Skip to content

FinceptTerminal is a modern finance application offering advanced market analytics, investment research, and economic data tools, designed for interactive exploration and data-driven decision-making in a user-friendly environment.

minor updates and bug fixes

tilakpatel224d95133240ba
diff --git a/fincept-qt/.cache/clangd/index/AIQuantLabScreen.cpp.41B70839A0CD4EA1.idx b/fincept-qt/.cache/clangd/index/AIQuantLabScreen.cpp.41B70839A0CD4EA1.idx
index 7300f6b9f..e14e353b7 100644
Binary files a/fincept-qt/.cache/clangd/index/AIQuantLabScreen.cpp.41B70839A0CD4EA1.idx and b/fincept-qt/.cache/clangd/index/AIQuantLabScreen.cpp.41B70839A0CD4EA1.idx differ
diff --git a/fincept-qt/.cache/clangd/index/AddWidgetDialog.cpp.7F204AC33D54795A.idx b/fincept-qt/.cache/clangd/index/AddWidgetDialog.cpp.7F204AC33D54795A.idx
index 87d9d8e5e..949111e18 100644
Binary files a/fincept-qt/.cache/clangd/index/AddWidgetDialog.cpp.7F204AC33D54795A.idx and b/fincept-qt/.cache/clangd/index/AddWidgetDialog.cpp.7F204AC33D54795A.idx differ
diff --git a/fincept-qt/.cache/clangd/index/AgentsViewPanel.cpp.5CEBB248B40E88FB.idx b/fincept-qt/.cache/clangd/index/AgentsViewPanel.cpp.5CEBB248B40E88FB.idx
index be0dcd785..82a19fd53 100644
Binary files a/fincept-qt/.cache/clangd/index/AgentsViewPanel.cpp.5CEBB248B40E88FB.idx and b/fincept-qt/.cache/clangd/index/AgentsViewPanel.cpp.5CEBB248B40E88FB.idx differ
diff --git a/fincept-qt/.cache/clangd/index/AkShareScreen.cpp.AEC9703C7D123D70.idx b/fincept-qt/.cache/clangd/index/AkShareScreen.cpp.AEC9703C7D123D70.idx
index 160fefdbf..4f2da5554 100644
Binary files a/fincept-qt/.cache/clangd/index/AkShareScreen.cpp.AEC9703C7D123D70.idx and b/fincept-qt/.cache/clangd/index/AkShareScreen.cpp.AEC9703C7D123D70.idx differ
diff --git a/fincept-qt/.cache/clangd/index/AlphaArenaScreen.cpp.188545A3697024DD.idx b/fincept-qt/.cache/clangd/index/AlphaArenaScreen.cpp.188545A3697024DD.idx
index db9c58688..079103a83 100644
Binary files a/fincept-qt/.cache/clangd/index/AlphaArenaScreen.cpp.188545A3697024DD.idx and b/fincept-qt/.cache/clangd/index/AlphaArenaScreen.cpp.188545A3697024DD.idx differ
diff --git a/fincept-qt/.cache/clangd/index/AltInvestmentsScreen.cpp.39D26F2EC203F7B4.idx b/fincept-qt/.cache/clangd/index/AltInvestmentsScreen.cpp.39D26F2EC203F7B4.idx
index 18af895af..b683425da 100644
Binary files a/fincept-qt/.cache/clangd/index/AltInvestmentsScreen.cpp.39D26F2EC203F7B4.idx and b/fincept-qt/.cache/clangd/index/AltInvestmentsScreen.cpp.39D26F2EC203F7B4.idx differ
diff --git a/fincept-qt/.cache/clangd/index/AnalyticsSectorsView.cpp.625A05556BFC976D.idx b/fincept-qt/.cache/clangd/index/AnalyticsSectorsView.cpp.625A05556BFC976D.idx
index c72acb4df..a171b30dd 100644
Binary files a/fincept-qt/.cache/clangd/index/AnalyticsSectorsView.cpp.625A05556BFC976D.idx and b/fincept-qt/.cache/clangd/index/AnalyticsSectorsView.cpp.625A05556BFC976D.idx differ
diff --git a/fincept-qt/.cache/clangd/index/AppConfig.h.7F12E88573E3E592.idx b/fincept-qt/.cache/clangd/index/AppConfig.h.7F12E88573E3E592.idx
new file mode 100644
index 000000000..109e46f8b
Binary files /dev/null and b/fincept-qt/.cache/clangd/index/AppConfig.h.7F12E88573E3E592.idx differ
diff --git a/fincept-qt/.cache/clangd/index/AsiaMarketsScreen.cpp.989DB238183C5B2F.idx b/fincept-qt/.cache/clangd/index/AsiaMarketsScreen.cpp.989DB238183C5B2F.idx
index 70599cc2b..cb79abba2 100644
Binary files a/fincept-qt/.cache/clangd/index/AsiaMarketsScreen.cpp.989DB238183C5B2F.idx and b/fincept-qt/.cache/clangd/index/AsiaMarketsScreen.cpp.989DB238183C5B2F.idx differ
diff --git a/fincept-qt/.cache/clangd/index/AuthApi.h.0FBB21F3704DE88A.idx b/fincept-qt/.cache/clangd/index/AuthApi.h.0FBB21F3704DE88A.idx
index 6fb0aa7ce..dc0dc2108 100644
Binary files a/fincept-qt/.cache/clangd/index/AuthApi.h.0FBB21F3704DE88A.idx and b/fincept-qt/.cache/clangd/index/AuthApi.h.0FBB21F3704DE88A.idx differ
diff --git a/fincept-qt/.cache/clangd/index/BacktestingScreen.cpp.DB7CED33FAA8B431.idx b/fincept-qt/.cache/clangd/index/BacktestingScreen.cpp.DB7CED33FAA8B431.idx
index a68678bd4..07c00697e 100644
Binary files a/fincept-qt/.cache/clangd/index/BacktestingScreen.cpp.DB7CED33FAA8B431.idx and b/fincept-qt/.cache/clangd/index/BacktestingScreen.cpp.DB7CED33FAA8B431.idx differ
diff --git a/fincept-qt/.cache/clangd/index/BaseWidget.cpp.0D8501EC45E9F0F1.idx b/fincept-qt/.cache/clangd/index/BaseWidget.cpp.0D8501EC45E9F0F1.idx
index ec575748f..380f8def9 100644
Binary files a/fincept-qt/.cache/clangd/index/BaseWidget.cpp.0D8501EC45E9F0F1.idx and b/fincept-qt/.cache/clangd/index/BaseWidget.cpp.0D8501EC45E9F0F1.idx differ
diff --git a/fincept-qt/.cache/clangd/index/BaseWidget.h.5F4E0019F7895C95.idx b/fincept-qt/.cache/clangd/index/BaseWidget.h.5F4E0019F7895C95.idx
index fe9908bde..013cd3db7 100644
Binary files a/fincept-qt/.cache/clangd/index/BaseWidget.h.5F4E0019F7895C95.idx and b/fincept-qt/.cache/clangd/index/BaseWidget.h.5F4E0019F7895C95.idx differ
diff --git a/fincept-qt/.cache/clangd/index/CacheManager.h.E3BD686F85751AE1.idx b/fincept-qt/.cache/clangd/index/CacheManager.h.E3BD686F85751AE1.idx
index 1117cc1de..f07df7d12 100644
Binary files a/fincept-qt/.cache/clangd/index/CacheManager.h.E3BD686F85751AE1.idx and b/fincept-qt/.cache/clangd/index/CacheManager.h.E3BD686F85751AE1.idx differ
diff --git a/fincept-qt/.cache/clangd/index/CodeEditorScreen.cpp.D3C6736B7E78EE2D.idx b/fincept-qt/.cache/clangd/index/CodeEditorScreen.cpp.D3C6736B7E78EE2D.idx
index 5c3647e53..afd57a499 100644
Binary files a/fincept-qt/.cache/clangd/index/CodeEditorScreen.cpp.D3C6736B7E78EE2D.idx and b/fincept-qt/.cache/clangd/index/CodeEditorScreen.cpp.D3C6736B7E78EE2D.idx differ
diff --git a/fincept-qt/.cache/clangd/index/CustomIndexView.cpp.AB90DF471910BE52.idx b/fincept-qt/.cache/clangd/index/CustomIndexView.cpp.AB90DF471910BE52.idx
index 254900f29..d65a41ca8 100644
Binary files a/fincept-qt/.cache/clangd/index/CustomIndexView.cpp.AB90DF471910BE52.idx and b/fincept-qt/.cache/clangd/index/CustomIndexView.cpp.AB90DF471910BE52.idx differ
diff --git a/fincept-qt/.cache/clangd/index/DBnomicsChartWidget.cpp.A1375064752FDA8D.idx b/fincept-qt/.cache/clangd/index/DBnomicsChartWidget.cpp.A1375064752FDA8D.idx
index a5de673a3..9ba6393b7 100644
Binary files a/fincept-qt/.cache/clangd/index/DBnomicsChartWidget.cpp.A1375064752FDA8D.idx and b/fincept-qt/.cache/clangd/index/DBnomicsChartWidget.cpp.A1375064752FDA8D.idx differ
diff --git a/fincept-qt/.cache/clangd/index/DBnomicsDataTable.cpp.52868050179168B0.idx b/fincept-qt/.cache/clangd/index/DBnomicsDataTable.cpp.52868050179168B0.idx
index 709ab54e4..011247f5b 100644
Binary files a/fincept-qt/.cache/clangd/index/DBnomicsDataTable.cpp.52868050179168B0.idx and b/fincept-qt/.cache/clangd/index/DBnomicsDataTable.cpp.52868050179168B0.idx differ
diff --git a/fincept-qt/.cache/clangd/index/DBnomicsScreen.cpp.DD1865D4F18E9A99.idx b/fincept-qt/.cache/clangd/index/DBnomicsScreen.cpp.DD1865D4F18E9A99.idx
index 070a4a918..00a99efa7 100644
Binary files a/fincept-qt/.cache/clangd/index/DBnomicsScreen.cpp.DD1865D4F18E9A99.idx and b/fincept-qt/.cache/clangd/index/DBnomicsScreen.cpp.DD1865D4F18E9A99.idx differ
diff --git a/fincept-qt/.cache/clangd/index/DBnomicsSelectionPanel.cpp.30F34CFC8985B37D.idx b/fincept-qt/.cache/clangd/index/DBnomicsSelectionPanel.cpp.30F34CFC8985B37D.idx
index b21e962b9..e44a63b7c 100644
Binary files a/fincept-qt/.cache/clangd/index/DBnomicsSelectionPanel.cpp.30F34CFC8985B37D.idx and b/fincept-qt/.cache/clangd/index/DBnomicsSelectionPanel.cpp.30F34CFC8985B37D.idx differ
diff --git a/fincept-qt/.cache/clangd/index/DashboardScreen.cpp.A85C1CA6D4EF5A15.idx b/fincept-qt/.cache/clangd/index/DashboardScreen.cpp.A85C1CA6D4EF5A15.idx
index 14ceea3d1..9da0c6419 100644
Binary files a/fincept-qt/.cache/clangd/index/DashboardScreen.cpp.A85C1CA6D4EF5A15.idx and b/fincept-qt/.cache/clangd/index/DashboardScreen.cpp.A85C1CA6D4EF5A15.idx differ
diff --git a/fincept-qt/.cache/clangd/index/DashboardScreen.h.D8F8E509069D6DB1.idx b/fincept-qt/.cache/clangd/index/DashboardScreen.h.D8F8E509069D6DB1.idx
index fc3eac129..3fa1f0c51 100644
Binary files a/fincept-qt/.cache/clangd/index/DashboardScreen.h.D8F8E509069D6DB1.idx and b/fincept-qt/.cache/clangd/index/DashboardScreen.h.D8F8E509069D6DB1.idx differ
diff --git a/fincept-qt/.cache/clangd/index/DashboardStatusBar.cpp.C5AB2615C32D56F4.idx b/fincept-qt/.cache/clangd/index/DashboardStatusBar.cpp.C5AB2615C32D56F4.idx
index d474480f1..0e1c81041 100644
Binary files a/fincept-qt/.cache/clangd/index/DashboardStatusBar.cpp.C5AB2615C32D56F4.idx and b/fincept-qt/.cache/clangd/index/DashboardStatusBar.cpp.C5AB2615C32D56F4.idx differ
diff --git a/fincept-qt/.cache/clangd/index/DashboardStatusBar.h.7C2F4176C52FC850.idx b/fincept-qt/.cache/clangd/index/DashboardStatusBar.h.7C2F4176C52FC850.idx
index fc02ecad6..fc89b7d00 100644
Binary files a/fincept-qt/.cache/clangd/index/DashboardStatusBar.h.7C2F4176C52FC850.idx and b/fincept-qt/.cache/clangd/index/DashboardStatusBar.h.7C2F4176C52FC850.idx differ
diff --git a/fincept-qt/.cache/clangd/index/DashboardToolBar.cpp.425D27BA0FD15EEE.idx b/fincept-qt/.cache/clangd/index/DashboardToolBar.cpp.425D27BA0FD15EEE.idx
index 184f8801d..b17a764cd 100644
Binary files a/fincept-qt/.cache/clangd/index/DashboardToolBar.cpp.425D27BA0FD15EEE.idx and b/fincept-qt/.cache/clangd/index/DashboardToolBar.cpp.425D27BA0FD15EEE.idx differ
diff --git a/fincept-qt/.cache/clangd/index/DashboardToolBar.h.CD550D1820A744B6.idx b/fincept-qt/.cache/clangd/index/DashboardToolBar.h.CD550D1820A744B6.idx
index ddc153e17..7f2b9679f 100644
Binary files a/fincept-qt/.cache/clangd/index/DashboardToolBar.h.CD550D1820A744B6.idx and b/fincept-qt/.cache/clangd/index/DashboardToolBar.h.CD550D1820A744B6.idx differ
diff --git a/fincept-qt/.cache/clangd/index/DataMappingScreen.cpp.3E53FB863B652EB2.idx b/fincept-qt/.cache/clangd/index/DataMappingScreen.cpp.3E53FB863B652EB2.idx
index 7b83b0317..97931a3bc 100644
Binary files a/fincept-qt/.cache/clangd/index/DataMappingScreen.cpp.3E53FB863B652EB2.idx and b/fincept-qt/.cache/clangd/index/DataMappingScreen.cpp.3E53FB863B652EB2.idx differ
diff --git a/fincept-qt/.cache/clangd/index/DataSourcesScreen.cpp.5DA094D79081B554.idx b/fincept-qt/.cache/clangd/index/DataSourcesScreen.cpp.5DA094D79081B554.idx
index a95cdb232..c76b25119 100644
Binary files a/fincept-qt/.cache/clangd/index/DataSourcesScreen.cpp.5DA094D79081B554.idx and b/fincept-qt/.cache/clangd/index/DataSourcesScreen.cpp.5DA094D79081B554.idx differ
diff --git a/fincept-qt/.cache/clangd/index/DataSourcesScreen.h.EFD192FF1E088777.idx b/fincept-qt/.cache/clangd/index/DataSourcesScreen.h.EFD192FF1E088777.idx
index afad88cff..15f613f8d 100644
Binary files a/fincept-qt/.cache/clangd/index/DataSourcesScreen.h.EFD192FF1E088777.idx and b/fincept-qt/.cache/clangd/index/DataSourcesScreen.h.EFD192FF1E088777.idx differ
diff --git a/fincept-qt/.cache/clangd/index/DataSourcesTools.cpp.5BEE63CA98EAF87D.idx b/fincept-qt/.cache/clangd/index/DataSourcesTools.cpp.5BEE63CA98EAF87D.idx
index 43267d633..9a066911b 100644
Binary files a/fincept-qt/.cache/clangd/index/DataSourcesTools.cpp.5BEE63CA98EAF87D.idx and b/fincept-qt/.cache/clangd/index/DataSourcesTools.cpp.5BEE63CA98EAF87D.idx differ
diff --git a/fincept-qt/.cache/clangd/index/EconomicCalendarWidget.cpp.28F38012398CFFB7.idx b/fincept-qt/.cache/clangd/index/EconomicCalendarWidget.cpp.28F38012398CFFB7.idx
index 6a15d2c0a..aba5c7a3c 100644
Binary files a/fincept-qt/.cache/clangd/index/EconomicCalendarWidget.cpp.28F38012398CFFB7.idx and b/fincept-qt/.cache/clangd/index/EconomicCalendarWidget.cpp.28F38012398CFFB7.idx differ
diff --git a/fincept-qt/.cache/clangd/index/EquityBottomPanel.cpp.8FE475C90BE77E9A.idx b/fincept-qt/.cache/clangd/index/EquityBottomPanel.cpp.8FE475C90BE77E9A.idx
index 53f94d023..2028b28e2 100644
Binary files a/fincept-qt/.cache/clangd/index/EquityBottomPanel.cpp.8FE475C90BE77E9A.idx and b/fincept-qt/.cache/clangd/index/EquityBottomPanel.cpp.8FE475C90BE77E9A.idx differ
diff --git a/fincept-qt/.cache/clangd/index/EquityFinancialsTab.cpp.E43A43C3AF136AE5.idx b/fincept-qt/.cache/clangd/index/EquityFinancialsTab.cpp.E43A43C3AF136AE5.idx
index 8a4fed3e4..cbdf2033a 100644
Binary files a/fincept-qt/.cache/clangd/index/EquityFinancialsTab.cpp.E43A43C3AF136AE5.idx and b/fincept-qt/.cache/clangd/index/EquityFinancialsTab.cpp.E43A43C3AF136AE5.idx differ
diff --git a/fincept-qt/.cache/clangd/index/EquityOrderBook.cpp.423D47C78E6DDACA.idx b/fincept-qt/.cache/clangd/index/EquityOrderBook.cpp.423D47C78E6DDACA.idx
index 4c19dbccb..446b5b3fb 100644
Binary files a/fincept-qt/.cache/clangd/index/EquityOrderBook.cpp.423D47C78E6DDACA.idx and b/fincept-qt/.cache/clangd/index/EquityOrderBook.cpp.423D47C78E6DDACA.idx differ
diff --git a/fincept-qt/.cache/clangd/index/EquityOrderEntry.cpp.6184EFA693185C27.idx b/fincept-qt/.cache/clangd/index/EquityOrderEntry.cpp.6184EFA693185C27.idx
index 1ecbb85ff..24146837b 100644
Binary files a/fincept-qt/.cache/clangd/index/EquityOrderEntry.cpp.6184EFA693185C27.idx and b/fincept-qt/.cache/clangd/index/EquityOrderEntry.cpp.6184EFA693185C27.idx differ
diff --git a/fincept-qt/.cache/clangd/index/EquityPeersTab.cpp.132D831DE892E597.idx b/fincept-qt/.cache/clangd/index/EquityPeersTab.cpp.132D831DE892E597.idx
index 10b69c294..43e0635c2 100644
Binary files a/fincept-qt/.cache/clangd/index/EquityPeersTab.cpp.132D831DE892E597.idx and b/fincept-qt/.cache/clangd/index/EquityPeersTab.cpp.132D831DE892E597.idx differ
diff --git a/fincept-qt/.cache/clangd/index/EquityResearchScreen.cpp.862F86FD34B4F5B4.idx b/fincept-qt/.cache/clangd/index/EquityResearchScreen.cpp.862F86FD34B4F5B4.idx
index 902cf338b..6705c3920 100644
Binary files a/fincept-qt/.cache/clangd/index/EquityResearchScreen.cpp.862F86FD34B4F5B4.idx and b/fincept-qt/.cache/clangd/index/EquityResearchScreen.cpp.862F86FD34B4F5B4.idx differ
diff --git a/fincept-qt/.cache/clangd/index/EquityTalippTab.cpp.582079BF4A061397.idx b/fincept-qt/.cache/clangd/index/EquityTalippTab.cpp.582079BF4A061397.idx
index b6cf9fcc7..397459be4 100644
Binary files a/fincept-qt/.cache/clangd/index/EquityTalippTab.cpp.582079BF4A061397.idx and b/fincept-qt/.cache/clangd/index/EquityTalippTab.cpp.582079BF4A061397.idx differ
diff --git a/fincept-qt/.cache/clangd/index/EquityTradingScreen.cpp.FE7C39129B304593.idx b/fincept-qt/.cache/clangd/index/EquityTradingScreen.cpp.FE7C39129B304593.idx
index e30cf95bb..a163f6891 100644
Binary files a/fincept-qt/.cache/clangd/index/EquityTradingScreen.cpp.FE7C39129B304593.idx and b/fincept-qt/.cache/clangd/index/EquityTradingScreen.cpp.FE7C39129B304593.idx differ
diff --git a/fincept-qt/.cache/clangd/index/EquityTradingScreen.h.6716E8865D3C3F58.idx b/fincept-qt/.cache/clangd/index/EquityTradingScreen.h.6716E8865D3C3F58.idx
index 495bdff2c..f03ed49bb 100644
Binary files a/fincept-qt/.cache/clangd/index/EquityTradingScreen.h.6716E8865D3C3F58.idx and b/fincept-qt/.cache/clangd/index/EquityTradingScreen.h.6716E8865D3C3F58.idx differ
diff --git a/fincept-qt/.cache/clangd/index/EquityWatchlist.cpp.74DCE3B057C79D17.idx b/fincept-qt/.cache/clangd/index/EquityWatchlist.cpp.74DCE3B057C79D17.idx
index bdb8bfa74..3469ce55d 100644
Binary files a/fincept-qt/.cache/clangd/index/EquityWatchlist.cpp.74DCE3B057C79D17.idx and b/fincept-qt/.cache/clangd/index/EquityWatchlist.cpp.74DCE3B057C79D17.idx differ
diff --git a/fincept-qt/.cache/clangd/index/ForumFeedPanel.cpp.5F7F615790317252.idx b/fincept-qt/.cache/clangd/index/ForumFeedPanel.cpp.5F7F615790317252.idx
index ff24fd7a5..e56b395cd 100644
Binary files a/fincept-qt/.cache/clangd/index/ForumFeedPanel.cpp.5F7F615790317252.idx and b/fincept-qt/.cache/clangd/index/ForumFeedPanel.cpp.5F7F615790317252.idx differ
diff --git a/fincept-qt/.cache/clangd/index/ForumPostListPanel.cpp.FEAE39C7448D7165.idx b/fincept-qt/.cache/clangd/index/ForumPostListPanel.cpp.FEAE39C7448D7165.idx
index 5a7a60456..3b32f7b90 100644
Binary files a/fincept-qt/.cache/clangd/index/ForumPostListPanel.cpp.FEAE39C7448D7165.idx and b/fincept-qt/.cache/clangd/index/ForumPostListPanel.cpp.FEAE39C7448D7165.idx differ
diff --git a/fincept-qt/.cache/clangd/index/ForumPostReaderPanel.cpp.8CFBEC3A80B347D9.idx b/fincept-qt/.cache/clangd/index/ForumPostReaderPanel.cpp.8CFBEC3A80B347D9.idx
index b98e93fe4..0a041a668 100644
Binary files a/fincept-qt/.cache/clangd/index/ForumPostReaderPanel.cpp.8CFBEC3A80B347D9.idx and b/fincept-qt/.cache/clangd/index/ForumPostReaderPanel.cpp.8CFBEC3A80B347D9.idx differ
diff --git a/fincept-qt/.cache/clangd/index/ForumScreen.cpp.C1E4185E44345127.idx b/fincept-qt/.cache/clangd/index/ForumScreen.cpp.C1E4185E44345127.idx
index ec60b6dda..8b2310b85 100644
Binary files a/fincept-qt/.cache/clangd/index/ForumScreen.cpp.C1E4185E44345127.idx and b/fincept-qt/.cache/clangd/index/ForumScreen.cpp.C1E4185E44345127.idx differ
diff --git a/fincept-qt/.cache/clangd/index/ForumSidebarPanel.cpp.86195AD7F7C1F8C1.idx b/fincept-qt/.cache/clangd/index/ForumSidebarPanel.cpp.86195AD7F7C1F8C1.idx
index 63f8a9c23..b1d1275c1 100644
Binary files a/fincept-qt/.cache/clangd/index/ForumSidebarPanel.cpp.86195AD7F7C1F8C1.idx and b/fincept-qt/.cache/clangd/index/ForumSidebarPanel.cpp.86195AD7F7C1F8C1.idx differ
diff --git a/fincept-qt/.cache/clangd/index/ForumThreadPanel.cpp.6C0B5205A9302983.idx b/fincept-qt/.cache/clangd/index/ForumThreadPanel.cpp.6C0B5205A9302983.idx
index 5b729f6dd..908a63146 100644
Binary files a/fincept-qt/.cache/clangd/index/ForumThreadPanel.cpp.6C0B5205A9302983.idx and b/fincept-qt/.cache/clangd/index/ForumThreadPanel.cpp.6C0B5205A9302983.idx differ
diff --git a/fincept-qt/.cache/clangd/index/GeopoliticsScreen.cpp.2C195C1C24A6D23C.idx b/fincept-qt/.cache/clangd/index/GeopoliticsScreen.cpp.2C195C1C24A6D23C.idx
index b864c65ff..c572043bd 100644
Binary files a/fincept-qt/.cache/clangd/index/GeopoliticsScreen.cpp.2C195C1C24A6D23C.idx and b/fincept-qt/.cache/clangd/index/GeopoliticsScreen.cpp.2C195C1C24A6D23C.idx differ
diff --git a/fincept-qt/.cache/clangd/index/GovDataAustraliaPanel.cpp.443524592FD2AE05.idx b/fincept-qt/.cache/clangd/index/GovDataAustraliaPanel.cpp.443524592FD2AE05.idx
index 4b06a9592..d535a425d 100644
Binary files a/fincept-qt/.cache/clangd/index/GovDataAustraliaPanel.cpp.443524592FD2AE05.idx and b/fincept-qt/.cache/clangd/index/GovDataAustraliaPanel.cpp.443524592FD2AE05.idx differ
diff --git a/fincept-qt/.cache/clangd/index/GovDataCKANPanel.cpp.5CFBEF8F4B669D74.idx b/fincept-qt/.cache/clangd/index/GovDataCKANPanel.cpp.5CFBEF8F4B669D74.idx
index 46a04f83b..d0bdebabc 100644
Binary files a/fincept-qt/.cache/clangd/index/GovDataCKANPanel.cpp.5CFBEF8F4B669D74.idx and b/fincept-qt/.cache/clangd/index/GovDataCKANPanel.cpp.5CFBEF8F4B669D74.idx differ
diff --git a/fincept-qt/.cache/clangd/index/GovDataCanadaPanel.cpp.19E3A817F1E339AE.idx b/fincept-qt/.cache/clangd/index/GovDataCanadaPanel.cpp.19E3A817F1E339AE.idx
index 9e6e802f9..51601438b 100644
Binary files a/fincept-qt/.cache/clangd/index/GovDataCanadaPanel.cpp.19E3A817F1E339AE.idx and b/fincept-qt/.cache/clangd/index/GovDataCanadaPanel.cpp.19E3A817F1E339AE.idx differ
diff --git a/fincept-qt/.cache/clangd/index/GovDataCongressPanel.cpp.3892C25FB618C790.idx b/fincept-qt/.cache/clangd/index/GovDataCongressPanel.cpp.3892C25FB618C790.idx
index 70c09a8a0..463ae89d8 100644
Binary files a/fincept-qt/.cache/clangd/index/GovDataCongressPanel.cpp.3892C25FB618C790.idx and b/fincept-qt/.cache/clangd/index/GovDataCongressPanel.cpp.3892C25FB618C790.idx differ
diff --git a/fincept-qt/.cache/clangd/index/GovDataFrancePanel.cpp.F22BBCDF5378E429.idx b/fincept-qt/.cache/clangd/index/GovDataFrancePanel.cpp.F22BBCDF5378E429.idx
index ca00f5f99..17527c8a2 100644
Binary files a/fincept-qt/.cache/clangd/index/GovDataFrancePanel.cpp.F22BBCDF5378E429.idx and b/fincept-qt/.cache/clangd/index/GovDataFrancePanel.cpp.F22BBCDF5378E429.idx differ
diff --git a/fincept-qt/.cache/clangd/index/GovDataHKPanel.cpp.D3A345EE4634AB6E.idx b/fincept-qt/.cache/clangd/index/GovDataHKPanel.cpp.D3A345EE4634AB6E.idx
index d7dc639cf..d7bcf05da 100644
Binary files a/fincept-qt/.cache/clangd/index/GovDataHKPanel.cpp.D3A345EE4634AB6E.idx and b/fincept-qt/.cache/clangd/index/GovDataHKPanel.cpp.D3A345EE4634AB6E.idx differ
diff --git a/fincept-qt/.cache/clangd/index/GovDataProviderPanel.cpp.596005A12806FC21.idx b/fincept-qt/.cache/clangd/index/GovDataProviderPanel.cpp.596005A12806FC21.idx
index c0adbd478..47d314a22 100644
Binary files a/fincept-qt/.cache/clangd/index/GovDataProviderPanel.cpp.596005A12806FC21.idx and b/fincept-qt/.cache/clangd/index/GovDataProviderPanel.cpp.596005A12806FC21.idx differ
diff --git a/fincept-qt/.cache/clangd/index/GovDataScreen.cpp.57412C1EABCCECB1.idx b/fincept-qt/.cache/clangd/index/GovDataScreen.cpp.57412C1EABCCECB1.idx
index d3ac068ae..ef127e2d8 100644
Binary files a/fincept-qt/.cache/clangd/index/GovDataScreen.cpp.57412C1EABCCECB1.idx and b/fincept-qt/.cache/clangd/index/GovDataScreen.cpp.57412C1EABCCECB1.idx differ
diff --git a/fincept-qt/.cache/clangd/index/GovDataSwissPanel.cpp.C9FEB6C6C0A4A5DA.idx b/fincept-qt/.cache/clangd/index/GovDataSwissPanel.cpp.C9FEB6C6C0A4A5DA.idx
index 58ba63960..e5dc7e2a4 100644
Binary files a/fincept-qt/.cache/clangd/index/GovDataSwissPanel.cpp.C9FEB6C6C0A4A5DA.idx and b/fincept-qt/.cache/clangd/index/GovDataSwissPanel.cpp.C9FEB6C6C0A4A5DA.idx differ
diff --git a/fincept-qt/.cache/clangd/index/GovDataTreasuryPanel.cpp.E9C667E3C15AD619.idx b/fincept-qt/.cache/clangd/index/GovDataTreasuryPanel.cpp.E9C667E3C15AD619.idx
index f5e1919e3..ec1339ab1 100644
Binary files a/fincept-qt/.cache/clangd/index/GovDataTreasuryPanel.cpp.E9C667E3C15AD619.idx and b/fincept-qt/.cache/clangd/index/GovDataTreasuryPanel.cpp.E9C667E3C15AD619.idx differ
diff --git a/fincept-qt/.cache/clangd/index/GovDataUKPanel.cpp.C9F004A9E44CA493.idx b/fincept-qt/.cache/clangd/index/GovDataUKPanel.cpp.C9F004A9E44CA493.idx
index 74fdfc4df..451ce0ba3 100644
Binary files a/fincept-qt/.cache/clangd/index/GovDataUKPanel.cpp.C9F004A9E44CA493.idx and b/fincept-qt/.cache/clangd/index/GovDataUKPanel.cpp.C9F004A9E44CA493.idx differ
diff --git a/fincept-qt/.cache/clangd/index/HDXDataPanel.cpp.69065C28382041FA.idx b/fincept-qt/.cache/clangd/index/HDXDataPanel.cpp.69065C28382041FA.idx
index f8f02a9cd..140eefb01 100644
Binary files a/fincept-qt/.cache/clangd/index/HDXDataPanel.cpp.69065C28382041FA.idx and b/fincept-qt/.cache/clangd/index/HDXDataPanel.cpp.69065C28382041FA.idx differ
diff --git a/fincept-qt/.cache/clangd/index/HttpClient.h.F30A154C5369BA41.idx b/fincept-qt/.cache/clangd/index/HttpClient.h.F30A154C5369BA41.idx
index b1aa4c9e3..2fd733284 100644
Binary files a/fincept-qt/.cache/clangd/index/HttpClient.h.F30A154C5369BA41.idx and b/fincept-qt/.cache/clangd/index/HttpClient.h.F30A154C5369BA41.idx differ
diff --git a/fincept-qt/.cache/clangd/index/IWorkspaceParticipant.h.144660E0707746D8.idx b/fincept-qt/.cache/clangd/index/IWorkspaceParticipant.h.144660E0707746D8.idx
new file mode 100644
index 000000000..ba469dfa0
Binary files /dev/null and b/fincept-qt/.cache/clangd/index/IWorkspaceParticipant.h.144660E0707746D8.idx differ
diff --git a/fincept-qt/.cache/clangd/index/LlmConfigSection.cpp.DC164602779CBA1E.idx b/fincept-qt/.cache/clangd/index/LlmConfigSection.cpp.DC164602779CBA1E.idx
index a77daa10b..beaf1ae34 100644
Binary files a/fincept-qt/.cache/clangd/index/LlmConfigSection.cpp.DC164602779CBA1E.idx and b/fincept-qt/.cache/clangd/index/LlmConfigSection.cpp.DC164602779CBA1E.idx differ
diff --git a/fincept-qt/.cache/clangd/index/Logger.h.AE8FEF52824D89E1.idx b/fincept-qt/.cache/clangd/index/Logger.h.AE8FEF52824D89E1.idx
index 7880eabde..5c9d5ebcc 100644
Binary files a/fincept-qt/.cache/clangd/index/Logger.h.AE8FEF52824D89E1.idx and b/fincept-qt/.cache/clangd/index/Logger.h.AE8FEF52824D89E1.idx differ
diff --git a/fincept-qt/.cache/clangd/index/MAAnalyticsScreen.cpp.967E80DB65526B96.idx b/fincept-qt/.cache/clangd/index/MAAnalyticsScreen.cpp.967E80DB65526B96.idx
index 168bcff33..03f24ed79 100644
Binary files a/fincept-qt/.cache/clangd/index/MAAnalyticsScreen.cpp.967E80DB65526B96.idx and b/fincept-qt/.cache/clangd/index/MAAnalyticsScreen.cpp.967E80DB65526B96.idx differ
diff --git a/fincept-qt/.cache/clangd/index/MarketPanel.cpp.B3E0F57BF6B23452.idx b/fincept-qt/.cache/clangd/index/MarketPanel.cpp.B3E0F57BF6B23452.idx
index d64d2943a..b1cbe54b5 100644
Binary files a/fincept-qt/.cache/clangd/index/MarketPanel.cpp.B3E0F57BF6B23452.idx and b/fincept-qt/.cache/clangd/index/MarketPanel.cpp.B3E0F57BF6B23452.idx differ
diff --git a/fincept-qt/.cache/clangd/index/MarketPanel.h.8583C9CDF055868E.idx b/fincept-qt/.cache/clangd/index/MarketPanel.h.8583C9CDF055868E.idx
index 5e41b7fdc..39c3ffb2a 100644
Binary files a/fincept-qt/.cache/clangd/index/MarketPanel.h.8583C9CDF055868E.idx and b/fincept-qt/.cache/clangd/index/MarketPanel.h.8583C9CDF055868E.idx differ
diff --git a/fincept-qt/.cache/clangd/index/MarketPulsePanel.cpp.05DE3AB960DECCE3.idx b/fincept-qt/.cache/clangd/index/MarketPulsePanel.cpp.05DE3AB960DECCE3.idx
index 5a665595d..68da297d4 100644
Binary files a/fincept-qt/.cache/clangd/index/MarketPulsePanel.cpp.05DE3AB960DECCE3.idx and b/fincept-qt/.cache/clangd/index/MarketPulsePanel.cpp.05DE3AB960DECCE3.idx differ
diff --git a/fincept-qt/.cache/clangd/index/MarketSentimentWidget.cpp.D58685EE07EC2845.idx b/fincept-qt/.cache/clangd/index/MarketSentimentWidget.cpp.D58685EE07EC2845.idx
index ebcefcadf..31226edb6 100644
Binary files a/fincept-qt/.cache/clangd/index/MarketSentimentWidget.cpp.D58685EE07EC2845.idx and b/fincept-qt/.cache/clangd/index/MarketSentimentWidget.cpp.D58685EE07EC2845.idx differ
diff --git a/fincept-qt/.cache/clangd/index/MarketsScreen.cpp.AB596983EDA612DF.idx b/fincept-qt/.cache/clangd/index/MarketsScreen.cpp.AB596983EDA612DF.idx
index 1630f1631..c8acc1794 100644
Binary files a/fincept-qt/.cache/clangd/index/MarketsScreen.cpp.AB596983EDA612DF.idx and b/fincept-qt/.cache/clangd/index/MarketsScreen.cpp.AB596983EDA612DF.idx differ
diff --git a/fincept-qt/.cache/clangd/index/MarketsScreen.h.284E6B065C972F74.idx b/fincept-qt/.cache/clangd/index/MarketsScreen.h.284E6B065C972F74.idx
index cd413aa5a..8b7671ac2 100644
Binary files a/fincept-qt/.cache/clangd/index/MarketsScreen.h.284E6B065C972F74.idx and b/fincept-qt/.cache/clangd/index/MarketsScreen.h.284E6B065C972F74.idx differ
diff --git a/fincept-qt/.cache/clangd/index/McpServersScreen.cpp.A2F4516D06D41DFB.idx b/fincept-qt/.cache/clangd/index/McpServersScreen.cpp.A2F4516D06D41DFB.idx
index bb11e2e92..5b0d358f8 100644
Binary files a/fincept-qt/.cache/clangd/index/McpServersScreen.cpp.A2F4516D06D41DFB.idx and b/fincept-qt/.cache/clangd/index/McpServersScreen.cpp.A2F4516D06D41DFB.idx differ
diff --git a/fincept-qt/.cache/clangd/index/McpServersSection.cpp.EA64F90BF3E333F5.idx b/fincept-qt/.cache/clangd/index/McpServersSection.cpp.EA64F90BF3E333F5.idx
index e9991e6aa..793b6d254 100644
Binary files a/fincept-qt/.cache/clangd/index/McpServersSection.cpp.EA64F90BF3E333F5.idx and b/fincept-qt/.cache/clangd/index/McpServersSection.cpp.EA64F90BF3E333F5.idx differ
diff --git a/fincept-qt/.cache/clangd/index/MigrationRunner.h.4F76F279231FC64F.idx b/fincept-qt/.cache/clangd/index/MigrationRunner.h.4F76F279231FC64F.idx
index b4dababeb..1fe22530a 100644
Binary files a/fincept-qt/.cache/clangd/index/MigrationRunner.h.4F76F279231FC64F.idx and b/fincept-qt/.cache/clangd/index/MigrationRunner.h.4F76F279231FC64F.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NewsArticleRepository.h.DED2F08BE5F466C0.idx b/fincept-qt/.cache/clangd/index/NewsArticleRepository.h.DED2F08BE5F466C0.idx
new file mode 100644
index 000000000..05f7a65bb
Binary files /dev/null and b/fincept-qt/.cache/clangd/index/NewsArticleRepository.h.DED2F08BE5F466C0.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NewsCommandBar.cpp.2144EBF3DF18E713.idx b/fincept-qt/.cache/clangd/index/NewsCommandBar.cpp.2144EBF3DF18E713.idx
index 362393277..57bc346bc 100644
Binary files a/fincept-qt/.cache/clangd/index/NewsCommandBar.cpp.2144EBF3DF18E713.idx and b/fincept-qt/.cache/clangd/index/NewsCommandBar.cpp.2144EBF3DF18E713.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NewsDetailPanel.cpp.0BA8F1322E075BFD.idx b/fincept-qt/.cache/clangd/index/NewsDetailPanel.cpp.0BA8F1322E075BFD.idx
index adaf2c921..8ae30785d 100644
Binary files a/fincept-qt/.cache/clangd/index/NewsDetailPanel.cpp.0BA8F1322E075BFD.idx and b/fincept-qt/.cache/clangd/index/NewsDetailPanel.cpp.0BA8F1322E075BFD.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NewsDetailPanel.h.53DE07FC03E492CE.idx b/fincept-qt/.cache/clangd/index/NewsDetailPanel.h.53DE07FC03E492CE.idx
index 549b4e6a8..a32e72908 100644
Binary files a/fincept-qt/.cache/clangd/index/NewsDetailPanel.h.53DE07FC03E492CE.idx and b/fincept-qt/.cache/clangd/index/NewsDetailPanel.h.53DE07FC03E492CE.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NewsFeedDelegate.cpp.0AF70557C498B179.idx b/fincept-qt/.cache/clangd/index/NewsFeedDelegate.cpp.0AF70557C498B179.idx
index d9e74c811..90ff23a7e 100644
Binary files a/fincept-qt/.cache/clangd/index/NewsFeedDelegate.cpp.0AF70557C498B179.idx and b/fincept-qt/.cache/clangd/index/NewsFeedDelegate.cpp.0AF70557C498B179.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NewsFeedModel.cpp.F9086FE154F0AE92.idx b/fincept-qt/.cache/clangd/index/NewsFeedModel.cpp.F9086FE154F0AE92.idx
index 36ced53c0..096872bbd 100644
Binary files a/fincept-qt/.cache/clangd/index/NewsFeedModel.cpp.F9086FE154F0AE92.idx and b/fincept-qt/.cache/clangd/index/NewsFeedModel.cpp.F9086FE154F0AE92.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NewsFeedModel.h.DE942D164D5953EB.idx b/fincept-qt/.cache/clangd/index/NewsFeedModel.h.DE942D164D5953EB.idx
index 96157816d..1ac459125 100644
Binary files a/fincept-qt/.cache/clangd/index/NewsFeedModel.h.DE942D164D5953EB.idx and b/fincept-qt/.cache/clangd/index/NewsFeedModel.h.DE942D164D5953EB.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NewsFeedPanel.cpp.A216AD62BA014DF6.idx b/fincept-qt/.cache/clangd/index/NewsFeedPanel.cpp.A216AD62BA014DF6.idx
index 4b963ebf1..703194282 100644
Binary files a/fincept-qt/.cache/clangd/index/NewsFeedPanel.cpp.A216AD62BA014DF6.idx and b/fincept-qt/.cache/clangd/index/NewsFeedPanel.cpp.A216AD62BA014DF6.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NewsScreen.cpp.EBFD5AF191E7C373.idx b/fincept-qt/.cache/clangd/index/NewsScreen.cpp.EBFD5AF191E7C373.idx
index 8f8b18fc9..b90da4a08 100644
Binary files a/fincept-qt/.cache/clangd/index/NewsScreen.cpp.EBFD5AF191E7C373.idx and b/fincept-qt/.cache/clangd/index/NewsScreen.cpp.EBFD5AF191E7C373.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NewsScreen.h.FFBFC965AD18A6C8.idx b/fincept-qt/.cache/clangd/index/NewsScreen.h.FFBFC965AD18A6C8.idx
index 1a56ebe24..f2a5e021a 100644
Binary files a/fincept-qt/.cache/clangd/index/NewsScreen.h.FFBFC965AD18A6C8.idx and b/fincept-qt/.cache/clangd/index/NewsScreen.h.FFBFC965AD18A6C8.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NewsService.h.73C155F1DAD76A78.idx b/fincept-qt/.cache/clangd/index/NewsService.h.73C155F1DAD76A78.idx
index c6c560840..378568087 100644
Binary files a/fincept-qt/.cache/clangd/index/NewsService.h.73C155F1DAD76A78.idx and b/fincept-qt/.cache/clangd/index/NewsService.h.73C155F1DAD76A78.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NewsSidePanel.cpp.A53FC6EC7B22DE2D.idx b/fincept-qt/.cache/clangd/index/NewsSidePanel.cpp.A53FC6EC7B22DE2D.idx
index 6ca0dacd7..114aaaa30 100644
Binary files a/fincept-qt/.cache/clangd/index/NewsSidePanel.cpp.A53FC6EC7B22DE2D.idx and b/fincept-qt/.cache/clangd/index/NewsSidePanel.cpp.A53FC6EC7B22DE2D.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NewsSidePanel.h.395CE2353B5BDA5B.idx b/fincept-qt/.cache/clangd/index/NewsSidePanel.h.395CE2353B5BDA5B.idx
index e9fbebd87..845caa1db 100644
Binary files a/fincept-qt/.cache/clangd/index/NewsSidePanel.h.395CE2353B5BDA5B.idx and b/fincept-qt/.cache/clangd/index/NewsSidePanel.h.395CE2353B5BDA5B.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NewsTickerStrip.cpp.7C25957A958C4EC9.idx b/fincept-qt/.cache/clangd/index/NewsTickerStrip.cpp.7C25957A958C4EC9.idx
index e7f344d35..aeefdb262 100644
Binary files a/fincept-qt/.cache/clangd/index/NewsTickerStrip.cpp.7C25957A958C4EC9.idx and b/fincept-qt/.cache/clangd/index/NewsTickerStrip.cpp.7C25957A958C4EC9.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NodeCanvas.cpp.C38A4531F1A13DF0.idx b/fincept-qt/.cache/clangd/index/NodeCanvas.cpp.C38A4531F1A13DF0.idx
index 6aacc6cf8..dd33db44d 100644
Binary files a/fincept-qt/.cache/clangd/index/NodeCanvas.cpp.C38A4531F1A13DF0.idx and b/fincept-qt/.cache/clangd/index/NodeCanvas.cpp.C38A4531F1A13DF0.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NotifBell.h.3F00D3A51F0F570B.idx b/fincept-qt/.cache/clangd/index/NotifBell.h.3F00D3A51F0F570B.idx
new file mode 100644
index 000000000..a4d486894
Binary files /dev/null and b/fincept-qt/.cache/clangd/index/NotifBell.h.3F00D3A51F0F570B.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NotifPanel.h.1541979C33697A41.idx b/fincept-qt/.cache/clangd/index/NotifPanel.h.1541979C33697A41.idx
new file mode 100644
index 000000000..be5c54ac7
Binary files /dev/null and b/fincept-qt/.cache/clangd/index/NotifPanel.h.1541979C33697A41.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NotifToast.h.E9483E9DC4115D6D.idx b/fincept-qt/.cache/clangd/index/NotifToast.h.E9483E9DC4115D6D.idx
new file mode 100644
index 000000000..47e7e7116
Binary files /dev/null and b/fincept-qt/.cache/clangd/index/NotifToast.h.E9483E9DC4115D6D.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NotificationService.h.12F5C5DF78C788DB.idx b/fincept-qt/.cache/clangd/index/NotificationService.h.12F5C5DF78C788DB.idx
new file mode 100644
index 000000000..c6b22d91c
Binary files /dev/null and b/fincept-qt/.cache/clangd/index/NotificationService.h.12F5C5DF78C788DB.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PerformanceRiskView.cpp.9D09F9B62EDB76BE.idx b/fincept-qt/.cache/clangd/index/PerformanceRiskView.cpp.9D09F9B62EDB76BE.idx
index 74adde023..220a52910 100644
Binary files a/fincept-qt/.cache/clangd/index/PerformanceRiskView.cpp.9D09F9B62EDB76BE.idx and b/fincept-qt/.cache/clangd/index/PerformanceRiskView.cpp.9D09F9B62EDB76BE.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PerformanceWidget.cpp.B7E359E26631E5D6.idx b/fincept-qt/.cache/clangd/index/PerformanceWidget.cpp.B7E359E26631E5D6.idx
index 16a372f21..97abcb4c0 100644
Binary files a/fincept-qt/.cache/clangd/index/PerformanceWidget.cpp.B7E359E26631E5D6.idx and b/fincept-qt/.cache/clangd/index/PerformanceWidget.cpp.B7E359E26631E5D6.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PlannerViewPanel.cpp.7B49932538F02780.idx b/fincept-qt/.cache/clangd/index/PlannerViewPanel.cpp.7B49932538F02780.idx
index 217aaa551..06bb78e02 100644
Binary files a/fincept-qt/.cache/clangd/index/PlannerViewPanel.cpp.7B49932538F02780.idx and b/fincept-qt/.cache/clangd/index/PlannerViewPanel.cpp.7B49932538F02780.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PlanningView.cpp.C268EC0E9DBF5B44.idx b/fincept-qt/.cache/clangd/index/PlanningView.cpp.C268EC0E9DBF5B44.idx
index 07bdf8133..a97794031 100644
Binary files a/fincept-qt/.cache/clangd/index/PlanningView.cpp.C268EC0E9DBF5B44.idx and b/fincept-qt/.cache/clangd/index/PlanningView.cpp.C268EC0E9DBF5B44.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PlanningView.h.1734A283BFBDB161.idx b/fincept-qt/.cache/clangd/index/PlanningView.h.1734A283BFBDB161.idx
index f2698366b..940486d0a 100644
Binary files a/fincept-qt/.cache/clangd/index/PlanningView.h.1734A283BFBDB161.idx and b/fincept-qt/.cache/clangd/index/PlanningView.h.1734A283BFBDB161.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PolymarketActivityFeed.cpp.DA7D83869524A486.idx b/fincept-qt/.cache/clangd/index/PolymarketActivityFeed.cpp.DA7D83869524A486.idx
index 9feeba3d6..978fddb38 100644
Binary files a/fincept-qt/.cache/clangd/index/PolymarketActivityFeed.cpp.DA7D83869524A486.idx and b/fincept-qt/.cache/clangd/index/PolymarketActivityFeed.cpp.DA7D83869524A486.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PolymarketLeaderboard.cpp.24AB7761B538F8AC.idx b/fincept-qt/.cache/clangd/index/PolymarketLeaderboard.cpp.24AB7761B538F8AC.idx
index c31452106..fce6bb150 100644
Binary files a/fincept-qt/.cache/clangd/index/PolymarketLeaderboard.cpp.24AB7761B538F8AC.idx and b/fincept-qt/.cache/clangd/index/PolymarketLeaderboard.cpp.24AB7761B538F8AC.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PolymarketMarketCard.cpp.0D7A01920D6B4F57.idx b/fincept-qt/.cache/clangd/index/PolymarketMarketCard.cpp.0D7A01920D6B4F57.idx
index 45b512a32..485dfe3aa 100644
Binary files a/fincept-qt/.cache/clangd/index/PolymarketMarketCard.cpp.0D7A01920D6B4F57.idx and b/fincept-qt/.cache/clangd/index/PolymarketMarketCard.cpp.0D7A01920D6B4F57.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PolymarketOrderBook.cpp.83738C1A262F1D6D.idx b/fincept-qt/.cache/clangd/index/PolymarketOrderBook.cpp.83738C1A262F1D6D.idx
index 890936bcb..657fc2d62 100644
Binary files a/fincept-qt/.cache/clangd/index/PolymarketOrderBook.cpp.83738C1A262F1D6D.idx and b/fincept-qt/.cache/clangd/index/PolymarketOrderBook.cpp.83738C1A262F1D6D.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioBlotter.cpp.0B95A6FC2FF51B82.idx b/fincept-qt/.cache/clangd/index/PortfolioBlotter.cpp.0B95A6FC2FF51B82.idx
index af28736ba..4e46809d7 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioBlotter.cpp.0B95A6FC2FF51B82.idx and b/fincept-qt/.cache/clangd/index/PortfolioBlotter.cpp.0B95A6FC2FF51B82.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioBlotter.h.9BB577E318A2FB26.idx b/fincept-qt/.cache/clangd/index/PortfolioBlotter.h.9BB577E318A2FB26.idx
index 9d492cf0c..5da00e347 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioBlotter.h.9BB577E318A2FB26.idx and b/fincept-qt/.cache/clangd/index/PortfolioBlotter.h.9BB577E318A2FB26.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioCommandBar.cpp.D4AE1F5BBA7204C4.idx b/fincept-qt/.cache/clangd/index/PortfolioCommandBar.cpp.D4AE1F5BBA7204C4.idx
index cb0afcf36..d4533b62c 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioCommandBar.cpp.D4AE1F5BBA7204C4.idx and b/fincept-qt/.cache/clangd/index/PortfolioCommandBar.cpp.D4AE1F5BBA7204C4.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioCommandBar.h.900A9AD1B110376A.idx b/fincept-qt/.cache/clangd/index/PortfolioCommandBar.h.900A9AD1B110376A.idx
index fc371f885..ca47e90b2 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioCommandBar.h.900A9AD1B110376A.idx and b/fincept-qt/.cache/clangd/index/PortfolioCommandBar.h.900A9AD1B110376A.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioDetailWrapper.cpp.58DB0F5963CB7269.idx b/fincept-qt/.cache/clangd/index/PortfolioDetailWrapper.cpp.58DB0F5963CB7269.idx
index 4d17389f2..a3d902911 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioDetailWrapper.cpp.58DB0F5963CB7269.idx and b/fincept-qt/.cache/clangd/index/PortfolioDetailWrapper.cpp.58DB0F5963CB7269.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioDetailWrapper.h.F72C04DB6F15381D.idx b/fincept-qt/.cache/clangd/index/PortfolioDetailWrapper.h.F72C04DB6F15381D.idx
index 03f68f411..c1b540139 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioDetailWrapper.h.F72C04DB6F15381D.idx and b/fincept-qt/.cache/clangd/index/PortfolioDetailWrapper.h.F72C04DB6F15381D.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioDialogs.cpp.959F567BA49874EA.idx b/fincept-qt/.cache/clangd/index/PortfolioDialogs.cpp.959F567BA49874EA.idx
index 4378fa1d8..206ad09bf 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioDialogs.cpp.959F567BA49874EA.idx and b/fincept-qt/.cache/clangd/index/PortfolioDialogs.cpp.959F567BA49874EA.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioDialogs.h.BB6340285294DE9E.idx b/fincept-qt/.cache/clangd/index/PortfolioDialogs.h.BB6340285294DE9E.idx
index 10770b4ec..27054b718 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioDialogs.h.BB6340285294DE9E.idx and b/fincept-qt/.cache/clangd/index/PortfolioDialogs.h.BB6340285294DE9E.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioFFNView.cpp.C7416A581F9D264E.idx b/fincept-qt/.cache/clangd/index/PortfolioFFNView.cpp.C7416A581F9D264E.idx
index 2407d1236..cfdbc5bad 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioFFNView.cpp.C7416A581F9D264E.idx and b/fincept-qt/.cache/clangd/index/PortfolioFFNView.cpp.C7416A581F9D264E.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioHeatmap.cpp.E91077A3D275DB52.idx b/fincept-qt/.cache/clangd/index/PortfolioHeatmap.cpp.E91077A3D275DB52.idx
index 198ce4e4e..b716d7fba 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioHeatmap.cpp.E91077A3D275DB52.idx and b/fincept-qt/.cache/clangd/index/PortfolioHeatmap.cpp.E91077A3D275DB52.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioOptimizationView.cpp.2EAAE5DA8ABA7C37.idx b/fincept-qt/.cache/clangd/index/PortfolioOptimizationView.cpp.2EAAE5DA8ABA7C37.idx
index fab25cf0e..db54bbcc5 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioOptimizationView.cpp.2EAAE5DA8ABA7C37.idx and b/fincept-qt/.cache/clangd/index/PortfolioOptimizationView.cpp.2EAAE5DA8ABA7C37.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioPerfChart.cpp.28553E5E136F9993.idx b/fincept-qt/.cache/clangd/index/PortfolioPerfChart.cpp.28553E5E136F9993.idx
index f3de4b1c8..173e405f0 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioPerfChart.cpp.28553E5E136F9993.idx and b/fincept-qt/.cache/clangd/index/PortfolioPerfChart.cpp.28553E5E136F9993.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioPerfChart.h.47CBD8B31F93AB19.idx b/fincept-qt/.cache/clangd/index/PortfolioPerfChart.h.47CBD8B31F93AB19.idx
index 37f7a89eb..e1a572704 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioPerfChart.h.47CBD8B31F93AB19.idx and b/fincept-qt/.cache/clangd/index/PortfolioPerfChart.h.47CBD8B31F93AB19.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioScreen.cpp.B88C75945610D9A6.idx b/fincept-qt/.cache/clangd/index/PortfolioScreen.cpp.B88C75945610D9A6.idx
index 8c2ee5624..b8878e672 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioScreen.cpp.B88C75945610D9A6.idx and b/fincept-qt/.cache/clangd/index/PortfolioScreen.cpp.B88C75945610D9A6.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioScreen.h.C896FF67018E0DB2.idx b/fincept-qt/.cache/clangd/index/PortfolioScreen.h.C896FF67018E0DB2.idx
index f57e52016..cc47d2f9f 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioScreen.h.C896FF67018E0DB2.idx and b/fincept-qt/.cache/clangd/index/PortfolioScreen.h.C896FF67018E0DB2.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioSectorPanel.cpp.C570B3A70CEC18AD.idx b/fincept-qt/.cache/clangd/index/PortfolioSectorPanel.cpp.C570B3A70CEC18AD.idx
index d2f0188ad..d46812ad0 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioSectorPanel.cpp.C570B3A70CEC18AD.idx and b/fincept-qt/.cache/clangd/index/PortfolioSectorPanel.cpp.C570B3A70CEC18AD.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioSectorPanel.h.B4FC6E8C9DA14A4B.idx b/fincept-qt/.cache/clangd/index/PortfolioSectorPanel.h.B4FC6E8C9DA14A4B.idx
index e8d955be8..7686cefdb 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioSectorPanel.h.B4FC6E8C9DA14A4B.idx and b/fincept-qt/.cache/clangd/index/PortfolioSectorPanel.h.B4FC6E8C9DA14A4B.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioService.h.14A0C03F2C9C0F01.idx b/fincept-qt/.cache/clangd/index/PortfolioService.h.14A0C03F2C9C0F01.idx
index b6a072507..113e59a5b 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioService.h.14A0C03F2C9C0F01.idx and b/fincept-qt/.cache/clangd/index/PortfolioService.h.14A0C03F2C9C0F01.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioStatsRibbon.cpp.503B306DABA9EE77.idx b/fincept-qt/.cache/clangd/index/PortfolioStatsRibbon.cpp.503B306DABA9EE77.idx
index e8b9cc32c..82ea7ee8a 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioStatsRibbon.cpp.503B306DABA9EE77.idx and b/fincept-qt/.cache/clangd/index/PortfolioStatsRibbon.cpp.503B306DABA9EE77.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioStatsRibbon.h.5653F12F8548F218.idx b/fincept-qt/.cache/clangd/index/PortfolioStatsRibbon.h.5653F12F8548F218.idx
index d8c2b6aa7..95f3d3292 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioStatsRibbon.h.5653F12F8548F218.idx and b/fincept-qt/.cache/clangd/index/PortfolioStatsRibbon.h.5653F12F8548F218.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioSummaryWidget.cpp.D7B17A1755066CC0.idx b/fincept-qt/.cache/clangd/index/PortfolioSummaryWidget.cpp.D7B17A1755066CC0.idx
index f8044331c..e77c86424 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioSummaryWidget.cpp.D7B17A1755066CC0.idx and b/fincept-qt/.cache/clangd/index/PortfolioSummaryWidget.cpp.D7B17A1755066CC0.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioTxnPanel.h.0EBEF201B41D9B94.idx b/fincept-qt/.cache/clangd/index/PortfolioTxnPanel.h.0EBEF201B41D9B94.idx
new file mode 100644
index 000000000..6160f198f
Binary files /dev/null and b/fincept-qt/.cache/clangd/index/PortfolioTxnPanel.h.0EBEF201B41D9B94.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioTypes.h.932959F0EA1E4787.idx b/fincept-qt/.cache/clangd/index/PortfolioTypes.h.932959F0EA1E4787.idx
index d9052aed6..71cef37a2 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioTypes.h.932959F0EA1E4787.idx and b/fincept-qt/.cache/clangd/index/PortfolioTypes.h.932959F0EA1E4787.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PricingScreen.cpp.22254975EF567042.idx b/fincept-qt/.cache/clangd/index/PricingScreen.cpp.22254975EF567042.idx
index d08233f01..1d736b578 100644
Binary files a/fincept-qt/.cache/clangd/index/PricingScreen.cpp.22254975EF567042.idx and b/fincept-qt/.cache/clangd/index/PricingScreen.cpp.22254975EF567042.idx differ
diff --git a/fincept-qt/.cache/clangd/index/ProfileScreen.cpp.988FD260ED70E22E.idx b/fincept-qt/.cache/clangd/index/ProfileScreen.cpp.988FD260ED70E22E.idx
index 2e1502942..d2529a430 100644
Binary files a/fincept-qt/.cache/clangd/index/ProfileScreen.cpp.988FD260ED70E22E.idx and b/fincept-qt/.cache/clangd/index/ProfileScreen.cpp.988FD260ED70E22E.idx differ
diff --git a/fincept-qt/.cache/clangd/index/ProfileTools.cpp.1D575B5EFDDFCDEF.idx b/fincept-qt/.cache/clangd/index/ProfileTools.cpp.1D575B5EFDDFCDEF.idx
index 79d19535d..0dccd13ce 100644
Binary files a/fincept-qt/.cache/clangd/index/ProfileTools.cpp.1D575B5EFDDFCDEF.idx and b/fincept-qt/.cache/clangd/index/ProfileTools.cpp.1D575B5EFDDFCDEF.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PythonSetupManager.h.A79B063F138C15AC.idx b/fincept-qt/.cache/clangd/index/PythonSetupManager.h.A79B063F138C15AC.idx
index 7ad7f3e68..52a4f3f10 100644
Binary files a/fincept-qt/.cache/clangd/index/PythonSetupManager.h.A79B063F138C15AC.idx and b/fincept-qt/.cache/clangd/index/PythonSetupManager.h.A79B063F138C15AC.idx differ
diff --git a/fincept-qt/.cache/clangd/index/QuantModulePanel.cpp.0891EA41229B251A.idx b/fincept-qt/.cache/clangd/index/QuantModulePanel.cpp.0891EA41229B251A.idx
index ac60d3a27..824d6e5c9 100644
Binary files a/fincept-qt/.cache/clangd/index/QuantModulePanel.cpp.0891EA41229B251A.idx and b/fincept-qt/.cache/clangd/index/QuantModulePanel.cpp.0891EA41229B251A.idx differ
diff --git a/fincept-qt/.cache/clangd/index/QuantStatsView.cpp.671BC44E4BAA76E8.idx b/fincept-qt/.cache/clangd/index/QuantStatsView.cpp.671BC44E4BAA76E8.idx
index a1bfb4325..13194fcab 100644
Binary files a/fincept-qt/.cache/clangd/index/QuantStatsView.cpp.671BC44E4BAA76E8.idx and b/fincept-qt/.cache/clangd/index/QuantStatsView.cpp.671BC44E4BAA76E8.idx differ
diff --git a/fincept-qt/.cache/clangd/index/QuickTradeWidget.cpp.7353B29FDA6B21BD.idx b/fincept-qt/.cache/clangd/index/QuickTradeWidget.cpp.7353B29FDA6B21BD.idx
index a4fb618a5..9e4366cf2 100644
Binary files a/fincept-qt/.cache/clangd/index/QuickTradeWidget.cpp.7353B29FDA6B21BD.idx and b/fincept-qt/.cache/clangd/index/QuickTradeWidget.cpp.7353B29FDA6B21BD.idx differ
diff --git a/fincept-qt/.cache/clangd/index/RegisterScreen.cpp.9BFD56187594DA62.idx b/fincept-qt/.cache/clangd/index/RegisterScreen.cpp.9BFD56187594DA62.idx
index e79ec8025..c35426a70 100644
Binary files a/fincept-qt/.cache/clangd/index/RegisterScreen.cpp.9BFD56187594DA62.idx and b/fincept-qt/.cache/clangd/index/RegisterScreen.cpp.9BFD56187594DA62.idx differ
diff --git a/fincept-qt/.cache/clangd/index/RelationalDatabases.cpp.170D8200AB2EE832.idx b/fincept-qt/.cache/clangd/index/RelationalDatabases.cpp.170D8200AB2EE832.idx
index 4c1f0b4da..1616f8978 100644
Binary files a/fincept-qt/.cache/clangd/index/RelationalDatabases.cpp.170D8200AB2EE832.idx and b/fincept-qt/.cache/clangd/index/RelationalDatabases.cpp.170D8200AB2EE832.idx differ
diff --git a/fincept-qt/.cache/clangd/index/ReportBuilderScreen.cpp.32A35A1EBC591518.idx b/fincept-qt/.cache/clangd/index/ReportBuilderScreen.cpp.32A35A1EBC591518.idx
index 1044d0f82..3d63df6ac 100644
Binary files a/fincept-qt/.cache/clangd/index/ReportBuilderScreen.cpp.32A35A1EBC591518.idx and b/fincept-qt/.cache/clangd/index/ReportBuilderScreen.cpp.32A35A1EBC591518.idx differ
diff --git a/fincept-qt/.cache/clangd/index/RiskManagementView.cpp.E5C6E2883969ED09.idx b/fincept-qt/.cache/clangd/index/RiskManagementView.cpp.E5C6E2883969ED09.idx
index cabeebb44..2b1fc92d2 100644
Binary files a/fincept-qt/.cache/clangd/index/RiskManagementView.cpp.E5C6E2883969ED09.idx and b/fincept-qt/.cache/clangd/index/RiskManagementView.cpp.E5C6E2883969ED09.idx differ
diff --git a/fincept-qt/.cache/clangd/index/RiskManagementView.h.46E465C8B90385EC.idx b/fincept-qt/.cache/clangd/index/RiskManagementView.h.46E465C8B90385EC.idx
index 12880f29f..0dee07c1a 100644
Binary files a/fincept-qt/.cache/clangd/index/RiskManagementView.h.46E465C8B90385EC.idx and b/fincept-qt/.cache/clangd/index/RiskManagementView.h.46E465C8B90385EC.idx differ
diff --git a/fincept-qt/.cache/clangd/index/RiskMetricsWidget.cpp.C43A9558B0D1DFA4.idx b/fincept-qt/.cache/clangd/index/RiskMetricsWidget.cpp.C43A9558B0D1DFA4.idx
index 13f962757..c8fb48b0d 100644
Binary files a/fincept-qt/.cache/clangd/index/RiskMetricsWidget.cpp.C43A9558B0D1DFA4.idx and b/fincept-qt/.cache/clangd/index/RiskMetricsWidget.cpp.C43A9558B0D1DFA4.idx differ
diff --git a/fincept-qt/.cache/clangd/index/ScreenerWidget.cpp.35356117B6EDA769.idx b/fincept-qt/.cache/clangd/index/ScreenerWidget.cpp.35356117B6EDA769.idx
index b86dfe10d..16a49e896 100644
Binary files a/fincept-qt/.cache/clangd/index/ScreenerWidget.cpp.35356117B6EDA769.idx and b/fincept-qt/.cache/clangd/index/ScreenerWidget.cpp.35356117B6EDA769.idx differ
diff --git a/fincept-qt/.cache/clangd/index/SettingsScreen.cpp.7BAB1A055328023F.idx b/fincept-qt/.cache/clangd/index/SettingsScreen.cpp.7BAB1A055328023F.idx
index bce80f025..e9d15ef5f 100644
Binary files a/fincept-qt/.cache/clangd/index/SettingsScreen.cpp.7BAB1A055328023F.idx and b/fincept-qt/.cache/clangd/index/SettingsScreen.cpp.7BAB1A055328023F.idx differ
diff --git a/fincept-qt/.cache/clangd/index/SettingsScreen.h.3B17EB0C2433BD0C.idx b/fincept-qt/.cache/clangd/index/SettingsScreen.h.3B17EB0C2433BD0C.idx
index d4e1cbaab..8e6e519c4 100644
Binary files a/fincept-qt/.cache/clangd/index/SettingsScreen.h.3B17EB0C2433BD0C.idx and b/fincept-qt/.cache/clangd/index/SettingsScreen.h.3B17EB0C2433BD0C.idx differ
diff --git a/fincept-qt/.cache/clangd/index/SetupScreen.cpp.8E4FD88F960542CA.idx b/fincept-qt/.cache/clangd/index/SetupScreen.cpp.8E4FD88F960542CA.idx
index 61bfb6dbc..272cc0e49 100644
Binary files a/fincept-qt/.cache/clangd/index/SetupScreen.cpp.8E4FD88F960542CA.idx and b/fincept-qt/.cache/clangd/index/SetupScreen.cpp.8E4FD88F960542CA.idx differ
diff --git a/fincept-qt/.cache/clangd/index/SetupScreen.h.9A2F3BED31DA2160.idx b/fincept-qt/.cache/clangd/index/SetupScreen.h.9A2F3BED31DA2160.idx
index 5677b7979..1bf6b32fb 100644
Binary files a/fincept-qt/.cache/clangd/index/SetupScreen.h.9A2F3BED31DA2160.idx and b/fincept-qt/.cache/clangd/index/SetupScreen.h.9A2F3BED31DA2160.idx differ
diff --git a/fincept-qt/.cache/clangd/index/StockQuoteWidget.cpp.6031351105EC0AB5.idx b/fincept-qt/.cache/clangd/index/StockQuoteWidget.cpp.6031351105EC0AB5.idx
index 7794fe480..fa628457b 100644
Binary files a/fincept-qt/.cache/clangd/index/StockQuoteWidget.cpp.6031351105EC0AB5.idx and b/fincept-qt/.cache/clangd/index/StockQuoteWidget.cpp.6031351105EC0AB5.idx differ
diff --git a/fincept-qt/.cache/clangd/index/SupportScreen.cpp.A01E3EA772E744DA.idx b/fincept-qt/.cache/clangd/index/SupportScreen.cpp.A01E3EA772E744DA.idx
index 248375c48..ecab8ebe1 100644
Binary files a/fincept-qt/.cache/clangd/index/SupportScreen.cpp.A01E3EA772E744DA.idx and b/fincept-qt/.cache/clangd/index/SupportScreen.cpp.A01E3EA772E744DA.idx differ
diff --git a/fincept-qt/.cache/clangd/index/SystemTools.cpp.0B9F75E6CACCD606.idx b/fincept-qt/.cache/clangd/index/SystemTools.cpp.0B9F75E6CACCD606.idx
index c38111acf..067b6f629 100644
Binary files a/fincept-qt/.cache/clangd/index/SystemTools.cpp.0B9F75E6CACCD606.idx and b/fincept-qt/.cache/clangd/index/SystemTools.cpp.0B9F75E6CACCD606.idx differ
diff --git a/fincept-qt/.cache/clangd/index/Theme.h.0B29DC6CE88619A3.idx b/fincept-qt/.cache/clangd/index/Theme.h.0B29DC6CE88619A3.idx
index e49132963..5df8d5737 100644
Binary files a/fincept-qt/.cache/clangd/index/Theme.h.0B29DC6CE88619A3.idx and b/fincept-qt/.cache/clangd/index/Theme.h.0B29DC6CE88619A3.idx differ
diff --git a/fincept-qt/.cache/clangd/index/ThemeManager.h.B69362045C2CF455.idx b/fincept-qt/.cache/clangd/index/ThemeManager.h.B69362045C2CF455.idx
index 8c22efa57..130c47145 100644
Binary files a/fincept-qt/.cache/clangd/index/ThemeManager.h.B69362045C2CF455.idx and b/fincept-qt/.cache/clangd/index/ThemeManager.h.B69362045C2CF455.idx differ
diff --git a/fincept-qt/.cache/clangd/index/TickerBar.cpp.082051C6BD3B08EB.idx b/fincept-qt/.cache/clangd/index/TickerBar.cpp.082051C6BD3B08EB.idx
index 708bf8443..297b50824 100644
Binary files a/fincept-qt/.cache/clangd/index/TickerBar.cpp.082051C6BD3B08EB.idx and b/fincept-qt/.cache/clangd/index/TickerBar.cpp.082051C6BD3B08EB.idx differ
diff --git a/fincept-qt/.cache/clangd/index/ToolsViewPanel.cpp.82FAB6D2B88AE63B.idx b/fincept-qt/.cache/clangd/index/ToolsViewPanel.cpp.82FAB6D2B88AE63B.idx
index 639bcd2f0..9ce00f01c 100644
Binary files a/fincept-qt/.cache/clangd/index/ToolsViewPanel.cpp.82FAB6D2B88AE63B.idx and b/fincept-qt/.cache/clangd/index/ToolsViewPanel.cpp.82FAB6D2B88AE63B.idx differ
diff --git a/fincept-qt/.cache/clangd/index/TopMoversWidget.cpp.05E71C7095736608.idx b/fincept-qt/.cache/clangd/index/TopMoversWidget.cpp.05E71C7095736608.idx
index 98572a2af..83cd09816 100644
Binary files a/fincept-qt/.cache/clangd/index/TopMoversWidget.cpp.05E71C7095736608.idx and b/fincept-qt/.cache/clangd/index/TopMoversWidget.cpp.05E71C7095736608.idx differ
diff --git a/fincept-qt/.cache/clangd/index/UserApi.h.D7503A3F6272FB26.idx b/fincept-qt/.cache/clangd/index/UserApi.h.D7503A3F6272FB26.idx
index 9b9442ddb..c4fcad360 100644
Binary files a/fincept-qt/.cache/clangd/index/UserApi.h.D7503A3F6272FB26.idx and b/fincept-qt/.cache/clangd/index/UserApi.h.D7503A3F6272FB26.idx differ
diff --git a/fincept-qt/.cache/clangd/index/VideoPlayerWidget.cpp.1DB4073011120746.idx b/fincept-qt/.cache/clangd/index/VideoPlayerWidget.cpp.1DB4073011120746.idx
index 445be486c..ab96473ee 100644
Binary files a/fincept-qt/.cache/clangd/index/VideoPlayerWidget.cpp.1DB4073011120746.idx and b/fincept-qt/.cache/clangd/index/VideoPlayerWidget.cpp.1DB4073011120746.idx differ
diff --git a/fincept-qt/.cache/clangd/index/WorkflowsViewPanel.cpp.F366349F6A518579.idx b/fincept-qt/.cache/clangd/index/WorkflowsViewPanel.cpp.F366349F6A518579.idx
index 152065ae4..6e5877aac 100644
Binary files a/fincept-qt/.cache/clangd/index/WorkflowsViewPanel.cpp.F366349F6A518579.idx and b/fincept-qt/.cache/clangd/index/WorkflowsViewPanel.cpp.F366349F6A518579.idx differ
diff --git a/fincept-qt/.cache/clangd/index/WorkspaceManager.h.17C3F9AC0E41185C.idx b/fincept-qt/.cache/clangd/index/WorkspaceManager.h.17C3F9AC0E41185C.idx
new file mode 100644
index 000000000..0b9eba46c
Binary files /dev/null and b/fincept-qt/.cache/clangd/index/WorkspaceManager.h.17C3F9AC0E41185C.idx differ
diff --git a/fincept-qt/.cache/clangd/index/WorkspaceTypes.h.14E38EFE3A9FF5DD.idx b/fincept-qt/.cache/clangd/index/WorkspaceTypes.h.14E38EFE3A9FF5DD.idx
new file mode 100644
index 000000000..08b1690fd
Binary files /dev/null and b/fincept-qt/.cache/clangd/index/WorkspaceTypes.h.14E38EFE3A9FF5DD.idx differ
diff --git a/fincept-qt/CMakeLists.txt b/fincept-qt/CMakeLists.txt
index 9e071338c..a2f39e6c1 100644
--- a/fincept-qt/CMakeLists.txt
+++ b/fincept-qt/CMakeLists.txt
@@ -14,21 +14,38 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# Unity build for infrastructure layers (safe — no local symbol conflicts)
# Screens are excluded below via SKIP_UNITY_BUILD_INCLUSION (too many local statics/functions)
set(CMAKE_UNITY_BUILD ON)
-set(CMAKE_UNITY_BUILD_BATCH_SIZE 32)
-
-# MSVC: /MP = multi-processor compilation (uses all cores within one project)
-# /Z7 = embed debug info in .obj files instead of shared PDB → eliminates PDB
-# write contention that serialises /MP builds (major speedup)
-# /Oi = enable intrinsics (faster codegen, no extra passes)
+# Batch size 14: sweet spot for MSVC — keeps each unity TU under ~30s to compile.
+# 32 was too large: one TU change forced a 32-file recompile; 14 limits blast radius.
+set(CMAKE_UNITY_BUILD_BATCH_SIZE 14)
+
+# FetchContent: after first successful download, never hit the network again.
+# Cuts configure time by 5-15s on incremental configures (no git fetch for 5 deps).
+set(FETCHCONTENT_UPDATES_DISCONNECTED ON CACHE BOOL "" FORCE)
+
+# MSVC compiler flags for maximum build throughput:
+# /MP — multi-processor compilation (uses all logical cores within one project)
+# /Z7 — embed debug info in .obj instead of shared PDB → no PDB write contention
+# that serialises /MP builds (major speedup on 16+ core machines)
+# /Oi — enable intrinsics (faster codegen, no extra passes)
+# /bigobj — allow >65535 sections (needed by large unity TUs and MOC output)
+# /d2FuncCache7 — MSVC internal: increase function-level cache for template-heavy code
if(MSVC)
add_compile_options(/MP /Z7 /Oi /bigobj)
- # Replace /Zi (shared PDB) with /Z7 in all configs to avoid race conditions
+ # Replace /Zi and /ZI (shared PDB) with /Z7 in all configs
foreach(flag_var
CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELWITHDEBINFO
CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL)
string(REPLACE "/Zi" "/Z7" ${flag_var} "${${flag_var}}")
string(REPLACE "/ZI" "/Z7" ${flag_var} "${${flag_var}}")
endforeach()
+ # Release: enable whole-program optimisation + link-time code generation.
+ # /GL compiles to IL; /LTCG merges at link time for cross-TU inlining & DCE.
+ # Only for Release — Debug/RelWithDebInfo stay fast for iteration.
+ if(CMAKE_BUILD_TYPE STREQUAL "Release" OR
+ (DEFINED CMAKE_CONFIGURATION_TYPES AND "Release" IN_LIST CMAKE_CONFIGURATION_TYPES))
+ add_compile_options($<$<CONFIG:Release>:/GL>)
+ add_link_options($<$<CONFIG:Release>:/LTCG:incremental>)
+ endif()
endif()
# Suppress Windows min/max macros that break std::min/std::max in unity batches
@@ -123,6 +140,8 @@ FetchContent_Declare(
GIT_REPOSITORY https://github.com/ggml-org/whisper.cpp.git
GIT_TAG v1.7.4
GIT_SHALLOW TRUE
+ # After first fetch, never touch the network again — saves 3-8s per configure
+ UPDATE_DISCONNECTED TRUE
)
FetchContent_MakeAvailable(whisper)
# whisper.cpp uses C-style casts internally — suppress warnings for third-party code
@@ -175,6 +194,7 @@ set_target_properties(qgeoview PROPERTIES UNITY_BUILD OFF)
# Core
set(CORE_SOURCES
src/core/config/AppConfig.cpp
+ src/core/config/AppPaths.cpp
src/core/logging/Logger.cpp
src/core/events/EventBus.cpp
src/core/session/SessionManager.cpp
@@ -225,6 +245,7 @@ set(STORAGE_SOURCES
src/storage/repositories/ReportRepository.cpp
src/storage/repositories/PaperTradingRepository.cpp
src/storage/repositories/NewsMonitorRepository.cpp
+ src/storage/repositories/NewsArticleRepository.cpp
src/storage/repositories/PortfolioHoldingsRepository.cpp
src/storage/repositories/ChatRepository.cpp
src/storage/repositories/LlmConfigRepository.cpp
@@ -252,6 +273,9 @@ set(STORAGE_SOURCES
# Data normalization — mapping persistence and normalized data storage
src/storage/sqlite/migrations/v012_data_normalization.cpp
+
+ # News articles — dedicated news article storage
+ src/storage/sqlite/migrations/v013_news_articles.cpp
)
# Python runner
@@ -362,6 +386,10 @@ set(SERVICE_SOURCES
src/services/workflow/WorkflowService.cpp
src/services/workflow/WorkflowExecutor.cpp
src/services/workflow/ExpressionEngine.cpp
+
+ src/services/workspace/WorkspaceSerializer.cpp
+ src/services/workspace/WorkspaceManager.cpp
+ src/services/workspace/WorkspaceTemplates.cpp
src/services/workflow/nodes/TriggerNodes.cpp
src/services/workflow/nodes/ControlFlowNodes.cpp
src/services/workflow/nodes/UtilityNodes.cpp
@@ -389,6 +417,24 @@ set(SERVICE_SOURCES
# Whisper STT service (cross-platform offline speech recognition)
src/services/stt/WhisperService.cpp
+
+ # Modular notification system — service + 15 providers
+ src/services/notifications/NotificationService.cpp
+ src/services/notifications/providers/TelegramProvider.cpp
+ src/services/notifications/providers/DiscordProvider.cpp
+ src/services/notifications/providers/SlackProvider.cpp
+ src/services/notifications/providers/EmailProvider.cpp
+ src/services/notifications/providers/WhatsAppProvider.cpp
+ src/services/notifications/providers/PushoverProvider.cpp
+ src/services/notifications/providers/NtfyProvider.cpp
+ src/services/notifications/providers/PushbulletProvider.cpp
+ src/services/notifications/providers/GotifyProvider.cpp
+ src/services/notifications/providers/MattermostProvider.cpp
+ src/services/notifications/providers/TeamsProvider.cpp
+ src/services/notifications/providers/WebhookProvider.cpp
+ src/services/notifications/providers/PagerDutyProvider.cpp
+ src/services/notifications/providers/OpsgenieProvider.cpp
+ src/services/notifications/providers/SMSProvider.cpp
)
# UI framework
@@ -411,6 +457,15 @@ set(UI_SOURCES
src/ui/navigation/StatusBar.cpp
src/ui/navigation/ToolBar.cpp
src/ui/navigation/CommandBar.cpp
+
+ src/ui/workspace/WorkspaceNewDialog.cpp
+ src/ui/workspace/WorkspaceOpenDialog.cpp
+ src/ui/workspace/WorkspaceSaveAsDialog.cpp
+
+ # In-app notification widgets
+ src/ui/widgets/NotifToast.cpp
+ src/ui/widgets/NotifBell.cpp
+ src/ui/widgets/NotifPanel.cpp
)
# Screens
@@ -428,6 +483,11 @@ set(SCREEN_SOURCES
src/screens/trade_viz/TradeVizScreen.cpp
src/screens/docs/DocsScreen.cpp
src/screens/ComingSoonScreen.cpp
+ src/screens/chat_mode/ChatModeService.cpp
+ src/screens/chat_mode/ChatSessionPanel.cpp
+ src/screens/chat_mode/ChatMessagePanel.cpp
+ src/screens/chat_mode/ChatAgentPanel.cpp
+ src/screens/chat_mode/ChatModeScreen.cpp
src/screens/setup/SetupScreen.cpp
src/screens/info/ContactScreen.cpp
src/screens/info/TermsScreen.cpp
@@ -941,6 +1001,7 @@ set_source_files_properties(
src/storage/repositories/LlmConfigRepository.cpp
src/storage/repositories/McpServerRepository.cpp
src/storage/repositories/NewsMonitorRepository.cpp
+ src/storage/repositories/NewsArticleRepository.cpp
src/storage/repositories/NotesRepository.cpp
src/storage/repositories/PaperTradingRepository.cpp
src/storage/repositories/PortfolioHoldingsRepository.cpp
@@ -964,6 +1025,7 @@ set_source_files_properties(
src/storage/sqlite/migrations/v010_llm_profiles.cpp
src/storage/sqlite/migrations/v011_custom_indices.cpp
src/storage/sqlite/migrations/v012_data_normalization.cpp
+ src/storage/sqlite/migrations/v013_news_articles.cpp
# Polymarket screen files — each defines static fmt_* helpers in same namespace
src/screens/polymarket/PolymarketScreen.cpp
src/screens/polymarket/PolymarketCommandBar.cpp
@@ -994,7 +1056,14 @@ set_source_files_properties(
src/trading/brokers/ibkr/IBKRBroker.cpp
src/trading/brokers/tradier/TradierBroker.cpp
src/trading/brokers/saxo/SaxoBankBroker.cpp
- # MCP core + tool files — each defines static constexpr TAG in same namespace
+ # WhisperService has a static local QStringList — exclude from unity to avoid ODR issues
+ src/services/stt/WhisperService.cpp
+ PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE
+)
+
+# MCP core + tools: each defines TAG or kTimeoutMs in shared namespaces —
+# must stay excluded from unity (batch size 1 = each file its own TU)
+set_source_files_properties(
src/mcp/McpProvider.cpp
src/mcp/McpService.cpp
src/mcp/McpClient.cpp
@@ -1019,11 +1088,57 @@ set_source_files_properties(
src/mcp/tools/SettingsTools.cpp
src/mcp/tools/PythonTools.cpp
src/mcp/tools/SystemTools.cpp
- # WhisperService has a static local QStringList — exclude from unity to avoid ODR issues
- src/services/stt/WhisperService.cpp
PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE
)
+# Trading brokers: each defines static now_ts() / TAG at file scope —
+# ODR collision if batched, must stay excluded from unity
+set_source_files_properties(
+ src/trading/brokers/zerodha/ZerodhaBroker.cpp
+ src/trading/brokers/angelone/AngelOneBroker.cpp
+ src/trading/brokers/fyers/FyersBroker.cpp
+ src/trading/brokers/upstox/UpstoxBroker.cpp
+ src/trading/brokers/dhan/DhanBroker.cpp
+ src/trading/brokers/kotak/KotakBroker.cpp
+ src/trading/brokers/groww/GrowwBroker.cpp
+ src/trading/brokers/aliceblue/AliceBlueBroker.cpp
+ src/trading/brokers/fivepaisa/FivePaisaBroker.cpp
+ src/trading/brokers/iifl/IIFLBroker.cpp
+ src/trading/brokers/motilal/MotilalBroker.cpp
+ src/trading/brokers/shoonya/ShoonyaBroker.cpp
+ src/trading/brokers/alpaca/AlpacaBroker.cpp
+ src/trading/brokers/ibkr/IBKRBroker.cpp
+ src/trading/brokers/tradier/TradierBroker.cpp
+ src/trading/brokers/saxo/SaxoBankBroker.cpp
+ src/trading/websocket/ZerodhaWebSocket.cpp
+ src/trading/websocket/AngelOneWebSocket.cpp
+ PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE
+)
+
+# Storage repositories: each defines kCols — safe to batch in groups of 3
+set_source_files_properties(
+ src/storage/repositories/AgentConfigRepository.cpp
+ src/storage/repositories/ChatRepository.cpp
+ src/storage/repositories/ContextRecordingRepository.cpp
+ src/storage/repositories/DashboardLayoutRepository.cpp
+ src/storage/repositories/DataSourceRepository.cpp
+ src/storage/repositories/LlmConfigRepository.cpp
+ src/storage/repositories/McpServerRepository.cpp
+ src/storage/repositories/NewsMonitorRepository.cpp
+ src/storage/repositories/NewsArticleRepository.cpp
+ src/storage/repositories/NotesRepository.cpp
+ src/storage/repositories/PaperTradingRepository.cpp
+ src/storage/repositories/PortfolioHoldingsRepository.cpp
+ src/storage/repositories/PortfolioRepository.cpp
+ src/storage/repositories/ReportRepository.cpp
+ src/storage/repositories/SettingsRepository.cpp
+ src/storage/repositories/WatchlistRepository.cpp
+ src/storage/repositories/WorkflowRepository.cpp
+ src/storage/repositories/CustomIndexRepository.cpp
+ src/storage/repositories/DataMappingRepository.cpp
+ PROPERTIES UNITY_BUILD_BATCH_SIZE 3
+)
+
# ── Executable ────────────────────────────────────────────────────────────────
# WIN32 — suppress console window on Windows
# MACOSX_BUNDLE — create a proper .app bundle on macOS
@@ -1211,6 +1326,15 @@ target_precompile_headers(FinceptTerminal PRIVATE
<QMouseEvent>
<QResizeEvent>
<QWheelEvent>
+ # ── Charts (Qt6::Charts — required dep) ──────────────────────────────────
+ <QChart>
+ <QChartView>
+ <QLineSeries>
+ <QBarSeries>
+ <QBarSet>
+ <QValueAxis>
+ <QDateTimeAxis>
+ <QBarCategoryAxis>
# ── Multimedia (always available — required dep) ───────────────────────────
<QAudioFormat>
<QMediaDevices>
diff --git a/fincept-qt/src/ai_chat/LlmService.cpp b/fincept-qt/src/ai_chat/LlmService.cpp
index ad5df2e22..4603b97ad 100644
--- a/fincept-qt/src/ai_chat/LlmService.cpp
+++ b/fincept-qt/src/ai_chat/LlmService.cpp
@@ -399,6 +399,9 @@ QJsonObject LlmService::build_fincept_request(const QString& user_message,
req["prompt"] = prompt;
req["temperature"] = temperature_;
req["max_tokens"] = max_tokens_;
+ // Pass selected model if it's a real server model name (not the legacy placeholder)
+ if (!model_.isEmpty() && model_ != "fincept-llm")
+ req["model"] = model_;
if (with_tools) {
QJsonArray all_tools = mcp::McpService::instance().format_tools_for_openai();
@@ -762,7 +765,7 @@ LlmResponse LlmService::do_request(const QString& user_message, const std::vecto
}
} else {
for (const QString& k : {"response", "content", "answer", "text", "result"}) {
- if (data.contains(k)) {
+ if (data.contains(k) && !data[k].toString().isEmpty()) {
resp.content = data[k].toString();
break;
}
@@ -774,6 +777,12 @@ LlmResponse LlmService::do_request(const QString& user_message, const std::vecto
else if (ai.isString())
resp.content = ai.toString();
}
+ // API returned success=true but empty response text — treat as soft error
+ if (resp.content.isEmpty()) {
+ resp.error = "Fincept LLM returned an empty response. Please try again.";
+ LOG_WARN(TAG, "Fincept API returned empty response field despite success=true");
+ return resp;
+ }
}
} else {
@@ -1501,6 +1510,8 @@ QString LlmService::get_models_url(const QString& provider, const QString& api_k
base.chop(1);
return base + "/api/tags";
}
+ if (p == "fincept")
+ return "https://api.fincept.in/research/llm/models";
// minimax: no public /v1/models endpoint — fallback models used instead
return {};
}
@@ -1517,8 +1528,18 @@ QMap<QString, QString> LlmService::get_models_headers(const QString& provider, c
// Key is in URL query param
if (!api_key.isEmpty())
h["x-goog-api-key"] = api_key;
- } else if (p == "ollama" || p == "fincept") {
+ } else if (p == "ollama") {
// No auth needed
+ } else if (p == "fincept") {
+ // Resolve API key from session (same logic as ensure_config)
+ QString resolved_key = api_key;
+ if (resolved_key.isEmpty()) {
+ auto stored = SettingsRepository::instance().get("fincept_api_key");
+ if (stored.is_ok() && !stored.value().isEmpty())
+ resolved_key = stored.value();
+ }
+ if (!resolved_key.isEmpty())
+ h["X-API-Key"] = resolved_key;
} else {
// OpenAI-compatible: OpenAI, Groq, DeepSeek, OpenRouter
if (!api_key.isEmpty())
@@ -1567,6 +1588,23 @@ QStringList LlmService::parse_models_response(const QString& provider, const QBy
if (!name.isEmpty())
models.append(name);
}
+ } else if (p == "fincept") {
+ // {"success":true,"data":{"models":["MiniMax-M2.7",...]}}
+ // or {"success":true,"data":["model1","model2",...]}
+ QJsonValue data_val = root["data"];
+ QJsonArray arr;
+ if (data_val.isObject())
+ arr = data_val.toObject()["models"].toArray();
+ else if (data_val.isArray())
+ arr = data_val.toArray();
+ for (const auto& v : arr) {
+ QString id = v.isString() ? v.toString() : v.toObject()["id"].toString();
+ if (!id.isEmpty())
+ models.append(id);
+ }
+ // If API doesn't expose a models endpoint yet, fall back to known models
+ if (models.isEmpty())
+ models = {"MiniMax-M2.7", "MiniMax-M2.7-highspeed", "MiniMax-M2.5"};
} else {
// OpenAI-compatible: OpenAI, Anthropic, Groq, DeepSeek, OpenRouter
// {"data": [{"id": "model-id", ...}]}
@@ -1583,6 +1621,12 @@ QStringList LlmService::parse_models_response(const QString& provider, const QBy
}
void LlmService::fetch_models(const QString& provider, const QString& api_key, const QString& base_url) {
+ // Fincept has no public /models listing endpoint — return known models immediately.
+ if (provider.toLower() == "fincept") {
+ emit models_fetched(provider, {"MiniMax-M2.7", "MiniMax-M2.7-highspeed", "MiniMax-M2.5", "MiniMax-M2.5-highspeed"}, {});
+ return;
+ }
+
QString url = get_models_url(provider, api_key, base_url);
if (url.isEmpty()) {
emit models_fetched(provider, {}, "Unknown provider: " + provider);
diff --git a/fincept-qt/src/app/MainWindow.cpp b/fincept-qt/src/app/MainWindow.cpp
index 6f01cfcbf..7d21e33b5 100644
--- a/fincept-qt/src/app/MainWindow.cpp
+++ b/fincept-qt/src/app/MainWindow.cpp
@@ -1,5 +1,6 @@
#include "app/MainWindow.h"
+#include "screens/chat_mode/ChatModeScreen.h"
#include "services/updater/UpdateService.h"
#include "ai_chat/AiChatBubble.h"
#include "ai_chat/AiChatScreen.h"
@@ -9,6 +10,10 @@
#include "core/session/SessionManager.h"
#include "storage/repositories/SettingsRepository.h"
#include "screens/ComingSoonScreen.h"
+#include "services/workspace/WorkspaceManager.h"
+#include "ui/workspace/WorkspaceNewDialog.h"
+#include "ui/workspace/WorkspaceOpenDialog.h"
+#include "ui/workspace/WorkspaceSaveAsDialog.h"
#include "screens/about/AboutScreen.h"
#include "screens/agent_config/AgentConfigScreen.h"
#include "screens/ai_quant_lab/AIQuantLabScreen.h"
@@ -121,7 +126,8 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent) {
master_stack->addWidget(auth_stack_);
// ── App shell ────────────────────────────────────────────────────────────
- auto* app_container = new QWidget;
+ app_container_ = new QWidget;
+ auto* app_container = app_container_;
auto* vl = new QVBoxLayout(app_container);
vl->setContentsMargins(0, 0, 0, 0);
vl->setSpacing(0);
@@ -145,6 +151,13 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent) {
status_bar_widget_ = status_bar;
master_stack->addWidget(app_container);
+
+ // ── Chat Mode ─────────────────────────────────────────────────────────────
+ chat_mode_screen_ = new chat_mode::ChatModeScreen;
+ master_stack->addWidget(chat_mode_screen_); // index 2
+ connect(chat_mode_screen_, &chat_mode::ChatModeScreen::exit_requested,
+ this, &MainWindow::toggle_chat_mode);
+
setCentralWidget(master_stack);
statusBar()->hide();
@@ -152,6 +165,20 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent) {
router_ = new ScreenRouter(app_stack_, this);
setup_app_screens();
+ // WorkspaceManager — wire router + main window
+ WorkspaceManager::instance().set_main_window(this);
+ WorkspaceManager::instance().set_router(router_);
+ connect(router_, &ScreenRouter::screen_changed,
+ &WorkspaceManager::instance(), &WorkspaceManager::on_screen_changed);
+ connect(&WorkspaceManager::instance(), &WorkspaceManager::workspace_loaded,
+ this, [this](const WorkspaceDef& ws) {
+ setWindowTitle(QString("Fincept Terminal — %1").arg(ws.metadata.name));
+ });
+ connect(&WorkspaceManager::instance(), &WorkspaceManager::workspace_error,
+ this, [this](const QString& msg) {
+ QMessageBox::warning(this, "Workspace Error", msg);
+ });
+
// AI Chat Bubble — floats over app_stack_ content area
chat_bubble_ = new AiChatBubble(app_stack_);
{
@@ -177,6 +204,9 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent) {
}
});
+ // Chat Mode toggle button in toolbar
+ connect(toolbar, &ui::ToolBar::chat_mode_toggled, this, &MainWindow::toggle_chat_mode);
+
// Toolbar Navigate menu → router
connect(toolbar, &ui::ToolBar::navigate_to, router_, &ScreenRouter::navigate);
@@ -190,6 +220,9 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent) {
});
// ── Keyboard shortcuts ────────────────────────────────────────────────────
+ auto* sc_chat = new QShortcut(QKeySequence(Qt::Key_F9), this);
+ connect(sc_chat, &QShortcut::activated, this, &MainWindow::toggle_chat_mode);
+
auto* sc_fullscreen = new QShortcut(QKeySequence(Qt::Key_F11), this);
connect(sc_fullscreen, &QShortcut::activated, this, [this]() {
if (isFullScreen())
@@ -256,6 +289,34 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent) {
} else if (action == "refresh") {
if (auto* w = app_stack_->currentWidget())
QMetaObject::invokeMethod(w, "refresh", Qt::QueuedConnection);
+ } else if (action == "new_workspace") {
+ auto* dlg = new WorkspaceNewDialog(this);
+ if (dlg->exec() == QDialog::Accepted)
+ WorkspaceManager::instance().new_workspace(
+ dlg->workspace_name(), dlg->workspace_description(), dlg->selected_template_id());
+ dlg->deleteLater();
+ } else if (action == "open_workspace") {
+ auto* dlg = new WorkspaceOpenDialog(this);
+ if (dlg->exec() == QDialog::Accepted && !dlg->selected_path().isEmpty())
+ WorkspaceManager::instance().open_workspace(dlg->selected_path());
+ dlg->deleteLater();
+ } else if (action == "save_workspace") {
+ WorkspaceManager::instance().save_workspace();
+ } else if (action == "save_workspace_as") {
+ auto* dlg = new WorkspaceSaveAsDialog(this);
+ if (dlg->exec() == QDialog::Accepted)
+ WorkspaceManager::instance().save_workspace_as(dlg->new_name(), dlg->chosen_path());
+ dlg->deleteLater();
+ } else if (action == "import_data") {
+ QString path = QFileDialog::getOpenFileName(
+ this, "Import Workspace", QDir::homePath(), "Fincept Workspace (*.fwsp)");
+ if (!path.isEmpty())
+ WorkspaceManager::instance().import_workspace(path);
+ } else if (action == "export_data") {
+ QString path = QFileDialog::getSaveFileName(
+ this, "Export Workspace", QDir::homePath(), "Fincept Workspace (*.fwsp)");
+ if (!path.isEmpty())
+ WorkspaceManager::instance().export_workspace(path);
} else if (action == "screenshot") {
QScreen* scr = this->screen();
if (!scr)
@@ -317,6 +378,32 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent) {
});
}
+void MainWindow::toggle_chat_mode() {
+ chat_mode_ = !chat_mode_;
+
+ if (chat_mode_) {
+ // Enter chat mode: hide terminal chrome, show chat screen (index 2)
+ if (tab_bar_widget_) tab_bar_widget_->setVisible(false);
+ if (status_bar_widget_) status_bar_widget_->setVisible(false);
+ if (chat_bubble_) chat_bubble_->setVisible(false);
+ stack_->setCurrentIndex(2);
+ LOG_INFO("MainWindow", "Entered Chat Mode");
+ } else {
+ // Exit chat mode: restore terminal
+ stack_->setCurrentIndex(1);
+ if (tab_bar_widget_) tab_bar_widget_->setVisible(true);
+ if (status_bar_widget_) status_bar_widget_->setVisible(true);
+ // Restore chat bubble based on setting
+ if (chat_bubble_) {
+ auto r = SettingsRepository::instance().get("appearance.show_chat_bubble");
+ const bool show = !r.is_ok() || r.value() != "false";
+ chat_bubble_->setVisible(show);
+ if (show) { chat_bubble_->reposition(); chat_bubble_->raise(); }
+ }
+ LOG_INFO("MainWindow", "Exited Chat Mode");
+ }
+}
+
void MainWindow::setup_auth_screens() {
auto* login = new screens::LoginScreen;
auto* reg = new screens::RegisterScreen;
@@ -461,7 +548,7 @@ void MainWindow::on_auth_state_changed() {
if (auth.session().has_paid_plan()) {
// Paid user → straight to dashboard
stack_->setCurrentIndex(1);
- router_->navigate("dashboard");
+ WorkspaceManager::instance().load_last_workspace();
// Trigger silent update check after login (delayed so UI settles first)
QTimer::singleShot(3000, this, []() {
services::UpdateService::instance().check_for_updates(true);
@@ -510,9 +597,8 @@ void MainWindow::show_info_help() {
auth_stack_->setCurrentIndex(4);
}
-void MainWindow::restore_session() {}
-
void MainWindow::closeEvent(QCloseEvent* event) {
+ WorkspaceManager::instance().save_workspace();
SessionManager::instance().save_geometry(saveGeometry(), saveState());
event->accept();
}
diff --git a/fincept-qt/src/app/MainWindow.h b/fincept-qt/src/app/MainWindow.h
index 452628000..f581fe0c0 100644
--- a/fincept-qt/src/app/MainWindow.h
+++ b/fincept-qt/src/app/MainWindow.h
@@ -7,6 +7,8 @@
#include <QStackedWidget>
#include <QTimer>
+namespace fincept::chat_mode { class ChatModeScreen; }
+
namespace fincept {
class MainWindow : public QMainWindow {
@@ -27,18 +29,23 @@ class MainWindow : public QMainWindow {
QStackedWidget* app_stack_ = nullptr;
// View state
- bool focus_mode_ = false;
+ bool focus_mode_ = false;
+ bool chat_mode_ = false;
bool always_on_top_ = false;
- QWidget* tab_bar_widget_ = nullptr; // kept to hide/show in focus mode
+ QWidget* tab_bar_widget_ = nullptr;
QWidget* status_bar_widget_ = nullptr;
- AiChatBubble* chat_bubble_ = nullptr;
+ AiChatBubble* chat_bubble_ = nullptr;
QTimer* user_refresh_timer_ = nullptr;
+ // Chat mode
+ chat_mode::ChatModeScreen* chat_mode_screen_ = nullptr;
+ QWidget* app_container_ = nullptr; // the normal terminal shell
+
void setup_auth_screens();
void setup_app_screens();
void setup_navigation();
- void restore_session();
void on_auth_state_changed();
+ void toggle_chat_mode();
// Info screens stack (Contact, Terms, Privacy, Trademarks, Help)
QStackedWidget* info_stack_ = nullptr;
diff --git a/fincept-qt/src/app/main.cpp b/fincept-qt/src/app/main.cpp
index a7a4760c4..d666f7e7a 100644
--- a/fincept-qt/src/app/main.cpp
+++ b/fincept-qt/src/app/main.cpp
@@ -2,12 +2,14 @@
#include "auth/AuthManager.h"
#include "auth/SessionGuard.h"
#include "core/config/AppConfig.h"
+#include "core/config/AppPaths.h"
#include "core/logging/Logger.h"
#include "core/session/SessionManager.h"
#include "mcp/McpInit.h"
#include "network/http/HttpClient.h"
#include "python/PythonSetupManager.h"
#include "screens/setup/SetupScreen.h"
+#include "storage/repositories/NewsArticleRepository.h"
#include "storage/repositories/SettingsRepository.h"
#include "storage/sqlite/CacheDatabase.h"
#include "storage/sqlite/Database.h"
@@ -30,40 +32,78 @@ int main(int argc, char* argv[]) {
app.setOrganizationName("Fincept");
app.setApplicationVersion("4.0.0");
- // Initialize logging
- QString log_dir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
- QDir().mkpath(log_dir);
+ // Create all application directories under %LOCALAPPDATA%\com.fincept.terminal\
+ fincept::AppPaths::ensure_all();
+
+ // ── One-time migration: move files from old scattered locations ──────────
+ // Old log location: %APPDATA%\Fincept\FinceptTerminal\fincept.log
+ // Old DB location: %APPDATA%\Fincept\FinceptTerminal\fincept.db / cache.db
+ {
+ const QString old_base = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
+ const auto migrate_file = [](const QString& old_path, const QString& new_path) {
+ if (QFile::exists(old_path) && !QFile::exists(new_path))
+ QFile::rename(old_path, new_path);
+ };
+ migrate_file(old_base + "/fincept.db", fincept::AppPaths::data() + "/fincept.db");
+ migrate_file(old_base + "/cache.db", fincept::AppPaths::data() + "/cache.db");
+ migrate_file(old_base + "/fincept.log", fincept::AppPaths::logs() + "/fincept.log");
+ migrate_file(old_base + "/fincept-files", fincept::AppPaths::files());
+ // Remove stale WAL/SHM from old location too
+ QFile::remove(old_base + "/fincept.db-wal");
+ QFile::remove(old_base + "/fincept.db-shm");
+ QFile::remove(old_base + "/cache.db-wal");
+ QFile::remove(old_base + "/cache.db-shm");
+ }
// Remove stale SQLite WAL/SHM lock files left by a previous crash.
// qsqlite.dll crashes on WAL recovery if the lock files are orphaned.
- for (const QString& db : {log_dir + "/fincept.db", log_dir + "/cache.db"}) {
- QFile::remove(db + "-wal");
- QFile::remove(db + "-shm");
- }
- // Also clean legacy DB location
+ QFile::remove(fincept::AppPaths::data() + "/fincept.db-wal");
+ QFile::remove(fincept::AppPaths::data() + "/fincept.db-shm");
+ QFile::remove(fincept::AppPaths::data() + "/cache.db-wal");
+ QFile::remove(fincept::AppPaths::data() + "/cache.db-shm");
+ // Also clean legacy v3 DB location
{
const QString local_dir = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
const QString legacy1 = local_dir.section('/', 0, -3) + "/FinceptTerminal/fincept_settings.db";
const QString legacy2 = QString(local_dir).replace("Fincept/FinceptTerminal", "FinceptTerminal")
+ "/fincept_settings.db";
- for (const QString& db : {legacy1, legacy2}) {
- QFile::remove(db + "-wal");
- QFile::remove(db + "-shm");
+ QFile::remove(legacy1 + "-wal");
+ QFile::remove(legacy1 + "-shm");
+ QFile::remove(legacy2 + "-wal");
+ QFile::remove(legacy2 + "-shm");
+ }
+
+ fincept::Logger::instance().set_file(fincept::AppPaths::logs() + "/fincept.log");
+ {
+ auto& log = fincept::Logger::instance();
+ auto& cfg = fincept::AppConfig::instance();
+
+ // Global level
+ const QString gl = cfg.get("log/global_level", "Info").toString();
+ const QHash<QString, fincept::LogLevel> lvl_map = {
+ {"Debug", fincept::LogLevel::Debug}, {"Info", fincept::LogLevel::Info},
+ {"Warn", fincept::LogLevel::Warn}, {"Error", fincept::LogLevel::Error}
+ };
+ log.set_level(lvl_map.value(gl, fincept::LogLevel::Info));
+
+ // Per-tag overrides
+ const int count = cfg.get("log/tag_count", 0).toInt();
+ for (int i = 0; i < count; ++i) {
+ const QString tag = cfg.get(QString("log/tag_%1_name").arg(i)).toString();
+ const QString level = cfg.get(QString("log/tag_%1_level").arg(i)).toString();
+ if (!tag.isEmpty() && lvl_map.contains(level))
+ log.set_tag_level(tag, lvl_map.value(level));
}
}
- fincept::Logger::instance().set_file(log_dir + "/fincept.log");
LOG_INFO("App", "Fincept Terminal v4.0.0 starting...");
- // Apply default theme immediately so the window is styled before anything shows
- fincept::ui::apply_global_stylesheet();
+ // Theme is applied after DB is open so saved font/theme are respected from the start.
// Initialize config
auto& config = fincept::AppConfig::instance();
fincept::HttpClient::instance().set_base_url(config.api_base_url());
- const QString saved_token = config.auth_token();
- if (!saved_token.isEmpty()) {
- fincept::HttpClient::instance().set_auth_header(saved_token);
- }
+ // Note: auth tokens are managed by AuthManager::initialize() which loads
+ // from SecureStorage (DPAPI) and SQLite — not from QSettings/Registry.
// Register migrations explicitly (avoids MSVC /OPT:REF stripping static-init TUs)
fincept::register_migration_v001();
@@ -78,12 +118,15 @@ int main(int argc, char* argv[]) {
fincept::register_migration_v010();
fincept::register_migration_v011();
fincept::register_migration_v012();
+ fincept::register_migration_v013();
// Open main database
- QString db_path = log_dir + "/fincept.db";
+ QString db_path = fincept::AppPaths::data() + "/fincept.db";
auto db_result = fincept::Database::instance().open(db_path);
if (db_result.is_err()) {
LOG_ERROR("App", "Failed to open database: " + QString::fromStdString(db_result.error()));
+ // DB unavailable — apply theme with built-in defaults so the UI is at least styled
+ fincept::ui::apply_global_stylesheet();
} else {
// Warm InstrumentService cache from DB (non-blocking, no network).
// If the table is empty on first run, the first broker login triggers a refresh.
@@ -92,27 +135,35 @@ int main(int argc, char* argv[]) {
LOG_INFO("App", "Zerodha instruments loaded");
fincept::trading::InstrumentService::instance().load_from_db("angelone");
LOG_INFO("App", "AngelOne instruments loaded");
- }
- // Load persisted appearance settings and re-apply theme/font
- {
- auto& repo = fincept::SettingsRepository::instance();
- auto& tm = fincept::ui::ThemeManager::instance();
- auto r_theme = repo.get("appearance.theme");
- auto r_family = repo.get("appearance.font_family");
- auto r_size = repo.get("appearance.font_size");
- QString theme = r_theme.is_ok() ? r_theme.value() : "Obsidian";
- QString family = r_family.is_ok() ? r_family.value() : "Consolas";
- QString size_s = r_size.is_ok() ? r_size.value() : "14px";
- int size_px = QString(size_s).replace("px", "").toInt();
- if (size_px <= 0) size_px = 14;
- tm.apply_font(family, size_px);
- tm.apply_theme(theme);
- LOG_INFO("App", "Theme applied: " + theme + ", font: " + family + " " + size_s);
+ // Prune news articles older than 30 days to keep DB size bounded
+ int64_t news_cutoff = QDateTime::currentSecsSinceEpoch() - (30LL * 86400);
+ fincept::NewsArticleRepository::instance().prune_older_than(news_cutoff);
+ LOG_INFO("App", "News articles pruned (keeping 30 days)");
+
+ // Load persisted appearance settings and apply theme+font in one shot,
+ // before any window is shown — eliminates the flash/wrong-font-on-startup issue.
+ {
+ auto& repo = fincept::SettingsRepository::instance();
+ auto& tm = fincept::ui::ThemeManager::instance();
+ auto r_theme = repo.get("appearance.theme");
+ auto r_family = repo.get("appearance.font_family");
+ auto r_size = repo.get("appearance.font_size");
+ QString theme = r_theme.is_ok() ? r_theme.value() : "Obsidian";
+ QString family = r_family.is_ok() ? r_family.value() : "Consolas";
+ QString size_s = r_size.is_ok() ? r_size.value() : "14px";
+ int size_px = size_s.left(size_s.indexOf("px")).toInt();
+ if (size_px <= 0) size_px = 14;
+ // Set font first so rebuild_and_apply inside apply_theme uses correct values
+ tm.apply_font(family, size_px);
+ tm.apply_theme(theme);
+ LOG_INFO("App", "Theme applied: " + theme + ", font: " + family + " " + size_s);
+ }
}
+
// Open cache database (non-fatal if fails)
- QString cache_path = log_dir + "/cache.db";
+ QString cache_path = fincept::AppPaths::data() + "/cache.db";
auto cache_result = fincept::CacheDatabase::instance().open(cache_path);
if (cache_result.is_err()) {
LOG_WARN("App", "Cache DB failed (non-fatal): " + QString::fromStdString(cache_result.error()));
diff --git a/fincept-qt/src/auth/AuthApi.cpp b/fincept-qt/src/auth/AuthApi.cpp
index 17603796a..4d0fc5dbb 100644
--- a/fincept-qt/src/auth/AuthApi.cpp
+++ b/fincept-qt/src/auth/AuthApi.cpp
@@ -199,10 +199,6 @@ void AuthApi::logout(Callback cb) {
request("POST", "/user/logout", {}, cb);
}
-void AuthApi::validate_session_server(Callback cb) {
- request("POST", "/user/validate-session", {}, cb);
-}
-
void AuthApi::session_pulse(Callback cb) {
request("GET", "/user/session-pulse", {}, cb);
}
diff --git a/fincept-qt/src/auth/AuthApi.h b/fincept-qt/src/auth/AuthApi.h
index d3fe5cd84..133e90168 100644
--- a/fincept-qt/src/auth/AuthApi.h
+++ b/fincept-qt/src/auth/AuthApi.h
@@ -29,7 +29,6 @@ class AuthApi : public QObject {
// Authenticated (uses api_key stored on HttpClient)
void logout(Callback cb);
- void validate_session_server(Callback cb);
void session_pulse(Callback cb);
void get_user_profile(Callback cb);
void update_user_profile(const QJsonObject& data, Callback cb);
diff --git a/fincept-qt/src/auth/AuthManager.cpp b/fincept-qt/src/auth/AuthManager.cpp
index 5bb3a513a..3cbd02180 100644
--- a/fincept-qt/src/auth/AuthManager.cpp
+++ b/fincept-qt/src/auth/AuthManager.cpp
@@ -2,11 +2,11 @@
#include "auth/AuthApi.h"
#include "auth/UserApi.h"
-#include "core/config/AppConfig.h"
#include "core/logging/Logger.h"
#include "network/http/HttpClient.h"
#include "storage/repositories/LlmConfigRepository.h"
#include "storage/repositories/SettingsRepository.h"
+#include "storage/secure/SecureStorage.h"
#include <QCryptographicHash>
#include <QDateTime>
@@ -72,22 +72,34 @@ void AuthManager::save_session() {
if (r.is_err()) {
LOG_ERROR("Auth", "Failed to save session: " + QString::fromStdString(r.error()));
}
+
+ // Persist api_key to OS-native encrypted storage (DPAPI / Keychain) as the
+ // durable credential. SQLite session JSON is the fallback.
+ if (!session_.api_key.isEmpty()) {
+ auto sr = fincept::SecureStorage::instance().store("api_key", session_.api_key);
+ if (sr.is_err())
+ LOG_WARN("Auth", "SecureStorage: failed to persist api_key — using SQLite fallback");
+ }
}
void AuthManager::load_session() {
auto r = fincept::SettingsRepository::instance().get("fincept_session");
- if (r.is_err())
- return;
-
- QString json = r.value();
- if (json.isEmpty())
- return;
+ if (r.is_ok() && !r.value().isEmpty()) {
+ auto doc = QJsonDocument::fromJson(r.value().toUtf8());
+ if (!doc.isNull())
+ session_ = SessionData::from_json(doc.object());
+ }
- auto doc = QJsonDocument::fromJson(json.toUtf8());
- if (doc.isNull())
- return;
+ // Try to recover api_key from SecureStorage (DPAPI / Keychain) — this is the
+ // most reliable source since it survives SQLite corruption and DB migrations.
+ auto secure_key = fincept::SecureStorage::instance().retrieve("api_key");
+ if (secure_key.is_ok() && !secure_key.value().isEmpty()) {
+ if (session_.api_key.isEmpty() || session_.api_key != secure_key.value()) {
+ LOG_INFO("Auth", "Restored api_key from SecureStorage");
+ session_.api_key = secure_key.value();
+ }
+ }
- session_ = SessionData::from_json(doc.object());
// Never trust saved authenticated flag — must be re-validated
session_.authenticated = false;
}
@@ -97,6 +109,7 @@ void AuthManager::clear_session() {
clear_tokens();
fincept::SettingsRepository::instance().remove("fincept_session");
fincept::SettingsRepository::instance().remove("fincept_api_key");
+ fincept::SecureStorage::instance().remove("api_key");
// Clear auto-configured fincept LLM provider and reset LlmService
LlmConfigRepository::instance().delete_provider("fincept");
@@ -109,8 +122,14 @@ void AuthManager::initialize() {
load_session();
if (!session_.api_key.isEmpty()) {
- // Restore tokens on HttpClient so API calls work
- apply_tokens(session_.api_key, session_.session_token);
+ // Apply api_key ONLY — do NOT send the stale session_token during
+ // startup validation. The server enforces single-session via
+ // X-Session-Token; sending a stale one triggers 401 even though
+ // the api_key is perfectly valid and permanent.
+ auto& http = fincept::HttpClient::instance();
+ http.set_auth_header(session_.api_key);
+ http.clear_session_token();
+
validate_saved_session();
return;
}
@@ -120,64 +139,55 @@ void AuthManager::initialize() {
}
void AuthManager::validate_saved_session() {
- AuthApi::instance().validate_session_server([this](ApiResponse r) {
- // 401/403 → session truly expired, must re-login
- if (!r.success && (r.status_code == 401 || r.status_code == 403)) {
- LOG_WARN("Auth", "Session expired (HTTP " + QString::number(r.status_code) + ") — clearing");
- clear_session();
- set_loading(false);
- emit auth_state_changed();
- return;
- }
-
- // Network/server error (500, 0) → treat as transient, keep session alive
- // and proceed to dashboard; worst case the next API call will fail
- if (!r.success) {
- LOG_WARN("Auth", "Session validation network error — restoring session anyway");
- session_.authenticated = true;
- set_loading(false);
- emit auth_state_changed();
- return;
- }
-
- // Success — check response body
- const auto data = unwrap_data(r.data);
- LOG_DEBUG("Auth", "validate-session response: " +
- QString::fromUtf8(QJsonDocument(r.data).toJson(QJsonDocument::Compact)));
+ // Validate the saved api_key by fetching the user profile.
+ // We intentionally do NOT send X-Session-Token here — the api_key is
+ // the permanent credential. A stale session_token would cause a false 401.
+ //
+ // Flow:
+ // api_key valid (200) → fetch subscription → mark authenticated → save
+ // api_key revoked (401/403) → clear everything → show login
+ // network error → trust cached session data (offline-friendly)
+ LOG_INFO("Auth", "Validating saved session via profile fetch (api_key only, no session_token)");
+ fetch_user_profile([this] { emit subscription_fetched(); });
+}
- // Only clear if server explicitly says valid=false with a 200 OK.
- // Some servers return {"valid": false} only when the token is truly revoked.
- if (r.status_code == 200 && data.contains("valid") && !data["valid"].toBool()) {
- LOG_WARN("Auth", "Session invalid (valid=false in body) — clearing");
+void AuthManager::fetch_user_profile(std::function<void()> on_done) {
+ AuthApi::instance().get_user_profile([this, on_done = std::move(on_done)](ApiResponse r) mutable {
+ if (!r.success && (r.status_code == 401 || r.status_code == 403)) {
+ // API key is revoked or invalid — force re-login
+ LOG_WARN("Auth", "Profile fetch returned 401/403 — API key invalid, clearing session");
clear_session();
set_loading(false);
emit auth_state_changed();
return;
}
-
- // Session valid — refresh profile then proceed
- fetch_user_profile([this] { emit subscription_fetched(); });
- });
-}
-
-void AuthManager::fetch_user_profile(std::function<void()> on_done) {
- AuthApi::instance().get_user_profile([this, on_done = std::move(on_done)](ApiResponse r) mutable {
if (r.success) {
const auto data = unwrap_data(r.data);
session_.user_info = UserProfile::from_json(data);
+
+ // api_key confirmed valid — now restore session_token on HttpClient
+ // so subsequent authenticated requests include it. If the old
+ // session_token turns out to be stale during usage, SessionGuard
+ // will handle recovery without clearing the api_key.
+ if (!session_.session_token.isEmpty()) {
+ fincept::HttpClient::instance().set_session_token(session_.session_token);
+ }
+ } else {
+ // Network/server error — keep going with cached session data
+ LOG_WARN("Auth", "Profile fetch failed (non-auth error) — using cached data");
+ session_.authenticated = !session_.api_key.isEmpty();
+ // Restore session_token for subsequent requests even in offline mode
+ if (!session_.session_token.isEmpty()) {
+ fincept::HttpClient::instance().set_session_token(session_.session_token);
+ }
}
fetch_user_subscription(std::move(on_done));
});
}
-// ── Shared post-auth completion ───────────────────────────────────────────────
-// Fetches subscription, syncs state, saves session, emits success_signal.
-// Called at the tail of login / verify_otp / verify_mfa / session restore.
-
// ── Shared post-auth completion ───────────────────────────────────────────────
// Fetches subscription, syncs state, saves session, then calls on_done().
-// Used by login / verify_otp / verify_mfa / session restore to avoid
-// duplicating the same 8-line block in four places.
+// Used by login / verify_otp / verify_mfa / session restore.
void AuthManager::complete_auth_flow(std::function<void()> on_done) {
UserApi::instance().get_user_subscription([this, on_done = std::move(on_done)](ApiResponse r) {
@@ -321,6 +331,7 @@ void AuthManager::verify_otp(const QString& email, const QString& otp) {
session_.session_token = session_token;
session_.device_id = generate_device_id();
+ LOG_INFO("Auth", "OTP verified successfully");
fetch_user_profile([this] { emit otp_verified(); });
});
}
@@ -353,6 +364,7 @@ void AuthManager::verify_mfa(const QString& email, const QString& otp) {
session_.session_token = session_token;
session_.device_id = generate_device_id();
+ LOG_INFO("Auth", "MFA verified successfully");
fetch_user_profile([this] { emit mfa_verified(); });
});
}
@@ -411,6 +423,52 @@ void AuthManager::logout() {
emit auth_state_changed();
}
+// ── Session recovery ─────────────────────────────────────────────────────────
+// Called by SessionGuard when it gets 401. Instead of immediately logging out,
+// we strip the stale session_token and re-validate with api_key only.
+// If the api_key is still valid → session recovered, no disruption.
+// If api_key is also invalid → truly expired, must re-login.
+
+void AuthManager::attempt_session_recovery(std::function<void(bool)> cb) {
+ if (session_.api_key.isEmpty()) {
+ if (cb) cb(false);
+ return;
+ }
+
+ LOG_INFO("Auth", "Attempting session recovery with api_key only");
+
+ // Temporarily strip session_token so the validation request doesn't 401
+ fincept::HttpClient::instance().clear_session_token();
+
+ AuthApi::instance().get_user_profile([this, cb = std::move(cb)](ApiResponse r) mutable {
+ if (r.success) {
+ LOG_INFO("Auth", "Session recovery succeeded — api_key is valid");
+ const auto data = unwrap_data(r.data);
+ session_.user_info = UserProfile::from_json(data);
+ session_.authenticated = true;
+
+ // The old session_token was stale. Clear it from our saved state.
+ // The app continues with api_key-only auth. A fresh session_token
+ // will be obtained on the next explicit login.
+ session_.session_token.clear();
+ save_session();
+
+ // Don't restore session_token — operate with api_key only
+ if (cb) cb(true);
+ } else if (r.status_code == 401 || r.status_code == 403) {
+ LOG_WARN("Auth", "Session recovery failed — api_key is invalid");
+ if (cb) cb(false);
+ } else {
+ // Network error — don't force logout, assume transient
+ LOG_WARN("Auth", "Session recovery: network error — keeping session alive");
+ // Restore session_token since we can't determine if it's stale
+ if (!session_.session_token.isEmpty())
+ fincept::HttpClient::instance().set_session_token(session_.session_token);
+ if (cb) cb(true);
+ }
+ });
+}
+
// ── Refresh user data ────────────────────────────────────────────────────────
void AuthManager::refresh_user_data() {
diff --git a/fincept-qt/src/auth/AuthManager.h b/fincept-qt/src/auth/AuthManager.h
index 58833a900..c0e64614f 100644
--- a/fincept-qt/src/auth/AuthManager.h
+++ b/fincept-qt/src/auth/AuthManager.h
@@ -30,6 +30,7 @@ class AuthManager : public QObject {
// Session management
void initialize();
void refresh_user_data();
+ void attempt_session_recovery(std::function<void(bool)> cb);
signals:
void auth_state_changed();
diff --git a/fincept-qt/src/auth/SessionGuard.cpp b/fincept-qt/src/auth/SessionGuard.cpp
index 0dfc32885..5dc2987e7 100644
--- a/fincept-qt/src/auth/SessionGuard.cpp
+++ b/fincept-qt/src/auth/SessionGuard.cpp
@@ -13,7 +13,7 @@ SessionGuard::SessionGuard(QObject* parent) : QObject(parent) {
connect(&AuthManager::instance(), &AuthManager::auth_state_changed, this, [this]() {
const auto& s = AuthManager::instance().session();
- if (s.authenticated && !s.session_token.isEmpty()) {
+ if (s.authenticated && !s.api_key.isEmpty()) {
start();
} else {
stop();
@@ -44,12 +44,23 @@ void SessionGuard::check_pulse() {
AuthApi::instance().session_pulse([this](ApiResponse r) {
is_checking_ = false;
- // 401/403 → session definitively expired
+ // 401/403 → session_token is stale. But the api_key may still be valid.
+ // Attempt recovery before logging the user out.
if (!r.success && (r.status_code == 401 || r.status_code == 403)) {
- LOG_WARN("SessionGuard", QString("Session expired (HTTP %1) — logging out").arg(r.status_code));
- stop();
- emit session_expired();
- AuthManager::instance().logout();
+ LOG_WARN("SessionGuard", QString("Pulse returned HTTP %1 — attempting session recovery").arg(r.status_code));
+ is_checking_ = true;
+ AuthManager::instance().attempt_session_recovery([this](bool recovered) {
+ is_checking_ = false;
+ if (recovered) {
+ LOG_INFO("SessionGuard", "Session recovered — api_key still valid");
+ return;
+ }
+ // api_key is truly invalid — must re-login
+ LOG_WARN("SessionGuard", "Session recovery failed — api_key invalid, logging out");
+ stop();
+ emit session_expired();
+ AuthManager::instance().logout();
+ });
return;
}
@@ -59,15 +70,24 @@ void SessionGuard::check_pulse() {
return;
}
- // Explicit valid=false in response body
+ // Explicit valid=false in response body — same recovery path
auto data = r.data;
if (data.contains("data") && data["data"].isObject())
data = data["data"].toObject();
if (data.contains("valid") && !data["valid"].toBool()) {
- LOG_WARN("SessionGuard", "Session invalid (valid=false) — logging out");
- stop();
- emit session_expired();
- AuthManager::instance().logout();
+ LOG_WARN("SessionGuard", "Pulse returned valid=false — attempting session recovery");
+ is_checking_ = true;
+ AuthManager::instance().attempt_session_recovery([this](bool recovered) {
+ is_checking_ = false;
+ if (recovered) {
+ LOG_INFO("SessionGuard", "Session recovered after valid=false");
+ return;
+ }
+ LOG_WARN("SessionGuard", "Session recovery failed — logging out");
+ stop();
+ emit session_expired();
+ AuthManager::instance().logout();
+ });
}
});
}
diff --git a/fincept-qt/src/auth/UserApi.cpp b/fincept-qt/src/auth/UserApi.cpp
index fc4571c3b..7c127c77d 100644
--- a/fincept-qt/src/auth/UserApi.cpp
+++ b/fincept-qt/src/auth/UserApi.cpp
@@ -103,29 +103,6 @@ void UserApi::get_login_history(int limit, int offset, Callback cb) {
request("GET", QString("/user/login-history?limit=%1&offset=%2").arg(limit).arg(offset), {}, cb);
}
-// ── Notifications ────────────────────────────────────────────────────────────
-
-void UserApi::get_notifications(int limit, int offset, bool unread_only, Callback cb) {
- request("GET",
- QString("/user/notifications?limit=%1&offset=%2&unread_only=%3")
- .arg(limit)
- .arg(offset)
- .arg(unread_only ? "true" : "false"),
- {}, cb);
-}
-
-void UserApi::mark_notification_read(int id, Callback cb) {
- request("PUT", QString("/user/notifications/%1/read").arg(id), {}, cb);
-}
-
-void UserApi::mark_all_notifications_read(Callback cb) {
- request("PUT", "/user/notifications/read-all", {}, cb);
-}
-
-void UserApi::delete_notification(int id, Callback cb) {
- request("DELETE", QString("/user/notifications/%1").arg(id), {}, cb);
-}
-
// ── MFA ──────────────────────────────────────────────────────────────────────
void UserApi::enable_mfa(Callback cb) {
diff --git a/fincept-qt/src/auth/UserApi.h b/fincept-qt/src/auth/UserApi.h
index efafaabc3..b79deb6cc 100644
--- a/fincept-qt/src/auth/UserApi.h
+++ b/fincept-qt/src/auth/UserApi.h
@@ -31,12 +31,6 @@ class UserApi : public QObject {
// Login history
void get_login_history(int limit, int offset, Callback cb);
- // Notifications
- void get_notifications(int limit, int offset, bool unread_only, Callback cb);
- void mark_notification_read(int notification_id, Callback cb);
- void mark_all_notifications_read(Callback cb);
- void delete_notification(int notification_id, Callback cb);
-
// MFA
void enable_mfa(Callback cb);
void disable_mfa(Callback cb);
diff --git a/fincept-qt/src/core/config/AppConfig.cpp b/fincept-qt/src/core/config/AppConfig.cpp
index 4bfe9be1e..c2b6787dc 100644
--- a/fincept-qt/src/core/config/AppConfig.cpp
+++ b/fincept-qt/src/core/config/AppConfig.cpp
@@ -25,14 +25,6 @@ QString AppConfig::api_base_url() const {
return settings_.value("api/base_url", "https://api.fincept.in").toString();
}
-QString AppConfig::auth_token() const {
- return settings_.value("auth/token").toString();
-}
-
-void AppConfig::set_auth_token(const QString& token) {
- settings_.setValue("auth/token", token);
-}
-
bool AppConfig::dark_mode() const {
return settings_.value("ui/dark_mode", true).toBool();
}
diff --git a/fincept-qt/src/core/config/AppConfig.h b/fincept-qt/src/core/config/AppConfig.h
index 5c3f512c5..2c79b7a2c 100644
--- a/fincept-qt/src/core/config/AppConfig.h
+++ b/fincept-qt/src/core/config/AppConfig.h
@@ -16,8 +16,6 @@ class AppConfig {
// Typed accessors for common settings
QString api_base_url() const;
- QString auth_token() const;
- void set_auth_token(const QString& token);
bool dark_mode() const;
int refresh_interval_ms() const;
diff --git a/fincept-qt/src/core/config/AppPaths.cpp b/fincept-qt/src/core/config/AppPaths.cpp
new file mode 100644
index 000000000..53ddaad0c
--- /dev/null
+++ b/fincept-qt/src/core/config/AppPaths.cpp
@@ -0,0 +1,63 @@
+#include "core/config/AppPaths.h"
+
+#include <QDir>
+#include <QStandardPaths>
+
+namespace fincept {
+
+QString AppPaths::root() {
+#ifdef _WIN32
+ // AppLocalDataLocation = %LOCALAPPDATA%\Fincept\FinceptTerminal
+ // Walk up two levels to reach %LOCALAPPDATA%, then append our app folder.
+ QString base = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
+ QDir d(base);
+ d.cdUp(); // %LOCALAPPDATA%\Fincept
+ d.cdUp(); // %LOCALAPPDATA%
+ return d.absolutePath() + "/com.fincept.terminal";
+#elif defined(__APPLE__)
+ return QDir::homePath() + "/Library/Application Support/com.fincept.terminal";
+#else
+ return QDir::homePath() + "/.local/share/com.fincept.terminal";
+#endif
+}
+
+QString AppPaths::data() {
+ return root() + "/data";
+}
+
+QString AppPaths::logs() {
+ return root() + "/logs";
+}
+
+QString AppPaths::files() {
+ return root() + "/files";
+}
+
+QString AppPaths::cache() {
+ return root() + "/cache";
+}
+
+QString AppPaths::models() {
+ return root() + "/models";
+}
+
+QString AppPaths::runtime() {
+ return root() + "/runtime";
+}
+
+QString AppPaths::workspaces() {
+ return root() + "/workspaces";
+}
+
+void AppPaths::ensure_all() {
+ QDir().mkpath(root());
+ QDir().mkpath(data());
+ QDir().mkpath(logs());
+ QDir().mkpath(files());
+ QDir().mkpath(cache());
+ QDir().mkpath(models());
+ QDir().mkpath(runtime());
+ QDir().mkpath(workspaces());
+}
+
+} // namespace fincept
diff --git a/fincept-qt/src/core/config/AppPaths.h b/fincept-qt/src/core/config/AppPaths.h
new file mode 100644
index 000000000..582012f26
--- /dev/null
+++ b/fincept-qt/src/core/config/AppPaths.h
@@ -0,0 +1,53 @@
+#pragma once
+#include <QString>
+
+namespace fincept {
+
+/// Central registry for all application file-system paths.
+///
+/// All paths live under a single root directory:
+/// Windows : %LOCALAPPDATA%\com.fincept.terminal\
+/// macOS : ~/Library/Application Support/com.fincept.terminal/
+/// Linux : ~/.local/share/com.fincept.terminal/
+///
+/// Sub-directories:
+/// data/ — SQLite databases (fincept.db, cache.db)
+/// logs/ — Application log files
+/// files/ — User-managed file attachments
+/// cache/ — Tile caches and other transient network data
+/// models/ — ML model files (Whisper, etc.)
+/// runtime/ — Python interpreter, UV, virtual environments
+///
+/// Call AppPaths::ensure_all() once at startup to create every sub-directory.
+class AppPaths {
+ public:
+ /// Root: %LOCALAPPDATA%\com.fincept.terminal (Windows)
+ static QString root();
+
+ /// root/data — persistent databases
+ static QString data();
+
+ /// root/logs — log files
+ static QString logs();
+
+ /// root/files — user-managed file attachments
+ static QString files();
+
+ /// root/cache — tile caches and transient network data
+ static QString cache();
+
+ /// root/models — ML model files
+ static QString models();
+
+ /// root/runtime — Python interpreter, UV, virtual environments
+ static QString runtime();
+
+ /// root/workspaces — saved workspace files (.fwsp)
+ static QString workspaces();
+
+ /// Create all sub-directories if they don't exist.
+ /// Call once before any path is used.
+ static void ensure_all();
+};
+
+} // namespace fincept
diff --git a/fincept-qt/src/core/logging/Logger.cpp b/fincept-qt/src/core/logging/Logger.cpp
index 37a2bfe28..5511b5d3e 100644
--- a/fincept-qt/src/core/logging/Logger.cpp
+++ b/fincept-qt/src/core/logging/Logger.cpp
@@ -11,6 +11,25 @@ void Logger::set_level(LogLevel level) {
min_level_ = level;
}
+void Logger::set_tag_level(const QString& tag, LogLevel level) {
+ QMutexLocker lock(&mutex_);
+ tag_levels_[tag] = level;
+}
+
+void Logger::clear_tag_level(const QString& tag) {
+ QMutexLocker lock(&mutex_);
+ tag_levels_.remove(tag);
+}
+
+void Logger::clear_all_tag_levels() {
+ QMutexLocker lock(&mutex_);
+ tag_levels_.clear();
+}
+
+QHash<QString, LogLevel> Logger::tag_levels() const {
+ return tag_levels_;
+}
+
void Logger::set_file(const QString& path) {
QMutexLocker lock(&mutex_);
if (log_file_.isOpen())
@@ -42,7 +61,14 @@ void Logger::error(const QString& tag, const QString& msg) {
}
void Logger::write(LogLevel level, const QString& tag, const QString& msg) {
- if (level < min_level_)
+ LogLevel effective = min_level_;
+ {
+ QMutexLocker lock(&mutex_);
+ auto it = tag_levels_.find(tag);
+ if (it != tag_levels_.end())
+ effective = it.value();
+ }
+ if (level < effective)
return;
static const char* names[] = {"DEBUG", "INFO", "WARN", "ERROR"};
diff --git a/fincept-qt/src/core/logging/Logger.h b/fincept-qt/src/core/logging/Logger.h
index 213f32ba5..01afe346f 100644
--- a/fincept-qt/src/core/logging/Logger.h
+++ b/fincept-qt/src/core/logging/Logger.h
@@ -2,6 +2,7 @@
#include <QDateTime>
#include <QDebug>
#include <QFile>
+#include <QHash>
#include <QMutex>
#include <QString>
#include <QTextStream>
@@ -16,6 +17,12 @@ class Logger {
void set_level(LogLevel level);
void set_file(const QString& path);
+ void set_tag_level(const QString& tag, LogLevel level);
+ void clear_tag_level(const QString& tag);
+ void clear_all_tag_levels();
+
+ LogLevel global_level() const { return min_level_; }
+ QHash<QString, LogLevel> tag_levels() const;
void debug(const QString& tag, const QString& msg);
void info(const QString& tag, const QString& msg);
@@ -27,6 +34,7 @@ class Logger {
void write(LogLevel level, const QString& tag, const QString& msg);
LogLevel min_level_ = LogLevel::Info;
+ QHash<QString, LogLevel> tag_levels_;
QFile log_file_;
QMutex mutex_;
};
diff --git a/fincept-qt/src/mcp/tools/DataSourcesTools.cpp b/fincept-qt/src/mcp/tools/DataSourcesTools.cpp
index af00c6df9..de4bb1d5e 100644
--- a/fincept-qt/src/mcp/tools/DataSourcesTools.cpp
+++ b/fincept-qt/src/mcp/tools/DataSourcesTools.cpp
@@ -281,7 +281,7 @@ std::vector<ToolDef> get_data_sources_tools() {
{
ToolDef t;
t.name = "ds_list_connectors";
- t.description = "List all 78 available connector types with their ID, name, category, "
+ t.description = "List all available connector types with their ID, name, category, "
"auth requirement, and testability. Use this to discover valid provider IDs.";
t.category = "data-sources";
t.input_schema.properties = QJsonObject{};
@@ -370,7 +370,7 @@ std::vector<ToolDef> get_data_sources_tools() {
t.name = "ds_connectors_by_category";
t.description = "List connector types filtered by category. "
"Valid categories: database, api, file, streaming, cloud, "
- "timeseries, market-data, search, warehouse.";
+ "timeseries, market-data, search, warehouse, alt-data, open-banking.";
t.category = "data-sources";
t.input_schema.properties = QJsonObject{
{"category", QJsonObject{{"type", "string"},
@@ -390,10 +390,12 @@ std::vector<ToolDef> get_data_sources_tools() {
else if (cat == "cloud") cat_enum = Category::Cloud;
else if (cat == "timeseries") cat_enum = Category::TimeSeries;
else if (cat == "market-data") cat_enum = Category::MarketData;
- else if (cat == "search") cat_enum = Category::SearchAnalytics;
- else if (cat == "warehouse") cat_enum = Category::DataWarehouse;
+ else if (cat == "search") cat_enum = Category::SearchAnalytics;
+ else if (cat == "warehouse") cat_enum = Category::DataWarehouse;
+ else if (cat == "alt-data") cat_enum = Category::AlternativeData;
+ else if (cat == "open-banking") cat_enum = Category::OpenBanking;
else return ToolResult::fail("Unknown category '" + cat +
- "'. Valid: database, api, file, streaming, cloud, timeseries, market-data, search, warehouse");
+ "'. Valid: database, api, file, streaming, cloud, timeseries, market-data, search, warehouse, alt-data, open-banking");
auto filtered = ConnectorRegistry::instance().by_category(cat_enum);
QJsonArray arr;
@@ -454,7 +456,7 @@ std::vector<ToolDef> get_data_sources_tools() {
int port = 80;
// Try explicit URL fields first
- for (const QString& key : {"url", "baseUrl", "endpoint", "wsdlUrl", "serviceRoot"}) {
+ for (const QString& key : {"url", "baseUrl", "endpoint", "wsdlUrl", "serviceRoot", "jobManagerUrl"}) {
QString val = config_obj[key].toString().trimmed();
if (!val.isEmpty()) {
QUrl u(val);
@@ -471,7 +473,7 @@ std::vector<ToolDef> get_data_sources_tools() {
QString h = config_obj["host"].toString().trimmed();
if (!h.isEmpty()) {
host = h;
- port = config_obj["port"].toInt(5432);
+ port = config_obj["port"].toInt(80);
}
}
@@ -485,6 +487,39 @@ std::vector<ToolDef> get_data_sources_tools() {
}
}
+ // Fallback: comma-separated host lists (kafka brokers, nats servers,
+ // cassandra contactPoints, etcd hosts, memcached servers)
+ if (host.isEmpty()) {
+ for (const QString& key : {"brokers", "servers", "contactPoints", "hosts", "zkQuorum"}) {
+ QString val = config_obj[key].toString().trimmed();
+ if (!val.isEmpty()) {
+ // Take the first entry — "host:port" or just "host"
+ QString first = val.split(',').first().trimmed();
+ int colon = first.lastIndexOf(':');
+ if (colon > 0) {
+ host = first.left(colon);
+ port = first.mid(colon + 1).toInt();
+ } else {
+ host = first;
+ port = config_obj["port"].toInt(80);
+ }
+ break;
+ }
+ }
+ }
+
+ // Fallback: bolt/neo4j URI in "uri" field
+ if (host.isEmpty()) {
+ QString uri = config_obj["uri"].toString().trimmed();
+ if (!uri.isEmpty()) {
+ QUrl u(uri);
+ if (u.isValid() && !u.host().isEmpty()) {
+ host = u.host();
+ port = u.port(7687);
+ }
+ }
+ }
+
if (host.isEmpty())
return ToolResult::fail("No testable endpoint found in connection config. "
"Ensure required fields (host, url, etc.) are filled in.");
diff --git a/fincept-qt/src/mcp/tools/ProfileTools.cpp b/fincept-qt/src/mcp/tools/ProfileTools.cpp
index e4b2e503c..ed7c69498 100644
--- a/fincept-qt/src/mcp/tools/ProfileTools.cpp
+++ b/fincept-qt/src/mcp/tools/ProfileTools.cpp
@@ -7,6 +7,7 @@
#include "auth/AuthTypes.h"
#include "auth/UserApi.h"
#include "core/logging/Logger.h"
+#include "services/notifications/NotificationService.h"
#include <QEventLoop>
#include <QJsonArray>
@@ -276,7 +277,7 @@ std::vector<ToolDef> get_profile_tools() {
{
ToolDef t;
t.name = "profile_get_notifications";
- t.description = "Get user notifications. Can filter to unread only.";
+ t.description = "Get in-app notification history. Can filter to unread only.";
t.category = "profile";
t.input_schema.properties = QJsonObject{
{"limit", QJsonObject{{"type", "integer"}, {"description", "Max notifications (default: 20)"}}},
@@ -284,12 +285,35 @@ std::vector<ToolDef> get_profile_tools() {
{"unread_only", QJsonObject{{"type", "boolean"}, {"description", "Only return unread notifications (default: false)"}}},
};
t.handler = [](const QJsonObject& args) -> ToolResult {
- int limit = args["limit"].toInt(20);
- int offset = args["offset"].toInt(0);
- bool unread = args["unread_only"].toBool(false);
- return run_user_api([limit, offset, unread](auto cb) {
- UserApi::instance().get_notifications(limit, offset, unread, cb);
- });
+ int limit = args["limit"].toInt(20);
+ int offset = args["offset"].toInt(0);
+ bool unread = args["unread_only"].toBool(false);
+
+ using namespace fincept::notifications;
+ const auto& history = NotificationService::instance().history();
+
+ QJsonArray arr;
+ int count = 0;
+ int skipped = 0;
+ for (const auto& rec : history) {
+ if (unread && rec.read) continue;
+ if (skipped < offset) { ++skipped; continue; }
+ if (count >= limit) break;
+
+ QJsonObject obj;
+ obj["id"] = rec.id;
+ obj["title"] = rec.request.title;
+ obj["message"] = rec.request.message;
+ obj["read"] = rec.read;
+ obj["time"] = rec.received_at.toString(Qt::ISODate);
+ arr.append(obj);
+ ++count;
+ }
+
+ QJsonObject result;
+ result["notifications"] = arr;
+ result["total"] = arr.size();
+ return ToolResult::ok("OK", QJsonValue(result));
};
tools.push_back(std::move(t));
}
@@ -298,8 +322,7 @@ std::vector<ToolDef> get_profile_tools() {
{
ToolDef t;
t.name = "profile_mark_notification_read";
- t.description = "Mark a specific notification as read by its ID. "
- "Use 'all' in the description field to mark all — see profile_mark_all_notifications_read instead.";
+ t.description = "Mark a specific in-app notification as read by its ID.";
t.category = "profile";
t.input_schema.properties = QJsonObject{
{"id", QJsonObject{{"type", "integer"}, {"description", "Notification ID to mark as read"}}},
@@ -308,9 +331,11 @@ std::vector<ToolDef> get_profile_tools() {
t.handler = [](const QJsonObject& args) -> ToolResult {
int id = args["id"].toInt(-1);
if (id < 0) return ToolResult::fail("Missing or invalid 'id'");
- return run_user_api([id](auto cb) {
- UserApi::instance().mark_notification_read(id, cb);
- });
+ fincept::notifications::NotificationService::instance().mark_read(id);
+ QJsonObject result;
+ result["success"] = true;
+ result["id"] = id;
+ return ToolResult::ok("Marked as read", QJsonValue(result));
};
tools.push_back(std::move(t));
}
@@ -319,13 +344,12 @@ std::vector<ToolDef> get_profile_tools() {
{
ToolDef t;
t.name = "profile_mark_all_notifications_read";
- t.description = "Mark all notifications as read at once.";
+ t.description = "Mark all in-app notifications as read at once.";
t.category = "profile";
t.input_schema.properties = QJsonObject{};
t.handler = [](const QJsonObject&) -> ToolResult {
- return run_user_api([](auto cb) {
- UserApi::instance().mark_all_notifications_read(cb);
- });
+ fincept::notifications::NotificationService::instance().mark_all_read();
+ return ToolResult::ok("All notifications marked as read");
};
tools.push_back(std::move(t));
}
diff --git a/fincept-qt/src/network/http/HttpClient.cpp b/fincept-qt/src/network/http/HttpClient.cpp
index bb617715c..f1c3af28a 100644
--- a/fincept-qt/src/network/http/HttpClient.cpp
+++ b/fincept-qt/src/network/http/HttpClient.cpp
@@ -41,8 +41,11 @@ void HttpClient::handle_reply(QNetworkReply* reply, JsonCallback callback) {
QJsonDocument doc = QJsonDocument::fromJson(data, &parse_err);
if (reply->error() != QNetworkReply::NoError) {
+ // Strip query string to avoid logging embedded tokens/keys
+ QUrl sanitized = reply->url();
+ sanitized.setQuery(QString{});
LOG_WARN("HTTP",
- QString("HTTP %1: %2 — %3").arg(status).arg(reply->url().toString()).arg(reply->errorString()));
+ QString("HTTP %1: %2 — %3").arg(status).arg(sanitized.toString()).arg(reply->errorString()));
// 401/403 must always be returned as err() so session expiry detection
// in AuthApi/SessionGuard works correctly — even when the body is valid JSON.
@@ -105,6 +108,10 @@ void HttpClient::set_session_token(const QString& token) {
session_token_ = token;
}
+void HttpClient::clear_session_token() {
+ session_token_.clear();
+}
+
void HttpClient::set_base_url(const QString& base) {
base_url_ = base;
}
diff --git a/fincept-qt/src/network/http/HttpClient.h b/fincept-qt/src/network/http/HttpClient.h
index 9b41cb97c..eb5a9cf29 100644
--- a/fincept-qt/src/network/http/HttpClient.h
+++ b/fincept-qt/src/network/http/HttpClient.h
@@ -28,6 +28,7 @@ class HttpClient : public QObject {
void set_auth_header(const QString& api_key);
void set_session_token(const QString& token);
+ void clear_session_token();
void set_base_url(const QString& base);
private:
diff --git a/fincept-qt/src/python/PythonSetupManager.cpp b/fincept-qt/src/python/PythonSetupManager.cpp
index cfca2b3dd..3bebad798 100644
--- a/fincept-qt/src/python/PythonSetupManager.cpp
+++ b/fincept-qt/src/python/PythonSetupManager.cpp
@@ -4,6 +4,7 @@
// Parallel venv creation + package installation.
#include "python/PythonSetupManager.h"
+#include "core/config/AppPaths.h"
#include "core/logging/Logger.h"
#include <QCoreApplication>
@@ -14,7 +15,6 @@
#include <QFuture>
#include <QMetaObject>
#include <QProcess>
-#include <QStandardPaths>
#include <QSysInfo>
#include <QtConcurrent>
@@ -38,22 +38,7 @@ PythonSetupManager::PythonSetupManager(QObject* parent) : QObject(parent) {}
// ─────────────────────────────────────────────────────────────────────────────
QString PythonSetupManager::install_dir() const {
-#ifdef _WIN32
- // AppLocalDataLocation = %LOCALAPPDATA% — matches Tauri's com.fincept.terminal path.
- // GenericDataLocation can return either Local or Roaming depending on Qt version/build,
- // so pin to AppLocalDataLocation for consistency across all Windows builds.
- QString base = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
- // AppLocalDataLocation = .../Local/Fincept/FinceptTerminal — strip to .../Local/
- // by going up two levels, then append the app-specific folder name.
- QDir d(base);
- d.cdUp(); // .../Local/Fincept
- d.cdUp(); // .../Local
- return d.absolutePath() + "/com.fincept.terminal";
-#elif defined(__APPLE__)
- return QDir::homePath() + "/Library/Application Support/com.fincept.terminal";
-#else
- return QDir::homePath() + "/.local/share/com.fincept.terminal";
-#endif
+ return fincept::AppPaths::root();
}
// ─────────────────────────────────────────────────────────────────────────────
@@ -531,6 +516,7 @@ bool PythonSetupManager::install_packages(const QString& venv_name, const QStrin
LOG_INFO("PythonSetup", QString("Installing packages into %1 from %2").arg(venv_name, req_path));
QString venv_python = python_path(venv_name);
+ QString step_key = venv_name.contains("numpy1") ? "packages-numpy1" : "packages-numpy2";
QStringList env = {
"UV_PYTHON_INSTALL_DIR=" + install_dir() + "/python",
@@ -538,7 +524,119 @@ bool PythonSetupManager::install_packages(const QString& venv_name, const QStrin
"PEEWEE_NO_C_EXTENSION=1",
};
- return run_command(uv_path(), {"pip", "install", "--python", venv_python, "-r", req_path}, env);
+ // ── Pass 1: try installing everything at once (fast path) ────────────────
+ // This succeeds on most machines and is 10-100x faster than one-by-one.
+ LOG_INFO("PythonSetup", QString("[%1] Pass 1: bulk install from %2").arg(venv_name, requirements_file));
+ emit_progress(step_key, 5, "Installing packages (bulk)...");
+
+ QString bulk_stderr;
+ bool bulk_ok = run_command_capture(
+ uv_path(),
+ {"pip", "install", "--python", venv_python, "-r", req_path},
+ env,
+ bulk_stderr);
+
+ if (bulk_ok) {
+ LOG_INFO("PythonSetup", QString("[%1] Bulk install succeeded").arg(venv_name));
+ emit_progress(step_key, 100, "All packages installed");
+ return true;
+ }
+
+ // ── Pass 2: bulk failed — install packages one-by-one, skip failures ────
+ LOG_WARN("PythonSetup",
+ QString("[%1] Bulk install failed (stderr: %2) — falling back to per-package install")
+ .arg(venv_name, bulk_stderr.left(300)));
+ emit_progress(step_key, 10, "Bulk install failed — retrying package by package...");
+
+ QStringList packages = read_packages_from_file(req_path);
+ if (packages.isEmpty()) {
+ LOG_ERROR("PythonSetup", "No packages parsed from: " + req_path);
+ return false;
+ }
+
+ QStringList failed = install_packages_individually(venv_name, packages, env, step_key);
+
+ if (failed.isEmpty()) {
+ LOG_INFO("PythonSetup", QString("[%1] All packages installed individually").arg(venv_name));
+ emit_progress(step_key, 100, "All packages installed");
+ } else {
+ LOG_WARN("PythonSetup",
+ QString("[%1] %2 package(s) skipped: %3")
+ .arg(venv_name)
+ .arg(failed.size())
+ .arg(failed.join(", ").left(300)));
+ emit_progress(step_key, 100,
+ QString("Done — %1 package(s) skipped (see log)").arg(failed.size()));
+ }
+
+ // Always return true from pass 2 — a partial environment is more useful
+ // than no environment. The skipped packages are logged for diagnosis.
+ return true;
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Read packages from a requirements file, stripping comments and blank lines.
+// Returns one entry per non-empty, non-comment line.
+// ─────────────────────────────────────────────────────────────────────────────
+
+QStringList PythonSetupManager::read_packages_from_file(const QString& req_path) const {
+ QFile file(req_path);
+ if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+ return {};
+
+ QStringList packages;
+ while (!file.atEnd()) {
+ QString line = QString::fromUtf8(file.readLine()).trimmed();
+ // Skip blank lines, comments, and pip options (-r, --extra-index-url, etc.)
+ if (line.isEmpty() || line.startsWith('#') || line.startsWith('-'))
+ continue;
+ // Strip inline comments e.g. "numpy>=1.26 # required by X"
+ int comment_pos = line.indexOf('#');
+ if (comment_pos > 0)
+ line = line.left(comment_pos).trimmed();
+ if (!line.isEmpty())
+ packages << line;
+ }
+ return packages;
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Install packages one by one, skipping any that fail.
+// Returns the list of packages that failed (for logging).
+// ─────────────────────────────────────────────────────────────────────────────
+
+QStringList PythonSetupManager::install_packages_individually(const QString& venv_name,
+ const QStringList& packages,
+ const QStringList& env_vars,
+ const QString& step_key) {
+ QString venv_python = python_path(venv_name);
+ QStringList failed;
+ int total = packages.size();
+
+ for (int i = 0; i < total; ++i) {
+ const QString& pkg = packages[i];
+ int pct = 10 + static_cast<int>(90.0 * i / total);
+ emit_progress(step_key, pct,
+ QString("Installing %1/%2: %3").arg(i + 1).arg(total).arg(pkg));
+
+ QString pkg_stderr;
+ bool ok = run_command_capture(
+ uv_path(),
+ {"pip", "install", "--python", venv_python, pkg},
+ env_vars,
+ pkg_stderr);
+
+ if (ok) {
+ LOG_INFO("PythonSetup", QString("[%1] Installed: %2").arg(venv_name, pkg));
+ } else {
+ LOG_WARN("PythonSetup",
+ QString("[%1] Skipped (failed): %2 — %3")
+ .arg(venv_name, pkg, pkg_stderr.left(200)));
+ failed << pkg;
+ }
+ }
+
+ return failed;
}
// ─────────────────────────────────────────────────────────────────────────────
@@ -619,6 +717,41 @@ bool PythonSetupManager::run_command(const QString& program, const QStringList&
return true;
}
+// ─────────────────────────────────────────────────────────────────────────────
+// Helper: run command, capture stderr (used for per-package failure diagnosis)
+// ─────────────────────────────────────────────────────────────────────────────
+
+bool PythonSetupManager::run_command_capture(const QString& program, const QStringList& args,
+ const QStringList& env_vars, QString& stderr_out) const {
+ QProcess proc;
+
+ if (!env_vars.isEmpty()) {
+ QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+ for (const auto& var : env_vars) {
+ int eq = var.indexOf('=');
+ if (eq > 0)
+ env.insert(var.left(eq), var.mid(eq + 1));
+ }
+ proc.setProcessEnvironment(env);
+ }
+
+#ifdef _WIN32
+ proc.setCreateProcessArgumentsModifier([](QProcess::CreateProcessArguments* cpa) {
+ cpa->flags |= 0x08000000; // CREATE_NO_WINDOW
+ });
+#endif
+
+ proc.start(program, args);
+ if (!proc.waitForFinished(30 * 60 * 1000)) {
+ proc.kill();
+ stderr_out = "timed out";
+ return false;
+ }
+
+ stderr_out = QString::fromUtf8(proc.readAllStandardError());
+ return proc.exitCode() == 0;
+}
+
// ─────────────────────────────────────────────────────────────────────────────
// Helper: download file
// ─────────────────────────────────────────────────────────────────────────────
diff --git a/fincept-qt/src/python/PythonSetupManager.h b/fincept-qt/src/python/PythonSetupManager.h
index 04b86803c..38db1b261 100644
--- a/fincept-qt/src/python/PythonSetupManager.h
+++ b/fincept-qt/src/python/PythonSetupManager.h
@@ -79,8 +79,18 @@ class PythonSetupManager : public QObject {
// Helpers
bool run_command(const QString& program, const QStringList& args, const QStringList& env_vars = {}) const;
+ // Like run_command but captures stderr — used for per-package failure diagnosis.
+ bool run_command_capture(const QString& program, const QStringList& args,
+ const QStringList& env_vars, QString& stderr_out) const;
QString download_file(const QString& url, const QString& dest_path) const;
+ // Two-pass resilient package install helpers
+ QStringList read_packages_from_file(const QString& req_path) const;
+ QStringList install_packages_individually(const QString& venv_name,
+ const QStringList& packages,
+ const QStringList& env_vars,
+ const QString& step_key);
+
// Requirements hash tracking — detect when requirements change across app versions
QString compute_requirements_hash(const QString& filename) const;
QString load_stored_hash(const QString& venv_name) const;
diff --git a/fincept-qt/src/screens/ai_quant_lab/AIQuantLabScreen.cpp b/fincept-qt/src/screens/ai_quant_lab/AIQuantLabScreen.cpp
index b45d075c6..b1fbcd6b3 100644
--- a/fincept-qt/src/screens/ai_quant_lab/AIQuantLabScreen.cpp
+++ b/fincept-qt/src/screens/ai_quant_lab/AIQuantLabScreen.cpp
@@ -4,6 +4,7 @@
#include "core/logging/Logger.h"
#include "screens/ai_quant_lab/QuantModulePanel.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QHBoxLayout>
#include <QScrollArea>
@@ -15,6 +16,10 @@ using namespace fincept::services::quant;
AIQuantLabScreen::AIQuantLabScreen(QWidget* parent) : QWidget(parent) {
modules_ = all_quant_modules();
build_ui();
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) {
+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));
+ });
LOG_INFO("AIQuantLab", "Screen constructed");
}
@@ -69,7 +74,7 @@ QWidget* AIQuantLabScreen::build_top_bar() {
hl->setSpacing(12);
auto* brand = new QLabel("AI QUANT LAB", bar);
- brand->setStyleSheet(QString("color:#9D4EDD; font-size:%1px; font-weight:700; font-family:%2;"
+ brand->setStyleSheet(QString("color:" + QString(ui::colors::INFO()) + "; font-weight:700; font-family:%2;"
"padding:4px 12px; background:rgba(157,78,221,0.08);"
"border:1px solid rgba(157,78,221,0.25); border-radius:2px;")
.arg(ui::fonts::TINY)
@@ -88,7 +93,7 @@ QWidget* AIQuantLabScreen::build_top_bar() {
btn->setToolTip(mod.label);
btn->setCursor(Qt::PointingHandCursor);
btn->setStyleSheet(
- QString("QPushButton { color:%1; font-size:8px; font-family:%2;"
+ QString("QPushButton { color:%1; font-family:%2;"
"padding:3px 6px; border:1px solid transparent; border-radius:2px;"
"background:transparent; }"
"QPushButton:hover { background:rgba(%3,0.08); color:%4; }")
@@ -104,7 +109,7 @@ QWidget* AIQuantLabScreen::build_top_bar() {
hl->addStretch(1);
auto* ready = new QLabel("18 MODULES", bar);
- ready->setStyleSheet(QString("color:%1; font-size:9px; font-family:%2; padding:3px 8px;"
+ ready->setStyleSheet(QString("color:%1; font-family:%2; padding:3px 8px;"
"background:rgba(22,163,74,0.08); border:1px solid rgba(22,163,74,0.25);"
"border-radius:2px; font-weight:700;")
.arg(ui::colors::POSITIVE)
@@ -130,7 +135,7 @@ QWidget* AIQuantLabScreen::build_left_sidebar() {
auto* hhl = new QHBoxLayout(header);
hhl->setContentsMargins(12, 0, 12, 0);
auto* title = new QLabel("MODULES", header);
- title->setStyleSheet(QString("color:#9D4EDD; font-size:9px; font-weight:700; font-family:%1; letter-spacing:1px;")
+ title->setStyleSheet(QString("color:" + QString(ui::colors::INFO()) + "; font-weight:700; font-family:%1; letter-spacing:1px;")
.arg(ui::fonts::DATA_FAMILY));
hhl->addWidget(title);
hhl->addStretch();
@@ -154,7 +159,7 @@ QWidget* AIQuantLabScreen::build_left_sidebar() {
QString cat_label = mod.category;
cat_label.replace('_', '/');
auto* cat = new QLabel(cat_label, list);
- cat->setStyleSheet(QString("color:%1; font-size:8px; font-weight:700; font-family:%2;"
+ cat->setStyleSheet(QString("color:%1; font-weight:700; font-family:%2;"
"padding:8px 12px 4px 12px; letter-spacing:1px;")
.arg(ui::colors::TEXT_TERTIARY)
.arg(ui::fonts::DATA_FAMILY));
@@ -194,7 +199,7 @@ QWidget* AIQuantLabScreen::build_right_sidebar() {
vl->setSpacing(10);
auto* title = new QLabel("MODULE INFO", panel);
- title->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; font-family:%2; letter-spacing:1px;")
+ title->setStyleSheet(QString("color:%1; font-weight:700; font-family:%2; letter-spacing:1px;")
.arg(ui::colors::CYAN)
.arg(ui::fonts::DATA_FAMILY));
vl->addWidget(title);
@@ -205,20 +210,20 @@ QWidget* AIQuantLabScreen::build_right_sidebar() {
vl->addWidget(right_title_);
right_category_ = new QLabel(panel);
- right_category_->setStyleSheet(QString("color:%1; font-size:9px; font-family:%2;")
+ right_category_->setStyleSheet(QString("color:%1; font-family:%2;")
.arg(ui::colors::TEXT_SECONDARY)
.arg(ui::fonts::DATA_FAMILY));
vl->addWidget(right_category_);
right_desc_ = new QLabel(panel);
right_desc_->setWordWrap(true);
- right_desc_->setStyleSheet(QString("color:%1; font-size:9px; font-family:%2; line-height:1.5;")
+ right_desc_->setStyleSheet(QString("color:%1; font-family:%2; line-height:1.5;")
.arg(ui::colors::TEXT_PRIMARY)
.arg(ui::fonts::DATA_FAMILY));
vl->addWidget(right_desc_);
right_script_ = new QLabel(panel);
- right_script_->setStyleSheet(QString("color:%1; font-size:8px; font-family:%2; padding:6px;"
+ right_script_->setStyleSheet(QString("color:%1; font-family:%2; padding:6px;"
"background:%3; border:1px solid %4; border-radius:2px;")
.arg(ui::colors::TEXT_TERTIARY)
.arg(ui::fonts::DATA_FAMILY)
@@ -235,7 +240,7 @@ QWidget* AIQuantLabScreen::build_right_sidebar() {
svl->setContentsMargins(10, 10, 10, 10);
svl->setSpacing(4);
auto* st = new QLabel("PLATFORM STATS", stats);
- st->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; font-family:%2;")
+ st->setStyleSheet(QString("color:%1; font-weight:700; font-family:%2;")
.arg(ui::colors::CYAN)
.arg(ui::fonts::DATA_FAMILY));
svl->addWidget(st);
@@ -245,11 +250,11 @@ QWidget* AIQuantLabScreen::build_right_sidebar() {
auto* rl = new QHBoxLayout(r);
rl->setContentsMargins(0, 0, 0, 0);
auto* lbl = new QLabel(l, r);
- lbl->setStyleSheet(QString("color:%1; font-size:9px; font-family:%2;")
+ lbl->setStyleSheet(QString("color:%1; font-family:%2;")
.arg(ui::colors::TEXT_TERTIARY)
.arg(ui::fonts::DATA_FAMILY));
auto* val = new QLabel(v, r);
- val->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; font-family:%2;")
+ val->setStyleSheet(QString("color:%1; font-weight:700; font-family:%2;")
.arg(ui::colors::TEXT_PRIMARY)
.arg(ui::fonts::DATA_FAMILY));
rl->addWidget(lbl);
@@ -276,18 +281,18 @@ QWidget* AIQuantLabScreen::build_status_bar() {
hl->setContentsMargins(12, 0, 12, 0);
hl->setSpacing(16);
auto s =
- QString("color:%1; font-size:8px; font-family:%2;").arg(ui::colors::TEXT_TERTIARY).arg(ui::fonts::DATA_FAMILY);
+ QString("color:%1; font-family:%2;").arg(ui::colors::TEXT_TERTIARY).arg(ui::fonts::DATA_FAMILY);
auto* l1 = new QLabel("ENGINE:", bar);
l1->setStyleSheet(s);
auto* v1 = new QLabel("QLIB + GS QUANT + PYTHON", bar);
- v1->setStyleSheet(QString("color:%1; font-size:8px; font-weight:700; font-family:%2;")
+ v1->setStyleSheet(QString("color:%1; font-weight:700; font-family:%2;")
.arg(ui::colors::POSITIVE)
.arg(ui::fonts::DATA_FAMILY));
hl->addWidget(l1);
hl->addWidget(v1);
hl->addStretch();
auto* v2 = new QLabel("READY", bar);
- v2->setStyleSheet(QString("color:%1; font-size:8px; font-weight:700; font-family:%2;")
+ v2->setStyleSheet(QString("color:%1; font-weight:700; font-family:%2;")
.arg(ui::colors::POSITIVE)
.arg(ui::fonts::DATA_FAMILY));
hl->addWidget(v2);
@@ -327,7 +332,7 @@ void AIQuantLabScreen::update_sidebar_selection() {
for (int i = 0; i < quick_buttons_.size(); ++i) {
const auto& mod = modules_[i];
bool active = (i == active_index_);
- quick_buttons_[i]->setStyleSheet(QString("QPushButton { color:%1; font-size:8px; font-family:%2;"
+ quick_buttons_[i]->setStyleSheet(QString("QPushButton { color:%1; font-family:%2;"
"padding:3px 6px; border:1px solid %3; border-radius:2px;"
"background:%4; font-weight:%5; }")
.arg(active ? mod.color.name() : ui::colors::TEXT_TERTIARY)
@@ -349,7 +354,7 @@ void AIQuantLabScreen::update_sidebar_selection() {
void AIQuantLabScreen::update_right_panel() {
const auto& mod = modules_[active_index_];
right_title_->setText(mod.label.toUpper());
- right_title_->setStyleSheet(QString("color:%1; font-size:11px; font-weight:700; font-family:%2;")
+ right_title_->setStyleSheet(QString("color:%1; font-weight:700; font-family:%2;")
.arg(mod.color.name())
.arg(ui::fonts::DATA_FAMILY));
right_category_->setText(QString(mod.category).replace('_', '/') + " module");
diff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.cpp b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.cpp
index aa7c584b8..2281f12e7 100644
--- a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.cpp
+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.cpp
@@ -6,6 +6,7 @@
#include "services/file_manager/FileManagerService.h"
#include "storage/repositories/LlmProfileRepository.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QDateTime>
#include <QDesktopServices>
@@ -140,6 +141,11 @@ QJsonObject QuantModulePanel::llm_config_from_combo(QComboBox* combo) const {
QuantModulePanel::QuantModulePanel(const QuantModule& mod, QWidget* parent) : QWidget(parent), module_(mod) {
build_ui();
connect_service();
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) {
+ setStyleSheet(QString("background:%1;color:%2;")
+ .arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY()));
+ });
}
void QuantModulePanel::connect_service() {
@@ -173,12 +179,12 @@ void QuantModulePanel::build_ui() {
hhl->addWidget(div);
auto* cat = new QLabel(module_.category, header);
cat->setStyleSheet(
- QString("color:%1; font-size:9px; font-family:%2;").arg(ui::colors::TEXT_TERTIARY).arg(ui::fonts::DATA_FAMILY));
+ QString("color:%1; font-family:%2;").arg(ui::colors::TEXT_TERTIARY).arg(ui::fonts::DATA_FAMILY));
hhl->addWidget(cat);
hhl->addStretch();
status_label_ = new QLabel(header);
status_label_->setStyleSheet(
- QString("color:%1; font-size:9px; font-family:%2;").arg(ui::colors::TEXT_TERTIARY).arg(ui::fonts::DATA_FAMILY));
+ QString("color:%1; font-family:%2;").arg(ui::colors::TEXT_TERTIARY).arg(ui::fonts::DATA_FAMILY));
hhl->addWidget(status_label_);
root->addWidget(header);
@@ -404,7 +410,7 @@ QWidget* QuantModulePanel::build_gs_quant_panel() {
svl->addWidget(build_input_row("Position Value ($)", st_pos, stress));
auto* st_hint = new QLabel("Tests 9 historical crisis scenarios: 2008, COVID-19, etc.", stress);
st_hint->setStyleSheet(
- QString("color:%1; font-size:9px; font-family:%2;").arg(ui::colors::TEXT_TERTIARY).arg(ui::fonts::DATA_FAMILY));
+ QString("color:%1; font-family:%2;").arg(ui::colors::TEXT_TERTIARY).arg(ui::fonts::DATA_FAMILY));
svl->addWidget(st_hint);
auto* stress_run = make_run_button("RUN STRESS TEST", stress);
connect(stress_run, &QPushButton::clicked, this, [this]() {
@@ -510,7 +516,7 @@ QWidget* QuantModulePanel::build_cfa_quant_panel() {
// Data input
auto* data_lbl = new QLabel("DATA INPUT", w);
- data_lbl->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; font-family:%2;"
+ data_lbl->setStyleSheet(QString("color:%1; font-weight:700; font-family:%2;"
"letter-spacing:1px;")
.arg(module_.color.name())
.arg(ui::fonts::DATA_FAMILY));
@@ -985,7 +991,7 @@ QWidget* QuantModulePanel::build_rd_agent_tab(QComboBox* llm_combo) {
sbl->setContentsMargins(12, 0, 12, 0);
sbl->setSpacing(8);
auto* status_dot = new QLabel("●", status_bar);
- status_dot->setStyleSheet(QString("color:%1; font-size:8px;").arg(ui::colors::TEXT_TERTIARY));
+ status_dot->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_TERTIARY));
sbl->addWidget(status_dot);
auto* status_txt = new QLabel("RD-Agent ready", status_bar);
status_txt->setObjectName("rdStatusTxt");
@@ -1247,18 +1253,18 @@ QWidget* QuantModulePanel::build_rd_agent_tab(QComboBox* llm_combo) {
auto* stop_btn = new QPushButton("STOP", tm_toolbar);
stop_btn->setCursor(Qt::PointingHandCursor);
- stop_btn->setStyleSheet(QString("QPushButton { background:#c0392b; color:#fff; border:none;"
+ stop_btn->setStyleSheet(QString("QPushButton { background:" + QString(ui::colors::NEGATIVE()) + "; color:" + QString(ui::colors::TEXT_PRIMARY()) + "; border:none;"
"font-family:%1; font-size:%2px; font-weight:700; padding:5px 12px; border-radius:2px; }"
- "QPushButton:hover { background:#e74c3c; }")
+ "QPushButton:hover { background:" + QString(ui::colors::NEGATIVE()) + "; }")
.arg(ui::fonts::DATA_FAMILY)
.arg(ui::fonts::TINY));
tm_hl->addWidget(stop_btn);
auto* resume_btn = new QPushButton("RESUME", tm_toolbar);
resume_btn->setCursor(Qt::PointingHandCursor);
- resume_btn->setStyleSheet(QString("QPushButton { background:#27ae60; color:#fff; border:none;"
+ resume_btn->setStyleSheet(QString("QPushButton { background:" + QString(ui::colors::POSITIVE()) + "; color:" + QString(ui::colors::TEXT_PRIMARY()) + "; border:none;"
"font-family:%1; font-size:%2px; font-weight:700; padding:5px 12px; border-radius:2px; }"
- "QPushButton:hover { background:#2ecc71; }")
+ "QPushButton:hover { background:" + QString(ui::colors::POSITIVE()) + "; }")
.arg(ui::fonts::DATA_FAMILY)
.arg(ui::fonts::TINY));
tm_hl->addWidget(resume_btn);
@@ -1371,7 +1377,7 @@ QWidget* QuantModulePanel::build_generic_panel() {
vl->addWidget(desc);
auto* script_lbl = new QLabel(QString("Python script: %1").arg(module_.script), w);
- script_lbl->setStyleSheet(QString("color:%1; font-size:9px; font-family:%2;"
+ script_lbl->setStyleSheet(QString("color:%1; font-family:%2;"
"padding:6px; background:%3; border:1px solid %4; border-radius:2px;")
.arg(ui::colors::TEXT_TERTIARY)
.arg(ui::fonts::DATA_FAMILY)
@@ -1479,7 +1485,7 @@ void QuantModulePanel::display_result(const QJsonObject& data) {
clear_results();
auto* header = new QLabel("RESULTS");
- header->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; font-family:%2; letter-spacing:1px;")
+ header->setStyleSheet(QString("color:%1; font-weight:700; font-family:%2; letter-spacing:1px;")
.arg(module_.color.name())
.arg(ui::fonts::DATA_FAMILY));
results_layout_->addWidget(header);
@@ -1635,11 +1641,11 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
auto status_str = obj["status"].toString();
auto* status_item = new QTableWidgetItem(status_str);
if (status_str == "running")
- status_item->setForeground(QColor("#f39c12"));
+ status_item->setForeground(QColor("" + QString(ui::colors::WARNING()) + ""));
else if (status_str == "completed")
- status_item->setForeground(QColor("#27ae60"));
+ status_item->setForeground(QColor("" + QString(ui::colors::POSITIVE()) + ""));
else if (status_str == "failed" || status_str == "stopped")
- status_item->setForeground(QColor("#c0392b"));
+ status_item->setForeground(QColor("" + QString(ui::colors::NEGATIVE()) + ""));
rd_task_table_->setItem(row, 2, status_item);
rd_task_table_->setItem(row, 3, new QTableWidgetItem(
QString::number(obj["progress"].toDouble() * 100, 'f', 0) + "%"));
@@ -1995,7 +2001,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
auto* lbl = new QLabel(out, this);
lbl->setWordWrap(true);
lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(drift ? QString("#EF5350") : ui::colors::TEXT_PRIMARY)
+ .arg(drift ? QString("" + QString(ui::colors::NEGATIVE()) + "") : ui::colors::TEXT_PRIMARY)
.arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
results_layout_->addWidget(lbl);
status_label_->setText(drift ? "⚠ Drift detected" : QString("MAE: %1").arg(mae, 0, 'f', 4));
@@ -2187,7 +2193,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
.arg(data["classification"].toString("-")), this);
lbl->setWordWrap(true);
lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(is_toxic ? QString("#EF5350") : ui::colors::TEXT_PRIMARY)
+ .arg(is_toxic ? QString("" + QString(ui::colors::NEGATIVE()) + "") : ui::colors::TEXT_PRIMARY)
.arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
results_layout_->addWidget(lbl);
status_label_->setText(is_toxic ? "⚠ Toxic flow detected" : "Flow normal");
diff --git a/fincept-qt/src/screens/chat_mode/ChatAgentPanel.cpp b/fincept-qt/src/screens/chat_mode/ChatAgentPanel.cpp
new file mode 100644
index 000000000..5f6a2b271
--- /dev/null
+++ b/fincept-qt/src/screens/chat_mode/ChatAgentPanel.cpp
@@ -0,0 +1,424 @@
+#include "screens/chat_mode/ChatAgentPanel.h"
+#include "screens/chat_mode/ChatModeService.h"
+#include "core/logging/Logger.h"
+
+#include <QHBoxLayout>
+#include <QInputDialog>
+#include <QMessageBox>
+#include <QVBoxLayout>
+
+namespace fincept::chat_mode {
+
+static const char* LIST_SS =
+ "QListWidget{background:#0d0d0d;border:1px solid #1a1a1a;color:#e5e5e5;"
+ "font-size:12px;font-family:'Consolas',monospace;border-radius:4px;outline:none;}"
+ "QListWidget::item{padding:6px 8px;border-bottom:1px solid #111111;}"
+ "QListWidget::item:selected{background:#1a1a1a;color:#d97706;}"
+ "QListWidget::item:hover{background:#111111;}"
+ "QScrollBar:vertical{background:#0d0d0d;width:4px;}"
+ "QScrollBar::handle:vertical{background:#2a2a2a;border-radius:2px;}"
+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}";
+
+// ── Constructor ───────────────────────────────────────────────────────────────
+
+ChatAgentPanel::ChatAgentPanel(QWidget* parent) : QWidget(parent) {
+ build_ui();
+ refresh_memory();
+ refresh_schedules();
+ refresh_tasks();
+}
+
+// ── Build UI ──────────────────────────────────────────────────────────────────
+
+void ChatAgentPanel::build_ui() {
+ setFixedWidth(280);
+ setStyleSheet("background:#0a0a0a;border-left:1px solid #1a1a1a;");
+
+ auto* vl = new QVBoxLayout(this);
+ vl->setContentsMargins(0, 0, 0, 0);
+ vl->setSpacing(0);
+
+ // Tab bar
+ tab_bar_ = new QTabBar;
+ tab_bar_->setExpanding(true);
+ tab_bar_->addTab("Memory");
+ tab_bar_->addTab("Schedules");
+ tab_bar_->addTab("Tasks");
+ tab_bar_->setStyleSheet(
+ "QTabBar{background:#0a0a0a;border-bottom:1px solid #1a1a1a;}"
+ "QTabBar::tab{background:#0a0a0a;color:#606060;padding:7px 0;"
+ "font-size:11px;font-family:'Consolas',monospace;border:none;"
+ "border-bottom:2px solid transparent;}"
+ "QTabBar::tab:selected{color:#d97706;border-bottom:2px solid #d97706;}"
+ "QTabBar::tab:hover{color:#e5e5e5;}");
+ connect(tab_bar_, &QTabBar::currentChanged, this, &ChatAgentPanel::on_tab_changed);
+ vl->addWidget(tab_bar_);
+
+ // Stacked content
+ stack_ = new QStackedWidget;
+ stack_->addWidget(build_memory_tab());
+ stack_->addWidget(build_schedules_tab());
+ stack_->addWidget(build_tasks_tab());
+ vl->addWidget(stack_, 1);
+}
+
+QPushButton* ChatAgentPanel::make_action_btn(const QString& text, const QString& tooltip) {
+ auto* btn = new QPushButton(text);
+ btn->setToolTip(tooltip);
+ btn->setFixedHeight(24);
+ btn->setStyleSheet(
+ "QPushButton{background:#111111;color:#808080;border:1px solid #2a2a2a;"
+ "border-radius:3px;font-size:11px;font-family:'Consolas',monospace;}"
+ "QPushButton:hover{background:#1a1a1a;color:#e5e5e5;border-color:#d97706;}"
+ "QPushButton:disabled{color:#333333;border-color:#1a1a1a;}");
+ return btn;
+}
+
+QWidget* ChatAgentPanel::build_memory_tab() {
+ auto* w = new QWidget;
+ auto* vl = new QVBoxLayout(w);
+ vl->setContentsMargins(8, 8, 8, 8);
+ vl->setSpacing(6);
+
+ auto* title = new QLabel("Agent Memory");
+ title->setStyleSheet(
+ "color:#606060;font-size:11px;font-weight:700;"
+ "font-family:'Consolas',monospace;background:transparent;");
+ vl->addWidget(title);
+
+ memory_list_ = new QListWidget;
+ memory_list_->setStyleSheet(LIST_SS);
+ vl->addWidget(memory_list_, 1);
+
+ auto* btn_row = new QHBoxLayout;
+ btn_row->setSpacing(4);
+ mem_add_btn_ = make_action_btn("+ Add", "Add a memory entry");
+ mem_del_btn_ = make_action_btn("Delete", "Delete selected entry");
+ mem_clear_btn_ = make_action_btn("Clear All","Clear all memory");
+ mem_del_btn_->setEnabled(false);
+ btn_row->addWidget(mem_add_btn_);
+ btn_row->addWidget(mem_del_btn_);
+ btn_row->addWidget(mem_clear_btn_);
+ vl->addLayout(btn_row);
+
+ connect(memory_list_, &QListWidget::itemSelectionChanged, this, [this]() {
+ mem_del_btn_->setEnabled(!memory_list_->selectedItems().isEmpty());
+ });
+ connect(mem_add_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_add_memory);
+ connect(mem_del_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_delete_memory);
+ connect(mem_clear_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_clear_all_memory);
+
+ return w;
+}
+
+QWidget* ChatAgentPanel::build_schedules_tab() {
+ auto* w = new QWidget;
+ auto* vl = new QVBoxLayout(w);
+ vl->setContentsMargins(8, 8, 8, 8);
+ vl->setSpacing(6);
+
+ auto* title = new QLabel("Scheduled Queries");
+ title->setStyleSheet(
+ "color:#606060;font-size:11px;font-weight:700;"
+ "font-family:'Consolas',monospace;background:transparent;");
+ vl->addWidget(title);
+
+ auto* hint = new QLabel("Run agent queries on a schedule (e.g. daily at 9 AM).");
+ hint->setWordWrap(true);
+ hint->setStyleSheet(
+ "color:#404040;font-size:10px;font-family:'Consolas',monospace;background:transparent;");
+ vl->addWidget(hint);
+
+ sched_list_ = new QListWidget;
+ sched_list_->setStyleSheet(LIST_SS);
+ vl->addWidget(sched_list_, 1);
+
+ auto* btn_row = new QHBoxLayout;
+ btn_row->setSpacing(4);
+ sched_add_btn_ = make_action_btn("+ Add", "Create a schedule");
+ sched_del_btn_ = make_action_btn("Delete", "Delete selected");
+ sched_toggle_btn_ = make_action_btn("Pause", "Pause / resume selected");
+ sched_del_btn_->setEnabled(false);
+ sched_toggle_btn_->setEnabled(false);
+ btn_row->addWidget(sched_add_btn_);
+ btn_row->addWidget(sched_toggle_btn_);
+ btn_row->addWidget(sched_del_btn_);
+ vl->addLayout(btn_row);
+
+ connect(sched_list_, &QListWidget::itemSelectionChanged, this, [this]() {
+ const bool sel = !sched_list_->selectedItems().isEmpty();
+ sched_del_btn_->setEnabled(sel);
+ sched_toggle_btn_->setEnabled(sel);
+ });
+ connect(sched_add_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_add_schedule);
+ connect(sched_del_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_delete_schedule);
+ connect(sched_toggle_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_toggle_schedule);
+
+ return w;
+}
+
+QWidget* ChatAgentPanel::build_tasks_tab() {
+ auto* w = new QWidget;
+ auto* vl = new QVBoxLayout(w);
+ vl->setContentsMargins(8, 8, 8, 8);
+ vl->setSpacing(6);
+
+ auto* title = new QLabel("Background Tasks");
+ title->setStyleSheet(
+ "color:#606060;font-size:11px;font-weight:700;"
+ "font-family:'Consolas',monospace;background:transparent;");
+ vl->addWidget(title);
+
+ task_status_lbl_ = new QLabel("Long-running agent queries.");
+ task_status_lbl_->setWordWrap(true);
+ task_status_lbl_->setStyleSheet(
+ "color:#404040;font-size:10px;font-family:'Consolas',monospace;background:transparent;");
+ vl->addWidget(task_status_lbl_);
+
+ task_list_ = new QListWidget;
+ task_list_->setStyleSheet(LIST_SS);
+ vl->addWidget(task_list_, 1);
+
+ auto* btn_row = new QHBoxLayout;
+ btn_row->setSpacing(4);
+ task_refresh_btn_ = make_action_btn("Refresh", "Refresh task list");
+ task_cancel_btn_ = make_action_btn("Cancel", "Cancel selected task");
+ task_cancel_btn_->setEnabled(false);
+ btn_row->addWidget(task_refresh_btn_);
+ btn_row->addWidget(task_cancel_btn_);
+ btn_row->addStretch();
+ vl->addLayout(btn_row);
+
+ connect(task_list_, &QListWidget::itemSelectionChanged, this, [this]() {
+ task_cancel_btn_->setEnabled(!task_list_->selectedItems().isEmpty());
+ });
+ connect(task_refresh_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_refresh_tasks);
+ connect(task_cancel_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_cancel_task);
+
+ return w;
+}
+
+// ── Tab switch ────────────────────────────────────────────────────────────────
+
+void ChatAgentPanel::on_tab_changed(int index) {
+ stack_->setCurrentIndex(index);
+}
+
+// ── Refresh methods ───────────────────────────────────────────────────────────
+
+void ChatAgentPanel::refresh_memory() {
+ ChatModeService::instance().list_memory(
+ [this](bool ok, QVector<AgentMemory> memories, QString err) {
+ memory_list_->clear();
+ if (!ok) {
+ auto* item = new QListWidgetItem(memory_list_);
+ item->setText("Agent memory not available on this plan.");
+ item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+ LOG_WARN("ChatAgentPanel", "Memory load failed: " + err);
+ return;
+ }
+ memories_ = std::move(memories);
+ if (memories_.isEmpty()) {
+ auto* item = new QListWidgetItem(memory_list_);
+ item->setText("No memory entries yet.");
+ item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+ return;
+ }
+ for (const auto& m : memories_) {
+ auto* item = new QListWidgetItem(memory_list_);
+ item->setText(QString("[%1] %2\n%3").arg(m.memory_type, m.key, m.value));
+ item->setData(Qt::UserRole, m.key);
+ }
+ });
+}
+
+void ChatAgentPanel::refresh_schedules() {
+ ChatModeService::instance().list_schedules(
+ [this](bool ok, QVector<AgentSchedule> schedules, QString err) {
+ sched_list_->clear();
+ if (!ok) {
+ auto* item = new QListWidgetItem(sched_list_);
+ item->setText("Schedules not available on this plan.");
+ item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+ LOG_WARN("ChatAgentPanel", "Schedules load failed: " + err);
+ return;
+ }
+ schedules_ = std::move(schedules);
+ if (schedules_.isEmpty()) {
+ auto* item = new QListWidgetItem(sched_list_);
+ item->setText("No schedules yet.");
+ item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+ return;
+ }
+ for (const auto& s : schedules_) {
+ auto* item = new QListWidgetItem(sched_list_);
+ const QString status_icon = (s.status == "active") ? "▶" : "⏸";
+ item->setText(QString("%1 %2\n%3").arg(status_icon, s.query, s.cron_expression));
+ item->setData(Qt::UserRole, s.schedule_id);
+ item->setData(Qt::UserRole + 1, s.status);
+ }
+ });
+}
+
+void ChatAgentPanel::refresh_tasks() {
+ ChatModeService::instance().list_tasks(
+ [this](bool ok, QVector<AgentTask> tasks, QString err) {
+ task_list_->clear();
+ if (!ok) {
+ auto* item = new QListWidgetItem(task_list_);
+ item->setText("Background tasks not available on this plan.");
+ item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+ LOG_WARN("ChatAgentPanel", "Tasks load failed: " + err);
+ return;
+ }
+ tasks_ = std::move(tasks);
+ if (tasks_.isEmpty()) {
+ auto* item = new QListWidgetItem(task_list_);
+ item->setText("No background tasks yet.");
+ item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+ return;
+ }
+ for (const auto& t : tasks_) {
+ auto* item = new QListWidgetItem(task_list_);
+ const QString icon =
+ t.status == "complete" ? "✓" :
+ t.status == "error" ? "✗" :
+ t.status == "cancelled" ? "⊘" :
+ t.status == "running" ? "⟳" : "·";
+ item->setText(QString("%1 %2\n%3").arg(icon, t.query.left(40), t.status));
+ item->setData(Qt::UserRole, t.task_id);
+ }
+ });
+}
+
+// ── Memory actions ────────────────────────────────────────────────────────────
+
+void ChatAgentPanel::on_add_memory() {
+ bool ok = false;
+ const QString key = QInputDialog::getText(
+ this, "Add Memory", "Key (e.g. risk_tolerance):", QLineEdit::Normal, {}, &ok);
+ if (!ok || key.trimmed().isEmpty()) return;
+
+ const QString value = QInputDialog::getText(
+ this, "Add Memory", QString("Value for \"%1\":").arg(key), QLineEdit::Normal, {}, &ok);
+ if (!ok || value.trimmed().isEmpty()) return;
+
+ // Type selection
+ const QStringList types = {"fact", "preference", "entity"};
+ const QString type = QInputDialog::getItem(
+ this, "Memory Type", "Type:", types, 0, false, &ok);
+ if (!ok) return;
+
+ ChatModeService::instance().save_memory(
+ key.trimmed(), value.trimmed(), type,
+ [this](bool saved_ok, QString err) {
+ if (!saved_ok) {
+ LOG_WARN("ChatAgentPanel", "Save memory failed: " + err);
+ return;
+ }
+ refresh_memory();
+ });
+}
+
+void ChatAgentPanel::on_delete_memory() {
+ auto* item = memory_list_->currentItem();
+ if (!item) return;
+ const QString key = item->data(Qt::UserRole).toString();
+ if (QMessageBox::question(this, "Delete Memory",
+ QString("Delete memory entry \"%1\"?").arg(key),
+ QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes)
+ return;
+ ChatModeService::instance().delete_memory(
+ key, [this](bool ok, QString err) {
+ if (!ok) LOG_WARN("ChatAgentPanel", "Delete memory failed: " + err);
+ refresh_memory();
+ });
+}
+
+void ChatAgentPanel::on_clear_all_memory() {
+ if (QMessageBox::question(this, "Clear All Memory",
+ "Delete ALL agent memory entries? This cannot be undone.",
+ QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes)
+ return;
+ ChatModeService::instance().clear_all_memory(
+ [this](bool ok, QString err) {
+ if (!ok) LOG_WARN("ChatAgentPanel", "Clear memory failed: " + err);
+ refresh_memory();
+ });
+}
+
+// ── Schedule actions ──────────────────────────────────────────────────────────
+
+void ChatAgentPanel::on_add_schedule() {
+ bool ok = false;
+ const QString query = QInputDialog::getText(
+ this, "New Schedule", "Query to run:", QLineEdit::Normal, {}, &ok);
+ if (!ok || query.trimmed().isEmpty()) return;
+
+ const QString cron = QInputDialog::getText(
+ this, "New Schedule",
+ "Cron expression (e.g. \"0 9 * * 1-5\" = weekdays at 9 AM):",
+ QLineEdit::Normal, "0 9 * * 1-5", &ok);
+ if (!ok || cron.trimmed().isEmpty()) return;
+
+ ChatModeService::instance().create_schedule(
+ query.trimmed(), cron.trimmed(), {},
+ [this](bool created_ok, AgentSchedule, QString err) {
+ if (!created_ok) {
+ LOG_WARN("ChatAgentPanel", "Create schedule failed: " + err);
+ return;
+ }
+ refresh_schedules();
+ });
+}
+
+void ChatAgentPanel::on_delete_schedule() {
+ auto* item = sched_list_->currentItem();
+ if (!item) return;
+ const QString id = item->data(Qt::UserRole).toString();
+ ChatModeService::instance().delete_schedule(
+ id, [this](bool ok, QString err) {
+ if (!ok) LOG_WARN("ChatAgentPanel", "Delete schedule failed: " + err);
+ refresh_schedules();
+ });
+}
+
+void ChatAgentPanel::on_toggle_schedule() {
+ auto* item = sched_list_->currentItem();
+ if (!item) return;
+ const QString id = item->data(Qt::UserRole).toString();
+ const QString status = item->data(Qt::UserRole + 1).toString();
+
+ if (status == "active") {
+ ChatModeService::instance().pause_schedule(
+ id, [this](bool ok, QString err) {
+ if (!ok) LOG_WARN("ChatAgentPanel", "Pause schedule failed: " + err);
+ refresh_schedules();
+ });
+ } else {
+ ChatModeService::instance().resume_schedule(
+ id, [this](bool ok, QString err) {
+ if (!ok) LOG_WARN("ChatAgentPanel", "Resume schedule failed: " + err);
+ refresh_schedules();
+ });
+ }
+}
+
+// ── Task actions ──────────────────────────────────────────────────────────────
+
+void ChatAgentPanel::on_refresh_tasks() {
+ refresh_tasks();
+}
+
+void ChatAgentPanel::on_cancel_task() {
+ auto* item = task_list_->currentItem();
+ if (!item) return;
+ const QString id = item->data(Qt::UserRole).toString();
+ ChatModeService::instance().cancel_task(
+ id, [this](bool ok, QString err) {
+ if (!ok) LOG_WARN("ChatAgentPanel", "Cancel task failed: " + err);
+ refresh_tasks();
+ });
+}
+
+} // namespace fincept::chat_mode
diff --git a/fincept-qt/src/screens/chat_mode/ChatAgentPanel.h b/fincept-qt/src/screens/chat_mode/ChatAgentPanel.h
new file mode 100644
index 000000000..f4c6d0e71
--- /dev/null
+++ b/fincept-qt/src/screens/chat_mode/ChatAgentPanel.h
@@ -0,0 +1,75 @@
+#pragma once
+#include "screens/chat_mode/ChatModeTypes.h"
+
+#include <QLabel>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QPushButton>
+#include <QStackedWidget>
+#include <QTabBar>
+#include <QWidget>
+
+namespace fincept::chat_mode {
+
+/// Right panel — tabs for Memory, Schedules, Tasks.
+class ChatAgentPanel : public QWidget {
+ Q_OBJECT
+ public:
+ explicit ChatAgentPanel(QWidget* parent = nullptr);
+
+ void refresh_memory();
+ void refresh_schedules();
+ void refresh_tasks();
+
+ private slots:
+ void on_tab_changed(int index);
+
+ // Memory
+ void on_add_memory();
+ void on_delete_memory();
+ void on_clear_all_memory();
+
+ // Schedules
+ void on_add_schedule();
+ void on_delete_schedule();
+ void on_toggle_schedule();
+
+ // Tasks
+ void on_refresh_tasks();
+ void on_cancel_task();
+
+ private:
+ QTabBar* tab_bar_ = nullptr;
+ QStackedWidget* stack_ = nullptr;
+
+ // Memory tab
+ QListWidget* memory_list_ = nullptr;
+ QPushButton* mem_add_btn_ = nullptr;
+ QPushButton* mem_del_btn_ = nullptr;
+ QPushButton* mem_clear_btn_= nullptr;
+
+ // Schedules tab
+ QListWidget* sched_list_ = nullptr;
+ QPushButton* sched_add_btn_ = nullptr;
+ QPushButton* sched_del_btn_ = nullptr;
+ QPushButton* sched_toggle_btn_ = nullptr;
+
+ // Tasks tab
+ QListWidget* task_list_ = nullptr;
+ QPushButton* task_refresh_btn_ = nullptr;
+ QPushButton* task_cancel_btn_ = nullptr;
+ QLabel* task_status_lbl_ = nullptr;
+
+ QVector<AgentMemory> memories_;
+ QVector<AgentSchedule> schedules_;
+ QVector<AgentTask> tasks_;
+
+ void build_ui();
+ QWidget* build_memory_tab();
+ QWidget* build_schedules_tab();
+ QWidget* build_tasks_tab();
+
+ static QPushButton* make_action_btn(const QString& text, const QString& tooltip);
+};
+
+} // namespace fincept::chat_mode
diff --git a/fincept-qt/src/screens/chat_mode/ChatMessagePanel.cpp b/fincept-qt/src/screens/chat_mode/ChatMessagePanel.cpp
new file mode 100644
index 000000000..4ea1cb51a
--- /dev/null
+++ b/fincept-qt/src/screens/chat_mode/ChatMessagePanel.cpp
@@ -0,0 +1,567 @@
+#include "screens/chat_mode/ChatMessagePanel.h"
+#include "screens/chat_mode/ChatModeService.h"
+#include "ui/markdown/MarkdownRenderer.h"
+
+#include <QEvent>
+#include <QHBoxLayout>
+#include <QKeyEvent>
+#include <QScrollBar>
+#include <QSizePolicy>
+#include <QTimer>
+
+namespace fincept::chat_mode {
+
+// ── Stylesheet constants ──────────────────────────────────────────────────────
+
+static const char* USER_BUBBLE_SS =
+ "background:#1a1a0a;color:#e5e5e5;border:1px solid #2a2a1a;"
+ "border-radius:8px;padding:10px 12px;font-size:13px;"
+ "font-family:'Consolas',monospace;";
+
+static const char* AI_BUBBLE_SS =
+ "background:#0a0a14;color:#e5e5e5;border:1px solid #1a1a2a;"
+ "border-radius:8px;padding:10px 12px;font-size:13px;"
+ "font-family:'Consolas',monospace;";
+
+static const char* ERROR_BUBBLE_SS =
+ "background:#140a0a;color:#ff6b6b;border:1px solid #2a1a1a;"
+ "border-radius:8px;padding:10px 12px;font-size:13px;"
+ "font-family:'Consolas',monospace;";
+
+static const char* TOOL_BADGE_SS =
+ "background:#111120;color:#6b6bff;border:1px solid #1a1a30;"
+ "border-radius:4px;padding:3px 8px;font-size:11px;"
+ "font-family:'Consolas',monospace;";
+
+// ── Constructor ───────────────────────────────────────────────────────────────
+
+ChatMessagePanel::ChatMessagePanel(QWidget* parent) : QWidget(parent) {
+ build_ui();
+}
+
+// ── Build UI ──────────────────────────────────────────────────────────────────
+
+void ChatMessagePanel::build_ui() {
+ setStyleSheet("background:#080808;");
+ auto* vl = new QVBoxLayout(this);
+ vl->setContentsMargins(0, 0, 0, 0);
+ vl->setSpacing(0);
+
+ vl->addWidget(build_header());
+ vl->addWidget(build_messages_area(), 1);
+ vl->addWidget(build_typing_indicator());
+ vl->addWidget(build_input_area());
+}
+
+QWidget* ChatMessagePanel::build_header() {
+ auto* hdr = new QWidget;
+ hdr->setFixedHeight(40);
+ hdr->setStyleSheet("background:#0a0a0a;border-bottom:1px solid #1a1a1a;");
+ auto* hl = new QHBoxLayout(hdr);
+ hl->setContentsMargins(16, 0, 16, 0);
+ hl->setSpacing(8);
+
+ hdr_title_lbl_ = new QLabel("New Conversation");
+ hdr_title_lbl_->setStyleSheet(
+ "color:#e5e5e5;font-size:13px;font-weight:700;"
+ "font-family:'Consolas',monospace;background:transparent;");
+ hl->addWidget(hdr_title_lbl_);
+
+ hl->addStretch();
+
+ // Mode toggle button
+ mode_btn_ = new QPushButton("LITE");
+ mode_btn_->setFixedHeight(22);
+ mode_btn_->setToolTip("Toggle between Lite (fast) and Deep (multi-step) mode");
+ mode_btn_->setStyleSheet(
+ "QPushButton{background:#111111;color:#d97706;border:1px solid #2a2a1a;"
+ "border-radius:3px;font-size:10px;font-weight:700;padding:0 8px;"
+ "font-family:'Consolas',monospace;}"
+ "QPushButton:hover{background:#1a1a0a;border-color:#d97706;}");
+ connect(mode_btn_, &QPushButton::clicked, this, [this]() {
+ current_mode_ = (current_mode_ == StreamMode::Lite) ? StreamMode::Deep : StreamMode::Lite;
+ mode_btn_->setText(current_mode_ == StreamMode::Lite ? "LITE" : "DEEP");
+ emit mode_toggled(current_mode_);
+ });
+ hl->addWidget(mode_btn_);
+
+ hdr_tokens_lbl_ = new QLabel("0 tokens");
+ hdr_tokens_lbl_->setStyleSheet(
+ "color:#404040;font-size:11px;font-family:'Consolas',monospace;"
+ "background:transparent;");
+ hl->addWidget(hdr_tokens_lbl_);
+
+ return hdr;
+}
+
+QWidget* ChatMessagePanel::build_messages_area() {
+ scroll_area_ = new QScrollArea;
+ scroll_area_->setWidgetResizable(true);
+ scroll_area_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ scroll_area_->setStyleSheet(
+ "QScrollArea{background:#080808;border:none;}"
+ "QScrollBar:vertical{background:#080808;width:4px;}"
+ "QScrollBar::handle:vertical{background:#2a2a2a;border-radius:2px;}"
+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}");
+
+ messages_container_ = new QWidget;
+ messages_container_->setStyleSheet("background:#080808;");
+ messages_layout_ = new QVBoxLayout(messages_container_);
+ messages_layout_->setContentsMargins(16, 12, 16, 12);
+ messages_layout_->setSpacing(12);
+ messages_layout_->addStretch(1);
+
+ welcome_panel_ = build_welcome();
+ messages_layout_->insertWidget(0, welcome_panel_);
+
+ scroll_area_->setWidget(messages_container_);
+ return scroll_area_;
+}
+
+QWidget* ChatMessagePanel::build_welcome() {
+ auto* w = new QWidget;
+ auto* vl = new QVBoxLayout(w);
+ vl->setContentsMargins(32, 40, 32, 40);
+ vl->setSpacing(16);
+ vl->setAlignment(Qt::AlignCenter);
+
+ auto* logo = new QLabel("◈ FINCEPT AGENT");
+ logo->setAlignment(Qt::AlignCenter);
+ logo->setStyleSheet(
+ "color:#d97706;font-size:22px;font-weight:700;"
+ "font-family:'Consolas',monospace;background:transparent;");
+ vl->addWidget(logo);
+
+ auto* sub = new QLabel(
+ "Your AI-powered financial intelligence assistant.\n"
+ "Ask about markets, analyze equities, run portfolio analysis,\n"
+ "or get macro economic insights.");
+ sub->setAlignment(Qt::AlignCenter);
+ sub->setWordWrap(true);
+ sub->setStyleSheet(
+ "color:#606060;font-size:13px;font-family:'Consolas',monospace;"
+ "background:transparent;line-height:1.6;");
+ vl->addWidget(sub);
+
+ // Quick suggestion chips
+ const QStringList suggestions = {
+ "What's the outlook for AAPL?",
+ "Summarize today's market news",
+ "Analyze my portfolio risk",
+ "What are the key economic indicators this week?"
+ };
+
+ auto* chips_row = new QWidget;
+ auto* chips_layout = new QHBoxLayout(chips_row);
+ chips_layout->setContentsMargins(0, 8, 0, 0);
+ chips_layout->setSpacing(8);
+ chips_layout->setAlignment(Qt::AlignCenter);
+
+ for (const auto& s : suggestions) {
+ auto* chip = new QPushButton(s);
+ chip->setStyleSheet(
+ "QPushButton{background:#111111;color:#808080;border:1px solid #2a2a2a;"
+ "border-radius:14px;padding:6px 14px;font-size:11px;"
+ "font-family:'Consolas',monospace;}"
+ "QPushButton:hover{background:#1a1a1a;color:#e5e5e5;border-color:#d97706;}");
+ connect(chip, &QPushButton::clicked, this, [this, s]() {
+ input_box_->setPlainText(s);
+ on_send_clicked();
+ });
+ chips_layout->addWidget(chip);
+ }
+ vl->addWidget(chips_row);
+
+ return w;
+}
+
+QWidget* ChatMessagePanel::build_typing_indicator() {
+ typing_indicator_ = new QWidget;
+ typing_indicator_->setFixedHeight(28);
+ typing_indicator_->setStyleSheet("background:#080808;");
+ typing_indicator_->setVisible(false);
+
+ auto* hl = new QHBoxLayout(typing_indicator_);
+ hl->setContentsMargins(16, 4, 16, 4);
+ hl->setSpacing(6);
+
+ auto* agent_lbl = new QLabel("Agent");
+ agent_lbl->setStyleSheet(
+ "color:#d97706;font-size:11px;font-weight:700;"
+ "font-family:'Consolas',monospace;background:transparent;");
+ hl->addWidget(agent_lbl);
+
+ typing_dots_lbl_ = new QLabel("●");
+ typing_dots_lbl_->setStyleSheet(
+ "color:#d97706;font-size:11px;background:transparent;");
+ hl->addWidget(typing_dots_lbl_);
+ hl->addStretch();
+
+ typing_timer_ = new QTimer(this);
+ typing_timer_->setInterval(400);
+ connect(typing_timer_, &QTimer::timeout, this, &ChatMessagePanel::on_typing_tick);
+
+ return typing_indicator_;
+}
+
+QWidget* ChatMessagePanel::build_input_area() {
+ auto* container = new QWidget;
+ container->setStyleSheet("background:#0a0a0a;border-top:1px solid #1a1a1a;");
+ auto* vl = new QVBoxLayout(container);
+ vl->setContentsMargins(16, 8, 16, 12);
+ vl->setSpacing(6);
+
+ // Input box
+ input_box_ = new QPlainTextEdit;
+ input_box_->setPlaceholderText("Ask Fincept Agent anything… (Enter to send, Shift+Enter for new line)");
+ input_box_->setMaximumHeight(120);
+ input_box_->setMinimumHeight(44);
+ input_box_->setStyleSheet(
+ "QPlainTextEdit{background:#111111;color:#e5e5e5;border:1px solid #2a2a2a;"
+ "border-radius:6px;padding:8px 12px;font-size:13px;"
+ "font-family:'Consolas',monospace;}"
+ "QPlainTextEdit:focus{border:1px solid #d97706;}"
+ "QScrollBar:vertical{background:#111111;width:4px;}"
+ "QScrollBar::handle:vertical{background:#2a2a2a;border-radius:2px;}"
+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}");
+ input_box_->installEventFilter(this);
+ vl->addWidget(input_box_);
+
+ // Bottom row: char count + buttons
+ auto* bottom_row = new QHBoxLayout;
+ bottom_row->setSpacing(6);
+
+ char_lbl_ = new QLabel("0 / 4000");
+ char_lbl_->setStyleSheet(
+ "color:#404040;font-size:11px;font-family:'Consolas',monospace;"
+ "background:transparent;");
+ bottom_row->addWidget(char_lbl_);
+ bottom_row->addStretch();
+
+ connect(input_box_, &QPlainTextEdit::textChanged, this, [this]() {
+ const int n = input_box_->toPlainText().length();
+ char_lbl_->setText(QString("%1 / 4000").arg(n));
+ });
+
+ stop_btn_ = new QPushButton("■ Stop");
+ stop_btn_->setFixedHeight(30);
+ stop_btn_->setVisible(false);
+ stop_btn_->setStyleSheet(
+ "QPushButton{background:#2a0a0a;color:#ff6b6b;border:1px solid #3a1a1a;"
+ "border-radius:4px;font-size:12px;padding:0 14px;"
+ "font-family:'Consolas',monospace;}"
+ "QPushButton:hover{background:#3a1a1a;}");
+ connect(stop_btn_, &QPushButton::clicked, this, []() {
+ ChatModeService::instance().abort_stream(); // forward declaration needed — see note
+ });
+ bottom_row->addWidget(stop_btn_);
+
+ send_btn_ = new QPushButton("Send ↵");
+ send_btn_->setFixedHeight(30);
+ send_btn_->setStyleSheet(
+ "QPushButton{background:#d97706;color:#000000;border:none;"
+ "border-radius:4px;font-size:12px;font-weight:700;padding:0 18px;"
+ "font-family:'Consolas',monospace;}"
+ "QPushButton:hover{background:#f59e0b;}"
+ "QPushButton:disabled{background:#2a2a1a;color:#606060;}");
+ connect(send_btn_, &QPushButton::clicked, this, &ChatMessagePanel::on_send_clicked);
+ bottom_row->addWidget(send_btn_);
+
+ vl->addLayout(bottom_row);
+ return container;
+}
+
+// ── Public API ────────────────────────────────────────────────────────────────
+
+void ChatMessagePanel::load_messages(const QVector<ChatMessage>& messages) {
+ clear_messages();
+ if (messages.isEmpty()) {
+ show_welcome(true);
+ return;
+ }
+ show_welcome(false);
+ for (const auto& m : messages)
+ add_message_bubble(m.role, m.content, m.created_at);
+ scroll_to_bottom();
+}
+
+void ChatMessagePanel::clear_messages() {
+ // Remove all bubble widgets (leave stretch + welcome panel)
+ QLayoutItem* item = nullptr;
+ while ((item = messages_layout_->takeAt(messages_layout_->count() - 1))) {
+ if (item->widget() && item->widget() != welcome_panel_)
+ item->widget()->deleteLater();
+ delete item;
+ }
+ // Re-add stretch + welcome
+ messages_layout_->addStretch(1);
+ show_welcome(true);
+ total_tokens_ = 0;
+ update_tokens_label();
+}
+
+void ChatMessagePanel::set_session_title(const QString& title) {
+ hdr_title_lbl_->setText(title.isEmpty() ? "New Conversation" : title);
+}
+
+void ChatMessagePanel::set_stream_mode(StreamMode mode) {
+ current_mode_ = mode;
+ mode_btn_->setText(mode == StreamMode::Lite ? "LITE" : "DEEP");
+}
+
+// ── Message bubbles ───────────────────────────────────────────────────────────
+
+void ChatMessagePanel::add_message_bubble(const QString& role, const QString& content,
+ const QString& timestamp)
+{
+ show_welcome(false);
+
+ auto* bubble = new QTextEdit;
+ bubble->setReadOnly(true);
+ if (role == "user") {
+ bubble->setPlainText(content);
+ } else {
+ bubble->setHtml(ui::MarkdownRenderer::render(content));
+ }
+ bubble->setStyleSheet(role == "user" ? USER_BUBBLE_SS : AI_BUBBLE_SS);
+ bubble->setFrameShape(QFrame::NoFrame);
+ bubble->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
+ bubble->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ bubble->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+
+ // Auto-resize to content
+ auto resize_to_content = [bubble]() {
+ QTextDocument* doc = bubble->document();
+ doc->setTextWidth(bubble->viewport()->width());
+ const int h = static_cast<int>(doc->size().height()) + 4;
+ bubble->setFixedHeight(qBound(40, h, 600));
+ };
+ resize_to_content();
+ connect(bubble, &QTextEdit::textChanged, this, resize_to_content);
+
+ // Role label row
+ auto* row = new QWidget;
+ auto* row_vl = new QVBoxLayout(row);
+ row_vl->setContentsMargins(0, 0, 0, 0);
+ row_vl->setSpacing(3);
+
+ // Role + timestamp header
+ auto* meta_row = new QHBoxLayout;
+ meta_row->setSpacing(6);
+ auto* role_lbl = new QLabel(role == "user" ? "You" : "Agent");
+ role_lbl->setStyleSheet(
+ QString("color:%1;font-size:10px;font-weight:700;font-family:'Consolas',monospace;"
+ "background:transparent;")
+ .arg(role == "user" ? "#d97706" : "#6b6bff"));
+ meta_row->addWidget(role_lbl);
+ if (!timestamp.isEmpty()) {
+ auto* ts_lbl = new QLabel(timestamp.left(16));
+ ts_lbl->setStyleSheet(
+ "color:#404040;font-size:10px;font-family:'Consolas',monospace;"
+ "background:transparent;");
+ meta_row->addWidget(ts_lbl);
+ }
+ meta_row->addStretch();
+ row_vl->addLayout(meta_row);
+ row_vl->addWidget(bubble);
+
+ // Insert before the stretch (last item)
+ const int insert_pos = messages_layout_->count() - 1;
+ messages_layout_->insertWidget(insert_pos, row);
+
+ QTimer::singleShot(0, this, [this]() { scroll_to_bottom(); });
+}
+
+QTextEdit* ChatMessagePanel::add_streaming_bubble() {
+ show_welcome(false);
+
+ auto* bubble = new QTextEdit;
+ bubble->setReadOnly(true);
+ bubble->setStyleSheet(AI_BUBBLE_SS);
+ bubble->setFrameShape(QFrame::NoFrame);
+ bubble->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
+ bubble->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ bubble->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ bubble->setFixedHeight(44);
+
+ // Role label row
+ auto* row = new QWidget;
+ auto* row_vl = new QVBoxLayout(row);
+ row_vl->setContentsMargins(0, 0, 0, 0);
+ row_vl->setSpacing(3);
+
+ auto* role_lbl = new QLabel("Agent");
+ role_lbl->setStyleSheet(
+ "color:#6b6bff;font-size:10px;font-weight:700;font-family:'Consolas',monospace;"
+ "background:transparent;");
+ row_vl->addWidget(role_lbl);
+ row_vl->addWidget(bubble);
+
+ const int insert_pos = messages_layout_->count() - 1;
+ messages_layout_->insertWidget(insert_pos, row);
+
+ return bubble;
+}
+
+void ChatMessagePanel::append_tool_badge(const QString& tool_name, int duration_ms) {
+ auto* badge = new QLabel(QString("⚙ %1 %2ms").arg(tool_name).arg(duration_ms));
+ badge->setStyleSheet(TOOL_BADGE_SS);
+ badge->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+
+ const int insert_pos = messages_layout_->count() - 1;
+ messages_layout_->insertWidget(insert_pos, badge, 0, Qt::AlignLeft);
+}
+
+// ── SSE slots ─────────────────────────────────────────────────────────────────
+
+void ChatMessagePanel::on_stream_session_meta(const QString& /*session_id*/,
+ const QString& new_title)
+{
+ if (!new_title.isEmpty())
+ set_session_title(new_title);
+}
+
+void ChatMessagePanel::on_stream_text_delta(const QString& text) {
+ if (!streaming_bubble_) return;
+
+ // Accumulate raw markdown in buffer
+ streaming_buffer_ += text;
+
+ // Show plain text while streaming (fast, no HTML parse overhead per chunk)
+ streaming_bubble_->setPlainText(streaming_buffer_);
+
+ // Resize bubble
+ QTextDocument* doc = streaming_bubble_->document();
+ doc->setTextWidth(streaming_bubble_->viewport()->width());
+ const int h = static_cast<int>(doc->size().height()) + 4;
+ streaming_bubble_->setFixedHeight(qBound(40, h, 600));
+
+ scroll_to_bottom();
+}
+
+void ChatMessagePanel::on_stream_tool_end(const QString& tool_name, int duration_ms) {
+ append_tool_badge(tool_name, duration_ms);
+}
+
+void ChatMessagePanel::on_stream_finish(int total_tokens) {
+ total_tokens_ += total_tokens;
+ update_tokens_label();
+
+ // Re-render the complete streamed text as proper markdown HTML
+ if (streaming_bubble_ && !streaming_buffer_.isEmpty()) {
+ streaming_bubble_->setHtml(ui::MarkdownRenderer::render(streaming_buffer_));
+ // Resize to final HTML height
+ QTextDocument* doc = streaming_bubble_->document();
+ doc->setTextWidth(streaming_bubble_->viewport()->width());
+ const int h = static_cast<int>(doc->size().height()) + 4;
+ streaming_bubble_->setFixedHeight(qBound(40, h, 600));
+ }
+
+ streaming_ = false;
+ streaming_bubble_ = nullptr;
+ streaming_buffer_.clear();
+ show_typing(false);
+ set_input_enabled(true);
+ send_btn_->setVisible(true);
+ stop_btn_->setVisible(false);
+ scroll_to_bottom();
+}
+
+void ChatMessagePanel::on_stream_error(const QString& message) {
+ streaming_ = false;
+ streaming_bubble_ = nullptr;
+ streaming_buffer_.clear();
+ show_typing(false);
+ set_input_enabled(true);
+ send_btn_->setVisible(true);
+ stop_btn_->setVisible(false);
+
+ // Show error bubble
+ auto* err = new QLabel("⚠ " + message);
+ err->setWordWrap(true);
+ err->setStyleSheet(ERROR_BUBBLE_SS);
+ const int insert_pos = messages_layout_->count() - 1;
+ messages_layout_->insertWidget(insert_pos, err);
+ scroll_to_bottom();
+}
+
+void ChatMessagePanel::on_stream_heartbeat() {
+ // Keep-alive — nothing to do
+}
+
+void ChatMessagePanel::on_insufficient_credits() {
+ on_stream_error("Insufficient credits. Please top up your account to continue.");
+}
+
+// ── Send ──────────────────────────────────────────────────────────────────────
+
+void ChatMessagePanel::on_send_clicked() {
+ const QString text = input_box_->toPlainText().trimmed();
+ if (text.isEmpty() || streaming_) return;
+
+ input_box_->clear();
+ streaming_ = true;
+ streaming_buffer_.clear();
+
+ // Show user bubble immediately
+ add_message_bubble("user", text);
+
+ // Prepare streaming bubble + UI state
+ show_typing(true);
+ set_input_enabled(false);
+ send_btn_->setVisible(false);
+ stop_btn_->setVisible(true);
+
+ streaming_bubble_ = add_streaming_bubble();
+
+ emit send_requested(text, current_mode_);
+}
+
+// ── Input event filter (Enter to send) ───────────────────────────────────────
+
+bool ChatMessagePanel::eventFilter(QObject* obj, QEvent* ev) {
+ if (obj == input_box_ && ev->type() == QEvent::KeyPress) {
+ auto* ke = static_cast<QKeyEvent*>(ev);
+ if (ke->key() == Qt::Key_Return && !(ke->modifiers() & Qt::ShiftModifier)) {
+ on_send_clicked();
+ return true;
+ }
+ }
+ return QWidget::eventFilter(obj, ev);
+}
+
+// ── Helpers ───────────────────────────────────────────────────────────────────
+
+void ChatMessagePanel::scroll_to_bottom() {
+ QScrollBar* sb = scroll_area_->verticalScrollBar();
+ sb->setValue(sb->maximum());
+}
+
+void ChatMessagePanel::show_welcome(bool show) {
+ if (welcome_panel_)
+ welcome_panel_->setVisible(show);
+}
+
+void ChatMessagePanel::show_typing(bool show) {
+ typing_indicator_->setVisible(show);
+ if (show)
+ typing_timer_->start();
+ else
+ typing_timer_->stop();
+}
+
+void ChatMessagePanel::set_input_enabled(bool enabled) {
+ input_box_->setEnabled(enabled);
+}
+
+void ChatMessagePanel::update_tokens_label() {
+ hdr_tokens_lbl_->setText(QString("%1 tokens").arg(total_tokens_));
+}
+
+void ChatMessagePanel::on_typing_tick() {
+ static const QVector<QString> DOTS = {"●", "● ●", "● ● ●"};
+ typing_dots_lbl_->setText(DOTS[typing_step_ % 3]);
+ ++typing_step_;
+}
+
+} // namespace fincept::chat_mode
diff --git a/fincept-qt/src/screens/chat_mode/ChatMessagePanel.h b/fincept-qt/src/screens/chat_mode/ChatMessagePanel.h
new file mode 100644
index 000000000..e5b42e965
--- /dev/null
+++ b/fincept-qt/src/screens/chat_mode/ChatMessagePanel.h
@@ -0,0 +1,107 @@
+#pragma once
+#include "screens/chat_mode/ChatModeTypes.h"
+
+#include <QLabel>
+#include <QPlainTextEdit>
+#include <QPointer>
+#include <QPushButton>
+#include <QScrollArea>
+#include <QTextEdit>
+#include <QTimer>
+#include <QVBoxLayout>
+#include <QWidget>
+
+namespace fincept::chat_mode {
+
+/// Center panel — message history, SSE streaming display, input area.
+class ChatMessagePanel : public QWidget {
+ Q_OBJECT
+ public:
+ explicit ChatMessagePanel(QWidget* parent = nullptr);
+
+ /// Load a session's messages into the view.
+ void load_messages(const QVector<ChatMessage>& messages);
+
+ /// Clear all messages and show welcome state.
+ void clear_messages();
+
+ /// Called when a new session is active (updates header title).
+ void set_session_title(const QString& title);
+
+ /// Update the mode selector label.
+ void set_stream_mode(StreamMode mode);
+
+ StreamMode current_mode() const { return current_mode_; }
+
+ signals:
+ void send_requested(const QString& message, StreamMode mode);
+ void mode_toggled(StreamMode mode);
+
+ public slots:
+ // SSE event slots — connected to ChatModeService signals
+ void on_stream_session_meta(const QString& session_id, const QString& new_title);
+ void on_stream_text_delta(const QString& text);
+ void on_stream_tool_end(const QString& tool_name, int duration_ms);
+ void on_stream_finish(int total_tokens);
+ void on_stream_error(const QString& message);
+ void on_stream_heartbeat();
+
+ void on_insufficient_credits();
+
+ private slots:
+ void on_send_clicked();
+ void on_typing_tick();
+ bool eventFilter(QObject* obj, QEvent* ev) override;
+
+ private:
+ // Header
+ QLabel* hdr_title_lbl_ = nullptr;
+ QLabel* hdr_mode_lbl_ = nullptr;
+ QLabel* hdr_tokens_lbl_ = nullptr;
+ QPushButton* mode_btn_ = nullptr;
+
+ // Messages area
+ QScrollArea* scroll_area_ = nullptr;
+ QWidget* messages_container_ = nullptr;
+ QVBoxLayout* messages_layout_ = nullptr;
+ QWidget* welcome_panel_ = nullptr;
+
+ // Typing indicator
+ QWidget* typing_indicator_ = nullptr;
+ QLabel* typing_dots_lbl_ = nullptr;
+ QTimer* typing_timer_ = nullptr;
+ int typing_step_ = 0;
+
+ // Input area
+ QPlainTextEdit* input_box_ = nullptr;
+ QPushButton* send_btn_ = nullptr;
+ QPushButton* stop_btn_ = nullptr;
+ QLabel* char_lbl_ = nullptr;
+
+ // State
+ StreamMode current_mode_ = StreamMode::Lite;
+ bool streaming_ = false;
+ QPointer<QTextEdit> streaming_bubble_;
+ QString streaming_buffer_; // accumulates raw markdown during stream
+ int total_tokens_ = 0;
+
+ void build_ui();
+ QWidget* build_header();
+ QWidget* build_welcome();
+ QWidget* build_messages_area();
+ QWidget* build_typing_indicator();
+ QWidget* build_input_area();
+
+ void add_message_bubble(const QString& role, const QString& content,
+ const QString& timestamp = {});
+ QTextEdit* add_streaming_bubble();
+ void append_tool_badge(const QString& tool_name, int duration_ms);
+
+ void scroll_to_bottom();
+ void show_welcome(bool show);
+ void show_typing(bool show);
+ void set_input_enabled(bool enabled);
+ void update_tokens_label();
+};
+
+} // namespace fincept::chat_mode
diff --git a/fincept-qt/src/screens/chat_mode/ChatModeScreen.cpp b/fincept-qt/src/screens/chat_mode/ChatModeScreen.cpp
new file mode 100644
index 000000000..347e4411a
--- /dev/null
+++ b/fincept-qt/src/screens/chat_mode/ChatModeScreen.cpp
@@ -0,0 +1,239 @@
+#include "screens/chat_mode/ChatModeScreen.h"
+#include "screens/chat_mode/ChatAgentPanel.h"
+#include "screens/chat_mode/ChatMessagePanel.h"
+#include "screens/chat_mode/ChatModeService.h"
+#include "screens/chat_mode/ChatSessionPanel.h"
+#include "core/logging/Logger.h"
+
+#include <QHBoxLayout>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QPointer>
+#include <QShowEvent>
+
+namespace fincept::chat_mode {
+
+ChatModeScreen::ChatModeScreen(QWidget* parent) : QWidget(parent) {
+ build_ui();
+ wire_signals();
+}
+
+void ChatModeScreen::build_ui() {
+ setStyleSheet("background:#080808;");
+
+ auto* hl = new QHBoxLayout(this);
+ hl->setContentsMargins(0, 0, 0, 0);
+ hl->setSpacing(0);
+
+ session_panel_ = new ChatSessionPanel(this);
+ message_panel_ = new ChatMessagePanel(this);
+ agent_panel_ = new ChatAgentPanel(this);
+
+ hl->addWidget(session_panel_);
+ hl->addWidget(message_panel_, 1);
+ hl->addWidget(agent_panel_);
+}
+
+void ChatModeScreen::wire_signals() {
+ auto& svc = ChatModeService::instance();
+
+ // Session panel → screen
+ connect(session_panel_, &ChatSessionPanel::session_selected,
+ this, &ChatModeScreen::on_session_selected);
+ connect(session_panel_, &ChatSessionPanel::new_session_requested,
+ this, &ChatModeScreen::on_new_session);
+ connect(session_panel_, &ChatSessionPanel::delete_session_requested,
+ this, &ChatModeScreen::on_delete_session);
+ connect(session_panel_, &ChatSessionPanel::rename_session_requested,
+ this, &ChatModeScreen::on_rename_session);
+ connect(session_panel_, &ChatSessionPanel::exit_chat_mode_requested,
+ this, &ChatModeScreen::exit_requested);
+
+ // Message panel → screen (sends a message)
+ connect(message_panel_, &ChatMessagePanel::send_requested,
+ this, &ChatModeScreen::on_send_requested);
+
+ // SSE service → message panel
+ connect(&svc, &ChatModeService::stream_session_meta,
+ message_panel_, &ChatMessagePanel::on_stream_session_meta);
+ connect(&svc, &ChatModeService::stream_text_delta,
+ message_panel_, &ChatMessagePanel::on_stream_text_delta);
+ connect(&svc, &ChatModeService::stream_tool_end,
+ message_panel_, &ChatMessagePanel::on_stream_tool_end);
+ connect(&svc, &ChatModeService::stream_finish,
+ message_panel_, &ChatMessagePanel::on_stream_finish);
+ connect(&svc, &ChatModeService::stream_error,
+ message_panel_, &ChatMessagePanel::on_stream_error);
+ connect(&svc, &ChatModeService::stream_heartbeat,
+ message_panel_, &ChatMessagePanel::on_stream_heartbeat);
+ connect(&svc, &ChatModeService::insufficient_credits,
+ message_panel_, &ChatMessagePanel::on_insufficient_credits);
+
+ // SSE session-meta → refresh session list so new title appears in sidebar
+ // Using `this` as context object is safe for connect() — Qt auto-disconnects on destroy
+ connect(&svc, &ChatModeService::stream_session_meta,
+ this, [this](const QString& /*id*/, const QString& new_title) {
+ if (!new_title.isEmpty())
+ session_panel_->refresh_sessions();
+ });
+
+ // SSE finish → refresh session list (message count updated server-side)
+ connect(&svc, &ChatModeService::stream_finish,
+ this, [this](int) { session_panel_->refresh_sessions(); });
+}
+
+// ── Show event — load initial state ──────────────────────────────────────────
+
+void ChatModeScreen::showEvent(QShowEvent* e) {
+ QWidget::showEvent(e);
+ LOG_INFO("ChatModeScreen", "Entered chat mode");
+ session_panel_->refresh_sessions();
+
+ QPointer<ChatModeScreen> self = this;
+
+ // Load stats for sidebar
+ ChatModeService::instance().get_stats(
+ [self](bool ok, ChatStats stats, QString) {
+ if (!self) return;
+ if (ok) self->session_panel_->update_stats(stats);
+ });
+
+ // If no active session yet, restore the most recent one
+ if (active_session_uuid_.isEmpty()) {
+ LOG_INFO("ChatModeScreen", "No active session — loading most recent");
+ ChatModeService::instance().list_sessions(
+ [self](bool ok, QVector<ChatSession> sessions, QString err) {
+ if (!self) return;
+ if (!ok) { LOG_WARN("ChatModeScreen", "Failed to list sessions on show: " + err); return; }
+ if (sessions.isEmpty()) { LOG_INFO("ChatModeScreen", "No sessions found — user has none yet"); return; }
+ LOG_INFO("ChatModeScreen", QString("Auto-selecting session: %1").arg(sessions.first().uuid));
+ self->on_session_selected(sessions.first().uuid);
+ });
+ } else {
+ LOG_INFO("ChatModeScreen", QString("Re-entering with active session: %1").arg(active_session_uuid_));
+ }
+}
+
+// ── Session actions ───────────────────────────────────────────────────────────
+
+void ChatModeScreen::on_session_selected(const QString& uuid) {
+ LOG_INFO("ChatModeScreen", QString("Session selected: %1").arg(uuid));
+ active_session_uuid_ = uuid;
+ session_panel_->set_active_session(uuid);
+
+ // Activate on backend (fire-and-forget, no callback needed)
+ ChatModeService::instance().activate_session(uuid, [](bool, QString) {});
+
+ // Single fetch: GET /chat/sessions/{uuid} returns both session meta + messages[]
+ QPointer<ChatModeScreen> self = this;
+ ChatModeService::instance().get(
+ "/chat/sessions/" + uuid,
+ [self](bool ok, QJsonDocument doc, QString err) {
+ if (!self) return;
+ if (!ok) {
+ LOG_WARN("ChatModeScreen", "Failed to load session: " + err);
+ return;
+ }
+ const QJsonObject data = doc.object().value("data").toObject();
+
+ // Update title from session object
+ const QString title = data.value("session").toObject()
+ .value("title").toString();
+ self->message_panel_->set_session_title(title);
+
+ // Load messages array
+ const QJsonArray msgs_arr = data.value("messages").toArray();
+ QVector<ChatMessage> messages;
+ messages.reserve(msgs_arr.size());
+ for (const auto& v : msgs_arr)
+ messages.append(ChatMessage::from_json(v.toObject()));
+ self->message_panel_->load_messages(messages);
+ });
+}
+
+void ChatModeScreen::on_new_session() {
+ QPointer<ChatModeScreen> self = this;
+ ChatModeService::instance().create_session(
+ "New Conversation",
+ [self](bool ok, ChatSession session, QString err) {
+ if (!self) return;
+ if (!ok) {
+ LOG_WARN("ChatModeScreen", "Failed to create session: " + err);
+ return;
+ }
+ self->message_panel_->clear_messages();
+ self->session_panel_->refresh_sessions();
+ self->on_session_selected(session.uuid);
+ });
+}
+
+void ChatModeScreen::on_delete_session(const QString& uuid) {
+ QPointer<ChatModeScreen> self = this;
+ ChatModeService::instance().delete_session(
+ uuid, [self, uuid](bool ok, QString err) {
+ if (!self) return;
+ if (!ok) {
+ LOG_WARN("ChatModeScreen", "Failed to delete session: " + err);
+ return;
+ }
+ if (self->active_session_uuid_ == uuid)
+ self->active_session_uuid_.clear();
+ self->session_panel_->refresh_sessions();
+ self->message_panel_->clear_messages();
+
+ ChatModeService::instance().list_sessions(
+ [self](bool list_ok, QVector<ChatSession> sessions, QString) {
+ if (!self) return;
+ if (!list_ok || sessions.isEmpty()) {
+ self->on_new_session();
+ return;
+ }
+ self->on_session_selected(sessions.first().uuid);
+ });
+ });
+}
+
+void ChatModeScreen::on_rename_session(const QString& uuid, const QString& title) {
+ QPointer<ChatModeScreen> self = this;
+ ChatModeService::instance().rename_session(
+ uuid, title, [self](bool ok, QString err) {
+ if (!self) return;
+ if (!ok) LOG_WARN("ChatModeScreen", "Rename failed: " + err);
+ self->session_panel_->refresh_sessions();
+ });
+}
+
+// ── Send message ──────────────────────────────────────────────────────────────
+
+void ChatModeScreen::on_send_requested(const QString& message, StreamMode mode) {
+ LOG_INFO("ChatModeScreen", QString("Send requested [%1]: \"%2\"")
+ .arg(mode == StreamMode::Deep ? "deep" : "lite")
+ .arg(message.left(60)));
+ ensure_active_session([this, message, mode](const QString& uuid) {
+ ChatModeService::instance().stream_message(message, uuid, mode);
+ });
+}
+
+void ChatModeScreen::ensure_active_session(std::function<void(const QString&)> then) {
+ if (!active_session_uuid_.isEmpty()) {
+ then(active_session_uuid_);
+ return;
+ }
+ QPointer<ChatModeScreen> self = this;
+ ChatModeService::instance().create_session(
+ "New Conversation",
+ [self, then = std::move(then)](bool ok, ChatSession session, QString err) {
+ if (!self) return;
+ if (!ok) {
+ LOG_WARN("ChatModeScreen", "Could not create session for message: " + err);
+ return;
+ }
+ self->active_session_uuid_ = session.uuid;
+ self->session_panel_->refresh_sessions();
+ self->session_panel_->set_active_session(session.uuid);
+ then(session.uuid);
+ });
+}
+
+} // namespace fincept::chat_mode
diff --git a/fincept-qt/src/screens/chat_mode/ChatModeScreen.h b/fincept-qt/src/screens/chat_mode/ChatModeScreen.h
new file mode 100644
index 000000000..d737b64e4
--- /dev/null
+++ b/fincept-qt/src/screens/chat_mode/ChatModeScreen.h
@@ -0,0 +1,44 @@
+#pragma once
+#include "screens/chat_mode/ChatModeTypes.h"
+
+#include <QWidget>
+#include <functional>
+
+namespace fincept::chat_mode {
+
+class ChatSessionPanel;
+class ChatMessagePanel;
+class ChatAgentPanel;
+
+/// Full-screen chat mode — replaces the entire terminal UI.
+/// Layout: [ChatSessionPanel | ChatMessagePanel | ChatAgentPanel]
+class ChatModeScreen : public QWidget {
+ Q_OBJECT
+ public:
+ explicit ChatModeScreen(QWidget* parent = nullptr);
+
+ signals:
+ void exit_requested();
+
+ protected:
+ void showEvent(QShowEvent* e) override;
+
+ private:
+ ChatSessionPanel* session_panel_ = nullptr;
+ ChatMessagePanel* message_panel_ = nullptr;
+ ChatAgentPanel* agent_panel_ = nullptr;
+
+ QString active_session_uuid_;
+
+ void build_ui();
+ void wire_signals();
+
+ void on_session_selected(const QString& uuid);
+ void on_new_session();
+ void on_delete_session(const QString& uuid);
+ void on_rename_session(const QString& uuid, const QString& title);
+ void on_send_requested(const QString& message, StreamMode mode);
+ void ensure_active_session(std::function<void(const QString& uuid)> then);
+};
+
+} // namespace fincept::chat_mode
diff --git a/fincept-qt/src/screens/chat_mode/ChatModeService.cpp b/fincept-qt/src/screens/chat_mode/ChatModeService.cpp
new file mode 100644
index 000000000..afd7076c7
--- /dev/null
+++ b/fincept-qt/src/screens/chat_mode/ChatModeService.cpp
@@ -0,0 +1,576 @@
+#include "screens/chat_mode/ChatModeService.h"
+
+#include "auth/AuthManager.h"
+#include "core/logging/Logger.h"
+
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QUrl>
+#include <QUrlQuery>
+
+namespace fincept::chat_mode {
+
+static constexpr const char* API_BASE = "https://api.fincept.in";
+
+// ── Singleton ─────────────────────────────────────────────────────────────────
+
+ChatModeService& ChatModeService::instance() {
+ static ChatModeService s;
+ return s;
+}
+
+ChatModeService::ChatModeService(QObject* parent) : QObject(parent) {
+ nam_ = new QNetworkAccessManager(this);
+ sse_nam_ = new QNetworkAccessManager(this);
+}
+
+// ── Auth helpers ──────────────────────────────────────────────────────────────
+
+QString ChatModeService::base_url() const { return QString::fromLatin1(API_BASE); }
+
+QString ChatModeService::api_key() const {
+ return auth::AuthManager::instance().session().api_key;
+}
+
+QString ChatModeService::session_token() const {
+ return auth::AuthManager::instance().session().session_token;
+}
+
+QNetworkRequest ChatModeService::build_request(const QString& path) const {
+ QNetworkRequest req{QUrl(base_url() + path)};
+ req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+ req.setHeader(QNetworkRequest::UserAgentHeader, "FinceptTerminal/4.0");
+ const QString key = api_key();
+ const QString tok = session_token();
+ if (!key.isEmpty())
+ req.setRawHeader("X-API-Key", key.toUtf8());
+ if (!tok.isEmpty())
+ req.setRawHeader("X-Session-Token", tok.toUtf8());
+ return req;
+}
+
+// ── Reply handler ─────────────────────────────────────────────────────────────
+
+void ChatModeService::handle_reply(
+ QNetworkReply* reply,
+ std::function<void(bool ok, QJsonDocument doc, QString error)> cb)
+{
+ // 15-second timeout — abort hanging requests so they don't silently block
+ auto* timer = new QTimer(reply);
+ timer->setSingleShot(true);
+ timer->setInterval(15000);
+ connect(timer, &QTimer::timeout, reply, [reply]() {
+ LOG_WARN("ChatModeService", QString("Request timed out: %1").arg(reply->url().path()));
+ reply->abort();
+ });
+ timer->start();
+
+ connect(reply, &QNetworkReply::finished, this,
+ [this, reply, cb = std::move(cb)]() mutable {
+ // Read all data BEFORE deleteLater
+ const int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+ const QByteArray data = reply->readAll();
+ const auto net_err = reply->error();
+ const QString url_path = reply->url().path();
+ reply->deleteLater();
+
+ LOG_DEBUG("ChatModeService",
+ QString("%1 HTTP %2 %3 bytes")
+ .arg(url_path).arg(status).arg(data.size()));
+
+ if (status == 402) {
+ LOG_WARN("ChatModeService", "Insufficient credits (402)");
+ emit insufficient_credits();
+ cb(false, {}, "Insufficient credits");
+ return;
+ }
+
+ if (status == 401 || status == 403) {
+ LOG_WARN("ChatModeService",
+ QString("Auth error %1 on %2").arg(status).arg(url_path));
+ cb(false, {}, QString("Auth error HTTP_%1").arg(status));
+ return;
+ }
+
+ QJsonParseError pe;
+ QJsonDocument doc = QJsonDocument::fromJson(data, &pe);
+
+ if (net_err != QNetworkReply::NoError &&
+ net_err != QNetworkReply::OperationCanceledError) {
+ const QString err = QString("HTTP %1 %2: %3")
+ .arg(status).arg(url_path)
+ .arg(QNetworkReply::staticMetaObject
+ .enumerator(
+ QNetworkReply::staticMetaObject
+ .indexOfEnumerator("NetworkError"))
+ .valueToKey(net_err));
+ LOG_WARN("ChatModeService", err);
+ cb(false, doc, err);
+ return;
+ }
+
+ if (pe.error != QJsonParseError::NoError) {
+ const QString err = QString("JSON parse error on %1: %2")
+ .arg(url_path, pe.errorString());
+ LOG_WARN("ChatModeService", err);
+ cb(false, {}, err);
+ return;
+ }
+
+ // Check API-level success flag if present
+ const QJsonObject root = doc.object();
+ if (root.contains("success") && !root["success"].toBool()) {
+ const QString err = root["message"].toString("API returned success:false");
+ LOG_WARN("ChatModeService",
+ QString("%1: %2").arg(url_path, err));
+ cb(false, doc, err);
+ return;
+ }
+
+ cb(true, doc, {});
+ });
+}
+
+// ── HTTP verbs ────────────────────────────────────────────────────────────────
+
+void ChatModeService::get(const QString& path,
+ std::function<void(bool, QJsonDocument, QString)> cb)
+{
+ auto* reply = nam_->get(build_request(path));
+ handle_reply(reply, std::move(cb));
+}
+
+void ChatModeService::post(const QString& path, const QJsonObject& body,
+ std::function<void(bool, QJsonDocument, QString)> cb)
+{
+ auto* reply = nam_->post(build_request(path),
+ QJsonDocument(body).toJson(QJsonDocument::Compact));
+ handle_reply(reply, std::move(cb));
+}
+
+void ChatModeService::put(const QString& path, const QJsonObject& body,
+ std::function<void(bool, QJsonDocument, QString)> cb)
+{
+ auto* reply = nam_->put(build_request(path),
+ QJsonDocument(body).toJson(QJsonDocument::Compact));
+ handle_reply(reply, std::move(cb));
+}
+
+void ChatModeService::del(const QString& path,
+ std::function<void(bool, QJsonDocument, QString)> cb)
+{
+ auto* reply = nam_->deleteResource(build_request(path));
+ handle_reply(reply, std::move(cb));
+}
+
+void ChatModeService::del_with_body(const QString& path, const QJsonObject& body,
+ std::function<void(bool, QJsonDocument, QString)> cb)
+{
+ QNetworkRequest req = build_request(path);
+ auto* reply = nam_->sendCustomRequest(
+ req, "DELETE", QJsonDocument(body).toJson(QJsonDocument::Compact));
+ handle_reply(reply, std::move(cb));
+}
+
+// ── Session CRUD ──────────────────────────────────────────────────────────────
+
+void ChatModeService::create_session(const QString& title, SessionCallback cb)
+{
+ LOG_INFO("ChatModeService", QString("Creating session: \"%1\"").arg(title));
+ QJsonObject body;
+ body["title"] = title;
+ post("/chat/sessions", body, [cb = std::move(cb)](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { LOG_WARN("ChatModeService", "create_session failed: " + err); cb(false, {}, err); return; }
+ const QJsonObject data = doc.object().value("data").toObject();
+ const QJsonObject session = data.value("session").toObject();
+ const QString uuid = session.value("session_uuid").toString();
+ LOG_INFO("ChatModeService", QString("Session created: %1").arg(uuid));
+ cb(true, ChatSession::from_json(session), {});
+ });
+}
+
+void ChatModeService::list_sessions(SessionsCallback cb)
+{
+ LOG_DEBUG("ChatModeService", "Listing sessions");
+ get("/chat/sessions", [cb = std::move(cb)](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { LOG_WARN("ChatModeService", "list_sessions failed: " + err); cb(false, {}, err); return; }
+ const QJsonArray arr = doc.object().value("data").toObject()
+ .value("sessions").toArray();
+ QVector<ChatSession> sessions;
+ sessions.reserve(arr.size());
+ for (const auto& v : arr)
+ sessions.append(ChatSession::from_json(v.toObject()));
+ LOG_INFO("ChatModeService", QString("Listed %1 sessions").arg(sessions.size()));
+ cb(true, sessions, {});
+ });
+}
+
+void ChatModeService::get_session(const QString& uuid, SessionCallback cb)
+{
+ LOG_DEBUG("ChatModeService", QString("Getting session: %1").arg(uuid));
+ get("/chat/sessions/" + uuid,
+ [cb = std::move(cb), uuid](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { LOG_WARN("ChatModeService", "get_session failed: " + err); cb(false, {}, err); return; }
+ const QJsonObject data = doc.object().value("data").toObject();
+ const QJsonObject session = data.value("session").toObject();
+ const int msg_count = data.value("messages").toArray().size();
+ LOG_INFO("ChatModeService", QString("Got session %1 with %2 messages").arg(uuid).arg(msg_count));
+ cb(true, ChatSession::from_json(session), {});
+ });
+}
+
+void ChatModeService::delete_session(const QString& uuid, VoidCallback cb)
+{
+ del("/chat/sessions/" + uuid, [cb = std::move(cb)](bool ok, QJsonDocument, QString err) {
+ cb(ok, err);
+ });
+}
+
+void ChatModeService::rename_session(const QString& uuid, const QString& title, VoidCallback cb)
+{
+ QJsonObject body;
+ body["title"] = title;
+ put("/chat/sessions/" + uuid + "/title", body,
+ [cb = std::move(cb)](bool ok, QJsonDocument, QString err) { cb(ok, err); });
+}
+
+void ChatModeService::activate_session(const QString& uuid, VoidCallback cb)
+{
+ put("/chat/sessions/" + uuid + "/activate", {},
+ [cb = std::move(cb)](bool ok, QJsonDocument, QString err) { cb(ok, err); });
+}
+
+// ── Session utilities ─────────────────────────────────────────────────────────
+
+void ChatModeService::get_stats(StatsCallback cb)
+{
+ get("/chat/stats", [cb = std::move(cb)](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { cb(false, {}, err); return; }
+ const QJsonObject data = doc.object().value("data").toObject(doc.object());
+ cb(true, ChatStats::from_json(data), {});
+ });
+}
+
+void ChatModeService::search_messages(const QString& query, SearchCallback cb)
+{
+ const QString path = QString("/chat/search?query=%1&limit=20")
+ .arg(QString::fromUtf8(QUrl::toPercentEncoding(query)));
+ get(path, [cb = std::move(cb)](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { cb(false, {}, err); return; }
+ // Response: { data: { results: [...], total: N, query: "..." } }
+ const QJsonArray arr = doc.object().value("data").toObject()
+ .value("results").toArray();
+ QVector<ChatMessage> results;
+ results.reserve(arr.size());
+ for (const auto& v : arr) {
+ const QJsonObject o = v.toObject();
+ ChatMessage m;
+ m.uuid = o["message_uuid"].toString();
+ m.role = o["role"].toString();
+ m.content = o["content"].toString();
+ m.created_at = o["created_at"].toString();
+ results.append(m);
+ }
+ cb(true, results, {});
+ });
+}
+
+void ChatModeService::bulk_delete_sessions(const QStringList& uuids, VoidCallback cb)
+{
+ QJsonObject body;
+ QJsonArray arr;
+ for (const auto& u : uuids) arr.append(u);
+ body["session_uuids"] = arr;
+ del_with_body("/chat/sessions/bulk-delete", body,
+ [cb = std::move(cb)](bool ok, QJsonDocument, QString err) { cb(ok, err); });
+}
+
+void ChatModeService::export_sessions(const QStringList& uuids,
+ std::function<void(bool, QJsonArray, QString)> cb)
+{
+ QJsonObject body;
+ QJsonArray arr;
+ for (const auto& u : uuids) arr.append(u);
+ body["session_uuids"] = arr;
+ body["format"] = "json";
+ post("/chat/export", body, [cb = std::move(cb)](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { cb(false, {}, err); return; }
+ const QJsonArray data = doc.object().value("data").toArray();
+ cb(true, data, {});
+ });
+}
+
+// ── Agent memory ──────────────────────────────────────────────────────────────
+
+void ChatModeService::list_memory(MemoriesCallback cb)
+{
+ get("/chat/agent/memory", [cb = std::move(cb)](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { cb(false, {}, err); return; }
+ QVector<AgentMemory> memories;
+ const QJsonArray arr = doc.object().value("memories").toArray();
+ for (const auto& v : arr)
+ memories.append(AgentMemory::from_json(v.toObject()));
+ cb(true, memories, {});
+ });
+}
+
+void ChatModeService::save_memory(const QString& key, const QString& value,
+ const QString& memory_type, VoidCallback cb)
+{
+ QJsonObject body;
+ body["key"] = key;
+ body["value"] = value;
+ body["memory_type"] = memory_type;
+ post("/chat/agent/memory", body,
+ [cb = std::move(cb)](bool ok, QJsonDocument, QString err) { cb(ok, err); });
+}
+
+void ChatModeService::delete_memory(const QString& key, VoidCallback cb)
+{
+ del("/chat/agent/memory/" + key,
+ [cb = std::move(cb)](bool ok, QJsonDocument, QString err) { cb(ok, err); });
+}
+
+void ChatModeService::clear_all_memory(VoidCallback cb)
+{
+ del("/chat/agent/memory",
+ [cb = std::move(cb)](bool ok, QJsonDocument, QString err) { cb(ok, err); });
+}
+
+// ── Agent schedules ───────────────────────────────────────────────────────────
+
+void ChatModeService::list_schedules(SchedulesCallback cb)
+{
+ get("/chat/agent/schedules", [cb = std::move(cb)](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { cb(false, {}, err); return; }
+ QVector<AgentSchedule> schedules;
+ const QJsonArray arr = doc.object().value("schedules").toArray();
+ for (const auto& v : arr)
+ schedules.append(AgentSchedule::from_json(v.toObject()));
+ cb(true, schedules, {});
+ });
+}
+
+void ChatModeService::create_schedule(const QString& query, const QString& cron_expression,
+ const QString& session_id, ScheduleCallback cb)
+{
+ QJsonObject body;
+ body["query"] = query;
+ body["cron_expression"] = cron_expression;
+ if (!session_id.isEmpty())
+ body["session_id"] = session_id;
+ post("/chat/agent/schedules", body,
+ [cb = std::move(cb)](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { cb(false, {}, err); return; }
+ const QJsonObject data = doc.object().value("data").toObject(doc.object());
+ cb(true, AgentSchedule::from_json(data), {});
+ });
+}
+
+void ChatModeService::delete_schedule(const QString& schedule_id, VoidCallback cb)
+{
+ del("/chat/agent/schedules/" + schedule_id,
+ [cb = std::move(cb)](bool ok, QJsonDocument, QString err) { cb(ok, err); });
+}
+
+void ChatModeService::pause_schedule(const QString& schedule_id, VoidCallback cb)
+{
+ put("/chat/agent/schedules/" + schedule_id + "/pause", {},
+ [cb = std::move(cb)](bool ok, QJsonDocument, QString err) { cb(ok, err); });
+}
+
+void ChatModeService::resume_schedule(const QString& schedule_id, VoidCallback cb)
+{
+ put("/chat/agent/schedules/" + schedule_id + "/resume", {},
+ [cb = std::move(cb)](bool ok, QJsonDocument, QString err) { cb(ok, err); });
+}
+
+// ── Agent tasks ───────────────────────────────────────────────────────────────
+
+void ChatModeService::list_tasks(TasksCallback cb)
+{
+ get("/chat/agent/tasks?limit=50",
+ [cb = std::move(cb)](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { cb(false, {}, err); return; }
+ QVector<AgentTask> tasks;
+ const QJsonArray arr = doc.object().value("tasks").toArray();
+ for (const auto& v : arr)
+ tasks.append(AgentTask::from_json(v.toObject()));
+ cb(true, tasks, {});
+ });
+}
+
+void ChatModeService::create_task(const QString& query, const QString& session_id, TaskCallback cb)
+{
+ QJsonObject body;
+ body["query"] = query;
+ if (!session_id.isEmpty())
+ body["session_id"] = session_id;
+ post("/chat/agent/tasks", body,
+ [cb = std::move(cb)](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { cb(false, {}, err); return; }
+ const QJsonObject data = doc.object().value("data").toObject(doc.object());
+ cb(true, AgentTask::from_json(data), {});
+ });
+}
+
+void ChatModeService::get_task(const QString& task_id, TaskCallback cb)
+{
+ get("/chat/agent/tasks/" + task_id,
+ [cb = std::move(cb)](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { cb(false, {}, err); return; }
+ const QJsonObject data = doc.object().value("data").toObject(doc.object());
+ cb(true, AgentTask::from_json(data), {});
+ });
+}
+
+void ChatModeService::cancel_task(const QString& task_id, VoidCallback cb)
+{
+ del("/chat/agent/tasks/" + task_id,
+ [cb = std::move(cb)](bool ok, QJsonDocument, QString err) { cb(ok, err); });
+}
+
+void ChatModeService::send_task_feedback(const QString& task_id, const QString& feedback,
+ VoidCallback cb)
+{
+ QJsonObject body;
+ body["feedback"] = feedback;
+ post("/chat/agent/tasks/" + task_id + "/feedback", body,
+ [cb = std::move(cb)](bool ok, QJsonDocument, QString err) { cb(ok, err); });
+}
+
+// ── SSE streaming ─────────────────────────────────────────────────────────────
+
+QNetworkReply* ChatModeService::stream_message(const QString& message,
+ const QString& session_id,
+ StreamMode mode,
+ const QString& source,
+ bool auto_approve,
+ int profile_id)
+{
+ LOG_INFO("ChatModeService",
+ QString("Streaming message to session %1 [%2]: \"%3\"")
+ .arg(session_id)
+ .arg(mode == StreamMode::Deep ? "deep" : "lite")
+ .arg(message.left(60)));
+
+ // Abort any previous stream
+ abort_stream();
+
+ QJsonObject body;
+ body["message"] = message;
+ body["session_id"] = session_id;
+ body["mode"] = (mode == StreamMode::Deep) ? "deep" : "lite";
+ body["auto_approve"] = auto_approve;
+ body["profile_id"] = profile_id;
+ if (!source.isEmpty())
+ body["source"] = source;
+ else
+ body["source"] = QJsonValue::Null;
+
+ QNetworkRequest req = build_request("/chat/agent/stream");
+ // Accept SSE
+ req.setRawHeader("Accept", "text/event-stream");
+ req.setAttribute(QNetworkRequest::CacheLoadControlAttribute,
+ QNetworkRequest::AlwaysNetwork);
+
+ sse_reply_ = sse_nam_->post(req, QJsonDocument(body).toJson(QJsonDocument::Compact));
+ sse_current_event_.clear();
+
+ connect(sse_reply_, &QNetworkReply::readyRead, this, [this]() {
+ while (sse_reply_ && sse_reply_->canReadLine()) {
+ const QByteArray line = sse_reply_->readLine().trimmed();
+ handle_sse_line(line);
+ }
+ });
+
+ connect(sse_reply_, &QNetworkReply::finished, this, [this]() {
+ if (!sse_reply_) return;
+ const int status =
+ sse_reply_->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+ const auto net_err = sse_reply_->error();
+ LOG_INFO("ChatModeService",
+ QString("SSE stream finished — HTTP %1, net_err=%2").arg(status).arg(net_err));
+ if (status == 402)
+ emit insufficient_credits();
+ if (net_err != QNetworkReply::NoError &&
+ net_err != QNetworkReply::OperationCanceledError) {
+ const QString body = QString::fromUtf8(sse_reply_->readAll().left(200));
+ LOG_WARN("ChatModeService",
+ QString("SSE error body: %1").arg(body));
+ emit stream_error(QString("Stream failed (HTTP %1)").arg(status));
+ }
+ sse_reply_->deleteLater();
+ sse_reply_ = nullptr;
+ });
+
+ return sse_reply_;
+}
+
+void ChatModeService::abort_stream()
+{
+ if (sse_reply_) {
+ sse_reply_->abort();
+ sse_reply_->deleteLater();
+ sse_reply_ = nullptr;
+ }
+}
+
+void ChatModeService::handle_sse_line(const QByteArray& line)
+{
+ if (line.startsWith("event:")) {
+ sse_current_event_ = QString::fromUtf8(line.mid(6).trimmed());
+ return;
+ }
+
+ if (line.startsWith("data:")) {
+ const QByteArray json_bytes = line.mid(5).trimmed();
+ QJsonParseError pe;
+ const QJsonDocument doc = QJsonDocument::fromJson(json_bytes, &pe);
+ if (pe.error != QJsonParseError::NoError)
+ return;
+
+ const QJsonObject data = doc.object();
+ const QString& ev = sse_current_event_;
+
+ if (ev == "session-meta") {
+ const QString sid = data["session_id"].toString();
+ const QString title = data["new_title"].toString();
+ LOG_INFO("ChatModeService",
+ QString("SSE session-meta: id=%1 title=%2").arg(sid, title));
+ emit stream_session_meta(sid, title);
+ } else if (ev == "text-delta") {
+ emit stream_text_delta(data["text"].toString());
+ } else if (ev == "tool-end") {
+ const QString tool = data["tool"].toString();
+ const int dur = data["durationMs"].toInt();
+ LOG_DEBUG("ChatModeService",
+ QString("SSE tool-end: %1 (%2ms)").arg(tool).arg(dur));
+ emit stream_tool_end(tool, dur);
+ } else if (ev == "step-finish") {
+ LOG_DEBUG("ChatModeService",
+ QString("SSE step-finish: %1 tokens").arg(data["tokensUsed"].toInt()));
+ emit stream_step_finish(data["tokensUsed"].toInt());
+ } else if (ev == "finish") {
+ const int total = data["totalTokens"].toInt();
+ LOG_INFO("ChatModeService",
+ QString("SSE finish: %1 total tokens").arg(total));
+ emit stream_finish(total);
+ } else if (ev == "heartbeat") {
+ LOG_DEBUG("ChatModeService", "SSE heartbeat");
+ emit stream_heartbeat();
+ } else if (ev == "error") {
+ const QString msg = data["message"].toString();
+ LOG_WARN("ChatModeService", "SSE error: " + msg);
+ emit stream_error(msg);
+ } else if (!ev.isEmpty()) {
+ LOG_DEBUG("ChatModeService", "SSE unknown event: " + ev);
+ }
+
+ sse_current_event_.clear();
+ }
+}
+
+} // namespace fincept::chat_mode
diff --git a/fincept-qt/src/screens/chat_mode/ChatModeService.h b/fincept-qt/src/screens/chat_mode/ChatModeService.h
new file mode 100644
index 000000000..25335a3e2
--- /dev/null
+++ b/fincept-qt/src/screens/chat_mode/ChatModeService.h
@@ -0,0 +1,132 @@
+#pragma once
+#include "screens/chat_mode/ChatModeTypes.h"
+
+#include <QJsonObject>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QObject>
+#include <QVector>
+#include <functional>
+
+namespace fincept::chat_mode {
+
+/// Singleton service for all api.fincept.in/chat/* calls.
+/// All callbacks are delivered on the Qt event loop (main thread).
+/// SSE streaming uses a dedicated QNetworkAccessManager to avoid
+/// blocking the shared HttpClient instance.
+class ChatModeService : public QObject {
+ Q_OBJECT
+ public:
+ static ChatModeService& instance();
+
+ // ── Session CRUD ──────────────────────────────────────────────────────────
+ using SessionCallback = std::function<void(bool ok, ChatSession session, QString error)>;
+ using SessionsCallback = std::function<void(bool ok, QVector<ChatSession> sessions, QString error)>;
+ using VoidCallback = std::function<void(bool ok, QString error)>;
+
+ void create_session(const QString& title, SessionCallback cb);
+ void list_sessions(SessionsCallback cb);
+ void get_session(const QString& uuid, SessionCallback cb);
+ void delete_session(const QString& uuid, VoidCallback cb);
+ void rename_session(const QString& uuid, const QString& title, VoidCallback cb);
+ void activate_session(const QString& uuid, VoidCallback cb);
+
+ // ── Session utilities (Phase 2) ───────────────────────────────────────────
+ using StatsCallback = std::function<void(bool ok, ChatStats stats, QString error)>;
+ using SearchCallback = std::function<void(bool ok, QVector<ChatMessage> results, QString error)>;
+
+ void get_stats(StatsCallback cb);
+ void search_messages(const QString& query, SearchCallback cb);
+ void bulk_delete_sessions(const QStringList& uuids, VoidCallback cb);
+ void export_sessions(const QStringList& uuids,
+ std::function<void(bool ok, QJsonArray data, QString error)> cb);
+
+ // ── Agent memory ──────────────────────────────────────────────────────────
+ using MemoriesCallback = std::function<void(bool ok, QVector<AgentMemory> memories, QString error)>;
+
+ void list_memory(MemoriesCallback cb);
+ void save_memory(const QString& key, const QString& value,
+ const QString& memory_type, VoidCallback cb);
+ void delete_memory(const QString& key, VoidCallback cb);
+ void clear_all_memory(VoidCallback cb);
+
+ // ── Agent schedules ───────────────────────────────────────────────────────
+ using SchedulesCallback = std::function<void(bool ok, QVector<AgentSchedule> schedules, QString error)>;
+ using ScheduleCallback = std::function<void(bool ok, AgentSchedule schedule, QString error)>;
+
+ void list_schedules(SchedulesCallback cb);
+ void create_schedule(const QString& query, const QString& cron_expression,
+ const QString& session_id, ScheduleCallback cb);
+ void delete_schedule(const QString& schedule_id, VoidCallback cb);
+ void pause_schedule(const QString& schedule_id, VoidCallback cb);
+ void resume_schedule(const QString& schedule_id, VoidCallback cb);
+
+ // ── Agent tasks ───────────────────────────────────────────────────────────
+ using TasksCallback = std::function<void(bool ok, QVector<AgentTask> tasks, QString error)>;
+ using TaskCallback = std::function<void(bool ok, AgentTask task, QString error)>;
+
+ void list_tasks(TasksCallback cb);
+ void create_task(const QString& query, const QString& session_id, TaskCallback cb);
+ void get_task(const QString& task_id, TaskCallback cb);
+ void cancel_task(const QString& task_id, VoidCallback cb);
+ void send_task_feedback(const QString& task_id, const QString& feedback, VoidCallback cb);
+
+ // ── SSE streaming ─────────────────────────────────────────────────────────
+ /// Starts a streaming agent call. Emits signals below as events arrive.
+ /// Returns the reply so caller can abort early if needed.
+ QNetworkReply* stream_message(const QString& message,
+ const QString& session_id,
+ StreamMode mode = StreamMode::Lite,
+ const QString& source = {},
+ bool auto_approve = false,
+ int profile_id = 1);
+
+ /// Abort any active SSE stream.
+ void abort_stream();
+
+ /// Low-level GET for callers that need raw document access (e.g. messages array).
+ void get(const QString& path,
+ std::function<void(bool ok, QJsonDocument doc, QString error)> cb);
+
+ signals:
+ // SSE events
+ void stream_session_meta(const QString& session_id, const QString& new_title);
+ void stream_text_delta(const QString& text);
+ void stream_tool_end(const QString& tool_name, int duration_ms);
+ void stream_step_finish(int tokens_used);
+ void stream_finish(int total_tokens);
+ void stream_error(const QString& message);
+ void stream_heartbeat();
+
+ // Credit error (HTTP 402)
+ void insufficient_credits();
+
+ private:
+ explicit ChatModeService(QObject* parent = nullptr);
+
+ QNetworkRequest build_request(const QString& path) const;
+ QString base_url() const;
+ QString api_key() const;
+ QString session_token() const;
+
+ void post(const QString& path, const QJsonObject& body,
+ std::function<void(bool ok, QJsonDocument doc, QString error)> cb);
+ void put(const QString& path, const QJsonObject& body,
+ std::function<void(bool ok, QJsonDocument doc, QString error)> cb);
+ void del(const QString& path,
+ std::function<void(bool ok, QJsonDocument doc, QString error)> cb);
+ void del_with_body(const QString& path, const QJsonObject& body,
+ std::function<void(bool ok, QJsonDocument doc, QString error)> cb);
+
+ void handle_reply(QNetworkReply* reply,
+ std::function<void(bool ok, QJsonDocument doc, QString error)> cb);
+
+ void handle_sse_line(const QByteArray& line);
+
+ QNetworkAccessManager* nam_ = nullptr; // for regular JSON calls
+ QNetworkAccessManager* sse_nam_ = nullptr; // dedicated for SSE stream
+ QNetworkReply* sse_reply_ = nullptr; // active SSE connection
+ QString sse_current_event_; // tracks "event:" field
+};
+
+} // namespace fincept::chat_mode
diff --git a/fincept-qt/src/screens/chat_mode/ChatModeTypes.h b/fincept-qt/src/screens/chat_mode/ChatModeTypes.h
new file mode 100644
index 000000000..4fdee662b
--- /dev/null
+++ b/fincept-qt/src/screens/chat_mode/ChatModeTypes.h
@@ -0,0 +1,133 @@
+#pragma once
+#include <QDateTime>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QString>
+#include <QVector>
+
+namespace fincept::chat_mode {
+
+// ── Stream mode ───────────────────────────────────────────────────────────────
+enum class StreamMode { Lite, Deep };
+
+// ── Session ───────────────────────────────────────────────────────────────────
+struct ChatSession {
+ QString uuid;
+ QString title;
+ bool is_active = false;
+ int message_count = 0;
+ QString created_at;
+ QString updated_at;
+ QString last_message_at;
+
+ static ChatSession from_json(const QJsonObject& o) {
+ ChatSession s;
+ s.uuid = o["session_uuid"].toString();
+ s.title = o["title"].toString();
+ s.is_active = o["is_active"].toBool();
+ s.message_count = o["message_count"].toInt();
+ s.created_at = o["created_at"].toString();
+ s.updated_at = o["updated_at"].toString();
+ s.last_message_at = o["last_message_at"].toString();
+ return s;
+ }
+};
+
+// ── Message ───────────────────────────────────────────────────────────────────
+struct ChatMessage {
+ QString uuid;
+ QString role; // "user" | "assistant"
+ QString content;
+ QString created_at;
+ int tokens_used = 0;
+ int response_time_ms = 0;
+
+ static ChatMessage from_json(const QJsonObject& o) {
+ ChatMessage m;
+ m.uuid = o["message_uuid"].toString();
+ m.role = o["role"].toString();
+ m.content = o["content"].toString();
+ m.created_at = o["created_at"].toString();
+ m.tokens_used = o["tokens_used"].toInt();
+ m.response_time_ms = o["response_time_ms"].toInt();
+ return m;
+ }
+};
+
+// ── Agent memory entry ────────────────────────────────────────────────────────
+struct AgentMemory {
+ QString key;
+ QString value;
+ QString memory_type; // "fact" | "preference" | "entity"
+ QString created_at;
+
+ static AgentMemory from_json(const QJsonObject& o) {
+ AgentMemory m;
+ m.key = o["key"].toString();
+ m.value = o["value"].toString();
+ m.memory_type = o["memory_type"].toString();
+ m.created_at = o["created_at"].toString();
+ return m;
+ }
+};
+
+// ── Agent schedule ────────────────────────────────────────────────────────────
+struct AgentSchedule {
+ QString schedule_id;
+ QString query;
+ QString cron_expression;
+ QString status; // "active" | "paused"
+ QString session_id;
+ QString created_at;
+
+ static AgentSchedule from_json(const QJsonObject& o) {
+ AgentSchedule s;
+ s.schedule_id = o["schedule_id"].toString();
+ s.query = o["query"].toString();
+ s.cron_expression = o["cron_expression"].toString();
+ s.status = o["status"].toString();
+ s.session_id = o["session_id"].toString();
+ s.created_at = o["created_at"].toString();
+ return s;
+ }
+};
+
+// ── Background agent task ─────────────────────────────────────────────────────
+struct AgentTask {
+ QString task_id;
+ QString query;
+ QString status; // "queued" | "running" | "complete" | "error" | "cancelled"
+ QString session_id;
+ QString result;
+ QString created_at;
+ QString updated_at;
+
+ static AgentTask from_json(const QJsonObject& o) {
+ AgentTask t;
+ t.task_id = o["task_id"].toString();
+ t.query = o["query"].toString();
+ t.status = o["status"].toString();
+ t.session_id = o["session_id"].toString();
+ t.result = o["result"].toString();
+ t.created_at = o["created_at"].toString();
+ t.updated_at = o["updated_at"].toString();
+ return t;
+ }
+};
+
+// ── Chat stats ────────────────────────────────────────────────────────────────
+struct ChatStats {
+ int total_sessions = 0;
+ int total_messages = 0;
+ int active_sessions = 0;
+
+ static ChatStats from_json(const QJsonObject& o) {
+ ChatStats s;
+ s.total_sessions = o["total_sessions"].toInt();
+ s.total_messages = o["total_messages"].toInt();
+ s.active_sessions = o["active_sessions"].toInt();
+ return s;
+ }
+};
+
+} // namespace fincept::chat_mode
diff --git a/fincept-qt/src/screens/chat_mode/ChatSessionPanel.cpp b/fincept-qt/src/screens/chat_mode/ChatSessionPanel.cpp
new file mode 100644
index 000000000..6b2102968
--- /dev/null
+++ b/fincept-qt/src/screens/chat_mode/ChatSessionPanel.cpp
@@ -0,0 +1,231 @@
+#include "screens/chat_mode/ChatSessionPanel.h"
+#include "screens/chat_mode/ChatModeService.h"
+#include "core/logging/Logger.h"
+
+#include <QInputDialog>
+#include <QListWidgetItem>
+#include <QMessageBox>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+
+namespace fincept::chat_mode {
+
+ChatSessionPanel::ChatSessionPanel(QWidget* parent) : QWidget(parent) {
+ build_ui();
+ refresh_sessions();
+}
+
+void ChatSessionPanel::build_ui() {
+ setFixedWidth(240);
+ setStyleSheet("background:#0a0a0a;border-right:1px solid #1a1a1a;");
+
+ auto* vl = new QVBoxLayout(this);
+ vl->setContentsMargins(8, 8, 8, 8);
+ vl->setSpacing(6);
+
+ // Header row: title + exit button
+ auto* header_row = new QHBoxLayout;
+ header_row->setSpacing(4);
+ auto* title_lbl = new QLabel("CONVERSATIONS");
+ title_lbl->setStyleSheet(
+ "color:#d97706;font-size:11px;font-weight:700;font-family:'Consolas',monospace;"
+ "background:transparent;letter-spacing:1px;");
+ header_row->addWidget(title_lbl);
+ header_row->addStretch();
+
+ exit_btn_ = new QPushButton("×");
+ exit_btn_->setFixedSize(20, 20);
+ exit_btn_->setToolTip("Exit Chat Mode");
+ exit_btn_->setStyleSheet(
+ "QPushButton{background:#1a1a1a;color:#808080;border:1px solid #2a2a2a;"
+ "border-radius:3px;font-size:14px;font-family:'Consolas',monospace;}"
+ "QPushButton:hover{background:#2a2a2a;color:#e5e5e5;}");
+ connect(exit_btn_, &QPushButton::clicked, this, &ChatSessionPanel::exit_chat_mode_requested);
+ header_row->addWidget(exit_btn_);
+ vl->addLayout(header_row);
+
+ // Search
+ search_edit_ = new QLineEdit;
+ search_edit_->setPlaceholderText("Search conversations…");
+ search_edit_->setStyleSheet(
+ "QLineEdit{background:#111111;color:#e5e5e5;border:1px solid #2a2a2a;"
+ "border-radius:4px;padding:4px 8px;font-size:12px;font-family:'Consolas',monospace;}"
+ "QLineEdit:focus{border:1px solid #d97706;}");
+ connect(search_edit_, &QLineEdit::textChanged, this, &ChatSessionPanel::on_search_changed);
+ vl->addWidget(search_edit_);
+
+ // Session list
+ session_list_ = new QListWidget;
+ session_list_->setStyleSheet(
+ "QListWidget{background:#0a0a0a;border:none;color:#e5e5e5;"
+ "font-size:12px;font-family:'Consolas',monospace;outline:none;}"
+ "QListWidget::item{padding:8px 6px;border-bottom:1px solid #111111;"
+ "border-radius:3px;}"
+ "QListWidget::item:selected{background:#1a1a1a;color:#d97706;}"
+ "QListWidget::item:hover{background:#111111;}"
+ "QScrollBar:vertical{background:#0a0a0a;width:4px;}"
+ "QScrollBar::handle:vertical{background:#2a2a2a;border-radius:2px;}"
+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}");
+ session_list_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ connect(session_list_, &QListWidget::itemClicked,
+ this, &ChatSessionPanel::on_item_clicked);
+ vl->addWidget(session_list_, 1);
+
+ // Stats label
+ stats_lbl_ = new QLabel;
+ stats_lbl_->setStyleSheet(
+ "color:#404040;font-size:11px;font-family:'Consolas',monospace;background:transparent;");
+ stats_lbl_->setAlignment(Qt::AlignCenter);
+ vl->addWidget(stats_lbl_);
+
+ // Action buttons
+ auto* btn_row = new QHBoxLayout;
+ btn_row->setSpacing(4);
+
+ auto mk_btn = [](const QString& text, const QString& tip) -> QPushButton* {
+ auto* btn = new QPushButton(text);
+ btn->setToolTip(tip);
+ btn->setFixedHeight(26);
+ btn->setStyleSheet(
+ "QPushButton{background:#111111;color:#808080;border:1px solid #2a2a2a;"
+ "border-radius:4px;font-size:12px;font-family:'Consolas',monospace;}"
+ "QPushButton:hover{background:#1a1a1a;color:#e5e5e5;border-color:#d97706;}"
+ "QPushButton:disabled{color:#333333;border-color:#1a1a1a;}");
+ return btn;
+ };
+
+ new_btn_ = mk_btn("+ New", "New conversation");
+ delete_btn_ = mk_btn("Delete", "Delete selected");
+ rename_btn_ = mk_btn("Rename", "Rename selected");
+
+ delete_btn_->setEnabled(false);
+ rename_btn_->setEnabled(false);
+
+ btn_row->addWidget(new_btn_);
+ btn_row->addWidget(rename_btn_);
+ btn_row->addWidget(delete_btn_);
+ vl->addLayout(btn_row);
+
+ connect(new_btn_, &QPushButton::clicked, this, &ChatSessionPanel::on_new_clicked);
+ connect(delete_btn_, &QPushButton::clicked, this, &ChatSessionPanel::on_delete_clicked);
+ connect(rename_btn_, &QPushButton::clicked, this, &ChatSessionPanel::on_rename_clicked);
+}
+
+void ChatSessionPanel::refresh_sessions() {
+ ChatModeService::instance().list_sessions(
+ [this](bool ok, QVector<ChatSession> sessions, QString err) {
+ if (!ok) {
+ LOG_WARN("ChatSessionPanel", "Failed to load sessions: " + err);
+ return;
+ }
+ sessions_ = std::move(sessions);
+ populate_list(sessions_);
+ });
+}
+
+void ChatSessionPanel::populate_list(const QVector<ChatSession>& sessions) {
+ session_list_->clear();
+ for (const auto& s : sessions) {
+ auto* item = new QListWidgetItem(session_list_);
+ // Show title + message count
+ const QString display = s.title.isEmpty() ? "(Untitled)" : s.title;
+ item->setText(display + QString("\n%1 msg").arg(s.message_count));
+ item->setData(Qt::UserRole, s.uuid);
+ item->setData(Qt::UserRole + 1, s.title);
+ if (s.uuid == active_uuid_) {
+ item->setSelected(true);
+ session_list_->setCurrentItem(item);
+ }
+ }
+ // Enable/disable action buttons
+ const bool has_sel = !active_uuid_.isEmpty();
+ delete_btn_->setEnabled(has_sel);
+ rename_btn_->setEnabled(has_sel);
+}
+
+void ChatSessionPanel::apply_filter(const QString& text) {
+ if (text.trimmed().isEmpty()) {
+ populate_list(sessions_);
+ return;
+ }
+ QVector<ChatSession> filtered;
+ for (const auto& s : sessions_) {
+ if (s.title.contains(text, Qt::CaseInsensitive))
+ filtered.append(s);
+ }
+ populate_list(filtered);
+}
+
+void ChatSessionPanel::set_active_session(const QString& uuid) {
+ active_uuid_ = uuid;
+ // Update selection in list
+ for (int i = 0; i < session_list_->count(); ++i) {
+ auto* item = session_list_->item(i);
+ const bool match = item->data(Qt::UserRole).toString() == uuid;
+ item->setSelected(match);
+ if (match) session_list_->setCurrentItem(item);
+ }
+ delete_btn_->setEnabled(!uuid.isEmpty());
+ rename_btn_->setEnabled(!uuid.isEmpty());
+}
+
+void ChatSessionPanel::update_stats(const ChatStats& stats) {
+ stats_lbl_->setText(
+ QString("%1 sessions · %2 messages")
+ .arg(stats.total_sessions)
+ .arg(stats.total_messages));
+}
+
+// ── Slots ─────────────────────────────────────────────────────────────────────
+
+void ChatSessionPanel::on_item_clicked(QListWidgetItem* item) {
+ if (!item) return;
+ const QString uuid = item->data(Qt::UserRole).toString();
+ active_uuid_ = uuid;
+ delete_btn_->setEnabled(true);
+ rename_btn_->setEnabled(true);
+ emit session_selected(uuid);
+}
+
+void ChatSessionPanel::on_new_clicked() {
+ emit new_session_requested();
+}
+
+void ChatSessionPanel::on_delete_clicked() {
+ if (active_uuid_.isEmpty()) return;
+
+ // Find title for confirmation
+ QString title;
+ for (const auto& s : sessions_) {
+ if (s.uuid == active_uuid_) { title = s.title; break; }
+ }
+ const QString confirm_name = title.isEmpty() ? "(Untitled)" : title;
+
+ if (QMessageBox::question(this, "Delete Conversation",
+ QString("Delete \"%1\"? This cannot be undone.").arg(confirm_name),
+ QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes)
+ return;
+
+ emit delete_session_requested(active_uuid_);
+}
+
+void ChatSessionPanel::on_rename_clicked() {
+ if (active_uuid_.isEmpty()) return;
+
+ QString current_title;
+ for (const auto& s : sessions_) {
+ if (s.uuid == active_uuid_) { current_title = s.title; break; }
+ }
+
+ bool ok = false;
+ const QString new_title = QInputDialog::getText(
+ this, "Rename Conversation", "New title:", QLineEdit::Normal, current_title, &ok);
+ if (ok && !new_title.trimmed().isEmpty())
+ emit rename_session_requested(active_uuid_, new_title.trimmed());
+}
+
+void ChatSessionPanel::on_search_changed(const QString& text) {
+ apply_filter(text);
+}
+
+} // namespace fincept::chat_mode
diff --git a/fincept-qt/src/screens/chat_mode/ChatSessionPanel.h b/fincept-qt/src/screens/chat_mode/ChatSessionPanel.h
new file mode 100644
index 000000000..b4d08e297
--- /dev/null
+++ b/fincept-qt/src/screens/chat_mode/ChatSessionPanel.h
@@ -0,0 +1,55 @@
+#pragma once
+#include "screens/chat_mode/ChatModeTypes.h"
+
+#include <QLabel>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QPushButton>
+#include <QWidget>
+
+namespace fincept::chat_mode {
+
+/// Left sidebar panel — session list, search, new/delete/rename.
+class ChatSessionPanel : public QWidget {
+ Q_OBJECT
+ public:
+ explicit ChatSessionPanel(QWidget* parent = nullptr);
+
+ void refresh_sessions();
+
+ signals:
+ void session_selected(const QString& uuid);
+ void new_session_requested();
+ void delete_session_requested(const QString& uuid);
+ void rename_session_requested(const QString& uuid, const QString& current_title);
+ void exit_chat_mode_requested();
+
+ public slots:
+ void set_active_session(const QString& uuid);
+ void update_stats(const ChatStats& stats);
+
+ private slots:
+ void on_item_clicked(QListWidgetItem* item);
+ void on_new_clicked();
+ void on_delete_clicked();
+ void on_rename_clicked();
+ void on_search_changed(const QString& text);
+
+ private:
+ QLineEdit* search_edit_ = nullptr;
+ QListWidget* session_list_ = nullptr;
+ QPushButton* new_btn_ = nullptr;
+ QPushButton* delete_btn_ = nullptr;
+ QPushButton* rename_btn_ = nullptr;
+ QPushButton* exit_btn_ = nullptr;
+ QLabel* stats_lbl_ = nullptr;
+
+ QString active_uuid_;
+ QVector<ChatSession> sessions_;
+
+ void build_ui();
+ void apply_filter(const QString& text);
+ void populate_list(const QVector<ChatSession>& sessions);
+};
+
+} // namespace fincept::chat_mode
diff --git a/fincept-qt/src/screens/dashboard/DashboardScreen.cpp b/fincept-qt/src/screens/dashboard/DashboardScreen.cpp
index fdce33de4..712ac9f89 100644
--- a/fincept-qt/src/screens/dashboard/DashboardScreen.cpp
+++ b/fincept-qt/src/screens/dashboard/DashboardScreen.cpp
@@ -1,11 +1,14 @@
#include "screens/dashboard/DashboardScreen.h"
+#include "services/notifications/NotificationService.h"
+#include "ui/widgets/NotifToast.h"
#include "screens/dashboard/canvas/AddWidgetDialog.h"
#include "screens/dashboard/canvas/DashboardTemplates.h"
#include "screens/dashboard/canvas/TemplatePicker.h"
#include "screens/dashboard/canvas/WidgetRegistry.h"
#include "storage/repositories/SettingsRepository.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QDataStream>
#include <QEvent>
@@ -18,7 +21,7 @@
namespace fincept::screens {
DashboardScreen::DashboardScreen(QWidget* parent) : QWidget(parent) {
- setStyleSheet(QString("background: %1;").arg(ui::colors::BG_BASE));
+ refresh_theme();
auto* vl = new QVBoxLayout(this);
vl->setContentsMargins(0, 0, 0, 0);
@@ -35,8 +38,9 @@ DashboardScreen::DashboardScreen(QWidget* parent) : QWidget(parent) {
// ── Main Content: Canvas (in scroll) + Market Pulse ──
content_split_ = new QSplitter(Qt::Horizontal);
content_split_->setHandleWidth(1);
- content_split_->setStyleSheet("QSplitter::handle { background: #1a1a1a; }"
- "QSplitter::handle:hover { background: #333333; }");
+ content_split_->setStyleSheet(
+ QString("QSplitter::handle{background:%1;}QSplitter::handle:hover{background:%2;}")
+ .arg(ui::colors::BORDER_DIM(), ui::colors::BORDER_MED()));
canvas_ = new DashboardCanvas;
@@ -45,10 +49,11 @@ DashboardScreen::DashboardScreen(QWidget* parent) : QWidget(parent) {
scroll_area_->setWidgetResizable(false); // canvas controls its own size
scroll_area_->setWidget(canvas_);
scroll_area_->setStyleSheet(
- "QScrollArea { border: none; background: transparent; }"
- "QScrollBar:vertical { width: 6px; background: transparent; }"
- "QScrollBar::handle:vertical { background: #222; border-radius: 3px; min-height: 20px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }");
+ QString("QScrollArea{border:none;background:transparent;}"
+ "QScrollBar:vertical{width:6px;background:transparent;}"
+ "QScrollBar::handle:vertical{background:%1;border-radius:3px;min-height:20px;}"
+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")
+ .arg(ui::colors::BORDER_MED()));
// Sync canvas width to scroll viewport via event filter
scroll_area_->viewport()->installEventFilter(this);
@@ -67,6 +72,12 @@ DashboardScreen::DashboardScreen(QWidget* parent) : QWidget(parent) {
status_bar_ = new DashboardStatusBar;
vl->addWidget(status_bar_);
+ // ── In-app notification toast (overlay, not in layout) ────────────────────
+ notif_toast_ = new fincept::ui::NotifToast(this);
+ connect(&fincept::notifications::NotificationService::instance(),
+ &fincept::notifications::NotificationService::notification_received,
+ notif_toast_, &fincept::ui::NotifToast::show_notification);
+
// ── Debounced save timer (P3: not started in constructor) ──
save_timer_ = new QTimer(this);
save_timer_->setSingleShot(true);
@@ -109,6 +120,26 @@ DashboardScreen::DashboardScreen(QWidget* parent) : QWidget(parent) {
compact = !compact;
canvas_->set_row_height(compact ? 40 : 60);
});
+
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) { refresh_theme(); });
+}
+
+// ── Theme ─────────────────────────────────────────────────────────────────────
+
+void DashboardScreen::refresh_theme() {
+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));
+ if (content_split_)
+ content_split_->setStyleSheet(
+ QString("QSplitter::handle{background:%1;}QSplitter::handle:hover{background:%2;}")
+ .arg(ui::colors::BORDER_DIM(), ui::colors::BORDER_MED()));
+ if (scroll_area_)
+ scroll_area_->setStyleSheet(
+ QString("QScrollArea{border:none;background:transparent;}"
+ "QScrollBar:vertical{width:6px;background:transparent;}"
+ "QScrollBar::handle:vertical{background:%1;border-radius:3px;min-height:20px;}"
+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")
+ .arg(ui::colors::BORDER_MED()));
}
// ── Show/Hide ─────────────────────────────────────────────────────────────────
diff --git a/fincept-qt/src/screens/dashboard/DashboardScreen.h b/fincept-qt/src/screens/dashboard/DashboardScreen.h
index 852f327f3..d2980d0ca 100644
--- a/fincept-qt/src/screens/dashboard/DashboardScreen.h
+++ b/fincept-qt/src/screens/dashboard/DashboardScreen.h
@@ -5,6 +5,8 @@
#include "screens/dashboard/TickerBar.h"
#include "screens/dashboard/canvas/DashboardCanvas.h"
+namespace fincept::ui { class NotifToast; } // forward declaration
+
#include <QHideEvent>
#include <QScrollArea>
#include <QShowEvent>
@@ -26,20 +28,22 @@ class DashboardScreen : public QWidget {
bool eventFilter(QObject* obj, QEvent* event) override;
private:
+ void refresh_theme();
void build_default_layout();
void save_layout();
void restore_layout();
- DashboardToolBar* toolbar_ = nullptr;
- TickerBar* ticker_bar_ = nullptr;
- QScrollArea* scroll_area_ = nullptr;
- DashboardCanvas* canvas_ = nullptr;
- QSplitter* content_split_ = nullptr;
- MarketPulsePanel* market_pulse_ = nullptr;
- DashboardStatusBar* status_bar_ = nullptr;
- QTimer* save_timer_ = nullptr;
- bool pulse_visible_ = true;
- bool layout_restored_ = false;
+ DashboardToolBar* toolbar_ = nullptr;
+ TickerBar* ticker_bar_ = nullptr;
+ QScrollArea* scroll_area_ = nullptr;
+ DashboardCanvas* canvas_ = nullptr;
+ QSplitter* content_split_= nullptr;
+ MarketPulsePanel* market_pulse_ = nullptr;
+ DashboardStatusBar* status_bar_ = nullptr;
+ fincept::ui::NotifToast* notif_toast_ = nullptr;
+ QTimer* save_timer_ = nullptr;
+ bool pulse_visible_ = true;
+ bool layout_restored_ = false;
};
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/dashboard/DashboardStatusBar.cpp b/fincept-qt/src/screens/dashboard/DashboardStatusBar.cpp
index 90cbdf6c8..f5ea70250 100644
--- a/fincept-qt/src/screens/dashboard/DashboardStatusBar.cpp
+++ b/fincept-qt/src/screens/dashboard/DashboardStatusBar.cpp
@@ -1,6 +1,9 @@
#include "screens/dashboard/DashboardStatusBar.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
+#include "ui/widgets/NotifBell.h"
+#include "ui/widgets/NotifPanel.h"
#include <QDateTime>
#include <QHBoxLayout>
@@ -10,10 +13,14 @@
namespace fincept::screens {
+// Color-only label style — no font-size/family (global QSS handles those)
+static QString lbl_ss(const QString& color, bool bold = false) {
+ return QString("color:%1;background:transparent;%2")
+ .arg(color, bold ? "font-weight:bold;" : "");
+}
+
DashboardStatusBar::DashboardStatusBar(QWidget* parent) : QWidget(parent) {
setFixedHeight(24);
- setStyleSheet(
- QString("background: %1; border-top: 1px solid %2;").arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
start_time_ = QDateTime::currentMSecsSinceEpoch();
@@ -21,94 +28,98 @@ DashboardStatusBar::DashboardStatusBar(QWidget* parent) : QWidget(parent) {
hl->setContentsMargins(12, 0, 12, 0);
hl->setSpacing(0);
- static const auto lbl = [](const QString& text, const QString& color, bool bold = false) {
+ auto make_lbl = [](const QString& text, const QString& color, bool bold = false) {
auto* l = new QLabel(text);
- l->setStyleSheet(QString("color: %1; font-size: 11px; %2 background: transparent; "
- "font-family: 'Consolas','Courier New',monospace;")
- .arg(color, bold ? "font-weight: bold; " : ""));
+ l->setStyleSheet(lbl_ss(color, bold));
return l;
};
- static const auto sep = [&]() { return lbl("|", ui::colors::BORDER_MED()); };
+ auto make_sep = [&]() { return make_lbl("|", ui::colors::BORDER_MED()); };
- // ── Left: version, session, layout, feeds ──
+ // ── Left ──
auto* left = new QWidget;
- left->setStyleSheet("background: transparent;");
+ left->setStyleSheet("background:transparent;");
auto* ll = new QHBoxLayout(left);
ll->setContentsMargins(0, 0, 0, 0);
ll->setSpacing(8);
- ll->addWidget(lbl("v4.0.0", ui::colors::TEXT_SECONDARY(), true));
- ll->addWidget(sep());
+ ll->addWidget(make_lbl("v4.0.0", ui::colors::TEXT_SECONDARY(), true));
+ ll->addWidget(make_sep());
- struct Feed {
- const char* label;
- const char* color;
+ const struct { const char* label; const char* color; } feeds[] = {
+ {"EQ", ui::colors::POSITIVE()}, {"FX", ui::colors::POSITIVE()},
+ {"CM", ui::colors::WARNING()}, {"FI", ui::colors::POSITIVE()},
+ {"CR", ui::colors::POSITIVE()},
};
- const Feed feeds[] = {
- {"EQ", ui::colors::POSITIVE()}, {"FX", ui::colors::POSITIVE()}, {"CM", ui::colors::WARNING()},
- {"FI", ui::colors::POSITIVE()}, {"CR", ui::colors::POSITIVE()},
- };
- for (auto& f : feeds) {
- ll->addWidget(lbl(f.label, f.color, true));
- }
+ for (auto& f : feeds)
+ ll->addWidget(make_lbl(f.label, f.color, true));
- ll->addWidget(sep());
- ll->addWidget(lbl("SESSION:", ui::colors::TEXT_SECONDARY()));
+ ll->addWidget(make_sep());
+ ll->addWidget(make_lbl("SESSION:", ui::colors::TEXT_SECONDARY()));
uptime_label_ = new QLabel("00:00:00");
- uptime_label_->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: bold; background: transparent; "
- "font-family: 'Consolas','Courier New',monospace;")
- .arg(ui::colors::CYAN()));
+ uptime_label_->setStyleSheet(lbl_ss(ui::colors::CYAN(), true));
ll->addWidget(uptime_label_);
- ll->addWidget(sep());
- ll->addWidget(lbl("LAYOUT:", ui::colors::TEXT_SECONDARY()));
+ ll->addWidget(make_sep());
+ ll->addWidget(make_lbl("LAYOUT:", ui::colors::TEXT_SECONDARY()));
layout_label_ = new QLabel("ACTIVE");
- layout_label_->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: bold; background: transparent; "
- "font-family: 'Consolas','Courier New',monospace;")
- .arg(ui::colors::POSITIVE()));
+ layout_label_->setStyleSheet(lbl_ss(ui::colors::POSITIVE(), true));
ll->addWidget(layout_label_);
- ll->addWidget(sep());
- ll->addWidget(lbl("FEEDS:", ui::colors::TEXT_SECONDARY()));
+ ll->addWidget(make_sep());
+ ll->addWidget(make_lbl("FEEDS:", ui::colors::TEXT_SECONDARY()));
feeds_label_ = new QLabel("CONNECTED");
- feeds_label_->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: bold; background: transparent; "
- "font-family: 'Consolas','Courier New',monospace;")
- .arg(ui::colors::POSITIVE()));
+ feeds_label_->setStyleSheet(lbl_ss(ui::colors::POSITIVE(), true));
ll->addWidget(feeds_label_);
hl->addWidget(left);
hl->addStretch();
- // ── Right: mem, latency, ready ──
+ // ── Right ──
auto* right = new QWidget;
- right->setStyleSheet("background: transparent;");
+ right->setStyleSheet("background:transparent;");
auto* rl = new QHBoxLayout(right);
rl->setContentsMargins(0, 0, 0, 0);
rl->setSpacing(8);
- rl->addWidget(lbl("MEM: OPTIMAL", ui::colors::CYAN()));
- rl->addWidget(sep());
+ rl->addWidget(make_lbl("MEM: OPTIMAL", ui::colors::CYAN()));
+ rl->addWidget(make_sep());
latency_label_ = new QLabel("LAT: ---");
- latency_label_->setStyleSheet(
- QString("color: %1; font-size: 11px; font-weight: bold; background: transparent;"
- "font-family: 'Consolas','Courier New',monospace;").arg(ui::colors::TEXT_SECONDARY()));
+ latency_label_->setStyleSheet(lbl_ss(ui::colors::TEXT_SECONDARY(), true));
rl->addWidget(latency_label_);
- rl->addWidget(sep());
- rl->addWidget(lbl("● READY", ui::colors::POSITIVE(), true));
+ rl->addWidget(make_sep());
+ rl->addWidget(make_lbl("● READY", ui::colors::POSITIVE(), true));
+ rl->addWidget(make_sep());
+
+ // ── Notification bell ──────────────────────────────────────────────────
+ notif_bell_ = new fincept::ui::NotifBell(this);
+ rl->addWidget(notif_bell_);
+
+ // Panel is a popup — parented to the top-level window so it can float
+ // over all widgets. We create it lazily on first click.
+ connect(notif_bell_, &fincept::ui::NotifBell::bell_clicked,
+ this, &DashboardStatusBar::toggle_notif_panel);
hl->addWidget(right);
- // Uptime timer
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) { refresh_theme(); });
+
connect(&uptime_timer_, &QTimer::timeout, this, &DashboardStatusBar::update_uptime);
uptime_timer_.start(1000);
- // API latency ping — fire immediately then every 30s
nam_ = new QNetworkAccessManager(this);
connect(&ping_timer_, &QTimer::timeout, this, &DashboardStatusBar::ping_api);
ping_timer_.start(30000);
ping_api();
+
+ refresh_theme();
+}
+
+void DashboardStatusBar::refresh_theme() {
+ setStyleSheet(QString("background:%1;border-top:1px solid %2;")
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
}
void DashboardStatusBar::update_uptime() {
@@ -117,22 +128,20 @@ void DashboardStatusBar::update_uptime() {
int m = static_cast<int>((elapsed % 3600) / 60);
int s = static_cast<int>(elapsed % 60);
uptime_label_->setText(
- QString("%1:%2:%3").arg(h, 2, 10, QChar('0')).arg(m, 2, 10, QChar('0')).arg(s, 2, 10, QChar('0')));
+ QString("%1:%2:%3").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0')).arg(s,2,10,QChar('0')));
}
void DashboardStatusBar::set_widget_count(int count) {
layout_label_->setText(count > 0 ? "ACTIVE" : "EMPTY");
- layout_label_->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: bold; background: transparent; "
- "font-family: 'Consolas','Courier New',monospace;")
- .arg(count > 0 ? ui::colors::POSITIVE() : ui::colors::TEXT_SECONDARY()));
+ layout_label_->setStyleSheet(
+ lbl_ss(count > 0 ? ui::colors::POSITIVE() : ui::colors::TEXT_SECONDARY(), true));
}
void DashboardStatusBar::set_connected(bool connected) {
connected_ = connected;
feeds_label_->setText(connected ? "CONNECTED" : "DISCONNECTED");
- feeds_label_->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: bold; background: transparent; "
- "font-family: 'Consolas','Courier New',monospace;")
- .arg(connected ? ui::colors::POSITIVE() : ui::colors::NEGATIVE()));
+ feeds_label_->setStyleSheet(
+ lbl_ss(connected ? ui::colors::POSITIVE() : ui::colors::NEGATIVE(), true));
}
void DashboardStatusBar::ping_api() {
@@ -142,30 +151,37 @@ void DashboardStatusBar::ping_api() {
QNetworkReply* reply = nam_->get(req);
connect(reply, &QNetworkReply::finished, this, [this, reply]() {
reply->deleteLater();
- if (reply->error() == QNetworkReply::NoError) {
- set_latency(static_cast<int>(ping_elapsed_.elapsed()));
- } else {
- set_latency(-1);
- }
+ set_latency(reply->error() == QNetworkReply::NoError
+ ? static_cast<int>(ping_elapsed_.elapsed()) : -1);
});
}
void DashboardStatusBar::set_latency(int ms) {
if (ms < 0) {
latency_label_->setText("LAT: ERR");
- latency_label_->setStyleSheet(
- QString("color: %1; font-size: 11px; font-weight: bold; background: transparent;"
- "font-family: 'Consolas','Courier New',monospace;").arg(ui::colors::NEGATIVE()));
+ latency_label_->setStyleSheet(lbl_ss(ui::colors::NEGATIVE(), true));
return;
}
latency_label_->setText(QString("LAT: %1ms").arg(ms));
- // Color: green <100ms, amber 100-300ms, red >300ms
const QString color = ms < 100 ? ui::colors::POSITIVE()
: ms < 300 ? ui::colors::AMBER()
: ui::colors::NEGATIVE();
- latency_label_->setStyleSheet(
- QString("color: %1; font-size: 11px; font-weight: bold; background: transparent;"
- "font-family: 'Consolas','Courier New',monospace;").arg(color));
+ latency_label_->setStyleSheet(lbl_ss(color, true));
+}
+
+void DashboardStatusBar::toggle_notif_panel() {
+ // Lazy-create the panel parented to the window so it floats freely
+ if (!notif_panel_) {
+ QWidget* root = window();
+ notif_panel_ = new fincept::ui::NotifPanel(root ? root : this);
+ }
+ if (notif_panel_->isVisible()) {
+ notif_panel_->hide();
+ } else {
+ notif_panel_->anchor_to(notif_bell_);
+ notif_panel_->show();
+ notif_panel_->raise();
+ }
}
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/dashboard/DashboardStatusBar.h b/fincept-qt/src/screens/dashboard/DashboardStatusBar.h
index 2e49862bc..02ebb469a 100644
--- a/fincept-qt/src/screens/dashboard/DashboardStatusBar.h
+++ b/fincept-qt/src/screens/dashboard/DashboardStatusBar.h
@@ -5,9 +5,17 @@
#include <QTimer>
#include <QWidget>
+// Forward declarations — avoids pulling notification headers into every TU
+// that includes DashboardStatusBar.h
+namespace fincept::ui {
+class NotifBell;
+class NotifPanel;
+} // namespace fincept::ui
+
namespace fincept::screens {
-/// Bottom status bar — session uptime, feed indicators, system status.
+/// Bottom status bar — session uptime, feed indicators, system status,
+/// and notification bell with unread badge (right side).
class DashboardStatusBar : public QWidget {
Q_OBJECT
public:
@@ -17,15 +25,20 @@ class DashboardStatusBar : public QWidget {
void set_connected(bool connected);
private:
+ void refresh_theme();
void update_uptime();
void ping_api();
- void set_latency(int ms); // -1 = timeout/error
+ void set_latency(int ms); // -1 = timeout/error
+ void toggle_notif_panel();
QLabel* uptime_label_ = nullptr;
QLabel* layout_label_ = nullptr;
QLabel* feeds_label_ = nullptr;
QLabel* latency_label_ = nullptr;
+ fincept::ui::NotifBell* notif_bell_ = nullptr;
+ fincept::ui::NotifPanel* notif_panel_ = nullptr;
+
QTimer uptime_timer_;
QTimer ping_timer_;
QNetworkAccessManager* nam_ = nullptr;
diff --git a/fincept-qt/src/screens/dashboard/DashboardToolBar.cpp b/fincept-qt/src/screens/dashboard/DashboardToolBar.cpp
index efee14d38..ed12fedd4 100644
--- a/fincept-qt/src/screens/dashboard/DashboardToolBar.cpp
+++ b/fincept-qt/src/screens/dashboard/DashboardToolBar.cpp
@@ -1,155 +1,129 @@
#include "screens/dashboard/DashboardToolBar.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QHBoxLayout>
namespace fincept::screens {
+static QString lbl_ss(const QString& color, bool bold = false) {
+ return QString("color:%1;background:transparent;%2")
+ .arg(color, bold ? "font-weight:bold;" : "");
+}
+
+static QString btn_ss(const QString& border, const QString& color) {
+ return QString("QPushButton{background:%1;border:1px solid %2;color:%3;padding:0 10px;font-weight:bold;}"
+ "QPushButton:hover{background:%4;color:%5;border-color:%6;}")
+ .arg(ui::colors::BG_RAISED(), border, color,
+ ui::colors::BG_HOVER(), ui::colors::TEXT_PRIMARY(), ui::colors::BORDER_BRIGHT());
+}
+
DashboardToolBar::DashboardToolBar(QWidget* parent) : QWidget(parent) {
setFixedHeight(26);
- setStyleSheet(
- QString("background: %1; border-bottom: 1px solid %2;").arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
auto* hl = new QHBoxLayout(this);
hl->setContentsMargins(12, 0, 12, 0);
hl->setSpacing(0);
- // ── Left: Terminal Identity ──
auto* left = new QWidget;
- left->setStyleSheet("background: transparent;");
+ left->setStyleSheet("background:transparent;");
auto* ll = new QHBoxLayout(left);
ll->setContentsMargins(0, 0, 0, 0);
ll->setSpacing(8);
- auto* brand = new QLabel("■ FINCEPT");
- brand->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: bold; letter-spacing: 1px; "
- "background: transparent; font-family: 'Consolas','Courier New',monospace;")
- .arg(ui::colors::AMBER()));
+ auto make_sep = [&](QBoxLayout* layout) {
+ auto* s = new QLabel("|");
+ s->setStyleSheet(lbl_ss(ui::colors::BORDER_MED()));
+ layout->addWidget(s);
+ };
+
+ auto* brand = new QLabel("FINCEPT");
+ brand->setStyleSheet(lbl_ss(ui::colors::AMBER(), true) + "letter-spacing:1px;");
ll->addWidget(brand);
auto* sub = new QLabel("TERMINAL");
- sub->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: bold; "
- "background: transparent; font-family: 'Consolas','Courier New',monospace;")
- .arg(ui::colors::TEXT_TERTIARY()));
+ sub->setStyleSheet(lbl_ss(ui::colors::TEXT_TERTIARY(), true));
ll->addWidget(sub);
- // Separator
- auto* sep1 = new QLabel("|");
- sep1->setStyleSheet(QString("color: %1; font-size: 11px; background: transparent; "
- "font-family: 'Consolas','Courier New',monospace;")
- .arg(ui::colors::BORDER_MED()));
- ll->addWidget(sep1);
-
- // Connection status — text-only, no dot, no border-radius
- status_text_ = new QLabel("● LIVE");
- status_text_->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: bold; "
- "background: transparent; font-family: 'Consolas','Courier New',monospace;")
- .arg(ui::colors::POSITIVE()));
+ make_sep(ll);
+
+ status_text_ = new QLabel("LIVE");
+ status_text_->setStyleSheet(lbl_ss(ui::colors::POSITIVE(), true));
ll->addWidget(status_text_);
- auto* sep2 = new QLabel("|");
- sep2->setStyleSheet(QString("color: %1; font-size: 11px; background: transparent; "
- "font-family: 'Consolas','Courier New',monospace;")
- .arg(ui::colors::BORDER_MED()));
- ll->addWidget(sep2);
+ make_sep(ll);
clock_label_ = new QLabel;
- clock_label_->setStyleSheet(QString("color: %1; font-size: 11px; "
- "background: transparent; font-family: 'Consolas','Courier New',monospace;")
- .arg(ui::colors::TEXT_SECONDARY()));
+ clock_label_->setStyleSheet(lbl_ss(ui::colors::TEXT_SECONDARY()));
ll->addWidget(clock_label_);
update_clock();
- auto* sep3 = new QLabel("|");
- sep3->setStyleSheet(QString("color: %1; font-size: 11px; background: transparent; "
- "font-family: 'Consolas','Courier New',monospace;")
- .arg(ui::colors::BORDER_MED()));
- ll->addWidget(sep3);
+ make_sep(ll);
- // Widget count
widget_count_ = new QLabel("0 WIDGETS");
- widget_count_->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: bold; "
- "background: transparent; font-family: 'Consolas','Courier New',monospace;")
- .arg(ui::colors::CYAN()));
+ widget_count_->setStyleSheet(lbl_ss(ui::colors::CYAN(), true));
ll->addWidget(widget_count_);
hl->addWidget(left);
hl->addStretch();
- // ── Right: Action buttons ──
auto* right = new QWidget;
- right->setStyleSheet("background: transparent;");
+ right->setStyleSheet("background:transparent;");
auto* rl = new QHBoxLayout(right);
rl->setContentsMargins(0, 0, 0, 0);
rl->setSpacing(4);
- static const auto btn_style = [](const QString& border_color, const QString& text_color) {
- return QString("QPushButton { background: #111111; border: 1px solid %1; color: %2; "
- "padding: 0 10px; font-size: 11px; font-weight: bold; "
- "font-family: 'Consolas','Courier New',monospace; }"
- "QPushButton:hover { background: #161616; color: #e5e5e5; border-color: #333333; }")
- .arg(border_color, text_color);
- };
-
- auto btn_primary = QString("QPushButton { background: rgba(217,119,6,0.1); border: 1px solid %1; color: %2; "
- "padding: 0 10px; font-size: 11px; font-weight: bold; "
- "font-family: 'Consolas','Courier New',monospace; }"
- "QPushButton:hover { background: %2; color: #080808; }")
- .arg(ui::colors::AMBER_DIM(), ui::colors::AMBER());
-
- auto btn_danger = QString("QPushButton { background: rgba(220,38,38,0.1); border: 1px solid #7f1d1d; color: %1; "
- "padding: 0 10px; font-size: 11px; font-weight: bold; "
- "font-family: 'Consolas','Courier New',monospace; }"
- "QPushButton:hover { background: %1; color: #e5e5e5; }")
- .arg(ui::colors::NEGATIVE());
-
compact_btn_ = new QPushButton("COMPACT");
compact_btn_->setFixedHeight(20);
- compact_btn_->setStyleSheet(btn_style(ui::colors::BORDER_DIM(), ui::colors::TEXT_SECONDARY()));
+ compact_btn_->setStyleSheet(btn_ss(ui::colors::BORDER_DIM(), ui::colors::TEXT_SECONDARY()));
connect(compact_btn_, &QPushButton::clicked, this, &DashboardToolBar::toggle_compact_clicked);
rl->addWidget(compact_btn_);
pulse_btn_ = new QPushButton("PULSE");
pulse_btn_->setFixedHeight(20);
- pulse_btn_->setStyleSheet(btn_style(ui::colors::BORDER_DIM(), ui::colors::TEXT_SECONDARY()));
+ pulse_btn_->setStyleSheet(btn_ss(ui::colors::BORDER_DIM(), ui::colors::TEXT_SECONDARY()));
connect(pulse_btn_, &QPushButton::clicked, this, &DashboardToolBar::toggle_pulse_clicked);
rl->addWidget(pulse_btn_);
- auto* sep4 = new QLabel("|");
- sep4->setStyleSheet(QString("color: %1; font-size: 11px; background: transparent; "
- "font-family: 'Consolas','Courier New',monospace;")
- .arg(ui::colors::BORDER_MED()));
- rl->addWidget(sep4);
+ make_sep(rl);
auto* add_btn = new QPushButton("+ ADD");
add_btn->setFixedHeight(20);
- add_btn->setStyleSheet(btn_primary);
+ add_btn->setStyleSheet(btn_ss(ui::colors::AMBER_DIM(), ui::colors::AMBER()));
connect(add_btn, &QPushButton::clicked, this, &DashboardToolBar::add_widget_clicked);
rl->addWidget(add_btn);
auto* save_btn = new QPushButton("SAVE");
save_btn->setFixedHeight(20);
- save_btn->setStyleSheet(btn_style(ui::colors::BORDER_DIM(), ui::colors::TEXT_SECONDARY()));
+ save_btn->setStyleSheet(btn_ss(ui::colors::BORDER_DIM(), ui::colors::TEXT_SECONDARY()));
connect(save_btn, &QPushButton::clicked, this, &DashboardToolBar::save_layout_clicked);
rl->addWidget(save_btn);
auto* reset_btn = new QPushButton("RESET");
reset_btn->setFixedHeight(20);
- reset_btn->setStyleSheet(btn_danger);
+ reset_btn->setStyleSheet(btn_ss(ui::colors::NEGATIVE(), ui::colors::NEGATIVE()));
connect(reset_btn, &QPushButton::clicked, this, &DashboardToolBar::reset_layout_clicked);
rl->addWidget(reset_btn);
hl->addWidget(right);
- // Clock timer
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) { refresh_theme(); });
+
connect(&clock_timer_, &QTimer::timeout, this, &DashboardToolBar::update_clock);
clock_timer_.start(1000);
+
+ refresh_theme();
+}
+
+void DashboardToolBar::refresh_theme() {
+ setStyleSheet(QString("background:%1;border-bottom:1px solid %2;")
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
}
void DashboardToolBar::update_clock() {
- auto now = QDateTime::currentDateTimeUtc();
- clock_label_->setText(now.toString("yyyy-MM-dd HH:mm:ss") + " UTC");
+ clock_label_->setText(QDateTime::currentDateTimeUtc().toString("yyyy-MM-dd HH:mm:ss") + " UTC");
}
void DashboardToolBar::set_widget_count(int count) {
@@ -158,12 +132,9 @@ void DashboardToolBar::set_widget_count(int count) {
void DashboardToolBar::set_connected(bool connected) {
connected_ = connected;
- const QString color = connected ? ui::colors::POSITIVE() : ui::colors::NEGATIVE();
- const char* label = connected ? "● LIVE" : "○ OFFLINE";
- status_text_->setText(label);
- status_text_->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: bold; "
- "background: transparent; font-family: 'Consolas','Courier New',monospace;")
- .arg(color));
+ status_text_->setText(connected ? "LIVE" : "OFFLINE");
+ status_text_->setStyleSheet(
+ lbl_ss(connected ? ui::colors::POSITIVE() : ui::colors::NEGATIVE(), true));
}
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/dashboard/DashboardToolBar.h b/fincept-qt/src/screens/dashboard/DashboardToolBar.h
index e6ab1b300..662e6f106 100644
--- a/fincept-qt/src/screens/dashboard/DashboardToolBar.h
+++ b/fincept-qt/src/screens/dashboard/DashboardToolBar.h
@@ -25,6 +25,7 @@ class DashboardToolBar : public QWidget {
private:
void update_clock();
+ void refresh_theme();
QLabel* clock_label_ = nullptr;
QLabel* status_text_ = nullptr;
diff --git a/fincept-qt/src/screens/dashboard/MarketPulsePanel.cpp b/fincept-qt/src/screens/dashboard/MarketPulsePanel.cpp
index 854799b89..8a53e8d27 100644
--- a/fincept-qt/src/screens/dashboard/MarketPulsePanel.cpp
+++ b/fincept-qt/src/screens/dashboard/MarketPulsePanel.cpp
@@ -2,6 +2,7 @@
#include "services/markets/MarketDataService.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QDateTime>
#include <QFrame>
@@ -34,7 +35,6 @@ static const QStringList kSnapshotSymbols = services::MarketDataService::global_
// ── Constructor ──────────────────────────────────────────────────────────────
MarketPulsePanel::MarketPulsePanel(QWidget* parent) : QWidget(parent) {
- setStyleSheet(QString("background: %1;").arg(ui::colors::PANEL()));
setMinimumWidth(260);
auto* vl = new QVBoxLayout(this);
@@ -45,10 +45,12 @@ MarketPulsePanel::MarketPulsePanel(QWidget* parent) : QWidget(parent) {
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
- scroll->setStyleSheet("QScrollArea { border: none; background: transparent; }"
- "QScrollBar:vertical { width: 6px; background: transparent; }"
- "QScrollBar::handle:vertical { background: #222222; border-radius: 3px; min-height: 20px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }");
+ scroll->setStyleSheet(
+ QString("QScrollArea{border:none;background:transparent;}"
+ "QScrollBar:vertical{width:6px;background:transparent;}"
+ "QScrollBar::handle:vertical{background:%1;border-radius:3px;min-height:20px;}"
+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")
+ .arg(ui::colors::BORDER_MED()));
auto* content = new QWidget;
auto* cl = new QVBoxLayout(content);
@@ -74,6 +76,12 @@ MarketPulsePanel::MarketPulsePanel(QWidget* parent) : QWidget(parent) {
hours_timer_ = new QTimer(this);
hours_timer_->setInterval(60000); // 1 min — market open/close status
connect(hours_timer_, &QTimer::timeout, this, &MarketPulsePanel::refresh_market_hours);
+
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) {
+ setStyleSheet(QString("background:%1;").arg(ui::colors::PANEL()));
+ });
+ setStyleSheet(QString("background:%1;").arg(ui::colors::PANEL()));
}
void MarketPulsePanel::showEvent(QShowEvent* e) {
diff --git a/fincept-qt/src/screens/dashboard/WidgetGrid.cpp b/fincept-qt/src/screens/dashboard/WidgetGrid.cpp
index 4a3c427c1..4368a437d 100644
--- a/fincept-qt/src/screens/dashboard/WidgetGrid.cpp
+++ b/fincept-qt/src/screens/dashboard/WidgetGrid.cpp
@@ -17,18 +17,25 @@
#include "screens/dashboard/widgets/TopMoversWidget.h"
#include "screens/dashboard/widgets/WatchlistWidget.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
namespace fincept::screens {
WidgetGrid::WidgetGrid(QWidget* parent) : QWidget(parent) {
- setStyleSheet(QString("background: %1;").arg(ui::colors::BG_BASE));
-
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
- scroll->setStyleSheet("QScrollArea { border: none; background: transparent; }"
- "QScrollBar:vertical { width: 6px; background: transparent; }"
- "QScrollBar::handle:vertical { background: #222222; border-radius: 3px; min-height: 20px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }");
+ scroll->setStyleSheet(
+ QString("QScrollArea{border:none;background:transparent;}"
+ "QScrollBar:vertical{width:6px;background:transparent;}"
+ "QScrollBar::handle:vertical{background:%1;border-radius:3px;min-height:20px;}"
+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")
+ .arg(ui::colors::BORDER_MED()));
+
+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) {
+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));
+ });
auto* content = new QWidget;
grid_ = new QGridLayout(content);
diff --git a/fincept-qt/src/screens/dashboard/widgets/BaseWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/BaseWidget.cpp
index ef0523718..227a72ddc 100644
--- a/fincept-qt/src/screens/dashboard/widgets/BaseWidget.cpp
+++ b/fincept-qt/src/screens/dashboard/widgets/BaseWidget.cpp
@@ -1,6 +1,7 @@
#include "screens/dashboard/widgets/BaseWidget.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QSize>
#include <QStyle>
@@ -83,6 +84,13 @@ BaseWidget::BaseWidget(const QString& title, QWidget* parent, const QString& acc
vl->addWidget(title_bar_);
+ // Auto-refresh styles on theme/font change — subclasses get this for free
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) {
+ refresh_base_theme();
+ on_theme_changed();
+ });
+
// ── Content ──
content_ = new QWidget;
content_->setStyleSheet("background: transparent;");
@@ -93,6 +101,21 @@ BaseWidget::BaseWidget(const QString& title, QWidget* parent, const QString& acc
vl->addWidget(content_, 1);
}
+void BaseWidget::refresh_base_theme() {
+ setStyleSheet(QString("BaseWidget{background:%1;border:1px solid %2;border-radius:2px;}")
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_BRIGHT()));
+ if (title_bar_)
+ title_bar_->setStyleSheet(
+ QString("background:%1;border-bottom:1px solid %2;")
+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));
+ if (refresh_btn_)
+ refresh_btn_->setStyleSheet(
+ QString("QPushButton{color:%1;background:%2;border:1px solid %3;border-radius:2px;padding:0;}"
+ "QPushButton:hover{color:%4;border-color:%4;background:%5;}")
+ .arg(accent_color_, ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM(),
+ ui::colors::TEXT_PRIMARY(), ui::colors::BG_HOVER()));
+}
+
void BaseWidget::set_loading(bool loading) {
loading_label_->setVisible(loading);
loading_label_->setText(loading ? "LOADING..." : "");
diff --git a/fincept-qt/src/screens/dashboard/widgets/BaseWidget.h b/fincept-qt/src/screens/dashboard/widgets/BaseWidget.h
index 5ec256e54..51e361ee4 100644
--- a/fincept-qt/src/screens/dashboard/widgets/BaseWidget.h
+++ b/fincept-qt/src/screens/dashboard/widgets/BaseWidget.h
@@ -1,4 +1,5 @@
#pragma once
+#include "ui/theme/ThemeTokens.h"
#include <QFrame>
#include <QHBoxLayout>
#include <QLabel>
@@ -25,6 +26,14 @@ class BaseWidget : public QFrame {
void close_requested();
void refresh_requested();
+ protected:
+ /// Override in subclasses to re-apply styles when theme/font changes.
+ /// Called automatically — no manual connection needed.
+ virtual void on_theme_changed() {}
+
+ private:
+ void refresh_base_theme();
+
private:
QWidget* title_bar_ = nullptr;
QLabel* title_label_ = nullptr;
diff --git a/fincept-qt/src/screens/data_sources/DataSourcesScreen.cpp b/fincept-qt/src/screens/data_sources/DataSourcesScreen.cpp
index 425cbdd4e..65d4dc54c 100644
--- a/fincept-qt/src/screens/data_sources/DataSourcesScreen.cpp
+++ b/fincept-qt/src/screens/data_sources/DataSourcesScreen.cpp
@@ -1,4 +1,4 @@
-// DataSourcesScreen.cpp — Fincept Data Sources, Obsidian design system.
+// DataSourcesScreen.cpp — Fincept Data Sources, Obsidian design system v2.
#include "screens/data_sources/DataSourcesScreen.h"
#include "core/logging/Logger.h"
@@ -10,7 +10,6 @@
#include <QComboBox>
#include <QDateTime>
#include <QDialog>
-#include <QCheckBox>
#include <QFileDialog>
#include <QEvent>
#include <QFile>
@@ -22,6 +21,7 @@
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
+#include <QLabel>
#include <QMessageBox>
#include <QListWidgetItem>
#include <QMap>
@@ -30,6 +30,7 @@
#include <QSet>
#include <QSignalBlocker>
#include <QSplitter>
+#include <QStackedWidget>
#include <QTcpSocket>
#include <QTextEdit>
#include <QUrl>
@@ -47,6 +48,7 @@ namespace fnt = fincept::ui::fonts;
namespace {
static const QString TAG = "DataSources";
+
static const QStringList kCategoryLabels = {
"All Connectors", "Databases", "APIs", "Files", "Streaming",
"Cloud", "Time Series", "Market Data", "Search", "Warehouses",
@@ -89,16 +91,16 @@ QString connector_code(const ConnectorConfig& cfg) {
QString connector_transport(const ConnectorConfig& cfg) {
switch (cfg.category) {
case Category::Database: return "SQL";
- case Category::Api: return "API";
+ case Category::Api: return "REST";
case Category::File: return "FILE";
- case Category::Streaming: return "STREAM";
+ case Category::Streaming: return "WS";
case Category::Cloud: return "CLOUD";
case Category::TimeSeries: return "TSDB";
- case Category::MarketData: return "MARKET";
- case Category::SearchAnalytics: return "SEARCH";
- case Category::DataWarehouse: return "WAREHOUSE";
- case Category::AlternativeData: return "ALT-DATA";
- case Category::OpenBanking: return "OPEN-BANK";
+ case Category::MarketData: return "MKT";
+ case Category::SearchAnalytics: return "SRCH";
+ case Category::DataWarehouse: return "DW";
+ case Category::AlternativeData: return "ALT";
+ case Category::OpenBanking: return "OB";
}
return "API";
}
@@ -142,56 +144,280 @@ int enabled_connections_for_provider(const QVector<DataSource>& rows, const QStr
}
QTableWidgetItem* make_item(const QString& text,
- const QColor& color = TEXT_PRIMARY,
+ const QColor& color = QColor("#e5e5e5"),
Qt::Alignment alignment = Qt::AlignLeft | Qt::AlignVCenter) {
auto* item = new QTableWidgetItem(text);
item->setForeground(color);
item->setTextAlignment(alignment);
+ item->setFlags(item->flags() & ~Qt::ItemIsEditable);
return item;
}
-QWidget* create_stat_box(const QString& label, QLabel** value_label) {
- auto* box = new QFrame;
- box->setObjectName("dsStatBox");
- auto* layout = new QVBoxLayout(box);
- layout->setContentsMargins(16, 12, 16, 12);
- layout->setSpacing(4);
-
- auto* value = new QLabel("--");
- value->setObjectName("dsStatValue");
- layout->addWidget(value);
-
- auto* title = new QLabel(label);
- title->setObjectName("dsStatLabel");
- layout->addWidget(title);
-
- *value_label = value;
- return box;
-}
-
-QWidget* create_metric_row(const QString& label, QLabel** value_label) {
- auto* row = new QWidget;
- row->setObjectName("dsInfoRow");
- auto* layout = new QHBoxLayout(row);
- layout->setContentsMargins(0, 8, 0, 8);
- layout->setSpacing(8);
-
- auto* title = new QLabel(label);
- title->setObjectName("dsMetricLabel");
- layout->addWidget(title);
- layout->addStretch();
-
- auto* value = new QLabel("--");
- value->setObjectName("dsMetricValue");
- layout->addWidget(value);
-
- *value_label = value;
- return row;
-}
-
-} // namespace
+// ── Shared stylesheet for all tab views ──────────────────────────────────────
+// Uses arg() substitution — call with .arg(col::BG_BASE) etc.
+static const QString kScreenStylesheet = R"(
+ * { font-family: 'Consolas','Courier New',monospace; }
-// ── Constructor ──────────────────────────────────────────────────────────────
+ /* ── Root ── */
+ #dsScreen { background: %1; }
+
+ /* ── Screen header ── */
+ #dsScreenHeader {
+ background: %1;
+ border-bottom: 1px solid %4;
+ }
+ #dsScreenTitle {
+ color: %5; font-size: 13px; font-weight: 700;
+ letter-spacing: 1px; background: transparent;
+ }
+ #dsScreenSubtitle {
+ color: %8; font-size: 11px; background: transparent;
+ }
+ #dsClock {
+ color: %5; font-size: 11px; font-weight: 700;
+ background: transparent; letter-spacing: 0.5px;
+ }
+ #dsSearch {
+ background: %2; border: 1px solid %4; color: %10;
+ padding: 0 10px; font-size: 12px;
+ }
+ #dsSearch:focus { border-color: %7; }
+ #dsSearch::selection { background: %5; color: %1; }
+
+ /* ── Tab bar ── */
+ #dsTabBar { background: %2; border-bottom: 1px solid %4; }
+ #dsTab {
+ background: transparent; color: %6; border: none;
+ border-bottom: 2px solid transparent;
+ padding: 0 18px; font-size: 12px; font-weight: 700;
+ letter-spacing: 0.5px;
+ }
+ #dsTab:hover { color: %10; background: %9; }
+ #dsTabActive {
+ background: transparent; color: %5; border: none;
+ border-bottom: 2px solid %5;
+ padding: 0 18px; font-size: 12px; font-weight: 700;
+ letter-spacing: 0.5px;
+ }
+
+ /* ── Stat boxes ── */
+ #dsStatRow { background: %3; border-bottom: 1px solid %4; }
+ #dsStatBox {
+ background: %2; border: 1px solid %4;
+ border-right: none;
+ }
+ #dsStatBox:last-child { border-right: 1px solid %4; }
+ #dsStatValue {
+ color: %10; font-size: 22px; font-weight: 700;
+ background: transparent;
+ }
+ #dsStatLabel {
+ color: %8; font-size: 10px; font-weight: 700;
+ letter-spacing: 0.5px; background: transparent;
+ }
+
+ /* ── Left sidebar ── */
+ #dsSidebar { background: %2; border-right: 1px solid %4; }
+ #dsSidebarHeader {
+ background: %3; border-bottom: 1px solid %4;
+ }
+ #dsSidebarTitle {
+ color: %5; font-size: 10px; font-weight: 700;
+ letter-spacing: 1px; background: transparent;
+ }
+ #dsCategoryList { background: transparent; border: none; outline: none; }
+ #dsCategoryList::item {
+ padding: 0 14px; height: 30px; color: %6;
+ font-size: 12px; border-bottom: 1px solid %4;
+ }
+ #dsCategoryList::item:selected {
+ background: rgba(217,119,6,0.1); color: %5;
+ border-left: 2px solid %5;
+ }
+ #dsCategoryList::item:hover:!selected { background: %9; color: %10; }
+
+ /* ── Provider ladder ── */
+ #dsProviderHeader { background: %3; border-bottom: 1px solid %4; border-top: 1px solid %4; }
+ #dsProviderLadder { background: transparent; border: none; outline: none; }
+ #dsProviderLadder::item {
+ padding: 0 14px; height: 26px; color: %6;
+ font-size: 11px; border-bottom: 1px solid %4;
+ }
+ #dsProviderLadder::item:selected { background: %9; color: %10; }
+ #dsProviderLadder::item:hover:!selected { background: %9; }
+
+ /* ── Connector table ── */
+ #dsConnPanel { background: %1; border: none; }
+ #dsConnHeader { background: %3; border-bottom: 1px solid %4; }
+ #dsConnPanelTitle {
+ color: %5; font-size: 10px; font-weight: 700;
+ letter-spacing: 1px; background: transparent;
+ }
+ #dsConnCount {
+ color: %8; font-size: 11px; background: transparent;
+ }
+ #dsConnectorTable {
+ background: %1; border: none; color: %10;
+ font-size: 12px; gridline-color: transparent;
+ selection-background-color: rgba(217,119,6,0.1);
+ selection-color: %10;
+ }
+ #dsConnectorTable::item {
+ padding: 0 8px; border-bottom: 1px solid %4; height: 26px;
+ }
+ #dsConnectorTable::item:hover:!selected { background: %9; }
+ #dsConnectorTable QHeaderView::section {
+ background: %2; color: %8; font-size: 10px; font-weight: 700;
+ letter-spacing: 0.5px; border: none;
+ border-bottom: 1px solid %4; border-right: 1px solid %4;
+ padding: 0 8px; height: 26px;
+ }
+ #dsConnectorTable QHeaderView::section:last { border-right: none; }
+
+ /* ── Detail panel ── */
+ #dsDetail { background: %2; border-left: 1px solid %4; }
+ #dsDetailHeader { background: %3; border-bottom: 1px solid %4; }
+ #dsDetailTitle {
+ color: %5; font-size: 10px; font-weight: 700;
+ letter-spacing: 1px; background: transparent;
+ }
+ #dsDetailSymbol {
+ min-width: 38px; max-width: 38px;
+ min-height: 38px; max-height: 38px;
+ font-size: 13px; font-weight: 700;
+ color: %5; background: %1; border: 1px solid %5;
+ }
+ #dsDetailName {
+ color: %10; font-size: 13px; font-weight: 700;
+ background: transparent;
+ }
+ #dsDetailDesc {
+ color: %6; font-size: 11px; background: transparent;
+ }
+ #dsDetailEmpty {
+ color: %8; font-size: 12px; background: transparent;
+ }
+ #dsInfoRow { background: transparent; border-bottom: 1px solid %4; }
+ #dsInfoLabel {
+ color: %8; font-size: 11px; font-weight: 700;
+ letter-spacing: 0.5px; background: transparent;
+ }
+ #dsInfoValue {
+ color: %10; font-size: 11px; font-weight: 700;
+ background: transparent;
+ }
+ #dsSectionSep {
+ color: %5; font-size: 10px; font-weight: 700;
+ letter-spacing: 1px; background: transparent;
+ }
+
+ /* ── Field table ── */
+ #dsFieldTable {
+ background: %2; border: none; color: %10;
+ font-size: 11px; gridline-color: transparent;
+ selection-background-color: %9;
+ }
+ #dsFieldTable::item {
+ padding: 0 6px; border-bottom: 1px solid %4; height: 24px;
+ }
+ #dsFieldTable QHeaderView::section {
+ background: %2; color: %8; font-size: 10px; font-weight: 700;
+ border: none; border-bottom: 1px solid %4;
+ border-right: 1px solid %4; padding: 0 6px; height: 24px;
+ }
+
+ /* ── Detail connection list ── */
+ #dsDetailConnList { background: transparent; border: none; outline: none; }
+ #dsDetailConnList::item {
+ padding: 0 10px; height: 26px; color: %6;
+ font-size: 11px; border-bottom: 1px solid %4;
+ }
+ #dsDetailConnList::item:selected { background: %9; color: %10; }
+ #dsDetailConnList::item:hover:!selected { background: %9; }
+
+ /* ── Connections panel ── */
+ #dsConnsPanel { background: %1; border: none; }
+ #dsConnsHeader { background: %3; border-bottom: 1px solid %4; }
+ #dsConnsToolbar { background: %2; border-bottom: 1px solid %4; }
+ #dsConnectionsTable {
+ background: %1; border: none; color: %10;
+ font-size: 12px; gridline-color: transparent;
+ selection-background-color: rgba(217,119,6,0.1);
+ selection-color: %10;
+ }
+ #dsConnectionsTable::item {
+ padding: 0 8px; border-bottom: 1px solid %4; height: 26px;
+ }
+ #dsConnectionsTable::item:hover:!selected { background: %9; }
+ #dsConnectionsTable QHeaderView::section {
+ background: %2; color: %8; font-size: 10px; font-weight: 700;
+ letter-spacing: 0.5px; border: none;
+ border-bottom: 1px solid %4; border-right: 1px solid %4;
+ padding: 0 8px; height: 26px;
+ }
+
+ /* ── Buttons ── */
+ #dsBtn {
+ background: %2; color: %6; border: 1px solid %4;
+ padding: 0 10px; font-size: 11px; font-weight: 700;
+ letter-spacing: 0.5px;
+ }
+ #dsBtn:hover:enabled { background: %9; color: %10; border-color: %7; }
+ #dsBtn:disabled { color: %8; opacity: 0.4; }
+ #dsBtnAccent {
+ background: rgba(217,119,6,0.08); color: %5;
+ border: 1px solid %12; padding: 0 10px;
+ font-size: 11px; font-weight: 700; letter-spacing: 0.5px;
+ }
+ #dsBtnAccent:hover:enabled { background: %5; color: %1; }
+ #dsBtnAccent:disabled { opacity: 0.4; }
+ #dsBtnDanger {
+ background: rgba(220,38,38,0.08); color: %14;
+ border: 1px solid #7f1d1d; padding: 0 10px;
+ font-size: 11px; font-weight: 700; letter-spacing: 0.5px;
+ }
+ #dsBtnDanger:hover:enabled { background: rgba(220,38,38,0.18); border-color: %14; }
+ #dsBtnDanger:disabled { opacity: 0.4; }
+ #dsBtnGreen {
+ background: rgba(22,163,74,0.08); color: %13;
+ border: 1px solid #14532d; padding: 0 10px;
+ font-size: 11px; font-weight: 700; letter-spacing: 0.5px;
+ }
+ #dsBtnGreen:hover:enabled { background: rgba(22,163,74,0.18); border-color: %13; }
+ #dsBtnGreen:disabled { opacity: 0.4; }
+ #dsSearchConn {
+ background: %2; border: 1px solid %4; color: %10;
+ padding: 0 8px; font-size: 11px;
+ }
+ #dsSearchConn:focus { border-color: %7; }
+ #dsEnableToggle { color: %10; background: transparent; }
+ #dsEnableToggle::indicator {
+ width: 13px; height: 13px;
+ border: 1px solid %7; background: %2;
+ }
+ #dsEnableToggle::indicator:checked { background: %13; border-color: %13; }
+ #dsStatusDot { font-size: 11px; font-weight: 700; background: transparent; }
+
+ /* ── Splitters ── */
+ #dsBrowseSplitter::handle, #dsConnsSplitter::handle {
+ background: %4; width: 1px; height: 1px;
+ }
+
+ /* ── Scrollbars ── */
+ QScrollBar:vertical { background: transparent; width: 5px; margin: 0; }
+ QScrollBar::handle:vertical { background: %7; min-height: 20px; }
+ QScrollBar::handle:vertical:hover { background: %11; }
+ QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }
+ QScrollBar:horizontal { background: transparent; height: 5px; margin: 0; }
+ QScrollBar::handle:horizontal { background: %7; min-width: 20px; }
+ QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { width: 0; }
+)";
+
+} // anonymous namespace
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Constructor & lifecycle
+// ─────────────────────────────────────────────────────────────────────────────
DataSourcesScreen::DataSourcesScreen(QWidget* parent) : QWidget(parent) {
register_all_connectors();
@@ -215,10 +441,6 @@ void DataSourcesScreen::hideEvent(QHideEvent* event) {
void DataSourcesScreen::resizeEvent(QResizeEvent* event) {
QWidget::resizeEvent(event);
- if (search_edit_) {
- const int target_width = std::clamp(width() / 4, 180, 340);
- search_edit_->setFixedWidth(target_width);
- }
update_stats_strip();
}
@@ -233,199 +455,15 @@ bool DataSourcesScreen::eventFilter(QObject* obj, QEvent* event) {
return QWidget::eventFilter(obj, event);
}
-// ── Styles ───────────────────────────────────────────────────────────────────
+// ─────────────────────────────────────────────────────────────────────────────
+// setup_ui — assembles the complete screen
+// ─────────────────────────────────────────────────────────────────────────────
-void DataSourcesScreen::apply_screen_styles() {
+void DataSourcesScreen::setup_ui() {
setObjectName("dsScreen");
- // Obsidian Design System — sharp monospace terminal aesthetic, no border-radius
- setStyleSheet(QString(R"(
- * { font-family: 'Consolas','Courier New',monospace; }
-
- #dsScreen { background: %1; }
-
- /* ── Top bar ─────────────────────────────────────────────────────── */
- #dsHeaderBar { background: %1; border-bottom: 1px solid %4; }
- #dsTermTag { color: %5; font-size: 11px; font-weight: 700;
- letter-spacing: 1px; background: transparent; }
- #dsHeaderTitle { color: %10; font-size: 13px; font-weight: 700;
- letter-spacing: 0.5px; background: transparent; }
- #dsHeaderMeta { color: %8; font-size: 11px; background: transparent; }
- #dsClockLabel { color: %5; font-size: 11px; font-weight: 700;
- background: transparent; letter-spacing: 0.5px; }
-
- /* ── Search input ─────────────────────────────────────────────────── */
- #dsSearch { background: %2; border: 1px solid %4; color: %10;
- padding: 0 10px; font-size: 12px; height: 26px; }
- #dsSearch:focus { border-color: %7; }
- #dsSearch::selection { background: %5; color: %1; }
- #dsClearBtn { background: transparent; color: %8; border: 1px solid %4;
- padding: 0 8px; height: 26px; font-size: 11px; font-weight: 700; }
- #dsClearBtn:hover { color: %10; background: %9; }
-
- /* ── Stat strip ───────────────────────────────────────────────────── */
- #dsStatStrip { background: %1; border-bottom: 1px solid %4; }
- #dsStatBox { background: %2; border: 1px solid %4; border-right: none; }
- #dsStatBox:last-child { border-right: 1px solid %4; }
- #dsStatValue { color: %10; font-size: 20px; font-weight: 700; background: transparent; }
- #dsStatLabel { color: %8; font-size: 10px; font-weight: 700;
- letter-spacing: 0.5px; background: transparent; }
- #dsStatTag { color: %5; font-size: 10px; font-weight: 700;
- background: transparent; letter-spacing: 0.5px; }
-
- /* ── Sidebar ──────────────────────────────────────────────────────── */
- #dsSidebarPanel { background: %2; border-right: 1px solid %4; }
- #dsSidebarTitle { color: %5; font-size: 10px; font-weight: 700;
- letter-spacing: 1px; background: transparent; }
- #dsSidebarSectionLabel { color: %8; font-size: 10px; font-weight: 700;
- letter-spacing: 1px; background: transparent; }
-
- /* ── Category list ────────────────────────────────────────────────── */
- #dsCategoryList { background: transparent; border: none; outline: none; }
- #dsCategoryList::item { padding: 0 14px; height: 28px; color: %6;
- font-size: 12px; border-bottom: 1px solid %4; }
- #dsCategoryList::item:selected { background: rgba(217,119,6,0.08);
- color: %5; border-left: 2px solid %5; }
- #dsCategoryList::item:hover:!selected { background: %9; color: %10; }
-
- /* ── Provider ladder ──────────────────────────────────────────────── */
- #dsProviderLadder { background: transparent; border: none; outline: none; }
- #dsProviderLadder::item { padding: 0 14px; height: 26px; color: %6;
- font-size: 11px; border-bottom: 1px solid %4; }
- #dsProviderLadder::item:selected { background: %9; color: %10; }
- #dsProviderLadder::item:hover:!selected { background: %9; }
-
- /* ── Panel shells ─────────────────────────────────────────────────── */
- #dsPanel { background: %1; border: none; }
- #dsPanelHeader { background: %2; border-bottom: 1px solid %4; }
- #dsPanelTitle { color: %5; font-size: 10px; font-weight: 700;
- letter-spacing: 1px; background: transparent; }
- #dsPanelMeta { color: %8; font-size: 10px; background: transparent; }
-
- /* ── Connector table ──────────────────────────────────────────────── */
- #dsConnectorTable { background: %1; border: none; color: %10;
- font-size: 12px; gridline-color: transparent; }
- #dsConnectorTable::item { padding: 0 8px; border-bottom: 1px solid %4;
- height: 26px; }
- #dsConnectorTable::item:selected { background: rgba(217,119,6,0.08); color: %10; }
- #dsConnectorTable::item:hover:!selected { background: %9; }
- #dsConnectorTable QHeaderView::section {
- background: %2; color: %8; font-size: 10px; font-weight: 700;
- letter-spacing: 0.5px; border: none; border-bottom: 1px solid %4;
- border-right: 1px solid %4; padding: 0 8px; height: 26px; }
- #dsConnectorTable QHeaderView::section:last { border-right: none; }
-
- /* ── Connections table ────────────────────────────────────────────── */
- #dsConnectionsTable { background: %1; border: none; color: %10;
- font-size: 12px; gridline-color: transparent; }
- #dsConnectionsTable::item { padding: 0 8px; border-bottom: 1px solid %4;
- height: 26px; }
- #dsConnectionsTable::item:selected { background: rgba(217,119,6,0.08); color: %10; }
- #dsConnectionsTable::item:hover:!selected { background: %9; }
- #dsConnectionsTable QHeaderView::section {
- background: %2; color: %8; font-size: 10px; font-weight: 700;
- letter-spacing: 0.5px; border: none; border-bottom: 1px solid %4;
- border-right: 1px solid %4; padding: 0 8px; height: 26px; }
-
- /* ── Field table ──────────────────────────────────────────────────── */
- #dsFieldTable { background: %2; border: none; color: %10;
- font-size: 11px; gridline-color: transparent; }
- #dsFieldTable::item { padding: 0 6px; border-bottom: 1px solid %4; height: 24px; }
- #dsFieldTable QHeaderView::section {
- background: %2; color: %8; font-size: 10px; font-weight: 700;
- border: none; border-bottom: 1px solid %4;
- border-right: 1px solid %4; padding: 0 6px; height: 24px; }
-
- /* ── Detail connection list ───────────────────────────────────────── */
- #dsDetailConnList { background: transparent; border: none; outline: none; }
- #dsDetailConnList::item { padding: 0 10px; height: 26px; color: %6;
- font-size: 11px; border-bottom: 1px solid %4; }
- #dsDetailConnList::item:selected { background: %9; color: %10; }
- #dsDetailConnList::item:hover:!selected { background: %9; }
-
- /* ── Inspector ────────────────────────────────────────────────────── */
- #dsInspectorSymbol { min-width: 36px; max-width: 36px; min-height: 36px; max-height: 36px;
- font-size: 14px; font-weight: 700; color: %5; background: %2;
- border: 1px solid %5; }
- #dsInspectorTitle { color: %10; font-size: 12px; font-weight: 700;
- background: transparent; }
- #dsInspectorKey { color: %8; font-size: 10px; font-weight: 700;
- letter-spacing: 0.5px; background: transparent; }
- #dsInspectorDesc { color: %6; font-size: 11px; background: transparent; }
- #dsInfoRow { background: transparent; border-bottom: 1px solid %4; }
- #dsMetricLabel { color: %8; font-size: 11px; background: transparent; }
- #dsMetricValue { color: %10; font-size: 11px; font-weight: 700;
- background: transparent; }
- #dsSectionLabel { color: %5; font-size: 10px; font-weight: 700;
- letter-spacing: 1px; background: transparent; }
-
- /* ── Buttons ──────────────────────────────────────────────────────── */
- #dsActionBtn { background: %2; color: %6; border: 1px solid %4;
- padding: 0 10px; height: 24px; font-size: 10px; font-weight: 700;
- font-family: 'Consolas','Courier New',monospace; letter-spacing: 0.5px; }
- #dsActionBtn:hover:enabled { background: %9; color: %10; border-color: %7; }
- #dsActionBtn[accent="true"] { background: rgba(217,119,6,0.08); color: %5;
- border: 1px solid %12; }
- #dsActionBtn[accent="true"]:hover:enabled { background: %5; color: %1; }
- #dsActionBtn:disabled { background: %2; color: %8; border-color: %4; }
-
- #dsInlineAction { background: transparent; color: %8; border: 1px solid %4;
- padding: 0 6px; height: 22px; font-size: 10px; font-weight: 700; }
- #dsInlineAction:hover { color: %10; background: %9; border-color: %7; }
- #dsInlineAction[accent="true"] { color: %5; border-color: %12;
- background: rgba(217,119,6,0.08); }
- #dsInlineAction[test="true"] { color: %13; border-color: #14532d;
- background: rgba(22,163,74,0.08); }
- #dsInlineAction[danger="true"] { color: %14; border-color: #7f1d1d;
- background: rgba(220,38,38,0.08); }
-
- #dsViewModeBtn { background: transparent; color: %8; border: 1px solid %4;
- padding: 0 10px; height: 26px; font-size: 11px; font-weight: 700; }
- #dsViewModeBtn:hover { color: %10; background: %9; }
- #dsViewModeBtn[active="true"] { color: %5; border-color: %12;
- background: rgba(217,119,6,0.08); }
-
- #dsImportExportBtn { background: transparent; color: %8; border: 1px solid %4;
- padding: 0 10px; height: 26px; font-size: 11px; font-weight: 700; }
- #dsImportExportBtn:hover { color: %10; background: %9; }
-
- #dsBulkBtn { background: transparent; color: %8; border: 1px solid %4;
- padding: 0 8px; height: 22px; font-size: 10px; font-weight: 700;
- font-family: 'Consolas','Courier New',monospace; letter-spacing: 0.5px; }
- #dsBulkBtn:hover:enabled { color: %10; background: %9; border-color: %7; }
- #dsBulkBtn:disabled { color: %8; opacity: 0.4; }
- #dsBulkBtn[danger="true"] { color: %14; border-color: #7f1d1d;
- background: rgba(220,38,38,0.06); }
- #dsBulkBtn[danger="true"]:hover:enabled { background: rgba(220,38,38,0.15);
- border-color: #dc2626; }
-
- /* ── Misc ─────────────────────────────────────────────────────────── */
- #dsConnSearch { background: %2; border: 1px solid %4; color: %10;
- padding: 0 8px; height: 22px; font-size: 10px;
- font-family: 'Consolas','Courier New',monospace; }
- #dsConnSearch:focus { border-color: %7; }
- #dsConnSearch::placeholder { color: %8; }
- #dsConnToolbar { background: %2; border-bottom: 1px solid %4; }
- #dsSelectAll { color: %6; font-size: 10px;
- font-family: 'Consolas','Courier New',monospace; }
- #dsStatusDot { font-size: 10px; font-weight: 700; background: transparent; }
- #dsEnableToggle { color: %10; background: transparent; }
- #dsEnableToggle::indicator { width: 13px; height: 13px;
- border: 1px solid %7; background: %2; }
- #dsEnableToggle::indicator:checked { background: %13; border-color: %13; }
-
- /* ── Splitters ────────────────────────────────────────────────────── */
- #dsWorkspaceSplitter::handle, #dsMainSplitter::handle {
- background: %4; width: 1px; height: 1px; }
-
- /* ── Scrollbars ───────────────────────────────────────────────────── */
- QScrollBar:vertical { background: transparent; width: 5px; margin: 0; }
- QScrollBar::handle:vertical { background: %7; min-height: 20px; }
- QScrollBar::handle:vertical:hover { background: %11; }
- QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }
- QScrollBar:horizontal { background: transparent; height: 5px; margin: 0; }
- QScrollBar::handle:horizontal { background: %7; min-width: 20px; }
- QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { width: 0; }
- )")
+
+ // Apply stylesheet
+ const QString style = kScreenStylesheet
.arg(col::BG_BASE) // %1
.arg(col::BG_SURFACE) // %2
.arg(col::BG_RAISED) // %3
@@ -439,677 +477,694 @@ void DataSourcesScreen::apply_screen_styles() {
.arg(col::BORDER_BRIGHT) // %11
.arg(col::AMBER_DIM) // %12
.arg(col::POSITIVE) // %13
- .arg(col::NEGATIVE)); // %14
+ .arg(col::NEGATIVE); // %14
+ setStyleSheet(style);
+
+ auto* root = new QVBoxLayout(this);
+ root->setContentsMargins(0, 0, 0, 0);
+ root->setSpacing(0);
+
+ // 1. Screen header
+ root->addWidget(build_screen_header());
+
+ // 2. Stats row
+ root->addWidget(build_stats_strip());
+
+ // 3. Tab bar
+ root->addWidget(build_tab_bar());
+
+ // 4. Page stack (Browse | Connections)
+ page_stack_ = new QStackedWidget;
+ page_stack_->addWidget(build_browse_page()); // index 0
+ page_stack_->addWidget(build_connections_page()); // index 1
+ root->addWidget(page_stack_, 1);
+
+ // Timers
+ clock_timer_ = new QTimer(this);
+ clock_timer_->setInterval(1000);
+ connect(clock_timer_, &QTimer::timeout, this, &DataSourcesScreen::update_clock);
+
+ poll_timer_ = new QTimer(this);
+ poll_timer_->setInterval(30000);
+ connect(poll_timer_, &QTimer::timeout, this, &DataSourcesScreen::on_poll_timer);
}
-// ── Header bar ───────────────────────────────────────────────────────────────
+// ─────────────────────────────────────────────────────────────────────────────
+// Screen header (title + search + clock + io buttons)
+// ─────────────────────────────────────────────────────────────────────────────
-QWidget* DataSourcesScreen::build_header_bar() {
+QWidget* DataSourcesScreen::build_screen_header() {
auto* bar = new QWidget;
- bar->setObjectName("dsHeaderBar");
- bar->setFixedHeight(36);
+ bar->setObjectName("dsScreenHeader");
+ bar->setFixedHeight(38);
auto* hl = new QHBoxLayout(bar);
- hl->setContentsMargins(12, 0, 12, 0);
+ hl->setContentsMargins(14, 0, 14, 0);
hl->setSpacing(0);
- // Terminal tag prefix
- auto* tag = new QLabel("DS");
- tag->setObjectName("dsTermTag");
- tag->setFixedWidth(28);
- hl->addWidget(tag);
+ auto* title = new QLabel("DATA SOURCES");
+ title->setObjectName("dsScreenTitle");
+ hl->addWidget(title);
// Separator
- auto* sep1 = new QFrame;
- sep1->setFrameShape(QFrame::VLine);
- sep1->setStyleSheet(QString("background:%1;").arg(col::BORDER_DIM));
- sep1->setFixedWidth(1);
- hl->addWidget(sep1);
- hl->addSpacing(12);
+ auto* sep = new QFrame;
+ sep->setFrameShape(QFrame::VLine);
+ sep->setFixedWidth(1);
+ sep->setStyleSheet(QString("background:%1;margin:8px 12px;").arg(col::BORDER_DIM));
+ hl->addWidget(sep);
- // Title
- auto* title = new QLabel("DATA SOURCES");
- title->setObjectName("dsHeaderTitle");
- hl->addWidget(title);
+ auto* subtitle = new QLabel(
+ QString("%1 CONNECTORS").arg(ConnectorRegistry::instance().count()));
+ subtitle->setObjectName("dsScreenSubtitle");
+ hl->addWidget(subtitle);
- hl->addSpacing(20);
+ hl->addStretch();
// Search
search_edit_ = new QLineEdit;
search_edit_->setObjectName("dsSearch");
search_edit_->setPlaceholderText("search connectors...");
- search_edit_->setFixedWidth(260);
+ search_edit_->setFixedSize(240, 26);
connect(search_edit_, &QLineEdit::textChanged, this, &DataSourcesScreen::on_search_changed);
hl->addWidget(search_edit_);
- hl->addSpacing(4);
-
- clear_search_btn_ = new QPushButton("CLR");
- clear_search_btn_->setObjectName("dsClearBtn");
- clear_search_btn_->setFixedWidth(36);
- clear_search_btn_->setCursor(Qt::PointingHandCursor);
- connect(clear_search_btn_, &QPushButton::clicked, search_edit_, &QLineEdit::clear);
- hl->addWidget(clear_search_btn_);
-
- hl->addStretch();
-
- // Count label
- count_label_ = new QLabel;
- count_label_->setObjectName("dsHeaderMeta");
- hl->addWidget(count_label_);
-
- hl->addSpacing(16);
-
- // View mode toggle
- view_mode_btn_ = new QPushButton("GALLERY");
- view_mode_btn_->setObjectName("dsViewModeBtn");
- view_mode_btn_->setProperty("active", true);
- view_mode_btn_->setCursor(Qt::PointingHandCursor);
- connect(view_mode_btn_, &QPushButton::clicked, this, &DataSourcesScreen::on_view_mode_toggle);
- hl->addWidget(view_mode_btn_);
-
- hl->addSpacing(4);
+ hl->addSpacing(12);
- import_btn_ = new QPushButton("IMPORT");
- import_btn_->setObjectName("dsImportExportBtn");
- import_btn_->setCursor(Qt::PointingHandCursor);
- connect(import_btn_, &QPushButton::clicked, this, &DataSourcesScreen::on_import_connections);
- hl->addWidget(import_btn_);
+ // IO buttons (right side)
+ auto make_io_btn = [&](const QString& label) -> QPushButton* {
+ auto* btn = new QPushButton(label);
+ btn->setObjectName("dsBtn");
+ btn->setFixedHeight(26);
+ btn->setCursor(Qt::PointingHandCursor);
+ return btn;
+ };
+ auto* import_btn = make_io_btn("IMPORT");
+ connect(import_btn, &QPushButton::clicked, this, &DataSourcesScreen::on_import_connections);
+ hl->addWidget(import_btn);
hl->addSpacing(4);
- export_btn_ = new QPushButton("EXPORT");
- export_btn_->setObjectName("dsImportExportBtn");
- export_btn_->setCursor(Qt::PointingHandCursor);
- connect(export_btn_, &QPushButton::clicked, this, &DataSourcesScreen::on_export_connections);
- hl->addWidget(export_btn_);
-
+ auto* export_btn = make_io_btn("EXPORT");
+ connect(export_btn, &QPushButton::clicked, this, &DataSourcesScreen::on_export_connections);
+ hl->addWidget(export_btn);
hl->addSpacing(4);
- auto* template_btn = new QPushButton("TEMPLATE");
- template_btn->setObjectName("dsImportExportBtn");
- template_btn->setCursor(Qt::PointingHandCursor);
- connect(template_btn, &QPushButton::clicked, this, &DataSourcesScreen::on_download_template);
- hl->addWidget(template_btn);
+ auto* tpl_btn = make_io_btn("TEMPLATE");
+ connect(tpl_btn, &QPushButton::clicked, this, &DataSourcesScreen::on_download_template);
+ hl->addWidget(tpl_btn);
hl->addSpacing(16);
// Separator
auto* sep2 = new QFrame;
sep2->setFrameShape(QFrame::VLine);
- sep2->setStyleSheet(QString("background:%1;").arg(col::BORDER_DIM));
sep2->setFixedWidth(1);
+ sep2->setStyleSheet(QString("background:%1;margin:8px 0;").arg(col::BORDER_DIM));
hl->addWidget(sep2);
hl->addSpacing(12);
- clock_label_ = new QLabel("--:--:--");
- clock_label_->setObjectName("dsClockLabel");
- clock_label_->setFixedWidth(64);
+ clock_label_ = new QLabel;
+ clock_label_->setObjectName("dsClock");
+ update_clock();
hl->addWidget(clock_label_);
return bar;
}
-// ── Command bar (kept for layout compatibility, minimal) ─────────────────────
-
-QWidget* DataSourcesScreen::build_command_bar() {
- // Search moved to header — return invisible placeholder
- auto* placeholder = new QWidget;
- placeholder->setFixedHeight(0);
- placeholder->setVisible(false);
- selection_status_label_ = new QLabel(placeholder); // keep pointer valid
- return placeholder;
-}
-
-// ── Stats strip ──────────────────────────────────────────────────────────────
+// ─────────────────────────────────────────────────────────────────────────────
+// Stats strip (4 clickable stat boxes)
+// ─────────────────────────────────────────────────────────────────────────────
QWidget* DataSourcesScreen::build_stats_strip() {
auto* strip = new QWidget;
- strip->setObjectName("dsStatStrip");
- strip->setFixedHeight(56);
+ strip->setObjectName("dsStatRow");
+ strip->setFixedHeight(58);
auto* hl = new QHBoxLayout(strip);
hl->setContentsMargins(0, 0, 0, 0);
hl->setSpacing(0);
- struct StatDef { const char* tag; const char* label; QLabel** ptr; const char* tip; };
- const StatDef defs[4] = {
- { "UNIVERSE", "TOTAL CONNECTORS", &universe_stat_value_,
- "Total available connectors — click to clear filter" },
- { "CONFIGURED", "CONFIGURED", &configured_stat_value_,
- "Connectors with saved connections" },
- { "ACTIVE", "ACTIVE", &active_stat_value_,
- "Connections currently enabled" },
- { "AUTH", "AUTH REQUIRED", &auth_stat_value_,
- "Connectors that require API key or credentials" },
- };
-
- for (int i = 0; i < 4; ++i) {
+ auto make_stat = [&](const QString& label, QLabel** out, int idx) -> QWidget* {
auto* box = new QFrame;
box->setObjectName("dsStatBox");
box->setCursor(Qt::PointingHandCursor);
- box->setToolTip(defs[i].tip);
box->installEventFilter(this);
- box->setProperty("statIndex", i);
+ box->setProperty("statIndex", idx);
auto* vl = new QVBoxLayout(box);
- vl->setContentsMargins(16, 8, 16, 8);
+ vl->setContentsMargins(0, 6, 0, 6);
vl->setSpacing(2);
auto* val = new QLabel("--");
val->setObjectName("dsStatValue");
+ val->setAlignment(Qt::AlignCenter);
+ val->setAttribute(Qt::WA_TransparentForMouseEvents);
vl->addWidget(val);
- *defs[i].ptr = val;
- auto* lbl = new QLabel(defs[i].label);
+ auto* lbl = new QLabel(label);
lbl->setObjectName("dsStatLabel");
+ lbl->setAlignment(Qt::AlignCenter);
+ lbl->setAttribute(Qt::WA_TransparentForMouseEvents);
vl->addWidget(lbl);
- hl->addWidget(box, 1);
- }
+ *out = val;
+ return box;
+ };
+
+ hl->addWidget(make_stat("UNIVERSE", &universe_stat_value_, 0));
+ hl->addWidget(make_stat("CONFIGURED", &configured_stat_value_, 1));
+ hl->addWidget(make_stat("ACTIVE", &active_stat_value_, 2));
+ hl->addWidget(make_stat("AUTH REQ", &auth_stat_value_, 3));
return strip;
}
-// ── Category sidebar panel ───────────────────────────────────────────────────
+// ─────────────────────────────────────────────────────────────────────────────
+// Tab bar (BROWSE | CONNECTIONS)
+// ─────────────────────────────────────────────────────────────────────────────
+
+QWidget* DataSourcesScreen::build_tab_bar() {
+ auto* bar = new QWidget;
+ bar->setObjectName("dsTabBar");
+ bar->setFixedHeight(32);
+
+ auto* hl = new QHBoxLayout(bar);
+ hl->setContentsMargins(14, 0, 14, 0);
+ hl->setSpacing(0);
+
+ auto make_tab = [&](const QString& label, int page_idx) -> QPushButton* {
+ auto* btn = new QPushButton(label);
+ btn->setFixedHeight(32);
+ btn->setCursor(Qt::PointingHandCursor);
+ btn->setObjectName(page_idx == 0 ? "dsTabActive" : "dsTab");
+ connect(btn, &QPushButton::clicked, this, [this, btn, page_idx]() {
+ // Update tab styles
+ for (auto* sibling : btn->parentWidget()->findChildren<QPushButton*>()) {
+ sibling->setObjectName("dsTab");
+ sibling->style()->unpolish(sibling);
+ sibling->style()->polish(sibling);
+ }
+ btn->setObjectName("dsTabActive");
+ btn->style()->unpolish(btn);
+ btn->style()->polish(btn);
+
+ page_stack_->setCurrentIndex(page_idx);
+ view_mode_ = (page_idx == 0) ? ViewMode::Gallery : ViewMode::Connections;
+ });
+ return btn;
+ };
+
+ auto* browse_tab = make_tab("BROWSE", 0);
+ auto* conns_tab = make_tab("CONNECTIONS", 1);
+
+ hl->addWidget(browse_tab);
+ hl->addWidget(conns_tab);
+ hl->addStretch();
+
+ // Count label
+ count_label_ = new QLabel;
+ count_label_->setObjectName("dsScreenSubtitle");
+ hl->addWidget(count_label_);
+
+ return bar;
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Browse page (sidebar | connector table | detail inspector)
+// ─────────────────────────────────────────────────────────────────────────────
+
+QWidget* DataSourcesScreen::build_browse_page() {
+ auto* page = new QWidget;
+ auto* hl = new QHBoxLayout(page);
+ hl->setContentsMargins(0, 0, 0, 0);
+ hl->setSpacing(0);
+
+ // Left: category sidebar
+ hl->addWidget(build_category_panel());
+
+ // Center + Right: splitter
+ auto* splitter = new QSplitter(Qt::Horizontal);
+ splitter->setObjectName("dsBrowseSplitter");
+ splitter->setHandleWidth(1);
+ splitter->setChildrenCollapsible(false);
+
+ splitter->addWidget(build_connector_panel());
+ splitter->addWidget(build_detail_panel());
+ splitter->setStretchFactor(0, 3);
+ splitter->setStretchFactor(1, 2);
+ splitter->setSizes({600, 280});
+
+ hl->addWidget(splitter, 1);
+ return page;
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Category sidebar
+// ─────────────────────────────────────────────────────────────────────────────
QWidget* DataSourcesScreen::build_category_panel() {
auto* panel = new QWidget;
- panel->setObjectName("dsSidebarPanel");
- panel->setFixedWidth(200);
+ panel->setObjectName("dsSidebar");
+ panel->setFixedWidth(180);
auto* vl = new QVBoxLayout(panel);
vl->setContentsMargins(0, 0, 0, 0);
vl->setSpacing(0);
- // CATEGORY header row
- auto* cat_hdr = new QWidget;
- cat_hdr->setFixedHeight(28);
- cat_hdr->setStyleSheet(QString("background:%1;border-bottom:1px solid %2;")
- .arg(col::BG_SURFACE, col::BORDER_DIM));
- auto* cat_hdr_l = new QHBoxLayout(cat_hdr);
- cat_hdr_l->setContentsMargins(12, 0, 12, 0);
- auto* cat_title = new QLabel("CATEGORY");
- cat_title->setObjectName("dsSidebarTitle");
- cat_hdr_l->addWidget(cat_title);
- vl->addWidget(cat_hdr);
+ // Header
+ auto* hdr = new QWidget;
+ hdr->setObjectName("dsSidebarHeader");
+ hdr->setFixedHeight(30);
+ auto* hdr_hl = new QHBoxLayout(hdr);
+ hdr_hl->setContentsMargins(14, 0, 14, 0);
+ auto* hdr_title = new QLabel("CATEGORY");
+ hdr_title->setObjectName("dsSidebarTitle");
+ hdr_hl->addWidget(hdr_title);
+ vl->addWidget(hdr);
// Category list
category_list_ = new QListWidget;
category_list_->setObjectName("dsCategoryList");
- category_list_->setFrameShape(QFrame::NoFrame);
category_list_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- category_list_->setSpacing(0);
connect(category_list_, &QListWidget::currentRowChanged,
this, &DataSourcesScreen::on_category_selection_changed);
- vl->addWidget(category_list_);
-
- // Divider
- auto* div = new QFrame;
- div->setFrameShape(QFrame::HLine);
- div->setStyleSheet(QString("background:%1;").arg(col::BORDER_DIM));
- div->setFixedHeight(1);
- vl->addWidget(div);
+ vl->addWidget(category_list_, 1);
- // ACTIVE CONNECTIONS header row
+ // Provider ladder section
auto* prov_hdr = new QWidget;
+ prov_hdr->setObjectName("dsProviderHeader");
prov_hdr->setFixedHeight(28);
- prov_hdr->setStyleSheet(QString("background:%1;border-bottom:1px solid %2;")
- .arg(col::BG_SURFACE, col::BORDER_DIM));
- auto* prov_hdr_l = new QHBoxLayout(prov_hdr);
- prov_hdr_l->setContentsMargins(12, 0, 12, 0);
- auto* prov_title = new QLabel("ACTIVE");
+ auto* prov_hl = new QHBoxLayout(prov_hdr);
+ prov_hl->setContentsMargins(14, 0, 14, 0);
+ auto* prov_title = new QLabel("TOP PROVIDERS");
prov_title->setObjectName("dsSidebarTitle");
- prov_hdr_l->addWidget(prov_title);
+ prov_hl->addWidget(prov_title);
vl->addWidget(prov_hdr);
- // Provider ladder
provider_ladder_ = new QListWidget;
provider_ladder_->setObjectName("dsProviderLadder");
- provider_ladder_->setFrameShape(QFrame::NoFrame);
provider_ladder_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ provider_ladder_->setFixedHeight(120);
connect(provider_ladder_, &QListWidget::itemClicked,
this, &DataSourcesScreen::on_provider_ladder_activated);
- vl->addWidget(provider_ladder_, 1);
+ vl->addWidget(provider_ladder_);
return panel;
}
-// ── Connector panel (main table) ─────────────────────────────────────────────
+// ─────────────────────────────────────────────────────────────────────────────
+// Connector table panel (center)
+// ─────────────────────────────────────────────────────────────────────────────
QWidget* DataSourcesScreen::build_connector_panel() {
auto* panel = new QWidget;
- panel->setObjectName("dsPanel");
+ panel->setObjectName("dsConnPanel");
auto* vl = new QVBoxLayout(panel);
vl->setContentsMargins(0, 0, 0, 0);
vl->setSpacing(0);
- // Panel header — 28px, uppercase terminal style
+ // Panel header
auto* hdr = new QWidget;
- hdr->setObjectName("dsPanelHeader");
- hdr->setFixedHeight(28);
- auto* hdr_l = new QHBoxLayout(hdr);
- hdr_l->setContentsMargins(10, 0, 10, 0);
- hdr_l->setSpacing(8);
-
- auto* hdr_tag = new QLabel("CONNECTORS");
- hdr_tag->setStyleSheet("color:#d97706;font-family:'Consolas','Courier New',monospace;"
- "font-size:10px;font-weight:700;letter-spacing:1.5px;");
- hdr_l->addWidget(hdr_tag, 1);
-
- auto* hint = new QLabel("DBL-CLICK TO CONFIGURE");
- hint->setStyleSheet("color:#555;font-family:'Consolas','Courier New',monospace;"
- "font-size:9px;letter-spacing:1px;");
- hdr_l->addWidget(hint);
+ hdr->setObjectName("dsConnHeader");
+ hdr->setFixedHeight(30);
+ auto* hdr_hl = new QHBoxLayout(hdr);
+ hdr_hl->setContentsMargins(12, 0, 12, 0);
+ hdr_hl->setSpacing(8);
+
+ auto* panel_title = new QLabel("CONNECTORS");
+ panel_title->setObjectName("dsConnPanelTitle");
+ hdr_hl->addWidget(panel_title);
+
+ hdr_hl->addStretch();
+
+ count_label_ = new QLabel; // reuse for connector count display
+ count_label_->setObjectName("dsConnCount");
+ hdr_hl->addWidget(count_label_);
vl->addWidget(hdr);
- // Connector table
+ // Table
connector_table_ = new QTableWidget;
connector_table_->setObjectName("dsConnectorTable");
connector_table_->setColumnCount(7);
- connector_table_->setHorizontalHeaderLabels({"", "Connector", "Category", "Auth", "Fields", "Active", "Total"});
+ connector_table_->setHorizontalHeaderLabels({"", "CONNECTOR", "CATEGORY", "AUTH", "TYPE", "ACTIVE", "TOTAL"});
+ connector_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Fixed);
+ connector_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
+ connector_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::ResizeToContents);
+ connector_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);
+ connector_table_->horizontalHeader()->setSectionResizeMode(4, QHeaderView::Fixed);
+ connector_table_->horizontalHeader()->setSectionResizeMode(5, QHeaderView::Fixed);
+ connector_table_->horizontalHeader()->setSectionResizeMode(6, QHeaderView::Fixed);
+ connector_table_->setColumnWidth(0, 38);
+ connector_table_->setColumnWidth(3, 52);
+ connector_table_->setColumnWidth(4, 56);
+ connector_table_->setColumnWidth(5, 52);
+ connector_table_->setColumnWidth(6, 52);
connector_table_->verticalHeader()->setVisible(false);
+ connector_table_->verticalHeader()->setDefaultSectionSize(26);
+ connector_table_->setShowGrid(false);
connector_table_->setSelectionBehavior(QAbstractItemView::SelectRows);
connector_table_->setSelectionMode(QAbstractItemView::SingleSelection);
connector_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);
- connector_table_->setShowGrid(false);
- connector_table_->setAlternatingRowColors(false);
- connector_table_->setFrameShape(QFrame::NoFrame);
- connector_table_->setWordWrap(false);
- connector_table_->horizontalHeader()->setStretchLastSection(false);
- connector_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
- connector_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::ResizeToContents);
- connector_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::ResizeToContents);
- connector_table_->horizontalHeader()->setSectionResizeMode(4, QHeaderView::ResizeToContents);
- connector_table_->horizontalHeader()->setSectionResizeMode(5, QHeaderView::ResizeToContents);
- connector_table_->horizontalHeader()->setSectionResizeMode(6, QHeaderView::ResizeToContents);
- connector_table_->setColumnWidth(0, 48);
+ connector_table_->horizontalHeader()->setHighlightSections(false);
+ connector_table_->setAlternatingRowColors(true);
+ connector_table_->setStyleSheet(
+ connector_table_->styleSheet() +
+ "QTableWidget { alternate-background-color: #0c0c0c; }");
connect(connector_table_, &QTableWidget::itemSelectionChanged,
this, &DataSourcesScreen::on_connector_selection_changed);
connect(connector_table_, &QTableWidget::cellDoubleClicked,
this, [this](int row, int) {
- auto* item = connector_table_->item(row, 1);
- if (item) on_connector_clicked(item->data(Qt::UserRole).toString());
- });
- vl->addWidget(connector_table_, 1);
+ auto* item = connector_table_->item(row, 1);
+ if (item) on_connector_clicked(item->data(Qt::UserRole).toString());
+ });
+ vl->addWidget(connector_table_, 1);
return panel;
}
-// ── Detail / inspector panel ─────────────────────────────────────────────────
+// ─────────────────────────────────────────────────────────────────────────────
+// Detail inspector panel (right)
+// ─────────────────────────────────────────────────────────────────────────────
QWidget* DataSourcesScreen::build_detail_panel() {
auto* panel = new QWidget;
- panel->setObjectName("dsPanel");
- panel->setMinimumWidth(260);
- panel->setMaximumWidth(300);
+ panel->setObjectName("dsDetail");
+ panel->setMinimumWidth(240);
auto* vl = new QVBoxLayout(panel);
vl->setContentsMargins(0, 0, 0, 0);
vl->setSpacing(0);
- // Panel header — 28px, uppercase terminal style
+ // Panel header
auto* hdr = new QWidget;
- hdr->setObjectName("dsPanelHeader");
- hdr->setFixedHeight(28);
- auto* hdr_l = new QHBoxLayout(hdr);
- hdr_l->setContentsMargins(10, 0, 10, 0);
- hdr_l->setSpacing(8);
-
- auto* hdr_tag = new QLabel("INSPECTOR");
- hdr_tag->setStyleSheet("color:#d97706;font-family:'Consolas','Courier New',monospace;"
- "font-size:10px;font-weight:700;letter-spacing:1.5px;");
- hdr_l->addWidget(hdr_tag, 1);
-
- auto* hdr_meta = new QLabel("CONFIG & STATUS");
- hdr_meta->setStyleSheet("color:#555;font-family:'Consolas','Courier New',monospace;"
- "font-size:9px;letter-spacing:1px;");
- hdr_l->addWidget(hdr_meta);
+ hdr->setObjectName("dsDetailHeader");
+ hdr->setFixedHeight(30);
+ auto* hdr_hl = new QHBoxLayout(hdr);
+ hdr_hl->setContentsMargins(12, 0, 12, 0);
+ auto* hdr_title = new QLabel("INSPECTOR");
+ hdr_title->setObjectName("dsDetailTitle");
+ hdr_hl->addWidget(hdr_title);
vl->addWidget(hdr);
- // Scrollable body
+ // Scrollable content
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
scroll->setFrameShape(QFrame::NoFrame);
scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- scroll->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
- scroll->setStyleSheet("QScrollArea { background: transparent; border: none; }");
+ scroll->setStyleSheet(
+ QString("QScrollArea { background:%1; border:none; }").arg(col::BG_SURFACE));
auto* body = new QWidget;
- body->setMaximumWidth(340);
+ body->setStyleSheet(QString("background:%1;").arg(col::BG_SURFACE));
auto* body_vl = new QVBoxLayout(body);
- body_vl->setContentsMargins(12, 12, 12, 12);
- body_vl->setSpacing(10);
+ body_vl->setContentsMargins(0, 0, 0, 0);
+ body_vl->setSpacing(0);
- // Hero — symbol tag + title block
- auto* hero = new QWidget;
- hero->setFixedHeight(44);
- auto* hero_hl = new QHBoxLayout(hero);
- hero_hl->setContentsMargins(0, 0, 0, 0);
- hero_hl->setSpacing(10);
+ // Identity block (symbol + name + description)
+ auto* id_block = new QWidget;
+ id_block->setObjectName("dsInfoRow");
+ id_block->setFixedHeight(64);
+ auto* id_hl = new QHBoxLayout(id_block);
+ id_hl->setContentsMargins(12, 10, 12, 10);
+ id_hl->setSpacing(10);
detail_symbol_ = new QLabel("--");
+ detail_symbol_->setObjectName("dsDetailSymbol");
detail_symbol_->setAlignment(Qt::AlignCenter);
- detail_symbol_->setFixedSize(36, 36);
- detail_symbol_->setStyleSheet(
- "color:#d97706;background:#1a1200;border:1px solid #d97706;"
- "font-family:'Consolas','Courier New',monospace;font-size:11px;font-weight:700;");
- hero_hl->addWidget(detail_symbol_);
-
- auto* hero_text_vl = new QVBoxLayout;
- hero_text_vl->setContentsMargins(0, 0, 0, 0);
- hero_text_vl->setSpacing(2);
-
- detail_title_ = new QLabel("SELECT A CONNECTOR");
- detail_title_->setStyleSheet(
- "color:#e8e8e8;font-family:'Consolas','Courier New',monospace;"
- "font-size:11px;font-weight:700;letter-spacing:0.5px;");
- hero_text_vl->addWidget(detail_title_);
-
- auto* detail_key = new QLabel("CONNECTOR PROFILE");
- detail_key->setStyleSheet(
- "color:#555;font-family:'Consolas','Courier New',monospace;"
- "font-size:9px;letter-spacing:1.5px;");
- hero_text_vl->addWidget(detail_key);
-
- hero_hl->addLayout(hero_text_vl, 1);
- body_vl->addWidget(hero);
-
- // Description
- detail_description_ = new QLabel("Select a connector to inspect its fields and manage saved connections.");
+ id_hl->addWidget(detail_symbol_);
+
+ auto* id_text = new QVBoxLayout;
+ id_text->setSpacing(2);
+ detail_title_ = new QLabel("Select a connector");
+ detail_title_->setObjectName("dsDetailName");
+ id_text->addWidget(detail_title_);
+ detail_description_ = new QLabel("Double-click to configure");
+ detail_description_->setObjectName("dsDetailDesc");
detail_description_->setWordWrap(true);
- detail_description_->setStyleSheet(
- "color:#666;font-family:'Consolas','Courier New',monospace;font-size:10px;line-height:1.4;");
- body_vl->addWidget(detail_description_);
-
- // Divider
- auto* info_div = new QFrame;
- info_div->setFrameShape(QFrame::HLine);
- info_div->setStyleSheet(QString("background:%1;border:none;").arg(col::BORDER_DIM));
- info_div->setFixedHeight(1);
- body_vl->addWidget(info_div);
-
- // Metric rows
- body_vl->addWidget(create_metric_row("CATEGORY", &detail_category_value_));
- body_vl->addWidget(create_metric_row("TRANSPORT", &detail_transport_value_));
- body_vl->addWidget(create_metric_row("AUTH", &detail_auth_value_));
- body_vl->addWidget(create_metric_row("TESTABLE", &detail_test_value_));
- body_vl->addWidget(create_metric_row("FIELDS", &detail_fields_value_));
- body_vl->addWidget(create_metric_row("CONFIGURED", &detail_configured_value_));
- body_vl->addWidget(create_metric_row("ACTIVE", &detail_enabled_value_));
- body_vl->addWidget(create_metric_row("LAST TESTED", &detail_last_tested_value_));
- body_vl->addWidget(create_metric_row("LAST STATUS", &detail_last_status_value_));
-
- // Action buttons
+ id_text->addWidget(detail_description_);
+ id_hl->addLayout(id_text, 1);
+
+ body_vl->addWidget(id_block);
+
+ // ── Metadata rows ────────────────────────────────────────────────────────
+ auto make_info_row = [&](const QString& label, QLabel** value_out) -> QWidget* {
+ auto* row = new QWidget;
+ row->setObjectName("dsInfoRow");
+ row->setFixedHeight(28);
+ auto* hl = new QHBoxLayout(row);
+ hl->setContentsMargins(12, 0, 12, 0);
+ hl->setSpacing(0);
+ auto* lbl = new QLabel(label);
+ lbl->setObjectName("dsInfoLabel");
+ hl->addWidget(lbl);
+ hl->addStretch();
+ auto* val = new QLabel("--");
+ val->setObjectName("dsInfoValue");
+ hl->addWidget(val);
+ *value_out = val;
+ return row;
+ };
+
+ body_vl->addWidget(make_info_row("CATEGORY", &detail_category_value_));
+ body_vl->addWidget(make_info_row("TYPE", &detail_transport_value_));
+ body_vl->addWidget(make_info_row("AUTH", &detail_auth_value_));
+ body_vl->addWidget(make_info_row("TESTABLE", &detail_test_value_));
+ body_vl->addWidget(make_info_row("FIELDS", &detail_fields_value_));
+ body_vl->addWidget(make_info_row("CONFIGURED", &detail_configured_value_));
+ body_vl->addWidget(make_info_row("ACTIVE", &detail_enabled_value_));
+ body_vl->addWidget(make_info_row("LAST STATUS", &detail_last_status_value_));
+
+ // ── Fields section label ─────────────────────────────────────────────────
+ auto* fields_hdr = new QWidget;
+ fields_hdr->setObjectName("dsConnHeader");
+ fields_hdr->setFixedHeight(26);
+ auto* fh_hl = new QHBoxLayout(fields_hdr);
+ fh_hl->setContentsMargins(12, 0, 12, 0);
+ auto* fh_lbl = new QLabel("CONFIG FIELDS");
+ fh_lbl->setObjectName("dsSectionSep");
+ fh_hl->addWidget(fh_lbl);
+ body_vl->addWidget(fields_hdr);
+
+ field_table_ = new QTableWidget;
+ field_table_->setObjectName("dsFieldTable");
+ field_table_->setColumnCount(3);
+ field_table_->setHorizontalHeaderLabels({"FIELD", "TYPE", "REQ"});
+ field_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
+ field_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);
+ field_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);
+ field_table_->setColumnWidth(1, 58);
+ field_table_->setColumnWidth(2, 38);
+ field_table_->verticalHeader()->setVisible(false);
+ field_table_->verticalHeader()->setDefaultSectionSize(24);
+ field_table_->setShowGrid(false);
+ field_table_->setSelectionMode(QAbstractItemView::NoSelection);
+ field_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);
+ field_table_->horizontalHeader()->setHighlightSections(false);
+ field_table_->setMaximumHeight(120);
+ body_vl->addWidget(field_table_);
+
+ // ── Saved connections section ────────────────────────────────────────────
+ auto* conns_hdr = new QWidget;
+ conns_hdr->setObjectName("dsConnHeader");
+ conns_hdr->setFixedHeight(26);
+ auto* ch_hl = new QHBoxLayout(conns_hdr);
+ ch_hl->setContentsMargins(12, 0, 12, 0);
+ auto* ch_lbl = new QLabel("SAVED CONNECTIONS");
+ ch_lbl->setObjectName("dsSectionSep");
+ ch_hl->addWidget(ch_lbl);
+ body_vl->addWidget(conns_hdr);
+
+ detail_connections_list_ = new QListWidget;
+ detail_connections_list_->setObjectName("dsDetailConnList");
+ detail_connections_list_->setMaximumHeight(110);
+ detail_connections_list_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ connect(detail_connections_list_, &QListWidget::itemClicked,
+ this, &DataSourcesScreen::on_detail_connection_activated);
+ body_vl->addWidget(detail_connections_list_);
+
+ // ── Action buttons ───────────────────────────────────────────────────────
auto* actions = new QWidget;
+ actions->setObjectName("dsConnHeader");
auto* act_vl = new QVBoxLayout(actions);
- act_vl->setContentsMargins(0, 4, 0, 4);
- act_vl->setSpacing(4);
+ act_vl->setContentsMargins(12, 10, 12, 10);
+ act_vl->setSpacing(6);
- new_connection_btn_ = new QPushButton("+ NEW CONNECTION");
- new_connection_btn_->setObjectName("dsActionBtn");
- new_connection_btn_->setProperty("accent", true);
+ new_connection_btn_ = new QPushButton("+ ADD CONNECTION");
+ new_connection_btn_->setObjectName("dsBtnAccent");
+ new_connection_btn_->setFixedHeight(28);
new_connection_btn_->setCursor(Qt::PointingHandCursor);
- new_connection_btn_->setFixedHeight(26);
+ new_connection_btn_->setEnabled(false);
connect(new_connection_btn_, &QPushButton::clicked, this, &DataSourcesScreen::on_connection_add);
act_vl->addWidget(new_connection_btn_);
- auto* act_row2 = new QHBoxLayout;
- act_row2->setSpacing(4);
+ auto* edit_test_hl = new QHBoxLayout;
+ edit_test_hl->setSpacing(6);
edit_connection_btn_ = new QPushButton("EDIT");
- edit_connection_btn_->setObjectName("dsActionBtn");
+ edit_connection_btn_->setObjectName("dsBtn");
+ edit_connection_btn_->setFixedHeight(26);
edit_connection_btn_->setCursor(Qt::PointingHandCursor);
- edit_connection_btn_->setFixedHeight(24);
+ edit_connection_btn_->setEnabled(false);
connect(edit_connection_btn_, &QPushButton::clicked, this, [this]() {
- const QString conn_id = effective_detail_connection_id();
- if (!conn_id.isEmpty()) on_connection_edit(conn_id);
+ on_connection_edit(effective_detail_connection_id());
});
- act_row2->addWidget(edit_connection_btn_);
+ edit_test_hl->addWidget(edit_connection_btn_);
test_connection_btn_ = new QPushButton("TEST");
- test_connection_btn_->setObjectName("dsActionBtn");
+ test_connection_btn_->setObjectName("dsBtnGreen");
+ test_connection_btn_->setFixedHeight(26);
test_connection_btn_->setCursor(Qt::PointingHandCursor);
- test_connection_btn_->setFixedHeight(24);
+ test_connection_btn_->setEnabled(false);
connect(test_connection_btn_, &QPushButton::clicked, this, [this]() {
- const QString conn_id = effective_detail_connection_id();
- if (!conn_id.isEmpty()) on_connection_test(conn_id);
+ on_connection_test(effective_detail_connection_id());
});
- act_row2->addWidget(test_connection_btn_);
-
- auto* dup_btn = new QPushButton("DUP");
- dup_btn->setObjectName("dsActionBtn");
- dup_btn->setCursor(Qt::PointingHandCursor);
- dup_btn->setFixedHeight(24);
- dup_btn->setToolTip("Clone this connection with a new name");
- connect(dup_btn, &QPushButton::clicked, this, [this]() {
- const QString conn_id = effective_detail_connection_id();
- if (!conn_id.isEmpty()) on_connection_duplicate(conn_id);
- });
- act_row2->addWidget(dup_btn);
+ edit_test_hl->addWidget(test_connection_btn_);
- act_vl->addLayout(act_row2);
+ act_vl->addLayout(edit_test_hl);
body_vl->addWidget(actions);
- // Fields section
- auto* fields_lbl = new QLabel("FIELD MAP");
- fields_lbl->setStyleSheet(
- "color:#888;font-family:'Consolas','Courier New',monospace;"
- "font-size:9px;font-weight:700;letter-spacing:1.5px;padding:4px 0 2px 0;");
- body_vl->addWidget(fields_lbl);
-
- field_table_ = new QTableWidget;
- field_table_->setObjectName("dsFieldTable");
- field_table_->setColumnCount(4);
- field_table_->setHorizontalHeaderLabels({"FIELD", "TYPE", "REQ", "DEFAULT"});
- field_table_->verticalHeader()->setVisible(false);
- field_table_->setSelectionMode(QAbstractItemView::NoSelection);
- field_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);
- field_table_->setShowGrid(false);
- field_table_->setFrameShape(QFrame::NoFrame);
- field_table_->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
- field_table_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- field_table_->setFixedHeight(156);
- body_vl->addWidget(field_table_);
-
- // Saved connections section
- auto* saved_lbl = new QLabel("SAVED CONNECTIONS");
- saved_lbl->setStyleSheet(
- "color:#888;font-family:'Consolas','Courier New',monospace;"
- "font-size:9px;font-weight:700;letter-spacing:1.5px;padding:4px 0 2px 0;");
- body_vl->addWidget(saved_lbl);
-
- detail_connections_list_ = new QListWidget;
- detail_connections_list_->setObjectName("dsDetailConnList");
- detail_connections_list_->setFrameShape(QFrame::NoFrame);
- detail_connections_list_->setMinimumHeight(60);
- connect(detail_connections_list_, &QListWidget::itemClicked,
- this, &DataSourcesScreen::on_detail_connection_activated);
- body_vl->addWidget(detail_connections_list_, 1);
-
+ body_vl->addStretch();
scroll->setWidget(body);
vl->addWidget(scroll, 1);
return panel;
}
-// ── Connections bottom panel ─────────────────────────────────────────────────
+// ─────────────────────────────────────────────────────────────────────────────
+// Connections page (full-screen connections table)
+// ─────────────────────────────────────────────────────────────────────────────
-QWidget* DataSourcesScreen::build_connections_panel() {
- auto* panel = new QWidget;
- panel->setObjectName("dsPanel");
+QWidget* DataSourcesScreen::build_connections_page() {
+ auto* page = new QWidget;
+ page->setObjectName("dsConnsPanel");
- auto* vl = new QVBoxLayout(panel);
+ auto* vl = new QVBoxLayout(page);
vl->setContentsMargins(0, 0, 0, 0);
vl->setSpacing(0);
- // Panel header — 28px, uppercase terminal style
+ // Panel header
auto* hdr = new QWidget;
- hdr->setObjectName("dsPanelHeader");
- hdr->setFixedHeight(28);
- auto* hdr_l = new QHBoxLayout(hdr);
- hdr_l->setContentsMargins(10, 0, 10, 0);
- hdr_l->setSpacing(8);
-
- auto* hdr_tag = new QLabel("SAVED CONNECTIONS");
- hdr_tag->setStyleSheet("color:#d97706;font-family:'Consolas','Courier New',monospace;"
- "font-size:10px;font-weight:700;letter-spacing:1.5px;");
- hdr_l->addWidget(hdr_tag, 1);
-
- auto* hdr_meta = new QLabel("ENABLE · EDIT · TEST · DUP · DEL");
- hdr_meta->setStyleSheet("color:#555;font-family:'Consolas','Courier New',monospace;"
- "font-size:9px;letter-spacing:1px;");
- hdr_l->addWidget(hdr_meta);
+ hdr->setObjectName("dsConnsHeader");
+ hdr->setFixedHeight(30);
+ auto* hdr_hl = new QHBoxLayout(hdr);
+ hdr_hl->setContentsMargins(12, 0, 12, 0);
+ hdr_hl->setSpacing(8);
+
+ auto* hdr_title = new QLabel("SAVED CONNECTIONS");
+ hdr_title->setObjectName("dsConnPanelTitle");
+ hdr_hl->addWidget(hdr_title);
+ hdr_hl->addStretch();
+
+ auto* add_conn_btn = new QPushButton("+ ADD");
+ add_conn_btn->setObjectName("dsBtnAccent");
+ add_conn_btn->setFixedHeight(24);
+ add_conn_btn->setCursor(Qt::PointingHandCursor);
+ connect(add_conn_btn, &QPushButton::clicked, this, &DataSourcesScreen::on_connection_add);
+ hdr_hl->addWidget(add_conn_btn);
+
vl->addWidget(hdr);
- // Toolbar — search + bulk actions, 30px height
+ // Toolbar
auto* toolbar = new QWidget;
- toolbar->setObjectName("dsConnToolbar");
- toolbar->setFixedHeight(30);
+ toolbar->setObjectName("dsConnsToolbar");
+ toolbar->setFixedHeight(32);
auto* tb_hl = new QHBoxLayout(toolbar);
- tb_hl->setContentsMargins(8, 0, 8, 0);
+ tb_hl->setContentsMargins(10, 0, 10, 0);
tb_hl->setSpacing(6);
- // Select-all checkbox
- select_all_check_ = new QCheckBox;
- select_all_check_->setObjectName("dsSelectAll");
- select_all_check_->setToolTip("Select / deselect all visible connections");
- connect(select_all_check_, &QCheckBox::toggled, this, [this](bool checked) {
- if (!connections_table_) return;
- connections_table_->setSelectionMode(
- checked ? QAbstractItemView::MultiSelection : QAbstractItemView::SingleSelection);
- if (checked) connections_table_->selectAll();
- else connections_table_->clearSelection();
- });
- tb_hl->addWidget(select_all_check_);
-
- // Separator
- auto* sep = new QFrame;
- sep->setFrameShape(QFrame::VLine);
- sep->setStyleSheet("color:#222;");
- sep->setFixedWidth(1);
- tb_hl->addWidget(sep);
-
- // Connection search
+ // Search
conn_search_edit_ = new QLineEdit;
- conn_search_edit_->setObjectName("dsConnSearch");
- conn_search_edit_->setPlaceholderText("FILTER CONNECTIONS...");
- conn_search_edit_->setFixedHeight(22);
- conn_search_edit_->setFixedWidth(220);
+ conn_search_edit_->setObjectName("dsSearchConn");
+ conn_search_edit_->setPlaceholderText("filter connections...");
+ conn_search_edit_->setFixedSize(220, 22);
connect(conn_search_edit_, &QLineEdit::textChanged,
this, &DataSourcesScreen::on_connections_search_changed);
tb_hl->addWidget(conn_search_edit_);
tb_hl->addStretch();
- // Bulk action buttons — 22px height, monospace uppercase
- const auto make_bulk_btn = [](const QString& label, bool danger = false) {
- auto* btn = new QPushButton(label);
- btn->setObjectName("dsBulkBtn");
- if (danger) btn->setProperty("danger", true);
- btn->setCursor(Qt::PointingHandCursor);
- btn->setFixedHeight(22);
- return btn;
- };
-
- bulk_enable_btn_ = make_bulk_btn("ENABLE ALL");
- bulk_disable_btn_ = make_bulk_btn("DISABLE ALL");
- bulk_delete_btn_ = make_bulk_btn("DEL SELECTED", true);
+ // Bulk buttons
+ bulk_enable_btn_ = new QPushButton("ENABLE ALL");
+ bulk_enable_btn_->setObjectName("dsBtnGreen");
+ bulk_enable_btn_->setFixedHeight(22);
+ bulk_enable_btn_->setCursor(Qt::PointingHandCursor);
+ connect(bulk_enable_btn_, &QPushButton::clicked, this, &DataSourcesScreen::on_bulk_enable_all);
+ tb_hl->addWidget(bulk_enable_btn_);
- connect(bulk_enable_btn_, &QPushButton::clicked, this, &DataSourcesScreen::on_bulk_enable_all);
+ bulk_disable_btn_ = new QPushButton("DISABLE ALL");
+ bulk_disable_btn_->setObjectName("dsBtn");
+ bulk_disable_btn_->setFixedHeight(22);
+ bulk_disable_btn_->setCursor(Qt::PointingHandCursor);
connect(bulk_disable_btn_, &QPushButton::clicked, this, &DataSourcesScreen::on_bulk_disable_all);
- connect(bulk_delete_btn_, &QPushButton::clicked, this, &DataSourcesScreen::on_bulk_delete_selected);
-
- tb_hl->addWidget(bulk_enable_btn_);
tb_hl->addWidget(bulk_disable_btn_);
+
+ bulk_delete_btn_ = new QPushButton("DELETE SEL");
+ bulk_delete_btn_->setObjectName("dsBtnDanger");
+ bulk_delete_btn_->setFixedHeight(22);
+ bulk_delete_btn_->setCursor(Qt::PointingHandCursor);
+ connect(bulk_delete_btn_, &QPushButton::clicked, this, &DataSourcesScreen::on_bulk_delete_selected);
tb_hl->addWidget(bulk_delete_btn_);
vl->addWidget(toolbar);
- // Connections table — extended to 9 cols (added Live Status)
+ // Connections table
connections_table_ = new QTableWidget;
connections_table_->setObjectName("dsConnectionsTable");
- connections_table_->setColumnCount(9);
- connections_table_->setHorizontalHeaderLabels(
- {"On", "Name", "Provider", "Category", "Type", "Live", "Tags", "Updated", "Actions"});
- connections_table_->verticalHeader()->setVisible(false);
- connections_table_->setSelectionBehavior(QAbstractItemView::SelectRows);
- connections_table_->setSelectionMode(QAbstractItemView::SingleSelection);
- connections_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);
- connections_table_->setShowGrid(false);
- connections_table_->setAlternatingRowColors(false);
- connections_table_->setFrameShape(QFrame::NoFrame);
- connections_table_->horizontalHeader()->setStretchLastSection(false);
+ connections_table_->setColumnCount(8);
+ connections_table_->setHorizontalHeaderLabels({
+ "", "NAME", "PROVIDER", "CATEGORY", "TYPE", "STATUS", "TAGS", "UPDATED"
+ });
+ connections_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Fixed);
connections_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
connections_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::ResizeToContents);
connections_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::ResizeToContents);
- connections_table_->horizontalHeader()->setSectionResizeMode(4, QHeaderView::ResizeToContents);
- connections_table_->horizontalHeader()->setSectionResizeMode(5, QHeaderView::ResizeToContents);
+ connections_table_->horizontalHeader()->setSectionResizeMode(4, QHeaderView::Fixed);
+ connections_table_->horizontalHeader()->setSectionResizeMode(5, QHeaderView::Fixed);
connections_table_->horizontalHeader()->setSectionResizeMode(6, QHeaderView::ResizeToContents);
- connections_table_->horizontalHeader()->setSectionResizeMode(7, QHeaderView::ResizeToContents);
- connections_table_->horizontalHeader()->setSectionResizeMode(8, QHeaderView::ResizeToContents);
- connections_table_->setColumnWidth(0, 44);
- connections_table_->setColumnWidth(8, 200);
+ connections_table_->horizontalHeader()->setSectionResizeMode(7, QHeaderView::Fixed);
+ connections_table_->setColumnWidth(0, 32);
+ connections_table_->setColumnWidth(4, 54);
+ connections_table_->setColumnWidth(5, 54);
+ connections_table_->setColumnWidth(7, 140);
+ connections_table_->verticalHeader()->setVisible(false);
+ connections_table_->verticalHeader()->setDefaultSectionSize(26);
+ connections_table_->setShowGrid(false);
+ connections_table_->setSelectionBehavior(QAbstractItemView::SelectRows);
+ connections_table_->setSelectionMode(QAbstractItemView::ExtendedSelection);
+ connections_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);
+ connections_table_->horizontalHeader()->setHighlightSections(false);
+ connections_table_->setAlternatingRowColors(true);
+ connections_table_->setStyleSheet(
+ connections_table_->styleSheet() +
+ "QTableWidget { alternate-background-color: #0c0c0c; }");
connect(connections_table_, &QTableWidget::itemSelectionChanged,
this, &DataSourcesScreen::on_connection_selection_changed);
- vl->addWidget(connections_table_, 1);
- return panel;
+ vl->addWidget(connections_table_, 1);
+ return page;
}
-// ── setup_ui ─────────────────────────────────────────────────────────────────
+// ─────────────────────────────────────────────────────────────────────────────
+// Command bar stub (unused — kept for ABI compat)
+// ─────────────────────────────────────────────────────────────────────────────
-void DataSourcesScreen::setup_ui() {
- apply_screen_styles();
-
- clock_timer_ = new QTimer(this);
- clock_timer_->setInterval(1000);
- connect(clock_timer_, &QTimer::timeout, this, &DataSourcesScreen::update_clock);
-
- // Live status poll — 30s interval, only runs while screen is visible
- poll_timer_ = new QTimer(this);
- poll_timer_->setInterval(30000);
- connect(poll_timer_, &QTimer::timeout, this, &DataSourcesScreen::on_poll_timer);
-
- auto* root = new QVBoxLayout(this);
- root->setContentsMargins(0, 0, 0, 0);
- root->setSpacing(0);
-
- root->addWidget(build_header_bar());
- root->addWidget(build_command_bar()); // zero-height placeholder
- root->addWidget(build_stats_strip());
-
- auto* main_splitter = new QSplitter(Qt::Vertical);
- main_splitter->setObjectName("dsMainSplitter");
- main_splitter->setHandleWidth(1);
- main_splitter->setChildrenCollapsible(false);
-
- auto* workspace_splitter = new QSplitter(Qt::Horizontal);
- workspace_splitter->setObjectName("dsWorkspaceSplitter");
- workspace_splitter->setHandleWidth(1);
- workspace_splitter->setChildrenCollapsible(false);
- workspace_splitter->addWidget(build_category_panel());
- workspace_splitter->addWidget(build_connector_panel());
- workspace_splitter->addWidget(build_detail_panel());
- workspace_splitter->setStretchFactor(0, 0);
- workspace_splitter->setStretchFactor(1, 1);
- workspace_splitter->setStretchFactor(2, 0);
- workspace_splitter->setSizes({200, 600, 280});
+QWidget* DataSourcesScreen::build_command_bar() {
+ auto* w = new QWidget;
+ w->setFixedHeight(0);
+ return w;
+}
- main_splitter->addWidget(workspace_splitter);
- main_splitter->addWidget(build_connections_panel());
- main_splitter->setStretchFactor(0, 3);
- main_splitter->setStretchFactor(1, 2);
- main_splitter->setSizes({540, 220});
- main_splitter->setCollapsible(0, true);
- main_splitter->setCollapsible(1, true);
+// ─────────────────────────────────────────────────────────────────────────────
+// apply_screen_styles — no-op (styles applied inline in setup_ui)
+// ─────────────────────────────────────────────────────────────────────────────
- root->addWidget(main_splitter, 1);
-}
+void DataSourcesScreen::apply_screen_styles() {}
-// ── Config dialog ─────────────────────────────────────────────────────────────
+// ─────────────────────────────────────────────────────────────────────────────
+// Config dialog
+// ─────────────────────────────────────────────────────────────────────────────
void DataSourcesScreen::show_config_dialog(const ConnectorConfig& config,
const QString& edit_id,
@@ -1139,12 +1194,13 @@ void DataSourcesScreen::show_config_dialog(const ConnectorConfig& config,
dlg.setModal(true);
dlg.setStyleSheet(QString(
"QDialog { background:%1; color:%2; }"
- "QLabel { color:%3; font-size:12px; background:transparent; }"
+ "QLabel { color:%3; font-size:12px; background:transparent; font-family:'Consolas','Courier New',monospace; }"
"QLineEdit, QTextEdit, QComboBox { background:%4; border:1px solid %5; color:%2;"
- " padding:6px 10px; font-size:13px; border-radius:3px; }"
+ " padding:6px 10px; font-size:13px; font-family:'Consolas','Courier New',monospace; }"
"QLineEdit:focus, QTextEdit:focus, QComboBox:focus { border-color:%6; }"
- "QCheckBox { color:%2; font-size:13px; }"
- "QPushButton { padding:7px 18px; font-size:12px; font-weight:700; border-radius:4px; }")
+ "QCheckBox { color:%2; font-size:13px; font-family:'Consolas','Courier New',monospace; }"
+ "QPushButton { padding:7px 18px; font-size:12px; font-weight:700;"
+ " font-family:'Consolas','Courier New',monospace; }")
.arg(col::BG_SURFACE, col::TEXT_PRIMARY, col::TEXT_SECONDARY,
col::BG_BASE, col::BORDER_DIM, col::AMBER));
@@ -1166,7 +1222,7 @@ void DataSourcesScreen::show_config_dialog(const ConnectorConfig& config,
code_lbl->setFixedSize(36, 36);
code_lbl->setStyleSheet(
QString("background:%1;color:%2;border:1px solid %3;font-size:14px;"
- "font-weight:700;border-radius:6px;")
+ "font-weight:700;")
.arg(config.color, col::TEXT_PRIMARY, col::BORDER_DIM));
dlg_hdr_hl->addWidget(code_lbl);
@@ -1285,7 +1341,7 @@ void DataSourcesScreen::show_config_dialog(const ConnectorConfig& config,
++row;
}
- // Tags field (generic — appended after connector-specific fields)
+ // Tags field
auto* tags_lbl = new QLabel("Tags");
tags_lbl->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
form->addWidget(tags_lbl, row, 0);
@@ -1414,13 +1470,14 @@ void DataSourcesScreen::show_config_dialog(const ConnectorConfig& config,
}
}
-// ── Data functions (unchanged) ────────────────────────────────────────────────
+// ─────────────────────────────────────────────────────────────────────────────
+// Data functions
+// ─────────────────────────────────────────────────────────────────────────────
QVector<ConnectorConfig> DataSourcesScreen::filtered_connectors() const {
QVector<ConnectorConfig> filtered;
const QString filter = search_edit_ ? search_edit_->text().trimmed().toLower() : "";
- // Pre-build set of configured/active connector IDs for stat filter
QSet<QString> configured_ids, active_ids;
if (stat_filter_ == 1 || stat_filter_ == 2) {
for (const auto& ds : connections_cache_) {
@@ -1483,36 +1540,54 @@ void DataSourcesScreen::build_connector_table() {
const int total_saved = total_connections_for_provider(connections_cache_, cfg.id);
const int live_saved = enabled_connections_for_provider(connections_cache_, cfg.id);
- connector_table_->setItem(row, 0, make_item(connector_code(cfg), QColor(cfg.color), Qt::AlignCenter));
+ // Col 0: code badge
+ auto* code_item = make_item(connector_code(cfg), QColor(cfg.color), Qt::AlignCenter);
+ connector_table_->setItem(row, 0, code_item);
+ // Col 1: name (carries connector ID in UserRole)
auto* name_item = make_item(cfg.name);
name_item->setData(Qt::UserRole, cfg.id);
connector_table_->setItem(row, 1, name_item);
- connector_table_->setItem(row, 2, make_item(category_label(cfg.category), TEXT_SECONDARY));
- connector_table_->setItem(row, 3, make_item(cfg.requires_auth ? "Key" : "Open",
- cfg.requires_auth ? COLOR_WARNING : COLOR_BUY, Qt::AlignCenter));
- connector_table_->setItem(row, 4, make_item(QString::number(cfg.fields.size()),
- TEXT_PRIMARY, Qt::AlignCenter));
- connector_table_->setItem(row, 5, make_item(QString::number(live_saved),
- live_saved > 0 ? COLOR_BUY : TEXT_TERTIARY, Qt::AlignCenter));
- connector_table_->setItem(row, 6, make_item(QString::number(total_saved),
- total_saved > 0 ? COLOR_ACCENT : TEXT_TERTIARY, Qt::AlignCenter));
- connector_table_->setRowHeight(row, 32);
-
- if (cfg.id == selected_connector_id_)
- preferred_row = row;
+ // Col 2: category
+ connector_table_->setItem(row, 2,
+ make_item(category_label(cfg.category), QColor(col::TEXT_SECONDARY())));
+
+ // Col 3: auth
+ connector_table_->setItem(row, 3,
+ make_item(cfg.requires_auth ? "KEY" : "OPEN",
+ cfg.requires_auth ? QColor(col::WARNING()) : QColor(col::POSITIVE()),
+ Qt::AlignCenter));
+
+ // Col 4: transport type
+ connector_table_->setItem(row, 4,
+ make_item(connector_transport(cfg), QColor(col::TEXT_TERTIARY()), Qt::AlignCenter));
+
+ // Col 5: active connections
+ connector_table_->setItem(row, 5,
+ make_item(live_saved > 0 ? QString::number(live_saved) : "-",
+ live_saved > 0 ? QColor(col::POSITIVE()) : QColor(col::TEXT_TERTIARY()),
+ Qt::AlignCenter));
+
+ // Col 6: total connections
+ connector_table_->setItem(row, 6,
+ make_item(total_saved > 0 ? QString::number(total_saved) : "-",
+ total_saved > 0 ? QColor(col::TEXT_PRIMARY()) : QColor(col::TEXT_TERTIARY()),
+ Qt::AlignCenter));
+
+ if (cfg.id == selected_connector_id_) preferred_row = row;
}
+ }
- if (preferred_row < 0 && !filtered.isEmpty()) {
- selected_connector_id_ = filtered.first().id;
- preferred_row = 0;
- } else if (filtered.isEmpty()) {
- selected_connector_id_.clear();
- }
+ if (count_label_)
+ count_label_->setText(QString("%1 / %2")
+ .arg(filtered.size())
+ .arg(ConnectorRegistry::instance().count()));
- if (preferred_row >= 0) connector_table_->selectRow(preferred_row);
- else connector_table_->clearSelection();
+ if (preferred_row >= 0) {
+ connector_table_->selectRow(preferred_row);
+ } else if (!selected_connector_id_.isEmpty()) {
+ connector_table_->clearSelection();
}
update_detail_panel();
@@ -1521,378 +1596,292 @@ void DataSourcesScreen::build_connector_table() {
void DataSourcesScreen::build_connections_table() {
if (!connections_table_) return;
- const auto visible_connections = filtered_connection_rows();
- int preferred_row = -1;
-
- {
- QSignalBlocker blocker(connections_table_);
- connections_table_->setRowCount(visible_connections.size());
-
- for (int row = 0; row < visible_connections.size(); ++row) {
- const auto& ds = visible_connections[row];
- const QString connector_id = normalized_provider_key(ds);
- const auto* cfg = find_connector_config(connector_id);
-
- auto* toggle = new QCheckBox;
- toggle->setObjectName("dsEnableToggle");
- toggle->setChecked(ds.enabled);
- toggle->setCursor(Qt::PointingHandCursor);
- connect(toggle, &QCheckBox::toggled, this,
- [this, conn_id = ds.id](bool enabled) {
- on_connection_enabled_changed(conn_id, enabled);
- });
- connections_table_->setCellWidget(row, 0, toggle);
-
- auto* name_item = make_item(ds.display_name);
- name_item->setData(Qt::UserRole, ds.id);
- connections_table_->setItem(row, 1, name_item);
-
- connections_table_->setItem(row, 2,
- make_item(cfg ? cfg->name : ds.provider, cfg ? QColor(cfg->color) : TEXT_SECONDARY));
- connections_table_->setItem(row, 3,
- make_item(cfg ? category_label(cfg->category) : ds.category, TEXT_SECONDARY));
- connections_table_->setItem(row, 4,
- make_item(ds.type == "websocket" ? "WS" : "REST",
- ds.type == "websocket" ? COLOR_ACCENT : TEXT_PRIMARY, Qt::AlignCenter));
-
- // Col 5: Live status (from cache or pending)
- {
- const auto it = live_status_cache_.find(ds.id);
- QString dot_text = "-";
- QColor dot_col = TEXT_TERTIARY;
- if (it != live_status_cache_.end()) {
- dot_text = it->first ? "OK" : "ERR";
- dot_col = it->first ? COLOR_BUY : COLOR_SELL;
- }
- auto* status_lbl = new QLabel(dot_text);
- status_lbl->setObjectName("dsStatusDot");
- status_lbl->setAlignment(Qt::AlignCenter);
- status_lbl->setStyleSheet(
- QString("color:%1;font-size:14px;font-weight:700;background:transparent;")
- .arg(dot_col.name()));
- status_lbl->setToolTip(it != live_status_cache_.end() ? it->second : "Not yet tested");
- connections_table_->setCellWidget(row, 5, status_lbl);
- }
-
- // Col 6: Tags
- connections_table_->setItem(row, 6,
- make_item(ds.tags.isEmpty() ? "—" : ds.tags, TEXT_TERTIARY));
-
- connections_table_->setItem(row, 7, make_item(ds.updated_at, TEXT_TERTIARY));
-
- auto* act_widget = new QWidget;
- auto* act_hl = new QHBoxLayout(act_widget);
- act_hl->setContentsMargins(4, 2, 4, 2);
- act_hl->setSpacing(4);
-
- auto* edit_btn = new QPushButton("Edit");
- edit_btn->setObjectName("dsInlineAction");
- edit_btn->setProperty("accent", true);
- edit_btn->setCursor(Qt::PointingHandCursor);
- connect(edit_btn, &QPushButton::clicked, this,
- [this, conn_id = ds.id]() { on_connection_edit(conn_id); });
- act_hl->addWidget(edit_btn);
-
- auto* test_btn = new QPushButton("Test");
- test_btn->setObjectName("dsInlineAction");
- test_btn->setProperty("test", true);
- test_btn->setCursor(Qt::PointingHandCursor);
- connect(test_btn, &QPushButton::clicked, this,
- [this, conn_id = ds.id]() { on_connection_test(conn_id); });
- act_hl->addWidget(test_btn);
-
- auto* dup_btn2 = new QPushButton("Clone");
- dup_btn2->setObjectName("dsInlineAction");
- dup_btn2->setCursor(Qt::PointingHandCursor);
- connect(dup_btn2, &QPushButton::clicked, this,
- [this, conn_id = ds.id]() { on_connection_duplicate(conn_id); });
- act_hl->addWidget(dup_btn2);
-
- auto* del_btn = new QPushButton("Delete");
- del_btn->setObjectName("dsInlineAction");
- del_btn->setProperty("danger", true);
- del_btn->setCursor(Qt::PointingHandCursor);
- connect(del_btn, &QPushButton::clicked, this,
- [this, conn_id = ds.id]() { on_connection_delete(conn_id); });
- act_hl->addWidget(del_btn);
-
- connections_table_->setCellWidget(row, 8, act_widget);
- connections_table_->setRowHeight(row, 32);
-
- if (ds.id == selected_connection_id_) preferred_row = row;
- if (preferred_row < 0 && connector_id == selected_connector_id_) preferred_row = row;
- }
+ const auto rows = filtered_connection_rows();
- if (preferred_row >= 0) connections_table_->selectRow(preferred_row);
- else connections_table_->clearSelection();
+ QSignalBlocker blocker(connections_table_);
+ connections_table_->setRowCount(rows.size());
+
+ for (int r = 0; r < rows.size(); ++r) {
+ const auto& ds = rows[r];
+ const auto* cfg = find_connector_config(ds.provider);
+
+ // Col 0: enable checkbox
+ auto* toggle = new QCheckBox;
+ toggle->setObjectName("dsEnableToggle");
+ toggle->setChecked(ds.enabled);
+ toggle->setProperty("conn_id", ds.id);
+ toggle->setCursor(Qt::PointingHandCursor);
+ connect(toggle, &QCheckBox::toggled, this, [this, id = ds.id](bool checked) {
+ on_connection_enabled_changed(id, checked);
+ });
+ connections_table_->setCellWidget(r, 0, toggle);
+
+ // Col 1: name (carries conn ID in UserRole)
+ auto* name_item = make_item(ds.display_name);
+ name_item->setData(Qt::UserRole, ds.id);
+ connections_table_->setItem(r, 1, name_item);
+
+ // Col 2: provider
+ const QString prov_color = cfg ? cfg->color : col::TEXT_SECONDARY();
+ connections_table_->setItem(r, 2,
+ make_item(cfg ? cfg->name : ds.provider, QColor(prov_color)));
+
+ // Col 3: category
+ connections_table_->setItem(r, 3,
+ make_item(ds.category, QColor(col::TEXT_SECONDARY())));
+
+ // Col 4: type
+ connections_table_->setItem(r, 4,
+ make_item(cfg ? connector_transport(*cfg) : ds.type,
+ QColor(col::TEXT_TERTIARY()), Qt::AlignCenter));
+
+ // Col 5: live status
+ const bool has_status = live_status_cache_.contains(ds.id);
+ const bool ok = has_status ? live_status_cache_[ds.id].first : false;
+ auto* status_lbl = new QLabel(has_status ? (ok ? "OK" : "ERR") : "--");
+ status_lbl->setAlignment(Qt::AlignCenter);
+ status_lbl->setObjectName("dsStatusDot");
+ status_lbl->setStyleSheet(
+ QString("color:%1;font-size:11px;font-weight:700;background:transparent;")
+ .arg(!has_status ? col::TEXT_TERTIARY()
+ : ok ? col::POSITIVE() : col::NEGATIVE()));
+ if (has_status)
+ status_lbl->setToolTip(live_status_cache_[ds.id].second);
+ connections_table_->setCellWidget(r, 5, status_lbl);
+
+ // Col 6: tags
+ connections_table_->setItem(r, 6,
+ make_item(ds.tags, QColor(col::TEXT_TERTIARY())));
+
+ // Col 7: updated_at
+ connections_table_->setItem(r, 7,
+ make_item(ds.updated_at.left(16), QColor(col::TEXT_TERTIARY())));
}
-
- on_connection_selection_changed();
}
-void DataSourcesScreen::update_provider_ladder() {
- if (!provider_ladder_) return;
-
- const auto visible_connectors = filtered_connectors();
- QSet<QString> allowed_connectors;
- for (const auto& cfg : visible_connectors)
- allowed_connectors.insert(cfg.id);
+void DataSourcesScreen::update_stats_strip() {
+ if (!universe_stat_value_) return;
- struct ProviderSummary { QString id, name, color; int total = 0, live = 0; };
- QMap<QString, ProviderSummary> grouped;
+ const auto& all = ConnectorRegistry::instance().all();
+ const int universe = all.size();
+ QSet<QString> configured_providers;
+ int active_count = 0, auth_count = 0;
for (const auto& ds : connections_cache_) {
- const QString connector_id = normalized_provider_key(ds);
- if (!allowed_connectors.contains(connector_id)) continue;
- auto& s = grouped[connector_id];
- s.id = connector_id;
- if (const auto* cfg = find_connector_config(connector_id)) {
- s.name = cfg->name; s.color = cfg->color;
- } else {
- s.name = connector_id; s.color = col::TEXT_PRIMARY();
- }
- ++s.total;
- if (ds.enabled) ++s.live;
+ configured_providers.insert(normalized_provider_key(ds));
+ if (ds.enabled) ++active_count;
+ }
+ for (const auto& cfg : all) {
+ if (cfg.requires_auth) ++auth_count;
}
- QVector<ProviderSummary> summaries;
- for (const auto& s : grouped.values()) summaries.append(s);
- std::sort(summaries.begin(), summaries.end(), [](const ProviderSummary& a, const ProviderSummary& b) {
- return a.total != b.total ? a.total > b.total : a.name.toLower() < b.name.toLower();
- });
+ universe_stat_value_->setText(QString::number(universe));
+ configured_stat_value_->setText(QString::number(configured_providers.size()));
+ active_stat_value_->setText(QString::number(active_count));
+ auth_stat_value_->setText(QString::number(auth_count));
- QSignalBlocker blocker(provider_ladder_);
- provider_ladder_->clear();
+ // Highlight active stat filter
+ auto reset_color = [](QLabel* v) {
+ v->setStyleSheet(
+ "color:#e5e5e5;font-size:22px;font-weight:700;background:transparent;");
+ };
+ auto set_amber = [](QLabel* v) {
+ v->setStyleSheet(
+ "color:#d97706;font-size:22px;font-weight:700;background:transparent;");
+ };
- if (summaries.isEmpty()) {
- auto* empty = new QListWidgetItem("No configured providers");
- empty->setFlags(Qt::NoItemFlags);
- empty->setForeground(QColor(col::TEXT_TERTIARY()));
- provider_ladder_->addItem(empty);
- return;
- }
+ reset_color(universe_stat_value_);
+ reset_color(configured_stat_value_);
+ reset_color(active_stat_value_);
+ reset_color(auth_stat_value_);
- for (const auto& s : summaries) {
- const QString text = QString("%1 — %2/%3 live").arg(s.name).arg(s.live).arg(s.total);
- auto* item = new QListWidgetItem(text);
- item->setData(Qt::UserRole, s.id);
- item->setToolTip(QString("%1 live / %2 configured").arg(s.live).arg(s.total));
- item->setForeground(s.live > 0 ? QColor(s.color) : QColor(col::TEXT_SECONDARY()));
- provider_ladder_->addItem(item);
+ switch (stat_filter_) {
+ case 0: set_amber(universe_stat_value_); break;
+ case 1: set_amber(configured_stat_value_); break;
+ case 2: set_amber(active_stat_value_); break;
+ case 3: set_amber(auth_stat_value_); break;
+ default: break;
}
}
-void DataSourcesScreen::update_stats_strip() {
- const auto visible_connectors = filtered_connectors();
- const int total_connectors = ConnectorRegistry::instance().count();
- const int visible_count = visible_connectors.size();
-
- QSet<QString> visible_ids;
- int auth_required = 0;
- for (const auto& cfg : visible_connectors) {
- visible_ids.insert(cfg.id);
- if (cfg.requires_auth) ++auth_required;
- }
+void DataSourcesScreen::update_provider_ladder() {
+ if (!provider_ladder_) return;
- int configured = 0, active = 0;
+ // Build connector -> total_connections map
+ QMap<QString, int> conn_counts;
for (const auto& ds : connections_cache_) {
- if (!visible_ids.contains(normalized_provider_key(ds))) continue;
- ++configured;
- if (ds.enabled) ++active;
+ const QString key = normalized_provider_key(ds);
+ conn_counts[key]++;
}
- const QString active_style =
- QString("color:%1;font-size:22px;font-weight:700;background:transparent;").arg(col::AMBER);
- const QString normal_style =
- QString("color:%1;font-size:22px;font-weight:700;background:transparent;").arg(col::TEXT_PRIMARY);
+ // Top 5 by count
+ QVector<QPair<int, QString>> ranked;
+ for (auto it = conn_counts.begin(); it != conn_counts.end(); ++it)
+ ranked.append({it.value(), it.key()});
+ std::sort(ranked.begin(), ranked.end(), [](const auto& a, const auto& b) {
+ return a.first > b.first;
+ });
+ ranked = ranked.mid(0, 8);
- if (universe_stat_value_) {
- universe_stat_value_->setText(QString("%1/%2").arg(visible_count).arg(total_connectors));
- universe_stat_value_->setStyleSheet(stat_filter_ == 0 ? active_style : normal_style);
- }
- if (configured_stat_value_) {
- configured_stat_value_->setText(QString::number(configured));
- configured_stat_value_->setStyleSheet(stat_filter_ == 1 ? active_style : normal_style);
- }
- if (active_stat_value_) {
- active_stat_value_->setText(QString::number(active));
- active_stat_value_->setStyleSheet(stat_filter_ == 2 ? active_style : normal_style);
- }
- if (auth_stat_value_) {
- auth_stat_value_->setText(QString::number(auth_required));
- auth_stat_value_->setStyleSheet(stat_filter_ == 3 ? active_style : normal_style);
- }
+ QSignalBlocker blocker(provider_ladder_);
+ provider_ladder_->clear();
- if (count_label_)
- count_label_->setText(QString("%1/%2 visible | %3 cfg | %4 live")
- .arg(visible_count).arg(total_connectors).arg(configured).arg(active));
-
- if (selection_status_label_) {
- QString focus = "All categories";
- if (!selected_connector_id_.isEmpty()) {
- const auto* cfg = find_connector_config(selected_connector_id_);
- focus = cfg ? cfg->name : selected_connector_id_;
- }
- selection_status_label_->setText(focus);
+ for (const auto& [count, id] : ranked) {
+ const auto* cfg = find_connector_config(id);
+ const QString name = cfg ? cfg->name : id;
+ auto* item = new QListWidgetItem(QString("%1 (%2)").arg(name).arg(count));
+ item->setData(Qt::UserRole, id);
+ item->setForeground(QColor(col::TEXT_SECONDARY()));
+ provider_ladder_->addItem(item);
}
- if (clear_search_btn_)
- clear_search_btn_->setEnabled(search_edit_ && !search_edit_->text().trimmed().isEmpty());
+ if (ranked.isEmpty()) {
+ auto* empty = new QListWidgetItem("no connections yet");
+ empty->setForeground(QColor(col::TEXT_TERTIARY()));
+ empty->setFlags(Qt::NoItemFlags);
+ provider_ladder_->addItem(empty);
+ }
}
void DataSourcesScreen::update_detail_panel() {
- if (!detail_title_ || !field_table_ || !detail_connections_list_) return;
+ if (!detail_title_) return;
const auto* cfg = find_connector_config(selected_connector_id_);
+
if (!cfg) {
detail_symbol_->setText("--");
- detail_symbol_->setStyleSheet("");
+ detail_symbol_->setStyleSheet(
+ QString("min-width:38px;max-width:38px;min-height:38px;max-height:38px;"
+ "font-size:13px;font-weight:700;color:%1;background:%2;"
+ "border:1px solid %1;").arg(col::AMBER, col::BG_BASE));
detail_title_->setText("Select a connector");
- detail_description_->setText("Select a connector from the list to inspect its fields and manage saved connections.");
+ detail_description_->setText("Double-click any row to configure");
detail_category_value_->setText("--");
detail_transport_value_->setText("--");
detail_auth_value_->setText("--");
- detail_auth_value_->setStyleSheet("");
detail_test_value_->setText("--");
detail_fields_value_->setText("--");
detail_configured_value_->setText("--");
detail_enabled_value_->setText("--");
- if (detail_last_tested_value_) detail_last_tested_value_->setText("--");
- if (detail_last_status_value_) detail_last_status_value_->setText("--");
- field_table_->setRowCount(0);
- detail_connections_list_->clear();
- auto* empty = new QListWidgetItem("No connector selected");
- empty->setFlags(Qt::NoItemFlags);
- empty->setForeground(QColor(col::TEXT_TERTIARY()));
- detail_connections_list_->addItem(empty);
- update_action_states();
+ detail_last_status_value_->setText("--");
+ if (field_table_) field_table_->setRowCount(0);
+ if (detail_connections_list_) detail_connections_list_->clear();
+ if (new_connection_btn_) new_connection_btn_->setEnabled(false);
+ if (edit_connection_btn_) edit_connection_btn_->setEnabled(false);
+ if (test_connection_btn_) test_connection_btn_->setEnabled(false);
return;
}
+ // Identity
detail_symbol_->setText(connector_code(*cfg));
detail_symbol_->setStyleSheet(
- QString("background:%1;color:%2;border:1px solid %3;"
- "font-size:15px;font-weight:700;border-radius:6px;")
- .arg(cfg->color, col::TEXT_PRIMARY, col::BORDER_DIM));
+ QString("min-width:38px;max-width:38px;min-height:38px;max-height:38px;"
+ "font-size:13px;font-weight:700;color:%1;background:%2;border:1px solid %1;")
+ .arg(cfg->color, col::BG_BASE));
detail_title_->setText(cfg->name);
detail_description_->setText(cfg->description);
+
+ // Metadata
detail_category_value_->setText(category_label(cfg->category));
detail_transport_value_->setText(connector_transport(*cfg));
- detail_auth_value_->setText(cfg->requires_auth ? "Requires credentials" : "Open access");
+ detail_auth_value_->setText(cfg->requires_auth ? "Required" : "None");
detail_auth_value_->setStyleSheet(
- QString("color:%1;font-size:12px;font-weight:600;background:transparent;")
- .arg(cfg->requires_auth ? col::WARNING : col::POSITIVE));
+ QString("color:%1;font-size:11px;font-weight:700;background:transparent;")
+ .arg(cfg->requires_auth ? col::WARNING() : col::POSITIVE()));
detail_test_value_->setText(cfg->testable ? "Yes" : "No");
- detail_fields_value_->setText(QString::number(cfg->fields.size()));
- const int total_saved = total_connections_for_provider(connections_cache_, cfg->id);
- const int live_saved = enabled_connections_for_provider(connections_cache_, cfg->id);
- detail_configured_value_->setText(QString::number(total_saved));
- detail_enabled_value_->setText(QString("%1 / %2").arg(live_saved).arg(total_saved));
-
- // Last tested / status from live cache — use preferred connection
- const QString pref_conn = preferred_connection_for_connector(cfg->id);
- const auto it = live_status_cache_.find(pref_conn);
- if (detail_last_tested_value_) {
- detail_last_tested_value_->setText(it != live_status_cache_.end() ? "Recently" : "Never");
- }
- if (detail_last_status_value_) {
- if (it != live_status_cache_.end()) {
- detail_last_status_value_->setText(it->first ? "OK" : "Failed");
- detail_last_status_value_->setStyleSheet(
- QString("color:%1;font-size:12px;font-weight:600;background:transparent;")
- .arg(it->first ? col::POSITIVE : col::NEGATIVE));
- } else {
- detail_last_status_value_->setText("—");
- detail_last_status_value_->setStyleSheet("");
- }
+ const int total = total_connections_for_provider(connections_cache_, cfg->id);
+ const int active = enabled_connections_for_provider(connections_cache_, cfg->id);
+ detail_fields_value_->setText(QString::number(cfg->fields.size()));
+ detail_configured_value_->setText(QString::number(total));
+ detail_enabled_value_->setText(QString::number(active));
+ detail_enabled_value_->setStyleSheet(
+ QString("color:%1;font-size:11px;font-weight:700;background:transparent;")
+ .arg(active > 0 ? col::POSITIVE() : col::TEXT_TERTIARY()));
+
+ // Last test status
+ const QString conn_id = effective_detail_connection_id();
+ if (!conn_id.isEmpty() && live_status_cache_.contains(conn_id)) {
+ const bool ok = live_status_cache_[conn_id].first;
+ detail_last_status_value_->setText(ok ? "OK" : "ERR");
+ detail_last_status_value_->setStyleSheet(
+ QString("color:%1;font-size:11px;font-weight:700;background:transparent;")
+ .arg(ok ? col::POSITIVE() : col::NEGATIVE()));
+ } else {
+ detail_last_status_value_->setText("--");
+ detail_last_status_value_->setStyleSheet(
+ QString("color:%1;font-size:11px;font-weight:700;background:transparent;")
+ .arg(col::TEXT_TERTIARY()));
}
- {
- QSignalBlocker blocker(field_table_);
+ // Fields table
+ if (field_table_) {
+ QSignalBlocker fb(field_table_);
field_table_->setRowCount(cfg->fields.size());
- for (int row = 0; row < cfg->fields.size(); ++row) {
- const auto& field = cfg->fields[row];
- field_table_->setItem(row, 0, make_item(field.label, TEXT_PRIMARY));
- field_table_->setItem(row, 1, make_item(field_type_label(field.type), TEXT_SECONDARY, Qt::AlignCenter));
- field_table_->setItem(row, 2, make_item(field.required ? "Req" : "Opt",
- field.required ? COLOR_WARNING : TEXT_TERTIARY, Qt::AlignCenter));
- QString preview = !field.default_value.isEmpty() ? field.default_value : field.placeholder;
- if (field.type == FieldType::Password && !preview.isEmpty())
- preview = "<secret>";
- field_table_->setItem(row, 3, make_item(compact_value(preview), TEXT_TERTIARY));
- field_table_->setRowHeight(row, 26);
+ for (int i = 0; i < cfg->fields.size(); ++i) {
+ const auto& f = cfg->fields[i];
+ field_table_->setItem(i, 0, make_item(f.label));
+ field_table_->setItem(i, 1,
+ make_item(field_type_label(f.type), QColor(col::TEXT_SECONDARY()), Qt::AlignCenter));
+ field_table_->setItem(i, 2,
+ make_item(f.required ? "Y" : "N",
+ f.required ? QColor(col::WARNING()) : QColor(col::TEXT_TERTIARY()),
+ Qt::AlignCenter));
}
+ // Shrink to content (max 120px = ~5 rows)
+ const int row_h = 24;
+ const int hdr_h = 24;
+ field_table_->setFixedHeight(
+ std::min(hdr_h + static_cast<int>(cfg->fields.size()) * row_h, 120));
}
- QVector<DataSource> connector_connections;
- for (const auto& ds : connections_cache_)
- if (connection_matches_connector(ds, cfg->id))
- connector_connections.append(ds);
-
- std::sort(connector_connections.begin(), connector_connections.end(),
- [](const DataSource& a, const DataSource& b) { return a.updated_at > b.updated_at; });
-
- QSignalBlocker blocker(detail_connections_list_);
- detail_connections_list_->clear();
-
- if (connector_connections.isEmpty()) {
- auto* empty = new QListWidgetItem("No saved connections");
- empty->setFlags(Qt::NoItemFlags);
- empty->setForeground(QColor(col::TEXT_TERTIARY()));
- detail_connections_list_->addItem(empty);
- } else {
- bool current_set = false;
- for (const auto& ds : connector_connections) {
- const QString text = QString("%1 %2")
- .arg(ds.enabled ? "[Live]" : "[Standby]", ds.display_name);
- auto* item = new QListWidgetItem(text);
+ // Saved connections list
+ if (detail_connections_list_) {
+ QSignalBlocker lb(detail_connections_list_);
+ detail_connections_list_->clear();
+ for (const auto& ds : connections_cache_) {
+ if (!connection_matches_connector(ds, cfg->id)) continue;
+ const QString status_str = ds.enabled ? "ACTIVE" : "OFF";
+ const QString label = QString("%1 [%2]").arg(ds.display_name).arg(status_str);
+ auto* item = new QListWidgetItem(label);
item->setData(Qt::UserRole, ds.id);
- item->setToolTip(ds.description);
- item->setForeground(ds.enabled ? QColor(col::POSITIVE()) : QColor(col::TEXT_SECONDARY()));
+ item->setForeground(ds.enabled ? QColor(col::TEXT_PRIMARY()) : QColor(col::TEXT_SECONDARY()));
detail_connections_list_->addItem(item);
if (ds.id == selected_connection_id_) {
detail_connections_list_->setCurrentItem(item);
- current_set = true;
}
}
- if (!current_set && detail_connections_list_->count() > 0)
- detail_connections_list_->setCurrentRow(0);
+ if (detail_connections_list_->count() == 0) {
+ auto* empty = new QListWidgetItem("No connections configured");
+ empty->setForeground(QColor(col::TEXT_TERTIARY()));
+ empty->setFlags(Qt::NoItemFlags);
+ detail_connections_list_->addItem(empty);
+ }
}
update_action_states();
}
void DataSourcesScreen::update_action_states() {
- const bool has_connector = !selected_connector_id_.isEmpty();
- const bool has_connection = !effective_detail_connection_id().isEmpty();
- if (new_connection_btn_) new_connection_btn_->setEnabled(has_connector);
- if (edit_connection_btn_) edit_connection_btn_->setEnabled(has_connection);
- if (test_connection_btn_) test_connection_btn_->setEnabled(has_connection);
+ const bool has_connector = !selected_connector_id_.isEmpty();
+ const QString conn_id = effective_detail_connection_id();
+ const bool has_conn = !conn_id.isEmpty();
+
+ if (new_connection_btn_) new_connection_btn_->setEnabled(has_connector);
+ if (edit_connection_btn_) edit_connection_btn_->setEnabled(has_conn);
+ if (test_connection_btn_) test_connection_btn_->setEnabled(has_conn);
}
+// ─────────────────────────────────────────────────────────────────────────────
+// Helpers
+// ─────────────────────────────────────────────────────────────────────────────
+
QString DataSourcesScreen::effective_detail_connection_id() const {
- if (!selected_connection_id_.isEmpty()) {
- for (const auto& ds : connections_cache_)
- if (ds.id == selected_connection_id_ && connection_matches_connector(ds, selected_connector_id_))
- return ds.id;
- }
- QString first_match;
- for (const auto& ds : connections_cache_) {
- if (!connection_matches_connector(ds, selected_connector_id_)) continue;
- if (ds.enabled) return ds.id;
- if (first_match.isEmpty()) first_match = ds.id;
- }
- return first_match;
+ if (!selected_connection_id_.isEmpty()) return selected_connection_id_;
+ return preferred_connection_for_connector(selected_connector_id_);
}
QString DataSourcesScreen::preferred_connection_for_connector(const QString& connector_id) const {
- if (connector_id.isEmpty()) return {};
- if (!selected_connection_id_.isEmpty()) {
- for (const auto& ds : connections_cache_)
- if (ds.id == selected_connection_id_ && connection_matches_connector(ds, connector_id))
- return ds.id;
- }
QString first_match;
for (const auto& ds : connections_cache_) {
if (!connection_matches_connector(ds, connector_id)) continue;
@@ -1916,7 +1905,9 @@ void DataSourcesScreen::select_connector_by_id(const QString& connector_id) {
}
}
-// ── Slots ─────────────────────────────────────────────────────────────────────
+// ─────────────────────────────────────────────────────────────────────────────
+// Slots
+// ─────────────────────────────────────────────────────────────────────────────
void DataSourcesScreen::on_category_filter(int idx) {
show_all_categories_ = (idx == 0);
@@ -1986,16 +1977,20 @@ void DataSourcesScreen::on_connection_enabled_changed(const QString& conn_id, bo
refresh_connections();
}
-// ── Known base-URL map for API-key-only providers ─────────────────────────
-// Returns a URL that can be hit to verify the endpoint is reachable.
-// For authenticated providers we use an endpoint that returns 200/401/403
-// (any of those means the server is up and the key was at least transmitted).
+// ── Provider probe URLs ───────────────────────────────────────────────────────
+
+// Returns a URL whose host:port we TCP-probe to verify reachability.
+// For connectors that have no URL at all we return {} — the host+port fallback
+// in on_connection_test() will pick up host/port fields directly.
+// Connectors with testable=false never reach this function.
static QString provider_probe_url(const QString& provider_id, const QJsonObject& cfg) {
- // Market data — simple ping / time / status endpoints (no side effects)
- if (provider_id == "yahoo-finance") return "https://query1.finance.yahoo.com/v8/finance/spark?symbols=AAPL&range=1d&interval=1d";
+ // ── Market data ───────────────────────────────────────────────────────────
+ if (provider_id == "yahoo-finance")
+ return "https://query1.finance.yahoo.com/v8/finance/spark?symbols=AAPL&range=1d&interval=1d";
if (provider_id == "alpha-vantage") {
const QString key = cfg.value("apiKey").toString().trimmed();
- return QString("https://www.alphavantage.co/query?function=TIME_SERIES_INTRADAY&symbol=IBM&interval=5min&apikey=%1").arg(key.isEmpty() ? "demo" : key);
+ return QString("https://www.alphavantage.co/query?function=TIME_SERIES_INTRADAY"
+ "&symbol=IBM&interval=5min&apikey=%1").arg(key.isEmpty() ? "demo" : key);
}
if (provider_id == "finnhub") {
const QString key = cfg.value("apiKey").toString().trimmed();
@@ -2004,8 +1999,8 @@ static QString provider_probe_url(const QString& provider_id, const QJsonObject&
if (provider_id == "iex-cloud") {
const QString token = cfg.value("token").toString().trimmed();
const bool sandbox = cfg.value("sandbox").toBool();
- const QString host = sandbox ? "https://sandbox.iexapis.com" : "https://cloud.iexapis.com";
- return QString("%1/stable/stock/AAPL/quote?token=%2").arg(host, token);
+ const QString base = sandbox ? "https://sandbox.iexapis.com" : "https://cloud.iexapis.com";
+ return QString("%1/stable/stock/AAPL/quote?token=%2").arg(base, token);
}
if (provider_id == "twelve-data") {
const QString key = cfg.value("apiKey").toString().trimmed();
@@ -2015,14 +2010,36 @@ static QString provider_probe_url(const QString& provider_id, const QJsonObject&
const QString key = cfg.value("apiKey").toString().trimmed();
return QString("https://data.nasdaq.com/api/v3/datasets/WIKI/AAPL.json?rows=1&api_key=%1").arg(key);
}
- if (provider_id == "binance") return "https://api.binance.com/api/v3/ping";
- if (provider_id == "coinbase") return "https://api.coinbase.com/v2/time";
- if (provider_id == "kraken") return "https://api.kraken.com/0/public/Time";
+ if (provider_id == "polygon-io")
+ return "https://api.polygon.io/v2/aggs/ticker/AAPL/range/1/day/2023-01-09/2023-01-09";
+ if (provider_id == "factset")
+ return "https://api.factset.com/health/alive";
+ if (provider_id == "refinitiv")
+ return "https://api.refinitiv.com/";
+ if (provider_id == "pitchbook")
+ return "https://api.pitchbook.com/";
+ if (provider_id == "nasdaq-totalview")
+ return "https://api.nasdaq.com/api/quote/AAPL/info?assetClass=stocks";
+ if (provider_id == "fincept") {
+ // host+port handled by TCP fallback — no HTTP probe
+ return {};
+ }
+
+ // ── Crypto ────────────────────────────────────────────────────────────────
+ if (provider_id == "binance")
+ return "https://api.binance.com/api/v3/ping";
+ if (provider_id == "coinbase")
+ return "https://api.coinbase.com/v2/time";
+ if (provider_id == "kraken")
+ return "https://api.kraken.com/0/public/Time";
if (provider_id == "coinmarketcap") {
const QString key = cfg.value("apiKey").toString().trimmed();
return QString("https://pro-api.coinmarketcap.com/v1/cryptocurrency/listings/latest?limit=1&CMC_PRO_API_KEY=%1").arg(key);
}
- if (provider_id == "coingecko") return "https://api.coingecko.com/api/v3/ping";
+ if (provider_id == "coingecko")
+ return "https://api.coingecko.com/api/v3/ping";
+
+ // ── EOD / Tiingo / Intrinio ───────────────────────────────────────────────
if (provider_id == "eod-historical") {
const QString token = cfg.value("apiToken").toString().trimmed();
return QString("https://eodhd.com/api/eod/AAPL.US?api_token=%1&fmt=json&limit=1").arg(token);
@@ -2035,15 +2052,17 @@ static QString provider_probe_url(const QString& provider_id, const QJsonObject&
const QString key = cfg.value("apiKey").toString().trimmed();
return QString("https://api-v2.intrinio.com/securities/AAPL?api_key=%1").arg(key);
}
+
+ // ── Reuters / Refinitiv (legacy) ──────────────────────────────────────────
if (provider_id == "reuters") {
const QString appKey = cfg.value("appKey").toString().trimmed();
return QString("https://api.refinitiv.com/user-framework/machine-id/v1/health?appKey=%1").arg(appKey);
}
if (provider_id == "marketstack") {
const QString key = cfg.value("apiKey").toString().trimmed();
- const bool https = cfg.value("https").toBool();
- const QString scheme = https ? "https" : "http";
- return QString("%1://api.marketstack.com/v1/tickers/AAPL?access_key=%2").arg(scheme, key);
+ const bool use_https = cfg.value("https").toBool();
+ return QString("%1://api.marketstack.com/v1/tickers/AAPL?access_key=%2")
+ .arg(use_https ? "https" : "http", key);
}
if (provider_id == "finage") {
const QString key = cfg.value("apiKey").toString().trimmed();
@@ -2054,69 +2073,204 @@ static QString provider_probe_url(const QString& provider_id, const QJsonObject&
return sandbox ? "https://sandbox.tradier.com/v1/markets/clock"
: "https://api.tradier.com/v1/markets/clock";
}
- // Search & Analytics
+
+ // ── Alternative data ─────────────────────────────────────────────────────
+ if (provider_id == "ravenpack")
+ return "https://api.ravenpack.com/user-text";
+ if (provider_id == "bloomberg-second-measure")
+ return "https://app.secondmeasure.com/";
+ if (provider_id == "safegraph")
+ return "https://api.safegraph.com/v1/healthcheck";
+ if (provider_id == "orbital-insight")
+ return "https://api.orbitalinsight.com/";
+ if (provider_id == "refinitiv-tick-history")
+ return "https://selectapi.datascope.refinitiv.com/RestApi/v1/Authentication/RequestToken";
+ if (provider_id == "earnest-research")
+ return "https://api.earnestresearch.com/";
+ if (provider_id == "thinknum")
+ return "https://data.thinknum.com/";
+ if (provider_id == "revelio-labs")
+ return "https://api.reveliolabs.com/";
+
+ // ── Open banking ─────────────────────────────────────────────────────────
+ if (provider_id == "plaid")
+ return "https://production.plaid.com/";
+ if (provider_id == "mx")
+ return "https://int-api.mx.com/";
+ if (provider_id == "finicity")
+ return "https://api.finicity.com/";
+ if (provider_id == "truelayer")
+ return "https://auth.truelayer.com/";
+ if (provider_id == "fdx-api") {
+ const QString base = cfg.value("baseUrl").toString().trimmed();
+ if (!base.isEmpty()) return base;
+ return "https://api.financial-data-exchange.org/";
+ }
+
+ // ── Generic protocol connectors ───────────────────────────────────────────
+ // REST API: probe baseUrl directly (any non-refused response = reachable)
+ if (provider_id == "rest-api") {
+ const QString base = cfg.value("baseUrl").toString().trimmed();
+ if (!base.isEmpty()) return base;
+ return {};
+ }
+ // GraphQL: probe the endpoint (TCP connect suffices; POST introspection would need QNetworkAccessManager)
+ if (provider_id == "graphql") {
+ const QString ep = cfg.value("endpoint").toString().trimmed();
+ if (!ep.isEmpty()) return ep;
+ return {};
+ }
+ // WebSocket: extract host:port from ws:// or wss:// URL for TCP probe
+ if (provider_id == "websocket") {
+ const QString url = cfg.value("url").toString().trimmed();
+ if (!url.isEmpty()) return url; // QUrl parser in test code handles ws/wss → port 80/443
+ return {};
+ }
+ // gRPC: host+port TCP probe handled by fallback (host/port fields present)
+ // rabbitmq: host+port TCP fallback handles it
+ // fix-protocol: host+port TCP fallback handles it
+ // SOAP: probe WSDL URL
+ if (provider_id == "soap") {
+ const QString wsdl = cfg.value("wsdlUrl").toString().trimmed();
+ if (!wsdl.isEmpty()) return wsdl;
+ return {};
+ }
+ // OData: probe mandatory $metadata endpoint
+ if (provider_id == "odata") {
+ const QString root = cfg.value("serviceRoot").toString().trimmed();
+ if (!root.isEmpty())
+ return (root.endsWith('/') ? root : root + "/") + "$metadata";
+ return {};
+ }
+ // MQTT: broker field is host, port field is port — TCP fallback via host+port handles it
+ // Kafka: brokers field "host:port" handled by brokers fallback in on_connection_test
+ // NATS: servers field "nats://host:port" handled by servers fallback in on_connection_test
+ // Redpanda: same as Kafka — brokers fallback
+ // Apache Flink: probe /overview REST endpoint
+ if (provider_id == "apache-flink") {
+ const QString jm = cfg.value("jobManagerUrl").toString().trimmed();
+ if (!jm.isEmpty())
+ return (jm.endsWith('/') ? jm : jm + "/") + "overview";
+ return "http://localhost:8081/overview";
+ }
+ // Apache Iceberg REST catalog: probe /v1/config
+ if (provider_id == "apache-iceberg") {
+ const QString catalog = cfg.value("catalog").toString().trimmed().toLower();
+ const QString uri = cfg.value("catalogUri").toString().trimmed();
+ if (catalog == "rest" && !uri.isEmpty())
+ return (uri.endsWith('/') ? uri : uri + "/") + "v1/config";
+ return {}; // non-REST catalogs (Hive, Glue, JDBC) have no HTTP endpoint
+ }
+
+ // ── Streaming / messaging (host+port via TCP fallback) ────────────────────
+ // rabbitmq, fix-protocol: host+port fields → TCP fallback handles them
+ // No probe URL needed here.
+
+ // ── Cloud storage (no URL-based health endpoints — TCP to S3/GCS/Azure) ──
+ if (provider_id == "aws-s3")
+ return "https://s3.amazonaws.com/";
+ if (provider_id == "google-cloud-storage")
+ return "https://storage.googleapis.com/";
+ if (provider_id == "azure-blob")
+ return "https://blob.core.windows.net/";
+ if (provider_id == "digitalocean-spaces")
+ return "https://nyc3.digitaloceanspaces.com/";
+ if (provider_id == "backblaze-b2")
+ return "https://api.backblazeb2.com/b2api/v2/b2_authorize_account";
+ if (provider_id == "wasabi")
+ return "https://s3.wasabisys.com/";
+ if (provider_id == "cloudflare-r2")
+ return "https://api.cloudflare.com/client/v4/user/tokens/verify";
+ if (provider_id == "oracle-cloud-storage")
+ return "https://objectstorage.us-ashburn-1.oraclecloud.com/";
+ if (provider_id == "minio") {
+ const QString ep = cfg.value("endpoint").toString().trimmed();
+ if (!ep.isEmpty())
+ return (ep.startsWith("http") ? ep : "http://" + ep) + "/minio/health/live";
+ return {};
+ }
+ if (provider_id == "ibm-cloud-storage") {
+ const QString ep = cfg.value("endpoint").toString().trimmed();
+ if (!ep.isEmpty()) return ep;
+ return "https://s3.us.cloud-object-storage.appdomain.cloud/";
+ }
+
+ // ── Search & analytics ────────────────────────────────────────────────────
if (provider_id == "elasticsearch") {
- QString node = cfg.value("node").toString().trimmed();
- if (!node.isEmpty()) return node.endsWith('/') ? node + "_cluster/health" : node + "/_cluster/health";
+ const QString node = cfg.value("node").toString().trimmed();
+ if (!node.isEmpty())
+ return (node.endsWith('/') ? node : node + "/") + "_cluster/health";
+ return {};
}
if (provider_id == "opensearch") {
- QString node = cfg.value("node").toString().trimmed();
- if (!node.isEmpty()) return node.endsWith('/') ? node + "_cluster/health" : node + "/_cluster/health";
+ const QString node = cfg.value("node").toString().trimmed();
+ if (!node.isEmpty())
+ return (node.endsWith('/') ? node : node + "/") + "_cluster/health";
+ return {};
}
if (provider_id == "solr") {
const QString host = cfg.value("host").toString().trimmed();
- if (!host.isEmpty()) return (host.startsWith("http") ? host : "http://" + host) + "/solr/admin/info/system";
+ if (!host.isEmpty())
+ return (host.startsWith("http") ? host : "http://" + host) + "/solr/admin/info/system";
+ return {};
}
if (provider_id == "meilisearch") {
const QString host = cfg.value("host").toString().trimmed();
- if (!host.isEmpty()) return (host.startsWith("http") ? host : "http://" + host) + "/health";
+ if (!host.isEmpty())
+ return (host.startsWith("http") ? host : "http://" + host) + "/health";
+ return {};
}
- // Time series
+ if (provider_id == "algolia") {
+ const QString appId = cfg.value("appId").toString().trimmed();
+ if (!appId.isEmpty())
+ return QString("https://%1-dsn.algolia.net/1/isalive").arg(appId);
+ return {};
+ }
+
+ // ── Time series ───────────────────────────────────────────────────────────
if (provider_id == "influxdb") {
const QString url = cfg.value("url").toString().trimmed();
- if (!url.isEmpty()) return url + (url.endsWith('/') ? "health" : "/health");
+ if (!url.isEmpty())
+ return (url.endsWith('/') ? url : url + "/") + "health";
+ return {};
}
if (provider_id == "prometheus") {
const QString url = cfg.value("url").toString().trimmed();
- if (!url.isEmpty()) return url + (url.endsWith('/') ? "-/healthy" : "/-/healthy");
+ if (!url.isEmpty())
+ return (url.endsWith('/') ? url : url + "/") + "-/healthy";
+ return {};
}
if (provider_id == "victoriametrics") {
const QString url = cfg.value("url").toString().trimmed();
- if (!url.isEmpty()) return url + (url.endsWith('/') ? "health" : "/health");
+ if (!url.isEmpty())
+ return (url.endsWith('/') ? url : url + "/") + "health";
+ return {};
}
if (provider_id == "opentsdb") {
const QString url = cfg.value("url").toString().trimmed();
- if (!url.isEmpty()) return url + (url.endsWith('/') ? "api/version" : "/api/version");
- }
- // Cloud storage
- if (provider_id == "minio") {
- const QString ep = cfg.value("endpoint").toString().trimmed();
- if (!ep.isEmpty()) return ep.startsWith("http") ? ep + "/minio/health/live" : "http://" + ep + "/minio/health/live";
- }
- if (provider_id == "ibm-cloud-storage") {
- const QString ep = cfg.value("endpoint").toString().trimmed();
- if (!ep.isEmpty()) return ep; // TCP-probe the endpoint host
- }
- // Search
- if (provider_id == "algolia") {
- const QString appId = cfg.value("appId").toString().trimmed();
- if (!appId.isEmpty())
- return QString("https://%1-dsn.algolia.net/1/isalive").arg(appId);
+ if (!url.isEmpty())
+ return (url.endsWith('/') ? url : url + "/") + "api/version";
+ return {};
}
- // Data warehouses
+ // questdb, timescaledb, kdb, clickhouse: host+port TCP fallback
+
+ // ── Data warehouses ───────────────────────────────────────────────────────
+ if (provider_id == "bigquery")
+ return "https://bigquery.googleapis.com/";
+ if (provider_id == "firestore")
+ return "https://firestore.googleapis.com/";
if (provider_id == "databricks") {
- const QString host = cfg.value("serverHostname").toString().trimmed();
- if (!host.isEmpty()) return QString("https://%1/api/2.0/clusters/list").arg(host);
- }
- if (provider_id == "bigquery") return "https://bigquery.googleapis.com/";
- if (provider_id == "redshift") {
- // Redshift is Postgres-compatible — TCP probe handled by host+port fallback
+ const QString h = cfg.value("serverHostname").toString().trimmed();
+ if (!h.isEmpty()) return QString("https://%1/api/2.0/clusters/list").arg(h);
return {};
}
if (provider_id == "synapse") {
const QString server = cfg.value("server").toString().trimmed();
if (!server.isEmpty()) return QString("https://%1").arg(server);
+ return {};
}
+ // redshift, snowflake: host+port TCP fallback
+
return {};
}
@@ -2128,7 +2282,6 @@ void DataSourcesScreen::on_connection_test(const QString& conn_id) {
const auto cfg_doc = QJsonDocument::fromJson(ds.config.toUtf8());
const auto cfg_obj = cfg_doc.object();
- // Check testable flag
const auto* connector_cfg = find_connector_config(ds.provider);
if (connector_cfg && !connector_cfg->testable) {
QDialog result_dlg(this);
@@ -2136,10 +2289,10 @@ void DataSourcesScreen::on_connection_test(const QString& conn_id) {
result_dlg.resize(420, 160);
result_dlg.setModal(true);
result_dlg.setStyleSheet(
- "QDialog{background:#0a0a0a;color:#e5e5e5;}"
+ "QDialog{background:#0a0a0a;color:#e5e5e5;font-family:'Consolas','Courier New',monospace;}"
"QLabel{font-size:13px;background:transparent;}"
"QPushButton{background:#111111;color:#e5e5e5;border:1px solid #1a1a1a;"
- "padding:6px 18px;font-size:12px;font-weight:700;border-radius:4px;}"
+ "padding:6px 18px;font-size:12px;font-weight:700;}"
"QPushButton:hover{background:#1a1a1a;}");
auto* vl = new QVBoxLayout(&result_dlg);
vl->setContentsMargins(24, 20, 24, 16); vl->setSpacing(10);
@@ -2160,8 +2313,6 @@ void DataSourcesScreen::on_connection_test(const QString& conn_id) {
const QString display = ds.display_name;
const QString provider = ds.provider;
- // Resolve what to test
- // Priority: 1) known probe URL per provider, 2) explicit url/endpoint field, 3) host+port TCP
const QString probe_url = provider_probe_url(provider, cfg_obj);
QString explicit_url;
@@ -2175,13 +2326,10 @@ void DataSourcesScreen::on_connection_test(const QString& conn_id) {
const QString test_url = probe_url.isEmpty() ? explicit_url : probe_url;
- // Resolve host/port for TCP fallback.
- // Handles both plain "host" fields and compound/URL fields from various connector types.
QString host = cfg_obj.value("host").toString().trimmed();
int port = cfg_obj.value("port").toVariant().toInt();
if (port <= 0) port = cfg_obj.value("port").toString().trimmed().toInt();
- // Kafka: "brokers" = "host1:port1,host2:port2"
if (host.isEmpty()) {
const QString brokers = cfg_obj.value("brokers").toString().trimmed();
if (!brokers.isEmpty()) {
@@ -2191,7 +2339,6 @@ void DataSourcesScreen::on_connection_test(const QString& conn_id) {
else { host = first; }
}
}
- // NATS / Memcached: "servers" or "hosts" = "nats://host:port" or "host:port"
if (host.isEmpty()) {
for (const auto& key : {"servers", "hosts"}) {
const QString val = cfg_obj.value(key).toString().trimmed();
@@ -2202,7 +2349,6 @@ void DataSourcesScreen::on_connection_test(const QString& conn_id) {
host = u.host();
if (port <= 0) port = u.port();
} else {
- // plain "host:port" without scheme
const int idx = first.lastIndexOf(':');
if (idx > 0) { host = first.left(idx); port = first.mid(idx + 1).toInt(); }
else { host = first; }
@@ -2210,7 +2356,6 @@ void DataSourcesScreen::on_connection_test(const QString& conn_id) {
if (!host.isEmpty()) break;
}
}
- // MongoDB: "connectionString" = "mongodb://host:port"
if (host.isEmpty()) {
const QString cs = cfg_obj.value("connectionString").toString().trimmed();
if (!cs.isEmpty()) {
@@ -2221,7 +2366,6 @@ void DataSourcesScreen::on_connection_test(const QString& conn_id) {
}
}
}
- // Neo4j: "uri" = "bolt://host:port"
if (host.isEmpty()) {
const QString uri = cfg_obj.value("uri").toString().trimmed();
if (!uri.isEmpty()) {
@@ -2232,7 +2376,6 @@ void DataSourcesScreen::on_connection_test(const QString& conn_id) {
}
}
}
- // Cassandra / ScyllaDB: "contactPoints" = "host1,host2"
if (host.isEmpty()) {
const QString cp = cfg_obj.value("contactPoints").toString().trimmed();
if (!cp.isEmpty()) {
@@ -2241,10 +2384,9 @@ void DataSourcesScreen::on_connection_test(const QString& conn_id) {
if (idx > 0) { host = first.left(idx); port = first.mid(idx + 1).toInt(); }
else { host = first; }
if (port <= 0) port = cfg_obj.value("port").toVariant().toInt();
- if (port <= 0) port = 9042; // Cassandra default
+ if (port <= 0) port = 9042;
}
}
- // HBase: "zkQuorum" = "host:port"
if (host.isEmpty()) {
const QString zk = cfg_obj.value("zkQuorum").toString().trimmed();
if (!zk.isEmpty()) {
@@ -2254,34 +2396,33 @@ void DataSourcesScreen::on_connection_test(const QString& conn_id) {
else { host = first; port = 2181; }
}
}
- // Databricks / Synapse / others: "serverHostname" or "server"
if (host.isEmpty()) {
for (const auto& key : {"serverHostname", "server", "account"}) {
const QString val = cfg_obj.value(key).toString().trimmed();
if (!val.isEmpty()) { host = val; break; }
}
}
- // For URL-based hosts (Elasticsearch node, InfluxDB url, CouchDB url etc.)
- // extract host+port for TCP fallback
if (host.isEmpty() && !test_url.isEmpty()) {
const QUrl u(test_url);
if (u.isValid() && !u.host().isEmpty()) {
host = u.host();
- if (port <= 0) port = u.port(u.scheme() == "https" ? 443 : 80);
+ if (port <= 0) {
+ const QString s = u.scheme().toLower();
+ port = u.port((s == "https" || s == "wss") ? 443 : 80);
+ }
}
}
if (test_url.isEmpty() && (host.isEmpty() || port <= 0)) {
- // Nothing to test — show informational dialog on main thread immediately
QDialog result_dlg(this);
result_dlg.setWindowTitle(QString("Test: %1").arg(display));
result_dlg.resize(420, 160);
result_dlg.setModal(true);
result_dlg.setStyleSheet(
- "QDialog{background:#0a0a0a;color:#e5e5e5;}"
+ "QDialog{background:#0a0a0a;color:#e5e5e5;font-family:'Consolas','Courier New',monospace;}"
"QLabel{font-size:13px;background:transparent;}"
"QPushButton{background:#111111;color:#e5e5e5;border:1px solid #1a1a1a;"
- "padding:6px 18px;font-size:12px;font-weight:700;border-radius:4px;}"
+ "padding:6px 18px;font-size:12px;font-weight:700;}"
"QPushButton:hover{background:#1a1a1a;}");
auto* vl = new QVBoxLayout(&result_dlg);
vl->setContentsMargins(24, 20, 24, 16); vl->setSpacing(10);
@@ -2299,11 +2440,6 @@ void DataSourcesScreen::on_connection_test(const QString& conn_id) {
return;
}
- // Run connectivity test on a worker thread.
- // IMPORTANT: QNetworkAccessManager must NOT be used on a non-main thread without its own
- // event loop. We use only QTcpSocket (blocking, safe on worker threads) here. For HTTP
- // we open a raw TCP connection to the resolved host:port — this validates network reachability
- // without touching QNetworkAccessManager off-thread.
const QString captured_test_url = test_url;
const QString captured_host = host;
const int captured_port = port;
@@ -2323,16 +2459,16 @@ void DataSourcesScreen::on_connection_test(const QString& conn_id) {
};
if (!captured_test_url.isEmpty()) {
- // Derive host/port from the URL and do a TCP probe — avoids QNetworkAccessManager off-thread
const QUrl url(captured_test_url);
if (!url.isValid() || url.host().isEmpty()) {
message = QString("Invalid URL: %1").arg(captured_test_url);
} else {
const QString url_host = url.host();
- const int url_port = url.port(url.scheme() == "https" ? 443 : 80);
+ const QString scheme = url.scheme().toLower();
+ const int default_port = (scheme == "https" || scheme == "wss") ? 443 : 80;
+ const int url_port = url.port(default_port);
auto [ok, msg] = tcp_probe(url_host, url_port, 5000);
success = ok;
- // Give a more meaningful message: distinguish reachable-but-auth-required from unreachable
message = ok ? QString("Endpoint reachable: %1").arg(captured_test_url) : msg;
}
} else if (!captured_host.isEmpty() && captured_port > 0) {
@@ -2344,7 +2480,6 @@ void DataSourcesScreen::on_connection_test(const QString& conn_id) {
QMetaObject::invokeMethod(qApp, [self, conn_id, display, success, message]() {
if (!self) return;
LOG_INFO(TAG, QString("Test %1: %2 — %3").arg(display, success ? "OK" : "FAIL", message));
- // Update live cache and refresh status cell in-place
self->live_status_cache_[conn_id] = {success, message};
self->update_connection_status_cell(conn_id, success, message);
self->update_detail_panel();
@@ -2354,10 +2489,10 @@ void DataSourcesScreen::on_connection_test(const QString& conn_id) {
result_dlg.resize(440, 190);
result_dlg.setModal(true);
result_dlg.setStyleSheet(
- "QDialog{background:#0a0a0a;color:#e5e5e5;}"
+ "QDialog{background:#0a0a0a;color:#e5e5e5;font-family:'Consolas','Courier New',monospace;}"
"QLabel{font-size:13px;background:transparent;}"
"QPushButton{background:#111111;color:#e5e5e5;border:1px solid #1a1a1a;"
- "padding:6px 18px;font-size:12px;font-weight:700;border-radius:4px;}"
+ "padding:6px 18px;font-size:12px;font-weight:700;}"
"QPushButton:hover{background:#1a1a1a;}");
auto* vl = new QVBoxLayout(&result_dlg);
@@ -2445,13 +2580,10 @@ void DataSourcesScreen::on_detail_connection_activated(QListWidgetItem* item) {
update_action_states();
}
-// ── filtered_connection_rows — applies conn_search + stat_filter ──────────────
-
QVector<DataSource> DataSourcesScreen::filtered_connection_rows() const {
const QString filter = conn_search_text_.trimmed().toLower();
QVector<DataSource> result;
for (const auto& ds : connections_cache_) {
- // stat_filter: 1=configured(any), 2=active, 3=auth-required connector
if (stat_filter_ == 2 && !ds.enabled) continue;
if (stat_filter_ == 3) {
const auto* cfg = find_connector_config(ds.provider);
@@ -2467,8 +2599,6 @@ QVector<DataSource> DataSourcesScreen::filtered_connection_rows() const {
return result;
}
-// ── update_connection_status_cell — update Live column in-place ───────────────
-
void DataSourcesScreen::update_connection_status_cell(const QString& conn_id, bool ok, const QString& msg) {
if (!connections_table_) return;
for (int row = 0; row < connections_table_->rowCount(); ++row) {
@@ -2478,70 +2608,38 @@ void DataSourcesScreen::update_connection_status_cell(const QString& conn_id, bo
if (lbl) {
lbl->setText(ok ? "OK" : "ERR");
lbl->setStyleSheet(
- QString("color:%1;font-size:14px;font-weight:700;background:transparent;")
- .arg(ok ? col::POSITIVE : col::NEGATIVE));
+ QString("color:%1;font-size:11px;font-weight:700;background:transparent;")
+ .arg(ok ? col::POSITIVE() : col::NEGATIVE()));
lbl->setToolTip(msg);
}
break;
}
}
-// ── on_view_mode_toggle ───────────────────────────────────────────────────────
-
void DataSourcesScreen::on_view_mode_toggle() {
+ // Legacy — now handled by tab bar
view_mode_ = (view_mode_ == ViewMode::Gallery) ? ViewMode::Connections : ViewMode::Gallery;
- const bool gallery = (view_mode_ == ViewMode::Gallery);
-
- if (view_mode_btn_) {
- view_mode_btn_->setText(gallery ? "Gallery" : "Connections");
- view_mode_btn_->setProperty("active", gallery);
- view_mode_btn_->style()->unpolish(view_mode_btn_);
- view_mode_btn_->style()->polish(view_mode_btn_);
- }
-
- auto* main_splitter = findChild<QSplitter*>("dsMainSplitter");
- auto* work_splitter = findChild<QSplitter*>("dsWorkspaceSplitter");
-
- if (gallery) {
- // Gallery: show full connector browser + inspector, hide connections table
- if (work_splitter) work_splitter->setVisible(true);
- if (main_splitter) {
- // Restore normal split — workspace takes all space, connections panel hidden
- main_splitter->setSizes({10000, 0});
- }
- } else {
- // Connections: hide the top browser entirely, give full height to connections table
- if (work_splitter) work_splitter->setVisible(false);
- if (main_splitter) {
- main_splitter->setSizes({0, 10000});
- }
- }
+ if (page_stack_)
+ page_stack_->setCurrentIndex(view_mode_ == ViewMode::Gallery ? 0 : 1);
}
-// ── on_connections_search_changed ────────────────────────────────────────────
-
void DataSourcesScreen::on_connections_search_changed(const QString& text) {
conn_search_text_ = text;
build_connections_table();
update_stats_strip();
}
-// ── on_stat_box_clicked ───────────────────────────────────────────────────────
-
void DataSourcesScreen::on_stat_box_clicked(int stat_index) {
apply_stat_filter(stat_index);
}
void DataSourcesScreen::apply_stat_filter(int stat_index) {
- // Toggle: clicking the active filter clears it
stat_filter_ = (stat_filter_ == stat_index) ? -1 : stat_index;
build_connector_table();
build_connections_table();
update_stats_strip();
}
-// ── on_connection_duplicate ───────────────────────────────────────────────────
-
void DataSourcesScreen::on_connection_duplicate(const QString& conn_id) {
const auto result = DataSourceRepository::instance().get(conn_id);
if (result.is_err()) return;
@@ -2552,8 +2650,6 @@ void DataSourcesScreen::on_connection_duplicate(const QString& conn_id) {
}
}
-// ── on_bulk_enable_all ────────────────────────────────────────────────────────
-
void DataSourcesScreen::on_bulk_enable_all() {
const auto rows = filtered_connection_rows();
for (const auto& ds : rows) {
@@ -2564,8 +2660,6 @@ void DataSourcesScreen::on_bulk_enable_all() {
LOG_INFO(TAG, QString("Bulk-enabled %1 connections").arg(rows.size()));
}
-// ── on_bulk_disable_all ───────────────────────────────────────────────────────
-
void DataSourcesScreen::on_bulk_disable_all() {
const auto rows = filtered_connection_rows();
for (const auto& ds : rows) {
@@ -2576,12 +2670,9 @@ void DataSourcesScreen::on_bulk_disable_all() {
LOG_INFO(TAG, QString("Bulk-disabled %1 connections").arg(rows.size()));
}
-// ── on_bulk_delete_selected ───────────────────────────────────────────────────
-
void DataSourcesScreen::on_bulk_delete_selected() {
if (!connections_table_) return;
- // Collect selected connection IDs
QSet<QString> selected_ids;
const auto selected_items = connections_table_->selectedItems();
for (auto* item : selected_items) {
@@ -2590,7 +2681,6 @@ void DataSourcesScreen::on_bulk_delete_selected() {
}
if (selected_ids.isEmpty()) return;
- // Confirm
QMessageBox confirm(this);
confirm.setWindowTitle("Delete Connections");
confirm.setText(QString("Delete %1 selected connection(s)?").arg(selected_ids.size()));
@@ -2598,10 +2688,10 @@ void DataSourcesScreen::on_bulk_delete_selected() {
confirm.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
confirm.setDefaultButton(QMessageBox::Cancel);
confirm.setStyleSheet(
- "QMessageBox { background:#0a0a0a; color:#e5e5e5; }"
+ "QMessageBox { background:#0a0a0a; color:#e5e5e5; font-family:'Consolas','Courier New',monospace; }"
"QLabel { color:#e5e5e5; font-size:13px; background:transparent; }"
"QPushButton { background:#111111; color:#e5e5e5; border:1px solid #1a1a1a;"
- " padding:6px 18px; font-size:12px; font-weight:700; border-radius:4px; }"
+ " padding:6px 18px; font-size:12px; font-weight:700; }"
"QPushButton:hover { background:#1a1a1a; }");
if (confirm.exec() != QMessageBox::Yes) return;
@@ -2614,8 +2704,6 @@ void DataSourcesScreen::on_bulk_delete_selected() {
LOG_INFO(TAG, QString("Bulk-deleted %1 connections").arg(selected_ids.size()));
}
-// ── on_export_connections ─────────────────────────────────────────────────────
-
void DataSourcesScreen::on_export_connections() {
const QString path = QFileDialog::getSaveFileName(
this, "Export Connections", "fincept_connections.json",
@@ -2655,8 +2743,6 @@ void DataSourcesScreen::on_export_connections() {
services::FileManagerService::instance().import_file(path, "data_sources");
}
-// ── on_import_connections ─────────────────────────────────────────────────────
-
void DataSourcesScreen::on_import_connections() {
const QString path = QFileDialog::getOpenFileName(
this, "Import Connections", "",
@@ -2683,7 +2769,6 @@ void DataSourcesScreen::on_import_connections() {
if (provider.isEmpty()) { ++skipped; continue; }
DataSource ds;
- // Assign a fresh UUID so imports never collide with existing IDs
ds.id = QUuid::createUuid().toString(QUuid::WithoutBraces);
ds.alias = obj["alias"].toString();
ds.display_name = obj["display_name"].toString();
@@ -2704,29 +2789,21 @@ void DataSourcesScreen::on_import_connections() {
refresh_connections();
LOG_INFO(TAG, QString("Import complete: %1 imported, %2 skipped").arg(imported).arg(skipped));
-
- // Register the imported file so it appears in the File Manager
services::FileManagerService::instance().import_file(path, "data_sources");
}
-// ── on_download_template ──────────────────────────────────────────────────────
-
void DataSourcesScreen::on_download_template() {
const QString path = QFileDialog::getSaveFileName(
this, "Save Connector Template", "fincept_connections_template.json",
"JSON Files (*.json);;All Files (*)");
if (path.isEmpty()) return;
- // Build one entry per connector using its placeholder/default field values.
- // Grouped by category in the output for readability.
const auto& all = ConnectorRegistry::instance().all();
- // Collect by category label
QMap<QString, QJsonArray> by_category;
for (const auto& cfg : all) {
QJsonObject config_obj;
for (const auto& field : cfg.fields) {
- // Use default_value if set, otherwise placeholder, otherwise empty string
QString val = !field.default_value.isEmpty()
? field.default_value
: (!field.placeholder.isEmpty() ? field.placeholder : "");
@@ -2749,7 +2826,6 @@ void DataSourcesScreen::on_download_template() {
by_category[category_label(cfg.category)].append(entry);
}
- // Flatten to a single array, category order
QStringList cat_order = {
"Databases", "APIs", "Streaming", "File Sources",
"Cloud Storage", "Time Series", "Market Data",
@@ -2762,7 +2838,6 @@ void DataSourcesScreen::on_download_template() {
out.append(entry);
}
}
- // Any category not in the fixed order
for (auto it = by_category.begin(); it != by_category.end(); ++it) {
if (!cat_order.contains(it.key())) {
for (const auto& entry : it.value())
@@ -2777,21 +2852,15 @@ void DataSourcesScreen::on_download_template() {
}
file.write(QJsonDocument(out).toJson(QJsonDocument::Indented));
file.close();
-
LOG_INFO(TAG, QString("Template written: %1 connectors to %2").arg(out.size()).arg(path));
}
-// ── on_poll_timer — background status poll for enabled connections ─────────────
-
void DataSourcesScreen::on_poll_timer() {
- // Poll only enabled connections that have a testable probe URL or host+port
for (const auto& ds : connections_cache_) {
if (!ds.enabled) continue;
-
const auto* connector_cfg = find_connector_config(ds.provider);
if (!connector_cfg || !connector_cfg->testable) continue;
- // Run the same probe logic as on_connection_test but silently (no dialog)
const auto cfg_obj = QJsonDocument::fromJson(ds.config.toUtf8()).object();
const QString probe_url = provider_probe_url(ds.provider, cfg_obj);
@@ -2801,15 +2870,18 @@ void DataSourcesScreen::on_poll_timer() {
if (host.isEmpty() && !probe_url.isEmpty()) {
const QUrl u(probe_url);
host = u.host();
- if (port <= 0) port = u.port(u.scheme() == "https" ? 443 : 80);
+ if (port <= 0) {
+ const QString s = u.scheme().toLower();
+ port = u.port((s == "https" || s == "wss") ? 443 : 80);
+ }
}
if (host.isEmpty() || port <= 0) continue;
QPointer<DataSourcesScreen> self = this;
- const QString conn_id = ds.id;
- const QString cap_host = host;
- const int cap_port = port;
- const QString cap_probe = probe_url;
+ const QString conn_id = ds.id;
+ const QString cap_host = host;
+ const int cap_port = port;
+ const QString cap_probe = probe_url;
QtConcurrent::run([self, conn_id, cap_host, cap_port, cap_probe]() {
QTcpSocket socket;
@@ -2830,8 +2902,6 @@ void DataSourcesScreen::on_poll_timer() {
}
}
-// ── refresh_connections ───────────────────────────────────────────────────────
-
void DataSourcesScreen::refresh_connections() {
const auto result = DataSourceRepository::instance().list_all();
connections_cache_ = result.is_ok() ? result.value() : QVector<DataSource>{};
diff --git a/fincept-qt/src/screens/data_sources/DataSourcesScreen.h b/fincept-qt/src/screens/data_sources/DataSourcesScreen.h
index 6bd8210cb..17c622bfe 100644
--- a/fincept-qt/src/screens/data_sources/DataSourcesScreen.h
+++ b/fincept-qt/src/screens/data_sources/DataSourcesScreen.h
@@ -1,5 +1,5 @@
#pragma once
-// Data Sources Screen - Bloomberg-style connector command center.
+// Data Sources Screen — Bloomberg-style data connector command center.
#include "screens/data_sources/DataSourceTypes.h"
#include "storage/repositories/DataSourceRepository.h"
@@ -12,6 +12,7 @@
#include <QPushButton>
#include <QResizeEvent>
#include <QShowEvent>
+#include <QStackedWidget>
#include <QTableWidget>
#include <QTimer>
#include <QWidget>
@@ -58,16 +59,20 @@ class DataSourcesScreen : public QWidget {
void update_clock();
private:
- void setup_ui();
- void apply_screen_styles();
- QWidget* build_header_bar();
- QWidget* build_command_bar();
+ // ── UI build ──────────────────────────────────────────────────────────────
+ void setup_ui();
+ void apply_screen_styles();
+ QWidget* build_screen_header();
+ QWidget* build_command_bar(); // stub — kept for compat
QWidget* build_stats_strip();
+ QWidget* build_tab_bar();
+ QWidget* build_browse_page();
+ QWidget* build_connections_page();
QWidget* build_category_panel();
QWidget* build_connector_panel();
QWidget* build_detail_panel();
- QWidget* build_connections_panel();
+ // ── Data / update ─────────────────────────────────────────────────────────
void build_category_ladder();
void build_connector_table();
void build_connections_table();
@@ -83,80 +88,74 @@ class DataSourcesScreen : public QWidget {
QVector<ConnectorConfig> filtered_connectors() const;
QVector<DataSource> filtered_connection_rows() const;
- void select_connector_by_id(const QString& connector_id);
+ void select_connector_by_id(const QString& connector_id);
QString effective_detail_connection_id() const;
QString preferred_connection_for_connector(const QString& connector_id) const;
- // ── Header / search ──────────────────────────────────────────────────────
- QLineEdit* search_edit_ = nullptr;
- QPushButton* clear_search_btn_ = nullptr;
- QLabel* count_label_ = nullptr;
- QLabel* selection_status_label_ = nullptr;
- QLabel* clock_label_ = nullptr;
- QPushButton* view_mode_btn_ = nullptr;
- QPushButton* import_btn_ = nullptr;
- QPushButton* export_btn_ = nullptr;
-
- // ── Connections toolbar ──────────────────────────────────────────────────
- QLineEdit* conn_search_edit_ = nullptr;
- QPushButton* bulk_enable_btn_ = nullptr;
- QPushButton* bulk_disable_btn_ = nullptr;
- QPushButton* bulk_delete_btn_ = nullptr;
-
- // ── Sidebar ──────────────────────────────────────────────────────────────
- QListWidget* category_list_ = nullptr;
- QListWidget* provider_ladder_ = nullptr;
-
- // ── Connector table ──────────────────────────────────────────────────────
- QTableWidget* connector_table_ = nullptr;
-
- // ── Detail inspector ─────────────────────────────────────────────────────
- QTableWidget* field_table_ = nullptr;
- QListWidget* detail_connections_list_ = nullptr;
- QPushButton* new_connection_btn_ = nullptr;
- QPushButton* edit_connection_btn_ = nullptr;
- QPushButton* test_connection_btn_ = nullptr;
-
- // ── Stats strip ──────────────────────────────────────────────────────────
- QLabel* universe_stat_value_ = nullptr;
- QLabel* configured_stat_value_ = nullptr;
- QLabel* active_stat_value_ = nullptr;
- QLabel* auth_stat_value_ = nullptr;
-
- // ── Inspector labels ─────────────────────────────────────────────────────
- QLabel* detail_title_ = nullptr;
- QLabel* detail_symbol_ = nullptr;
- QLabel* detail_category_value_ = nullptr;
- QLabel* detail_transport_value_ = nullptr;
- QLabel* detail_auth_value_ = nullptr;
- QLabel* detail_test_value_ = nullptr;
- QLabel* detail_fields_value_ = nullptr;
- QLabel* detail_configured_value_ = nullptr;
- QLabel* detail_enabled_value_ = nullptr;
- QLabel* detail_description_ = nullptr;
- QLabel* detail_last_tested_value_ = nullptr;
- QLabel* detail_last_status_value_ = nullptr;
-
- // ── Connections table ────────────────────────────────────────────────────
- QTableWidget* connections_table_ = nullptr;
- QCheckBox* select_all_check_ = nullptr;
-
- // ── Timers ───────────────────────────────────────────────────────────────
- QTimer* clock_timer_ = nullptr;
- QTimer* poll_timer_ = nullptr;
-
- // ── State ────────────────────────────────────────────────────────────────
+ // ── Screen header ─────────────────────────────────────────────────────────
+ QLineEdit* search_edit_ = nullptr;
+ QLabel* clock_label_ = nullptr;
+ QLabel* count_label_ = nullptr;
+
+ // ── Connections toolbar ───────────────────────────────────────────────────
+ QLineEdit* conn_search_edit_ = nullptr;
+ QPushButton* bulk_enable_btn_ = nullptr;
+ QPushButton* bulk_disable_btn_ = nullptr;
+ QPushButton* bulk_delete_btn_ = nullptr;
+
+ // ── Left sidebar ──────────────────────────────────────────────────────────
+ QListWidget* category_list_ = nullptr;
+ QListWidget* provider_ladder_ = nullptr;
+
+ // ── Connector table ───────────────────────────────────────────────────────
+ QTableWidget* connector_table_ = nullptr;
+
+ // ── Detail inspector ──────────────────────────────────────────────────────
+ QLabel* detail_title_ = nullptr;
+ QLabel* detail_symbol_ = nullptr;
+ QLabel* detail_description_ = nullptr;
+ QLabel* detail_category_value_ = nullptr;
+ QLabel* detail_transport_value_ = nullptr;
+ QLabel* detail_auth_value_ = nullptr;
+ QLabel* detail_test_value_ = nullptr;
+ QLabel* detail_fields_value_ = nullptr;
+ QLabel* detail_configured_value_ = nullptr;
+ QLabel* detail_enabled_value_ = nullptr;
+ QLabel* detail_last_status_value_ = nullptr;
+ QTableWidget* field_table_ = nullptr;
+ QListWidget* detail_connections_list_ = nullptr;
+ QPushButton* new_connection_btn_ = nullptr;
+ QPushButton* edit_connection_btn_ = nullptr;
+ QPushButton* test_connection_btn_ = nullptr;
+
+ // ── Stats strip ───────────────────────────────────────────────────────────
+ QLabel* universe_stat_value_ = nullptr;
+ QLabel* configured_stat_value_ = nullptr;
+ QLabel* active_stat_value_ = nullptr;
+ QLabel* auth_stat_value_ = nullptr;
+
+ // ── Connections table ─────────────────────────────────────────────────────
+ QTableWidget* connections_table_ = nullptr;
+
+ // ── Page stack ────────────────────────────────────────────────────────────
+ QStackedWidget* page_stack_ = nullptr;
+
+ // ── Timers ────────────────────────────────────────────────────────────────
+ QTimer* clock_timer_ = nullptr;
+ QTimer* poll_timer_ = nullptr;
+
+ // ── State ─────────────────────────────────────────────────────────────────
enum class ViewMode { Gallery, Connections };
QVector<DataSource> connections_cache_;
- QString selected_connector_id_;
- QString selected_connection_id_;
+ QString selected_connector_id_;
+ QString selected_connection_id_;
Category active_category_ = Category::Database;
bool show_all_categories_ = true;
ViewMode view_mode_ = ViewMode::Gallery;
- int stat_filter_ = -1; // -1 = no filter, 0-3 = stat box index
- QString conn_search_text_; // connections table search text
- QMap<QString, QPair<bool,QString>> live_status_cache_; // conn_id -> {ok, msg}
+ int stat_filter_ = -1; // -1 = none, 0-3 = stat box index
+ QString conn_search_text_;
+ QMap<QString, QPair<bool, QString>> live_status_cache_;
};
} // namespace fincept::screens::datasources
diff --git a/fincept-qt/src/screens/data_sources/connectors/RelationalDatabases.cpp b/fincept-qt/src/screens/data_sources/connectors/RelationalDatabases.cpp
index e09a60a7b..3ee75f5ab 100644
--- a/fincept-qt/src/screens/data_sources/connectors/RelationalDatabases.cpp
+++ b/fincept-qt/src/screens/data_sources/connectors/RelationalDatabases.cpp
@@ -103,22 +103,6 @@ static QVector<ConnectorConfig> relational_configs() {
F_USERNAME,
{"password", "Password", FieldType::Password, "", false, "", {}}}},
- {"snowflake",
- "Snowflake",
- "snowflake",
- Category::Database,
- "S",
- "#29B5E8",
- "Cloud data warehouse platform",
- true,
- true,
- {{"account", "Account Identifier", FieldType::Text, "xy12345.us-east-1", true, "", {}},
- F_USERNAME,
- F_PASSWORD,
- F_DATABASE,
- {"warehouse", "Warehouse", FieldType::Text, "COMPUTE_WH", true, "", {}},
- {"schema", "Schema", FieldType::Text, "PUBLIC", false, "", {}}}},
-
{"vertica",
"Vertica",
"vertica",
diff --git a/fincept-qt/src/screens/equity_trading/EquityTradingScreen.cpp b/fincept-qt/src/screens/equity_trading/EquityTradingScreen.cpp
index 132b3b1ec..aacfb4ea7 100644
--- a/fincept-qt/src/screens/equity_trading/EquityTradingScreen.cpp
+++ b/fincept-qt/src/screens/equity_trading/EquityTradingScreen.cpp
@@ -2,6 +2,7 @@
#include "screens/equity_trading/EquityTradingScreen.h"
#include "core/logging/Logger.h"
+#include "services/workspace/WorkspaceManager.h"
#include "screens/equity_trading/EquityBottomPanel.h"
#include "screens/equity_trading/EquityChart.h"
#include "screens/equity_trading/EquityCredentials.h"
@@ -47,9 +48,43 @@ EquityTradingScreen::EquityTradingScreen(QWidget* parent) : QWidget(parent) {
watchlist_symbols_ = DEFAULT_WATCHLIST;
setup_ui();
setup_timers();
+ WorkspaceManager::instance().register_participant("equity_trading", this);
+}
+
+QJsonObject EquityTradingScreen::save_state() const {
+ QJsonObject s;
+ s["broker_id"] = broker_id_;
+ s["symbol"] = selected_symbol_;
+ s["exchange"] = selected_exchange_;
+ s["trading_mode"] = (trading_mode_ == equity::TradingMode::Paper) ? "paper" : "live";
+ QJsonArray wl;
+ for (const auto& sym : watchlist_symbols_)
+ wl.append(sym);
+ s["watchlist_symbols"] = QJsonValue(wl);
+ return s;
+}
+
+void EquityTradingScreen::restore_state(const QJsonObject& state) {
+ if (state.contains("broker_id"))
+ broker_id_ = state["broker_id"].toString();
+ if (state.contains("symbol"))
+ selected_symbol_ = state["symbol"].toString();
+ if (state.contains("exchange"))
+ selected_exchange_ = state["exchange"].toString();
+ if (state.contains("trading_mode"))
+ trading_mode_ = (state["trading_mode"].toString() == "live")
+ ? equity::TradingMode::Live
+ : equity::TradingMode::Paper;
+ if (state.contains("watchlist_symbols")) {
+ watchlist_symbols_.clear();
+ for (const auto& v : state["watchlist_symbols"].toArray())
+ watchlist_symbols_.append(v.toString());
+ }
+ // Heavy init (broker connect, data fetch) happens in showEvent/init_broker
}
EquityTradingScreen::~EquityTradingScreen() {
+ WorkspaceManager::instance().unregister_participant("equity_trading");
ws_teardown();
if (fill_cb_id_ >= 0)
OrderMatcher::instance().remove_fill_callback(fill_cb_id_);
diff --git a/fincept-qt/src/screens/equity_trading/EquityTradingScreen.h b/fincept-qt/src/screens/equity_trading/EquityTradingScreen.h
index ff4d2dd0f..7ab77d181 100644
--- a/fincept-qt/src/screens/equity_trading/EquityTradingScreen.h
+++ b/fincept-qt/src/screens/equity_trading/EquityTradingScreen.h
@@ -3,6 +3,7 @@
// Routes to live brokers (16 supported) or paper trading engine.
#include "screens/equity_trading/EquityTypes.h"
+#include "services/workspace/IWorkspaceParticipant.h"
#include "trading/TradingTypes.h"
#include "trading/websocket/AngelOneTickTypes.h"
@@ -33,12 +34,15 @@ class EquityBottomPanel;
namespace fincept::screens {
-class EquityTradingScreen : public QWidget {
+class EquityTradingScreen : public QWidget, public IWorkspaceParticipant {
Q_OBJECT
public:
explicit EquityTradingScreen(QWidget* parent = nullptr);
~EquityTradingScreen();
+ QJsonObject save_state() const override;
+ void restore_state(const QJsonObject& state) override;
+
protected:
void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) override;
diff --git a/fincept-qt/src/screens/forum/ForumFeedPanel.cpp b/fincept-qt/src/screens/forum/ForumFeedPanel.cpp
index 827fae8c1..8ff3fb367 100644
--- a/fincept-qt/src/screens/forum/ForumFeedPanel.cpp
+++ b/fincept-qt/src/screens/forum/ForumFeedPanel.cpp
@@ -2,6 +2,7 @@
#include "screens/forum/ForumFeedPanel.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QDateTime>
#include <QFrame>
@@ -52,6 +53,7 @@ static QString fmt_n(int n) {
}
ForumFeedPanel::ForumFeedPanel(QWidget* parent) : QWidget(parent) {
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed, this, [this](const ui::ThemeTokens&) { setStyleSheet(QString("background:%1;color:%2;").arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY())); });
build_ui();
}
@@ -487,11 +489,11 @@ void ForumFeedPanel::rebuild_posts() {
return lbl;
};
- QString rep_col = p.reply_count > 0 ? ui::colors::CYAN() : "#1e1e1e";
+ QString rep_col = p.reply_count > 0 ? ui::colors::CYAN() : QString(ui::colors::BORDER_DIM());
eng_hl->addWidget(up_btn);
eng_hl->addWidget(mk_eng("◆", QString("%1 replies").arg(p.reply_count), rep_col));
- eng_hl->addWidget(mk_eng("◉", fmt_n(p.views) + " views", "#1e1e1e"));
+ eng_hl->addWidget(mk_eng("◉", fmt_n(p.views) + " views", QString(ui::colors::BORDER_DIM())));
eng_hl->addStretch();
// Badges
diff --git a/fincept-qt/src/screens/forum/ForumPostListPanel.cpp b/fincept-qt/src/screens/forum/ForumPostListPanel.cpp
index c35caee3b..dd0e8e031 100644
--- a/fincept-qt/src/screens/forum/ForumPostListPanel.cpp
+++ b/fincept-qt/src/screens/forum/ForumPostListPanel.cpp
@@ -2,6 +2,7 @@
#include "screens/forum/ForumPostListPanel.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QDateTime>
#include <QFrame>
@@ -52,6 +53,7 @@ static QString det_color(const QString& s) {
}
ForumPostListPanel::ForumPostListPanel(QWidget* parent) : QWidget(parent) {
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed, this, [this](const ui::ThemeTokens&) { setStyleSheet(QString("background:%1;color:%2;").arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY())); });
build_ui();
}
@@ -390,12 +392,12 @@ void ForumPostListPanel::rebuild_feed() {
return lbl;
};
- QString like_color = post.likes > 0 ? ui::colors::AMBER() : "#1e1e1e";
- QString rep_color = post.reply_count > 0 ? ui::colors::CYAN() : "#1e1e1e";
+ QString like_color = post.likes > 0 ? ui::colors::AMBER() : QString(ui::colors::BORDER_DIM());
+ QString rep_color = post.reply_count > 0 ? ui::colors::CYAN() : QString(ui::colors::BORDER_DIM());
eng_hl->addWidget(mk_eng("▲", fmt_num(post.likes), like_color));
eng_hl->addWidget(mk_eng("◆", fmt_num(post.reply_count), rep_color));
- eng_hl->addWidget(mk_eng("◉", fmt_num(post.views), "#1e1e1e"));
+ eng_hl->addWidget(mk_eng("◉", fmt_num(post.views), QString(ui::colors::BORDER_DIM())));
eng_hl->addStretch();
if (post.reply_count > 5) {
diff --git a/fincept-qt/src/screens/forum/ForumPostReaderPanel.cpp b/fincept-qt/src/screens/forum/ForumPostReaderPanel.cpp
index 32eb77b53..838641114 100644
--- a/fincept-qt/src/screens/forum/ForumPostReaderPanel.cpp
+++ b/fincept-qt/src/screens/forum/ForumPostReaderPanel.cpp
@@ -3,6 +3,7 @@
#include "services/forum/ForumService.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QDateTime>
#include <QFrame>
@@ -43,6 +44,7 @@ static QString det_color(const QString& s) {
}
ForumPostReaderPanel::ForumPostReaderPanel(QWidget* parent) : QWidget(parent) {
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed, this, [this](const ui::ThemeTokens&) { setStyleSheet(QString("background:%1;color:%2;").arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY())); });
build_ui();
}
diff --git a/fincept-qt/src/screens/forum/ForumScreen.cpp b/fincept-qt/src/screens/forum/ForumScreen.cpp
index 807deb3aa..982ecbb1a 100644
--- a/fincept-qt/src/screens/forum/ForumScreen.cpp
+++ b/fincept-qt/src/screens/forum/ForumScreen.cpp
@@ -7,6 +7,7 @@
#include "screens/forum/ForumThreadPanel.h"
#include "services/forum/ForumService.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QDialog>
#include <QFrame>
@@ -28,6 +29,7 @@ static QString M(int sz = 12) {
}
ForumScreen::ForumScreen(QWidget* parent) : QWidget(parent) {
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed, this, [this](const ui::ThemeTokens&) { setStyleSheet(QString("background:%1;color:%2;").arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY())); });
build_ui();
}
diff --git a/fincept-qt/src/screens/forum/ForumSidebarPanel.cpp b/fincept-qt/src/screens/forum/ForumSidebarPanel.cpp
index d5f6cbbf3..4cbc5cb7e 100644
--- a/fincept-qt/src/screens/forum/ForumSidebarPanel.cpp
+++ b/fincept-qt/src/screens/forum/ForumSidebarPanel.cpp
@@ -2,6 +2,7 @@
#include "screens/forum/ForumSidebarPanel.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QFrame>
#include <QHBoxLayout>
@@ -23,6 +24,7 @@ static QString det_color(const QString& s) {
}
ForumSidebarPanel::ForumSidebarPanel(QWidget* parent) : QWidget(parent) {
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed, this, [this](const ui::ThemeTokens&) { setStyleSheet(QString("background:%1;color:%2;").arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY())); });
build_ui();
}
@@ -494,8 +496,8 @@ void ForumSidebarPanel::rebuild_contributors() {
// Medal icons for top 3
static const char* medals[] = {"🥇", "🥈", "🥉", " 4", " 5"};
- static const char* rank_colors[] = {"#d97706", "#94a3b8", "#cd7f32",
- "#525252", "#525252"};
+ const QString rank_colors[] = {ui::colors::AMBER(), ui::colors::TEXT_SECONDARY(), "#cd7f32",
+ ui::colors::TEXT_TERTIARY(), ui::colors::TEXT_TERTIARY()};
for (int i = 0; i < std::min(5, (int)contributors_.size()); ++i) {
const auto& c = contributors_[i];
diff --git a/fincept-qt/src/screens/forum/ForumThreadPanel.cpp b/fincept-qt/src/screens/forum/ForumThreadPanel.cpp
index f62c1aed2..64547d5db 100644
--- a/fincept-qt/src/screens/forum/ForumThreadPanel.cpp
+++ b/fincept-qt/src/screens/forum/ForumThreadPanel.cpp
@@ -3,6 +3,7 @@
#include "core/logging/Logger.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QDateTime>
#include <QFrame>
@@ -43,6 +44,7 @@ static QString det_color(const QString& s) {
}
ForumThreadPanel::ForumThreadPanel(QWidget* parent) : QWidget(parent) {
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed, this, [this](const ui::ThemeTokens&) { setStyleSheet(QString("background:%1;color:%2;").arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY())); });
build_ui();
}
diff --git a/fincept-qt/src/screens/markets/MarketPanel.cpp b/fincept-qt/src/screens/markets/MarketPanel.cpp
index 08c0e3a10..dd06b43ea 100644
--- a/fincept-qt/src/screens/markets/MarketPanel.cpp
+++ b/fincept-qt/src/screens/markets/MarketPanel.cpp
@@ -1,6 +1,7 @@
#include "screens/markets/MarketPanel.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QHBoxLayout>
#include <QHeaderView>
@@ -15,30 +16,32 @@ MarketPanel::MarketPanel(const QString& title, const QStringList& symbols, bool
setMinimumWidth(280);
setMaximumWidth(520);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
- setFixedHeight(show_name ? 322 : 322);
- setStyleSheet("background:#0a0a0a;border:1px solid #1e1e1e;");
+ setFixedHeight(322);
auto* vl = new QVBoxLayout(this);
vl->setContentsMargins(0, 0, 0, 0);
vl->setSpacing(0);
+ // Header
auto* header = new QWidget;
header->setFixedHeight(32);
- header->setStyleSheet("background:#111418;border-bottom:1px solid #1e1e1e;"
- "border-left:2px solid #d97706;");
auto* hhl = new QHBoxLayout(header);
hhl->setContentsMargins(10, 0, 8, 0);
+
title_label_ = new QLabel(title.toUpper());
- title_label_->setStyleSheet("color:#d97706;font-size:12px;font-weight:700;background:transparent;"
- "letter-spacing:1.2px;font-family:'Consolas',monospace;");
+ title_label_->setStyleSheet(
+ QString("color:%1;font-weight:700;letter-spacing:1.2px;background:transparent;")
+ .arg(ui::colors::AMBER()));
hhl->addWidget(title_label_);
hhl->addStretch();
+
status_label_ = new QLabel;
status_label_->setStyleSheet(
- "color:#333333;font-size:11px;background:transparent;font-family:'Consolas',monospace;");
+ QString("color:%1;background:transparent;").arg(ui::colors::TEXT_DIM()));
hhl->addWidget(status_label_);
vl->addWidget(header);
+ // Table
table_ = new QTableWidget;
table_->setAlternatingRowColors(true);
table_->setSelectionMode(QAbstractItemView::NoSelection);
@@ -50,13 +53,6 @@ MarketPanel::MarketPanel(const QString& title, const QStringList& symbols, bool
table_->horizontalHeader()->setStretchLastSection(true);
table_->horizontalHeader()->setHighlightSections(false);
table_->horizontalHeader()->setFixedHeight(18);
- table_->setStyleSheet("QTableWidget{background:#080808;alternate-background-color:#0d0d0d;border:none;"
- "font-family:'Consolas',monospace;font-size:13px;}"
- "QTableWidget::item{padding:0 6px;border-bottom:1px solid #161616;}"
- "QTableWidget::item:selected{background:#1a1a0a;}"
- "QHeaderView::section{background:#0e0e0e;color:#606060;border:none;"
- "border-bottom:1px solid #1e1e1e;font-size:10px;font-weight:600;"
- "letter-spacing:0.5px;padding:0 6px;font-family:'Consolas',monospace;}");
if (show_name_) {
table_->setColumnCount(6);
@@ -76,9 +72,41 @@ MarketPanel::MarketPanel(const QString& title, const QStringList& symbols, bool
loading_overlay_ = new ui::LoadingOverlay(this);
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) { refresh_theme(); });
+ refresh_theme();
refresh();
}
+void MarketPanel::refresh_theme() {
+ setStyleSheet(QString("background:%1;border:1px solid %2;")
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
+
+ // Header
+ if (title_label_) {
+ title_label_->parentWidget()->setStyleSheet(
+ QString("background:%1;border-bottom:1px solid %2;border-left:2px solid %3;")
+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM(), ui::colors::AMBER()));
+ title_label_->setStyleSheet(
+ QString("color:%1;font-weight:700;letter-spacing:1.2px;background:transparent;")
+ .arg(ui::colors::AMBER()));
+ status_label_->setStyleSheet(
+ QString("color:%1;background:transparent;").arg(ui::colors::TEXT_DIM()));
+ }
+
+ // Table
+ if (table_)
+ table_->setStyleSheet(
+ QString("QTableWidget{background:%1;alternate-background-color:%2;border:none;}"
+ "QTableWidget::item{padding:0 6px;border-bottom:1px solid %3;}"
+ "QTableWidget::item:selected{background:%4;}"
+ "QHeaderView::section{background:%5;color:%6;border:none;"
+ "border-bottom:1px solid %3;font-weight:600;letter-spacing:0.5px;padding:0 6px;}")
+ .arg(ui::colors::BG_BASE(), ui::colors::BG_SURFACE(),
+ ui::colors::BORDER_DIM(), ui::colors::BG_HOVER(),
+ ui::colors::BG_RAISED(), ui::colors::TEXT_DIM()));
+}
+
void MarketPanel::set_symbols(const QStringList& s) {
symbols_ = s;
refresh();
@@ -87,25 +115,23 @@ void MarketPanel::set_symbols(const QStringList& s) {
void MarketPanel::refresh() {
status_label_->setText("LOADING");
status_label_->setStyleSheet(
- "color:#d97706;font-size:12px;background:transparent;font-family:'Consolas',monospace;");
-
+ QString("color:%1;background:transparent;").arg(ui::colors::AMBER()));
loading_overlay_->show_loading("LOADING\xe2\x80\xa6");
QPointer<MarketPanel> self = this;
services::MarketDataService::instance().fetch_quotes(symbols_, [self](bool ok, QVector<services::QuoteData> q) {
- if (!self)
- return;
+ if (!self) return;
self->loading_overlay_->hide_loading();
if (!ok) {
self->status_label_->setText("FAIL");
self->status_label_->setStyleSheet(
- "color:#dc2626;font-size:12px;background:transparent;font-family:'Consolas',monospace;");
+ QString("color:%1;background:transparent;").arg(ui::colors::NEGATIVE()));
emit self->refresh_finished();
return;
}
self->status_label_->setText(QString::number(q.size()));
self->status_label_->setStyleSheet(
- "color:#333333;font-size:12px;background:transparent;font-family:'Consolas',monospace;");
+ QString("color:%1;background:transparent;").arg(ui::colors::TEXT_DIM()));
self->populate(q);
emit self->refresh_finished();
});
@@ -129,30 +155,21 @@ void MarketPanel::populate(const QVector<services::QuoteData>& quotes) {
return i;
};
bool pos = q.change >= 0;
- const QString cc = pos ? "#22c55e" : "#ef4444"; // brighter green/red
+ const QString cc = pos ? ui::colors::POSITIVE() : ui::colors::NEGATIVE();
const QString arr = pos ? "▲" : "▼";
int prec = q.price > 100 ? 2 : (q.price > 1 ? 2 : 4);
int col = 0;
- // Symbol — white identifier
- table_->setItem(row, col++, mk(q.symbol, "#e5e5e5", Qt::AlignLeft | Qt::AlignVCenter));
- // Name (regional panels)
+ table_->setItem(row, col++, mk(q.symbol, ui::colors::TEXT_PRIMARY(), Qt::AlignLeft | Qt::AlignVCenter));
if (show_name_)
- table_->setItem(row, col++, mk(q.name, "#505050", Qt::AlignLeft | Qt::AlignVCenter));
- // LAST price — amber (the primary data point)
- table_->setItem(row, col++, mk(QString::number(q.price, 'f', prec), "#e5a020"));
- // CHG with directional arrow
- table_->setItem(row, col++,
- mk(QString("%1 %2").arg(arr).arg(std::abs(q.change), 0, 'f', 2), cc));
- // CHG%
- table_->setItem(row, col++,
- mk(QString("%1%2%").arg(arr).arg(std::abs(q.change_pct), 0, 'f', 2), cc));
- // HIGH / LOW — visible but secondary
+ table_->setItem(row, col++, mk(q.name, ui::colors::TEXT_TERTIARY(), Qt::AlignLeft | Qt::AlignVCenter));
+ table_->setItem(row, col++, mk(QString::number(q.price, 'f', prec), ui::colors::AMBER()));
+ table_->setItem(row, col++, mk(QString("%1 %2").arg(arr).arg(std::abs(q.change), 0, 'f', 2), cc));
+ table_->setItem(row, col++, mk(QString("%1%2%").arg(arr).arg(std::abs(q.change_pct), 0, 'f', 2), cc));
if (!show_name_) {
- table_->setItem(row, col++, mk(QString::number(q.high, 'f', 2), "#4a4a4a"));
- table_->setItem(row, col++, mk(QString::number(q.low, 'f', 2), "#4a4a4a"));
+ table_->setItem(row, col++, mk(QString::number(q.high, 'f', 2), ui::colors::TEXT_SECONDARY()));
+ table_->setItem(row, col++, mk(QString::number(q.low, 'f', 2), ui::colors::TEXT_SECONDARY()));
}
- // VOL — dim placeholder (service doesn't provide volume yet)
- table_->setItem(row, col++, mk("--", "#2a2a2a"));
+ table_->setItem(row, col++, mk("--", ui::colors::TEXT_DIM()));
table_->setRowHeight(row, 26);
}
}
diff --git a/fincept-qt/src/screens/markets/MarketPanel.h b/fincept-qt/src/screens/markets/MarketPanel.h
index 81133792d..f85f3f210 100644
--- a/fincept-qt/src/screens/markets/MarketPanel.h
+++ b/fincept-qt/src/screens/markets/MarketPanel.h
@@ -26,6 +26,7 @@ class MarketPanel : public QWidget {
private:
void populate(const QVector<services::QuoteData>& quotes);
+ void refresh_theme();
QString title_;
QStringList symbols_;
diff --git a/fincept-qt/src/screens/markets/MarketsScreen.cpp b/fincept-qt/src/screens/markets/MarketsScreen.cpp
index 20327b6e2..c1a05305b 100644
--- a/fincept-qt/src/screens/markets/MarketsScreen.cpp
+++ b/fincept-qt/src/screens/markets/MarketsScreen.cpp
@@ -2,6 +2,7 @@
#include "services/markets/MarketDataService.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QComboBox>
#include <QDateTime>
@@ -17,44 +18,62 @@
namespace fincept::screens {
+static QString lbl_ss(const QString& color, bool bold = false) {
+ return QString("color:%1;background:transparent;%2")
+ .arg(color, bold ? "font-weight:bold;" : "");
+}
+
MarketsScreen::MarketsScreen(QWidget* parent) : QWidget(parent) {
- setStyleSheet("background:#080808;");
auto* root = new QVBoxLayout(this);
root->setContentsMargins(0, 0, 0, 0);
root->setSpacing(0);
- root->addWidget(build_header());
- root->addWidget(build_controls());
+
+ header_widget_ = build_header();
+ controls_widget_ = build_controls();
+ root->addWidget(header_widget_);
+ root->addWidget(controls_widget_);
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
- scroll->setStyleSheet("QScrollArea{border:none;background:#080808;}");
+ scroll->setStyleSheet(
+ QString("QScrollArea{border:none;background:%1;}"
+ "QScrollBar:vertical{width:6px;background:transparent;}"
+ "QScrollBar::handle:vertical{background:%2;border-radius:3px;min-height:20px;}"
+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")
+ .arg(ui::colors::BG_BASE(), ui::colors::BORDER_MED()));
+
auto* content = new QWidget;
auto* cvl = new QVBoxLayout(content);
cvl->setContentsMargins(6, 6, 6, 6);
cvl->setSpacing(2);
- // Global Markets section header
- auto* gt_row = new QWidget;
- gt_row->setFixedHeight(28);
- gt_row->setStyleSheet("background:transparent;");
- auto* gt_hl = new QHBoxLayout(gt_row);
- gt_hl->setContentsMargins(0, 4, 0, 0);
- gt_hl->setSpacing(10);
- auto* gt = new QLabel("GLOBAL MARKETS");
- gt->setStyleSheet("color:#d97706;font-size:11px;font-weight:700;background:transparent;"
- "letter-spacing:1.5px;font-family:'Consolas',monospace;");
- gt_hl->addWidget(gt);
+ auto make_section_hdr = [&](const QString& title, const QString& count_text) {
+ auto* row = new QWidget;
+ row->setFixedHeight(28);
+ row->setStyleSheet("background:transparent;");
+ auto* hl = new QHBoxLayout(row);
+ hl->setContentsMargins(0, 4, 0, 0);
+ hl->setSpacing(10);
+ auto* lbl = new QLabel(title);
+ lbl->setStyleSheet(lbl_ss(ui::colors::AMBER(), true) + "letter-spacing:1.5px;");
+ hl->addWidget(lbl);
+ auto* cnt = new QLabel(count_text);
+ cnt->setStyleSheet(lbl_ss(ui::colors::TEXT_DIM()));
+ hl->addWidget(cnt);
+ hl->addStretch();
+ return row;
+ };
+
+ auto make_sep = [&]() {
+ auto* s = new QFrame;
+ s->setFixedHeight(1);
+ s->setStyleSheet(QString("background:%1;border:none;").arg(ui::colors::BORDER_DIM()));
+ return s;
+ };
+
int g_count = services::MarketDataService::default_global_markets().size();
- auto* gt_count = new QLabel(QString("· %1 instruments").arg(g_count));
- gt_count->setStyleSheet("color:#303030;font-size:11px;background:transparent;"
- "font-family:'Consolas',monospace;");
- gt_hl->addWidget(gt_count);
- gt_hl->addStretch();
- cvl->addWidget(gt_row);
- auto* gs = new QFrame;
- gs->setFixedHeight(1);
- gs->setStyleSheet("background:#252525;border:none;");
- cvl->addWidget(gs);
+ cvl->addWidget(make_section_hdr("GLOBAL MARKETS", QString("· %1 instruments").arg(g_count)));
+ cvl->addWidget(make_sep());
auto* gg = new QGridLayout;
gg->setSpacing(6);
@@ -67,28 +86,9 @@ MarketsScreen::MarketsScreen(QWidget* parent) : QWidget(parent) {
}
cvl->addLayout(gg);
- // Regional Markets section header
- auto* rt_row = new QWidget;
- rt_row->setFixedHeight(28);
- rt_row->setStyleSheet("background:transparent;");
- auto* rt_hl = new QHBoxLayout(rt_row);
- rt_hl->setContentsMargins(0, 12, 0, 0);
- rt_hl->setSpacing(10);
- auto* rt = new QLabel("REGIONAL MARKETS");
- rt->setStyleSheet("color:#d97706;font-size:11px;font-weight:700;background:transparent;"
- "letter-spacing:1.5px;font-family:'Consolas',monospace;");
- rt_hl->addWidget(rt);
int r_count = services::MarketDataService::default_regional_markets().size();
- auto* rt_count = new QLabel(QString("· %1 regions").arg(r_count));
- rt_count->setStyleSheet("color:#303030;font-size:11px;background:transparent;"
- "font-family:'Consolas',monospace;");
- rt_hl->addWidget(rt_count);
- rt_hl->addStretch();
- cvl->addWidget(rt_row);
- auto* rs = new QFrame;
- rs->setFixedHeight(1);
- rs->setStyleSheet("background:#252525;border:none;");
- cvl->addWidget(rs);
+ cvl->addWidget(make_section_hdr("REGIONAL MARKETS", QString("· %1 regions").arg(r_count)));
+ cvl->addWidget(make_sep());
auto* rg = new QGridLayout;
rg->setSpacing(4);
@@ -104,20 +104,36 @@ MarketsScreen::MarketsScreen(QWidget* parent) : QWidget(parent) {
}
cvl->addLayout(rg);
cvl->addStretch();
+
scroll->setWidget(content);
root->addWidget(scroll, 1);
auto_refresh_timer_ = new QTimer(this);
auto_refresh_timer_->setInterval(update_interval_ms_);
connect(auto_refresh_timer_, &QTimer::timeout, this, &MarketsScreen::refresh_all);
- // Timer starts via showEvent, not eagerly
+
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) { refresh_theme(); });
+ refresh_theme();
+}
+
+void MarketsScreen::refresh_theme() {
+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));
+ if (header_widget_)
+ header_widget_->setStyleSheet(
+ QString("background:%1;border-bottom:1px solid %2;")
+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));
+ if (controls_widget_)
+ controls_widget_->setStyleSheet(
+ QString("background:%1;border-bottom:1px solid %2;")
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
}
void MarketsScreen::showEvent(QShowEvent* event) {
QWidget::showEvent(event);
if (auto_update_ && auto_refresh_timer_)
auto_refresh_timer_->start();
- refresh_all(); // fresh data on show
+ refresh_all();
}
void MarketsScreen::hideEvent(QHideEvent* event) {
@@ -129,73 +145,62 @@ void MarketsScreen::hideEvent(QHideEvent* event) {
QWidget* MarketsScreen::build_header() {
auto* w = new QWidget;
w->setFixedHeight(40);
- w->setStyleSheet("background:#09090b;border-bottom:1px solid #1e1e1e;");
auto* h = new QHBoxLayout(w);
h->setContentsMargins(14, 0, 14, 0);
h->setSpacing(0);
- auto mk = [](const QString& t, const QString& c, int sz = 12, bool b = false) {
- auto* l = new QLabel(t);
- l->setStyleSheet(QString("color:%1;font-size:%2px;%3background:transparent;"
- "font-family:'Consolas',monospace;")
- .arg(c).arg(sz).arg(b ? "font-weight:700;" : ""));
- return l;
- };
-
- // Brand
- h->addWidget(mk("FINCEPT", "#d97706", 14, true));
- h->addWidget(mk(" MARKETS", "#404040", 12));
+ auto* brand = new QLabel("FINCEPT");
+ brand->setStyleSheet(lbl_ss(ui::colors::AMBER(), true));
+ h->addWidget(brand);
+ auto* sub = new QLabel(" MARKETS");
+ sub->setStyleSheet(lbl_ss(ui::colors::TEXT_TERTIARY()));
+ h->addWidget(sub);
- // Separator
- auto* sep1 = new QFrame; sep1->setFrameShape(QFrame::VLine);
+ auto* sep1 = new QFrame;
+ sep1->setFrameShape(QFrame::VLine);
sep1->setFixedSize(1, 20);
- sep1->setStyleSheet("background:#252525;margin:0 16px;");
+ sep1->setStyleSheet(QString("background:%1;margin:0 16px;").arg(ui::colors::BORDER_MED()));
h->addWidget(sep1);
- // Market session badge — computed from current NY time
- auto* session_dot = mk("●", "#22c55e", 9);
- auto* session_lbl = mk("NYSE OPEN", "#22c55e", 11, true);
+ auto* session_dot = new QLabel("●");
+ auto* session_lbl = new QLabel("NYSE OPEN");
+ session_dot->setStyleSheet(lbl_ss(ui::colors::POSITIVE()));
+ session_lbl->setStyleSheet(lbl_ss(ui::colors::POSITIVE(), true));
h->addWidget(session_dot);
- h->addWidget(mk(" ", "#000"));
+ h->addWidget(new QLabel(" "));
h->addWidget(session_lbl);
- // Update session badge every minute
auto update_session = [session_dot, session_lbl]() {
- // NYSE: Mon-Fri 09:30-16:00 ET (UTC-5 or UTC-4 DST)
QDateTime utc = QDateTime::currentDateTimeUtc();
- int day = utc.date().dayOfWeek(); // 1=Mon..7=Sun
- // Approximate ET as UTC-4 (EDT). Good enough for a badge.
+ int day = utc.date().dayOfWeek();
QDateTime et = utc.addSecs(-4 * 3600);
int hhmm = et.time().hour() * 100 + et.time().minute();
bool weekday = (day >= 1 && day <= 5);
QString label, color;
if (!weekday || hhmm < 400 || hhmm >= 2000) {
- label = "NYSE CLOSED"; color = "#404040";
+ label = "NYSE CLOSED"; color = ui::colors::TEXT_TERTIARY();
} else if (hhmm < 930) {
- label = "NYSE PRE-MKT"; color = "#d97706";
+ label = "NYSE PRE-MKT"; color = ui::colors::AMBER();
} else if (hhmm < 1600) {
- label = "NYSE OPEN"; color = "#22c55e";
+ label = "NYSE OPEN"; color = ui::colors::POSITIVE();
} else {
- label = "NYSE AFTER-HRS"; color = "#6366f1";
+ label = "NYSE AFTER-HRS"; color = ui::colors::INFO();
}
- session_dot->setStyleSheet(QString("color:%1;font-size:9px;background:transparent;"
- "font-family:'Consolas',monospace;").arg(color));
- session_lbl->setStyleSheet(QString("color:%1;font-size:11px;font-weight:700;background:transparent;"
- "font-family:'Consolas',monospace;").arg(color));
+ session_dot->setStyleSheet(lbl_ss(color));
+ session_lbl->setStyleSheet(lbl_ss(color, true));
session_lbl->setText(label);
};
update_session();
- auto* session_timer = new QTimer(this);
+ auto* session_timer = new QTimer(w);
session_timer->setInterval(60000);
- connect(session_timer, &QTimer::timeout, this, update_session);
+ connect(session_timer, &QTimer::timeout, w, update_session);
session_timer->start();
h->addStretch();
- // Three market clocks
- auto* ny_lbl = mk("", "#606060", 11);
- auto* lon_lbl = mk("", "#606060", 11);
- auto* tok_lbl = mk("", "#606060", 11);
+ auto* ny_lbl = new QLabel; ny_lbl ->setStyleSheet(lbl_ss(ui::colors::TEXT_SECONDARY()));
+ auto* lon_lbl = new QLabel; lon_lbl->setStyleSheet(lbl_ss(ui::colors::TEXT_SECONDARY()));
+ auto* tok_lbl = new QLabel; tok_lbl->setStyleSheet(lbl_ss(ui::colors::TEXT_SECONDARY()));
auto update_clocks = [ny_lbl, lon_lbl, tok_lbl]() {
QDateTime utc = QDateTime::currentDateTimeUtc();
@@ -207,15 +212,17 @@ QWidget* MarketsScreen::build_header() {
tok_lbl->setText(fmt(utc.addSecs( 9 * 3600), "TOK"));
};
update_clocks();
- auto* clock_timer = new QTimer(this);
+ auto* clock_timer = new QTimer(w);
clock_timer->setInterval(1000);
- connect(clock_timer, &QTimer::timeout, this, update_clocks);
+ connect(clock_timer, &QTimer::timeout, w, update_clocks);
clock_timer->start();
+ auto* dot1 = new QLabel(" · "); dot1->setStyleSheet(lbl_ss(ui::colors::BORDER_MED()));
+ auto* dot2 = new QLabel(" · "); dot2->setStyleSheet(lbl_ss(ui::colors::BORDER_MED()));
h->addWidget(ny_lbl);
- h->addWidget(mk(" · ", "#252525", 11));
+ h->addWidget(dot1);
h->addWidget(lon_lbl);
- h->addWidget(mk(" · ", "#252525", 11));
+ h->addWidget(dot2);
h->addWidget(tok_lbl);
return w;
@@ -224,136 +231,109 @@ QWidget* MarketsScreen::build_header() {
QWidget* MarketsScreen::build_controls() {
auto* w = new QWidget;
w->setFixedHeight(32);
- w->setStyleSheet("background:#0c0c0c;border-bottom:1px solid #1e1e1e;");
auto* h = new QHBoxLayout(w);
h->setContentsMargins(14, 0, 14, 0);
h->setSpacing(4);
- // F-key chip helper
- auto fkey_btn = [](const QString& key, const QString& label) {
- auto* btn = new QPushButton;
+ auto make_btn = [](const QString& key, const QString& label) {
+ auto* btn = new QPushButton(QString("[%1] %2").arg(key, label));
btn->setFixedHeight(22);
btn->setCursor(Qt::PointingHandCursor);
- // Build text with key chip prefix
- btn->setText(QString(" %1 ").arg(label));
- // Custom paint via stylesheet: dim key badge + bright label
btn->setStyleSheet(
- QString("QPushButton { background:#141414; color:#909090; border:1px solid #2a2a2a;"
- "font-size:11px; font-family:'Consolas',monospace; padding:0 2px; }"
- "QPushButton:hover { background:#1e1e1e; color:#d97706; border-color:#d97706; }"
- "QPushButton:pressed { background:#d97706; color:#080808; }"));
- // Prepend key chip as part of text — use unicode thin space trick
- btn->setText(QString("[%1] %2").arg(key, label));
- Q_UNUSED(key)
+ QString("QPushButton{background:%1;color:%2;border:1px solid %3;padding:0 8px;font-weight:bold;}"
+ "QPushButton:hover{background:%4;color:%5;border-color:%5;}")
+ .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_SECONDARY(), ui::colors::BORDER_MED(),
+ ui::colors::BG_HOVER(), ui::colors::AMBER()));
return btn;
};
- auto* refresh_btn = fkey_btn("F5", "REFRESH");
+ auto* refresh_btn = make_btn("F5", "REFRESH");
connect(refresh_btn, &QPushButton::clicked, this, &MarketsScreen::refresh_all);
h->addWidget(refresh_btn);
- auto* auto_btn = fkey_btn("F9", auto_update_ ? "AUTO·ON" : "AUTO·OFF");
- auto_btn->setStyleSheet(
- QString("QPushButton{background:#141414;color:%1;border:1px solid %2;"
- "font-size:11px;font-family:'Consolas',monospace;padding:0 6px;}"
- "QPushButton:hover{background:#1e1e1e;border-color:#d97706;color:#d97706;}")
- .arg(auto_update_ ? "#22c55e" : "#505050",
- auto_update_ ? "#1a3a1a" : "#252525"));
- connect(auto_btn, &QPushButton::clicked, this, [this, auto_btn]() {
- auto_update_ = !auto_update_;
- auto_btn->setText(QString("[F9] %1").arg(auto_update_ ? "AUTO·ON" : "AUTO·OFF"));
+ auto* auto_btn = make_btn("F9", auto_update_ ? "AUTO ON" : "AUTO OFF");
+ auto update_auto_style = [this, auto_btn]() {
+ auto_btn->setText(QString("[F9] %1").arg(auto_update_ ? "AUTO ON" : "AUTO OFF"));
auto_btn->setStyleSheet(
- QString("QPushButton{background:#141414;color:%1;border:1px solid %2;"
- "font-size:11px;font-family:'Consolas',monospace;padding:0 6px;}"
- "QPushButton:hover{background:#1e1e1e;border-color:#d97706;color:#d97706;}")
- .arg(auto_update_ ? "#22c55e" : "#505050",
- auto_update_ ? "#1a3a1a" : "#252525"));
+ QString("QPushButton{background:%1;color:%2;border:1px solid %3;padding:0 8px;font-weight:bold;}"
+ "QPushButton:hover{background:%4;border-color:%5;color:%5;}")
+ .arg(ui::colors::BG_RAISED(),
+ auto_update_ ? ui::colors::POSITIVE() : ui::colors::TEXT_TERTIARY(),
+ auto_update_ ? ui::colors::POSITIVE() : ui::colors::BORDER_DIM(),
+ ui::colors::BG_HOVER(), ui::colors::AMBER()));
+ };
+ update_auto_style();
+ connect(auto_btn, &QPushButton::clicked, this, [this, update_auto_style]() {
+ auto_update_ = !auto_update_;
+ update_auto_style();
if (auto_update_) auto_refresh_timer_->start();
else auto_refresh_timer_->stop();
});
h->addWidget(auto_btn);
- // Interval combo styled as a terminal chip
auto* iv = new QComboBox;
iv->setFixedHeight(22);
iv->addItem("10m", 600000);
iv->addItem("15m", 900000);
iv->addItem("30m", 1800000);
iv->addItem("1h", 3600000);
- iv->setStyleSheet("QComboBox{background:#141414;color:#606060;border:1px solid #252525;"
- "padding:0 6px;font-size:11px;font-family:'Consolas',monospace;}"
- "QComboBox::drop-down{border:none;width:14px;}"
- "QComboBox QAbstractItemView{background:#141414;color:#909090;"
- "border:1px solid #252525;selection-background-color:#1e1e0a;}");
+ iv->setStyleSheet(
+ QString("QComboBox{background:%1;color:%2;border:1px solid %3;padding:0 6px;}"
+ "QComboBox::drop-down{border:none;width:14px;}"
+ "QComboBox QAbstractItemView{background:%1;color:%2;border:1px solid %3;"
+ "selection-background-color:%4;}")
+ .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_SECONDARY(),
+ ui::colors::BORDER_MED(), ui::colors::BG_HOVER()));
connect(iv, &QComboBox::currentIndexChanged, this, [this, iv](int i) {
update_interval_ms_ = iv->itemData(i).toInt();
auto_refresh_timer_->setInterval(update_interval_ms_);
});
h->addWidget(iv);
-
h->addStretch();
- // Last updated timestamp
- auto* updated_lbl = new QLabel("LAST UPDATE --:--:--");
- updated_lbl->setStyleSheet("color:#303030;font-size:11px;background:transparent;"
- "font-family:'Consolas',monospace;");
- h->addWidget(updated_lbl);
- last_update_label_ = updated_lbl;
+ last_update_label_ = new QLabel("LAST UPDATE --:--:--");
+ last_update_label_->setStyleSheet(lbl_ss(ui::colors::TEXT_DIM()));
+ h->addWidget(last_update_label_);
- h->addWidget(new QLabel(" ")); // spacer
+ h->addWidget(new QLabel(" "));
- // Status
status_label_ = new QLabel("● READY");
- status_label_->setStyleSheet("color:#22c55e;font-size:11px;font-weight:700;background:transparent;"
- "font-family:'Consolas',monospace;");
+ status_label_->setStyleSheet(lbl_ss(ui::colors::POSITIVE(), true));
h->addWidget(status_label_);
+
return w;
}
void MarketsScreen::refresh_all() {
- if (refresh_in_progress_)
- return;
+ if (refresh_in_progress_) return;
refresh_in_progress_ = true;
if (status_label_) {
status_label_->setText("● LOADING");
- status_label_->setStyleSheet("color:#d97706;font-size:11px;font-weight:700;background:transparent;"
- "font-family:'Consolas',monospace;");
+ status_label_->setStyleSheet(lbl_ss(ui::colors::AMBER(), true));
}
- for (auto* p : global_panels_)
- p->refresh();
- for (auto* p : regional_panels_)
- p->refresh();
+ for (auto* p : global_panels_) p->refresh();
+ for (auto* p : regional_panels_) p->refresh();
- // Panels handle their own overlay; update the status bar when done.
- // We use a single-shot approach: once all panels have emitted refresh_finished,
- // we mark the screen ready. Use a shared counter via lambda capture.
const int total = global_panels_.size() + regional_panels_.size();
- if (total == 0) {
- refresh_in_progress_ = false;
- return;
- }
+ if (total == 0) { refresh_in_progress_ = false; return; }
- auto* counter = new QObject(this);
+ auto* counter = new QObject(this);
auto* remaining = new int(total);
auto finish = [this, counter, remaining]() {
- --(*remaining);
- if (*remaining > 0)
- return;
+ if (--(*remaining) > 0) return;
refresh_in_progress_ = false;
delete remaining;
counter->deleteLater();
if (status_label_) {
status_label_->setText("● READY");
- status_label_->setStyleSheet("color:#22c55e;font-size:11px;font-weight:700;background:transparent;"
- "font-family:'Consolas',monospace;");
+ status_label_->setStyleSheet(lbl_ss(ui::colors::POSITIVE(), true));
}
if (last_update_label_) {
last_update_label_->setText(
QString("LAST UPDATE %1").arg(QDateTime::currentDateTime().toString("HH:mm:ss")));
- last_update_label_->setStyleSheet("color:#404040;font-size:11px;background:transparent;"
- "font-family:'Consolas',monospace;");
+ last_update_label_->setStyleSheet(lbl_ss(ui::colors::TEXT_SECONDARY()));
}
};
for (auto* p : global_panels_)
diff --git a/fincept-qt/src/screens/markets/MarketsScreen.h b/fincept-qt/src/screens/markets/MarketsScreen.h
index 995bbbacc..362be2b8d 100644
--- a/fincept-qt/src/screens/markets/MarketsScreen.h
+++ b/fincept-qt/src/screens/markets/MarketsScreen.h
@@ -33,6 +33,10 @@ class MarketsScreen : public QWidget {
QWidget* build_header();
QWidget* build_controls();
void refresh_all();
+ void refresh_theme();
+
+ QWidget* header_widget_ = nullptr;
+ QWidget* controls_widget_ = nullptr;
QLabel* last_update_label_ = nullptr;
};
diff --git a/fincept-qt/src/screens/mcp_servers/McpServersScreen.cpp b/fincept-qt/src/screens/mcp_servers/McpServersScreen.cpp
index 122c35a03..eed1084ac 100644
--- a/fincept-qt/src/screens/mcp_servers/McpServersScreen.cpp
+++ b/fincept-qt/src/screens/mcp_servers/McpServersScreen.cpp
@@ -9,6 +9,7 @@
#include "mcp/McpManager.h"
#include "mcp/McpProvider.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QCheckBox>
#include <QComboBox>
@@ -32,45 +33,45 @@
namespace {
using namespace fincept::ui;
-static const QString kStyle = QStringLiteral(
+inline QString kStyle() { return QString(
// Screen / header
"#mcpScreen { background: %1; }"
"#mcpHeader { background: %2; border-bottom: 2px solid %3; }"
- "#mcpHeaderTitle { color:%4; font-size:12px; font-weight:700; background:transparent; }"
+ "#mcpHeaderTitle { color:%4; font-weight:700; background:transparent; }"
// Tab buttons
"#mcpViewBtn { background:transparent; color:%5; border:1px solid %8; "
- " font-size:9px; font-weight:700; padding:4px 14px; }"
+ " font-weight:700; padding:4px 14px; }"
"#mcpViewBtn:hover { color:%4; border-color:%9; }"
"#mcpViewBtn[active=\"true\"] { background:%3; color:%1; border-color:%3; }"
// Search / refresh
"#mcpSearchInput { background:%1; color:%4; border:1px solid %8; "
- " padding:4px 8px; font-size:11px; min-width:200px; }"
+ " padding:4px 8px; min-width:200px; }"
"#mcpSearchInput:focus { border-color:%9; }"
"#mcpRefreshBtn { background:%7; color:%5; border:1px solid %8; "
- " padding:4px 10px; font-size:9px; font-weight:700; }"
+ " padding:4px 10px; font-weight:700; }"
"#mcpRefreshBtn:hover { color:%4; }"
// ── Marketplace cards ──
"#mktCard { background:%7; border:1px solid %8; min-height:130px; }"
"#mktCard:hover { border-color:%9; }"
- "#mktCardName { color:%4; font-size:11px; font-weight:700; background:transparent; }"
- "#mktCardDesc { color:%5; font-size:10px; background:transparent; }"
- "#mktCardCmd { color:%13; font-size:9px; font-family:monospace; background:transparent; }"
- "#mktCardEnv { color:%3; font-size:9px; background:transparent; }"
- "#mktCatBadge { color:%3; font-size:8px; font-weight:700; "
+ "#mktCardName { color:%4; font-weight:700; background:transparent; }"
+ "#mktCardDesc { color:%5; background:transparent; }"
+ "#mktCardCmd { color:%13; font-family:monospace; background:transparent; }"
+ "#mktCardEnv { color:%3; background:transparent; }"
+ "#mktCatBadge { color:%3; font-weight:700; "
" background:rgba(217,119,6,0.12); padding:1px 6px; border:1px solid rgba(217,119,6,0.3); }"
"#mktAddBtn { background:%3; color:%1; border:none; padding:5px 16px; "
- " font-size:9px; font-weight:700; }"
- "#mktAddBtn:hover { background:#FF8800; }"
- "#mktInstalledBadge { color:%6; font-size:9px; font-weight:700; "
+ " font-weight:700; }"
+ "#mktAddBtn:hover { background:%10; }"
+ "#mktInstalledBadge { color:%6; font-weight:700; "
" background:rgba(22,163,74,0.12); padding:5px 12px; border:1px solid rgba(22,163,74,0.3); }"
// Category filter sidebar
"#catList { background:%2; border:none; outline:none; }"
- "#catList::item { color:%5; font-size:9px; font-weight:700; padding:6px 12px; }"
+ "#catList::item { color:%5; font-weight:700; padding:6px 12px; }"
"#catList::item:hover { color:%4; background:%12; }"
"#catList::item:selected { color:%3; background:rgba(217,119,6,0.1); "
" border-left:2px solid %3; }"
@@ -78,56 +79,56 @@ static const QString kStyle = QStringLiteral(
// ── Installed server cards ──
"#srvCard { background:%7; border:1px solid %8; margin:4px 0px; }"
"#srvCard:hover { border-color:%9; }"
- "#srvCardName { color:%4; font-size:12px; font-weight:700; background:transparent; }"
- "#srvCardDesc { color:%5; font-size:10px; background:transparent; }"
- "#srvCardCmd { color:%13; font-size:9px; font-family:monospace; background:transparent; }"
- "#srvCardCat { color:%5; font-size:9px; background:transparent; }"
- "#pillRunning { color:%6; font-size:9px; font-weight:700; "
+ "#srvCardName { color:%4; font-weight:700; background:transparent; }"
+ "#srvCardDesc { color:%5; background:transparent; }"
+ "#srvCardCmd { color:%13; font-family:monospace; background:transparent; }"
+ "#srvCardCat { color:%5; background:transparent; }"
+ "#pillRunning { color:%6; font-weight:700; "
" background:rgba(22,163,74,0.15); padding:2px 10px; "
" border:1px solid rgba(22,163,74,0.4); }"
- "#pillStopped { color:%14; font-size:9px; font-weight:700; "
+ "#pillStopped { color:%14; font-weight:700; "
" background:rgba(220,38,38,0.10); padding:2px 10px; "
" border:1px solid rgba(220,38,38,0.4); }"
- "#pillError { color:%14; font-size:9px; font-weight:700; "
+ "#pillError { color:%14; font-weight:700; "
" background:rgba(220,38,38,0.10); padding:2px 10px; "
" border:1px solid rgba(220,38,38,0.4); }"
- "#pillAutoOn { color:%6; font-size:8px; background:transparent; }"
- "#pillAutoOff { color:%11; font-size:8px; background:transparent; }"
+ "#pillAutoOn { color:%6; background:transparent; }"
+ "#pillAutoOff { color:%11; background:transparent; }"
// Inline card buttons
"#cardToggleOn { background:rgba(22,163,74,0.15); color:%6; "
" border:1px solid rgba(22,163,74,0.5); "
- " padding:4px 12px; font-size:9px; font-weight:700; }"
+ " padding:4px 12px; font-weight:700; }"
"#cardToggleOn:hover { background:rgba(22,163,74,0.25); }"
"#cardToggleOff { background:%7; color:%5; border:1px solid %8; "
- " padding:4px 12px; font-size:9px; font-weight:700; }"
+ " padding:4px 12px; font-weight:700; }"
"#cardToggleOff:hover { color:%4; border-color:%9; }"
"#cardLogsBtn { background:transparent; color:%5; border:1px solid %8; "
- " padding:4px 12px; font-size:9px; font-weight:700; }"
+ " padding:4px 12px; font-weight:700; }"
"#cardLogsBtn:hover { color:%4; }"
"#cardRemoveBtn { background:transparent; color:%14; border:1px solid %14; "
- " padding:4px 12px; font-size:9px; font-weight:700; }"
+ " padding:4px 12px; font-weight:700; }"
"#cardRemoveBtn:hover { background:rgba(220,38,38,0.12); }"
// Add server button (full-width sticky)
"#addSrvBtn { background:%3; color:%1; border:none; "
- " padding:8px; font-size:10px; font-weight:700; }"
- "#addSrvBtn:hover { background:#FF8800; }"
+ " padding:8px; font-weight:700; }"
+ "#addSrvBtn:hover { background:%10; }"
// Log expander inside card
- "QTextEdit { background:%1; color:%13; border:none; font-size:10px; font-family:monospace; }"
+ "QTextEdit { background:%1; color:%13; border:none; font-family:monospace; }"
// Tools table
- "QTableWidget { background:%1; color:%4; border:none; gridline-color:%8; font-size:11px; }"
+ "QTableWidget { background:%1; color:%4; border:none; gridline-color:%8; }"
"QTableWidget::item { padding:2px 6px; border-bottom:1px solid %8; }"
"QHeaderView::section { background:%2; color:%5; border:none; "
" border-bottom:1px solid %8; border-right:1px solid %8; "
- " padding:4px 6px; font-size:10px; font-weight:700; }"
+ " padding:4px 6px; font-weight:700; }"
// Status bar
"#mcpStatusBar { background:%2; border-top:1px solid %8; }"
- "#mcpStatusText { color:%5; font-size:9px; background:transparent; }"
- "#mcpStatusHighlight { color:%13; font-size:9px; background:transparent; }"
+ "#mcpStatusText { color:%5; background:transparent; }"
+ "#mcpStatusHighlight { color:%13; background:transparent; }"
// Scroll
"QScrollBar:vertical { background:%1; width:6px; }"
@@ -149,7 +150,8 @@ static const QString kStyle = QStringLiteral(
.arg(colors::BG_HOVER) // %12
.arg(colors::CYAN) // %13
.arg(colors::NEGATIVE) // %14
-;
+; }
+
} // namespace
namespace fincept::screens {
@@ -202,7 +204,9 @@ static const QList<MarketplaceEntry> g_catalog = {
McpServersScreen::McpServersScreen(QWidget* parent) : QWidget(parent) {
setObjectName("mcpScreen");
- setStyleSheet(kStyle);
+ setStyleSheet(kStyle());
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) { setStyleSheet(kStyle()); });
setup_ui();
connect(&McpManager::instance(), &McpManager::servers_changed, this, [this]() {
diff --git a/fincept-qt/src/screens/news/NewsCommandBar.cpp b/fincept-qt/src/screens/news/NewsCommandBar.cpp
index cda94fdd2..cad1b91f8 100644
--- a/fincept-qt/src/screens/news/NewsCommandBar.cpp
+++ b/fincept-qt/src/screens/news/NewsCommandBar.cpp
@@ -1,12 +1,18 @@
#include "screens/news/NewsCommandBar.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QStyle>
namespace fincept::screens {
NewsCommandBar::NewsCommandBar(QWidget* parent) : QWidget(parent) {
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) {
+ setStyleSheet(QString("background:%1;color:%2;")
+ .arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY()));
+ });
setObjectName("newsCommandBar");
setFixedHeight(32);
@@ -49,7 +55,7 @@ NewsCommandBar::NewsCommandBar(QWidget* parent) : QWidget(parent) {
root->addSpacing(4);
// Time range pills
- QStringList time_ranges = {"1H", "6H", "24H", "48H", "7D"};
+ QStringList time_ranges = {"1H", "6H", "24H", "48H", "7D", "30D"};
for (const auto& tr : time_ranges) {
auto* btn = make_pill(tr, tr, root);
time_btns_.append(btn);
diff --git a/fincept-qt/src/screens/news/NewsDetailPanel.cpp b/fincept-qt/src/screens/news/NewsDetailPanel.cpp
index 194b84d22..8eaeaa985 100644
--- a/fincept-qt/src/screens/news/NewsDetailPanel.cpp
+++ b/fincept-qt/src/screens/news/NewsDetailPanel.cpp
@@ -2,7 +2,9 @@
#include "core/logging/Logger.h"
#include "services/file_manager/FileManagerService.h"
+#include "storage/repositories/NewsArticleRepository.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QApplication>
#include <QClipboard>
@@ -19,6 +21,11 @@
namespace fincept::screens {
NewsDetailPanel::NewsDetailPanel(QWidget* parent) : QWidget(parent) {
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) {
+ setStyleSheet(QString("background:%1;color:%2;")
+ .arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY()));
+ });
setObjectName("newsDetailPanel");
setFixedWidth(340);
@@ -146,10 +153,17 @@ QWidget* NewsDetailPanel::build_content_view() {
save_btn_->setFixedHeight(24);
save_btn_->setToolTip("Save article to File Manager");
+ bookmark_btn_ = new QPushButton("BOOKMARK", content);
+ bookmark_btn_->setObjectName("newsDetailSaveBtn");
+ bookmark_btn_->setFixedHeight(24);
+ bookmark_btn_->setToolTip("Bookmark article");
+ bookmark_btn_->setCheckable(true);
+
action_layout->addWidget(open_btn_);
action_layout->addWidget(copy_btn_);
action_layout->addWidget(analyze_btn_);
action_layout->addWidget(save_btn_);
+ action_layout->addWidget(bookmark_btn_);
layout->addWidget(actions);
connect(open_btn_, &QPushButton::clicked, this, [this]() {
@@ -194,6 +208,11 @@ QWidget* NewsDetailPanel::build_content_view() {
LOG_INFO("News", "Saved article: " + stored_name);
}
});
+ connect(bookmark_btn_, &QPushButton::clicked, this, [this]() {
+ if (!has_article_)
+ return;
+ emit bookmark_requested(current_article_);
+ });
// Translate button
translate_btn_ = new QPushButton("TRANSLATE", content);
@@ -388,14 +407,14 @@ void NewsDetailPanel::show_article(const services::NewsArticle& article) {
// Source with credibility flag
if (article.source_flag != services::SourceFlag::NONE) {
QString flag_text = services::NewsService::source_flag_label(article.source_flag);
- QString flag_color = article.source_flag == services::SourceFlag::STATE_MEDIA ? "#f97316" : ui::colors::WARNING();
+ QString flag_color = article.source_flag == services::SourceFlag::STATE_MEDIA ? "" + QString(ui::colors::WARNING()) + "" : ui::colors::WARNING();
source_label_->setText(article.source.toUpper() + " [" + flag_text + "]");
source_label_->setStyleSheet(
- QString("color: %1; font-size: 12px; font-weight: 700; background: transparent;").arg(flag_color));
+ QString("color: %1; font-weight: 700; background: transparent;").arg(flag_color));
} else {
source_label_->setText(article.source.toUpper());
source_label_->setStyleSheet(
- QString("color: %1; font-size: 12px; font-weight: 700; background: transparent;").arg(ui::colors::CYAN));
+ QString("color: %1; font-weight: 700; background: transparent;").arg(ui::colors::CYAN));
}
// Threat classification in impact label
@@ -405,7 +424,7 @@ void NewsDetailPanel::show_article(const services::NewsArticle& article) {
impact_label_->setText(QString("Threat: %1 (%2, %3% conf)")
.arg(threat_text, article.threat.category)
.arg(static_cast<int>(article.threat.confidence * 100)));
- impact_label_->setStyleSheet(QString("color: %1; font-size: 11px; background: transparent;").arg(threat_color));
+ impact_label_->setStyleSheet(QString("color: %1; background: transparent;").arg(threat_color));
}
summary_label_->setText(article.summary.isEmpty() ? "No summary available." : article.summary);
impact_label_->setText(QString("Impact: %1").arg(services::impact_string(article.impact)));
@@ -421,6 +440,19 @@ void NewsDetailPanel::show_article(const services::NewsArticle& article) {
analyze_btn_->setEnabled(true);
analyze_timeout_->stop();
+ // Reflect saved state from DB
+ {
+ auto r = fincept::NewsArticleRepository::instance().load_saved();
+ bool is_saved = false;
+ if (r.is_ok()) {
+ for (const auto& a : r.value()) {
+ if (a.id == article.id) { is_saved = true; break; }
+ }
+ }
+ bookmark_btn_->setChecked(is_saved);
+ bookmark_btn_->setText(is_saved ? "BOOKMARKED" : "BOOKMARK");
+ }
+
// Clear related and monitors
show_related({});
monitor_section_->hide();
diff --git a/fincept-qt/src/screens/news/NewsDetailPanel.h b/fincept-qt/src/screens/news/NewsDetailPanel.h
index 5665ec16e..f92d1060f 100644
--- a/fincept-qt/src/screens/news/NewsDetailPanel.h
+++ b/fincept-qt/src/screens/news/NewsDetailPanel.h
@@ -32,6 +32,7 @@ class NewsDetailPanel : public QWidget {
void related_article_clicked(const services::NewsArticle& article);
void open_in_browser(const QString& url);
void copy_url(const QString& url);
+ void bookmark_requested(const services::NewsArticle& article);
private:
QWidget* build_empty_state();
@@ -80,9 +81,10 @@ class NewsDetailPanel : public QWidget {
QVBoxLayout* infra_layout_ = nullptr;
// Action buttons
- QPushButton* open_btn_ = nullptr;
- QPushButton* copy_btn_ = nullptr;
- QPushButton* save_btn_ = nullptr;
+ QPushButton* open_btn_ = nullptr;
+ QPushButton* copy_btn_ = nullptr;
+ QPushButton* save_btn_ = nullptr;
+ QPushButton* bookmark_btn_ = nullptr;
QStackedWidget* stack_ = nullptr;
services::NewsArticle current_article_;
diff --git a/fincept-qt/src/screens/news/NewsFeedDelegate.cpp b/fincept-qt/src/screens/news/NewsFeedDelegate.cpp
index 526988ed6..bb60a4380 100644
--- a/fincept-qt/src/screens/news/NewsFeedDelegate.cpp
+++ b/fincept-qt/src/screens/news/NewsFeedDelegate.cpp
@@ -3,6 +3,7 @@
#include "screens/news/NewsFeedModel.h"
#include "services/news/NewsService.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QPainter>
#include <QStyleOptionViewItem>
@@ -120,27 +121,30 @@ void NewsFeedDelegate::paint_wire_row(QPainter* painter, const QRect& rect, cons
}
x += 12;
+ // Pre-formatted strings from model — zero allocation in paint path
+ const QString source = index.data(FormattedSourceRole).toString();
+ const QString lang_badge = index.data(FormattedLangRole).toString();
+ const QString threat_label = index.data(FormattedThreatRole).toString();
+ const QString tickers_str = index.data(FormattedTickersRole).toString();
+ const QString threat_color = index.data(ThreatColorRole).toString();
+
// Source name
painter->setFont(bold_font_);
painter->setPen(QColor(ui::colors::CYAN()));
- QString source = article.source.left(10).toUpper();
painter->drawText(QRect(x, rect.top(), 72, rect.height()), Qt::AlignVCenter | Qt::AlignLeft, source);
x += 76;
// Language badge (if not English)
- if (!article.lang.isEmpty() && article.lang != "en") {
+ if (!lang_badge.isEmpty()) {
painter->setFont(tiny_font_);
painter->setPen(QColor(ui::colors::TEXT_DIM()));
- QString lang_badge = article.lang.toUpper();
painter->drawText(QRect(x, rect.top(), 20, rect.height()), Qt::AlignVCenter | Qt::AlignCenter, lang_badge);
x += 22;
}
// Threat level left border (for MEDIUM+ threats)
- if (article.threat.level != services::ThreatLevel::INFO && article.threat.level != services::ThreatLevel::LOW) {
- QString tcolor = services::threat_level_color(article.threat.level);
- painter->fillRect(QRect(rect.left(), rect.top(), 2, rect.height()), QColor(tcolor));
- }
+ if (!threat_color.isEmpty())
+ painter->fillRect(QRect(rect.left(), rect.top(), 2, rect.height()), QColor(threat_color));
// Headline — fills remaining space
painter->setFont(data_font_);
@@ -155,7 +159,7 @@ void NewsFeedDelegate::paint_wire_row(QPainter* painter, const QRect& rect, cons
int right_reserve = 140; // space for credibility + threat + sentiment + tickers
int headline_width = rect.right() - x - right_reserve;
if (headline_width > 0) {
- QFontMetrics& fm = is_hot ? const_cast<QFontMetrics&>(bold_fm_) : const_cast<QFontMetrics&>(data_fm_);
+ QFontMetrics& fm = is_hot ? bold_fm_ : data_fm_;
QString elided = fm.elidedText(article.headline, Qt::ElideRight, headline_width);
painter->drawText(QRect(x, rect.top(), headline_width, rect.height()), Qt::AlignVCenter | Qt::AlignLeft,
elided);
@@ -177,14 +181,12 @@ void NewsFeedDelegate::paint_wire_row(QPainter* painter, const QRect& rect, cons
}
}
- // Threat level badge (only for MEDIUM+)
- if (article.threat.level != services::ThreatLevel::INFO && article.threat.level != services::ThreatLevel::LOW) {
+ // Threat level badge (only for MEDIUM+) — pre-formatted, no allocation
+ if (!threat_label.isEmpty()) {
painter->setFont(tiny_font_);
- QString tcolor = services::threat_level_color(article.threat.level);
- painter->setPen(QColor(tcolor));
- QString tlabel = services::threat_level_string(article.threat.level).left(4);
- painter->drawText(QPoint(x, text_y), tlabel);
- x += tiny_fm_.horizontalAdvance(tlabel) + 4;
+ painter->setPen(QColor(threat_color));
+ painter->drawText(QPoint(x, text_y), threat_label);
+ x += tiny_fm_.horizontalAdvance(threat_label) + 4;
}
// Sentiment arrow
@@ -201,13 +203,12 @@ void NewsFeedDelegate::paint_wire_row(QPainter* painter, const QRect& rect, cons
}
x += 16;
- // Tickers (up to 2)
- painter->setFont(tiny_font_);
- painter->setPen(QColor(ui::colors::WARNING()));
- for (int i = 0; i < std::min(2, static_cast<int>(article.tickers.size())); ++i) {
- QString ticker = "$" + article.tickers[i];
- painter->drawText(QPoint(x, text_y), ticker);
- x += tiny_fm_.horizontalAdvance(ticker) + 6;
+ // Tickers — pre-joined string "$AAPL $MSFT", no allocation in paint
+ if (!tickers_str.isEmpty()) {
+ painter->setFont(tiny_font_);
+ painter->setPen(QColor(ui::colors::WARNING()));
+ painter->drawText(QPoint(x, text_y), tickers_str);
+ x += tiny_fm_.horizontalAdvance(tickers_str) + 6;
}
// Bottom border
diff --git a/fincept-qt/src/screens/news/NewsFeedDelegate.h b/fincept-qt/src/screens/news/NewsFeedDelegate.h
index 996eda4f6..402a747d0 100644
--- a/fincept-qt/src/screens/news/NewsFeedDelegate.h
+++ b/fincept-qt/src/screens/news/NewsFeedDelegate.h
@@ -24,9 +24,9 @@ class NewsFeedDelegate : public QStyledItemDelegate {
QFont data_font_;
QFont bold_font_;
QFont tiny_font_;
- QFontMetrics data_fm_;
- QFontMetrics bold_fm_;
- QFontMetrics tiny_fm_;
+ mutable QFontMetrics data_fm_;
+ mutable QFontMetrics bold_fm_;
+ mutable QFontMetrics tiny_fm_;
};
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/news/NewsFeedModel.cpp b/fincept-qt/src/screens/news/NewsFeedModel.cpp
index bec110c78..251307ba2 100644
--- a/fincept-qt/src/screens/news/NewsFeedModel.cpp
+++ b/fincept-qt/src/screens/news/NewsFeedModel.cpp
@@ -1,6 +1,9 @@
#include "screens/news/NewsFeedModel.h"
#include "core/logging/Logger.h"
+#include "services/news/NewsService.h"
+
+#include <QStringList>
namespace fincept::screens {
@@ -51,6 +54,19 @@ QVariant NewsFeedModel::data(const QModelIndex& index, int role) const {
return geo_article_ids_.contains(article.id);
case PulsePhaseRole:
return (!seen_ids_.contains(article.id)) ? pulse_phase_ : -1;
+ // Pre-formatted display strings — no allocation in paint()
+ case FormattedSourceRole:
+ return row < formatted_rows_.size() ? formatted_rows_[row].source : QVariant{};
+ case FormattedLangRole:
+ return row < formatted_rows_.size() ? formatted_rows_[row].lang : QVariant{};
+ case FormattedThreatRole:
+ return row < formatted_rows_.size() ? formatted_rows_[row].threat : QVariant{};
+ case FormattedTickersRole:
+ return row < formatted_rows_.size() ? formatted_rows_[row].tickers : QVariant{};
+ case ThreatColorRole:
+ return row < formatted_rows_.size() ? formatted_rows_[row].threat_color : QVariant{};
+ case PriorityColorRole:
+ return row < formatted_rows_.size() ? formatted_rows_[row].priority_color : QVariant{};
default:
return {};
}
@@ -90,12 +106,54 @@ QVariant NewsFeedModel::data(const QModelIndex& index, int role) const {
void NewsFeedModel::set_wire_articles(const QVector<services::NewsArticle>& articles) {
beginResetModel();
articles_ = articles;
+
+ // Rebuild O(1) lookup cache, incremental unseen counter, and pre-formatted rows
+ article_id_to_row_.clear();
+ article_id_to_row_.reserve(articles.size());
+ formatted_rows_.clear();
+ formatted_rows_.reserve(articles.size());
+ unseen_count_ = 0;
+
+ for (int i = 0; i < articles.size(); ++i) {
+ const auto& a = articles[i];
+ article_id_to_row_.insert(a.id, i);
+ if (!seen_ids_.contains(a.id))
+ ++unseen_count_;
+
+ // Pre-format once — avoids allocation in paint() on every frame
+ FormattedRow fr;
+ fr.source = a.source.left(10).toUpper();
+ fr.lang = (a.lang.isEmpty() || a.lang == "en") ? QString() : a.lang.toUpper();
+ const bool show_threat = a.threat.level != services::ThreatLevel::INFO &&
+ a.threat.level != services::ThreatLevel::LOW;
+ fr.threat = show_threat ? services::threat_level_string(a.threat.level).left(4) : QString();
+ fr.threat_color = show_threat ? services::threat_level_color(a.threat.level) : QString();
+ fr.priority_color = services::priority_color(a.priority);
+
+ // Pre-join tickers: "$AAPL $MSFT" (up to 2)
+ QStringList ticker_parts;
+ for (int t = 0; t < std::min(2, static_cast<int>(a.tickers.size())); ++t)
+ ticker_parts << ('$' + a.tickers[t]);
+ fr.tickers = ticker_parts.join(' ');
+
+ formatted_rows_.append(std::move(fr));
+ }
+
endResetModel();
}
void NewsFeedModel::set_clusters(const QVector<services::NewsCluster>& clusters) {
beginResetModel();
clusters_ = clusters;
+ // Rebuild O(1) lookup cache and incremental unseen counter
+ cluster_id_to_row_.clear();
+ cluster_id_to_row_.reserve(clusters.size());
+ unseen_count_ = 0;
+ for (int i = 0; i < clusters.size(); ++i) {
+ cluster_id_to_row_.insert(clusters[i].lead_article.id, i);
+ if (!seen_ids_.contains(clusters[i].lead_article.id))
+ ++unseen_count_;
+ }
endResetModel();
}
@@ -140,12 +198,13 @@ void NewsFeedModel::set_monitor_matches(const QMap<QString, QVector<services::Ne
void NewsFeedModel::mark_all_seen() {
if (view_mode_ == "WIRE") {
- for (const auto& a : articles_)
+ for (const auto& a : std::as_const(articles_))
seen_ids_.insert(a.id);
} else {
- for (const auto& c : clusters_)
+ for (const auto& c : std::as_const(clusters_))
seen_ids_.insert(c.lead_article.id);
}
+ unseen_count_ = 0;
emit dataChanged(index(0, 0), index(rowCount() - 1, 0), {IsNewRole});
}
@@ -153,40 +212,28 @@ void NewsFeedModel::mark_seen(const QString& article_id) {
if (seen_ids_.contains(article_id))
return;
seen_ids_.insert(article_id);
- auto idx = index_for_article(article_id);
+ if (unseen_count_ > 0)
+ --unseen_count_;
+ const auto idx = index_for_article(article_id);
if (idx.isValid())
- emit dataChanged(idx, idx, {IsNewRole});
+ emit dataChanged(idx, idx, {IsNewRole, PulsePhaseRole});
}
int NewsFeedModel::unseen_count() const {
- int count = 0;
- if (view_mode_ == "WIRE") {
- for (const auto& a : articles_) {
- if (!seen_ids_.contains(a.id))
- ++count;
- }
- } else {
- for (const auto& c : clusters_) {
- if (!seen_ids_.contains(c.lead_article.id))
- ++count;
- }
- }
- return count;
+ return unseen_count_; // O(1) — maintained incrementally
}
QModelIndex NewsFeedModel::index_for_article(const QString& article_id) const {
if (article_id.isEmpty())
return {};
if (view_mode_ == "WIRE") {
- for (int i = 0; i < articles_.size(); ++i) {
- if (articles_[i].id == article_id)
- return index(i, 0);
- }
+ const auto it = article_id_to_row_.find(article_id);
+ if (it != article_id_to_row_.end())
+ return index(it.value(), 0);
} else {
- for (int i = 0; i < clusters_.size(); ++i) {
- if (clusters_[i].lead_article.id == article_id)
- return index(i, 0);
- }
+ const auto it = cluster_id_to_row_.find(article_id);
+ if (it != cluster_id_to_row_.end())
+ return index(it.value(), 0);
}
return {};
}
diff --git a/fincept-qt/src/screens/news/NewsFeedModel.h b/fincept-qt/src/screens/news/NewsFeedModel.h
index 6244330df..3e0df2fa4 100644
--- a/fincept-qt/src/screens/news/NewsFeedModel.h
+++ b/fincept-qt/src/screens/news/NewsFeedModel.h
@@ -4,6 +4,7 @@
#include "services/news/NewsService.h"
#include <QAbstractListModel>
+#include <QHash>
#include <QSet>
#include <QVector>
@@ -24,6 +25,14 @@ enum NewsFeedRole {
LanguageRole,
HasGeoRole,
PulsePhaseRole,
+ // Pre-formatted display strings — computed once in set_wire_articles,
+ // read directly in paint() to avoid per-frame allocations (P7/Per.19)
+ FormattedSourceRole, // source.left(10).toUpper()
+ FormattedLangRole, // lang.toUpper()
+ FormattedThreatRole, // threat_level_string().left(4)
+ FormattedTickersRole, // "$AAPL $MSFT" pre-joined string
+ ThreatColorRole, // threat_level_color() string
+ PriorityColorRole, // priority_color() string
};
/// QAbstractListModel holding article/cluster data for QListView.
@@ -62,10 +71,24 @@ class NewsFeedModel : public QAbstractListModel {
QVector<services::NewsCluster> clusters_;
QString view_mode_ = "WIRE";
QString selected_id_;
- QSet<QString> seen_ids_;
- QMap<QString, QString> article_monitor_color_;
+ QSet<QString> seen_ids_;
+ QHash<QString, int> article_id_to_row_; // O(1) index lookup for WIRE mode
+ QHash<QString, int> cluster_id_to_row_; // O(1) index lookup for CLUSTERS mode
+ QHash<QString, QString> article_monitor_color_; // O(1) vs QMap's O(log n)
QSet<QString> geo_article_ids_;
- int pulse_phase_ = 0; // 0-3 for animation cycle
+ int pulse_phase_ = 0; // 0-3 for animation cycle
+ int unseen_count_ = 0; // incremental counter, avoids O(n) scan
+
+ // Per-row pre-formatted display strings — avoids string allocations in paint()
+ struct FormattedRow {
+ QString source; // source.left(10).toUpper()
+ QString lang; // lang.toUpper()
+ QString threat; // threat_level_string().left(4) or ""
+ QString tickers; // "$AAPL $MSFT" or ""
+ QString threat_color;
+ QString priority_color;
+ };
+ QVector<FormattedRow> formatted_rows_;
};
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/news/NewsFeedPanel.cpp b/fincept-qt/src/screens/news/NewsFeedPanel.cpp
index 0301bbf4c..adf2b2fa3 100644
--- a/fincept-qt/src/screens/news/NewsFeedPanel.cpp
+++ b/fincept-qt/src/screens/news/NewsFeedPanel.cpp
@@ -2,6 +2,7 @@
#include "core/logging/Logger.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QApplication>
#include <QDateTime>
@@ -15,6 +16,11 @@
namespace fincept::screens {
NewsFeedPanel::NewsFeedPanel(QWidget* parent) : QWidget(parent) {
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) {
+ setStyleSheet(QString("background:%1;color:%2;")
+ .arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY()));
+ });
setObjectName("newsFeedPanel");
auto* root = new QVBoxLayout(this);
diff --git a/fincept-qt/src/screens/news/NewsScreen.cpp b/fincept-qt/src/screens/news/NewsScreen.cpp
index 1dfb7c719..431207a22 100644
--- a/fincept-qt/src/screens/news/NewsScreen.cpp
+++ b/fincept-qt/src/screens/news/NewsScreen.cpp
@@ -1,6 +1,9 @@
#include "screens/news/NewsScreen.h"
#include "core/logging/Logger.h"
+#include "services/notifications/NotificationService.h"
+#include "storage/repositories/NewsArticleRepository.h"
+#include "storage/repositories/SettingsRepository.h"
#include "screens/news/NewsCommandBar.h"
#include "screens/news/NewsDetailPanel.h"
#include "screens/news/NewsFeedPanel.h"
@@ -10,6 +13,7 @@
#include "services/news/NewsNlpService.h"
#include "ui/theme/StyleSheets.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QDateTime>
#include <QDesktopServices>
@@ -28,6 +32,11 @@
namespace fincept::screens {
NewsScreen::NewsScreen(QWidget* parent) : QWidget(parent) {
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) {
+ setStyleSheet(QString("background:%1;color:%2;")
+ .arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY()));
+ });
setObjectName("newsScreen");
setStyleSheet(ui::styles::news_screen_styles());
@@ -117,6 +126,15 @@ void NewsScreen::connect_signals() {
// Detail panel
connect(detail_panel_, &NewsDetailPanel::analyze_requested, this, &NewsScreen::on_analyze_requested);
+ connect(detail_panel_, &NewsDetailPanel::bookmark_requested, this, [this](const services::NewsArticle& article) {
+ auto r = fincept::NewsArticleRepository::instance().toggle_saved(article.id);
+ if (r.is_ok()) {
+ // Refresh saved section in side panel
+ auto saved_r = fincept::NewsArticleRepository::instance().load_saved();
+ if (saved_r.is_ok())
+ side_panel_->update_saved(saved_r.value());
+ }
+ });
// RTL toggle
connect(command_bar_, &NewsCommandBar::rtl_toggled, this, []() { ui::set_rtl(!ui::is_rtl()); });
@@ -146,18 +164,44 @@ void NewsScreen::connect_signals() {
});
// Started/stopped in showEvent/hideEvent (P3 compliance)
- // Scroll-based seen tracking
+ // Debounced DB seen-write timer: flushes pending_seen_ids_ every 1s
+ // so scroll events never do synchronous DB I/O on the UI thread.
+ seen_flush_timer_ = new QTimer(this);
+ seen_flush_timer_->setInterval(1000);
+ seen_flush_timer_->setSingleShot(true);
+ connect(seen_flush_timer_, &QTimer::timeout, this, [this]() {
+ if (pending_seen_ids_.isEmpty())
+ return;
+ // Move to local copy and clear, then write in one transaction
+ const QSet<QString> ids = std::move(pending_seen_ids_);
+ pending_seen_ids_.clear();
+ QPointer<NewsScreen> self = this;
+ QtConcurrent::run([ids, self]() {
+ for (const auto& id : ids)
+ fincept::NewsArticleRepository::instance().mark_seen(id);
+ if (self) {
+ QMetaObject::invokeMethod(self, [self]() {
+ if (self)
+ LOG_DEBUG("NewsScreen", QString("Flushed %1 seen IDs to DB").arg(0));
+ }, Qt::QueuedConnection);
+ }
+ });
+ });
+
+ // Scroll-based seen tracking — model update is instant, DB write is batched
connect(feed_panel_->list_view()->verticalScrollBar(), &QScrollBar::valueChanged, this, [this]() {
- // Mark visible articles as seen
auto* lv = feed_panel_->list_view();
+ const QRect viewport_rect = lv->viewport()->rect();
for (int i = 0; i < feed_panel_->model()->rowCount(); ++i) {
- auto idx = feed_panel_->model()->index(i, 0);
- auto item_rect = lv->visualRect(idx);
- if (item_rect.intersects(lv->viewport()->rect())) {
- auto article = feed_panel_->model()->article_at(i);
- feed_panel_->model()->mark_seen(article.id);
+ const auto idx = feed_panel_->model()->index(i, 0);
+ if (lv->visualRect(idx).intersects(viewport_rect)) {
+ const QString id = feed_panel_->model()->article_at(i).id;
+ feed_panel_->model()->mark_seen(id);
+ pending_seen_ids_.insert(id);
}
}
+ if (!pending_seen_ids_.isEmpty())
+ seen_flush_timer_->start(); // restart 1s debounce window
});
// Summarize button
@@ -218,6 +262,25 @@ void NewsScreen::showEvent(QShowEvent* e) {
if (first_show_) {
first_show_ = false;
+
+ // Ensure optional columns exist (idempotent, safe on every launch)
+ fincept::NewsArticleRepository::instance().ensure_seen_column();
+ fincept::NewsArticleRepository::instance().ensure_saved_column();
+
+ // Pre-populate seen state from DB so previously-read articles
+ // don't show the "new" glow after restart (last 30 days only)
+ int64_t since_ts = QDateTime::currentSecsSinceEpoch() - (30LL * 86400);
+ auto seen_result = fincept::NewsArticleRepository::instance().load_seen_ids(since_ts);
+ if (seen_result.is_ok()) {
+ for (const auto& id : seen_result.value())
+ feed_panel_->model()->mark_seen(id);
+ }
+
+ // Pre-populate saved/bookmarked articles in side panel
+ auto saved_result = fincept::NewsArticleRepository::instance().load_saved();
+ if (saved_result.is_ok())
+ side_panel_->update_saved(saved_result.value());
+
on_refresh();
}
}
@@ -451,14 +514,46 @@ void NewsScreen::apply_filters_async() {
QPointer<NewsScreen> self = this;
auto articles_copy = all_articles_;
- auto category = active_category_;
- auto time_range = time_range_;
- auto search = search_query_;
- auto sort = sort_mode_;
- auto variant = active_variant_;
+ const QString category = active_category_;
+ const QString time_range = time_range_;
+ const QString search_lower = search_query_.toLower(); // pre-lowercase once
+ const QString sort = sort_mode_;
+ const QString variant = active_variant_;
int visible_count = visible_article_count_;
- QtConcurrent::run([self, gen, articles_copy, category, time_range, search, sort, variant, visible_count]() {
+ // For 7D / 30D ranges, merge DB history with the current RSS batch so
+ // articles that aged out of the cache are still visible.
+ // Build live_ids once and reuse for both FTS and full-load paths.
+ if (time_range == "7D" || time_range == "30D") {
+ const int64_t window_sec = (time_range == "30D") ? (30LL * 86400) : (7LL * 86400);
+ const int64_t cutoff = QDateTime::currentSecsSinceEpoch() - window_sec;
+
+ // Build ID set once
+ QSet<QString> live_ids;
+ live_ids.reserve(articles_copy.size());
+ for (const auto& a : std::as_const(articles_copy))
+ live_ids.insert(a.id);
+
+ auto merge_into = [&](const QVector<services::NewsArticle>& extras) {
+ for (const auto& a : extras)
+ if (!live_ids.contains(a.id))
+ articles_copy.append(a);
+ };
+
+ if (!search_lower.isEmpty()) {
+ auto fts_result = fincept::NewsArticleRepository::instance().search_fts(
+ search_lower, cutoff, 1000);
+ if (fts_result.is_ok())
+ merge_into(fts_result.value());
+ } else {
+ auto db_result = fincept::NewsArticleRepository::instance().load_recent(cutoff, {}, 5000);
+ if (db_result.is_ok())
+ merge_into(db_result.value());
+ }
+ }
+
+ QtConcurrent::run([self, gen, articles_copy = std::move(articles_copy),
+ category, time_range, search_lower, sort, variant, visible_count]() {
// Time filter
int64_t window_sec = 0;
if (time_range == "1H")
@@ -471,6 +566,8 @@ void NewsScreen::apply_filters_async() {
window_sec = 172800;
else if (time_range == "7D")
window_sec = 604800;
+ else if (time_range == "30D")
+ window_sec = 30LL * 86400;
int64_t cutoff = 0;
if (window_sec > 0)
@@ -498,25 +595,31 @@ void NewsScreen::apply_filters_async() {
continue;
// "FULL" shows everything
- // Category filter
+ // Category filter — static map at file scope (never rebuilt)
if (category != "ALL") {
- static const QMap<QString, QStringList> cat_map = {
- {"MKT", {"MARKETS"}}, {"EARN", {"EARNINGS"}}, {"ECO", {"ECONOMIC"}}, {"TECH", {"TECH"}},
- {"NRG", {"ENERGY"}}, {"CRPT", {"CRYPTO"}}, {"GEO", {"GEOPOLITICS"}}, {"DEF", {"DEFENSE"}},
+ static const QHash<QString, QString> cat_map = {
+ {"MKT", "MARKETS"}, {"EARN", "EARNINGS"},
+ {"ECO", "ECONOMIC"}, {"TECH", "TECH"},
+ {"NRG", "ENERGY"}, {"CRPT", "CRYPTO"},
+ {"GEO", "GEOPOLITICS"}, {"DEF", "DEFENSE"},
};
auto it = cat_map.find(category);
- if (it != cat_map.end() && !it.value().contains(a.category))
+ if (it != cat_map.end() && a.category != it.value())
continue;
}
- // Search filter
- if (!search.isEmpty()) {
- bool match = a.headline.contains(search, Qt::CaseInsensitive) ||
- a.summary.contains(search, Qt::CaseInsensitive) ||
- a.source.contains(search, Qt::CaseInsensitive);
- for (const auto& t : a.tickers) {
- if (t.contains(search, Qt::CaseInsensitive))
- match = true;
+ // Search filter — search_lower already lowercased, compare against
+ // pre-lowercased article text to avoid per-call toLower() inside Qt
+ if (!search_lower.isEmpty()) {
+ const QString hl = a.headline.toLower();
+ const QString sum = a.summary.toLower();
+ bool match = hl.contains(search_lower) ||
+ sum.contains(search_lower) ||
+ a.source.toLower().contains(search_lower);
+ if (!match) {
+ for (const auto& t : std::as_const(a.tickers)) {
+ if (t.toLower().contains(search_lower)) { match = true; break; }
+ }
}
if (!match)
continue;
@@ -598,9 +701,36 @@ void NewsScreen::update_ui_from_filtered(int /*generation*/, const QVector<servi
// Breaking banner
auto breaking = services::get_breaking_clusters(clusters);
- if (!breaking.isEmpty())
+ if (!breaking.isEmpty()) {
feed_panel_->show_breaking(breaking);
+ // ── Notifications: Breaking news ────────────────────────────────────
+ auto& repo = fincept::SettingsRepository::instance();
+ auto get_bool = [&](const QString& key, bool def) -> bool {
+ auto r = repo.get(key);
+ return r.is_ok() && !r.value().isEmpty() ? (r.value() == "1") : def;
+ };
+ if (get_bool("notifications.news_breaking", true)) {
+ using namespace fincept::notifications;
+ for (const auto& cluster : breaking) {
+ const QString& lead_id = cluster.lead_article.id;
+ if (notified_breaking_.contains(lead_id))
+ continue;
+ notified_breaking_.insert(lead_id);
+
+ NotificationRequest req;
+ req.title = QString("BREAKING: %1").arg(cluster.lead_article.headline.left(80));
+ req.message = cluster.lead_article.summary.isEmpty()
+ ? cluster.lead_article.source
+ : cluster.lead_article.summary.left(160);
+ req.level = cluster.lead_article.priority == services::Priority::FLASH
+ ? NotifLevel::Critical : NotifLevel::Alert;
+ req.trigger = NotifTrigger::NewsAlert;
+ NotificationService::instance().send(req);
+ }
+ }
+ }
+
// Ticker strip
QVector<services::NewsArticle> ticker_articles;
for (const auto& a : filtered) {
@@ -725,9 +855,36 @@ void NewsScreen::update_ui_from_filtered(int /*generation*/, const QVector<servi
void NewsScreen::update_monitors() {
auto monitors = services::NewsMonitorService::instance().get_monitors();
- auto matches = services::NewsMonitorService::instance().scan_monitors(monitors, filtered_articles_);
+ auto matches = services::NewsMonitorService::instance().scan_monitors(monitors, filtered_articles_);
side_panel_->update_monitors(monitors, matches);
feed_panel_->model()->set_monitor_matches(matches, monitors);
+
+ // ── Notifications: Monitor keyword matches ──────────────────────────────
+ auto& repo = fincept::SettingsRepository::instance();
+ auto get_bool = [&](const QString& key, bool def) -> bool {
+ auto r = repo.get(key);
+ return r.is_ok() && !r.value().isEmpty() ? (r.value() == "1") : def;
+ };
+ if (get_bool("notifications.news_monitors", true)) {
+ using namespace fincept::notifications;
+ for (const auto& monitor : monitors) {
+ if (!monitor.enabled) continue;
+ const auto& articles = matches.value(monitor.id);
+ for (const auto& article : articles) {
+ const QString dedup_key = monitor.id + ":" + article.id;
+ if (notified_monitors_.contains(dedup_key))
+ continue;
+ notified_monitors_.insert(dedup_key);
+
+ NotificationRequest req;
+ req.title = QString("WATCH \"%1\": %2").arg(monitor.label, article.headline.left(70));
+ req.message = article.summary.isEmpty() ? article.source : article.summary.left(160);
+ req.level = NotifLevel::Warning;
+ req.trigger = NotifTrigger::NewsAlert;
+ NotificationService::instance().send(req);
+ }
+ }
+ }
}
void NewsScreen::compute_deviations() {
@@ -780,6 +937,51 @@ void NewsScreen::compute_deviations() {
side_panel_->update_deviations(deviations);
+ // ── Notifications: Category deviations & FLASH articles ────────────────
+ auto& repo = fincept::SettingsRepository::instance();
+ auto get_bool = [&](const QString& key, bool def) -> bool {
+ auto r = repo.get(key);
+ return r.is_ok() && !r.value().isEmpty() ? (r.value() == "1") : def;
+ };
+
+ if (get_bool("notifications.news_deviations", true)) {
+ using namespace fincept::notifications;
+ for (const auto& [category, z_score] : deviations) {
+ if (notified_deviations_.contains(category))
+ continue;
+ notified_deviations_.insert(category);
+
+ NotificationRequest req;
+ req.title = QString("DEVIATION: %1 news spike").arg(category);
+ req.message = QString("Unusual volume detected (z-score: %1). More %2 articles than normal.")
+ .arg(z_score, 0, 'f', 1).arg(category);
+ req.level = z_score >= 5.0 ? NotifLevel::Critical : NotifLevel::Warning;
+ req.trigger = NotifTrigger::NewsAlert;
+ NotificationService::instance().send(req);
+ }
+ }
+
+ // ── Notifications: FLASH / high-impact articles ─────────────────────────
+ if (get_bool("notifications.news_flash", true)) {
+ using namespace fincept::notifications;
+ for (const auto& article : filtered_articles_) {
+ if (article.priority != services::Priority::FLASH)
+ continue;
+ if (article.impact != services::Impact::HIGH)
+ continue;
+ if (notified_flash_.contains(article.id))
+ continue;
+ notified_flash_.insert(article.id);
+
+ NotificationRequest req;
+ req.title = QString("FLASH: %1").arg(article.headline.left(80));
+ req.message = article.summary.isEmpty() ? article.source : article.summary.left(160);
+ req.level = NotifLevel::Critical;
+ req.trigger = NotifTrigger::NewsAlert;
+ NotificationService::instance().send(req);
+ }
+ }
+
// Persist baselines via correlation service (Fix #5)
services::NewsCorrelationService::instance().update_baseline(
current_counts, [](bool /*ok*/, QMap<QString, services::CategoryBaseline> /*baselines*/) {
diff --git a/fincept-qt/src/screens/news/NewsScreen.h b/fincept-qt/src/screens/news/NewsScreen.h
index 3e429001b..eac239dd2 100644
--- a/fincept-qt/src/screens/news/NewsScreen.h
+++ b/fincept-qt/src/screens/news/NewsScreen.h
@@ -4,6 +4,7 @@
#include "services/news/NewsService.h"
#include <QHideEvent>
+#include <QSet>
#include <QShowEvent>
#include <QWidget>
@@ -99,9 +100,19 @@ class NewsScreen : public QWidget {
};
QMap<QString, CategoryBaseline> baselines_;
+ // Notification dedup — track IDs already fired this session to avoid re-firing on every refresh
+ QSet<QString> notified_breaking_; // cluster lead article IDs
+ QSet<QString> notified_monitors_; // monitor_id + ":" + article_id pairs
+ QSet<QString> notified_deviations_; // category keys that triggered deviation alert
+ QSet<QString> notified_flash_; // article IDs fired as FLASH/high-impact
+
// Pulse animation timer
QTimer* pulse_timer_ = nullptr;
+ // Debounced DB seen-writes: collect IDs, flush every 1s
+ QTimer* seen_flush_timer_ = nullptr;
+ QSet<QString> pending_seen_ids_;
+
// Active variant for feed filtering
QString active_variant_ = "FULL";
};
diff --git a/fincept-qt/src/screens/news/NewsSidePanel.cpp b/fincept-qt/src/screens/news/NewsSidePanel.cpp
index 7c0edcfa2..9f3dd3eef 100644
--- a/fincept-qt/src/screens/news/NewsSidePanel.cpp
+++ b/fincept-qt/src/screens/news/NewsSidePanel.cpp
@@ -1,12 +1,19 @@
#include "screens/news/NewsSidePanel.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
+#include <QPushButton>
#include <QScrollArea>
namespace fincept::screens {
NewsSidePanel::NewsSidePanel(QWidget* parent) : QWidget(parent) {
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) {
+ setStyleSheet(QString("background:%1;color:%2;")
+ .arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY()));
+ });
setObjectName("newsSidePanel");
setFixedWidth(240);
@@ -57,6 +64,7 @@ NewsSidePanel::NewsSidePanel(QWidget* parent) : QWidget(parent) {
signals_section_ = build_hidden_section("SIGNALS", signals_layout_);
cii_section_ = build_hidden_section("INSTABILITY", cii_layout_);
predictions_section_ = build_hidden_section("PREDICTIONS", predictions_layout_);
+ saved_section_ = build_hidden_section("BOOKMARKS", saved_layout_);
layout->addStretch();
scroll->setWidget(content);
@@ -474,10 +482,10 @@ void NewsSidePanel::update_signals(const QVector<services::CorrelationSignal>& s
for (int i = 0; i < std::min(8, static_cast<int>(sigs.size())); ++i) {
const auto& sig = sigs[i];
- QString color = sig.severity == "critical" ? "#dc2626" : (sig.severity == "high" ? "#f97316" : "#eab308");
+ QString color = sig.severity == "critical" ? "" + QString(ui::colors::NEGATIVE()) + "" : (sig.severity == "high" ? "" + QString(ui::colors::WARNING()) + "" : "" + QString(ui::colors::WARNING()) + "");
auto* lbl = new QLabel(sig.detail.left(35), this);
lbl->setObjectName("newsDeviationCategory");
- lbl->setStyleSheet(QString("color: %1; font-size: 10px; background: transparent;").arg(color));
+ lbl->setStyleSheet(QString("color: %1; background: transparent;").arg(color));
lbl->setToolTip(sig.detail);
signals_layout_->addWidget(lbl);
}
@@ -495,11 +503,11 @@ void NewsSidePanel::update_instability(const QString& country, const services::I
if (lbl) {
QString color =
score.level == "CRITICAL"
- ? "#dc2626"
- : (score.level == "HIGH" ? "#f97316" : (score.level == "ELEVATED" ? "#eab308" : "#22c55e"));
+ ? "" + QString(ui::colors::NEGATIVE()) + ""
+ : (score.level == "HIGH" ? "" + QString(ui::colors::WARNING()) + "" : (score.level == "ELEVATED" ? "" + QString(ui::colors::WARNING()) + "" : "" + QString(ui::colors::POSITIVE()) + ""));
lbl->setText(QString("%1 %2 %3").arg(country, -4).arg(score.cii_score, 3).arg(score.level));
lbl->setStyleSheet(
- QString("color: %1; font-size: 11px; font-weight: 700; background: transparent;").arg(color));
+ QString("color: %1; font-weight: 700; background: transparent;").arg(color));
}
return;
}
@@ -507,12 +515,12 @@ void NewsSidePanel::update_instability(const QString& country, const services::I
// New entry
QString color = score.level == "CRITICAL"
- ? "#dc2626"
- : (score.level == "HIGH" ? "#f97316" : (score.level == "ELEVATED" ? "#eab308" : "#22c55e"));
+ ? "" + QString(ui::colors::NEGATIVE()) + ""
+ : (score.level == "HIGH" ? "" + QString(ui::colors::WARNING()) + "" : (score.level == "ELEVATED" ? "" + QString(ui::colors::WARNING()) + "" : "" + QString(ui::colors::POSITIVE()) + ""));
auto* lbl = new QLabel(QString("%1 %2 %3").arg(country, -4).arg(score.cii_score, 3).arg(score.level), this);
lbl->setObjectName("newsDeviationScore");
lbl->setProperty("country", country);
- lbl->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: 700; background: transparent;").arg(color));
+ lbl->setStyleSheet(QString("color: %1; font-weight: 700; background: transparent;").arg(color));
cii_layout_->addWidget(lbl);
}
@@ -533,13 +541,47 @@ void NewsSidePanel::update_predictions(const QVector<services::PredictionMarket>
for (int i = 0; i < std::min(6, static_cast<int>(predictions.size())); ++i) {
const auto& pm = predictions[i];
int pct = static_cast<int>(pm.yes_price * 100);
- QString color = pct >= 70 ? "#16a34a" : (pct <= 30 ? "#dc2626" : "#ca8a04");
+ QString color = pct >= 70 ? "" + QString(ui::colors::POSITIVE()) + "" : (pct <= 30 ? "" + QString(ui::colors::NEGATIVE()) + "" : "" + QString(ui::colors::WARNING()) + "");
auto* lbl = new QLabel(QString("%1% %2").arg(pct).arg(pm.question.left(28)), this);
lbl->setObjectName("newsMonitorLabel");
- lbl->setStyleSheet(QString("color: %1; font-size: 10px; background: transparent;").arg(color));
+ lbl->setStyleSheet(QString("color: %1; background: transparent;").arg(color));
lbl->setToolTip(pm.question);
predictions_layout_->addWidget(lbl);
}
}
+void NewsSidePanel::build_saved_section(QVBoxLayout* /*parent*/) {
+ // Section is built via build_hidden_section in constructor — nothing extra needed.
+}
+
+void NewsSidePanel::update_saved(const QVector<services::NewsArticle>& saved) {
+ while (saved_layout_->count() > 0) {
+ auto* item = saved_layout_->takeAt(0);
+ if (item->widget())
+ item->widget()->deleteLater();
+ delete item;
+ }
+
+ if (saved.isEmpty()) {
+ saved_section_->hide();
+ return;
+ }
+ saved_section_->show();
+
+ for (int i = 0; i < std::min(10, static_cast<int>(saved.size())); ++i) {
+ const auto& a = saved[i];
+ QString title = a.headline.left(36) + (a.headline.size() > 36 ? "…" : "");
+ auto* btn = new QPushButton(title, this);
+ btn->setObjectName("newsTopStoryLabel");
+ btn->setToolTip(a.headline + "\n" + a.source);
+ btn->setFlat(true);
+ btn->setCursor(Qt::PointingHandCursor);
+ btn->setStyleSheet("text-align:left;");
+ connect(btn, &QPushButton::clicked, this, [this, a]() {
+ emit article_clicked(a);
+ });
+ saved_layout_->addWidget(btn);
+ }
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/news/NewsSidePanel.h b/fincept-qt/src/screens/news/NewsSidePanel.h
index 1c52a214d..00ec249c6 100644
--- a/fincept-qt/src/screens/news/NewsSidePanel.h
+++ b/fincept-qt/src/screens/news/NewsSidePanel.h
@@ -32,6 +32,7 @@ class NewsSidePanel : public QWidget {
void update_signals(const QVector<services::CorrelationSignal>& sigs);
void update_instability(const QString& country, const services::InstabilityScore& score);
void update_predictions(const QVector<services::PredictionMarket>& predictions);
+ void update_saved(const QVector<services::NewsArticle>& saved);
signals:
void category_clicked(const QString& category);
@@ -47,6 +48,7 @@ class NewsSidePanel : public QWidget {
void build_categories_section(QVBoxLayout* parent);
void build_monitors_section(QVBoxLayout* parent);
void build_deviations_section(QVBoxLayout* parent);
+ void build_saved_section(QVBoxLayout* parent);
// Stats
QLabel* feeds_value_ = nullptr;
@@ -93,6 +95,10 @@ class NewsSidePanel : public QWidget {
// Prediction markets
QVBoxLayout* predictions_layout_ = nullptr;
QWidget* predictions_section_ = nullptr;
+
+ // Saved / bookmarked articles
+ QVBoxLayout* saved_layout_ = nullptr;
+ QWidget* saved_section_ = nullptr;
};
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/quantlib/QuantLibScreen.cpp b/fincept-qt/src/screens/quantlib/QuantLibScreen.cpp
index f8b11b4e7..8932fb92c 100644
--- a/fincept-qt/src/screens/quantlib/QuantLibScreen.cpp
+++ b/fincept-qt/src/screens/quantlib/QuantLibScreen.cpp
@@ -12,6 +12,7 @@
#include <QScrollArea>
#include <QSplitter>
#include <QVBoxLayout>
+#include "ui/theme/ThemeManager.h"
namespace {
using namespace fincept::ui;
@@ -20,54 +21,54 @@ inline QString kStyle() {
return QStringLiteral("#qlScreen { background: %1; }"
"#qlHeader { background: %2; border-bottom: 2px solid %3; }"
- "#qlHeaderTitle { color: %4; font-size: 12px; font-weight: 700; background: transparent; }"
- "#qlHeaderSub { color: %5; font-size: 9px; letter-spacing: 0.5px; background: transparent; }"
- "#qlHeaderBadge { color: %6; font-size: 8px; font-weight: 700; "
+ "#qlHeaderTitle { color: %4; font-weight: 700; background: transparent; }"
+ "#qlHeaderSub { color: %5; letter-spacing: 0.5px; background: transparent; }"
+ "#qlHeaderBadge { color: %6; font-weight: 700; "
" background: rgba(22,163,74,0.2); padding: 2px 6px; }"
"#qlSidebar { background: %7; border-right: 1px solid %8; }"
- "QTreeWidget { background: %1; color: %5; border: none; font-size: 11px; }"
+ "QTreeWidget { background: %1; color: %5; border: none; }"
"QTreeWidget::item { padding: 4px 8px; border-bottom: 1px solid %8; }"
"QTreeWidget::item:hover { color: %4; background: %12; }"
"QTreeWidget::item:selected { color: %3; background: rgba(217,119,6,0.1); "
" border-left: 2px solid %3; }"
"#qlCenterPanel { background: %1; }"
- "#qlCenterTitle { color: %4; font-size: 13px; font-weight: 700; background: transparent; }"
+ "#qlCenterTitle { color: %4; font-weight: 700; background: transparent; }"
"#qlPanel { background: %7; border: 1px solid %8; }"
"#qlPanelHeader { background: %2; border-bottom: 1px solid %8; }"
- "#qlPanelTitle { color: %4; font-size: 11px; font-weight: 700; background: transparent; }"
- "#qlLabel { color: %5; font-size: 9px; font-weight: 700; "
+ "#qlPanelTitle { color: %4; font-weight: 700; background: transparent; }"
+ "#qlLabel { color: %5; font-weight: 700; "
" letter-spacing: 0.5px; background: transparent; }"
"QLineEdit { background: %1; color: %4; border: 1px solid %8; "
- " padding: 4px 8px; font-size: 11px; }"
+ " padding: 4px 8px; }"
"QLineEdit:focus { border-color: %9; }"
"QComboBox { background: %1; color: %4; border: 1px solid %8; "
- " padding: 4px 8px; font-size: 11px; }"
+ " padding: 4px 8px; }"
"QComboBox::drop-down { border: none; width: 16px; }"
"QComboBox QAbstractItemView { background: %2; color: %4; border: 1px solid %8; "
" selection-background-color: %3; }"
"#qlExecBtn { background: %3; color: %1; border: none; padding: 6px 20px; "
- " font-size: 10px; font-weight: 700; }"
- "#qlExecBtn:hover { background: #FF8800; }"
+ " font-weight: 700; }"
+ "#qlExecBtn:hover { background: %10; }"
"#qlExecBtn:disabled { background: %10; color: %11; }"
"#qlResultPanel { background: %7; border-left: 1px solid %8; }"
- "#qlResultStatus { color: %5; font-size: 9px; background: transparent; }"
- "QTextEdit { background: %1; color: %13; border: none; font-size: 11px; }"
+ "#qlResultStatus { color: %5; background: transparent; }"
+ "QTextEdit { background: %1; color: %13; border: none; }"
"QTableWidget { background: %1; color: %4; border: none; gridline-color: %8; "
- " font-size: 11px; }"
+ " }"
"QTableWidget::item { padding: 2px 6px; border-bottom: 1px solid %8; }"
"QHeaderView::section { background: %2; color: %5; border: none; "
" border-bottom: 1px solid %8; border-right: 1px solid %8; "
- " padding: 4px 6px; font-size: 10px; font-weight: 700; }"
+ " padding: 4px 6px; font-weight: 700; }"
"#qlStatusBar { background: %2; border-top: 1px solid %8; }"
- "#qlStatusText { color: %5; font-size: 9px; background: transparent; }"
- "#qlStatusHighlight { color: %13; font-size: 9px; background: transparent; }"
+ "#qlStatusText { color: %5; background: transparent; }"
+ "#qlStatusHighlight { color: %13; background: transparent; }"
"QSplitter::handle { background: %8; }"
"QScrollBar:vertical { background: %1; width: 6px; }"
@@ -93,6 +94,7 @@ inline QString kStyle() {
namespace fincept::screens {
using namespace fincept::ui;
+#include "ui/theme/ThemeManager.h"
// ── Module definitions ──────────────────────────────────────────────────────
@@ -137,6 +139,8 @@ QuantLibScreen::QuantLibScreen(QWidget* parent) : QWidget(parent) {
setStyleSheet(kStyle());
modules_ = build_modules();
setup_ui();
+ connect(&ThemeManager::instance(), &ThemeManager::theme_changed,
+ this, [this](const ThemeTokens&) { setStyleSheet(kStyle()); });
LOG_INFO("QuantLib", "Screen constructed — 18 modules, 590+ endpoints");
}
@@ -209,7 +213,7 @@ QWidget* QuantLibScreen::create_sidebar() {
vl->setSpacing(0);
auto* title = new QLabel("MODULES");
- title->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: 700; "
+ title->setStyleSheet(QString("color: %1; font-weight: 700; "
"letter-spacing: 0.5px; background: transparent; "
"padding: 8px 12px; border-bottom: 1px solid %2;")
.arg(colors::TEXT_SECONDARY, colors::BORDER_DIM));
@@ -329,7 +333,7 @@ QWidget* QuantLibScreen::create_center_panel() {
btn->setCursor(Qt::PointingHandCursor);
btn->setStyleSheet(
QString("QPushButton { background: %1; color: %2; border: 1px solid %3; "
- "padding: 2px 8px; font-size: 8px; font-weight: 700; } "
+ "padding: 2px 8px; font-weight: 700; } "
"QPushButton:hover { color: %4; }")
.arg(colors::BG_SURFACE, colors::TEXT_SECONDARY, colors::BORDER_DIM, colors::TEXT_PRIMARY));
connect(btn, &QPushButton::clicked, param_input1_, [this, json_text]() { param_input1_->setText(json_text); });
diff --git a/fincept-qt/src/screens/settings/LlmConfigSection.cpp b/fincept-qt/src/screens/settings/LlmConfigSection.cpp
index 79c03a30f..f4ef49412 100644
--- a/fincept-qt/src/screens/settings/LlmConfigSection.cpp
+++ b/fincept-qt/src/screens/settings/LlmConfigSection.cpp
@@ -3,6 +3,8 @@
#include "screens/settings/LlmConfigSection.h"
#include "ai_chat/LlmService.h"
+#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include "core/logging/Logger.h"
#include "network/http/HttpClient.h"
#include "storage/repositories/LlmConfigRepository.h"
@@ -71,7 +73,7 @@ QStringList LlmConfigSection::fallback_models(const QString& provider) {
if (p == "ollama")
return {"llama3:8b", "mistral:7b", "codellama:7b"};
if (p == "fincept")
- return {"fincept-llm"};
+ return {"MiniMax-M2.7", "MiniMax-M2.7-highspeed", "MiniMax-M2.5", "MiniMax-M2.5-highspeed"};
return {};
}
@@ -85,6 +87,14 @@ LlmConfigSection::LlmConfigSection(QWidget* parent) : QWidget(parent) {
connect(&ai_chat::LlmService::instance(), &ai_chat::LlmService::models_fetched, this,
&LlmConfigSection::on_models_fetched);
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) {
+ setStyleSheet(QString("background:%1;color:%2;")
+ .arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY()));
+ });
+ setStyleSheet(QString("background:%1;color:%2;")
+ .arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY()));
+
load_providers();
load_profiles();
}
@@ -102,11 +112,11 @@ void LlmConfigSection::build_ui() {
// Title bar
auto* title_bar = new QWidget;
title_bar->setFixedHeight(44);
- title_bar->setStyleSheet("background:#0d0d0d;border-bottom:1px solid #1e1e1e;");
+ title_bar->setStyleSheet("background:" + QString(ui::colors::BG_SURFACE()) + ";border-bottom:1px solid " + QString(ui::colors::BORDER_DIM()) + ";");
auto* tbl = new QHBoxLayout(title_bar);
tbl->setContentsMargins(16, 0, 16, 0);
auto* title_lbl = new QLabel("LLM CONFIGURATION");
- title_lbl->setStyleSheet("color:#ff6600;font-size:13px;font-weight:700;letter-spacing:1px;");
+ title_lbl->setStyleSheet("color:" + QString(ui::colors::AMBER()) + ";font-weight:700;letter-spacing:1px;");
tbl->addWidget(title_lbl);
tbl->addStretch();
root->addWidget(title_bar);
@@ -114,11 +124,11 @@ void LlmConfigSection::build_ui() {
tab_widget_ = new QTabWidget;
tab_widget_->setDocumentMode(true);
tab_widget_->setStyleSheet(
- "QTabWidget::pane{border:none;background:#0a0a0a;}"
- "QTabBar::tab{background:#0d0d0d;color:#888;padding:8px 20px;font-size:11px;"
+ "QTabWidget::pane{border:none;background:" + QString(ui::colors::BG_BASE()) + ";}"
+ "QTabBar::tab{background:" + QString(ui::colors::BG_SURFACE()) + ";color:" + QString(ui::colors::TEXT_SECONDARY()) + ";padding:8px 20px;"
"font-weight:600;letter-spacing:1px;border-bottom:2px solid transparent;}"
- "QTabBar::tab:selected{color:#ff6600;border-bottom:2px solid #ff6600;}"
- "QTabBar::tab:hover{color:#ccc;}");
+ "QTabBar::tab:selected{color:" + QString(ui::colors::AMBER()) + ";border-bottom:2px solid " + QString(ui::colors::AMBER()) + ";}"
+ "QTabBar::tab:hover{color:" + QString(ui::colors::TEXT_PRIMARY()) + ";}");
tab_widget_->addTab(build_providers_tab(), "PROVIDERS");
tab_widget_->addTab(build_profiles_tab(), "PROFILES");
root->addWidget(tab_widget_, 1);
@@ -141,7 +151,7 @@ QWidget* LlmConfigSection::build_providers_tab() {
auto* sep = new QFrame;
sep->setFixedHeight(1);
- sep->setStyleSheet("background:#1e1e1e;");
+ sep->setStyleSheet("background:" + QString(ui::colors::BORDER_DIM()) + ";");
vl->addWidget(sep);
vl->addWidget(build_global_panel());
return w;
@@ -150,29 +160,29 @@ QWidget* LlmConfigSection::build_providers_tab() {
QWidget* LlmConfigSection::build_provider_list_panel() {
auto* panel = new QWidget;
panel->setFixedWidth(220);
- panel->setStyleSheet("background:#0a0a0a;border-right:1px solid #1e1e1e;");
+ panel->setStyleSheet("background:" + QString(ui::colors::BG_BASE()) + ";border-right:1px solid " + QString(ui::colors::BORDER_DIM()) + ";");
auto* vl = new QVBoxLayout(panel);
vl->setContentsMargins(8, 8, 8, 8);
vl->setSpacing(6);
auto* lbl = new QLabel("Providers");
- lbl->setStyleSheet("color:#888;font-size:11px;font-weight:700;letter-spacing:1px;");
+ lbl->setStyleSheet("color:" + QString(ui::colors::TEXT_SECONDARY()) + ";font-weight:700;letter-spacing:1px;");
vl->addWidget(lbl);
provider_list_ = new QListWidget;
- provider_list_->setStyleSheet("QListWidget{background:transparent;border:none;color:#ccc;font-size:12px;}"
+ provider_list_->setStyleSheet("QListWidget{background:transparent;border:none;color:" + QString(ui::colors::TEXT_PRIMARY()) + ";}"
"QListWidget::item{padding:8px 6px;border-radius:3px;}"
- "QListWidget::item:selected{background:#1a1a1a;color:#ff6600;}"
- "QListWidget::item:hover{background:#111;}");
+ "QListWidget::item:selected{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::AMBER()) + ";}"
+ "QListWidget::item:hover{background:" + QString(ui::colors::BG_RAISED()) + ";}");
connect(provider_list_, &QListWidget::currentRowChanged, this, &LlmConfigSection::on_provider_selected);
vl->addWidget(provider_list_, 1);
auto* btn_row = new QHBoxLayout;
add_btn_ = new QPushButton("+ Add");
- add_btn_->setStyleSheet("QPushButton{background:#1a1a1a;color:#ff6600;border:1px solid #ff6600;"
- "border-radius:3px;padding:5px 10px;font-size:11px;font-weight:600;}"
- "QPushButton:hover{background:#2a1a0a;}");
+ add_btn_->setStyleSheet("QPushButton{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::AMBER()) + ";border:1px solid " + QString(ui::colors::AMBER()) + ";"
+ "border-radius:3px;padding:5px 10px;font-weight:600;}"
+ "QPushButton:hover{background:" + QString(ui::colors::BG_RAISED()) + ";}");
connect(add_btn_, &QPushButton::clicked, this, [this]() {
// Show input dialog to pick provider
QStringList choices = KNOWN_PROVIDERS;
@@ -211,10 +221,10 @@ QWidget* LlmConfigSection::build_provider_list_panel() {
delete_btn_ = new QPushButton("Remove");
delete_btn_->setEnabled(false);
- delete_btn_->setStyleSheet("QPushButton{background:#1a0a0a;color:#cc3300;border:1px solid #330000;"
- "border-radius:3px;padding:5px 10px;font-size:11px;}"
- "QPushButton:hover{background:#2a1010;}"
- "QPushButton:disabled{color:#333;border-color:#222;}");
+ delete_btn_->setStyleSheet("QPushButton{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::NEGATIVE()) + ";border:1px solid " + QString(ui::colors::BG_RAISED()) + ";"
+ "border-radius:3px;padding:5px 10px;}"
+ "QPushButton:hover{background:" + QString(ui::colors::BG_RAISED()) + ";}"
+ "QPushButton:disabled{color:" + QString(ui::colors::BORDER_BRIGHT()) + ";border-color:#222;}");
connect(delete_btn_, &QPushButton::clicked, this, &LlmConfigSection::on_delete_provider);
btn_row->addWidget(add_btn_);
@@ -228,25 +238,25 @@ QWidget* LlmConfigSection::build_form_panel() {
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
scroll->setFrameShape(QFrame::NoFrame);
- scroll->setStyleSheet("QScrollArea{background:#0a0a0a;border:none;}"
- "QScrollBar:vertical{background:#111;width:6px;}"
- "QScrollBar::handle:vertical{background:#333;border-radius:3px;}"
+ scroll->setStyleSheet("QScrollArea{background:" + QString(ui::colors::BG_BASE()) + ";border:none;}"
+ "QScrollBar:vertical{background:" + QString(ui::colors::BG_RAISED()) + ";width:6px;}"
+ "QScrollBar::handle:vertical{background:" + QString(ui::colors::BORDER_BRIGHT()) + ";border-radius:3px;}"
"QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}");
auto* page = new QWidget;
- page->setStyleSheet("background:#0a0a0a;");
+ page->setStyleSheet("background:" + QString(ui::colors::BG_BASE()) + ";");
auto* vl = new QVBoxLayout(page);
vl->setContentsMargins(24, 20, 24, 20);
vl->setSpacing(14);
// Section title
auto* form_title = new QLabel("Provider Configuration");
- form_title->setStyleSheet("color:#ff6600;font-size:13px;font-weight:700;");
+ form_title->setStyleSheet("color:" + QString(ui::colors::AMBER()) + ";font-weight:700;");
vl->addWidget(form_title);
auto* sep = new QFrame;
sep->setFixedHeight(1);
- sep->setStyleSheet("background:#1e1e1e;");
+ sep->setStyleSheet("background:" + QString(ui::colors::BORDER_DIM()) + ";");
vl->addWidget(sep);
auto* form = new QFormLayout;
@@ -254,12 +264,12 @@ QWidget* LlmConfigSection::build_form_panel() {
form->setLabelAlignment(Qt::AlignRight | Qt::AlignVCenter);
auto field_style = [](QLineEdit* le) {
- le->setStyleSheet("QLineEdit{background:#111;color:#e0e0e0;border:1px solid #2a2a2a;"
- "border-radius:3px;padding:6px;font-size:12px;}"
- "QLineEdit:focus{border:1px solid #ff6600;}");
+ le->setStyleSheet("QLineEdit{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::TEXT_PRIMARY()) + ";border:1px solid " + QString(ui::colors::BORDER_MED()) + ";"
+ "border-radius:3px;padding:6px;}"
+ "QLineEdit:focus{border:1px solid " + QString(ui::colors::AMBER()) + ";}");
le->setMinimumWidth(320);
};
- auto lbl_style = [](QLabel* l) { l->setStyleSheet("color:#888;font-size:12px;"); };
+ auto lbl_style = [](QLabel* l) { l->setStyleSheet("color:" + QString(ui::colors::TEXT_SECONDARY()) + ";"); };
auto* p_lbl = new QLabel("Provider");
lbl_style(p_lbl);
@@ -267,7 +277,7 @@ QWidget* LlmConfigSection::build_form_panel() {
provider_edit_->setPlaceholderText("e.g. openai");
provider_edit_->setReadOnly(true); // set by selection
field_style(provider_edit_);
- provider_edit_->setStyleSheet(provider_edit_->styleSheet() + "QLineEdit{background:#0d0d0d;color:#666;}");
+ provider_edit_->setStyleSheet(provider_edit_->styleSheet() + "QLineEdit{background:" + QString(ui::colors::BG_SURFACE()) + ";color:" + QString(ui::colors::TEXT_TERTIARY()) + ";}");
form->addRow(p_lbl, provider_edit_);
auto* k_lbl = new QLabel("API Key");
@@ -285,24 +295,24 @@ QWidget* LlmConfigSection::build_form_panel() {
model_combo_->setEditable(true);
model_combo_->setMinimumWidth(260);
model_combo_->lineEdit()->setPlaceholderText("Select or type model...");
- model_combo_->setStyleSheet("QComboBox{background:#111;color:#e0e0e0;border:1px solid #2a2a2a;"
- "border-radius:3px;padding:6px;font-size:12px;}"
- "QComboBox:focus{border:1px solid #ff6600;}"
+ model_combo_->setStyleSheet("QComboBox{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::TEXT_PRIMARY()) + ";border:1px solid " + QString(ui::colors::BORDER_MED()) + ";"
+ "border-radius:3px;padding:6px;}"
+ "QComboBox:focus{border:1px solid " + QString(ui::colors::AMBER()) + ";}"
"QComboBox::drop-down{border:none;width:20px;}"
"QComboBox::down-arrow{image:none;border-left:4px solid transparent;"
- "border-right:4px solid transparent;border-top:5px solid #888;}"
- "QComboBox QAbstractItemView{background:#111;color:#e0e0e0;"
- "selection-background-color:#1a1a1a;selection-color:#ff6600;"
- "border:1px solid #2a2a2a;}");
+ "border-right:4px solid transparent;border-top:5px solid " + QString(ui::colors::TEXT_SECONDARY()) + ";}"
+ "QComboBox QAbstractItemView{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::TEXT_PRIMARY()) + ";"
+ "selection-background-color:" + QString(ui::colors::BG_RAISED()) + ";selection-color:" + QString(ui::colors::AMBER()) + ";"
+ "border:1px solid " + QString(ui::colors::BORDER_MED()) + ";}");
model_row->addWidget(model_combo_, 1);
fetch_btn_ = new QPushButton("Fetch");
fetch_btn_->setFixedHeight(30);
fetch_btn_->setFixedWidth(60);
- fetch_btn_->setStyleSheet("QPushButton{background:#1a1a1a;color:#ff6600;border:1px solid #333;"
- "border-radius:3px;font-size:11px;font-weight:600;}"
- "QPushButton:hover{background:#2a1a0a;}"
- "QPushButton:disabled{color:#555;border-color:#222;}");
+ fetch_btn_->setStyleSheet("QPushButton{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::AMBER()) + ";border:1px solid " + QString(ui::colors::BORDER_BRIGHT()) + ";"
+ "border-radius:3px;font-weight:600;}"
+ "QPushButton:hover{background:" + QString(ui::colors::BG_RAISED()) + ";}"
+ "QPushButton:disabled{color:" + QString(ui::colors::TEXT_TERTIARY()) + ";border-color:#222;}");
connect(fetch_btn_, &QPushButton::clicked, this, &LlmConfigSection::on_fetch_models);
model_row->addWidget(fetch_btn_);
@@ -321,16 +331,16 @@ QWidget* LlmConfigSection::build_form_panel() {
auto* btn_row = new QHBoxLayout;
save_btn_ = new QPushButton("Save & Set Active");
save_btn_->setFixedHeight(34);
- save_btn_->setStyleSheet("QPushButton{background:#ff6600;color:#000;border:none;border-radius:4px;"
- "font-size:12px;font-weight:700;padding:0 16px;}"
- "QPushButton:hover{background:#ff8800;}"
- "QPushButton:disabled{background:#333;color:#666;}");
+ save_btn_->setStyleSheet("QPushButton{background:" + QString(ui::colors::AMBER()) + ";color:#000;border:none;border-radius:4px;"
+ "font-weight:700;padding:0 16px;}"
+ "QPushButton:hover{background:" + QString(ui::colors::AMBER_DIM()) + ";}"
+ "QPushButton:disabled{background:" + QString(ui::colors::BORDER_BRIGHT()) + ";color:" + QString(ui::colors::TEXT_TERTIARY()) + ";}");
connect(save_btn_, &QPushButton::clicked, this, &LlmConfigSection::on_save_provider);
test_btn_ = new QPushButton("Test Connection");
test_btn_->setFixedHeight(34);
- test_btn_->setStyleSheet("QPushButton{background:#1a1a1a;color:#ccc;border:1px solid #333;"
- "border-radius:4px;font-size:12px;padding:0 16px;}"
+ test_btn_->setStyleSheet("QPushButton{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::TEXT_PRIMARY()) + ";border:1px solid " + QString(ui::colors::BORDER_BRIGHT()) + ";"
+ "border-radius:4px;padding:0 16px;}"
"QPushButton:hover{background:#222;}");
connect(test_btn_, &QPushButton::clicked, this, &LlmConfigSection::on_test_connection);
@@ -340,7 +350,7 @@ QWidget* LlmConfigSection::build_form_panel() {
vl->addLayout(btn_row);
status_lbl_ = new QLabel;
- status_lbl_->setStyleSheet("font-size:11px;");
+ status_lbl_->setStyleSheet("");
status_lbl_->hide();
vl->addWidget(status_lbl_);
@@ -351,14 +361,14 @@ QWidget* LlmConfigSection::build_form_panel() {
QWidget* LlmConfigSection::build_global_panel() {
auto* panel = new QWidget;
- panel->setStyleSheet("background:#0d0d0d;");
+ panel->setStyleSheet("background:" + QString(ui::colors::BG_SURFACE()) + ";");
auto* vl = new QVBoxLayout(panel);
vl->setContentsMargins(24, 12, 24, 12);
vl->setSpacing(10);
auto* title = new QLabel("GLOBAL SETTINGS");
- title->setStyleSheet("color:#ff6600;font-size:11px;font-weight:700;letter-spacing:1px;");
+ title->setStyleSheet("color:" + QString(ui::colors::AMBER()) + ";font-weight:700;letter-spacing:1px;");
vl->addWidget(title);
auto* row = new QHBoxLayout;
@@ -367,15 +377,15 @@ QWidget* LlmConfigSection::build_global_panel() {
// Temperature
auto* temp_grp = new QVBoxLayout;
auto* temp_lbl = new QLabel("Temperature");
- temp_lbl->setStyleSheet("color:#888;font-size:11px;");
+ temp_lbl->setStyleSheet("color:" + QString(ui::colors::TEXT_SECONDARY()) + ";");
temp_spin_ = new QDoubleSpinBox;
temp_spin_->setRange(0.0, 2.0);
temp_spin_->setSingleStep(0.05);
temp_spin_->setValue(0.7);
temp_spin_->setDecimals(2);
temp_spin_->setFixedWidth(100);
- temp_spin_->setStyleSheet("QDoubleSpinBox{background:#111;color:#e0e0e0;border:1px solid #2a2a2a;"
- "border-radius:3px;padding:4px;font-size:12px;}");
+ temp_spin_->setStyleSheet("QDoubleSpinBox{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::TEXT_PRIMARY()) + ";border:1px solid " + QString(ui::colors::BORDER_MED()) + ";"
+ "border-radius:3px;padding:4px;}");
temp_grp->addWidget(temp_lbl);
temp_grp->addWidget(temp_spin_);
row->addLayout(temp_grp);
@@ -383,14 +393,14 @@ QWidget* LlmConfigSection::build_global_panel() {
// Max tokens
auto* tok_grp = new QVBoxLayout;
auto* tok_lbl = new QLabel("Max Tokens");
- tok_lbl->setStyleSheet("color:#888;font-size:11px;");
+ tok_lbl->setStyleSheet("color:" + QString(ui::colors::TEXT_SECONDARY()) + ";");
tokens_spin_ = new QSpinBox;
tokens_spin_->setRange(100, 32000);
tokens_spin_->setSingleStep(100);
tokens_spin_->setValue(4096);
tokens_spin_->setFixedWidth(100);
- tokens_spin_->setStyleSheet("QSpinBox{background:#111;color:#e0e0e0;border:1px solid #2a2a2a;"
- "border-radius:3px;padding:4px;font-size:12px;}");
+ tokens_spin_->setStyleSheet("QSpinBox{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::TEXT_PRIMARY()) + ";border:1px solid " + QString(ui::colors::BORDER_MED()) + ";"
+ "border-radius:3px;padding:4px;}");
tok_grp->addWidget(tok_lbl);
tok_grp->addWidget(tokens_spin_);
row->addLayout(tok_grp);
@@ -398,13 +408,13 @@ QWidget* LlmConfigSection::build_global_panel() {
// System prompt
auto* sp_grp = new QVBoxLayout;
auto* sp_lbl = new QLabel("System Prompt");
- sp_lbl->setStyleSheet("color:#888;font-size:11px;");
+ sp_lbl->setStyleSheet("color:" + QString(ui::colors::TEXT_SECONDARY()) + ";");
system_prompt_ = new QPlainTextEdit;
system_prompt_->setPlaceholderText("Optional system prompt for the LLM...");
system_prompt_->setFixedHeight(60);
- system_prompt_->setStyleSheet("QPlainTextEdit{background:#111;color:#e0e0e0;border:1px solid #2a2a2a;"
- "border-radius:3px;padding:4px;font-size:12px;}"
- "QPlainTextEdit:focus{border:1px solid #ff6600;}");
+ system_prompt_->setStyleSheet("QPlainTextEdit{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::TEXT_PRIMARY()) + ";border:1px solid " + QString(ui::colors::BORDER_MED()) + ";"
+ "border-radius:3px;padding:4px;}"
+ "QPlainTextEdit:focus{border:1px solid " + QString(ui::colors::AMBER()) + ";}");
sp_grp->addWidget(sp_lbl);
sp_grp->addWidget(system_prompt_);
row->addLayout(sp_grp, 1);
@@ -414,9 +424,9 @@ QWidget* LlmConfigSection::build_global_panel() {
save_global_btn_ = new QPushButton("Save Global Settings");
save_global_btn_->setFixedHeight(30);
save_global_btn_->setFixedWidth(180);
- save_global_btn_->setStyleSheet("QPushButton{background:#1a1a1a;color:#ff6600;border:1px solid #ff6600;"
- "border-radius:3px;font-size:11px;font-weight:600;}"
- "QPushButton:hover{background:#2a1a0a;}");
+ save_global_btn_->setStyleSheet("QPushButton{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::AMBER()) + ";border:1px solid " + QString(ui::colors::AMBER()) + ";"
+ "border-radius:3px;font-weight:600;}"
+ "QPushButton:hover{background:" + QString(ui::colors::BG_RAISED()) + ";}");
connect(save_global_btn_, &QPushButton::clicked, this, &LlmConfigSection::on_save_global);
vl->addWidget(save_global_btn_);
@@ -442,7 +452,7 @@ void LlmConfigSection::load_providers() {
auto* item = new QListWidgetItem(display);
item->setData(Qt::UserRole, p.provider);
if (p.is_active)
- item->setForeground(QColor("#ff6600"));
+ item->setForeground(QColor("" + QString(ui::colors::AMBER()) + ""));
provider_list_->addItem(item);
}
}
@@ -502,9 +512,9 @@ void LlmConfigSection::populate_form(const QString& provider) {
api_key_edit_->setPlaceholderText("Login to auto-configure");
}
api_key_edit_->setEnabled(false);
- model_combo_->setEnabled(false);
+ model_combo_->setEnabled(true); // allow model selection
base_url_edit_->setEnabled(false);
- fetch_btn_->setEnabled(false);
+ fetch_btn_->setEnabled(true); // allow fetching available models
} else {
api_key_edit_->setText(p.api_key);
api_key_edit_->setEnabled(true);
@@ -522,8 +532,8 @@ void LlmConfigSection::populate_form(const QString& provider) {
api_key_edit_->setEnabled(!is_fincept);
base_url_edit_->setText(def_url);
base_url_edit_->setEnabled(!is_fincept);
- model_combo_->setEnabled(!is_fincept);
- fetch_btn_->setEnabled(!is_fincept);
+ model_combo_->setEnabled(true); // fincept allows model selection
+ fetch_btn_->setEnabled(true); // fincept supports fetching models
}
// ============================================================================
@@ -560,7 +570,7 @@ void LlmConfigSection::on_save_provider() {
// Fincept defaults
if (is_fincept) {
if (cfg.model.isEmpty())
- cfg.model = "fincept-llm";
+ cfg.model = "MiniMax-M2.7";
if (cfg.base_url.isEmpty())
cfg.base_url = "https://api.fincept.in/research/llm";
}
@@ -724,7 +734,7 @@ void LlmConfigSection::on_models_fetched(const QString& provider, const QStringL
void LlmConfigSection::show_status(const QString& msg, bool error) {
status_lbl_->setText(msg);
- status_lbl_->setStyleSheet(error ? "color:#ff4444;font-size:11px;" : "color:#44cc44;font-size:11px;");
+ status_lbl_->setStyleSheet(error ? "color:" + QString(ui::colors::NEGATIVE()) + ";" : "color:" + QString(ui::colors::POSITIVE()) + ";");
status_lbl_->show();
QTimer::singleShot(4000, status_lbl_, &QLabel::hide);
}
@@ -741,7 +751,7 @@ QWidget* LlmConfigSection::build_profiles_tab() {
auto* splitter = new QSplitter(Qt::Horizontal);
splitter->setHandleWidth(1);
- splitter->setStyleSheet("QSplitter::handle{background:#1e1e1e;}");
+ splitter->setStyleSheet("QSplitter::handle{background:" + QString(ui::colors::BORDER_DIM()) + ";}");
splitter->addWidget(build_profile_list_panel());
splitter->addWidget(build_profile_form_panel());
splitter->setStretchFactor(0, 0);
@@ -754,36 +764,36 @@ QWidget* LlmConfigSection::build_profiles_tab() {
QWidget* LlmConfigSection::build_profile_list_panel() {
auto* panel = new QWidget;
panel->setFixedWidth(240);
- panel->setStyleSheet("background:#0a0a0a;border-right:1px solid #1e1e1e;");
+ panel->setStyleSheet("background:" + QString(ui::colors::BG_BASE()) + ";border-right:1px solid " + QString(ui::colors::BORDER_DIM()) + ";");
auto* vl = new QVBoxLayout(panel);
vl->setContentsMargins(8, 8, 8, 8);
vl->setSpacing(6);
auto* lbl = new QLabel("PROFILES");
- lbl->setStyleSheet("color:#888;font-size:11px;font-weight:700;letter-spacing:1px;");
+ lbl->setStyleSheet("color:" + QString(ui::colors::TEXT_SECONDARY()) + ";font-weight:700;letter-spacing:1px;");
vl->addWidget(lbl);
auto* hint = new QLabel("A profile = named LLM config you can assign to any agent or team.");
hint->setWordWrap(true);
- hint->setStyleSheet("color:#555;font-size:10px;padding-bottom:4px;");
+ hint->setStyleSheet("color:" + QString(ui::colors::TEXT_TERTIARY()) + ";padding-bottom:4px;");
vl->addWidget(hint);
profile_list_ = new QListWidget;
profile_list_->setStyleSheet(
- "QListWidget{background:transparent;border:none;color:#ccc;font-size:12px;}"
+ "QListWidget{background:transparent;border:none;color:" + QString(ui::colors::TEXT_PRIMARY()) + ";}"
"QListWidget::item{padding:8px 6px;border-radius:3px;}"
- "QListWidget::item:selected{background:#1a1a1a;color:#ff6600;}"
- "QListWidget::item:hover{background:#111;}");
+ "QListWidget::item:selected{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::AMBER()) + ";}"
+ "QListWidget::item:hover{background:" + QString(ui::colors::BG_RAISED()) + ";}");
connect(profile_list_, &QListWidget::currentRowChanged, this, &LlmConfigSection::on_profile_selected);
vl->addWidget(profile_list_, 1);
auto* btn_row = new QHBoxLayout;
auto* add_btn = new QPushButton("+ New");
add_btn->setStyleSheet(
- "QPushButton{background:#1a1a1a;color:#ff6600;border:1px solid #ff6600;"
- "border-radius:3px;padding:5px 10px;font-size:11px;font-weight:600;}"
- "QPushButton:hover{background:#2a1a0a;}");
+ "QPushButton{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::AMBER()) + ";border:1px solid " + QString(ui::colors::AMBER()) + ";"
+ "border-radius:3px;padding:5px 10px;font-weight:600;}"
+ "QPushButton:hover{background:" + QString(ui::colors::BG_RAISED()) + ";}");
connect(add_btn, &QPushButton::clicked, this, [this]() {
editing_profile_id_.clear();
clear_profile_form();
@@ -793,10 +803,10 @@ QWidget* LlmConfigSection::build_profile_list_panel() {
profile_delete_btn_ = new QPushButton("Delete");
profile_delete_btn_->setEnabled(false);
profile_delete_btn_->setStyleSheet(
- "QPushButton{background:transparent;color:#cc4444;border:1px solid #cc4444;"
- "border-radius:3px;padding:5px 10px;font-size:11px;}"
- "QPushButton:hover{background:#1a0a0a;}"
- "QPushButton:disabled{color:#333;border-color:#333;}");
+ "QPushButton{background:transparent;color:" + QString(ui::colors::NEGATIVE()) + ";border:1px solid " + QString(ui::colors::NEGATIVE()) + ";"
+ "border-radius:3px;padding:5px 10px;}"
+ "QPushButton:hover{background:" + QString(ui::colors::BG_RAISED()) + ";}"
+ "QPushButton:disabled{color:" + QString(ui::colors::BORDER_BRIGHT()) + ";border-color:" + QString(ui::colors::BORDER_BRIGHT()) + ";}");
connect(profile_delete_btn_, &QPushButton::clicked, this, &LlmConfigSection::on_delete_profile);
btn_row->addWidget(profile_delete_btn_);
vl->addLayout(btn_row);
@@ -807,23 +817,23 @@ QWidget* LlmConfigSection::build_profile_list_panel() {
QWidget* LlmConfigSection::build_profile_form_panel() {
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
- scroll->setStyleSheet("QScrollArea{border:none;background:#0a0a0a;}"
- "QScrollBar:vertical{width:6px;background:#0d0d0d;}"
- "QScrollBar::handle:vertical{background:#333;}");
+ scroll->setStyleSheet("QScrollArea{border:none;background:" + QString(ui::colors::BG_BASE()) + ";}"
+ "QScrollBar:vertical{width:6px;background:" + QString(ui::colors::BG_SURFACE()) + ";}"
+ "QScrollBar::handle:vertical{background:" + QString(ui::colors::BORDER_BRIGHT()) + ";}");
auto* panel = new QWidget;
- panel->setStyleSheet("background:#0a0a0a;");
+ panel->setStyleSheet("background:" + QString(ui::colors::BG_BASE()) + ";");
auto* vl = new QVBoxLayout(panel);
vl->setContentsMargins(20, 16, 20, 16);
vl->setSpacing(10);
static auto lbl = [](const QString& t) {
auto* l = new QLabel(t);
- l->setStyleSheet("color:#888;font-size:10px;font-weight:700;letter-spacing:1px;");
+ l->setStyleSheet("color:" + QString(ui::colors::TEXT_SECONDARY()) + ";font-weight:700;letter-spacing:1px;");
return l;
};
static auto field_style = []() {
- return QString("background:#111;color:#ccc;border:1px solid #2a2a2a;padding:6px 10px;font-size:12px;");
+ return QString("background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::TEXT_PRIMARY()) + ";border:1px solid " + QString(ui::colors::BORDER_MED()) + ";padding:6px 10px;");
};
vl->addWidget(lbl("PROFILE NAME"));
@@ -894,19 +904,19 @@ QWidget* LlmConfigSection::build_profile_form_panel() {
auto* btn_row = new QHBoxLayout;
profile_save_btn_ = new QPushButton("SAVE PROFILE");
profile_save_btn_->setStyleSheet(
- "QPushButton{background:#ff6600;color:#000;border:none;padding:8px 20px;"
- "font-size:11px;font-weight:700;letter-spacing:1px;}"
- "QPushButton:hover{background:#ff8800;}");
+ "QPushButton{background:" + QString(ui::colors::AMBER()) + ";color:#000;border:none;padding:8px 20px;"
+ "font-weight:700;letter-spacing:1px;}"
+ "QPushButton:hover{background:" + QString(ui::colors::AMBER_DIM()) + ";}");
connect(profile_save_btn_, &QPushButton::clicked, this, &LlmConfigSection::on_save_profile);
btn_row->addWidget(profile_save_btn_);
profile_default_btn_ = new QPushButton("SET AS DEFAULT");
profile_default_btn_->setEnabled(false);
profile_default_btn_->setStyleSheet(
- "QPushButton{background:transparent;color:#ff6600;border:1px solid #ff6600;"
- "padding:8px 20px;font-size:11px;font-weight:600;}"
- "QPushButton:hover{background:#1a0a00;}"
- "QPushButton:disabled{color:#333;border-color:#333;}");
+ "QPushButton{background:transparent;color:" + QString(ui::colors::AMBER()) + ";border:1px solid " + QString(ui::colors::AMBER()) + ";"
+ "padding:8px 20px;font-weight:600;}"
+ "QPushButton:hover{background:" + QString(ui::colors::BG_RAISED()) + ";}"
+ "QPushButton:disabled{color:" + QString(ui::colors::BORDER_BRIGHT()) + ";border-color:" + QString(ui::colors::BORDER_BRIGHT()) + ";}");
connect(profile_default_btn_, &QPushButton::clicked, this, &LlmConfigSection::on_set_default_profile);
btn_row->addWidget(profile_default_btn_);
btn_row->addStretch();
@@ -939,7 +949,7 @@ void LlmConfigSection::load_profiles() {
auto* item = new QListWidgetItem(display);
item->setData(Qt::UserRole, p.id);
if (p.is_default)
- item->setForeground(QColor("#ff6600"));
+ item->setForeground(QColor("" + QString(ui::colors::AMBER()) + ""));
profile_list_->addItem(item);
}
}
@@ -991,7 +1001,7 @@ void LlmConfigSection::clear_profile_form() {
void LlmConfigSection::show_profile_status(const QString& msg, bool error) {
profile_status_lbl_->setText(msg);
- profile_status_lbl_->setStyleSheet(error ? "color:#ff4444;font-size:11px;" : "color:#44cc44;font-size:11px;");
+ profile_status_lbl_->setStyleSheet(error ? "color:" + QString(ui::colors::NEGATIVE()) + ";" : "color:" + QString(ui::colors::POSITIVE()) + ";");
profile_status_lbl_->show();
QTimer::singleShot(4000, profile_status_lbl_, &QLabel::hide);
}
diff --git a/fincept-qt/src/screens/settings/McpServersSection.cpp b/fincept-qt/src/screens/settings/McpServersSection.cpp
index 075d6d4d3..e24995c57 100644
--- a/fincept-qt/src/screens/settings/McpServersSection.cpp
+++ b/fincept-qt/src/screens/settings/McpServersSection.cpp
@@ -3,6 +3,8 @@
#include "screens/settings/McpServersSection.h"
#include "core/logging/Logger.h"
+#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include "mcp/McpManager.h"
#include "mcp/McpService.h"
#include "storage/repositories/McpServerRepository.h"
@@ -41,6 +43,14 @@ static constexpr const char* TAG = "McpServersSection";
McpServersSection::McpServersSection(QWidget* parent) : QWidget(parent) {
build_ui();
load_servers();
+
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) {
+ setStyleSheet(QString("background:%1;color:%2;")
+ .arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY()));
+ });
+ setStyleSheet(QString("background:%1;color:%2;")
+ .arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY()));
}
void McpServersSection::reload() {
@@ -57,18 +67,18 @@ void McpServersSection::build_ui() {
// Title bar
auto* title_bar = new QWidget;
title_bar->setFixedHeight(44);
- title_bar->setStyleSheet("background:#0d0d0d;border-bottom:1px solid #1e1e1e;");
+ title_bar->setStyleSheet("background:" + QString(ui::colors::BG_SURFACE()) + ";border-bottom:1px solid " + QString(ui::colors::BORDER_DIM()) + ";");
auto* tbl = new QHBoxLayout(title_bar);
tbl->setContentsMargins(16, 0, 16, 0);
auto* title = new QLabel("MCP SERVERS");
- title->setStyleSheet("color:#ff6600;font-size:13px;font-weight:700;letter-spacing:1px;");
+ title->setStyleSheet("color:" + QString(ui::colors::AMBER()) + ";font-weight:700;letter-spacing:1px;");
tbl->addWidget(title);
tbl->addStretch();
// Internal tools count badge
auto* tools_badge = new QLabel;
tools_badge->setObjectName("McpToolsBadge");
- tools_badge->setStyleSheet("color:#888;font-size:11px;");
+ tools_badge->setStyleSheet("color:" + QString(ui::colors::TEXT_SECONDARY()) + ";");
tbl->addWidget(tools_badge);
root->addWidget(title_bar);
@@ -76,7 +86,7 @@ void McpServersSection::build_ui() {
// Tab buttons
auto* tab_bar = new QWidget;
tab_bar->setFixedHeight(36);
- tab_bar->setStyleSheet("background:#0a0a0a;border-bottom:1px solid #1e1e1e;");
+ tab_bar->setStyleSheet("background:" + QString(ui::colors::BG_BASE()) + ";border-bottom:1px solid " + QString(ui::colors::BORDER_DIM()) + ";");
auto* tbbl = new QHBoxLayout(tab_bar);
tbbl->setContentsMargins(8, 0, 8, 0);
tbbl->setSpacing(4);
@@ -85,10 +95,10 @@ void McpServersSection::build_ui() {
auto* btn = new QPushButton(text);
btn->setCheckable(true);
btn->setFixedHeight(28);
- btn->setStyleSheet("QPushButton{background:transparent;color:#888;border:none;"
- "border-bottom:2px solid transparent;font-size:12px;padding:0 12px;}"
- "QPushButton:checked{color:#ff6600;border-bottom:2px solid #ff6600;}"
- "QPushButton:hover:!checked{color:#ccc;}");
+ btn->setStyleSheet("QPushButton{background:transparent;color:" + QString(ui::colors::TEXT_SECONDARY()) + ";border:none;"
+ "border-bottom:2px solid transparent;padding:0 12px;}"
+ "QPushButton:checked{color:" + QString(ui::colors::AMBER()) + ";border-bottom:2px solid " + QString(ui::colors::AMBER()) + ";}"
+ "QPushButton:hover:!checked{color:" + QString(ui::colors::TEXT_PRIMARY()) + ";}");
connect(btn, &QPushButton::clicked, this, [this, idx]() { on_tab_changed(idx); });
tbbl->addWidget(btn);
if (idx == 0)
@@ -117,7 +127,7 @@ void McpServersSection::build_ui() {
QWidget* McpServersSection::build_servers_tab() {
auto* page = new QWidget;
- page->setStyleSheet("background:#0a0a0a;");
+ page->setStyleSheet("background:" + QString(ui::colors::BG_BASE()) + ";");
auto* hl = new QHBoxLayout(page);
hl->setContentsMargins(0, 0, 0, 0);
hl->setSpacing(0);
@@ -125,37 +135,37 @@ QWidget* McpServersSection::build_servers_tab() {
// Left: server list
auto* left = new QWidget;
left->setFixedWidth(240);
- left->setStyleSheet("background:#0a0a0a;border-right:1px solid #1e1e1e;");
+ left->setStyleSheet("background:" + QString(ui::colors::BG_BASE()) + ";border-right:1px solid " + QString(ui::colors::BORDER_DIM()) + ";");
auto* lvl = new QVBoxLayout(left);
lvl->setContentsMargins(8, 8, 8, 8);
lvl->setSpacing(6);
auto* list_lbl = new QLabel("External Servers");
- list_lbl->setStyleSheet("color:#888;font-size:11px;font-weight:700;letter-spacing:1px;");
+ list_lbl->setStyleSheet("color:" + QString(ui::colors::TEXT_SECONDARY()) + ";font-weight:700;letter-spacing:1px;");
lvl->addWidget(list_lbl);
server_list_ = new QListWidget;
- server_list_->setStyleSheet("QListWidget{background:transparent;border:none;color:#ccc;font-size:12px;}"
- "QListWidget::item{padding:10px 8px;border-radius:3px;border-bottom:1px solid #111;}"
- "QListWidget::item:selected{background:#1a1a1a;color:#ff6600;}"
- "QListWidget::item:hover{background:#111;}");
+ server_list_->setStyleSheet("QListWidget{background:transparent;border:none;color:" + QString(ui::colors::TEXT_PRIMARY()) + ";}"
+ "QListWidget::item{padding:10px 8px;border-radius:3px;border-bottom:1px solid " + QString(ui::colors::BG_RAISED()) + ";}"
+ "QListWidget::item:selected{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::AMBER()) + ";}"
+ "QListWidget::item:hover{background:" + QString(ui::colors::BG_RAISED()) + ";}");
connect(server_list_, &QListWidget::currentRowChanged, this, &McpServersSection::on_server_selected);
lvl->addWidget(server_list_, 1);
// Action buttons
auto* btns = new QHBoxLayout;
add_btn_ = new QPushButton("+ Add");
- add_btn_->setStyleSheet("QPushButton{background:#1a1a1a;color:#ff6600;border:1px solid #ff6600;"
- "border-radius:3px;padding:5px 10px;font-size:11px;font-weight:600;}"
- "QPushButton:hover{background:#2a1a0a;}");
+ add_btn_->setStyleSheet("QPushButton{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::AMBER()) + ";border:1px solid " + QString(ui::colors::AMBER()) + ";"
+ "border-radius:3px;padding:5px 10px;font-weight:600;}"
+ "QPushButton:hover{background:" + QString(ui::colors::BG_RAISED()) + ";}");
connect(add_btn_, &QPushButton::clicked, this, &McpServersSection::on_add_server);
remove_btn_ = new QPushButton("Remove");
remove_btn_->setEnabled(false);
- remove_btn_->setStyleSheet("QPushButton{background:#1a0a0a;color:#cc3300;border:1px solid #330000;"
- "border-radius:3px;padding:5px 10px;font-size:11px;}"
- "QPushButton:hover{background:#2a1010;}"
- "QPushButton:disabled{color:#333;border-color:#222;}");
+ remove_btn_->setStyleSheet("QPushButton{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::NEGATIVE()) + ";border:1px solid " + QString(ui::colors::BG_RAISED()) + ";"
+ "border-radius:3px;padding:5px 10px;}"
+ "QPushButton:hover{background:" + QString(ui::colors::BG_RAISED()) + ";}"
+ "QPushButton:disabled{color:" + QString(ui::colors::BORDER_BRIGHT()) + ";border-color:#222;}");
connect(remove_btn_, &QPushButton::clicked, this, &McpServersSection::on_remove_server);
btns->addWidget(add_btn_);
@@ -168,20 +178,20 @@ QWidget* McpServersSection::build_servers_tab() {
auto* right = new QScrollArea;
right->setWidgetResizable(true);
right->setFrameShape(QFrame::NoFrame);
- right->setStyleSheet("QScrollArea{background:#0a0a0a;border:none;}"
- "QScrollBar:vertical{background:#111;width:6px;}"
- "QScrollBar::handle:vertical{background:#333;border-radius:3px;}"
+ right->setStyleSheet("QScrollArea{background:" + QString(ui::colors::BG_BASE()) + ";border:none;}"
+ "QScrollBar:vertical{background:" + QString(ui::colors::BG_RAISED()) + ";width:6px;}"
+ "QScrollBar::handle:vertical{background:" + QString(ui::colors::BORDER_BRIGHT()) + ";border-radius:3px;}"
"QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}");
auto* detail_page = new QWidget;
- detail_page->setStyleSheet("background:#0a0a0a;");
+ detail_page->setStyleSheet("background:" + QString(ui::colors::BG_BASE()) + ";");
auto* dvl = new QVBoxLayout(detail_page);
dvl->setContentsMargins(24, 20, 24, 20);
dvl->setSpacing(12);
detail_lbl_ = new QLabel("Select a server to view details.");
detail_lbl_->setWordWrap(true);
- detail_lbl_->setStyleSheet("color:#666;font-size:12px;");
+ detail_lbl_->setStyleSheet("color:" + QString(ui::colors::TEXT_TERTIARY()) + ";");
dvl->addWidget(detail_lbl_);
// Start/Stop buttons
@@ -189,19 +199,19 @@ QWidget* McpServersSection::build_servers_tab() {
start_btn_ = new QPushButton("▶ Start");
start_btn_->setEnabled(false);
start_btn_->setFixedHeight(32);
- start_btn_->setStyleSheet("QPushButton{background:#0a2a0a;color:#44cc44;border:1px solid #226622;"
- "border-radius:4px;font-size:12px;font-weight:600;padding:0 16px;}"
- "QPushButton:hover{background:#0f3a0f;}"
- "QPushButton:disabled{color:#333;border-color:#222;background:#0a0a0a;}");
+ start_btn_->setStyleSheet("QPushButton{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::POSITIVE()) + ";border:1px solid " + QString(ui::colors::POSITIVE()) + ";"
+ "border-radius:4px;font-weight:600;padding:0 16px;}"
+ "QPushButton:hover{background:" + QString(ui::colors::BG_RAISED()) + ";}"
+ "QPushButton:disabled{color:" + QString(ui::colors::BORDER_BRIGHT()) + ";border-color:#222;background:" + QString(ui::colors::BG_BASE()) + ";}");
connect(start_btn_, &QPushButton::clicked, this, &McpServersSection::on_start_server);
stop_btn_ = new QPushButton("■ Stop");
stop_btn_->setEnabled(false);
stop_btn_->setFixedHeight(32);
- stop_btn_->setStyleSheet("QPushButton{background:#2a0a0a;color:#cc4444;border:1px solid #662222;"
- "border-radius:4px;font-size:12px;font-weight:600;padding:0 16px;}"
- "QPushButton:hover{background:#3a0f0f;}"
- "QPushButton:disabled{color:#333;border-color:#222;background:#0a0a0a;}");
+ stop_btn_->setStyleSheet("QPushButton{background:" + QString(ui::colors::NEGATIVE()) + ";color:" + QString(ui::colors::NEGATIVE()) + ";border:1px solid " + QString(ui::colors::NEGATIVE()) + ";"
+ "border-radius:4px;font-weight:600;padding:0 16px;}"
+ "QPushButton:hover{background:" + QString(ui::colors::BG_RAISED()) + ";}"
+ "QPushButton:disabled{color:" + QString(ui::colors::BORDER_BRIGHT()) + ";border-color:#222;background:" + QString(ui::colors::BG_BASE()) + ";}");
connect(stop_btn_, &QPushButton::clicked, this, &McpServersSection::on_stop_server);
server_btns->addWidget(start_btn_);
@@ -210,7 +220,7 @@ QWidget* McpServersSection::build_servers_tab() {
dvl->addLayout(server_btns);
status_lbl_ = new QLabel;
- status_lbl_->setStyleSheet("font-size:11px;");
+ status_lbl_->setStyleSheet("");
status_lbl_->hide();
dvl->addWidget(status_lbl_);
@@ -227,14 +237,14 @@ QWidget* McpServersSection::build_servers_tab() {
QWidget* McpServersSection::build_tools_tab() {
auto* page = new QWidget;
- page->setStyleSheet("background:#0a0a0a;");
+ page->setStyleSheet("background:" + QString(ui::colors::BG_BASE()) + ";");
auto* vl = new QVBoxLayout(page);
vl->setContentsMargins(16, 12, 16, 12);
vl->setSpacing(8);
auto* info =
new QLabel("All registered MCP tools — both internal (built-in) and external (from connected servers).");
- info->setStyleSheet("color:#888;font-size:11px;");
+ info->setStyleSheet("color:" + QString(ui::colors::TEXT_SECONDARY()) + ";");
info->setWordWrap(true);
vl->addWidget(info);
@@ -249,13 +259,13 @@ QWidget* McpServersSection::build_tools_tab() {
tools_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);
tools_table_->setAlternatingRowColors(true);
tools_table_->verticalHeader()->hide();
- tools_table_->setStyleSheet("QTableWidget{background:#0a0a0a;color:#ccc;border:1px solid #1e1e1e;"
- "gridline-color:#111;font-size:12px;}"
+ tools_table_->setStyleSheet("QTableWidget{background:" + QString(ui::colors::BG_BASE()) + ";color:" + QString(ui::colors::TEXT_PRIMARY()) + ";border:1px solid " + QString(ui::colors::BORDER_DIM()) + ";"
+ "gridline-color:" + QString(ui::colors::BG_RAISED()) + ";}"
"QTableWidget::item{padding:6px;}"
- "QTableWidget::item:selected{background:#1a1a1a;color:#ff6600;}"
- "QHeaderView::section{background:#0d0d0d;color:#888;border:none;"
- "border-bottom:1px solid #1e1e1e;padding:6px;font-size:11px;font-weight:600;}"
- "QTableWidget{alternate-background-color:#080808;}");
+ "QTableWidget::item:selected{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::AMBER()) + ";}"
+ "QHeaderView::section{background:" + QString(ui::colors::BG_SURFACE()) + ";color:" + QString(ui::colors::TEXT_SECONDARY()) + ";border:none;"
+ "border-bottom:1px solid " + QString(ui::colors::BORDER_DIM()) + ";padding:6px;font-weight:600;}"
+ "QTableWidget{alternate-background-color:" + QString(ui::colors::BG_BASE()) + ";}");
vl->addWidget(tools_table_, 1);
return page;
@@ -269,14 +279,14 @@ void McpServersSection::on_add_server() {
auto* dlg = new QDialog(this);
dlg->setWindowTitle("Add MCP Server");
dlg->setMinimumWidth(480);
- dlg->setStyleSheet("background:#0d0d0d;color:#e0e0e0;");
+ dlg->setStyleSheet("background:" + QString(ui::colors::BG_SURFACE()) + ";color:" + QString(ui::colors::TEXT_PRIMARY()) + ";");
auto* vl = new QVBoxLayout(dlg);
vl->setSpacing(12);
vl->setContentsMargins(16, 16, 16, 16);
auto* title = new QLabel("Add External MCP Server");
- title->setStyleSheet("color:#ff6600;font-size:13px;font-weight:700;");
+ title->setStyleSheet("color:" + QString(ui::colors::AMBER()) + ";font-weight:700;");
vl->addWidget(title);
auto* form = new QFormLayout;
@@ -285,14 +295,14 @@ void McpServersSection::on_add_server() {
auto fe = [](const QString& ph) {
auto* e = new QLineEdit;
e->setPlaceholderText(ph);
- e->setStyleSheet("QLineEdit{background:#111;color:#e0e0e0;border:1px solid #2a2a2a;"
- "border-radius:3px;padding:6px;font-size:12px;}"
- "QLineEdit:focus{border:1px solid #ff6600;}");
+ e->setStyleSheet("QLineEdit{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::TEXT_PRIMARY()) + ";border:1px solid " + QString(ui::colors::BORDER_MED()) + ";"
+ "border-radius:3px;padding:6px;}"
+ "QLineEdit:focus{border:1px solid " + QString(ui::colors::AMBER()) + ";}");
return e;
};
auto fl = [](const QString& t) {
auto* l = new QLabel(t);
- l->setStyleSheet("color:#888;font-size:12px;");
+ l->setStyleSheet("color:" + QString(ui::colors::TEXT_SECONDARY()) + ";");
return l;
};
@@ -313,7 +323,7 @@ void McpServersSection::on_add_server() {
// Auto-start checkbox
auto* auto_start_row = new QHBoxLayout;
auto* as_lbl = new QLabel("Auto-start on launch");
- as_lbl->setStyleSheet("color:#888;font-size:12px;");
+ as_lbl->setStyleSheet("color:" + QString(ui::colors::TEXT_SECONDARY()) + ";");
auto* as_cb = new QCheckBox;
as_cb->setChecked(false);
auto_start_row->addWidget(as_lbl);
@@ -322,11 +332,11 @@ void McpServersSection::on_add_server() {
vl->addLayout(auto_start_row);
auto* btns = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
- btns->setStyleSheet("QPushButton{background:#1a1a1a;color:#e0e0e0;border:1px solid #333;"
- "border-radius:3px;padding:6px 16px;font-size:12px;}"
+ btns->setStyleSheet("QPushButton{background:" + QString(ui::colors::BG_RAISED()) + ";color:" + QString(ui::colors::TEXT_PRIMARY()) + ";border:1px solid " + QString(ui::colors::BORDER_BRIGHT()) + ";"
+ "border-radius:3px;padding:6px 16px;}"
"QPushButton:hover{background:#222;}"
- "QPushButton[text='OK']{background:#ff6600;color:#000;border:none;}"
- "QPushButton[text='OK']:hover{background:#ff8800;}");
+ "QPushButton[text='OK']{background:" + QString(ui::colors::AMBER()) + ";color:#000;border:none;}"
+ "QPushButton[text='OK']:hover{background:" + QString(ui::colors::AMBER_DIM()) + ";}");
connect(btns, &QDialogButtonBox::accepted, dlg, &QDialog::accept);
connect(btns, &QDialogButtonBox::rejected, dlg, &QDialog::reject);
vl->addWidget(btns);
@@ -393,9 +403,9 @@ void McpServersSection::load_servers() {
item->setData(Qt::UserRole, cfg.id);
if (cfg.status == ServerStatus::Running)
- item->setForeground(QColor("#44cc44"));
+ item->setForeground(QColor("" + QString(ui::colors::POSITIVE()) + ""));
else if (cfg.status == ServerStatus::Error)
- item->setForeground(QColor("#cc4444"));
+ item->setForeground(QColor("" + QString(ui::colors::NEGATIVE()) + ""));
else
item->setForeground(QColor("#888"));
@@ -427,11 +437,11 @@ void McpServersSection::load_tools() {
auto* desc_item = new QTableWidgetItem(t.description);
if (t.is_internal) {
- server_item->setForeground(QColor("#ff6600"));
+ server_item->setForeground(QColor("" + QString(ui::colors::AMBER()) + ""));
cat_item->setForeground(QColor("#888"));
} else {
- server_item->setForeground(QColor("#44cc44"));
- cat_item->setForeground(QColor("#4488cc"));
+ server_item->setForeground(QColor("" + QString(ui::colors::POSITIVE()) + ""));
+ cat_item->setForeground(QColor("" + QString(ui::colors::INFO()) + ""));
}
tools_table_->setItem(row, 0, name_item);
@@ -456,11 +466,11 @@ void McpServersSection::refresh_server_detail(const QString& server_id) {
else
status_str = "Stopped";
- detail_lbl_->setText(QString("<b style='color:#e0e0e0'>%1</b><br>"
- "<span style='color:#888;font-size:11px;'>Status: %2</span><br>"
- "<span style='color:#666;font-size:11px;'>Command: %3 %4</span><br>"
- "<span style='color:#666;font-size:11px;'>Category: %5</span><br>"
- "<span style='color:#666;font-size:11px;'>Auto-start: %6</span>")
+ detail_lbl_->setText(QString("<b style='color:" + QString(ui::colors::TEXT_PRIMARY()) + "'>%1</b><br>"
+ "<span style='color:" + QString(ui::colors::TEXT_SECONDARY()) + ";'>Status: %2</span><br>"
+ "<span style='color:" + QString(ui::colors::TEXT_TERTIARY()) + ";'>Command: %3 %4</span><br>"
+ "<span style='color:" + QString(ui::colors::TEXT_TERTIARY()) + ";'>Category: %5</span><br>"
+ "<span style='color:" + QString(ui::colors::TEXT_TERTIARY()) + ";'>Auto-start: %6</span>")
.arg(cfg.name, status_str, cfg.command, cfg.args.join(' '),
cfg.category.isEmpty() ? "-" : cfg.category, cfg.auto_start ? "Yes" : "No"));
@@ -556,7 +566,7 @@ void McpServersSection::on_tab_changed(int idx) {
void McpServersSection::show_status(const QString& msg, bool error) {
status_lbl_->setText(msg);
- status_lbl_->setStyleSheet(error ? "color:#ff4444;font-size:11px;" : "color:#44cc44;font-size:11px;");
+ status_lbl_->setStyleSheet(error ? "color:" + QString(ui::colors::NEGATIVE()) + ";" : "color:" + QString(ui::colors::POSITIVE()) + ";");
status_lbl_->show();
QTimer::singleShot(4000, status_lbl_, &QLabel::hide);
}
diff --git a/fincept-qt/src/screens/settings/SettingsScreen.cpp b/fincept-qt/src/screens/settings/SettingsScreen.cpp
index d9d345c0c..8abff6160 100644
--- a/fincept-qt/src/screens/settings/SettingsScreen.cpp
+++ b/fincept-qt/src/screens/settings/SettingsScreen.cpp
@@ -4,7 +4,9 @@
#include "screens/settings/SettingsScreen.h"
#include "ai_chat/LlmService.h"
+#include "core/config/AppConfig.h"
#include "core/logging/Logger.h"
+#include "services/notifications/NotificationService.h"
#include "screens/settings/LlmConfigSection.h"
#include "screens/settings/McpServersSection.h"
#include "storage/cache/CacheManager.h"
@@ -33,96 +35,63 @@ namespace fincept::screens {
// ── Token-based style builders (live — reflect active theme) ─────────────────
+// All helpers read live ThemeManager tokens — no font-size overrides (global QSS handles font)
static QString section_title_ss() {
- const auto& t = fincept::ui::ThemeManager::instance().tokens();
- return QString("color: %1; font-size: 13px; font-weight: bold; letter-spacing: 0.5px; background: transparent;")
- .arg(QString(t.accent));
+ return QString("color:%1;font-weight:bold;letter-spacing:0.5px;background:transparent;")
+ .arg(ui::colors::AMBER());
}
-
static QString sub_title_ss() {
- const auto& t = fincept::ui::ThemeManager::instance().tokens();
- return QString("color: %1; font-size: 11px; font-weight: 700; letter-spacing: 0.5px; background: transparent;")
- .arg(QString(t.text_secondary));
+ return QString("color:%1;font-weight:700;letter-spacing:0.5px;background:transparent;")
+ .arg(ui::colors::TEXT_SECONDARY());
}
-
static QString label_ss() {
- const auto& t = fincept::ui::ThemeManager::instance().tokens();
- return QString("color: %1; font-size: 13px; background: transparent;")
- .arg(QString(t.text_secondary));
+ return QString("color:%1;background:transparent;").arg(ui::colors::TEXT_SECONDARY());
}
-
static QString nav_btn_ss() {
- const auto& t = fincept::ui::ThemeManager::instance().tokens();
- return QString(
- "QPushButton { background: transparent; color: %1; border: none; "
- "text-align: left; padding: 0 12px; font-size: 13px; }"
- "QPushButton:hover { background: %2; color: %3; }"
- "QPushButton:checked { color: %4; background: %2; }")
- .arg(QString(t.text_secondary), QString(t.bg_raised),
- QString(t.text_primary), QString(t.accent));
+ return QString("QPushButton{background:transparent;color:%1;border:none;text-align:left;padding:0 12px;}"
+ "QPushButton:hover{background:%2;color:%3;}"
+ "QPushButton:checked{color:%4;background:%2;}")
+ .arg(ui::colors::TEXT_SECONDARY(), ui::colors::BG_RAISED(),
+ ui::colors::TEXT_PRIMARY(), ui::colors::AMBER());
}
-
static QString input_ss() {
- const auto& t = fincept::ui::ThemeManager::instance().tokens();
- return QString(
- "QLineEdit { background: %1; color: %2; border: 1px solid %3; "
- "padding: 6px; font-size: 12px; }"
- "QLineEdit:focus { border: 1px solid %4; }")
- .arg(QString(t.bg_raised), QString(t.text_primary),
- QString(t.border_med), QString(t.accent));
+ return QString("QLineEdit{background:%1;color:%2;border:1px solid %3;padding:6px;}"
+ "QLineEdit:focus{border:1px solid %4;}")
+ .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_PRIMARY(),
+ ui::colors::BORDER_MED(), ui::colors::AMBER());
}
-
static QString btn_primary_ss() {
- const auto& t = fincept::ui::ThemeManager::instance().tokens();
- return QString(
- "QPushButton { background: %1; color: %2; border: none; "
- "font-size: 12px; font-weight: 700; padding: 0 16px; height: 32px; }"
- "QPushButton:hover { background: %3; }")
- .arg(QString(t.accent), QString(t.bg_base), QString(t.accent_dim));
+ return QString("QPushButton{background:%1;color:%2;border:none;font-weight:700;padding:0 16px;height:32px;}"
+ "QPushButton:hover{background:%3;}")
+ .arg(ui::colors::AMBER(), ui::colors::BG_BASE(), ui::colors::AMBER_DIM());
}
-
static QString btn_secondary_ss() {
- const auto& t = fincept::ui::ThemeManager::instance().tokens();
- return QString(
- "QPushButton { background: %1; color: %2; border: 1px solid %3; "
- "font-size: 12px; padding: 0 12px; height: 32px; }"
- "QPushButton:hover { background: %4; }")
- .arg(QString(t.bg_raised), QString(t.text_primary),
- QString(t.border_bright), QString(t.bg_hover));
+ return QString("QPushButton{background:%1;color:%2;border:1px solid %3;padding:0 12px;height:32px;}"
+ "QPushButton:hover{background:%4;}")
+ .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_PRIMARY(),
+ ui::colors::BORDER_BRIGHT(), ui::colors::BG_HOVER());
}
-
static QString btn_danger_ss() {
- const auto& t = fincept::ui::ThemeManager::instance().tokens();
- return QString(
- "QPushButton { background: %1; color: %2; border: 1px solid %3; "
- "font-size: 12px; padding: 4px 12px; }"
- "QPushButton:hover { background: %4; }")
- .arg(QString(t.bg_raised), QString(t.negative),
- QString(t.border_dim), QString(t.bg_hover));
+ return QString("QPushButton{background:%1;color:%2;border:1px solid %3;padding:4px 12px;}"
+ "QPushButton:hover{background:%4;}")
+ .arg(ui::colors::BG_RAISED(), ui::colors::NEGATIVE(),
+ ui::colors::BORDER_DIM(), ui::colors::BG_HOVER());
}
-
static QString combo_ss() {
- const auto& t = fincept::ui::ThemeManager::instance().tokens();
- return QString(
- "QComboBox { background: %1; color: %2; border: 1px solid %3; "
- "padding: 5px 8px; font-size: 12px; min-width: 160px; }"
- "QComboBox:focus { border: 1px solid %4; }"
- "QComboBox::drop-down { border: none; width: 20px; }"
- "QComboBox QAbstractItemView { background: %1; color: %2; "
- "selection-background-color: %5; border: 1px solid %3; }")
- .arg(QString(t.bg_raised), QString(t.text_primary),
- QString(t.border_med), QString(t.accent), QString(t.bg_hover));
+ return QString("QComboBox{background:%1;color:%2;border:1px solid %3;padding:5px 8px;min-width:160px;}"
+ "QComboBox:focus{border:1px solid %4;}"
+ "QComboBox::drop-down{border:none;width:20px;}"
+ "QComboBox QAbstractItemView{background:%1;color:%2;selection-background-color:%5;border:1px solid %3;}")
+ .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_PRIMARY(),
+ ui::colors::BORDER_MED(), ui::colors::AMBER(), ui::colors::BG_HOVER());
}
-
static QString check_ss() {
- const auto& t = fincept::ui::ThemeManager::instance().tokens();
- return QString(
- "QCheckBox { color: %1; font-size: 13px; background: transparent; }"
- "QCheckBox::indicator { width: 14px; height: 14px; }"
- "QCheckBox::indicator:unchecked { border: 1px solid %2; background: %3; }"
- "QCheckBox::indicator:checked { border: 1px solid %4; background: %4; }")
- .arg(QString(t.text_secondary), QString(t.border_bright),
- QString(t.bg_raised), QString(t.accent));
+ return QString("QCheckBox{color:%1;background:transparent;}"
+ "QCheckBox::indicator{width:14px;height:14px;}"
+ "QCheckBox::indicator:unchecked{border:1px solid %2;background:%3;}"
+ "QCheckBox::indicator:checked{border:1px solid %4;background:%4;}")
+ .arg(ui::colors::TEXT_SECONDARY(), ui::colors::BORDER_BRIGHT(),
+ ui::colors::BG_RAISED(), ui::colors::AMBER());
}
// ── Credential key definitions ────────────────────────────────────────────────
@@ -151,17 +120,15 @@ static const QList<CredDef> CRED_KEYS = {
// ── Construction ──────────────────────────────────────────────────────────────
SettingsScreen::SettingsScreen(QWidget* parent) : QWidget(parent) {
- setStyleSheet(QString("background: %1;").arg(ui::colors::DARK));
auto* root = new QHBoxLayout(this);
root->setContentsMargins(0, 0, 0, 0);
root->setSpacing(0);
// Left nav panel
- auto* nav = new QWidget;
+ nav_ = new QWidget;
+ auto* nav = nav_;
nav->setFixedWidth(200);
- nav->setStyleSheet(
- QString("background: %1; border-right: 1px solid %2;").arg(ui::colors::PANEL, ui::colors::BORDER));
auto* nvl = new QVBoxLayout(nav);
nvl->setContentsMargins(8, 16, 8, 8);
nvl->setSpacing(2);
@@ -180,6 +147,7 @@ SettingsScreen::SettingsScreen(QWidget* parent) : QWidget(parent) {
sections_->addWidget(build_data_sources()); // 4
sections_->addWidget(build_llm_config()); // 5
sections_->addWidget(build_mcp_servers()); // 6
+ sections_->addWidget(build_logging()); // 7
QList<QPushButton*> nav_btns;
auto make_btn = [&](const QString& text, int idx) {
@@ -209,6 +177,7 @@ SettingsScreen::SettingsScreen(QWidget* parent) : QWidget(parent) {
make_btn("Data Sources", 4);
make_btn("LLM Config", 5);
make_btn("MCP Servers", 6);
+ make_btn("Logging", 7);
first->setChecked(true);
@@ -221,6 +190,23 @@ SettingsScreen::SettingsScreen(QWidget* parent) : QWidget(parent) {
connect(llm, &LlmConfigSection::config_changed, this,
[]() { ai_chat::LlmService::instance().reload_config(); });
}
+
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) { refresh_theme(); });
+ refresh_theme();
+}
+
+void SettingsScreen::refresh_theme() {
+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));
+ if (nav_)
+ nav_->setStyleSheet(
+ QString("background:%1;border-right:1px solid %2;")
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
+ // Re-apply nav button styles
+ if (nav_) {
+ for (auto* btn : nav_->findChildren<QPushButton*>())
+ btn->setStyleSheet(nav_btn_ss());
+ }
}
void SettingsScreen::showEvent(QShowEvent* e) {
@@ -253,7 +239,7 @@ QWidget* SettingsScreen::make_row(const QString& label, QWidget* control, const
if (!description.isEmpty()) {
auto* desc = new QLabel(description);
- desc->setStyleSheet("color: #555; font-size: 11px; background: transparent;");
+ desc->setStyleSheet(QString("color:%1;background:transparent;").arg(ui::colors::TEXT_SECONDARY()));
desc->setWordWrap(true);
vl->addWidget(desc);
}
@@ -263,7 +249,7 @@ QWidget* SettingsScreen::make_row(const QString& label, QWidget* control, const
QFrame* SettingsScreen::make_sep() {
auto* sep = new QFrame;
sep->setFixedHeight(1);
- sep->setStyleSheet("background: #1e1e1e;");
+ sep->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_DIM()));
return sep;
}
@@ -272,10 +258,12 @@ QFrame* SettingsScreen::make_sep() {
QWidget* SettingsScreen::build_credentials() {
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
- scroll->setStyleSheet("QScrollArea { border: none; background: transparent; }"
- "QScrollBar:vertical { background: #0a0a0a; width: 6px; }"
- "QScrollBar::handle:vertical { background: #2a2a2a; border-radius: 3px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }");
+ scroll->setStyleSheet(
+ QString("QScrollArea{border:none;background:transparent;}"
+ "QScrollBar:vertical{width:6px;background:transparent;}"
+ "QScrollBar::handle:vertical{background:%1;border-radius:3px;}"
+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")
+ .arg(ui::colors::BORDER_MED()));
auto* page = new QWidget;
auto* vl = new QVBoxLayout(page);
@@ -291,7 +279,7 @@ QWidget* SettingsScreen::build_credentials() {
auto* info =
new QLabel("Store API keys securely in the OS keychain. Keys are never written to disk in plain text.");
info->setWordWrap(true);
- info->setStyleSheet("color: #555; font-size: 11px; background: transparent;");
+ info->setStyleSheet(QString("color:%1;background:transparent;").arg(ui::colors::TEXT_SECONDARY()));
vl->addWidget(info);
vl->addSpacing(16);
vl->addWidget(make_sep());
@@ -304,7 +292,7 @@ QWidget* SettingsScreen::build_credentials() {
// Card frame
auto* card = new QFrame;
- card->setStyleSheet("QFrame { background: #0d0d0d; border: 1px solid #1a1a1a; border-radius: 4px; }");
+ card->setStyleSheet(QString("QFrame{background:%1;border:1px solid %2;border-radius:4px;}").arg(ui::colors::BG_SURFACE(),ui::colors::BORDER_DIM()));
auto* cvl = new QVBoxLayout(card);
cvl->setContentsMargins(0, 0, 0, 0);
cvl->setSpacing(0);
@@ -312,17 +300,17 @@ QWidget* SettingsScreen::build_credentials() {
// Card header
auto* hdr = new QWidget;
hdr->setFixedHeight(34);
- hdr->setStyleSheet("background: #111; border-bottom: 1px solid #1a1a1a;");
+ hdr->setStyleSheet(QString("background:%1;border-bottom:1px solid %2;").arg(ui::colors::BG_RAISED(),ui::colors::BORDER_DIM()));
auto* hhl = new QHBoxLayout(hdr);
hhl->setContentsMargins(12, 0, 12, 0);
auto* name_lbl = new QLabel(name);
- name_lbl->setStyleSheet("color: #e0e0e0; font-size: 12px; font-weight: 600; background: transparent;");
+ name_lbl->setStyleSheet(QString("color:%1;font-weight:600;background:transparent;").arg(ui::colors::TEXT_PRIMARY()));
hhl->addWidget(name_lbl);
hhl->addStretch();
// Status label — persisted across load_credentials calls
auto* status_lbl = new QLabel("Not set");
- status_lbl->setStyleSheet("color: #555; font-size: 11px; background: transparent;");
+ status_lbl->setStyleSheet(QString("color:%1;background:transparent;").arg(ui::colors::TEXT_SECONDARY()));
hhl->addWidget(status_lbl);
cred_status_[key] = status_lbl;
@@ -354,7 +342,7 @@ QWidget* SettingsScreen::build_credentials() {
SecureStorage::instance().remove(key);
field->setPlaceholderText("Not configured");
status_lbl->setText("Cleared");
- status_lbl->setStyleSheet("color: #888; font-size: 11px; background: transparent;");
+ status_lbl->setStyleSheet(QString("color:%1;background:transparent;").arg(ui::colors::TEXT_SECONDARY()));
LOG_INFO("Credentials", "Cleared key: " + key);
} else {
auto r = SecureStorage::instance().store(key, val);
@@ -362,11 +350,11 @@ QWidget* SettingsScreen::build_credentials() {
field->clear();
field->setPlaceholderText("•••••••• (saved)");
status_lbl->setText("Saved ✓");
- status_lbl->setStyleSheet("color: #44aa44; font-size: 11px; background: transparent;");
+ status_lbl->setStyleSheet(QString("color:%1;background:transparent;").arg(ui::colors::POSITIVE()));
LOG_INFO("Credentials", "Stored key: " + key);
} else {
status_lbl->setText("Save failed");
- status_lbl->setStyleSheet("color: #cc3300; font-size: 11px; background: transparent;");
+ status_lbl->setStyleSheet(QString("color:%1;background:transparent;").arg(ui::colors::NEGATIVE()));
LOG_ERROR("Credentials", "Failed to store " + key);
}
}
@@ -395,12 +383,12 @@ void SettingsScreen::load_credentials() {
field->clear();
field->setPlaceholderText("•••••••• (saved)");
status->setText("Saved ✓");
- status->setStyleSheet("color: #44aa44; font-size: 11px; background: transparent;");
+ status->setStyleSheet(QString("color:%1;background:transparent;").arg(ui::colors::POSITIVE()));
} else {
field->clear();
field->setPlaceholderText("Not configured");
status->setText("Not set");
- status->setStyleSheet("color: #555; font-size: 11px; background: transparent;");
+ status->setStyleSheet(QString("color:%1;background:transparent;").arg(ui::colors::TEXT_SECONDARY()));
}
}
}
@@ -498,7 +486,7 @@ QWidget* SettingsScreen::build_appearance() {
custom_accent_color_ = chosen.name();
accent_color_btn_->setStyleSheet(
QString("QPushButton { background: %1; color: %2; border: none; "
- "font-size: 12px; padding: 0 12px; height: 32px; }")
+ "padding: 0 12px; height: 32px; }")
.arg(custom_accent_color_,
QString(fincept::ui::ThemeManager::instance().tokens().bg_base)));
fincept::ui::ThemeManager::instance().apply_accent(custom_accent_color_);
@@ -629,7 +617,7 @@ void SettingsScreen::load_appearance() {
if (accent_color_btn_) {
accent_color_btn_->setStyleSheet(
QString("QPushButton { background: %1; color: %2; border: none; "
- "font-size: 12px; padding: 0 12px; height: 32px; }")
+ "padding: 0 12px; height: 32px; }")
.arg(custom_accent_color_,
QString(fincept::ui::ThemeManager::instance().tokens().bg_base)));
}
@@ -637,100 +625,342 @@ void SettingsScreen::load_appearance() {
}
// ── Notifications ─────────────────────────────────────────────────────────────
+//
+// Full per-provider accordion UI. Each provider gets a collapsible card with
+// its credential fields, an enable toggle, and a "Test Send" button.
+// Below the provider list: alert trigger checkboxes.
+
+// Provider-specific field definitions ──────────────────────────────────────────
+namespace {
+
+struct FieldDef {
+ QString key;
+ QString label;
+ QString placeholder;
+ bool is_password{false};
+};
+
+struct ProviderDef {
+ QString id;
+ QString name;
+ QString icon;
+ QVector<FieldDef> fields;
+};
+
+const QVector<ProviderDef>& provider_defs() {
+ static const QVector<ProviderDef> defs = {
+ { "telegram", "Telegram", "✈", {
+ {"bot_token", "Bot Token", "Enter bot token from @BotFather", true},
+ {"chat_id", "Chat ID", "e.g. 123456789"},
+ }},
+ { "discord", "Discord", "🎮", {
+ {"webhook_url", "Webhook URL", "https://discord.com/api/webhooks/..."},
+ }},
+ { "slack", "Slack", "💬", {
+ {"webhook_url", "Webhook URL", "https://hooks.slack.com/services/..."},
+ {"channel", "Channel", "#alerts (optional)"},
+ }},
+ { "email", "Email", "📧", {
+ {"smtp_host", "SMTP Host", "smtp.gmail.com"},
+ {"smtp_port", "Port", "587"},
+ {"smtp_user", "Username", "[email protected]"},
+ {"smtp_pass", "Password", "App password", true},
+ {"to_addr", "To Address", "[email protected]"},
+ {"from_addr", "From Address", "[email protected] (optional)"},
+ }},
+ { "whatsapp", "WhatsApp", "📱", {
+ {"account_sid", "Account SID", "Twilio Account SID"},
+ {"auth_token", "Auth Token", "Twilio Auth Token", true},
+ {"from_number", "From Number", "+14155238886"},
+ {"to_number", "To Number", "+1XXXXXXXXXX"},
+ }},
+ { "pushover", "Pushover", "🔔", {
+ {"api_token", "API Token", "Your Pushover app token", true},
+ {"user_key", "User Key", "Your Pushover user key", true},
+ }},
+ { "ntfy", "ntfy", "📢", {
+ {"server_url", "Server URL", "https://ntfy.sh (leave empty for default)"},
+ {"topic", "Topic", "your-topic-name"},
+ {"token", "Auth Token", "Optional auth token", true},
+ }},
+ { "pushbullet", "Pushbullet", "🔵", {
+ {"api_key", "API Key", "Your Pushbullet API key", true},
+ {"channel_tag", "Channel Tag", "Optional channel tag"},
+ }},
+ { "gotify", "Gotify", "🔊", {
+ {"server_url", "Server URL", "https://your-gotify-server.com"},
+ {"app_token", "App Token", "Application token", true},
+ }},
+ { "mattermost", "Mattermost", "🟦", {
+ {"webhook_url", "Webhook URL", "https://your-mattermost.com/hooks/..."},
+ {"channel", "Channel", "#town-square (optional)"},
+ {"username", "Username", "Fincept (optional)"},
+ }},
+ { "teams", "MS Teams", "🟪", {
+ {"webhook_url", "Webhook URL", "https://outlook.office.com/webhook/..."},
+ }},
+ { "webhook", "Webhook", "🌐", {
+ {"url", "URL", "https://your-endpoint.com/notify"},
+ {"method", "Method", "POST"},
+ }},
+ { "pagerduty", "PagerDuty", "🚨", {
+ {"routing_key", "Routing Key", "32-character integration key", true},
+ }},
+ { "opsgenie", "Opsgenie", "🔴", {
+ {"api_key", "API Key", "Your Opsgenie API key", true},
+ }},
+ { "sms", "SMS (Twilio)", "💬", {
+ {"account_sid", "Account SID", "Twilio Account SID"},
+ {"auth_token", "Auth Token", "Twilio Auth Token", true},
+ {"from_number", "From Number", "+15005550006"},
+ {"to_number", "To Number", "+1XXXXXXXXXX"},
+ }},
+ };
+ return defs;
+}
+
+} // anonymous namespace
QWidget* SettingsScreen::build_notifications() {
+ using namespace fincept::notifications;
+
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
- scroll->setStyleSheet("QScrollArea { border: none; background: transparent; }"
- "QScrollBar:vertical { background: #0a0a0a; width: 6px; }"
- "QScrollBar::handle:vertical { background: #2a2a2a; border-radius: 3px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }");
+ scroll->setStyleSheet(
+ QString("QScrollArea { border: none; background: transparent; }"
+ "QScrollBar:vertical { background: %1; width: 6px; }"
+ "QScrollBar::handle:vertical { background: %2; border-radius: 3px; }"
+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }")
+ .arg(fincept::ui::colors::BG_SURFACE(), fincept::ui::colors::BORDER_MED()));
auto* page = new QWidget;
auto* vl = new QVBoxLayout(page);
vl->setContentsMargins(24, 24, 24, 24);
- vl->setSpacing(8);
+ vl->setSpacing(6);
- auto* t = new QLabel("NOTIFICATIONS");
- t->setStyleSheet(section_title_ss());
- vl->addWidget(t);
+ auto* hdr_lbl = new QLabel("NOTIFICATION PROVIDERS");
+ hdr_lbl->setStyleSheet(section_title_ss());
+ vl->addWidget(hdr_lbl);
vl->addWidget(make_sep());
vl->addSpacing(8);
- // ── Email ─────────────────────────────────────────────────────────────────
- auto* email_hdr = new QLabel("EMAIL");
- email_hdr->setStyleSheet(sub_title_ss());
- vl->addWidget(email_hdr);
-
- notif_email_ = new QCheckBox;
- notif_email_->setStyleSheet(check_ss());
-
- notif_email_addr_ = new QLineEdit;
- notif_email_addr_->setPlaceholderText("[email protected]");
- notif_email_addr_->setStyleSheet(input_ss());
- notif_email_addr_->setFixedWidth(240);
+ // ── Per-provider accordion cards ──────────────────────────────────────────
+ for (const auto& def : provider_defs()) {
+ ProviderWidgets pw;
- auto* email_row = make_row("Email Address", notif_email_addr_);
+ // Card outer frame
+ auto* card = new QFrame;
+ card->setStyleSheet(
+ QString("QFrame { background: %1; border: 1px solid %2; border-radius: 3px; }")
+ .arg(fincept::ui::colors::BG_RAISED(), fincept::ui::colors::BORDER_DIM()));
+ auto* cvl = new QVBoxLayout(card);
+ cvl->setContentsMargins(0, 0, 0, 0);
+ cvl->setSpacing(0);
- vl->addWidget(make_row("Email Alerts", notif_email_));
- vl->addWidget(email_row);
+ // ── Header row (icon + name + toggle) ─────────────────────────────────
+ auto* head = new QWidget;
+ head->setFixedHeight(36);
+ head->setStyleSheet("background: transparent;");
+ head->setCursor(Qt::PointingHandCursor);
+ auto* hl = new QHBoxLayout(head);
+ hl->setContentsMargins(10, 0, 10, 0);
+ hl->setSpacing(8);
+
+ auto* arrow_lbl = new QLabel("▶");
+ arrow_lbl->setStyleSheet(
+ QString("color: %1; background: transparent;")
+ .arg(fincept::ui::colors::TEXT_SECONDARY()));
+ hl->addWidget(arrow_lbl);
+
+ auto* icon_lbl = new QLabel(def.icon + " " + def.name.toUpper());
+ icon_lbl->setStyleSheet(
+ QString("color: %1; font-weight: bold; background: transparent;")
+ .arg(fincept::ui::colors::TEXT_PRIMARY()));
+ hl->addWidget(icon_lbl, 1);
+
+ pw.enabled = new QCheckBox;
+ pw.enabled->setStyleSheet(check_ss());
+ hl->addWidget(pw.enabled);
+
+ cvl->addWidget(head);
+
+ // ── Body (credential fields + test button) ─────────────────────────────
+ pw.body_frame = new QFrame;
+ pw.body_frame->setStyleSheet(
+ QString("QFrame { background: %1; border-top: 1px solid %2; }")
+ .arg(fincept::ui::colors::BG_SURFACE(), fincept::ui::colors::BORDER_DIM()));
+ auto* bvl = new QVBoxLayout(pw.body_frame);
+ bvl->setContentsMargins(12, 10, 12, 10);
+ bvl->setSpacing(6);
+
+ const QString pid = def.id;
+
+ for (const auto& fd : def.fields) {
+ auto* field = new QLineEdit;
+ field->setPlaceholderText(fd.placeholder);
+ field->setStyleSheet(input_ss());
+ if (fd.is_password)
+ field->setEchoMode(QLineEdit::Password);
+ pw.fields[fd.key] = field;
+ bvl->addWidget(make_row(fd.label, field));
+ }
- // Show/hide email field based on toggle
- connect(notif_email_, &QCheckBox::toggled, email_row, &QWidget::setVisible);
- email_row->setVisible(false); // default hidden until loaded
+ // Test button + status
+ auto* test_row = new QWidget;
+ test_row->setStyleSheet("background: transparent;");
+ auto* thl = new QHBoxLayout(test_row);
+ thl->setContentsMargins(0, 4, 0, 0);
+ thl->setSpacing(8);
+
+ pw.test_btn = new QPushButton("Test Send");
+ pw.test_btn->setFixedWidth(100);
+ pw.test_btn->setStyleSheet(btn_secondary_ss());
+
+ pw.status_lbl = new QLabel;
+ pw.status_lbl->setStyleSheet(QString("color:%1;background:transparent;").arg(ui::colors::TEXT_SECONDARY()));
+
+ thl->addWidget(pw.test_btn);
+ thl->addWidget(pw.status_lbl, 1);
+ thl->addStretch();
+ bvl->addWidget(test_row);
+
+ cvl->addWidget(pw.body_frame);
+ pw.body_frame->hide(); // collapsed by default
+
+ // ── Expand/collapse on header click ───────────────────────────────────
+ connect(head, &QWidget::destroyed, this, [](){}); // keep lifetime
+ // Install an event filter to catch mouse press on the header widget
+ // (QWidget doesn't have a clicked signal — use a lambda on a QPushButton overlay)
+ auto* head_btn = new QPushButton(head);
+ head_btn->setGeometry(0, 0, 9999, 36); // covers full header
+ head_btn->setFlat(true);
+ head_btn->setStyleSheet("QPushButton { background: transparent; border: none; }");
+ head_btn->raise();
+
+ connect(head_btn, &QPushButton::clicked, this,
+ [card, pw, arrow_lbl]() mutable {
+ const bool expanded = pw.body_frame->isVisible();
+ pw.body_frame->setVisible(!expanded);
+ arrow_lbl->setText(expanded ? "▶" : "▼");
+ Q_UNUSED(card);
+ });
+
+ // ── Test Send wiring ──────────────────────────────────────────────────
+ connect(pw.test_btn, &QPushButton::clicked, this,
+ [this, pid, pw]() mutable {
+ // Save fields first so provider has latest credentials
+ save_provider_fields(pid, pw);
+ NotificationService::instance().reload_all_configs();
+
+ pw.status_lbl->setText("Sending...");
+ pw.status_lbl->setStyleSheet(
+ QString("color:%1;background:transparent;").arg(ui::colors::TEXT_SECONDARY()));
+
+ NotificationRequest req;
+ req.title = "Fincept Test";
+ req.message = "This is a test notification from Fincept Terminal.";
+ req.trigger = NotifTrigger::Manual;
+
+ QPointer<QLabel> status_ptr = pw.status_lbl;
+ NotificationService::instance().send_to(pid, req,
+ [status_ptr](bool ok, const QString& err) {
+ if (!status_ptr) return;
+ if (ok) {
+ status_ptr->setText("✓ Sent successfully");
+ status_ptr->setStyleSheet(
+ QString("color:%1;background:transparent;").arg(ui::colors::POSITIVE()));
+ } else {
+ status_ptr->setText("✗ " + err.left(60));
+ status_ptr->setStyleSheet(
+ QString("color:%1;background:transparent;").arg(ui::colors::NEGATIVE()));
+ }
+ });
+ });
+
+ provider_widgets_[def.id] = pw;
+ vl->addWidget(card);
+ }
- vl->addSpacing(12);
+ vl->addSpacing(16);
vl->addWidget(make_sep());
vl->addSpacing(8);
- // ── In-App ────────────────────────────────────────────────────────────────
- auto* inapp_hdr = new QLabel("IN-APP ALERTS");
- inapp_hdr->setStyleSheet(sub_title_ss());
- vl->addWidget(inapp_hdr);
-
- notif_inapp_ = new QCheckBox;
- notif_inapp_->setStyleSheet(check_ss());
- notif_price_ = new QCheckBox;
- notif_price_->setStyleSheet(check_ss());
- notif_news_ = new QCheckBox;
- notif_news_->setStyleSheet(check_ss());
- notif_orders_ = new QCheckBox;
- notif_orders_->setStyleSheet(check_ss());
-
- vl->addWidget(make_row("In-App Notifications", notif_inapp_));
- vl->addWidget(make_row("Price Alerts", notif_price_));
- vl->addWidget(make_row("News Alerts", notif_news_));
- vl->addWidget(make_row("Order Fill Alerts", notif_orders_));
-
- vl->addSpacing(12);
- vl->addWidget(make_sep());
- vl->addSpacing(8);
+ // ── Alert triggers ────────────────────────────────────────────────────────
+ auto* trig_hdr = new QLabel("ALERT TRIGGERS");
+ trig_hdr->setStyleSheet(sub_title_ss());
+ vl->addWidget(trig_hdr);
+ vl->addSpacing(4);
- // ── Sound ────────────────────────────────────────────────────────────────
- auto* sound_hdr = new QLabel("SOUND");
- sound_hdr->setStyleSheet(sub_title_ss());
- vl->addWidget(sound_hdr);
+ trigger_inapp_ = new QCheckBox; trigger_inapp_->setStyleSheet(check_ss());
+ trigger_price_ = new QCheckBox; trigger_price_->setStyleSheet(check_ss());
+ trigger_news_ = new QCheckBox; trigger_news_->setStyleSheet(check_ss());
+ trigger_orders_ = new QCheckBox; trigger_orders_->setStyleSheet(check_ss());
+
+ vl->addWidget(make_row("In-App Alerts (toast + bell)", trigger_inapp_,
+ "Show slide-in toasts and update bell badge."));
+ vl->addWidget(make_row("Price Alerts", trigger_price_,
+ "Notify when price alert thresholds are crossed."));
+ vl->addWidget(make_row("News Alerts", trigger_news_,
+ "Enable news notifications (configure which types below)."));
+
+ // ── News alert sub-options ────────────────────────────────────────────────
+ news_subopts_frame_ = new QFrame;
+ news_subopts_frame_->setObjectName("newsSuboptsFrame");
+ news_subopts_frame_->setStyleSheet(
+ "#newsSuboptsFrame { border-left: 2px solid #374151; margin-left: 24px; padding-left: 8px; }");
+ auto* sub_vl = new QVBoxLayout(news_subopts_frame_);
+ sub_vl->setContentsMargins(0, 4, 0, 4);
+ sub_vl->setSpacing(4);
+
+ news_breaking_ = new QCheckBox; news_breaking_->setStyleSheet(check_ss());
+ news_monitors_ = new QCheckBox; news_monitors_->setStyleSheet(check_ss());
+ news_deviations_ = new QCheckBox; news_deviations_->setStyleSheet(check_ss());
+ news_flash_ = new QCheckBox; news_flash_->setStyleSheet(check_ss());
+
+ sub_vl->addWidget(make_row("Breaking News", news_breaking_,
+ "Notify on FLASH/BREAKING/URGENT priority clusters."));
+ sub_vl->addWidget(make_row("Monitor Keyword Matches", news_monitors_,
+ "Notify when a news monitor watch list gets new matches."));
+ sub_vl->addWidget(make_row("Category Volume Spikes", news_deviations_,
+ "Notify when a category has abnormally high article volume (z-score ≥ 3)."));
+ sub_vl->addWidget(make_row("FLASH + High-Impact Articles", news_flash_,
+ "Notify on individual articles that are both FLASH priority and high market impact."));
+
+ vl->addWidget(news_subopts_frame_);
+
+ // Show/hide sub-options based on master toggle
+ connect(trigger_news_, &QCheckBox::toggled, this, [this](bool on) {
+ news_subopts_frame_->setVisible(on);
+ });
- notif_sound_ = new QCheckBox;
- notif_sound_->setStyleSheet(check_ss());
- vl->addWidget(make_row("Sound Alerts", notif_sound_, "Plays a chime on price alerts and order fills."));
+ vl->addWidget(make_row("Order Fill Alerts", trigger_orders_,
+ "Notify when orders are filled or rejected."));
vl->addSpacing(16);
- auto* save_btn = new QPushButton("Save Preferences");
- save_btn->setFixedWidth(180);
+ // ── Save ──────────────────────────────────────────────────────────────────
+ auto* save_btn = new QPushButton("Save All Providers");
+ save_btn->setFixedWidth(200);
save_btn->setStyleSheet(btn_primary_ss());
connect(save_btn, &QPushButton::clicked, this, [this]() {
+ // Save triggers
auto& repo = SettingsRepository::instance();
auto b = [](bool v) { return v ? "1" : "0"; };
- repo.set("notifications.email", b(notif_email_->isChecked()), "notifications");
- repo.set("notifications.email_addr", notif_email_addr_->text().trimmed(), "notifications");
- repo.set("notifications.inapp", b(notif_inapp_->isChecked()), "notifications");
- repo.set("notifications.price_alerts", b(notif_price_->isChecked()), "notifications");
- repo.set("notifications.news_alerts", b(notif_news_->isChecked()), "notifications");
- repo.set("notifications.order_fills", b(notif_orders_->isChecked()), "notifications");
- repo.set("notifications.sound", b(notif_sound_->isChecked()), "notifications");
- LOG_INFO("Settings", "Notification preferences saved");
+ repo.set("notifications.inapp", b(trigger_inapp_->isChecked()), "notifications");
+ repo.set("notifications.price_alerts", b(trigger_price_->isChecked()), "notifications");
+ repo.set("notifications.news_alerts", b(trigger_news_->isChecked()), "notifications");
+ repo.set("notifications.order_fills", b(trigger_orders_->isChecked()), "notifications");
+ repo.set("notifications.news_breaking", b(news_breaking_->isChecked()), "notifications");
+ repo.set("notifications.news_monitors", b(news_monitors_->isChecked()), "notifications");
+ repo.set("notifications.news_deviations", b(news_deviations_->isChecked()), "notifications");
+ repo.set("notifications.news_flash", b(news_flash_->isChecked()), "notifications");
+
+ // Save every provider
+ for (const auto& def : provider_defs())
+ save_provider_fields(def.id, provider_widgets_.value(def.id));
+
+ NotificationService::instance().reload_all_configs();
+ LOG_INFO("Settings", "All notification providers saved");
});
vl->addWidget(save_btn);
vl->addStretch();
@@ -740,26 +970,66 @@ QWidget* SettingsScreen::build_notifications() {
}
void SettingsScreen::load_notifications() {
- if (!notif_email_)
- return;
+ using namespace fincept::notifications;
+
+ if (provider_widgets_.isEmpty()) return;
+
auto& repo = SettingsRepository::instance();
auto get_bool = [&](const QString& key, bool def) -> bool {
auto r = repo.get(key);
- return r.is_ok() ? (r.value() == "1") : def;
+ return r.is_ok() && !r.value().isEmpty() ? (r.value() == "1") : def;
};
- notif_email_->setChecked(get_bool("notifications.email", true));
- auto addr_r = repo.get("notifications.email_addr");
- notif_email_addr_->setText(addr_r.is_ok() ? addr_r.value() : "");
- notif_inapp_->setChecked(get_bool("notifications.inapp", true));
- notif_price_->setChecked(get_bool("notifications.price_alerts", false));
- notif_news_->setChecked(get_bool("notifications.news_alerts", false));
- notif_orders_->setChecked(get_bool("notifications.order_fills", true));
- notif_sound_->setChecked(get_bool("notifications.sound", false));
-
- // Sync email address row visibility
- if (auto* email_row = notif_email_addr_->parentWidget())
- email_row->setVisible(notif_email_->isChecked());
+ // Load trigger checkboxes
+ if (trigger_inapp_) trigger_inapp_->setChecked(get_bool("notifications.inapp", true));
+ if (trigger_price_) trigger_price_->setChecked(get_bool("notifications.price_alerts", true));
+ if (trigger_orders_) trigger_orders_->setChecked(get_bool("notifications.order_fills", true));
+
+ const bool news_on = get_bool("notifications.news_alerts", false);
+ if (trigger_news_) trigger_news_->setChecked(news_on);
+
+ // News sub-options — default all on, gate on master toggle
+ if (news_breaking_) news_breaking_->setChecked(get_bool("notifications.news_breaking", true));
+ if (news_monitors_) news_monitors_->setChecked(get_bool("notifications.news_monitors", true));
+ if (news_deviations_) news_deviations_->setChecked(get_bool("notifications.news_deviations", true));
+ if (news_flash_) news_flash_->setChecked(get_bool("notifications.news_flash", true));
+ if (news_subopts_frame_) news_subopts_frame_->setVisible(news_on);
+
+ // Load per-provider fields
+ for (const auto& def : provider_defs()) {
+ if (!provider_widgets_.contains(def.id)) continue;
+ const auto& pw = provider_widgets_[def.id];
+ const QString cat = QString("notif_%1").arg(def.id);
+
+ // Enable toggle
+ if (pw.enabled) {
+ auto r = repo.get(cat + ".enabled");
+ pw.enabled->setChecked(r.is_ok() && r.value() == "1");
+ }
+
+ // Credential fields
+ for (const auto& fd : def.fields) {
+ if (!pw.fields.contains(fd.key)) continue;
+ auto r = repo.get(cat + "." + fd.key);
+ if (r.is_ok() && pw.fields[fd.key])
+ pw.fields[fd.key]->setText(r.value());
+ }
+ }
+}
+
+// Helper: persist a single provider's fields from its widget set
+void SettingsScreen::save_provider_fields(const QString& provider_id,
+ const ProviderWidgets& pw) {
+ auto& repo = SettingsRepository::instance();
+ const QString cat = QString("notif_%1").arg(provider_id);
+
+ if (pw.enabled)
+ repo.set(cat + ".enabled", pw.enabled->isChecked() ? "1" : "0", cat);
+
+ for (auto it = pw.fields.constBegin(); it != pw.fields.constEnd(); ++it) {
+ if (it.value())
+ repo.set(cat + "." + it.key(), it.value()->text().trimmed(), cat);
+ }
}
// ── Storage & Cache ───────────────────────────────────────────────────────────
@@ -767,10 +1037,12 @@ void SettingsScreen::load_notifications() {
QWidget* SettingsScreen::build_storage() {
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
- scroll->setStyleSheet("QScrollArea { border: none; background: transparent; }"
- "QScrollBar:vertical { background: #0a0a0a; width: 6px; }"
- "QScrollBar::handle:vertical { background: #2a2a2a; border-radius: 3px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }");
+ scroll->setStyleSheet(
+ QString("QScrollArea{border:none;background:transparent;}"
+ "QScrollBar:vertical{width:6px;background:transparent;}"
+ "QScrollBar::handle:vertical{background:%1;border-radius:3px;}"
+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")
+ .arg(ui::colors::BORDER_MED()));
auto* page = new QWidget;
auto* vl = new QVBoxLayout(page);
@@ -790,13 +1062,13 @@ QWidget* SettingsScreen::build_storage() {
vl->addSpacing(4);
auto* card = new QFrame;
- card->setStyleSheet("QFrame { background: #0d0d0d; border: 1px solid #1a1a1a; border-radius: 4px; }");
+ card->setStyleSheet(QString("QFrame{background:%1;border:1px solid %2;border-radius:4px;}").arg(ui::colors::BG_SURFACE(),ui::colors::BORDER_DIM()));
auto* cvl = new QVBoxLayout(card);
cvl->setContentsMargins(16, 12, 16, 12);
cvl->setSpacing(8);
storage_count_ = new QLabel("—");
- storage_count_->setStyleSheet("color: #e0e0e0; font-size: 13px; background: transparent;");
+ storage_count_->setStyleSheet(QString("color:%1;background:transparent;").arg(ui::colors::TEXT_PRIMARY()));
cvl->addWidget(make_row("Cache Entries", storage_count_));
auto* refresh_btn = new QPushButton("Refresh");
@@ -828,7 +1100,7 @@ QWidget* SettingsScreen::build_storage() {
auto* note = new QLabel("Clears all cached market data, quotes, and news. "
"Live data will be re-fetched on next access.");
note->setWordWrap(true);
- note->setStyleSheet("color: #555; font-size: 11px; background: transparent;");
+ note->setStyleSheet(QString("color:%1;background:transparent;").arg(ui::colors::TEXT_SECONDARY()));
vl->addWidget(note);
vl->addSpacing(12);
@@ -869,10 +1141,12 @@ void SettingsScreen::refresh_storage_stats() {
QWidget* SettingsScreen::build_data_sources() {
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
- scroll->setStyleSheet("QScrollArea { border: none; background: transparent; }"
- "QScrollBar:vertical { background: #0a0a0a; width: 6px; }"
- "QScrollBar::handle:vertical { background: #2a2a2a; border-radius: 3px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }");
+ scroll->setStyleSheet(
+ QString("QScrollArea{border:none;background:transparent;}"
+ "QScrollBar:vertical{width:6px;background:transparent;}"
+ "QScrollBar::handle:vertical{background:%1;border-radius:3px;}"
+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")
+ .arg(ui::colors::BORDER_MED()));
auto* page = new QWidget;
auto* vl = new QVBoxLayout(page);
@@ -887,7 +1161,7 @@ QWidget* SettingsScreen::build_data_sources() {
auto* info = new QLabel("Toggle which external data providers are active. "
"Changes take effect immediately.");
info->setWordWrap(true);
- info->setStyleSheet("color: #555; font-size: 11px; background: transparent;");
+ info->setStyleSheet(QString("color:%1;background:transparent;").arg(ui::colors::TEXT_SECONDARY()));
vl->addWidget(info);
vl->addSpacing(16);
vl->addWidget(make_sep());
@@ -899,7 +1173,7 @@ QWidget* SettingsScreen::build_data_sources() {
auto* empty = new QLabel("No data sources configured.\n"
"Sources are seeded automatically at application startup.");
empty->setWordWrap(true);
- empty->setStyleSheet("color: #555; font-size: 12px; background: transparent;");
+ empty->setStyleSheet(QString("color:%1;background:transparent;").arg(ui::colors::TEXT_SECONDARY()));
vl->addWidget(empty);
vl->addStretch();
scroll->setWidget(page);
@@ -921,7 +1195,7 @@ QWidget* SettingsScreen::build_data_sources() {
for (const auto& ds : it.value()) {
// Source card
auto* card = new QFrame;
- card->setStyleSheet("QFrame { background: #0d0d0d; border: 1px solid #1a1a1a; border-radius: 4px; }");
+ card->setStyleSheet(QString("QFrame{background:%1;border:1px solid %2;border-radius:4px;}").arg(ui::colors::BG_SURFACE(),ui::colors::BORDER_DIM()));
auto* cvl2 = new QVBoxLayout(card);
cvl2->setContentsMargins(0, 0, 0, 0);
cvl2->setSpacing(0);
@@ -929,19 +1203,19 @@ QWidget* SettingsScreen::build_data_sources() {
// Card header row
auto* hdr = new QWidget;
hdr->setFixedHeight(40);
- hdr->setStyleSheet("background: #111; border-bottom: 1px solid #1a1a1a;");
+ hdr->setStyleSheet(QString("background:%1;border-bottom:1px solid %2;").arg(ui::colors::BG_RAISED(),ui::colors::BORDER_DIM()));
auto* hhl = new QHBoxLayout(hdr);
hhl->setContentsMargins(12, 0, 12, 0);
auto* name_lbl = new QLabel(ds.display_name.isEmpty() ? ds.alias : ds.display_name);
- name_lbl->setStyleSheet("color: #e0e0e0; font-size: 12px; font-weight: 600; background: transparent;");
+ name_lbl->setStyleSheet(QString("color:%1;font-weight:600;background:transparent;").arg(ui::colors::TEXT_PRIMARY()));
hhl->addWidget(name_lbl);
// Type badge
auto* type_badge = new QLabel(ds.type == "websocket" ? "WS" : "REST");
- type_badge->setStyleSheet("color: #555; font-size: 10px; font-weight: 700; "
- "background: #1a1a1a; border: 1px solid #2a2a2a; "
- "border-radius: 2px; padding: 1px 5px;");
+ type_badge->setStyleSheet(
+ QString("color:%1;font-weight:700;background:%2;border:1px solid %3;border-radius:2px;padding:1px 5px;")
+ .arg(ui::colors::TEXT_TERTIARY(), ui::colors::BG_RAISED(), ui::colors::BORDER_MED()));
hhl->addWidget(type_badge);
hhl->addStretch();
@@ -964,7 +1238,7 @@ QWidget* SettingsScreen::build_data_sources() {
if (!ds.description.isEmpty()) {
auto* desc = new QLabel(ds.description);
desc->setWordWrap(true);
- desc->setStyleSheet("color: #555; font-size: 11px; padding: 8px 12px; background: transparent;");
+ desc->setStyleSheet(QString("color:%1;padding:8px 12px;background:transparent;").arg(ui::colors::TEXT_TERTIARY()));
cvl2->addWidget(desc);
}
@@ -989,4 +1263,167 @@ QWidget* SettingsScreen::build_mcp_servers() {
return new McpServersSection;
}
+// ── Logging ───────────────────────────────────────────────────────────────────
+
+QWidget* SettingsScreen::build_logging() {
+ static const QStringList LEVEL_NAMES = {"Debug", "Info", "Warn", "Error"};
+
+ auto level_to_idx = [](const QString& s) -> int {
+ const QStringList names = {"Debug", "Info", "Warn", "Error"};
+ int i = names.indexOf(s);
+ return i >= 0 ? i : 1; // default Info
+ };
+
+ auto* scroll = new QScrollArea;
+ scroll->setWidgetResizable(true);
+ scroll->setFrameShape(QFrame::NoFrame);
+
+ auto* page = new QWidget;
+ auto* vl = new QVBoxLayout(page);
+ vl->setContentsMargins(24, 24, 24, 24);
+ vl->setSpacing(16);
+
+ // Title
+ auto* t = new QLabel("LOGGING");
+ t->setStyleSheet(section_title_ss());
+ vl->addWidget(t);
+ vl->addWidget(make_sep());
+
+ // ── Global level ─────────────────────────────────────────────────────────
+ auto* global_lbl = new QLabel("Global Log Level");
+ global_lbl->setStyleSheet(sub_title_ss());
+ vl->addWidget(global_lbl);
+
+ auto* global_desc = new QLabel("Minimum level for all tags unless overridden.");
+ global_desc->setStyleSheet(label_ss());
+ global_desc->setWordWrap(true);
+ vl->addWidget(global_desc);
+
+ log_global_level_ = new QComboBox;
+ log_global_level_->addItems(LEVEL_NAMES);
+ log_global_level_->setStyleSheet(combo_ss());
+ log_global_level_->setFixedWidth(160);
+
+ const QString saved_global = AppConfig::instance().get("log/global_level", "Info").toString();
+ log_global_level_->setCurrentIndex(level_to_idx(saved_global));
+
+ vl->addWidget(log_global_level_);
+ vl->addWidget(make_sep());
+
+ // ── Per-tag overrides ────────────────────────────────────────────────────
+ auto* tag_title = new QLabel("Per-Tag Overrides");
+ tag_title->setStyleSheet(sub_title_ss());
+ vl->addWidget(tag_title);
+
+ auto* tag_desc = new QLabel("Override the log level for a specific tag (e.g. ExchangeService, AgentService).");
+ tag_desc->setStyleSheet(label_ss());
+ tag_desc->setWordWrap(true);
+ vl->addWidget(tag_desc);
+
+ // Container for tag rows
+ log_tag_list_ = new QWidget;
+ log_tag_layout_ = new QVBoxLayout(log_tag_list_);
+ log_tag_layout_->setContentsMargins(0, 0, 0, 0);
+ log_tag_layout_->setSpacing(6);
+
+ // Load persisted tag overrides
+ auto& cfg = AppConfig::instance();
+ const int count = cfg.get("log/tag_count", 0).toInt();
+ auto add_tag_row = [&](const QString& tag, const QString& level) {
+ auto* row = new QWidget;
+ auto* rl = new QHBoxLayout(row);
+ rl->setContentsMargins(0, 0, 0, 0);
+ rl->setSpacing(8);
+
+ auto* tag_edit = new QLineEdit(tag);
+ tag_edit->setPlaceholderText("Tag name");
+ tag_edit->setFixedWidth(220);
+ tag_edit->setStyleSheet(input_ss());
+
+ auto* lvl_combo = new QComboBox;
+ lvl_combo->addItems(LEVEL_NAMES);
+ lvl_combo->setStyleSheet(combo_ss());
+ lvl_combo->setFixedWidth(120);
+ lvl_combo->setCurrentIndex(level_to_idx(level));
+
+ auto* del_btn = new QPushButton("Remove");
+ del_btn->setStyleSheet(btn_danger_ss());
+ del_btn->setFixedHeight(28);
+ connect(del_btn, &QPushButton::clicked, this, [row]() {
+ row->deleteLater();
+ });
+
+ rl->addWidget(tag_edit);
+ rl->addWidget(lvl_combo);
+ rl->addWidget(del_btn);
+ rl->addStretch();
+ log_tag_layout_->addWidget(row);
+ };
+
+ for (int i = 0; i < count; ++i) {
+ const QString tag = cfg.get(QString("log/tag_%1_name").arg(i)).toString();
+ const QString level = cfg.get(QString("log/tag_%1_level").arg(i)).toString();
+ if (!tag.isEmpty())
+ add_tag_row(tag, level);
+ }
+
+ vl->addWidget(log_tag_list_);
+
+ // Add row button
+ auto* add_btn = new QPushButton("+ Add Tag Override");
+ add_btn->setStyleSheet(btn_secondary_ss());
+ add_btn->setFixedHeight(30);
+ add_btn->setFixedWidth(180);
+ connect(add_btn, &QPushButton::clicked, this, [this, add_tag_row]() mutable {
+ add_tag_row({}, "Info");
+ });
+ vl->addWidget(add_btn);
+ vl->addWidget(make_sep());
+
+ // ── Save button ──────────────────────────────────────────────────────────
+ auto* save_btn = new QPushButton("Apply & Save");
+ save_btn->setStyleSheet(btn_primary_ss());
+ save_btn->setFixedHeight(34);
+ save_btn->setFixedWidth(140);
+
+ connect(save_btn, &QPushButton::clicked, this, [this]() {
+ auto& cfg = AppConfig::instance();
+ auto& log = Logger::instance();
+
+ // Save + apply global level
+ const QString gl = log_global_level_->currentText();
+ cfg.set("log/global_level", gl);
+ const QHash<QString, LogLevel> lvl_map = {
+ {"Debug", LogLevel::Debug}, {"Info", LogLevel::Info},
+ {"Warn", LogLevel::Warn}, {"Error", LogLevel::Error}
+ };
+ log.set_level(lvl_map.value(gl, LogLevel::Info));
+
+ // Save + apply per-tag overrides
+ log.clear_all_tag_levels();
+ const auto rows = log_tag_list_->findChildren<QWidget*>(QString(), Qt::FindDirectChildrenOnly);
+ int saved = 0;
+ for (auto* row : rows) {
+ auto* tag_edit = row->findChild<QLineEdit*>();
+ auto* lvl_combo = row->findChild<QComboBox*>();
+ if (!tag_edit || !lvl_combo) continue;
+ const QString tag = tag_edit->text().trimmed();
+ const QString level = lvl_combo->currentText();
+ if (tag.isEmpty()) continue;
+ cfg.set(QString("log/tag_%1_name").arg(saved), tag);
+ cfg.set(QString("log/tag_%1_level").arg(saved), level);
+ log.set_tag_level(tag, lvl_map.value(level, LogLevel::Info));
+ ++saved;
+ }
+ cfg.set("log/tag_count", saved);
+
+ LOG_INFO("Settings", QString("Logging config saved: global=%1, tags=%2").arg(gl).arg(saved));
+ });
+
+ vl->addWidget(save_btn);
+ vl->addStretch();
+ scroll->setWidget(page);
+ return scroll;
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/settings/SettingsScreen.h b/fincept-qt/src/screens/settings/SettingsScreen.h
index 88e0acb62..eb2e5ae3b 100644
--- a/fincept-qt/src/screens/settings/SettingsScreen.h
+++ b/fincept-qt/src/screens/settings/SettingsScreen.h
@@ -1,6 +1,7 @@
#pragma once
#include <QCheckBox>
#include <QComboBox>
+#include <QFrame>
#include <QHash>
#include <QLabel>
#include <QLineEdit>
@@ -13,7 +14,7 @@ namespace fincept::screens {
/// Full-featured settings screen.
/// Sections: Credentials | Appearance | Notifications | Storage & Cache |
-/// Data Sources | LLM Config | MCP Servers
+/// Data Sources | LLM Config | MCP Servers | Logging
class SettingsScreen : public QWidget {
Q_OBJECT
public:
@@ -24,6 +25,7 @@ class SettingsScreen : public QWidget {
private:
QStackedWidget* sections_ = nullptr;
+ QWidget* nav_ = nullptr;
// ── Section builders ─────────────────────────────────────────────────────
QWidget* build_credentials();
@@ -33,6 +35,7 @@ class SettingsScreen : public QWidget {
QWidget* build_data_sources();
QWidget* build_llm_config();
QWidget* build_mcp_servers();
+ QWidget* build_logging();
// ── Shared layout helper ──────────────────────────────────────────────────
static QWidget* make_row(const QString& label, QWidget* control, const QString& description = {});
@@ -55,22 +58,46 @@ class SettingsScreen : public QWidget {
QTimer* appearance_debounce_ = nullptr; // coalesces rapid font/density changes
// ── Notifications state ───────────────────────────────────────────────────
- QCheckBox* notif_email_ = nullptr;
- QLineEdit* notif_email_addr_ = nullptr;
- QCheckBox* notif_inapp_ = nullptr;
- QCheckBox* notif_price_ = nullptr;
- QCheckBox* notif_news_ = nullptr;
- QCheckBox* notif_orders_ = nullptr;
- QCheckBox* notif_sound_ = nullptr;
+ // Per-provider accordion widgets (keyed by provider_id)
+ struct ProviderWidgets {
+ QCheckBox* enabled = nullptr;
+ QHash<QString, QLineEdit*> fields; // field_key → input widget
+ QPushButton* test_btn = nullptr;
+ QFrame* body_frame = nullptr; // collapsible config area
+ QLabel* status_lbl = nullptr; // inline test result
+ };
+ QHash<QString, ProviderWidgets> provider_widgets_;
+
+ // Alert trigger checkboxes
+ QCheckBox* trigger_inapp_ = nullptr;
+ QCheckBox* trigger_price_ = nullptr;
+ QCheckBox* trigger_news_ = nullptr;
+ QCheckBox* trigger_orders_ = nullptr;
+
+ // News alert sub-options (visible only when trigger_news_ is checked)
+ QCheckBox* news_breaking_ = nullptr;
+ QCheckBox* news_monitors_ = nullptr;
+ QCheckBox* news_deviations_ = nullptr;
+ QCheckBox* news_flash_ = nullptr;
+ QFrame* news_subopts_frame_ = nullptr;
// ── Storage state ─────────────────────────────────────────────────────────
QLabel* storage_count_ = nullptr;
+ // ── Logging state ─────────────────────────────────────────────────────────
+ QComboBox* log_global_level_ = nullptr;
+ QWidget* log_tag_list_ = nullptr; // VBox container for tag rows
+ QVBoxLayout* log_tag_layout_ = nullptr;
+
// ── Data loaders (called from showEvent) ──────────────────────────────────
+ void refresh_theme();
void load_credentials();
void load_appearance();
void load_notifications();
void refresh_storage_stats();
+
+ // ── Notification helpers ──────────────────────────────────────────────────
+ void save_provider_fields(const QString& provider_id, const ProviderWidgets& pw);
};
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/setup/SetupScreen.cpp b/fincept-qt/src/screens/setup/SetupScreen.cpp
index f09e2b135..212d584d5 100644
--- a/fincept-qt/src/screens/setup/SetupScreen.cpp
+++ b/fincept-qt/src/screens/setup/SetupScreen.cpp
@@ -59,101 +59,119 @@ void SetupScreen::build_ui() {
root->setContentsMargins(0, 0, 0, 0);
root->setSpacing(0);
- // Center everything
root->addStretch(2);
auto* center = new QWidget(this);
- center->setFixedWidth(600);
+ center->setFixedWidth(640);
auto* cl = new QVBoxLayout(center);
- cl->setSpacing(20);
+ cl->setSpacing(8);
- // Title
+ // ── Title block ───────────────────────────────────────────────────────────
auto* title = new QLabel("FINCEPT TERMINAL", center);
title->setAlignment(Qt::AlignCenter);
title->setStyleSheet(
- QString("color:%1; font-family:%2; font-size:24px; font-weight:700;").arg(kAccent, fonts::DATA_FAMILY));
+ QString("color:%1; font-family:%2; font-size:24px; font-weight:700; letter-spacing:3px;")
+ .arg(kAccent, fonts::DATA_FAMILY));
cl->addWidget(title);
- subtitle_lbl_ = new QLabel("First-Time Environment Setup", center);
+ subtitle_lbl_ = new QLabel("Getting your workspace ready", center);
subtitle_lbl_->setAlignment(Qt::AlignCenter);
subtitle_lbl_->setStyleSheet(
QString("color:%1; font-family:%2; font-size:13px;").arg(colors::TEXT_SECONDARY, fonts::DATA_FAMILY));
cl->addWidget(subtitle_lbl_);
-
- cl->addSpacing(10);
-
- // Step progress rows — UV-first optimized flow
- cl->addWidget(build_step_row("UV Package Manager", "uv"));
- cl->addWidget(build_step_row("Python 3.12 (via UV)", "python"));
- cl->addWidget(build_step_row("Virtual Environments", "venv"));
- cl->addWidget(build_step_row("NumPy 1.x Packages", "packages-numpy1"));
- cl->addWidget(build_step_row("NumPy 2.x Packages", "packages-numpy2"));
- cl->addWidget(build_step_row("Whisper Voice Model", "whisper"));
-
- cl->addSpacing(20);
-
- // Begin setup button
+ // Brief plain-English explanation
+ auto* intro = new QLabel(
+ "We need to download a few tools and data libraries once.\n"
+ "This only happens the first time — future launches are instant.",
+ center);
+ intro->setAlignment(Qt::AlignCenter);
+ intro->setWordWrap(true);
+ intro->setStyleSheet(
+ QString("color:%1; font-family:%2; font-size:10px; margin-top:4px; margin-bottom:12px;")
+ .arg(colors::TEXT_TERTIARY, fonts::DATA_FAMILY));
+ cl->addWidget(intro);
+
+ // ── Divider ───────────────────────────────────────────────────────────────
+ auto* divider = new QFrame(center);
+ divider->setFrameShape(QFrame::HLine);
+ divider->setStyleSheet(QString("color:%1;").arg(colors::BORDER_DIM));
+ cl->addWidget(divider);
+ cl->addSpacing(4);
+
+ // ── Step rows — plain-English labels + technical key hidden inside ────────
+ cl->addWidget(build_step_row("uv", "Download Installer", "Downloads the tool that manages everything else (~13 MB)"));
+ cl->addWidget(build_step_row("python", "Install Python Runtime", "The programming language engine used for all analytics"));
+ cl->addWidget(build_step_row("venv", "Create Isolated Workspaces", "Two sandboxed environments to keep library versions conflict-free"));
+ cl->addWidget(build_step_row("packages-numpy1","Install Trading Libraries", "Backtesting, portfolio optimization and legacy quant tools"));
+ cl->addWidget(build_step_row("packages-numpy2","Install Analytics Libraries", "Machine learning, data science and AI agent frameworks"));
+ cl->addWidget(build_step_row("whisper", "Download Voice Assistant", "Offline voice recognition model for speech commands (~57 MB)"));
+
+ cl->addSpacing(16);
+
+ // ── Action buttons ────────────────────────────────────────────────────────
begin_btn_ = new QPushButton("BEGIN SETUP", center);
- begin_btn_->setFixedHeight(44);
+ begin_btn_->setFixedHeight(46);
begin_btn_->setCursor(Qt::PointingHandCursor);
begin_btn_->setStyleSheet(
QString("QPushButton { background:%1; color:%2; border:none;"
- " font-family:%3; font-size:14px; font-weight:700; letter-spacing:2px; }"
+ " font-family:%3; font-size:14px; font-weight:700; letter-spacing:2px; border-radius:3px; }"
"QPushButton:hover { background:#b45309; }"
- "QPushButton:disabled { background:%4; color:%5; }")
+ "QPushButton:disabled { background:%4; color:%5; border-radius:3px; }")
.arg(kAccent, colors::TEXT_PRIMARY, fonts::DATA_FAMILY, colors::BG_RAISED, colors::TEXT_TERTIARY));
connect(begin_btn_, &QPushButton::clicked, this, &SetupScreen::on_begin_setup);
cl->addWidget(begin_btn_);
- // Status label — text set by prefill_completed_steps()
+ // Status label
status_label_ = new QLabel({}, center);
status_label_->setAlignment(Qt::AlignCenter);
- status_label_->setStyleSheet(QString("color:%1; font-family:%2; font-size:10px; margin-top:8px;")
- .arg(colors::TEXT_TERTIARY, fonts::DATA_FAMILY));
+ status_label_->setWordWrap(true);
+ status_label_->setStyleSheet(
+ QString("color:%1; font-family:%2; font-size:10px; margin-top:6px;")
+ .arg(colors::TEXT_TERTIARY, fonts::DATA_FAMILY));
cl->addWidget(status_label_);
summary_lbl_ = new QLabel({}, center);
summary_lbl_->setAlignment(Qt::AlignCenter);
summary_lbl_->setWordWrap(true);
- summary_lbl_->setStyleSheet(QString("color:%1; font-family:%2; font-size:10px;")
- .arg(colors::TEXT_TERTIARY, fonts::DATA_FAMILY));
+ summary_lbl_->setStyleSheet(
+ QString("color:%1; font-family:%2; font-size:10px;")
+ .arg(colors::TEXT_TERTIARY, fonts::DATA_FAMILY));
cl->addWidget(summary_lbl_);
- // Skip button — hidden until timeout fires or Whisper fails
+ // Skip button
skip_btn_ = new QPushButton("SKIP & CONTINUE", center);
skip_btn_->setFixedHeight(36);
skip_btn_->setCursor(Qt::PointingHandCursor);
skip_btn_->setVisible(false);
skip_btn_->setStyleSheet(
QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"
- " font-family:%2; font-size:12px; font-weight:600; letter-spacing:1px; }"
+ " font-family:%2; font-size:12px; font-weight:600; letter-spacing:1px; border-radius:3px; }"
"QPushButton:hover { background:%3; }")
.arg(colors::TEXT_SECONDARY, fonts::DATA_FAMILY, colors::BG_RAISED));
connect(skip_btn_, &QPushButton::clicked, this, &SetupScreen::on_skip_clicked);
cl->addWidget(skip_btn_);
- // Retry voice model button — hidden until Whisper fails
- retry_whisper_btn_ = new QPushButton("RETRY VOICE MODEL", center);
+ // Retry voice model button
+ retry_whisper_btn_ = new QPushButton("RETRY VOICE MODEL DOWNLOAD", center);
retry_whisper_btn_->setFixedHeight(36);
retry_whisper_btn_->setCursor(Qt::PointingHandCursor);
retry_whisper_btn_->setVisible(false);
retry_whisper_btn_->setStyleSheet(
QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"
- " font-family:%2; font-size:12px; font-weight:600; letter-spacing:1px; }"
+ " font-family:%2; font-size:12px; font-weight:600; letter-spacing:1px; border-radius:3px; }"
"QPushButton:hover { background:%3; }")
.arg(kAccent, fonts::DATA_FAMILY, colors::BG_RAISED));
connect(retry_whisper_btn_, &QPushButton::clicked, this, &SetupScreen::on_retry_whisper);
cl->addWidget(retry_whisper_btn_);
- // Install dir info
- auto* dir_label = new QLabel("Install directory: " + python::PythonSetupManager::instance().install_dir(), center);
+ // Install dir — small, dim, for power users
+ auto* dir_label = new QLabel("Installing to: " + python::PythonSetupManager::instance().install_dir(), center);
dir_label->setAlignment(Qt::AlignCenter);
dir_label->setStyleSheet(
- QString("color:%1; font-family:%2; font-size:9px; margin-top:4px;").arg(colors::TEXT_DIM, fonts::DATA_FAMILY));
+ QString("color:%1; font-family:%2; font-size:9px; margin-top:6px;").arg(colors::TEXT_DIM, fonts::DATA_FAMILY));
cl->addWidget(dir_label);
- // Wrap center widget in horizontal centering
auto* hcenter = new QHBoxLayout();
hcenter->addStretch();
hcenter->addWidget(center);
@@ -163,40 +181,77 @@ void SetupScreen::build_ui() {
root->addStretch(3);
}
-QWidget* SetupScreen::build_step_row(const QString& label, const QString& object_name) {
+QWidget* SetupScreen::build_step_row(const QString& key, const QString& label, const QString& sublabel) {
auto* row = new QWidget(this);
- auto* hl = new QHBoxLayout(row);
- hl->setContentsMargins(0, 4, 0, 4);
- hl->setSpacing(10);
-
- auto* lbl = new QLabel(label, row);
- lbl->setFixedWidth(180);
- lbl->setStyleSheet(QString("color:%1; font-family:%2; font-size:11px; font-weight:600;")
- .arg(colors::TEXT_SECONDARY, fonts::DATA_FAMILY));
- hl->addWidget(lbl);
-
+ auto* hl = new QHBoxLayout(row);
+ hl->setContentsMargins(0, 6, 0, 6);
+ hl->setSpacing(12);
+
+ // Left: label stack (name + description)
+ auto* label_col = new QWidget(row);
+ label_col->setFixedWidth(220);
+ auto* label_vl = new QVBoxLayout(label_col);
+ label_vl->setContentsMargins(0, 0, 0, 0);
+ label_vl->setSpacing(2);
+
+ auto* lbl = new QLabel(label, label_col);
+ lbl->setStyleSheet(
+ QString("color:%1; font-family:%2; font-size:11px; font-weight:600;")
+ .arg(colors::TEXT_SECONDARY, fonts::DATA_FAMILY));
+ label_vl->addWidget(lbl);
+
+ auto* sub = new QLabel(sublabel, label_col);
+ sub->setWordWrap(true);
+ sub->setStyleSheet(
+ QString("color:%1; font-family:%2; font-size:9px;")
+ .arg(colors::TEXT_DIM, fonts::DATA_FAMILY));
+ label_vl->addWidget(sub);
+
+ hl->addWidget(label_col);
+
+ // Middle: progress bar
auto* bar = new QProgressBar(row);
bar->setRange(0, 100);
bar->setValue(0);
bar->setTextVisible(false);
- bar->setFixedHeight(14);
- bar->setStyleSheet(QString("QProgressBar { background:%1; border:1px solid %2; }"
- "QProgressBar::chunk { background:%3; }")
- .arg(colors::BG_RAISED, colors::BORDER_DIM, kAccent));
+ bar->setFixedHeight(10);
+ bar->setStyleSheet(
+ QString("QProgressBar { background:%1; border:1px solid %2; border-radius:5px; }"
+ "QProgressBar::chunk { background:%3; border-radius:5px; }")
+ .arg(colors::BG_RAISED, colors::BORDER_DIM, kAccent));
hl->addWidget(bar, 1);
- auto* status = new QLabel("Pending", row);
- status->setFixedWidth(80);
+ // Right: status badge
+ auto* status = new QLabel("Waiting", row);
+ status->setFixedWidth(72);
status->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
status->setStyleSheet(
QString("color:%1; font-family:%2; font-size:9px;").arg(colors::TEXT_TERTIARY, fonts::DATA_FAMILY));
hl->addWidget(status);
+ // Pulse timer — drives the indeterminate animation while step is in-flight
+ auto* pulse = new QTimer(row);
+ pulse->setInterval(40); // ~25 fps — smooth but cheap
+ pulse->setSingleShot(false);
+
StepUI step;
- step.label = lbl;
- step.bar = bar;
- step.status = status;
- steps_[object_name] = step;
+ step.label = lbl;
+ step.sublabel = sub;
+ step.bar = bar;
+ step.status = status;
+ step.pulse = pulse;
+ step.pulse_val = 0;
+ steps_[key] = step;
+
+ // Connect pulse tick — captures key by value so it's safe after row moves
+ connect(pulse, &QTimer::timeout, this, [this, key]() {
+ if (!steps_.contains(key)) return;
+ auto& s = steps_[key];
+ // Smooth bouncing fill: ramps 0→85 then stays — gives "working" feel
+ // without implying false completion.
+ s.pulse_val = std::min(s.pulse_val + 1, 85);
+ s.bar->setValue(s.pulse_val);
+ });
return row;
}
@@ -205,91 +260,128 @@ QWidget* SetupScreen::build_step_row(const QString& label, const QString& object
// Actions
// ─────────────────────────────────────────────────────────────────────────────
+// ─────────────────────────────────────────────────────────────────────────────
+// Pulse helpers
+// ─────────────────────────────────────────────────────────────────────────────
+
+void SetupScreen::start_pulse(const QString& key) {
+ if (!steps_.contains(key)) return;
+ auto& s = steps_[key];
+ s.pulse_val = 0;
+ s.bar->setValue(0);
+ if (s.pulse) s.pulse->start();
+}
+
+void SetupScreen::stop_pulse(const QString& key) {
+ if (!steps_.contains(key)) return;
+ auto& s = steps_[key];
+ if (s.pulse) s.pulse->stop();
+}
+
+void SetupScreen::mark_step_active(const QString& key) {
+ if (!steps_.contains(key)) return;
+ auto& s = steps_[key];
+ s.status->setText("Working...");
+ s.status->setStyleSheet(
+ QString("color:%1; font-family:%2; font-size:9px;").arg(kAccent, fonts::DATA_FAMILY));
+ start_pulse(key);
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Actions
+// ─────────────────────────────────────────────────────────────────────────────
+
void SetupScreen::on_begin_setup() {
begin_btn_->setEnabled(false);
begin_btn_->setText("SETTING UP...");
- status_label_->setText("Setup in progress — please don't close the application");
+ status_label_->setText("Setup in progress — please keep the application open");
status_label_->setStyleSheet(
- QString("color:%1; font-family:%2; font-size:10px; margin-top:8px;").arg(kAccent, fonts::DATA_FAMILY));
+ QString("color:%1; font-family:%2; font-size:10px; margin-top:6px;").arg(kAccent, fonts::DATA_FAMILY));
- // Start overall timeout — shows skip button if setup is stuck after 15 min
if (timeout_timer_) timeout_timer_->start();
-
python::PythonSetupManager::instance().run_setup();
}
void SetupScreen::on_progress(const python::SetupProgress& progress) {
- // Update the step's progress bar and status
- // Map step names: "python", "uv", "venv-numpy1", "packages-numpy1", "venv-numpy2", "packages-numpy2"
- QString step_key = progress.step;
-
- // venv creation progress goes to the venv row
- if (step_key == "venv-numpy1" || step_key == "venv-numpy2") {
- // handled below
- }
+ const QString& key = progress.step;
- if (steps_.contains(step_key)) {
- auto& ui = steps_[step_key];
- ui.bar->setValue(progress.progress);
+ if (steps_.contains(key)) {
+ auto& s = steps_[key];
if (progress.is_error) {
- ui.status->setText("FAILED");
- ui.status->setStyleSheet(
+ // Stop pulse, show red failed badge
+ stop_pulse(key);
+ s.bar->setValue(s.pulse_val > 0 ? s.pulse_val : 0);
+ s.status->setText("FAILED");
+ s.status->setStyleSheet(
QString("color:%1; font-family:%2; font-size:9px;").arg(colors::RED, fonts::DATA_FAMILY));
+ } else if (progress.progress == 0) {
+ // Step just started — kick off the pulse animation
+ mark_step_active(key);
} else if (progress.progress >= 100) {
- ui.status->setText("DONE");
- ui.status->setStyleSheet(
- QString("color:%1; font-family:%2; font-size:9px;").arg(colors::GREEN, fonts::DATA_FAMILY));
+ // Step finished — stop pulse and snap to full
+ mark_step_done(key);
} else {
- ui.status->setText(QString("%1%").arg(progress.progress));
- ui.status->setStyleSheet(
+ // Mid-step real progress (pass-2 per-package installs send real %)
+ stop_pulse(key);
+ s.bar->setValue(progress.progress);
+ s.status->setText(QString("%1%").arg(progress.progress));
+ s.status->setStyleSheet(
QString("color:%1; font-family:%2; font-size:9px;").arg(kAccent, fonts::DATA_FAMILY));
}
}
- // Update main status
- status_label_->setText(progress.message);
+ // Plain-English status line — strip internal technical messages
+ QString msg = progress.message;
+ // Replace internal step identifiers users don't need to see
+ msg.replace("venv-numpy1", "Trading workspace");
+ msg.replace("venv-numpy2", "Analytics workspace");
+ msg.replace("requirements-numpy1.txt", "trading library list");
+ msg.replace("requirements-numpy2.txt", "analytics library list");
+ status_label_->setText(msg);
}
void SetupScreen::on_setup_done(bool success, const QString& error) {
if (success) {
- LOG_INFO("SetupScreen", "Python setup completed — starting Whisper model download");
- status_label_->setText("Downloading Whisper voice model...");
+ LOG_INFO("SetupScreen", "Python setup completed — starting voice model download");
+ status_label_->setText("Downloading the offline voice assistant model...");
status_label_->setStyleSheet(
- QString("color:%1; font-family:%2; font-size:10px; margin-top:8px;").arg(kAccent, fonts::DATA_FAMILY));
-
- // Kick off whisper model download as the final setup step.
- // on_whisper_ready() will emit setup_complete() when done.
+ QString("color:%1; font-family:%2; font-size:10px; margin-top:6px;").arg(kAccent, fonts::DATA_FAMILY));
+ mark_step_active("whisper");
services::WhisperService::instance().download_for_setup();
} else {
+ // Stop all running pulses
+ for (auto [k, s] : steps_.asKeyValueRange())
+ stop_pulse(k);
+
begin_btn_->setEnabled(true);
begin_btn_->setText("RETRY SETUP");
- status_label_->setText("Setup failed: " + error);
+ status_label_->setText("Something went wrong during setup. Check your internet connection and try again.");
status_label_->setStyleSheet(
- QString("color:%1; font-family:%2; font-size:10px; margin-top:8px;").arg(colors::RED, fonts::DATA_FAMILY));
-
+ QString("color:%1; font-family:%2; font-size:10px; margin-top:6px;").arg(colors::RED, fonts::DATA_FAMILY));
LOG_ERROR("SetupScreen", "Setup failed: " + error);
}
}
void SetupScreen::on_whisper_progress(int percent) {
if (!steps_.contains("whisper")) return;
- auto& ui = steps_["whisper"];
- ui.bar->setValue(percent);
- if (percent < 100) {
- ui.status->setText(QString("%1%").arg(percent));
- ui.status->setStyleSheet(
- QString("color:%1; font-family:%2; font-size:9px;").arg(kAccent, fonts::DATA_FAMILY));
- }
- status_label_->setText(QString("Downloading Whisper voice model... %1%").arg(percent));
+ auto& s = steps_["whisper"];
+ // Whisper gives real % from QNetworkReply — stop pulse and use real value
+ stop_pulse("whisper");
+ s.bar->setValue(percent);
+ s.status->setText(QString("%1%").arg(percent));
+ s.status->setStyleSheet(
+ QString("color:%1; font-family:%2; font-size:9px;").arg(kAccent, fonts::DATA_FAMILY));
+ status_label_->setText(QString("Downloading voice assistant model... %1%").arg(percent));
}
void SetupScreen::on_whisper_ready() {
mark_step_done("whisper");
- status_label_->setText("All components installed! Starting Fincept Terminal...");
- status_label_->setStyleSheet(QString("color:%1; font-family:%2; font-size:10px; margin-top:8px;")
- .arg(colors::GREEN, fonts::DATA_FAMILY));
- begin_btn_->setText("SETUP COMPLETE");
+ status_label_->setText("Everything is ready! Launching Fincept Terminal...");
+ status_label_->setStyleSheet(
+ QString("color:%1; font-family:%2; font-size:10px; margin-top:6px;")
+ .arg(colors::GREEN, fonts::DATA_FAMILY));
+ begin_btn_->setText("LAUNCH");
LOG_INFO("SetupScreen", "Whisper model ready — setup fully complete");
if (timeout_timer_) timeout_timer_->stop();
@@ -297,39 +389,46 @@ void SetupScreen::on_whisper_ready() {
}
void SetupScreen::on_whisper_error(const QString& message) {
+ stop_pulse("whisper");
if (steps_.contains("whisper")) {
- auto& ui = steps_["whisper"];
- ui.status->setText("FAILED");
- ui.status->setStyleSheet(
- QString("color:%1; font-family:%2; font-size:9px;").arg(colors::RED, fonts::DATA_FAMILY));
+ auto& s = steps_["whisper"];
+ s.bar->setValue(s.pulse_val > 0 ? s.pulse_val : 0);
+ s.status->setText("SKIPPED");
+ s.status->setStyleSheet(
+ QString("color:%1; font-family:%2; font-size:9px;").arg(colors::TEXT_TERTIARY, fonts::DATA_FAMILY));
}
- // Non-fatal — voice commands won't work but app can still launch.
LOG_WARN("SetupScreen", "Whisper model download failed: " + message);
whisper_failed_ = true;
- status_label_->setText("Voice model download failed — voice commands unavailable.");
+ status_label_->setText(
+ "Voice assistant couldn't be downloaded — voice commands won't be available.\n"
+ "All other features work normally. You can retry or continue without it.");
status_label_->setStyleSheet(
- QString("color:%1; font-family:%2; font-size:10px; margin-top:8px;").arg(colors::TEXT_TERTIARY, fonts::DATA_FAMILY));
+ QString("color:%1; font-family:%2; font-size:10px; margin-top:6px;")
+ .arg(colors::TEXT_TERTIARY, fonts::DATA_FAMILY));
begin_btn_->setText("SETUP COMPLETE");
- // Show retry and skip buttons so user has explicit choices
if (retry_whisper_btn_) retry_whisper_btn_->setVisible(true);
if (skip_btn_) {
skip_btn_->setVisible(true);
- skip_btn_->setText("SKIP & CONTINUE WITHOUT VOICE");
+ skip_btn_->setText("CONTINUE WITHOUT VOICE COMMANDS");
}
}
void SetupScreen::on_skip_clicked() {
LOG_INFO("SetupScreen", "User skipped setup — launching app");
if (timeout_timer_) timeout_timer_->stop();
+ for (auto [k, s] : steps_.asKeyValueRange())
+ stop_pulse(k);
emit setup_complete();
}
void SetupScreen::on_setup_timeout() {
LOG_WARN("SetupScreen", "Setup timed out after 15 minutes — showing skip option");
- status_label_->setText("Setup is taking longer than expected. You can skip and continue.");
+ status_label_->setText(
+ "Setup is taking longer than expected — possibly a slow internet connection.\n"
+ "You can wait or skip and continue with limited functionality.");
status_label_->setStyleSheet(
- QString("color:%1; font-family:%2; font-size:10px; margin-top:8px;")
+ QString("color:%1; font-family:%2; font-size:10px; margin-top:6px;")
.arg(colors::TEXT_TERTIARY, fonts::DATA_FAMILY));
if (skip_btn_) skip_btn_->setVisible(true);
}
@@ -338,26 +437,21 @@ void SetupScreen::on_retry_whisper() {
whisper_failed_ = false;
if (retry_whisper_btn_) retry_whisper_btn_->setVisible(false);
if (skip_btn_) skip_btn_->setVisible(false);
- if (steps_.contains("whisper")) {
- auto& ui = steps_["whisper"];
- ui.bar->setValue(0);
- ui.status->setText("Retrying...");
- ui.status->setStyleSheet(
- QString("color:%1; font-family:%2; font-size:9px;").arg(kAccent, fonts::DATA_FAMILY));
- }
- status_label_->setText("Retrying Whisper voice model download...");
+ mark_step_active("whisper");
+ status_label_->setText("Retrying voice assistant model download...");
status_label_->setStyleSheet(
- QString("color:%1; font-family:%2; font-size:10px; margin-top:8px;").arg(kAccent, fonts::DATA_FAMILY));
+ QString("color:%1; font-family:%2; font-size:10px; margin-top:6px;").arg(kAccent, fonts::DATA_FAMILY));
LOG_INFO("SetupScreen", "User requested Whisper retry");
services::WhisperService::instance().download_for_setup();
}
void SetupScreen::mark_step_done(const QString& key) {
if (!steps_.contains(key)) return;
- auto& ui = steps_[key];
- ui.bar->setValue(100);
- ui.status->setText("DONE");
- ui.status->setStyleSheet(
+ stop_pulse(key);
+ auto& s = steps_[key];
+ s.bar->setValue(100);
+ s.status->setText("DONE");
+ s.status->setStyleSheet(
QString("color:%1; font-family:%2; font-size:9px;").arg(colors::GREEN, fonts::DATA_FAMILY));
}
@@ -365,36 +459,33 @@ void SetupScreen::prefill_completed_steps() {
const auto status = python::PythonSetupManager::instance().check_status();
const bool whisper = services::WhisperService::is_model_downloaded();
- // Pre-fill completed steps as green DONE
- if (status.uv_installed) mark_step_done("uv");
- if (status.python_installed) mark_step_done("python");
- if (status.venv_numpy1_ready && status.venv_numpy2_ready) mark_step_done("venv");
- if (status.venv_numpy1_ready) mark_step_done("packages-numpy1");
- if (status.venv_numpy2_ready) mark_step_done("packages-numpy2");
- if (whisper) mark_step_done("whisper");
+ if (status.uv_installed) mark_step_done("uv");
+ if (status.python_installed) mark_step_done("python");
+ if (status.venv_numpy1_ready && status.venv_numpy2_ready) mark_step_done("venv");
+ if (status.venv_numpy1_ready) mark_step_done("packages-numpy1");
+ if (status.venv_numpy2_ready) mark_step_done("packages-numpy2");
+ if (whisper) mark_step_done("whisper");
const bool any_done = status.uv_installed || status.python_installed
- || status.venv_numpy1_ready || status.venv_numpy2_ready
- || whisper;
+ || status.venv_numpy1_ready || status.venv_numpy2_ready || whisper;
const bool all_done = status.uv_installed && status.python_installed
- && status.venv_numpy1_ready && status.venv_numpy2_ready
- && whisper;
+ && status.venv_numpy1_ready && status.venv_numpy2_ready && whisper;
summary_lbl_->setText({});
if (all_done) {
- subtitle_lbl_->setText("Environment Ready");
+ subtitle_lbl_->setText("Your workspace is fully configured");
begin_btn_->setEnabled(false);
begin_btn_->setText("ALREADY COMPLETE");
- status_label_->setText("All components are installed.");
+ status_label_->setText("Everything is installed and ready to go.");
} else if (any_done) {
- subtitle_lbl_->setText("Completing Environment Setup");
- begin_btn_->setText("COMPLETE SETUP");
- status_label_->setText("Only missing components will be downloaded. Internet connection required.");
+ subtitle_lbl_->setText("Finishing your workspace setup");
+ begin_btn_->setText("CONTINUE SETUP");
+ status_label_->setText("Only the missing pieces will be downloaded. Needs an internet connection.");
} else {
- subtitle_lbl_->setText("First-Time Environment Setup");
+ subtitle_lbl_->setText("Getting your workspace ready");
begin_btn_->setText("BEGIN SETUP");
- status_label_->setText("Estimated time: 3–5 minutes. Internet connection required.");
+ status_label_->setText("Takes about 3–5 minutes. Needs an internet connection.");
}
}
diff --git a/fincept-qt/src/screens/setup/SetupScreen.h b/fincept-qt/src/screens/setup/SetupScreen.h
index 56e24a944..b7ba8d4f0 100644
--- a/fincept-qt/src/screens/setup/SetupScreen.h
+++ b/fincept-qt/src/screens/setup/SetupScreen.h
@@ -37,13 +37,16 @@ class SetupScreen : public QWidget {
private:
void build_ui();
- QWidget* build_step_row(const QString& label, const QString& object_name);
+ QWidget* build_step_row(const QString& key, const QString& label, const QString& sublabel);
void prefill_completed_steps();
void mark_step_done(const QString& key);
+ void mark_step_active(const QString& key); // highlights the currently running step
+ void start_pulse(const QString& key); // starts indeterminate pulse on a bar
+ void stop_pulse(const QString& key); // stops pulse, keeps value
QPushButton* begin_btn_ = nullptr;
- QPushButton* skip_btn_ = nullptr; // "Skip & continue" shown on timeout/error
- QPushButton* retry_whisper_btn_= nullptr; // "Retry voice model" shown after Whisper failure
+ QPushButton* skip_btn_ = nullptr;
+ QPushButton* retry_whisper_btn_= nullptr;
QLabel* status_label_ = nullptr;
QLabel* subtitle_lbl_ = nullptr;
QLabel* summary_lbl_ = nullptr;
@@ -52,9 +55,12 @@ class SetupScreen : public QWidget {
// Step progress bars (keyed by step name)
struct StepUI {
- QLabel* label = nullptr;
- QProgressBar* bar = nullptr;
- QLabel* status = nullptr;
+ QLabel* label = nullptr;
+ QLabel* sublabel = nullptr; // plain-English description below the label
+ QProgressBar* bar = nullptr;
+ QLabel* status = nullptr;
+ QTimer* pulse = nullptr; // drives indeterminate animation
+ int pulse_val = 0; // current pulse position 0-99
};
QMap<QString, StepUI> steps_;
};
diff --git a/fincept-qt/src/services/algo_trading/AlgoTradingService.cpp b/fincept-qt/src/services/algo_trading/AlgoTradingService.cpp
index 3fb56d732..bb057ac0d 100644
--- a/fincept-qt/src/services/algo_trading/AlgoTradingService.cpp
+++ b/fincept-qt/src/services/algo_trading/AlgoTradingService.cpp
@@ -1,13 +1,13 @@
// src/services/algo_trading/AlgoTradingService.cpp
#include "services/algo_trading/AlgoTradingService.h"
+#include "core/config/AppPaths.h"
#include "core/logging/Logger.h"
#include "python/PythonRunner.h"
#include "storage/cache/CacheManager.h"
#include <QJsonDocument>
#include <QPointer>
-#include <QStandardPaths>
#include <QUuid>
namespace fincept::services::algo {
@@ -19,7 +19,7 @@ static constexpr const char* kDeploymentsCacheKey = "algo:deployments";
// ── DB path helper ────────────────────────────────────────────────────────────
static QString algo_db_path() {
- return QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/fincept.db";
+ return fincept::AppPaths::data() + "/fincept.db";
}
AlgoTradingService& AlgoTradingService::instance() {
diff --git a/fincept-qt/src/services/file_manager/FileManagerService.cpp b/fincept-qt/src/services/file_manager/FileManagerService.cpp
index 9e9f90e89..c42d4ecc3 100644
--- a/fincept-qt/src/services/file_manager/FileManagerService.cpp
+++ b/fincept-qt/src/services/file_manager/FileManagerService.cpp
@@ -2,6 +2,7 @@
#include "services/file_manager/FileManagerService.h"
+#include "core/config/AppPaths.h"
#include "core/logging/Logger.h"
#include <QDateTime>
@@ -10,7 +11,6 @@
#include <QFileInfo>
#include <QJsonDocument>
#include <QMimeDatabase>
-#include <QStandardPaths>
#include <QUuid>
namespace fincept::services {
@@ -33,7 +33,7 @@ FileManagerService::FileManagerService(QObject* parent) : QObject(parent) {
// ── Paths ────────────────────────────────────────────────────────────────────
QString FileManagerService::storage_dir() const {
- return QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + "/fincept-files";
+ return fincept::AppPaths::files();
}
QString FileManagerService::full_path(const QString& stored_name) const {
diff --git a/fincept-qt/src/services/news/NewsService.cpp b/fincept-qt/src/services/news/NewsService.cpp
index 5e967734c..3a7c34f3a 100644
--- a/fincept-qt/src/services/news/NewsService.cpp
+++ b/fincept-qt/src/services/news/NewsService.cpp
@@ -3,6 +3,7 @@
#include "core/logging/Logger.h"
#include "network/http/HttpClient.h"
#include "storage/cache/CacheManager.h"
+#include "storage/repositories/NewsArticleRepository.h"
#include <QAtomicInt>
#include <QDateTime>
@@ -60,6 +61,12 @@ void NewsService::fetch_all_news(bool force, ArticlesCallback cb) {
a.link = o["link"].toString();
a.sort_ts = o["sort_ts"].toVariant().toLongLong();
a.tier = o["tier"].toInt(4);
+ a.priority = priority_from_string(o["priority"].toString());
+ a.sentiment = sentiment_from_string(o["sentiment"].toString());
+ a.impact = impact_from_string(o["impact"].toString());
+ a.lang = o["lang"].toString();
+ for (const auto& t : o["tickers"].toArray())
+ a.tickers << t.toString();
articles.append(a);
}
cb(true, articles);
@@ -122,16 +129,23 @@ void NewsService::fetch_all_news(bool force, ArticlesCallback cb) {
QJsonArray arr;
for (const auto& a : all) {
QJsonObject o;
- o["id"] = a.id;
- o["time"] = a.time;
- o["headline"] = a.headline;
- o["summary"] = a.summary;
- o["source"] = a.source;
- o["region"] = a.region;
- o["category"] = a.category;
- o["link"] = a.link;
- o["sort_ts"] = static_cast<qint64>(a.sort_ts);
- o["tier"] = a.tier;
+ o["id"] = a.id;
+ o["time"] = a.time;
+ o["headline"] = a.headline;
+ o["summary"] = a.summary;
+ o["source"] = a.source;
+ o["region"] = a.region;
+ o["category"] = a.category;
+ o["link"] = a.link;
+ o["sort_ts"] = static_cast<qint64>(a.sort_ts);
+ o["tier"] = a.tier;
+ o["priority"] = priority_string(a.priority);
+ o["sentiment"] = sentiment_string(a.sentiment);
+ o["impact"] = impact_string(a.impact);
+ o["lang"] = a.lang;
+ QJsonArray tickers;
+ for (const auto& t : a.tickers) tickers.append(t);
+ o["tickers"] = tickers;
arr.append(o);
}
fincept::CacheManager::instance().put(
@@ -140,6 +154,9 @@ void NewsService::fetch_all_news(bool force, ArticlesCallback cb) {
kArticleCacheTtlSec,
"news");
+ // Persist to DB (INSERT OR IGNORE — keeps history across refreshes)
+ fincept::NewsArticleRepository::instance().upsert_batch(all);
+
LOG_INFO("NewsService",
QString("Fetched %1 articles from %2 sources").arg(all.size()).arg(sources.size()));
@@ -164,16 +181,22 @@ void NewsService::fetch_all_news_progressive(bool force, ArticlesCallback final_
for (const auto& v : arr) {
const QJsonObject o = v.toObject();
NewsArticle a;
- a.id = o["id"].toString();
- a.time = o["time"].toString();
- a.headline = o["headline"].toString();
- a.summary = o["summary"].toString();
- a.source = o["source"].toString();
- a.region = o["region"].toString();
- a.category = o["category"].toString();
- a.link = o["link"].toString();
- a.sort_ts = o["sort_ts"].toVariant().toLongLong();
- a.tier = o["tier"].toInt(4);
+ a.id = o["id"].toString();
+ a.time = o["time"].toString();
+ a.headline = o["headline"].toString();
+ a.summary = o["summary"].toString();
+ a.source = o["source"].toString();
+ a.region = o["region"].toString();
+ a.category = o["category"].toString();
+ a.link = o["link"].toString();
+ a.sort_ts = o["sort_ts"].toVariant().toLongLong();
+ a.tier = o["tier"].toInt(4);
+ a.priority = priority_from_string(o["priority"].toString());
+ a.sentiment = sentiment_from_string(o["sentiment"].toString());
+ a.impact = impact_from_string(o["impact"].toString());
+ a.lang = o["lang"].toString();
+ for (const auto& t : o["tickers"].toArray())
+ a.tickers << t.toString();
articles.append(a);
}
final_cb(true, articles);
@@ -244,16 +267,23 @@ void NewsService::fetch_all_news_progressive(bool force, ArticlesCallback final_
QJsonArray parr;
for (const auto& a : all) {
QJsonObject o;
- o["id"] = a.id;
- o["time"] = a.time;
- o["headline"] = a.headline;
- o["summary"] = a.summary;
- o["source"] = a.source;
- o["region"] = a.region;
- o["category"] = a.category;
- o["link"] = a.link;
- o["sort_ts"] = static_cast<qint64>(a.sort_ts);
- o["tier"] = a.tier;
+ o["id"] = a.id;
+ o["time"] = a.time;
+ o["headline"] = a.headline;
+ o["summary"] = a.summary;
+ o["source"] = a.source;
+ o["region"] = a.region;
+ o["category"] = a.category;
+ o["link"] = a.link;
+ o["sort_ts"] = static_cast<qint64>(a.sort_ts);
+ o["tier"] = a.tier;
+ o["priority"] = priority_string(a.priority);
+ o["sentiment"] = sentiment_string(a.sentiment);
+ o["impact"] = impact_string(a.impact);
+ o["lang"] = a.lang;
+ QJsonArray tickers;
+ for (const auto& t : a.tickers) tickers.append(t);
+ o["tickers"] = tickers;
parr.append(o);
}
fincept::CacheManager::instance().put(
@@ -262,6 +292,9 @@ void NewsService::fetch_all_news_progressive(bool force, ArticlesCallback final_
kArticleCacheTtlSec,
"news");
+ // Persist to DB (INSERT OR IGNORE — keeps history across refreshes)
+ fincept::NewsArticleRepository::instance().upsert_batch(all);
+
LOG_INFO(
"NewsService",
QString("Progressive fetch complete: %1 articles, %2 sources").arg(all.size()).arg(sources.size()));
@@ -615,7 +648,9 @@ QString NewsService::strip_html(const QString& html) {
// ── Enrich article: sentiment, priority, category, tickers ──────────────────
void NewsService::enrich_article(NewsArticle& article) {
- QString text = (article.headline + " " + article.summary).toLower();
+ // Build once — reused for all keyword checks, ticker regex, and classify_threat
+ const QString combined = article.headline + " " + article.summary;
+ const QString text = combined.toLower();
// Priority
if (text.contains("breaking") || text.contains("alert"))
@@ -712,7 +747,7 @@ void NewsService::enrich_article(NewsArticle& article) {
static QRegularExpression ticker_re("\\b[A-Z]{2,5}\\b");
static QSet<QString> common_words = {"THE", "FOR", "AND", "BUT", "NOT", "FROM", "WITH", "THIS", "THAT", "HAVE",
"WILL", "BEEN", "THEY", "WERE", "SAID", "HAS", "ITS", "NEW", "ARE", "WAS"};
- auto it = ticker_re.globalMatch(article.headline + " " + article.summary);
+ auto it = ticker_re.globalMatch(combined); // reuse already-built string
QSet<QString> found;
while (it.hasNext() && found.size() < 5) {
auto m = it.next();
@@ -757,8 +792,8 @@ void NewsService::enrich_article(NewsArticle& article) {
};
article.lang = detect_lang(article.headline);
- // Threat classification
- article.threat = classify_threat(article);
+ // Threat classification — pass pre-built text to avoid a 3rd toLower()
+ article.threat = classify_threat(article, text);
// Source credibility flag
article.source_flag = source_flag_for(article.source);
@@ -767,7 +802,11 @@ void NewsService::enrich_article(NewsArticle& article) {
// ── Threat classification with confidence ───────────────────────────────────
ThreatClassification NewsService::classify_threat(const NewsArticle& article) {
- QString text = (article.headline + " " + article.summary).toLower();
+ // Convenience overload — builds text itself (used only outside enrich_article)
+ return classify_threat(article, (article.headline + " " + article.summary).toLower());
+}
+
+ThreatClassification NewsService::classify_threat(const NewsArticle& article, const QString& text) {
ThreatClassification tc;
tc.category = "general";
tc.confidence = 0.3; // base confidence from keyword matching
@@ -1161,4 +1200,23 @@ QString threat_level_color(ThreatLevel t) {
return "#525252";
}
+Priority priority_from_string(const QString& s) {
+ if (s == "FLASH") return Priority::FLASH;
+ if (s == "URGENT") return Priority::URGENT;
+ if (s == "BREAKING") return Priority::BREAKING;
+ return Priority::ROUTINE;
+}
+
+Sentiment sentiment_from_string(const QString& s) {
+ if (s == "BULLISH") return Sentiment::BULLISH;
+ if (s == "BEARISH") return Sentiment::BEARISH;
+ return Sentiment::NEUTRAL;
+}
+
+Impact impact_from_string(const QString& s) {
+ if (s == "HIGH") return Impact::HIGH;
+ if (s == "MEDIUM") return Impact::MEDIUM;
+ return Impact::LOW;
+}
+
} // namespace fincept::services
diff --git a/fincept-qt/src/services/news/NewsService.h b/fincept-qt/src/services/news/NewsService.h
index 03b742112..3581428e0 100644
--- a/fincept-qt/src/services/news/NewsService.h
+++ b/fincept-qt/src/services/news/NewsService.h
@@ -146,6 +146,8 @@ class NewsService : public QObject {
/// Threat level helpers.
static ThreatClassification classify_threat(const NewsArticle& article);
+ /// Overload that accepts pre-built lowercased text to avoid redundant allocation.
+ static ThreatClassification classify_threat(const NewsArticle& article, const QString& text);
signals:
void articles_updated(QVector<NewsArticle> articles);
@@ -183,4 +185,9 @@ QString relative_time(int64_t unix_ts);
QString threat_level_string(ThreatLevel t);
QString threat_level_color(ThreatLevel t);
+// Round-trip helpers (string → enum)
+Priority priority_from_string(const QString& s);
+Sentiment sentiment_from_string(const QString& s);
+Impact impact_from_string(const QString& s);
+
} // namespace fincept::services
diff --git a/fincept-qt/src/services/notifications/NotificationService.cpp b/fincept-qt/src/services/notifications/NotificationService.cpp
new file mode 100644
index 000000000..39e8945bf
--- /dev/null
+++ b/fincept-qt/src/services/notifications/NotificationService.cpp
@@ -0,0 +1,190 @@
+#include "services/notifications/NotificationService.h"
+
+#include "core/logging/Logger.h"
+#include "storage/repositories/SettingsRepository.h"
+
+// Provider includes
+#include "services/notifications/providers/TelegramProvider.h"
+#include "services/notifications/providers/DiscordProvider.h"
+#include "services/notifications/providers/SlackProvider.h"
+#include "services/notifications/providers/EmailProvider.h"
+#include "services/notifications/providers/WhatsAppProvider.h"
+#include "services/notifications/providers/PushoverProvider.h"
+#include "services/notifications/providers/NtfyProvider.h"
+#include "services/notifications/providers/PushbulletProvider.h"
+#include "services/notifications/providers/GotifyProvider.h"
+#include "services/notifications/providers/MattermostProvider.h"
+#include "services/notifications/providers/TeamsProvider.h"
+#include "services/notifications/providers/WebhookProvider.h"
+#include "services/notifications/providers/PagerDutyProvider.h"
+#include "services/notifications/providers/OpsgenieProvider.h"
+#include "services/notifications/providers/SMSProvider.h"
+
+#include <algorithm>
+
+namespace fincept::notifications {
+
+// ── Singleton ─────────────────────────────────────────────────────────────────
+
+NotificationService& NotificationService::instance() {
+ static NotificationService inst;
+ return inst;
+}
+
+NotificationService::NotificationService() {
+ register_providers();
+}
+
+void NotificationService::register_providers() {
+ providers_.clear();
+ providers_.emplace_back(std::make_unique<TelegramProvider>());
+ providers_.emplace_back(std::make_unique<DiscordProvider>());
+ providers_.emplace_back(std::make_unique<SlackProvider>());
+ providers_.emplace_back(std::make_unique<EmailProvider>());
+ providers_.emplace_back(std::make_unique<WhatsAppProvider>());
+ providers_.emplace_back(std::make_unique<PushoverProvider>());
+ providers_.emplace_back(std::make_unique<NtfyProvider>());
+ providers_.emplace_back(std::make_unique<PushbulletProvider>());
+ providers_.emplace_back(std::make_unique<GotifyProvider>());
+ providers_.emplace_back(std::make_unique<MattermostProvider>());
+ providers_.emplace_back(std::make_unique<TeamsProvider>());
+ providers_.emplace_back(std::make_unique<WebhookProvider>());
+ providers_.emplace_back(std::make_unique<PagerDutyProvider>());
+ providers_.emplace_back(std::make_unique<OpsgenieProvider>());
+ providers_.emplace_back(std::make_unique<SMSProvider>());
+
+ for (auto& p : providers_)
+ p->load_config();
+
+ LOG_INFO("NotificationService", "Registered 15 notification providers");
+}
+
+// ── Send ──────────────────────────────────────────────────────────────────────
+
+void NotificationService::send(const NotificationRequest& req) {
+ // Read per-trigger filter from settings
+ auto& repo = SettingsRepository::instance();
+ auto get_bool = [&](const QString& key, bool def) -> bool {
+ auto r = repo.get(key);
+ return r.is_ok() ? (r.value() == "1") : def;
+ };
+
+ // Check trigger-level filter (in-app always on unless globally disabled)
+ const bool inapp_on = get_bool("notifications.inapp", true);
+ const bool price_on = get_bool("notifications.price_alerts", true);
+ const bool orders_on = get_bool("notifications.order_fills", true);
+ const bool news_on = get_bool("notifications.news_alerts", false);
+
+ bool trigger_allowed = true;
+ switch (req.trigger) {
+ case NotifTrigger::PriceAlert: trigger_allowed = price_on; break;
+ case NotifTrigger::OrderFill: trigger_allowed = orders_on; break;
+ case NotifTrigger::NewsAlert: trigger_allowed = news_on; break;
+ case NotifTrigger::Manual:
+ case NotifTrigger::WorkflowNode: trigger_allowed = true; break;
+ }
+
+ if (!trigger_allowed) {
+ LOG_DEBUG("NotificationService",
+ QString("Trigger suppressed by filter: %1").arg(req.title).toStdString().c_str());
+ return;
+ }
+
+ // Always record in-app history
+ NotificationRecord record;
+ record.id = next_id_++;
+ record.request = req;
+ record.read = false;
+ record.received_at = QDateTime::currentDateTime();
+ history_.prepend(record);
+ if (history_.size() > 200)
+ history_.removeLast();
+
+ if (inapp_on) {
+ ++unread_;
+ emit notification_received(record);
+ emit unread_count_changed(unread_);
+ }
+
+ // Dispatch to external providers
+ for (auto& p : providers_) {
+ if (!p->is_enabled() || !p->is_configured())
+ continue;
+ const QString pid = p->provider_id();
+ p->send(req, [pid](bool ok, const QString& err) {
+ if (ok) {
+ LOG_INFO("NotificationService",
+ QString("Delivered via %1").arg(pid).toStdString().c_str());
+ } else {
+ LOG_WARN("NotificationService",
+ QString("Delivery failed via %1: %2").arg(pid, err).toStdString().c_str());
+ }
+ });
+ }
+}
+
+void NotificationService::send_to(const QString& provider_id,
+ const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) {
+ auto* p = provider(provider_id);
+ if (!p) {
+ cb(false, QString("Provider '%1' not found").arg(provider_id));
+ return;
+ }
+ p->send(req, std::move(cb));
+}
+
+// ── History ───────────────────────────────────────────────────────────────────
+
+const QVector<NotificationRecord>& NotificationService::history() const {
+ return history_;
+}
+
+int NotificationService::unread_count() const {
+ return unread_;
+}
+
+void NotificationService::mark_read(int id) {
+ for (auto& r : history_) {
+ if (r.id == id && !r.read) {
+ r.read = true;
+ --unread_;
+ if (unread_ < 0) unread_ = 0;
+ emit unread_count_changed(unread_);
+ return;
+ }
+ }
+}
+
+void NotificationService::mark_all_read() {
+ for (auto& r : history_)
+ r.read = true;
+ unread_ = 0;
+ emit unread_count_changed(0);
+}
+
+// ── Provider access ───────────────────────────────────────────────────────────
+
+QVector<INotificationProvider*> NotificationService::providers() const {
+ QVector<INotificationProvider*> out;
+ out.reserve(static_cast<int>(providers_.size()));
+ for (const auto& p : providers_)
+ out.append(p.get());
+ return out;
+}
+
+INotificationProvider* NotificationService::provider(const QString& id) const {
+ for (const auto& p : providers_) {
+ if (p->provider_id() == id)
+ return p.get();
+ }
+ return nullptr;
+}
+
+void NotificationService::reload_all_configs() {
+ for (auto& p : providers_)
+ p->load_config();
+ LOG_INFO("NotificationService", "All provider configs reloaded");
+}
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/NotificationService.h b/fincept-qt/src/services/notifications/NotificationService.h
new file mode 100644
index 000000000..53bec04f5
--- /dev/null
+++ b/fincept-qt/src/services/notifications/NotificationService.h
@@ -0,0 +1,115 @@
+#pragma once
+#include <QDateTime>
+#include <QObject>
+#include <QString>
+#include <QVector>
+#include <functional>
+#include <memory>
+#include <vector>
+
+namespace fincept::notifications {
+
+// ── Enumerations ──────────────────────────────────────────────────────────────
+
+enum class NotifLevel { Info, Warning, Alert, Critical };
+enum class NotifTrigger { Manual, PriceAlert, OrderFill, NewsAlert, WorkflowNode };
+
+// ── Data structures ───────────────────────────────────────────────────────────
+
+struct NotificationRequest {
+ QString title;
+ QString message;
+ NotifLevel level = NotifLevel::Info;
+ NotifTrigger trigger = NotifTrigger::Manual;
+ QDateTime timestamp{QDateTime::currentDateTime()};
+};
+
+struct NotificationRecord {
+ int id{0};
+ NotificationRequest request;
+ bool read{false};
+ QDateTime received_at{QDateTime::currentDateTime()};
+};
+
+// ── Provider interface ────────────────────────────────────────────────────────
+
+/// Abstract base for every external notification channel.
+/// Each provider is responsible for reading/writing its own credentials
+/// from SettingsRepository under category "notif_<provider_id>".
+class INotificationProvider {
+ public:
+ virtual ~INotificationProvider() = default;
+
+ /// Unique machine-readable identifier, e.g. "telegram".
+ virtual QString provider_id() const = 0;
+
+ /// Human-readable name shown in UI, e.g. "Telegram".
+ virtual QString display_name() const = 0;
+
+ /// Icon/emoji character used in settings UI header.
+ virtual QString icon() const = 0;
+
+ /// Returns true when the minimum required credentials are present.
+ virtual bool is_configured() const = 0;
+
+ /// True when the user has enabled this provider in Settings.
+ virtual bool is_enabled() const = 0;
+
+ /// Perform the HTTP call to deliver req. Invoke cb with (ok, error_string).
+ virtual void send(const NotificationRequest& req,
+ std::function<void(bool ok, QString error)> cb) = 0;
+
+ /// Reload credentials from SettingsRepository.
+ virtual void load_config() = 0;
+
+ /// Persist current credential state to SettingsRepository.
+ virtual void save_config() = 0;
+};
+
+// ── Service ───────────────────────────────────────────────────────────────────
+
+/// Central notification dispatcher. Maintains in-process history, dispatches
+/// to all configured+enabled providers, and emits Qt signals for UI layers.
+class NotificationService : public QObject {
+ Q_OBJECT
+ public:
+ static NotificationService& instance();
+
+ /// Dispatch to all enabled+configured providers that match the trigger filter.
+ /// Always adds to history and emits notification_received regardless of
+ /// external delivery outcome.
+ void send(const NotificationRequest& req);
+
+ /// Deliver to a single named provider — used for Settings "Test Send" button.
+ void send_to(const QString& provider_id,
+ const NotificationRequest& req,
+ std::function<void(bool ok, QString error)> cb);
+
+ // ── History ───────────────────────────────────────────────────────────────
+ const QVector<NotificationRecord>& history() const;
+ int unread_count() const;
+ void mark_read(int id);
+ void mark_all_read();
+
+ // ── Provider access (for settings page) ──────────────────────────────────
+ QVector<INotificationProvider*> providers() const;
+ INotificationProvider* provider(const QString& id) const;
+
+ /// Call after settings are saved to reload all provider configs.
+ void reload_all_configs();
+
+ signals:
+ void notification_received(const fincept::notifications::NotificationRecord& record);
+ void unread_count_changed(int count);
+
+ private:
+ explicit NotificationService();
+ void register_providers();
+
+ std::vector<std::unique_ptr<INotificationProvider>> providers_;
+ QVector<NotificationRecord> history_;
+ int next_id_{1};
+ int unread_{0};
+};
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/BaseProvider.h b/fincept-qt/src/services/notifications/providers/BaseProvider.h
new file mode 100644
index 000000000..30270565b
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/BaseProvider.h
@@ -0,0 +1,50 @@
+#pragma once
+#include "services/notifications/NotificationService.h"
+#include "storage/repositories/SettingsRepository.h"
+
+namespace fincept::notifications {
+
+/// Convenience base class for HTTP-based notification providers.
+/// Subclasses implement provider_id(), display_name(), icon(), and send().
+/// load_config() / save_config() / is_configured() / is_enabled() are handled here
+/// via SettingsRepository under category "notif_<provider_id>".
+class BaseProvider : public INotificationProvider {
+ public:
+ bool is_enabled() const override { return enabled_; }
+
+ void load_config() override {
+ auto& r = SettingsRepository::instance();
+ const QString cat = category();
+ enabled_ = get_bool(r, cat + ".enabled", false);
+ load_fields(r, cat);
+ }
+
+ void save_config() override {
+ auto& r = SettingsRepository::instance();
+ const QString cat = category();
+ r.set(cat + ".enabled", enabled_ ? "1" : "0", cat);
+ save_fields(r, cat);
+ }
+
+ protected:
+ bool enabled_{false};
+
+ QString category() const { return QString("notif_%1").arg(provider_id()); }
+
+ static bool get_bool(SettingsRepository& r, const QString& key, bool def) {
+ auto res = r.get(key);
+ return res.is_ok() && !res.value().isEmpty() ? (res.value() == "1") : def;
+ }
+
+ static QString get_str(SettingsRepository& r, const QString& key) {
+ auto res = r.get(key);
+ return res.is_ok() ? res.value() : QString{};
+ }
+
+ /// Subclasses load their specific credential fields here.
+ virtual void load_fields(SettingsRepository& r, const QString& cat) = 0;
+ /// Subclasses persist their specific credential fields here.
+ virtual void save_fields(SettingsRepository& r, const QString& cat) = 0;
+};
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/DiscordProvider.cpp b/fincept-qt/src/services/notifications/providers/DiscordProvider.cpp
new file mode 100644
index 000000000..303105dd3
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/DiscordProvider.cpp
@@ -0,0 +1,57 @@
+#include "services/notifications/providers/DiscordProvider.h"
+#include "network/http/HttpClient.h"
+
+#include <QJsonArray>
+#include <QJsonObject>
+
+namespace fincept::notifications {
+
+void DiscordProvider::load_fields(SettingsRepository& r, const QString& cat) {
+ webhook_url_ = get_str(r, cat + ".webhook_url");
+}
+
+void DiscordProvider::save_fields(SettingsRepository& r, const QString& cat) {
+ r.set(cat + ".webhook_url", webhook_url_, cat);
+}
+
+void DiscordProvider::send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) {
+ if (!is_configured()) { cb(false, "Not configured"); return; }
+
+ const int color = [&]() -> int {
+ switch (req.level) {
+ case NotifLevel::Warning: return 0xF59E0B; // amber
+ case NotifLevel::Alert: return 0xF97316; // orange
+ case NotifLevel::Critical: return 0xEF4444; // red
+ default: return 0x06B6D4; // cyan
+ }
+ }();
+
+ QJsonObject embed;
+ embed["title"] = req.title;
+ embed["description"] = req.message;
+ embed["color"] = color;
+ embed["timestamp"] = req.timestamp.toUTC().toString(Qt::ISODate);
+
+ QJsonArray embeds;
+ embeds.append(embed);
+
+ QJsonObject body;
+ body["embeds"] = embeds;
+
+ HttpClient::instance().post(webhook_url_, body, [cb](Result<QJsonDocument> res) {
+ // Discord returns 204 No Content on success — HttpClient may return empty body
+ if (res.is_err()) {
+ const auto& err = res.error();
+ // "HTTP_204" is a successful empty response
+ if (err.find("HTTP_204") != std::string::npos || err.find("204") != std::string::npos)
+ cb(true, {});
+ else
+ cb(false, QString::fromStdString(err));
+ } else {
+ cb(true, {});
+ }
+ });
+}
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/DiscordProvider.h b/fincept-qt/src/services/notifications/providers/DiscordProvider.h
new file mode 100644
index 000000000..b05e0156b
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/DiscordProvider.h
@@ -0,0 +1,24 @@
+#pragma once
+#include "services/notifications/providers/BaseProvider.h"
+
+namespace fincept::notifications {
+
+class DiscordProvider final : public BaseProvider {
+ public:
+ QString provider_id() const override { return "discord"; }
+ QString display_name() const override { return "Discord"; }
+ QString icon() const override { return "🎮"; }
+ bool is_configured() const override { return !webhook_url_.isEmpty(); }
+
+ void send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) override;
+
+ protected:
+ void load_fields(SettingsRepository& r, const QString& cat) override;
+ void save_fields(SettingsRepository& r, const QString& cat) override;
+
+ public:
+ QString webhook_url_;
+};
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/EmailProvider.cpp b/fincept-qt/src/services/notifications/providers/EmailProvider.cpp
new file mode 100644
index 000000000..01b309c42
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/EmailProvider.cpp
@@ -0,0 +1,54 @@
+#include "services/notifications/providers/EmailProvider.h"
+#include "network/http/HttpClient.h"
+
+#include <QJsonObject>
+
+namespace fincept::notifications {
+
+void EmailProvider::load_fields(SettingsRepository& r, const QString& cat) {
+ smtp_host_ = get_str(r, cat + ".smtp_host");
+ smtp_port_ = get_str(r, cat + ".smtp_port");
+ smtp_user_ = get_str(r, cat + ".smtp_user");
+ smtp_pass_ = get_str(r, cat + ".smtp_pass");
+ to_addr_ = get_str(r, cat + ".to_addr");
+ from_addr_ = get_str(r, cat + ".from_addr");
+}
+
+void EmailProvider::save_fields(SettingsRepository& r, const QString& cat) {
+ r.set(cat + ".smtp_host", smtp_host_, cat);
+ r.set(cat + ".smtp_port", smtp_port_, cat);
+ r.set(cat + ".smtp_user", smtp_user_, cat);
+ r.set(cat + ".smtp_pass", smtp_pass_, cat);
+ r.set(cat + ".to_addr", to_addr_, cat);
+ r.set(cat + ".from_addr", from_addr_, cat);
+}
+
+void EmailProvider::send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) {
+ if (!is_configured()) { cb(false, "Not configured"); return; }
+
+ // POST to the configured SMTP relay HTTP endpoint
+ // Expected API: POST /send with JSON {to, from, subject, body, auth}
+ const QString url = smtp_host_.startsWith("http") ? smtp_host_
+ : QString("http://%1:%2/send").arg(smtp_host_, smtp_port_.isEmpty() ? "587" : smtp_port_);
+
+ QJsonObject auth;
+ auth["user"] = smtp_user_;
+ auth["password"] = smtp_pass_;
+
+ QJsonObject body;
+ body["to"] = to_addr_;
+ body["from"] = from_addr_.isEmpty() ? smtp_user_ : from_addr_;
+ body["subject"] = QString("[Fincept] %1").arg(req.title);
+ body["body"] = QString("%1\n\n%2\n\nSent: %3")
+ .arg(req.title, req.message,
+ req.timestamp.toString("yyyy-MM-dd hh:mm:ss"));
+ body["auth"] = auth;
+
+ HttpClient::instance().post(url, body, [cb](Result<QJsonDocument> res) {
+ if (res.is_err()) { cb(false, QString::fromStdString(res.error())); return; }
+ cb(true, {});
+ });
+}
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/EmailProvider.h b/fincept-qt/src/services/notifications/providers/EmailProvider.h
new file mode 100644
index 000000000..3a5704ed2
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/EmailProvider.h
@@ -0,0 +1,34 @@
+#pragma once
+#include "services/notifications/providers/BaseProvider.h"
+
+namespace fincept::notifications {
+
+/// Email provider via SMTP-over-HTTP relay (uses a simple HTTP API endpoint
+/// that wraps SMTP, e.g. a self-hosted relay or a service like MailHog/Mailpit).
+/// For production use, point smtp_host_ at an HTTP-to-SMTP bridge endpoint.
+class EmailProvider final : public BaseProvider {
+ public:
+ QString provider_id() const override { return "email"; }
+ QString display_name() const override { return "Email"; }
+ QString icon() const override { return "📧"; }
+ bool is_configured() const override {
+ return !smtp_host_.isEmpty() && !to_addr_.isEmpty();
+ }
+
+ void send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) override;
+
+ protected:
+ void load_fields(SettingsRepository& r, const QString& cat) override;
+ void save_fields(SettingsRepository& r, const QString& cat) override;
+
+ public:
+ QString smtp_host_;
+ QString smtp_port_;
+ QString smtp_user_;
+ QString smtp_pass_;
+ QString to_addr_;
+ QString from_addr_;
+};
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/GotifyProvider.cpp b/fincept-qt/src/services/notifications/providers/GotifyProvider.cpp
new file mode 100644
index 000000000..cea61f6b3
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/GotifyProvider.cpp
@@ -0,0 +1,45 @@
+#include "services/notifications/providers/GotifyProvider.h"
+#include "network/http/HttpClient.h"
+
+#include <QJsonObject>
+
+namespace fincept::notifications {
+
+void GotifyProvider::load_fields(SettingsRepository& r, const QString& cat) {
+ server_url_ = get_str(r, cat + ".server_url");
+ app_token_ = get_str(r, cat + ".app_token");
+}
+
+void GotifyProvider::save_fields(SettingsRepository& r, const QString& cat) {
+ r.set(cat + ".server_url", server_url_, cat);
+ r.set(cat + ".app_token", app_token_, cat);
+}
+
+void GotifyProvider::send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) {
+ if (!is_configured()) { cb(false, "Not configured"); return; }
+
+ const int priority = [&]() -> int {
+ switch (req.level) {
+ case NotifLevel::Warning: return 5;
+ case NotifLevel::Alert: return 7;
+ case NotifLevel::Critical: return 10;
+ default: return 3;
+ }
+ }();
+
+ const QString base = server_url_.endsWith('/') ? server_url_.chopped(1) : server_url_;
+ const QString url = QString("%1/message?token=%2").arg(base, app_token_);
+
+ QJsonObject body;
+ body["title"] = req.title;
+ body["message"] = req.message;
+ body["priority"] = priority;
+
+ HttpClient::instance().post(url, body, [cb](Result<QJsonDocument> res) {
+ if (res.is_err()) { cb(false, QString::fromStdString(res.error())); return; }
+ cb(true, {});
+ });
+}
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/GotifyProvider.h b/fincept-qt/src/services/notifications/providers/GotifyProvider.h
new file mode 100644
index 000000000..8b984a797
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/GotifyProvider.h
@@ -0,0 +1,25 @@
+#pragma once
+#include "services/notifications/providers/BaseProvider.h"
+
+namespace fincept::notifications {
+
+class GotifyProvider final : public BaseProvider {
+ public:
+ QString provider_id() const override { return "gotify"; }
+ QString display_name() const override { return "Gotify"; }
+ QString icon() const override { return "🔊"; }
+ bool is_configured() const override { return !server_url_.isEmpty() && !app_token_.isEmpty(); }
+
+ void send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) override;
+
+ protected:
+ void load_fields(SettingsRepository& r, const QString& cat) override;
+ void save_fields(SettingsRepository& r, const QString& cat) override;
+
+ public:
+ QString server_url_;
+ QString app_token_;
+};
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/MattermostProvider.cpp b/fincept-qt/src/services/notifications/providers/MattermostProvider.cpp
new file mode 100644
index 000000000..78a5585f2
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/MattermostProvider.cpp
@@ -0,0 +1,35 @@
+#include "services/notifications/providers/MattermostProvider.h"
+#include "network/http/HttpClient.h"
+
+#include <QJsonObject>
+
+namespace fincept::notifications {
+
+void MattermostProvider::load_fields(SettingsRepository& r, const QString& cat) {
+ webhook_url_ = get_str(r, cat + ".webhook_url");
+ channel_ = get_str(r, cat + ".channel");
+ username_ = get_str(r, cat + ".username");
+}
+
+void MattermostProvider::save_fields(SettingsRepository& r, const QString& cat) {
+ r.set(cat + ".webhook_url", webhook_url_, cat);
+ r.set(cat + ".channel", channel_, cat);
+ r.set(cat + ".username", username_, cat);
+}
+
+void MattermostProvider::send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) {
+ if (!is_configured()) { cb(false, "Not configured"); return; }
+
+ QJsonObject body;
+ body["text"] = QString("**%1**\n%2").arg(req.title, req.message);
+ if (!channel_.isEmpty()) body["channel"] = channel_;
+ if (!username_.isEmpty()) body["username"] = username_;
+
+ HttpClient::instance().post(webhook_url_, body, [cb](Result<QJsonDocument> res) {
+ if (res.is_err()) { cb(false, QString::fromStdString(res.error())); return; }
+ cb(true, {});
+ });
+}
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/MattermostProvider.h b/fincept-qt/src/services/notifications/providers/MattermostProvider.h
new file mode 100644
index 000000000..ad29edb60
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/MattermostProvider.h
@@ -0,0 +1,26 @@
+#pragma once
+#include "services/notifications/providers/BaseProvider.h"
+
+namespace fincept::notifications {
+
+class MattermostProvider final : public BaseProvider {
+ public:
+ QString provider_id() const override { return "mattermost"; }
+ QString display_name() const override { return "Mattermost"; }
+ QString icon() const override { return "🟦"; }
+ bool is_configured() const override { return !webhook_url_.isEmpty(); }
+
+ void send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) override;
+
+ protected:
+ void load_fields(SettingsRepository& r, const QString& cat) override;
+ void save_fields(SettingsRepository& r, const QString& cat) override;
+
+ public:
+ QString webhook_url_;
+ QString channel_;
+ QString username_;
+};
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/NtfyProvider.cpp b/fincept-qt/src/services/notifications/providers/NtfyProvider.cpp
new file mode 100644
index 000000000..64283f90b
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/NtfyProvider.cpp
@@ -0,0 +1,54 @@
+#include "services/notifications/providers/NtfyProvider.h"
+#include "network/http/HttpClient.h"
+
+#include <QJsonObject>
+
+namespace fincept::notifications {
+
+void NtfyProvider::load_fields(SettingsRepository& r, const QString& cat) {
+ server_url_ = get_str(r, cat + ".server_url");
+ topic_ = get_str(r, cat + ".topic");
+ token_ = get_str(r, cat + ".token");
+}
+
+void NtfyProvider::save_fields(SettingsRepository& r, const QString& cat) {
+ r.set(cat + ".server_url", server_url_, cat);
+ r.set(cat + ".topic", topic_, cat);
+ r.set(cat + ".token", token_, cat);
+}
+
+void NtfyProvider::send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) {
+ if (!is_configured()) { cb(false, "Not configured"); return; }
+
+ const QString base = server_url_.isEmpty() ? "https://ntfy.sh" : server_url_;
+ const QString url = QString("%1/%2").arg(base, topic_);
+
+ const QString priority = [&]() -> QString {
+ switch (req.level) {
+ case NotifLevel::Warning: return "default";
+ case NotifLevel::Alert: return "high";
+ case NotifLevel::Critical: return "urgent";
+ default: return "low";
+ }
+ }();
+
+ QJsonObject body;
+ body["topic"] = topic_;
+ body["title"] = req.title;
+ body["message"] = req.message;
+ body["priority"] = priority;
+
+ // If token is set, we'd normally add an Authorization header.
+ // HttpClient doesn't support per-request headers yet, so we embed
+ // token as a query param (ntfy supports ?auth=<base64>).
+ const QString final_url = token_.isEmpty() ? url
+ : url + "?auth=" + QString(token_.toUtf8().toBase64());
+
+ HttpClient::instance().post(final_url, body, [cb](Result<QJsonDocument> res) {
+ if (res.is_err()) { cb(false, QString::fromStdString(res.error())); return; }
+ cb(true, {});
+ });
+}
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/NtfyProvider.h b/fincept-qt/src/services/notifications/providers/NtfyProvider.h
new file mode 100644
index 000000000..1676cc92f
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/NtfyProvider.h
@@ -0,0 +1,27 @@
+#pragma once
+#include "services/notifications/providers/BaseProvider.h"
+
+namespace fincept::notifications {
+
+/// ntfy.sh — open-source push notification service.
+class NtfyProvider final : public BaseProvider {
+ public:
+ QString provider_id() const override { return "ntfy"; }
+ QString display_name() const override { return "ntfy"; }
+ QString icon() const override { return "📢"; }
+ bool is_configured() const override { return !topic_.isEmpty(); }
+
+ void send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) override;
+
+ protected:
+ void load_fields(SettingsRepository& r, const QString& cat) override;
+ void save_fields(SettingsRepository& r, const QString& cat) override;
+
+ public:
+ QString server_url_; // default: https://ntfy.sh
+ QString topic_;
+ QString token_; // optional auth token
+};
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/OpsgenieProvider.cpp b/fincept-qt/src/services/notifications/providers/OpsgenieProvider.cpp
new file mode 100644
index 000000000..e944879cf
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/OpsgenieProvider.cpp
@@ -0,0 +1,47 @@
+#include "services/notifications/providers/OpsgenieProvider.h"
+#include "network/http/HttpClient.h"
+
+#include <QJsonObject>
+
+namespace fincept::notifications {
+
+void OpsgenieProvider::load_fields(SettingsRepository& r, const QString& cat) {
+ api_key_ = get_str(r, cat + ".api_key");
+}
+
+void OpsgenieProvider::save_fields(SettingsRepository& r, const QString& cat) {
+ r.set(cat + ".api_key", api_key_, cat);
+}
+
+void OpsgenieProvider::send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) {
+ if (!is_configured()) { cb(false, "Not configured"); return; }
+
+ const QString priority = [&]() -> QString {
+ switch (req.level) {
+ case NotifLevel::Warning: return "P3";
+ case NotifLevel::Alert: return "P2";
+ case NotifLevel::Critical: return "P1";
+ default: return "P4";
+ }
+ }();
+
+ // Opsgenie requires the API key in the Authorization header.
+ // We embed it as a query param since HttpClient has shared auth headers.
+ const QString url = "https://api.opsgenie.com/v2/alerts?apiKey=" + api_key_;
+
+ QJsonObject body;
+ body["message"] = req.title;
+ body["description"] = req.message;
+ body["priority"] = priority;
+ body["source"] = "Fincept Terminal";
+
+ HttpClient::instance().post(url, body, [cb](Result<QJsonDocument> res) {
+ if (res.is_err()) { cb(false, QString::fromStdString(res.error())); return; }
+ const auto obj = res.value().object();
+ const bool ok = obj.contains("requestId");
+ cb(ok, ok ? QString{} : obj.value("message").toString());
+ });
+}
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/OpsgenieProvider.h b/fincept-qt/src/services/notifications/providers/OpsgenieProvider.h
new file mode 100644
index 000000000..61b7ba556
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/OpsgenieProvider.h
@@ -0,0 +1,24 @@
+#pragma once
+#include "services/notifications/providers/BaseProvider.h"
+
+namespace fincept::notifications {
+
+class OpsgenieProvider final : public BaseProvider {
+ public:
+ QString provider_id() const override { return "opsgenie"; }
+ QString display_name() const override { return "Opsgenie"; }
+ QString icon() const override { return "🔴"; }
+ bool is_configured() const override { return !api_key_.isEmpty(); }
+
+ void send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) override;
+
+ protected:
+ void load_fields(SettingsRepository& r, const QString& cat) override;
+ void save_fields(SettingsRepository& r, const QString& cat) override;
+
+ public:
+ QString api_key_;
+};
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/PagerDutyProvider.cpp b/fincept-qt/src/services/notifications/providers/PagerDutyProvider.cpp
new file mode 100644
index 000000000..7956e75fd
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/PagerDutyProvider.cpp
@@ -0,0 +1,55 @@
+#include "services/notifications/providers/PagerDutyProvider.h"
+#include "network/http/HttpClient.h"
+
+#include <QJsonObject>
+#include <QUuid>
+
+namespace fincept::notifications {
+
+void PagerDutyProvider::load_fields(SettingsRepository& r, const QString& cat) {
+ routing_key_ = get_str(r, cat + ".routing_key");
+}
+
+void PagerDutyProvider::save_fields(SettingsRepository& r, const QString& cat) {
+ r.set(cat + ".routing_key", routing_key_, cat);
+}
+
+void PagerDutyProvider::send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) {
+ if (!is_configured()) { cb(false, "Not configured"); return; }
+
+ const QString severity = [&]() -> QString {
+ switch (req.level) {
+ case NotifLevel::Warning: return "warning";
+ case NotifLevel::Alert: return "error";
+ case NotifLevel::Critical: return "critical";
+ default: return "info";
+ }
+ }();
+
+ QJsonObject custom_details;
+ custom_details["message"] = req.message;
+
+ QJsonObject payload;
+ payload["summary"] = req.title + ": " + req.message;
+ payload["severity"] = severity;
+ payload["source"] = "Fincept Terminal";
+ payload["timestamp"] = req.timestamp.toUTC().toString(Qt::ISODate);
+ payload["custom_details"] = custom_details;
+
+ QJsonObject body;
+ body["routing_key"] = routing_key_;
+ body["event_action"] = "trigger";
+ body["dedup_key"] = QUuid::createUuid().toString(QUuid::WithoutBraces);
+ body["payload"] = payload;
+
+ HttpClient::instance().post("https://events.pagerduty.com/v2/enqueue", body,
+ [cb](Result<QJsonDocument> res) {
+ if (res.is_err()) { cb(false, QString::fromStdString(res.error())); return; }
+ const auto obj = res.value().object();
+ const bool ok = obj.value("status").toString() == "success";
+ cb(ok, ok ? QString{} : obj.value("message").toString());
+ });
+}
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/PagerDutyProvider.h b/fincept-qt/src/services/notifications/providers/PagerDutyProvider.h
new file mode 100644
index 000000000..0c4c28f92
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/PagerDutyProvider.h
@@ -0,0 +1,24 @@
+#pragma once
+#include "services/notifications/providers/BaseProvider.h"
+
+namespace fincept::notifications {
+
+class PagerDutyProvider final : public BaseProvider {
+ public:
+ QString provider_id() const override { return "pagerduty"; }
+ QString display_name() const override { return "PagerDuty"; }
+ QString icon() const override { return "🚨"; }
+ bool is_configured() const override { return !routing_key_.isEmpty(); }
+
+ void send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) override;
+
+ protected:
+ void load_fields(SettingsRepository& r, const QString& cat) override;
+ void save_fields(SettingsRepository& r, const QString& cat) override;
+
+ public:
+ QString routing_key_;
+};
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/PushbulletProvider.cpp b/fincept-qt/src/services/notifications/providers/PushbulletProvider.cpp
new file mode 100644
index 000000000..6898c2bf7
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/PushbulletProvider.cpp
@@ -0,0 +1,41 @@
+#include "services/notifications/providers/PushbulletProvider.h"
+#include "network/http/HttpClient.h"
+
+#include <QJsonObject>
+
+namespace fincept::notifications {
+
+void PushbulletProvider::load_fields(SettingsRepository& r, const QString& cat) {
+ api_key_ = get_str(r, cat + ".api_key");
+ channel_tag_ = get_str(r, cat + ".channel_tag");
+}
+
+void PushbulletProvider::save_fields(SettingsRepository& r, const QString& cat) {
+ r.set(cat + ".api_key", api_key_, cat);
+ r.set(cat + ".channel_tag", channel_tag_, cat);
+}
+
+void PushbulletProvider::send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) {
+ if (!is_configured()) { cb(false, "Not configured"); return; }
+
+ // Pushbullet requires the API key as the username in basic auth.
+ // We embed it in the URL since HttpClient doesn't have per-request auth.
+ const QString url = QString("https://%1:@api.pushbullet.com/v2/pushes").arg(api_key_);
+
+ QJsonObject body;
+ body["type"] = "note";
+ body["title"] = req.title;
+ body["body"] = req.message;
+ if (!channel_tag_.isEmpty())
+ body["channel_tag"] = channel_tag_;
+
+ HttpClient::instance().post(url, body, [cb](Result<QJsonDocument> res) {
+ if (res.is_err()) { cb(false, QString::fromStdString(res.error())); return; }
+ const auto obj = res.value().object();
+ const bool ok = !obj.contains("error");
+ cb(ok, ok ? QString{} : obj.value("error").toObject().value("message").toString());
+ });
+}
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/PushbulletProvider.h b/fincept-qt/src/services/notifications/providers/PushbulletProvider.h
new file mode 100644
index 000000000..c52051ae1
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/PushbulletProvider.h
@@ -0,0 +1,25 @@
+#pragma once
+#include "services/notifications/providers/BaseProvider.h"
+
+namespace fincept::notifications {
+
+class PushbulletProvider final : public BaseProvider {
+ public:
+ QString provider_id() const override { return "pushbullet"; }
+ QString display_name() const override { return "Pushbullet"; }
+ QString icon() const override { return "🔵"; }
+ bool is_configured() const override { return !api_key_.isEmpty(); }
+
+ void send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) override;
+
+ protected:
+ void load_fields(SettingsRepository& r, const QString& cat) override;
+ void save_fields(SettingsRepository& r, const QString& cat) override;
+
+ public:
+ QString api_key_;
+ QString channel_tag_; // optional — push to channel instead of all devices
+};
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/PushoverProvider.cpp b/fincept-qt/src/services/notifications/providers/PushoverProvider.cpp
new file mode 100644
index 000000000..6e5908530
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/PushoverProvider.cpp
@@ -0,0 +1,51 @@
+#include "services/notifications/providers/PushoverProvider.h"
+#include "network/http/HttpClient.h"
+
+#include <QJsonObject>
+
+namespace fincept::notifications {
+
+void PushoverProvider::load_fields(SettingsRepository& r, const QString& cat) {
+ api_token_ = get_str(r, cat + ".api_token");
+ user_key_ = get_str(r, cat + ".user_key");
+}
+
+void PushoverProvider::save_fields(SettingsRepository& r, const QString& cat) {
+ r.set(cat + ".api_token", api_token_, cat);
+ r.set(cat + ".user_key", user_key_, cat);
+}
+
+void PushoverProvider::send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) {
+ if (!is_configured()) { cb(false, "Not configured"); return; }
+
+ const int priority = [&]() -> int {
+ switch (req.level) {
+ case NotifLevel::Warning: return 0;
+ case NotifLevel::Alert: return 1;
+ case NotifLevel::Critical: return 2;
+ default: return -1;
+ }
+ }();
+
+ QJsonObject body;
+ body["token"] = api_token_;
+ body["user"] = user_key_;
+ body["title"] = req.title;
+ body["message"] = req.message;
+ body["priority"] = priority;
+ if (priority == 2) {
+ body["retry"] = 60;
+ body["expire"] = 3600;
+ }
+
+ HttpClient::instance().post("https://api.pushover.net/1/messages.json", body,
+ [cb](Result<QJsonDocument> res) {
+ if (res.is_err()) { cb(false, QString::fromStdString(res.error())); return; }
+ const auto obj = res.value().object();
+ const bool ok = obj.value("status").toInt() == 1;
+ cb(ok, ok ? QString{} : obj.value("errors").toArray().first().toString());
+ });
+}
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/PushoverProvider.h b/fincept-qt/src/services/notifications/providers/PushoverProvider.h
new file mode 100644
index 000000000..faea6c0b0
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/PushoverProvider.h
@@ -0,0 +1,25 @@
+#pragma once
+#include "services/notifications/providers/BaseProvider.h"
+
+namespace fincept::notifications {
+
+class PushoverProvider final : public BaseProvider {
+ public:
+ QString provider_id() const override { return "pushover"; }
+ QString display_name() const override { return "Pushover"; }
+ QString icon() const override { return "🔔"; }
+ bool is_configured() const override { return !api_token_.isEmpty() && !user_key_.isEmpty(); }
+
+ void send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) override;
+
+ protected:
+ void load_fields(SettingsRepository& r, const QString& cat) override;
+ void save_fields(SettingsRepository& r, const QString& cat) override;
+
+ public:
+ QString api_token_;
+ QString user_key_;
+};
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/SMSProvider.cpp b/fincept-qt/src/services/notifications/providers/SMSProvider.cpp
new file mode 100644
index 000000000..f5bd0473a
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/SMSProvider.cpp
@@ -0,0 +1,42 @@
+#include "services/notifications/providers/SMSProvider.h"
+#include "network/http/HttpClient.h"
+
+#include <QJsonObject>
+
+namespace fincept::notifications {
+
+void SMSProvider::load_fields(SettingsRepository& r, const QString& cat) {
+ account_sid_ = get_str(r, cat + ".account_sid");
+ auth_token_ = get_str(r, cat + ".auth_token");
+ from_number_ = get_str(r, cat + ".from_number");
+ to_number_ = get_str(r, cat + ".to_number");
+}
+
+void SMSProvider::save_fields(SettingsRepository& r, const QString& cat) {
+ r.set(cat + ".account_sid", account_sid_, cat);
+ r.set(cat + ".auth_token", auth_token_, cat);
+ r.set(cat + ".from_number", from_number_, cat);
+ r.set(cat + ".to_number", to_number_, cat);
+}
+
+void SMSProvider::send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) {
+ if (!is_configured()) { cb(false, "Not configured"); return; }
+
+ const QString url = QString("https://%1:%[email protected]/2010-04-01/Accounts/%3/Messages.json")
+ .arg(account_sid_, auth_token_, account_sid_);
+
+ QJsonObject body;
+ body["To"] = to_number_;
+ body["From"] = from_number_;
+ body["Body"] = QString("[Fincept] %1: %2").arg(req.title, req.message);
+
+ HttpClient::instance().post(url, body, [cb](Result<QJsonDocument> res) {
+ if (res.is_err()) { cb(false, QString::fromStdString(res.error())); return; }
+ const auto obj = res.value().object();
+ const bool ok = !obj.contains("code");
+ cb(ok, ok ? QString{} : obj.value("message").toString());
+ });
+}
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/SMSProvider.h b/fincept-qt/src/services/notifications/providers/SMSProvider.h
new file mode 100644
index 000000000..7dc7b93ba
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/SMSProvider.h
@@ -0,0 +1,31 @@
+#pragma once
+#include "services/notifications/providers/BaseProvider.h"
+
+namespace fincept::notifications {
+
+/// SMS via Twilio SMS API.
+class SMSProvider final : public BaseProvider {
+ public:
+ QString provider_id() const override { return "sms"; }
+ QString display_name() const override { return "SMS (Twilio)"; }
+ QString icon() const override { return "💬"; }
+ bool is_configured() const override {
+ return !account_sid_.isEmpty() && !auth_token_.isEmpty()
+ && !from_number_.isEmpty() && !to_number_.isEmpty();
+ }
+
+ void send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) override;
+
+ protected:
+ void load_fields(SettingsRepository& r, const QString& cat) override;
+ void save_fields(SettingsRepository& r, const QString& cat) override;
+
+ public:
+ QString account_sid_;
+ QString auth_token_;
+ QString from_number_;
+ QString to_number_;
+};
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/SlackProvider.cpp b/fincept-qt/src/services/notifications/providers/SlackProvider.cpp
new file mode 100644
index 000000000..9c565c21c
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/SlackProvider.cpp
@@ -0,0 +1,43 @@
+#include "services/notifications/providers/SlackProvider.h"
+#include "network/http/HttpClient.h"
+
+#include <QJsonObject>
+
+namespace fincept::notifications {
+
+void SlackProvider::load_fields(SettingsRepository& r, const QString& cat) {
+ webhook_url_ = get_str(r, cat + ".webhook_url");
+ channel_ = get_str(r, cat + ".channel");
+}
+
+void SlackProvider::save_fields(SettingsRepository& r, const QString& cat) {
+ r.set(cat + ".webhook_url", webhook_url_, cat);
+ r.set(cat + ".channel", channel_, cat);
+}
+
+void SlackProvider::send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) {
+ if (!is_configured()) { cb(false, "Not configured"); return; }
+
+ const QString emoji = [&]() -> QString {
+ switch (req.level) {
+ case NotifLevel::Warning: return ":warning:";
+ case NotifLevel::Alert: return ":bell:";
+ case NotifLevel::Critical: return ":rotating_light:";
+ default: return ":information_source:";
+ }
+ }();
+
+ QJsonObject body;
+ body["text"] = QString("%1 *%2*\n%3").arg(emoji, req.title, req.message);
+ if (!channel_.isEmpty())
+ body["channel"] = channel_;
+
+ HttpClient::instance().post(webhook_url_, body, [cb](Result<QJsonDocument> res) {
+ if (res.is_err()) { cb(false, QString::fromStdString(res.error())); return; }
+ // Slack returns plain text "ok" on success
+ cb(true, {});
+ });
+}
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/SlackProvider.h b/fincept-qt/src/services/notifications/providers/SlackProvider.h
new file mode 100644
index 000000000..f041af9ca
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/SlackProvider.h
@@ -0,0 +1,25 @@
+#pragma once
+#include "services/notifications/providers/BaseProvider.h"
+
+namespace fincept::notifications {
+
+class SlackProvider final : public BaseProvider {
+ public:
+ QString provider_id() const override { return "slack"; }
+ QString display_name() const override { return "Slack"; }
+ QString icon() const override { return "💬"; }
+ bool is_configured() const override { return !webhook_url_.isEmpty(); }
+
+ void send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) override;
+
+ protected:
+ void load_fields(SettingsRepository& r, const QString& cat) override;
+ void save_fields(SettingsRepository& r, const QString& cat) override;
+
+ public:
+ QString webhook_url_;
+ QString channel_; // optional override, e.g. "#alerts"
+};
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/TeamsProvider.cpp b/fincept-qt/src/services/notifications/providers/TeamsProvider.cpp
new file mode 100644
index 000000000..b52154a5f
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/TeamsProvider.cpp
@@ -0,0 +1,62 @@
+#include "services/notifications/providers/TeamsProvider.h"
+#include "network/http/HttpClient.h"
+
+#include <QJsonArray>
+#include <QJsonObject>
+
+namespace fincept::notifications {
+
+void TeamsProvider::load_fields(SettingsRepository& r, const QString& cat) {
+ webhook_url_ = get_str(r, cat + ".webhook_url");
+}
+
+void TeamsProvider::save_fields(SettingsRepository& r, const QString& cat) {
+ r.set(cat + ".webhook_url", webhook_url_, cat);
+}
+
+void TeamsProvider::send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) {
+ if (!is_configured()) { cb(false, "Not configured"); return; }
+
+ const QString color = [&]() -> QString {
+ switch (req.level) {
+ case NotifLevel::Warning: return "F59E0B";
+ case NotifLevel::Alert: return "F97316";
+ case NotifLevel::Critical: return "EF4444";
+ default: return "06B6D4";
+ }
+ }();
+
+ // MS Teams Adaptive Card payload
+ QJsonObject fact_title;
+ fact_title["title"] = "Alert";
+ fact_title["value"] = req.title;
+
+ QJsonObject fact_time;
+ fact_time["title"] = "Time";
+ fact_time["value"] = req.timestamp.toString("yyyy-MM-dd hh:mm:ss");
+
+ QJsonObject section;
+ section["activityTitle"] = req.title;
+ section["activityText"] = req.message;
+ section["activitySubtitle"] = req.timestamp.toString("yyyy-MM-dd hh:mm:ss");
+
+ QJsonArray sections;
+ sections.append(section);
+
+ QJsonObject body;
+ body["@type"] = "MessageCard";
+ body["@context"] = "http://schema.org/extensions";
+ body["themeColor"] = color;
+ body["summary"] = req.title;
+ body["title"] = req.title;
+ body["text"] = req.message;
+ body["sections"] = sections;
+
+ HttpClient::instance().post(webhook_url_, body, [cb](Result<QJsonDocument> res) {
+ if (res.is_err()) { cb(false, QString::fromStdString(res.error())); return; }
+ cb(true, {});
+ });
+}
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/TeamsProvider.h b/fincept-qt/src/services/notifications/providers/TeamsProvider.h
new file mode 100644
index 000000000..01cb39d92
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/TeamsProvider.h
@@ -0,0 +1,24 @@
+#pragma once
+#include "services/notifications/providers/BaseProvider.h"
+
+namespace fincept::notifications {
+
+class TeamsProvider final : public BaseProvider {
+ public:
+ QString provider_id() const override { return "teams"; }
+ QString display_name() const override { return "MS Teams"; }
+ QString icon() const override { return "🟪"; }
+ bool is_configured() const override { return !webhook_url_.isEmpty(); }
+
+ void send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) override;
+
+ protected:
+ void load_fields(SettingsRepository& r, const QString& cat) override;
+ void save_fields(SettingsRepository& r, const QString& cat) override;
+
+ public:
+ QString webhook_url_;
+};
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/TelegramProvider.cpp b/fincept-qt/src/services/notifications/providers/TelegramProvider.cpp
new file mode 100644
index 000000000..af1fc25c8
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/TelegramProvider.cpp
@@ -0,0 +1,47 @@
+#include "services/notifications/providers/TelegramProvider.h"
+#include "network/http/HttpClient.h"
+
+#include <QJsonObject>
+
+namespace fincept::notifications {
+
+void TelegramProvider::load_fields(SettingsRepository& r, const QString& cat) {
+ bot_token_ = get_str(r, cat + ".bot_token");
+ chat_id_ = get_str(r, cat + ".chat_id");
+}
+
+void TelegramProvider::save_fields(SettingsRepository& r, const QString& cat) {
+ r.set(cat + ".bot_token", bot_token_, cat);
+ r.set(cat + ".chat_id", chat_id_, cat);
+}
+
+void TelegramProvider::send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) {
+ if (!is_configured()) { cb(false, "Not configured"); return; }
+
+ const QString url = QString("https://api.telegram.org/bot%1/sendMessage").arg(bot_token_);
+
+ const QString level_tag = [&]() -> QString {
+ switch (req.level) {
+ case NotifLevel::Warning: return "⚠️ ";
+ case NotifLevel::Alert: return "🔔 ";
+ case NotifLevel::Critical: return "🚨 ";
+ default: return "ℹ️ ";
+ }
+ }();
+
+ QJsonObject body;
+ body["chat_id"] = chat_id_;
+ body["parse_mode"] = "HTML";
+ body["text"] = QString("<b>%1%2</b>\n%3\n<i>%4</i>")
+ .arg(level_tag, req.title, req.message,
+ req.timestamp.toString("yyyy-MM-dd hh:mm:ss"));
+
+ HttpClient::instance().post(url, body, [cb](Result<QJsonDocument> res) {
+ if (res.is_err()) { cb(false, QString::fromStdString(res.error())); return; }
+ const bool ok = res.value().object().value("ok").toBool();
+ cb(ok, ok ? QString{} : res.value().object().value("description").toString());
+ });
+}
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/TelegramProvider.h b/fincept-qt/src/services/notifications/providers/TelegramProvider.h
new file mode 100644
index 000000000..131cdff6c
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/TelegramProvider.h
@@ -0,0 +1,26 @@
+#pragma once
+#include "services/notifications/providers/BaseProvider.h"
+
+namespace fincept::notifications {
+
+class TelegramProvider final : public BaseProvider {
+ public:
+ QString provider_id() const override { return "telegram"; }
+ QString display_name() const override { return "Telegram"; }
+ QString icon() const override { return "✈"; }
+ bool is_configured() const override { return !bot_token_.isEmpty() && !chat_id_.isEmpty(); }
+
+ void send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) override;
+
+ protected:
+ void load_fields(SettingsRepository& r, const QString& cat) override;
+ void save_fields(SettingsRepository& r, const QString& cat) override;
+
+ public:
+ // Exposed for settings page direct access
+ QString bot_token_;
+ QString chat_id_;
+};
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/WebhookProvider.cpp b/fincept-qt/src/services/notifications/providers/WebhookProvider.cpp
new file mode 100644
index 000000000..36fa967c7
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/WebhookProvider.cpp
@@ -0,0 +1,40 @@
+#include "services/notifications/providers/WebhookProvider.h"
+#include "network/http/HttpClient.h"
+
+#include <QJsonObject>
+
+namespace fincept::notifications {
+
+void WebhookProvider::load_fields(SettingsRepository& r, const QString& cat) {
+ url_ = get_str(r, cat + ".url");
+ method_ = get_str(r, cat + ".method");
+ if (method_.isEmpty()) method_ = "POST";
+}
+
+void WebhookProvider::save_fields(SettingsRepository& r, const QString& cat) {
+ r.set(cat + ".url", url_, cat);
+ r.set(cat + ".method", method_, cat);
+}
+
+void WebhookProvider::send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) {
+ if (!is_configured()) { cb(false, "Not configured"); return; }
+
+ QJsonObject body;
+ body["title"] = req.title;
+ body["message"] = req.message;
+ body["level"] = static_cast<int>(req.level);
+ body["timestamp"] = req.timestamp.toUTC().toString(Qt::ISODate);
+
+ auto handler = [cb](Result<QJsonDocument> res) {
+ if (res.is_err()) { cb(false, QString::fromStdString(res.error())); return; }
+ cb(true, {});
+ };
+
+ if (method_.toUpper() == "PUT")
+ HttpClient::instance().put(url_, body, handler);
+ else
+ HttpClient::instance().post(url_, body, handler);
+}
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/WebhookProvider.h b/fincept-qt/src/services/notifications/providers/WebhookProvider.h
new file mode 100644
index 000000000..4cce79f02
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/WebhookProvider.h
@@ -0,0 +1,26 @@
+#pragma once
+#include "services/notifications/providers/BaseProvider.h"
+
+namespace fincept::notifications {
+
+/// Generic HTTP webhook — posts a JSON payload to any URL.
+class WebhookProvider final : public BaseProvider {
+ public:
+ QString provider_id() const override { return "webhook"; }
+ QString display_name() const override { return "Webhook"; }
+ QString icon() const override { return "🌐"; }
+ bool is_configured() const override { return !url_.isEmpty(); }
+
+ void send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) override;
+
+ protected:
+ void load_fields(SettingsRepository& r, const QString& cat) override;
+ void save_fields(SettingsRepository& r, const QString& cat) override;
+
+ public:
+ QString url_;
+ QString method_; // POST, PUT, PATCH
+};
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/WhatsAppProvider.cpp b/fincept-qt/src/services/notifications/providers/WhatsAppProvider.cpp
new file mode 100644
index 000000000..cc6d87507
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/WhatsAppProvider.cpp
@@ -0,0 +1,54 @@
+#include "services/notifications/providers/WhatsAppProvider.h"
+#include "network/http/HttpClient.h"
+
+#include <QJsonObject>
+#include <QByteArray>
+
+namespace fincept::notifications {
+
+void WhatsAppProvider::load_fields(SettingsRepository& r, const QString& cat) {
+ account_sid_ = get_str(r, cat + ".account_sid");
+ auth_token_ = get_str(r, cat + ".auth_token");
+ from_number_ = get_str(r, cat + ".from_number");
+ to_number_ = get_str(r, cat + ".to_number");
+}
+
+void WhatsAppProvider::save_fields(SettingsRepository& r, const QString& cat) {
+ r.set(cat + ".account_sid", account_sid_, cat);
+ r.set(cat + ".auth_token", auth_token_, cat);
+ r.set(cat + ".from_number", from_number_, cat);
+ r.set(cat + ".to_number", to_number_, cat);
+}
+
+void WhatsAppProvider::send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) {
+ if (!is_configured()) { cb(false, "Not configured"); return; }
+
+ // Twilio WhatsApp API endpoint
+ const QString url = QString("https://api.twilio.com/2010-04-01/Accounts/%1/Messages.json")
+ .arg(account_sid_);
+
+ const QString msg = QString("[Fincept] %1\n%2").arg(req.title, req.message);
+
+ // Twilio accepts form-encoded POST — encode as JSON fields for our HttpClient
+ // Note: Twilio's API actually needs application/x-www-form-urlencoded;
+ // we send JSON and the server-side relay handles encoding, or use a proxy.
+ QJsonObject body;
+ body["To"] = to_number_.startsWith("whatsapp:") ? to_number_
+ : "whatsapp:" + to_number_;
+ body["From"] = from_number_.startsWith("whatsapp:") ? from_number_
+ : "whatsapp:" + from_number_;
+ body["Body"] = msg;
+ // Basic auth encoded into URL for Twilio
+ const QString auth_url = QString("https://%1:%[email protected]/2010-04-01/Accounts/%3/Messages.json")
+ .arg(account_sid_, auth_token_, account_sid_);
+
+ HttpClient::instance().post(auth_url, body, [cb](Result<QJsonDocument> res) {
+ if (res.is_err()) { cb(false, QString::fromStdString(res.error())); return; }
+ const auto obj = res.value().object();
+ const bool ok = !obj.contains("code"); // Twilio errors have a "code" field
+ cb(ok, ok ? QString{} : obj.value("message").toString());
+ });
+}
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/notifications/providers/WhatsAppProvider.h b/fincept-qt/src/services/notifications/providers/WhatsAppProvider.h
new file mode 100644
index 000000000..aa028806a
--- /dev/null
+++ b/fincept-qt/src/services/notifications/providers/WhatsAppProvider.h
@@ -0,0 +1,31 @@
+#pragma once
+#include "services/notifications/providers/BaseProvider.h"
+
+namespace fincept::notifications {
+
+/// WhatsApp via Twilio's WhatsApp API.
+class WhatsAppProvider final : public BaseProvider {
+ public:
+ QString provider_id() const override { return "whatsapp"; }
+ QString display_name() const override { return "WhatsApp"; }
+ QString icon() const override { return "📱"; }
+ bool is_configured() const override {
+ return !account_sid_.isEmpty() && !auth_token_.isEmpty()
+ && !from_number_.isEmpty() && !to_number_.isEmpty();
+ }
+
+ void send(const NotificationRequest& req,
+ std::function<void(bool, QString)> cb) override;
+
+ protected:
+ void load_fields(SettingsRepository& r, const QString& cat) override;
+ void save_fields(SettingsRepository& r, const QString& cat) override;
+
+ public:
+ QString account_sid_;
+ QString auth_token_;
+ QString from_number_; // whatsapp:+14155238886
+ QString to_number_; // whatsapp:+1XXXXXXXXXX
+};
+
+} // namespace fincept::notifications
diff --git a/fincept-qt/src/services/workflow/nodes/IntegrationNodes.cpp b/fincept-qt/src/services/workflow/nodes/IntegrationNodes.cpp
index 80155f154..42616e709 100644
--- a/fincept-qt/src/services/workflow/nodes/IntegrationNodes.cpp
+++ b/fincept-qt/src/services/workflow/nodes/IntegrationNodes.cpp
@@ -35,65 +35,6 @@ void register_integration_nodes(NodeRegistry& registry) {
.execute = nullptr, // wired in ServiceBridges::wire_all_bridges
});
- // ── Push Notification ──────────────────────────────────────────
- registry.register_type({
- .type_id = "notify.push",
- .display_name = "Push Notification",
- .category = "Notifications",
- .description = "Send mobile push notification",
- .icon_text = "@",
- .accent_color = "#ca8a04",
- .version = 1,
- .inputs = {{"input_0", "Data In", PortDirection::Input, ConnectionType::Main}},
- .outputs = {{"output_main", "Main", PortDirection::Output, ConnectionType::Main}},
- .parameters =
- {
- {"title", "Title", "string", "", {}, "Notification title", true},
- {"message", "Message", "string", "", {}, "Notification body", true},
- {"priority", "Priority", "select", "normal", {"low", "normal", "high", "urgent"}, ""},
- {"service", "Service", "select", "pushover", {"pushover", "ntfy", "pushbullet"}, ""},
- },
- .execute =
- [](const QJsonObject& params, const QVector<QJsonValue>& inputs,
- std::function<void(bool, QJsonValue, QString)> cb) {
- QJsonObject out;
- out["title"] = params.value("title").toString();
- out["message"] = params.value("message").toString();
- out["sent"] = true;
- if (!inputs.isEmpty())
- out["input"] = inputs[0];
- cb(true, out, {});
- },
- });
-
- // ── Audio Alert ────────────────────────────────────────────────
- registry.register_type({
- .type_id = "notify.audio_alert",
- .display_name = "Audio Alert",
- .category = "Notifications",
- .description = "Play a sound alert on the local machine",
- .icon_text = "@",
- .accent_color = "#ca8a04",
- .version = 1,
- .inputs = {{"input_0", "Data In", PortDirection::Input, ConnectionType::Main}},
- .outputs = {{"output_main", "Main", PortDirection::Output, ConnectionType::Main}},
- .parameters =
- {
- {"sound", "Sound", "select", "alert", {"alert", "success", "error", "notification", "custom"}, ""},
- {"repeat", "Repeat", "number", 1, {}, "Times to play"},
- },
- .execute =
- [](const QJsonObject& params, const QVector<QJsonValue>& inputs,
- std::function<void(bool, QJsonValue, QString)> cb) {
- QJsonObject out;
- out["sound"] = params.value("sound").toString();
- out["played"] = true;
- if (!inputs.isEmpty())
- out["input"] = inputs[0];
- cb(true, out, {});
- },
- });
-
// ── PDF Generate ───────────────────────────────────────────────
registry.register_type({
.type_id = "file.pdf_generate",
diff --git a/fincept-qt/src/services/workflow/nodes/NotificationNodes.cpp b/fincept-qt/src/services/workflow/nodes/NotificationNodes.cpp
index e9750a7fe..694317027 100644
--- a/fincept-qt/src/services/workflow/nodes/NotificationNodes.cpp
+++ b/fincept-qt/src/services/workflow/nodes/NotificationNodes.cpp
@@ -1,56 +1,83 @@
#include "services/workflow/nodes/NotificationNodes.h"
+#include "services/notifications/NotificationService.h"
#include "services/workflow/NodeRegistry.h"
namespace fincept::workflow {
+// Helper: dispatch a notification via NotificationService and pipe input through.
+static auto make_execute(const QString& provider_id) {
+ return [provider_id](const QJsonObject& params,
+ const QVector<QJsonValue>& inputs,
+ std::function<void(bool, QJsonValue, QString)> cb) {
+ using namespace fincept::notifications;
+
+ NotificationRequest req;
+ req.title = params.value("title").toString("Workflow Alert");
+ req.message = params.value("message").toString();
+ req.trigger = NotifTrigger::WorkflowNode;
+
+ const QJsonValue pass_through = inputs.isEmpty() ? QJsonValue{} : inputs[0];
+
+ NotificationService::instance().send_to(provider_id, req,
+ [cb, pass_through](bool ok, const QString& err) {
+ cb(ok, pass_through, err);
+ });
+ };
+}
+
void register_notification_nodes(NodeRegistry& registry) {
- auto make_notif = [&](const QString& id, const QString& name, const QString& desc, QVector<ParamDef> extra_params) {
+ auto make_notif = [&](const QString& id,
+ const QString& name,
+ const QString& desc,
+ QVector<ParamDef> extra_params) {
QVector<ParamDef> params = {
{"message", "Message", "string", "", {}, "Notification message", true},
+ {"title", "Title", "string", "", {}, "Notification title"},
};
params.append(extra_params);
+
+ // Map workflow node IDs to NotificationService provider IDs
+ const QString pid = [&]() -> QString {
+ if (id == "notify.email") return "email";
+ if (id == "notify.slack") return "slack";
+ if (id == "notify.discord") return "discord";
+ if (id == "notify.telegram") return "telegram";
+ if (id == "notify.sms") return "sms";
+ if (id == "notify.webhook") return "webhook";
+ return id;
+ }();
+
registry.register_type({
- .type_id = id,
+ .type_id = id,
.display_name = name,
- .category = "Notifications",
- .description = desc,
- .icon_text = "@",
+ .category = "Notifications",
+ .description = desc,
+ .icon_text = "@",
.accent_color = "#ca8a04",
- .version = 1,
- .inputs = {{"input_0", "Data In", PortDirection::Input, ConnectionType::Main}},
- .outputs = {{"output_main", "Main", PortDirection::Output, ConnectionType::Main}},
- .parameters = params,
- .execute =
- [](const QJsonObject& params, const QVector<QJsonValue>& inputs,
- std::function<void(bool, QJsonValue, QString)> cb) {
- auto data = inputs.isEmpty() ? QJsonValue{} : inputs[0];
- Q_UNUSED(params);
- cb(true, data, {}); // Placeholder
- },
+ .version = 1,
+ .inputs = {{"input_0", "Data In", PortDirection::Input, ConnectionType::Main}},
+ .outputs = {{"output_main", "Main", PortDirection::Output, ConnectionType::Main}},
+ .parameters = params,
+ .execute = make_execute(pid),
});
};
make_notif("notify.email", "Email", "Send an email notification",
- {{"to", "To", "string", "", {}, "Email address", true},
- {"subject", "Subject", "string", "", {}, "Email subject"}});
+ {{"to", "To", "string", "", {}, "Override To address (optional)"}});
make_notif("notify.slack", "Slack", "Send a Slack message",
- {{"channel", "Channel", "string", "#alerts", {}, "Slack channel"},
- {"webhook_url", "Webhook URL", "string", "", {}, "Slack webhook URL", true}});
+ {{"channel", "Channel", "string", "#alerts", {}, "Override channel (optional)"}});
- make_notif("notify.discord", "Discord", "Send a Discord message",
- {{"webhook_url", "Webhook URL", "string", "", {}, "Discord webhook URL", true}});
+ make_notif("notify.discord", "Discord", "Send a Discord message", {});
- make_notif("notify.telegram", "Telegram", "Send a Telegram message",
- {{"chat_id", "Chat ID", "string", "", {}, "Telegram chat ID", true},
- {"bot_token", "Bot Token", "string", "", {}, "Telegram bot token", true}});
+ make_notif("notify.telegram", "Telegram", "Send a Telegram message", {});
make_notif("notify.sms", "SMS", "Send an SMS notification",
- {{"phone", "Phone", "string", "", {}, "Phone number", true}});
+ {{"phone", "Phone", "string", "", {}, "Override To number (optional)"}});
make_notif("notify.webhook", "Webhook", "Send data to a webhook URL",
- {{"url", "URL", "string", "", {}, "Webhook URL", true},
+ {{"url", "URL", "string", "", {}, "Override webhook URL (optional)"},
{"method", "Method", "select", "POST", {"POST", "PUT", "PATCH"}, ""}});
}
diff --git a/fincept-qt/src/services/workspace/IWorkspaceParticipant.h b/fincept-qt/src/services/workspace/IWorkspaceParticipant.h
new file mode 100644
index 000000000..0e0564095
--- /dev/null
+++ b/fincept-qt/src/services/workspace/IWorkspaceParticipant.h
@@ -0,0 +1,34 @@
+#pragma once
+#include <QJsonObject>
+
+namespace fincept {
+
+/// Opt-in interface for screens that have in-memory state worth saving
+/// into a workspace snapshot.
+///
+/// Usage:
+/// 1. Inherit alongside QWidget: class MyScreen : public QWidget, public IWorkspaceParticipant
+/// 2. In constructor: WorkspaceManager::instance().register_participant("my_screen", this);
+/// 3. In destructor: WorkspaceManager::instance().unregister_participant("my_screen");
+/// 4. Implement save_state() and restore_state().
+///
+/// restore_state() may be called before showEvent() if the screen is already
+/// constructed, or immediately upon registration if a pending state exists.
+/// Implementations must be safe to call before setup_ui() completes — guard
+/// with an initialised_ flag if needed.
+class IWorkspaceParticipant {
+ public:
+ virtual ~IWorkspaceParticipant() = default;
+
+ /// Capture current in-memory state into a JSON object.
+ /// Called from the UI thread only.
+ virtual QJsonObject save_state() const = 0;
+
+ /// Restore state from a previously saved JSON object.
+ /// Called from the UI thread only.
+ /// Implementations should defer heavy work (broker init, data fetch)
+ /// to showEvent() by storing values in member variables here.
+ virtual void restore_state(const QJsonObject& state) = 0;
+};
+
+} // namespace fincept
diff --git a/fincept-qt/src/services/workspace/WorkspaceManager.cpp b/fincept-qt/src/services/workspace/WorkspaceManager.cpp
new file mode 100644
index 000000000..334605d20
--- /dev/null
+++ b/fincept-qt/src/services/workspace/WorkspaceManager.cpp
@@ -0,0 +1,380 @@
+#include "services/workspace/WorkspaceManager.h"
+
+#include "app/ScreenRouter.h"
+#include "core/config/AppPaths.h"
+#include "core/logging/Logger.h"
+#include "screens/dashboard/canvas/GridLayout.h"
+#include "services/workspace/WorkspaceSerializer.h"
+#include "services/workspace/WorkspaceTemplates.h"
+#include "storage/repositories/SettingsRepository.h"
+
+#include <QDateTime>
+#include <QDir>
+#include <QFile>
+#include <QUuid>
+
+namespace fincept {
+
+// ── Singleton ─────────────────────────────────────────────────────────────────
+
+WorkspaceManager& WorkspaceManager::instance() {
+ static WorkspaceManager inst;
+ return inst;
+}
+
+WorkspaceManager::WorkspaceManager() {
+ autosave_timer_ = new QTimer(this);
+ autosave_timer_->setInterval(5 * 60 * 1000); // 5 minutes
+ connect(autosave_timer_, &QTimer::timeout, this, [this]() {
+ if (current_workspace_.has_value())
+ save_workspace();
+ });
+}
+
+// ── Setup ─────────────────────────────────────────────────────────────────────
+
+void WorkspaceManager::set_main_window(QMainWindow* w) {
+ main_window_ = w;
+}
+
+void WorkspaceManager::set_router(ScreenRouter* r) {
+ router_ = r;
+}
+
+// ── Participant registration ──────────────────────────────────────────────────
+
+void WorkspaceManager::register_participant(const QString& screen_id, IWorkspaceParticipant* p) {
+ participants_[screen_id] = p;
+
+ // If a pending state exists, deliver it immediately
+ if (pending_states_.contains(screen_id)) {
+ p->restore_state(pending_states_.take(screen_id));
+ LOG_DEBUG("WorkspaceManager", QString("Delivered pending state to: %1").arg(screen_id));
+ }
+}
+
+void WorkspaceManager::unregister_participant(const QString& screen_id) {
+ participants_.remove(screen_id);
+}
+
+// ── Workspace operations ──────────────────────────────────────────────────────
+
+void WorkspaceManager::new_workspace(const QString& name, const QString& description,
+ const QString& template_id) {
+ ensure_workspaces_dir();
+
+ WorkspaceDef ws = WorkspaceTemplates::make(template_id);
+ ws.metadata.id = QUuid::createUuid().toString(QUuid::WithoutBraces);
+ ws.metadata.name = name;
+ ws.metadata.description = description;
+ ws.metadata.created_at = QDateTime::currentDateTimeUtc().toString(Qt::ISODate);
+ ws.metadata.updated_at = ws.metadata.created_at;
+
+ current_workspace_ = std::move(ws);
+ pending_states_.clear();
+
+ apply_to_ui();
+
+ emit workspace_closed();
+ emit workspace_loaded(*current_workspace_);
+
+ autosave_timer_->start();
+ LOG_INFO("WorkspaceManager", QString("New workspace: %1").arg(name));
+}
+
+void WorkspaceManager::open_workspace(const QString& path) {
+ QFile f(path);
+ if (!f.open(QIODevice::ReadOnly)) {
+ emit workspace_error(QString("Cannot open file: %1").arg(path));
+ return;
+ }
+ QByteArray data = f.readAll();
+ f.close();
+
+ auto result = WorkspaceSerializer::from_json(QJsonDocument::fromJson(data));
+ if (result.is_err()) {
+ emit workspace_error(QString::fromStdString(result.error()));
+ return;
+ }
+
+ // Save current workspace before switching
+ if (current_workspace_.has_value())
+ save_workspace();
+
+ current_workspace_ = std::move(result.value());
+ pending_states_.clear();
+
+ apply_to_ui();
+
+ save_last_id(current_workspace_->metadata.id);
+ update_mru(current_workspace_->metadata.id);
+
+ emit workspace_loaded(*current_workspace_);
+ autosave_timer_->start();
+
+ LOG_INFO("WorkspaceManager", QString("Opened workspace: %1").arg(current_workspace_->metadata.name));
+}
+
+void WorkspaceManager::save_workspace() {
+ if (!current_workspace_.has_value()) {
+ new_workspace("Default");
+ return;
+ }
+
+ ensure_workspaces_dir();
+ capture_from_ui();
+
+ current_workspace_->metadata.updated_at =
+ QDateTime::currentDateTimeUtc().toString(Qt::ISODate);
+
+ QJsonDocument doc = WorkspaceSerializer::to_json(*current_workspace_);
+ QString path = workspace_file_path(current_workspace_->metadata.id);
+
+ QFile f(path);
+ if (!f.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+ emit workspace_error(QString("Cannot write workspace: %1").arg(path));
+ return;
+ }
+ f.write(doc.toJson(QJsonDocument::Indented));
+ f.close();
+
+ save_last_id(current_workspace_->metadata.id);
+ emit workspace_saved(current_workspace_->metadata.id);
+ LOG_INFO("WorkspaceManager", QString("Saved workspace: %1").arg(current_workspace_->metadata.name));
+}
+
+void WorkspaceManager::save_workspace_as(const QString& new_name, const QString& path) {
+ if (!current_workspace_.has_value())
+ return;
+
+ capture_from_ui();
+
+ WorkspaceDef ws = *current_workspace_;
+ ws.metadata.id = QUuid::createUuid().toString(QUuid::WithoutBraces);
+ ws.metadata.name = new_name;
+ ws.metadata.updated_at = QDateTime::currentDateTimeUtc().toString(Qt::ISODate);
+
+ QJsonDocument doc = WorkspaceSerializer::to_json(ws);
+ QFile f(path);
+ if (!f.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+ emit workspace_error(QString("Cannot write workspace: %1").arg(path));
+ return;
+ }
+ f.write(doc.toJson(QJsonDocument::Indented));
+ f.close();
+
+ // Switch to the new workspace
+ current_workspace_ = std::move(ws);
+ save_last_id(current_workspace_->metadata.id);
+ emit workspace_saved(current_workspace_->metadata.id);
+ emit workspace_loaded(*current_workspace_);
+ LOG_INFO("WorkspaceManager", QString("Saved workspace as: %1").arg(new_name));
+}
+
+void WorkspaceManager::import_workspace(const QString& path) {
+ auto summary = WorkspaceSerializer::summary_from_file(path);
+ if (summary.is_err()) {
+ emit workspace_error(QString::fromStdString(summary.error()));
+ return;
+ }
+
+ ensure_workspaces_dir();
+
+ // Assign new UUID to avoid collision
+ QString new_id = QUuid::createUuid().toString(QUuid::WithoutBraces);
+ QString dest = workspace_file_path(new_id);
+
+ QFile::copy(path, dest);
+
+ // Patch the id in the copied file
+ QFile f(dest);
+ if (f.open(QIODevice::ReadOnly)) {
+ QByteArray data = f.readAll();
+ f.close();
+ auto result = WorkspaceSerializer::from_json(QJsonDocument::fromJson(data));
+ if (result.is_ok()) {
+ WorkspaceDef ws = result.value();
+ ws.metadata.id = new_id;
+ QFile fw(dest);
+ if (fw.open(QIODevice::WriteOnly | QIODevice::Truncate))
+ fw.write(WorkspaceSerializer::to_json(ws).toJson(QJsonDocument::Indented));
+ }
+ }
+
+ open_workspace(dest);
+ LOG_INFO("WorkspaceManager", QString("Imported workspace from: %1").arg(path));
+}
+
+void WorkspaceManager::export_workspace(const QString& destination_path) {
+ if (!current_workspace_.has_value()) return;
+ capture_from_ui();
+
+ QJsonDocument doc = WorkspaceSerializer::to_json(*current_workspace_);
+ QFile f(destination_path);
+ if (!f.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+ emit workspace_error(QString("Cannot export to: %1").arg(destination_path));
+ return;
+ }
+ f.write(doc.toJson(QJsonDocument::Indented));
+ f.close();
+ LOG_INFO("WorkspaceManager", QString("Exported workspace to: %1").arg(destination_path));
+}
+
+void WorkspaceManager::load_last_workspace() {
+ auto id_result = SettingsRepository::instance().get("workspace.last_id");
+ if (id_result.is_ok() && !id_result.value().isEmpty()) {
+ QString path = workspace_file_path(id_result.value());
+ if (QFile::exists(path)) {
+ open_workspace(path);
+ return;
+ }
+ }
+ // No saved workspace — create default
+ new_workspace("Default");
+}
+
+// ── Queries ───────────────────────────────────────────────────────────────────
+
+Result<QVector<WorkspaceSummary>> WorkspaceManager::list_workspaces() const {
+ ensure_workspaces_dir();
+ QDir dir(AppPaths::workspaces());
+ QVector<WorkspaceSummary> result;
+
+ const auto entries = dir.entryInfoList({"*.fwsp"}, QDir::Files, QDir::Time);
+ for (const auto& fi : entries) {
+ auto s = WorkspaceSerializer::summary_from_file(fi.absoluteFilePath());
+ if (s.is_ok())
+ result.append(s.value());
+ }
+ return Result<QVector<WorkspaceSummary>>::ok(std::move(result));
+}
+
+QString WorkspaceManager::current_workspace_name() const {
+ return current_workspace_.has_value() ? current_workspace_->metadata.name : QString{};
+}
+
+QString WorkspaceManager::current_workspace_path() const {
+ return current_workspace_.has_value()
+ ? workspace_file_path(current_workspace_->metadata.id)
+ : QString{};
+}
+
+// ── Screen changed slot ───────────────────────────────────────────────────────
+
+void WorkspaceManager::on_screen_changed(const QString& screen_id) {
+ if (!current_workspace_.has_value()) return;
+ current_workspace_->active_screen = screen_id;
+
+ // Track open screens
+ if (!current_workspace_->open_screens.contains(screen_id))
+ current_workspace_->open_screens.append(screen_id);
+
+ // Deliver pending state if participant is now registered
+ if (pending_states_.contains(screen_id) && participants_.contains(screen_id)) {
+ participants_[screen_id]->restore_state(pending_states_.take(screen_id));
+ LOG_DEBUG("WorkspaceManager", QString("Delivered pending state on navigate: %1").arg(screen_id));
+ }
+}
+
+// ── Private helpers ───────────────────────────────────────────────────────────
+
+void WorkspaceManager::capture_from_ui() {
+ if (!current_workspace_.has_value()) return;
+
+ // Window geometry
+ if (main_window_)
+ current_workspace_->window_geometry_base64 =
+ main_window_->saveGeometry().toBase64();
+
+ // Active screen
+ if (router_)
+ current_workspace_->active_screen = router_->current_screen_id();
+
+ // Per-screen states from participants
+ current_workspace_->screen_states.clear();
+ for (auto it = participants_.cbegin(); it != participants_.cend(); ++it) {
+ WorkspaceScreenState ss;
+ ss.screen_id = it.key();
+ ss.state = it.value()->save_state();
+ current_workspace_->screen_states.append(ss);
+ }
+}
+
+void WorkspaceManager::apply_to_ui() {
+ if (!current_workspace_.has_value()) return;
+ const WorkspaceDef& ws = *current_workspace_;
+
+ // Store dashboard profile key so DashboardScreen picks it up
+ SettingsRepository::instance().set(
+ "workspace.active_dashboard_profile",
+ ws.metadata.id, "workspace");
+
+ // Store dashboard layout as base64 in the settings key DashboardScreen reads
+ // We serialize the layout and write it so restore_layout() loads the right grid
+ {
+ QByteArray data;
+ QDataStream stream(&data, QIODevice::WriteOnly);
+ stream << ws.dashboard_layout.cols
+ << ws.dashboard_layout.row_h
+ << ws.dashboard_layout.margin;
+ stream << static_cast<int>(ws.dashboard_layout.items.size());
+ for (const auto& item : ws.dashboard_layout.items) {
+ stream << item.id << item.instance_id;
+ stream << item.cell.x << item.cell.y << item.cell.w << item.cell.h;
+ stream << item.cell.min_w << item.cell.min_h;
+ }
+ if (!ws.dashboard_layout.items.isEmpty()) {
+ SettingsRepository::instance().set(
+ "dashboard_canvas_layout",
+ QString::fromLatin1(data.toBase64()), "dashboard");
+ }
+ }
+
+ // Queue pending screen states for lazy-constructed screens
+ for (const auto& ss : ws.screen_states) {
+ if (participants_.contains(ss.screen_id)) {
+ // Screen already constructed — deliver immediately
+ participants_[ss.screen_id]->restore_state(ss.state);
+ } else {
+ // Screen not yet constructed — queue for when it registers
+ pending_states_[ss.screen_id] = ss.state;
+ }
+ }
+
+ // Restore window geometry
+ if (main_window_ && !ws.window_geometry_base64.isEmpty())
+ main_window_->restoreGeometry(
+ QByteArray::fromBase64(ws.window_geometry_base64.toLatin1()));
+
+ // Navigate to active screen
+ if (router_ && !ws.active_screen.isEmpty())
+ router_->navigate(ws.active_screen);
+}
+
+void WorkspaceManager::ensure_workspaces_dir() const {
+ QDir().mkpath(AppPaths::workspaces());
+}
+
+QString WorkspaceManager::workspace_file_path(const QString& id) const {
+ return AppPaths::workspaces() + "/" + id + ".fwsp";
+}
+
+void WorkspaceManager::save_last_id(const QString& id) {
+ SettingsRepository::instance().set("workspace.last_id", id, "workspace");
+}
+
+void WorkspaceManager::update_mru(const QString& id) {
+ auto r = SettingsRepository::instance().get("workspace.mru_list");
+ QStringList mru;
+ if (r.is_ok() && !r.value().isEmpty())
+ mru = r.value().split(',', Qt::SkipEmptyParts);
+
+ mru.removeAll(id);
+ mru.prepend(id);
+ if (mru.size() > 5)
+ mru = mru.mid(0, 5);
+
+ SettingsRepository::instance().set("workspace.mru_list", mru.join(','), "workspace");
+}
+
+} // namespace fincept
diff --git a/fincept-qt/src/services/workspace/WorkspaceManager.h b/fincept-qt/src/services/workspace/WorkspaceManager.h
new file mode 100644
index 000000000..9a637eb8f
--- /dev/null
+++ b/fincept-qt/src/services/workspace/WorkspaceManager.h
@@ -0,0 +1,96 @@
+#pragma once
+#include "services/workspace/IWorkspaceParticipant.h"
+#include "services/workspace/WorkspaceTypes.h"
+#include "core/result/Result.h"
+
+#include <QHash>
+#include <QMainWindow>
+#include <QObject>
+#include <QTimer>
+#include <optional>
+
+namespace fincept {
+
+class ScreenRouter;
+
+/// Central workspace service — singleton QObject on the UI thread.
+///
+/// Lifecycle:
+/// MainWindow creates it after setup_app_screens().
+/// load_last_workspace() is called after auth resolves.
+/// save_workspace() is called in closeEvent().
+class WorkspaceManager : public QObject {
+ Q_OBJECT
+ public:
+ static WorkspaceManager& instance();
+
+ /// Must be called once before any workspace operation.
+ void set_main_window(QMainWindow* w);
+ void set_router(ScreenRouter* r);
+
+ // ── Screen participation ──────────────────────────────────────────────────
+
+ /// Called by screens in their constructor.
+ void register_participant(const QString& screen_id, IWorkspaceParticipant* p);
+
+ /// Called by screens in their destructor.
+ void unregister_participant(const QString& screen_id);
+
+ // ── Workspace operations ──────────────────────────────────────────────────
+
+ void new_workspace(const QString& name, const QString& description = {},
+ const QString& template_id = {});
+
+ void open_workspace(const QString& path);
+
+ void save_workspace();
+
+ void save_workspace_as(const QString& new_name, const QString& path);
+
+ void import_workspace(const QString& path);
+
+ void export_workspace(const QString& destination_path);
+
+ /// Load the last-used workspace on startup.
+ void load_last_workspace();
+
+ // ── Queries ───────────────────────────────────────────────────────────────
+
+ Result<QVector<WorkspaceSummary>> list_workspaces() const;
+
+ bool has_current_workspace() const { return current_workspace_.has_value(); }
+
+ QString current_workspace_name() const;
+
+ QString current_workspace_path() const;
+
+ public slots:
+ /// Connected to ScreenRouter::screen_changed — delivers pending states.
+ void on_screen_changed(const QString& screen_id);
+
+ signals:
+ void workspace_loaded(const WorkspaceDef& ws);
+ void workspace_saved(const QString& id);
+ void workspace_closed();
+ void workspace_error(const QString& message);
+
+ private:
+ WorkspaceManager();
+
+ void capture_from_ui();
+ void apply_to_ui();
+ void ensure_workspaces_dir() const;
+ QString workspace_file_path(const QString& id) const;
+ void save_last_id(const QString& id);
+ void update_mru(const QString& id);
+
+ std::optional<WorkspaceDef> current_workspace_;
+ QHash<QString, IWorkspaceParticipant*> participants_;
+ QHash<QString, QJsonObject> pending_states_; // states waiting for lazy screens
+
+ QMainWindow* main_window_ = nullptr;
+ ScreenRouter* router_ = nullptr;
+ QTimer* autosave_timer_ = nullptr;
+};
+
+} // namespace fincept
diff --git a/fincept-qt/src/services/workspace/WorkspaceSerializer.cpp b/fincept-qt/src/services/workspace/WorkspaceSerializer.cpp
new file mode 100644
index 000000000..a181badb9
--- /dev/null
+++ b/fincept-qt/src/services/workspace/WorkspaceSerializer.cpp
@@ -0,0 +1,189 @@
+#include "services/workspace/WorkspaceSerializer.h"
+
+#include <QFile>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QUuid>
+
+namespace fincept {
+
+// ── Serialize ─────────────────────────────────────────────────────────────────
+
+static QJsonObject serialize_metadata(const WorkspaceMetadata& m) {
+ QJsonObject o;
+ o["id"] = m.id;
+ o["name"] = m.name;
+ o["description"] = m.description;
+ o["template_id"] = m.template_id;
+ o["created_at"] = m.created_at;
+ o["updated_at"] = m.updated_at;
+ o["version"] = m.version;
+ return o;
+}
+
+QJsonObject WorkspaceSerializer::serialize_layout(const screens::GridLayout& layout) {
+ QJsonObject o;
+ o["cols"] = layout.cols;
+ o["row_h"] = layout.row_h;
+ o["margin"] = layout.margin;
+
+ QJsonArray items;
+ for (const auto& item : layout.items) {
+ QJsonObject it;
+ it["id"] = item.id;
+ it["instance_id"] = item.instance_id;
+ it["x"] = item.cell.x;
+ it["y"] = item.cell.y;
+ it["w"] = item.cell.w;
+ it["h"] = item.cell.h;
+ it["min_w"] = item.cell.min_w;
+ it["min_h"] = item.cell.min_h;
+ it["is_static"] = item.is_static;
+ items.append(QJsonValue(it));
+ }
+ o["items"] = QJsonValue(items);
+ return o;
+}
+
+QJsonDocument WorkspaceSerializer::to_json(const WorkspaceDef& ws) {
+ QJsonObject root;
+ root["version"] = 1;
+ root["metadata"] = QJsonValue(serialize_metadata(ws.metadata));
+
+ QJsonObject nav;
+ nav["active_screen"] = ws.active_screen;
+ QJsonArray open;
+ for (const auto& s : ws.open_screens)
+ open.append(s);
+ nav["open_screens"] = QJsonValue(open);
+ root["navigation"] = QJsonValue(nav);
+
+ root["dashboard"] = QJsonValue(serialize_layout(ws.dashboard_layout));
+
+ QJsonObject refs;
+ QJsonArray wl, pt, wf;
+ for (const auto& id : ws.watchlist_ids) wl.append(id);
+ for (const auto& id : ws.portfolio_ids) pt.append(id);
+ for (const auto& id : ws.workflow_ids) wf.append(id);
+ refs["watchlist_ids"] = QJsonValue(wl);
+ refs["portfolio_ids"] = QJsonValue(pt);
+ refs["workflow_ids"] = QJsonValue(wf);
+ root["references"] = QJsonValue(refs);
+
+ QJsonArray states;
+ for (const auto& ss : ws.screen_states) {
+ QJsonObject s;
+ s["screen_id"] = ss.screen_id;
+ s["state"] = QJsonValue(ss.state);
+ states.append(QJsonValue(s));
+ }
+ root["screen_states"] = QJsonValue(states);
+ root["window_geometry"] = ws.window_geometry_base64;
+
+ return QJsonDocument(root);
+}
+
+// ── Deserialize ───────────────────────────────────────────────────────────────
+
+screens::GridLayout WorkspaceSerializer::deserialize_layout(const QJsonObject& o) {
+ screens::GridLayout layout;
+ layout.cols = o["cols"].toInt(12);
+ layout.row_h = o["row_h"].toInt(60);
+ layout.margin = o["margin"].toInt(4);
+
+ for (const auto& v : o["items"].toArray()) {
+ QJsonObject it = v.toObject();
+ screens::GridItem item;
+ item.id = it["id"].toString();
+ item.instance_id = it["instance_id"].toString();
+ item.cell.x = it["x"].toInt();
+ item.cell.y = it["y"].toInt();
+ item.cell.w = it["w"].toInt(4);
+ item.cell.h = it["h"].toInt(4);
+ item.cell.min_w = it["min_w"].toInt(2);
+ item.cell.min_h = it["min_h"].toInt(3);
+ item.is_static = it["is_static"].toBool(false);
+ layout.items.append(item);
+ }
+ return layout;
+}
+
+Result<WorkspaceDef> WorkspaceSerializer::from_json(const QJsonDocument& doc) {
+ if (doc.isNull() || !doc.isObject())
+ return Result<WorkspaceDef>::err("Invalid JSON document");
+
+ QJsonObject root = doc.object();
+
+ int version = root["version"].toInt(0);
+ if (version != 1)
+ return Result<WorkspaceDef>::err(
+ QString("Unsupported workspace version: %1").arg(version).toStdString());
+
+ WorkspaceDef ws;
+
+ QJsonObject m = root["metadata"].toObject();
+ ws.metadata.id = m["id"].toString();
+ ws.metadata.name = m["name"].toString();
+ ws.metadata.description = m["description"].toString();
+ ws.metadata.template_id = m["template_id"].toString();
+ ws.metadata.created_at = m["created_at"].toString();
+ ws.metadata.updated_at = m["updated_at"].toString();
+ ws.metadata.version = m["version"].toInt(1);
+
+ if (ws.metadata.id.isEmpty() || ws.metadata.name.isEmpty())
+ return Result<WorkspaceDef>::err("Workspace missing required id or name");
+
+ QJsonObject nav = root["navigation"].toObject();
+ ws.active_screen = nav["active_screen"].toString("dashboard");
+ for (const auto& v : nav["open_screens"].toArray())
+ ws.open_screens.append(v.toString());
+
+ ws.dashboard_layout = deserialize_layout(root["dashboard"].toObject());
+
+ QJsonObject refs = root["references"].toObject();
+ for (const auto& v : refs["watchlist_ids"].toArray()) ws.watchlist_ids.append(v.toString());
+ for (const auto& v : refs["portfolio_ids"].toArray()) ws.portfolio_ids.append(v.toString());
+ for (const auto& v : refs["workflow_ids"].toArray()) ws.workflow_ids.append(v.toString());
+
+ for (const auto& v : root["screen_states"].toArray()) {
+ QJsonObject s = v.toObject();
+ WorkspaceScreenState ss;
+ ss.screen_id = s["screen_id"].toString();
+ ss.state = s["state"].toObject();
+ if (!ss.screen_id.isEmpty())
+ ws.screen_states.append(ss);
+ }
+
+ ws.window_geometry_base64 = root["window_geometry"].toString();
+
+ return Result<WorkspaceDef>::ok(std::move(ws));
+}
+
+Result<WorkspaceSummary> WorkspaceSerializer::summary_from_file(const QString& path) {
+ QFile f(path);
+ if (!f.open(QIODevice::ReadOnly))
+ return Result<WorkspaceSummary>::err(
+ QString("Cannot open: %1").arg(path).toStdString());
+
+ QByteArray data = f.readAll();
+ f.close();
+
+ QJsonDocument doc = QJsonDocument::fromJson(data);
+ if (doc.isNull())
+ return Result<WorkspaceSummary>::err("Invalid JSON");
+
+ QJsonObject m = doc.object()["metadata"].toObject();
+ if (m.isEmpty())
+ return Result<WorkspaceSummary>::err("Missing metadata");
+
+ WorkspaceSummary s;
+ s.id = m["id"].toString();
+ s.name = m["name"].toString();
+ s.description = m["description"].toString();
+ s.updated_at = m["updated_at"].toString();
+ s.template_id = m["template_id"].toString();
+ s.file_path = path;
+ return Result<WorkspaceSummary>::ok(std::move(s));
+}
+
+} // namespace fincept
diff --git a/fincept-qt/src/services/workspace/WorkspaceSerializer.h b/fincept-qt/src/services/workspace/WorkspaceSerializer.h
new file mode 100644
index 000000000..ef47f5a82
--- /dev/null
+++ b/fincept-qt/src/services/workspace/WorkspaceSerializer.h
@@ -0,0 +1,32 @@
+#pragma once
+#include "services/workspace/WorkspaceTypes.h"
+#include "core/result/Result.h"
+
+#include <QJsonDocument>
+#include <QString>
+
+namespace fincept {
+
+/// Pure static utility — converts WorkspaceDef ↔ QJsonDocument.
+/// No file I/O, no Qt signals. Stateless.
+class WorkspaceSerializer {
+ public:
+ /// Serialize a full workspace to JSON.
+ static QJsonDocument to_json(const WorkspaceDef& ws);
+
+ /// Deserialize a workspace from JSON.
+ /// Returns Err if version is unsupported or required fields are missing.
+ static Result<WorkspaceDef> from_json(const QJsonDocument& doc);
+
+ /// Read only the metadata block from a .fwsp file path.
+ /// Fast — does not parse the full document.
+ static Result<WorkspaceSummary> summary_from_file(const QString& path);
+
+ private:
+ WorkspaceSerializer() = delete;
+
+ static QJsonObject serialize_layout(const screens::GridLayout& layout);
+ static screens::GridLayout deserialize_layout(const QJsonObject& obj);
+};
+
+} // namespace fincept
diff --git a/fincept-qt/src/services/workspace/WorkspaceTemplates.cpp b/fincept-qt/src/services/workspace/WorkspaceTemplates.cpp
new file mode 100644
index 000000000..3d17f7121
--- /dev/null
+++ b/fincept-qt/src/services/workspace/WorkspaceTemplates.cpp
@@ -0,0 +1,175 @@
+#include "services/workspace/WorkspaceTemplates.h"
+#include <QUuid>
+
+namespace fincept {
+
+// ── Helper to build a GridItem ────────────────────────────────────────────────
+
+static screens::GridItem make_item(const QString& id, int x, int y, int w, int h) {
+ screens::GridItem item;
+ item.id = id;
+ item.instance_id = QUuid::createUuid().toString(QUuid::WithoutBraces);
+ item.cell = {x, y, w, h, 2, 3};
+ item.is_static = false;
+ return item;
+}
+
+// ── Template implementations ──────────────────────────────────────────────────
+
+WorkspaceDef WorkspaceTemplates::blank() {
+ WorkspaceDef ws;
+ ws.metadata.template_id = "blank";
+ ws.active_screen = "dashboard";
+ ws.open_screens = {"dashboard"};
+ // Empty dashboard layout — user starts fresh
+ ws.dashboard_layout.cols = 12;
+ ws.dashboard_layout.row_h = 60;
+ ws.dashboard_layout.margin= 4;
+ return ws;
+}
+
+WorkspaceDef WorkspaceTemplates::equity_trader() {
+ WorkspaceDef ws;
+ ws.metadata.template_id = "equity_trader";
+ ws.active_screen = "equity_trading";
+ ws.open_screens = {"dashboard", "equity_trading", "watchlist", "portfolio"};
+
+ ws.dashboard_layout.cols = 12;
+ ws.dashboard_layout.row_h = 60;
+ ws.dashboard_layout.margin= 4;
+ ws.dashboard_layout.items = {
+ make_item("indices", 0, 0, 8, 4),
+ make_item("news", 8, 0, 4, 4),
+ make_item("portfolio", 0, 4, 6, 4),
+ make_item("watchlist", 6, 4, 6, 4),
+ };
+
+ // Equity trading screen defaults
+ WorkspaceScreenState eq;
+ eq.screen_id = "equity_trading";
+ eq.state["broker_id"] = "fyers";
+ eq.state["symbol"] = "RELIANCE";
+ eq.state["exchange"] = "NSE";
+ eq.state["trading_mode"] = "paper";
+ ws.screen_states.append(eq);
+
+ return ws;
+}
+
+WorkspaceDef WorkspaceTemplates::crypto_trader() {
+ WorkspaceDef ws;
+ ws.metadata.template_id = "crypto_trader";
+ ws.active_screen = "crypto_trading";
+ ws.open_screens = {"dashboard", "crypto_trading", "watchlist"};
+
+ ws.dashboard_layout.cols = 12;
+ ws.dashboard_layout.row_h = 60;
+ ws.dashboard_layout.margin= 4;
+ ws.dashboard_layout.items = {
+ make_item("crypto_prices", 0, 0, 8, 4),
+ make_item("news", 8, 0, 4, 4),
+ make_item("portfolio", 0, 4, 12, 4),
+ };
+
+ WorkspaceScreenState cr;
+ cr.screen_id = "crypto_trading";
+ cr.state["exchange_id"] = "kraken";
+ cr.state["symbol"] = "BTC/USDT";
+ cr.state["trading_mode"] = "paper";
+ ws.screen_states.append(cr);
+
+ return ws;
+}
+
+WorkspaceDef WorkspaceTemplates::portfolio_manager() {
+ WorkspaceDef ws;
+ ws.metadata.template_id = "portfolio_manager";
+ ws.active_screen = "portfolio";
+ ws.open_screens = {"dashboard", "portfolio", "watchlist", "equity_research"};
+
+ ws.dashboard_layout.cols = 12;
+ ws.dashboard_layout.row_h = 60;
+ ws.dashboard_layout.margin= 4;
+ ws.dashboard_layout.items = {
+ make_item("portfolio", 0, 0, 8, 5),
+ make_item("news", 8, 0, 4, 5),
+ make_item("watchlist", 0, 5, 6, 4),
+ make_item("indices", 6, 5, 6, 4),
+ };
+
+ return ws;
+}
+
+WorkspaceDef WorkspaceTemplates::research_analyst() {
+ WorkspaceDef ws;
+ ws.metadata.template_id = "research_analyst";
+ ws.active_screen = "equity_research";
+ ws.open_screens = {"equity_research", "news", "ma_analytics", "surface_analytics", "dashboard"};
+
+ ws.dashboard_layout.cols = 12;
+ ws.dashboard_layout.row_h = 60;
+ ws.dashboard_layout.margin= 4;
+ ws.dashboard_layout.items = {
+ make_item("news", 0, 0, 6, 5),
+ make_item("indices", 6, 0, 6, 5),
+ make_item("portfolio", 0, 5, 12, 4),
+ };
+
+ WorkspaceScreenState er;
+ er.screen_id = "equity_research";
+ er.state["symbol"] = "AAPL";
+ er.state["tab"] = 0;
+ ws.screen_states.append(er);
+
+ return ws;
+}
+
+WorkspaceDef WorkspaceTemplates::macro_economist() {
+ WorkspaceDef ws;
+ ws.metadata.template_id = "macro_economist";
+ ws.active_screen = "economics";
+ ws.open_screens = {"economics", "markets", "gov_data", "dbnomics", "geopolitics", "dashboard"};
+
+ ws.dashboard_layout.cols = 12;
+ ws.dashboard_layout.row_h = 60;
+ ws.dashboard_layout.margin= 4;
+ ws.dashboard_layout.items = {
+ make_item("indices", 0, 0, 8, 4),
+ make_item("news", 8, 0, 4, 4),
+ make_item("calendar", 0, 4, 12, 5),
+ };
+
+ return ws;
+}
+
+// ── Public API ────────────────────────────────────────────────────────────────
+
+WorkspaceDef WorkspaceTemplates::make(const QString& template_id) {
+ if (template_id == "equity_trader") return equity_trader();
+ if (template_id == "crypto_trader") return crypto_trader();
+ if (template_id == "portfolio_manager")return portfolio_manager();
+ if (template_id == "research_analyst") return research_analyst();
+ if (template_id == "macro_economist") return macro_economist();
+ return blank();
+}
+
+QVector<WorkspaceSummary> WorkspaceTemplates::available() {
+ QVector<WorkspaceSummary> list;
+ auto add = [&](const QString& id, const QString& name, const QString& desc) {
+ WorkspaceSummary s;
+ s.id = id;
+ s.name = name;
+ s.description = desc;
+ s.template_id = id;
+ list.append(s);
+ };
+ add("blank", "Blank", "Start with an empty workspace");
+ add("equity_trader", "Equity Trader", "Equity trading with watchlist and portfolio");
+ add("crypto_trader", "Crypto Trader", "Crypto trading with live price feed");
+ add("portfolio_manager", "Portfolio Manager", "Portfolio overview with research tools");
+ add("research_analyst", "Research Analyst", "Equity research, news, M&A and surface analytics");
+ add("macro_economist", "Macro Economist", "Economics, gov data, DBnomics and geopolitics");
+ return list;
+}
+
+} // namespace fincept
diff --git a/fincept-qt/src/services/workspace/WorkspaceTemplates.h b/fincept-qt/src/services/workspace/WorkspaceTemplates.h
new file mode 100644
index 000000000..470fdf17b
--- /dev/null
+++ b/fincept-qt/src/services/workspace/WorkspaceTemplates.h
@@ -0,0 +1,29 @@
+#pragma once
+#include "services/workspace/WorkspaceTypes.h"
+#include <QVector>
+
+namespace fincept {
+
+/// Built-in workspace templates. Stateless, returns pre-configured WorkspaceDef objects.
+/// Metadata id/name/timestamps are filled in by WorkspaceManager::new_workspace().
+class WorkspaceTemplates {
+ public:
+ /// Return a WorkspaceDef seeded from the named template.
+ /// Falls back to blank() if template_id is empty or unknown.
+ static WorkspaceDef make(const QString& template_id);
+
+ /// All available templates as summaries (for the New Workspace dialog).
+ static QVector<WorkspaceSummary> available();
+
+ private:
+ WorkspaceTemplates() = delete;
+
+ static WorkspaceDef blank();
+ static WorkspaceDef equity_trader();
+ static WorkspaceDef crypto_trader();
+ static WorkspaceDef portfolio_manager();
+ static WorkspaceDef research_analyst();
+ static WorkspaceDef macro_economist();
+};
+
+} // namespace fincept
diff --git a/fincept-qt/src/services/workspace/WorkspaceTypes.h b/fincept-qt/src/services/workspace/WorkspaceTypes.h
new file mode 100644
index 000000000..0fb7592a9
--- /dev/null
+++ b/fincept-qt/src/services/workspace/WorkspaceTypes.h
@@ -0,0 +1,66 @@
+#pragma once
+#include "screens/dashboard/canvas/GridLayout.h"
+
+#include <QJsonObject>
+#include <QString>
+#include <QStringList>
+#include <QVector>
+
+namespace fincept {
+
+// ── Workspace screen state ────────────────────────────────────────────────────
+
+/// Opaque per-screen state blob saved/restored by IWorkspaceParticipant.
+struct WorkspaceScreenState {
+ QString screen_id;
+ QJsonObject state;
+};
+
+// ── Workspace metadata ────────────────────────────────────────────────────────
+
+struct WorkspaceMetadata {
+ QString id; // UUID
+ QString name;
+ QString description;
+ QString template_id; // empty = user-created
+ QString created_at; // ISO-8601
+ QString updated_at; // ISO-8601
+ int version = 1;
+};
+
+// ── Full workspace definition ─────────────────────────────────────────────────
+
+struct WorkspaceDef {
+ WorkspaceMetadata metadata;
+
+ // Navigation
+ QString active_screen;
+ QStringList open_screens; // screens visited, in order
+
+ // Dashboard widget grid — self-contained, not a DB reference
+ screens::GridLayout dashboard_layout;
+
+ // References to existing DB entities (by ID)
+ QStringList watchlist_ids;
+ QStringList portfolio_ids;
+ QStringList workflow_ids;
+
+ // Per-screen in-memory state
+ QVector<WorkspaceScreenState> screen_states;
+
+ // Window geometry (base64 of QWidget::saveGeometry())
+ QString window_geometry_base64;
+};
+
+// ── Lightweight summary for listing dialogs ───────────────────────────────────
+
+struct WorkspaceSummary {
+ QString id;
+ QString name;
+ QString description;
+ QString updated_at;
+ QString template_id;
+ QString file_path;
+};
+
+} // namespace fincept
diff --git a/fincept-qt/src/storage/cache/CacheManager.cpp b/fincept-qt/src/storage/cache/CacheManager.cpp
index 7079035dc..76716e49b 100644
--- a/fincept-qt/src/storage/cache/CacheManager.cpp
+++ b/fincept-qt/src/storage/cache/CacheManager.cpp
@@ -1,9 +1,8 @@
#include "storage/cache/CacheManager.h"
-#include "core/logging/Logger.h"
#include "storage/sqlite/CacheDatabase.h"
-#include <QJsonDocument>
+#include <QSqlQuery>
namespace fincept {
@@ -12,128 +11,92 @@ CacheManager& CacheManager::instance() {
return s;
}
-CacheManager::CacheManager(QObject* parent) : QObject(parent) {
- // Periodic eviction every 60 seconds
- evict_timer_ = new QTimer(this);
- connect(evict_timer_, &QTimer::timeout, this, &CacheManager::evict_expired);
- evict_timer_->start(60000);
-}
+CacheManager::CacheManager(QObject* parent) : QObject(parent) {}
void CacheManager::put(const QString& key, const QVariant& value, int ttl_seconds, const QString& category) {
- QMutexLocker lock(&mutex_);
- cache_[key] = {value, QDateTime::currentDateTime().addSecs(ttl_seconds), category};
- persist(key, value, ttl_seconds, category);
+ auto& cdb = CacheDatabase::instance();
+ if (!cdb.is_open())
+ return;
+
+ const QString data = value.toString();
+ cdb.execute("INSERT OR REPLACE INTO unified_cache "
+ "(key, value, category, ttl_seconds, expires_at, hit_count, size_bytes) "
+ "VALUES (?, ?, ?, ?, datetime('now', '+' || ? || ' seconds'), 0, ?)",
+ {key, data, category, ttl_seconds, ttl_seconds, data.size()});
}
QVariant CacheManager::get(const QString& key) const {
- QMutexLocker lock(&mutex_);
- auto it = cache_.find(key);
- if (it == cache_.end())
+ auto& cdb = CacheDatabase::instance();
+ if (!cdb.is_open())
return {};
- if (QDateTime::currentDateTime() > it->expires_at) {
+
+ auto r = cdb.execute(
+ "SELECT value FROM unified_cache WHERE key = ? AND expires_at > datetime('now')",
+ {key});
+ if (r.is_err())
return {};
- }
- return it->value;
+
+ QSqlQuery q = r.value();
+ if (!q.next())
+ return {};
+
+ // Increment hit counter (fire-and-forget)
+ cdb.execute("UPDATE unified_cache SET hit_count = hit_count + 1 WHERE key = ?", {key});
+
+ return q.value(0).toString();
}
bool CacheManager::has(const QString& key) const {
- QMutexLocker lock(&mutex_);
- auto it = cache_.find(key);
- if (it == cache_.end())
+ auto& cdb = CacheDatabase::instance();
+ if (!cdb.is_open())
return false;
- return QDateTime::currentDateTime() <= it->expires_at;
+
+ auto r = cdb.execute(
+ "SELECT 1 FROM unified_cache WHERE key = ? AND expires_at > datetime('now')",
+ {key});
+ if (r.is_err())
+ return false;
+
+ QSqlQuery q = r.value();
+ return q.next();
}
void CacheManager::remove(const QString& key) {
- QMutexLocker lock(&mutex_);
- cache_.remove(key);
- remove_persisted(key);
+ auto& cdb = CacheDatabase::instance();
+ if (cdb.is_open())
+ cdb.execute("DELETE FROM unified_cache WHERE key = ?", {key});
}
void CacheManager::remove_prefix(const QString& prefix) {
- QMutexLocker lock(&mutex_);
- QStringList to_remove;
- for (auto it = cache_.begin(); it != cache_.end(); ++it) {
- if (it.key().startsWith(prefix))
- to_remove.append(it.key());
- }
- for (const auto& k : to_remove)
- cache_.remove(k);
auto& cdb = CacheDatabase::instance();
- if (cdb.is_open()) {
- cdb.execute("DELETE FROM unified_cache WHERE key LIKE ?",
- {prefix + "%"});
- }
+ if (cdb.is_open())
+ cdb.execute("DELETE FROM unified_cache WHERE key LIKE ?", {prefix + "%"});
}
void CacheManager::clear() {
- QMutexLocker lock(&mutex_);
- cache_.clear();
auto& cdb = CacheDatabase::instance();
- if (cdb.is_open()) {
+ if (cdb.is_open())
cdb.exec("DELETE FROM unified_cache");
- }
}
void CacheManager::clear_category(const QString& category) {
- QMutexLocker lock(&mutex_);
- // Remove from in-memory cache
- for (auto it = cache_.begin(); it != cache_.end();) {
- if (it->category == category)
- it = cache_.erase(it);
- else
- ++it;
- }
- // Remove from DB
auto& cdb = CacheDatabase::instance();
- if (cdb.is_open()) {
+ if (cdb.is_open())
cdb.execute("DELETE FROM unified_cache WHERE category = ?", {category});
- }
}
int CacheManager::entry_count() const {
- QMutexLocker lock(&mutex_);
- return cache_.size();
-}
-
-void CacheManager::evict_expired() {
- QMutexLocker lock(&mutex_);
- auto now = QDateTime::currentDateTime();
- for (auto it = cache_.begin(); it != cache_.end();) {
- if (now > it->expires_at)
- it = cache_.erase(it);
- else
- ++it;
- }
- // Also clean DB
- auto& cdb = CacheDatabase::instance();
- if (cdb.is_open()) {
- cdb.exec("DELETE FROM unified_cache WHERE expires_at <= datetime('now')");
- }
-}
-
-void CacheManager::persist(const QString& key, const QVariant& value, int ttl, const QString& category) {
auto& cdb = CacheDatabase::instance();
if (!cdb.is_open())
- return;
+ return 0;
- QString data = value.toString();
- if (data.isEmpty() && value.canConvert<QJsonDocument>()) {
- data = QString::fromUtf8(value.toJsonDocument().toJson(QJsonDocument::Compact));
- }
- int size = data.size();
+ auto r = cdb.execute(
+ "SELECT COUNT(*) FROM unified_cache WHERE expires_at > datetime('now')", {});
+ if (r.is_err())
+ return 0;
- cdb.execute("INSERT OR REPLACE INTO unified_cache "
- "(key, value, category, ttl_seconds, expires_at, hit_count, size_bytes) "
- "VALUES (?, ?, ?, ?, datetime('now', '+' || ? || ' seconds'), 0, ?)",
- {key, data, category, ttl, ttl, size});
-}
-
-void CacheManager::remove_persisted(const QString& key) {
- auto& cdb = CacheDatabase::instance();
- if (!cdb.is_open())
- return;
- cdb.execute("DELETE FROM unified_cache WHERE key = ?", {key});
+ QSqlQuery q = r.value();
+ return q.next() ? q.value(0).toInt() : 0;
}
} // namespace fincept
diff --git a/fincept-qt/src/storage/cache/CacheManager.h b/fincept-qt/src/storage/cache/CacheManager.h
index 2ed6c346a..c599fe59f 100644
--- a/fincept-qt/src/storage/cache/CacheManager.h
+++ b/fincept-qt/src/storage/cache/CacheManager.h
@@ -1,16 +1,12 @@
#pragma once
-#include <QDateTime>
-#include <QHash>
-#include <QMutex>
#include <QObject>
#include <QString>
-#include <QTimer>
#include <QVariant>
namespace fincept {
-/// In-memory L1 cache with write-through to cache.db.
-/// Falls back to pure in-memory if CacheDatabase is not available.
+/// SQLite-backed cache. All reads and writes go directly to CacheDatabase (cache.db).
+/// No in-memory layer — avoids double-storage and keeps a single source of truth.
class CacheManager : public QObject {
Q_OBJECT
public:
@@ -28,20 +24,6 @@ class CacheManager : public QObject {
private:
explicit CacheManager(QObject* parent = nullptr);
-
- void evict_expired();
- void persist(const QString& key, const QVariant& value, int ttl, const QString& category);
- void remove_persisted(const QString& key);
-
- struct Entry {
- QVariant value;
- QDateTime expires_at;
- QString category;
- };
-
- mutable QMutex mutex_;
- QHash<QString, Entry> cache_;
- QTimer* evict_timer_ = nullptr;
};
} // namespace fincept
diff --git a/fincept-qt/src/storage/repositories/NewsArticleRepository.cpp b/fincept-qt/src/storage/repositories/NewsArticleRepository.cpp
new file mode 100644
index 000000000..9c5901657
--- /dev/null
+++ b/fincept-qt/src/storage/repositories/NewsArticleRepository.cpp
@@ -0,0 +1,387 @@
+#include "storage/repositories/NewsArticleRepository.h"
+
+#include "core/logging/Logger.h"
+#include "storage/sqlite/Database.h"
+
+#include <QJsonArray>
+#include <QJsonDocument>
+
+#include <cstdint>
+
+namespace fincept {
+
+using fincept::services::Impact;
+using fincept::services::NewsArticle;
+using fincept::services::Priority;
+using fincept::services::Sentiment;
+using fincept::services::SourceFlag;
+using fincept::services::ThreatLevel;
+
+// ── Singleton ────────────────────────────────────────────────────────────────
+
+NewsArticleRepository& NewsArticleRepository::instance() {
+ static NewsArticleRepository s;
+ return s;
+}
+
+// ── Helpers: enum ↔ string ───────────────────────────────────────────────────
+
+static QString priority_str(Priority p) {
+ switch (p) {
+ case Priority::FLASH: return "FLASH";
+ case Priority::URGENT: return "URGENT";
+ case Priority::BREAKING: return "BREAKING";
+ default: return "ROUTINE";
+ }
+}
+
+static Priority priority_from(const QString& s) {
+ if (s == "FLASH") return Priority::FLASH;
+ if (s == "URGENT") return Priority::URGENT;
+ if (s == "BREAKING") return Priority::BREAKING;
+ return Priority::ROUTINE;
+}
+
+static QString sentiment_str(Sentiment s) {
+ switch (s) {
+ case Sentiment::BULLISH: return "BULLISH";
+ case Sentiment::BEARISH: return "BEARISH";
+ default: return "NEUTRAL";
+ }
+}
+
+static Sentiment sentiment_from(const QString& s) {
+ if (s == "BULLISH") return Sentiment::BULLISH;
+ if (s == "BEARISH") return Sentiment::BEARISH;
+ return Sentiment::NEUTRAL;
+}
+
+static QString impact_str(Impact i) {
+ switch (i) {
+ case Impact::HIGH: return "HIGH";
+ case Impact::MEDIUM: return "MEDIUM";
+ default: return "LOW";
+ }
+}
+
+static Impact impact_from(const QString& s) {
+ if (s == "HIGH") return Impact::HIGH;
+ if (s == "MEDIUM") return Impact::MEDIUM;
+ return Impact::LOW;
+}
+
+static QString threat_level_str(ThreatLevel l) {
+ switch (l) {
+ case ThreatLevel::CRITICAL: return "CRITICAL";
+ case ThreatLevel::HIGH: return "HIGH";
+ case ThreatLevel::MEDIUM: return "MEDIUM";
+ case ThreatLevel::LOW: return "LOW";
+ default: return "INFO";
+ }
+}
+
+static ThreatLevel threat_level_from(const QString& s) {
+ if (s == "CRITICAL") return ThreatLevel::CRITICAL;
+ if (s == "HIGH") return ThreatLevel::HIGH;
+ if (s == "MEDIUM") return ThreatLevel::MEDIUM;
+ if (s == "LOW") return ThreatLevel::LOW;
+ return ThreatLevel::INFO;
+}
+
+// ── Row mapper ───────────────────────────────────────────────────────────────
+
+NewsArticle NewsArticleRepository::map_row(QSqlQuery& q) {
+ NewsArticle a;
+ a.id = q.value(0).toString();
+ a.headline = q.value(1).toString();
+ a.summary = q.value(2).toString();
+ a.source = q.value(3).toString();
+ a.region = q.value(4).toString();
+ a.category = q.value(5).toString();
+ a.link = q.value(6).toString();
+ a.sort_ts = q.value(7).toLongLong();
+ a.priority = priority_from(q.value(8).toString());
+ a.sentiment = sentiment_from(q.value(9).toString());
+ a.impact = impact_from(q.value(10).toString());
+ a.tier = q.value(12).toInt();
+ a.lang = q.value(13).toString();
+ a.threat.level = threat_level_from(q.value(14).toString());
+ a.threat.category = q.value(15).toString();
+ a.threat.confidence = q.value(16).toDouble();
+ a.source_flag = static_cast<SourceFlag>(q.value(17).toInt());
+
+ // tickers: stored as JSON array string
+ const QString tickers_json = q.value(11).toString();
+ if (!tickers_json.isEmpty()) {
+ const QJsonArray arr = QJsonDocument::fromJson(tickers_json.toUtf8()).array();
+ for (const auto& v : arr)
+ a.tickers << v.toString();
+ }
+ return a;
+}
+
+// ── upsert_batch ─────────────────────────────────────────────────────────────
+
+Result<void> NewsArticleRepository::upsert_batch(const QVector<NewsArticle>& articles) {
+ if (articles.isEmpty())
+ return Result<void>::ok();
+
+ auto& database = db();
+ auto bt = database.begin_transaction();
+ if (bt.is_err())
+ return bt;
+
+ const QString sql =
+ "INSERT OR IGNORE INTO news_articles "
+ "(id, headline, summary, source, region, category, link, sort_ts, "
+ " priority, sentiment, impact, tickers, tier, lang, "
+ " threat_level, threat_cat, threat_conf, source_flag) "
+ "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+
+ int inserted = 0;
+ for (const auto& a : articles) {
+ QJsonArray tickers_arr;
+ for (const auto& t : a.tickers)
+ tickers_arr.append(t);
+ const QString tickers_json = QString::fromUtf8(
+ QJsonDocument(tickers_arr).toJson(QJsonDocument::Compact));
+
+ auto r = exec_write(sql, {
+ a.id,
+ a.headline,
+ a.summary,
+ a.source,
+ a.region,
+ a.category,
+ a.link,
+ static_cast<qint64>(a.sort_ts),
+ priority_str(a.priority),
+ sentiment_str(a.sentiment),
+ impact_str(a.impact),
+ tickers_json,
+ a.tier,
+ a.lang,
+ threat_level_str(a.threat.level),
+ a.threat.category,
+ a.threat.confidence,
+ static_cast<int>(a.source_flag)
+ });
+ if (r.is_ok())
+ ++inserted;
+ }
+
+ auto ct = database.commit();
+ if (ct.is_err()) {
+ database.rollback();
+ return ct;
+ }
+
+ LOG_DEBUG("NewsArticleRepo",
+ QString("upsert_batch: %1 new / %2 total").arg(inserted).arg(articles.size()));
+ return Result<void>::ok();
+}
+
+// ── load_recent ──────────────────────────────────────────────────────────────
+
+Result<QVector<NewsArticle>> NewsArticleRepository::load_recent(int64_t since_ts,
+ const QString& category,
+ int limit) const {
+ if (category.isEmpty()) {
+ return query_list(
+ "SELECT id, headline, summary, source, region, category, link, sort_ts, "
+ " priority, sentiment, impact, tickers, tier, lang, "
+ " threat_level, threat_cat, threat_conf, source_flag "
+ "FROM news_articles WHERE sort_ts >= ? ORDER BY sort_ts DESC LIMIT ?",
+ {static_cast<qint64>(since_ts), limit},
+ map_row);
+ }
+ return query_list(
+ "SELECT id, headline, summary, source, region, category, link, sort_ts, "
+ " priority, sentiment, impact, tickers, tier, lang, "
+ " threat_level, threat_cat, threat_conf, source_flag "
+ "FROM news_articles WHERE sort_ts >= ? AND category = ? ORDER BY sort_ts DESC LIMIT ?",
+ {static_cast<qint64>(since_ts), category, limit},
+ map_row);
+}
+
+// ── count ────────────────────────────────────────────────────────────────────
+
+int NewsArticleRepository::count() const {
+ auto r = db().execute("SELECT COUNT(*) FROM news_articles", {});
+ if (r.is_err())
+ return 0;
+ auto& q = r.value();
+ return q.next() ? q.value(0).toInt() : 0;
+}
+
+// ── prune_older_than ─────────────────────────────────────────────────────────
+
+Result<void> NewsArticleRepository::prune_older_than(int64_t cutoff_ts) {
+ return exec_write("DELETE FROM news_articles WHERE sort_ts < ?",
+ {static_cast<qint64>(cutoff_ts)});
+}
+
+// ── ensure_seen_column ───────────────────────────────────────────────────────
+
+void NewsArticleRepository::ensure_seen_column() {
+ // ALTER TABLE IF NOT EXISTS is not supported in older SQLite — use a
+ // pragma to check if the column already exists before adding it.
+ auto r = db().execute("PRAGMA table_info(news_articles)", {});
+ if (r.is_err())
+ return;
+ auto& q = r.value();
+ bool has_seen_at = false;
+ while (q.next()) {
+ if (q.value(1).toString() == "seen_at") {
+ has_seen_at = true;
+ break;
+ }
+ }
+ if (!has_seen_at)
+ exec_raw("ALTER TABLE news_articles ADD COLUMN seen_at INTEGER");
+}
+
+// ── mark_seen ────────────────────────────────────────────────────────────────
+
+Result<void> NewsArticleRepository::mark_seen(const QString& id) {
+ return exec_write(
+ "UPDATE news_articles SET seen_at = ? WHERE id = ? AND seen_at IS NULL",
+ {static_cast<qint64>(QDateTime::currentSecsSinceEpoch()), id});
+}
+
+// ── ensure_saved_column ───────────────────────────────────────────────────────
+
+void NewsArticleRepository::ensure_saved_column() {
+ auto r = db().execute("PRAGMA table_info(news_articles)", {});
+ if (r.is_err())
+ return;
+ auto& q = r.value();
+ bool has_saved = false;
+ while (q.next()) {
+ if (q.value(1).toString() == "saved") {
+ has_saved = true;
+ break;
+ }
+ }
+ if (!has_saved)
+ exec_raw("ALTER TABLE news_articles ADD COLUMN saved INTEGER DEFAULT 0");
+}
+
+// ── toggle_saved ──────────────────────────────────────────────────────────────
+
+Result<bool> NewsArticleRepository::toggle_saved(const QString& id) {
+ // Read current state
+ auto r = db().execute("SELECT saved FROM news_articles WHERE id = ?", {id});
+ if (r.is_err())
+ return Result<bool>::err(r.error());
+ auto& q = r.value();
+ if (!q.next())
+ return Result<bool>::err("Article not found");
+ bool currently_saved = q.value(0).toInt() != 0;
+ bool new_state = !currently_saved;
+ auto wr = exec_write("UPDATE news_articles SET saved = ? WHERE id = ?",
+ {new_state ? 1 : 0, id});
+ if (wr.is_err())
+ return Result<bool>::err(wr.error());
+ return Result<bool>::ok(new_state);
+}
+
+// ── load_saved ────────────────────────────────────────────────────────────────
+
+Result<QVector<fincept::services::NewsArticle>> NewsArticleRepository::load_saved() const {
+ return query_list(
+ "SELECT id, headline, summary, source, region, category, link, sort_ts, "
+ " priority, sentiment, impact, tickers, tier, lang, "
+ " threat_level, threat_cat, threat_conf, source_flag "
+ "FROM news_articles WHERE saved = 1 ORDER BY sort_ts DESC",
+ {},
+ map_row);
+}
+
+// ── search_fts ────────────────────────────────────────────────────────────────
+
+Result<QVector<fincept::services::NewsArticle>> NewsArticleRepository::search_fts(
+ const QString& query, int64_t since_ts, int limit) const {
+
+ // Escape FTS special characters to prevent query parse errors
+ QString safe = query;
+ safe.replace('"', ' ');
+
+ // Try FTS5 path first
+ const QString fts_sql =
+ since_ts > 0
+ ? "SELECT a.id, a.headline, a.summary, a.source, a.region, a.category, a.link, a.sort_ts,"
+ " a.priority, a.sentiment, a.impact, a.tickers, a.tier, a.lang,"
+ " a.threat_level, a.threat_cat, a.threat_conf, a.source_flag"
+ " FROM news_fts f"
+ " JOIN news_articles a ON a.id = f.id"
+ " WHERE news_fts MATCH ? AND a.sort_ts >= ?"
+ " ORDER BY rank LIMIT ?"
+ : "SELECT a.id, a.headline, a.summary, a.source, a.region, a.category, a.link, a.sort_ts,"
+ " a.priority, a.sentiment, a.impact, a.tickers, a.tier, a.lang,"
+ " a.threat_level, a.threat_cat, a.threat_conf, a.source_flag"
+ " FROM news_fts f"
+ " JOIN news_articles a ON a.id = f.id"
+ " WHERE news_fts MATCH ?"
+ " ORDER BY rank LIMIT ?";
+
+ QVariantList params;
+ params << safe;
+ if (since_ts > 0)
+ params << static_cast<qint64>(since_ts);
+ params << limit;
+
+ auto r = db().execute(fts_sql, params);
+ if (r.is_ok()) {
+ QVector<fincept::services::NewsArticle> result;
+ auto& q = r.value();
+ while (q.next())
+ result.append(map_row(q));
+ return Result<QVector<fincept::services::NewsArticle>>::ok(std::move(result));
+ }
+
+ // Fallback: LIKE scan (FTS table may not exist on old DB)
+ LOG_WARN("NewsArticleRepo", "FTS5 unavailable, falling back to LIKE scan");
+ const QString like = "%" + query + "%";
+ const QString like_sql =
+ since_ts > 0
+ ? "SELECT id, headline, summary, source, region, category, link, sort_ts,"
+ " priority, sentiment, impact, tickers, tier, lang,"
+ " threat_level, threat_cat, threat_conf, source_flag"
+ " FROM news_articles"
+ " WHERE (headline LIKE ? OR summary LIKE ?) AND sort_ts >= ?"
+ " ORDER BY sort_ts DESC LIMIT ?"
+ : "SELECT id, headline, summary, source, region, category, link, sort_ts,"
+ " priority, sentiment, impact, tickers, tier, lang,"
+ " threat_level, threat_cat, threat_conf, source_flag"
+ " FROM news_articles"
+ " WHERE headline LIKE ? OR summary LIKE ?"
+ " ORDER BY sort_ts DESC LIMIT ?";
+
+ QVariantList like_params;
+ like_params << like << like;
+ if (since_ts > 0)
+ like_params << static_cast<qint64>(since_ts);
+ like_params << limit;
+
+ return query_list(like_sql, like_params, map_row);
+}
+
+// ── load_seen_ids ─────────────────────────────────────────────────────────────
+
+Result<QSet<QString>> NewsArticleRepository::load_seen_ids(int64_t since_ts) const {
+ auto r = db().execute(
+ since_ts > 0
+ ? "SELECT id FROM news_articles WHERE seen_at IS NOT NULL AND sort_ts >= ?"
+ : "SELECT id FROM news_articles WHERE seen_at IS NOT NULL",
+ since_ts > 0 ? QVariantList{static_cast<qint64>(since_ts)} : QVariantList{});
+ if (r.is_err())
+ return Result<QSet<QString>>::err(r.error());
+ QSet<QString> ids;
+ auto& q = r.value();
+ while (q.next())
+ ids.insert(q.value(0).toString());
+ return Result<QSet<QString>>::ok(std::move(ids));
+}
+
+} // namespace fincept
diff --git a/fincept-qt/src/storage/repositories/NewsArticleRepository.h b/fincept-qt/src/storage/repositories/NewsArticleRepository.h
new file mode 100644
index 000000000..7fa2562f2
--- /dev/null
+++ b/fincept-qt/src/storage/repositories/NewsArticleRepository.h
@@ -0,0 +1,63 @@
+#pragma once
+#include "services/news/NewsService.h"
+#include "storage/repositories/BaseRepository.h"
+
+#include <cstdint>
+
+namespace fincept {
+
+/// Persists NewsArticle records to the news_articles SQLite table.
+/// INSERT OR IGNORE keeps the first-seen enriched copy; duplicates are skipped.
+class NewsArticleRepository : public BaseRepository<fincept::services::NewsArticle> {
+ public:
+ static NewsArticleRepository& instance();
+
+ /// Insert a batch of articles; ignores duplicates (same id).
+ /// Call this off the UI thread — wraps in a single transaction for speed.
+ Result<void> upsert_batch(const QVector<fincept::services::NewsArticle>& articles);
+
+ /// Load articles newer than since_ts (unix seconds).
+ /// Optional category filter ("" = all). Ordered newest-first.
+ Result<QVector<fincept::services::NewsArticle>> load_recent(int64_t since_ts,
+ const QString& category = {},
+ int limit = 2000) const;
+
+ /// Total number of stored articles.
+ int count() const;
+
+ /// Delete articles older than cutoff_ts (unix seconds).
+ Result<void> prune_older_than(int64_t cutoff_ts);
+
+ /// Mark an article as read (sets seen_at = now). No-op if already seen.
+ Result<void> mark_seen(const QString& id);
+
+ /// Return all article IDs seen since since_ts (unix seconds).
+ /// Pass 0 to load all. Used to pre-populate the feed model on startup.
+ Result<QSet<QString>> load_seen_ids(int64_t since_ts = 0) const;
+
+ /// Ensure the seen_at column exists (idempotent ALTER TABLE).
+ /// Called once at startup before any seen operations.
+ void ensure_seen_column();
+
+ /// Toggle bookmark state for an article. Returns the new saved state.
+ Result<bool> toggle_saved(const QString& id);
+
+ /// Return all bookmarked articles, newest first.
+ Result<QVector<fincept::services::NewsArticle>> load_saved() const;
+
+ /// Ensure the saved column exists (idempotent ALTER TABLE).
+ void ensure_saved_column();
+
+ /// Full-text search over headline + summary using the FTS5 index.
+ /// Returns matching articles ordered by FTS rank (best match first).
+ /// Falls back to LIKE scan if FTS table is unavailable.
+ Result<QVector<fincept::services::NewsArticle>> search_fts(const QString& query,
+ int64_t since_ts = 0,
+ int limit = 500) const;
+
+ private:
+ NewsArticleRepository() = default;
+ static fincept::services::NewsArticle map_row(QSqlQuery& q);
+};
+
+} // namespace fincept
diff --git a/fincept-qt/src/storage/sqlite/migrations/MigrationRunner.h b/fincept-qt/src/storage/sqlite/migrations/MigrationRunner.h
index 6d0170efa..0dc6bf5e8 100644
--- a/fincept-qt/src/storage/sqlite/migrations/MigrationRunner.h
+++ b/fincept-qt/src/storage/sqlite/migrations/MigrationRunner.h
@@ -59,5 +59,6 @@ void register_migration_v009();
void register_migration_v010();
void register_migration_v011();
void register_migration_v012();
+void register_migration_v013();
} // namespace fincept
diff --git a/fincept-qt/src/storage/sqlite/migrations/v013_news_articles.cpp b/fincept-qt/src/storage/sqlite/migrations/v013_news_articles.cpp
new file mode 100644
index 000000000..6656c2ba4
--- /dev/null
+++ b/fincept-qt/src/storage/sqlite/migrations/v013_news_articles.cpp
@@ -0,0 +1,113 @@
+// v013_news_articles — Persistent news article storage.
+// Stores all fetched RSS articles so history is retained across refreshes.
+
+#include "storage/sqlite/migrations/MigrationRunner.h"
+
+#include <QSqlError>
+#include <QSqlQuery>
+
+namespace fincept {
+namespace {
+
+static Result<void> sql(QSqlDatabase& db, const char* stmt) {
+ QSqlQuery q(db);
+ if (!q.exec(stmt))
+ return Result<void>::err(q.lastError().text().toStdString());
+ return Result<void>::ok();
+}
+
+Result<void> apply_v013(QSqlDatabase& db) {
+
+ // ── Persistent article store ───────────────────────────────────────────────
+ auto r = sql(db, "CREATE TABLE IF NOT EXISTS news_articles ("
+ " id TEXT PRIMARY KEY,"
+ " headline TEXT NOT NULL,"
+ " summary TEXT,"
+ " source TEXT,"
+ " region TEXT,"
+ " category TEXT,"
+ " link TEXT,"
+ " sort_ts INTEGER,"
+ " priority TEXT,"
+ " sentiment TEXT,"
+ " impact TEXT,"
+ " tickers TEXT," // JSON array ["AAPL","MSFT"]
+ " tier INTEGER DEFAULT 4,"
+ " lang TEXT,"
+ " threat_level TEXT,"
+ " threat_cat TEXT,"
+ " threat_conf REAL DEFAULT 0,"
+ " source_flag INTEGER DEFAULT 0,"
+ " fetched_at INTEGER DEFAULT (strftime('%s','now'))"
+ ")");
+ if (r.is_err())
+ return r;
+
+ r = sql(db, "CREATE INDEX IF NOT EXISTS idx_news_articles_sort_ts "
+ "ON news_articles(sort_ts DESC)");
+ if (r.is_err())
+ return r;
+
+ r = sql(db, "CREATE INDEX IF NOT EXISTS idx_news_articles_category "
+ "ON news_articles(category)");
+ if (r.is_err())
+ return r;
+
+ r = sql(db, "CREATE INDEX IF NOT EXISTS idx_news_articles_source "
+ "ON news_articles(source)");
+ if (r.is_err())
+ return r;
+
+ // ── FTS5 full-text search over headline + summary ─────────────────────────
+ // content= keeps the FTS index in sync with news_articles automatically.
+ // tokenize=porter enables stemming (search "inflation" matches "inflationary").
+ r = sql(db, "CREATE VIRTUAL TABLE IF NOT EXISTS news_fts USING fts5("
+ " id UNINDEXED,"
+ " headline,"
+ " summary,"
+ " source UNINDEXED,"
+ " content='news_articles',"
+ " content_rowid='rowid',"
+ " tokenize='porter unicode61'"
+ ")");
+ if (r.is_err())
+ return r;
+
+ // Triggers to keep FTS in sync with base table inserts/deletes
+ r = sql(db, "CREATE TRIGGER IF NOT EXISTS news_fts_ai AFTER INSERT ON news_articles BEGIN"
+ " INSERT INTO news_fts(rowid, id, headline, summary, source)"
+ " VALUES (new.rowid, new.id, new.headline, new.summary, new.source);"
+ "END");
+ if (r.is_err())
+ return r;
+
+ r = sql(db, "CREATE TRIGGER IF NOT EXISTS news_fts_ad AFTER DELETE ON news_articles BEGIN"
+ " INSERT INTO news_fts(news_fts, rowid, id, headline, summary, source)"
+ " VALUES ('delete', old.rowid, old.id, old.headline, old.summary, old.source);"
+ "END");
+ if (r.is_err())
+ return r;
+
+ r = sql(db, "CREATE TRIGGER IF NOT EXISTS news_fts_au AFTER UPDATE ON news_articles BEGIN"
+ " INSERT INTO news_fts(news_fts, rowid, id, headline, summary, source)"
+ " VALUES ('delete', old.rowid, old.id, old.headline, old.summary, old.source);"
+ " INSERT INTO news_fts(rowid, id, headline, summary, source)"
+ " VALUES (new.rowid, new.id, new.headline, new.summary, new.source);"
+ "END");
+ if (r.is_err())
+ return r;
+
+ return Result<void>::ok();
+}
+
+} // anonymous namespace
+
+void register_migration_v013() {
+ static bool done = false;
+ if (done)
+ return;
+ done = true;
+ MigrationRunner::register_migration({13, "news_articles", apply_v013});
+}
+
+} // namespace fincept
diff --git a/fincept-qt/src/trading/ExchangeService.cpp b/fincept-qt/src/trading/ExchangeService.cpp
index 950382cf2..b1be9c20e 100644
--- a/fincept-qt/src/trading/ExchangeService.cpp
+++ b/fincept-qt/src/trading/ExchangeService.cpp
@@ -242,6 +242,7 @@ void ExchangeService::poll_prices() {
}
}
+ LOG_DEBUG("ExchangeService", QString("Poll complete: %1 tickers updated").arg(results.size()));
self->poll_in_progress_ = false;
},
Qt::QueuedConnection);
@@ -324,7 +325,7 @@ void ExchangeService::start_daemon() {
if (daemon_process_) {
QString err = QString::fromUtf8(daemon_process_->readAllStandardError()).trimmed();
if (!err.isEmpty())
- LOG_WARN(TAG, "Daemon stderr: " + err);
+ LOG_DEBUG(TAG, "Daemon stderr: " + err);
}
});
connect(daemon_process_, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this,
diff --git a/fincept-qt/src/ui/navigation/FKeyBar.cpp b/fincept-qt/src/ui/navigation/FKeyBar.cpp
index eae2c04cc..99fbca8f0 100644
--- a/fincept-qt/src/ui/navigation/FKeyBar.cpp
+++ b/fincept-qt/src/ui/navigation/FKeyBar.cpp
@@ -15,21 +15,20 @@ TabBar::TabBar(QWidget* parent) : QWidget(parent) {
auto* container = new QWidget;
tab_layout_ = new QHBoxLayout(container);
tab_layout_->setContentsMargins(4, 0, 4, 0);
- tab_layout_->setSpacing(0);
+ tab_layout_->setSpacing(2);
- // All 14 tabs matching Tauri's tab bar
QVector<TabDef> tabs = {
{"dashboard", "DASHBOARD"},
{"markets", "MARKETS"},
- {"crypto_trading", "CRYPTO TRADING"},
+ {"crypto_trading", "CRYPTO"},
{"portfolio", "PORTFOLIO"},
{"news", "NEWS"},
{"ai_chat", "AI CHAT"},
- {"backtesting", "BACKTESTING"},
- {"algo_trading", "ALGO TRADING"},
- {"node_editor", "NODE EDITOR"},
- {"code_editor", "CODE EDITOR"},
- {"ai_quant_lab", "AI QUANT LAB"},
+ {"backtesting", "BACKTEST"},
+ {"algo_trading", "ALGO"},
+ {"node_editor", "NODES"},
+ {"code_editor", "CODE"},
+ {"ai_quant_lab", "QUANT LAB"},
{"quantlib", "QUANTLIB"},
{"forum", "FORUM"},
{"settings", "SETTINGS"},
@@ -47,9 +46,10 @@ TabBar::TabBar(QWidget* parent) : QWidget(parent) {
void TabBar::add_tab(const TabDef& def) {
auto* btn = new QPushButton(def.label);
btn->setFixedHeight(32);
- btn->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+ btn->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
btn->setCursor(Qt::PointingHandCursor);
btn->setProperty("tab_id", def.id);
+ btn->setToolTip(def.label);
connect(btn, &QPushButton::clicked, this, [this, id = def.id]() {
set_active(id);
emit tab_changed(id);
@@ -69,11 +69,9 @@ void TabBar::update_styles() {
for (auto* btn : tab_buttons_) {
bool active = btn->property("tab_id").toString() == active_id_;
btn->setStyleSheet(active ? "QPushButton{background:#b45309;color:#e5e5e5;border:1px solid #4d3300;"
- "padding:0 12px;font-size:13px;font-weight:600;letter-spacing:1px;"
- "font-family:'Consolas',monospace;}"
+ "padding:0 8px;font-weight:600;letter-spacing:0.5px;}"
: "QPushButton{background:transparent;color:#ffffff;border:none;"
- "padding:0 12px;font-size:13px;letter-spacing:0.5px;"
- "font-family:'Consolas',monospace;}"
+ "padding:0 8px;letter-spacing:0.5px;}"
"QPushButton:hover{color:#d97706;background:#111111;}");
}
}
diff --git a/fincept-qt/src/ui/navigation/NavigationBar.cpp b/fincept-qt/src/ui/navigation/NavigationBar.cpp
index cb7e99650..c5d3e197d 100644
--- a/fincept-qt/src/ui/navigation/NavigationBar.cpp
+++ b/fincept-qt/src/ui/navigation/NavigationBar.cpp
@@ -14,40 +14,38 @@ NavigationBar::NavigationBar(QWidget* parent) : QWidget(parent) {
hl->setContentsMargins(14, 0, 14, 0);
hl->setSpacing(0);
- auto mk = [](const QString& t, const QString& c, int sz = 14, bool b = false) {
+ auto mk = [](const QString& t, const QString& c, bool b = false) {
auto* l = new QLabel(t);
- l->setStyleSheet(QString("color:%1;font-size:%2px;%3background:transparent;"
- "font-family:'Consolas',monospace;")
+ l->setStyleSheet(QString("color:%1;%2background:transparent;")
.arg(c)
- .arg(sz)
.arg(b ? "font-weight:700;" : ""));
return l;
};
- hl->addWidget(mk("FINCEPT", "#d97706", 16, true));
- hl->addWidget(mk("TERMINAL", "#ffffff", 14));
- hl->addWidget(mk(" ", "#000"));
- hl->addWidget(mk("\xe2\x97\x8f", "#16a34a", 10));
- hl->addWidget(mk(" LIVE", "#16a34a", 13, true));
+ hl->addWidget(mk("FINCEPT", "#d97706", true));
+ hl->addWidget(mk("TERMINAL", "#ffffff"));
+ hl->addWidget(mk(" ", "#000000"));
+ hl->addWidget(mk("\xe2\x97\x8f", "#16a34a"));
+ hl->addWidget(mk(" LIVE", "#16a34a", true));
hl->addStretch();
- clock_label_ = mk("", "#404040", 13);
+ clock_label_ = mk("", "#404040");
hl->addWidget(clock_label_);
hl->addStretch();
- user_label_ = mk("---", "#d97706", 13);
+ user_label_ = mk("---", "#d97706");
hl->addWidget(user_label_);
- hl->addWidget(mk(" | ", "#1a1a1a", 13));
- credits_label_ = mk("---", "#16a34a", 13);
+ hl->addWidget(mk(" | ", "#1a1a1a"));
+ credits_label_ = mk("---", "#16a34a");
hl->addWidget(credits_label_);
- hl->addWidget(mk(" | ", "#1a1a1a", 13));
- plan_label_ = mk("---", "#ffffff", 13);
+ hl->addWidget(mk(" | ", "#1a1a1a"));
+ plan_label_ = mk("---", "#ffffff");
hl->addWidget(plan_label_);
- hl->addWidget(mk(" | ", "#1a1a1a", 13));
+ hl->addWidget(mk(" | ", "#1a1a1a"));
auto* logout_btn = new QPushButton("LOGOUT");
logout_btn->setFixedHeight(24);
logout_btn->setCursor(Qt::PointingHandCursor);
logout_btn->setStyleSheet("QPushButton{background:transparent;color:#dc2626;border:1px solid #7f1d1d;"
- "padding:0 10px;font-size:12px;font-weight:700;font-family:'Consolas',monospace;}"
+ "padding:0 10px;font-weight:700;}"
"QPushButton:hover{background:#dc2626;color:#e5e5e5;border-color:#dc2626;}");
connect(logout_btn, &QPushButton::clicked, this, &NavigationBar::logout_clicked);
hl->addWidget(logout_btn);
@@ -78,7 +76,7 @@ void NavigationBar::refresh_user_display() {
user_label_->setText(s.user_info.username.isEmpty() ? s.user_info.email : s.user_info.username);
credits_label_->setText(QString("%1 CR").arg(s.user_info.credit_balance, 0, 'f', 2));
credits_label_->setStyleSheet(
- QString("color:%1;font-size:13px;background:transparent;font-family:'Consolas',monospace;")
+ QString("color:%1;background:transparent;")
.arg(s.user_info.credit_balance > 0 ? "#16a34a" : "#dc2626"));
plan_label_->setText(s.account_type().toUpper());
}
diff --git a/fincept-qt/src/ui/navigation/ToolBar.cpp b/fincept-qt/src/ui/navigation/ToolBar.cpp
index dd5b6a3d4..375e51d61 100644
--- a/fincept-qt/src/ui/navigation/ToolBar.cpp
+++ b/fincept-qt/src/ui/navigation/ToolBar.cpp
@@ -4,31 +4,30 @@
#include <QAction>
#include <QDateTime>
+#include <QFontMetrics>
#include <QHBoxLayout>
#include <QPushButton>
#include <QResizeEvent>
namespace fincept::ui {
-static const char* MENU_SS = "QMenuBar{background:transparent;color:#808080;border:none;font-size:13px;"
- "font-family:'Consolas',monospace;spacing:0;}"
+static const char* MENU_SS = "QMenuBar{background:transparent;color:#808080;border:none;"
+ "spacing:0;}"
"QMenuBar::item{background:transparent;padding:4px 10px;}"
"QMenuBar::item:selected{background:#1a1a1a;color:#e5e5e5;}";
static const char* POPUP_SS = "QMenu{background:#0a0a0a;color:#e5e5e5;border:1px solid #1a1a1a;"
- "font-size:13px;font-family:'Consolas',monospace;padding:4px 0;}"
+ "padding:4px 0;}"
"QMenu::item{padding:5px 24px 5px 12px;}"
"QMenu::item:selected{background:#1a1a1a;}"
"QMenu::item:disabled{color:#404040;}"
"QMenu::separator{background:#1a1a1a;height:1px;margin:4px 8px;}";
-static const char* MF = "font-family:'Consolas',monospace;";
-
ToolBar::ToolBar(QWidget* parent) : QWidget(parent) {
setFixedHeight(32);
setStyleSheet("background:#0a0a0a;border-bottom:1px solid #1a1a1a;");
auto* hl = new QHBoxLayout(this);
- hl->setContentsMargins(4, 0, 10, 0);
+ hl->setContentsMargins(4, 0, 6, 0);
hl->setSpacing(0);
// Menus
@@ -40,77 +39,90 @@ ToolBar::ToolBar(QWidget* parent) : QWidget(parent) {
menu_bar_->addMenu(build_help_menu());
hl->addWidget(menu_bar_);
- // Command bar — shrinks gracefully, min 120 max 260
+ // Command bar — shrinks gracefully
command_bar_ = new CommandBar(this);
- command_bar_->setMinimumWidth(120);
- command_bar_->setMaximumWidth(260);
+ command_bar_->setMinimumWidth(80);
+ command_bar_->setMaximumWidth(240);
command_bar_->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
connect(command_bar_, &CommandBar::navigate_to, this, &ToolBar::navigate_to);
hl->addWidget(command_bar_);
- auto sep = [&]() {
+ auto sep = [&]() -> QLabel* {
auto* s = new QLabel("|");
- s->setStyleSheet("color:#333333;font-size:13px;background:transparent;padding:0 4px;");
+ s->setStyleSheet("color:#333333;background:transparent;padding:0 3px;");
s->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
hl->addWidget(s);
+ separators_.append(s);
+ return s;
};
- auto mk = [](const QString& t, const QString& c, int sz = 13, bool b = false) -> QLabel* {
+ auto mk = [](const QString& t, const QString& c, bool b = false) -> QLabel* {
auto* l = new QLabel(t);
- l->setStyleSheet(QString("color:%1;font-size:%2px;%3background:transparent;%4")
+ l->setStyleSheet(QString("color:%1;%2background:transparent;")
.arg(c)
- .arg(sz)
- .arg(b ? "font-weight:700;" : "")
- .arg(MF));
+ .arg(b ? "font-weight:700;" : ""));
l->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
return l;
};
sep();
- hl->addWidget(mk("FINCEPT ", "#d97706", 14, true));
- hl->addWidget(mk("TERMINAL", "#e5e5e5", 14, true));
- // subtitle — hidden below ~900px effective width via stretch absorbing
- subtitle_label_ = mk(" | PROFESSIONAL RESEARCH DESK", "#666666", 11);
- subtitle_label_->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+ auto* fincept_lbl = mk("FINCEPT ", "#d97706", true);
+ hl->addWidget(fincept_lbl);
+ branding_label_ = mk("TERMINAL", "#e5e5e5", true);
+ hl->addWidget(branding_label_);
+ subtitle_label_ = mk(" | PROFESSIONAL RESEARCH DESK", "#666666");
hl->addWidget(subtitle_label_);
- hl->addWidget(mk(" ", "#000"));
- hl->addWidget(mk("\xe2\x97\x8f", "#16a34a", 9));
- hl->addWidget(mk(" LIVE", "#16a34a", 11, true));
+ hl->addWidget(mk(" ", "#000000"));
+ live_dot_ = mk("\xe2\x97\x8f", "#16a34a");
+ hl->addWidget(live_dot_);
+ live_label_ = mk(" LIVE", "#16a34a", true);
+ hl->addWidget(live_label_);
hl->addStretch(1);
- clock_label_ = mk("", "#ffffff", 12);
- clock_label_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- clock_label_->setMinimumWidth(160);
+ clock_label_ = mk("", "#ffffff");
+ clock_label_->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
hl->addWidget(clock_label_);
hl->addStretch(1);
- user_label_ = mk("---", "#d97706", 12);
- user_label_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ user_label_ = mk("---", "#d97706");
+ user_label_->setMaximumWidth(120);
hl->addWidget(user_label_);
sep();
- credits_label_ = mk("---", "#16a34a", 12);
- credits_label_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ credits_label_ = mk("---", "#16a34a");
+ credits_label_->setMaximumWidth(100);
hl->addWidget(credits_label_);
sep();
plan_btn_ = new QPushButton("---");
plan_btn_->setCursor(Qt::PointingHandCursor);
plan_btn_->setToolTip("View Plans & Pricing");
plan_btn_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- plan_btn_->setStyleSheet("QPushButton{color:#ffffff;font-size:12px;background:transparent;border:none;"
- "font-family:'Consolas',monospace;padding:0 2px;}"
+ plan_btn_->setStyleSheet("QPushButton{color:#ffffff;background:transparent;border:none;padding:0 2px;}"
"QPushButton:hover{color:#d97706;}");
connect(plan_btn_, &QPushButton::clicked, this, &ToolBar::plan_clicked);
hl->addWidget(plan_btn_);
sep();
+ chat_mode_btn_ = new QPushButton("⬡ CHAT");
+ chat_mode_btn_->setFixedHeight(20);
+ chat_mode_btn_->setCursor(Qt::PointingHandCursor);
+ chat_mode_btn_->setToolTip("Switch to Chat Mode (F9)");
+ chat_mode_btn_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ chat_mode_btn_->setStyleSheet(
+ "QPushButton{background:transparent;color:#d97706;border:1px solid #7a4700;"
+ "padding:0 8px;font-weight:700;}"
+ "QPushButton:hover{background:#7a4700;color:#fff;border-color:#d97706;}");
+ connect(chat_mode_btn_, &QPushButton::clicked, this, &ToolBar::chat_mode_toggled);
+ hl->addWidget(chat_mode_btn_);
+ sep();
+
auto* logout_btn = new QPushButton("LOGOUT");
logout_btn->setFixedHeight(20);
logout_btn->setCursor(Qt::PointingHandCursor);
logout_btn->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
logout_btn->setStyleSheet("QPushButton{background:transparent;color:#dc2626;border:1px solid #7f1d1d;"
- "padding:0 8px;font-size:11px;font-weight:700;font-family:'Consolas',monospace;}"
+ "padding:0 8px;font-weight:700;}"
"QPushButton:hover{background:#dc2626;color:#e5e5e5;border-color:#dc2626;}");
connect(logout_btn, &QPushButton::clicked, this, &ToolBar::logout_clicked);
hl->addWidget(logout_btn);
@@ -128,14 +140,42 @@ ToolBar::ToolBar(QWidget* parent) : QWidget(parent) {
void ToolBar::resizeEvent(QResizeEvent* e) {
QWidget::resizeEvent(e);
- // Hide subtitle below 900px to prevent collisions
- if (subtitle_label_)
- subtitle_label_->setVisible(e->size().width() >= 900);
+ apply_responsive_layout(e->size().width());
+}
+
+void ToolBar::apply_responsive_layout(int w) {
+ // Progressive disclosure: hide less-critical elements as width shrinks
+ // >= 1200: everything visible
+ // >= 1000: hide subtitle
+ // >= 800: also hide clock, LIVE label
+ // >= 650: also hide credits, chat button
+ // < 650: minimal — menus + branding + user + plan + logout
+
+ bool show_subtitle = (w >= 1200);
+ bool show_clock = (w >= 800);
+ bool show_live = (w >= 800);
+ bool show_credits = (w >= 650);
+ bool show_chat = (w >= 650);
+
+ if (subtitle_label_) subtitle_label_->setVisible(show_subtitle);
+ if (clock_label_) clock_label_->setVisible(show_clock);
+ if (live_dot_) live_dot_->setVisible(show_live);
+ if (live_label_) live_label_->setVisible(show_live);
+ if (credits_label_) credits_label_->setVisible(show_credits);
+ if (chat_mode_btn_) chat_mode_btn_->setVisible(show_chat);
+
+ // Hide separators adjacent to hidden widgets — check each separator's neighbors
+ // Simple approach: hide seps 3 (after credits) and 4 (after plan/before chat)
+ // when their adjacent content is hidden
+ if (separators_.size() >= 5) {
+ separators_[2]->setVisible(show_credits); // sep before credits
+ separators_[3]->setVisible(show_chat); // sep before chat
+ }
}
void ToolBar::update_clock() {
auto dt = QDateTime::currentDateTime();
- clock_label_->setText(dt.toString("dd MMM yyyy").toUpper() + " " + dt.toString("HH:mm:ss"));
+ clock_label_->setText(dt.toString("dd MMM yy").toUpper() + " " + dt.toString("HH:mm:ss"));
}
void ToolBar::refresh_user_display() {
@@ -146,24 +186,30 @@ void ToolBar::refresh_user_display() {
plan_btn_->setText("---");
return;
}
- user_label_->setText(s.user_info.username.isEmpty() ? s.user_info.email : s.user_info.username);
- credits_label_->setText(QString("%1 CR").arg(s.user_info.credit_balance, 0, 'f', 2));
- credits_label_->setStyleSheet(QString("color:%1;font-size:12px;background:transparent;%2")
- .arg(s.user_info.credit_balance > 0 ? "#16a34a" : "#dc2626")
- .arg(MF));
+
+ // Elide username/email to fit within maxWidth
+ QString name = s.user_info.username.isEmpty() ? s.user_info.email : s.user_info.username;
+ QFontMetrics fm(user_label_->font());
+ user_label_->setText(fm.elidedText(name, Qt::ElideRight, user_label_->maximumWidth() - 4));
+ user_label_->setToolTip(name);
+
+ // Credits — compact format
+ int credits = static_cast<int>(s.user_info.credit_balance);
+ credits_label_->setText(QString("%1 CR").arg(credits));
+ credits_label_->setStyleSheet(QString("color:%1;background:transparent;")
+ .arg(s.user_info.credit_balance > 0 ? "#16a34a" : "#dc2626"));
QString plan_text = s.account_type().toUpper();
- if (!plan_text.isEmpty())
- plan_text += " Plan";
plan_btn_->setText(plan_text.isEmpty() ? "FREE" : plan_text);
}
QMenu* ToolBar::build_file_menu() {
auto* m = new QMenu("File", this);
m->setStyleSheet(POPUP_SS);
- m->addAction("New Workspace", this, [this]() { emit action_triggered("new_workspace"); });
- m->addAction("Open Workspace", this, [this]() { emit action_triggered("open_workspace"); });
- m->addAction("Save Workspace", this, [this]() { emit action_triggered("save_workspace"); });
+ m->addAction("New Workspace", this, [this]() { emit action_triggered("new_workspace"); });
+ m->addAction("Open Workspace", this, [this]() { emit action_triggered("open_workspace"); });
+ m->addAction("Save Workspace", this, [this]() { emit action_triggered("save_workspace"); });
+ m->addAction("Save Workspace As", this, [this]() { emit action_triggered("save_workspace_as"); });
m->addSeparator();
m->addAction("Import Data", this, [this]() { emit action_triggered("import_data"); });
m->addAction("Export Data", this, [this]() { emit action_triggered("export_data"); });
@@ -176,8 +222,7 @@ QMenu* ToolBar::build_file_menu() {
QMenu* ToolBar::build_navigate_menu() {
auto* m = new QMenu("Navigate", this);
- m->setStyleSheet("QMenu{background:#0a0a0a;color:#e5e5e5;border:1px solid #1a1a1a;"
- "font-size:13px;font-family:'Consolas',monospace;padding:2px 0;}"
+ m->setStyleSheet("QMenu{background:#0a0a0a;color:#e5e5e5;border:1px solid #1a1a1a;padding:2px 0;}"
"QMenu::item{padding:3px 20px 3px 10px;}"
"QMenu::item:selected{background:#1a1a1a;}"
"QMenu::item:disabled{color:#d97706;font-weight:700;padding:6px 10px 2px 10px;}"
diff --git a/fincept-qt/src/ui/navigation/ToolBar.h b/fincept-qt/src/ui/navigation/ToolBar.h
index d32672853..a1c0d51b8 100644
--- a/fincept-qt/src/ui/navigation/ToolBar.h
+++ b/fincept-qt/src/ui/navigation/ToolBar.h
@@ -24,6 +24,7 @@ class ToolBar : public QWidget {
void action_triggered(const QString& action);
void logout_clicked();
void plan_clicked();
+ void chat_mode_toggled();
protected:
void resizeEvent(QResizeEvent* e) override;
@@ -37,11 +38,18 @@ class ToolBar : public QWidget {
QLabel* user_label_ = nullptr;
QLabel* credits_label_ = nullptr;
QLabel* subtitle_label_ = nullptr;
+ QLabel* branding_label_ = nullptr;
+ QLabel* live_dot_ = nullptr;
+ QLabel* live_label_ = nullptr;
QPushButton* plan_btn_ = nullptr;
+ QPushButton* chat_mode_btn_ = nullptr;
QTimer* clock_timer_ = nullptr;
+ QVector<QLabel*> separators_;
CommandBar* command_bar_ = nullptr;
+ void apply_responsive_layout(int width);
+
QMenu* build_file_menu();
QMenu* build_navigate_menu();
QMenu* build_view_menu();
diff --git a/fincept-qt/src/ui/theme/ThemeManager.cpp b/fincept-qt/src/ui/theme/ThemeManager.cpp
index f782a8052..197778960 100644
--- a/fincept-qt/src/ui/theme/ThemeManager.cpp
+++ b/fincept-qt/src/ui/theme/ThemeManager.cpp
@@ -148,13 +148,7 @@ void ThemeManager::apply_accent(const QString& hex) {
void ThemeManager::apply_font(const QString& family, int size_px) {
font_family_ = family;
font_size_px_ = (size_px > 0) ? size_px : 14;
-
- QFont f(font_family_);
- f.setStyleHint(QFont::Monospace);
- f.setPixelSize(font_size_px_);
- qApp->setFont(f);
- // Also rebuild QSS so widgets with inline font-size rules get overridden by
- // the global * { font-size } rule — otherwise 178+ hardcoded rules win.
+ // rebuild_and_apply() will sync qApp->setFont() and QSS together.
rebuild_and_apply();
}
@@ -185,6 +179,15 @@ QFont ThemeManager::current_font() const {
}
void ThemeManager::rebuild_and_apply() {
+ // Keep qApp->font() in sync with our font_family_/font_size_px_ so that
+ // widgets using inline setStyleSheet() (which bypass QSS font inheritance)
+ // still render with the correct font.
+ QFont f(font_family_);
+ f.setStyleHint(QFont::Monospace);
+ f.setPixelSize(font_size_px_);
+ if (qApp->font() != f)
+ qApp->setFont(f);
+
QString qss = build_global_qss();
if (qss != cached_qss_) {
cached_qss_ = qss;
diff --git a/fincept-qt/src/ui/widgets/NotifBell.cpp b/fincept-qt/src/ui/widgets/NotifBell.cpp
new file mode 100644
index 000000000..fbadba92b
--- /dev/null
+++ b/fincept-qt/src/ui/widgets/NotifBell.cpp
@@ -0,0 +1,44 @@
+#include "ui/widgets/NotifBell.h"
+
+#include "services/notifications/NotificationService.h"
+#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
+
+namespace fincept::ui {
+
+NotifBell::NotifBell(QWidget* parent) : QPushButton(parent) {
+ setFlat(true);
+ setFixedHeight(20);
+ setCursor(Qt::PointingHandCursor);
+ update_label();
+
+ // Wire to service
+ connect(&fincept::notifications::NotificationService::instance(),
+ &fincept::notifications::NotificationService::unread_count_changed,
+ this, &NotifBell::set_unread);
+
+ connect(this, &QPushButton::clicked, this, &NotifBell::bell_clicked);
+}
+
+void NotifBell::set_unread(int count) {
+ unread_ = count;
+ update_label();
+}
+
+void NotifBell::update_label() {
+ const QString color = unread_ > 0 ? ui::colors::WARNING() : ui::colors::TEXT_SECONDARY();
+ const QString text = unread_ > 0
+ ? QString("ALERTS [%1]").arg(unread_)
+ : QString("ALERTS");
+
+ setText(text);
+ setStyleSheet(
+ QString("QPushButton { background: transparent; color: %1; border: none; "
+ "font-size: 11px; font-weight: %2; padding: 0 4px; }"
+ "QPushButton:hover { color: %3; }")
+ .arg(color,
+ unread_ > 0 ? "bold" : "normal",
+ QString(ui::colors::AMBER())));
+}
+
+} // namespace fincept::ui
diff --git a/fincept-qt/src/ui/widgets/NotifBell.h b/fincept-qt/src/ui/widgets/NotifBell.h
new file mode 100644
index 000000000..1f41c2f9b
--- /dev/null
+++ b/fincept-qt/src/ui/widgets/NotifBell.h
@@ -0,0 +1,23 @@
+#pragma once
+#include <QPushButton>
+
+namespace fincept::ui {
+
+/// Bell button with unread badge — lives in DashboardStatusBar.
+/// Connects to NotificationService::unread_count_changed to update badge.
+class NotifBell : public QPushButton {
+ Q_OBJECT
+ public:
+ explicit NotifBell(QWidget* parent = nullptr);
+
+ void set_unread(int count);
+
+ signals:
+ void bell_clicked();
+
+ private:
+ void update_label();
+ int unread_{0};
+};
+
+} // namespace fincept::ui
diff --git a/fincept-qt/src/ui/widgets/NotifPanel.cpp b/fincept-qt/src/ui/widgets/NotifPanel.cpp
new file mode 100644
index 000000000..6e51e5f2e
--- /dev/null
+++ b/fincept-qt/src/ui/widgets/NotifPanel.cpp
@@ -0,0 +1,172 @@
+#include "ui/widgets/NotifPanel.h"
+
+#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
+
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QScrollArea>
+#include <QShowEvent>
+#include <QVBoxLayout>
+
+namespace fincept::ui {
+
+using namespace fincept::notifications;
+
+NotifPanel::NotifPanel(QWidget* parent) : QFrame(parent, Qt::Popup | Qt::FramelessWindowHint) {
+ setFixedSize(PANEL_W, PANEL_H);
+ setStyleSheet(
+ QString("QFrame { background: %1; border: 1px solid %2; border-radius: 4px; }")
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_MED()));
+
+ auto* vl = new QVBoxLayout(this);
+ vl->setContentsMargins(0, 0, 0, 0);
+ vl->setSpacing(0);
+
+ // ── Header ────────────────────────────────────────────────────────────────
+ auto* header = new QWidget;
+ header->setFixedHeight(36);
+ header->setStyleSheet(
+ QString("background: %1; border-bottom: 1px solid %2;")
+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_MED()));
+
+ auto* hl = new QHBoxLayout(header);
+ hl->setContentsMargins(12, 0, 8, 0);
+
+ auto* title_lbl = new QLabel("NOTIFICATIONS");
+ title_lbl->setStyleSheet(
+ QString("color: %1; font-size: 11px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::AMBER()));
+ hl->addWidget(title_lbl);
+ hl->addStretch();
+
+ auto* mark_all_btn = new QPushButton("Mark all read");
+ mark_all_btn->setFlat(true);
+ mark_all_btn->setStyleSheet(
+ QString("QPushButton { color: %1; background: transparent; border: none; font-size: 11px; }"
+ "QPushButton:hover { color: %2; }")
+ .arg(ui::colors::TEXT_SECONDARY(), ui::colors::AMBER()));
+ connect(mark_all_btn, &QPushButton::clicked, this, [this]() {
+ NotificationService::instance().mark_all_read();
+ refresh();
+ });
+ hl->addWidget(mark_all_btn);
+ vl->addWidget(header);
+
+ // ── Scroll area ───────────────────────────────────────────────────────────
+ scroll_ = new QScrollArea;
+ scroll_->setWidgetResizable(true);
+ scroll_->setFrameShape(QFrame::NoFrame);
+ scroll_->setStyleSheet(
+ QString("QScrollArea { background: transparent; border: none; }"
+ "QScrollBar:vertical { background: %1; width: 4px; }"
+ "QScrollBar::handle:vertical { background: %2; }")
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_MED()));
+
+ list_container_ = new QWidget;
+ list_container_->setStyleSheet("background: transparent;");
+ list_layout_ = new QVBoxLayout(list_container_);
+ list_layout_->setContentsMargins(0, 0, 0, 0);
+ list_layout_->setSpacing(0);
+ list_layout_->addStretch();
+
+ scroll_->setWidget(list_container_);
+ vl->addWidget(scroll_, 1);
+}
+
+void NotifPanel::showEvent(QShowEvent* e) {
+ QFrame::showEvent(e);
+ refresh();
+}
+
+void NotifPanel::refresh() {
+ // Clear existing rows (keep the stretch at end)
+ while (list_layout_->count() > 1) {
+ auto* item = list_layout_->takeAt(0);
+ if (item->widget()) item->widget()->deleteLater();
+ delete item;
+ }
+
+ const auto& hist = NotificationService::instance().history();
+ if (hist.isEmpty()) {
+ auto* empty = new QLabel("No notifications");
+ empty->setAlignment(Qt::AlignCenter);
+ empty->setStyleSheet(
+ QString("color: %1; font-size: 12px; background: transparent; padding: 24px;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+ list_layout_->insertWidget(0, empty);
+ return;
+ }
+
+ int count = 0;
+ for (const auto& rec : hist) {
+ if (++count > 50) break;
+
+ const QString dot_color = [&]() -> QString {
+ switch (rec.request.level) {
+ case NotifLevel::Warning: return "#F59E0B";
+ case NotifLevel::Alert: return "#F97316";
+ case NotifLevel::Critical: return "#EF4444";
+ default: return "#06B6D4";
+ }
+ }();
+
+ auto* row = new QWidget;
+ row->setFixedHeight(52);
+ row->setStyleSheet(
+ QString("QWidget { background: %1; border-bottom: 1px solid %2; }"
+ "QWidget:hover { background: %3; }")
+ .arg(rec.read ? ui::colors::BG_SURFACE() : ui::colors::BG_RAISED(),
+ ui::colors::BORDER_DIM(),
+ ui::colors::BG_HOVER()));
+
+ auto* rl = new QHBoxLayout(row);
+ rl->setContentsMargins(12, 6, 12, 6);
+ rl->setSpacing(8);
+
+ auto* dot = new QLabel("●");
+ dot->setFixedWidth(10);
+ dot->setStyleSheet(
+ QString("color: %1; font-size: 9px; background: transparent;").arg(dot_color));
+ rl->addWidget(dot, 0, Qt::AlignTop);
+
+ auto* text_col = new QWidget;
+ text_col->setStyleSheet("background: transparent;");
+ auto* tvl = new QVBoxLayout(text_col);
+ tvl->setContentsMargins(0, 0, 0, 0);
+ tvl->setSpacing(1);
+
+ auto* title_lbl = new QLabel(rec.request.title.left(45));
+ title_lbl->setStyleSheet(
+ QString("color: %1; font-size: 12px; font-weight: %2; background: transparent;")
+ .arg(ui::colors::TEXT_PRIMARY(), rec.read ? "normal" : "bold"));
+ tvl->addWidget(title_lbl);
+
+ auto* msg_lbl = new QLabel(rec.request.message.left(60));
+ msg_lbl->setStyleSheet(
+ QString("color: %1; font-size: 11px; background: transparent;")
+ .arg(ui::colors::TEXT_SECONDARY()));
+ tvl->addWidget(msg_lbl);
+ rl->addWidget(text_col, 1);
+
+ auto* time_lbl = new QLabel(rec.received_at.toString("hh:mm:ss"));
+ time_lbl->setStyleSheet(
+ QString("color: %1; font-size: 10px; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+ time_lbl->setAlignment(Qt::AlignTop | Qt::AlignRight);
+ rl->addWidget(time_lbl);
+
+ list_layout_->insertWidget(list_layout_->count() - 1, row);
+ }
+}
+
+void NotifPanel::anchor_to(QWidget* ref_widget) {
+ if (!ref_widget || !ref_widget->parentWidget()) return;
+ const QPoint global_pos = ref_widget->mapToGlobal(QPoint(0, 0));
+ const int x = global_pos.x() + ref_widget->width() - PANEL_W;
+ const int y = global_pos.y() - PANEL_H;
+ move(x, y);
+}
+
+} // namespace fincept::ui
diff --git a/fincept-qt/src/ui/widgets/NotifPanel.h b/fincept-qt/src/ui/widgets/NotifPanel.h
new file mode 100644
index 000000000..d746e91f9
--- /dev/null
+++ b/fincept-qt/src/ui/widgets/NotifPanel.h
@@ -0,0 +1,37 @@
+#pragma once
+#include "services/notifications/NotificationService.h"
+
+#include <QFrame>
+#include <QScrollArea>
+#include <QVBoxLayout>
+#include <QWidget>
+
+namespace fincept::ui {
+
+/// Dropdown notification history panel.
+/// Shown/hidden by DashboardStatusBar when the bell is clicked.
+/// Anchored just above the status bar, right-aligned.
+class NotifPanel : public QFrame {
+ Q_OBJECT
+ public:
+ explicit NotifPanel(QWidget* parent = nullptr);
+
+ /// Repopulate the list from NotificationService::history().
+ void refresh();
+
+ /// Position relative to a reference widget (the bell button).
+ void anchor_to(QWidget* ref_widget);
+
+ protected:
+ void showEvent(QShowEvent* e) override;
+
+ private:
+ QWidget* list_container_ = nullptr;
+ QVBoxLayout* list_layout_ = nullptr;
+ QScrollArea* scroll_ = nullptr;
+
+ static constexpr int PANEL_W = 380;
+ static constexpr int PANEL_H = 400;
+};
+
+} // namespace fincept::ui
diff --git a/fincept-qt/src/ui/widgets/NotifToast.cpp b/fincept-qt/src/ui/widgets/NotifToast.cpp
new file mode 100644
index 000000000..ed2fa2ddb
--- /dev/null
+++ b/fincept-qt/src/ui/widgets/NotifToast.cpp
@@ -0,0 +1,166 @@
+#include "ui/widgets/NotifToast.h"
+
+#include "ui/theme/ThemeManager.h"
+
+#include <QHBoxLayout>
+#include <QPainter>
+#include <QPropertyAnimation>
+#include <QShowEvent>
+#include <QVBoxLayout>
+
+namespace fincept::ui {
+
+using namespace fincept::notifications;
+
+NotifToast::NotifToast(QWidget* parent) : QWidget(parent, Qt::ToolTip | Qt::FramelessWindowHint) {
+ setAttribute(Qt::WA_TranslucentBackground);
+ setAttribute(Qt::WA_ShowWithoutActivating);
+ setFixedSize(TOAST_W, TOAST_H);
+ hide();
+
+ // ── Layout ────────────────────────────────────────────────────────────────
+ auto* outer = new QHBoxLayout(this);
+ outer->setContentsMargins(12, 10, 12, 10);
+ outer->setSpacing(10);
+
+ level_dot_ = new QLabel("●");
+ level_dot_->setFixedSize(10, 10);
+ level_dot_->setStyleSheet("background: transparent; font-size: 10px;");
+ outer->addWidget(level_dot_, 0, Qt::AlignTop | Qt::AlignHCenter);
+
+ auto* text_col = new QWidget;
+ text_col->setStyleSheet("background: transparent;");
+ auto* tvl = new QVBoxLayout(text_col);
+ tvl->setContentsMargins(0, 0, 0, 0);
+ tvl->setSpacing(2);
+
+ title_lbl_ = new QLabel;
+ title_lbl_->setStyleSheet("color: #e0e0e0; font-size: 13px; font-weight: bold; background: transparent;");
+ title_lbl_->setWordWrap(false);
+ tvl->addWidget(title_lbl_);
+
+ msg_lbl_ = new QLabel;
+ msg_lbl_->setStyleSheet("color: #a0a0a0; font-size: 12px; background: transparent;");
+ msg_lbl_->setWordWrap(true);
+ tvl->addWidget(msg_lbl_);
+
+ outer->addWidget(text_col, 1);
+
+ time_lbl_ = new QLabel;
+ time_lbl_->setStyleSheet("color: #555; font-size: 10px; background: transparent;");
+ time_lbl_->setAlignment(Qt::AlignTop | Qt::AlignRight);
+ outer->addWidget(time_lbl_, 0, Qt::AlignTop);
+
+ // ── Timers & animation (P3: start only in showEvent) ─────────────────────
+ auto_dismiss_ = new QTimer(this);
+ auto_dismiss_->setSingleShot(true);
+ auto_dismiss_->setInterval(AUTO_DISMISS_MS);
+ connect(auto_dismiss_, &QTimer::timeout, this, &NotifToast::dismiss);
+
+ slide_anim_ = new QPropertyAnimation(this, "pos", this);
+ slide_anim_->setDuration(ANIM_MS);
+ slide_anim_->setEasingCurve(QEasingCurve::OutCubic);
+}
+
+// ── Slot ──────────────────────────────────────────────────────────────────────
+
+void NotifToast::show_notification(const NotificationRecord& record) {
+ current_level_ = record.request.level;
+
+ const QString dot_color = [&]() -> QString {
+ switch (current_level_) {
+ case NotifLevel::Warning: return "#F59E0B";
+ case NotifLevel::Alert: return "#F97316";
+ case NotifLevel::Critical: return "#EF4444";
+ default: return "#06B6D4";
+ }
+ }();
+
+ level_dot_->setStyleSheet(
+ QString("color: %1; background: transparent; font-size: 10px;").arg(dot_color));
+
+ title_lbl_->setText(record.request.title.left(50));
+ msg_lbl_->setText(record.request.message.left(80));
+ time_lbl_->setText(record.request.timestamp.toString("hh:mm:ss"));
+
+ reposition();
+ show();
+ raise();
+}
+
+// ── Events ────────────────────────────────────────────────────────────────────
+
+void NotifToast::showEvent(QShowEvent* e) {
+ QWidget::showEvent(e);
+ // Slide in from right
+ if (parentWidget()) {
+ const QPoint hidden_pos(parentWidget()->width(), y());
+ const QPoint shown_pos(parentWidget()->width() - TOAST_W - MARGIN, y());
+ slide_anim_->setStartValue(hidden_pos);
+ slide_anim_->setEndValue(shown_pos);
+ slide_anim_->start();
+ }
+ auto_dismiss_->start();
+}
+
+void NotifToast::hideEvent(QHideEvent* e) {
+ QWidget::hideEvent(e);
+ auto_dismiss_->stop();
+ slide_anim_->stop();
+}
+
+void NotifToast::resizeEvent(QResizeEvent* e) {
+ QWidget::resizeEvent(e);
+ reposition();
+}
+
+void NotifToast::paintEvent(QPaintEvent*) {
+ QPainter p(this);
+ p.setRenderHint(QPainter::Antialiasing);
+
+ const QString border_color = [&]() -> QString {
+ switch (current_level_) {
+ case NotifLevel::Warning: return "#F59E0B";
+ case NotifLevel::Alert: return "#F97316";
+ case NotifLevel::Critical: return "#EF4444";
+ default: return "#1a1a2a";
+ }
+ }();
+
+ // Background
+ p.setPen(Qt::NoPen);
+ p.setBrush(QColor("#0d0d1a"));
+ p.drawRoundedRect(rect(), 6, 6);
+
+ // Left accent bar
+ p.setBrush(QColor(border_color));
+ p.drawRoundedRect(0, 0, 3, height(), 2, 2);
+
+ // Border
+ p.setBrush(Qt::NoBrush);
+ p.setPen(QPen(QColor("#1a1a2a"), 1));
+ p.drawRoundedRect(rect().adjusted(0, 0, -1, -1), 6, 6);
+}
+
+// ── Private ───────────────────────────────────────────────────────────────────
+
+void NotifToast::reposition() {
+ if (!parentWidget()) return;
+ const int x = parentWidget()->width() - TOAST_W - MARGIN;
+ const int y = MARGIN;
+ move(x, y);
+}
+
+void NotifToast::dismiss() {
+ if (!parentWidget()) { hide(); return; }
+ // Slide back out to the right
+ const QPoint shown_pos(parentWidget()->width() - TOAST_W - MARGIN, y());
+ const QPoint hidden_pos(parentWidget()->width() + 10, y());
+ slide_anim_->setStartValue(shown_pos);
+ slide_anim_->setEndValue(hidden_pos);
+ connect(slide_anim_, &QPropertyAnimation::finished, this, &NotifToast::hide,
+ Qt::SingleShotConnection);
+ slide_anim_->start();
+}
+
+} // namespace fincept::ui
diff --git a/fincept-qt/src/ui/widgets/NotifToast.h b/fincept-qt/src/ui/widgets/NotifToast.h
new file mode 100644
index 000000000..954f30459
--- /dev/null
+++ b/fincept-qt/src/ui/widgets/NotifToast.h
@@ -0,0 +1,55 @@
+#pragma once
+#include "services/notifications/NotificationService.h"
+
+#include <QLabel>
+#include <QPropertyAnimation>
+#include <QTimer>
+#include <QWidget>
+
+namespace fincept::ui {
+
+/// Slide-in toast notification overlay.
+/// Anchored to the top-right of its parent widget.
+/// Shows for ~4 seconds then auto-dismisses.
+///
+/// Usage:
+/// auto* toast = new NotifToast(main_window);
+/// connect(&NotificationService::instance(),
+/// &NotificationService::notification_received,
+/// toast, &NotifToast::show_notification);
+class NotifToast : public QWidget {
+ Q_OBJECT
+ public:
+ explicit NotifToast(QWidget* parent = nullptr);
+
+ public slots:
+ void show_notification(const fincept::notifications::NotificationRecord& record);
+
+ protected:
+ void paintEvent(QPaintEvent* e) override;
+ void showEvent(QShowEvent* e) override;
+ void hideEvent(QHideEvent* e) override;
+ void resizeEvent(QResizeEvent* e) override;
+
+ private:
+ void reposition();
+ void dismiss();
+
+ QLabel* level_dot_ = nullptr;
+ QLabel* title_lbl_ = nullptr;
+ QLabel* msg_lbl_ = nullptr;
+ QLabel* time_lbl_ = nullptr;
+ QTimer* auto_dismiss_= nullptr;
+ QPropertyAnimation* slide_anim_ = nullptr;
+
+ fincept::notifications::NotifLevel current_level_{
+ fincept::notifications::NotifLevel::Info};
+
+ static constexpr int TOAST_W = 320;
+ static constexpr int TOAST_H = 72;
+ static constexpr int MARGIN = 12;
+ static constexpr int AUTO_DISMISS_MS= 4000;
+ static constexpr int ANIM_MS = 250;
+};
+
+} // namespace fincept::ui
diff --git a/fincept-qt/src/ui/widgets/WorldMapWidget.cpp b/fincept-qt/src/ui/widgets/WorldMapWidget.cpp
index a93a4527b..ebe2306d0 100644
--- a/fincept-qt/src/ui/widgets/WorldMapWidget.cpp
+++ b/fincept-qt/src/ui/widgets/WorldMapWidget.cpp
@@ -1,6 +1,8 @@
// src/ui/widgets/WorldMapWidget.cpp
#include "ui/widgets/WorldMapWidget.h"
+#include "core/config/AppPaths.h"
+
#include <QGeoView/QGVCamera.h>
#include <QGeoView/QGVGlobal.h>
#include <QGeoView/QGVLayer.h>
@@ -13,7 +15,6 @@
#include <QNetworkAccessManager>
#include <QNetworkDiskCache>
#include <QPainter>
-#include <QStandardPaths>
#include <QVBoxLayout>
namespace fincept::ui {
@@ -25,7 +26,7 @@ static void ensure_network_manager() {
auto* nam = new QNetworkAccessManager(qApp);
auto* cache = new QNetworkDiskCache(nam);
- QString cache_dir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/map_tiles";
+ QString cache_dir = fincept::AppPaths::cache() + "/map_tiles";
cache->setCacheDirectory(cache_dir);
cache->setMaximumCacheSize(100 * 1024 * 1024); // 100 MB
nam->setCache(cache);
diff --git a/fincept-qt/src/ui/workspace/WorkspaceNewDialog.cpp b/fincept-qt/src/ui/workspace/WorkspaceNewDialog.cpp
new file mode 100644
index 000000000..ca8b959db
--- /dev/null
+++ b/fincept-qt/src/ui/workspace/WorkspaceNewDialog.cpp
@@ -0,0 +1,153 @@
+#include "ui/workspace/WorkspaceNewDialog.h"
+#include "services/workspace/WorkspaceTemplates.h"
+
+#include <QDialogButtonBox>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QPlainTextEdit>
+#include <QPushButton>
+#include <QVBoxLayout>
+
+namespace fincept::ui {
+
+static const char* DLG_SS =
+ "QDialog{background:#0a0a0a;color:#e5e5e5;}"
+ "QLabel{color:#e5e5e5;}"
+ "QLineEdit,QPlainTextEdit{"
+ "background:#111;color:#e5e5e5;border:1px solid #2a2a2a;"
+ "border-radius:3px;padding:4px;}"
+ "QLineEdit:focus,QPlainTextEdit:focus{border:1px solid #d97706;}"
+ "QListWidget{background:#111;color:#e5e5e5;border:1px solid #2a2a2a;border-radius:3px;}"
+ "QListWidget::item{padding:8px 12px;}"
+ "QListWidget::item:selected{background:#1c1c1c;color:#d97706;border-left:2px solid #d97706;}"
+ "QListWidget::item:hover{background:#161616;}"
+ "QPushButton{background:#1a1a1a;color:#e5e5e5;border:1px solid #2a2a2a;"
+ "border-radius:3px;padding:6px 16px;}"
+ "QPushButton:hover{background:#222;border-color:#d97706;}"
+ "QPushButton#createBtn{background:#d97706;color:#000;font-weight:700;border:none;}"
+ "QPushButton#createBtn:hover{background:#b45309;}"
+ "QPushButton#createBtn:disabled{background:#4a3000;color:#666;}";
+
+WorkspaceNewDialog::WorkspaceNewDialog(QWidget* parent) : QDialog(parent) {
+ setWindowTitle("New Workspace");
+ setModal(true);
+ setFixedSize(680, 460);
+ setStyleSheet(DLG_SS);
+ setup_ui();
+}
+
+void WorkspaceNewDialog::setup_ui() {
+ auto* root = new QHBoxLayout(this);
+ root->setContentsMargins(16, 16, 16, 16);
+ root->setSpacing(16);
+
+ // ── Left: template list ───────────────────────────────────────────────────
+ auto* left = new QVBoxLayout;
+ auto* tpl_label = new QLabel("Template");
+ tpl_label->setStyleSheet("color:#888;font-size:11px;font-weight:600;");
+ left->addWidget(tpl_label);
+
+ template_list_ = new QListWidget;
+ template_list_->setFixedWidth(200);
+ for (const auto& s : WorkspaceTemplates::available()) {
+ auto* item = new QListWidgetItem(s.name);
+ item->setData(Qt::UserRole, s.id);
+ item->setToolTip(s.description);
+ template_list_->addItem(item);
+ }
+ template_list_->setCurrentRow(0);
+ left->addWidget(template_list_, 1);
+ root->addLayout(left);
+
+ // ── Right: name, description, preview ────────────────────────────────────
+ auto* right = new QVBoxLayout;
+ right->setSpacing(10);
+
+ auto* name_label = new QLabel("Workspace Name");
+ name_label->setStyleSheet("color:#888;font-size:11px;font-weight:600;");
+ right->addWidget(name_label);
+
+ name_edit_ = new QLineEdit;
+ name_edit_->setPlaceholderText("My Workspace");
+ right->addWidget(name_edit_);
+
+ auto* desc_label = new QLabel("Description (optional)");
+ desc_label->setStyleSheet("color:#888;font-size:11px;font-weight:600;");
+ right->addWidget(desc_label);
+
+ description_edit_ = new QPlainTextEdit;
+ description_edit_->setFixedHeight(70);
+ description_edit_->setPlaceholderText("What is this workspace for?");
+ right->addWidget(description_edit_);
+
+ auto* prev_label = new QLabel("Preview");
+ prev_label->setStyleSheet("color:#888;font-size:11px;font-weight:600;");
+ right->addWidget(prev_label);
+
+ preview_label_ = new QLabel;
+ preview_label_->setWordWrap(true);
+ preview_label_->setStyleSheet(
+ "background:#111;border:1px solid #2a2a2a;border-radius:3px;"
+ "padding:8px;color:#aaa;font-size:12px;");
+ preview_label_->setFixedHeight(80);
+ right->addWidget(preview_label_);
+
+ right->addStretch();
+
+ // Buttons
+ auto* btn_row = new QHBoxLayout;
+ btn_row->addStretch();
+ auto* cancel_btn = new QPushButton("Cancel");
+ create_btn_ = new QPushButton("Create");
+ create_btn_->setObjectName("createBtn");
+ create_btn_->setEnabled(false);
+ btn_row->addWidget(cancel_btn);
+ btn_row->addWidget(create_btn_);
+ right->addLayout(btn_row);
+
+ root->addLayout(right, 1);
+
+ // ── Connections ───────────────────────────────────────────────────────────
+ connect(name_edit_, &QLineEdit::textChanged, this, [this](const QString& t) {
+ create_btn_->setEnabled(!t.trimmed().isEmpty());
+ });
+
+ connect(template_list_, &QListWidget::currentRowChanged, this, [this](int) {
+ if (auto* item = template_list_->currentItem())
+ update_preview(item->data(Qt::UserRole).toString());
+ });
+
+ connect(cancel_btn, &QPushButton::clicked, this, &QDialog::reject);
+ connect(create_btn_, &QPushButton::clicked, this, &QDialog::accept);
+
+ // Seed preview
+ if (template_list_->count() > 0)
+ update_preview(template_list_->item(0)->data(Qt::UserRole).toString());
+}
+
+void WorkspaceNewDialog::update_preview(const QString& template_id) {
+ for (const auto& s : WorkspaceTemplates::available()) {
+ if (s.id == template_id) {
+ preview_label_->setText(s.description);
+ return;
+ }
+ }
+}
+
+QString WorkspaceNewDialog::workspace_name() const {
+ return name_edit_ ? name_edit_->text().trimmed() : QString{};
+}
+
+QString WorkspaceNewDialog::workspace_description() const {
+ return description_edit_ ? description_edit_->toPlainText().trimmed() : QString{};
+}
+
+QString WorkspaceNewDialog::selected_template_id() const {
+ if (!template_list_ || !template_list_->currentItem())
+ return "blank";
+ return template_list_->currentItem()->data(Qt::UserRole).toString();
+}
+
+} // namespace fincept::ui
diff --git a/fincept-qt/src/ui/workspace/WorkspaceNewDialog.h b/fincept-qt/src/ui/workspace/WorkspaceNewDialog.h
new file mode 100644
index 000000000..e478e81fa
--- /dev/null
+++ b/fincept-qt/src/ui/workspace/WorkspaceNewDialog.h
@@ -0,0 +1,33 @@
+#pragma once
+#include <QDialog>
+#include <QString>
+
+class QLineEdit;
+class QPlainTextEdit;
+class QListWidget;
+class QLabel;
+
+namespace fincept::ui {
+
+/// Dialog for creating a new workspace — name, description, template selector.
+class WorkspaceNewDialog : public QDialog {
+ Q_OBJECT
+ public:
+ explicit WorkspaceNewDialog(QWidget* parent = nullptr);
+
+ QString workspace_name() const;
+ QString workspace_description() const;
+ QString selected_template_id() const;
+
+ private:
+ void setup_ui();
+ void update_preview(const QString& template_id);
+
+ QLineEdit* name_edit_ = nullptr;
+ QPlainTextEdit* description_edit_ = nullptr;
+ QListWidget* template_list_ = nullptr;
+ QLabel* preview_label_ = nullptr;
+ QPushButton* create_btn_ = nullptr;
+};
+
+} // namespace fincept::ui
diff --git a/fincept-qt/src/ui/workspace/WorkspaceOpenDialog.cpp b/fincept-qt/src/ui/workspace/WorkspaceOpenDialog.cpp
new file mode 100644
index 000000000..033604533
--- /dev/null
+++ b/fincept-qt/src/ui/workspace/WorkspaceOpenDialog.cpp
@@ -0,0 +1,137 @@
+#include "ui/workspace/WorkspaceOpenDialog.h"
+#include "services/workspace/WorkspaceManager.h"
+
+#include <QDialogButtonBox>
+#include <QFileDialog>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QListWidget>
+#include <QPushButton>
+#include <QVBoxLayout>
+
+namespace fincept::ui {
+
+static const char* OPEN_DLG_SS =
+ "QDialog{background:#0a0a0a;color:#e5e5e5;}"
+ "QLabel{color:#e5e5e5;}"
+ "QListWidget{background:#111;color:#e5e5e5;border:1px solid #2a2a2a;border-radius:3px;}"
+ "QListWidget::item{padding:10px 12px;}"
+ "QListWidget::item:selected{background:#1c1c1c;color:#d97706;border-left:2px solid #d97706;}"
+ "QListWidget::item:hover{background:#161616;}"
+ "QPushButton{background:#1a1a1a;color:#e5e5e5;border:1px solid #2a2a2a;"
+ "border-radius:3px;padding:6px 16px;}"
+ "QPushButton:hover{background:#222;border-color:#d97706;}"
+ "QPushButton#openBtn{background:#d97706;color:#000;font-weight:700;border:none;}"
+ "QPushButton#openBtn:hover{background:#b45309;}"
+ "QPushButton#openBtn:disabled{background:#4a3000;color:#666;}";
+
+WorkspaceOpenDialog::WorkspaceOpenDialog(QWidget* parent) : QDialog(parent) {
+ setWindowTitle("Open Workspace");
+ setModal(true);
+ setFixedSize(760, 480);
+ setStyleSheet(OPEN_DLG_SS);
+ setup_ui();
+ load_workspaces();
+}
+
+void WorkspaceOpenDialog::setup_ui() {
+ auto* root = new QHBoxLayout(this);
+ root->setContentsMargins(16, 16, 16, 16);
+ root->setSpacing(16);
+
+ // ── Left: workspace list ──────────────────────────────────────────────────
+ auto* left = new QVBoxLayout;
+ auto* list_label = new QLabel("Saved Workspaces");
+ list_label->setStyleSheet("color:#888;font-size:11px;font-weight:600;");
+ left->addWidget(list_label);
+
+ workspace_list_ = new QListWidget;
+ workspace_list_->setFixedWidth(320);
+ left->addWidget(workspace_list_, 1);
+
+ auto* browse_btn = new QPushButton("Browse for File...");
+ left->addWidget(browse_btn);
+ root->addLayout(left);
+
+ // ── Right: preview ────────────────────────────────────────────────────────
+ auto* right = new QVBoxLayout;
+ right->setSpacing(10);
+
+ auto* prev_label = new QLabel("Preview");
+ prev_label->setStyleSheet("color:#888;font-size:11px;font-weight:600;");
+ right->addWidget(prev_label);
+
+ preview_label_ = new QLabel("Select a workspace to preview");
+ preview_label_->setWordWrap(true);
+ preview_label_->setAlignment(Qt::AlignTop | Qt::AlignLeft);
+ preview_label_->setStyleSheet(
+ "background:#111;border:1px solid #2a2a2a;border-radius:3px;"
+ "padding:12px;color:#aaa;font-size:12px;");
+ right->addWidget(preview_label_, 1);
+
+ // Buttons
+ auto* btn_row = new QHBoxLayout;
+ btn_row->addStretch();
+ auto* cancel_btn = new QPushButton("Cancel");
+ open_btn_ = new QPushButton("Open");
+ open_btn_->setObjectName("openBtn");
+ open_btn_->setEnabled(false);
+ btn_row->addWidget(cancel_btn);
+ btn_row->addWidget(open_btn_);
+ right->addLayout(btn_row);
+
+ root->addLayout(right, 1);
+
+ // ── Connections ───────────────────────────────────────────────────────────
+ connect(workspace_list_, &QListWidget::currentRowChanged,
+ this, &WorkspaceOpenDialog::update_preview);
+
+ connect(workspace_list_, &QListWidget::itemDoubleClicked, this, [this]() {
+ if (open_btn_->isEnabled()) accept();
+ });
+
+ connect(browse_btn, &QPushButton::clicked, this, &WorkspaceOpenDialog::browse_for_file);
+ connect(cancel_btn, &QPushButton::clicked, this, &QDialog::reject);
+ connect(open_btn_, &QPushButton::clicked, this, &QDialog::accept);
+}
+
+void WorkspaceOpenDialog::load_workspaces() {
+ auto result = WorkspaceManager::instance().list_workspaces();
+ if (result.is_err()) return;
+
+ for (const auto& s : result.value()) {
+ auto* item = new QListWidgetItem(s.name);
+ item->setData(Qt::UserRole, s.file_path);
+ item->setData(Qt::UserRole + 1, s.description);
+ item->setData(Qt::UserRole + 2, s.updated_at);
+ workspace_list_->addItem(item);
+ }
+}
+
+void WorkspaceOpenDialog::browse_for_file() {
+ QString path = QFileDialog::getOpenFileName(
+ this, "Open Workspace File", {}, "Fincept Workspace (*.fwsp);;All Files (*)");
+ if (path.isEmpty()) return;
+ selected_path_ = path;
+ open_btn_->setEnabled(true);
+ preview_label_->setText(QString("File: %1").arg(path));
+ accept();
+}
+
+void WorkspaceOpenDialog::update_preview(int row) {
+ if (row < 0 || row >= workspace_list_->count()) return;
+ auto* item = workspace_list_->item(row);
+ selected_path_ = item->data(Qt::UserRole).toString();
+ QString desc = item->data(Qt::UserRole + 1).toString();
+ QString date = item->data(Qt::UserRole + 2).toString();
+ preview_label_->setText(
+ QString("<b>%1</b><br><br>%2<br><br><span style='color:#555'>Last saved: %3</span>")
+ .arg(item->text(), desc.isEmpty() ? "No description" : desc, date));
+ open_btn_->setEnabled(true);
+}
+
+QString WorkspaceOpenDialog::selected_path() const {
+ return selected_path_;
+}
+
+} // namespace fincept::ui
diff --git a/fincept-qt/src/ui/workspace/WorkspaceOpenDialog.h b/fincept-qt/src/ui/workspace/WorkspaceOpenDialog.h
new file mode 100644
index 000000000..5b5b4175e
--- /dev/null
+++ b/fincept-qt/src/ui/workspace/WorkspaceOpenDialog.h
@@ -0,0 +1,32 @@
+#pragma once
+#include <QDialog>
+#include <QString>
+
+class QListWidget;
+class QLabel;
+class QPushButton;
+
+namespace fincept::ui {
+
+/// Dialog for opening a saved workspace.
+class WorkspaceOpenDialog : public QDialog {
+ Q_OBJECT
+ public:
+ explicit WorkspaceOpenDialog(QWidget* parent = nullptr);
+
+ /// Path of the selected workspace file, or empty if none.
+ QString selected_path() const;
+
+ private:
+ void setup_ui();
+ void load_workspaces();
+ void browse_for_file();
+ void update_preview(int row);
+
+ QListWidget* workspace_list_ = nullptr;
+ QLabel* preview_label_ = nullptr;
+ QPushButton* open_btn_ = nullptr;
+ QString selected_path_;
+};
+
+} // namespace fincept::ui
diff --git a/fincept-qt/src/ui/workspace/WorkspaceSaveAsDialog.cpp b/fincept-qt/src/ui/workspace/WorkspaceSaveAsDialog.cpp
new file mode 100644
index 000000000..612adf855
--- /dev/null
+++ b/fincept-qt/src/ui/workspace/WorkspaceSaveAsDialog.cpp
@@ -0,0 +1,108 @@
+#include "ui/workspace/WorkspaceSaveAsDialog.h"
+#include "core/config/AppPaths.h"
+#include "services/workspace/WorkspaceManager.h"
+
+#include <QFileDialog>
+#include <QHBoxLayout>
+#include <QRegularExpression>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QVBoxLayout>
+
+namespace fincept::ui {
+
+static const char* SAVEAS_DLG_SS =
+ "QDialog{background:#0a0a0a;color:#e5e5e5;}"
+ "QLabel{color:#e5e5e5;}"
+ "QLineEdit{background:#111;color:#e5e5e5;border:1px solid #2a2a2a;"
+ "border-radius:3px;padding:4px;}"
+ "QLineEdit:focus{border:1px solid #d97706;}"
+ "QPushButton{background:#1a1a1a;color:#e5e5e5;border:1px solid #2a2a2a;"
+ "border-radius:3px;padding:6px 16px;}"
+ "QPushButton:hover{background:#222;border-color:#d97706;}"
+ "QPushButton#saveBtn{background:#d97706;color:#000;font-weight:700;border:none;}"
+ "QPushButton#saveBtn:hover{background:#b45309;}"
+ "QPushButton#saveBtn:disabled{background:#4a3000;color:#666;}";
+
+WorkspaceSaveAsDialog::WorkspaceSaveAsDialog(QWidget* parent) : QDialog(parent) {
+ setWindowTitle("Save Workspace As");
+ setModal(true);
+ setFixedSize(420, 180);
+ setStyleSheet(SAVEAS_DLG_SS);
+ chosen_path_ = AppPaths::workspaces();
+ setup_ui();
+}
+
+void WorkspaceSaveAsDialog::setup_ui() {
+ auto* vl = new QVBoxLayout(this);
+ vl->setContentsMargins(20, 20, 20, 20);
+ vl->setSpacing(12);
+
+ auto* name_label = new QLabel("Workspace Name");
+ name_label->setStyleSheet("color:#888;font-size:11px;font-weight:600;");
+ vl->addWidget(name_label);
+
+ name_edit_ = new QLineEdit;
+ name_edit_->setPlaceholderText("Enter a name");
+ // Pre-fill with current workspace name
+ name_edit_->setText(WorkspaceManager::instance().current_workspace_name());
+ name_edit_->selectAll();
+ vl->addWidget(name_edit_);
+
+ // Path row
+ auto* path_row = new QHBoxLayout;
+ auto* path_label = new QLabel(QString("Save to: %1").arg(chosen_path_));
+ path_label->setStyleSheet("color:#555;font-size:11px;");
+ path_label->setWordWrap(true);
+ auto* change_btn = new QPushButton("Change...");
+ change_btn->setFixedWidth(80);
+ path_row->addWidget(path_label, 1);
+ path_row->addWidget(change_btn);
+ vl->addLayout(path_row);
+
+ vl->addStretch();
+
+ // Buttons
+ auto* btn_row = new QHBoxLayout;
+ btn_row->addStretch();
+ auto* cancel_btn = new QPushButton("Cancel");
+ auto* save_btn = new QPushButton("Save");
+ save_btn->setObjectName("saveBtn");
+ save_btn->setEnabled(!name_edit_->text().trimmed().isEmpty());
+ btn_row->addWidget(cancel_btn);
+ btn_row->addWidget(save_btn);
+ vl->addLayout(btn_row);
+
+ connect(name_edit_, &QLineEdit::textChanged, save_btn, [save_btn](const QString& t) {
+ save_btn->setEnabled(!t.trimmed().isEmpty());
+ });
+
+ connect(change_btn, &QPushButton::clicked, this, [this, path_label]() {
+ QString dir = QFileDialog::getExistingDirectory(this, "Choose Save Location", chosen_path_);
+ if (!dir.isEmpty()) {
+ chosen_path_ = dir;
+ path_label->setText(QString("Save to: %1").arg(dir));
+ }
+ });
+
+ connect(cancel_btn, &QPushButton::clicked, this, &QDialog::reject);
+ connect(save_btn, &QPushButton::clicked, this, &QDialog::accept);
+}
+
+QString WorkspaceSaveAsDialog::new_name() const {
+ return name_edit_ ? name_edit_->text().trimmed() : QString{};
+}
+
+QString WorkspaceSaveAsDialog::chosen_path() const {
+ // Return full file path including filename
+ QString name = new_name();
+ if (name.isEmpty()) return {};
+ // Sanitise for filename
+ QString filename = name;
+ filename.replace(QRegularExpression("[^a-zA-Z0-9_\\- ]"), "_");
+ filename = filename.simplified().replace(' ', '_');
+ return chosen_path_ + "/" + filename + ".fwsp";
+}
+
+} // namespace fincept::ui
diff --git a/fincept-qt/src/ui/workspace/WorkspaceSaveAsDialog.h b/fincept-qt/src/ui/workspace/WorkspaceSaveAsDialog.h
new file mode 100644
index 000000000..92636a6d3
--- /dev/null
+++ b/fincept-qt/src/ui/workspace/WorkspaceSaveAsDialog.h
@@ -0,0 +1,25 @@
+#pragma once
+#include <QDialog>
+#include <QString>
+
+class QLineEdit;
+
+namespace fincept::ui {
+
+/// Compact dialog for "Save Workspace As" — just a name field.
+class WorkspaceSaveAsDialog : public QDialog {
+ Q_OBJECT
+ public:
+ explicit WorkspaceSaveAsDialog(QWidget* parent = nullptr);
+
+ QString new_name() const;
+ QString chosen_path() const;
+
+ private:
+ void setup_ui();
+
+ QLineEdit* name_edit_ = nullptr;
+ QString chosen_path_;
+};
+
+} // namespace fincept::ui