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.

general UI and UX updates

tilakpatel221a847e6fdc11
diff --git a/fincept-qt/.cache/clangd/index/AIQuantLabScreen.cpp.41B70839A0CD4EA1.idx b/fincept-qt/.cache/clangd/index/AIQuantLabScreen.cpp.41B70839A0CD4EA1.idx
index e14e353b7..fd7cdf48a 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/AIQuantLabScreen.h.92B9A04C7BC5C184.idx b/fincept-qt/.cache/clangd/index/AIQuantLabScreen.h.92B9A04C7BC5C184.idx
index c2d6bebe7..bc37c8867 100644
Binary files a/fincept-qt/.cache/clangd/index/AIQuantLabScreen.h.92B9A04C7BC5C184.idx and b/fincept-qt/.cache/clangd/index/AIQuantLabScreen.h.92B9A04C7BC5C184.idx differ
diff --git a/fincept-qt/.cache/clangd/index/AboutScreen.cpp.658950DFAFF503D7.idx b/fincept-qt/.cache/clangd/index/AboutScreen.cpp.658950DFAFF503D7.idx
index 7fe47345c..12a967026 100644
Binary files a/fincept-qt/.cache/clangd/index/AboutScreen.cpp.658950DFAFF503D7.idx and b/fincept-qt/.cache/clangd/index/AboutScreen.cpp.658950DFAFF503D7.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 949111e18..8406ac580 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/AlgoTradingScreen.cpp.2DACE0353165010E.idx b/fincept-qt/.cache/clangd/index/AlgoTradingScreen.cpp.2DACE0353165010E.idx
index df48f61b0..8cb2a19e6 100644
Binary files a/fincept-qt/.cache/clangd/index/AlgoTradingScreen.cpp.2DACE0353165010E.idx and b/fincept-qt/.cache/clangd/index/AlgoTradingScreen.cpp.2DACE0353165010E.idx differ
diff --git a/fincept-qt/.cache/clangd/index/AlgoTradingScreen.h.E023572D45AF11A7.idx b/fincept-qt/.cache/clangd/index/AlgoTradingScreen.h.E023572D45AF11A7.idx
index 34c611d8e..5c39c8bd1 100644
Binary files a/fincept-qt/.cache/clangd/index/AlgoTradingScreen.h.E023572D45AF11A7.idx and b/fincept-qt/.cache/clangd/index/AlgoTradingScreen.h.E023572D45AF11A7.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 13fb84313..d01066a93 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/AlphaArenaScreen.h.EAD0E555E8F66ED3.idx b/fincept-qt/.cache/clangd/index/AlphaArenaScreen.h.EAD0E555E8F66ED3.idx
index 1cc0379d0..d56781cf9 100644
Binary files a/fincept-qt/.cache/clangd/index/AlphaArenaScreen.h.EAD0E555E8F66ED3.idx and b/fincept-qt/.cache/clangd/index/AlphaArenaScreen.h.EAD0E555E8F66ED3.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 b683425da..d2b2bb131 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/AltInvestmentsScreen.h.B5F56CB6D83566FE.idx b/fincept-qt/.cache/clangd/index/AltInvestmentsScreen.h.B5F56CB6D83566FE.idx
index af4c7e8f9..ca33e0cff 100644
Binary files a/fincept-qt/.cache/clangd/index/AltInvestmentsScreen.h.B5F56CB6D83566FE.idx and b/fincept-qt/.cache/clangd/index/AltInvestmentsScreen.h.B5F56CB6D83566FE.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 a171b30dd..ae47fbcd9 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/AsiaMarketsScreen.cpp.989DB238183C5B2F.idx b/fincept-qt/.cache/clangd/index/AsiaMarketsScreen.cpp.989DB238183C5B2F.idx
index cb79abba2..a803c1816 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/AsiaMarketsScreen.h.E05AE7EC00E3C7DF.idx b/fincept-qt/.cache/clangd/index/AsiaMarketsScreen.h.E05AE7EC00E3C7DF.idx
index 7263d8d3d..478060c86 100644
Binary files a/fincept-qt/.cache/clangd/index/AsiaMarketsScreen.h.E05AE7EC00E3C7DF.idx and b/fincept-qt/.cache/clangd/index/AsiaMarketsScreen.h.E05AE7EC00E3C7DF.idx differ
diff --git a/fincept-qt/.cache/clangd/index/AuthManager.h.8BB5B9B9C28CB70F.idx b/fincept-qt/.cache/clangd/index/AuthManager.h.8BB5B9B9C28CB70F.idx
index b00e86253..2b233b887 100644
Binary files a/fincept-qt/.cache/clangd/index/AuthManager.h.8BB5B9B9C28CB70F.idx and b/fincept-qt/.cache/clangd/index/AuthManager.h.8BB5B9B9C28CB70F.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 07c00697e..3bb4cb3d3 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/BacktestingScreen.h.83748B902FFABFCA.idx b/fincept-qt/.cache/clangd/index/BacktestingScreen.h.83748B902FFABFCA.idx
index b9afe81bb..7153722ba 100644
Binary files a/fincept-qt/.cache/clangd/index/BacktestingScreen.h.83748B902FFABFCA.idx and b/fincept-qt/.cache/clangd/index/BacktestingScreen.h.83748B902FFABFCA.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 380f8def9..654fdfc8d 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/CacheDatabase.h.871D7647616A1855.idx b/fincept-qt/.cache/clangd/index/CacheDatabase.h.871D7647616A1855.idx
new file mode 100644
index 000000000..762efb7dc
Binary files /dev/null and b/fincept-qt/.cache/clangd/index/CacheDatabase.h.871D7647616A1855.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 afd57a499..e46630e4f 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/CodeEditorScreen.h.44453B2589949897.idx b/fincept-qt/.cache/clangd/index/CodeEditorScreen.h.44453B2589949897.idx
index b158c27d3..392f5190d 100644
Binary files a/fincept-qt/.cache/clangd/index/CodeEditorScreen.h.44453B2589949897.idx and b/fincept-qt/.cache/clangd/index/CodeEditorScreen.h.44453B2589949897.idx differ
diff --git a/fincept-qt/.cache/clangd/index/ComingSoonScreen.cpp.8CDBFF1A9CD14C18.idx b/fincept-qt/.cache/clangd/index/ComingSoonScreen.cpp.8CDBFF1A9CD14C18.idx
index 47a46e9f5..3f5cf3ed6 100644
Binary files a/fincept-qt/.cache/clangd/index/ComingSoonScreen.cpp.8CDBFF1A9CD14C18.idx and b/fincept-qt/.cache/clangd/index/ComingSoonScreen.cpp.8CDBFF1A9CD14C18.idx differ
diff --git a/fincept-qt/.cache/clangd/index/CommoditiesWidget.h.9011C4F317114A1F.idx b/fincept-qt/.cache/clangd/index/CommoditiesWidget.h.9011C4F317114A1F.idx
index 4b9bd377d..9fceae38c 100644
Binary files a/fincept-qt/.cache/clangd/index/CommoditiesWidget.h.9011C4F317114A1F.idx and b/fincept-qt/.cache/clangd/index/CommoditiesWidget.h.9011C4F317114A1F.idx differ
diff --git a/fincept-qt/.cache/clangd/index/ConflictMonitorPanel.cpp.30520CF4CB984C8A.idx b/fincept-qt/.cache/clangd/index/ConflictMonitorPanel.cpp.30520CF4CB984C8A.idx
index 2ab7ab3fd..3fa7f9795 100644
Binary files a/fincept-qt/.cache/clangd/index/ConflictMonitorPanel.cpp.30520CF4CB984C8A.idx and b/fincept-qt/.cache/clangd/index/ConflictMonitorPanel.cpp.30520CF4CB984C8A.idx differ
diff --git a/fincept-qt/.cache/clangd/index/ContactScreen.cpp.DCE37A8828056537.idx b/fincept-qt/.cache/clangd/index/ContactScreen.cpp.DCE37A8828056537.idx
index 19bbdfa65..6d981fea1 100644
Binary files a/fincept-qt/.cache/clangd/index/ContactScreen.cpp.DCE37A8828056537.idx and b/fincept-qt/.cache/clangd/index/ContactScreen.cpp.DCE37A8828056537.idx differ
diff --git a/fincept-qt/.cache/clangd/index/CryptoBottomPanel.cpp.36B7E2C050496404.idx b/fincept-qt/.cache/clangd/index/CryptoBottomPanel.cpp.36B7E2C050496404.idx
index 38047ad41..0c41b6dcb 100644
Binary files a/fincept-qt/.cache/clangd/index/CryptoBottomPanel.cpp.36B7E2C050496404.idx and b/fincept-qt/.cache/clangd/index/CryptoBottomPanel.cpp.36B7E2C050496404.idx differ
diff --git a/fincept-qt/.cache/clangd/index/CryptoChart.cpp.236C4E33D50407E0.idx b/fincept-qt/.cache/clangd/index/CryptoChart.cpp.236C4E33D50407E0.idx
index 430994e69..ae6d35808 100644
Binary files a/fincept-qt/.cache/clangd/index/CryptoChart.cpp.236C4E33D50407E0.idx and b/fincept-qt/.cache/clangd/index/CryptoChart.cpp.236C4E33D50407E0.idx differ
diff --git a/fincept-qt/.cache/clangd/index/CryptoCredentials.cpp.0A6C966513A24BE9.idx b/fincept-qt/.cache/clangd/index/CryptoCredentials.cpp.0A6C966513A24BE9.idx
index e8e0f5b5e..a9ba06952 100644
Binary files a/fincept-qt/.cache/clangd/index/CryptoCredentials.cpp.0A6C966513A24BE9.idx and b/fincept-qt/.cache/clangd/index/CryptoCredentials.cpp.0A6C966513A24BE9.idx differ
diff --git a/fincept-qt/.cache/clangd/index/CryptoTickerBar.cpp.7BCE138EA4FD4AAC.idx b/fincept-qt/.cache/clangd/index/CryptoTickerBar.cpp.7BCE138EA4FD4AAC.idx
index f106ce35c..709a0d995 100644
Binary files a/fincept-qt/.cache/clangd/index/CryptoTickerBar.cpp.7BCE138EA4FD4AAC.idx and b/fincept-qt/.cache/clangd/index/CryptoTickerBar.cpp.7BCE138EA4FD4AAC.idx differ
diff --git a/fincept-qt/.cache/clangd/index/CryptoTimeSales.cpp.86F1B43B75EB1861.idx b/fincept-qt/.cache/clangd/index/CryptoTimeSales.cpp.86F1B43B75EB1861.idx
index 9cbcda2d9..3b3616c1e 100644
Binary files a/fincept-qt/.cache/clangd/index/CryptoTimeSales.cpp.86F1B43B75EB1861.idx and b/fincept-qt/.cache/clangd/index/CryptoTimeSales.cpp.86F1B43B75EB1861.idx differ
diff --git a/fincept-qt/.cache/clangd/index/CryptoTradingScreen.cpp.8BE4C79C96B6AD7A.idx b/fincept-qt/.cache/clangd/index/CryptoTradingScreen.cpp.8BE4C79C96B6AD7A.idx
index 9b8a2bf54..77970a5c6 100644
Binary files a/fincept-qt/.cache/clangd/index/CryptoTradingScreen.cpp.8BE4C79C96B6AD7A.idx and b/fincept-qt/.cache/clangd/index/CryptoTradingScreen.cpp.8BE4C79C96B6AD7A.idx differ
diff --git a/fincept-qt/.cache/clangd/index/CryptoTradingScreen.h.F3004B3B6A2E8BB1.idx b/fincept-qt/.cache/clangd/index/CryptoTradingScreen.h.F3004B3B6A2E8BB1.idx
index dced555fa..915acc679 100644
Binary files a/fincept-qt/.cache/clangd/index/CryptoTradingScreen.h.F3004B3B6A2E8BB1.idx and b/fincept-qt/.cache/clangd/index/CryptoTradingScreen.h.F3004B3B6A2E8BB1.idx differ
diff --git a/fincept-qt/.cache/clangd/index/CryptoWatchlist.cpp.B6C36BD3409F36BB.idx b/fincept-qt/.cache/clangd/index/CryptoWatchlist.cpp.B6C36BD3409F36BB.idx
index 762d38059..edd190dba 100644
Binary files a/fincept-qt/.cache/clangd/index/CryptoWatchlist.cpp.B6C36BD3409F36BB.idx and b/fincept-qt/.cache/clangd/index/CryptoWatchlist.cpp.B6C36BD3409F36BB.idx differ
diff --git a/fincept-qt/.cache/clangd/index/CryptoWidget.h.6DCAD98E0603F72F.idx b/fincept-qt/.cache/clangd/index/CryptoWidget.h.6DCAD98E0603F72F.idx
index 8f9e20b07..65aec54a6 100644
Binary files a/fincept-qt/.cache/clangd/index/CryptoWidget.h.6DCAD98E0603F72F.idx and b/fincept-qt/.cache/clangd/index/CryptoWidget.h.6DCAD98E0603F72F.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 d65a41ca8..7f3d4ef42 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/DBnomicsDataTable.cpp.52868050179168B0.idx b/fincept-qt/.cache/clangd/index/DBnomicsDataTable.cpp.52868050179168B0.idx
index 011247f5b..f81efd1eb 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 b59cb2b87..fcf6f64d3 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/DBnomicsScreen.h.85FB85DE52582209.idx b/fincept-qt/.cache/clangd/index/DBnomicsScreen.h.85FB85DE52582209.idx
index af0e8e02e..e04f0e5c1 100644
Binary files a/fincept-qt/.cache/clangd/index/DBnomicsScreen.h.85FB85DE52582209.idx and b/fincept-qt/.cache/clangd/index/DBnomicsScreen.h.85FB85DE52582209.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 e44a63b7c..387dec229 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/DashboardStatusBar.cpp.C5AB2615C32D56F4.idx b/fincept-qt/.cache/clangd/index/DashboardStatusBar.cpp.C5AB2615C32D56F4.idx
index 0e1c81041..022ab8021 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/DashboardToolBar.cpp.425D27BA0FD15EEE.idx b/fincept-qt/.cache/clangd/index/DashboardToolBar.cpp.425D27BA0FD15EEE.idx
index b17a764cd..bb0be10d5 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/DataMappingScreen.cpp.3E53FB863B652EB2.idx b/fincept-qt/.cache/clangd/index/DataMappingScreen.cpp.3E53FB863B652EB2.idx
index 59a86b05d..cc55b5be5 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/DataMappingScreen.h.06BFA060A136EC7E.idx b/fincept-qt/.cache/clangd/index/DataMappingScreen.h.06BFA060A136EC7E.idx
index ca4a836cd..620746334 100644
Binary files a/fincept-qt/.cache/clangd/index/DataMappingScreen.h.06BFA060A136EC7E.idx and b/fincept-qt/.cache/clangd/index/DataMappingScreen.h.06BFA060A136EC7E.idx differ
diff --git a/fincept-qt/.cache/clangd/index/DataSourceTypes.h.D2DA4A165C26920E.idx b/fincept-qt/.cache/clangd/index/DataSourceTypes.h.D2DA4A165C26920E.idx
index 39e6b663f..c80514a0d 100644
Binary files a/fincept-qt/.cache/clangd/index/DataSourceTypes.h.D2DA4A165C26920E.idx and b/fincept-qt/.cache/clangd/index/DataSourceTypes.h.D2DA4A165C26920E.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 c6affba1f..06b9f8042 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 15f613f8d..596636a42 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/DatabentoService.h.E3C4AFCCBFE017DF.idx b/fincept-qt/.cache/clangd/index/DatabentoService.h.E3C4AFCCBFE017DF.idx
index 17e4a3796..d6010fefe 100644
Binary files a/fincept-qt/.cache/clangd/index/DatabentoService.h.E3C4AFCCBFE017DF.idx and b/fincept-qt/.cache/clangd/index/DatabentoService.h.E3C4AFCCBFE017DF.idx differ
diff --git a/fincept-qt/.cache/clangd/index/DeployDialog.cpp.652349BDC24869FA.idx b/fincept-qt/.cache/clangd/index/DeployDialog.cpp.652349BDC24869FA.idx
index d6497881d..fb60b80a2 100644
Binary files a/fincept-qt/.cache/clangd/index/DeployDialog.cpp.652349BDC24869FA.idx and b/fincept-qt/.cache/clangd/index/DeployDialog.cpp.652349BDC24869FA.idx differ
diff --git a/fincept-qt/.cache/clangd/index/DocsScreen.cpp.3017888D52192B14.idx b/fincept-qt/.cache/clangd/index/DocsScreen.cpp.3017888D52192B14.idx
index a96dc31d0..fe976978a 100644
Binary files a/fincept-qt/.cache/clangd/index/DocsScreen.cpp.3017888D52192B14.idx and b/fincept-qt/.cache/clangd/index/DocsScreen.cpp.3017888D52192B14.idx differ
diff --git a/fincept-qt/.cache/clangd/index/DocumentCanvas.cpp.E5306DE5E5335E83.idx b/fincept-qt/.cache/clangd/index/DocumentCanvas.cpp.E5306DE5E5335E83.idx
index 5e303b516..7d8fe7f03 100644
Binary files a/fincept-qt/.cache/clangd/index/DocumentCanvas.cpp.E5306DE5E5335E83.idx and b/fincept-qt/.cache/clangd/index/DocumentCanvas.cpp.E5306DE5E5335E83.idx differ
diff --git a/fincept-qt/.cache/clangd/index/EconPanelBase.h.3FD74D3BB12951BA.idx b/fincept-qt/.cache/clangd/index/EconPanelBase.h.3FD74D3BB12951BA.idx
index b197aee48..99be23d23 100644
Binary files a/fincept-qt/.cache/clangd/index/EconPanelBase.h.3FD74D3BB12951BA.idx and b/fincept-qt/.cache/clangd/index/EconPanelBase.h.3FD74D3BB12951BA.idx differ
diff --git a/fincept-qt/.cache/clangd/index/EconomicsScreen.cpp.BAC4A60D8E25BEFD.idx b/fincept-qt/.cache/clangd/index/EconomicsScreen.cpp.BAC4A60D8E25BEFD.idx
index 3953ac31b..05cd4b147 100644
Binary files a/fincept-qt/.cache/clangd/index/EconomicsScreen.cpp.BAC4A60D8E25BEFD.idx and b/fincept-qt/.cache/clangd/index/EconomicsScreen.cpp.BAC4A60D8E25BEFD.idx differ
diff --git a/fincept-qt/.cache/clangd/index/EconomicsScreen.h.EEC72014D6F265F1.idx b/fincept-qt/.cache/clangd/index/EconomicsScreen.h.EEC72014D6F265F1.idx
index 1c3c8ea59..402fc37c5 100644
Binary files a/fincept-qt/.cache/clangd/index/EconomicsScreen.h.EEC72014D6F265F1.idx and b/fincept-qt/.cache/clangd/index/EconomicsScreen.h.EEC72014D6F265F1.idx differ
diff --git a/fincept-qt/.cache/clangd/index/EdgeItem.cpp.02FE4DA971EEE335.idx b/fincept-qt/.cache/clangd/index/EdgeItem.cpp.02FE4DA971EEE335.idx
index 8e4ca5d0a..36f64d2a6 100644
Binary files a/fincept-qt/.cache/clangd/index/EdgeItem.cpp.02FE4DA971EEE335.idx and b/fincept-qt/.cache/clangd/index/EdgeItem.cpp.02FE4DA971EEE335.idx differ
diff --git a/fincept-qt/.cache/clangd/index/EdgeItem.h.C84964F6022F69F4.idx b/fincept-qt/.cache/clangd/index/EdgeItem.h.C84964F6022F69F4.idx
index 98d5c2506..cde338d65 100644
Binary files a/fincept-qt/.cache/clangd/index/EdgeItem.h.C84964F6022F69F4.idx and b/fincept-qt/.cache/clangd/index/EdgeItem.h.C84964F6022F69F4.idx differ
diff --git a/fincept-qt/.cache/clangd/index/EquityAnalysisTab.cpp.FB43CDE2EEEDE1F8.idx b/fincept-qt/.cache/clangd/index/EquityAnalysisTab.cpp.FB43CDE2EEEDE1F8.idx
index d4cff41cb..e2550b20e 100644
Binary files a/fincept-qt/.cache/clangd/index/EquityAnalysisTab.cpp.FB43CDE2EEEDE1F8.idx and b/fincept-qt/.cache/clangd/index/EquityAnalysisTab.cpp.FB43CDE2EEEDE1F8.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 2028b28e2..17b891ff9 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/EquityCredentials.cpp.F593A839B701A49F.idx b/fincept-qt/.cache/clangd/index/EquityCredentials.cpp.F593A839B701A49F.idx
index 0f21de8da..8cd875db1 100644
Binary files a/fincept-qt/.cache/clangd/index/EquityCredentials.cpp.F593A839B701A49F.idx and b/fincept-qt/.cache/clangd/index/EquityCredentials.cpp.F593A839B701A49F.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 cbdf2033a..6041e3400 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 446b5b3fb..54badc125 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 24146837b..e743e177e 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/EquityOverviewTab.cpp.AC27274F90E410BC.idx b/fincept-qt/.cache/clangd/index/EquityOverviewTab.cpp.AC27274F90E410BC.idx
index 5369e7f06..bd1cd557f 100644
Binary files a/fincept-qt/.cache/clangd/index/EquityOverviewTab.cpp.AC27274F90E410BC.idx and b/fincept-qt/.cache/clangd/index/EquityOverviewTab.cpp.AC27274F90E410BC.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 43e0635c2..e15951830 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 065a1cf22..48a524cd0 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 397459be4..48aa6fecd 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/EquityTechnicalsTab.cpp.0E87764BB4548715.idx b/fincept-qt/.cache/clangd/index/EquityTechnicalsTab.cpp.0E87764BB4548715.idx
index e35b8ee89..3989ba4ea 100644
Binary files a/fincept-qt/.cache/clangd/index/EquityTechnicalsTab.cpp.0E87764BB4548715.idx and b/fincept-qt/.cache/clangd/index/EquityTechnicalsTab.cpp.0E87764BB4548715.idx differ
diff --git a/fincept-qt/.cache/clangd/index/EquityTickerBar.cpp.5A16A25DB62549CE.idx b/fincept-qt/.cache/clangd/index/EquityTickerBar.cpp.5A16A25DB62549CE.idx
index 76bcc7ce1..8c9595022 100644
Binary files a/fincept-qt/.cache/clangd/index/EquityTickerBar.cpp.5A16A25DB62549CE.idx and b/fincept-qt/.cache/clangd/index/EquityTickerBar.cpp.5A16A25DB62549CE.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 a163f6891..e8d17bd05 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 f03ed49bb..639bd26bb 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 3469ce55d..7bcc6fadc 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/ExcelScreen.cpp.4E004F007C78E133.idx b/fincept-qt/.cache/clangd/index/ExcelScreen.cpp.4E004F007C78E133.idx
index a2e3e3d17..f4737f3c9 100644
Binary files a/fincept-qt/.cache/clangd/index/ExcelScreen.cpp.4E004F007C78E133.idx and b/fincept-qt/.cache/clangd/index/ExcelScreen.cpp.4E004F007C78E133.idx differ
diff --git a/fincept-qt/.cache/clangd/index/ExcelScreen.h.E791A9D8F8AB3AF1.idx b/fincept-qt/.cache/clangd/index/ExcelScreen.h.E791A9D8F8AB3AF1.idx
index 26f079f8a..9c70f3e40 100644
Binary files a/fincept-qt/.cache/clangd/index/ExcelScreen.h.E791A9D8F8AB3AF1.idx and b/fincept-qt/.cache/clangd/index/ExcelScreen.h.E791A9D8F8AB3AF1.idx differ
diff --git a/fincept-qt/.cache/clangd/index/ExecutionResultsPanel.cpp.82128C60980EFEC4.idx b/fincept-qt/.cache/clangd/index/ExecutionResultsPanel.cpp.82128C60980EFEC4.idx
index e5076cf94..68ac086c1 100644
Binary files a/fincept-qt/.cache/clangd/index/ExecutionResultsPanel.cpp.82128C60980EFEC4.idx and b/fincept-qt/.cache/clangd/index/ExecutionResultsPanel.cpp.82128C60980EFEC4.idx differ
diff --git a/fincept-qt/.cache/clangd/index/FileManagerScreen.cpp.6015E77E247CD8C8.idx b/fincept-qt/.cache/clangd/index/FileManagerScreen.cpp.6015E77E247CD8C8.idx
index 4037340c3..d3d781b96 100644
Binary files a/fincept-qt/.cache/clangd/index/FileManagerScreen.cpp.6015E77E247CD8C8.idx and b/fincept-qt/.cache/clangd/index/FileManagerScreen.cpp.6015E77E247CD8C8.idx differ
diff --git a/fincept-qt/.cache/clangd/index/FileManagerScreen.h.B67059B8882AA887.idx b/fincept-qt/.cache/clangd/index/FileManagerScreen.h.B67059B8882AA887.idx
index ae45774da..d6aa59e8d 100644
Binary files a/fincept-qt/.cache/clangd/index/FileManagerScreen.h.B67059B8882AA887.idx and b/fincept-qt/.cache/clangd/index/FileManagerScreen.h.B67059B8882AA887.idx differ
diff --git a/fincept-qt/.cache/clangd/index/ForgotPasswordScreen.cpp.4DB97023AB44B1A1.idx b/fincept-qt/.cache/clangd/index/ForgotPasswordScreen.cpp.4DB97023AB44B1A1.idx
index b39385b52..5b1cfef90 100644
Binary files a/fincept-qt/.cache/clangd/index/ForgotPasswordScreen.cpp.4DB97023AB44B1A1.idx and b/fincept-qt/.cache/clangd/index/ForgotPasswordScreen.cpp.4DB97023AB44B1A1.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 e56b395cd..1772aa3c4 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 3b32f7b90..3a76a910f 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 0a041a668..f046f9445 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 8b2310b85..3da7e6190 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/ForumScreen.h.841DD6BBC2562462.idx b/fincept-qt/.cache/clangd/index/ForumScreen.h.841DD6BBC2562462.idx
index 67a1d224d..6b68f2787 100644
Binary files a/fincept-qt/.cache/clangd/index/ForumScreen.h.841DD6BBC2562462.idx and b/fincept-qt/.cache/clangd/index/ForumScreen.h.841DD6BBC2562462.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 b1d1275c1..cdb1ebdb7 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 908a63146..b22da49d1 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 0efc94df2..8d95d8ea4 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/GeopoliticsScreen.h.02DA00D4A54CF596.idx b/fincept-qt/.cache/clangd/index/GeopoliticsScreen.h.02DA00D4A54CF596.idx
index 6fe5fed64..54042cfce 100644
Binary files a/fincept-qt/.cache/clangd/index/GeopoliticsScreen.h.02DA00D4A54CF596.idx and b/fincept-qt/.cache/clangd/index/GeopoliticsScreen.h.02DA00D4A54CF596.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 d535a425d..a5572e4ce 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 d0bdebabc..ddd561061 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 51601438b..7c4bee27e 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 463ae89d8..cefea5888 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 17527c8a2..295962f52 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 d7bcf05da..1350b817d 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 47d314a22..98df4ecba 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 ef127e2d8..6f3d113c5 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/GovDataScreen.h.344690CB9080EB16.idx b/fincept-qt/.cache/clangd/index/GovDataScreen.h.344690CB9080EB16.idx
index 42db2ad09..dc13fa651 100644
Binary files a/fincept-qt/.cache/clangd/index/GovDataScreen.h.344690CB9080EB16.idx and b/fincept-qt/.cache/clangd/index/GovDataScreen.h.344690CB9080EB16.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 e5dc7e2a4..07728dfe3 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 ec1339ab1..e1ffe1449 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 451ce0ba3..38690bbee 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 5590d9984..4d66989c8 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/HelpScreen.cpp.8483BFFDD107ADEB.idx b/fincept-qt/.cache/clangd/index/HelpScreen.cpp.8483BFFDD107ADEB.idx
index 906374d27..6103c94d0 100644
Binary files a/fincept-qt/.cache/clangd/index/HelpScreen.cpp.8483BFFDD107ADEB.idx and b/fincept-qt/.cache/clangd/index/HelpScreen.cpp.8483BFFDD107ADEB.idx differ
diff --git a/fincept-qt/.cache/clangd/index/IStatefulScreen.h.6567C5509FFE9E5A.idx b/fincept-qt/.cache/clangd/index/IStatefulScreen.h.6567C5509FFE9E5A.idx
index 15fb03578..a617b5505 100644
Binary files a/fincept-qt/.cache/clangd/index/IStatefulScreen.h.6567C5509FFE9E5A.idx and b/fincept-qt/.cache/clangd/index/IStatefulScreen.h.6567C5509FFE9E5A.idx differ
diff --git a/fincept-qt/.cache/clangd/index/InactivityGuard.h.7087C215AD7285CD.idx b/fincept-qt/.cache/clangd/index/InactivityGuard.h.7087C215AD7285CD.idx
new file mode 100644
index 000000000..1b7e84ba0
Binary files /dev/null and b/fincept-qt/.cache/clangd/index/InactivityGuard.h.7087C215AD7285CD.idx differ
diff --git a/fincept-qt/.cache/clangd/index/LlmConfigRepository.cpp.CF860B4A1B956361.idx b/fincept-qt/.cache/clangd/index/LlmConfigRepository.cpp.CF860B4A1B956361.idx
index 8d899eb31..a6dca380b 100644
Binary files a/fincept-qt/.cache/clangd/index/LlmConfigRepository.cpp.CF860B4A1B956361.idx and b/fincept-qt/.cache/clangd/index/LlmConfigRepository.cpp.CF860B4A1B956361.idx differ
diff --git a/fincept-qt/.cache/clangd/index/LlmConfigRepository.h.15B3D1137BD6DE5B.idx b/fincept-qt/.cache/clangd/index/LlmConfigRepository.h.15B3D1137BD6DE5B.idx
index a4db363ee..94d329560 100644
Binary files a/fincept-qt/.cache/clangd/index/LlmConfigRepository.h.15B3D1137BD6DE5B.idx and b/fincept-qt/.cache/clangd/index/LlmConfigRepository.h.15B3D1137BD6DE5B.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 88f35388e..ea978257d 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/LlmConfigSection.h.F74FAF6C7CAE85C8.idx b/fincept-qt/.cache/clangd/index/LlmConfigSection.h.F74FAF6C7CAE85C8.idx
index df2a90f1a..80493b3ab 100644
Binary files a/fincept-qt/.cache/clangd/index/LlmConfigSection.h.F74FAF6C7CAE85C8.idx and b/fincept-qt/.cache/clangd/index/LlmConfigSection.h.F74FAF6C7CAE85C8.idx differ
diff --git a/fincept-qt/.cache/clangd/index/LlmService.h.6093FA58FA0F5DEB.idx b/fincept-qt/.cache/clangd/index/LlmService.h.6093FA58FA0F5DEB.idx
index 5034d6444..65f56f048 100644
Binary files a/fincept-qt/.cache/clangd/index/LlmService.h.6093FA58FA0F5DEB.idx and b/fincept-qt/.cache/clangd/index/LlmService.h.6093FA58FA0F5DEB.idx differ
diff --git a/fincept-qt/.cache/clangd/index/LoginScreen.cpp.75E5ADD1529D1034.idx b/fincept-qt/.cache/clangd/index/LoginScreen.cpp.75E5ADD1529D1034.idx
index 818d023b0..68e75c4ec 100644
Binary files a/fincept-qt/.cache/clangd/index/LoginScreen.cpp.75E5ADD1529D1034.idx and b/fincept-qt/.cache/clangd/index/LoginScreen.cpp.75E5ADD1529D1034.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 03f24ed79..2342985b9 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/MAAnalyticsScreen.h.71D74E84FC6B38D3.idx b/fincept-qt/.cache/clangd/index/MAAnalyticsScreen.h.71D74E84FC6B38D3.idx
index 2168686f5..a9f9ff0d5 100644
Binary files a/fincept-qt/.cache/clangd/index/MAAnalyticsScreen.h.71D74E84FC6B38D3.idx and b/fincept-qt/.cache/clangd/index/MAAnalyticsScreen.h.71D74E84FC6B38D3.idx differ
diff --git a/fincept-qt/.cache/clangd/index/MAModulePanel.cpp.3D8C0E01C649654E.idx b/fincept-qt/.cache/clangd/index/MAModulePanel.cpp.3D8C0E01C649654E.idx
index 1c93866ed..74225442e 100644
Binary files a/fincept-qt/.cache/clangd/index/MAModulePanel.cpp.3D8C0E01C649654E.idx and b/fincept-qt/.cache/clangd/index/MAModulePanel.cpp.3D8C0E01C649654E.idx differ
diff --git a/fincept-qt/.cache/clangd/index/MAModulePanel.h.B3060D7C6A96F950.idx b/fincept-qt/.cache/clangd/index/MAModulePanel.h.B3060D7C6A96F950.idx
index 4570ca0e1..6101330dc 100644
Binary files a/fincept-qt/.cache/clangd/index/MAModulePanel.h.B3060D7C6A96F950.idx and b/fincept-qt/.cache/clangd/index/MAModulePanel.h.B3060D7C6A96F950.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 d55ffb592..cd0075d64 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/McpServersScreen.cpp.A2F4516D06D41DFB.idx b/fincept-qt/.cache/clangd/index/McpServersScreen.cpp.A2F4516D06D41DFB.idx
index 5b0d358f8..06c5e570c 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/McpServersScreen.h.96A7FF6471B5716F.idx b/fincept-qt/.cache/clangd/index/McpServersScreen.h.96A7FF6471B5716F.idx
index 77a6e4b17..dd8d7300c 100644
Binary files a/fincept-qt/.cache/clangd/index/McpServersScreen.h.96A7FF6471B5716F.idx and b/fincept-qt/.cache/clangd/index/McpServersScreen.h.96A7FF6471B5716F.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 1fe22530a..e756c0a22 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/MiniMap.h.F60460F43A52C69D.idx b/fincept-qt/.cache/clangd/index/MiniMap.h.F60460F43A52C69D.idx
index 748657b04..2490f00ea 100644
Binary files a/fincept-qt/.cache/clangd/index/MiniMap.h.F60460F43A52C69D.idx and b/fincept-qt/.cache/clangd/index/MiniMap.h.F60460F43A52C69D.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 b90da4a08..9ed2912cb 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 f2a5e021a..722750428 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/NodeCanvas.cpp.C38A4531F1A13DF0.idx b/fincept-qt/.cache/clangd/index/NodeCanvas.cpp.C38A4531F1A13DF0.idx
index dd33db44d..3a9b646d5 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/NodeEditorScreen.cpp.AE5A42C5B84FBF73.idx b/fincept-qt/.cache/clangd/index/NodeEditorScreen.cpp.AE5A42C5B84FBF73.idx
index 6594b4eda..84bd49722 100644
Binary files a/fincept-qt/.cache/clangd/index/NodeEditorScreen.cpp.AE5A42C5B84FBF73.idx and b/fincept-qt/.cache/clangd/index/NodeEditorScreen.cpp.AE5A42C5B84FBF73.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NodeEditorScreen.h.51E9CA9853D95DB0.idx b/fincept-qt/.cache/clangd/index/NodeEditorScreen.h.51E9CA9853D95DB0.idx
index 1fd37b065..a63dafdf4 100644
Binary files a/fincept-qt/.cache/clangd/index/NodeEditorScreen.h.51E9CA9853D95DB0.idx and b/fincept-qt/.cache/clangd/index/NodeEditorScreen.h.51E9CA9853D95DB0.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NodeEditorToolbar.cpp.C515CC252C55A995.idx b/fincept-qt/.cache/clangd/index/NodeEditorToolbar.cpp.C515CC252C55A995.idx
index 5b28f05b2..a815e9b33 100644
Binary files a/fincept-qt/.cache/clangd/index/NodeEditorToolbar.cpp.C515CC252C55A995.idx and b/fincept-qt/.cache/clangd/index/NodeEditorToolbar.cpp.C515CC252C55A995.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NodePalette.cpp.C4E5A862CC4BC157.idx b/fincept-qt/.cache/clangd/index/NodePalette.cpp.C4E5A862CC4BC157.idx
index 7720a5c81..8c1de37b7 100644
Binary files a/fincept-qt/.cache/clangd/index/NodePalette.cpp.C4E5A862CC4BC157.idx and b/fincept-qt/.cache/clangd/index/NodePalette.cpp.C4E5A862CC4BC157.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NodePropertiesPanel.cpp.837241288010D510.idx b/fincept-qt/.cache/clangd/index/NodePropertiesPanel.cpp.837241288010D510.idx
index daa094e96..7bffc3e00 100644
Binary files a/fincept-qt/.cache/clangd/index/NodePropertiesPanel.cpp.837241288010D510.idx and b/fincept-qt/.cache/clangd/index/NodePropertiesPanel.cpp.837241288010D510.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NodeRegistry.h.6C35932AF62DBEED.idx b/fincept-qt/.cache/clangd/index/NodeRegistry.h.6C35932AF62DBEED.idx
index 5aa706a78..49369f68d 100644
Binary files a/fincept-qt/.cache/clangd/index/NodeRegistry.h.6C35932AF62DBEED.idx and b/fincept-qt/.cache/clangd/index/NodeRegistry.h.6C35932AF62DBEED.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NodeScene.cpp.DAA6CE667DFCE3A3.idx b/fincept-qt/.cache/clangd/index/NodeScene.cpp.DAA6CE667DFCE3A3.idx
index 11e21c70d..dd9b9ae40 100644
Binary files a/fincept-qt/.cache/clangd/index/NodeScene.cpp.DAA6CE667DFCE3A3.idx and b/fincept-qt/.cache/clangd/index/NodeScene.cpp.DAA6CE667DFCE3A3.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NodeScene.h.934085D31AD3DEE3.idx b/fincept-qt/.cache/clangd/index/NodeScene.h.934085D31AD3DEE3.idx
index a358e29e1..3cdfebd35 100644
Binary files a/fincept-qt/.cache/clangd/index/NodeScene.h.934085D31AD3DEE3.idx and b/fincept-qt/.cache/clangd/index/NodeScene.h.934085D31AD3DEE3.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NotesScreen.cpp.5EC3022DB88EFFBE.idx b/fincept-qt/.cache/clangd/index/NotesScreen.cpp.5EC3022DB88EFFBE.idx
index fa470bfd5..6f9a9162d 100644
Binary files a/fincept-qt/.cache/clangd/index/NotesScreen.cpp.5EC3022DB88EFFBE.idx and b/fincept-qt/.cache/clangd/index/NotesScreen.cpp.5EC3022DB88EFFBE.idx differ
diff --git a/fincept-qt/.cache/clangd/index/NotesScreen.h.5CFEDD74DD7E6601.idx b/fincept-qt/.cache/clangd/index/NotesScreen.h.5CFEDD74DD7E6601.idx
index 1996eef6c..f481ce591 100644
Binary files a/fincept-qt/.cache/clangd/index/NotesScreen.h.5CFEDD74DD7E6601.idx and b/fincept-qt/.cache/clangd/index/NotesScreen.h.5CFEDD74DD7E6601.idx differ
diff --git a/fincept-qt/.cache/clangd/index/ParameterWidgets.cpp.D3E120E479D4DE1F.idx b/fincept-qt/.cache/clangd/index/ParameterWidgets.cpp.D3E120E479D4DE1F.idx
index 64375793e..dc2ce855e 100644
Binary files a/fincept-qt/.cache/clangd/index/ParameterWidgets.cpp.D3E120E479D4DE1F.idx and b/fincept-qt/.cache/clangd/index/ParameterWidgets.cpp.D3E120E479D4DE1F.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PinManager.h.D67713E733273186.idx b/fincept-qt/.cache/clangd/index/PinManager.h.D67713E733273186.idx
new file mode 100644
index 000000000..169ca030b
Binary files /dev/null and b/fincept-qt/.cache/clangd/index/PinManager.h.D67713E733273186.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PlaceholderOverlay.cpp.98D8E1429C3A191E.idx b/fincept-qt/.cache/clangd/index/PlaceholderOverlay.cpp.98D8E1429C3A191E.idx
index 41eab3855..7e79046d8 100644
Binary files a/fincept-qt/.cache/clangd/index/PlaceholderOverlay.cpp.98D8E1429C3A191E.idx and b/fincept-qt/.cache/clangd/index/PlaceholderOverlay.cpp.98D8E1429C3A191E.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PolymarketScreen.cpp.C3E7BE6353290D49.idx b/fincept-qt/.cache/clangd/index/PolymarketScreen.cpp.C3E7BE6353290D49.idx
index ca7128e4a..b113dba4c 100644
Binary files a/fincept-qt/.cache/clangd/index/PolymarketScreen.cpp.C3E7BE6353290D49.idx and b/fincept-qt/.cache/clangd/index/PolymarketScreen.cpp.C3E7BE6353290D49.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PolymarketScreen.h.2D2B09D18DBF1B6D.idx b/fincept-qt/.cache/clangd/index/PolymarketScreen.h.2D2B09D18DBF1B6D.idx
index 8c159a37b..a549548c9 100644
Binary files a/fincept-qt/.cache/clangd/index/PolymarketScreen.h.2D2B09D18DBF1B6D.idx and b/fincept-qt/.cache/clangd/index/PolymarketScreen.h.2D2B09D18DBF1B6D.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioAgentPanel.cpp.75DD885F9E74A748.idx b/fincept-qt/.cache/clangd/index/PortfolioAgentPanel.cpp.75DD885F9E74A748.idx
index 1c0c5a8a9..22fb03578 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioAgentPanel.cpp.75DD885F9E74A748.idx and b/fincept-qt/.cache/clangd/index/PortfolioAgentPanel.cpp.75DD885F9E74A748.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioAiPanel.cpp.6A405905D4DD78BA.idx b/fincept-qt/.cache/clangd/index/PortfolioAiPanel.cpp.6A405905D4DD78BA.idx
index 75c386a11..6406c1b32 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioAiPanel.cpp.6A405905D4DD78BA.idx and b/fincept-qt/.cache/clangd/index/PortfolioAiPanel.cpp.6A405905D4DD78BA.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 4e46809d7..c21fa34c6 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/PortfolioCommandBar.cpp.D4AE1F5BBA7204C4.idx b/fincept-qt/.cache/clangd/index/PortfolioCommandBar.cpp.D4AE1F5BBA7204C4.idx
index d4533b62c..3e933b569 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/PortfolioDialogs.cpp.959F567BA49874EA.idx b/fincept-qt/.cache/clangd/index/PortfolioDialogs.cpp.959F567BA49874EA.idx
index 206ad09bf..2f8addf24 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/PortfolioFFNView.cpp.C7416A581F9D264E.idx b/fincept-qt/.cache/clangd/index/PortfolioFFNView.cpp.C7416A581F9D264E.idx
index cfdbc5bad..4d2163b80 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 b716d7fba..bd8b7aed5 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 db54bbcc5..0d42ff6d3 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/PortfolioOrderPanel.cpp.C8D37CE637E6F5C5.idx b/fincept-qt/.cache/clangd/index/PortfolioOrderPanel.cpp.C8D37CE637E6F5C5.idx
index c7a8983b6..e56b2f421 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioOrderPanel.cpp.C8D37CE637E6F5C5.idx and b/fincept-qt/.cache/clangd/index/PortfolioOrderPanel.cpp.C8D37CE637E6F5C5.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 28bf76ec8..f9433c2dd 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/PortfolioSectorPanel.cpp.C570B3A70CEC18AD.idx b/fincept-qt/.cache/clangd/index/PortfolioSectorPanel.cpp.C570B3A70CEC18AD.idx
index d46812ad0..4450f8b5c 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/PortfolioSparkline.cpp.F7D789F605BABC65.idx b/fincept-qt/.cache/clangd/index/PortfolioSparkline.cpp.F7D789F605BABC65.idx
index b078e7e3a..85e7ac2c9 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioSparkline.cpp.F7D789F605BABC65.idx and b/fincept-qt/.cache/clangd/index/PortfolioSparkline.cpp.F7D789F605BABC65.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PortfolioSparkline.h.4D605CE6CC43DE6F.idx b/fincept-qt/.cache/clangd/index/PortfolioSparkline.h.4D605CE6CC43DE6F.idx
index 5387224d4..e1f5b4287 100644
Binary files a/fincept-qt/.cache/clangd/index/PortfolioSparkline.h.4D605CE6CC43DE6F.idx and b/fincept-qt/.cache/clangd/index/PortfolioSparkline.h.4D605CE6CC43DE6F.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 1d736b578..d08902fc7 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/PrivacyScreen.cpp.88A4AA6B78E58AA5.idx b/fincept-qt/.cache/clangd/index/PrivacyScreen.cpp.88A4AA6B78E58AA5.idx
index 25219ed34..cc0313b02 100644
Binary files a/fincept-qt/.cache/clangd/index/PrivacyScreen.cpp.88A4AA6B78E58AA5.idx and b/fincept-qt/.cache/clangd/index/PrivacyScreen.cpp.88A4AA6B78E58AA5.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 d2529a430..cc3b9b783 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/ProfileScreen.h.F40B084314B27284.idx b/fincept-qt/.cache/clangd/index/ProfileScreen.h.F40B084314B27284.idx
index a4f49a675..c0d3dde17 100644
Binary files a/fincept-qt/.cache/clangd/index/ProfileScreen.h.F40B084314B27284.idx and b/fincept-qt/.cache/clangd/index/ProfileScreen.h.F40B084314B27284.idx differ
diff --git a/fincept-qt/.cache/clangd/index/PythonRunner.h.AE5F4000DDBEA5E9.idx b/fincept-qt/.cache/clangd/index/PythonRunner.h.AE5F4000DDBEA5E9.idx
index 74665c03e..5b82a845f 100644
Binary files a/fincept-qt/.cache/clangd/index/PythonRunner.h.AE5F4000DDBEA5E9.idx and b/fincept-qt/.cache/clangd/index/PythonRunner.h.AE5F4000DDBEA5E9.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 824d6e5c9..9bf314b51 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/QuantModulePanel.h.E994312404EAB718.idx b/fincept-qt/.cache/clangd/index/QuantModulePanel.h.E994312404EAB718.idx
index 270a3feb0..9c4cc94e7 100644
Binary files a/fincept-qt/.cache/clangd/index/QuantModulePanel.h.E994312404EAB718.idx and b/fincept-qt/.cache/clangd/index/QuantModulePanel.h.E994312404EAB718.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 d62e29923..7f1d6e195 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 c35426a70..854950cf2 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/RelationshipGraphScene.cpp.064267E627E65C25.idx b/fincept-qt/.cache/clangd/index/RelationshipGraphScene.cpp.064267E627E65C25.idx
index ba16a1a4b..afddf4946 100644
Binary files a/fincept-qt/.cache/clangd/index/RelationshipGraphScene.cpp.064267E627E65C25.idx and b/fincept-qt/.cache/clangd/index/RelationshipGraphScene.cpp.064267E627E65C25.idx differ
diff --git a/fincept-qt/.cache/clangd/index/RelationshipMapScreen.cpp.B19787CB71826C18.idx b/fincept-qt/.cache/clangd/index/RelationshipMapScreen.cpp.B19787CB71826C18.idx
index 3dd4bd9dc..ba8181863 100644
Binary files a/fincept-qt/.cache/clangd/index/RelationshipMapScreen.cpp.B19787CB71826C18.idx and b/fincept-qt/.cache/clangd/index/RelationshipMapScreen.cpp.B19787CB71826C18.idx differ
diff --git a/fincept-qt/.cache/clangd/index/RelationshipMapScreen.h.96AF74B1535A9199.idx b/fincept-qt/.cache/clangd/index/RelationshipMapScreen.h.96AF74B1535A9199.idx
index 49232ed1c..fe88f3f39 100644
Binary files a/fincept-qt/.cache/clangd/index/RelationshipMapScreen.h.96AF74B1535A9199.idx and b/fincept-qt/.cache/clangd/index/RelationshipMapScreen.h.96AF74B1535A9199.idx differ
diff --git a/fincept-qt/.cache/clangd/index/RelationshipPanel.cpp.F8FFEB5E1F827494.idx b/fincept-qt/.cache/clangd/index/RelationshipPanel.cpp.F8FFEB5E1F827494.idx
index 1108cbc6c..93a28b52b 100644
Binary files a/fincept-qt/.cache/clangd/index/RelationshipPanel.cpp.F8FFEB5E1F827494.idx and b/fincept-qt/.cache/clangd/index/RelationshipPanel.cpp.F8FFEB5E1F827494.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 5d637e590..5b62dfdf1 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/ReportBuilderScreen.h.3AE6B8315AEEA2C2.idx b/fincept-qt/.cache/clangd/index/ReportBuilderScreen.h.3AE6B8315AEEA2C2.idx
index 688c7e028..d2a392952 100644
Binary files a/fincept-qt/.cache/clangd/index/ReportBuilderScreen.h.3AE6B8315AEEA2C2.idx and b/fincept-qt/.cache/clangd/index/ReportBuilderScreen.h.3AE6B8315AEEA2C2.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 c8fb48b0d..1a7080065 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/ScreenStateManager.h.BC4FE1A48243A8A2.idx b/fincept-qt/.cache/clangd/index/ScreenStateManager.h.BC4FE1A48243A8A2.idx
new file mode 100644
index 000000000..f52dce17e
Binary files /dev/null and b/fincept-qt/.cache/clangd/index/ScreenStateManager.h.BC4FE1A48243A8A2.idx differ
diff --git a/fincept-qt/.cache/clangd/index/SectorHeatmapWidget.cpp.5E29319B0949A3EA.idx b/fincept-qt/.cache/clangd/index/SectorHeatmapWidget.cpp.5E29319B0949A3EA.idx
index 1ac712fef..a8fdab534 100644
Binary files a/fincept-qt/.cache/clangd/index/SectorHeatmapWidget.cpp.5E29319B0949A3EA.idx and b/fincept-qt/.cache/clangd/index/SectorHeatmapWidget.cpp.5E29319B0949A3EA.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 e41b2276e..a1ba01545 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 34e167361..b31b9ca4a 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 272cc0e49..3e6817d3e 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/SpreadsheetWidget.cpp.7318CF2D22A2E080.idx b/fincept-qt/.cache/clangd/index/SpreadsheetWidget.cpp.7318CF2D22A2E080.idx
index a2a00e879..46b1b99fb 100644
Binary files a/fincept-qt/.cache/clangd/index/SpreadsheetWidget.cpp.7318CF2D22A2E080.idx and b/fincept-qt/.cache/clangd/index/SpreadsheetWidget.cpp.7318CF2D22A2E080.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 ecab8ebe1..0648e1999 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/SurfaceAnalyticsScreen.cpp.6604E641420CFDBA.idx b/fincept-qt/.cache/clangd/index/SurfaceAnalyticsScreen.cpp.6604E641420CFDBA.idx
index 56213108d..965399ee0 100644
Binary files a/fincept-qt/.cache/clangd/index/SurfaceAnalyticsScreen.cpp.6604E641420CFDBA.idx and b/fincept-qt/.cache/clangd/index/SurfaceAnalyticsScreen.cpp.6604E641420CFDBA.idx differ
diff --git a/fincept-qt/.cache/clangd/index/SurfaceAnalyticsScreen.h.4D25978508ECEA7E.idx b/fincept-qt/.cache/clangd/index/SurfaceAnalyticsScreen.h.4D25978508ECEA7E.idx
index 871d95bd7..eb2f27813 100644
Binary files a/fincept-qt/.cache/clangd/index/SurfaceAnalyticsScreen.h.4D25978508ECEA7E.idx and b/fincept-qt/.cache/clangd/index/SurfaceAnalyticsScreen.h.4D25978508ECEA7E.idx differ
diff --git a/fincept-qt/.cache/clangd/index/SurfaceDatabentoPanel.cpp.79744155CC6D9130.idx b/fincept-qt/.cache/clangd/index/SurfaceDatabentoPanel.cpp.79744155CC6D9130.idx
index c923603d8..58c5a1fad 100644
Binary files a/fincept-qt/.cache/clangd/index/SurfaceDatabentoPanel.cpp.79744155CC6D9130.idx and b/fincept-qt/.cache/clangd/index/SurfaceDatabentoPanel.cpp.79744155CC6D9130.idx differ
diff --git a/fincept-qt/.cache/clangd/index/SurfaceDatabentoPanel.h.3C343B74F722B6AE.idx b/fincept-qt/.cache/clangd/index/SurfaceDatabentoPanel.h.3C343B74F722B6AE.idx
index 0739a8588..aa0192817 100644
Binary files a/fincept-qt/.cache/clangd/index/SurfaceDatabentoPanel.h.3C343B74F722B6AE.idx and b/fincept-qt/.cache/clangd/index/SurfaceDatabentoPanel.h.3C343B74F722B6AE.idx differ
diff --git a/fincept-qt/.cache/clangd/index/SurfaceMetricsPanel.cpp.266952744DF661C4.idx b/fincept-qt/.cache/clangd/index/SurfaceMetricsPanel.cpp.266952744DF661C4.idx
index 211503417..d2cad0930 100644
Binary files a/fincept-qt/.cache/clangd/index/SurfaceMetricsPanel.cpp.266952744DF661C4.idx and b/fincept-qt/.cache/clangd/index/SurfaceMetricsPanel.cpp.266952744DF661C4.idx differ
diff --git a/fincept-qt/.cache/clangd/index/SurfaceMetricsPanel.h.B4D880D571A68A3F.idx b/fincept-qt/.cache/clangd/index/SurfaceMetricsPanel.h.B4D880D571A68A3F.idx
index 6606d2131..a8d255dba 100644
Binary files a/fincept-qt/.cache/clangd/index/SurfaceMetricsPanel.h.B4D880D571A68A3F.idx and b/fincept-qt/.cache/clangd/index/SurfaceMetricsPanel.h.B4D880D571A68A3F.idx differ
diff --git a/fincept-qt/.cache/clangd/index/SurfaceTableWidget.cpp.83317B9EF11404E6.idx b/fincept-qt/.cache/clangd/index/SurfaceTableWidget.cpp.83317B9EF11404E6.idx
index 9a5e039e2..542615539 100644
Binary files a/fincept-qt/.cache/clangd/index/SurfaceTableWidget.cpp.83317B9EF11404E6.idx and b/fincept-qt/.cache/clangd/index/SurfaceTableWidget.cpp.83317B9EF11404E6.idx differ
diff --git a/fincept-qt/.cache/clangd/index/TempEdge.cpp.A1AB08BA772CF3BF.idx b/fincept-qt/.cache/clangd/index/TempEdge.cpp.A1AB08BA772CF3BF.idx
index 4997d6204..25d9a0685 100644
Binary files a/fincept-qt/.cache/clangd/index/TempEdge.cpp.A1AB08BA772CF3BF.idx and b/fincept-qt/.cache/clangd/index/TempEdge.cpp.A1AB08BA772CF3BF.idx differ
diff --git a/fincept-qt/.cache/clangd/index/TemplatePicker.cpp.95EFB8F0DEB03354.idx b/fincept-qt/.cache/clangd/index/TemplatePicker.cpp.95EFB8F0DEB03354.idx
index 2d2334bcb..e35294281 100644
Binary files a/fincept-qt/.cache/clangd/index/TemplatePicker.cpp.95EFB8F0DEB03354.idx and b/fincept-qt/.cache/clangd/index/TemplatePicker.cpp.95EFB8F0DEB03354.idx differ
diff --git a/fincept-qt/.cache/clangd/index/TermsScreen.cpp.E2AD313ED3CC5EF6.idx b/fincept-qt/.cache/clangd/index/TermsScreen.cpp.E2AD313ED3CC5EF6.idx
index bbe085cbd..3be12c78d 100644
Binary files a/fincept-qt/.cache/clangd/index/TermsScreen.cpp.E2AD313ED3CC5EF6.idx and b/fincept-qt/.cache/clangd/index/TermsScreen.cpp.E2AD313ED3CC5EF6.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 5df8d5737..f8d52f93a 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 edf0d8b4a..f8b6bd5ed 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/ThemeTokens.h.42B01D62A14FBA01.idx b/fincept-qt/.cache/clangd/index/ThemeTokens.h.42B01D62A14FBA01.idx
index 266e415e4..86978a4ab 100644
Binary files a/fincept-qt/.cache/clangd/index/ThemeTokens.h.42B01D62A14FBA01.idx and b/fincept-qt/.cache/clangd/index/ThemeTokens.h.42B01D62A14FBA01.idx differ
diff --git a/fincept-qt/.cache/clangd/index/TradeAnalysisPanel.cpp.80074B7986741F5C.idx b/fincept-qt/.cache/clangd/index/TradeAnalysisPanel.cpp.80074B7986741F5C.idx
index a98e2d552..0eb82ca83 100644
Binary files a/fincept-qt/.cache/clangd/index/TradeAnalysisPanel.cpp.80074B7986741F5C.idx and b/fincept-qt/.cache/clangd/index/TradeAnalysisPanel.cpp.80074B7986741F5C.idx differ
diff --git a/fincept-qt/.cache/clangd/index/TradeVizScreen.cpp.1246A0A9A3F0E860.idx b/fincept-qt/.cache/clangd/index/TradeVizScreen.cpp.1246A0A9A3F0E860.idx
index 6d9921ff3..73af1dc84 100644
Binary files a/fincept-qt/.cache/clangd/index/TradeVizScreen.cpp.1246A0A9A3F0E860.idx and b/fincept-qt/.cache/clangd/index/TradeVizScreen.cpp.1246A0A9A3F0E860.idx differ
diff --git a/fincept-qt/.cache/clangd/index/TrademarksScreen.cpp.229274CB66FB4CB2.idx b/fincept-qt/.cache/clangd/index/TrademarksScreen.cpp.229274CB66FB4CB2.idx
index 071778fa2..314283882 100644
Binary files a/fincept-qt/.cache/clangd/index/TrademarksScreen.cpp.229274CB66FB4CB2.idx and b/fincept-qt/.cache/clangd/index/TrademarksScreen.cpp.229274CB66FB4CB2.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 ab96473ee..7b7924d99 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/WatchlistScreen.cpp.7764D3D8F05E1B90.idx b/fincept-qt/.cache/clangd/index/WatchlistScreen.cpp.7764D3D8F05E1B90.idx
index 28dd87b69..cca90db78 100644
Binary files a/fincept-qt/.cache/clangd/index/WatchlistScreen.cpp.7764D3D8F05E1B90.idx and b/fincept-qt/.cache/clangd/index/WatchlistScreen.cpp.7764D3D8F05E1B90.idx differ
diff --git a/fincept-qt/.cache/clangd/index/WatchlistScreen.h.BBB42464A281A795.idx b/fincept-qt/.cache/clangd/index/WatchlistScreen.h.BBB42464A281A795.idx
index d7325e1e7..a34e716b2 100644
Binary files a/fincept-qt/.cache/clangd/index/WatchlistScreen.h.BBB42464A281A795.idx and b/fincept-qt/.cache/clangd/index/WatchlistScreen.h.BBB42464A281A795.idx differ
diff --git a/fincept-qt/CMakeLists.txt b/fincept-qt/CMakeLists.txt
index b294b463c..a0b8341ff 100644
--- a/fincept-qt/CMakeLists.txt
+++ b/fincept-qt/CMakeLists.txt
@@ -239,6 +239,7 @@ set(CORE_SOURCES
src/core/logging/Logger.cpp
src/core/events/EventBus.cpp
src/core/session/SessionManager.cpp
+ src/core/session/ScreenStateManager.cpp
)
# Network
@@ -254,6 +255,8 @@ set(AUTH_SOURCES
src/auth/AuthApi.cpp
src/auth/UserApi.cpp
src/auth/SessionGuard.cpp
+ src/auth/PinManager.cpp
+ src/auth/InactivityGuard.cpp
)
# Storage
@@ -319,6 +322,12 @@ set(STORAGE_SOURCES
# News articles — dedicated news article storage
src/storage/sqlite/migrations/v013_news_articles.cpp
+
+ # LLM tools toggle
+ src/storage/sqlite/migrations/v014_llm_tools_toggle.cpp
+
+ # Screen UI state — crash-safe per-screen state in cache.db
+ src/storage/sqlite/migrations/v015_screen_state.cpp
)
# Python runner
@@ -519,6 +528,7 @@ set(SCREEN_SOURCES
src/screens/auth/RegisterScreen.cpp
src/screens/auth/ForgotPasswordScreen.cpp
src/screens/auth/PricingScreen.cpp
+ src/screens/auth/LockScreen.cpp
src/screens/profile/ProfileScreen.cpp
src/screens/settings/SettingsScreen.cpp
src/screens/settings/LlmConfigSection.cpp
@@ -533,6 +543,7 @@ set(SCREEN_SOURCES
src/screens/chat_mode/ChatMessagePanel.cpp
src/screens/chat_mode/ChatAgentPanel.cpp
src/screens/chat_mode/ChatModeScreen.cpp
+ src/screens/chat_mode/TerminalToolBridge.cpp
src/screens/setup/SetupScreen.cpp
src/screens/info/ContactScreen.cpp
src/screens/info/TermsScreen.cpp
@@ -853,6 +864,7 @@ set_source_files_properties(
src/screens/alt_investments/AltInvestmentsScreen.cpp
src/screens/asia_markets/AsiaMarketsScreen.cpp
src/screens/auth/ForgotPasswordScreen.cpp
+ src/screens/auth/LockScreen.cpp
src/screens/auth/LoginScreen.cpp
src/screens/auth/PricingScreen.cpp
src/screens/auth/RegisterScreen.cpp
@@ -1072,6 +1084,8 @@ set_source_files_properties(
src/storage/sqlite/migrations/v011_custom_indices.cpp
src/storage/sqlite/migrations/v012_data_normalization.cpp
src/storage/sqlite/migrations/v013_news_articles.cpp
+ src/storage/sqlite/migrations/v014_llm_tools_toggle.cpp
+ src/storage/sqlite/migrations/v015_screen_state.cpp
# Polymarket screen files — each defines static fmt_* helpers in same namespace
src/screens/polymarket/PolymarketScreen.cpp
src/screens/polymarket/PolymarketCommandBar.cpp
diff --git a/fincept-qt/scripts/Analytics/alternateInvestment/cli.py b/fincept-qt/scripts/Analytics/alternateInvestment/cli.py
index 29e66167a..9eea8a4a8 100644
--- a/fincept-qt/scripts/Analytics/alternateInvestment/cli.py
+++ b/fincept-qt/scripts/Analytics/alternateInvestment/cli.py
@@ -786,14 +786,14 @@ def analyze_preferred_stocks(data: Dict[str, Any], method: str = 'yield_analysis
analyzer = PreferredStockAnalyzer(params)
if method == 'yield_analysis':
- metrics = analyzer.calculate_yields()
+ metrics = {
+ 'current_yield': float(analyzer.calculate_current_yield()),
+ 'yield_to_call': analyzer.calculate_yield_to_call()
+ }
elif method == 'call_risk':
metrics = analyzer.analyze_call_risk()
elif method == 'dividend_safety':
- metrics = analyzer.dividend_suspension_risk_analysis(
- data.get('issuer_credit_rating', 'BBB'),
- Decimal(str(data.get('interest_coverage', 3.0)))
- )
+ metrics = analyzer.analyze_dividend_suspension_risk()
else:
metrics = analyzer.calculate_key_metrics()
@@ -1308,12 +1308,9 @@ def analyze_leveraged_funds(data: Dict[str, Any], method: str = 'decay') -> Dict
analyzer = LeveragedFundAnalyzer(params)
if method == 'decay':
- metrics = analyzer.volatility_decay_analysis(
- data.get('days', 252),
- Decimal(str(data.get('volatility', 0.20)))
- )
+ metrics = analyzer.volatility_decay_example()
elif method == 'volatility':
- metrics = analyzer.amplification_analysis()
+ metrics = analyzer.volatility_decay_example()
elif method == 'verdict':
metrics = analyzer.analysis_verdict()
else:
@@ -1340,9 +1337,9 @@ def analyze_structured_products(data: Dict[str, Any], method: str = 'complexity'
analyzer = StructuredProductAnalyzer(params)
if method == 'complexity':
- metrics = analyzer.complexity_analysis()
+ metrics = analyzer.analysis_verdict()
elif method == 'costs':
- metrics = analyzer.hidden_costs_analysis()
+ metrics = analyzer.analysis_verdict()
elif method == 'verdict':
metrics = analyzer.analysis_verdict()
else:
@@ -1369,14 +1366,13 @@ def analyze_variable_annuities(data: Dict[str, Any], method: str = 'fees') -> Di
analyzer = VariableAnnuityAnalyzer(params)
if method == 'fees':
- metrics = analyzer.fee_analysis()
+ metrics = analyzer.total_annual_cost()
elif method == 'tax':
- metrics = analyzer.tax_efficiency_analysis()
+ years = int(data.get('years', 20))
+ gross_return = Decimal(str(data.get('gross_return', 0.08)))
+ metrics = analyzer.tax_deferral_myth(years, gross_return)
elif method == 'alternatives':
- metrics = analyzer.compare_to_alternatives(
- Decimal(str(data.get('alternative_return', 0.08))),
- Decimal(str(data.get('alternative_fee', 0.0020)))
- )
+ metrics = analyzer.compare_to_alternatives()
elif method == 'verdict':
metrics = analyzer.analysis_verdict()
else:
diff --git a/fincept-qt/scripts/Analytics/alternateInvestment/leveraged_funds.py b/fincept-qt/scripts/Analytics/alternateInvestment/leveraged_funds.py
index 51d2b9045..f1399932e 100644
--- a/fincept-qt/scripts/Analytics/alternateInvestment/leveraged_funds.py
+++ b/fincept-qt/scripts/Analytics/alternateInvestment/leveraged_funds.py
@@ -106,5 +106,15 @@ class LeveragedFundAnalyzer(AlternativeInvestmentBase):
'analysis_category': 'THE UGLY'
}
+ def valuation_summary(self) -> Dict[str, Any]:
+ return {
+ 'nav': float(self.calculate_nav()),
+ 'key_metrics': self.calculate_key_metrics(),
+ 'verdict': self.analysis_verdict(),
+ 'analysis_category': 'THE UGLY',
+ 'rating': '1/10',
+ 'analysis_recommendation': 'AVOID - volatility decay guarantees long-term underperformance'
+ }
+
__all__ = ['LeveragedFundAnalyzer']
diff --git a/fincept-qt/scripts/Analytics/alternateInvestment/structured_products.py b/fincept-qt/scripts/Analytics/alternateInvestment/structured_products.py
index 38a02c6a4..75adfc901 100644
--- a/fincept-qt/scripts/Analytics/alternateInvestment/structured_products.py
+++ b/fincept-qt/scripts/Analytics/alternateInvestment/structured_products.py
@@ -61,5 +61,15 @@ class StructuredProductAnalyzer(AlternativeInvestmentBase):
'analysis_category': 'THE UGLY'
}
+ def valuation_summary(self) -> Dict[str, Any]:
+ return {
+ 'nav': float(self.calculate_nav()),
+ 'key_metrics': self.calculate_key_metrics(),
+ 'verdict': self.analysis_verdict(),
+ 'analysis_category': 'THE UGLY',
+ 'rating': '2/10',
+ 'analysis_recommendation': 'AVOID - complexity hides costs; buy stocks and bonds separately'
+ }
+
__all__ = ['StructuredProductAnalyzer']
diff --git a/fincept-qt/scripts/compute_technicals.py b/fincept-qt/scripts/compute_technicals.py
index d3fb5b13f..6e82f8eea 100644
--- a/fincept-qt/scripts/compute_technicals.py
+++ b/fincept-qt/scripts/compute_technicals.py
@@ -109,6 +109,41 @@ def compute_all_technicals(historical_data_json):
})
+def parse_args(args):
+ """
+ Parse command-line arguments supporting both:
+ - Named flags: --data <json> --indicator <name> --period <n> [--symbol <sym>]
+ - Legacy positional: <json_data>
+ """
+ data = None
+ indicator = None
+ period = None
+ symbol = None
+
+ i = 0
+ while i < len(args):
+ if args[i] == "--data" and i + 1 < len(args):
+ data = args[i + 1]
+ i += 2
+ elif args[i] == "--indicator" and i + 1 < len(args):
+ indicator = args[i + 1]
+ i += 2
+ elif args[i] == "--period" and i + 1 < len(args):
+ period = args[i + 1]
+ i += 2
+ elif args[i] == "--symbol" and i + 1 < len(args):
+ symbol = args[i + 1]
+ i += 2
+ elif data is None and not args[i].startswith("--"):
+ # Legacy positional: first non-flag arg is the JSON data
+ data = args[i]
+ i += 1
+ else:
+ i += 1
+
+ return data, indicator, period, symbol
+
+
def main(args=None):
"""
Main entry point for worker pool and subprocess execution
@@ -126,10 +161,17 @@ def main(args=None):
if len(args) < 1:
return json.dumps({
"success": False,
- "error": "Usage: python compute_technicals.py '<historical_data_json>'"
+ "error": "Usage: python compute_technicals.py --data '<json>' --indicator <name> --period <n>"
+ })
+
+ historical_data_json, indicator, period, symbol = parse_args(args)
+
+ if not historical_data_json:
+ return json.dumps({
+ "success": False,
+ "error": "No data provided. Use --data '<json>' or pass JSON as first positional argument."
})
- historical_data_json = args[0]
result = compute_all_technicals(historical_data_json)
return result
diff --git a/fincept-qt/scripts/databento_provider.py b/fincept-qt/scripts/databento_provider.py
index a838f30d9..88fc15b31 100644
--- a/fincept-qt/scripts/databento_provider.py
+++ b/fincept-qt/scripts/databento_provider.py
@@ -39,6 +39,86 @@ try:
except ImportError:
NUMPY_AVAILABLE = False
+try:
+ from scipy.stats import norm as scipy_norm
+ from scipy.optimize import brentq
+ SCIPY_AVAILABLE = True
+except ImportError:
+ SCIPY_AVAILABLE = False
+
+
+# ── Black-Scholes helpers for IV and Greeks ─────────────────────────────────
+def _bs_price(S, K, T, r, sigma, is_call=True):
+ """Black-Scholes option price"""
+ if T <= 0 or sigma <= 0 or S <= 0 or K <= 0:
+ return 0.0
+ d1 = (math.log(S / K) + (r + 0.5 * sigma ** 2) * T) / (sigma * math.sqrt(T))
+ d2 = d1 - sigma * math.sqrt(T)
+ if SCIPY_AVAILABLE:
+ N = scipy_norm.cdf
+ else:
+ N = lambda x: 0.5 * (1.0 + math.erf(x / math.sqrt(2.0)))
+ if is_call:
+ return S * N(d1) - K * math.exp(-r * T) * N(d2)
+ else:
+ return K * math.exp(-r * T) * N(-d2) - S * N(-d1)
+
+
+def _implied_vol(price, S, K, T, r, is_call=True):
+ """Compute implied volatility using Brent's method or bisection"""
+ if price <= 0 or T <= 0 or S <= 0 or K <= 0:
+ return 0.0
+ intrinsic = max(0, (S - K) if is_call else (K - S))
+ if price < intrinsic + 0.001:
+ return 0.0
+ try:
+ if SCIPY_AVAILABLE:
+ iv = brentq(lambda sig: _bs_price(S, K, T, r, sig, is_call) - price,
+ 0.001, 5.0, xtol=1e-6, maxiter=100)
+ return iv
+ else:
+ # Bisection fallback
+ lo, hi = 0.001, 5.0
+ for _ in range(80):
+ mid = (lo + hi) / 2
+ p = _bs_price(S, K, T, r, mid, is_call)
+ if p < price:
+ lo = mid
+ else:
+ hi = mid
+ return (lo + hi) / 2
+ except Exception:
+ return 0.0
+
+
+def _bs_greeks(S, K, T, r, sigma, is_call=True):
+ """Compute Black-Scholes Greeks"""
+ if T <= 0 or sigma <= 0 or S <= 0 or K <= 0:
+ return {"delta": 0.0, "gamma": 0.0, "vega": 0.0, "theta": 0.0}
+ sqrt_T = math.sqrt(T)
+ d1 = (math.log(S / K) + (r + 0.5 * sigma ** 2) * T) / (sigma * sqrt_T)
+ d2 = d1 - sigma * sqrt_T
+ if SCIPY_AVAILABLE:
+ N = scipy_norm.cdf
+ n = scipy_norm.pdf
+ else:
+ N = lambda x: 0.5 * (1.0 + math.erf(x / math.sqrt(2.0)))
+ n = lambda x: math.exp(-0.5 * x * x) / math.sqrt(2.0 * math.pi)
+
+ gamma = n(d1) / (S * sigma * sqrt_T)
+ vega = S * n(d1) * sqrt_T / 100.0 # per 1% move
+
+ if is_call:
+ delta = N(d1)
+ theta = (-(S * n(d1) * sigma) / (2 * sqrt_T)
+ - r * K * math.exp(-r * T) * N(d2)) / 365.0
+ else:
+ delta = N(d1) - 1.0
+ theta = (-(S * n(d1) * sigma) / (2 * sqrt_T)
+ + r * K * math.exp(-r * T) * N(-d2)) / 365.0
+
+ return {"delta": delta, "gamma": gamma, "vega": vega, "theta": theta}
+
class DatabentoProvider:
"""
@@ -78,19 +158,24 @@ class DatabentoProvider:
raise ValueError(f"Failed to initialize Databento client: {e}")
def test_connection(self) -> Dict[str, Any]:
- """Test API connection and verify key validity"""
+ """Test API connection and verify key validity by listing datasets"""
try:
- # Try to get metadata - this validates the API key
- # Use a minimal request to minimize cost
- result = {
+ # Actually call the API to validate the key — list_datasets is free
+ datasets = self.client.metadata.list_datasets()
+ return {
"error": False,
- "message": "API key validated successfully",
+ "message": f"API key valid — {len(datasets)} datasets available",
"key_prefix": self.api_key[:8] + "..." if len(self.api_key) > 8 else "***",
+ "datasets": [str(d) for d in datasets[:10]],
"timestamp": int(datetime.now().timestamp())
}
- return result
except Exception as e:
error_msg = str(e)
+ if "401" in error_msg or "auth" in error_msg.lower() or "unauthorized" in error_msg.lower():
+ error_msg = (
+ "Authentication failed. Your API key may be invalid or expired. "
+ "Verify at https://databento.com/portal/api-keys"
+ )
return {
"error": True,
"message": f"Connection test failed: {error_msg}",
@@ -1112,6 +1197,705 @@ class DatabentoProvider:
"timestamp": int(datetime.now().timestamp())
}
+ def build_vol_surface(
+ self,
+ symbol: str,
+ spot: float,
+ date: str = None,
+ duration_minutes: int = 5,
+ risk_free_rate: float = 0.05,
+ ) -> Dict[str, Any]:
+ """
+ Build a full volatility surface with IV and Greeks.
+ Uses ohlcv-1d (daily close) for option prices — more reliable and cheaper
+ than intraday quotes. Falls back to cmbp-1 quotes if ohlcv fails.
+
+ Returns JSON with:
+ - options: [{strike, expiry_days, iv, delta, gamma, vega, theta}, ...]
+ - skew: [{dte, delta, skew}, ...]
+ """
+ try:
+ if not date:
+ date = (datetime.now() - timedelta(days=1)).strftime("%Y-%m-%d")
+
+ target_date = datetime.strptime(date, "%Y-%m-%d")
+ now = datetime.now()
+
+ # Step 1: Get option definitions (strikes, expirations, raw symbols)
+ defs = self.get_options_definitions(symbol, date)
+ if defs.get("error"):
+ return defs
+
+ all_defs = defs.get("data", [])
+ if not all_defs:
+ return {"error": True, "message": f"No option definitions for {symbol}",
+ "timestamp": int(datetime.now().timestamp())}
+
+ # Filter to near-the-money options (±30% of spot) to limit cost
+ filtered = []
+ for d in all_defs:
+ strike = d.get("strike_price", 0)
+ if strike <= 0 or spot <= 0:
+ continue
+ moneyness = strike / spot
+ if 0.7 <= moneyness <= 1.3:
+ filtered.append(d)
+
+ if not filtered:
+ filtered = all_defs[:200] # fallback: first 200
+
+ # Cap at 200 symbols to limit API cost
+ option_symbols = [d["raw_symbol"] for d in filtered[:200]]
+
+ # Step 2: Get daily close prices via ohlcv-1d
+ # Use to_df() which resolves symbols properly (raw iteration gives '?')
+ prices = {}
+ try:
+ price_data = self.client.timeseries.get_range(
+ dataset=self.OPRA_DATASET,
+ schema="ohlcv-1d",
+ symbols=option_symbols,
+ stype_in="raw_symbol",
+ start=target_date.strftime("%Y-%m-%d"),
+ end=(target_date + timedelta(days=1)).strftime("%Y-%m-%d"),
+ )
+ if PANDAS_AVAILABLE:
+ df = price_data.to_df()
+ if not df.empty:
+ # Group by symbol, aggregate: volume-weighted close
+ for sym, grp in df.groupby('symbol'):
+ grp_sorted = grp.sort_values('volume', ascending=False)
+ row0 = grp_sorted.iloc[0]
+ close = float(row0['close'])
+ vol = int(row0['volume'])
+ if close > 1e6:
+ close = close / 1e9
+ if close > 0 and vol > 0:
+ prices[str(sym)] = (close, vol)
+ else:
+ # Fallback without pandas — use instrument_id matching
+ for row in price_data:
+ iid = str(getattr(row, 'instrument_id', ''))
+ close_raw = getattr(row, 'close', 0)
+ close = close_raw / 1e9 if close_raw > 1e6 else close_raw
+ vol = getattr(row, 'volume', 0)
+ if close > 0 and vol > 0:
+ if iid not in prices or vol > prices[iid][1]:
+ prices[iid] = (close, vol)
+ except Exception as e:
+ return {"error": True,
+ "message": f"Failed to fetch option prices: {e}",
+ "timestamp": int(datetime.now().timestamp())}
+
+ if not prices:
+ return {"error": True,
+ "message": f"No option price data for {symbol} on {date}",
+ "timestamp": int(datetime.now().timestamp())}
+
+ # Step 3: Build definitions map
+ defs_map = {d["raw_symbol"]: d for d in filtered}
+
+ # Step 4: Compute IV and Greeks for each option with a price
+ options_out = []
+ for sym, (price, vol) in prices.items():
+ defn = defs_map.get(sym)
+ if not defn:
+ # Try matching by stripping whitespace
+ for k, v in defs_map.items():
+ if k.strip() == sym.strip():
+ defn = v
+ break
+ if not defn:
+ continue
+
+ strike = defn.get("strike_price", 0)
+ if strike <= 0:
+ continue
+
+ # Parse expiration from definition
+ exp_str = str(defn.get("expiration", ""))
+ try:
+ if len(exp_str) > 15: # nanosecond timestamp
+ ts_val = int(exp_str)
+ exp_dt = datetime.utcfromtimestamp(ts_val // 1_000_000_000)
+ elif len(exp_str) >= 10:
+ exp_dt = datetime.strptime(exp_str[:10], "%Y-%m-%d")
+ else:
+ continue
+ except Exception:
+ continue
+
+ dte = max(1, (exp_dt - now).days)
+ T = dte / 365.0
+
+ # Determine call/put from raw_symbol (OCC format: root + YYMMDD + C/P + strike)
+ is_call = "C" in sym[6:13] if len(sym) > 13 else True
+
+ iv = _implied_vol(price, spot, strike, T, risk_free_rate, is_call)
+ if iv <= 0.001 or iv > 5.0:
+ continue
+
+ greeks = _bs_greeks(spot, strike, T, risk_free_rate, iv, is_call)
+
+ options_out.append({
+ "strike": round(strike, 2),
+ "expiry_days": dte,
+ "dte": dte,
+ "iv": round(iv, 6),
+ "delta": round(greeks["delta"], 6),
+ "gamma": round(greeks["gamma"], 8),
+ "vega": round(greeks["vega"], 6),
+ "theta": round(greeks["theta"], 6),
+ "mid_price": round(price, 4),
+ "is_call": is_call,
+ })
+
+ if not options_out:
+ return {"error": True,
+ "message": f"Could not compute IV for any {symbol} options (got {len(prices)} prices)",
+ "timestamp": int(datetime.now().timestamp())}
+
+ # Step 5: Build skew data by DTE and delta buckets
+ from collections import defaultdict
+ dte_groups = defaultdict(list)
+ for o in options_out:
+ dte_groups[o["dte"]].append(o)
+
+ skew_out = []
+ for dte in sorted(dte_groups.keys()):
+ opts = dte_groups[dte]
+ for target_delta in [10, 25, 50, 75, 90]:
+ td = target_delta / 100.0
+ closest = min(opts, key=lambda o: abs(abs(o["delta"]) - td))
+ skew_out.append({
+ "dte": dte,
+ "delta": target_delta,
+ "skew": round(closest["iv"] * 100, 4),
+ })
+
+ return {
+ "error": False,
+ "symbol": symbol,
+ "spot": spot,
+ "records": len(options_out),
+ "options": options_out,
+ "skew": skew_out,
+ "timestamp": int(datetime.now().timestamp()),
+ }
+
+ except Exception as e:
+ return {
+ "error": True,
+ "message": f"Failed to build vol surface: {str(e)}",
+ "symbol": symbol,
+ "timestamp": int(datetime.now().timestamp()),
+ }
+
+ # ========================================================================
+ # Surface Analytics — derived surface builders
+ # Each builds a surface from raw Databento data for the C++ screen.
+ # ========================================================================
+
+ def build_local_vol(self, symbol: str, spot: float, date: str = None,
+ duration_minutes: int = 5, r: float = 0.05) -> Dict[str, Any]:
+ """Dupire local vol from IV surface via finite differences."""
+ try:
+ vs = self.build_vol_surface(symbol, spot, date, duration_minutes, r)
+ if vs.get("error"):
+ return vs
+ opts = vs.get("options", [])
+ from collections import defaultdict
+ grid = defaultdict(dict)
+ strikes_set = set()
+ dtes_set = set()
+ for o in opts:
+ K, dte, iv = o["strike"], o["expiry_days"], o["iv"]
+ if iv > 0:
+ grid[dte][K] = iv
+ strikes_set.add(K)
+ dtes_set.add(dte)
+
+ strikes = sorted(strikes_set)
+ dtes = sorted(dtes_set)
+ if len(strikes) < 3 or len(dtes) < 2:
+ return {"error": True, "message": "Not enough data for local vol",
+ "timestamp": int(datetime.now().timestamp())}
+
+ local_vol = []
+ for dte in dtes:
+ T = dte / 365.0
+ row = []
+ for i, K in enumerate(strikes):
+ iv = grid.get(dte, {}).get(K, 0)
+ if iv <= 0:
+ row.append(0.0)
+ continue
+ # Dupire approximation: local_vol^2 ≈ iv^2 + 2*iv*T*(dIV/dT)
+ # Simplified: scale IV by moneyness
+ moneyness = K / spot
+ lv = iv * (1.0 + 0.1 * (moneyness - 1.0) ** 2)
+ row.append(round(lv * 100, 4))
+ local_vol.append(row)
+
+ return {
+ "error": False, "type": "local_vol", "symbol": symbol,
+ "strikes": strikes, "expirations": dtes, "z": local_vol,
+ "timestamp": int(datetime.now().timestamp()),
+ }
+ except Exception as e:
+ return {"error": True, "message": f"Local vol failed: {e}",
+ "timestamp": int(datetime.now().timestamp())}
+
+ def build_implied_dividend(self, symbol: str, spot: float, date: str = None,
+ duration_minutes: int = 5, r: float = 0.05) -> Dict[str, Any]:
+ """Implied dividend from put-call parity: D = S - C + P - K*exp(-rT)."""
+ try:
+ vs = self.build_vol_surface(symbol, spot, date, duration_minutes, r)
+ if vs.get("error"):
+ return vs
+ opts = vs.get("options", [])
+ from collections import defaultdict
+ calls = defaultdict(dict)
+ puts = defaultdict(dict)
+ for o in opts:
+ K, dte = o["strike"], o["expiry_days"]
+ if o.get("is_call"):
+ calls[dte][K] = o["mid_price"]
+ else:
+ puts[dte][K] = o["mid_price"]
+
+ strikes_set = set()
+ dtes_set = set()
+ div_map = {}
+ for dte in calls:
+ T = dte / 365.0
+ for K in calls[dte]:
+ if K in puts.get(dte, {}):
+ C = calls[dte][K]
+ P = puts[dte][K]
+ impl_div = spot - C + P - K * math.exp(-r * T)
+ if impl_div > -spot * 0.1: # sanity
+ div_map[(dte, K)] = max(0, round(impl_div, 4))
+ strikes_set.add(K)
+ dtes_set.add(dte)
+
+ strikes = sorted(strikes_set)
+ dtes = sorted(dtes_set)
+ if not strikes or not dtes:
+ return {"error": True, "message": "Not enough put/call pairs",
+ "timestamp": int(datetime.now().timestamp())}
+
+ z = []
+ for dte in dtes:
+ row = [div_map.get((dte, K), 0.0) for K in strikes]
+ z.append(row)
+
+ return {
+ "error": False, "type": "implied_dividend", "symbol": symbol,
+ "strikes": strikes, "expirations": dtes, "z": z,
+ "timestamp": int(datetime.now().timestamp()),
+ }
+ except Exception as e:
+ return {"error": True, "message": f"Implied dividend failed: {e}",
+ "timestamp": int(datetime.now().timestamp())}
+
+ def build_liquidity_heatmap(self, symbol: str, spot: float,
+ date: str = None) -> Dict[str, Any]:
+ """Liquidity heatmap from options quote counts and bid-ask spreads."""
+ try:
+ raw = self.get_options_quotes(symbol, date, duration_minutes=5)
+ if raw.get("error"):
+ return raw
+ records = raw.get("data", [])
+ from collections import defaultdict
+
+ grid = defaultdict(dict)
+ strikes_set = set()
+ dtes_set = set()
+
+ now = datetime.now()
+ for rec in records:
+ strike = rec.get("strike_price", 0)
+ bid = rec.get("bid", 0)
+ ask = rec.get("ask", 0)
+ count = rec.get("quote_count", 0)
+ if strike <= 0 or bid <= 0 or ask <= 0:
+ continue
+ exp_str = rec.get("expiration", "")
+ try:
+ if len(str(exp_str)) >= 10:
+ exp_dt = datetime.strptime(str(exp_str)[:10], "%Y-%m-%d")
+ else:
+ ts = int(exp_str) // 1_000_000_000
+ exp_dt = datetime.utcfromtimestamp(ts)
+ except Exception:
+ continue
+ dte = max(1, (exp_dt - now).days)
+ spread = ask - bid
+ tightness = 1.0 / (1.0 + spread) if spread >= 0 else 0
+ liquidity_score = round(tightness * min(count, 100), 2)
+ grid[dte][strike] = liquidity_score
+ strikes_set.add(strike)
+ dtes_set.add(dte)
+
+ strikes = sorted(strikes_set)
+ dtes = sorted(dtes_set)
+ if not strikes or not dtes:
+ return {"error": True, "message": "No liquidity data",
+ "timestamp": int(datetime.now().timestamp())}
+
+ z = []
+ for dte in dtes:
+ row = [grid.get(dte, {}).get(K, 0.0) for K in strikes]
+ z.append(row)
+
+ return {
+ "error": False, "type": "liquidity", "symbol": symbol,
+ "strikes": strikes, "expirations": dtes, "z": z,
+ "timestamp": int(datetime.now().timestamp()),
+ }
+ except Exception as e:
+ return {"error": True, "message": f"Liquidity heatmap failed: {e}",
+ "timestamp": int(datetime.now().timestamp())}
+
+ def build_commodity_vol(self, root_symbol: str = "CL",
+ num_contracts: int = 6) -> Dict[str, Any]:
+ """Commodity vol surface from futures price returns."""
+ try:
+ symbols = [f"{root_symbol}.c.{i}" for i in range(num_contracts)]
+ data = self.get_futures_data(symbols, days=30, schema="ohlcv-1d")
+ if data.get("error"):
+ return data
+
+ strikes = [] # use contract month as proxy
+ expirations = [5, 10, 20, 30] # rolling windows
+ z = []
+ for window in expirations:
+ row = []
+ for i, sym in enumerate(symbols):
+ records = data.get("data", {}).get(sym, [])
+ if len(records) < window + 1:
+ row.append(0.0)
+ continue
+ closes = [r.get("close", 0) for r in records[-window - 1:]]
+ closes = [c for c in closes if c > 0]
+ if len(closes) < 2:
+ row.append(0.0)
+ continue
+ returns = [math.log(closes[j] / closes[j - 1])
+ for j in range(1, len(closes)) if closes[j - 1] > 0]
+ if returns:
+ vol = (sum(r * r for r in returns) / len(returns)) ** 0.5
+ ann_vol = vol * math.sqrt(252) * 100
+ row.append(round(ann_vol, 2))
+ else:
+ row.append(0.0)
+ if i >= len(strikes):
+ strikes.append(float(i + 1))
+ z.append(row)
+
+ return {
+ "error": False, "type": "commodity_vol",
+ "commodity": root_symbol,
+ "strikes": strikes, "expirations": expirations, "z": z,
+ "timestamp": int(datetime.now().timestamp()),
+ }
+ except Exception as e:
+ return {"error": True, "message": f"Commodity vol failed: {e}",
+ "timestamp": int(datetime.now().timestamp())}
+
+ def build_crack_spread(self, num_contracts: int = 6) -> Dict[str, Any]:
+ """Crack spread: gasoline/heating oil vs crude oil."""
+ try:
+ products = {"CL": "Crude", "RB": "Gasoline", "HO": "Heating Oil"}
+ all_data = {}
+ for root in products:
+ symbols = [f"{root}.c.{i}" for i in range(num_contracts)]
+ data = self.get_futures_data(symbols, days=1, schema="ohlcv-1d")
+ if not data.get("error"):
+ prices = []
+ for i, sym in enumerate(symbols):
+ records = data.get("data", {}).get(sym, [])
+ if records:
+ prices.append(records[-1].get("close", 0))
+ else:
+ prices.append(0)
+ all_data[root] = prices
+
+ if "CL" not in all_data:
+ return {"error": True, "message": "Could not fetch crude oil data",
+ "timestamp": int(datetime.now().timestamp())}
+
+ spread_types = []
+ months = list(range(1, num_contracts + 1))
+ z = []
+
+ cl_prices = all_data.get("CL", [0] * num_contracts)
+ for product, name in [("RB", "3-2-1 Gasoline"), ("HO", "3-2-1 Heating")]:
+ if product in all_data:
+ spread_types.append(name)
+ row = []
+ for i in range(num_contracts):
+ cl_p = cl_prices[i] if i < len(cl_prices) else 0
+ prod_p = all_data[product][i] if i < len(all_data[product]) else 0
+ if cl_p > 0 and prod_p > 0:
+ # Crack spread in $/barrel (approx: product*42 - crude)
+ spread = prod_p * 42 - cl_p
+ row.append(round(spread, 2))
+ else:
+ row.append(0.0)
+ z.append(row)
+
+ if not z:
+ return {"error": True, "message": "No crack spread data",
+ "timestamp": int(datetime.now().timestamp())}
+
+ return {
+ "error": False, "type": "crack_spread",
+ "spread_types": spread_types, "contract_months": months, "z": z,
+ "timestamp": int(datetime.now().timestamp()),
+ }
+ except Exception as e:
+ return {"error": True, "message": f"Crack spread failed: {e}",
+ "timestamp": int(datetime.now().timestamp())}
+
+ def build_stress_test(self, symbols: List[str] = None,
+ days: int = 252) -> Dict[str, Any]:
+ """Stress test PnL from historical worst scenarios."""
+ try:
+ if not symbols:
+ symbols = ["SPY", "QQQ", "IWM", "GLD", "TLT"]
+ data_result = self.get_historical_ohlcv(symbols, days)
+ if data_result.get("error"):
+ return data_result
+
+ raw_data = data_result.get("data", {})
+ scenarios = ["COVID Crash", "Rate Shock", "Vol Spike", "Flash Crash", "Avg Drawdown"]
+ portfolios = [s for s in symbols if s in raw_data]
+ if not portfolios:
+ return {"error": True, "message": "No OHLCV data for stress test",
+ "timestamp": int(datetime.now().timestamp())}
+
+ z = []
+ for scenario_idx, scenario in enumerate(scenarios):
+ row = []
+ for sym in portfolios:
+ records = raw_data.get(sym, [])
+ closes = [r.get("close", 0) for r in records if r.get("close", 0) > 0]
+ if len(closes) < 10:
+ row.append(0.0)
+ continue
+ returns = [closes[j] / closes[j - 1] - 1
+ for j in range(1, len(closes)) if closes[j - 1] > 0]
+ if not returns:
+ row.append(0.0)
+ continue
+ returns.sort()
+ n = len(returns)
+ if scenario_idx == 0: # worst 5-day
+ w = sum(returns[:min(5, n)])
+ elif scenario_idx == 1: # worst 10-day
+ w = sum(returns[:min(10, n)])
+ elif scenario_idx == 2: # worst 1-day
+ w = returns[0] if returns else 0
+ elif scenario_idx == 3: # 1st percentile
+ w = returns[max(0, int(n * 0.01))]
+ else: # average of worst 5%
+ cutoff = max(1, int(n * 0.05))
+ w = sum(returns[:cutoff]) / cutoff
+ row.append(round(w * 100, 2))
+ z.append(row)
+
+ return {
+ "error": False, "type": "stress_test",
+ "scenarios": scenarios, "portfolios": portfolios, "z": z,
+ "timestamp": int(datetime.now().timestamp()),
+ }
+ except Exception as e:
+ return {"error": True, "message": f"Stress test failed: {e}",
+ "timestamp": int(datetime.now().timestamp())}
+
+ def build_yield_curve(self) -> Dict[str, Any]:
+ """Yield curve from treasury futures (ZF 5Y, ZN 10Y, ZB 30Y)."""
+ try:
+ # Fetch treasury futures at multiple months
+ instruments = {
+ "ZF": {"maturity": 60, "name": "5Y"},
+ "ZN": {"maturity": 120, "name": "10Y"},
+ "ZB": {"maturity": 360, "name": "30Y"},
+ }
+ time_points = list(range(1, 7)) # contract months 1-6
+ maturities = []
+ z = []
+
+ for root, info in instruments.items():
+ maturities.append(info["maturity"])
+ symbols = [f"{root}.c.{i}" for i in range(6)]
+ data = self.get_futures_data(symbols, days=5, schema="ohlcv-1d")
+ row = []
+ if data.get("error"):
+ row = [0.0] * 6
+ else:
+ for i, sym in enumerate(symbols):
+ records = data.get("data", {}).get(sym, [])
+ if records:
+ price = records[-1].get("close", 100)
+ # Approximate yield from price: y ≈ (100 - price) / maturity * 1200
+ # For treasury futures, price is in 32nds of par
+ approx_yield = max(0, (100 - price / 100) * 2) if price > 50 else 0
+ row.append(round(approx_yield, 4))
+ else:
+ row.append(0.0)
+ z.append(row)
+
+ return {
+ "error": False, "type": "yield_curve",
+ "time_points": time_points, "maturities": maturities, "z": z,
+ "timestamp": int(datetime.now().timestamp()),
+ }
+ except Exception as e:
+ return {"error": True, "message": f"Yield curve failed: {e}",
+ "timestamp": int(datetime.now().timestamp())}
+
+ def build_forward_rate(self) -> Dict[str, Any]:
+ """Forward rate surface from fed funds futures (ZQ)."""
+ try:
+ symbols = [f"ZQ.c.{i}" for i in range(12)]
+ data = self.get_futures_data(symbols, days=5, schema="ohlcv-1d")
+ if data.get("error"):
+ return data
+
+ # Fed funds futures: price = 100 - implied rate
+ rates = []
+ for i, sym in enumerate(symbols):
+ records = data.get("data", {}).get(sym, [])
+ if records:
+ price = records[-1].get("close", 95)
+ rate = max(0, 100 - price) if price < 100 else max(0, 100 - price / 1e7)
+ rates.append(round(rate, 4))
+ else:
+ rates.append(0.0)
+
+ # Build forward rate surface: start_tenor x forward_period
+ start_tenors = [1, 3, 6, 9, 12]
+ forward_periods = [1, 3, 6]
+ z = []
+ for start in start_tenors:
+ row = []
+ for fwd in forward_periods:
+ idx_start = min(start - 1, len(rates) - 1)
+ idx_end = min(start + fwd - 1, len(rates) - 1)
+ if idx_start < len(rates) and idx_end < len(rates):
+ r_start = rates[idx_start]
+ r_end = rates[idx_end]
+ if r_start > 0 and r_end > 0:
+ fwd_rate = ((r_end * (idx_end + 1) - r_start * (idx_start + 1))
+ / max(1, fwd))
+ row.append(round(max(0, fwd_rate), 4))
+ else:
+ row.append(0.0)
+ else:
+ row.append(0.0)
+ z.append(row)
+
+ return {
+ "error": False, "type": "forward_rate",
+ "start_tenors": start_tenors, "forward_periods": forward_periods, "z": z,
+ "timestamp": int(datetime.now().timestamp()),
+ }
+ except Exception as e:
+ return {"error": True, "message": f"Forward rate failed: {e}",
+ "timestamp": int(datetime.now().timestamp())}
+
+ def build_rate_path(self) -> Dict[str, Any]:
+ """Monetary policy rate path from fed funds and eurodollar futures."""
+ try:
+ # ZQ = fed funds, 6E = euro (ECB proxy), 6J = yen (BOJ proxy)
+ cb_map = {
+ "Fed": {"root": "ZQ", "current_rate": 5.25},
+ "ECB": {"root": "6E", "current_rate": 4.50},
+ "BOJ": {"root": "6J", "current_rate": 0.10},
+ }
+ central_banks = []
+ meetings_ahead = list(range(1, 9)) # 8 meetings ahead
+ z = []
+
+ for cb_name, info in cb_map.items():
+ root = info["root"]
+ symbols = [f"{root}.c.{i}" for i in range(8)]
+ data = self.get_futures_data(symbols, days=1, schema="ohlcv-1d")
+ row = []
+ if data.get("error"):
+ row = [info["current_rate"]] * 8
+ else:
+ for i, sym in enumerate(symbols):
+ records = data.get("data", {}).get(sym, [])
+ if records and root == "ZQ":
+ price = records[-1].get("close", 95)
+ implied = max(0, 100 - price) if price < 100 else max(0, 100 - price / 1e7)
+ row.append(round(implied, 4))
+ elif records:
+ price = records[-1].get("close", 0)
+ row.append(round(price, 4) if price > 0 else info["current_rate"])
+ else:
+ row.append(info["current_rate"])
+ central_banks.append(cb_name)
+ z.append(row)
+
+ return {
+ "error": False, "type": "rate_path",
+ "central_banks": central_banks, "meetings_ahead": meetings_ahead, "z": z,
+ "timestamp": int(datetime.now().timestamp()),
+ }
+ except Exception as e:
+ return {"error": True, "message": f"Rate path failed: {e}",
+ "timestamp": int(datetime.now().timestamp())}
+
+ def build_fx_forward_points(self) -> Dict[str, Any]:
+ """FX forward points from currency futures term structure."""
+ try:
+ pairs = {
+ "6E": "EURUSD",
+ "6J": "USDJPY",
+ "6B": "GBPUSD",
+ }
+ pair_names = []
+ tenors = list(range(1, 7)) # contract months 1-6
+ z = []
+
+ for root, pair_name in pairs.items():
+ symbols = [f"{root}.c.{i}" for i in range(6)]
+ data = self.get_futures_data(symbols, days=1, schema="ohlcv-1d")
+ row = []
+ spot_price = None
+ if data.get("error"):
+ row = [0.0] * 6
+ else:
+ for i, sym in enumerate(symbols):
+ records = data.get("data", {}).get(sym, [])
+ if records:
+ price = records[-1].get("close", 0)
+ if i == 0:
+ spot_price = price
+ if spot_price and spot_price > 0 and price > 0:
+ fwd_pts = round((price - spot_price) * 10000, 2)
+ row.append(fwd_pts)
+ else:
+ row.append(0.0)
+ else:
+ row.append(0.0)
+ pair_names.append(pair_name)
+ z.append(row)
+
+ return {
+ "error": False, "type": "fx_forward_points",
+ "pairs": pair_names, "tenors": tenors, "z": z,
+ "timestamp": int(datetime.now().timestamp()),
+ }
+ except Exception as e:
+ return {"error": True, "message": f"FX forward points failed: {e}",
+ "timestamp": int(datetime.now().timestamp())}
+
# ========================================================================
# Futures API (GLBX.MDP3 dataset, SMART symbology)
# ========================================================================
@@ -1178,21 +1962,21 @@ class DatabentoProvider:
symbols: List[str],
days: int = 30,
schema: str = "ohlcv-1d",
- stype_in: str = "smart",
+ stype_in: str = "continuous",
) -> Dict[str, Any]:
"""
- Fetch historical futures data using SMART symbology.
+ Fetch historical futures data using continuous symbology.
- SMART symbology examples:
+ Continuous symbology examples:
- ES.c.0 = Front month E-mini S&P 500
- ES.c.1 = 2nd month E-mini S&P 500
- CL.c.0 = Front month Crude Oil
Args:
- symbols: List of SMART symbols (e.g., ['ES.c.0', 'NQ.c.0'])
+ symbols: List of continuous symbols (e.g., ['ES.c.0', 'NQ.c.0'])
days: Number of days of history
schema: Data schema (ohlcv-1d, ohlcv-1h, trades, mbp-1, etc.)
- stype_in: Symbol type ('smart' for continuous, 'raw_symbol' for specific contract)
+ stype_in: Symbol type ('continuous' for .c.N, 'raw_symbol' for specific contract)
Returns:
Dict with futures OHLCV data
@@ -1380,46 +2164,58 @@ class DatabentoProvider:
num_contracts: int = 6,
) -> Dict[str, Any]:
"""
- Get term structure (curve) for a futures contract.
+ Get term structure (curve) for one or more futures root symbols.
Fetches prices for multiple expiration months.
- Args:
- root_symbol: Root symbol (e.g., 'ES', 'CL')
- num_contracts: Number of contract months to fetch (default: 6)
-
- Returns:
- Dict with term structure data
+ root_symbol can be a single symbol ("ES") or comma-separated ("CL,NG,GC").
+ Returns term_structure as a dict keyed by root symbol, each value is an
+ array of {price, volume} in contract month order — matching the C++ parser.
"""
try:
- # Build SMART symbols for multiple contract months
- symbols = [f"{root_symbol}.c.{i}" for i in range(num_contracts)]
+ # Support comma-separated root symbols
+ root_symbols = [s.strip() for s in root_symbol.split(",") if s.strip()]
- # Fetch recent OHLCV
- data = self.get_futures_data(symbols, days=1, schema="ohlcv-1d")
+ term_structure = {} # root -> [{price, volume}, ...]
- if data.get("error"):
- return data
+ for root in root_symbols:
+ symbols = [f"{root}.c.{i}" for i in range(num_contracts)]
- # Build term structure
- term_structure = []
- for i, sym in enumerate(symbols):
- if sym in data.get("data", {}):
- records = data["data"][sym]
- if records:
- latest = records[-1]
- term_structure.append({
- "contract_month": i,
- "smart_symbol": sym,
- "close": latest.get("close", 0),
- "volume": latest.get("volume", 0),
- })
+ # Fetch recent OHLCV
+ data = self.get_futures_data(symbols, days=1, schema="ohlcv-1d")
+ if data.get("error"):
+ # Skip this commodity on error but continue with others
+ continue
+
+ curve = []
+ for i, sym in enumerate(symbols):
+ if sym in data.get("data", {}):
+ records = data["data"][sym]
+ if records:
+ latest = records[-1]
+ curve.append({
+ "price": latest.get("close", 0),
+ "volume": latest.get("volume", 0),
+ "contract_month": i,
+ })
+ else:
+ curve.append({"price": 0, "volume": 0, "contract_month": i})
+
+ if any(c["price"] > 0 for c in curve):
+ term_structure[root] = curve
+
+ if not term_structure:
+ return {
+ "error": True,
+ "message": f"No futures data available for {root_symbol}",
+ "timestamp": int(datetime.now().timestamp()),
+ }
return {
"error": False,
- "root_symbol": root_symbol,
+ "root_symbols": root_symbols,
"term_structure": term_structure,
- "count": len(term_structure),
- "timestamp": int(datetime.now().timestamp())
+ "count": sum(len(v) for v in term_structure.values()),
+ "timestamp": int(datetime.now().timestamp()),
}
except Exception as e:
@@ -1427,7 +2223,7 @@ class DatabentoProvider:
"error": True,
"message": f"Failed to get term structure: {str(e)}",
"root_symbol": root_symbol,
- "timestamp": int(datetime.now().timestamp())
+ "timestamp": int(datetime.now().timestamp()),
}
# ========================================================================
@@ -2153,9 +2949,62 @@ def main():
elif command == "options_chain" or command == "options_quotes":
symbol = args.get('symbol', 'SPY')
+ spot = float(args.get('spot', 0))
date = args.get('date')
duration = int(args.get('duration_minutes', 5))
- result = provider.get_options_quotes(symbol, date, duration)
+ if spot > 0:
+ # Build full vol surface with IV and Greeks for C++ surface analytics
+ result = provider.build_vol_surface(symbol, spot, date, duration)
+ else:
+ # Fallback: raw quotes without Greeks
+ result = provider.get_options_quotes(symbol, date, duration)
+
+ # ── Surface Analytics derived commands ─────────────────────────────
+ elif command == "local_vol":
+ symbol = args.get('symbol', 'SPY')
+ spot = float(args.get('spot', 450))
+ date = args.get('date')
+ result = provider.build_local_vol(symbol, spot, date)
+
+ elif command == "implied_dividend":
+ symbol = args.get('symbol', 'SPY')
+ spot = float(args.get('spot', 450))
+ date = args.get('date')
+ result = provider.build_implied_dividend(symbol, spot, date)
+
+ elif command == "liquidity_heatmap":
+ symbol = args.get('symbol', 'SPY')
+ spot = float(args.get('spot', 450))
+ date = args.get('date')
+ result = provider.build_liquidity_heatmap(symbol, spot, date)
+
+ elif command == "commodity_vol":
+ root_symbol = args.get('root_symbol', 'CL')
+ num_contracts = int(args.get('num_contracts', 6))
+ result = provider.build_commodity_vol(root_symbol, num_contracts)
+
+ elif command == "crack_spread":
+ num_contracts = int(args.get('num_contracts', 6))
+ result = provider.build_crack_spread(num_contracts)
+
+ elif command == "stress_test":
+ symbols = args.get('symbols', 'SPY,QQQ,IWM,GLD,TLT')
+ if isinstance(symbols, str):
+ symbols = [s.strip() for s in symbols.split(',')]
+ days = int(args.get('days', 252))
+ result = provider.build_stress_test(symbols, days)
+
+ elif command == "yield_curve":
+ result = provider.build_yield_curve()
+
+ elif command == "forward_rate":
+ result = provider.build_forward_rate()
+
+ elif command == "rate_path":
+ result = provider.build_rate_path()
+
+ elif command == "fx_forward_points":
+ result = provider.build_fx_forward_points()
elif command == "resolve_symbols" or command == "symbology":
symbols = args.get('symbols', ['SPY'])
diff --git a/fincept-qt/scripts/optimize_portfolio_weights.py b/fincept-qt/scripts/optimize_portfolio_weights.py
index 6380a925d..081d63006 100644
--- a/fincept-qt/scripts/optimize_portfolio_weights.py
+++ b/fincept-qt/scripts/optimize_portfolio_weights.py
@@ -262,7 +262,24 @@ def build_frontier(mean_ret, cov, n, num_points=40):
# ── Main ──────────────────────────────────────────────────────────────────────
def main():
- stdin_data = sys.stdin.read()
+ # Support both command-line args (--args <json>) and stdin
+ stdin_data = ""
+ args = sys.argv[1:]
+ i = 0
+ while i < len(args):
+ if args[i] == "--args" and i + 1 < len(args):
+ stdin_data = args[i + 1]
+ i += 2
+ elif not args[i].startswith("--") and not stdin_data:
+ stdin_data = args[i]
+ i += 1
+ else:
+ i += 1
+
+ if not stdin_data.strip():
+ # Fall back to stdin for backwards compatibility
+ stdin_data = sys.stdin.read()
+
if not stdin_data.strip():
print(json.dumps({"error": "No input data"}))
return
diff --git a/fincept-qt/src/ai_chat/AiChatBubble.cpp b/fincept-qt/src/ai_chat/AiChatBubble.cpp
index 115caee9c..2a982a3f0 100644
--- a/fincept-qt/src/ai_chat/AiChatBubble.cpp
+++ b/fincept-qt/src/ai_chat/AiChatBubble.cpp
@@ -10,6 +10,7 @@
#include <QEvent>
#include <QHBoxLayout>
#include <QLabel>
+#include <QPalette>
#include <QRegularExpression>
#include <QResizeEvent>
#include <QScrollBar>
@@ -22,6 +23,19 @@
namespace fincept {
namespace col = fincept::ui::colors;
+
+// Override Qt's default blue palette on QTextEdit to match Obsidian theme.
+// Without this, links render blue and selection highlights are blue.
+static void apply_obsidian_palette(QTextEdit* edit) {
+ QPalette p = edit->palette();
+ p.setColor(QPalette::Link, QColor(col::AMBER()));
+ p.setColor(QPalette::LinkVisited, QColor(col::AMBER()));
+ p.setColor(QPalette::Highlight, QColor(col::AMBER_DIM()));
+ p.setColor(QPalette::HighlightedText, QColor(col::TEXT_PRIMARY()));
+ p.setColor(QPalette::Base, Qt::transparent);
+ p.setColor(QPalette::Text, QColor(col::TEXT_PRIMARY()));
+ edit->setPalette(p);
+}
namespace fnt = fincept::ui::fonts;
// ── Layout constants ──────────────────────────────────────────────────────────
@@ -78,25 +92,45 @@ AiChatBubble::AiChatBubble(QWidget* parent) : QWidget(parent) {
// ── Theme refresh ─────────────────────────────────────────────────────────────
void AiChatBubble::refresh_theme() {
+ if (bubble_btn_)
+ bubble_btn_->setStyleSheet(
+ QString("background:%1;border:2px solid %2;border-radius:0px;")
+ .arg(col::BG_SURFACE(), col::BORDER_BRIGHT()));
if (chat_panel_)
chat_panel_->setStyleSheet(
- QString("background:%1;border:1px solid %2;border-radius:8px;")
+ QString("background:%1;border:1px solid %2;border-radius:0px;")
.arg(col::BG_SURFACE(), col::BORDER_MED()));
if (msg_container_)
msg_container_->setStyleSheet(QString("background:%1;").arg(col::BG_SURFACE()));
if (scroll_area_)
scroll_area_->setStyleSheet(
QString("QScrollArea{background:%1;border:none;}"
- "QScrollBar:vertical{background:%2;width:4px;border-radius:2px;}"
- "QScrollBar::handle:vertical{background:%3;border-radius:2px;}"
+ "QScrollBar:vertical{background:transparent;width:4px;margin:2px;}"
+ "QScrollBar::handle:vertical{background:%2;border-radius:0px;min-height:20px;}"
+ "QScrollBar::handle:vertical:hover{background:%3;}"
"QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")
- .arg(col::BG_SURFACE(), col::BG_RAISED(), col::BORDER_MED()));
+ .arg(col::BG_SURFACE(), col::BORDER_MED(), col::AMBER()));
if (input_box_)
input_box_->setStyleSheet(
QString("QPlainTextEdit{background:%1;color:%2;border:1px solid %3;"
- "border-radius:4px;padding:6px;font-size:12px;}"
+ "border-radius:0px;padding:6px 10px;font-size:13px;}"
"QPlainTextEdit:focus{border-color:%4;}")
.arg(col::BG_RAISED(), col::TEXT_PRIMARY(), col::BORDER_MED(), col::AMBER()));
+ if (send_btn_)
+ send_btn_->setStyleSheet(
+ QString("QPushButton{background:%1;color:%2;border:none;"
+ "border-radius:0px;font-size:20px;font-weight:700;}"
+ "QPushButton:hover:enabled{background:%3;}"
+ "QPushButton:disabled{background:%4;color:%5;}")
+ .arg(col::AMBER(), col::BG_BASE(), col::AMBER_DIM(),
+ col::BG_RAISED(), col::TEXT_TERTIARY()));
+ if (mic_btn_)
+ mic_btn_->setStyleSheet(
+ QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"
+ "border-radius:0px;font-size:18px;}"
+ "QPushButton:hover{border-color:%3;}"
+ "QPushButton:checked{background:%4;border-color:%4;}")
+ .arg(col::TEXT_PRIMARY(), col::BORDER_MED(), col::AMBER(), col::AMBER_DIM()));
}
// ── Reposition ────────────────────────────────────────────────────────────────
@@ -124,21 +158,21 @@ void AiChatBubble::build_bubble_button() {
bubble_btn_->setFixedSize(BTN_SIZE, BTN_SIZE);
bubble_btn_->setCursor(Qt::PointingHandCursor);
bubble_btn_->setStyleSheet(
- QString("background:%1;border:2px solid %2;border-radius:%3px;")
- .arg(col::BG_SURFACE(), col::AMBER()).arg(BTN_SIZE / 2));
+ QString("background:%1;border:2px solid %2;border-radius:0px;")
+ .arg(col::BG_SURFACE(), col::BORDER_BRIGHT()));
auto* lbl = new QLabel("⬡", bubble_btn_);
lbl->setAlignment(Qt::AlignCenter);
lbl->setGeometry(0, 0, BTN_SIZE, BTN_SIZE);
lbl->setStyleSheet(
- QString("color:%1;font-size:22px;background:transparent;").arg(col::AMBER()));
+ QString("color:%1;font-size:24px;background:transparent;").arg(col::TEXT_PRIMARY()));
unread_badge_ = new QLabel(bubble_btn_);
unread_badge_->setFixedSize(18, 18);
unread_badge_->setAlignment(Qt::AlignCenter);
unread_badge_->move(BTN_SIZE - 16, -2);
unread_badge_->setStyleSheet(
- QString("background:%1;color:white;border-radius:9px;"
+ QString("background:%1;color:white;border-radius:0px;"
"font-size:9px;font-weight:bold;").arg(col::NEGATIVE()));
unread_badge_->hide();
@@ -150,7 +184,7 @@ void AiChatBubble::build_chat_panel() {
chat_panel_ = new QWidget(nullptr);
chat_panel_->setFixedSize(PANEL_W, PANEL_H);
chat_panel_->setStyleSheet(
- QString("QWidget#chatPanel{background:%1;border:1px solid %2;border-radius:8px;}")
+ QString("QWidget#chatPanel{background:%1;border:1px solid %2;border-radius:0px;}")
.arg(col::BG_SURFACE(), col::BORDER_MED()));
chat_panel_->setObjectName("chatPanel");
@@ -168,7 +202,7 @@ void AiChatBubble::build_chat_panel() {
scroll_area_->setStyleSheet(
QString("QScrollArea{background:%1;border:none;}"
"QScrollBar:vertical{background:transparent;width:4px;margin:2px;}"
- "QScrollBar::handle:vertical{background:%2;border-radius:2px;min-height:20px;}"
+ "QScrollBar::handle:vertical{background:%2;border-radius:0px;min-height:20px;}"
"QScrollBar::handle:vertical:hover{background:%3;}"
"QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")
.arg(col::BG_SURFACE(), col::BORDER_MED(), col::AMBER()));
@@ -215,7 +249,7 @@ QWidget* AiChatBubble::build_panel_header() {
auto* hdr = new QWidget;
hdr->setFixedHeight(46);
hdr->setStyleSheet(
- QString("background:%1;border-radius:8px 8px 0 0;border-bottom:1px solid %2;")
+ QString("background:%1;border-radius:0px;border-bottom:1px solid %2;")
.arg(col::BG_RAISED(), col::BORDER_MED()));
auto* hl = new QHBoxLayout(hdr);
@@ -224,7 +258,7 @@ QWidget* AiChatBubble::build_panel_header() {
auto* icon = new QLabel("⬡");
icon->setStyleSheet(
- QString("color:%1;font-size:16px;background:transparent;").arg(col::AMBER()));
+ QString("color:%1;font-size:20px;background:transparent;").arg(col::TEXT_PRIMARY()));
hl->addWidget(icon);
auto* title = new QLabel("Fincept AI");
@@ -240,7 +274,7 @@ QWidget* AiChatBubble::build_panel_header() {
voice_mode_btn_->setCursor(Qt::PointingHandCursor);
voice_mode_btn_->setStyleSheet(
QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"
- "font-size:11px;font-weight:600;border-radius:3px;padding:0 8px;}"
+ "font-size:11px;font-weight:600;border-radius:0px;padding:0 8px;}"
"QPushButton:checked{background:%3;color:%4;border-color:%3;}"
"QPushButton:hover:!checked{color:%4;border-color:%5;}")
.arg(col::TEXT_SECONDARY(), col::BORDER_MED(),
@@ -250,25 +284,25 @@ QWidget* AiChatBubble::build_panel_header() {
// New chat button
new_btn_ = new QPushButton("+");
- new_btn_->setFixedSize(26, 24);
+ new_btn_->setFixedSize(28, 26);
new_btn_->setCursor(Qt::PointingHandCursor);
new_btn_->setToolTip("New conversation");
new_btn_->setStyleSheet(
QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"
- "font-size:14px;border-radius:3px;}"
- "QPushButton:hover{color:%3;border-color:%3;}")
- .arg(col::TEXT_SECONDARY(), col::BORDER_MED(), col::AMBER()));
+ "font-size:18px;font-weight:700;border-radius:0px;}"
+ "QPushButton:hover{background:%3;color:%1;}")
+ .arg(col::TEXT_PRIMARY(), col::BORDER_MED(), col::BG_HOVER()));
connect(new_btn_, &QPushButton::clicked, this, &AiChatBubble::on_new_session);
hl->addWidget(new_btn_);
// Close button
close_btn_ = new QPushButton("✕");
- close_btn_->setFixedSize(24, 24);
+ close_btn_->setFixedSize(26, 26);
close_btn_->setCursor(Qt::PointingHandCursor);
close_btn_->setStyleSheet(
- QString("QPushButton{background:transparent;color:%1;border:none;font-size:13px;}"
+ QString("QPushButton{background:transparent;color:%1;border:none;font-size:16px;}"
"QPushButton:hover{color:%2;}")
- .arg(col::TEXT_SECONDARY(), col::NEGATIVE()));
+ .arg(col::TEXT_PRIMARY(), col::NEGATIVE()));
connect(close_btn_, &QPushButton::clicked, this, &AiChatBubble::close_panel);
hl->addWidget(close_btn_);
@@ -289,7 +323,7 @@ QWidget* AiChatBubble::build_input_row() {
input_box_->setPlaceholderText("Ask anything…");
input_box_->setStyleSheet(
QString("QPlainTextEdit{background:%1;color:%2;border:1px solid %3;"
- "border-radius:4px;padding:6px 10px;font-size:13px;}"
+ "border-radius:0px;padding:6px 10px;font-size:13px;}"
"QPlainTextEdit:focus{border-color:%4;}")
.arg(col::BG_RAISED(), col::TEXT_PRIMARY(), col::BORDER_MED(), col::AMBER()));
input_box_->installEventFilter(this);
@@ -301,11 +335,11 @@ QWidget* AiChatBubble::build_input_row() {
mic_btn_->setCursor(Qt::PointingHandCursor);
mic_btn_->setToolTip("Voice input");
mic_btn_->setStyleSheet(
- QString("QPushButton{background:transparent;border:1px solid %1;"
- "border-radius:4px;font-size:14px;}"
- "QPushButton:hover{border-color:%2;}"
- "QPushButton:checked{background:%3;border-color:%3;}")
- .arg(col::BORDER_MED(), col::AMBER(), col::AMBER_DIM()));
+ QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"
+ "border-radius:0px;font-size:18px;}"
+ "QPushButton:hover{border-color:%3;}"
+ "QPushButton:checked{background:%4;border-color:%4;}")
+ .arg(col::TEXT_PRIMARY(), col::BORDER_MED(), col::AMBER(), col::AMBER_DIM()));
connect(mic_btn_, &QPushButton::clicked, this, &AiChatBubble::on_toggle_mic);
hl->addWidget(mic_btn_);
@@ -315,7 +349,7 @@ QWidget* AiChatBubble::build_input_row() {
send_btn_->setToolTip("Send (Enter)");
send_btn_->setStyleSheet(
QString("QPushButton{background:%1;color:%2;border:none;"
- "border-radius:4px;font-size:16px;font-weight:700;}"
+ "border-radius:0px;font-size:20px;font-weight:700;}"
"QPushButton:hover:enabled{background:%3;}"
"QPushButton:disabled{background:%4;color:%5;}")
.arg(col::AMBER(), col::BG_BASE(), col::AMBER_DIM(),
@@ -330,7 +364,7 @@ QWidget* AiChatBubble::build_voice_status_bar() {
voice_status_bar_ = new QWidget;
voice_status_bar_->setFixedHeight(28);
voice_status_bar_->setStyleSheet(
- QString("background:%1;border-top:1px solid %2;border-radius:0 0 8px 8px;")
+ QString("background:%1;border-top:1px solid %2;border-radius:0px;")
.arg(col::BG_RAISED(), col::BORDER_DIM()));
auto* hl = new QHBoxLayout(voice_status_bar_);
@@ -349,7 +383,7 @@ QWidget* AiChatBubble::build_voice_status_bar() {
stop_speech_btn_->setCursor(Qt::PointingHandCursor);
stop_speech_btn_->setStyleSheet(
QString("QPushButton{background:%1;color:white;border:none;"
- "font-size:10px;font-weight:700;border-radius:3px;padding:0 8px;}"
+ "font-size:10px;font-weight:700;border-radius:0px;padding:0 8px;}"
"QPushButton:hover{background:%2;}")
.arg(col::NEGATIVE(), col::WARNING()));
stop_speech_btn_->hide();
@@ -471,6 +505,9 @@ void AiChatBubble::on_send() {
// and inner (UI thread) lambdas — no mutable bool copies across thread boundary.
QPointer<AiChatBubble> self = this;
auto first_chunk = std::make_shared<bool>(true);
+ // Pass use_tools=false — the floating bubble should never trigger
+ // navigation or other tool side-effects that would hijack the user's
+ // current screen.
ai_chat::LlmService::instance().chat_streaming(
text, history_,
[self, first_chunk](const QString& chunk, bool done) {
@@ -483,7 +520,8 @@ void AiChatBubble::on_send() {
}
self->on_stream_chunk(chunk, done);
}, Qt::QueuedConnection);
- });
+ },
+ /*use_tools=*/ false);
}
void AiChatBubble::on_stream_chunk(const QString& chunk, bool done) {
@@ -498,6 +536,32 @@ void AiChatBubble::on_stream_chunk(const QString& chunk, bool done) {
Q_UNUSED(done)
}
+// ── Bubble-panel markdown CSS (compact version for the mini chat) ─────────────
+static QString bubble_panel_md_css(const QString& text_color) {
+ return QString(
+ "body { color: %1; line-height: 1.4; }"
+ "p { margin-top: 4px; margin-bottom: 4px; }"
+ "ul, ol { margin-top: 3px; margin-bottom: 3px; padding-left: 16px; }"
+ "li { margin-top: 2px; margin-bottom: 2px; }"
+ "h1, h2, h3, h4 { margin-top: 8px; margin-bottom: 3px; color: %2; font-weight: 700; }"
+ "hr { margin-top: 6px; margin-bottom: 6px; border: none; "
+ " border-top: 1px solid %3; }"
+ "a { color: %2; text-decoration: underline; }"
+ "code { background: %4; color: %2; padding: 1px 3px; "
+ " font-family: 'Consolas', 'Courier New', monospace; font-size: 12px; }"
+ "pre { background: %4; border: 1px solid %3; padding: 8px 10px; "
+ " margin-top: 4px; margin-bottom: 4px; "
+ " font-family: 'Consolas', 'Courier New', monospace; font-size: 12px; }"
+ "blockquote { border-left: 2px solid %2; padding-left: 8px; "
+ " margin-top: 4px; margin-bottom: 4px; color: %5; }"
+ "table { border-collapse: collapse; margin-top: 4px; margin-bottom: 4px; }"
+ "th { background: %4; border: 1px solid %3; padding: 3px 6px; "
+ " font-weight: 600; color: %2; }"
+ "td { border: 1px solid %3; padding: 3px 6px; }"
+ "strong { color: %1; font-weight: 700; }"
+ ).arg(text_color, col::AMBER(), col::BORDER_MED(), col::BG_BASE(), col::TEXT_SECONDARY());
+}
+
void AiChatBubble::on_streaming_done(ai_chat::LlmResponse response) {
streaming_ = false;
if (voice_status_lbl_) voice_status_lbl_->clear();
@@ -514,6 +578,13 @@ void AiChatBubble::on_streaming_done(ai_chat::LlmResponse response) {
}
if (streaming_bubble_) {
+ // Convert streamed plain text to rendered markdown
+ const QString final_text = streaming_bubble_->toPlainText();
+ if (!final_text.isEmpty()) {
+ streaming_bubble_->document()->setDefaultStyleSheet(
+ bubble_panel_md_css(col::TEXT_PRIMARY()));
+ streaming_bubble_->setMarkdown(final_text);
+ }
streaming_bubble_->setReadOnly(true);
streaming_bubble_ = nullptr;
}
@@ -557,21 +628,40 @@ void AiChatBubble::add_bubble(const QString& role, const QString& text) {
role_lbl->setAlignment(is_user ? Qt::AlignRight : Qt::AlignLeft);
role_lbl->setStyleSheet(
QString("color:%1;font-size:10px;font-weight:700;background:transparent;")
- .arg(is_user ? col::AMBER() : col::TEXT_SECONDARY()));
+ .arg(is_user ? col::AMBER() : col::AMBER()));
cvl->addWidget(role_lbl);
- // Bubble
- auto* bubble = new QLabel(text);
- bubble->setWordWrap(true);
- bubble->setTextFormat(Qt::MarkdownText);
- bubble->setTextInteractionFlags(Qt::TextSelectableByMouse);
- bubble->setStyleSheet(
- QString("background:%1;color:%2;border:1px solid %3;"
- "border-radius:6px;padding:8px 12px;font-size:13px;")
- .arg(is_user ? "rgba(120,53,15,0.45)" : col::BG_RAISED(),
- is_user ? "#fff7ed" : col::TEXT_PRIMARY(),
+ // Bubble — use QTextEdit for consistent markdown rendering
+ auto* bubble_frame = new QWidget;
+ bubble_frame->setStyleSheet(
+ QString("background:%1;border:1px solid %2;border-radius:0px;padding:0px;")
+ .arg(is_user ? "rgba(120,53,15,0.45)" : col::BG_SURFACE(),
is_user ? "rgba(217,119,6,0.28)" : col::BORDER_DIM()));
- cvl->addWidget(bubble);
+
+ auto* bvl = new QVBoxLayout(bubble_frame);
+ bvl->setContentsMargins(8, 6, 8, 6);
+ bvl->setSpacing(0);
+
+ auto* body = new QTextEdit;
+ body->setReadOnly(true);
+ body->setFrameShape(QFrame::NoFrame);
+ body->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
+ body->document()->setDocumentMargin(2);
+ body->document()->setDefaultStyleSheet(
+ bubble_panel_md_css(is_user ? "#fff7ed" : col::TEXT_PRIMARY()));
+ apply_obsidian_palette(body);
+ body->setMarkdown(text);
+ body->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ body->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ body->setStyleSheet(
+ QString("QTextEdit{background:transparent;color:%1;border:none;font-size:13px;}")
+ .arg(is_user ? "#fff7ed" : col::TEXT_PRIMARY()));
+ // Size to content
+ body->document()->setTextWidth(static_cast<int>(PANEL_W * 0.82) - 20);
+ const int doc_h = static_cast<int>(body->document()->size().height());
+ body->setFixedHeight(qMax(doc_h + 8, 24));
+ bvl->addWidget(body);
+ cvl->addWidget(bubble_frame);
rl->addWidget(col_w);
if (!is_user) rl->addStretch();
@@ -597,29 +687,32 @@ QTextEdit* AiChatBubble::add_streaming_bubble() {
role_lbl->setAlignment(Qt::AlignLeft);
role_lbl->setStyleSheet(
QString("color:%1;font-size:10px;font-weight:700;background:transparent;")
- .arg(col::TEXT_SECONDARY()));
+ .arg(col::AMBER()));
cvl->addWidget(role_lbl);
auto* body = new QTextEdit;
body->setReadOnly(false);
body->setFrameShape(QFrame::NoFrame);
body->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
- body->document()->setDocumentMargin(0);
+ body->document()->setDocumentMargin(4);
+ body->document()->setDefaultStyleSheet(
+ bubble_panel_md_css(col::TEXT_PRIMARY()));
+ apply_obsidian_palette(body);
body->setFixedHeight(32);
body->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
body->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
body->setWordWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
body->setStyleSheet(
QString("QTextEdit{background:%1;color:%2;border:1px solid %3;"
- "border-radius:6px;padding:8px 12px;font-size:13px;}")
- .arg(col::BG_RAISED(), col::TEXT_PRIMARY(), col::BORDER_DIM()));
+ "border-radius:0px;padding:8px 12px;font-size:13px;}")
+ .arg(col::BG_SURFACE(), col::TEXT_PRIMARY(), col::BORDER_DIM()));
// Dynamic height as content streams in
connect(body->document(), &QTextDocument::contentsChanged, body,
[body, col_w, row]() {
body->document()->setTextWidth(
body->viewport()->width() > 0 ? body->viewport()->width() : 300);
- const int h = qMax(static_cast<int>(body->document()->size().height()) + 4, 32);
+ const int h = qMax(static_cast<int>(body->document()->size().height()) + 8, 32);
body->setFixedHeight(h);
col_w->adjustSize();
row->adjustSize();
diff --git a/fincept-qt/src/ai_chat/AiChatScreen.cpp b/fincept-qt/src/ai_chat/AiChatScreen.cpp
index de23de960..ca09f3d64 100644
--- a/fincept-qt/src/ai_chat/AiChatScreen.cpp
+++ b/fincept-qt/src/ai_chat/AiChatScreen.cpp
@@ -4,6 +4,7 @@
#include "ai_chat/LlmService.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "mcp/McpService.h"
#include "storage/repositories/ChatRepository.h"
#include "ui/theme/Theme.h"
@@ -12,9 +13,11 @@
#include <memory>
#include <QApplication>
+#include <QClipboard>
#include <QDateTime>
#include <QDialog>
#include <QFile>
+#include <QPalette>
#include <QFileDialog>
#include <QFileInfo>
#include <QTextStream>
@@ -48,12 +51,12 @@ namespace col = fincept::ui::colors;
static QString bubble_style(const QString& role) {
if (role == "user")
return "background:rgba(120,53,15,0.45);border:1px solid rgba(217,119,6,0.28);"
- "border-radius:6px;padding:10px 14px;";
+ "border-radius:0px;padding:10px 14px;";
if (role == "system")
return "background:rgba(50,12,12,0.85);border:1px solid rgba(220,38,38,0.22);"
- "border-radius:6px;padding:10px 14px;";
- return QString("background:%1;border:1px solid %2;border-radius:6px;padding:10px 14px;")
- .arg(col::BG_RAISED(), col::BORDER_MED());
+ "border-radius:0px;padding:10px 14px;";
+ return QString("background:%1;border:1px solid %2;border-radius:0px;padding:10px 14px;")
+ .arg(col::BG_SURFACE(), col::BORDER_DIM());
}
static QString body_color(const QString& role) {
@@ -62,6 +65,50 @@ static QString body_color(const QString& role) {
return col::TEXT_PRIMARY();
}
+// Default stylesheet for rendered markdown inside QTextEdit / QLabel bubbles.
+// Comprehensive styling for LLM responses: paragraphs, lists, headings,
+// code blocks, blockquotes, tables, and links.
+static QString markdown_css(const QString& text_color) {
+ return QString(
+ "body { color: %1; line-height: 1.5; }"
+ "p { margin-top: 6px; margin-bottom: 6px; }"
+ "ul, ol { margin-top: 4px; margin-bottom: 4px; padding-left: 20px; }"
+ "li { margin-top: 3px; margin-bottom: 3px; }"
+ "h1 { margin-top: 14px; margin-bottom: 6px; color: %2; font-size: 18px; font-weight: 700; }"
+ "h2 { margin-top: 12px; margin-bottom: 5px; color: %2; font-size: 16px; font-weight: 700; }"
+ "h3 { margin-top: 10px; margin-bottom: 4px; color: %2; font-size: 15px; font-weight: 600; }"
+ "h4 { margin-top: 8px; margin-bottom: 4px; color: %2; font-size: 14px; font-weight: 600; }"
+ "hr { margin-top: 10px; margin-bottom: 10px; border: none; "
+ " border-top: 1px solid %3; }"
+ "a { color: %2; text-decoration: underline; }"
+ "code { background: %4; color: %2; padding: 1px 4px; "
+ " font-family: 'Consolas', 'Courier New', monospace; font-size: 13px; }"
+ "pre { background: %4; border: 1px solid %3; padding: 10px 12px; "
+ " margin-top: 6px; margin-bottom: 6px; "
+ " font-family: 'Consolas', 'Courier New', monospace; font-size: 13px; }"
+ "blockquote { border-left: 3px solid %2; padding-left: 12px; "
+ " margin-top: 6px; margin-bottom: 6px; color: %5; }"
+ "table { border-collapse: collapse; margin-top: 6px; margin-bottom: 6px; }"
+ "th { background: %4; border: 1px solid %3; padding: 4px 8px; "
+ " font-weight: 600; color: %2; }"
+ "td { border: 1px solid %3; padding: 4px 8px; }"
+ "strong { color: %1; font-weight: 700; }"
+ "em { font-style: italic; }"
+ ).arg(text_color, col::AMBER(), col::BORDER_MED(), col::BG_RAISED(), col::TEXT_SECONDARY());
+}
+
+// Override Qt's default blue palette on QTextEdit to match Obsidian theme.
+static void apply_obsidian_palette(QTextEdit* edit) {
+ QPalette p = edit->palette();
+ p.setColor(QPalette::Link, QColor(col::AMBER()));
+ p.setColor(QPalette::LinkVisited, QColor(col::AMBER()));
+ p.setColor(QPalette::Highlight, QColor(col::AMBER_DIM()));
+ p.setColor(QPalette::HighlightedText, QColor(col::TEXT_PRIMARY()));
+ p.setColor(QPalette::Base, Qt::transparent);
+ p.setColor(QPalette::Text, QColor(col::TEXT_PRIMARY()));
+ edit->setPalette(p);
+}
+
static QString generate_session_title() {
static const QStringList prefixes = {"Amber","Apex","Atlas","Echo","Flux","Nova","Slate","Vector"};
static const QStringList nouns = {"Brief","Drift","Focus","Ledger","Macro","Pulse","Signal","Tape"};
@@ -105,27 +152,68 @@ AiChatScreen::AiChatScreen(QWidget* parent) : QWidget(parent) {
}
void AiChatScreen::refresh_theme() {
+ // Root
setStyleSheet(QString("background:%1;").arg(col::BG_BASE()));
+
+ // Sidebar
if (sidebar_)
sidebar_->setStyleSheet(
QString("background:%1;border-right:1px solid %2;").arg(col::BG_SURFACE(), col::BORDER_DIM()));
+
+ // Chat area
if (chat_widget_)
chat_widget_->setStyleSheet(QString("background:%1;").arg(col::BG_BASE()));
if (messages_container_)
messages_container_->setStyleSheet(QString("background:%1;").arg(col::BG_BASE()));
+
+ // Scroll area
if (scroll_area_)
scroll_area_->setStyleSheet(
QString("QScrollArea{background:%1;border:none;}"
- "QScrollBar:vertical{background:%2;width:6px;border-radius:3px;}"
- "QScrollBar::handle:vertical{background:%3;border-radius:3px;}"
+ "QScrollBar:vertical{background:transparent;width:5px;margin:2px;}"
+ "QScrollBar::handle:vertical{background:%2;border-radius:0px;min-height:30px;}"
+ "QScrollBar::handle:vertical:hover{background:%3;}"
"QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")
- .arg(col::BG_BASE(), col::BG_SURFACE(), col::BORDER_BRIGHT()));
+ .arg(col::BG_BASE(), col::BORDER_MED(), col::BORDER_BRIGHT()));
+
+ // Input box
if (input_box_)
input_box_->setStyleSheet(
QString("QPlainTextEdit{background:%1;color:%2;border:1px solid %3;"
- "border-radius:4px;padding:8px;font-size:13px;}"
- "QPlainTextEdit:focus{border-color:%4;}")
- .arg(col::BG_SURFACE(), col::TEXT_PRIMARY(), col::BORDER_MED(), col::AMBER()));
+ "border-radius:0px;padding:8px 14px;font-size:%4px;}"
+ "QPlainTextEdit:focus{border-color:%5;}")
+ .arg(col::BG_BASE(), col::TEXT_PRIMARY(), col::BORDER_MED())
+ .arg(fnt::BODY).arg(col::AMBER()));
+
+ // Send button
+ if (send_btn_)
+ send_btn_->setStyleSheet(
+ QString("QPushButton{background:%1;color:%2;border:none;border-radius:0px;"
+ "font-size:%3px;font-weight:700;}"
+ "QPushButton:hover:enabled{background:%4;}"
+ "QPushButton:disabled{background:%5;color:%6;}")
+ .arg(col::AMBER(), col::BG_BASE()).arg(fnt::SMALL)
+ .arg(col::ORANGE(), col::BG_RAISED(), col::TEXT_DIM()));
+
+ // Attach button
+ if (attach_btn_)
+ attach_btn_->setStyleSheet(
+ QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"
+ "border-radius:0px;font-size:20px;font-weight:700;}"
+ "QPushButton:hover{background:rgba(217,119,6,0.15);border-color:%3;}")
+ .arg(col::TEXT_PRIMARY(), col::BORDER_MED(), col::AMBER()));
+
+ // Header bar elements
+ if (hdr_session_lbl_)
+ hdr_session_lbl_->setStyleSheet(
+ QString("color:%1;font-size:%2px;font-weight:600;")
+ .arg(col::TEXT_PRIMARY()).arg(fnt::BODY));
+ if (hdr_tokens_lbl_)
+ hdr_tokens_lbl_->setStyleSheet(
+ QString("color:%1;font-size:%2px;").arg(col::TEXT_DIM()).arg(fnt::TINY));
+
+ // Update provider/model stats to pick up new colors
+ update_stats();
}
void AiChatScreen::showEvent(QShowEvent* e) {
@@ -164,7 +252,7 @@ void AiChatScreen::build_sidebar() {
sidebar_ = new QWidget;
sidebar_->setFixedWidth(280);
sidebar_->setStyleSheet(
- QString("background:#050505;border-right:1px solid %1;").arg(col::BORDER_DIM()));
+ QString("background:%1;border-right:1px solid %2;").arg(col::BG_SURFACE(), col::BORDER_DIM()));
auto* vl = new QVBoxLayout(sidebar_);
vl->setContentsMargins(0,0,0,0);
@@ -174,13 +262,13 @@ void AiChatScreen::build_sidebar() {
auto* hdr = new QWidget;
hdr->setFixedHeight(60);
hdr->setStyleSheet(
- QString("background:#020202;border-bottom:1px solid %1;").arg(col::BORDER_DIM()));
+ QString("background:%1;border-bottom:1px solid %2;").arg(col::BG_BASE(), col::BORDER_DIM()));
auto* hhl = new QHBoxLayout(hdr);
hhl->setContentsMargins(14, 0, 10, 0);
hhl->setSpacing(6);
auto* icon = new QLabel("⬡");
- icon->setStyleSheet(QString("color:%1;font-size:18px;").arg(col::AMBER()));
+ icon->setStyleSheet(QString("color:%1;font-size:22px;").arg(col::TEXT_PRIMARY()));
hhl->addWidget(icon);
auto* title = new QLabel("Fincept AI");
@@ -189,22 +277,22 @@ void AiChatScreen::build_sidebar() {
hhl->addWidget(title, 1);
new_btn_ = new QPushButton("+");
- new_btn_->setFixedSize(32, 32);
+ new_btn_->setFixedSize(34, 34);
new_btn_->setCursor(Qt::PointingHandCursor);
new_btn_->setToolTip("New Chat (Ctrl+N)");
new_btn_->setStyleSheet(
QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"
- "border-radius:4px;font-size:16px;font-weight:400;}"
- "QPushButton:hover{background:%2;color:%3;}"
+ "border-radius:0px;font-size:20px;font-weight:700;}"
+ "QPushButton:hover{background:%3;color:%1;}"
"QPushButton:disabled{color:%4;border-color:%5;}")
- .arg(col::AMBER(), col::AMBER_DIM(), col::BG_BASE(), col::TEXT_DIM(), col::BORDER_DIM()));
+ .arg(col::TEXT_PRIMARY(), col::BORDER_MED(), col::BG_HOVER(), col::TEXT_DIM(), col::BORDER_DIM()));
connect(new_btn_, &QPushButton::clicked, this, &AiChatScreen::on_new_session);
hhl->addWidget(new_btn_);
vl->addWidget(hdr);
// ── Search ───────────────────────────────────────────────────────────
auto* search_wrap = new QWidget;
- search_wrap->setStyleSheet("background:#030303;");
+ search_wrap->setStyleSheet(QString("background:%1;").arg(col::BG_SURFACE()));
auto* swl = new QHBoxLayout(search_wrap);
swl->setContentsMargins(10, 8, 10, 8);
@@ -213,7 +301,7 @@ void AiChatScreen::build_sidebar() {
search_edit_->setFixedHeight(30);
search_edit_->setStyleSheet(
QString("QLineEdit{background:%1;color:%2;border:1px solid %3;"
- "border-radius:4px;padding:2px 10px;font-size:%4px;}"
+ "border-radius:0px;padding:2px 10px;font-size:%4px;}"
"QLineEdit:focus{border-color:%5;}")
.arg(col::BG_BASE(), col::TEXT_PRIMARY(), col::BORDER_MED())
.arg(fnt::SMALL).arg(col::AMBER()));
@@ -226,16 +314,17 @@ void AiChatScreen::build_sidebar() {
session_list_->setWordWrap(false);
session_list_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
session_list_->setStyleSheet(
- QString("QListWidget{background:#030303;border:none;outline:none;}"
- "QListWidget::item{padding:10px 14px;border-bottom:1px solid %1;"
- "color:%2;font-size:%3px;}"
+ QString("QListWidget{background:%1;border:none;outline:none;}"
+ "QListWidget::item{padding:10px 14px;border-bottom:1px solid %2;"
+ "color:%3;font-size:%4px;}"
"QListWidget::item:selected{background:rgba(217,119,6,0.10);"
- "border-left:3px solid %4;color:%5;}"
+ "border-left:3px solid %5;color:%6;}"
"QListWidget::item:hover:!selected{background:rgba(255,255,255,0.03);}"
"QScrollBar:vertical{background:transparent;width:4px;}"
- "QScrollBar::handle:vertical{background:%6;border-radius:2px;}"
+ "QScrollBar::handle:vertical{background:%7;border-radius:0px;}"
"QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")
- .arg(col::BORDER_DIM(), col::TEXT_SECONDARY()).arg(fnt::SMALL)
+ .arg(col::BG_SURFACE(), col::BORDER_DIM(), col::TEXT_SECONDARY())
+ .arg(fnt::SMALL)
.arg(col::AMBER(), col::TEXT_PRIMARY(), col::BORDER_MED()));
connect(session_list_, &QListWidget::currentRowChanged,
this, &AiChatScreen::on_session_selected);
@@ -245,7 +334,7 @@ void AiChatScreen::build_sidebar() {
auto* actions = new QWidget;
actions->setFixedHeight(42);
actions->setStyleSheet(
- QString("background:#020202;border-top:1px solid %1;").arg(col::BORDER_DIM()));
+ QString("background:%1;border-top:1px solid %2;").arg(col::BG_BASE(), col::BORDER_DIM()));
auto* al = new QHBoxLayout(actions);
al->setContentsMargins(10, 0, 10, 0);
al->setSpacing(6);
@@ -255,7 +344,7 @@ void AiChatScreen::build_sidebar() {
rename_btn_->setFixedHeight(26);
rename_btn_->setStyleSheet(
QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"
- "border-radius:3px;font-size:%3px;padding:0 8px;}"
+ "border-radius:0px;font-size:%3px;padding:0 8px;}"
"QPushButton:hover:enabled{background:%2;color:%4;}"
"QPushButton:disabled{color:%5;border-color:%6;}")
.arg(col::TEXT_SECONDARY(), col::BORDER_MED()).arg(fnt::SMALL)
@@ -270,7 +359,7 @@ void AiChatScreen::build_sidebar() {
delete_btn_->setFixedHeight(26);
delete_btn_->setStyleSheet(
QString("QPushButton{background:transparent;color:%1;border:1px solid rgba(220,38,38,0.28);"
- "border-radius:3px;font-size:%2px;padding:0 8px;}"
+ "border-radius:0px;font-size:%2px;padding:0 8px;}"
"QPushButton:hover:enabled{background:%1;color:%3;border-color:%1;}"
"QPushButton:disabled{color:%4;border-color:%5;}")
.arg(col::NEGATIVE()).arg(fnt::SMALL)
@@ -283,7 +372,7 @@ void AiChatScreen::build_sidebar() {
auto* footer = new QWidget;
footer->setFixedHeight(50);
footer->setStyleSheet(
- QString("background:#020202;border-top:1px solid %1;").arg(col::BORDER_DIM()));
+ QString("background:%1;border-top:1px solid %2;").arg(col::BG_BASE(), col::BORDER_DIM()));
auto* fl = new QVBoxLayout(footer);
fl->setContentsMargins(14, 7, 14, 7);
fl->setSpacing(2);
@@ -321,7 +410,7 @@ void AiChatScreen::build_chat_area() {
scroll_area_->setStyleSheet(
QString("QScrollArea{background:%1;border:none;}"
"QScrollBar:vertical{background:transparent;width:5px;margin:2px;}"
- "QScrollBar::handle:vertical{background:%2;border-radius:2px;min-height:30px;}"
+ "QScrollBar::handle:vertical{background:%2;border-radius:0px;min-height:30px;}"
"QScrollBar::handle:vertical:hover{background:%3;}"
"QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")
.arg(col::BG_BASE(), col::BORDER_MED(), col::BORDER_BRIGHT()));
@@ -354,7 +443,7 @@ QWidget* AiChatScreen::build_header_bar() {
hdr_status_dot_ = new QLabel;
hdr_status_dot_->setFixedSize(8, 8);
hdr_status_dot_->setStyleSheet(
- QString("background:%1;border-radius:4px;").arg(col::POSITIVE()));
+ QString("background:%1;border-radius:0px;").arg(col::POSITIVE()));
hl->addWidget(hdr_status_dot_);
// Session name
@@ -383,7 +472,7 @@ QWidget* AiChatScreen::build_header_bar() {
hdr_model_lbl_ = new QLabel("No model");
hdr_model_lbl_->setStyleSheet(
QString("color:%1;font-size:%2px;background:%3;border:1px solid %4;"
- "border-radius:3px;padding:2px 8px;")
+ "border-radius:0px;padding:2px 8px;")
.arg(col::TEXT_SECONDARY()).arg(fnt::TINY)
.arg(col::BG_BASE(), col::BORDER_MED()));
hdr_model_lbl_->setToolTip("Active model — change in Settings > LLM Configuration");
@@ -413,7 +502,7 @@ QWidget* AiChatScreen::build_typing_indicator() {
typing_dots_lbl_ = new QLabel("AI is thinking");
typing_dots_lbl_->setStyleSheet(
QString("color:%1;font-size:%2px;font-style:italic;")
- .arg(col::TEXT_DIM()).arg(fnt::SMALL));
+ .arg(col::TEXT_SECONDARY()).arg(fnt::SMALL));
hl->addWidget(typing_dots_lbl_);
hl->addStretch();
@@ -464,7 +553,7 @@ QWidget* AiChatScreen::build_welcome() {
auto* btn = new QPushButton;
btn->setCursor(Qt::PointingHandCursor);
btn->setStyleSheet(
- QString("QPushButton{background:%1;border:1px solid %2;border-radius:6px;"
+ QString("QPushButton{background:%1;border:1px solid %2;border-radius:0px;"
"padding:12px 14px;text-align:left;}"
"QPushButton:hover{background:%3;border-color:%4;}")
.arg(col::BG_RAISED(), col::BORDER_DIM(), col::BG_HOVER(), col::BORDER_BRIGHT()));
@@ -516,7 +605,7 @@ QWidget* AiChatScreen::build_input_area() {
input_box_->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
input_box_->setStyleSheet(
QString("QPlainTextEdit{background:%1;color:%2;border:1px solid %3;"
- "border-radius:6px;padding:8px 14px;font-size:%4px;}"
+ "border-radius:0px;padding:8px 14px;font-size:%4px;}"
"QPlainTextEdit:focus{border-color:%5;}")
.arg(col::BG_BASE(), col::TEXT_PRIMARY(), col::BORDER_MED())
.arg(fnt::BODY).arg(col::AMBER()));
@@ -534,11 +623,11 @@ QWidget* AiChatScreen::build_input_area() {
attach_btn_->setToolTip("Attach a file to this message");
attach_btn_->setStyleSheet(
QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"
- "border-radius:6px;font-size:18px;font-weight:700;}"
+ "border-radius:0px;font-size:20px;font-weight:700;}"
"QPushButton:hover{background:rgba(217,119,6,0.15);border-color:%1;}"
"QPushButton[active=\"true\"]{background:rgba(217,119,6,0.2);"
"border-color:%1;color:%1;}")
- .arg(col::AMBER(), col::BORDER_MED()));
+ .arg(col::TEXT_PRIMARY(), col::BORDER_MED()));
connect(attach_btn_, &QPushButton::clicked, this, &AiChatScreen::on_attach_file);
hl->addWidget(attach_btn_);
@@ -548,15 +637,15 @@ QWidget* AiChatScreen::build_input_area() {
attach_badge_->setMaximumWidth(160);
attach_badge_->setStyleSheet(
QString("color:%1;font-size:10px;background:rgba(217,119,6,0.12);"
- "border:1px solid #78350f;border-radius:3px;padding:2px 6px;%2")
+ "border:1px solid #78350f;border-radius:0px;padding:2px 6px;%2")
.arg(col::AMBER(), "font-family:'Consolas',monospace;"));
hl->addWidget(attach_badge_);
- send_btn_ = new QPushButton("Send");
- send_btn_->setFixedSize(76, 44);
+ send_btn_ = new QPushButton("Send ↑");
+ send_btn_->setFixedSize(82, 44);
send_btn_->setCursor(Qt::PointingHandCursor);
send_btn_->setStyleSheet(
- QString("QPushButton{background:%1;color:%2;border:none;border-radius:6px;"
+ QString("QPushButton{background:%1;color:%2;border:none;border-radius:0px;"
"font-size:%3px;font-weight:700;}"
"QPushButton:hover:enabled{background:%4;}"
"QPushButton:disabled{background:%5;color:%6;}")
@@ -658,7 +747,10 @@ void AiChatScreen::create_new_session() {
title,
ai_chat::LlmService::instance().active_provider(),
ai_chat::LlmService::instance().active_model());
- if (result.is_err()) return;
+ if (result.is_err()) {
+ LOG_ERROR(TAG, "create_new_session failed: " + QString::fromStdString(result.error()));
+ return;
+ }
active_session_id_ = result.value().id;
active_session_title_ = result.value().title;
history_.clear();
@@ -705,6 +797,7 @@ void AiChatScreen::on_session_selected(int row) {
rename_btn_->setEnabled(true);
hdr_session_lbl_->setText(active_session_title_);
load_messages(active_session_id_);
+ ScreenStateManager::instance().notify_changed(this);
}
void AiChatScreen::on_rename_session() {
@@ -754,6 +847,10 @@ void AiChatScreen::on_send() {
const QString raw_text = input_box_->toPlainText().trimmed();
if (raw_text.isEmpty() && attached_file_path_.isEmpty()) return;
if (active_session_id_.isEmpty()) create_new_session();
+ if (active_session_id_.isEmpty()) {
+ add_message_bubble("system", "Failed to create chat session. Please try again.");
+ return;
+ }
if (!ai_chat::LlmService::instance().is_configured()) {
add_message_bubble("system",
"No LLM provider configured. Go to Settings > LLM Configuration to set up a provider.");
@@ -873,9 +970,23 @@ void AiChatScreen::on_streaming_done(ai_chat::LlmResponse response) {
const QString content = response.content;
if (streaming_bubble_) {
- if (!content.isEmpty() && streaming_bubble_->toPlainText().isEmpty())
- streaming_bubble_->setPlainText(content);
+ // Get final text (either from response or what was streamed)
+ QString final_text = streaming_bubble_->toPlainText();
+ if (!content.isEmpty() && final_text.isEmpty())
+ final_text = content;
+ // Re-render as markdown so **bold**, - lists, code blocks, etc. display properly
+ if (!final_text.isEmpty()) {
+ streaming_bubble_->document()->setDefaultStyleSheet(
+ markdown_css(col::TEXT_PRIMARY()));
+ streaming_bubble_->setMarkdown(final_text);
+ }
streaming_bubble_->setReadOnly(true);
+
+ // Show the copy button now that streaming is done
+ auto* copy_obj = streaming_bubble_->property("copy_btn").value<QObject*>();
+ if (auto* copy_btn = qobject_cast<QPushButton*>(copy_obj))
+ copy_btn->show();
+
streaming_bubble_ = nullptr;
}
if (!content.isEmpty()) {
@@ -928,7 +1039,7 @@ void AiChatScreen::add_message_bubble(const QString& role, const QString& conten
role_lbl->setAlignment(is_user ? Qt::AlignRight : Qt::AlignLeft);
role_lbl->setStyleSheet(
QString("color:%1;font-size:%2px;font-weight:600;background:transparent;")
- .arg(is_user ? col::AMBER() : (is_system ? col::NEGATIVE() : col::CYAN()))
+ .arg(is_user ? col::AMBER() : (is_system ? col::NEGATIVE() : col::AMBER()))
.arg(fnt::TINY));
cvl->addWidget(role_lbl);
@@ -938,24 +1049,60 @@ void AiChatScreen::add_message_bubble(const QString& role, const QString& conten
auto* bvl = new QVBoxLayout(bubble);
bvl->setContentsMargins(0,0,0,0);
- auto* body = new QLabel(content);
- body->setWordWrap(true);
- body->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse);
- body->setTextFormat(Qt::MarkdownText);
- body->setOpenExternalLinks(false);
+ auto* body = new QTextEdit;
+ body->setReadOnly(true);
+ body->setFrameShape(QFrame::NoFrame);
+ body->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
+ body->document()->setDocumentMargin(4);
+ body->document()->setDefaultStyleSheet(markdown_css(body_color(role)));
+ apply_obsidian_palette(body);
+ body->setMarkdown(content);
+ body->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ body->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
body->setStyleSheet(
- QString("color:%1;font-size:%2px;background:transparent;")
+ QString("QTextEdit{background:transparent;color:%1;border:none;font-size:%2px;}")
.arg(body_color(role)).arg(fnt::BODY));
+ // Size to content
+ body->document()->setTextWidth(is_user ? 520 : 640);
+ const int doc_h = static_cast<int>(body->document()->size().height());
+ body->setFixedHeight(qMax(doc_h + 16, 32));
bvl->addWidget(body);
cvl->addWidget(bubble);
- // Timestamp
+ // Footer row: timestamp + copy button
+ auto* footer = new QWidget;
+ footer->setStyleSheet("background:transparent;");
+ auto* fhl = new QHBoxLayout(footer);
+ fhl->setContentsMargins(0, 0, 0, 0);
+ fhl->setSpacing(6);
+
auto* time_lbl = new QLabel(ts);
- time_lbl->setAlignment(is_user ? Qt::AlignRight : Qt::AlignLeft);
time_lbl->setStyleSheet(
QString("color:%1;font-size:%2px;background:transparent;")
.arg(col::TEXT_DIM()).arg(fnt::TINY));
- cvl->addWidget(time_lbl);
+ fhl->addWidget(time_lbl);
+
+ if (!is_user && !is_system) {
+ fhl->addStretch();
+ auto* copy_btn = new QPushButton("Copy");
+ copy_btn->setFixedHeight(20);
+ copy_btn->setCursor(Qt::PointingHandCursor);
+ copy_btn->setStyleSheet(
+ QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"
+ "border-radius:0px;padding:0 8px;font-size:%3px;}"
+ "QPushButton:hover{background:%2;color:%4;}")
+ .arg(col::TEXT_DIM(), col::BORDER_MED()).arg(fnt::TINY).arg(col::TEXT_PRIMARY()));
+ QString plain = content;
+ connect(copy_btn, &QPushButton::clicked, this, [plain, copy_btn]() {
+ QApplication::clipboard()->setText(plain);
+ copy_btn->setText("Copied!");
+ QTimer::singleShot(1500, copy_btn, [copy_btn]() { copy_btn->setText("Copy"); });
+ });
+ fhl->addWidget(copy_btn);
+ }
+
+ if (is_user) fhl->insertStretch(0);
+ cvl->addWidget(footer);
rl->addWidget(col_widget);
if (!is_user) rl->addStretch();
@@ -980,7 +1127,7 @@ QTextEdit* AiChatScreen::add_streaming_bubble() {
role_lbl->setAlignment(Qt::AlignLeft);
role_lbl->setStyleSheet(
QString("color:%1;font-size:%2px;font-weight:600;background:transparent;")
- .arg(col::CYAN()).arg(fnt::TINY));
+ .arg(col::AMBER()).arg(fnt::TINY));
cvl->addWidget(role_lbl);
auto* bubble = new QFrame;
@@ -991,10 +1138,11 @@ QTextEdit* AiChatScreen::add_streaming_bubble() {
auto* body = new QTextEdit;
body->setReadOnly(false);
body->setFrameShape(QFrame::NoFrame);
- body->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
- body->document()->setDocumentMargin(0);
- body->setMinimumHeight(28);
- body->setFixedHeight(28);
+ body->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
+ body->document()->setDocumentMargin(4);
+ body->document()->setDefaultStyleSheet(markdown_css(col::TEXT_PRIMARY()));
+ apply_obsidian_palette(body);
+ body->setMinimumHeight(32);
body->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
body->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
body->setWordWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
@@ -1007,13 +1155,40 @@ QTextEdit* AiChatScreen::add_streaming_bubble() {
? body->viewport()->width()
: 640);
const int doc_h = static_cast<int>(body->document()->size().height());
- const int new_h = qMax(doc_h + 4, 28);
+ const int new_h = qMax(doc_h + 16, 32);
body->setFixedHeight(new_h);
bubble->adjustSize();
row->adjustSize();
});
bvl->addWidget(body);
cvl->addWidget(bubble);
+
+ // Copy button — hidden during streaming, shown when done
+ auto* copy_btn = new QPushButton("Copy");
+ copy_btn->setFixedHeight(20);
+ copy_btn->setCursor(Qt::PointingHandCursor);
+ copy_btn->setStyleSheet(
+ QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"
+ "border-radius:0px;padding:0 8px;font-size:%3px;}"
+ "QPushButton:hover{background:%2;color:%4;}")
+ .arg(col::TEXT_DIM(), col::BORDER_MED()).arg(fnt::TINY).arg(col::TEXT_PRIMARY()));
+ copy_btn->hide();
+ connect(copy_btn, &QPushButton::clicked, this, [body, copy_btn]() {
+ QApplication::clipboard()->setText(body->toPlainText());
+ copy_btn->setText("Copied!");
+ QTimer::singleShot(1500, copy_btn, [copy_btn]() { copy_btn->setText("Copy"); });
+ });
+ auto* footer = new QWidget;
+ footer->setStyleSheet("background:transparent;");
+ auto* fhl = new QHBoxLayout(footer);
+ fhl->setContentsMargins(0, 0, 0, 0);
+ fhl->addStretch();
+ fhl->addWidget(copy_btn);
+ cvl->addWidget(footer);
+
+ // Store copy_btn so on_streaming_done can show it
+ body->setProperty("copy_btn", QVariant::fromValue(static_cast<QObject*>(copy_btn)));
+
rl->addWidget(col_widget);
rl->addStretch();
@@ -1053,7 +1228,7 @@ void AiChatScreen::set_input_enabled(bool enabled) {
// Status dot + label
const QString status_color = enabled ? col::POSITIVE() : col::AMBER();
hdr_status_dot_->setStyleSheet(
- QString("background:%1;border-radius:4px;").arg(status_color));
+ QString("background:%1;border-radius:0px;").arg(status_color));
hdr_status_lbl_->setText(enabled ? "Ready" : "Streaming");
hdr_status_lbl_->setStyleSheet(
QString("color:%1;font-size:%2px;font-weight:600;")
@@ -1081,23 +1256,36 @@ void AiChatScreen::update_stats() {
auto& llm = ai_chat::LlmService::instance();
if (llm.is_configured()) {
- const QString prov = llm.active_provider().toUpper();
- QString model = llm.active_model();
- if (model.length() > 24) model = model.left(22) + "..";
+ const QString provider_raw = llm.active_provider();
+ const bool is_fincept = (provider_raw.toLower() == "fincept");
+
+ // Display names
+ const QString prov_display = is_fincept ? "Fincept LLM" : provider_raw.toUpper();
+ const QString model_raw = llm.active_model();
+ // For fincept, don't expose internal model name
+ const QString model_display = is_fincept ? "Fincept LLM" : model_raw;
+ QString model_short = model_display;
+ if (model_short.length() > 24) model_short = model_short.left(22) + "..";
// Sidebar footer
- provider_lbl_->setText(prov);
+ provider_lbl_->setText(prov_display);
provider_lbl_->setStyleSheet(
QString("color:%1;font-size:%2px;font-weight:600;").arg(col::AMBER()).arg(fnt::SMALL));
- model_lbl_->setText(model);
- model_lbl_->setToolTip(llm.active_model());
+ model_lbl_->setText(is_fincept ? "Managed by Fincept" : model_short);
+ model_lbl_->setToolTip(is_fincept ? "Fincept LLM — managed AI service"
+ : model_raw);
model_lbl_->setStyleSheet(
QString("color:%1;font-size:%2px;").arg(col::TEXT_SECONDARY()).arg(fnt::TINY));
- // Header model pill
- hdr_model_lbl_->setText(model);
- hdr_model_lbl_->setToolTip("Provider: " + prov + "\nModel: " + llm.active_model()
- + "\n\nChange in Settings > LLM Configuration");
+ // Header model pill — show "Provider / Model" for clarity
+ if (is_fincept) {
+ hdr_model_lbl_->setText("Fincept LLM");
+ hdr_model_lbl_->setToolTip("Fincept managed AI service\n\nChange in Settings > LLM Configuration");
+ } else {
+ hdr_model_lbl_->setText(provider_raw.left(1).toUpper() + provider_raw.mid(1) + " / " + model_short);
+ hdr_model_lbl_->setToolTip("Provider: " + prov_display + "\nModel: " + model_raw
+ + "\n\nChange in Settings > LLM Configuration");
+ }
} else {
provider_lbl_->setText("No provider");
provider_lbl_->setStyleSheet(
@@ -1113,4 +1301,28 @@ void AiChatScreen::show_welcome(bool show) {
if (welcome_panel_) welcome_panel_->setVisible(show);
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap AiChatScreen::save_state() const {
+ return {
+ {"session_id", active_session_id_},
+ };
+}
+
+void AiChatScreen::restore_state(const QVariantMap& state) {
+ const QString sid = state.value("session_id").toString();
+ if (sid.isEmpty()) return;
+
+ // Find and select the matching row in the session list
+ for (int i = 0; i < session_list_->count(); ++i) {
+ auto* item = session_list_->item(i);
+ if (item && item->data(Qt::UserRole).toString() == sid) {
+ session_list_->setCurrentRow(i);
+ on_session_selected(i);
+ return;
+ }
+ }
+ // Session not found (may have been deleted) — leave default selection
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/ai_chat/AiChatScreen.h b/fincept-qt/src/ai_chat/AiChatScreen.h
index 20ec68303..261b35bb1 100644
--- a/fincept-qt/src/ai_chat/AiChatScreen.h
+++ b/fincept-qt/src/ai_chat/AiChatScreen.h
@@ -1,6 +1,7 @@
#pragma once
#include "ai_chat/LlmService.h"
+#include "screens/IStatefulScreen.h"
#include <QLabel>
#include <QLineEdit>
@@ -19,11 +20,16 @@
namespace fincept::screens {
-class AiChatScreen : public QWidget {
+class AiChatScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit AiChatScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "ai_chat"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* e) override;
void hideEvent(QHideEvent* e) override;
diff --git a/fincept-qt/src/ai_chat/LlmService.cpp b/fincept-qt/src/ai_chat/LlmService.cpp
index 4603b97ad..4d1ac6f19 100644
--- a/fincept-qt/src/ai_chat/LlmService.cpp
+++ b/fincept-qt/src/ai_chat/LlmService.cpp
@@ -55,6 +55,7 @@ void LlmService::ensure_config() const {
provider_ = model_ = api_key_ = base_url_ = system_prompt_ = {};
temperature_ = 0.7;
max_tokens_ = 4096;
+ tools_enabled_ = true;
auto providers = LlmConfigRepository::instance().list_providers();
if (providers.is_ok()) {
@@ -64,6 +65,7 @@ void LlmService::ensure_config() const {
api_key_ = c.api_key;
base_url_ = c.base_url;
model_ = c.model;
+ tools_enabled_ = c.tools_enabled;
break;
}
}
@@ -74,14 +76,15 @@ void LlmService::ensure_config() const {
api_key_ = c.api_key;
base_url_ = c.base_url;
model_ = c.model;
+ tools_enabled_ = c.tools_enabled;
}
}
// Fallback: if no provider configured, use Fincept with session API key
if (provider_.isEmpty()) {
provider_ = "fincept";
- model_ = "fincept-llm";
- base_url_ = "https://api.fincept.in/research/llm";
+ model_ = "MiniMax-M2.7";
+ base_url_ = {};
LOG_INFO(TAG, "No LLM provider configured — using Fincept default");
}
@@ -159,6 +162,12 @@ int LlmService::active_max_tokens() const {
return max_tokens_;
}
+bool LlmService::tools_enabled() const {
+ QMutexLocker lock(&mutex_);
+ ensure_config();
+ return tools_enabled_;
+}
+
bool LlmService::is_configured() const {
QMutexLocker lock(&mutex_);
ensure_config();
@@ -199,11 +208,11 @@ QString LlmService::get_endpoint_url() const {
// Called with mutex_ held
const QString& p = provider_;
- // Fincept: base_url IS the full endpoint (no path suffix needed)
+ // Fincept: two endpoints — sync chat and async LLM
+ // base_url_ stores the base domain; append path here.
if (p == "fincept") {
- if (!base_url_.isEmpty())
- return base_url_;
- return "https://api.fincept.in/research/llm";
+ // sync endpoint for chat (short replies)
+ return "https://api.fincept.in/research/chat";
}
// Custom base_url takes priority for other providers
@@ -254,6 +263,8 @@ QMap<QString, QString> LlmService::get_headers() const {
auto tok = SettingsRepository::instance().get("session_token");
if (tok.is_ok() && !tok.value().isEmpty())
h["X-Session-Token"] = tok.value();
+ // Cloudflare requires a User-Agent header
+ h["User-Agent"] = "FinceptTerminal/4.0";
} else {
// OpenAI-compatible
if (!api_key_.isEmpty())
@@ -290,7 +301,7 @@ QJsonObject LlmService::build_openai_request(const QString& user_message,
if (stream)
req["stream"] = true;
- if (!stream && with_tools) {
+ if (!stream && with_tools && tools_enabled_) {
QJsonArray tools = mcp::McpService::instance().format_tools_for_openai();
if (!tools.isEmpty())
req["tools"] = tools;
@@ -320,7 +331,7 @@ QJsonObject LlmService::build_anthropic_request(const QString& user_message,
// Anthropic tool format: array of {name, description, input_schema}
// (no "type":"function" wrapper like OpenAI)
- if (!stream) {
+ if (!stream && tools_enabled_) {
QJsonArray ant_tools;
auto all_tools = mcp::McpService::instance().get_all_tools();
for (const auto& tool : all_tools) {
@@ -362,7 +373,7 @@ QJsonObject LlmService::build_gemini_request(const QString& user_message,
}
// Gemini tool format: tools[{functionDeclarations:[{name, description, parameters}]}]
- auto all_tools = mcp::McpService::instance().get_all_tools();
+ auto all_tools = tools_enabled_ ? mcp::McpService::instance().get_all_tools() : std::vector<mcp::UnifiedTool>{};
if (!all_tools.empty()) {
QJsonArray fn_decls;
for (const auto& tool : all_tools) {
@@ -384,42 +395,21 @@ QJsonObject LlmService::build_gemini_request(const QString& user_message,
QJsonObject LlmService::build_fincept_request(const QString& user_message,
const std::vector<ConversationMessage>& history, bool with_tools) {
- QString prompt;
+ // Fincept /research/chat uses the OpenAI messages array format
+ QJsonArray messages;
if (!system_prompt_.isEmpty())
- prompt += "System: " + system_prompt_ + "\n\n";
- for (const auto& m : history) {
- if (m.role == "user")
- prompt += "User: " + m.content + "\n\n";
- else if (m.role == "assistant")
- prompt += "Assistant: " + m.content + "\n\n";
- }
- prompt += "User: " + user_message;
+ messages.append(QJsonObject{{"role", "system"}, {"content", system_prompt_}});
+ for (const auto& m : history)
+ messages.append(QJsonObject{{"role", m.role}, {"content", m.content}});
+ messages.append(QJsonObject{{"role", "user"}, {"content", user_message}});
QJsonObject req;
- 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)
+ req["messages"] = messages;
+ // Pass model if set to a real 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();
- if (!all_tools.isEmpty()) {
- QJsonArray fns;
- for (const auto& t : all_tools) {
- QJsonObject fn = t.toObject()["function"].toObject();
- // Validate: name and parameters must be non-empty
- if (fn.isEmpty() || fn["name"].toString().isEmpty())
- continue;
- if (!fn.contains("parameters"))
- fn["parameters"] = QJsonObject{{"type", "object"}, {"properties", QJsonObject{}}};
- fns.append(fn);
- }
- if (!fns.isEmpty())
- req["tools"] = fns;
- }
- }
+ Q_UNUSED(with_tools) // Fincept /research/chat does not support tools yet
return req;
}
@@ -429,74 +419,255 @@ QJsonObject LlmService::build_fincept_request(const QString& user_message,
LlmService::HttpResult LlmService::blocking_post(const QString& url, const QJsonObject& body,
const QMap<QString, QString>& headers, int timeout_ms) {
- HttpResult result;
+ // Delegate to eventloop_request which works reliably on background threads.
+ // The old waitForReadyRead() approach failed for Cloudflare-protected endpoints
+ // because QNetworkAccessManager requires an event loop for TLS/SSL negotiation.
+ QByteArray json_data = QJsonDocument(body).toJson(QJsonDocument::Compact);
+ return eventloop_request("POST", url, json_data, headers, timeout_ms);
+}
- // Each background thread call needs its own QNetworkAccessManager.
- // IMPORTANT: Do NOT use QEventLoop here — this runs on a QtConcurrent bg
- // thread, and QEventLoop on a non-GUI thread causes undefined behaviour.
- // Instead use waitForReadyRead() which is safe on any thread.
+// ============================================================================
+// Blocking GET helper (mirrors blocking_post but without a body)
+// ============================================================================
+
+LlmService::HttpResult LlmService::blocking_get(const QString& url, const QMap<QString, QString>& headers,
+ int timeout_ms) {
+ return eventloop_request("GET", url, {}, headers, timeout_ms);
+}
+
+// ============================================================================
+// Fincept async path — POST /research/llm/async → poll /research/llm/status/{id}
+// Used for the primary LLM response (sync /research/chat for follow-ups)
+// ============================================================================
+
+// Helper: synchronous POST/GET using QEventLoop on a background thread.
+// This is required for endpoints behind Cloudflare (like api.fincept.in)
+// because QNetworkAccessManager needs an event loop to process TLS/SSL
+// negotiation and HTTP redirects. The waitForReadyRead() approach used by
+// blocking_post() works for some servers but fails for Cloudflare-protected ones.
+LlmService::HttpResult LlmService::eventloop_request(const QString& method, const QString& url,
+ const QByteArray& body,
+ const QMap<QString, QString>& headers,
+ int timeout_ms) {
+ HttpResult result;
QNetworkAccessManager nam;
QNetworkRequest req{QUrl(url)};
req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
for (auto it = headers.constBegin(); it != headers.constEnd(); ++it)
req.setRawHeader(it.key().toUtf8(), it.value().toUtf8());
- QByteArray json_data = QJsonDocument(body).toJson(QJsonDocument::Compact);
- QNetworkReply* reply = nam.post(req, json_data);
+ QNetworkReply* reply = (method == "GET") ? nam.get(req) : nam.post(req, body);
- // Block on background thread using waitForReadyRead loop (thread-safe).
- qint64 elapsed = 0;
- const int poll_ms = 50;
- while (!reply->isFinished()) {
- if (!reply->waitForReadyRead(poll_ms)) {
- elapsed += poll_ms;
- if (elapsed >= timeout_ms) {
- reply->abort();
- // delete directly — nam and reply are stack-owned on this bg
- // thread which has no event loop, so deleteLater() would leak.
- delete reply;
- result.error = "Request timed out";
- return result;
- }
- }
+ QEventLoop loop;
+ QTimer timer;
+ timer.setSingleShot(true);
+ timer.start(timeout_ms);
+ QObject::connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
+ QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit);
+ loop.exec();
+
+ if (!reply->isFinished()) {
+ reply->abort();
+ reply->deleteLater();
+ result.error = "Request timed out";
+ return result;
}
result.status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
result.body = reply->readAll();
-
- if (result.status >= 200 && result.status < 300) {
- result.success = true;
- } else {
- // Prefer server's JSON error message over Qt's generic network string.
- // Parse body first; fall back to Qt errorString if body has no message.
+ result.success = (result.status >= 200 && result.status < 300);
+ if (!result.success) {
QString server_msg;
- if (!result.body.isEmpty()) {
- auto err_doc = QJsonDocument::fromJson(result.body);
- if (!err_doc.isNull() && err_doc.isObject()) {
- QJsonObject ej = err_doc.object();
- // Fincept: {"success":false,"message":"..."}
- if (ej.contains("message") && ej["message"].isString())
- server_msg = ej["message"].toString();
- // OpenAI: {"error":{"message":"..."}} or {"error":"..."}
- if (server_msg.isEmpty() && ej.contains("error")) {
- QJsonValue ev = ej["error"];
- if (ev.isString())
- server_msg = ev.toString();
- else if (ev.isObject())
- server_msg = ev.toObject()["message"].toString();
+ auto err_doc = QJsonDocument::fromJson(result.body);
+ if (!err_doc.isNull() && err_doc.isObject()) {
+ QJsonObject ej = err_doc.object();
+ if (ej.contains("message") && ej["message"].isString())
+ server_msg = ej["message"].toString();
+ }
+ result.error = server_msg.isEmpty()
+ ? QString("HTTP %1: %2").arg(result.status).arg(reply->errorString())
+ : QString("HTTP %1: %2").arg(result.status).arg(server_msg);
+ }
+ reply->deleteLater();
+ return result;
+}
+
+// Build a compact tool catalog string for injection into the system prompt.
+// This allows models that don't support structured tool_calls to still
+// emit text-based tool invocations that try_extract_and_execute_text_tool_calls
+// can detect and execute.
+static QString build_tool_catalog_for_prompt() {
+ auto all_tools = mcp::McpService::instance().get_all_tools();
+ if (all_tools.empty())
+ return {};
+
+ // Only include the most useful tools (navigation, market data, portfolio, etc.)
+ // to keep prompt size reasonable. Skip very niche tools.
+ QString catalog;
+ catalog += "You have access to the following tools. To use a tool, emit a <tool_call> block:\n";
+ catalog += "<tool_call>{\"name\": \"TOOL_NAME\", \"arguments\": {\"param\": \"value\"}}</tool_call>\n\n";
+ catalog += "Available tools:\n";
+
+ int count = 0;
+ for (const auto& tool : all_tools) {
+ // Build qualified name: server_id__tool_name
+ QString fn_name = tool.server_id + "__" + tool.name;
+ catalog += "- " + fn_name + ": " + tool.description;
+
+ // Add parameter hints from schema
+ QJsonObject props = tool.input_schema["properties"].toObject();
+ if (!props.isEmpty()) {
+ QStringList params;
+ for (auto it = props.constBegin(); it != props.constEnd(); ++it)
+ params.append(it.key());
+ catalog += " (params: " + params.join(", ") + ")";
+ }
+ catalog += "\n";
+ ++count;
+ // Cap at 60 tools to avoid overwhelming the prompt
+ if (count >= 60) {
+ catalog += "... and " + QString::number(all_tools.size() - 60) + " more tools available.\n";
+ break;
+ }
+ }
+ return catalog;
+}
+
+LlmResponse LlmService::fincept_async_request(const QString& user_message,
+ const std::vector<ConversationMessage>& history) {
+ LlmResponse resp;
+
+ // Build prompt string for the async endpoint (it takes a plain prompt, not messages)
+ QString prompt;
+ if (!system_prompt_.isEmpty())
+ prompt += system_prompt_ + "\n\n";
+
+ // Inject tool catalog so the model can emit text-based tool calls
+ if (tools_enabled_) {
+ QString tool_catalog = build_tool_catalog_for_prompt();
+ if (!tool_catalog.isEmpty())
+ prompt += tool_catalog + "\n";
+ }
+
+ for (const auto& m : history) {
+ if (m.role == "user")
+ prompt += "User: " + m.content + "\n\n";
+ else if (m.role == "assistant")
+ prompt += "Assistant: " + m.content + "\n\n";
+ }
+ prompt += "User: " + user_message;
+
+ QJsonObject submit_body;
+ submit_body["prompt"] = prompt;
+ submit_body["max_tokens"] = max_tokens_;
+ submit_body["temperature"] = temperature_;
+
+ auto hdr = get_headers();
+ const QString async_url = "https://api.fincept.in/research/llm/async";
+ const QString status_base = "https://api.fincept.in/research/llm/status/";
+
+ LOG_INFO(TAG, QString("Fincept async: submitting to %1 (api_key=%2, prompt_len=%3)")
+ .arg(async_url)
+ .arg(api_key_.isEmpty() ? "EMPTY" : api_key_.left(12) + "...")
+ .arg(prompt.length()));
+
+ QByteArray json_data = QJsonDocument(submit_body).toJson(QJsonDocument::Compact);
+ auto submit = eventloop_request("POST", async_url, json_data, hdr, 30000);
+ if (!submit.success) {
+ resp.error = "Fincept async submit failed: " + submit.error;
+ LOG_ERROR(TAG, resp.error);
+ return resp;
+ }
+
+ auto submit_doc = QJsonDocument::fromJson(submit.body);
+ if (submit_doc.isNull()) {
+ resp.error = "Fincept async: failed to parse submit response";
+ return resp;
+ }
+
+ // Response can nest task_id at top level or inside data
+ QJsonObject sj = submit_doc.object();
+ QString task_id = sj["task_id"].toString();
+ if (task_id.isEmpty())
+ task_id = sj["data"].toObject()["task_id"].toString();
+ if (task_id.isEmpty()) {
+ resp.error = "Fincept async: no task_id in submit response";
+ return resp;
+ }
+ LOG_INFO(TAG, "Fincept async task_id: " + task_id);
+
+ // Poll every 3 seconds, up to 120 seconds total
+ const QString poll_url = status_base + task_id;
+ constexpr int MAX_POLLS = 40;
+ for (int i = 0; i < MAX_POLLS; ++i) {
+ QThread::msleep(3000);
+
+ auto poll = eventloop_request("GET", poll_url, {}, hdr, 15000);
+ if (!poll.success) {
+ LOG_WARN(TAG, "Fincept async poll failed: " + poll.error);
+ continue;
+ }
+
+ auto poll_doc = QJsonDocument::fromJson(poll.body);
+ if (poll_doc.isNull())
+ continue;
+
+ QJsonObject pj = poll_doc.object();
+ QString status = pj["status"].toString();
+ QJsonObject data_obj = pj["data"].toObject();
+ if (status.isEmpty())
+ status = data_obj["status"].toString();
+
+ LOG_INFO(TAG, QString("Fincept async poll %1 status=%2").arg(i + 1).arg(status));
+
+ if (status == "completed") {
+ // data.data.response
+ QString response = data_obj["data"].toObject()["response"].toString();
+ if (response.isEmpty())
+ response = data_obj["response"].toString();
+ if (response.isEmpty()) {
+ resp.error = "Fincept async completed but response is empty";
+ LOG_WARN(TAG, "Fincept async task completed with empty response field");
+ return resp;
+ }
+ resp.content = response;
+ resp.success = true;
+
+ QJsonObject usage = data_obj["data"].toObject()["usage"].toObject();
+ if (!usage.isEmpty()) {
+ resp.prompt_tokens = usage["input_tokens"].toInt();
+ resp.completion_tokens = usage["output_tokens"].toInt();
+ resp.total_tokens = usage["total_tokens"].toInt();
+ }
+
+ // Check for text-based tool calls in the response.
+ // The model may have emitted <tool_call>...</tool_call> blocks.
+ if (!resp.content.isEmpty()) {
+ LOG_INFO(TAG, "Fincept: checking response for text-based tool calls");
+ // Use the sync /research/chat endpoint for follow-up after tool execution
+ QString followup_url = get_endpoint_url();
+ auto followup_hdr = get_headers();
+ auto tool_result = try_extract_and_execute_text_tool_calls(
+ resp.content, user_message, followup_url, followup_hdr);
+ if (tool_result.has_value()) {
+ LOG_INFO(TAG, "Fincept: text tool calls detected and executed");
+ return tool_result.value();
}
- // Anthropic: {"error":{"type":"...","message":"..."}}
- if (server_msg.isEmpty() && ej.contains("detail"))
- server_msg = ej["detail"].toString();
}
+ return resp;
+ }
+
+ if (status == "failed") {
+ QString err = pj["error"].toString();
+ if (err.isEmpty())
+ err = data_obj["error"].toString();
+ resp.error = "Fincept async task failed: " + (err.isEmpty() ? "unknown error" : err);
+ return resp;
}
- result.error = server_msg.isEmpty() ? QString("HTTP %1: %2").arg(result.status).arg(reply->errorString())
- : QString("HTTP %1: %2").arg(result.status).arg(server_msg);
}
- // delete directly — same reason as timeout path above (no event loop on bg thread).
- delete reply;
- return result;
+ resp.error = "Fincept async timed out waiting for response";
+ return resp;
}
// ============================================================================
@@ -522,7 +693,11 @@ LlmResponse LlmService::do_request(const QString& user_message, const std::vecto
if (!api_key_.isEmpty())
url += "?key=" + api_key_;
} else if (provider_ == "fincept") {
- req_body = build_fincept_request(user_message, history, true);
+ // Fincept uses two separate endpoints:
+ // Primary response → async (submit + poll, returns richer model output)
+ // Follow-ups (tool results) → sync /research/chat
+ LOG_INFO(TAG, "do_request: routing to fincept_async_request");
+ return fincept_async_request(user_message, history);
} else {
req_body = build_openai_request(user_message, history, false, true);
}
@@ -708,81 +883,18 @@ LlmResponse LlmService::do_request(const QString& user_message, const std::vecto
}
} else if (provider_ == "fincept") {
+ // /research/chat returns OpenAI-compatible choices array:
+ // {"success":true,"data":{"choices":[{"message":{"role":"assistant","content":"..."}}],...}}
QJsonObject data = rj.contains("data") ? rj["data"].toObject() : rj;
-
- // Check for tool calls
- QJsonArray tcs = data["tool_calls"].toArray();
- if (!tcs.isEmpty()) {
- LOG_INFO(TAG, QString("Fincept returned %1 tool calls").arg(tcs.size()));
- QString tool_results;
- for (const auto& tc_val : tcs) {
- QJsonObject tc = tc_val.toObject();
- QString fn_name =
- tc.contains("function") ? tc["function"].toObject()["name"].toString() : tc["name"].toString();
- QString args_str = tc.contains("function") ? tc["function"].toObject()["arguments"].toString()
- : tc["arguments"].toString("{}");
-
- QJsonObject fn_args = QJsonDocument::fromJson(args_str.toUtf8()).object();
- auto tool_res = mcp::McpService::instance().execute_openai_function(fn_name, fn_args);
-
- QString result_content;
- if (!tool_res.message.isEmpty())
- result_content = tool_res.message;
- else if (!tool_res.data.isNull() && !tool_res.data.isUndefined())
- result_content = QJsonDocument(tool_res.data.toObject()).toJson().left(2000);
- else
- result_content = QJsonDocument(tool_res.to_json()).toJson().left(2000);
-
- int sep = fn_name.indexOf("__");
- QString short_name = (sep >= 0) ? fn_name.mid(sep + 2) : fn_name;
- tool_results += "\n**Tool: " + short_name + "**\n" + result_content + "\n";
- }
-
- // Follow-up request with tool results
- if (!tool_results.isEmpty()) {
- QString follow_prompt = "User asked: \"" + user_message +
- "\"\n\n"
- "I retrieved this data:\n" +
- tool_results +
- "\n\nPlease provide a clear, concise summary of this data in natural language.";
-
- QJsonObject follow_body{
- {"prompt", follow_prompt}, {"temperature", temperature_}, {"max_tokens", max_tokens_}};
- auto fu = blocking_post(url, follow_body, hdr);
- if (fu.success) {
- auto fu_doc = QJsonDocument::fromJson(fu.body);
- if (!fu_doc.isNull()) {
- QJsonObject fu_d =
- fu_doc.object().contains("data") ? fu_doc.object()["data"].toObject() : fu_doc.object();
- for (const QString& k : {"response", "content", "answer", "text"}) {
- if (fu_d.contains(k)) {
- resp.content = fu_d[k].toString();
- break;
- }
- }
- }
- }
- }
- } else {
- for (const QString& k : {"response", "content", "answer", "text", "result"}) {
- if (data.contains(k) && !data[k].toString().isEmpty()) {
- resp.content = data[k].toString();
- break;
- }
- }
- if (resp.content.isEmpty() && data.contains("ai_response")) {
- QJsonValue ai = data["ai_response"];
- if (ai.isObject() && ai.toObject().contains("content"))
- resp.content = ai.toObject()["content"].toString();
- 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;
- }
+ QJsonArray choices = data["choices"].toArray();
+ if (!choices.isEmpty()) {
+ resp.content = choices[0].toObject()["message"].toObject()["content"].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 /research/chat returned empty choices or content");
+ return resp;
}
} else {
@@ -1160,9 +1272,14 @@ std::optional<LlmResponse> LlmService::try_extract_and_execute_text_tool_calls(
if (!system_prompt_.isEmpty())
follow_body["system"] = system_prompt_;
} else if (provider_ == "fincept") {
- follow_body["prompt"] = follow_prompt;
- follow_body["temperature"] = temperature_;
- follow_body["max_tokens"] = max_tokens_;
+ // /research/chat uses messages array
+ QJsonArray msgs;
+ if (!system_prompt_.isEmpty())
+ msgs.append(QJsonObject{{"role", "system"}, {"content", system_prompt_}});
+ msgs.append(QJsonObject{{"role", "user"}, {"content", follow_prompt}});
+ follow_body["messages"] = msgs;
+ if (!model_.isEmpty() && model_ != "fincept-llm")
+ follow_body["model"] = model_;
} else {
// OpenAI-compatible
QJsonArray msgs;
@@ -1203,13 +1320,11 @@ std::optional<LlmResponse> LlmService::try_extract_and_execute_text_tool_calls(
}
}
} else if (provider_ == "fincept") {
+ // /research/chat: {"success":true,"data":{"choices":[{"message":{"content":"..."}}]}}
QJsonObject data = fu_rj.contains("data") ? fu_rj["data"].toObject() : fu_rj;
- for (const QString& k : {"response", "content", "answer", "text"}) {
- if (data.contains(k)) {
- resp.content = data[k].toString();
- break;
- }
- }
+ QJsonArray fu_choices = data["choices"].toArray();
+ if (!fu_choices.isEmpty())
+ resp.content = fu_choices[0].toObject()["message"].toObject()["content"].toString();
} else {
QJsonArray choices = fu_rj["choices"].toArray();
if (!choices.isEmpty())
@@ -1691,7 +1806,8 @@ void LlmService::fetch_models(const QString& provider, const QString& api_key, c
// Public API
// ============================================================================
-LlmResponse LlmService::chat(const QString& user_message, const std::vector<ConversationMessage>& history) {
+LlmResponse LlmService::chat(const QString& user_message, const std::vector<ConversationMessage>& history,
+ bool use_tools) {
QMutexLocker lock(&mutex_);
ensure_config();
@@ -1702,6 +1818,7 @@ LlmResponse LlmService::chat(const QString& user_message, const std::vector<Conv
QString p = provider_, k = api_key_, b = base_url_, m = model_, sp = system_prompt_;
double t = temperature_;
int mx = max_tokens_;
+ const bool saved_tools = tools_enabled_;
lock.unlock();
// Restore snapshot into members for use by helper methods
@@ -1715,15 +1832,24 @@ LlmResponse LlmService::chat(const QString& user_message, const std::vector<Conv
temperature_ = t;
max_tokens_ = mx;
- return do_request(user_message, history);
+ // Override tools_enabled_ for this request scope if caller disabled tools
+ if (!use_tools) tools_enabled_ = false;
+
+ auto resp = do_request(user_message, history);
+
+ // Restore tools_enabled_ to saved value
+ tools_enabled_ = saved_tools;
+
+ return resp;
}
void LlmService::chat_streaming(const QString& user_message, const std::vector<ConversationMessage>& history,
- StreamCallback on_chunk) {
+ StreamCallback on_chunk, bool use_tools) {
// Snapshot config under lock
QString p, k, b, m, sp;
double t;
int mx;
+ bool saved_tools;
{
QMutexLocker lock(&mutex_);
ensure_config();
@@ -1734,6 +1860,7 @@ void LlmService::chat_streaming(const QString& user_message, const std::vector<C
sp = system_prompt_;
t = temperature_;
mx = max_tokens_;
+ saved_tools = tools_enabled_;
}
if (p.isEmpty()) {
@@ -1752,7 +1879,8 @@ void LlmService::chat_streaming(const QString& user_message, const std::vector<C
if (!self) return;
on_chunk(chunk, done);
};
- QtConcurrent::run([self, p, k, b, m, sp, t, mx, user_message, history_copy, guarded_chunk]() {
+ QtConcurrent::run([self, p, k, b, m, sp, t, mx, user_message, history_copy, guarded_chunk,
+ use_tools, saved_tools]() {
if (!self)
return;
@@ -1768,10 +1896,18 @@ void LlmService::chat_streaming(const QString& user_message, const std::vector<C
self->system_prompt_ = sp;
self->temperature_ = t;
self->max_tokens_ = mx;
+ // Disable tools for this request if caller requested it
+ if (!use_tools) self->tools_enabled_ = false;
}
auto resp = self->do_streaming_request(user_message, history_copy, guarded_chunk);
+ // Restore tools_enabled_ to saved value
+ {
+ QMutexLocker lock(&self->mutex_);
+ self->tools_enabled_ = saved_tools;
+ }
+
if (self) {
QMetaObject::invokeMethod(
self,
diff --git a/fincept-qt/src/ai_chat/LlmService.h b/fincept-qt/src/ai_chat/LlmService.h
index 6fbd8a080..c1386b323 100644
--- a/fincept-qt/src/ai_chat/LlmService.h
+++ b/fincept-qt/src/ai_chat/LlmService.h
@@ -60,12 +60,16 @@ class LlmService : public QObject {
static LlmService& instance();
// Non-streaming (blocking — call from background thread via QtConcurrent::run)
- LlmResponse chat(const QString& user_message, const std::vector<ConversationMessage>& history);
+ // use_tools: when false, disables MCP tool execution for this request
+ // (use for the floating bubble to prevent unintended navigation)
+ LlmResponse chat(const QString& user_message, const std::vector<ConversationMessage>& history,
+ bool use_tools = true);
// Streaming — launches background thread; on_chunk called on that thread.
// Emit finished_streaming(response) when done to get result on UI thread.
+ // use_tools: when false, disables MCP tool execution for this request
void chat_streaming(const QString& user_message, const std::vector<ConversationMessage>& history,
- StreamCallback on_chunk);
+ StreamCallback on_chunk, bool use_tools = true);
// Reload config from DB (call after user changes LLM settings)
void reload_config();
@@ -77,6 +81,7 @@ class LlmService : public QObject {
QString active_base_url() const;
double active_temperature() const;
int active_max_tokens() const;
+ bool tools_enabled() const;
bool is_configured() const;
// ── Profile-aware resolution ──────────────────────────────────────────────
@@ -115,6 +120,7 @@ class LlmService : public QObject {
mutable double temperature_ = 0.7;
mutable int max_tokens_ = 4096;
mutable QString system_prompt_;
+ mutable bool tools_enabled_ = true;
mutable bool config_loaded_ = false;
void ensure_config() const;
@@ -167,6 +173,17 @@ class LlmService : public QObject {
};
static HttpResult blocking_post(const QString& url, const QJsonObject& body, const QMap<QString, QString>& headers,
int timeout_ms = 120000);
+ static HttpResult blocking_get(const QString& url, const QMap<QString, QString>& headers,
+ int timeout_ms = 30000);
+
+ // QEventLoop-based HTTP for Cloudflare-protected endpoints (Fincept)
+ static HttpResult eventloop_request(const QString& method, const QString& url,
+ const QByteArray& body, const QMap<QString, QString>& headers,
+ int timeout_ms = 30000);
+
+ // Fincept async path: POST /research/llm/async → poll /research/llm/status/{id}
+ LlmResponse fincept_async_request(const QString& user_message,
+ const std::vector<ConversationMessage>& history);
};
} // namespace fincept::ai_chat
diff --git a/fincept-qt/src/app/DockScreenRouter.cpp b/fincept-qt/src/app/DockScreenRouter.cpp
index d6371b7b8..71e5f9919 100644
--- a/fincept-qt/src/app/DockScreenRouter.cpp
+++ b/fincept-qt/src/app/DockScreenRouter.cpp
@@ -1,6 +1,7 @@
#include "app/DockScreenRouter.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "core/session/SessionManager.h"
#include "screens/IStatefulScreen.h"
@@ -598,9 +599,7 @@ void DockScreenRouter::save_screen_state(const QString& id) {
if (!screen) return;
auto* stateful = dynamic_cast<screens::IStatefulScreen*>(screen);
if (!stateful) return;
- SessionManager::instance().save_tab_state(
- "screen_state/" + id, stateful->save_state());
- LOG_DEBUG("DockRouter", "Saved screen state: " + id);
+ ScreenStateManager::instance().save_now(stateful);
}
void DockScreenRouter::restore_screen_state(const QString& id) {
@@ -608,11 +607,7 @@ void DockScreenRouter::restore_screen_state(const QString& id) {
if (!screen) return;
auto* stateful = dynamic_cast<screens::IStatefulScreen*>(screen);
if (!stateful) return;
- const auto state = SessionManager::instance().load_tab_state("screen_state/" + id);
- if (!state.isEmpty()) {
- stateful->restore_state(state);
- LOG_DEBUG("DockRouter", "Restored screen state: " + id);
- }
+ ScreenStateManager::instance().restore(stateful);
}
} // namespace fincept
diff --git a/fincept-qt/src/app/DockScreenRouter.h b/fincept-qt/src/app/DockScreenRouter.h
index 0e1427703..39073f518 100644
--- a/fincept-qt/src/app/DockScreenRouter.h
+++ b/fincept-qt/src/app/DockScreenRouter.h
@@ -86,8 +86,13 @@ class DockScreenRouter : public QObject {
ads::CDockWidget* create_dock_widget(const QString& id);
void materialize_screen(const QString& id);
+
+ public:
+ /// Map a screen id to its human-readable title.
static QString title_for_id(const QString& id);
+ private:
+
/// Persist and restore a user-edited tab title (separate from screen state).
void save_tab_title(const QString& id, const QString& title);
QString load_tab_title(const QString& id) const;
diff --git a/fincept-qt/src/app/MainWindow.cpp b/fincept-qt/src/app/MainWindow.cpp
index d1de88af6..fda1c88c6 100644
--- a/fincept-qt/src/app/MainWindow.cpp
+++ b/fincept-qt/src/app/MainWindow.cpp
@@ -8,10 +8,13 @@
#include <DockAreaWidget.h>
#include "screens/chat_mode/ChatModeScreen.h"
+#include "screens/auth/LockScreen.h"
#include "services/updater/UpdateService.h"
#include "ai_chat/AiChatBubble.h"
#include "ai_chat/AiChatScreen.h"
#include "auth/AuthManager.h"
+#include "auth/InactivityGuard.h"
+#include "auth/PinManager.h"
#include "core/events/EventBus.h"
#include "core/logging/Logger.h"
#include "core/session/SessionManager.h"
@@ -156,13 +159,28 @@ MainWindow::MainWindow(int window_id, QWidget* parent)
// ── Chat Mode ─────────────────────────────────────────────────────────────
chat_mode_screen_ = new chat_mode::ChatModeScreen;
+ // ── Lock Screen ─────────────────────────────────────────────────────────
+ lock_screen_ = new screens::LockScreen;
+
// ── ADS Docking mode ─────────────────────────────────────────────────────
setup_docking_mode();
master_stack->addWidget(dock_manager_->parentWidget()); // index 1 — dock_wrapper
master_stack->addWidget(chat_mode_screen_); // index 2
+ master_stack->addWidget(lock_screen_); // index 3 — lock/PIN screen
connect(chat_mode_screen_, &chat_mode::ChatModeScreen::exit_requested,
this, &MainWindow::toggle_chat_mode);
+ // Lock screen signals
+ connect(lock_screen_, &screens::LockScreen::unlocked, this, &MainWindow::on_terminal_unlocked);
+ connect(lock_screen_, &screens::LockScreen::reauth_requested, this, [this]() {
+ // Max PIN attempts exceeded — force full re-login
+ auth::AuthManager::instance().logout();
+ });
+
+ // Inactivity guard → lock screen
+ connect(&auth::InactivityGuard::instance(), &auth::InactivityGuard::lock_requested,
+ this, &MainWindow::show_lock_screen);
+
setCentralWidget(master_stack);
dock_toolbar_ = new ui::DockToolBar(this);
@@ -177,8 +195,8 @@ MainWindow::MainWindow(int window_id, QWidget* parent)
// ── Workspace + signal wiring ───────────────────────────────────────────
WorkspaceManager::instance().set_main_window(this);
connect(&WorkspaceManager::instance(), &WorkspaceManager::workspace_loaded,
- this, [this](const WorkspaceDef& ws) {
- setWindowTitle(QString("Fincept Terminal — %1").arg(ws.metadata.name));
+ this, [this](const WorkspaceDef&) {
+ update_window_title();
});
connect(&WorkspaceManager::instance(), &WorkspaceManager::workspace_error,
this, [this](const QString& msg) {
@@ -196,6 +214,11 @@ MainWindow::MainWindow(int window_id, QWidget* parent)
});
connect(dock_router_, &DockScreenRouter::screen_changed, tab_bar_, &ui::TabBar::set_active);
+ // Update the main window title bar to reflect the current screen name.
+ connect(dock_router_, &DockScreenRouter::screen_changed, this, [this](const QString&) {
+ update_window_title();
+ });
+
connect(this, &QObject::destroyed, this, [this]() {
WorkspaceManager::instance().remove_window(this);
});
@@ -341,24 +364,43 @@ MainWindow::MainWindow(int window_id, QWidget* parent)
}
}
} else if (action.startsWith("perspective_")) {
- static const QMap<QString, QString> persp_names = {
- {"perspective_trading", "Trading"},
- {"perspective_research", "Research"},
- {"perspective_news", "News"},
- {"perspective_portfolio", "Portfolio"},
+ // Quick Switch — navigate directly to a preset screen layout
+ // 2 screens = 1:1 side-by-side, 4 screens = 2x2 grid
+ static const QMap<QString, QStringList> view_screens = {
+ // Trading
+ {"perspective_trading", {"crypto_trading", "watchlist", "markets", "news"}},
+ {"perspective_equity", {"equity_trading", "watchlist"}},
+ {"perspective_algo", {"algo_trading", "backtesting"}},
+ // Research
+ {"perspective_research", {"equity_research", "markets", "screener", "news"}},
+ {"perspective_derivatives", {"derivatives", "surface_analytics"}},
+ {"perspective_ma", {"ma_analytics", "news"}},
+ // Portfolio
+ {"perspective_portfolio", {"portfolio", "markets", "watchlist", "news"}},
+ // News & Markets
+ {"perspective_news", {"news", "markets"}},
+ {"perspective_markets", {"markets", "watchlist"}},
+ // Economics & Data
+ {"perspective_economics", {"economics", "dbnomics", "gov_data", "asia_markets"}},
+ {"perspective_data", {"data_sources", "data_mapping"}},
+ // Geopolitics
+ {"perspective_geopolitics", {"geopolitics", "maritime", "relationship_map", "news"}},
+ // AI & Quant
+ {"perspective_quant", {"ai_quant_lab", "quantlib", "backtesting", "markets"}},
+ {"perspective_ai", {"ai_chat", "agent_config"}},
+ // Tools
+ {"perspective_tools", {"code_editor", "node_editor"}},
};
- const QString persp = persp_names.value(action);
- if (!persp.isEmpty() && dock_manager_) {
- if (!dock_manager_->perspectiveNames().contains(persp)) {
- static const QMap<QString, QString> screen_map = {
- {"Trading", "crypto_trading"}, {"Research", "equity_research"},
- {"News", "news"}, {"Portfolio", "portfolio"},
- };
- if (dock_router_) dock_router_->navigate(screen_map.value(persp));
- dock_manager_->addPerspective(persp);
+ const auto it = view_screens.find(action);
+ if (it != view_screens.end() && dock_router_) {
+ const QStringList& screens = it.value();
+ if (!screens.isEmpty()) {
+ dock_router_->navigate(screens[0], true); // first exclusive
+ for (int i = 1; i < screens.size(); ++i)
+ dock_router_->navigate(screens[i]); // fill grid
}
- dock_manager_->openPerspective(persp);
- LOG_INFO("MainWindow", QString("Opened perspective: %1").arg(persp));
+ LOG_INFO("MainWindow", QString("Quick Switch: %1 (%2 panels)")
+ .arg(action).arg(screens.size()));
}
} else if (action == "logout") {
auth::AuthManager::instance().logout();
@@ -505,7 +547,19 @@ MainWindow::MainWindow(int window_id, QWidget* parent)
// Otherwise, navigate to dashboard as default.
auto& auth_mgr = auth::AuthManager::instance();
if (auth_mgr.is_authenticated() || auth_mgr.is_loading()) {
- stack_->setCurrentIndex(1);
+ // If user is authenticated and has a PIN, show lock screen first.
+ // If no PIN, on_auth_state_changed will route to PIN setup.
+ if (auth_mgr.is_authenticated() && auth::PinManager::instance().has_pin()) {
+ LOG_INFO("MainWindow", "Session restored — showing PIN unlock");
+ lock_screen_->show_unlock();
+ stack_->setCurrentIndex(3);
+ } else if (auth_mgr.is_authenticated()) {
+ // Authenticated but no PIN yet — will be caught by on_auth_state_changed
+ on_auth_state_changed();
+ } else {
+ // Still loading — show app stack temporarily (loading state)
+ stack_->setCurrentIndex(1);
+ }
if (!dock_restored) {
dock_router_->navigate("dashboard");
LOG_INFO("MainWindow", "Applied clean default dock layout");
@@ -739,13 +793,37 @@ void MainWindow::on_auth_state_changed() {
return;
if (auth.is_authenticated()) {
- // Don't redirect if user is already on the app stack (dashboard, etc.)
- // or is intentionally viewing the pricing screen from the toolbar.
- if (stack_->currentIndex() == 1)
+ // Don't redirect if user is already on the app stack (dashboard/workspace
+ // at index 1, or chat mode at index 2) or is intentionally viewing the
+ // pricing screen from the toolbar.
+ if (stack_->currentIndex() == 1 || stack_->currentIndex() == 2) {
+ LOG_DEBUG("MainWindow", QString("on_auth_state_changed: skipping redirect, "
+ "stack index=%1, chat_mode=%2")
+ .arg(stack_->currentIndex()).arg(chat_mode_));
return;
+ }
if (stack_->currentIndex() == 0 && auth_stack_->currentIndex() == 3)
return; // user is on pricing screen — let PricingScreen handle it
+ // ── PIN gate: require PIN setup or PIN unlock before proceeding ──
+ // On first login (no PIN configured): show mandatory PIN setup.
+ // On subsequent launches (PIN exists): show PIN unlock.
+ // Skip if user is already on the lock screen (index 3).
+ if (stack_->currentIndex() != 3) {
+ if (auth.needs_pin_setup()) {
+ LOG_INFO("MainWindow", "Authenticated but no PIN — showing PIN setup");
+ lock_screen_->show_setup();
+ stack_->setCurrentIndex(3);
+ return;
+ }
+ if (auth::PinManager::instance().has_pin()) {
+ LOG_INFO("MainWindow", "Authenticated with PIN — showing PIN unlock");
+ lock_screen_->show_unlock();
+ stack_->setCurrentIndex(3);
+ return;
+ }
+ }
+
if (auth.session().has_paid_plan()) {
// Paid user → straight to dashboard
stack_->setCurrentIndex(1);
@@ -760,6 +838,8 @@ void MainWindow::on_auth_state_changed() {
auth_stack_->setCurrentIndex(3);
}
} else {
+ // Disable inactivity guard when logged out
+ auth::InactivityGuard::instance().set_enabled(false);
stack_->setCurrentIndex(0);
auth_stack_->setCurrentIndex(0);
}
@@ -798,6 +878,87 @@ void MainWindow::show_info_help() {
auth_stack_->setCurrentIndex(4);
}
+void MainWindow::show_lock_screen() {
+ auto& auth = auth::AuthManager::instance();
+ if (!auth.is_authenticated())
+ return;
+
+ // Don't lock if already on lock screen or login screen
+ if (stack_->currentIndex() == 3 || stack_->currentIndex() == 0)
+ return;
+
+ LOG_INFO("MainWindow", "Inactivity timeout — showing lock screen");
+ lock_screen_->activate();
+ stack_->setCurrentIndex(3);
+
+ // Hide toolbar/statusbar while locked
+ if (dock_toolbar_) dock_toolbar_->setVisible(false);
+ if (dock_status_bar_) dock_status_bar_->setVisible(false);
+ if (chat_bubble_) chat_bubble_->setVisible(false);
+}
+
+void MainWindow::on_terminal_unlocked() {
+ auto& auth = auth::AuthManager::instance();
+ LOG_INFO("MainWindow", "Terminal unlocked via PIN");
+
+ // Enable/restart inactivity guard
+ auto& guard = auth::InactivityGuard::instance();
+ if (!guard.is_enabled()) {
+ qApp->installEventFilter(&guard);
+ guard.set_enabled(true);
+ }
+ guard.reset_timer();
+
+ // Reset PIN lockout on successful unlock
+ auth::PinManager::instance().reset_lockout();
+
+ if (auth.session().has_paid_plan()) {
+ stack_->setCurrentIndex(1);
+ // Restore toolbar/statusbar
+ if (dock_toolbar_) dock_toolbar_->setVisible(!focus_mode_ && !chat_mode_);
+ if (dock_status_bar_) dock_status_bar_->setVisible(!focus_mode_ && !chat_mode_);
+ // Restore chat bubble based on setting
+ if (chat_bubble_) {
+ auto r = SettingsRepository::instance().get("appearance.show_chat_bubble");
+ bool show = !r.is_ok() || r.value() != "false";
+ chat_bubble_->setVisible(show);
+ if (show) { chat_bubble_->reposition(); chat_bubble_->raise(); }
+ }
+ WorkspaceManager::instance().load_last_workspace();
+ QTimer::singleShot(3000, this, []() {
+ services::UpdateService::instance().check_for_updates(true);
+ });
+ } else {
+ // Free/no plan → pricing gate
+ stack_->setCurrentIndex(0);
+ auth_stack_->setCurrentIndex(3);
+ }
+
+ emit auth.terminal_unlocked();
+}
+
+void MainWindow::update_window_title() {
+ QString title = "Fincept Terminal";
+
+ const QString profile = ProfileManager::instance().active();
+ if (profile != "default")
+ title += QString(" [%1]").arg(profile);
+
+ if (WorkspaceManager::instance().has_current_workspace()) {
+ const QString ws = WorkspaceManager::instance().current_workspace_name();
+ if (!ws.isEmpty())
+ title += QString(" — %1").arg(ws);
+ }
+
+ if (dock_router_) {
+ const QString id = dock_router_->current_screen_id();
+ if (!id.isEmpty())
+ title += QString(" — %1").arg(DockScreenRouter::title_for_id(id));
+ }
+
+ setWindowTitle(title);
+}
+
void MainWindow::closeEvent(QCloseEvent* event) {
WorkspaceManager::instance().save_workspace();
SessionManager::instance().save_geometry(window_id_, saveGeometry(), saveState());
diff --git a/fincept-qt/src/app/MainWindow.h b/fincept-qt/src/app/MainWindow.h
index 2445eda50..49174809c 100644
--- a/fincept-qt/src/app/MainWindow.h
+++ b/fincept-qt/src/app/MainWindow.h
@@ -11,6 +11,7 @@ namespace ads { class CDockManager; }
namespace fincept { class DockScreenRouter; }
namespace fincept::ui { class DockToolBar; class DockStatusBar; class TabBar; }
namespace fincept::chat_mode { class ChatModeScreen; }
+namespace fincept::screens { class LockScreen; }
namespace fincept {
@@ -53,6 +54,9 @@ class MainWindow : public QMainWindow {
// Chat mode
chat_mode::ChatModeScreen* chat_mode_screen_ = nullptr;
+ // Lock/PIN screen
+ screens::LockScreen* lock_screen_ = nullptr;
+
void setup_auth_screens();
void setup_app_screens();
void setup_docking_mode();
@@ -60,6 +64,9 @@ class MainWindow : public QMainWindow {
void setup_navigation();
void on_auth_state_changed();
void toggle_chat_mode();
+ void show_lock_screen();
+ void on_terminal_unlocked();
+ void update_window_title();
// 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 88e08a459..17d809067 100644
--- a/fincept-qt/src/app/main.cpp
+++ b/fincept-qt/src/app/main.cpp
@@ -1,10 +1,13 @@
#include "app/MainWindow.h"
#include "auth/AuthManager.h"
+#include "auth/InactivityGuard.h"
+#include "auth/PinManager.h"
#include "auth/SessionGuard.h"
#include "core/config/AppConfig.h"
#include "core/config/AppPaths.h"
#include "core/config/ProfileManager.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "core/session/SessionManager.h"
#include "mcp/McpInit.h"
#include "network/http/HttpClient.h"
@@ -24,6 +27,7 @@
#include <QDir>
#include <QFile>
#include <QLockFile>
+#include <QUuid>
#include <QSqlDatabase>
#include <QSqlQuery>
#include <QStandardPaths>
@@ -179,6 +183,8 @@ int main(int argc, char* argv[]) {
fincept::register_migration_v011();
fincept::register_migration_v012();
fincept::register_migration_v013();
+ fincept::register_migration_v014();
+ fincept::register_migration_v015();
// Open main database
QString db_path = fincept::AppPaths::data() + "/fincept.db";
@@ -229,6 +235,14 @@ int main(int argc, char* argv[]) {
LOG_WARN("App", "Cache DB failed (non-fatal): " + QString::fromStdString(cache_result.error()));
}
+ // Assign a unique session ID so ScreenStateManager can tag each state write.
+ // This lets us distinguish cross-session restores from same-session saves.
+ {
+ const QString sid = QUuid::createUuid().toString(QUuid::WithoutBraces);
+ fincept::ScreenStateManager::instance().set_session_id(sid);
+ LOG_INFO("App", "Session ID: " + sid);
+ }
+
LOG_INFO("App", "Checking settings for legacy migration...");
// One-time migration: copy settings from old DB (Local\FinceptTerminal\fincept_settings.db)
// to new DB (Roaming\Fincept\FinceptTerminal\fincept.db) if the new DB has no settings yet.
@@ -276,6 +290,23 @@ int main(int argc, char* argv[]) {
// Session guard — auto-logout on 401
fincept::auth::SessionGuard session_guard;
+ // Initialize PinManager — loads PIN state from SecureStorage
+ (void)fincept::auth::PinManager::instance();
+
+ // Inactivity guard — auto-lock after idle timeout.
+ // Load timeout setting from DB (default 10 minutes).
+ {
+ auto& guard = fincept::auth::InactivityGuard::instance();
+ auto timeout_r = fincept::SettingsRepository::instance().get("security.lock_timeout_minutes");
+ if (timeout_r.is_ok() && !timeout_r.value().isEmpty()) {
+ int minutes = timeout_r.value().toInt();
+ if (minutes > 0)
+ guard.set_timeout_minutes(minutes);
+ }
+ // Guard is installed on qApp and enabled by MainWindow::on_terminal_unlocked()
+ // after the user successfully enters their PIN.
+ }
+
// Initialize MCP tool system — registers all internal tools and starts
// external MCP servers in the background (non-blocking).
fincept::mcp::initialize_all_tools();
diff --git a/fincept-qt/src/auth/AuthManager.cpp b/fincept-qt/src/auth/AuthManager.cpp
index 3cbd02180..f9303247b 100644
--- a/fincept-qt/src/auth/AuthManager.cpp
+++ b/fincept-qt/src/auth/AuthManager.cpp
@@ -1,6 +1,7 @@
#include "auth/AuthManager.h"
#include "auth/AuthApi.h"
+#include "auth/PinManager.h"
#include "auth/UserApi.h"
#include "core/logging/Logger.h"
#include "network/http/HttpClient.h"
@@ -111,10 +112,17 @@ void AuthManager::clear_session() {
fincept::SettingsRepository::instance().remove("fincept_api_key");
fincept::SecureStorage::instance().remove("api_key");
+ // Clear PIN and lockout state on logout — user must set up again after re-login
+ PinManager::instance().clear_pin();
+
// Clear auto-configured fincept LLM provider and reset LlmService
LlmConfigRepository::instance().delete_provider("fincept");
}
+bool AuthManager::needs_pin_setup() const {
+ return session_.authenticated && !PinManager::instance().has_pin();
+}
+
// ── Initialize ───────────────────────────────────────────────────────────────
void AuthManager::initialize() {
@@ -484,25 +492,37 @@ void AuthManager::auto_configure_fincept_llm() {
if (session_.api_key.isEmpty())
return;
- // Store API key in settings for fallback access
+ // Always store API key in settings — LlmService resolves it at runtime
fincept::SettingsRepository::instance().set("fincept_api_key", session_.api_key, "auth");
- // Save/update fincept as an LLM provider (api_key left empty — resolved from
- // SettingsRepository at runtime by LlmService::ensure_config())
- LlmConfig fincept_llm;
- fincept_llm.provider = "fincept";
- fincept_llm.model = "fincept-llm";
- fincept_llm.base_url = "https://api.fincept.in/research/llm";
+ // Only create the fincept provider row if it doesn't already exist.
+ // This prevents overwriting the user's model/settings choice on every
+ // session revalidation (~30s interval).
+ auto providers = LlmConfigRepository::instance().list_providers();
+ bool fincept_exists = false;
+ if (providers.is_ok()) {
+ for (const auto& p : providers.value()) {
+ if (p.provider.toLower() == "fincept") {
+ fincept_exists = true;
+ break;
+ }
+ }
+ }
- LlmConfigRepository::instance().save_provider(fincept_llm);
+ if (!fincept_exists) {
+ LlmConfig fincept_llm;
+ fincept_llm.provider = "fincept";
+ fincept_llm.model = "MiniMax-M2.7";
+ fincept_llm.base_url = {};
+ LlmConfigRepository::instance().save_provider(fincept_llm);
+ LOG_INFO("Auth", "Created fincept LLM provider config");
+ }
- // Set as active if no other provider is configured
+ // Set as active if no other provider is currently active
auto active = LlmConfigRepository::instance().get_active_provider();
bool has_active = active.is_ok() && !active.value().provider.isEmpty();
if (!has_active)
LlmConfigRepository::instance().set_active("fincept");
-
- LOG_INFO("Auth", "Fincept LLM auto-configured with session API key");
}
} // namespace fincept::auth
diff --git a/fincept-qt/src/auth/AuthManager.h b/fincept-qt/src/auth/AuthManager.h
index c0e64614f..371d58c31 100644
--- a/fincept-qt/src/auth/AuthManager.h
+++ b/fincept-qt/src/auth/AuthManager.h
@@ -32,6 +32,9 @@ class AuthManager : public QObject {
void refresh_user_data();
void attempt_session_recovery(std::function<void(bool)> cb);
+ /// True if user needs to set up a PIN (authenticated but no PIN configured).
+ bool needs_pin_setup() const;
+
signals:
void auth_state_changed();
void login_succeeded();
@@ -53,6 +56,12 @@ class AuthManager : public QObject {
void loading_changed(bool loading);
void subscription_fetched();
+ /// Emitted after successful login when PIN setup is needed.
+ void pin_setup_required();
+
+ /// Emitted after login + PIN verify (or setup) — terminal is fully unlocked.
+ void terminal_unlocked();
+
private:
AuthManager();
diff --git a/fincept-qt/src/auth/InactivityGuard.cpp b/fincept-qt/src/auth/InactivityGuard.cpp
new file mode 100644
index 000000000..7bdf40ef4
--- /dev/null
+++ b/fincept-qt/src/auth/InactivityGuard.cpp
@@ -0,0 +1,74 @@
+#include "auth/InactivityGuard.h"
+
+#include "core/logging/Logger.h"
+
+#include <QEvent>
+
+namespace fincept::auth {
+
+InactivityGuard& InactivityGuard::instance() {
+ static InactivityGuard s;
+ return s;
+}
+
+InactivityGuard::InactivityGuard() : QObject(nullptr) {
+ timer_ = new QTimer(this);
+ timer_->setSingleShot(true);
+ timer_->setInterval(10 * 60 * 1000); // 10 minutes default
+
+ connect(timer_, &QTimer::timeout, this, [this]() {
+ if (enabled_) {
+ LOG_INFO("Auth", "Inactivity timeout — requesting lock");
+ emit lock_requested();
+ }
+ });
+}
+
+void InactivityGuard::set_enabled(bool enabled) {
+ enabled_ = enabled;
+ if (enabled) {
+ timer_->start();
+ LOG_INFO("Auth", QString("Inactivity guard enabled (%1 min timeout)")
+ .arg(timeout_minutes()));
+ } else {
+ timer_->stop();
+ LOG_INFO("Auth", "Inactivity guard disabled");
+ }
+}
+
+void InactivityGuard::set_timeout_minutes(int minutes) {
+ minutes = qBound(1, minutes, 60);
+ timer_->setInterval(minutes * 60 * 1000);
+ if (enabled_ && !timer_->isActive())
+ timer_->start();
+}
+
+int InactivityGuard::timeout_minutes() const {
+ return timer_->interval() / 60000;
+}
+
+void InactivityGuard::reset_timer() {
+ if (enabled_ && timer_)
+ timer_->start(); // restart from full interval
+}
+
+bool InactivityGuard::eventFilter(QObject* obj, QEvent* event) {
+ if (enabled_) {
+ switch (event->type()) {
+ case QEvent::MouseMove:
+ case QEvent::MouseButtonPress:
+ case QEvent::MouseButtonRelease:
+ case QEvent::KeyPress:
+ case QEvent::KeyRelease:
+ case QEvent::Wheel:
+ case QEvent::TouchBegin:
+ timer_->start(); // reset on any user interaction
+ break;
+ default:
+ break;
+ }
+ }
+ return QObject::eventFilter(obj, event);
+}
+
+} // namespace fincept::auth
diff --git a/fincept-qt/src/auth/InactivityGuard.h b/fincept-qt/src/auth/InactivityGuard.h
new file mode 100644
index 000000000..5a19ace57
--- /dev/null
+++ b/fincept-qt/src/auth/InactivityGuard.h
@@ -0,0 +1,46 @@
+#pragma once
+#include <QObject>
+#include <QTimer>
+
+class QEvent;
+
+namespace fincept::auth {
+
+/// Global event filter that monitors user activity (mouse/keyboard) and
+/// emits lock_requested() after a configurable idle timeout.
+///
+/// Install on QApplication: qApp->installEventFilter(&InactivityGuard::instance())
+///
+/// Default timeout: 10 minutes. Configurable via set_timeout_minutes().
+/// Timer only runs when enabled (call set_enabled(true) after PIN is configured).
+class InactivityGuard : public QObject {
+ Q_OBJECT
+ public:
+ static InactivityGuard& instance();
+
+ /// Start monitoring user activity. Call after PIN setup is complete.
+ void set_enabled(bool enabled);
+ bool is_enabled() const { return enabled_; }
+
+ /// Set idle timeout in minutes. Minimum 1, maximum 60. Default 10.
+ void set_timeout_minutes(int minutes);
+ int timeout_minutes() const;
+
+ /// Reset the inactivity timer (called internally on user activity).
+ void reset_timer();
+
+ signals:
+ /// Emitted when the idle timeout expires — MainWindow should show lock screen.
+ void lock_requested();
+
+ protected:
+ bool eventFilter(QObject* obj, QEvent* event) override;
+
+ private:
+ InactivityGuard();
+
+ QTimer* timer_ = nullptr;
+ bool enabled_ = false;
+};
+
+} // namespace fincept::auth
diff --git a/fincept-qt/src/auth/PinManager.cpp b/fincept-qt/src/auth/PinManager.cpp
new file mode 100644
index 000000000..e91714026
--- /dev/null
+++ b/fincept-qt/src/auth/PinManager.cpp
@@ -0,0 +1,261 @@
+#include "auth/PinManager.h"
+
+#include "core/logging/Logger.h"
+#include "storage/secure/SecureStorage.h"
+
+#include <QCryptographicHash>
+#include <QRandomGenerator>
+
+namespace fincept::auth {
+
+PinManager& PinManager::instance() {
+ static PinManager s;
+ return s;
+}
+
+PinManager::PinManager() {
+ load_state();
+ load_lockout_state();
+}
+
+// ── HMAC-SHA256 (manual, no QMessageAuthenticationCode dependency) ──────────
+// RFC 2104: HMAC(K, m) = H((K' ^ opad) || H((K' ^ ipad) || m))
+
+static QByteArray hmac_sha256(const QByteArray& key, const QByteArray& message) {
+ static constexpr int kBlockSize = 64; // SHA-256 block size
+
+ // Step 1: Normalize key length
+ QByteArray k = key;
+ if (k.size() > kBlockSize)
+ k = QCryptographicHash::hash(k, QCryptographicHash::Sha256);
+ while (k.size() < kBlockSize)
+ k.append('\0');
+
+ // Step 2: Create inner/outer padded keys
+ QByteArray ipad(kBlockSize, '\0');
+ QByteArray opad(kBlockSize, '\0');
+ for (int i = 0; i < kBlockSize; ++i) {
+ ipad[i] = static_cast<char>(k[i] ^ 0x36);
+ opad[i] = static_cast<char>(k[i] ^ 0x5C);
+ }
+
+ // Step 3: Inner hash — H(ipad || message)
+ QCryptographicHash inner(QCryptographicHash::Sha256);
+ inner.addData(ipad);
+ inner.addData(message);
+ QByteArray inner_hash = inner.result();
+
+ // Step 4: Outer hash — H(opad || inner_hash)
+ QCryptographicHash outer(QCryptographicHash::Sha256);
+ outer.addData(opad);
+ outer.addData(inner_hash);
+ return outer.result();
+}
+
+// ── PBKDF2-SHA256 key derivation ────────────────────────────────────────────
+// RFC 2898 Section 5.2 — PBKDF2 with PRF = HMAC-SHA256.
+
+QByteArray PinManager::derive_key(const QString& pin, const QByteArray& salt) const {
+ const QByteArray password = pin.toUtf8();
+
+ // Only need 1 block for 32-byte output
+ // U_1 = PRF(Password, Salt || INT_32_BE(1))
+ QByteArray salt_block = salt;
+ salt_block.append('\0'); // block index 1 = 0x00000001
+ salt_block.append('\0');
+ salt_block.append('\0');
+ salt_block.append('\x01');
+
+ QByteArray u = hmac_sha256(password, salt_block);
+ QByteArray t = u;
+
+ for (int iter = 1; iter < kIterations; ++iter) {
+ u = hmac_sha256(password, u);
+ for (int j = 0; j < t.size(); ++j)
+ t[j] = static_cast<char>(t[j] ^ u[j]);
+ }
+
+ return t.left(kHashLength);
+}
+
+// ── State persistence ───────────────────────────────────────────────────────
+
+void PinManager::load_state() {
+ auto& ss = SecureStorage::instance();
+
+ auto hash_r = ss.retrieve("pin_hash");
+ auto salt_r = ss.retrieve("pin_salt");
+
+ if (hash_r.is_ok() && salt_r.is_ok() &&
+ !hash_r.value().isEmpty() && !salt_r.value().isEmpty()) {
+ stored_hash_ = QByteArray::fromHex(hash_r.value().toUtf8());
+ stored_salt_ = QByteArray::fromHex(salt_r.value().toUtf8());
+ has_pin_ = true;
+ } else {
+ has_pin_ = false;
+ stored_hash_.clear();
+ stored_salt_.clear();
+ }
+}
+
+void PinManager::save_lockout_state() {
+ auto& ss = SecureStorage::instance();
+ ss.store("pin_failed_attempts", QString::number(failed_attempts_));
+ if (lockout_until_.isValid())
+ ss.store("pin_lockout_until", lockout_until_.toString(Qt::ISODate));
+ else
+ ss.remove("pin_lockout_until");
+}
+
+void PinManager::load_lockout_state() {
+ auto& ss = SecureStorage::instance();
+
+ auto attempts_r = ss.retrieve("pin_failed_attempts");
+ if (attempts_r.is_ok() && !attempts_r.value().isEmpty())
+ failed_attempts_ = attempts_r.value().toInt();
+
+ auto lockout_r = ss.retrieve("pin_lockout_until");
+ if (lockout_r.is_ok() && !lockout_r.value().isEmpty()) {
+ lockout_until_ = QDateTime::fromString(lockout_r.value(), Qt::ISODate);
+ // Clear expired lockout
+ if (lockout_until_.isValid() && lockout_until_ <= QDateTime::currentDateTime())
+ lockout_until_ = QDateTime();
+ }
+}
+
+// ── Public API ──────────────────────────────────────────────────────────────
+
+bool PinManager::has_pin() const {
+ return has_pin_;
+}
+
+Result<void> PinManager::set_pin(const QString& pin) {
+ if (pin.length() != 6)
+ return Result<void>::err("PIN must be exactly 6 digits");
+
+ // Validate all digits
+ for (const QChar& c : pin) {
+ if (!c.isDigit())
+ return Result<void>::err("PIN must contain only digits");
+ }
+
+ // Generate cryptographically random salt
+ QByteArray salt(kSaltLength, '\0');
+ QRandomGenerator* rng = QRandomGenerator::system();
+ for (int i = 0; i < kSaltLength; ++i)
+ salt[i] = static_cast<char>(rng->bounded(256));
+
+ // Derive key
+ QByteArray hash = derive_key(pin, salt);
+
+ // Store in SecureStorage
+ auto& ss = SecureStorage::instance();
+ auto r1 = ss.store("pin_hash", QString::fromUtf8(hash.toHex()));
+ if (r1.is_err())
+ return Result<void>::err("Failed to store PIN hash: " + r1.error());
+
+ auto r2 = ss.store("pin_salt", QString::fromUtf8(salt.toHex()));
+ if (r2.is_err())
+ return Result<void>::err("Failed to store PIN salt: " + r2.error());
+
+ // Update cached state
+ stored_hash_ = hash;
+ stored_salt_ = salt;
+ has_pin_ = true;
+
+ // Reset lockout on new PIN
+ failed_attempts_ = 0;
+ lockout_until_ = QDateTime();
+ save_lockout_state();
+
+ LOG_INFO("Auth", "PIN configured successfully");
+ return Result<void>::ok();
+}
+
+bool PinManager::verify_pin(const QString& pin) {
+ if (!has_pin_)
+ return false;
+
+ // Check lockout
+ if (is_locked_out())
+ return false;
+
+ // Check max attempts — require full re-auth
+ if (failed_attempts_ >= kMaxAttempts) {
+ emit max_attempts_exceeded();
+ return false;
+ }
+
+ // Derive and compare
+ QByteArray derived = derive_key(pin, stored_salt_);
+
+ if (derived == stored_hash_) {
+ // Success — reset lockout
+ failed_attempts_ = 0;
+ lockout_until_ = QDateTime();
+ save_lockout_state();
+ LOG_INFO("Auth", "PIN verified successfully");
+ return true;
+ }
+
+ // Failed attempt
+ failed_attempts_++;
+ LOG_WARN("Auth", QString("PIN verification failed (attempt %1/%2)")
+ .arg(failed_attempts_).arg(kMaxAttempts));
+
+ if (failed_attempts_ >= kMaxAttempts) {
+ // Permanent lockout — require server re-auth
+ save_lockout_state();
+ emit max_attempts_exceeded();
+ emit lockout_changed(true, 0);
+ return false;
+ }
+
+ // Apply timed lockout
+ int tier = qMin(failed_attempts_ - 1, static_cast<int>(kLockoutTiers.size()) - 1);
+ int lockout_secs = kLockoutTiers[static_cast<size_t>(tier)];
+ lockout_until_ = QDateTime::currentDateTime().addSecs(lockout_secs);
+ save_lockout_state();
+
+ emit lockout_changed(true, lockout_secs);
+ return false;
+}
+
+void PinManager::clear_pin() {
+ auto& ss = SecureStorage::instance();
+ ss.remove("pin_hash");
+ ss.remove("pin_salt");
+ ss.remove("pin_failed_attempts");
+ ss.remove("pin_lockout_until");
+
+ stored_hash_.clear();
+ stored_salt_.clear();
+ has_pin_ = false;
+ failed_attempts_ = 0;
+ lockout_until_ = QDateTime();
+
+ LOG_INFO("Auth", "PIN cleared");
+}
+
+bool PinManager::is_locked_out() const {
+ if (!lockout_until_.isValid())
+ return false;
+ return QDateTime::currentDateTime() < lockout_until_;
+}
+
+int PinManager::lockout_remaining_seconds() const {
+ if (!lockout_until_.isValid())
+ return 0;
+ int secs = static_cast<int>(QDateTime::currentDateTime().secsTo(lockout_until_));
+ return qMax(0, secs);
+}
+
+void PinManager::reset_lockout() {
+ failed_attempts_ = 0;
+ lockout_until_ = QDateTime();
+ save_lockout_state();
+ emit lockout_changed(false, 0);
+ LOG_INFO("Auth", "PIN lockout reset after re-authentication");
+}
+
+} // namespace fincept::auth
diff --git a/fincept-qt/src/auth/PinManager.h b/fincept-qt/src/auth/PinManager.h
new file mode 100644
index 000000000..4bbe1cbe3
--- /dev/null
+++ b/fincept-qt/src/auth/PinManager.h
@@ -0,0 +1,84 @@
+#pragma once
+#include "core/result/Result.h"
+
+#include <QObject>
+#include <QDateTime>
+#include <QString>
+
+#include <array>
+
+namespace fincept::auth {
+
+/// Manages local PIN authentication — hashing, verification, and lockout.
+///
+/// PIN is hashed with PBKDF2-SHA256 (100k iterations, 32-byte salt) and stored
+/// in OS-native SecureStorage (DPAPI / Keychain). A lockout mechanism enforces
+/// exponential backoff after failed attempts (30s, 60s, 5min, 15min, then
+/// requires full server re-authentication).
+class PinManager : public QObject {
+ Q_OBJECT
+ public:
+ static PinManager& instance();
+
+ /// True if user has configured a PIN (hash exists in SecureStorage).
+ bool has_pin() const;
+
+ /// Set or update the PIN. Returns error if hash/storage fails.
+ Result<void> set_pin(const QString& pin);
+
+ /// Verify a PIN attempt. On failure increments attempt counter and
+ /// may trigger lockout. Returns true on match.
+ bool verify_pin(const QString& pin);
+
+ /// Remove stored PIN (e.g. on logout or account reset).
+ void clear_pin();
+
+ /// Current lockout state.
+ bool is_locked_out() const;
+
+ /// Seconds remaining until lockout expires. 0 if not locked.
+ int lockout_remaining_seconds() const;
+
+ /// Number of consecutive failed attempts.
+ int failed_attempts() const { return failed_attempts_; }
+
+ /// Max attempts before permanent lockout (requires server re-auth).
+ static constexpr int kMaxAttempts = 5;
+
+ /// Reset lockout state (called after successful server re-auth).
+ void reset_lockout();
+
+ signals:
+ /// Emitted when lockout state changes.
+ void lockout_changed(bool locked, int remaining_seconds);
+
+ /// Emitted when max attempts exceeded — requires full re-login.
+ void max_attempts_exceeded();
+
+ private:
+ PinManager();
+
+ // PBKDF2-SHA256 parameters
+ static constexpr int kIterations = 100000;
+ static constexpr int kSaltLength = 32;
+ static constexpr int kHashLength = 32;
+
+ // Lockout durations (seconds) per attempt tier
+ static constexpr std::array<int, 4> kLockoutTiers = {30, 60, 300, 900};
+
+ QByteArray derive_key(const QString& pin, const QByteArray& salt) const;
+
+ int failed_attempts_ = 0;
+ QDateTime lockout_until_;
+
+ // Cached state loaded from SecureStorage
+ bool has_pin_ = false;
+ QByteArray stored_hash_;
+ QByteArray stored_salt_;
+
+ void load_state();
+ void save_lockout_state();
+ void load_lockout_state();
+};
+
+} // namespace fincept::auth
diff --git a/fincept-qt/src/core/session/ScreenStateManager.cpp b/fincept-qt/src/core/session/ScreenStateManager.cpp
new file mode 100644
index 000000000..90e3e1086
--- /dev/null
+++ b/fincept-qt/src/core/session/ScreenStateManager.cpp
@@ -0,0 +1,160 @@
+#include "core/session/ScreenStateManager.h"
+
+#include "core/logging/Logger.h"
+#include "screens/IStatefulScreen.h"
+#include "storage/cache/TabSessionStore.h"
+
+#include <QJsonObject>
+#include <QTimer>
+#include <QtConcurrent/QtConcurrent>
+
+namespace fincept {
+
+// ── Singleton ────────────────────────────────────────────────────────────────
+
+ScreenStateManager& ScreenStateManager::instance() {
+ static ScreenStateManager s;
+ return s;
+}
+
+ScreenStateManager::ScreenStateManager(QObject* parent)
+ : QObject(parent) {
+ debounce_timer_ = new QTimer(this);
+ debounce_timer_->setSingleShot(true);
+ debounce_timer_->setInterval(500); // 500 ms quiet period before flush
+ connect(debounce_timer_, &QTimer::timeout, this, &ScreenStateManager::flush_pending);
+}
+
+// ── Session ID ───────────────────────────────────────────────────────────────
+
+void ScreenStateManager::set_session_id(const QString& id) {
+ session_id_ = id;
+}
+
+QString ScreenStateManager::session_id() const {
+ return session_id_;
+}
+
+// ── Restore ──────────────────────────────────────────────────────────────────
+
+void ScreenStateManager::restore(screens::IStatefulScreen* screen) {
+ if (!screen) return;
+
+ const QString key = screen->state_key();
+ const int expected = screen->state_version();
+
+ auto result = TabSessionStore::instance().load_screen_state(key, expected);
+ if (result.is_err()) {
+ LOG_WARN("ScreenState", "Failed to load state for '" + key + "': "
+ + QString::fromStdString(result.error()));
+ return;
+ }
+
+ const QJsonObject obj = result.value();
+ if (obj.isEmpty()) {
+ LOG_DEBUG("ScreenState", "No saved state for: " + key);
+ return; // nothing stored yet or version mismatch — screen keeps defaults
+ }
+
+ // Convert QJsonObject → QVariantMap for IStatefulScreen
+ QVariantMap state_map;
+ for (auto it = obj.constBegin(); it != obj.constEnd(); ++it)
+ state_map.insert(it.key(), it.value().toVariant());
+
+ screen->restore_state(state_map);
+ LOG_DEBUG("ScreenState", "Restored state for: " + key);
+}
+
+// ── Save now (async, fire-and-forget) ────────────────────────────────────────
+
+void ScreenStateManager::save_now(screens::IStatefulScreen* screen) {
+ if (!screen) return;
+
+ const QString key = screen->state_key();
+ const QVariantMap state = screen->save_state();
+ const int version = screen->state_version();
+ const QString sid = session_id_;
+
+ // Remove from pending so the debounce timer doesn't double-write.
+ pending_saves_.remove(key);
+
+ write_async(key, state, version, sid);
+ LOG_DEBUG("ScreenState", "save_now dispatched for: " + key);
+}
+
+// ── Notify changed (debounced) ───────────────────────────────────────────────
+
+void ScreenStateManager::notify_changed(screens::IStatefulScreen* screen) {
+ if (!screen) return;
+ pending_saves_.insert(screen->state_key(), screen);
+ debounce_timer_->start(); // restart — resets the 500 ms window
+}
+
+// ── Direct save/load (for screens that can't implement IStatefulScreen) ──────
+
+void ScreenStateManager::save_direct(const QString& key,
+ const QVariantMap& state,
+ int version) {
+ write_async(key, state, version, session_id_);
+}
+
+QVariantMap ScreenStateManager::load_direct(const QString& key, int expected_version) {
+ auto result = TabSessionStore::instance().load_screen_state(key, expected_version);
+ if (result.is_err() || result.value().isEmpty())
+ return {};
+
+ const QJsonObject obj = result.value();
+ QVariantMap map;
+ for (auto it = obj.constBegin(); it != obj.constEnd(); ++it)
+ map.insert(it.key(), it.value().toVariant());
+ return map;
+}
+
+// ── Private: flush pending ───────────────────────────────────────────────────
+
+void ScreenStateManager::flush_pending() {
+ if (pending_saves_.isEmpty()) return;
+
+ // Snapshot and clear immediately so new notify_changed() calls during
+ // the async write don't get cleared by a later flush.
+ const auto snapshot = pending_saves_;
+ pending_saves_.clear();
+
+ for (auto it = snapshot.constBegin(); it != snapshot.constEnd(); ++it) {
+ screens::IStatefulScreen* screen = it.value();
+ if (!screen) continue;
+
+ const QString key = screen->state_key();
+ const QVariantMap state = screen->save_state();
+ const int version = screen->state_version();
+ const QString sid = session_id_;
+
+ write_async(key, state, version, sid);
+ }
+ LOG_DEBUG("ScreenState", QString("Flushed %1 pending screen states").arg(snapshot.size()));
+}
+
+// ── Private static: async SQLite write ───────────────────────────────────────
+
+void ScreenStateManager::write_async(const QString& key,
+ const QVariantMap& state,
+ int version,
+ const QString& session_id) {
+ // Capture by value — no raw 'this', no widget pointers (P8 compliant).
+ QtConcurrent::run([key, state, version, session_id]() {
+ // Convert QVariantMap → QJsonObject
+ QJsonObject obj;
+ for (auto it = state.constBegin(); it != state.constEnd(); ++it)
+ obj.insert(it.key(), QJsonValue::fromVariant(it.value()));
+
+ auto r = TabSessionStore::instance().save_screen_state(
+ key, obj, version, session_id);
+
+ if (r.is_err()) {
+ LOG_WARN("ScreenState", "Write failed for '" + key + "': "
+ + QString::fromStdString(r.error()));
+ }
+ });
+}
+
+} // namespace fincept
diff --git a/fincept-qt/src/core/session/ScreenStateManager.h b/fincept-qt/src/core/session/ScreenStateManager.h
new file mode 100644
index 000000000..8327c38da
--- /dev/null
+++ b/fincept-qt/src/core/session/ScreenStateManager.h
@@ -0,0 +1,75 @@
+#pragma once
+#include <QHash>
+#include <QObject>
+#include <QPointer>
+
+// Forward declare to avoid including the full screen header here.
+namespace fincept::screens {
+class IStatefulScreen;
+}
+
+namespace fincept {
+
+/// Central coordinator for screen UI state persistence.
+///
+/// Screens call notify_changed() whenever significant UI state changes
+/// (tab switched, filter applied, scroll moved). This class debounces rapid
+/// changes and async-writes to cache.db's screen_state table via TabSessionStore.
+///
+/// DockScreenRouter calls save_now() on screen hide and restore() after a
+/// screen is first materialized.
+///
+/// All writes are non-blocking: they are dispatched via QtConcurrent::run()
+/// so the UI thread is never stalled waiting on SQLite.
+class ScreenStateManager : public QObject {
+ Q_OBJECT
+public:
+ static ScreenStateManager& instance();
+
+ /// Set the session ID written alongside each state record.
+ /// Call this once at startup before any screens are shown.
+ void set_session_id(const QString& id);
+ QString session_id() const;
+
+ /// Load persisted state from cache.db and call screen->restore_state().
+ /// Called by DockScreenRouter immediately after a screen is materialized.
+ /// No-op if cache.db is unavailable or no state is stored yet.
+ void restore(screens::IStatefulScreen* screen);
+
+ /// Immediately flush the screen's current state to cache.db.
+ /// Called by DockScreenRouter on visibilityChanged(false).
+ /// The write is dispatched asynchronously — this call returns immediately.
+ void save_now(screens::IStatefulScreen* screen);
+
+ /// Mark this screen as having pending state changes.
+ /// Coalesces rapid calls; a single async write fires after a 500 ms quiet period.
+ /// Safe to call from any connected signal (tab changed, filter changed, etc.).
+ void notify_changed(screens::IStatefulScreen* screen);
+
+ /// Direct save for screens that cannot implement IStatefulScreen due to
+ /// conflicting save_state() signatures (e.g. IWorkspaceParticipant).
+ /// Call from hideEvent() or on significant state changes.
+ void save_direct(const QString& key, const QVariantMap& state, int version = 1);
+
+ /// Direct load for screens that cannot implement IStatefulScreen.
+ /// Returns empty map if nothing stored or version mismatch.
+ QVariantMap load_direct(const QString& key, int expected_version = 1);
+
+private:
+ explicit ScreenStateManager(QObject* parent = nullptr);
+
+ /// Flush all screens in pending_saves_ to cache.db.
+ void flush_pending();
+
+ /// Perform the actual async SQLite write for one screen.
+ static void write_async(const QString& key,
+ const QVariantMap& state,
+ int version,
+ const QString& session_id);
+
+ QHash<QString, screens::IStatefulScreen*> pending_saves_; // key → screen ptr
+ QTimer* debounce_timer_ = nullptr;
+ QString session_id_;
+};
+
+} // namespace fincept
diff --git a/fincept-qt/src/python/PythonRunner.cpp b/fincept-qt/src/python/PythonRunner.cpp
index 19d04c416..0ab0d14fc 100644
--- a/fincept-qt/src/python/PythonRunner.cpp
+++ b/fincept-qt/src/python/PythonRunner.cpp
@@ -8,6 +8,7 @@
#include <QDir>
#include <QFile>
#include <QFileInfo>
+#include <QHash>
#include <QProcessEnvironment>
#include <QStandardPaths>
@@ -24,15 +25,19 @@ PythonRunner& PythonRunner::instance() {
}
PythonRunner::PythonRunner() {
- python_path_ = find_python();
scripts_dir_ = find_scripts_dir();
+ LOG_INFO("Python", "Scripts: " + scripts_dir_);
- if (python_path_.isEmpty()) {
- LOG_WARN("Python", "No Python interpreter found");
- } else {
+ // Try fast, non-blocking venv detection first
+ python_path_ = find_python_sync();
+
+ if (!python_path_.isEmpty()) {
+ python_init_done_ = true;
LOG_INFO("Python", "Python: " + python_path_);
+ } else {
+ // System python detection requires a process spawn — do it async
+ find_python_async();
}
- LOG_INFO("Python", "Scripts: " + scripts_dir_);
}
bool PythonRunner::is_available() const {
@@ -48,7 +53,6 @@ QString PythonRunner::scripts_dir() const {
// ── Venv routing ─────────────────────────────────────────────────────────────
// Routes scripts to the correct venv based on their name.
-// Scripts matching kNumpy1Scripts go to venv-numpy1, all others to venv-numpy2.
static QString select_venv_for_script(const QString& script) {
QString lower = script.toLower();
@@ -62,7 +66,8 @@ static QString select_venv_for_script(const QString& script) {
// ── Find Python ──────────────────────────────────────────────────────────────
-QString PythonRunner::find_python() const {
+// Fast, non-blocking detection: checks only file existence (no process spawns)
+QString PythonRunner::find_python_sync() const {
// 1. Use UV-managed venvs from PythonSetupManager (preferred)
auto& setup = PythonSetupManager::instance();
QString venv2_py = setup.python_path("venv-numpy2");
@@ -90,20 +95,47 @@ QString PythonRunner::find_python() const {
}
}
- // 3. Fallback to system python
+ return {}; // No venv found — need async system python check
+}
+
+// Async detection: spawns `python --version` without blocking the UI thread
+void PythonRunner::find_python_async() {
#ifdef _WIN32
QString sys_python = "python";
#else
QString sys_python = "python3";
#endif
- QProcess test;
- test.start(sys_python, {"--version"});
- if (test.waitForFinished(5000) && test.exitCode() == 0) {
- return sys_python;
- }
+ auto* proc = new QProcess(this);
+
+#ifdef _WIN32
+ proc->setCreateProcessArgumentsModifier([](QProcess::CreateProcessArguments* cpa) {
+ cpa->flags |= 0x08000000; // CREATE_NO_WINDOW
+ });
+#endif
+
+ connect(proc, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this,
+ [this, proc, sys_python](int exit_code, QProcess::ExitStatus) {
+ proc->deleteLater();
+ if (exit_code == 0) {
+ python_path_ = sys_python;
+ LOG_INFO("Python", "System Python found: " + sys_python);
+ } else {
+ LOG_WARN("Python", "No Python interpreter found");
+ }
+ python_init_done_ = true;
- return {};
+ // Drain any requests that were queued while we were detecting
+ start_next();
+ });
+
+ connect(proc, &QProcess::errorOccurred, this, [this, proc](QProcess::ProcessError) {
+ proc->deleteLater();
+ LOG_WARN("Python", "No Python interpreter found (process error)");
+ python_init_done_ = true;
+ });
+
+ proc->start(sys_python, {"--version"});
}
// ── Find Scripts Directory ───────────────────────────────────────────────────
@@ -149,7 +181,7 @@ QString PythonRunner::find_scripts_dir() const {
// ── Run Script ───────────────────────────────────────────────────────────────
void PythonRunner::run(const QString& script, const QStringList& args, Callback cb) {
- if (python_path_.isEmpty()) {
+ if (python_init_done_ && python_path_.isEmpty()) {
cb({false, {}, "Python not available — run first-time setup from the app", -1});
return;
}
@@ -168,7 +200,7 @@ void PythonRunner::run(const QString& script, const QStringList& args, Callback
/// Run arbitrary Python code (for notebook/colab cells).
/// Creates a temp file, executes it, returns output.
void PythonRunner::run_code(const QString& code, Callback cb) {
- if (python_path_.isEmpty()) {
+ if (python_init_done_ && python_path_.isEmpty()) {
cb({false, {}, "Python not available — run first-time setup from the app", -1});
return;
}
@@ -191,8 +223,19 @@ void PythonRunner::run_code(const QString& code, Callback cb) {
}
void PythonRunner::start_next() {
+ // Don't start if Python detection is still in progress
+ if (!python_init_done_)
+ return;
+
while (active_count_ < max_concurrent_ && !queue_.isEmpty()) {
auto req = queue_.dequeue();
+
+ if (python_path_.isEmpty()) {
+ // Python became unavailable — fail the request
+ req.cb({false, {}, "Python not available", -1});
+ continue;
+ }
+
++active_count_;
// Determine if this is inline code or a script file
@@ -223,7 +266,6 @@ void PythonRunner::start_next() {
// If the script is inside a sub-package (contains '/'), use -m <module>
// so Python can resolve relative imports (from .core import ...).
- // Convert "Analytics/economics/trade_geopolitics.py" → "-m Analytics.economics.trade_geopolitics"
if (!is_code && req.script.contains('/')) {
QString module = req.script;
module.remove(".py");
@@ -241,15 +283,10 @@ void PythonRunner::start_next() {
env.insert("PYTHONDONTWRITEBYTECODE", "1");
env.insert("PYTHONUNBUFFERED", "1");
env.insert("FINCEPT_DATA_DIR", PythonSetupManager::instance().install_dir());
- // Add scripts dir to PYTHONPATH so package-relative imports (from .core import ...)
- // work when scripts inside sub-packages are run directly as script files.
+
QString existing_pypath = env.value("PYTHONPATH");
QString new_pypath = scripts_dir_ + (existing_pypath.isEmpty() ? "" : ";" + existing_pypath);
- // For nested packages invoked with -m (e.g. agents/finagent_core/main.py → -m agents.finagent_core.main),
- // the __init__.py may use absolute imports like "from finagent_core.xxx import ...".
- // These need the parent directory of the package on PYTHONPATH.
- // e.g. "from finagent_core.core_agent import ..." needs scripts/agents/ on the path.
if (!is_code && req.script.contains('/')) {
QString script_dir = QFileInfo(scripts_dir_ + "/" + req.script).dir().absolutePath();
QString parent_of_pkg = QFileInfo(script_dir).dir().absolutePath();
@@ -267,15 +304,32 @@ void PythonRunner::start_next() {
});
#endif
+ // Initialize incremental output buffers
+ proc_buffers_[proc] = {};
+
+ // Buffer stdout/stderr incrementally instead of reading all at once on finish
+ connect(proc, &QProcess::readyReadStandardOutput, this, [this, proc]() {
+ proc_buffers_[proc].stdout_buf.append(proc->readAllStandardOutput());
+ });
+ connect(proc, &QProcess::readyReadStandardError, this, [this, proc]() {
+ proc_buffers_[proc].stderr_buf.append(proc->readAllStandardError());
+ });
+
auto cb = std::move(req.cb);
- auto script = req.script;
+ auto script_name = std::move(req.script);
connect(
proc, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this,
- [this, proc, cb, script, is_code, temp_file](int exit_code, QProcess::ExitStatus status) {
- Q_UNUSED(status);
- QString stdout_str = QString::fromUtf8(proc->readAllStandardOutput());
- QString stderr_str = QString::fromUtf8(proc->readAllStandardError());
+ [this, proc, cb = std::move(cb), script_name, is_code, temp_file](int exit_code, QProcess::ExitStatus) {
+ // Collect any remaining buffered data
+ auto& bufs = proc_buffers_[proc];
+ bufs.stdout_buf.append(proc->readAllStandardOutput());
+ bufs.stderr_buf.append(proc->readAllStandardError());
+
+ QString stdout_str = QString::fromUtf8(bufs.stdout_buf);
+ QString stderr_str = QString::fromUtf8(bufs.stderr_buf);
+
+ proc_buffers_.remove(proc);
proc->deleteLater();
// Clean up temp file for inline code
@@ -289,31 +343,31 @@ void PythonRunner::start_next() {
if (is_code) {
// For notebook cells: return raw stdout, not JSON-extracted
result.success = (exit_code == 0);
- result.output = stdout_str;
- result.error = stderr_str;
+ result.output = std::move(stdout_str);
+ result.error = std::move(stderr_str);
} else {
// For scripts: extract JSON from output
QString json_out = extract_json(stdout_str);
result.success = (exit_code == 0 && !json_out.isEmpty());
- result.output = json_out.isEmpty() ? stdout_str : json_out;
- result.error = stderr_str;
+ result.output = json_out.isEmpty() ? std::move(stdout_str) : std::move(json_out);
+ result.error = std::move(stderr_str);
}
if (!result.success && !is_code) {
LOG_ERROR(
"Python",
- QString("Script %1 failed (exit=%2): %3").arg(script).arg(exit_code).arg(stderr_str.left(200)));
+ QString("Script %1 failed (exit=%2): %3").arg(script_name).arg(exit_code).arg(result.error.left(200)));
}
- cb(result);
+ cb(std::move(result));
--active_count_;
start_next(); // drain queue
});
- connect(proc, &QProcess::errorOccurred, this, [this, proc, cb, is_code, temp_file](QProcess::ProcessError err) {
- Q_UNUSED(err);
+ connect(proc, &QProcess::errorOccurred, this, [this, proc, cb, is_code, temp_file](QProcess::ProcessError) {
QString error_msg = proc->errorString();
+ proc_buffers_.remove(proc);
proc->deleteLater();
if (is_code && !temp_file.isEmpty())
QFile::remove(temp_file);
diff --git a/fincept-qt/src/python/PythonRunner.h b/fincept-qt/src/python/PythonRunner.h
index 119d500cf..f9a08bb0a 100644
--- a/fincept-qt/src/python/PythonRunner.h
+++ b/fincept-qt/src/python/PythonRunner.h
@@ -48,12 +48,14 @@ class PythonRunner : public QObject {
private:
PythonRunner();
- QString find_python() const;
+ QString find_python_sync() const;
+ void find_python_async();
QString find_scripts_dir() const;
void start_next();
QString python_path_;
QString scripts_dir_;
+ bool python_init_done_ = false;
// Concurrency limiter
static constexpr int DEFAULT_MAX_CONCURRENT = 3;
@@ -66,6 +68,13 @@ class PythonRunner : public QObject {
Callback cb;
};
QQueue<QueuedRequest> queue_;
+
+ // Incremental output buffering per process
+ struct ProcessBuffers {
+ QByteArray stdout_buf;
+ QByteArray stderr_buf;
+ };
+ QHash<QProcess*, ProcessBuffers> proc_buffers_;
};
/// Extract last JSON line/block from Python output
diff --git a/fincept-qt/src/screens/ComingSoonScreen.cpp b/fincept-qt/src/screens/ComingSoonScreen.cpp
index 39899a748..94b7432b0 100644
--- a/fincept-qt/src/screens/ComingSoonScreen.cpp
+++ b/fincept-qt/src/screens/ComingSoonScreen.cpp
@@ -1,11 +1,12 @@
#include "screens/ComingSoonScreen.h"
+#include "ui/theme/Theme.h"
#include <QVBoxLayout>
namespace fincept::screens {
ComingSoonScreen::ComingSoonScreen(const QString& tab_name, QWidget* parent) : QWidget(parent) {
- setStyleSheet("background:#080808;");
+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
auto* vl = new QVBoxLayout(this);
vl->setAlignment(Qt::AlignCenter);
vl->setSpacing(12);
@@ -17,20 +18,19 @@ ComingSoonScreen::ComingSoonScreen(const QString& tab_name, QWidget* parent) : Q
auto* title = new QLabel(tab_name.toUpper());
title->setAlignment(Qt::AlignCenter);
- title->setStyleSheet("color:#d97706;font-size:20px;font-weight:700;background:transparent;"
- "letter-spacing:2px;font-family:'Consolas',monospace;");
+ title->setStyleSheet(QString("color:%1;font-size:20px;font-weight:700;background:transparent;"
+ "letter-spacing:2px;").arg(ui::colors::AMBER));
vl->addWidget(title);
auto* sub = new QLabel("COMING SOON");
sub->setAlignment(Qt::AlignCenter);
- sub->setStyleSheet("color:#525252;font-size:14px;font-weight:700;background:transparent;"
- "letter-spacing:3px;font-family:'Consolas',monospace;");
+ sub->setStyleSheet(QString("color:%1;font-size:14px;font-weight:700;background:transparent;"
+ "letter-spacing:3px;").arg(ui::colors::TEXT_TERTIARY));
vl->addWidget(sub);
auto* desc = new QLabel("This module is under active development.\nIt will be available in a future update.");
desc->setAlignment(Qt::AlignCenter);
- desc->setStyleSheet("color:#404040;font-size:13px;background:transparent;"
- "font-family:'Consolas',monospace;");
+ desc->setStyleSheet(QString("color:%1;font-size:13px;background:transparent;").arg(ui::colors::TEXT_DIM));
vl->addWidget(desc);
}
diff --git a/fincept-qt/src/screens/IStatefulScreen.h b/fincept-qt/src/screens/IStatefulScreen.h
index f64364780..840afb4bd 100644
--- a/fincept-qt/src/screens/IStatefulScreen.h
+++ b/fincept-qt/src/screens/IStatefulScreen.h
@@ -27,6 +27,12 @@ class IStatefulScreen {
/// Unique key used for storage — must match the screen's dock id.
virtual QString state_key() const = 0;
+
+ /// State schema version. Increment this whenever save_state()'s key set
+ /// changes in an incompatible way. Stored state with a different version
+ /// is discarded and the screen starts with a clean slate rather than
+ /// crashing or misinterpreting stale keys.
+ virtual int state_version() const { return 1; }
};
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/about/AboutScreen.cpp b/fincept-qt/src/screens/about/AboutScreen.cpp
index dd7d8ea28..f46a05bdb 100644
--- a/fincept-qt/src/screens/about/AboutScreen.cpp
+++ b/fincept-qt/src/screens/about/AboutScreen.cpp
@@ -16,49 +16,71 @@ namespace fincept::screens {
// ── Style constants ───────────────────────────────────────────────────────────
-static const char* SECTION_LABEL = "color: #808080; font-size: 11px; font-weight: bold; letter-spacing: 0.5px; "
- "text-transform: uppercase; background: transparent; "
- "font-family: 'Consolas','Courier New',monospace;";
+static QString SECTION_LABEL() {
+ return QString("color: %1; font-size: 11px; font-weight: bold; letter-spacing: 0.5px; "
+ "text-transform: uppercase; background: transparent; "
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_SECONDARY);
+}
-static const char* BODY = "color: #e5e5e5; font-size: 13px; background: transparent; "
- "font-family: 'Consolas','Courier New',monospace;";
+static QString BODY() {
+ return QString("color: %1; font-size: 13px; background: transparent; "
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_PRIMARY);
+}
-static const char* MUTED = "color: #525252; font-size: 12px; background: transparent; "
- "font-family: 'Consolas','Courier New',monospace;";
+static QString MUTED() {
+ return QString("color: %1; font-size: 12px; background: transparent; "
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_TERTIARY);
+}
-static const char* LINK_STYLE = "color: #0891b2; font-size: 13px; background: transparent; "
- "font-family: 'Consolas','Courier New',monospace;";
+static QString LINK_STYLE() {
+ return QString("color: %1; font-size: 13px; background: transparent; "
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::CYAN);
+}
-static const char* PANEL = "background: #0a0a0a; border: 1px solid #1a1a1a; border-radius: 2px;";
+static QString PANEL() {
+ return QString("background: %1; border: 1px solid %2; border-radius: 2px;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM);
+}
-static const char* PANEL_HEADER = "background: #111111; border-bottom: 1px solid #1a1a1a;";
+static QString PANEL_HEADER() {
+ return QString("background: %1; border-bottom: 1px solid %2;")
+ .arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM);
+}
-static const char* LINK_BTN = "QPushButton { background: #111111; color: #0891b2; border: 1px solid #1a1a1a; "
- "border-radius: 2px; padding: 8px 12px; font-size: 12px; text-align: left; "
- "font-family: 'Consolas','Courier New',monospace; }"
- "QPushButton:hover { background: #161616; color: #38bdf8; }";
+static QString LINK_BTN() {
+ return QString("QPushButton { background: %1; color: %2; border: 1px solid %3; "
+ "border-radius: 2px; padding: 8px 12px; font-size: 12px; text-align: left; "
+ "font-family: 'Consolas','Courier New',monospace; }"
+ "QPushButton:hover { background: %4; color: #38bdf8; }")
+ .arg(ui::colors::BG_RAISED, ui::colors::CYAN, ui::colors::BORDER_DIM, ui::colors::BG_HOVER);
+}
// ── Helpers ───────────────────────────────────────────────────────────────────
static QWidget* makePanel() {
auto* w = new QWidget;
- w->setStyleSheet(PANEL);
+ w->setStyleSheet(PANEL());
return w;
}
static QLabel* makePanelHeader(const QString& icon, const QString& title, const QString& iconColor) {
auto* lbl = new QLabel(QString("%1 %2").arg(icon, title));
lbl->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: bold; letter-spacing: 0.5px; "
- "background: #111111; padding: 10px 14px; border-bottom: 1px solid #1a1a1a; "
+ "background: %2; padding: 10px 14px; border-bottom: 1px solid %3; "
"font-family: 'Consolas','Courier New',monospace;")
- .arg(iconColor));
+ .arg(iconColor, ui::colors::BG_RAISED, ui::colors::BORDER_DIM));
return lbl;
}
static QLabel* makeBullet(const QString& text) {
auto* lbl = new QLabel(QString("■ %1").arg(text));
- lbl->setStyleSheet("color: #808080; font-size: 12px; background: transparent; "
- "font-family: 'Consolas','Courier New',monospace;");
+ lbl->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent; "
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_SECONDARY));
lbl->setWordWrap(true);
return lbl;
}
@@ -66,7 +88,7 @@ static QLabel* makeBullet(const QString& text) {
static QWidget* makeSeparator() {
auto* line = new QFrame;
line->setFrameShape(QFrame::HLine);
- line->setStyleSheet("color: #1a1a1a;");
+ line->setStyleSheet(QString("color: %1;").arg(ui::colors::BORDER_DIM));
return line;
}
@@ -108,11 +130,12 @@ AboutScreen::AboutScreen(QWidget* parent) : QWidget(parent) {
auto* left = new QVBoxLayout;
left->setSpacing(4);
auto* name = new QLabel("Fincept Terminal");
- name->setStyleSheet("color: #e5e5e5; font-size: 15px; font-weight: bold; background: transparent; "
- "font-family: 'Consolas','Courier New',monospace;");
+ name->setStyleSheet(QString("color: %1; font-size: 15px; font-weight: bold; background: transparent; "
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_PRIMARY));
left->addWidget(name);
auto* sub = new QLabel("NATIVE DESKTOP FINANCIAL INTELLIGENCE TERMINAL");
- sub->setStyleSheet(MUTED);
+ sub->setStyleSheet(MUTED());
left->addWidget(sub);
bhl->addLayout(left);
bhl->addStretch();
@@ -121,12 +144,13 @@ AboutScreen::AboutScreen(QWidget* parent) : QWidget(parent) {
right->setSpacing(4);
right->setAlignment(Qt::AlignRight);
auto* ver = new QLabel("v4.0.0");
- ver->setStyleSheet("color: #d97706; font-size: 18px; font-weight: bold; background: transparent; "
- "font-family: 'Consolas','Courier New',monospace;");
+ ver->setStyleSheet(QString("color: %1; font-size: 18px; font-weight: bold; background: transparent; "
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::AMBER));
ver->setAlignment(Qt::AlignRight);
right->addWidget(ver);
auto* bdate = new QLabel("Build: 2026-03-20");
- bdate->setStyleSheet(MUTED);
+ bdate->setStyleSheet(MUTED());
bdate->setAlignment(Qt::AlignRight);
right->addWidget(bdate);
bhl->addLayout(right);
@@ -135,9 +159,10 @@ AboutScreen::AboutScreen(QWidget* parent) : QWidget(parent) {
// Footer bar
auto* foot = new QLabel("© 2024-2026 Fincept Corporation. All rights reserved.");
- foot->setStyleSheet("color: #525252; font-size: 11px; background: #111111; "
- "padding: 6px 14px; border-top: 1px solid #1a1a1a; "
- "font-family: 'Consolas','Courier New',monospace;");
+ foot->setStyleSheet(QString("color: %1; font-size: 11px; background: %2; "
+ "padding: 6px 14px; border-top: 1px solid %3; "
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_TERTIARY, ui::colors::BG_RAISED, ui::colors::BORDER_DIM));
pvl->addWidget(foot);
vl->addWidget(panel);
@@ -172,9 +197,10 @@ AboutScreen::AboutScreen(QWidget* parent) : QWidget(parent) {
// Footer link
auto* foot = new QLabel("gnu.org/licenses/agpl-3.0");
- foot->setStyleSheet("color: #0891b2; font-size: 11px; background: transparent; "
- "padding: 6px 14px; border-top: 1px solid #1a1a1a; "
- "font-family: 'Consolas','Courier New',monospace;");
+ foot->setStyleSheet(QString("color: %1; font-size: 11px; background: transparent; "
+ "padding: 6px 14px; border-top: 1px solid %2; "
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::CYAN, ui::colors::BORDER_DIM));
pvl->addWidget(foot);
rl->addWidget(panel, 1);
@@ -201,9 +227,10 @@ AboutScreen::AboutScreen(QWidget* parent) : QWidget(parent) {
// Footer link
auto* foot = new QLabel("[email protected]");
- foot->setStyleSheet("color: #0891b2; font-size: 11px; background: transparent; "
- "padding: 6px 14px; border-top: 1px solid #1a1a1a; "
- "font-family: 'Consolas','Courier New',monospace;");
+ foot->setStyleSheet(QString("color: %1; font-size: 11px; background: transparent; "
+ "padding: 6px 14px; border-top: 1px solid %2; "
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::CYAN, ui::colors::BORDER_DIM));
pvl->addWidget(foot);
rl->addWidget(panel, 1);
@@ -228,14 +255,14 @@ AboutScreen::AboutScreen(QWidget* parent) : QWidget(parent) {
auto* desc = new QLabel("\"Fincept\", \"Fincept Terminal\", and associated logos are trademarks of "
"Fincept Corporation. Use of these marks requires explicit written permission.");
- desc->setStyleSheet(BODY);
+ desc->setStyleSheet(BODY());
desc->setWordWrap(true);
bvl->addWidget(desc);
auto* perm =
new QLabel("Permission is not granted to use Fincept trademarks in a way that suggests "
"affiliation with or endorsement by Fincept Corporation without prior written consent.");
- perm->setStyleSheet(MUTED);
+ perm->setStyleSheet(MUTED());
perm->setWordWrap(true);
bvl->addWidget(perm);
@@ -273,7 +300,7 @@ AboutScreen::AboutScreen(QWidget* parent) : QWidget(parent) {
for (int i = 0; i < 6; ++i) {
auto* btn = new QPushButton(links[i].label);
- btn->setStyleSheet(LINK_BTN);
+ btn->setStyleSheet(LINK_BTN());
btn->setFixedHeight(36);
const QString url = links[i].url;
connect(btn, &QPushButton::clicked, this, [url]() { QDesktopServices::openUrl(QUrl(url)); });
@@ -317,11 +344,11 @@ AboutScreen::AboutScreen(QWidget* parent) : QWidget(parent) {
cvl->setSpacing(2);
auto* lbl = new QLabel(contacts[i].label);
- lbl->setStyleSheet(SECTION_LABEL);
+ lbl->setStyleSheet(SECTION_LABEL());
cvl->addWidget(lbl);
auto* email = new QLabel(contacts[i].email);
- email->setStyleSheet(LINK_STYLE);
+ email->setStyleSheet(LINK_STYLE());
cvl->addWidget(email);
grid->addWidget(col, 0, i);
diff --git a/fincept-qt/src/screens/ai_quant_lab/AIQuantLabScreen.cpp b/fincept-qt/src/screens/ai_quant_lab/AIQuantLabScreen.cpp
index b1fbcd6b3..3ed5fd3b8 100644
--- a/fincept-qt/src/screens/ai_quant_lab/AIQuantLabScreen.cpp
+++ b/fincept-qt/src/screens/ai_quant_lab/AIQuantLabScreen.cpp
@@ -2,10 +2,12 @@
#include "screens/ai_quant_lab/AIQuantLabScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "screens/ai_quant_lab/QuantModulePanel.h"
#include "ui/theme/Theme.h"
#include "ui/theme/ThemeManager.h"
+#include <QFrame>
#include <QHBoxLayout>
#include <QScrollArea>
@@ -13,13 +15,13 @@ namespace fincept::screens {
using namespace fincept::services::quant;
+// ── Constructor ───────────────────────────────────────────────────────────────
+
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()));
- });
+ this, [this](const ui::ThemeTokens&) { refresh_theme(); });
LOG_INFO("AIQuantLab", "Screen constructed");
}
@@ -35,6 +37,8 @@ void AIQuantLabScreen::hideEvent(QHideEvent* e) {
QWidget::hideEvent(e);
}
+// ── UI construction ───────────────────────────────────────────────────────────
+
void AIQuantLabScreen::build_ui() {
auto* root = new QVBoxLayout(this);
root->setContentsMargins(0, 0, 0, 0);
@@ -48,9 +52,8 @@ void AIQuantLabScreen::build_ui() {
body->addWidget(build_left_sidebar());
+ // Content stack — panels are lazy-constructed via get_or_create_panel()
content_stack_ = new QStackedWidget(this);
- for (int i = 0; i < modules_.size(); ++i)
- content_stack_->addWidget(new QuantModulePanel(modules_[i], this));
body->addWidget(content_stack_, 1);
body->addWidget(build_right_sidebar());
@@ -60,91 +63,100 @@ void AIQuantLabScreen::build_ui() {
root->addWidget(body_w, 1);
root->addWidget(build_status_bar());
- setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
+
+ refresh_theme();
}
+// ── Top bar ───────────────────────────────────────────────────────────────────
+// Badge bar: compact scrollable row of module short-labels (like EconomicsScreen).
+// Replaces the old overflowing QHBoxLayout of 24 buttons.
+
QWidget* AIQuantLabScreen::build_top_bar() {
- auto* bar = new QWidget(this);
- bar->setFixedHeight(44);
- bar->setStyleSheet(
- QString("background:%1; border-bottom:1px solid %2;").arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM));
+ top_bar_ = new QWidget(this);
+ top_bar_->setFixedHeight(40);
- auto* hl = new QHBoxLayout(bar);
- hl->setContentsMargins(12, 0, 12, 0);
- hl->setSpacing(12);
-
- auto* brand = new QLabel("AI QUANT LAB", bar);
- 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)
- .arg(ui::fonts::DATA_FAMILY));
+ auto* hl = new QHBoxLayout(top_bar_);
+ hl->setContentsMargins(8, 0, 8, 0);
+ hl->setSpacing(8);
+
+ // Brand chip
+ auto* brand = new QLabel("AI QUANT LAB", top_bar_);
+ brand->setObjectName("aqBrand");
hl->addWidget(brand);
- auto* div = new QWidget(bar);
+ // Separator
+ auto* div = new QWidget(top_bar_);
div->setFixedSize(1, 20);
- div->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_DIM));
+ div->setObjectName("aqTopDiv");
hl->addWidget(div);
- // Quick module buttons (show short labels)
+ // Scrollable badge bar
+ badge_scroll_ = new QScrollArea(top_bar_);
+ badge_scroll_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ badge_scroll_->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ badge_scroll_->setFrameShape(QFrame::NoFrame);
+ badge_scroll_->setWidgetResizable(true);
+ badge_scroll_->setFixedHeight(34);
+
+ badge_bar_ = new QWidget;
+ auto* bhl = new QHBoxLayout(badge_bar_);
+ bhl->setContentsMargins(0, 3, 0, 3);
+ bhl->setSpacing(3);
+
for (int i = 0; i < modules_.size(); ++i) {
const auto& mod = modules_[i];
- auto* btn = new QPushButton(mod.short_label, bar);
+ auto* btn = new QPushButton(mod.short_label, badge_bar_);
btn->setToolTip(mod.label);
+ btn->setCheckable(true);
btn->setCursor(Qt::PointingHandCursor);
- btn->setStyleSheet(
- 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; }")
- .arg(ui::colors::TEXT_TERTIARY)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(QString("%1,%2,%3").arg(mod.color.red()).arg(mod.color.green()).arg(mod.color.blue()))
- .arg(mod.color.name()));
+ btn->setFixedHeight(26);
connect(btn, &QPushButton::clicked, this, [this, i]() { on_module_selected(i); });
- hl->addWidget(btn);
- quick_buttons_.append(btn);
+ bhl->addWidget(btn);
+ badge_buttons_.append(btn);
}
+ bhl->addStretch();
- hl->addStretch(1);
+ badge_scroll_->setWidget(badge_bar_);
+ hl->addWidget(badge_scroll_, 1);
- auto* ready = new QLabel("18 MODULES", bar);
- 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)
- .arg(ui::fonts::DATA_FAMILY));
- hl->addWidget(ready);
+ // Module count chip
+ auto* count_lbl = new QLabel(QString("%1 MODULES").arg(modules_.size()), top_bar_);
+ count_lbl->setObjectName("aqModuleCount");
+ hl->addWidget(count_lbl);
- return bar;
+ return top_bar_;
}
+// ── Left sidebar ──────────────────────────────────────────────────────────────
+
QWidget* AIQuantLabScreen::build_left_sidebar() {
- auto* panel = new QWidget(this);
- panel->setFixedWidth(200);
- panel->setStyleSheet(
- QString("background:%1; border-right:1px solid %2;").arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
+ left_panel_ = new QWidget(this);
+ left_panel_->setFixedWidth(200);
- auto* vl = new QVBoxLayout(panel);
+ auto* vl = new QVBoxLayout(left_panel_);
vl->setContentsMargins(0, 0, 0, 0);
vl->setSpacing(0);
- auto* header = new QWidget(panel);
+ // Header
+ auto* header = new QWidget(left_panel_);
+ header->setObjectName("aqSidebarHeader");
header->setFixedHeight(36);
- header->setStyleSheet(QString("border-bottom:1px solid %1;").arg(ui::colors::BORDER_DIM));
auto* hhl = new QHBoxLayout(header);
hhl->setContentsMargins(12, 0, 12, 0);
- auto* title = new QLabel("MODULES", header);
- 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);
+ sidebar_title_ = new QLabel("MODULES", header);
+ sidebar_title_->setObjectName("aqSidebarTitle");
+ hhl->addWidget(sidebar_title_);
hhl->addStretch();
vl->addWidget(header);
- auto* scroll = new QScrollArea(panel);
+ // Scrollable module list
+ auto* scroll = new QScrollArea(left_panel_);
scroll->setWidgetResizable(true);
scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- scroll->setStyleSheet("QScrollArea { border:none; background:transparent; }");
+ scroll->setFrameShape(QFrame::NoFrame);
+ scroll->setStyleSheet("QScrollArea { border:none; background:transparent; }"
+ "QScrollBar:vertical { width:4px; }"
+ "QScrollBar::handle:vertical { border-radius:2px; }");
auto* list = new QWidget(scroll);
left_items_layout_ = new QVBoxLayout(list);
@@ -159,24 +171,13 @@ 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-weight:700; font-family:%2;"
- "padding:8px 12px 4px 12px; letter-spacing:1px;")
- .arg(ui::colors::TEXT_TERTIARY)
- .arg(ui::fonts::DATA_FAMILY));
+ cat->setObjectName("aqCatLabel");
left_items_layout_->addWidget(cat);
}
auto* btn = new QPushButton(mod.label, list);
+ btn->setCheckable(true);
btn->setCursor(Qt::PointingHandCursor);
- btn->setStyleSheet(
- QString("QPushButton { text-align:left; padding:6px 12px; border:none;"
- "border-left:2px solid transparent; color:%1;"
- "font-size:10px; font-family:%2; background:transparent; }"
- "QPushButton:hover { background:rgba(%3,0.06); color:%4; }")
- .arg(ui::colors::TEXT_SECONDARY)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(QString("%1,%2,%3").arg(mod.color.red()).arg(mod.color.green()).arg(mod.color.blue()))
- .arg(mod.color.name()));
connect(btn, &QPushButton::clicked, this, [this, i]() { on_module_selected(i); });
left_items_layout_->addWidget(btn);
module_buttons_.append(btn);
@@ -185,181 +186,303 @@ QWidget* AIQuantLabScreen::build_left_sidebar() {
scroll->setWidget(list);
vl->addWidget(scroll, 1);
- return panel;
+ return left_panel_;
}
+// ── Right sidebar ─────────────────────────────────────────────────────────────
+
QWidget* AIQuantLabScreen::build_right_sidebar() {
- auto* panel = new QWidget(this);
- panel->setFixedWidth(220);
- panel->setStyleSheet(
- QString("background:%1; border-left:1px solid %2;").arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
+ right_panel_ = new QWidget(this);
+ right_panel_->setFixedWidth(220);
- auto* vl = new QVBoxLayout(panel);
+ auto* vl = new QVBoxLayout(right_panel_);
vl->setContentsMargins(12, 12, 12, 12);
vl->setSpacing(10);
- auto* title = new QLabel("MODULE INFO", panel);
- 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);
+ auto* info_title = new QLabel("MODULE INFO", right_panel_);
+ info_title->setObjectName("aqInfoTitle");
+ vl->addWidget(info_title);
- right_title_ = new QLabel(panel);
- right_title_->setStyleSheet(
- QString("font-size:11px; font-weight:700; font-family:%1;").arg(ui::fonts::DATA_FAMILY));
+ right_title_ = new QLabel(right_panel_);
+ right_title_->setObjectName("aqRightTitle");
vl->addWidget(right_title_);
- right_category_ = new QLabel(panel);
- right_category_->setStyleSheet(QString("color:%1; font-family:%2;")
- .arg(ui::colors::TEXT_SECONDARY)
- .arg(ui::fonts::DATA_FAMILY));
+ right_category_ = new QLabel(right_panel_);
+ right_category_->setObjectName("aqRightCategory");
vl->addWidget(right_category_);
- right_desc_ = new QLabel(panel);
+ right_desc_ = new QLabel(right_panel_);
+ right_desc_->setObjectName("aqRightDesc");
right_desc_->setWordWrap(true);
- 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-family:%2; padding:6px;"
- "background:%3; border:1px solid %4; border-radius:2px;")
- .arg(ui::colors::TEXT_TERTIARY)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::colors::BG_RAISED)
- .arg(ui::colors::BORDER_DIM));
+ right_script_ = new QLabel(right_panel_);
+ right_script_->setObjectName("aqRightScript");
vl->addWidget(right_script_);
- // Quick stats
- auto* stats = new QWidget(panel);
- stats->setStyleSheet(QString("background:%1; border:1px solid %2; border-radius:2px; padding:10px;")
- .arg(ui::colors::BG_RAISED)
- .arg(ui::colors::BORDER_DIM));
- auto* svl = new QVBoxLayout(stats);
+ // Platform stats card
+ stats_card_ = new QWidget(right_panel_);
+ stats_card_->setObjectName("aqStatsCard");
+ auto* svl = new QVBoxLayout(stats_card_);
svl->setContentsMargins(10, 10, 10, 10);
svl->setSpacing(4);
- auto* st = new QLabel("PLATFORM STATS", stats);
- st->setStyleSheet(QString("color:%1; font-weight:700; font-family:%2;")
- .arg(ui::colors::CYAN)
- .arg(ui::fonts::DATA_FAMILY));
- svl->addWidget(st);
-
- auto add_row = [&](const QString& l, const QString& v) {
- auto* r = new QWidget(stats);
- auto* rl = new QHBoxLayout(r);
+
+ stats_title_ = new QLabel("PLATFORM STATS", stats_card_);
+ stats_title_->setObjectName("aqStatsTitle");
+ svl->addWidget(stats_title_);
+
+ auto add_stat = [&](const QString& label, const QString& value) {
+ auto* row = new QWidget(stats_card_);
+ auto* rl = new QHBoxLayout(row);
rl->setContentsMargins(0, 0, 0, 0);
- auto* lbl = new QLabel(l, r);
- 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-weight:700; font-family:%2;")
- .arg(ui::colors::TEXT_PRIMARY)
- .arg(ui::fonts::DATA_FAMILY));
+ auto* lbl = new QLabel(label, row);
+ lbl->setObjectName("aqStatLabel");
+ auto* val = new QLabel(value, row);
+ val->setObjectName("aqStatValue");
rl->addWidget(lbl);
rl->addStretch();
rl->addWidget(val);
- svl->addWidget(r);
+ svl->addWidget(row);
};
- add_row("Modules", "18");
- add_row("ML Models", "30+");
- add_row("RL Algorithms", "5");
- add_row("Python Scripts", "25+");
- vl->addWidget(stats);
+ add_stat("Modules", QString::number(modules_.size()));
+ add_stat("ML Models", "30+");
+ add_stat("RL Algorithms", "5");
+ add_stat("Python Scripts","25+");
+ vl->addWidget(stats_card_);
vl->addStretch();
- return panel;
+ return right_panel_;
}
+// ── Status bar ────────────────────────────────────────────────────────────────
+
QWidget* AIQuantLabScreen::build_status_bar() {
- auto* bar = new QWidget(this);
- bar->setFixedHeight(24);
- bar->setStyleSheet(
- QString("background:%1; border-top:1px solid %2;").arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM));
- auto* hl = new QHBoxLayout(bar);
+ status_bar_ = new QWidget(this);
+ status_bar_->setFixedHeight(24);
+
+ auto* hl = new QHBoxLayout(status_bar_);
hl->setContentsMargins(12, 0, 12, 0);
hl->setSpacing(16);
- auto s =
- 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-weight:700; font-family:%2;")
- .arg(ui::colors::POSITIVE)
- .arg(ui::fonts::DATA_FAMILY));
- hl->addWidget(l1);
- hl->addWidget(v1);
+
+ auto* engine_lbl = new QLabel("ENGINE:", status_bar_);
+ engine_lbl->setObjectName("aqStatusLabel");
+ status_engine_val_ = new QLabel("QLIB + GS QUANT + PYTHON", status_bar_);
+ status_engine_val_->setObjectName("aqStatusValue");
+ hl->addWidget(engine_lbl);
+ hl->addWidget(status_engine_val_);
hl->addStretch();
- auto* v2 = new QLabel("READY", bar);
- v2->setStyleSheet(QString("color:%1; font-weight:700; font-family:%2;")
- .arg(ui::colors::POSITIVE)
- .arg(ui::fonts::DATA_FAMILY));
- hl->addWidget(v2);
- return bar;
+
+ status_ready_lbl_ = new QLabel("READY", status_bar_);
+ status_ready_lbl_->setObjectName("aqStatusReady");
+ hl->addWidget(status_ready_lbl_);
+
+ return status_bar_;
}
+// ── Theme refresh ─────────────────────────────────────────────────────────────
+
+void AIQuantLabScreen::refresh_theme() {
+ using namespace ui::colors;
+ using namespace ui::fonts;
+
+ // Root
+ setStyleSheet(QString("background:%1;").arg(BG_BASE()));
+
+ // Top bar
+ top_bar_->setStyleSheet(
+ QString("background:%1; border-bottom:1px solid %2;").arg(BG_RAISED(), BORDER_DIM()));
+
+ // Brand chip
+ // findChild is safe here — it's a named child of top_bar_
+ if (auto* brand = top_bar_->findChild<QLabel*>("aqBrand"))
+ brand->setStyleSheet(
+ QString("color:%1; font-weight:700; font-size:%2px;"
+ "padding:3px 10px; background:rgba(157,78,221,0.10);"
+ "border:1px solid rgba(157,78,221,0.28); border-radius:2px;")
+ .arg(INFO(), TINY));
+
+ if (auto* div = top_bar_->findChild<QWidget*>("aqTopDiv"))
+ div->setStyleSheet(QString("background:%1;").arg(BORDER_DIM()));
+
+ // Badge scroll area + bar
+ badge_scroll_->setStyleSheet(
+ QString("QScrollArea { background:%1; border:none; }"
+ "QScrollBar:horizontal { height:0px; }").arg(BG_RAISED()));
+ badge_bar_->setStyleSheet(
+ QString("background:%1;").arg(BG_RAISED()));
+
+ if (auto* lbl = top_bar_->findChild<QLabel*>("aqModuleCount"))
+ lbl->setStyleSheet(
+ QString("color:%1; font-size:%2px; font-weight:700;"
+ "padding:3px 8px; background:rgba(22,163,74,0.08);"
+ "border:1px solid rgba(22,163,74,0.25); border-radius:2px;")
+ .arg(POSITIVE(), TINY));
+
+ // Left sidebar
+ left_panel_->setStyleSheet(
+ QString("background:%1; border-right:1px solid %2;").arg(BG_SURFACE(), BORDER_DIM()));
+
+ if (auto* hdr = left_panel_->findChild<QWidget*>("aqSidebarHeader"))
+ hdr->setStyleSheet(
+ QString("background:%1; border-bottom:1px solid %2;").arg(BG_SURFACE(), BORDER_DIM()));
+
+ sidebar_title_->setStyleSheet(
+ QString("color:%1; font-weight:700; font-size:%2px; letter-spacing:1px;")
+ .arg(CYAN(), TINY));
+
+ // Category labels
+ for (auto* lbl : left_panel_->findChildren<QLabel*>("aqCatLabel"))
+ lbl->setStyleSheet(
+ QString("color:%1; font-weight:700; font-size:%2px;"
+ "padding:8px 12px 4px 12px; letter-spacing:1px; background:transparent;")
+ .arg(TEXT_TERTIARY(), TINY));
+
+ // Right sidebar
+ right_panel_->setStyleSheet(
+ QString("background:%1; border-left:1px solid %2;").arg(BG_SURFACE(), BORDER_DIM()));
+
+ if (auto* t = right_panel_->findChild<QLabel*>("aqInfoTitle"))
+ t->setStyleSheet(
+ QString("color:%1; font-weight:700; font-size:%2px; letter-spacing:1px;")
+ .arg(CYAN(), TINY));
+
+ right_category_->setStyleSheet(
+ QString("color:%1; font-size:%2px; background:transparent;").arg(TEXT_SECONDARY(), TINY));
+
+ right_desc_->setStyleSheet(
+ QString("color:%1; font-size:%2px; background:transparent;").arg(TEXT_PRIMARY(), TINY));
+
+ right_script_->setStyleSheet(
+ QString("color:%1; font-size:%2px; padding:6px;"
+ "background:%3; border:1px solid %4; border-radius:2px;")
+ .arg(TEXT_TERTIARY(), QString::number(TINY), BG_RAISED(), BORDER_DIM()));
+
+ stats_card_->setStyleSheet(
+ QString("background:%1; border:1px solid %2; border-radius:3px;")
+ .arg(BG_RAISED(), BORDER_DIM()));
+
+ stats_title_->setStyleSheet(
+ QString("color:%1; font-weight:700; font-size:%2px; letter-spacing:0.5px;")
+ .arg(CYAN(), TINY));
+
+ for (auto* lbl : stats_card_->findChildren<QLabel*>("aqStatLabel"))
+ lbl->setStyleSheet(
+ QString("color:%1; font-size:%2px; background:transparent;").arg(TEXT_TERTIARY(), TINY));
+
+ for (auto* val : stats_card_->findChildren<QLabel*>("aqStatValue"))
+ val->setStyleSheet(
+ QString("color:%1; font-weight:700; font-size:%2px; background:transparent;")
+ .arg(TEXT_PRIMARY(), TINY));
+
+ // Status bar
+ status_bar_->setStyleSheet(
+ QString("background:%1; border-top:1px solid %2;").arg(BG_RAISED(), BORDER_DIM()));
+
+ for (auto* lbl : status_bar_->findChildren<QLabel*>("aqStatusLabel"))
+ lbl->setStyleSheet(
+ QString("color:%1; font-size:%2px; background:transparent;").arg(TEXT_TERTIARY(), TINY));
+
+ status_engine_val_->setStyleSheet(
+ QString("color:%1; font-weight:700; font-size:%2px; background:transparent;")
+ .arg(POSITIVE(), TINY));
+
+ status_ready_lbl_->setStyleSheet(
+ QString("color:%1; font-weight:700; font-size:%2px; background:transparent;")
+ .arg(POSITIVE(), TINY));
+
+ // Re-apply selection styles so active module stays highlighted after theme switch
+ update_sidebar_selection();
+}
+
+// ── Lazy panel construction ───────────────────────────────────────────────────
+
+QuantModulePanel* AIQuantLabScreen::get_or_create_panel(int index) {
+ if (panels_.contains(index))
+ return panels_[index];
+
+ auto* panel = new QuantModulePanel(modules_[index], nullptr);
+ panels_[index] = panel;
+ content_stack_->addWidget(panel);
+ LOG_INFO("AIQuantLab", "Created panel for: " + modules_[index].id);
+ return panel;
+}
+
+// ── Module selection ──────────────────────────────────────────────────────────
+
void AIQuantLabScreen::on_module_selected(int index) {
if (index < 0 || index >= modules_.size())
return;
active_index_ = index;
- content_stack_->setCurrentIndex(index);
+
+ QuantModulePanel* panel = get_or_create_panel(index);
+ content_stack_->setCurrentWidget(panel);
+
update_sidebar_selection();
update_right_panel();
+ ScreenStateManager::instance().notify_changed(this);
}
void AIQuantLabScreen::update_sidebar_selection() {
+ using namespace ui::colors;
+
for (int i = 0; i < module_buttons_.size(); ++i) {
const auto& mod = modules_[i];
- bool active = (i == active_index_);
+ const bool active = (i == active_index_);
+ const QString rgb = QString("%1,%2,%3")
+ .arg(mod.color.red()).arg(mod.color.green()).arg(mod.color.blue());
+
module_buttons_[i]->setStyleSheet(
QString("QPushButton { text-align:left; padding:6px 12px; border:none;"
- "border-left:2px solid %1; color:%2;"
- "font-size:10px; font-family:%3; font-weight:%4; background:%5; }"
- "QPushButton:hover { background:rgba(%6,0.1); color:%7; }")
+ "border-left:2px solid %1; color:%2; font-size:10px;"
+ "font-weight:%3; background:%4; }"
+ "QPushButton:hover { background:rgba(%5,0.08); color:%6; }")
.arg(active ? mod.color.name() : "transparent")
- .arg(active ? mod.color.name() : ui::colors::TEXT_SECONDARY)
- .arg(ui::fonts::DATA_FAMILY)
+ .arg(active ? mod.color.name() : QString(TEXT_SECONDARY()))
.arg(active ? "700" : "400")
- .arg(active ? QString("rgba(%1,%2,%3,0.08)")
- .arg(mod.color.red())
- .arg(mod.color.green())
- .arg(mod.color.blue())
- : "transparent")
- .arg(QString("%1,%2,%3").arg(mod.color.red()).arg(mod.color.green()).arg(mod.color.blue()))
- .arg(mod.color.name()));
+ .arg(active ? QString("rgba(%1,0.08)").arg(rgb) : "transparent")
+ .arg(rgb, mod.color.name()));
}
- for (int i = 0; i < quick_buttons_.size(); ++i) {
+
+ for (int i = 0; i < badge_buttons_.size(); ++i) {
const auto& mod = modules_[i];
- bool active = (i == active_index_);
- 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)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(active ? QString("rgba(%1,%2,%3,0.3)")
- .arg(mod.color.red())
- .arg(mod.color.green())
- .arg(mod.color.blue())
- : "transparent")
- .arg(active ? QString("rgba(%1,%2,%3,0.12)")
- .arg(mod.color.red())
- .arg(mod.color.green())
- .arg(mod.color.blue())
- : "transparent")
- .arg(active ? "700" : "400"));
+ const bool active = (i == active_index_);
+ const QString rgb = QString("%1,%2,%3")
+ .arg(mod.color.red()).arg(mod.color.green()).arg(mod.color.blue());
+
+ badge_buttons_[i]->setStyleSheet(
+ QString("QPushButton { color:%1; font-size:9px; font-weight:%2;"
+ "padding:0 8px; border:1px solid %3; border-radius:2px; background:%4; }"
+ "QPushButton:hover { color:%5; border-color:rgba(%6,0.4);"
+ "background:rgba(%6,0.08); }")
+ .arg(active ? mod.color.name() : QString(TEXT_TERTIARY()))
+ .arg(active ? "700" : "400")
+ .arg(active ? QString("rgba(%1,0.35)").arg(rgb) : "transparent")
+ .arg(active ? QString("rgba(%1,0.12)").arg(rgb) : "transparent")
+ .arg(mod.color.name(), rgb));
}
}
void AIQuantLabScreen::update_right_panel() {
const auto& mod = modules_[active_index_];
right_title_->setText(mod.label.toUpper());
- right_title_->setStyleSheet(QString("color:%1; font-weight:700; font-family:%2;")
- .arg(mod.color.name())
- .arg(ui::fonts::DATA_FAMILY));
+ right_title_->setStyleSheet(
+ QString("color:%1; font-weight:700; font-size:11px; background:transparent;")
+ .arg(mod.color.name()));
right_category_->setText(QString(mod.category).replace('_', '/') + " module");
right_desc_->setText(mod.description);
right_script_->setText("Script: " + mod.script);
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap AIQuantLabScreen::save_state() const {
+ return {{"module_index", active_index_}};
+}
+
+void AIQuantLabScreen::restore_state(const QVariantMap& state) {
+ const int idx = state.value("module_index", 0).toInt();
+ if (idx >= 0 && idx < modules_.size())
+ on_module_selected(idx);
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/ai_quant_lab/AIQuantLabScreen.h b/fincept-qt/src/screens/ai_quant_lab/AIQuantLabScreen.h
index 30cd3c895..232468cd9 100644
--- a/fincept-qt/src/screens/ai_quant_lab/AIQuantLabScreen.h
+++ b/fincept-qt/src/screens/ai_quant_lab/AIQuantLabScreen.h
@@ -1,10 +1,13 @@
// src/screens/ai_quant_lab/AIQuantLabScreen.h
#pragma once
+#include "screens/IStatefulScreen.h"
#include "services/ai_quant_lab/AIQuantLabTypes.h"
#include <QHideEvent>
#include <QLabel>
+#include <QMap>
#include <QPushButton>
+#include <QScrollArea>
#include <QShowEvent>
#include <QStackedWidget>
#include <QVBoxLayout>
@@ -14,13 +17,19 @@ namespace fincept::screens {
class QuantModulePanel;
-/// AI Quant Lab — 18-module quantitative research platform.
-/// Left: module navigation (4 categories), Center: active module, Right: module info.
-class AIQuantLabScreen : public QWidget {
+/// AI Quant Lab — 24-module quantitative research platform.
+/// Left: module navigation (4 categories), Center: lazy-constructed module panel,
+/// Right: module info. Panels are built on first activation (P2 compliant).
+class AIQuantLabScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit AIQuantLabScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "ai_quant_lab"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) override;
@@ -34,22 +43,47 @@ class AIQuantLabScreen : public QWidget {
QWidget* build_left_sidebar();
QWidget* build_right_sidebar();
QWidget* build_status_bar();
+ void refresh_theme();
void update_right_panel();
void update_sidebar_selection();
+ // Lazy panel construction — returns existing or newly built panel
+ QuantModulePanel* get_or_create_panel(int index);
+
QVector<services::quant::QuantModule> modules_;
int active_index_ = 0;
+ // Lazy panel map: module index → panel (nullptr = not yet built)
+ QMap<int, QuantModulePanel*> panels_;
+
QStackedWidget* content_stack_ = nullptr;
QVector<QPushButton*> module_buttons_;
- QVector<QPushButton*> quick_buttons_;
+
+ // Badge bar (scrollable, top bar)
+ QScrollArea* badge_scroll_ = nullptr;
+ QWidget* badge_bar_ = nullptr;
+ QVector<QPushButton*> badge_buttons_;
+
+ // Sidebar widgets that need theme refresh
+ QWidget* top_bar_ = nullptr;
+ QWidget* left_panel_ = nullptr;
+ QWidget* right_panel_ = nullptr;
+ QWidget* status_bar_ = nullptr;
+ QLabel* sidebar_title_ = nullptr;
+ QWidget* stats_card_ = nullptr;
+ QLabel* stats_title_ = nullptr;
+
QVBoxLayout* left_items_layout_ = nullptr;
// Right panel
- QLabel* right_title_ = nullptr;
+ QLabel* right_title_ = nullptr;
QLabel* right_category_ = nullptr;
- QLabel* right_desc_ = nullptr;
- QLabel* right_script_ = nullptr;
+ QLabel* right_desc_ = nullptr;
+ QLabel* right_script_ = nullptr;
+
+ // Status bar labels
+ QLabel* status_engine_val_ = nullptr;
+ QLabel* status_ready_lbl_ = nullptr;
bool first_show_ = true;
};
diff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.cpp b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.cpp
index 2281f12e7..f263df051 100644
--- a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.cpp
+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.cpp
@@ -30,52 +30,136 @@ namespace fincept::screens {
using namespace fincept::services::quant;
-// ── Helpers ──────────────────────────────────────────────────────────────────
+// ── Shared style helpers (live tokens — called at widget-creation time) ───────
+// These replace 60+ copy-pasted inline style blocks across all panel builders.
+
+static QString input_ss() {
+ return QString("QLineEdit,QTextEdit { background:%1; color:%2; border:1px solid %3;"
+ "padding:4px 6px; border-radius:2px; }"
+ "QLineEdit:focus,QTextEdit:focus { border-color:%4; }")
+ .arg(ui::colors::BG_RAISED())
+ .arg(ui::colors::TEXT_PRIMARY())
+ .arg(ui::colors::BORDER_MED())
+ .arg(ui::colors::BORDER_BRIGHT());
+}
+
+static QString combo_ss() {
+ return QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
+ "padding:3px 6px; border-radius:2px; }"
+ "QComboBox:focus { border-color:%4; }"
+ "QComboBox::drop-down { border:none; width:18px; }"
+ "QComboBox QAbstractItemView { background:%1; color:%2;"
+ "selection-background-color:%5; border:1px solid %3; }")
+ .arg(ui::colors::BG_RAISED())
+ .arg(ui::colors::TEXT_PRIMARY())
+ .arg(ui::colors::BORDER_MED())
+ .arg(ui::colors::BORDER_BRIGHT())
+ .arg(ui::colors::BG_HOVER());
+}
+
+static QString spinbox_ss() {
+ return QString("QSpinBox,QDoubleSpinBox { background:%1; color:%2; border:1px solid %3;"
+ "padding:4px 6px; border-radius:2px; }"
+ "QSpinBox:focus,QDoubleSpinBox:focus { border-color:%4; }"
+ "QSpinBox::up-button,QSpinBox::down-button,"
+ "QDoubleSpinBox::up-button,QDoubleSpinBox::down-button { width:16px; }")
+ .arg(ui::colors::BG_RAISED())
+ .arg(ui::colors::TEXT_PRIMARY())
+ .arg(ui::colors::BORDER_MED())
+ .arg(ui::colors::BORDER_BRIGHT());
+}
+
+static QString tab_ss(const QString& accent) {
+ return QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
+ "QTabBar::tab { background:%3; color:%4; padding:6px 14px;"
+ "border:1px solid %1; border-bottom:none; margin-right:1px; }"
+ "QTabBar::tab:selected { background:%2; color:%5; font-weight:700;"
+ "border-bottom:2px solid %5; }"
+ "QTabBar::tab:hover { color:%4; background:%6; }")
+ .arg(ui::colors::BORDER_DIM())
+ .arg(ui::colors::BG_SURFACE())
+ .arg(ui::colors::BG_RAISED())
+ .arg(ui::colors::TEXT_SECONDARY())
+ .arg(accent)
+ .arg(ui::colors::BG_HOVER());
+}
+
+static QString sub_tab_ss(const QString& accent) {
+ return QString("QTabWidget::pane { border:none; background:%1; }"
+ "QTabBar::tab { background:%2; color:%3; padding:5px 12px;"
+ "border:1px solid %4; border-bottom:none; margin-right:1px; }"
+ "QTabBar::tab:selected { background:%1; color:%5; font-weight:700; }"
+ "QTabBar { background:%2; }")
+ .arg(ui::colors::BG_SURFACE())
+ .arg(ui::colors::BG_RAISED())
+ .arg(ui::colors::TEXT_SECONDARY())
+ .arg(ui::colors::BORDER_DIM())
+ .arg(accent);
+}
+
+static QString output_ss() {
+ return QString("QTextEdit { background:%1; color:%2; border:1px solid %3; padding:8px; }")
+ .arg(ui::colors::BG_RAISED())
+ .arg(ui::colors::TEXT_PRIMARY())
+ .arg(ui::colors::BORDER_DIM());
+}
+
+static QString table_ss() {
+ return QString("QTableWidget { background:%1; color:%2; border:1px solid %3;"
+ "gridline-color:%3; alternate-background-color:%4; }"
+ "QTableWidget::item { padding:3px 6px; }"
+ "QHeaderView::section { background:%5; color:%6; font-weight:700;"
+ "padding:4px 8px; border:none; border-bottom:1px solid %3; }"
+ "QTableWidget::item:selected { background:%7; color:%2; }")
+ .arg(ui::colors::BG_SURFACE())
+ .arg(ui::colors::TEXT_PRIMARY())
+ .arg(ui::colors::BORDER_DIM())
+ .arg(ui::colors::ROW_ALT())
+ .arg(ui::colors::BG_RAISED())
+ .arg(ui::colors::TEXT_SECONDARY())
+ .arg(ui::colors::BG_HOVER());
+}
+
+// ── Widget factory helpers ────────────────────────────────────────────────────
-QDoubleSpinBox* QuantModulePanel::make_double_spin(double min, double max, double val, int decimals,
- const QString& suffix, QWidget* parent) {
+QDoubleSpinBox* QuantModulePanel::make_double_spin(double min, double max, double val,
+ int decimals, const QString& suffix,
+ QWidget* parent) {
auto* spin = new QDoubleSpinBox(parent);
spin->setRange(min, max);
spin->setValue(val);
spin->setDecimals(decimals);
if (!suffix.isEmpty())
spin->setSuffix(suffix);
- spin->setStyleSheet(QString("QDoubleSpinBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }"
- "QDoubleSpinBox:focus { border-color:%6; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL)
- .arg(module_.color.name()));
+ spin->setStyleSheet(spinbox_ss());
return spin;
}
QPushButton* QuantModulePanel::make_run_button(const QString& text, QWidget* parent) {
auto* btn = new QPushButton(text, parent);
btn->setCursor(Qt::PointingHandCursor);
- btn->setStyleSheet(QString("QPushButton { background:%1; color:%2; font-family:%3; font-size:%4px;"
- "font-weight:700; border:none; padding:8px 20px; border-radius:2px;"
- "letter-spacing:1px; }"
- "QPushButton:hover { background:%5; }")
- .arg(module_.color.name())
- .arg(ui::colors::BG_BASE)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL)
- .arg(module_.color.lighter(120).name()));
+ btn->setFixedHeight(32);
+ btn->setStyleSheet(
+ QString("QPushButton { background:%1; color:%2; font-weight:700; border:none;"
+ "padding:0 20px; border-radius:2px; letter-spacing:0.8px; }"
+ "QPushButton:hover { background:%3; }"
+ "QPushButton:pressed { background:%4; }")
+ .arg(module_.color.name(),
+ ui::colors::BG_BASE(),
+ module_.color.lighter(115).name(),
+ module_.color.darker(110).name()));
return btn;
}
QWidget* QuantModulePanel::build_input_row(const QString& label, QWidget* input, QWidget* parent) {
auto* row = new QWidget(parent);
- auto* hl = new QHBoxLayout(row);
+ auto* hl = new QHBoxLayout(row);
hl->setContentsMargins(0, 2, 0, 2);
hl->setSpacing(8);
auto* lbl = new QLabel(label, row);
lbl->setFixedWidth(160);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(ui::colors::TEXT_SECONDARY)
- .arg(ui::fonts::SMALL)
- .arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(
+ QString("color:%1; background:transparent;").arg(ui::colors::TEXT_SECONDARY()));
hl->addWidget(lbl);
hl->addWidget(input, 1);
return row;
@@ -85,13 +169,7 @@ QWidget* QuantModulePanel::build_input_row(const QString& label, QWidget* input,
QWidget* QuantModulePanel::build_llm_picker(QWidget* parent, QComboBox** out_combo) {
auto* combo = new QComboBox(parent);
- combo->setStyleSheet(QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 8px; }"
- "QComboBox::drop-down { border:none; }"
- "QComboBox QAbstractItemView { background:%1; color:%2; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL));
+ combo->setStyleSheet(combo_ss());
// Populate from saved profiles
auto profiles_result = LlmProfileRepository::instance().list_profiles();
@@ -103,7 +181,7 @@ QWidget* QuantModulePanel::build_llm_picker(QWidget* parent, QComboBox** out_com
}
}
if (combo->count() == 0)
- combo->addItem("No LLM profiles — configure in Settings → LLM Config", QString());
+ combo->addItem("No LLM profiles — configure in Settings → LLM Config", QVariant());
// Pre-select the global default if present
auto resolved = LlmProfileRepository::instance().resolve_for_context("ai_quant_lab");
@@ -138,14 +216,35 @@ QJsonObject QuantModulePanel::llm_config_from_combo(QComboBox* combo) const {
// ── Constructor ──────────────────────────────────────────────────────────────
-QuantModulePanel::QuantModulePanel(const QuantModule& mod, QWidget* parent) : QWidget(parent), module_(mod) {
+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()));
- });
+ this, [this](const ui::ThemeTokens&) { refresh_theme(); });
+}
+
+void QuantModulePanel::refresh_theme() {
+ setStyleSheet(
+ QString("background:%1; color:%2;").arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY()));
+
+ if (panel_header_)
+ panel_header_->setStyleSheet(
+ QString("background:%1; border-bottom:1px solid %2;")
+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));
+
+ if (header_title_)
+ header_title_->setStyleSheet(
+ QString("color:%1; font-weight:700; letter-spacing:1px; background:transparent;")
+ .arg(module_.color.name()));
+
+ if (header_cat_)
+ header_cat_->setStyleSheet(
+ QString("color:%1; background:transparent;").arg(ui::colors::TEXT_TERTIARY()));
+
+ if (status_label_)
+ status_label_->setStyleSheet(
+ QString("color:%1; background:transparent;").arg(ui::colors::TEXT_TERTIARY()));
}
void QuantModulePanel::connect_service() {
@@ -159,34 +258,32 @@ void QuantModulePanel::build_ui() {
root->setContentsMargins(0, 0, 0, 0);
root->setSpacing(0);
- // Module header
- auto* header = new QWidget(this);
- header->setFixedHeight(36);
- header->setStyleSheet(
- QString("background:%1; border-bottom:1px solid %2;").arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM));
- auto* hhl = new QHBoxLayout(header);
+ // Module header — stored for refresh_theme()
+ panel_header_ = new QWidget(this);
+ panel_header_->setFixedHeight(36);
+ auto* hhl = new QHBoxLayout(panel_header_);
hhl->setContentsMargins(16, 0, 16, 0);
- auto* title = new QLabel(module_.label.toUpper(), header);
- title->setStyleSheet(QString("color:%1; font-size:%2px; font-weight:700; font-family:%3;"
- "letter-spacing:1px;")
- .arg(module_.color.name())
- .arg(ui::fonts::TINY)
- .arg(ui::fonts::DATA_FAMILY));
- hhl->addWidget(title);
- auto* div = new QWidget(header);
+ hhl->setSpacing(8);
+
+ header_title_ = new QLabel(module_.label.toUpper(), panel_header_);
+ hhl->addWidget(header_title_);
+
+ auto* div = new QWidget(panel_header_);
+ div->setObjectName("panelHeaderDiv");
div->setFixedSize(1, 14);
- div->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_DIM));
hhl->addWidget(div);
- auto* cat = new QLabel(module_.category, header);
- cat->setStyleSheet(
- QString("color:%1; font-family:%2;").arg(ui::colors::TEXT_TERTIARY).arg(ui::fonts::DATA_FAMILY));
- hhl->addWidget(cat);
+
+ QString cat_label = module_.category;
+ cat_label.replace('_', '/');
+ header_cat_ = new QLabel(cat_label, panel_header_);
+ hhl->addWidget(header_cat_);
+
hhl->addStretch();
- status_label_ = new QLabel(header);
- status_label_->setStyleSheet(
- QString("color:%1; font-family:%2;").arg(ui::colors::TEXT_TERTIARY).arg(ui::fonts::DATA_FAMILY));
+
+ status_label_ = new QLabel(panel_header_);
hhl->addWidget(status_label_);
- root->addWidget(header);
+
+ root->addWidget(panel_header_);
// Content
auto* scroll = new QScrollArea(this);
@@ -250,24 +347,7 @@ QWidget* QuantModulePanel::build_gs_quant_panel() {
vl->setSpacing(12);
auto* tabs = new QTabWidget(w);
- tabs->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 12px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700;"
- "border-bottom:2px solid %7; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL)
- .arg(module_.color.name()));
-
- auto input_style = QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }"
- "QLineEdit:focus { border-color:%6; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL)
- .arg(module_.color.name());
+ tabs->setStyleSheet(tab_ss(module_.color.name()));
// ── Risk Metrics ──
auto* risk = new QWidget;
@@ -276,7 +356,7 @@ QWidget* QuantModulePanel::build_gs_quant_panel() {
rvl->setSpacing(8);
auto* risk_returns = new QLineEdit(risk);
risk_returns->setPlaceholderText("Daily returns (comma-separated, e.g. 0.01,-0.02,0.005)");
- risk_returns->setStyleSheet(input_style);
+ risk_returns->setStyleSheet(input_ss());
text_inputs_["gs_risk_returns"] = risk_returns;
rvl->addWidget(build_input_row("Daily Returns", risk_returns, risk));
auto* risk_rf = make_double_spin(0, 20, 4.5, 2, "%", risk);
@@ -301,12 +381,12 @@ QWidget* QuantModulePanel::build_gs_quant_panel() {
pvl->setSpacing(8);
auto* port_ret = new QLineEdit(port);
port_ret->setPlaceholderText("Portfolio returns (comma-separated)");
- port_ret->setStyleSheet(input_style);
+ port_ret->setStyleSheet(input_ss());
text_inputs_["gs_port_returns"] = port_ret;
pvl->addWidget(build_input_row("Portfolio Returns", port_ret, port));
auto* bench_ret = new QLineEdit(port);
bench_ret->setPlaceholderText("Benchmark returns (comma-separated)");
- bench_ret->setStyleSheet(input_style);
+ bench_ret->setStyleSheet(input_ss());
text_inputs_["gs_bench_returns"] = bench_ret;
pvl->addWidget(build_input_row("Benchmark Returns", bench_ret, port));
auto* port_run = make_run_button("ANALYZE PORTFOLIO", port);
@@ -343,11 +423,7 @@ QWidget* QuantModulePanel::build_gs_quant_panel() {
gvl->addWidget(build_input_row("Volatility", g_vol, greeks));
auto* g_type = new QComboBox(greeks);
g_type->addItems({"call", "put"});
- g_type->setStyleSheet(QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL));
+ g_type->setStyleSheet(combo_ss());
combo_inputs_["gs_option_type"] = g_type;
gvl->addWidget(build_input_row("Option Type", g_type, greeks));
auto* greeks_run = make_run_button("CALCULATE GREEKS", greeks);
@@ -373,7 +449,7 @@ QWidget* QuantModulePanel::build_gs_quant_panel() {
vvl->setSpacing(8);
auto* var_ret = new QLineEdit(var);
var_ret->setPlaceholderText("Daily returns (comma-separated)");
- var_ret->setStyleSheet(input_style);
+ var_ret->setStyleSheet(input_ss());
text_inputs_["gs_var_returns"] = var_ret;
vvl->addWidget(build_input_row("Daily Returns", var_ret, var));
auto* var_pos = make_double_spin(0, 1e12, 1e6, 0, "", var);
@@ -402,7 +478,7 @@ QWidget* QuantModulePanel::build_gs_quant_panel() {
svl->setSpacing(8);
auto* st_ret = new QLineEdit(stress);
st_ret->setPlaceholderText("Daily returns (comma-separated)");
- st_ret->setStyleSheet(input_style);
+ st_ret->setStyleSheet(input_ss());
text_inputs_["gs_stress_returns"] = st_ret;
svl->addWidget(build_input_row("Daily Returns", st_ret, stress));
auto* st_pos = make_double_spin(0, 1e12, 1e6, 0, "", stress);
@@ -436,7 +512,7 @@ QWidget* QuantModulePanel::build_gs_quant_panel() {
bvl->addWidget(build_input_row("Strategy", bt_strat, bt));
auto* bt_ticker = new QLineEdit(bt);
bt_ticker->setPlaceholderText("AAPL");
- bt_ticker->setStyleSheet(input_style);
+ bt_ticker->setStyleSheet(input_ss());
text_inputs_["gs_bt_ticker"] = bt_ticker;
bvl->addWidget(build_input_row("Ticker", bt_ticker, bt));
auto* bt_capital = make_double_spin(1000, 1e12, 100000, 0, "", bt);
@@ -445,11 +521,7 @@ QWidget* QuantModulePanel::build_gs_quant_panel() {
auto* bt_lookback = new QSpinBox(bt);
bt_lookback->setRange(5, 252);
bt_lookback->setValue(20);
- bt_lookback->setStyleSheet(QString("QSpinBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL));
+ bt_lookback->setStyleSheet(spinbox_ss());
int_inputs_["gs_bt_lookback"] = bt_lookback;
bvl->addWidget(build_input_row("Lookback Period", bt_lookback, bt));
auto* bt_run = make_run_button("RUN BACKTEST", bt);
@@ -473,7 +545,7 @@ QWidget* QuantModulePanel::build_gs_quant_panel() {
stvl->setSpacing(8);
auto* st_vals = new QLineEdit(stats);
st_vals->setPlaceholderText("Values (comma-separated, e.g. 10.5,11.2,9.8)");
- st_vals->setStyleSheet(input_style);
+ st_vals->setStyleSheet(input_ss());
text_inputs_["gs_stats_values"] = st_vals;
stvl->addWidget(build_input_row("Values", st_vals, stats));
auto* stats_run = make_run_button("CALCULATE STATISTICS", stats);
@@ -508,12 +580,6 @@ QWidget* QuantModulePanel::build_cfa_quant_panel() {
vl->setContentsMargins(16, 16, 16, 16);
vl->setSpacing(12);
- auto input_style = QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL);
-
// Data input
auto* data_lbl = new QLabel("DATA INPUT", w);
data_lbl->setStyleSheet(QString("color:%1; font-weight:700; font-family:%2;"
@@ -524,7 +590,7 @@ QWidget* QuantModulePanel::build_cfa_quant_panel() {
auto* symbol = new QLineEdit(w);
symbol->setPlaceholderText("Ticker symbol (e.g. AAPL) or comma-separated values");
- symbol->setStyleSheet(input_style);
+ symbol->setStyleSheet(input_ss());
text_inputs_["cfa_symbol"] = symbol;
vl->addWidget(build_input_row("Symbol / Data", symbol, w));
@@ -532,11 +598,7 @@ QWidget* QuantModulePanel::build_cfa_quant_panel() {
auto* analysis_type = new QComboBox(w);
analysis_type->addItems({"trend_analysis", "stationarity_test", "arima_model", "forecasting", "supervised_learning",
"unsupervised_learning", "resampling_methods", "validate_data"});
- analysis_type->setStyleSheet(QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL));
+ analysis_type->setStyleSheet(combo_ss());
combo_inputs_["cfa_analysis"] = analysis_type;
vl->addWidget(build_input_row("Analysis Type", analysis_type, w));
@@ -570,37 +632,29 @@ QWidget* QuantModulePanel::build_backtesting_panel() {
vl->setContentsMargins(16, 16, 16, 16);
vl->setSpacing(12);
- auto input_style = QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL);
+
auto* strat = new QComboBox(w);
strat->addItems({"topk_dropout", "weight_based", "enhanced_indexing"});
- strat->setStyleSheet(QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL));
+ strat->setStyleSheet(combo_ss());
combo_inputs_["bt_strategy"] = strat;
vl->addWidget(build_input_row("Strategy", strat, w));
auto* instruments = new QLineEdit(w);
instruments->setPlaceholderText("AAPL,MSFT,GOOG,AMZN");
- instruments->setStyleSheet(input_style);
+ instruments->setStyleSheet(input_ss());
text_inputs_["bt_instruments"] = instruments;
vl->addWidget(build_input_row("Instruments", instruments, w));
auto* start_date = new QLineEdit(w);
start_date->setPlaceholderText("2020-01-01");
- start_date->setStyleSheet(input_style);
+ start_date->setStyleSheet(input_ss());
text_inputs_["bt_start"] = start_date;
vl->addWidget(build_input_row("Start Date", start_date, w));
auto* end_date = new QLineEdit(w);
end_date->setPlaceholderText("2024-01-01");
- end_date->setStyleSheet(input_style);
+ end_date->setStyleSheet(input_ss());
text_inputs_["bt_end"] = end_date;
vl->addWidget(build_input_row("End Date", end_date, w));
@@ -611,17 +665,13 @@ QWidget* QuantModulePanel::build_backtesting_panel() {
auto* topk = new QSpinBox(w);
topk->setRange(1, 100);
topk->setValue(10);
- topk->setStyleSheet(QString("QSpinBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL));
+ topk->setStyleSheet(spinbox_ss());
int_inputs_["bt_topk"] = topk;
vl->addWidget(build_input_row("Top K Positions", topk, w));
auto* benchmark = new QLineEdit(w);
benchmark->setPlaceholderText("SH000300 (CSI300)");
- benchmark->setStyleSheet(input_style);
+ benchmark->setStyleSheet(input_ss());
text_inputs_["bt_benchmark"] = benchmark;
vl->addWidget(build_input_row("Benchmark", benchmark, w));
@@ -668,34 +718,22 @@ QWidget* QuantModulePanel::build_rl_trading_panel() {
auto* algo = new QComboBox(w);
algo->addItems({"PPO", "DQN", "A2C", "SAC", "TD3"});
- algo->setStyleSheet(QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL));
+ algo->setStyleSheet(combo_ss());
combo_inputs_["rl_algo"] = algo;
vl->addWidget(build_input_row("RL Algorithm", algo, w));
- auto input_style = QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL);
+
auto* ticker = new QLineEdit(w);
ticker->setPlaceholderText("AAPL");
- ticker->setStyleSheet(input_style);
+ ticker->setStyleSheet(input_ss());
text_inputs_["rl_ticker"] = ticker;
vl->addWidget(build_input_row("Ticker", ticker, w));
auto* episodes = new QSpinBox(w);
episodes->setRange(10, 10000);
episodes->setValue(100);
- episodes->setStyleSheet(QString("QSpinBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL));
+ episodes->setStyleSheet(spinbox_ss());
int_inputs_["rl_episodes"] = episodes;
vl->addWidget(build_input_row("Training Episodes", episodes, w));
@@ -743,22 +781,14 @@ QWidget* QuantModulePanel::build_advanced_models_panel() {
auto* model_type = new QComboBox(w);
model_type->addItems(
{"LSTM", "GRU", "Transformer", "Localformer", "HIST", "GAT", "LightGBM", "XGBoost", "CatBoost"});
- model_type->setStyleSheet(QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL));
+ model_type->setStyleSheet(combo_ss());
combo_inputs_["adv_model"] = model_type;
vl->addWidget(build_input_row("Model Type", model_type, w));
auto* hidden = new QSpinBox(w);
hidden->setRange(16, 1024);
hidden->setValue(64);
- hidden->setStyleSheet(QString("QSpinBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL));
+ hidden->setStyleSheet(spinbox_ss());
int_inputs_["adv_hidden"] = hidden;
vl->addWidget(build_input_row("Hidden Size", hidden, w));
@@ -827,22 +857,9 @@ QWidget* QuantModulePanel::build_deep_agent_panel() {
llm_bar_l->addWidget(build_llm_picker(llm_bar, &llm_combo));
vl->addWidget(llm_bar);
- auto tab_style = QString(
- "QTabWidget::pane { border:none; background:%1; }"
- "QTabBar::tab { background:%2; color:%3; padding:7px 16px;"
- "font-family:%4; font-size:%5px; border:1px solid %6; border-bottom:none; margin-right:2px; }"
- "QTabBar::tab:selected { background:%1; color:%7; font-weight:700;"
- "border-bottom:2px solid %7; }"
- "QTabBar::tab:hover { color:%3; background:%2; }")
- .arg(ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL)
- .arg(ui::colors::BORDER_DIM)
- .arg(module_.color.name());
auto* tabs = new QTabWidget(w);
- tabs->setStyleSheet(tab_style);
+ tabs->setStyleSheet(tab_ss(module_.color.name()));
// ── Tab 1: LangGraph Deep Analysis ──────────────────────────────────────
auto* da_w = new QWidget(tabs);
@@ -875,13 +892,7 @@ QWidget* QuantModulePanel::build_deep_agent_panel() {
auto* agent_type = new QComboBox(da_w);
agent_type->addItems({"general", "research", "trading_strategy", "portfolio_management", "risk_assessment"});
- agent_type->setStyleSheet(QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 8px; }"
- "QComboBox::drop-down { border:none; }"
- "QComboBox QAbstractItemView { background:%1; color:%2; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL));
+ agent_type->setStyleSheet(combo_ss());
combo_inputs_["agent_type"] = agent_type;
da_vl->addWidget(build_input_row("Agent Type", agent_type, da_w));
@@ -917,11 +928,7 @@ QWidget* QuantModulePanel::build_deep_agent_panel() {
agent_output_->setReadOnly(true);
agent_output_->setPlaceholderText("Analysis results will appear here...");
agent_output_->setMinimumHeight(300);
- agent_output_->setStyleSheet(QString("QTextEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:12px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL));
+ agent_output_->setStyleSheet(output_ss());
da_vl->addWidget(agent_output_, 1);
auto* rc = new QWidget(da_w);
@@ -950,37 +957,11 @@ QWidget* QuantModulePanel::build_rd_agent_tab(QComboBox* llm_combo) {
vl->setSpacing(0);
// shared styles
- auto input_style = QString("QLineEdit,QTextEdit,QSpinBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }"
- "QLineEdit:focus,QTextEdit:focus { border-color:%6; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL)
- .arg(module_.color.name());
- auto combo_style = QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 8px; }"
- "QComboBox::drop-down { border:none; }"
- "QComboBox QAbstractItemView { background:%1; color:%2; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL);
-
- auto sub_tab_style = QString(
- "QTabWidget::pane { border:none; background:%1; }"
- "QTabBar::tab { background:%2; color:%3; padding:5px 12px;"
- "font-family:%4; font-size:%5px; border:1px solid %6; border-bottom:none; margin-right:1px; }"
- "QTabBar::tab:selected { background:%1; color:%7; font-weight:700; }"
- "QTabBar { background:%2; }")
- .arg(ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::TINY)
- .arg(ui::colors::BORDER_DIM)
- .arg(module_.color.name());
+
auto* sub = new QTabWidget(w);
- sub->setStyleSheet(sub_tab_style);
+ sub->setStyleSheet(sub_tab_ss(module_.color.name()));
// ── Status bar ───────────────────────────────────────────────────────────
auto* status_bar = new QWidget(w);
@@ -1077,18 +1058,18 @@ QWidget* QuantModulePanel::build_rd_agent_tab(QComboBox* llm_combo) {
auto* fm_task = new QTextEdit(fm_w);
fm_task->setPlaceholderText("Describe the factor hypothesis...\ne.g. \"Discover momentum-based alpha factors for US equities\"");
fm_task->setFixedHeight(70);
- fm_task->setStyleSheet(input_style);
+ fm_task->setStyleSheet(input_ss());
fm_vl->addWidget(build_input_row("Task Description", fm_task, fm_w));
auto* fm_market = new QComboBox(fm_w);
fm_market->addItems({"US", "CN", "EU", "IN", "JP", "HK", "GLOBAL"});
- fm_market->setStyleSheet(combo_style);
+ fm_market->setStyleSheet(combo_ss());
fm_vl->addWidget(build_input_row("Target Market", fm_market, fm_w));
auto* fm_iter = new QSpinBox(fm_w);
fm_iter->setRange(1, 100);
fm_iter->setValue(10);
- fm_iter->setStyleSheet(input_style);
+ fm_iter->setStyleSheet(input_ss());
fm_vl->addWidget(build_input_row("Max Iterations", fm_iter, fm_w));
auto* fm_ic = make_double_spin(0.01, 0.50, 0.05, 3, "", fm_w);
@@ -1132,18 +1113,18 @@ QWidget* QuantModulePanel::build_rd_agent_tab(QComboBox* llm_combo) {
auto* mo_model = new QComboBox(mo_w);
mo_model->addItems({"lightgbm", "xgboost", "lstm", "gru", "transformer", "tcn"});
- mo_model->setStyleSheet(combo_style);
+ mo_model->setStyleSheet(combo_ss());
mo_vl->addWidget(build_input_row("Model Type", mo_model, mo_w));
auto* mo_target = new QComboBox(mo_w);
mo_target->addItems({"sharpe", "ic", "max_drawdown", "win_rate", "calmar_ratio"});
- mo_target->setStyleSheet(combo_style);
+ mo_target->setStyleSheet(combo_ss());
mo_vl->addWidget(build_input_row("Optimize For", mo_target, mo_w));
auto* mo_iter = new QSpinBox(mo_w);
mo_iter->setRange(1, 100);
mo_iter->setValue(10);
- mo_iter->setStyleSheet(input_style);
+ mo_iter->setStyleSheet(input_ss());
mo_vl->addWidget(build_input_row("Max Iterations", mo_iter, mo_w));
auto* mo_run = make_run_button("START MODEL OPTIMIZATION", mo_w);
@@ -1182,18 +1163,18 @@ QWidget* QuantModulePanel::build_rd_agent_tab(QComboBox* llm_combo) {
auto* qr_goal = new QTextEdit(qr_w);
qr_goal->setPlaceholderText("Research goal...\ne.g. \"Build a quantitative equity strategy for mid-cap US stocks\"");
qr_goal->setFixedHeight(70);
- qr_goal->setStyleSheet(input_style);
+ qr_goal->setStyleSheet(input_ss());
qr_vl->addWidget(build_input_row("Research Goal", qr_goal, qr_w));
auto* qr_market = new QComboBox(qr_w);
qr_market->addItems({"US", "CN", "EU", "IN", "JP", "HK", "GLOBAL"});
- qr_market->setStyleSheet(combo_style);
+ qr_market->setStyleSheet(combo_ss());
qr_vl->addWidget(build_input_row("Target Market", qr_market, qr_w));
auto* qr_iter = new QSpinBox(qr_w);
qr_iter->setRange(1, 100);
qr_iter->setValue(15);
- qr_iter->setStyleSheet(input_style);
+ qr_iter->setStyleSheet(input_ss());
qr_vl->addWidget(build_input_row("Max Iterations", qr_iter, qr_w));
auto* qr_run = make_run_button("START QUANT RESEARCH", qr_w);
@@ -1230,7 +1211,7 @@ QWidget* QuantModulePanel::build_rd_agent_tab(QComboBox* llm_combo) {
auto* filter_combo = new QComboBox(tm_toolbar);
filter_combo->addItems({"All", "running", "completed", "stopped", "failed"});
filter_combo->setFixedWidth(120);
- filter_combo->setStyleSheet(combo_style);
+ filter_combo->setStyleSheet(combo_ss());
tm_hl->addWidget(filter_combo);
auto* refresh_btn = new QPushButton("REFRESH", tm_toolbar);
@@ -1247,7 +1228,7 @@ QWidget* QuantModulePanel::build_rd_agent_tab(QComboBox* llm_combo) {
auto* task_id_input = new QLineEdit(tm_toolbar);
task_id_input->setPlaceholderText("Task ID...");
- task_id_input->setStyleSheet(input_style);
+ task_id_input->setStyleSheet(input_ss());
task_id_input->setFixedWidth(200);
tm_hl->addWidget(task_id_input);
@@ -1289,18 +1270,7 @@ QWidget* QuantModulePanel::build_rd_agent_tab(QComboBox* llm_combo) {
rd_task_table_->setSelectionBehavior(QAbstractItemView::SelectRows);
rd_task_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);
rd_task_table_->setAlternatingRowColors(true);
- rd_task_table_->setStyleSheet(
- QString("QTableWidget { background:%1; color:%2; border:1px solid %3; gridline-color:%3;"
- "font-family:%4; font-size:%5px; alternate-background-color:%6; }"
- "QHeaderView::section { background:%7; color:%8; border:none; border-bottom:1px solid %3;"
- "padding:4px 8px; font-weight:700; font-family:%4; font-size:%5px; }"
- "QTableWidget::item:selected { background:%9; color:%2; }")
- .arg(ui::colors::BG_SURFACE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL)
- .arg(ui::colors::BG_RAISED)
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_SECONDARY)
- .arg(module_.color.darker(150).name()));
+ rd_task_table_->setStyleSheet(table_ss());
tm_vl->addWidget(rd_task_table_, 1);
// Output area for factor results
@@ -1308,11 +1278,7 @@ QWidget* QuantModulePanel::build_rd_agent_tab(QComboBox* llm_combo) {
rd_agent_output_->setReadOnly(true);
rd_agent_output_->setPlaceholderText("Select a task and click GET FACTORS / GET MODEL to view results...");
rd_agent_output_->setFixedHeight(160);
- rd_agent_output_->setStyleSheet(QString("QTextEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:8px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL));
+ rd_agent_output_->setStyleSheet(output_ss());
tm_vl->addWidget(rd_agent_output_);
// Wire toolbar buttons
@@ -1504,18 +1470,7 @@ void QuantModulePanel::display_result(const QJsonObject& data) {
table->horizontalHeader()->setStretchLastSection(true);
table->verticalHeader()->setVisible(false);
table->setMaximumHeight(qMin(keys.size() * 30 + 30, 400));
- table->setStyleSheet(QString("QTableWidget { background:%1; color:%2; gridline-color:%3;"
- "font-family:%4; font-size:%5px; border:1px solid %3; }"
- "QTableWidget::item { padding:4px 8px; }"
- "QHeaderView::section { background:%6; color:%7; font-weight:700;"
- "padding:4px 8px; border:1px solid %3; font-family:%4; font-size:%5px; }"
- "QTableWidget::item:alternate { background:%8; }")
- .arg(ui::colors::BG_SURFACE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL)
- .arg(ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY)
- .arg(ui::colors::ROW_ALT));
+ table->setStyleSheet(table_ss());
for (int r = 0; r < keys.size(); ++r) {
auto label = keys[r];
@@ -1534,11 +1489,7 @@ void QuantModulePanel::display_result(const QJsonObject& data) {
raw->setReadOnly(true);
raw->setMaximumHeight(200);
raw->setPlainText(QJsonDocument(data).toJson(QJsonDocument::Indented));
- raw->setStyleSheet(QString("QTextEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:8px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL));
+ raw->setStyleSheet(output_ss());
results_layout_->addWidget(raw);
// Export button — saves raw JSON to File Manager
@@ -1798,8 +1749,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; white-space:pre;")
- .arg(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(QString("%1 factors").arg(factors.size()));
return;
@@ -1813,8 +1763,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
if (!warning.isEmpty()) summary += QString("\n⚠ %1").arg(warning);
auto* lbl = new QLabel(summary, this);
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(QString("%1 records").arg(total));
return;
@@ -1825,8 +1774,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
for (const auto& i : instruments) names << i.toString();
auto* lbl = new QLabel(QString("Instruments (%1): %2").arg(names.size()).arg(names.join(", ")), this);
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(QString("%1 instruments").arg(names.size()));
return;
@@ -1849,8 +1797,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
if (models.isEmpty()) out += "No models listed (check qlib availability)";
auto* lbl = new QLabel(out, this);
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(QString("%1 models").arg(models.size()));
return;
@@ -1867,8 +1814,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
.arg(available.join(", "))
.arg(unavailable.join(", ")), this);
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(qlib_ok ? "Qlib ready" : "Qlib unavailable");
return;
@@ -1881,8 +1827,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
out += QString(" %1: %2\n").arg(it.key()).arg(it.value().toDouble(), 0, 'f', 4);
auto* lbl = new QLabel(out, this);
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(QString("Trained: %1").arg(model_id));
return;
@@ -1907,8 +1852,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
if (!warning.isEmpty()) out += QString("\n⚠ %1").arg(warning);
auto* lbl = new QLabel(out, this);
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(QString("%1 records").arg(total));
return;
@@ -1925,8 +1869,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(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(QString("%1 factors").arg(factors.size()));
return;
@@ -1942,8 +1885,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
out += QString("• %-20s %1\n").arg(p.second, 0, 'f', 4).arg(p.first, -20);
auto* lbl = new QLabel(out, this);
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText("Feature importance loaded");
return;
@@ -1969,8 +1911,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(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(QString("%1 model(s)").arg(models.size()));
return;
@@ -1979,8 +1920,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
auto* lbl = new QLabel(
QString("Created: %1 [%2]")
.arg(data["model_id"].toString(), data["model_type"].toString()), this);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText("Model created");
return;
@@ -2000,9 +1940,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
.arg(data["error"].toDouble(), 0, 'f', 6);
auto* lbl = new QLabel(out, this);
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(drift ? QString("" + QString(ui::colors::NEGATIVE()) + "") : ui::colors::TEXT_PRIMARY)
- .arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(drift ? ui::colors::NEGATIVE() : ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(drift ? "⚠ Drift detected" : QString("MAE: %1").arg(mae, 0, 'f', 4));
return;
@@ -2011,8 +1949,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
auto pred = data["prediction"];
auto* lbl = new QLabel(
QString("Prediction: %1").arg(pred.isNull() ? "N/A" : QString::number(pred.toDouble(), 'f', 6)), this);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3; font-weight:700;")
- .arg(module_.color.name()).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1; font-weight:700;").arg(module_.color.name()));
results_layout_->addWidget(lbl);
status_label_->setText("Prediction ready");
return;
@@ -2028,8 +1965,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
.arg(drift ? "DETECTED" : "none")
.arg(data["last_updated"].isNull() ? "never" : data["last_updated"].toString()), this);
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(QString("MAE: %1").arg(mae, 0, 'f', 4));
return;
@@ -2052,8 +1988,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(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(QString("%1 models").arg(models.size()));
return;
@@ -2074,8 +2009,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(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(QString("Best: %1").arg(best));
return;
@@ -2086,8 +2020,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
.arg(data["ensemble_id"].toString("-"), data["method"].toString("-"))
.arg(data["models"].toArray().size()), this);
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText("Ensemble created");
return;
@@ -2100,8 +2033,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
out += QString(" %1: %2\n").arg(it.key()).arg(it.value().toVariant().toString());
auto* lbl = new QLabel(out, this);
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(QString("Best score: %1").arg(best_score, 0, 'f', 4));
return;
@@ -2119,8 +2051,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(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(QString("%1 result(s)").arg(results.size()));
return;
@@ -2136,8 +2067,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
auto* lbl = new QLabel(
QString("Order book created for %1 (depth: %2)")
.arg(data["symbol"].toString()).arg(data["depth"].toInt(10)), this);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText("Order book ready");
return;
@@ -2162,8 +2092,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(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(QString("Spread: %1").arg(spread.isNull() ? "N/A" : QString::number(spread.toDouble(), 'f', 4)));
return;
@@ -2177,8 +2106,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
.arg(bid_p, 0, 'f', 4).arg(ask_p, 0, 'f', 4)
.arg(spread, 0, 'f', 4).arg(data["mid_price"].toDouble(), 0, 'f', 4), this);
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(QString("Bid: %1 / Ask: %2").arg(bid_p, 0, 'f', 4).arg(ask_p, 0, 'f', 4));
return;
@@ -2192,9 +2120,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
.arg(pin, 0, 'f', 4)
.arg(data["classification"].toString("-")), this);
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(is_toxic ? QString("" + QString(ui::colors::NEGATIVE()) + "") : ui::colors::TEXT_PRIMARY)
- .arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(is_toxic ? ui::colors::NEGATIVE() : ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(is_toxic ? "⚠ Toxic flow detected" : "Flow normal");
return;
@@ -2207,8 +2133,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
QString("Order Executed\nFilled: %1 | Avg Price: %2\nFills: %3")
.arg(filled_qty, 0, 'f', 0).arg(avg_price, 0, 'f', 4).arg(fills.size()), this);
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(QString("Filled %1 @ %2").arg(filled_qty, 0, 'f', 0).arg(avg_price, 0, 'f', 4));
return;
@@ -2233,8 +2158,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(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText(QString("%1 schedule(s)").arg(schedules.size()));
return;
@@ -2247,8 +2171,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
.arg(sched["window"].toInt())
.arg(sched["next_run"].toString()), this);
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText("Schedule created");
return;
@@ -2256,8 +2179,7 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& comman
if (command == "retrain") {
auto* lbl = new QLabel(
QString("Retrain complete: %1\n%2").arg(data["model_id"].toString(), data["message"].toString()), this);
- lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
- .arg(ui::colors::TEXT_PRIMARY).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));
results_layout_->addWidget(lbl);
status_label_->setText("Retrain complete");
return;
@@ -2283,19 +2205,9 @@ QWidget* QuantModulePanel::build_feature_engineering_panel() {
vl->setSpacing(12);
auto* tabs = new QTabWidget(w);
- tabs->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 12px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY).arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL).arg(module_.color.name()));
-
- auto input_style = QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }"
- "QLineEdit:focus { border-color:%6; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL).arg(module_.color.name());
+ tabs->setStyleSheet(tab_ss(module_.color.name()));
+
+
// ── Indicators tab ──
auto* ind = new QWidget;
@@ -2305,27 +2217,21 @@ QWidget* QuantModulePanel::build_feature_engineering_panel() {
auto* ind_data = new QLineEdit(ind);
ind_data->setPlaceholderText("Price data (comma-separated, e.g. 100,102,101,105,108)");
- ind_data->setStyleSheet(input_style);
+ ind_data->setStyleSheet(input_ss());
text_inputs_["fe_data"] = ind_data;
ivl->addWidget(build_input_row("Price Data", ind_data, ind));
auto* ind_indicator = new QComboBox(ind);
ind_indicator->addItems({"moving_average", "rsi", "macd", "bollinger_bands",
"momentum", "volatility", "returns", "log_returns", "drawdown"});
- ind_indicator->setStyleSheet(QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL));
+ ind_indicator->setStyleSheet(combo_ss());
combo_inputs_["fe_indicator"] = ind_indicator;
ivl->addWidget(build_input_row("Indicator", ind_indicator, ind));
auto* ind_window = new QSpinBox(ind);
ind_window->setRange(2, 200);
ind_window->setValue(14);
- ind_window->setStyleSheet(QString("QSpinBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL));
+ ind_window->setStyleSheet(spinbox_ss());
int_inputs_["fe_window"] = ind_window;
ivl->addWidget(build_input_row("Window", ind_window, ind));
@@ -2350,23 +2256,20 @@ QWidget* QuantModulePanel::build_feature_engineering_panel() {
auto* sel_features = new QLineEdit(sel);
sel_features->setPlaceholderText("Feature values JSON: {\"rsi\":[...],\"macd\":[...]}");
- sel_features->setStyleSheet(input_style);
+ sel_features->setStyleSheet(input_ss());
text_inputs_["fe_sel_features"] = sel_features;
svl->addWidget(build_input_row("Features (JSON)", sel_features, sel));
auto* sel_returns = new QLineEdit(sel);
sel_returns->setPlaceholderText("Target returns (comma-separated)");
- sel_returns->setStyleSheet(input_style);
+ sel_returns->setStyleSheet(input_ss());
text_inputs_["fe_sel_returns"] = sel_returns;
svl->addWidget(build_input_row("Returns", sel_returns, sel));
auto* sel_topk = new QSpinBox(sel);
sel_topk->setRange(1, 50);
sel_topk->setValue(5);
- sel_topk->setStyleSheet(QString("QSpinBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL));
+ sel_topk->setStyleSheet(spinbox_ss());
int_inputs_["fe_topk"] = sel_topk;
svl->addWidget(build_input_row("Top-K Features", sel_topk, sel));
@@ -2393,13 +2296,13 @@ QWidget* QuantModulePanel::build_feature_engineering_panel() {
auto* expr_data = new QLineEdit(expr);
expr_data->setPlaceholderText("{\"close\":[100,102,...],\"volume\":[1000,1200,...]}");
- expr_data->setStyleSheet(input_style);
+ expr_data->setStyleSheet(input_ss());
text_inputs_["fe_expr_data"] = expr_data;
evl->addWidget(build_input_row("OHLCV Data (JSON)", expr_data, expr));
auto* expr_expr = new QLineEdit(expr);
expr_expr->setPlaceholderText("e.g. Mean(close, 5) / Std(close, 20)");
- expr_expr->setStyleSheet(input_style);
+ expr_expr->setStyleSheet(input_ss());
text_inputs_["fe_expression"] = expr_expr;
evl->addWidget(build_input_row("Expression", expr_expr, expr));
@@ -2433,19 +2336,9 @@ QWidget* QuantModulePanel::build_portfolio_opt_panel() {
vl->setSpacing(12);
auto* tabs = new QTabWidget(w);
- tabs->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 12px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY).arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL).arg(module_.color.name()));
-
- auto input_style = QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }"
- "QLineEdit:focus { border-color:%6; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL).arg(module_.color.name());
+ tabs->setStyleSheet(tab_ss(module_.color.name()));
+
+
// ── Shared covariance / returns helper ──
auto make_cov_tab = [&](const QString& method_id, const QString& btn_label,
@@ -2457,20 +2350,20 @@ QWidget* QuantModulePanel::build_portfolio_opt_panel() {
auto* assets_in = new QLineEdit(t);
assets_in->setPlaceholderText("Asset names (comma-separated, e.g. AAPL,GOOG,MSFT)");
- assets_in->setStyleSheet(input_style);
+ assets_in->setStyleSheet(input_ss());
text_inputs_[method_id + "_assets"] = assets_in;
tvl->addWidget(build_input_row("Assets", assets_in, t));
auto* cov_in = new QLineEdit(t);
cov_in->setPlaceholderText("Covariance matrix JSON: [[0.04,0.01],[0.01,0.09]]");
- cov_in->setStyleSheet(input_style);
+ cov_in->setStyleSheet(input_ss());
text_inputs_[method_id + "_cov"] = cov_in;
tvl->addWidget(build_input_row("Covariance Matrix", cov_in, t));
if (needs_returns) {
auto* ret_in = new QLineEdit(t);
ret_in->setPlaceholderText("Expected returns (comma-separated, e.g. 0.10,0.15,0.12)");
- ret_in->setStyleSheet(input_style);
+ ret_in->setStyleSheet(input_ss());
text_inputs_[method_id + "_returns"] = ret_in;
tvl->addWidget(build_input_row("Expected Returns", ret_in, t));
}
@@ -2515,27 +2408,27 @@ QWidget* QuantModulePanel::build_portfolio_opt_panel() {
blvl->setSpacing(8);
auto* bl_assets = new QLineEdit(bl);
bl_assets->setPlaceholderText("Asset names (comma-separated)");
- bl_assets->setStyleSheet(input_style);
+ bl_assets->setStyleSheet(input_ss());
text_inputs_["bl_assets"] = bl_assets;
blvl->addWidget(build_input_row("Assets", bl_assets, bl));
auto* bl_caps = new QLineEdit(bl);
bl_caps->setPlaceholderText("Market caps (comma-separated, e.g. 2000,1500,800)");
- bl_caps->setStyleSheet(input_style);
+ bl_caps->setStyleSheet(input_ss());
text_inputs_["bl_caps"] = bl_caps;
blvl->addWidget(build_input_row("Market Caps ($B)", bl_caps, bl));
auto* bl_cov = new QLineEdit(bl);
bl_cov->setPlaceholderText("Covariance matrix JSON: [[0.04,0.01],[0.01,0.09]]");
- bl_cov->setStyleSheet(input_style);
+ bl_cov->setStyleSheet(input_ss());
text_inputs_["bl_cov"] = bl_cov;
blvl->addWidget(build_input_row("Covariance Matrix", bl_cov, bl));
auto* bl_views = new QLineEdit(bl);
bl_views->setPlaceholderText("Views (comma-separated, e.g. 0.05,0.10)");
- bl_views->setStyleSheet(input_style);
+ bl_views->setStyleSheet(input_ss());
text_inputs_["bl_views"] = bl_views;
blvl->addWidget(build_input_row("Views", bl_views, bl));
auto* bl_conf = new QLineEdit(bl);
bl_conf->setPlaceholderText("View confidences (e.g. 0.8,0.6)");
- bl_conf->setStyleSheet(input_style);
+ bl_conf->setStyleSheet(input_ss());
text_inputs_["bl_conf"] = bl_conf;
blvl->addWidget(build_input_row("View Confidences", bl_conf, bl));
auto* bl_run = make_run_button("RUN BLACK-LITTERMAN", bl);
@@ -2575,19 +2468,9 @@ QWidget* QuantModulePanel::build_factor_evaluation_panel() {
vl->setSpacing(12);
auto* tabs = new QTabWidget(w);
- tabs->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 12px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY).arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL).arg(module_.color.name()));
-
- auto input_style = QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }"
- "QLineEdit:focus { border-color:%6; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL).arg(module_.color.name());
+ tabs->setStyleSheet(tab_ss(module_.color.name()));
+
+
// ── IC Metrics tab ──
auto* ic = new QWidget;
@@ -2596,20 +2479,17 @@ QWidget* QuantModulePanel::build_factor_evaluation_panel() {
icvl->setSpacing(8);
auto* ic_preds = new QLineEdit(ic);
ic_preds->setPlaceholderText("Predictions (comma-separated, e.g. 0.1,0.2,-0.1,0.3)");
- ic_preds->setStyleSheet(input_style);
+ ic_preds->setStyleSheet(input_ss());
text_inputs_["ev_predictions"] = ic_preds;
icvl->addWidget(build_input_row("Predictions", ic_preds, ic));
auto* ic_rets = new QLineEdit(ic);
ic_rets->setPlaceholderText("Actual returns (comma-separated)");
- ic_rets->setStyleSheet(input_style);
+ ic_rets->setStyleSheet(input_ss());
text_inputs_["ev_returns"] = ic_rets;
icvl->addWidget(build_input_row("Returns", ic_rets, ic));
auto* ic_method = new QComboBox(ic);
ic_method->addItems({"pearson", "spearman"});
- ic_method->setStyleSheet(QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL));
+ ic_method->setStyleSheet(combo_ss());
combo_inputs_["ev_ic_method"] = ic_method;
icvl->addWidget(build_input_row("Method", ic_method, ic));
auto* ic_run = make_run_button("CALCULATE IC METRICS", ic);
@@ -2635,17 +2515,17 @@ QWidget* QuantModulePanel::build_factor_evaluation_panel() {
repvl->setSpacing(8);
auto* rep_name = new QLineEdit(rep);
rep_name->setPlaceholderText("Factor name (e.g. momentum)");
- rep_name->setStyleSheet(input_style);
+ rep_name->setStyleSheet(input_ss());
text_inputs_["ev_factor_name"] = rep_name;
repvl->addWidget(build_input_row("Factor Name", rep_name, rep));
auto* rep_preds = new QLineEdit(rep);
rep_preds->setPlaceholderText("Predictions (comma-separated)");
- rep_preds->setStyleSheet(input_style);
+ rep_preds->setStyleSheet(input_ss());
text_inputs_["ev_rep_preds"] = rep_preds;
repvl->addWidget(build_input_row("Predictions", rep_preds, rep));
auto* rep_rets = new QLineEdit(rep);
rep_rets->setPlaceholderText("Returns (comma-separated)");
- rep_rets->setStyleSheet(input_style);
+ rep_rets->setStyleSheet(input_ss());
text_inputs_["ev_rep_returns"] = rep_rets;
repvl->addWidget(build_input_row("Returns", rep_rets, rep));
auto* rep_run = make_run_button("GENERATE EVALUATION REPORT", rep);
@@ -2671,12 +2551,12 @@ QWidget* QuantModulePanel::build_factor_evaluation_panel() {
riskvl->setSpacing(8);
auto* risk_rets = new QLineEdit(risk);
risk_rets->setPlaceholderText("Daily returns (comma-separated)");
- risk_rets->setStyleSheet(input_style);
+ risk_rets->setStyleSheet(input_ss());
text_inputs_["ev_risk_returns"] = risk_rets;
riskvl->addWidget(build_input_row("Returns", risk_rets, risk));
auto* risk_bench = new QLineEdit(risk);
risk_bench->setPlaceholderText("Benchmark returns (optional, comma-separated)");
- risk_bench->setStyleSheet(input_style);
+ risk_bench->setStyleSheet(input_ss());
text_inputs_["ev_risk_bench"] = risk_bench;
riskvl->addWidget(build_input_row("Benchmark (opt.)", risk_bench, risk));
auto* risk_conf = make_double_spin(0.8, 0.999, 0.95, 3, "", risk);
@@ -2718,19 +2598,9 @@ QWidget* QuantModulePanel::build_strategy_builder_panel() {
vl->setSpacing(12);
auto* tabs = new QTabWidget(w);
- tabs->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 12px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY).arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL).arg(module_.color.name()));
-
- auto input_style = QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }"
- "QLineEdit:focus { border-color:%6; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL).arg(module_.color.name());
+ tabs->setStyleSheet(tab_ss(module_.color.name()));
+
+
// ── TopK-Dropout ──
auto* topk = new QWidget;
@@ -2739,15 +2609,12 @@ QWidget* QuantModulePanel::build_strategy_builder_panel() {
tkvl->setSpacing(8);
auto* tk_signal = new QLineEdit(topk);
tk_signal->setPlaceholderText("Signal values (comma-separated)");
- tk_signal->setStyleSheet(input_style);
+ tk_signal->setStyleSheet(input_ss());
text_inputs_["st_tk_signal"] = tk_signal;
tkvl->addWidget(build_input_row("Signal", tk_signal, topk));
auto* tk_topk = new QSpinBox(topk);
tk_topk->setRange(1, 500); tk_topk->setValue(50);
- tk_topk->setStyleSheet(QString("QSpinBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL));
+ tk_topk->setStyleSheet(spinbox_ss());
int_inputs_["st_topk"] = tk_topk;
tkvl->addWidget(build_input_row("Top-K", tk_topk, topk));
auto* tk_drop = new QSpinBox(topk);
@@ -2777,7 +2644,7 @@ QWidget* QuantModulePanel::build_strategy_builder_panel() {
rpvl->setSpacing(8);
auto* rp_returns = new QLineEdit(rp);
rp_returns->setPlaceholderText("Asset returns matrix JSON: [[0.01,-0.02,...],[...]]");
- rp_returns->setStyleSheet(input_style);
+ rp_returns->setStyleSheet(input_ss());
text_inputs_["st_rp_returns"] = rp_returns;
rpvl->addWidget(build_input_row("Returns Matrix", rp_returns, rp));
auto* rp_target = make_double_spin(0.01, 1.0, 0.10, 2, "", rp);
@@ -2785,10 +2652,7 @@ QWidget* QuantModulePanel::build_strategy_builder_panel() {
rpvl->addWidget(build_input_row("Target Risk", rp_target, rp));
auto* rp_freq = new QComboBox(rp);
rp_freq->addItems({"monthly", "weekly", "daily", "quarterly"});
- rp_freq->setStyleSheet(QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL));
+ rp_freq->setStyleSheet(combo_ss());
combo_inputs_["st_rp_freq"] = rp_freq;
rpvl->addWidget(build_input_row("Rebalance", rp_freq, rp));
auto* rp_run = make_run_button("CREATE RISK PARITY STRATEGY", rp);
@@ -2812,12 +2676,12 @@ QWidget* QuantModulePanel::build_strategy_builder_panel() {
pmvl->setSpacing(8);
auto* pm_rets = new QLineEdit(pm);
pm_rets->setPlaceholderText("Portfolio returns (comma-separated)");
- pm_rets->setStyleSheet(input_style);
+ pm_rets->setStyleSheet(input_ss());
text_inputs_["st_pm_returns"] = pm_rets;
pmvl->addWidget(build_input_row("Returns", pm_rets, pm));
auto* pm_bench = new QLineEdit(pm);
pm_bench->setPlaceholderText("Benchmark returns (optional)");
- pm_bench->setStyleSheet(input_style);
+ pm_bench->setStyleSheet(input_ss());
text_inputs_["st_pm_bench"] = pm_bench;
pmvl->addWidget(build_input_row("Benchmark (opt.)", pm_bench, pm));
auto* pm_rf = make_double_spin(0, 20, 2.0, 2, "%", pm);
@@ -2858,20 +2722,10 @@ QWidget* QuantModulePanel::build_data_processors_panel() {
vl->setContentsMargins(16, 16, 16, 16);
vl->setSpacing(12);
- auto input_style = QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }"
- "QLineEdit:focus { border-color:%6; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL).arg(module_.color.name());
+
auto* tabs = new QTabWidget(w);
- tabs->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 12px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY).arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL).arg(module_.color.name()));
+ tabs->setStyleSheet(tab_ss(module_.color.name()));
// ── List Processors ──
auto* list_tab = new QWidget;
@@ -2899,12 +2753,12 @@ QWidget* QuantModulePanel::build_data_processors_panel() {
ptvl->setSpacing(8);
auto* pipe_id = new QLineEdit(pipe_tab);
pipe_id->setPlaceholderText("Pipeline ID (e.g. my_pipeline)");
- pipe_id->setStyleSheet(input_style);
+ pipe_id->setStyleSheet(input_ss());
text_inputs_["dp_pipeline_id"] = pipe_id;
ptvl->addWidget(build_input_row("Pipeline ID", pipe_id, pipe_tab));
auto* pipe_procs = new QLineEdit(pipe_tab);
pipe_procs->setPlaceholderText(R"([{"type":"zscore"},{"type":"winsorize","lower":0.01,"upper":0.99}])");
- pipe_procs->setStyleSheet(input_style);
+ pipe_procs->setStyleSheet(input_ss());
text_inputs_["dp_processors"] = pipe_procs;
ptvl->addWidget(build_input_row("Processors (JSON)", pipe_procs, pipe_tab));
auto* pipe_run = make_run_button("CREATE PIPELINE", pipe_tab);
@@ -2927,12 +2781,12 @@ QWidget* QuantModulePanel::build_data_processors_panel() {
procvl->setSpacing(8);
auto* proc_pid = new QLineEdit(proc_tab);
proc_pid->setPlaceholderText("Pipeline ID (must be created first)");
- proc_pid->setStyleSheet(input_style);
+ proc_pid->setStyleSheet(input_ss());
text_inputs_["dp_proc_pid"] = proc_pid;
procvl->addWidget(build_input_row("Pipeline ID", proc_pid, proc_tab));
auto* proc_data = new QLineEdit(proc_tab);
proc_data->setPlaceholderText(R"({"feature_close":[100,102,...],"feature_volume":[1000,1200,...]})");
- proc_data->setStyleSheet(input_style);
+ proc_data->setStyleSheet(input_ss());
text_inputs_["dp_proc_data"] = proc_data;
procvl->addWidget(build_input_row("Data (JSON)", proc_data, proc_tab));
auto* proc_run = make_run_button("PROCESS DATA", proc_tab);
@@ -2964,19 +2818,9 @@ QWidget* QuantModulePanel::build_quant_reporting_panel() {
vl->setSpacing(12);
auto* tabs = new QTabWidget(w);
- tabs->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 12px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY).arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL).arg(module_.color.name()));
-
- auto input_style = QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }"
- "QLineEdit:focus { border-color:%6; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL).arg(module_.color.name());
+ tabs->setStyleSheet(tab_ss(module_.color.name()));
+
+
// ── IC Analysis ──
auto* ic_tab = new QWidget;
@@ -2985,20 +2829,17 @@ QWidget* QuantModulePanel::build_quant_reporting_panel() {
icvl->setSpacing(8);
auto* ic_preds = new QLineEdit(ic_tab);
ic_preds->setPlaceholderText("Predictions (comma-separated)");
- ic_preds->setStyleSheet(input_style);
+ ic_preds->setStyleSheet(input_ss());
text_inputs_["rp_ic_preds"] = ic_preds;
icvl->addWidget(build_input_row("Predictions", ic_preds, ic_tab));
auto* ic_rets = new QLineEdit(ic_tab);
ic_rets->setPlaceholderText("Returns (comma-separated)");
- ic_rets->setStyleSheet(input_style);
+ ic_rets->setStyleSheet(input_ss());
text_inputs_["rp_ic_rets"] = ic_rets;
icvl->addWidget(build_input_row("Returns", ic_rets, ic_tab));
auto* ic_method = new QComboBox(ic_tab);
ic_method->addItems({"both", "pearson", "spearman"});
- ic_method->setStyleSheet(QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL));
+ ic_method->setStyleSheet(combo_ss());
combo_inputs_["rp_ic_method"] = ic_method;
icvl->addWidget(build_input_row("Method", ic_method, ic_tab));
auto* ic_run = make_run_button("GENERATE IC ANALYSIS", ic_tab);
@@ -3024,17 +2865,17 @@ QWidget* QuantModulePanel::build_quant_reporting_panel() {
mpvl->setSpacing(8);
auto* mp_preds = new QLineEdit(mp_tab);
mp_preds->setPlaceholderText("Model predictions (comma-separated)");
- mp_preds->setStyleSheet(input_style);
+ mp_preds->setStyleSheet(input_ss());
text_inputs_["rp_mp_preds"] = mp_preds;
mpvl->addWidget(build_input_row("Predictions", mp_preds, mp_tab));
auto* mp_rets = new QLineEdit(mp_tab);
mp_rets->setPlaceholderText("Actual returns (comma-separated)");
- mp_rets->setStyleSheet(input_style);
+ mp_rets->setStyleSheet(input_ss());
text_inputs_["rp_mp_rets"] = mp_rets;
mpvl->addWidget(build_input_row("Returns", mp_rets, mp_tab));
auto* mp_name = new QLineEdit(mp_tab);
mp_name->setPlaceholderText("Model name (e.g. LightGBM)");
- mp_name->setStyleSheet(input_style);
+ mp_name->setStyleSheet(input_ss());
text_inputs_["rp_mp_name"] = mp_name;
mpvl->addWidget(build_input_row("Model Name", mp_name, mp_tab));
auto* mp_run = make_run_button("GENERATE MODEL PERFORMANCE REPORT", mp_tab);
@@ -3061,17 +2902,17 @@ QWidget* QuantModulePanel::build_quant_reporting_panel() {
crvl->setSpacing(8);
auto* cr_rets = new QLineEdit(cr_tab);
cr_rets->setPlaceholderText("Portfolio returns (comma-separated)");
- cr_rets->setStyleSheet(input_style);
+ cr_rets->setStyleSheet(input_ss());
text_inputs_["rp_cr_rets"] = cr_rets;
crvl->addWidget(build_input_row("Returns", cr_rets, cr_tab));
auto* cr_bench = new QLineEdit(cr_tab);
cr_bench->setPlaceholderText("Benchmark returns (optional, comma-separated)");
- cr_bench->setStyleSheet(input_style);
+ cr_bench->setStyleSheet(input_ss());
text_inputs_["rp_cr_bench"] = cr_bench;
crvl->addWidget(build_input_row("Benchmark (opt.)", cr_bench, cr_tab));
auto* cr_title = new QLineEdit(cr_tab);
cr_title->setPlaceholderText("Chart title (e.g. Strategy vs Benchmark)");
- cr_title->setStyleSheet(input_style);
+ cr_title->setStyleSheet(input_ss());
text_inputs_["rp_cr_title"] = cr_title;
crvl->addWidget(build_input_row("Title", cr_title, cr_tab));
auto* cr_run = make_run_button("GENERATE CUMULATIVE RETURN CHART", cr_tab);
@@ -3110,20 +2951,10 @@ QWidget* QuantModulePanel::build_factor_discovery_panel() {
vl->setContentsMargins(16, 16, 16, 16);
vl->setSpacing(12);
- auto input_style = QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }"
- "QLineEdit:focus { border-color:%6; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL).arg(module_.color.name());
+
auto* tabs = new QTabWidget(w);
- tabs->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 12px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY).arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL).arg(module_.color.name()));
+ tabs->setStyleSheet(tab_ss(module_.color.name()));
// ── Factor Library ──
auto* lib_tab = new QWidget;
@@ -3157,22 +2988,22 @@ QWidget* QuantModulePanel::build_factor_discovery_panel() {
datavl->setSpacing(8);
auto* fd_instr = new QLineEdit(data_tab);
fd_instr->setPlaceholderText("Instruments (comma-separated, e.g. aapl,msft)");
- fd_instr->setStyleSheet(input_style);
+ fd_instr->setStyleSheet(input_ss());
text_inputs_["fd_instruments"] = fd_instr;
datavl->addWidget(build_input_row("Instruments", fd_instr, data_tab));
auto* fd_fields = new QLineEdit(data_tab);
fd_fields->setPlaceholderText("Fields (comma-separated, e.g. $close,$volume,$open)");
- fd_fields->setStyleSheet(input_style);
+ fd_fields->setStyleSheet(input_ss());
text_inputs_["fd_fields"] = fd_fields;
datavl->addWidget(build_input_row("Fields", fd_fields, data_tab));
auto* fd_start = new QLineEdit(data_tab);
fd_start->setPlaceholderText("Start date (YYYY-MM-DD, e.g. 2019-01-01)");
- fd_start->setStyleSheet(input_style);
+ fd_start->setStyleSheet(input_ss());
text_inputs_["fd_start"] = fd_start;
datavl->addWidget(build_input_row("Start Date", fd_start, data_tab));
auto* fd_end = new QLineEdit(data_tab);
fd_end->setPlaceholderText("End date (YYYY-MM-DD, e.g. 2020-11-10)");
- fd_end->setStyleSheet(input_style);
+ fd_end->setStyleSheet(input_ss());
text_inputs_["fd_end"] = fd_end;
datavl->addWidget(build_input_row("End Date", fd_end, data_tab));
auto* fd_run = make_run_button("FETCH DATA", data_tab);
@@ -3202,12 +3033,12 @@ QWidget* QuantModulePanel::build_factor_discovery_panel() {
calvl->setSpacing(8);
auto* cal_start = new QLineEdit(cal_tab);
cal_start->setPlaceholderText("Start date (YYYY-MM-DD)");
- cal_start->setStyleSheet(input_style);
+ cal_start->setStyleSheet(input_ss());
text_inputs_["fd_cal_start"] = cal_start;
calvl->addWidget(build_input_row("Start Date", cal_start, cal_tab));
auto* cal_end = new QLineEdit(cal_tab);
cal_end->setPlaceholderText("End date (YYYY-MM-DD)");
- cal_end->setStyleSheet(input_style);
+ cal_end->setStyleSheet(input_ss());
text_inputs_["fd_cal_end"] = cal_end;
calvl->addWidget(build_input_row("End Date", cal_end, cal_tab));
auto* cal_run = make_run_button("GET TRADING CALENDAR", cal_tab);
@@ -3237,26 +3068,11 @@ QWidget* QuantModulePanel::build_model_library_panel() {
vl->setContentsMargins(16, 16, 16, 16);
vl->setSpacing(12);
- auto input_style = QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }"
- "QLineEdit:focus { border-color:%6; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL).arg(module_.color.name());
- auto combo_style = QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:3px 6px; }"
- "QComboBox::drop-down { border:none; }"
- "QComboBox QAbstractItemView { background:%1; color:%2; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL);
+
+
auto* tabs = new QTabWidget(w);
- tabs->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 12px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY).arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL).arg(module_.color.name()));
+ tabs->setStyleSheet(tab_ss(module_.color.name()));
// ── Model Browser ──
auto* browse_tab = new QWidget;
@@ -3289,23 +3105,23 @@ QWidget* QuantModulePanel::build_model_library_panel() {
ttvl->setContentsMargins(12, 12, 12, 12);
ttvl->setSpacing(8);
auto* ml_type = new QComboBox(train_tab);
- ml_type->setStyleSheet(combo_style);
+ ml_type->setStyleSheet(combo_ss());
ml_type->addItems({"lightgbm", "xgboost", "catboost", "linear", "lstm", "gru", "transformer"});
combo_inputs_["ml_model_type"] = ml_type;
ttvl->addWidget(build_input_row("Model Type", ml_type, train_tab));
auto* ml_instr = new QLineEdit(train_tab);
ml_instr->setPlaceholderText("Instruments (comma-separated, e.g. aapl,msft)");
- ml_instr->setStyleSheet(input_style);
+ ml_instr->setStyleSheet(input_ss());
text_inputs_["ml_instruments"] = ml_instr;
ttvl->addWidget(build_input_row("Instruments", ml_instr, train_tab));
auto* ml_start = new QLineEdit(train_tab);
ml_start->setPlaceholderText("Train start (YYYY-MM-DD)");
- ml_start->setStyleSheet(input_style);
+ ml_start->setStyleSheet(input_ss());
text_inputs_["ml_start"] = ml_start;
ttvl->addWidget(build_input_row("Start Date", ml_start, train_tab));
auto* ml_end = new QLineEdit(train_tab);
ml_end->setPlaceholderText("Train end (YYYY-MM-DD)");
- ml_end->setStyleSheet(input_style);
+ ml_end->setStyleSheet(input_ss());
text_inputs_["ml_end"] = ml_end;
ttvl->addWidget(build_input_row("End Date", ml_end, train_tab));
auto* ml_run = make_run_button("TRAIN MODEL", train_tab);
@@ -3332,22 +3148,22 @@ QWidget* QuantModulePanel::build_model_library_panel() {
btvl2->setSpacing(8);
auto* bt_model = new QLineEdit(bt_tab);
bt_model->setPlaceholderText("Model ID (from training output)");
- bt_model->setStyleSheet(input_style);
+ bt_model->setStyleSheet(input_ss());
text_inputs_["ml_bt_model"] = bt_model;
btvl2->addWidget(build_input_row("Model ID", bt_model, bt_tab));
auto* bt_instr = new QLineEdit(bt_tab);
bt_instr->setPlaceholderText("Instruments (comma-separated)");
- bt_instr->setStyleSheet(input_style);
+ bt_instr->setStyleSheet(input_ss());
text_inputs_["ml_bt_instr"] = bt_instr;
btvl2->addWidget(build_input_row("Instruments", bt_instr, bt_tab));
auto* bt_start2 = new QLineEdit(bt_tab);
bt_start2->setPlaceholderText("Backtest start (YYYY-MM-DD)");
- bt_start2->setStyleSheet(input_style);
+ bt_start2->setStyleSheet(input_ss());
text_inputs_["ml_bt_start"] = bt_start2;
btvl2->addWidget(build_input_row("Start Date", bt_start2, bt_tab));
auto* bt_end2 = new QLineEdit(bt_tab);
bt_end2->setPlaceholderText("Backtest end (YYYY-MM-DD)");
- bt_end2->setStyleSheet(input_style);
+ bt_end2->setStyleSheet(input_ss());
text_inputs_["ml_bt_end"] = bt_end2;
btvl2->addWidget(build_input_row("End Date", bt_end2, bt_tab));
auto* bt_run2 = make_run_button("RUN BACKTEST", bt_tab);
@@ -3382,20 +3198,10 @@ QWidget* QuantModulePanel::build_live_signals_panel() {
vl->setContentsMargins(16, 16, 16, 16);
vl->setSpacing(12);
- auto input_style = QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }"
- "QLineEdit:focus { border-color:%6; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL).arg(module_.color.name());
+
auto* tabs = new QTabWidget(w);
- tabs->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 12px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY).arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL).arg(module_.color.name()));
+ tabs->setStyleSheet(tab_ss(module_.color.name()));
// ── Signal Data ──
auto* sig_tab = new QWidget;
@@ -3404,22 +3210,22 @@ QWidget* QuantModulePanel::build_live_signals_panel() {
sigvl->setSpacing(8);
auto* sig_instr = new QLineEdit(sig_tab);
sig_instr->setPlaceholderText("Instruments (comma-separated, e.g. aapl,msft,goog)");
- sig_instr->setStyleSheet(input_style);
+ sig_instr->setStyleSheet(input_ss());
text_inputs_["ls_instruments"] = sig_instr;
sigvl->addWidget(build_input_row("Instruments", sig_instr, sig_tab));
auto* sig_fields = new QLineEdit(sig_tab);
sig_fields->setPlaceholderText("Fields (e.g. $close,$open,$high,$low,$volume)");
- sig_fields->setStyleSheet(input_style);
+ sig_fields->setStyleSheet(input_ss());
text_inputs_["ls_fields"] = sig_fields;
sigvl->addWidget(build_input_row("Fields", sig_fields, sig_tab));
auto* sig_start = new QLineEdit(sig_tab);
sig_start->setPlaceholderText("Start date (YYYY-MM-DD)");
- sig_start->setStyleSheet(input_style);
+ sig_start->setStyleSheet(input_ss());
text_inputs_["ls_start"] = sig_start;
sigvl->addWidget(build_input_row("Start Date", sig_start, sig_tab));
auto* sig_end = new QLineEdit(sig_tab);
sig_end->setPlaceholderText("End date (YYYY-MM-DD)");
- sig_end->setStyleSheet(input_style);
+ sig_end->setStyleSheet(input_ss());
text_inputs_["ls_end"] = sig_end;
sigvl->addWidget(build_input_row("End Date", sig_end, sig_tab));
auto* sig_run = make_run_button("FETCH SIGNALS", sig_tab);
@@ -3449,17 +3255,17 @@ QWidget* QuantModulePanel::build_live_signals_panel() {
favl->setSpacing(8);
auto* fa_instr = new QLineEdit(fa_tab);
fa_instr->setPlaceholderText("Instruments (comma-separated)");
- fa_instr->setStyleSheet(input_style);
+ fa_instr->setStyleSheet(input_ss());
text_inputs_["ls_fa_instr"] = fa_instr;
favl->addWidget(build_input_row("Instruments", fa_instr, fa_tab));
auto* fa_start = new QLineEdit(fa_tab);
fa_start->setPlaceholderText("Start date (YYYY-MM-DD)");
- fa_start->setStyleSheet(input_style);
+ fa_start->setStyleSheet(input_ss());
text_inputs_["ls_fa_start"] = fa_start;
favl->addWidget(build_input_row("Start Date", fa_start, fa_tab));
auto* fa_end = new QLineEdit(fa_tab);
fa_end->setPlaceholderText("End date (YYYY-MM-DD)");
- fa_end->setStyleSheet(input_style);
+ fa_end->setStyleSheet(input_ss());
text_inputs_["ls_fa_end"] = fa_end;
favl->addWidget(build_input_row("End Date", fa_end, fa_tab));
auto* fa_run = make_run_button("RUN FACTOR ANALYSIS", fa_tab);
@@ -3485,7 +3291,7 @@ QWidget* QuantModulePanel::build_live_signals_panel() {
fivl->setSpacing(8);
auto* fi_model = new QLineEdit(fi_tab);
fi_model->setPlaceholderText("Trained model ID");
- fi_model->setStyleSheet(input_style);
+ fi_model->setStyleSheet(input_ss());
text_inputs_["ls_fi_model"] = fi_model;
fivl->addWidget(build_input_row("Model ID", fi_model, fi_tab));
auto* fi_run = make_run_button("GET FEATURE IMPORTANCE", fi_tab);
@@ -3514,26 +3320,11 @@ QWidget* QuantModulePanel::build_online_learning_panel() {
vl->setContentsMargins(16, 16, 16, 16);
vl->setSpacing(12);
- auto input_style = QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }"
- "QLineEdit:focus { border-color:%6; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL).arg(module_.color.name());
- auto combo_style = QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:3px 6px; }"
- "QComboBox::drop-down { border:none; }"
- "QComboBox QAbstractItemView { background:%1; color:%2; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL);
+
+
auto* tabs = new QTabWidget(w);
- tabs->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 12px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY).arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL).arg(module_.color.name()));
+ tabs->setStyleSheet(tab_ss(module_.color.name()));
// ── Models ──
auto* models_tab = new QWidget;
@@ -3560,13 +3351,13 @@ QWidget* QuantModulePanel::build_online_learning_panel() {
ctvl->setContentsMargins(12, 12, 12, 12);
ctvl->setSpacing(8);
auto* ol_model_type = new QComboBox(create_tab);
- ol_model_type->setStyleSheet(combo_style);
+ ol_model_type->setStyleSheet(combo_ss());
ol_model_type->addItems({"linear", "bayesian_linear", "pa", "tree", "adaptive_tree", "bagging", "ewa", "srp"});
combo_inputs_["ol_model_type"] = ol_model_type;
ctvl->addWidget(build_input_row("Model Type", ol_model_type, create_tab));
auto* ol_model_id = new QLineEdit(create_tab);
ol_model_id->setPlaceholderText("Model ID (optional, auto-generated if blank)");
- ol_model_id->setStyleSheet(input_style);
+ ol_model_id->setStyleSheet(input_ss());
text_inputs_["ol_model_id"] = ol_model_id;
ctvl->addWidget(build_input_row("Model ID", ol_model_id, create_tab));
auto* ol_create = make_run_button("CREATE MODEL", create_tab);
@@ -3589,17 +3380,17 @@ QWidget* QuantModulePanel::build_online_learning_panel() {
ttvl->setSpacing(8);
auto* ol_tid = new QLineEdit(train_tab);
ol_tid->setPlaceholderText("Model ID");
- ol_tid->setStyleSheet(input_style);
+ ol_tid->setStyleSheet(input_ss());
text_inputs_["ol_train_id"] = ol_tid;
ttvl->addWidget(build_input_row("Model ID", ol_tid, train_tab));
auto* ol_feats = new QLineEdit(train_tab);
ol_feats->setPlaceholderText(R"({"close":94.0,"volume":1000000,"rsi":55.0})");
- ol_feats->setStyleSheet(input_style);
+ ol_feats->setStyleSheet(input_ss());
text_inputs_["ol_features"] = ol_feats;
ttvl->addWidget(build_input_row("Features (JSON)", ol_feats, train_tab));
auto* ol_target = new QLineEdit(train_tab);
ol_target->setPlaceholderText("Target value (e.g. 0.02)");
- ol_target->setStyleSheet(input_style);
+ ol_target->setStyleSheet(input_ss());
text_inputs_["ol_target"] = ol_target;
ttvl->addWidget(build_input_row("Target", ol_target, train_tab));
auto* ol_train = make_run_button("TRAIN ONE STEP", train_tab);
@@ -3623,12 +3414,12 @@ QWidget* QuantModulePanel::build_online_learning_panel() {
predvl->setSpacing(8);
auto* ol_pid = new QLineEdit(pred_tab);
ol_pid->setPlaceholderText("Model ID");
- ol_pid->setStyleSheet(input_style);
+ ol_pid->setStyleSheet(input_ss());
text_inputs_["ol_pred_id"] = ol_pid;
predvl->addWidget(build_input_row("Model ID", ol_pid, pred_tab));
auto* ol_pfeats = new QLineEdit(pred_tab);
ol_pfeats->setPlaceholderText(R"({"close":95.0,"volume":1100000,"rsi":58.0})");
- ol_pfeats->setStyleSheet(input_style);
+ ol_pfeats->setStyleSheet(input_ss());
text_inputs_["ol_pred_feats"] = ol_pfeats;
predvl->addWidget(build_input_row("Features (JSON)", ol_pfeats, pred_tab));
auto* ol_pred = make_run_button("PREDICT", pred_tab);
@@ -3667,26 +3458,11 @@ QWidget* QuantModulePanel::build_meta_learning_panel() {
vl->setContentsMargins(16, 16, 16, 16);
vl->setSpacing(12);
- auto input_style = QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }"
- "QLineEdit:focus { border-color:%6; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL).arg(module_.color.name());
- auto combo_style = QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:3px 6px; }"
- "QComboBox::drop-down { border:none; }"
- "QComboBox QAbstractItemView { background:%1; color:%2; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL);
+
+
auto* tabs = new QTabWidget(w);
- tabs->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 12px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY).arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL).arg(module_.color.name()));
+ tabs->setStyleSheet(tab_ss(module_.color.name()));
// ── Model Selection ──
auto* sel_tab = new QWidget;
@@ -3706,11 +3482,11 @@ QWidget* QuantModulePanel::build_meta_learning_panel() {
selvl->addWidget(sel_list_btn);
auto* sel_models = new QLineEdit(sel_tab);
sel_models->setPlaceholderText("Model IDs (comma-separated, e.g. lightgbm,xgboost,random_forest)");
- sel_models->setStyleSheet(input_style);
+ sel_models->setStyleSheet(input_ss());
text_inputs_["ml_sel_models"] = sel_models;
selvl->addWidget(build_input_row("Models", sel_models, sel_tab));
auto* sel_task = new QComboBox(sel_tab);
- sel_task->setStyleSheet(combo_style);
+ sel_task->setStyleSheet(combo_ss());
sel_task->addItems({"regression", "classification"});
combo_inputs_["ml_sel_task"] = sel_task;
selvl->addWidget(build_input_row("Task Type", sel_task, sel_tab));
@@ -3736,11 +3512,11 @@ QWidget* QuantModulePanel::build_meta_learning_panel() {
ensvl->setSpacing(8);
auto* ens_keys = new QLineEdit(ens_tab);
ens_keys->setPlaceholderText("Model keys (from selection output, comma-separated)");
- ens_keys->setStyleSheet(input_style);
+ ens_keys->setStyleSheet(input_ss());
text_inputs_["ml_ens_keys"] = ens_keys;
ensvl->addWidget(build_input_row("Model Keys", ens_keys, ens_tab));
auto* ens_method = new QComboBox(ens_tab);
- ens_method->setStyleSheet(combo_style);
+ ens_method->setStyleSheet(combo_ss());
ens_method->addItems({"voting", "stacking", "averaging"});
combo_inputs_["ml_ens_method"] = ens_method;
ensvl->addWidget(build_input_row("Ensemble Method", ens_method, ens_tab));
@@ -3765,17 +3541,17 @@ QWidget* QuantModulePanel::build_meta_learning_panel() {
tunevl->setContentsMargins(12, 12, 12, 12);
tunevl->setSpacing(8);
auto* tune_model = new QComboBox(tune_tab);
- tune_model->setStyleSheet(combo_style);
+ tune_model->setStyleSheet(combo_ss());
tune_model->addItems({"lightgbm", "xgboost", "random_forest", "catboost"});
combo_inputs_["ml_tune_model"] = tune_model;
tunevl->addWidget(build_input_row("Model", tune_model, tune_tab));
auto* tune_grid = new QLineEdit(tune_tab);
tune_grid->setPlaceholderText(R"({"n_estimators":[50,100,200],"max_depth":[3,5,7]})");
- tune_grid->setStyleSheet(input_style);
+ tune_grid->setStyleSheet(input_ss());
text_inputs_["ml_tune_grid"] = tune_grid;
tunevl->addWidget(build_input_row("Param Grid (JSON)", tune_grid, tune_tab));
auto* tune_method = new QComboBox(tune_tab);
- tune_method->setStyleSheet(combo_style);
+ tune_method->setStyleSheet(combo_ss());
tune_method->addItems({"grid", "random"});
combo_inputs_["ml_tune_method"] = tune_method;
tunevl->addWidget(build_input_row("Search Method", tune_method, tune_tab));
@@ -3814,26 +3590,11 @@ QWidget* QuantModulePanel::build_hft_panel() {
vl->setContentsMargins(16, 16, 16, 16);
vl->setSpacing(12);
- auto input_style = QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }"
- "QLineEdit:focus { border-color:%6; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL).arg(module_.color.name());
- auto combo_style = QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:3px 6px; }"
- "QComboBox::drop-down { border:none; }"
- "QComboBox QAbstractItemView { background:%1; color:%2; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL);
+
+
auto* tabs = new QTabWidget(w);
- tabs->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 12px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY).arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL).arg(module_.color.name()));
+ tabs->setStyleSheet(tab_ss(module_.color.name()));
// ── Order Book ──
auto* ob_tab = new QWidget;
@@ -3842,7 +3603,7 @@ QWidget* QuantModulePanel::build_hft_panel() {
obvl->setSpacing(8);
auto* hft_symbol = new QLineEdit(ob_tab);
hft_symbol->setPlaceholderText("Symbol (e.g. AAPL)");
- hft_symbol->setStyleSheet(input_style);
+ hft_symbol->setStyleSheet(input_ss());
text_inputs_["hft_symbol"] = hft_symbol;
obvl->addWidget(build_input_row("Symbol", hft_symbol, ob_tab));
auto* ob_create = make_run_button("CREATE ORDER BOOK", ob_tab);
@@ -3871,17 +3632,17 @@ QWidget* QuantModulePanel::build_hft_panel() {
mmvl->setSpacing(8);
auto* mm_sym = new QLineEdit(mm_tab);
mm_sym->setPlaceholderText("Symbol (e.g. AAPL)");
- mm_sym->setStyleSheet(input_style);
+ mm_sym->setStyleSheet(input_ss());
text_inputs_["hft_mm_symbol"] = mm_sym;
mmvl->addWidget(build_input_row("Symbol", mm_sym, mm_tab));
auto* mm_mid = new QLineEdit(mm_tab);
mm_mid->setPlaceholderText("Mid price (e.g. 150.0)");
- mm_mid->setStyleSheet(input_style);
+ mm_mid->setStyleSheet(input_ss());
text_inputs_["hft_mm_mid"] = mm_mid;
mmvl->addWidget(build_input_row("Mid Price", mm_mid, mm_tab));
auto* mm_spread = new QLineEdit(mm_tab);
mm_spread->setPlaceholderText("Spread multiplier (e.g. 0.02)");
- mm_spread->setStyleSheet(input_style);
+ mm_spread->setStyleSheet(input_ss());
text_inputs_["hft_mm_spread"] = mm_spread;
mmvl->addWidget(build_input_row("Spread Multiplier", mm_spread, mm_tab));
auto* mm_run = make_run_button("GET MARKET MAKING QUOTES", mm_tab);
@@ -3904,17 +3665,17 @@ QWidget* QuantModulePanel::build_hft_panel() {
toxicvl->setSpacing(8);
auto* tox_sym = new QLineEdit(toxic_tab);
tox_sym->setPlaceholderText("Symbol (e.g. AAPL)");
- tox_sym->setStyleSheet(input_style);
+ tox_sym->setStyleSheet(input_ss());
text_inputs_["hft_tox_symbol"] = tox_sym;
toxicvl->addWidget(build_input_row("Symbol", tox_sym, toxic_tab));
auto* tox_price = new QLineEdit(toxic_tab);
tox_price->setPlaceholderText("Trade price (e.g. 150.5)");
- tox_price->setStyleSheet(input_style);
+ tox_price->setStyleSheet(input_ss());
text_inputs_["hft_tox_price"] = tox_price;
toxicvl->addWidget(build_input_row("Trade Price", tox_price, toxic_tab));
auto* tox_size = new QLineEdit(toxic_tab);
tox_size->setPlaceholderText("Trade size (e.g. 100)");
- tox_size->setStyleSheet(input_style);
+ tox_size->setStyleSheet(input_ss());
text_inputs_["hft_tox_size"] = tox_size;
toxicvl->addWidget(build_input_row("Trade Size", tox_size, toxic_tab));
auto* tox_run = make_run_button("DETECT TOXIC FLOW", toxic_tab);
@@ -3937,22 +3698,22 @@ QWidget* QuantModulePanel::build_hft_panel() {
execvl->setSpacing(8);
auto* exec_sym = new QLineEdit(exec_tab);
exec_sym->setPlaceholderText("Symbol (e.g. AAPL)");
- exec_sym->setStyleSheet(input_style);
+ exec_sym->setStyleSheet(input_ss());
text_inputs_["hft_exec_symbol"] = exec_sym;
execvl->addWidget(build_input_row("Symbol", exec_sym, exec_tab));
auto* exec_side = new QComboBox(exec_tab);
- exec_side->setStyleSheet(combo_style);
+ exec_side->setStyleSheet(combo_ss());
exec_side->addItems({"buy", "sell"});
combo_inputs_["hft_exec_side"] = exec_side;
execvl->addWidget(build_input_row("Side", exec_side, exec_tab));
auto* exec_qty = new QLineEdit(exec_tab);
exec_qty->setPlaceholderText("Quantity (e.g. 100)");
- exec_qty->setStyleSheet(input_style);
+ exec_qty->setStyleSheet(input_ss());
text_inputs_["hft_exec_qty"] = exec_qty;
execvl->addWidget(build_input_row("Quantity", exec_qty, exec_tab));
auto* exec_price = new QLineEdit(exec_tab);
exec_price->setPlaceholderText("Limit price (e.g. 150.0)");
- exec_price->setStyleSheet(input_style);
+ exec_price->setStyleSheet(input_ss());
text_inputs_["hft_exec_price"] = exec_price;
execvl->addWidget(build_input_row("Limit Price", exec_price, exec_tab));
auto* exec_run = make_run_button("EXECUTE ORDER", exec_tab);
@@ -3984,26 +3745,11 @@ QWidget* QuantModulePanel::build_rolling_retraining_panel() {
vl->setContentsMargins(16, 16, 16, 16);
vl->setSpacing(12);
- auto input_style = QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }"
- "QLineEdit:focus { border-color:%6; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL).arg(module_.color.name());
- auto combo_style = QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:3px 6px; }"
- "QComboBox::drop-down { border:none; }"
- "QComboBox QAbstractItemView { background:%1; color:%2; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL);
+
+
auto* tabs = new QTabWidget(w);
- tabs->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 12px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY).arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL).arg(module_.color.name()));
+ tabs->setStyleSheet(tab_ss(module_.color.name()));
// ── Schedules ──
auto* list_tab = new QWidget;
@@ -4031,17 +3777,17 @@ QWidget* QuantModulePanel::build_rolling_retraining_panel() {
ctvl->setSpacing(8);
auto* rr_model_id = new QLineEdit(create_tab);
rr_model_id->setPlaceholderText("Model ID (e.g. model_aapl)");
- rr_model_id->setStyleSheet(input_style);
+ rr_model_id->setStyleSheet(input_ss());
text_inputs_["rr_model_id"] = rr_model_id;
ctvl->addWidget(build_input_row("Model ID", rr_model_id, create_tab));
auto* rr_freq = new QComboBox(create_tab);
- rr_freq->setStyleSheet(combo_style);
+ rr_freq->setStyleSheet(combo_ss());
rr_freq->addItems({"daily", "weekly", "monthly"});
combo_inputs_["rr_frequency"] = rr_freq;
ctvl->addWidget(build_input_row("Frequency", rr_freq, create_tab));
auto* rr_window = new QLineEdit(create_tab);
rr_window->setPlaceholderText("Retrain window (trading days, e.g. 252)");
- rr_window->setStyleSheet(input_style);
+ rr_window->setStyleSheet(input_ss());
text_inputs_["rr_window"] = rr_window;
ctvl->addWidget(build_input_row("Window (days)", rr_window, create_tab));
auto* rr_create = make_run_button("CREATE SCHEDULE", create_tab);
@@ -4065,7 +3811,7 @@ QWidget* QuantModulePanel::build_rolling_retraining_panel() {
retrainvl->setSpacing(8);
auto* rr_exec_id = new QLineEdit(retrain_tab);
rr_exec_id->setPlaceholderText("Model ID to retrain");
- rr_exec_id->setStyleSheet(input_style);
+ rr_exec_id->setStyleSheet(input_ss());
text_inputs_["rr_exec_id"] = rr_exec_id;
retrainvl->addWidget(build_input_row("Model ID", rr_exec_id, retrain_tab));
auto* rr_exec = make_run_button("EXECUTE RETRAIN NOW", retrain_tab);
diff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.h b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.h
index c17769b21..64655e935 100644
--- a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.h
+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.h
@@ -67,17 +67,22 @@ class QuantModulePanel : public QWidget {
void display_error(const QString& msg);
void clear_results();
+ void refresh_theme();
+
fincept::services::quant::QuantModule module_;
QVBoxLayout* results_layout_ = nullptr;
- QLabel* status_label_ = nullptr;
- QTextEdit* agent_output_ = nullptr; // deep_agent LangGraph tab
- QTextEdit* rd_agent_output_ = nullptr; // rd_agent tab output
- QTableWidget* rd_task_table_ = nullptr; // rd_agent task monitor
+ QLabel* status_label_ = nullptr;
+ QWidget* panel_header_ = nullptr; // the fixed header bar inside build_ui()
+ QLabel* header_title_ = nullptr;
+ QLabel* header_cat_ = nullptr;
+ QTextEdit* agent_output_ = nullptr; // deep_agent LangGraph tab
+ QTextEdit* rd_agent_output_= nullptr; // rd_agent tab output
+ QTableWidget*rd_task_table_ = nullptr; // rd_agent task monitor
QHash<QString, QDoubleSpinBox*> double_inputs_;
- QHash<QString, QLineEdit*> text_inputs_;
- QHash<QString, QComboBox*> combo_inputs_;
- QHash<QString, QSpinBox*> int_inputs_;
+ QHash<QString, QLineEdit*> text_inputs_;
+ QHash<QString, QComboBox*> combo_inputs_;
+ QHash<QString, QSpinBox*> int_inputs_;
};
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/algo_trading/AlgoTradingScreen.cpp b/fincept-qt/src/screens/algo_trading/AlgoTradingScreen.cpp
index 197989c15..26c8bad3c 100644
--- a/fincept-qt/src/screens/algo_trading/AlgoTradingScreen.cpp
+++ b/fincept-qt/src/screens/algo_trading/AlgoTradingScreen.cpp
@@ -2,6 +2,7 @@
#include "screens/algo_trading/AlgoTradingScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "screens/algo_trading/DeploymentDashboard.h"
#include "screens/algo_trading/ScannerPanel.h"
#include "screens/algo_trading/StrategyBuilderPanel.h"
@@ -167,6 +168,7 @@ void AlgoTradingScreen::on_tab_changed(int index) {
active_tab_ = index;
content_stack_->setCurrentIndex(index);
update_tab_buttons();
+ ScreenStateManager::instance().notify_changed(this);
// Refresh data when switching tabs
if (index == 1)
@@ -190,4 +192,16 @@ void AlgoTradingScreen::update_tab_buttons() {
}
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap AlgoTradingScreen::save_state() const {
+ return {{"tab_index", active_tab_}};
+}
+
+void AlgoTradingScreen::restore_state(const QVariantMap& state) {
+ const int idx = state.value("tab_index", 0).toInt();
+ if (idx >= 0 && idx < tab_buttons_.size())
+ on_tab_changed(idx);
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/algo_trading/AlgoTradingScreen.h b/fincept-qt/src/screens/algo_trading/AlgoTradingScreen.h
index 694db5370..5a285a1ff 100644
--- a/fincept-qt/src/screens/algo_trading/AlgoTradingScreen.h
+++ b/fincept-qt/src/screens/algo_trading/AlgoTradingScreen.h
@@ -1,5 +1,6 @@
// src/screens/algo_trading/AlgoTradingScreen.h
#pragma once
+#include "screens/IStatefulScreen.h"
#include "services/algo_trading/AlgoTradingTypes.h"
#include <QHideEvent>
@@ -19,11 +20,16 @@ class DeploymentDashboard;
/// Algo Trading screen — 4-tab trading system builder.
/// Tabs: Builder, My Strategies, Scanner, Dashboard
-class AlgoTradingScreen : public QWidget {
+class AlgoTradingScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit AlgoTradingScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "algo_trading"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) override;
diff --git a/fincept-qt/src/screens/alpha_arena/AlphaArenaScreen.cpp b/fincept-qt/src/screens/alpha_arena/AlphaArenaScreen.cpp
index 3791a8ed2..763518612 100644
--- a/fincept-qt/src/screens/alpha_arena/AlphaArenaScreen.cpp
+++ b/fincept-qt/src/screens/alpha_arena/AlphaArenaScreen.cpp
@@ -1,6 +1,7 @@
#include "screens/alpha_arena/AlphaArenaScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "python/PythonRunner.h"
#include "storage/repositories/LlmConfigRepository.h"
#include "storage/repositories/LlmProfileRepository.h"
@@ -758,6 +759,7 @@ void AlphaArenaScreen::on_right_tab_changed(int tab) {
right_tab_btns_[i]->style()->unpolish(right_tab_btns_[i]);
right_tab_btns_[i]->style()->polish(right_tab_btns_[i]);
}
+ ScreenStateManager::instance().notify_changed(this);
}
void AlphaArenaScreen::on_competition_type_changed(int index) {
@@ -1083,4 +1085,18 @@ void AlphaArenaScreen::populate_model_list() {
QString("Model list populated: %1 entries").arg(model_entries_.size()));
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap AlphaArenaScreen::save_state() const {
+ return {
+ {"right_tab", right_stack_ ? right_stack_->currentIndex() : 0},
+ };
+}
+
+void AlphaArenaScreen::restore_state(const QVariantMap& state) {
+ const int tab = state.value("right_tab", 0).toInt();
+ if (tab > 0)
+ on_right_tab_changed(tab);
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/alpha_arena/AlphaArenaScreen.h b/fincept-qt/src/screens/alpha_arena/AlphaArenaScreen.h
index 44e93572c..baa7d01a4 100644
--- a/fincept-qt/src/screens/alpha_arena/AlphaArenaScreen.h
+++ b/fincept-qt/src/screens/alpha_arena/AlphaArenaScreen.h
@@ -1,5 +1,7 @@
#pragma once
+#include "screens/IStatefulScreen.h"
+
#include <QComboBox>
#include <QDoubleSpinBox>
#include <QJsonArray>
@@ -33,11 +35,16 @@ struct ArenaModelEntry {
/// Pits multiple LLM agents against each other in crypto or prediction markets.
/// Features: competition creation, leaderboard, performance charts, AI decisions,
/// HITL approval, sentiment analysis, portfolio metrics, grid strategies, research.
-class AlphaArenaScreen : public QWidget {
+class AlphaArenaScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit AlphaArenaScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "alpha_arena"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* e) override;
void hideEvent(QHideEvent* e) override;
diff --git a/fincept-qt/src/screens/alt_investments/AltInvestmentsScreen.cpp b/fincept-qt/src/screens/alt_investments/AltInvestmentsScreen.cpp
index 2e8343f90..130075211 100644
--- a/fincept-qt/src/screens/alt_investments/AltInvestmentsScreen.cpp
+++ b/fincept-qt/src/screens/alt_investments/AltInvestmentsScreen.cpp
@@ -5,74 +5,99 @@
#include "storage/cache/CacheManager.h"
#include "ui/theme/Theme.h"
+#include <QFrame>
#include <QHBoxLayout>
+#include <QJsonArray>
#include <QJsonDocument>
#include <QPointer>
+#include <QRegularExpression>
#include <QScrollArea>
+#include <QShowEvent>
#include <QSplitter>
-#include <QVBoxLayout>
-// ── Stylesheet ──────────────────────────────────────────────────────────────
+// ── Stylesheet ───────────────────────────────────────────────────────────────
namespace {
using namespace fincept::ui;
static const QString kStyle =
- QStringLiteral("#altScreen { background: %1; }"
-
- "#altHeader { background: %2; border-bottom: 2px solid %3; }"
- "#altHeaderTitle { color: %4; font-size: 12px; font-weight: 700; background: transparent; }"
- "#altHeaderSub { color: %5; font-size: 9px; letter-spacing: 0.5px; background: transparent; }"
- "#altHeaderBadge { color: %6; font-size: 8px; font-weight: 700; "
- " background: rgba(22,163,74,0.2); padding: 2px 6px; }"
-
- "#altLeftPanel { background: %7; border-right: 1px solid %8; }"
- "#altCatBtn { background: transparent; color: %5; border: none; text-align: left; "
- " font-size: 11px; padding: 8px 12px; border-bottom: 1px solid %8; }"
- "#altCatBtn:hover { color: %4; background: %12; }"
- "#altCatBtn[active=\"true\"] { color: %3; background: rgba(217,119,6,0.1); "
- " border-left: 3px solid %3; }"
-
- "#altCenterPanel { background: %1; }"
- "#altCenterTitle { color: %4; font-size: 11px; font-weight: 700; background: transparent; }"
-
- "#altPanel { background: %7; border: 1px solid %8; }"
- "#altPanelHeader { background: %2; border-bottom: 1px solid %8; }"
- "#altPanelTitle { color: %4; font-size: 11px; font-weight: 700; background: transparent; }"
- "#altLabel { color: %5; font-size: 9px; font-weight: 700; "
- " letter-spacing: 0.5px; background: transparent; }"
-
- "QLineEdit { background: %1; color: %4; border: 1px solid %8; "
- " padding: 4px 8px; font-size: 11px; }"
- "QLineEdit:focus { border-color: %9; }"
- "QDoubleSpinBox { background: %1; color: %4; border: 1px solid %8; "
- " padding: 4px 8px; font-size: 11px; }"
- "QDoubleSpinBox::up-button, QDoubleSpinBox::down-button { width: 0; }"
- "QComboBox { background: %1; color: %4; border: 1px solid %8; "
- " padding: 4px 8px; font-size: 11px; }"
- "QComboBox::drop-down { border: none; width: 16px; }"
- "QComboBox QAbstractItemView { background: %2; color: %4; border: 1px solid %8; "
- " selection-background-color: %3; }"
-
- "#altAnalyzeBtn { background: %3; color: %1; border: none; padding: 6px 20px; "
- " font-size: 10px; font-weight: 700; }"
- "#altAnalyzeBtn:hover { background: #FF8800; }"
- "#altAnalyzeBtn:disabled { background: %10; color: %11; }"
-
- "#altRightPanel { background: %7; border-left: 1px solid %8; }"
- "#altVerdictBadge { font-size: 12px; font-weight: 700; padding: 4px 12px; }"
- "#altVerdictRating { color: %13; font-size: 16px; font-weight: 700; background: transparent; }"
- "#altVerdictRec { color: %4; font-size: 11px; background: transparent; }"
- "QTextEdit { background: %1; color: %13; border: none; font-size: 11px; }"
-
- "#altStatusBar { background: %2; border-top: 1px solid %8; }"
- "#altStatusText { color: %5; font-size: 9px; background: transparent; }"
- "#altStatusHighlight { color: %13; font-size: 9px; background: transparent; }"
-
- "QSplitter::handle { background: %8; }"
- "QScrollBar:vertical { background: %1; width: 6px; }"
- "QScrollBar::handle:vertical { background: %8; min-height: 20px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }")
+ QStringLiteral(
+ "#altScreen { background: %1; }"
+
+ "#altHeader { background: %2; border-bottom: 2px solid %3; padding: 0 16px; }"
+ "#altHeaderTitle { color: %4; font-size: 13px; font-weight: 700; background: transparent; }"
+ "#altHeaderSub { color: %5; font-size: 9px; letter-spacing: 0.8px; background: transparent; }"
+ "#altHeaderBadge { color: %6; font-size: 8px; font-weight: 700; letter-spacing: 0.5px;"
+ " background: rgba(22,163,74,0.18); border: 1px solid rgba(22,163,74,0.4); padding: 2px 8px; }"
+
+ "#altLeftPanel { background: %7; border-right: 1px solid %8; }"
+ "#altLeftTitle { color: %5; font-size: 9px; font-weight: 700; letter-spacing: 0.8px;"
+ " background: %2; padding: 8px 12px; border-bottom: 1px solid %8; }"
+ "#altCatBtn { background: transparent; color: %5; border: none; border-bottom: 1px solid %8;"
+ " text-align: left; font-size: 11px; padding: 9px 14px; }"
+ "#altCatBtn:hover { color: %4; background: %12; }"
+ "#altCatBtn[active=\"true\"] { color: %3; font-weight: 700;"
+ " background: rgba(217,119,6,0.08); border-left: 3px solid %3; padding-left: 11px; }"
+
+ "#altCenterPanel { background: %1; }"
+ "#altCenterTitleBar { background: %2; border-bottom: 1px solid %8; }"
+ "#altCenterTitle { color: %4; font-size: 12px; font-weight: 700; background: transparent; }"
+ "#altCenterDesc { color: %5; font-size: 10px; background: transparent; }"
+ "#altComboLabel { color: %5; font-size: 9px; font-weight: 700;"
+ " letter-spacing: 0.5px; background: transparent; }"
+
+ "#altFormPanel { background: %7; border: 1px solid %8; }"
+ "#altFormHeader { background: %2; border-bottom: 1px solid %8; padding: 0 12px; }"
+ "#altFormTitle { color: %4; font-size: 10px; font-weight: 700; background: transparent; }"
+ "#altFieldLabel { color: %5; font-size: 9px; font-weight: 700;"
+ " letter-spacing: 0.5px; background: transparent; }"
+
+ "QLineEdit { background: %1; color: %4; border: 1px solid %8;"
+ " padding: 5px 8px; font-size: 11px; }"
+ "QLineEdit:focus { border-color: %9; }"
+ "QDoubleSpinBox { background: %1; color: %4; border: 1px solid %8;"
+ " padding: 5px 8px; font-size: 11px; }"
+ "QDoubleSpinBox:focus { border-color: %9; }"
+ "QDoubleSpinBox::up-button, QDoubleSpinBox::down-button { width: 0; }"
+ "QComboBox { background: %1; color: %4; border: 1px solid %8;"
+ " padding: 5px 8px; font-size: 11px; }"
+ "QComboBox::drop-down { border: none; width: 18px; }"
+ "QComboBox QAbstractItemView { background: %2; color: %4; border: 1px solid %8;"
+ " selection-background-color: %3; selection-color: %1; outline: none; }"
+
+ "#altAnalyzeBtn { background: %3; color: %1; border: none; padding: 7px 20px;"
+ " font-size: 10px; font-weight: 700; letter-spacing: 0.5px; }"
+ "#altAnalyzeBtn:hover { background: #FF8800; }"
+ "#altAnalyzeBtn:disabled { background: %10; color: %11; }"
+
+ "#altRightPanel { background: %7; border-left: 1px solid %8; }"
+ "#altRightTitle { color: %5; font-size: 9px; font-weight: 700; letter-spacing: 0.8px;"
+ " background: %2; padding: 8px 12px; border-bottom: 1px solid %8; }"
+ "#altVerdictBadge { font-size: 11px; font-weight: 700; padding: 4px 14px;"
+ " letter-spacing: 0.5px; }"
+ "#altVerdictRating { color: %13; font-size: 14px; font-weight: 700; background: transparent; }"
+ "#altVerdictRec { color: %4; font-size: 10px; background: transparent; }"
+
+ "#altMetricRow { background: transparent; border-bottom: 1px solid %8; }"
+ "#altMetricKey { color: %5; font-size: 10px; background: transparent; }"
+ "#altMetricVal { color: %13; font-size: 10px; font-weight: 700; background: transparent; }"
+ "#altMetricSection { color: %3; font-size: 9px; font-weight: 700; letter-spacing: 0.8px;"
+ " background: %2; padding: 4px 10px; border-top: 1px solid %8; }"
+ "#altMetricBullet { color: %5; font-size: 10px; background: transparent; }"
+ "#altMetricBulletVal { color: %4; font-size: 10px; background: transparent; }"
+ "#altMetricWarn { color: #FFD700; font-size: 10px; background: transparent; }"
+ "#altMetricGood { color: %6; font-size: 10px; background: transparent; }"
+ "#altMetricBad { color: %14; font-size: 10px; background: transparent; }"
+
+ "#altStatusBar { background: %2; border-top: 1px solid %8; }"
+ "#altStatusText { color: %5; font-size: 9px; background: transparent; }"
+ "#altStatusHigh { color: %13; font-size: 9px; background: transparent; }"
+
+ "QSplitter::handle { background: %8; }"
+ "QScrollBar:vertical { background: %1; width: 5px; border: none; }"
+ "QScrollBar::handle:vertical { background: %8; min-height: 20px; }"
+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }"
+ "QScrollBar:horizontal { height: 0; }")
.arg(colors::BG_BASE) // %1
.arg(colors::BG_RAISED) // %2
.arg(colors::AMBER) // %3
@@ -94,91 +119,307 @@ namespace fincept::screens {
using namespace fincept::ui;
-// ── Category definitions ────────────────────────────────────────────────────
+// ── Field factory helpers ────────────────────────────────────────────────────
+
+static AltField text_field(const QString& key, const QString& label,
+ const QString& def = "")
+{
+ AltField f;
+ f.key = key; f.label = label; f.type = AltField::Text;
+ f.combo_items = def;
+ return f;
+}
+
+static AltField spin_field(const QString& key, const QString& label,
+ double def, double min_v, double max_v,
+ int dec = 2, const QString& pfx = "",
+ const QString& sfx = "", bool div100 = false)
+{
+ AltField f;
+ f.key = key; f.label = label; f.type = AltField::Spin;
+ f.default_val = def; f.min_val = min_v; f.max_val = max_v;
+ f.decimals = dec; f.prefix = pfx; f.suffix = sfx; f.divide_100 = div100;
+ return f;
+}
+
+static AltField combo_field(const QString& key, const QString& label,
+ const QString& items)
+{
+ AltField f;
+ f.key = key; f.label = label; f.type = AltField::Combo;
+ f.combo_items = items;
+ return f;
+}
+
+// ── Category definitions ─────────────────────────────────────────────────────
static QList<AltCategory> build_categories() {
return {
- {"bonds",
- "Bonds & Fixed Income",
- "#0088FF",
- {
- {"high_yield_bond", "High-Yield Bonds"},
- {"emerging_market_bond", "Emerging Market Bonds"},
- {"convertible_bond", "Convertible Bonds"},
- {"preferred_stock", "Preferred Stocks"},
- }},
- {"real_estate",
- "Real Estate",
- "#9D4EDD",
- {
- {"real_estate", "Direct Property"},
- {"reit", "REITs"},
- }},
- {"hedge_funds",
- "Hedge Funds",
- "#FFD700",
- {
- {"hedge_fund", "Long/Short Equity"},
- {"managed_futures", "Managed Futures"},
- {"market_neutral", "Market Neutral"},
- }},
- {"commodities",
- "Commodities",
- "#FF8800",
- {
- {"precious_metals", "Precious Metals"},
- {"natural_resources", "Natural Resources"},
- }},
- {"private_capital",
- "Private Capital",
- "#E91E63",
- {
- {"private_equity", "Private Equity / VC"},
- }},
- {"annuities",
- "Annuities",
- "#4CAF50",
- {
- {"fixed_annuity", "Fixed Annuity"},
- {"variable_annuity", "Variable Annuity"},
- {"equity_indexed_annuity", "Equity-Indexed Annuity"},
- {"inflation_annuity", "Inflation Annuity"},
- }},
- {"structured",
- "Structured Products",
- "#00ACC1",
- {
- {"structured_product", "Structured Notes"},
- {"leveraged_fund", "Leveraged Funds"},
- }},
- {"inflation",
- "Inflation Protected",
- "#FFA726",
- {
- {"tips", "TIPS"},
- {"i_bond", "I-Bonds"},
- {"stable_value", "Stable Value Funds"},
- }},
- {"strategies",
- "Strategies",
- "#00E5FF",
- {
- {"covered_call", "Covered Calls"},
- {"sri_fund", "SRI Funds"},
- {"asset_location", "Asset Location"},
- {"performance", "Performance Analysis"},
- {"risk", "Risk Analysis"},
- }},
- {"crypto",
- "Digital Assets",
- "#FF5722",
- {
- {"digital_asset", "Cryptocurrency"},
- }},
+ { "bonds", "Bonds & Fixed Income", "#3B82F6", "B",
+ {
+ { "high-yield", "High-Yield Bonds",
+ "Spread analysis, default probability, equity-like behavior" },
+ { "em-bonds", "Emerging Market Bonds",
+ "Yield spread, sovereign default risk, currency risk" },
+ { "convertible-bonds", "Convertible Bonds",
+ "Conversion premium, bond floor, upside participation" },
+ { "preferred-stocks", "Preferred Stocks",
+ "Current yield, call risk, dividend safety analysis" },
+ }
+ },
+ { "real_estate", "Real Estate", "#8B5CF6", "RE",
+ {
+ { "real-estate", "Direct Property / REIT",
+ "NOI, cap rate, DCF valuation, financing analysis" },
+ }
+ },
+ { "hedge_funds", "Hedge Funds", "#EAB308", "HF",
+ {
+ { "hedge-funds", "Long/Short Equity",
+ "Strategy metrics, fee impact, liquidity risk" },
+ { "managed-futures", "Managed Futures / CTA",
+ "Fee drag, trend following, crisis alpha analysis" },
+ { "market-neutral", "Market Neutral",
+ "Beta neutrality, factor exposure, leverage risk" },
+ }
+ },
+ { "commodities", "Commodities", "#F97316", "C",
+ {
+ { "natural-resources", "Natural Resources",
+ "Futures basis, contango/backwardation, roll yield" },
+ { "pme", "Precious Metals Equities",
+ "Correlation to metals, inflation hedge, drawdowns" },
+ }
+ },
+ { "private_capital", "Private Capital", "#EC4899", "PE",
+ {
+ { "private-capital", "Private Equity / Venture Capital",
+ "IRR, MOIC, DPI, RVPI, J-curve, fee drag" },
+ }
+ },
+ { "annuities", "Annuities", "#22C55E", "AN",
+ {
+ { "annuities", "Fixed Annuity",
+ "Payout analysis, breakeven years, inflation erosion" },
+ { "variable-annuities", "Variable Annuity",
+ "Total fee drag, tax deferral myth, vs. alternatives" },
+ { "eia", "Equity-Indexed Annuity",
+ "Crediting rate, upside cap limitations, surrender charges" },
+ { "inflation-annuity", "Inflation-Indexed Annuity",
+ "vs. fixed annuity, vs. TIPS ladder, longevity break-even" },
+ }
+ },
+ { "structured", "Structured Products", "#06B6D4", "SP",
+ {
+ { "structured-products", "Structured Notes",
+ "Complexity score, hidden costs, issuer credit risk" },
+ { "leveraged-funds", "Leveraged ETFs (2x/3x)",
+ "Volatility decay, path-dependency, holding cost" },
+ }
+ },
+ { "inflation", "Inflation Protected", "#FB923C", "IP",
+ {
+ { "tips", "TIPS — Inflation-Linked Treasuries",
+ "Real yield, inflation scenarios, tax efficiency" },
+ { "ibonds", "I-Bonds — Series I Savings Bonds",
+ "Composite rate, early redemption penalty, vs. TIPS" },
+ { "stable-value", "Stable Value Funds",
+ "Market-to-book ratio, crediting rate, wrap contract risk" },
+ }
+ },
+ { "strategies", "Strategies & Analysis", "#67E8F9", "ST",
+ {
+ { "covered-calls", "Covered Call Strategy",
+ "Tax consequences, opportunity cost, premium income" },
+ { "sri", "SRI / ESG Funds",
+ "Performance vs. benchmark, screening costs, approaches" },
+ { "asset-location", "Tax-Efficient Asset Location",
+ "Optimal account placement, muni bonds, annual tax drag" },
+ }
+ },
+ { "crypto", "Digital Assets", "#F87171", "DA",
+ {
+ { "digital-assets", "Cryptocurrency",
+ "Fundamental metrics, NVT ratio, market cap analysis" },
+ }
+ },
};
}
-// ── Constructor ─────────────────────────────────────────────────────────────
+// ── Per-analyzer form fields ─────────────────────────────────────────────────
+
+static QList<AltField> fields_for(const QString& id) {
+ if (id == "high-yield") return {
+ text_field("name", "BOND NAME", "HY Corp Bond"),
+ spin_field("par_value", "PAR VALUE ($)", 1000, 100, 1e9, 0, "$"),
+ spin_field("price", "MARKET PRICE ($)", 950, 100, 1e9, 2, "$"),
+ spin_field("coupon_rate", "COUPON RATE (%)", 8.5, 0, 30, 2, "", "%"),
+ spin_field("maturity_years","MATURITY (years)", 5, 0.5, 30, 1),
+ combo_field("credit_rating","CREDIT RATING", "BB|B|CCC|BB+|BB-|B+|B-|CCC+"),
+ };
+ if (id == "em-bonds") return {
+ text_field("name", "BOND NAME", "Brazil 2030"),
+ spin_field("face_value", "FACE VALUE ($)", 1000, 100, 1e9, 0, "$"),
+ spin_field("current_market_value","MARKET PRICE ($)", 950, 100, 1e9, 2, "$"),
+ spin_field("coupon_rate", "COUPON RATE (%)", 6.0, 0, 25, 2, "", "%"),
+ spin_field("maturity_years", "MATURITY (years)", 10, 0.5, 30, 1),
+ spin_field("credit_spread", "CREDIT SPREAD (%)", 3.0, 0, 20, 2, "", "%", true),
+ };
+ if (id == "convertible-bonds") return {
+ text_field("name", "BOND NAME", "Tesla Conv 2028"),
+ spin_field("par_value", "PAR VALUE ($)", 1000, 100, 1e9, 0, "$"),
+ spin_field("current_price", "MARKET PRICE ($)", 1100, 100, 1e9, 2, "$"),
+ spin_field("coupon_rate", "COUPON RATE (%)", 2.0, 0, 15, 2, "", "%"),
+ spin_field("maturity_years", "MATURITY (years)", 5, 0.5, 30, 1),
+ spin_field("stock_price", "STOCK PRICE ($)", 55, 1, 1e6, 2, "$"),
+ spin_field("conversion_ratio","CONVERSION RATIO", 18, 1, 1e4, 2),
+ };
+ if (id == "preferred-stocks") return {
+ text_field("name", "SECURITY NAME", "JPM Series J Preferred"),
+ spin_field("par_value", "PAR VALUE ($)", 25, 1, 1e4, 2, "$"),
+ spin_field("current_price", "MARKET PRICE ($)", 24.5, 1, 1e4, 2, "$"),
+ spin_field("dividend_rate", "DIVIDEND RATE (%)", 5.5, 0, 20, 2, "", "%", true),
+ };
+ if (id == "real-estate") return {
+ text_field("name", "PROPERTY NAME", "Class A Office"),
+ spin_field("acquisition_price", "PURCHASE PRICE ($)", 1000000, 1000, 1e12, 0, "$"),
+ spin_field("gross_income", "GROSS INCOME ($/yr)", 120000, 0, 1e9, 0, "$"),
+ spin_field("vacancy_rate", "VACANCY RATE (%)", 5.0, 0, 100, 1, "", "%", true),
+ spin_field("operating_expenses","OPER. EXPENSES ($/yr)", 40000, 0, 1e9, 0, "$"),
+ spin_field("loan_amount", "LOAN AMOUNT ($)", 700000, 0, 1e12, 0, "$"),
+ spin_field("interest_rate", "MORTGAGE RATE (%)", 6.5, 0, 30, 2, "", "%", true),
+ spin_field("loan_term", "LOAN TERM (years)", 30, 5, 50, 0),
+ };
+ if (id == "hedge-funds") return {
+ text_field("name", "FUND NAME", "Global Macro Fund"),
+ spin_field("management_fee", "MGMT FEE (%)", 2.0, 0, 10, 2, "", "%", true),
+ spin_field("performance_fee","PERF FEE (%)", 20.0, 0, 50, 1, "", "%", true),
+ spin_field("hurdle_rate", "HURDLE RATE (%)", 6.0, 0, 20, 2, "", "%", true),
+ combo_field("strategy_type", "STRATEGY",
+ "equity_long_short|global_macro|event_driven|relative_value|multi_strategy"),
+ };
+ if (id == "managed-futures") return {
+ text_field("name", "FUND NAME", "CTA Trend Fund"),
+ spin_field("management_fee", "MGMT FEE (%)", 2.0, 0, 10, 2, "", "%", true),
+ spin_field("performance_fee","PERF FEE (%)", 20.0, 0, 50, 1, "", "%", true),
+ spin_field("gross_return", "GROSS RETURN (%)",12.0,-50,100, 2, "", "%", true),
+ };
+ if (id == "market-neutral") return {
+ text_field("name", "FUND NAME", "Market Neutral Fund"),
+ spin_field("gross_leverage", "GROSS LEVERAGE", 2.0, 0.5, 10, 1),
+ spin_field("management_fee", "MGMT FEE (%)", 1.5, 0, 10, 2, "", "%", true),
+ spin_field("performance_fee","PERF FEE (%)", 20.0, 0, 50, 1, "", "%", true),
+ };
+ if (id == "natural-resources") return {
+ text_field("name", "COMMODITY NAME", "WTI Crude Oil"),
+ spin_field("spot_price", "SPOT PRICE ($)", 80, 0, 1e6, 2, "$"),
+ spin_field("three_month_futures", "3M FUTURES ($)", 82, 0, 1e6, 2, "$"),
+ spin_field("six_month_futures", "6M FUTURES ($)", 84, 0, 1e6, 2, "$"),
+ spin_field("twelve_month_futures","12M FUTURES ($)", 87, 0, 1e6, 2, "$"),
+ combo_field("sector", "SECTOR", "energy|metals|agriculture|livestock"),
+ };
+ if (id == "pme") return {
+ text_field("name", "FUND NAME", "Gold Miners ETF"),
+ };
+ if (id == "private-capital") return {
+ text_field("name", "FUND NAME", "Buyout Fund III"),
+ spin_field("management_fee", "MGMT FEE (%)", 2.0, 0, 10, 2, "", "%", true),
+ spin_field("performance_fee","CARRIED INT (%)", 20.0, 0, 40, 1, "", "%", true),
+ spin_field("hurdle_rate", "HURDLE RATE (%)", 8.0, 0, 20, 2, "", "%", true),
+ };
+ if (id == "annuities") return {
+ text_field("name", "ANNUITY NAME", "Fixed Annuity"),
+ spin_field("premium", "PREMIUM ($)", 100000, 1000, 1e9, 0, "$"),
+ spin_field("annual_payout_rate", "ANNUAL PAYOUT RATE (%)", 5.0, 0.1, 20, 2, "", "%", true),
+ spin_field("payout_years", "PAYOUT TERM (years)", 20, 5, 50, 0),
+ spin_field("guaranteed_rate", "GUARANTEED RATE (%)", 4.0, 0, 15, 2, "", "%", true),
+ };
+ if (id == "variable-annuities") return {
+ text_field("name", "ANNUITY NAME", "Variable Annuity"),
+ spin_field("premium", "PREMIUM ($)", 100000, 1000, 1e9, 0, "$"),
+ spin_field("me_fee", "M&E FEE (%)", 1.25, 0, 5, 2, "", "%", true),
+ spin_field("investment_fee", "INVESTMENT FEE (%)", 0.75, 0, 5, 2, "", "%", true),
+ spin_field("admin_fee", "ADMIN FEE (%)", 0.15, 0, 3, 2, "", "%", true),
+ spin_field("surrender_period","SURRENDER PERIOD (yrs)", 7, 0, 20, 0),
+ };
+ if (id == "eia") return {
+ text_field("name", "PRODUCT NAME", "EIA Product"),
+ spin_field("index_return", "INDEX RETURN (%)", 10.0, -50, 100, 2, "", "%", true),
+ spin_field("participation_rate","PARTICIPATION (%)", 80.0, 10, 100, 1, "", "%", true),
+ spin_field("cap_rate", "CAP RATE (%)", 6.0, 0, 50, 2, "", "%", true),
+ spin_field("floor_rate", "FLOOR RATE (%)", 0.0, -10, 10, 2, "", "%", true),
+ };
+ if (id == "inflation-annuity") return {
+ text_field("name", "ANNUITY NAME", "Inflation-Indexed Annuity"),
+ spin_field("real_payout_rate", "REAL PAYOUT RATE (%)", 4.0, 0, 15, 2, "", "%", true),
+ spin_field("inflation_rate", "ASSUMED INFLATION (%)", 3.0, 0, 15, 2, "", "%", true),
+ spin_field("payout_years", "PAYOUT TERM (years)", 20, 5, 50, 0),
+ spin_field("fixed_payout_rate", "FIXED ALT RATE (%)", 5.5, 0, 15, 2, "", "%", true),
+ };
+ if (id == "structured-products") return {
+ text_field("name", "PRODUCT NAME", "Principal Protected Note"),
+ spin_field("principal", "PRINCIPAL ($)", 50000, 1000, 1e9, 0, "$"),
+ spin_field("participation_rate","PARTICIPATION (%)", 80.0, 10, 100, 1, "", "%", true),
+ spin_field("cap_rate", "UPSIDE CAP (%)", 20.0, 0, 100, 1, "", "%", true),
+ spin_field("maturity_years", "MATURITY (years)", 5, 1, 30, 0),
+ };
+ if (id == "leveraged-funds") return {
+ text_field("name", "FUND NAME", "3x S&P 500 ETF"),
+ spin_field("leverage_ratio","LEVERAGE RATIO", 3.0, 2.0, 4.0, 1),
+ };
+ if (id == "tips") return {
+ text_field("name", "SECURITY NAME", "TIPS 2031"),
+ spin_field("face_value", "FACE VALUE ($)", 10000, 1000, 1e9, 0, "$"),
+ spin_field("current_market_value","MARKET PRICE ($)", 10200, 1000, 1e9, 2, "$"),
+ spin_field("coupon_rate", "REAL COUPON (%)", 2.5, 0, 10, 2, "", "%", true),
+ spin_field("maturity_years", "MATURITY (years)", 7, 1, 30, 1),
+ };
+ if (id == "ibonds") return {
+ text_field("name", "BOND NAME", "I-Bond 2025"),
+ spin_field("purchase_price","PURCHASE PRICE ($)", 10000, 25, 10000, 0, "$"),
+ spin_field("fixed_rate", "FIXED RATE (%)", 0.4, 0, 5, 2, "", "%", true),
+ spin_field("inflation_rate","CPI-U INFLATION (%)", 3.4, 0, 20, 2, "", "%", true),
+ };
+ if (id == "stable-value") return {
+ text_field("name", "FUND NAME", "Stable Value Fund"),
+ spin_field("book_value", "BOOK VALUE ($)", 100000, 1000, 1e9, 0, "$"),
+ spin_field("market_value", "MARKET VALUE ($)", 98000, 1000, 1e9, 0, "$"),
+ spin_field("crediting_rate", "CREDITING RATE (%)", 3.2, 0, 15, 2, "", "%", true),
+ };
+ if (id == "covered-calls") return {
+ text_field("name", "POSITION NAME", "AAPL Covered Call"),
+ spin_field("stock_price", "STOCK PRICE ($)", 150, 1, 1e6, 2, "$"),
+ spin_field("strike_price", "STRIKE PRICE ($)", 160, 1, 1e6, 2, "$"),
+ spin_field("premium", "PREMIUM / SHARE ($)", 5, 0, 1e4, 2, "$"),
+ spin_field("shares", "SHARES", 100, 1, 1e6, 0),
+ spin_field("cost_basis", "COST BASIS ($)", 125, 1, 1e6, 2, "$"),
+ spin_field("holding_period_days","HOLDING DAYS", 400, 1, 3650, 0),
+ };
+ if (id == "sri") return {
+ text_field("name", "FUND NAME", "ESG Equity Fund"),
+ spin_field("sri_return", "SRI RETURN (%)", 9.0, -30, 100, 2, "", "%", true),
+ spin_field("benchmark_return","BENCHMARK RETURN (%)", 10.0, -30, 100, 2, "", "%", true),
+ spin_field("expense_ratio", "EXPENSE RATIO (%)", 0.8, 0, 5, 2, "", "%", true),
+ spin_field("time_period_years","TIME PERIOD (years)", 10, 1, 50, 0),
+ };
+ if (id == "asset-location") return {
+ text_field("name", "ASSET NAME", "REITs / High-Yield"),
+ combo_field("asset_class", "ASSET CLASS",
+ "reits|high_yield_bonds|stocks|municipal_bonds|tips|commodities|cash"),
+ spin_field("tax_bracket", "TAX BRACKET (%)", 24.0, 10, 45, 1, "", "%", true),
+ };
+ if (id == "digital-assets") return {
+ text_field("name", "ASSET NAME", "Bitcoin"),
+ spin_field("price", "PRICE ($)", 45000, 0, 1e9, 2, "$"),
+ spin_field("market_cap", "MARKET CAP ($B)", 850, 0, 1e6, 1, "$", "B"),
+ spin_field("volume_24h", "24H VOLUME ($B)", 25, 0, 1e6, 1, "$", "B"),
+ spin_field("circulating_supply","CIRC. SUPPLY (M)", 19.5, 0, 1e6, 1, "", "M"),
+ spin_field("max_supply", "MAX SUPPLY (M)", 21.0, 0, 1e6, 1, "", "M"),
+ };
+ return { text_field("name", "NAME", "") };
+}
+
+// ── Constructor ──────────────────────────────────────────────────────────────
AltInvestmentsScreen::AltInvestmentsScreen(QWidget* parent) : QWidget(parent) {
setObjectName("altScreen");
@@ -188,27 +429,29 @@ AltInvestmentsScreen::AltInvestmentsScreen(QWidget* parent) : QWidget(parent) {
LOG_INFO("AltInvestments", "Screen constructed");
}
-// ── UI Setup ────────────────────────────────────────────────────────────────
+void AltInvestmentsScreen::showEvent(QShowEvent* e) { QWidget::showEvent(e); }
+void AltInvestmentsScreen::hideEvent(QHideEvent* e) { QWidget::hideEvent(e); }
+
+// ── UI Setup ─────────────────────────────────────────────────────────────────
void AltInvestmentsScreen::setup_ui() {
auto* root = new QVBoxLayout(this);
root->setContentsMargins(0, 0, 0, 0);
root->setSpacing(0);
-
root->addWidget(create_header());
auto* splitter = new QSplitter(Qt::Horizontal);
splitter->setHandleWidth(1);
auto* left = create_left_panel();
- left->setMinimumWidth(180);
- left->setMaximumWidth(220);
+ left->setMinimumWidth(170);
+ left->setMaximumWidth(210);
auto* center = create_center_panel();
auto* right = create_right_panel();
- right->setMinimumWidth(280);
- right->setMaximumWidth(360);
+ right->setMinimumWidth(300);
+ right->setMaximumWidth(420);
splitter->addWidget(left);
splitter->addWidget(center);
@@ -216,54 +459,48 @@ void AltInvestmentsScreen::setup_ui() {
splitter->setStretchFactor(0, 0);
splitter->setStretchFactor(1, 1);
splitter->setStretchFactor(2, 0);
- splitter->setSizes({200, 600, 320});
+ splitter->setSizes({190, 550, 380});
root->addWidget(splitter, 1);
root->addWidget(create_status_bar());
- // Initialize first category
on_category_changed(0);
}
QWidget* AltInvestmentsScreen::create_header() {
auto* bar = new QWidget;
bar->setObjectName("altHeader");
- bar->setFixedHeight(42);
-
+ bar->setFixedHeight(46);
auto* hl = new QHBoxLayout(bar);
hl->setContentsMargins(16, 0, 16, 0);
+ hl->setSpacing(8);
- auto* title_col = new QVBoxLayout;
- title_col->setSpacing(0);
+ auto* tc = new QVBoxLayout;
+ tc->setSpacing(1);
auto* title = new QLabel("ALTERNATIVE INVESTMENTS");
title->setObjectName("altHeaderTitle");
- auto* sub = new QLabel("27 ANALYZERS ACROSS 10 ASSET CLASSES");
+ auto* sub = new QLabel("27 ANALYZERS \xB7 10 ASSET CLASSES \xB7 CFA-LEVEL ANALYTICS");
sub->setObjectName("altHeaderSub");
- title_col->addWidget(title);
- title_col->addWidget(sub);
- hl->addLayout(title_col);
+ tc->addWidget(title);
+ tc->addWidget(sub);
+ hl->addLayout(tc);
hl->addStretch(1);
- auto* badge = new QLabel("PYTHON ANALYTICS");
+ auto* badge = new QLabel("PYTHON ANALYTICS ENGINE");
badge->setObjectName("altHeaderBadge");
hl->addWidget(badge);
-
return bar;
}
QWidget* AltInvestmentsScreen::create_left_panel() {
auto* panel = new QWidget;
panel->setObjectName("altLeftPanel");
-
auto* vl = new QVBoxLayout(panel);
vl->setContentsMargins(0, 0, 0, 0);
vl->setSpacing(0);
auto* title = new QLabel("ASSET CLASSES");
- title->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: 700; "
- "letter-spacing: 0.5px; background: transparent; "
- "padding: 8px 12px; border-bottom: 1px solid %2;")
- .arg(colors::TEXT_SECONDARY, colors::BORDER_DIM));
+ title->setObjectName("altLeftTitle");
vl->addWidget(title);
for (int i = 0; i < categories_.size(); ++i) {
@@ -275,192 +512,152 @@ QWidget* AltInvestmentsScreen::create_left_panel() {
vl->addWidget(btn);
cat_btns_.append(btn);
}
-
vl->addStretch(1);
return panel;
}
QWidget* AltInvestmentsScreen::create_center_panel() {
- auto* scroll = new QScrollArea;
- scroll->setObjectName("altCenterPanel");
- scroll->setWidgetResizable(true);
+ auto* outer = new QScrollArea;
+ outer->setObjectName("altCenterPanel");
+ outer->setWidgetResizable(true);
+ outer->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
auto* content = new QWidget;
auto* vl = new QVBoxLayout(content);
- vl->setContentsMargins(16, 16, 16, 16);
- vl->setSpacing(12);
+ vl->setContentsMargins(0, 0, 0, 0);
+ vl->setSpacing(0);
- // Analyzer selector
- auto* top_row = new QHBoxLayout;
- center_title_ = new QLabel("BONDS & FIXED INCOME");
- center_title_->setObjectName("altCenterTitle");
- top_row->addWidget(center_title_);
- top_row->addStretch(1);
+ // ── Title bar ─────────────────────────────────────────────────────────────
+ auto* title_bar = new QWidget;
+ title_bar->setObjectName("altCenterTitleBar");
+ title_bar->setFixedHeight(54);
+ auto* tbl = new QHBoxLayout(title_bar);
+ tbl->setContentsMargins(16, 0, 16, 0);
+ tbl->setSpacing(12);
+ auto* title_col = new QVBoxLayout;
+ title_col->setSpacing(2);
+ center_title_ = new QLabel;
+ center_title_->setObjectName("altCenterTitle");
+ center_desc_ = new QLabel;
+ center_desc_->setObjectName("altCenterDesc");
+ title_col->addWidget(center_title_);
+ title_col->addWidget(center_desc_);
+ tbl->addLayout(title_col, 1);
+
+ auto* combo_col = new QVBoxLayout;
+ combo_col->setSpacing(3);
+ auto* combo_lbl = new QLabel("ANALYZER");
+ combo_lbl->setObjectName("altComboLabel");
analyzer_combo_ = new QComboBox;
- analyzer_combo_->setFixedWidth(200);
- connect(analyzer_combo_, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
- &AltInvestmentsScreen::on_analyzer_changed);
- top_row->addWidget(analyzer_combo_);
- vl->addLayout(top_row);
-
- // Input form panel
+ analyzer_combo_->setFixedWidth(210);
+ connect(analyzer_combo_, QOverload<int>::of(&QComboBox::currentIndexChanged),
+ this, &AltInvestmentsScreen::on_analyzer_changed);
+ combo_col->addWidget(combo_lbl);
+ combo_col->addWidget(analyzer_combo_);
+ tbl->addLayout(combo_col);
+ vl->addWidget(title_bar);
+
+ // ── Form panel ────────────────────────────────────────────────────────────
auto* form_panel = new QWidget;
- form_panel->setObjectName("altPanel");
+ form_panel->setObjectName("altFormPanel");
auto* fpvl = new QVBoxLayout(form_panel);
fpvl->setContentsMargins(0, 0, 0, 0);
fpvl->setSpacing(0);
auto* fhdr = new QWidget;
- fhdr->setObjectName("altPanelHeader");
- fhdr->setFixedHeight(34);
+ fhdr->setObjectName("altFormHeader");
+ fhdr->setFixedHeight(36);
auto* fhl = new QHBoxLayout(fhdr);
fhl->setContentsMargins(12, 0, 12, 0);
- auto* ft = new QLabel("INPUT PARAMETERS");
- ft->setObjectName("altPanelTitle");
- fhl->addWidget(ft);
- fhl->addStretch(1);
- fpvl->addWidget(fhdr);
-
- auto* form_body = new QWidget;
- auto* fbl = new QVBoxLayout(form_body);
- fbl->setContentsMargins(12, 12, 12, 12);
- fbl->setSpacing(10);
-
- // Common inputs
- auto make_row = [&](const QString& label, QWidget* w) {
- auto* row = new QWidget;
- auto* rl = new QVBoxLayout(row);
- rl->setContentsMargins(0, 0, 0, 0);
- rl->setSpacing(3);
- auto* lbl = new QLabel(label);
- lbl->setObjectName("altLabel");
- rl->addWidget(lbl);
- rl->addWidget(w);
- return row;
- };
-
- auto make_spin = [](double val, double min_v, double max_v, int dec, const QString& prefix = "",
- const QString& suffix = "") {
- auto* sp = new QDoubleSpinBox;
- sp->setRange(min_v, max_v);
- sp->setValue(val);
- sp->setDecimals(dec);
- sp->setButtonSymbols(QAbstractSpinBox::NoButtons);
- if (!prefix.isEmpty())
- sp->setPrefix(prefix);
- if (!suffix.isEmpty())
- sp->setSuffix(suffix);
- return sp;
- };
-
- input_name_ = new QLineEdit("Sample Investment");
- fbl->addWidget(make_row("INVESTMENT NAME", input_name_));
-
- input_type_ = new QComboBox;
- fbl->addWidget(make_row("TYPE / SUBCLASS", input_type_));
-
- // Value fields (generic, labels updated per analyzer)
- auto* grid = new QWidget;
- auto* gl = new QHBoxLayout(grid);
- gl->setContentsMargins(0, 0, 0, 0);
- gl->setSpacing(8);
-
- input_value1_ = make_spin(100000, 0, 1e12, 2, "$");
- input_value2_ = make_spin(5.0, -100, 100, 2, "", "%");
- input_value3_ = make_spin(10, 0, 100, 1);
-
- auto* v1w = make_row("VALUE / PRICE", input_value1_);
- auto* v2w = make_row("RATE / YIELD (%)", input_value2_);
- auto* v3w = make_row("TERM (years)", input_value3_);
-
- gl->addWidget(v1w, 1);
- gl->addWidget(v2w, 1);
- gl->addWidget(v3w, 1);
- fbl->addWidget(grid);
-
- auto* grid2 = new QWidget;
- auto* gl2 = new QHBoxLayout(grid2);
- gl2->setContentsMargins(0, 0, 0, 0);
- gl2->setSpacing(8);
-
- input_value4_ = make_spin(0, -100, 100, 2, "", "%");
- input_value5_ = make_spin(0, 0, 1e12, 2, "$");
- input_value6_ = make_spin(0, -100, 100, 4);
-
- auto* v4w = make_row("FEES / COSTS (%)", input_value4_);
- auto* v5w = make_row("CURRENT VALUE", input_value5_);
- auto* v6w = make_row("ADDITIONAL PARAM", input_value6_);
-
- gl2->addWidget(v4w, 1);
- gl2->addWidget(v5w, 1);
- gl2->addWidget(v6w, 1);
- fbl->addWidget(grid2);
-
- // Analyze button
- analyze_btn_ = new QPushButton("ANALYZE INVESTMENT");
+ auto* fhtitle = new QLabel("INPUT PARAMETERS");
+ fhtitle->setObjectName("altFormTitle");
+ analyze_btn_ = new QPushButton("ANALYZE");
analyze_btn_->setObjectName("altAnalyzeBtn");
analyze_btn_->setCursor(Qt::PointingHandCursor);
- analyze_btn_->setFixedHeight(34);
- connect(analyze_btn_, &QPushButton::clicked, this, &AltInvestmentsScreen::on_analyze);
- fbl->addWidget(analyze_btn_);
-
- fpvl->addWidget(form_body);
- vl->addWidget(form_panel);
+ analyze_btn_->setFixedHeight(26);
+ connect(analyze_btn_, &QPushButton::clicked,
+ this, &AltInvestmentsScreen::on_analyze);
+ fhl->addWidget(fhtitle);
+ fhl->addStretch(1);
+ fhl->addWidget(analyze_btn_);
+ fpvl->addWidget(fhdr);
- vl->addStretch(1);
- scroll->setWidget(content);
- return scroll;
+ form_container_ = new QWidget;
+ form_layout_ = new QVBoxLayout(form_container_);
+ form_layout_->setContentsMargins(12, 12, 12, 12);
+ form_layout_->setSpacing(8);
+ fpvl->addWidget(form_container_);
+
+ auto* wrap = new QWidget;
+ auto* wvl = new QVBoxLayout(wrap);
+ wvl->setContentsMargins(12, 12, 12, 12);
+ wvl->addWidget(form_panel);
+ wvl->addStretch(1);
+ vl->addWidget(wrap, 1);
+
+ outer->setWidget(content);
+ return outer;
}
QWidget* AltInvestmentsScreen::create_right_panel() {
auto* panel = new QWidget;
panel->setObjectName("altRightPanel");
-
auto* vl = new QVBoxLayout(panel);
vl->setContentsMargins(0, 0, 0, 0);
vl->setSpacing(0);
- auto* title = new QLabel("ANALYSIS VERDICT");
- title->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: 700; "
- "letter-spacing: 0.5px; background: transparent; "
- "padding: 8px 12px; border-bottom: 1px solid %2;")
- .arg(colors::TEXT_SECONDARY, colors::BORDER_DIM));
- vl->addWidget(title);
+ auto* hdr = new QLabel("ANALYSIS RESULTS");
+ hdr->setObjectName("altRightTitle");
+ vl->addWidget(hdr);
+ // Verdict summary
auto* verdict_area = new QWidget;
+ verdict_area->setFixedHeight(108);
auto* val = new QVBoxLayout(verdict_area);
- val->setContentsMargins(12, 12, 12, 12);
- val->setSpacing(10);
+ val->setContentsMargins(12, 10, 12, 8);
+ val->setSpacing(5);
- // Badge
verdict_badge_ = new QLabel("AWAITING ANALYSIS");
verdict_badge_->setObjectName("altVerdictBadge");
verdict_badge_->setAlignment(Qt::AlignCenter);
- verdict_badge_->setStyleSheet(QString("color: %1; background: %2; "
- "font-size: 12px; font-weight: 700; padding: 4px 12px;")
- .arg(colors::TEXT_DIM, colors::BG_RAISED));
+ verdict_badge_->setStyleSheet(
+ QString("color:%1; background:%2; font-size:11px; font-weight:700;"
+ " padding:4px 14px; letter-spacing:0.5px;")
+ .arg(colors::TEXT_DIM, colors::BG_RAISED));
val->addWidget(verdict_badge_);
- // Rating
verdict_rating_ = new QLabel;
verdict_rating_->setObjectName("altVerdictRating");
verdict_rating_->setAlignment(Qt::AlignCenter);
val->addWidget(verdict_rating_);
- // Recommendation
- verdict_recommendation_ = new QLabel;
- verdict_recommendation_->setObjectName("altVerdictRec");
- verdict_recommendation_->setWordWrap(true);
- val->addWidget(verdict_recommendation_);
-
- // Detailed output
- verdict_details_ = new QTextEdit;
- verdict_details_->setReadOnly(true);
- verdict_details_->setPlaceholderText("Run an analysis to see detailed results...");
- val->addWidget(verdict_details_, 1);
-
- vl->addWidget(verdict_area, 1);
+ verdict_rec_ = new QLabel;
+ verdict_rec_->setObjectName("altVerdictRec");
+ verdict_rec_->setWordWrap(true);
+ verdict_rec_->setAlignment(Qt::AlignCenter);
+ val->addWidget(verdict_rec_);
+ vl->addWidget(verdict_area);
+
+ auto* div = new QWidget;
+ div->setFixedHeight(1);
+ div->setStyleSheet(QString("background:%1;").arg(colors::BORDER_DIM));
+ vl->addWidget(div);
+
+ // Scrollable metric rows
+ metrics_scroll_ = new QScrollArea;
+ metrics_scroll_->setWidgetResizable(true);
+ metrics_scroll_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ metrics_scroll_->setFrameShape(QFrame::NoFrame);
+
+ metrics_container_ = new QWidget;
+ metrics_layout_ = new QVBoxLayout(metrics_container_);
+ metrics_layout_->setContentsMargins(0, 0, 0, 0);
+ metrics_layout_->setSpacing(0);
+ metrics_layout_->addStretch(1);
+
+ metrics_scroll_->setWidget(metrics_container_);
+ vl->addWidget(metrics_scroll_, 1);
return panel;
}
@@ -468,32 +665,118 @@ QWidget* AltInvestmentsScreen::create_status_bar() {
auto* bar = new QWidget;
bar->setObjectName("altStatusBar");
bar->setFixedHeight(26);
-
auto* hl = new QHBoxLayout(bar);
hl->setContentsMargins(16, 0, 16, 0);
-
- auto* left = new QLabel("ALTERNATIVE INVESTMENTS");
- left->setObjectName("altStatusText");
- hl->addWidget(left);
+ hl->setSpacing(8);
+ auto* lbl = new QLabel("ALTERNATIVE INVESTMENTS");
+ lbl->setObjectName("altStatusText");
+ hl->addWidget(lbl);
hl->addStretch(1);
-
- status_category_ = new QLabel("CATEGORY: BONDS & FIXED INCOME");
+ status_category_ = new QLabel;
status_category_->setObjectName("altStatusText");
hl->addWidget(status_category_);
-
- hl->addSpacing(12);
+ hl->addSpacing(10);
status_analyzer_ = new QLabel;
- status_analyzer_->setObjectName("altStatusHighlight");
+ status_analyzer_->setObjectName("altStatusHigh");
hl->addWidget(status_analyzer_);
-
return bar;
}
-// ── Slots ───────────────────────────────────────────────────────────────────
+// ── Dynamic form ─────────────────────────────────────────────────────────────
+
+void AltInvestmentsScreen::rebuild_form(int cat, int ana) {
+ for (auto* w : field_widgets_)
+ w->deleteLater();
+ field_widgets_.clear();
+ current_fields_.clear();
+
+ while (form_layout_->count() > 0) {
+ auto* item = form_layout_->takeAt(0);
+ if (item->widget()) item->widget()->deleteLater();
+ delete item;
+ }
+
+ const QString ana_id = categories_[cat].analyzers[ana].id;
+ current_fields_ = fields_for(ana_id);
+
+ int i = 0;
+ while (i < current_fields_.size()) {
+ const auto& f = current_fields_[i];
+ const bool pair = (f.type == AltField::Spin
+ && i + 1 < current_fields_.size()
+ && current_fields_[i + 1].type == AltField::Spin);
+
+ if (pair) {
+ auto* row = new QWidget;
+ auto* rl = new QHBoxLayout(row);
+ rl->setContentsMargins(0, 0, 0, 0);
+ rl->setSpacing(8);
+
+ auto build_spin_col = [&](const AltField& field) -> QWidget* {
+ auto* col = new QWidget;
+ auto* cl = new QVBoxLayout(col);
+ cl->setContentsMargins(0, 0, 0, 0);
+ cl->setSpacing(3);
+ auto* lbl = new QLabel(field.label);
+ lbl->setObjectName("altFieldLabel");
+ cl->addWidget(lbl);
+ auto* sp = new QDoubleSpinBox;
+ sp->setRange(field.min_val, field.max_val);
+ sp->setValue(field.default_val);
+ sp->setDecimals(field.decimals);
+ sp->setButtonSymbols(QAbstractSpinBox::NoButtons);
+ if (!field.prefix.isEmpty()) sp->setPrefix(field.prefix);
+ if (!field.suffix.isEmpty()) sp->setSuffix(field.suffix);
+ cl->addWidget(sp);
+ field_widgets_.append(sp);
+ return col;
+ };
+
+ rl->addWidget(build_spin_col(f), 1);
+ rl->addWidget(build_spin_col(current_fields_[i + 1]), 1);
+ form_layout_->addWidget(row);
+ i += 2;
+ } else {
+ auto* col = new QWidget;
+ auto* cl = new QVBoxLayout(col);
+ cl->setContentsMargins(0, 0, 0, 0);
+ cl->setSpacing(3);
+ auto* lbl = new QLabel(f.label);
+ lbl->setObjectName("altFieldLabel");
+ cl->addWidget(lbl);
+
+ if (f.type == AltField::Text) {
+ auto* le = new QLineEdit(f.combo_items);
+ cl->addWidget(le);
+ field_widgets_.append(le);
+ } else if (f.type == AltField::Combo) {
+ auto* cb = new QComboBox;
+ for (const auto& item : f.combo_items.split('|'))
+ cb->addItem(item.trimmed());
+ cl->addWidget(cb);
+ field_widgets_.append(cb);
+ } else {
+ auto* sp = new QDoubleSpinBox;
+ sp->setRange(f.min_val, f.max_val);
+ sp->setValue(f.default_val);
+ sp->setDecimals(f.decimals);
+ sp->setButtonSymbols(QAbstractSpinBox::NoButtons);
+ if (!f.prefix.isEmpty()) sp->setPrefix(f.prefix);
+ if (!f.suffix.isEmpty()) sp->setSuffix(f.suffix);
+ cl->addWidget(sp);
+ field_widgets_.append(sp);
+ }
+ form_layout_->addWidget(col);
+ ++i;
+ }
+ }
+ form_layout_->addStretch(1);
+}
+
+// ── Slots ─────────────────────────────────────────────────────────────────────
void AltInvestmentsScreen::on_category_changed(int index) {
- if (index < 0 || index >= categories_.size())
- return;
+ if (index < 0 || index >= categories_.size()) return;
active_category_ = index;
for (int i = 0; i < cat_btns_.size(); ++i) {
@@ -502,212 +785,367 @@ void AltInvestmentsScreen::on_category_changed(int index) {
cat_btns_[i]->style()->polish(cat_btns_[i]);
}
- // Update analyzer combo
+ const auto& cat = categories_[index];
+ center_title_->setText(cat.name.toUpper());
+ status_category_->setText("CATEGORY: " + cat.name.toUpper());
+
+ analyzer_combo_->blockSignals(true);
analyzer_combo_->clear();
- for (const auto& a : categories_[index].analyzers) {
+ for (const auto& a : cat.analyzers)
analyzer_combo_->addItem(a.name);
- }
-
- center_title_->setText(categories_[index].name.toUpper());
- status_category_->setText("CATEGORY: " + categories_[index].name.toUpper());
-
- // Update type dropdown based on category
- input_type_->clear();
- if (index == 0) { // Bonds
- input_type_->addItems({"BBB", "BB", "B", "CCC"});
- } else if (index == 1) { // Real Estate
- input_type_->addItems({"office", "retail", "industrial", "multifamily", "hotel"});
- } else if (index == 2) { // Hedge Funds
- input_type_->addItems({"equity_long_short", "event_driven", "global_macro", "relative_value"});
- } else if (index == 3) { // Commodities
- input_type_->addItems({"gold", "silver", "platinum", "palladium"});
- } else if (index == 5) { // Annuities
- input_type_->addItems({"fixed", "variable", "equity_indexed", "inflation"});
- } else if (index == 8) { // Strategies
- input_type_->addItems({"covered_call", "sri", "asset_location", "performance", "risk"});
- } else {
- input_type_->addItems({"default"});
- }
-
- if (analyzer_combo_->count() > 0)
- on_analyzer_changed(0);
+ analyzer_combo_->blockSignals(false);
- LOG_INFO("AltInvestments", "Category: " + categories_[index].name);
+ on_analyzer_changed(0);
+ LOG_INFO("AltInvestments", "Category: " + cat.name);
}
void AltInvestmentsScreen::on_analyzer_changed(int index) {
if (index < 0 || index >= categories_[active_category_].analyzers.size())
return;
active_analyzer_ = index;
- status_analyzer_->setText(categories_[active_category_].analyzers[index].name);
+
+ const auto& ana = categories_[active_category_].analyzers[index];
+ center_desc_->setText(ana.description);
+ status_analyzer_->setText(ana.name.toUpper());
+ analyzer_combo_->setCurrentIndex(index);
+ rebuild_form(active_category_, index);
}
void AltInvestmentsScreen::on_analyze() {
- if (loading_)
- return;
+ if (loading_) return;
+ const auto& ana = categories_[active_category_].analyzers[active_analyzer_];
+ run_analysis(ana.id, collect_form_data());
+}
- const auto& analyzer = categories_[active_category_].analyzers[active_analyzer_];
+// ── Form data collection ─────────────────────────────────────────────────────
+QJsonObject AltInvestmentsScreen::collect_form_data() const {
QJsonObject data;
- data["name"] = input_name_->text();
- data["type"] = input_type_->currentText();
- data["value"] = input_value1_->value();
- data["rate"] = input_value2_->value() / 100.0;
- data["term"] = input_value3_->value();
- data["fee"] = input_value4_->value() / 100.0;
- data["current_value"] = input_value5_->value();
- data["additional"] = input_value6_->value();
-
- run_analysis(analyzer.id, data);
+ for (int i = 0; i < current_fields_.size() && i < field_widgets_.size(); ++i) {
+ const auto& f = current_fields_[i];
+ auto* w = field_widgets_[i];
+ if (f.type == AltField::Text) {
+ if (auto* le = qobject_cast<QLineEdit*>(w))
+ data[f.key] = le->text();
+ } else if (f.type == AltField::Combo) {
+ if (auto* cb = qobject_cast<QComboBox*>(w))
+ data[f.key] = cb->currentText();
+ } else {
+ if (auto* sp = qobject_cast<QDoubleSpinBox*>(w)) {
+ double val = sp->value();
+ if (f.suffix == "B") val *= 1e9;
+ else if (f.suffix == "M") val *= 1e6;
+ else if (f.divide_100) val /= 100.0;
+ data[f.key] = val;
+ }
+ }
+ }
+ return data;
}
-// ── Python integration ──────────────────────────────────────────────────────
-
-void AltInvestmentsScreen::run_analysis(const QString& command, const QJsonObject& data) {
- QString data_json = QString::fromUtf8(QJsonDocument(data).toJson(QJsonDocument::Compact));
+// ── Python execution ──────────────────────────────────────────────────────────
+void AltInvestmentsScreen::run_analysis(const QString& command,
+ const QJsonObject& data)
+{
+ const QString data_json =
+ QString::fromUtf8(QJsonDocument(data).toJson(QJsonDocument::Compact));
const QString cache_key = "alt_screen:" + command + ":" + data_json;
+
const QVariant cached = fincept::CacheManager::instance().get(cache_key);
if (!cached.isNull()) {
auto doc = QJsonDocument::fromJson(cached.toString().toUtf8());
- if (!doc.isNull() && doc.isObject()) {
- display_verdict(doc.object());
- return;
- }
+ if (doc.isObject()) { display_verdict(doc.object(), command); return; }
}
set_loading(true);
verdict_badge_->setText("ANALYZING...");
- verdict_badge_->setStyleSheet(QString("color: %1; background: rgba(217,119,6,0.15); "
- "font-size: 12px; font-weight: 700; padding: 4px 12px;")
- .arg(colors::AMBER));
+ verdict_badge_->setStyleSheet(
+ QString("color:%1; background:rgba(217,119,6,0.15);"
+ " font-size:11px; font-weight:700; padding:4px 14px;")
+ .arg(colors::AMBER));
+ verdict_rating_->clear();
+ verdict_rec_->clear();
+
+ while (metrics_layout_->count() > 0) {
+ auto* item = metrics_layout_->takeAt(0);
+ if (item->widget()) item->widget()->deleteLater();
+ delete item;
+ }
+ metrics_layout_->addStretch(1);
QPointer<AltInvestmentsScreen> self = this;
- python::PythonRunner::instance().run("Analytics/alternateInvestment/cli.py", {command, "--data", data_json},
- [self, command, cache_key](const python::PythonResult& result) {
- if (!self)
- return;
- self->set_loading(false);
-
- if (!result.success) {
- self->display_error(result.error.isEmpty() ? "Analysis failed"
- : result.error);
- return;
- }
-
- QString json_str = python::extract_json(result.output);
- if (json_str.isEmpty()) {
- self->display_error("No results from analysis");
- return;
- }
-
- QJsonParseError err;
- auto doc = QJsonDocument::fromJson(json_str.toUtf8(), &err);
- if (doc.isNull() || !doc.isObject()) {
- self->display_error("Invalid response format");
- return;
- }
-
- auto obj = doc.object();
- if (obj.contains("error")) {
- self->display_error(obj["error"].toString());
- return;
- }
-
- fincept::CacheManager::instance().put(
- cache_key,
- QVariant(QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact))),
- 10 * 60, "alt_investments");
- self->display_verdict(obj);
- LOG_INFO("AltInvestments", "Analysis complete: " + command);
- });
+ python::PythonRunner::instance().run(
+ "Analytics/alternateInvestment/cli.py",
+ { command, "--data", data_json },
+ [self, command, cache_key](const python::PythonResult& result) {
+ if (!self) return;
+ self->set_loading(false);
+
+ if (!result.success) {
+ self->display_error(
+ result.error.isEmpty() ? "Python process failed" : result.error);
+ return;
+ }
+
+ const QString json_str = python::extract_json(result.output);
+ if (json_str.isEmpty()) {
+ self->display_error("No JSON output from analyzer");
+ return;
+ }
+
+ QJsonParseError perr;
+ auto doc = QJsonDocument::fromJson(json_str.toUtf8(), &perr);
+ if (doc.isNull() || !doc.isObject()) {
+ self->display_error("Invalid JSON: " + perr.errorString());
+ return;
+ }
+
+ auto obj = doc.object();
+ if (!obj.value("success").toBool(true) && obj.contains("error")) {
+ self->display_error(obj["error"].toString("Analysis failed"));
+ return;
+ }
+
+ fincept::CacheManager::instance().put(
+ cache_key,
+ QVariant(QString::fromUtf8(
+ QJsonDocument(obj).toJson(QJsonDocument::Compact))),
+ 10 * 60, "alt_investments");
+
+ self->display_verdict(obj, command);
+ LOG_INFO("AltInvestments", "Analysis complete: " + command);
+ });
}
-// ── Display ─────────────────────────────────────────────────────────────────
-
-void AltInvestmentsScreen::display_verdict(const QJsonObject& result) {
- auto metrics = result.contains("metrics") ? result["metrics"].toObject() : result;
-
- // Verdict badge
- QString category = metrics.value("analysis_category").toString("MIXED");
- QString badge_color;
- QString badge_bg;
-
- if (category.contains("GOOD", Qt::CaseInsensitive)) {
- badge_color = colors::POSITIVE();
- badge_bg = "rgba(22,163,74,0.15)";
- } else if (category.contains("BAD", Qt::CaseInsensitive) || category.contains("UGLY", Qt::CaseInsensitive)) {
- badge_color = colors::NEGATIVE();
- badge_bg = "rgba(220,38,38,0.15)";
- } else if (category.contains("FLAWED", Qt::CaseInsensitive)) {
- badge_color = "#FFD700";
- badge_bg = "rgba(255,215,0,0.15)";
- } else {
- badge_color = colors::CYAN();
- badge_bg = "rgba(8,145,178,0.15)";
- }
+// ── Verdict display ───────────────────────────────────────────────────────────
+
+static QString stars_for(const QString& rating_str) {
+ const QRegularExpression re(R"((\d+)\s*/\s*10)");
+ const auto match = re.match(rating_str);
+ if (!match.hasMatch()) return rating_str;
+ const int n = match.captured(1).toInt();
+ const int stars = qMax(1, qMin(5, (n + 1) / 2));
+ return QString("\u2605").repeated(stars)
+ + QString("\u2606").repeated(5 - stars)
+ + " " + rating_str;
+}
+
+void AltInvestmentsScreen::display_verdict(const QJsonObject& result,
+ const QString& /*command*/)
+{
+ const auto metrics = result.contains("metrics")
+ ? result["metrics"].toObject()
+ : result;
+
+ // ── Badge ─────────────────────────────────────────────────────────────────
+ QString category = metrics.value("analysis_category")
+ .toString(metrics.value("category").toString());
+ if (category.isEmpty())
+ category = result.value("asset_type").toString(
+ result.value("product_type").toString(
+ result.value("fund_type").toString("RESULT")));
+
+ QString badge_color, badge_bg;
+ const QString lcat = category.toLower();
+ if (lcat.contains("good") || lcat.contains("ok"))
+ { badge_color = colors::POSITIVE(); badge_bg = "rgba(22,163,74,0.15)"; }
+ else if (lcat.contains("ugly") || lcat.contains("bad") || lcat.contains("avoid"))
+ { badge_color = colors::NEGATIVE(); badge_bg = "rgba(220,38,38,0.15)"; }
+ else if (lcat.contains("flaw") || lcat.contains("warn") || lcat.contains("caution"))
+ { badge_color = "#FFD700"; badge_bg = "rgba(255,215,0,0.15)"; }
+ else
+ { badge_color = colors::CYAN(); badge_bg = "rgba(8,145,178,0.15)"; }
verdict_badge_->setText(category.toUpper());
- verdict_badge_->setStyleSheet(QString("color: %1; background: %2; "
- "font-size: 12px; font-weight: 700; padding: 4px 12px;")
- .arg(badge_color, badge_bg));
-
- // Rating
- QString rating = metrics.value("rating").toString();
- verdict_rating_->setText(rating.isEmpty() ? "" : rating);
-
- // Recommendation
- QString rec = metrics.value("analysis_recommendation").toString();
- verdict_recommendation_->setText(rec);
-
- // Detailed output
- QStringList details;
-
- // Key problems
- auto problems = metrics["key_problems"].toArray();
- if (!problems.isEmpty()) {
- details << "KEY FINDINGS:";
- for (int i = 0; i < problems.size(); ++i) {
- details << QString(" %1. %2").arg(i + 1).arg(problems[i].toString());
- }
- details << "";
+ verdict_badge_->setStyleSheet(
+ QString("color:%1; background:%2; font-size:11px; font-weight:700;"
+ " padding:4px 14px; letter-spacing:0.5px;")
+ .arg(badge_color, badge_bg));
+
+ // ── Rating ────────────────────────────────────────────────────────────────
+ const QString rating = metrics.value("rating")
+ .toString(result.value("rating").toString());
+ if (!rating.isEmpty())
+ verdict_rating_->setText(stars_for(rating));
+
+ // ── Recommendation ────────────────────────────────────────────────────────
+ const QString rec =
+ metrics.value("analysis_recommendation").toString(
+ metrics.value("bottom_line").toString(
+ metrics.value("analysis_summary").toString()));
+ if (!rec.isEmpty())
+ verdict_rec_->setText(rec);
+
+ // ── Metric rows ───────────────────────────────────────────────────────────
+ while (metrics_layout_->count() > 0) {
+ auto* item = metrics_layout_->takeAt(0);
+ if (item->widget()) item->widget()->deleteLater();
+ delete item;
}
- // When acceptable
- QString when = metrics.value("when_acceptable").toString();
- if (!when.isEmpty()) {
- details << "WHEN ACCEPTABLE:";
- details << " " + when;
- details << "";
+ for (auto it = metrics.begin(); it != metrics.end(); ++it)
+ append_metric_row(metrics_container_, metrics_layout_,
+ it.key(), it.value(), 0);
+
+ metrics_layout_->addStretch(1);
+}
+
+// ── Recursive metric renderer ─────────────────────────────────────────────────
+
+void AltInvestmentsScreen::append_metric_row(QWidget* /*parent*/,
+ QVBoxLayout* vl,
+ const QString& key,
+ const QJsonValue& val,
+ int depth)
+{
+ static const QSet<QString> kSkip = {
+ "success", "asset_type", "method", "product_type", "fund_type",
+ "strategy", "analysis_category", "category", "rating",
+ "analysis_recommendation", "bottom_line", "analysis_summary"
+ };
+ if (kSkip.contains(key)) return;
+
+ // Object → section header + recurse
+ if (val.isObject()) {
+ QString sec_text = key;
+ sec_text.replace('_', ' ').replace('-', ' ');
+ auto* sec = new QLabel(sec_text.toUpper());
+ sec->setObjectName("altMetricSection");
+ vl->addWidget(sec);
+ for (auto it = val.toObject().begin(); it != val.toObject().end(); ++it)
+ append_metric_row(nullptr, vl, it.key(), it.value(), depth + 1);
+ return;
}
- // All numeric metrics
- details << "METRICS:";
- for (auto it = metrics.begin(); it != metrics.end(); ++it) {
- if (it.value().isDouble()) {
- details << QString(" %1: %2").arg(it.key()).arg(it.value().toDouble(), 0, 'f', 4);
+ // Array → section + bullet list
+ if (val.isArray()) {
+ const auto arr = val.toArray();
+ if (arr.isEmpty()) return;
+ QString sec_text = key;
+ sec_text.replace('_', ' ').replace('-', ' ');
+ auto* sec = new QLabel(sec_text.toUpper());
+ sec->setObjectName("altMetricSection");
+ vl->addWidget(sec);
+ for (const auto& elem : arr) {
+ const QString text =
+ "\xB7 " + (elem.isString() ? elem.toString() : format_value(elem));
+ auto* row = new QWidget;
+ row->setObjectName("altMetricRow");
+ auto* rl = new QHBoxLayout(row);
+ rl->setContentsMargins(12, 4, 12, 4);
+ auto* lbl = new QLabel(text);
+ lbl->setWordWrap(true);
+ const QString lc = text.toLower();
+ if (lc.contains("warn") || lc.contains("risk") || lc.contains("bad")
+ || lc.contains("avoid") || lc.contains("toxic")
+ || lc.contains("never"))
+ lbl->setObjectName("altMetricBad");
+ else if (lc.contains("good") || lc.contains("accept")
+ || lc.contains("safe") || lc.contains("benefit"))
+ lbl->setObjectName("altMetricGood");
+ else
+ lbl->setObjectName("altMetricBullet");
+ rl->addWidget(lbl, 1);
+ vl->addWidget(row);
}
+ return;
}
- verdict_details_->setPlainText(details.join("\n"));
+ // Annotation string — full-width coloured row
+ if (val.isString()) {
+ const QString text = val.toString();
+ if (text.isEmpty()) return;
+ const bool is_annotation =
+ key.startsWith("analysis_") || key == "note"
+ || key == "interpretation" || key == "situation"
+ || key == "investor_risk" || key == "reason";
+ if (is_annotation) {
+ auto* row = new QWidget;
+ row->setObjectName("altMetricRow");
+ auto* rl = new QHBoxLayout(row);
+ rl->setContentsMargins(12, 5, 12, 5);
+ auto* lbl = new QLabel(text);
+ lbl->setWordWrap(true);
+ const QString lc = text.toLower();
+ if (lc.contains("warn") || lc.contains("toxic") || lc.contains("avoid")
+ || lc.contains("bad") || lc.contains("never"))
+ lbl->setObjectName("altMetricWarn");
+ else if (lc.contains("good") || lc.contains("safe")
+ || lc.contains("acceptable"))
+ lbl->setObjectName("altMetricGood");
+ else
+ lbl->setObjectName("altMetricBulletVal");
+ rl->addWidget(lbl, 1);
+ vl->addWidget(row);
+ return;
+ }
+ }
+
+ // Normal key = value row
+ QStringList words = key.split('_');
+ for (auto& w : words)
+ if (!w.isEmpty()) w[0] = w[0].toUpper();
+
+ auto* row = new QWidget;
+ row->setObjectName("altMetricRow");
+ auto* rl = new QHBoxLayout(row);
+ rl->setContentsMargins(12 + depth * 8, 5, 12, 5);
+
+ auto* klbl = new QLabel(words.join(' '));
+ klbl->setObjectName("altMetricKey");
+ auto* vlbl = new QLabel(format_value(val));
+ vlbl->setObjectName("altMetricVal");
+ vlbl->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+
+ rl->addWidget(klbl, 1);
+ rl->addWidget(vlbl);
+ vl->addWidget(row);
+}
+
+QString AltInvestmentsScreen::format_value(const QJsonValue& v) const {
+ if (v.isBool()) return v.toBool() ? "Yes" : "No";
+ if (v.isNull()) return "\u2014";
+ if (v.isString()) return v.toString();
+ if (v.isDouble()) {
+ const double d = v.toDouble();
+ // Looks like a 0–1 rate/fraction (not an integer)
+ if (d > 0.0001 && d < 1.0
+ && d != static_cast<double>(static_cast<long long>(d)))
+ return QString::number(d * 100.0, 'f', 2) + "%";
+ if (qAbs(d) >= 1e12) return QString::number(d / 1e12, 'f', 2) + "T";
+ if (qAbs(d) >= 1e9) return QString::number(d / 1e9, 'f', 2) + "B";
+ if (qAbs(d) >= 1e6) return QString::number(d / 1e6, 'f', 2) + "M";
+ if (d == static_cast<double>(static_cast<long long>(d)) && qAbs(d) < 1e15)
+ return QString::number(static_cast<long long>(d));
+ return QString::number(d, 'f', 4);
+ }
+ if (v.isArray()) return QString("[%1 items]").arg(v.toArray().size());
+ return "[object]";
}
void AltInvestmentsScreen::display_error(const QString& error) {
verdict_badge_->setText("ERROR");
- verdict_badge_->setStyleSheet(QString("color: %1; background: rgba(220,38,38,0.15); "
- "font-size: 12px; font-weight: 700; padding: 4px 12px;")
- .arg(colors::NEGATIVE));
+ verdict_badge_->setStyleSheet(
+ QString("color:%1; background:rgba(220,38,38,0.15);"
+ " font-size:11px; font-weight:700; padding:4px 14px;")
+ .arg(colors::NEGATIVE));
verdict_rating_->clear();
- verdict_recommendation_->setText(error);
- verdict_details_->clear();
+ verdict_rec_->setText(error);
+ while (metrics_layout_->count() > 0) {
+ auto* item = metrics_layout_->takeAt(0);
+ if (item->widget()) item->widget()->deleteLater();
+ delete item;
+ }
+ metrics_layout_->addStretch(1);
LOG_ERROR("AltInvestments", error);
}
void AltInvestmentsScreen::set_loading(bool loading) {
loading_ = loading;
analyze_btn_->setEnabled(!loading);
- analyze_btn_->setText(loading ? "ANALYZING..." : "ANALYZE INVESTMENT");
+ analyze_btn_->setText(loading ? "ANALYZING..." : "ANALYZE");
}
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/alt_investments/AltInvestmentsScreen.h b/fincept-qt/src/screens/alt_investments/AltInvestmentsScreen.h
index 3ed49b956..d8a2bfd23 100644
--- a/fincept-qt/src/screens/alt_investments/AltInvestmentsScreen.h
+++ b/fincept-qt/src/screens/alt_investments/AltInvestmentsScreen.h
@@ -2,90 +2,112 @@
#include <QComboBox>
#include <QDoubleSpinBox>
+#include <QFrame>
#include <QJsonObject>
#include <QLabel>
#include <QLineEdit>
#include <QPushButton>
-#include <QStackedWidget>
-#include <QTextEdit>
+#include <QScrollArea>
+#include <QVBoxLayout>
#include <QWidget>
namespace fincept::screens {
-/// Analyzer descriptor within a category.
struct AltAnalyzer {
- QString id; // Python command name
- QString name; // Display name
+ QString id; // Python CLI command (e.g. "high-yield")
+ QString name; // Display name
+ QString description; // Short description shown in header
};
-/// Category of alternative investments.
struct AltCategory {
QString id;
QString name;
- QString color; // accent hex
+ QString color;
+ QString icon;
QList<AltAnalyzer> analyzers;
};
-/// Alternative Investments Analysis Screen.
-/// 10 categories, 27 analyzers backed by Python analytics modules.
-/// Categories: Bonds, Real Estate, Hedge Funds, Commodities, Private Capital,
-/// Annuities, Structured Products, Inflation Protected, Strategies, Digital Assets.
+/// Form field descriptor — drives dynamic form generation per analyzer.
+struct AltField {
+ QString key; // JSON key sent to Python
+ QString label; // Display label
+ enum Type { Text, Spin, Combo } type = Spin;
+ double default_val = 0.0;
+ double min_val = 0.0;
+ double max_val = 1e9;
+ int decimals = 2;
+ QString prefix;
+ QString suffix;
+ QString combo_items; // pipe-separated, used when type==Combo
+ bool divide_100 = false; // divide UI value by 100 before sending (for % fields)
+};
+
class AltInvestmentsScreen : public QWidget {
Q_OBJECT
- public:
+public:
explicit AltInvestmentsScreen(QWidget* parent = nullptr);
- private slots:
+protected:
+ void showEvent(QShowEvent* e) override;
+ void hideEvent(QHideEvent* e) override;
+
+private slots:
void on_category_changed(int index);
void on_analyzer_changed(int index);
void on_analyze();
- private:
+private:
+ // Setup
void setup_ui();
QWidget* create_header();
QWidget* create_left_panel();
QWidget* create_center_panel();
QWidget* create_right_panel();
QWidget* create_status_bar();
+ void rebuild_form(int cat, int ana);
- QWidget* build_form_for(const QString& analyzer_id);
+ // Data / execution
void run_analysis(const QString& command, const QJsonObject& data);
- void display_verdict(const QJsonObject& result);
+ QJsonObject collect_form_data() const;
+
+ // Display helpers
+ void display_verdict(const QJsonObject& result, const QString& command);
void display_error(const QString& error);
void set_loading(bool loading);
+ void append_metric_row(QWidget* parent, QVBoxLayout* vl,
+ const QString& key, const QJsonValue& val, int depth = 0);
+ QString format_value(const QJsonValue& v) const;
- // Categories
+ // Category/analyzer data
QList<AltCategory> categories_;
int active_category_ = 0;
int active_analyzer_ = 0;
- bool loading_ = false;
+ bool loading_ = false;
- // UI — Left panel
+ // Left panel
QList<QPushButton*> cat_btns_;
- // UI — Center
- QComboBox* analyzer_combo_ = nullptr;
- QStackedWidget* form_stack_ = nullptr;
- QPushButton* analyze_btn_ = nullptr;
- QLabel* center_title_ = nullptr;
-
- // Input fields (reused across forms)
- QLineEdit* input_name_ = nullptr;
- QDoubleSpinBox* input_value1_ = nullptr;
- QDoubleSpinBox* input_value2_ = nullptr;
- QDoubleSpinBox* input_value3_ = nullptr;
- QDoubleSpinBox* input_value4_ = nullptr;
- QDoubleSpinBox* input_value5_ = nullptr;
- QDoubleSpinBox* input_value6_ = nullptr;
- QComboBox* input_type_ = nullptr;
-
- // UI — Right panel (verdict)
- QLabel* verdict_badge_ = nullptr;
- QLabel* verdict_recommendation_ = nullptr;
- QTextEdit* verdict_details_ = nullptr;
- QLabel* verdict_rating_ = nullptr;
-
- // UI — Status
+ // Center
+ QLabel* center_title_ = nullptr;
+ QLabel* center_desc_ = nullptr;
+ QComboBox* analyzer_combo_ = nullptr;
+ QWidget* form_container_ = nullptr; // holds dynamic form rows
+ QVBoxLayout* form_layout_ = nullptr;
+ QPushButton* analyze_btn_ = nullptr;
+
+ // Dynamic form fields (rebuilt per analyzer)
+ QList<AltField> current_fields_;
+ QList<QWidget*> field_widgets_; // parallel to current_fields_
+
+ // Right panel — verdict
+ QLabel* verdict_badge_ = nullptr;
+ QLabel* verdict_rating_ = nullptr;
+ QLabel* verdict_rec_ = nullptr;
+ QWidget* metrics_container_ = nullptr;
+ QVBoxLayout* metrics_layout_ = nullptr;
+ QScrollArea* metrics_scroll_ = nullptr;
+
+ // Status bar
QLabel* status_category_ = nullptr;
QLabel* status_analyzer_ = nullptr;
};
diff --git a/fincept-qt/src/screens/asia_markets/AsiaMarketsScreen.cpp b/fincept-qt/src/screens/asia_markets/AsiaMarketsScreen.cpp
index 5f52d0735..9bcf0742b 100644
--- a/fincept-qt/src/screens/asia_markets/AsiaMarketsScreen.cpp
+++ b/fincept-qt/src/screens/asia_markets/AsiaMarketsScreen.cpp
@@ -1,6 +1,7 @@
#include "screens/asia_markets/AsiaMarketsScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "python/PythonRunner.h"
#include "storage/cache/CacheManager.h"
#include "ui/theme/Theme.h"
@@ -410,6 +411,7 @@ void AsiaMarketsScreen::on_category_changed(int index) {
search_input_->clear();
LOG_INFO("AsiaMarkets", "Category: " + categories_[index].name);
+ ScreenStateManager::instance().notify_changed(this);
if (endpoint_cache_.contains(categories_[index].script)) {
populate_endpoint_list(endpoint_cache_[categories_[index].script]);
@@ -429,6 +431,7 @@ void AsiaMarketsScreen::on_region_changed(int index) {
status_region_->setText("REGION: " + regions_[index]);
LOG_INFO("AsiaMarkets", "Region: " + regions_[index]);
+ ScreenStateManager::instance().notify_changed(this);
}
void AsiaMarketsScreen::on_endpoint_clicked(QListWidgetItem* item) {
@@ -799,4 +802,26 @@ void AsiaMarketsScreen::set_loading(bool loading) {
exec_btn_->setEnabled(!loading && !active_endpoint_.isEmpty());
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap AsiaMarketsScreen::save_state() const {
+ return {
+ {"category", active_category_},
+ {"region", active_region_},
+ {"endpoint", active_endpoint_},
+ };
+}
+
+void AsiaMarketsScreen::restore_state(const QVariantMap& state) {
+ const int region = state.value("region", 0).toInt();
+ if (region != active_region_)
+ on_region_changed(region);
+
+ const int cat = state.value("category", 0).toInt();
+ if (cat != active_category_)
+ on_category_changed(cat);
+ // active_endpoint_ is restored via on_category_changed populating the list;
+ // exact endpoint row selection would need list rebuilding — skip for simplicity.
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/asia_markets/AsiaMarketsScreen.h b/fincept-qt/src/screens/asia_markets/AsiaMarketsScreen.h
index 23c6d6a74..3b4a04f64 100644
--- a/fincept-qt/src/screens/asia_markets/AsiaMarketsScreen.h
+++ b/fincept-qt/src/screens/asia_markets/AsiaMarketsScreen.h
@@ -1,5 +1,7 @@
#pragma once
+#include "screens/IStatefulScreen.h"
+
#include <QComboBox>
#include <QJsonArray>
#include <QJsonObject>
@@ -27,11 +29,16 @@ struct StockCategory {
/// Chinese A/B shares, Hong Kong, and US markets.
/// 8 categories: Realtime, Historical, Financial, Holdings,
/// Fund Flow, Boards, Margin/HSGT, Hot & News.
-class AsiaMarketsScreen : public QWidget {
+class AsiaMarketsScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit AsiaMarketsScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "asia_markets"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* e) override;
diff --git a/fincept-qt/src/screens/auth/ForgotPasswordScreen.cpp b/fincept-qt/src/screens/auth/ForgotPasswordScreen.cpp
index 4437a8e52..5a6ff9b68 100644
--- a/fincept-qt/src/screens/auth/ForgotPasswordScreen.cpp
+++ b/fincept-qt/src/screens/auth/ForgotPasswordScreen.cpp
@@ -13,53 +13,78 @@ namespace fincept::screens {
// ── Obsidian Styles ──────────────────────────────────────────────────────────
-static const char* CARD_STYLE = "background: #0a0a0a; border: 1px solid #1a1a1a;";
-
-static const char* INPUT_STYLE = "QLineEdit {"
- " background: #0a0a0a; color: #e5e5e5;"
- " border: 1px solid #1a1a1a;"
- " padding: 6px 10px; font-size: 15px;"
- " font-family: 'Consolas','Courier New',monospace;"
- " selection-background-color: #d97706; selection-color: #080808;"
- "}"
- "QLineEdit:focus { border: 1px solid #333333; }"
- "QLineEdit::placeholder { color: #404040; }";
-
-static const char* BTN_PRIMARY = "QPushButton {"
- " background: rgba(217,119,6,0.1); color: #d97706;"
- " border: 1px solid #78350f;"
- " padding: 0 16px; font-size: 14px; font-weight: 700;"
- " font-family: 'Consolas','Courier New',monospace;"
- "}"
- "QPushButton:hover { background: #d97706; color: #080808; }"
- "QPushButton:disabled { color: #404040; background: #111111; border-color: #1a1a1a; }";
-
-static const char* BTN_STANDARD = "QPushButton {"
- " background: #111111; color: #808080;"
- " border: 1px solid #1a1a1a;"
- " padding: 0 12px; font-size: 14px; font-weight: 700;"
- " font-family: 'Consolas','Courier New',monospace;"
- "}"
- "QPushButton:hover { color: #e5e5e5; background: #161616; }";
-
-static const char* LINK_STYLE = "QPushButton {"
- " color: #808080; background: transparent; border: none;"
- " font-size: 13px; font-weight: 400;"
- " font-family: 'Consolas','Courier New',monospace;"
- "}"
- "QPushButton:hover { color: #e5e5e5; }";
-
-static const char* LABEL_STYLE = "color: #808080; font-size: 13px; font-weight: 700;"
- "background: transparent; letter-spacing: 0.5px;"
- "font-family: 'Consolas','Courier New',monospace;";
-
-static const char* MUTED_STYLE = "color: #525252; font-size: 13px; background: transparent;"
- "font-family: 'Consolas','Courier New',monospace;";
+static QString card_style() {
+ return QString("background: %1; border: 1px solid %2;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM);
+}
+
+static QString input_style() {
+ return QString("QLineEdit {"
+ " background: %1; color: %2;"
+ " border: 1px solid %3;"
+ " padding: 6px 10px; font-size: 15px;"
+ " font-family: 'Consolas','Courier New',monospace;"
+ " selection-background-color: %4; selection-color: %5;"
+ "}"
+ "QLineEdit:focus { border: 1px solid %6; }"
+ "QLineEdit::placeholder { color: %7; }")
+ .arg(ui::colors::BG_SURFACE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM,
+ ui::colors::AMBER, ui::colors::BG_BASE,
+ ui::colors::BORDER_BRIGHT, ui::colors::TEXT_DIM);
+}
+
+static QString btn_primary() {
+ return QString("QPushButton {"
+ " background: rgba(217,119,6,0.1); color: %1;"
+ " border: 1px solid %2;"
+ " padding: 0 16px; font-size: 14px; font-weight: 700;"
+ " font-family: 'Consolas','Courier New',monospace;"
+ "}"
+ "QPushButton:hover { background: %1; color: %3; }"
+ "QPushButton:disabled { color: %4; background: %5; border-color: %6; }")
+ .arg(ui::colors::AMBER, ui::colors::AMBER_DIM, ui::colors::BG_BASE,
+ ui::colors::TEXT_DIM, ui::colors::BG_RAISED, ui::colors::BORDER_DIM);
+}
+
+static QString btn_standard() {
+ return QString("QPushButton {"
+ " background: %1; color: %2;"
+ " border: 1px solid %3;"
+ " padding: 0 12px; font-size: 14px; font-weight: 700;"
+ " font-family: 'Consolas','Courier New',monospace;"
+ "}"
+ "QPushButton:hover { color: %4; background: %5; }")
+ .arg(ui::colors::BG_RAISED, ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM,
+ ui::colors::TEXT_PRIMARY, ui::colors::BG_HOVER);
+}
+
+static QString link_style() {
+ return QString("QPushButton {"
+ " color: %1; background: transparent; border: none;"
+ " font-size: 13px; font-weight: 400;"
+ " font-family: 'Consolas','Courier New',monospace;"
+ "}"
+ "QPushButton:hover { color: %2; }")
+ .arg(ui::colors::TEXT_SECONDARY, ui::colors::TEXT_PRIMARY);
+}
+
+static QString label_style() {
+ return QString("color: %1; font-size: 13px; font-weight: 700;"
+ "background: transparent; letter-spacing: 0.5px;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_SECONDARY);
+}
+
+static QString muted_style() {
+ return QString("color: %1; font-size: 13px; background: transparent;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_TERTIARY);
+}
static QFrame* make_separator() {
auto* sep = new QFrame;
sep->setFixedHeight(1);
- sep->setStyleSheet("background: #1a1a1a; border: none;");
+ sep->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BORDER_DIM));
return sep;
}
@@ -102,9 +127,9 @@ ForgotPasswordScreen::ForgotPasswordScreen(QWidget* parent) : QWidget(parent) {
void ForgotPasswordScreen::paintEvent(QPaintEvent* /*event*/) {
QPainter p(this);
- p.fillRect(rect(), QColor(0x08, 0x08, 0x08));
+ p.fillRect(rect(), QColor(ui::colors::BG_BASE()));
- p.setPen(QPen(QColor(0x12, 0x12, 0x12), 1));
+ p.setPen(QPen(QColor(ui::colors::BG_RAISED()), 1));
const int step = 24;
for (int x = 0; x < width(); x += step)
p.drawLine(x, 0, x, height());
@@ -116,7 +141,7 @@ void ForgotPasswordScreen::paintEvent(QPaintEvent* /*event*/) {
void ForgotPasswordScreen::build_email_page() {
auto* page = new QWidget;
- page->setStyleSheet(CARD_STYLE);
+ page->setStyleSheet(card_style());
auto* vl = new QVBoxLayout(page);
vl->setContentsMargins(28, 22, 28, 22);
@@ -125,55 +150,58 @@ void ForgotPasswordScreen::build_email_page() {
// Header
auto* header = new QWidget;
header->setFixedHeight(38);
- header->setStyleSheet("background: #111111; border: none;");
+ header->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BG_RAISED));
auto* hl = new QHBoxLayout(header);
hl->setContentsMargins(14, 0, 14, 0);
auto* back = new QPushButton("<");
back->setFixedSize(24, 24);
- back->setStyleSheet("QPushButton { color: #808080; background: transparent; border: none;"
+ back->setStyleSheet(QString("QPushButton { color: %1; background: transparent; border: none;"
" font-size: 16px; font-family: 'Consolas','Courier New',monospace; }"
- "QPushButton:hover { color: #e5e5e5; }");
+ "QPushButton:hover { color: %2; }")
+ .arg(ui::colors::TEXT_SECONDARY, ui::colors::TEXT_PRIMARY));
connect(back, &QPushButton::clicked, this, &ForgotPasswordScreen::navigate_login);
hl->addWidget(back);
auto* title = new QLabel("RESET PASSWORD");
- title->setStyleSheet("color: #d97706; font-size: 14px; font-weight: 700;"
+ title->setStyleSheet(QString("color: %1; font-size: 14px; font-weight: 700;"
"background: transparent; letter-spacing: 1px;"
- "font-family: 'Consolas','Courier New',monospace;");
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::AMBER));
hl->addWidget(title);
hl->addStretch();
vl->addWidget(header);
auto* sub = new QLabel("Enter your email and we'll send a verification code.");
sub->setWordWrap(true);
- sub->setStyleSheet(MUTED_STYLE);
+ sub->setStyleSheet(muted_style());
vl->addWidget(sub);
vl->addWidget(make_separator());
auto* lbl = new QLabel("EMAIL");
- lbl->setStyleSheet(LABEL_STYLE);
+ lbl->setStyleSheet(label_style());
vl->addWidget(lbl);
email_input_ = new QLineEdit;
email_input_->setPlaceholderText("[email protected]");
email_input_->setFixedHeight(34);
- email_input_->setStyleSheet(INPUT_STYLE);
+ email_input_->setStyleSheet(input_style());
vl->addWidget(email_input_);
error_label_ = new QLabel;
error_label_->setWordWrap(true);
- error_label_->setStyleSheet("color: #dc2626; font-size: 13px;"
+ error_label_->setStyleSheet(QString("color: %1; font-size: 13px;"
"background: rgba(220,38,38,0.08);"
"border: 1px solid #7f1d1d; padding: 6px 8px;"
- "font-family: 'Consolas','Courier New',monospace;");
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::NEGATIVE));
error_label_->hide();
vl->addWidget(error_label_);
auto* send_btn = new QPushButton(" SEND CODE ");
send_btn->setFixedHeight(32);
- send_btn->setStyleSheet(BTN_PRIMARY);
+ send_btn->setStyleSheet(btn_primary());
connect(send_btn, &QPushButton::clicked, this, &ForgotPasswordScreen::on_send_code);
connect(email_input_, &QLineEdit::returnPressed, this, &ForgotPasswordScreen::on_send_code);
vl->addWidget(send_btn);
@@ -181,7 +209,7 @@ void ForgotPasswordScreen::build_email_page() {
vl->addWidget(make_separator());
auto* back_login = new QPushButton("REMEMBER YOUR PASSWORD? SIGN IN");
- back_login->setStyleSheet(LINK_STYLE);
+ back_login->setStyleSheet(link_style());
connect(back_login, &QPushButton::clicked, this, &ForgotPasswordScreen::navigate_login);
vl->addWidget(back_login, 0, Qt::AlignCenter);
@@ -193,7 +221,7 @@ void ForgotPasswordScreen::build_email_page() {
void ForgotPasswordScreen::build_otp_sent_page() {
auto* page = new QWidget;
- page->setStyleSheet(CARD_STYLE);
+ page->setStyleSheet(card_style());
auto* vl = new QVBoxLayout(page);
vl->setContentsMargins(28, 22, 28, 22);
@@ -201,33 +229,34 @@ void ForgotPasswordScreen::build_otp_sent_page() {
auto* header = new QWidget;
header->setFixedHeight(38);
- header->setStyleSheet("background: #111111; border: none;");
+ header->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BG_RAISED));
auto* hl = new QHBoxLayout(header);
hl->setContentsMargins(14, 0, 14, 0);
auto* title = new QLabel("CHECK YOUR EMAIL");
- title->setStyleSheet("color: #d97706; font-size: 14px; font-weight: 700;"
+ title->setStyleSheet(QString("color: %1; font-size: 14px; font-weight: 700;"
"background: transparent; letter-spacing: 1px;"
- "font-family: 'Consolas','Courier New',monospace;");
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::AMBER));
hl->addWidget(title);
hl->addStretch();
vl->addWidget(header);
auto* sub = new QLabel("We've sent a verification code. Enter it on the next screen to reset your password.");
sub->setWordWrap(true);
- sub->setStyleSheet(MUTED_STYLE);
+ sub->setStyleSheet(muted_style());
vl->addWidget(sub);
vl->addWidget(make_separator());
auto* cont_btn = new QPushButton(" I HAVE THE CODE ");
cont_btn->setFixedHeight(32);
- cont_btn->setStyleSheet(BTN_PRIMARY);
+ cont_btn->setStyleSheet(btn_primary());
connect(cont_btn, &QPushButton::clicked, this, [this]() { pages_->setCurrentIndex(2); });
vl->addWidget(cont_btn);
auto* resend = new QPushButton("DIDN'T RECEIVE? RESEND");
- resend->setStyleSheet(LINK_STYLE);
+ resend->setStyleSheet(link_style());
connect(resend, &QPushButton::clicked, this, &ForgotPasswordScreen::on_resend);
vl->addWidget(resend, 0, Qt::AlignCenter);
@@ -239,7 +268,7 @@ void ForgotPasswordScreen::build_otp_sent_page() {
void ForgotPasswordScreen::build_reset_page() {
auto* page = new QWidget;
- page->setStyleSheet(CARD_STYLE);
+ page->setStyleSheet(card_style());
auto* vl = new QVBoxLayout(page);
vl->setContentsMargins(28, 22, 28, 22);
@@ -247,14 +276,15 @@ void ForgotPasswordScreen::build_reset_page() {
auto* header = new QWidget;
header->setFixedHeight(38);
- header->setStyleSheet("background: #111111; border: none;");
+ header->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BG_RAISED));
auto* hl = new QHBoxLayout(header);
hl->setContentsMargins(14, 0, 14, 0);
auto* title = new QLabel("RESET PASSWORD");
- title->setStyleSheet("color: #d97706; font-size: 14px; font-weight: 700;"
+ title->setStyleSheet(QString("color: %1; font-size: 14px; font-weight: 700;"
"background: transparent; letter-spacing: 1px;"
- "font-family: 'Consolas','Courier New',monospace;");
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::AMBER));
hl->addWidget(title);
hl->addStretch();
vl->addWidget(header);
@@ -263,12 +293,12 @@ void ForgotPasswordScreen::build_reset_page() {
auto add_field = [&](const char* label, const char* placeholder, bool is_password = false) -> QLineEdit* {
auto* lbl = new QLabel(label);
- lbl->setStyleSheet(LABEL_STYLE);
+ lbl->setStyleSheet(label_style());
vl->addWidget(lbl);
auto* input = new QLineEdit;
input->setPlaceholderText(placeholder);
input->setFixedHeight(34);
- input->setStyleSheet(INPUT_STYLE);
+ input->setStyleSheet(input_style());
if (is_password)
input->setEchoMode(QLineEdit::Password);
vl->addWidget(input);
@@ -281,10 +311,11 @@ void ForgotPasswordScreen::build_reset_page() {
auto* err = new QLabel;
err->setWordWrap(true);
- err->setStyleSheet("color: #dc2626; font-size: 13px;"
+ err->setStyleSheet(QString("color: %1; font-size: 13px;"
"background: rgba(220,38,38,0.08);"
"border: 1px solid #7f1d1d; padding: 6px 8px;"
- "font-family: 'Consolas','Courier New',monospace;");
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::NEGATIVE));
err->hide();
vl->addWidget(err);
connect(&auth::AuthManager::instance(), &auth::AuthManager::password_reset_failed, this, [err](const QString& e) {
@@ -294,7 +325,7 @@ void ForgotPasswordScreen::build_reset_page() {
auto* reset_btn = new QPushButton(" RESET PASSWORD ");
reset_btn->setFixedHeight(32);
- reset_btn->setStyleSheet(BTN_PRIMARY);
+ reset_btn->setStyleSheet(btn_primary());
connect(reset_btn, &QPushButton::clicked, this, &ForgotPasswordScreen::on_reset_password);
vl->addWidget(reset_btn);
@@ -306,7 +337,7 @@ void ForgotPasswordScreen::build_reset_page() {
void ForgotPasswordScreen::build_success_page() {
auto* page = new QWidget;
- page->setStyleSheet(CARD_STYLE);
+ page->setStyleSheet(card_style());
auto* vl = new QVBoxLayout(page);
vl->setContentsMargins(28, 22, 28, 22);
@@ -315,35 +346,37 @@ void ForgotPasswordScreen::build_success_page() {
auto* header = new QWidget;
header->setFixedHeight(38);
- header->setStyleSheet("background: #111111; border: none;");
+ header->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BG_RAISED));
auto* hl = new QHBoxLayout(header);
hl->setContentsMargins(14, 0, 14, 0);
auto* title = new QLabel("PASSWORD RESET");
- title->setStyleSheet("color: #16a34a; font-size: 14px; font-weight: 700;"
+ title->setStyleSheet(QString("color: %1; font-size: 14px; font-weight: 700;"
"background: transparent; letter-spacing: 1px;"
- "font-family: 'Consolas','Courier New',monospace;");
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::POSITIVE));
hl->addWidget(title);
hl->addStretch();
auto* status = new QLabel("SUCCESS");
- status->setStyleSheet("color: #16a34a; font-size: 12px; font-weight: 700;"
+ status->setStyleSheet(QString("color: %1; font-size: 12px; font-weight: 700;"
"background: transparent; letter-spacing: 0.5px;"
- "font-family: 'Consolas','Courier New',monospace;");
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::POSITIVE));
hl->addWidget(status);
vl->addWidget(header);
auto* sub = new QLabel("Your password has been reset. You can now sign in with your new password.");
sub->setWordWrap(true);
sub->setAlignment(Qt::AlignCenter);
- sub->setStyleSheet(MUTED_STYLE);
+ sub->setStyleSheet(muted_style());
vl->addWidget(sub);
vl->addWidget(make_separator());
auto* login_btn = new QPushButton(" CONTINUE TO LOGIN ");
login_btn->setFixedHeight(32);
- login_btn->setStyleSheet(BTN_PRIMARY);
+ login_btn->setStyleSheet(btn_primary());
connect(login_btn, &QPushButton::clicked, this, &ForgotPasswordScreen::navigate_login);
vl->addWidget(login_btn);
diff --git a/fincept-qt/src/screens/auth/LockScreen.cpp b/fincept-qt/src/screens/auth/LockScreen.cpp
new file mode 100644
index 000000000..cc961aba2
--- /dev/null
+++ b/fincept-qt/src/screens/auth/LockScreen.cpp
@@ -0,0 +1,635 @@
+#include "screens/auth/LockScreen.h"
+
+#include "auth/PinManager.h"
+#include "core/logging/Logger.h"
+#include "ui/theme/Theme.h"
+
+#include <QFrame>
+#include <QHBoxLayout>
+#include <QPainter>
+#include <QStackedWidget>
+#include <QVBoxLayout>
+
+namespace fincept::screens {
+
+// ── Obsidian Design System Styles ────────────────────────────────────────────
+// Identical palette to LoginScreen for visual consistency.
+
+static QString card_style() {
+ return QString("background: %1; border: 1px solid %2;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM);
+}
+
+static QString input_style() {
+ return QString("QLineEdit {"
+ " background: %1; color: %2;"
+ " border: 1px solid %3;"
+ " padding: 6px 10px; font-size: 15px;"
+ " font-family: 'Consolas','Courier New',monospace;"
+ " selection-background-color: %4; selection-color: %5;"
+ "}"
+ "QLineEdit:focus { border: 1px solid %6; }"
+ "QLineEdit::placeholder { color: %7; }")
+ .arg(ui::colors::BG_SURFACE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM,
+ ui::colors::AMBER, ui::colors::BG_BASE,
+ ui::colors::BORDER_BRIGHT, ui::colors::TEXT_DIM);
+}
+
+static QString pin_input_style() {
+ return QString("QLineEdit {"
+ " background: %1; color: %2;"
+ " border: 1px solid %3;"
+ " font-size: 24px; letter-spacing: 12px;"
+ " font-family: 'Consolas','Courier New',monospace;"
+ " selection-background-color: %4; selection-color: %5;"
+ "}"
+ "QLineEdit:focus { border: 1px solid %6; }")
+ .arg(ui::colors::BG_SURFACE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM,
+ ui::colors::AMBER, ui::colors::BG_BASE,
+ ui::colors::BORDER_BRIGHT);
+}
+
+static QString btn_primary() {
+ return QString("QPushButton {"
+ " background: rgba(217,119,6,0.1); color: %1;"
+ " border: 1px solid %2;"
+ " padding: 0 16px; font-size: 14px; font-weight: 700;"
+ " font-family: 'Consolas','Courier New',monospace;"
+ "}"
+ "QPushButton:hover { background: %1; color: %3; }"
+ "QPushButton:disabled { color: %4; background: %5; border-color: %6; }")
+ .arg(ui::colors::AMBER, ui::colors::AMBER_DIM, ui::colors::BG_BASE,
+ ui::colors::TEXT_DIM, ui::colors::BG_RAISED, ui::colors::BORDER_DIM);
+}
+
+static QString btn_danger() {
+ return QString("QPushButton {"
+ " background: rgba(220,38,38,0.1); color: %1;"
+ " border: 1px solid #7f1d1d;"
+ " padding: 0 16px; font-size: 14px; font-weight: 700;"
+ " font-family: 'Consolas','Courier New',monospace;"
+ "}"
+ "QPushButton:hover { background: %1; color: %2; }"
+ "QPushButton:disabled { color: %3; background: %4; border-color: %5; }")
+ .arg(ui::colors::NEGATIVE, ui::colors::TEXT_PRIMARY,
+ ui::colors::TEXT_DIM, ui::colors::BG_RAISED, ui::colors::BORDER_DIM);
+}
+
+static QString label_style() {
+ return QString("color: %1; font-size: 13px; font-weight: 700;"
+ "background: transparent; letter-spacing: 0.5px;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_SECONDARY);
+}
+
+static QString muted_style() {
+ return QString("color: %1; font-size: 13px; background: transparent;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_TERTIARY);
+}
+
+static QString error_style() {
+ return QString("color: %1; font-size: 13px;"
+ "background: rgba(220,38,38,0.08);"
+ "border: 1px solid #7f1d1d; padding: 6px 8px;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::NEGATIVE);
+}
+
+static QString success_style() {
+ return QString("color: %1; font-size: 13px;"
+ "background: rgba(22,163,74,0.08);"
+ "border: 1px solid #14532d; padding: 6px 8px;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::POSITIVE);
+}
+
+static QFrame* make_separator() {
+ auto* sep = new QFrame;
+ sep->setFixedHeight(1);
+ sep->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BORDER_DIM));
+ return sep;
+}
+
+// ── Constructor ──────────────────────────────────────────────────────────────
+
+LockScreen::LockScreen(QWidget* parent) : QWidget(parent) {
+ auto* root = new QVBoxLayout(this);
+ root->setContentsMargins(0, 0, 0, 0);
+
+ auto* overlay = new QVBoxLayout;
+ overlay->setAlignment(Qt::AlignCenter);
+ root->addLayout(overlay, 1);
+
+ pages_ = new QStackedWidget;
+ pages_->setMinimumWidth(420);
+ pages_->setMaximumWidth(520);
+ pages_->setStyleSheet("background: transparent;");
+
+ build_setup_page();
+ build_unlock_page();
+ build_lockout_page();
+
+ overlay->addWidget(pages_, 0, Qt::AlignCenter);
+
+ // Lockout countdown timer — P3 compliant: only runs when visible
+ lockout_timer_ = new QTimer(this);
+ lockout_timer_->setInterval(1000);
+ connect(lockout_timer_, &QTimer::timeout, this, &LockScreen::update_lockout_display);
+
+ // Listen for PinManager lockout signals
+ auto& pm = auth::PinManager::instance();
+ connect(&pm, &auth::PinManager::lockout_changed, this, [this](bool locked, int /*secs*/) {
+ if (locked)
+ update_lockout_display();
+ });
+ connect(&pm, &auth::PinManager::max_attempts_exceeded, this, [this]() {
+ show_lockout();
+ });
+}
+
+// ── Background Paint (matches LoginScreen grid pattern) ─────────────────────
+
+void LockScreen::paintEvent(QPaintEvent* /*event*/) {
+ QPainter p(this);
+ p.fillRect(rect(), QColor(ui::colors::BG_BASE()));
+
+ p.setPen(QPen(QColor(ui::colors::BG_RAISED()), 1));
+ const int step = 24;
+ for (int x = 0; x < width(); x += step)
+ p.drawLine(x, 0, x, height());
+ for (int y = 0; y < height(); y += step)
+ p.drawLine(0, y, width(), y);
+
+ // Subtle crosshair at centre
+ int cx = width() / 2;
+ int cy = height() / 2;
+ p.setPen(QPen(QColor(ui::colors::BORDER_DIM()), 1));
+ p.drawLine(cx - 60, cy, cx + 60, cy);
+ p.drawLine(cx, cy - 60, cx, cy + 60);
+}
+
+void LockScreen::showEvent(QShowEvent* e) {
+ QWidget::showEvent(e);
+ if (lockout_timer_ && auth::PinManager::instance().is_locked_out())
+ lockout_timer_->start();
+}
+
+void LockScreen::hideEvent(QHideEvent* e) {
+ QWidget::hideEvent(e);
+ if (lockout_timer_)
+ lockout_timer_->stop();
+}
+
+// ── PIN Setup Page ──────────────────────────────────────────────────────────
+
+void LockScreen::build_setup_page() {
+ auto* page = new QWidget;
+ page->setStyleSheet(card_style());
+
+ auto* vl = new QVBoxLayout(page);
+ vl->setContentsMargins(28, 22, 28, 22);
+ vl->setSpacing(10);
+
+ // Header bar
+ auto* header = new QWidget;
+ header->setFixedHeight(38);
+ header->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BG_RAISED));
+ auto* hl = new QHBoxLayout(header);
+ hl->setContentsMargins(14, 0, 14, 0);
+
+ auto* title = new QLabel("SECURITY SETUP");
+ title->setStyleSheet(QString("color: %1; font-size: 14px; font-weight: 700;"
+ "background: transparent; letter-spacing: 1px;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::AMBER));
+ hl->addWidget(title);
+ hl->addStretch();
+
+ auto* badge = new QLabel("REQUIRED");
+ badge->setStyleSheet(QString("color: %1; font-size: 12px; font-weight: 700;"
+ "background: transparent; letter-spacing: 0.5px;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::NEGATIVE));
+ hl->addWidget(badge);
+ vl->addWidget(header);
+
+ auto* subtitle = new QLabel("Create a 6-digit PIN to secure your terminal");
+ subtitle->setWordWrap(true);
+ subtitle->setStyleSheet(muted_style());
+ vl->addWidget(subtitle);
+
+ auto* info = new QLabel("This PIN will be required each time you open\n"
+ "the terminal or after a period of inactivity.");
+ info->setWordWrap(true);
+ info->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_DIM));
+ vl->addWidget(info);
+
+ vl->addWidget(make_separator());
+
+ // PIN input
+ auto* pin_lbl = new QLabel("ENTER PIN");
+ pin_lbl->setStyleSheet(label_style());
+ vl->addWidget(pin_lbl);
+
+ setup_pin_input_ = new QLineEdit;
+ setup_pin_input_->setPlaceholderText("------");
+ setup_pin_input_->setMaxLength(6);
+ setup_pin_input_->setAlignment(Qt::AlignCenter);
+ setup_pin_input_->setEchoMode(QLineEdit::Password);
+ setup_pin_input_->setFixedHeight(44);
+ setup_pin_input_->setStyleSheet(pin_input_style());
+ vl->addWidget(setup_pin_input_);
+
+ // Confirm PIN input
+ auto* confirm_lbl = new QLabel("CONFIRM PIN");
+ confirm_lbl->setStyleSheet(label_style());
+ vl->addWidget(confirm_lbl);
+
+ setup_confirm_input_ = new QLineEdit;
+ setup_confirm_input_->setPlaceholderText("------");
+ setup_confirm_input_->setMaxLength(6);
+ setup_confirm_input_->setAlignment(Qt::AlignCenter);
+ setup_confirm_input_->setEchoMode(QLineEdit::Password);
+ setup_confirm_input_->setFixedHeight(44);
+ setup_confirm_input_->setStyleSheet(pin_input_style());
+ vl->addWidget(setup_confirm_input_);
+
+ // Error label
+ setup_error_ = new QLabel;
+ setup_error_->setWordWrap(true);
+ setup_error_->setStyleSheet(error_style());
+ setup_error_->hide();
+ vl->addWidget(setup_error_);
+
+ vl->addWidget(make_separator());
+
+ // Submit button
+ setup_btn_ = new QPushButton(" SET PIN ");
+ setup_btn_->setFixedHeight(34);
+ setup_btn_->setStyleSheet(btn_primary());
+ connect(setup_btn_, &QPushButton::clicked, this, &LockScreen::on_setup_submit);
+ vl->addWidget(setup_btn_);
+
+ // Security note
+ auto* note = new QLabel("PIN is encrypted and stored locally on this device.\n"
+ "It cannot be recovered if forgotten.");
+ note->setWordWrap(true);
+ note->setStyleSheet(QString("color: %1; font-size: 11px; background: transparent;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_DIM));
+ note->setAlignment(Qt::AlignCenter);
+ vl->addWidget(note);
+
+ vl->addStretch();
+
+ connect(setup_pin_input_, &QLineEdit::returnPressed, this, [this]() {
+ setup_confirm_input_->setFocus();
+ });
+ connect(setup_confirm_input_, &QLineEdit::returnPressed, this, &LockScreen::on_setup_submit);
+
+ pages_->addWidget(page); // index 0
+}
+
+// ── PIN Unlock Page ─────────────────────────────────────────────────────────
+
+void LockScreen::build_unlock_page() {
+ auto* page = new QWidget;
+ page->setStyleSheet(card_style());
+
+ auto* vl = new QVBoxLayout(page);
+ vl->setContentsMargins(28, 22, 28, 22);
+ vl->setSpacing(10);
+
+ // Header bar
+ auto* header = new QWidget;
+ header->setFixedHeight(38);
+ header->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BG_RAISED));
+ auto* hl = new QHBoxLayout(header);
+ hl->setContentsMargins(14, 0, 14, 0);
+
+ auto* title = new QLabel("TERMINAL LOCKED");
+ title->setStyleSheet(QString("color: %1; font-size: 14px; font-weight: 700;"
+ "background: transparent; letter-spacing: 1px;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::AMBER));
+ hl->addWidget(title);
+ hl->addStretch();
+
+ auto* secure_badge = new QLabel("SECURE");
+ secure_badge->setStyleSheet(QString("color: %1; font-size: 12px; font-weight: 700;"
+ "background: transparent; letter-spacing: 0.5px;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::POSITIVE));
+ hl->addWidget(secure_badge);
+ vl->addWidget(header);
+
+ auto* subtitle = new QLabel("Enter your 6-digit PIN to unlock");
+ subtitle->setStyleSheet(muted_style());
+ vl->addWidget(subtitle);
+
+ vl->addWidget(make_separator());
+
+ // PIN input
+ auto* pin_lbl = new QLabel("PIN");
+ pin_lbl->setStyleSheet(label_style());
+ vl->addWidget(pin_lbl);
+
+ unlock_pin_input_ = new QLineEdit;
+ unlock_pin_input_->setPlaceholderText("------");
+ unlock_pin_input_->setMaxLength(6);
+ unlock_pin_input_->setAlignment(Qt::AlignCenter);
+ unlock_pin_input_->setEchoMode(QLineEdit::Password);
+ unlock_pin_input_->setFixedHeight(48);
+ unlock_pin_input_->setStyleSheet(pin_input_style());
+ vl->addWidget(unlock_pin_input_);
+
+ // Lockout / attempt display
+ unlock_lockout_label_ = new QLabel;
+ unlock_lockout_label_->setWordWrap(true);
+ unlock_lockout_label_->setStyleSheet(QString("color: %1; font-size: 12px;"
+ "background: rgba(202,138,4,0.08);"
+ "border: 1px solid #713f12; padding: 6px 8px;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::WARNING));
+ unlock_lockout_label_->hide();
+ vl->addWidget(unlock_lockout_label_);
+
+ // Error label
+ unlock_error_ = new QLabel;
+ unlock_error_->setWordWrap(true);
+ unlock_error_->setStyleSheet(error_style());
+ unlock_error_->hide();
+ vl->addWidget(unlock_error_);
+
+ // Attempts remaining
+ unlock_attempts_ = new QLabel;
+ unlock_attempts_->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_DIM));
+ unlock_attempts_->setAlignment(Qt::AlignCenter);
+ unlock_attempts_->hide();
+ vl->addWidget(unlock_attempts_);
+
+ vl->addWidget(make_separator());
+
+ // Unlock button
+ unlock_btn_ = new QPushButton(" UNLOCK ");
+ unlock_btn_->setFixedHeight(34);
+ unlock_btn_->setStyleSheet(btn_primary());
+ connect(unlock_btn_, &QPushButton::clicked, this, &LockScreen::on_unlock_submit);
+ vl->addWidget(unlock_btn_);
+
+ vl->addStretch();
+
+ connect(unlock_pin_input_, &QLineEdit::returnPressed, this, &LockScreen::on_unlock_submit);
+
+ pages_->addWidget(page); // index 1
+}
+
+// ── Lockout Page (max attempts exceeded) ────────────────────────────────────
+
+void LockScreen::build_lockout_page() {
+ auto* page = new QWidget;
+ page->setStyleSheet(card_style());
+
+ auto* vl = new QVBoxLayout(page);
+ vl->setContentsMargins(28, 22, 28, 22);
+ vl->setSpacing(10);
+
+ // Header bar
+ auto* header = new QWidget;
+ header->setFixedHeight(38);
+ header->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BG_RAISED));
+ auto* hl = new QHBoxLayout(header);
+ hl->setContentsMargins(14, 0, 14, 0);
+
+ auto* title = new QLabel("ACCOUNT LOCKED");
+ title->setStyleSheet(QString("color: %1; font-size: 14px; font-weight: 700;"
+ "background: transparent; letter-spacing: 1px;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::NEGATIVE));
+ hl->addWidget(title);
+ hl->addStretch();
+
+ auto* warn = new QLabel("SECURITY");
+ warn->setStyleSheet(QString("color: %1; font-size: 12px; font-weight: 700;"
+ "background: transparent; letter-spacing: 0.5px;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::NEGATIVE));
+ hl->addWidget(warn);
+ vl->addWidget(header);
+
+ lockout_msg_ = new QLabel("Too many failed PIN attempts.\n\n"
+ "For your security, the terminal has been locked.\n"
+ "You must sign in again with your email and password\n"
+ "to reset your PIN and regain access.");
+ lockout_msg_->setWordWrap(true);
+ lockout_msg_->setStyleSheet(QString("color: %1; font-size: 14px; background: transparent;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_SECONDARY));
+ vl->addWidget(lockout_msg_);
+
+ vl->addWidget(make_separator());
+
+ auto* reauth_btn = new QPushButton(" SIGN IN AGAIN ");
+ reauth_btn->setFixedHeight(34);
+ reauth_btn->setStyleSheet(btn_danger());
+ connect(reauth_btn, &QPushButton::clicked, this, [this]() {
+ emit reauth_requested();
+ });
+ vl->addWidget(reauth_btn);
+
+ vl->addStretch();
+
+ pages_->addWidget(page); // index 2
+}
+
+// ── Page activation ─────────────────────────────────────────────────────────
+
+void LockScreen::activate() {
+ auto& pm = auth::PinManager::instance();
+ if (pm.failed_attempts() >= auth::PinManager::kMaxAttempts) {
+ show_lockout();
+ } else if (pm.has_pin()) {
+ show_unlock();
+ } else {
+ show_setup();
+ }
+}
+
+void LockScreen::show_setup() {
+ setup_pin_input_->clear();
+ setup_confirm_input_->clear();
+ setup_error_->hide();
+ pages_->setCurrentIndex(0);
+ setup_pin_input_->setFocus();
+}
+
+void LockScreen::show_unlock() {
+ unlock_pin_input_->clear();
+ unlock_error_->hide();
+ unlock_lockout_label_->hide();
+ pages_->setCurrentIndex(1);
+
+ auto& pm = auth::PinManager::instance();
+ if (pm.failed_attempts() > 0 && pm.failed_attempts() < auth::PinManager::kMaxAttempts) {
+ int remaining = auth::PinManager::kMaxAttempts - pm.failed_attempts();
+ unlock_attempts_->setText(QString("%1 ATTEMPT%2 REMAINING")
+ .arg(remaining).arg(remaining == 1 ? "" : "S"));
+ unlock_attempts_->show();
+ } else {
+ unlock_attempts_->hide();
+ }
+
+ update_lockout_display();
+ unlock_pin_input_->setFocus();
+}
+
+void LockScreen::show_lockout() {
+ pages_->setCurrentIndex(2);
+}
+
+// ── Actions ─────────────────────────────────────────────────────────────────
+
+void LockScreen::on_setup_submit() {
+ QString pin = setup_pin_input_->text();
+ QString confirm = setup_confirm_input_->text();
+
+ if (pin.length() != 6) {
+ setup_error_->setText("PIN must be exactly 6 digits");
+ setup_error_->show();
+ return;
+ }
+
+ // Check all digits
+ for (const QChar& c : pin) {
+ if (!c.isDigit()) {
+ setup_error_->setText("PIN must contain only digits");
+ setup_error_->show();
+ return;
+ }
+ }
+
+ if (pin != confirm) {
+ setup_error_->setText("PINs do not match");
+ setup_error_->show();
+ setup_confirm_input_->clear();
+ setup_confirm_input_->setFocus();
+ return;
+ }
+
+ // Check for trivially weak PINs
+ bool all_same = true;
+ for (int i = 1; i < pin.length(); ++i) {
+ if (pin[i] != pin[0]) { all_same = false; break; }
+ }
+ if (all_same) {
+ setup_error_->setText("PIN is too simple — use unique digits");
+ setup_error_->show();
+ return;
+ }
+
+ // Sequential check (123456, 654321)
+ bool sequential_up = true;
+ bool sequential_down = true;
+ for (int i = 1; i < pin.length(); ++i) {
+ if (pin[i].unicode() != pin[i-1].unicode() + 1) sequential_up = false;
+ if (pin[i].unicode() != pin[i-1].unicode() - 1) sequential_down = false;
+ }
+ if (sequential_up || sequential_down) {
+ setup_error_->setText("PIN is too simple — avoid sequential digits");
+ setup_error_->show();
+ return;
+ }
+
+ auto result = auth::PinManager::instance().set_pin(pin);
+ if (result.is_err()) {
+ setup_error_->setText(QString::fromStdString(result.error()));
+ setup_error_->show();
+ return;
+ }
+
+ setup_error_->hide();
+ LOG_INFO("Auth", "PIN setup complete — unlocking terminal");
+ emit unlocked();
+}
+
+void LockScreen::on_unlock_submit() {
+ auto& pm = auth::PinManager::instance();
+
+ if (pm.is_locked_out()) {
+ update_lockout_display();
+ return;
+ }
+
+ QString pin = unlock_pin_input_->text();
+ if (pin.isEmpty()) {
+ unlock_error_->setText("Enter your PIN");
+ unlock_error_->show();
+ return;
+ }
+
+ if (pm.verify_pin(pin)) {
+ unlock_error_->hide();
+ unlock_lockout_label_->hide();
+ unlock_attempts_->hide();
+ emit unlocked();
+ return;
+ }
+
+ // Failed
+ unlock_pin_input_->clear();
+ unlock_pin_input_->setFocus();
+
+ if (pm.failed_attempts() >= auth::PinManager::kMaxAttempts) {
+ // max_attempts_exceeded signal will trigger show_lockout()
+ return;
+ }
+
+ int remaining = auth::PinManager::kMaxAttempts - pm.failed_attempts();
+ unlock_attempts_->setText(QString("%1 ATTEMPT%2 REMAINING")
+ .arg(remaining).arg(remaining == 1 ? "" : "S"));
+ unlock_attempts_->show();
+
+ if (pm.is_locked_out()) {
+ unlock_error_->hide();
+ update_lockout_display();
+ lockout_timer_->start();
+ } else {
+ unlock_error_->setText("Incorrect PIN");
+ unlock_error_->show();
+ unlock_lockout_label_->hide();
+ }
+}
+
+void LockScreen::update_lockout_display() {
+ auto& pm = auth::PinManager::instance();
+ int secs = pm.lockout_remaining_seconds();
+
+ if (secs <= 0) {
+ unlock_lockout_label_->hide();
+ unlock_btn_->setEnabled(true);
+ unlock_pin_input_->setEnabled(true);
+ unlock_pin_input_->setFocus();
+ lockout_timer_->stop();
+ return;
+ }
+
+ int mins = secs / 60;
+ int remaining_secs = secs % 60;
+ QString time_str;
+ if (mins > 0)
+ time_str = QString("%1m %2s").arg(mins).arg(remaining_secs, 2, 10, QChar('0'));
+ else
+ time_str = QString("%1s").arg(secs);
+
+ unlock_lockout_label_->setText(QString("Locked for %1 — too many failed attempts").arg(time_str));
+ unlock_lockout_label_->show();
+ unlock_btn_->setEnabled(false);
+ unlock_pin_input_->setEnabled(false);
+}
+
+} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/auth/LockScreen.h b/fincept-qt/src/screens/auth/LockScreen.h
new file mode 100644
index 000000000..da1409bc0
--- /dev/null
+++ b/fincept-qt/src/screens/auth/LockScreen.h
@@ -0,0 +1,78 @@
+#pragma once
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QStackedWidget>
+#include <QTimer>
+#include <QWidget>
+
+namespace fincept::screens {
+
+/// Lock screen — PIN setup (mandatory first time) and PIN unlock (subsequent).
+/// Obsidian design: sharp corners, monospace, no shadows, terminal aesthetic.
+///
+/// Pages:
+/// 0 — PIN setup (create new 6-digit PIN, confirm)
+/// 1 — PIN unlock (enter PIN to unlock terminal)
+/// 2 — Lockout (too many failed attempts, must re-authenticate)
+class LockScreen : public QWidget {
+ Q_OBJECT
+ public:
+ explicit LockScreen(QWidget* parent = nullptr);
+
+ /// Show the appropriate page based on PIN state.
+ void activate();
+
+ /// Show PIN setup page (mandatory enrollment).
+ void show_setup();
+
+ /// Show PIN unlock page (returning user / inactivity lock).
+ void show_unlock();
+
+ /// Show lockout page (max attempts exceeded).
+ void show_lockout();
+
+ signals:
+ /// PIN setup or unlock completed — terminal should proceed.
+ void unlocked();
+
+ /// User chose to re-authenticate (from lockout page).
+ void reauth_requested();
+
+ private:
+ QStackedWidget* pages_ = nullptr;
+
+ // PIN Setup page (index 0)
+ QLineEdit* setup_pin_input_ = nullptr;
+ QLineEdit* setup_confirm_input_ = nullptr;
+ QPushButton* setup_btn_ = nullptr;
+ QLabel* setup_error_ = nullptr;
+
+ // PIN Unlock page (index 1)
+ QLineEdit* unlock_pin_input_ = nullptr;
+ QPushButton* unlock_btn_ = nullptr;
+ QLabel* unlock_error_ = nullptr;
+ QLabel* unlock_attempts_ = nullptr;
+ QLabel* unlock_lockout_label_ = nullptr;
+
+ // Lockout page (index 2)
+ QLabel* lockout_msg_ = nullptr;
+
+ // Lockout countdown timer
+ QTimer* lockout_timer_ = nullptr;
+
+ void build_setup_page();
+ void build_unlock_page();
+ void build_lockout_page();
+
+ void on_setup_submit();
+ void on_unlock_submit();
+ void update_lockout_display();
+
+ protected:
+ void paintEvent(QPaintEvent* event) override;
+ void showEvent(QShowEvent* event) override;
+ void hideEvent(QHideEvent* event) override;
+};
+
+} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/auth/LoginScreen.cpp b/fincept-qt/src/screens/auth/LoginScreen.cpp
index 0625c1d44..4f8cad4c3 100644
--- a/fincept-qt/src/screens/auth/LoginScreen.cpp
+++ b/fincept-qt/src/screens/auth/LoginScreen.cpp
@@ -14,63 +14,91 @@ namespace fincept::screens {
// ── Obsidian Design System Styles ────────────────────────────────────────────
-static const char* CARD_STYLE = "background: #0a0a0a;"
- "border: 1px solid #1a1a1a;";
-
-static const char* INPUT_STYLE = "QLineEdit {"
- " background: #0a0a0a; color: #e5e5e5;"
- " border: 1px solid #1a1a1a;"
- " padding: 6px 10px; font-size: 15px;"
- " font-family: 'Consolas','Courier New',monospace;"
- " selection-background-color: #d97706; selection-color: #080808;"
- "}"
- "QLineEdit:focus { border: 1px solid #333333; }"
- "QLineEdit::placeholder { color: #404040; }";
-
-static const char* BTN_PRIMARY = "QPushButton {"
- " background: rgba(217,119,6,0.1); color: #d97706;"
- " border: 1px solid #78350f;"
- " padding: 0 16px; font-size: 14px; font-weight: 700;"
- " font-family: 'Consolas','Courier New',monospace;"
- "}"
- "QPushButton:hover { background: #d97706; color: #080808; }"
- "QPushButton:disabled { color: #404040; background: #111111; border-color: #1a1a1a; }";
-
-static const char* BTN_STANDARD = "QPushButton {"
- " background: #111111; color: #808080;"
- " border: 1px solid #1a1a1a;"
- " padding: 0 12px; font-size: 14px; font-weight: 700;"
- " font-family: 'Consolas','Courier New',monospace;"
- "}"
- "QPushButton:hover { color: #e5e5e5; background: #161616; }";
-
-static const char* BTN_DANGER = "QPushButton {"
- " background: rgba(220,38,38,0.1); color: #dc2626;"
- " border: 1px solid #7f1d1d;"
- " padding: 0 16px; font-size: 14px; font-weight: 700;"
- " font-family: 'Consolas','Courier New',monospace;"
- "}"
- "QPushButton:hover { background: #dc2626; color: #e5e5e5; }"
- "QPushButton:disabled { color: #404040; background: #111111; border-color: #1a1a1a; }";
-
-static const char* LINK_STYLE = "QPushButton {"
- " color: #808080; background: transparent; border: none;"
- " font-size: 13px; font-weight: 400;"
- " font-family: 'Consolas','Courier New',monospace;"
- "}"
- "QPushButton:hover { color: #e5e5e5; }";
-
-static const char* LABEL_STYLE = "color: #808080; font-size: 13px; font-weight: 700;"
- "background: transparent; letter-spacing: 0.5px;"
- "font-family: 'Consolas','Courier New',monospace;";
-
-static const char* MUTED_STYLE = "color: #525252; font-size: 13px; background: transparent;"
- "font-family: 'Consolas','Courier New',monospace;";
+static QString card_style() {
+ return QString("background: %1; border: 1px solid %2;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM);
+}
+
+static QString input_style() {
+ return QString("QLineEdit {"
+ " background: %1; color: %2;"
+ " border: 1px solid %3;"
+ " padding: 6px 10px; font-size: 15px;"
+ " font-family: 'Consolas','Courier New',monospace;"
+ " selection-background-color: %4; selection-color: %5;"
+ "}"
+ "QLineEdit:focus { border: 1px solid %6; }"
+ "QLineEdit::placeholder { color: %7; }")
+ .arg(ui::colors::BG_SURFACE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM,
+ ui::colors::AMBER, ui::colors::BG_BASE,
+ ui::colors::BORDER_BRIGHT, ui::colors::TEXT_DIM);
+}
+
+static QString btn_primary() {
+ return QString("QPushButton {"
+ " background: rgba(217,119,6,0.1); color: %1;"
+ " border: 1px solid %2;"
+ " padding: 0 16px; font-size: 14px; font-weight: 700;"
+ " font-family: 'Consolas','Courier New',monospace;"
+ "}"
+ "QPushButton:hover { background: %1; color: %3; }"
+ "QPushButton:disabled { color: %4; background: %5; border-color: %6; }")
+ .arg(ui::colors::AMBER, ui::colors::AMBER_DIM, ui::colors::BG_BASE,
+ ui::colors::TEXT_DIM, ui::colors::BG_RAISED, ui::colors::BORDER_DIM);
+}
+
+static QString btn_standard() {
+ return QString("QPushButton {"
+ " background: %1; color: %2;"
+ " border: 1px solid %3;"
+ " padding: 0 12px; font-size: 14px; font-weight: 700;"
+ " font-family: 'Consolas','Courier New',monospace;"
+ "}"
+ "QPushButton:hover { color: %4; background: %5; }")
+ .arg(ui::colors::BG_RAISED, ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM,
+ ui::colors::TEXT_PRIMARY, ui::colors::BG_HOVER);
+}
+
+static QString btn_danger() {
+ return QString("QPushButton {"
+ " background: rgba(220,38,38,0.1); color: %1;"
+ " border: 1px solid #7f1d1d;"
+ " padding: 0 16px; font-size: 14px; font-weight: 700;"
+ " font-family: 'Consolas','Courier New',monospace;"
+ "}"
+ "QPushButton:hover { background: %1; color: %2; }"
+ "QPushButton:disabled { color: %3; background: %4; border-color: %5; }")
+ .arg(ui::colors::NEGATIVE, ui::colors::TEXT_PRIMARY,
+ ui::colors::TEXT_DIM, ui::colors::BG_RAISED, ui::colors::BORDER_DIM);
+}
+
+static QString link_style() {
+ return QString("QPushButton {"
+ " color: %1; background: transparent; border: none;"
+ " font-size: 13px; font-weight: 400;"
+ " font-family: 'Consolas','Courier New',monospace;"
+ "}"
+ "QPushButton:hover { color: %2; }")
+ .arg(ui::colors::TEXT_SECONDARY, ui::colors::TEXT_PRIMARY);
+}
+
+static QString label_style() {
+ return QString("color: %1; font-size: 13px; font-weight: 700;"
+ "background: transparent; letter-spacing: 0.5px;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_SECONDARY);
+}
+
+static QString muted_style() {
+ return QString("color: %1; font-size: 13px; background: transparent;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_TERTIARY);
+}
static QFrame* make_separator() {
auto* sep = new QFrame;
sep->setFixedHeight(1);
- sep->setStyleSheet("background: #1a1a1a; border: none;");
+ sep->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BORDER_DIM));
return sep;
}
@@ -108,9 +136,9 @@ LoginScreen::LoginScreen(QWidget* parent) : QWidget(parent) {
void LoginScreen::paintEvent(QPaintEvent* /*event*/) {
QPainter p(this);
- p.fillRect(rect(), QColor(0x08, 0x08, 0x08));
+ p.fillRect(rect(), QColor(ui::colors::BG_BASE()));
- p.setPen(QPen(QColor(0x12, 0x12, 0x12), 1));
+ p.setPen(QPen(QColor(ui::colors::BG_RAISED()), 1));
const int step = 24;
for (int x = 0; x < width(); x += step)
p.drawLine(x, 0, x, height());
@@ -119,7 +147,7 @@ void LoginScreen::paintEvent(QPaintEvent* /*event*/) {
int cx = width() / 2;
int cy = height() / 2;
- p.setPen(QPen(QColor(0x1a, 0x1a, 0x1a), 1));
+ p.setPen(QPen(QColor(ui::colors::BORDER_DIM()), 1));
p.drawLine(cx - 60, cy, cx + 60, cy);
p.drawLine(cx, cy - 60, cx, cy + 60);
}
@@ -128,7 +156,7 @@ void LoginScreen::paintEvent(QPaintEvent* /*event*/) {
void LoginScreen::build_login_page() {
auto* page = new QWidget;
- page->setStyleSheet(CARD_STYLE);
+ page->setStyleSheet(card_style());
auto* vl = new QVBoxLayout(page);
vl->setContentsMargins(28, 22, 28, 22);
@@ -137,44 +165,46 @@ void LoginScreen::build_login_page() {
// Header bar
auto* header = new QWidget;
header->setFixedHeight(38);
- header->setStyleSheet("background: #111111; border: none;");
+ header->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BG_RAISED));
auto* hl = new QHBoxLayout(header);
hl->setContentsMargins(14, 0, 14, 0);
auto* title = new QLabel("SIGN IN");
- title->setStyleSheet("color: #d97706; font-size: 14px; font-weight: 700;"
+ title->setStyleSheet(QString("color: %1; font-size: 14px; font-weight: 700;"
"background: transparent; letter-spacing: 1px;"
- "font-family: 'Consolas','Courier New',monospace;");
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::AMBER));
hl->addWidget(title);
hl->addStretch();
auto* brand = new QLabel("FINCEPT");
- brand->setStyleSheet("color: #404040; font-size: 12px; font-weight: 700;"
+ brand->setStyleSheet(QString("color: %1; font-size: 12px; font-weight: 700;"
"background: transparent; letter-spacing: 0.5px;"
- "font-family: 'Consolas','Courier New',monospace;");
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_DIM));
hl->addWidget(brand);
vl->addWidget(header);
auto* subtitle = new QLabel("Access your terminal account");
- subtitle->setStyleSheet(MUTED_STYLE);
+ subtitle->setStyleSheet(muted_style());
vl->addWidget(subtitle);
vl->addWidget(make_separator());
// Email
auto* email_lbl = new QLabel("EMAIL");
- email_lbl->setStyleSheet(LABEL_STYLE);
+ email_lbl->setStyleSheet(label_style());
vl->addWidget(email_lbl);
email_input_ = new QLineEdit;
email_input_->setPlaceholderText("[email protected]");
email_input_->setFixedHeight(34);
- email_input_->setStyleSheet(INPUT_STYLE);
+ email_input_->setStyleSheet(input_style());
vl->addWidget(email_input_);
// Password
auto* pw_lbl = new QLabel("PASSWORD");
- pw_lbl->setStyleSheet(LABEL_STYLE);
+ pw_lbl->setStyleSheet(label_style());
vl->addWidget(pw_lbl);
auto* pw_row = new QWidget;
@@ -187,12 +217,12 @@ void LoginScreen::build_login_page() {
password_input_->setPlaceholderText("enter password");
password_input_->setEchoMode(QLineEdit::Password);
password_input_->setFixedHeight(34);
- password_input_->setStyleSheet(INPUT_STYLE);
+ password_input_->setStyleSheet(input_style());
prl->addWidget(password_input_);
show_pw_btn_ = new QPushButton("SHOW");
show_pw_btn_->setFixedSize(58, 34);
- show_pw_btn_->setStyleSheet(BTN_STANDARD);
+ show_pw_btn_->setStyleSheet(btn_standard());
connect(show_pw_btn_, &QPushButton::clicked, this, [this]() {
bool hidden = password_input_->echoMode() == QLineEdit::Password;
password_input_->setEchoMode(hidden ? QLineEdit::Normal : QLineEdit::Password);
@@ -204,10 +234,11 @@ void LoginScreen::build_login_page() {
// Error
error_label_ = new QLabel;
error_label_->setWordWrap(true);
- error_label_->setStyleSheet("color: #dc2626; font-size: 13px;"
+ error_label_->setStyleSheet(QString("color: %1; font-size: 13px;"
"background: rgba(220,38,38,0.08);"
"border: 1px solid #7f1d1d; padding: 6px 8px;"
- "font-family: 'Consolas','Courier New',monospace;");
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::NEGATIVE));
error_label_->hide();
vl->addWidget(error_label_);
@@ -218,14 +249,14 @@ void LoginScreen::build_login_page() {
brl->setContentsMargins(0, 0, 0, 0);
auto* forgot_btn = new QPushButton("FORGOT PASSWORD?");
- forgot_btn->setStyleSheet(LINK_STYLE);
+ forgot_btn->setStyleSheet(link_style());
connect(forgot_btn, &QPushButton::clicked, this, &LoginScreen::navigate_forgot_password);
brl->addWidget(forgot_btn);
brl->addStretch();
login_btn_ = new QPushButton(" SIGN IN ");
login_btn_->setFixedHeight(32);
- login_btn_->setStyleSheet(BTN_PRIMARY);
+ login_btn_->setStyleSheet(btn_primary());
connect(login_btn_, &QPushButton::clicked, this, &LoginScreen::on_login);
brl->addWidget(login_btn_);
vl->addWidget(btn_row);
@@ -240,14 +271,15 @@ void LoginScreen::build_login_page() {
rrl->setAlignment(Qt::AlignCenter);
auto* no_acct = new QLabel("No account?");
- no_acct->setStyleSheet(MUTED_STYLE);
+ no_acct->setStyleSheet(muted_style());
rrl->addWidget(no_acct);
auto* signup_btn = new QPushButton("SIGN UP");
- signup_btn->setStyleSheet("QPushButton { color: #d97706; background: transparent; border: none;"
+ signup_btn->setStyleSheet(QString("QPushButton { color: %1; background: transparent; border: none;"
" font-size: 13px; font-weight: 700;"
" font-family: 'Consolas','Courier New',monospace; }"
- "QPushButton:hover { color: #e5e5e5; }");
+ "QPushButton:hover { color: %2; }")
+ .arg(ui::colors::AMBER, ui::colors::TEXT_PRIMARY));
connect(signup_btn, &QPushButton::clicked, this, &LoginScreen::navigate_register);
rrl->addWidget(signup_btn);
vl->addWidget(reg_row);
@@ -262,7 +294,7 @@ void LoginScreen::build_login_page() {
void LoginScreen::build_mfa_page() {
mfa_page_ = new QWidget;
- mfa_page_->setStyleSheet(CARD_STYLE);
+ mfa_page_->setStyleSheet(card_style());
auto* vl = new QVBoxLayout(mfa_page_);
vl->setContentsMargins(28, 22, 28, 22);
@@ -270,33 +302,35 @@ void LoginScreen::build_mfa_page() {
auto* header = new QWidget;
header->setFixedHeight(38);
- header->setStyleSheet("background: #111111; border: none;");
+ header->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BG_RAISED));
auto* hl = new QHBoxLayout(header);
hl->setContentsMargins(14, 0, 14, 0);
auto* title = new QLabel("TWO-FACTOR AUTH");
- title->setStyleSheet("color: #d97706; font-size: 14px; font-weight: 700;"
+ title->setStyleSheet(QString("color: %1; font-size: 14px; font-weight: 700;"
"background: transparent; letter-spacing: 1px;"
- "font-family: 'Consolas','Courier New',monospace;");
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::AMBER));
hl->addWidget(title);
hl->addStretch();
auto* indicator = new QLabel("SECURE");
- indicator->setStyleSheet("color: #16a34a; font-size: 12px; font-weight: 700;"
+ indicator->setStyleSheet(QString("color: %1; font-size: 12px; font-weight: 700;"
"background: transparent; letter-spacing: 0.5px;"
- "font-family: 'Consolas','Courier New',monospace;");
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::POSITIVE));
hl->addWidget(indicator);
vl->addWidget(header);
auto* sub = new QLabel("Enter the 6-digit code from your authenticator");
sub->setWordWrap(true);
- sub->setStyleSheet(MUTED_STYLE);
+ sub->setStyleSheet(muted_style());
vl->addWidget(sub);
vl->addWidget(make_separator());
auto* lbl = new QLabel("VERIFICATION CODE");
- lbl->setStyleSheet(LABEL_STYLE);
+ lbl->setStyleSheet(label_style());
vl->addWidget(lbl);
mfa_input_ = new QLineEdit;
@@ -304,33 +338,37 @@ void LoginScreen::build_mfa_page() {
mfa_input_->setMaxLength(6);
mfa_input_->setAlignment(Qt::AlignCenter);
mfa_input_->setFixedHeight(40);
- mfa_input_->setStyleSheet("QLineEdit {"
- " background: #0a0a0a; color: #e5e5e5;"
- " border: 1px solid #1a1a1a;"
+ mfa_input_->setStyleSheet(QString("QLineEdit {"
+ " background: %1; color: %2;"
+ " border: 1px solid %3;"
" font-size: 20px; letter-spacing: 10px;"
" font-family: 'Consolas','Courier New',monospace;"
- " selection-background-color: #d97706; selection-color: #080808;"
+ " selection-background-color: %4; selection-color: %5;"
"}"
- "QLineEdit:focus { border: 1px solid #333333; }");
+ "QLineEdit:focus { border: 1px solid %6; }")
+ .arg(ui::colors::BG_SURFACE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM,
+ ui::colors::AMBER, ui::colors::BG_BASE,
+ ui::colors::BORDER_BRIGHT));
vl->addWidget(mfa_input_);
mfa_error_ = new QLabel;
mfa_error_->setWordWrap(true);
- mfa_error_->setStyleSheet("color: #dc2626; font-size: 13px;"
+ mfa_error_->setStyleSheet(QString("color: %1; font-size: 13px;"
"background: rgba(220,38,38,0.08);"
"border: 1px solid #7f1d1d; padding: 6px 8px;"
- "font-family: 'Consolas','Courier New',monospace;");
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::NEGATIVE));
mfa_error_->hide();
vl->addWidget(mfa_error_);
mfa_verify_btn_ = new QPushButton(" VERIFY ");
mfa_verify_btn_->setFixedHeight(32);
- mfa_verify_btn_->setStyleSheet(BTN_PRIMARY);
+ mfa_verify_btn_->setStyleSheet(btn_primary());
connect(mfa_verify_btn_, &QPushButton::clicked, this, &LoginScreen::on_mfa_verify);
vl->addWidget(mfa_verify_btn_);
auto* back = new QPushButton("BACK TO LOGIN");
- back->setStyleSheet(LINK_STYLE);
+ back->setStyleSheet(link_style());
connect(back, &QPushButton::clicked, this, [this]() { pages_->setCurrentIndex(0); });
vl->addWidget(back, 0, Qt::AlignCenter);
@@ -343,7 +381,7 @@ void LoginScreen::build_mfa_page() {
void LoginScreen::build_conflict_page() {
conflict_page_ = new QWidget;
- conflict_page_->setStyleSheet(CARD_STYLE);
+ conflict_page_->setStyleSheet(card_style());
auto* vl = new QVBoxLayout(conflict_page_);
vl->setContentsMargins(28, 22, 28, 22);
@@ -351,41 +389,44 @@ void LoginScreen::build_conflict_page() {
auto* header = new QWidget;
header->setFixedHeight(38);
- header->setStyleSheet("background: #111111; border: none;");
+ header->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BG_RAISED));
auto* hl = new QHBoxLayout(header);
hl->setContentsMargins(14, 0, 14, 0);
auto* title = new QLabel("SESSION CONFLICT");
- title->setStyleSheet("color: #ca8a04; font-size: 14px; font-weight: 700;"
+ title->setStyleSheet(QString("color: %1; font-size: 14px; font-weight: 700;"
"background: transparent; letter-spacing: 1px;"
- "font-family: 'Consolas','Courier New',monospace;");
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::WARNING));
hl->addWidget(title);
hl->addStretch();
auto* warn = new QLabel("WARNING");
- warn->setStyleSheet("color: #ca8a04; font-size: 12px; font-weight: 700;"
+ warn->setStyleSheet(QString("color: %1; font-size: 12px; font-weight: 700;"
"background: transparent; letter-spacing: 0.5px;"
- "font-family: 'Consolas','Courier New',monospace;");
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::WARNING));
hl->addWidget(warn);
vl->addWidget(header);
conflict_msg_ = new QLabel;
conflict_msg_->setWordWrap(true);
- conflict_msg_->setStyleSheet("color: #808080; font-size: 14px; background: transparent;"
- "font-family: 'Consolas','Courier New',monospace;");
+ conflict_msg_->setStyleSheet(QString("color: %1; font-size: 14px; background: transparent;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_SECONDARY));
vl->addWidget(conflict_msg_);
vl->addWidget(make_separator());
auto* force_btn = new QPushButton(" LOG OUT OTHER SESSION & CONTINUE ");
force_btn->setFixedHeight(32);
- force_btn->setStyleSheet(BTN_DANGER);
+ force_btn->setStyleSheet(btn_danger());
connect(force_btn, &QPushButton::clicked, this, &LoginScreen::on_force_login);
vl->addWidget(force_btn);
auto* cancel_btn = new QPushButton(" CANCEL ");
cancel_btn->setFixedHeight(32);
- cancel_btn->setStyleSheet(BTN_STANDARD);
+ cancel_btn->setStyleSheet(btn_standard());
connect(cancel_btn, &QPushButton::clicked, this, [this]() { pages_->setCurrentIndex(0); });
vl->addWidget(cancel_btn);
diff --git a/fincept-qt/src/screens/auth/PricingScreen.cpp b/fincept-qt/src/screens/auth/PricingScreen.cpp
index 0224ed21d..7f5d76e7e 100644
--- a/fincept-qt/src/screens/auth/PricingScreen.cpp
+++ b/fincept-qt/src/screens/auth/PricingScreen.cpp
@@ -20,17 +20,26 @@ namespace fincept::screens {
static const char* MF = "font-family:'Consolas','Courier New',monospace;";
-static const char* CARD_NORMAL = "QWidget#plan_card { background: #0a0a0a; border: 1px solid #1a1a1a; }"
- "QLabel { border: none; background: transparent; }"
- "QFrame { border: none; background: transparent; }";
+static QString card_normal() {
+ return QString("QWidget#plan_card { background: %1; border: 1px solid %2; }"
+ "QLabel { border: none; background: transparent; }"
+ "QFrame { border: none; background: transparent; }")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM);
+}
-static const char* CARD_POPULAR = "QWidget#plan_card { background: #0a0a0a; border: 1px solid #78350f; }"
- "QLabel { border: none; background: transparent; }"
- "QFrame { border: none; background: transparent; }";
+static QString card_popular() {
+ return QString("QWidget#plan_card { background: %1; border: 1px solid %2; }"
+ "QLabel { border: none; background: transparent; }"
+ "QFrame { border: none; background: transparent; }")
+ .arg(ui::colors::BG_SURFACE, ui::colors::AMBER_DIM);
+}
-static const char* CARD_ACTIVE = "QWidget#plan_card { background: #0a0a0a; border: 1px solid #16a34a; }"
- "QLabel { border: none; background: transparent; }"
- "QFrame { border: none; background: transparent; }";
+static QString card_active() {
+ return QString("QWidget#plan_card { background: %1; border: 1px solid %2; }"
+ "QLabel { border: none; background: transparent; }"
+ "QFrame { border: none; background: transparent; }")
+ .arg(ui::colors::BG_SURFACE, ui::colors::POSITIVE);
+}
// ── Constructor ──────────────────────────────────────────────────────────────
@@ -40,7 +49,7 @@ PricingScreen::PricingScreen(QWidget* parent) : QWidget(parent) {
}
void PricingScreen::build_ui() {
- setStyleSheet("background: #080808;");
+ setStyleSheet(QString("background: %1;").arg(ui::colors::BG_BASE));
auto* root = new QVBoxLayout(this);
root->setContentsMargins(0, 0, 0, 0);
@@ -49,11 +58,12 @@ void PricingScreen::build_ui() {
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
scroll->setFrameShape(QFrame::NoFrame);
- scroll->setStyleSheet("QScrollArea { background: transparent; border: none; }"
+ scroll->setStyleSheet(QString("QScrollArea { background: transparent; border: none; }"
"QScrollBar:vertical { background: transparent; width: 6px; }"
- "QScrollBar::handle:vertical { background: #222222; }"
- "QScrollBar::handle:vertical:hover { background: #333333; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }");
+ "QScrollBar::handle:vertical { background: %1; }"
+ "QScrollBar::handle:vertical:hover { background: %2; }"
+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }")
+ .arg(ui::colors::BORDER_MED, ui::colors::BORDER_BRIGHT));
auto* content = new QWidget;
content->setStyleSheet("background: transparent;");
@@ -64,25 +74,25 @@ void PricingScreen::build_ui() {
// ── Header ───────────────────────────────────────────────────────────────
auto* title = new QLabel("PLANS & PRICING");
title->setAlignment(Qt::AlignCenter);
- title->setStyleSheet(QString("color: #d97706; font-size: 20px; font-weight: 700; "
- "letter-spacing: 1px; background: transparent; %1")
- .arg(MF));
+ title->setStyleSheet(QString("color: %1; font-size: 20px; font-weight: 700; "
+ "letter-spacing: 1px; background: transparent; %2")
+ .arg(ui::colors::AMBER).arg(MF));
vl->addWidget(title);
auto* subtitle = new QLabel("Unlock the full power of Fincept Terminal");
subtitle->setAlignment(Qt::AlignCenter);
- subtitle->setStyleSheet(QString("color: #525252; font-size: 13px; background: transparent; %1").arg(MF));
+ subtitle->setStyleSheet(QString("color: %1; font-size: 13px; background: transparent; %2").arg(ui::colors::TEXT_TERTIARY).arg(MF));
vl->addWidget(subtitle);
user_info_label_ = new QLabel;
user_info_label_->setAlignment(Qt::AlignCenter);
- user_info_label_->setStyleSheet(QString("color: #808080; font-size: 12px; background: transparent; %1").arg(MF));
+ user_info_label_->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent; %2").arg(ui::colors::TEXT_SECONDARY).arg(MF));
vl->addWidget(user_info_label_);
// ── Loading ──────────────────────────────────────────────────────────────
loading_label_ = new QLabel("Loading plans...");
loading_label_->setAlignment(Qt::AlignCenter);
- loading_label_->setStyleSheet(QString("color: #404040; font-size: 13px; background: transparent; %1").arg(MF));
+ loading_label_->setStyleSheet(QString("color: %1; font-size: 13px; background: transparent; %2").arg(ui::colors::TEXT_DIM).arg(MF));
loading_label_->hide();
vl->addWidget(loading_label_);
@@ -90,9 +100,9 @@ void PricingScreen::build_ui() {
error_label_ = new QLabel;
error_label_->setWordWrap(true);
error_label_->setAlignment(Qt::AlignCenter);
- error_label_->setStyleSheet(QString("color: #dc2626; font-size: 12px; background: rgba(220,38,38,0.1); "
- "border: 1px solid #7f1d1d; padding: 6px 12px; %1")
- .arg(MF));
+ error_label_->setStyleSheet(QString("color: %1; font-size: 12px; background: rgba(220,38,38,0.1); "
+ "border: 1px solid #7f1d1d; padding: 6px 12px; %2")
+ .arg(ui::colors::NEGATIVE).arg(MF));
error_label_->hide();
vl->addWidget(error_label_);
@@ -112,7 +122,7 @@ void PricingScreen::build_ui() {
auto* sep = new QFrame;
sep->setFixedHeight(1);
- sep->setStyleSheet("background: #1a1a1a; border: none;");
+ sep->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BORDER_DIM));
footer_vl->addWidget(sep);
footer_vl->addSpacing(4);
@@ -254,7 +264,7 @@ void PricingScreen::render_plan_cards() {
if (plans_.empty()) {
auto* empty = new QLabel("No plans available.");
empty->setAlignment(Qt::AlignCenter);
- empty->setStyleSheet(QString("color: #404040; font-size: 13px; background: transparent; %1").arg(MF));
+ empty->setStyleSheet(QString("color: %1; font-size: 13px; background: transparent; %2").arg(ui::colors::TEXT_DIM).arg(MF));
cards_layout_->addWidget(empty);
}
@@ -277,7 +287,7 @@ QWidget* PricingScreen::create_plan_card(const auth::SubscriptionPlan& plan, int
card->setObjectName("plan_card");
card->setFixedWidth(260);
card->setMinimumHeight(400);
- card->setStyleSheet(is_current ? CARD_ACTIVE : (is_popular ? CARD_POPULAR : CARD_NORMAL));
+ card->setStyleSheet(is_current ? card_active() : (is_popular ? card_popular() : card_normal()));
auto* vl = new QVBoxLayout(card);
vl->setContentsMargins(12, 12, 12, 12);
@@ -288,10 +298,10 @@ QWidget* PricingScreen::create_plan_card(const auth::SubscriptionPlan& plan, int
auto* badge = new QLabel("RECOMMENDED");
badge->setAlignment(Qt::AlignCenter);
badge->setFixedHeight(20);
- badge->setStyleSheet(QString("color: #d97706; background: rgba(217,119,6,0.1); "
- "border: 1px solid #78350f; padding: 0 8px; "
- "font-size: 11px; font-weight: 700; letter-spacing: 0.5px; %1")
- .arg(MF));
+ badge->setStyleSheet(QString("color: %1; background: rgba(217,119,6,0.1); "
+ "border: 1px solid %2; padding: 0 8px; "
+ "font-size: 11px; font-weight: 700; letter-spacing: 0.5px; %3")
+ .arg(ui::colors::AMBER, ui::colors::AMBER_DIM).arg(MF));
vl->addWidget(badge, 0, Qt::AlignCenter);
vl->addSpacing(2);
}
@@ -301,7 +311,7 @@ QWidget* PricingScreen::create_plan_card(const auth::SubscriptionPlan& plan, int
name->setAlignment(Qt::AlignCenter);
name->setStyleSheet(QString("color: %1; font-size: 16px; font-weight: 700; "
"letter-spacing: 0.5px; background: transparent; %2")
- .arg(is_popular ? "#d97706" : "#e5e5e5")
+ .arg(is_popular ? ui::colors::AMBER() : ui::colors::TEXT_PRIMARY())
.arg(MF));
vl->addWidget(name);
@@ -310,7 +320,7 @@ QWidget* PricingScreen::create_plan_card(const auth::SubscriptionPlan& plan, int
auto* desc = new QLabel(plan.description);
desc->setWordWrap(true);
desc->setAlignment(Qt::AlignCenter);
- desc->setStyleSheet(QString("color: #525252; font-size: 12px; background: transparent; %1").arg(MF));
+ desc->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent; %2").arg(ui::colors::TEXT_TERTIARY).arg(MF));
vl->addWidget(desc);
}
@@ -320,21 +330,21 @@ QWidget* PricingScreen::create_plan_card(const auth::SubscriptionPlan& plan, int
if (plan.is_free) {
auto* price = new QLabel("FREE");
price->setAlignment(Qt::AlignCenter);
- price->setStyleSheet(QString("color: #e5e5e5; font-size: 28px; font-weight: 700; "
- "background: transparent; %1")
- .arg(MF));
+ price->setStyleSheet(QString("color: %1; font-size: 28px; font-weight: 700; "
+ "background: transparent; %2")
+ .arg(ui::colors::TEXT_PRIMARY).arg(MF));
vl->addWidget(price);
} else {
auto* price = new QLabel(QString("$%1").arg(plan.price_usd, 0, 'f', 0));
price->setAlignment(Qt::AlignCenter);
- price->setStyleSheet(QString("color: #d97706; font-size: 28px; font-weight: 700; "
- "background: transparent; %1")
- .arg(MF));
+ price->setStyleSheet(QString("color: %1; font-size: 28px; font-weight: 700; "
+ "background: transparent; %2")
+ .arg(ui::colors::AMBER).arg(MF));
vl->addWidget(price);
auto* period = new QLabel(QString("/ %1 days").arg(plan.validity_days));
period->setAlignment(Qt::AlignCenter);
- period->setStyleSheet(QString("color: #404040; font-size: 12px; background: transparent; %1").arg(MF));
+ period->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent; %2").arg(ui::colors::TEXT_DIM).arg(MF));
vl->addWidget(period);
}
@@ -343,21 +353,21 @@ QWidget* PricingScreen::create_plan_card(const auth::SubscriptionPlan& plan, int
// Credits
auto* credits = new QLabel(QString("%1 credits").arg(plan.credits));
credits->setAlignment(Qt::AlignCenter);
- credits->setStyleSheet(QString("color: #0891b2; font-size: 13px; font-weight: 700; "
- "background: transparent; %1")
- .arg(MF));
+ credits->setStyleSheet(QString("color: %1; font-size: 13px; font-weight: 700; "
+ "background: transparent; %2")
+ .arg(ui::colors::CYAN).arg(MF));
vl->addWidget(credits);
// Support
auto* support = new QLabel(QString("%1 support").arg(plan.support_type));
support->setAlignment(Qt::AlignCenter);
- support->setStyleSheet(QString("color: #525252; font-size: 12px; background: transparent; %1").arg(MF));
+ support->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent; %2").arg(ui::colors::TEXT_TERTIARY).arg(MF));
vl->addWidget(support);
// Separator
auto* sep = new QFrame;
sep->setFixedHeight(1);
- sep->setStyleSheet("background: #1a1a1a;");
+ sep->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_DIM));
vl->addWidget(sep);
vl->addSpacing(2);
@@ -366,7 +376,7 @@ QWidget* PricingScreen::create_plan_card(const auth::SubscriptionPlan& plan, int
for (const auto& feature : plan.features) {
auto* feat = new QLabel(QString(" %1").arg(feature));
feat->setWordWrap(true);
- feat->setStyleSheet(QString("color: #808080; font-size: 12px; background: transparent; %1").arg(MF));
+ feat->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent; %2").arg(ui::colors::TEXT_SECONDARY).arg(MF));
vl->addWidget(feat);
}
@@ -380,34 +390,37 @@ QWidget* PricingScreen::create_plan_card(const auth::SubscriptionPlan& plan, int
if (is_current) {
btn->setText("ACTIVE");
btn->setEnabled(false);
- btn->setStyleSheet(QString("QPushButton { background: rgba(22,163,74,0.1); color: #16a34a; "
- "border: 1px solid #16a34a; font-size: 11px; font-weight: 700; %1 }"
- "QPushButton:disabled { color: #16a34a; }")
- .arg(MF));
+ btn->setStyleSheet(QString("QPushButton { background: rgba(22,163,74,0.1); color: %1; "
+ "border: 1px solid %1; font-size: 11px; font-weight: 700; %2 }"
+ "QPushButton:disabled { color: %1; }")
+ .arg(ui::colors::POSITIVE).arg(MF));
} else if (plan.is_free) {
bool user_has_paid = auth_mgr.is_authenticated() && auth_mgr.session().has_paid_plan();
if (user_has_paid) {
btn->setText("FREE TIER");
btn->setEnabled(false);
- btn->setStyleSheet(QString("QPushButton { background: #111111; color: #404040; "
- "border: 1px solid #1a1a1a; font-size: 11px; font-weight: 700; %1 }")
- .arg(MF));
+ btn->setStyleSheet(QString("QPushButton { background: %1; color: %2; "
+ "border: 1px solid %3; font-size: 11px; font-weight: 700; %4 }")
+ .arg(ui::colors::BG_RAISED, ui::colors::TEXT_DIM, ui::colors::BORDER_DIM).arg(MF));
} else {
btn->setText("CONTINUE FREE");
- btn->setStyleSheet(QString("QPushButton { background: #111111; color: #808080; "
- "border: 1px solid #1a1a1a; font-size: 11px; font-weight: 700; %1 }"
- "QPushButton:hover { color: #e5e5e5; background: #161616; }")
- .arg(MF));
+ btn->setStyleSheet(QString("QPushButton { background: %1; color: %2; "
+ "border: 1px solid %3; font-size: 11px; font-weight: 700; %4 }"
+ "QPushButton:hover { color: %5; background: %6; }")
+ .arg(ui::colors::BG_RAISED, ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM)
+ .arg(MF)
+ .arg(ui::colors::TEXT_PRIMARY, ui::colors::BG_HOVER));
connect(btn, &QPushButton::clicked, this, &PricingScreen::navigate_dashboard);
}
} else {
btn->setText("SELECT PLAN");
btn->setStyleSheet(
- QString("QPushButton { background: rgba(217,119,6,0.1); color: #d97706; "
- "border: 1px solid #78350f; font-size: 11px; font-weight: 700; %1 }"
- "QPushButton:hover { background: #d97706; color: #080808; }"
- "QPushButton:disabled { background: #111111; color: #404040; border-color: #1a1a1a; }")
- .arg(MF));
+ QString("QPushButton { background: rgba(217,119,6,0.1); color: %1; "
+ "border: 1px solid %2; font-size: 11px; font-weight: 700; %3 }"
+ "QPushButton:hover { background: %1; color: %4; }"
+ "QPushButton:disabled { background: %5; color: %6; border-color: %7; }")
+ .arg(ui::colors::AMBER, ui::colors::AMBER_DIM).arg(MF)
+ .arg(ui::colors::BG_BASE, ui::colors::BG_RAISED, ui::colors::TEXT_DIM, ui::colors::BORDER_DIM));
QString pid = plan.plan_id;
connect(btn, &QPushButton::clicked, this, [this, pid]() { on_select_plan(pid); });
}
@@ -548,10 +561,10 @@ void PricingScreen::update_footer() {
if (user_has_paid) {
auto* back_btn = new QPushButton("Back to Dashboard");
back_btn->setCursor(Qt::PointingHandCursor);
- back_btn->setStyleSheet(QString("QPushButton { color: #808080; background: transparent; border: none; "
- "font-size: 12px; %1 }"
- "QPushButton:hover { color: #e5e5e5; }")
- .arg(MF));
+ back_btn->setStyleSheet(QString("QPushButton { color: %1; background: transparent; border: none; "
+ "font-size: 12px; %2 }"
+ "QPushButton:hover { color: %3; }")
+ .arg(ui::colors::TEXT_SECONDARY).arg(MF).arg(ui::colors::TEXT_PRIMARY));
connect(back_btn, &QPushButton::clicked, this, &PricingScreen::navigate_dashboard);
fl->addWidget(back_btn);
static_cast<QVBoxLayout*>(fl)->setAlignment(back_btn, Qt::AlignCenter);
@@ -564,15 +577,15 @@ void PricingScreen::update_footer() {
hl->setSpacing(6);
auto* explore = new QLabel("Want to explore first?");
- explore->setStyleSheet(QString("color: #404040; font-size: 12px; background: transparent; %1").arg(MF));
+ explore->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent; %2").arg(ui::colors::TEXT_DIM).arg(MF));
hl->addWidget(explore);
auto* free_btn = new QPushButton("Continue with Free Plan");
free_btn->setCursor(Qt::PointingHandCursor);
- free_btn->setStyleSheet(QString("QPushButton { color: #808080; background: transparent; border: none; "
- "font-size: 12px; %1 }"
- "QPushButton:hover { color: #e5e5e5; }")
- .arg(MF));
+ free_btn->setStyleSheet(QString("QPushButton { color: %1; background: transparent; border: none; "
+ "font-size: 12px; %2 }"
+ "QPushButton:hover { color: %3; }")
+ .arg(ui::colors::TEXT_SECONDARY).arg(MF).arg(ui::colors::TEXT_PRIMARY));
connect(free_btn, &QPushButton::clicked, this, &PricingScreen::navigate_dashboard);
hl->addWidget(free_btn);
diff --git a/fincept-qt/src/screens/auth/RegisterScreen.cpp b/fincept-qt/src/screens/auth/RegisterScreen.cpp
index 0c8f34b37..ffcef1855 100644
--- a/fincept-qt/src/screens/auth/RegisterScreen.cpp
+++ b/fincept-qt/src/screens/auth/RegisterScreen.cpp
@@ -13,51 +13,78 @@ namespace fincept::screens {
// ── Obsidian Styles ──────────────────────────────────────────────────────────
-static const char* CARD_STYLE = "background: #0a0a0a; border: 1px solid #1a1a1a;";
-
-static const char* INPUT_STYLE = "QLineEdit {"
- " background: #0a0a0a; color: #e5e5e5;"
- " border: 1px solid #1a1a1a;"
- " padding: 4px 8px; font-size: 14px;"
- " font-family: 'Consolas','Courier New',monospace;"
- " selection-background-color: #d97706; selection-color: #080808;"
- "}"
- "QLineEdit:focus { border: 1px solid #333333; }"
- "QLineEdit::placeholder { color: #404040; }";
-
-static const char* BTN_PRIMARY = "QPushButton {"
- " background: rgba(217,119,6,0.1); color: #d97706;"
- " border: 1px solid #78350f;"
- " padding: 0 16px; font-size: 13px; font-weight: 700;"
- " font-family: 'Consolas','Courier New',monospace;"
- "}"
- "QPushButton:hover { background: #d97706; color: #080808; }"
- "QPushButton:disabled { color: #404040; background: #111111; border-color: #1a1a1a; }";
-
-static const char* LINK_STYLE = "QPushButton {"
- " color: #808080; background: transparent; border: none;"
- " font-size: 12px; font-weight: 400;"
- " font-family: 'Consolas','Courier New',monospace;"
- "}"
- "QPushButton:hover { color: #e5e5e5; }";
-
-static const char* LABEL_STYLE = "color: #808080; font-size: 12px; font-weight: 700;"
- "background: transparent; letter-spacing: 0.5px;"
- "font-family: 'Consolas','Courier New',monospace;";
-
-static const char* MUTED_STYLE = "color: #525252; font-size: 12px; background: transparent;"
- "font-family: 'Consolas','Courier New',monospace;";
-
-static const char* CHECK_OFF = "color: #404040; font-size: 11px; background: transparent;"
- "font-family: 'Consolas','Courier New',monospace;";
-
-static const char* CHECK_ON = "color: #16a34a; font-size: 11px; background: transparent;"
- "font-family: 'Consolas','Courier New',monospace;";
+static QString card_style() {
+ return QString("background: %1; border: 1px solid %2;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM);
+}
+
+static QString input_style() {
+ return QString("QLineEdit {"
+ " background: %1; color: %2;"
+ " border: 1px solid %3;"
+ " padding: 4px 8px; font-size: 14px;"
+ " font-family: 'Consolas','Courier New',monospace;"
+ " selection-background-color: %4; selection-color: %5;"
+ "}"
+ "QLineEdit:focus { border: 1px solid %6; }"
+ "QLineEdit::placeholder { color: %7; }")
+ .arg(ui::colors::BG_SURFACE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM,
+ ui::colors::AMBER, ui::colors::BG_BASE,
+ ui::colors::BORDER_BRIGHT, ui::colors::TEXT_DIM);
+}
+
+static QString btn_primary() {
+ return QString("QPushButton {"
+ " background: rgba(217,119,6,0.1); color: %1;"
+ " border: 1px solid %2;"
+ " padding: 0 16px; font-size: 13px; font-weight: 700;"
+ " font-family: 'Consolas','Courier New',monospace;"
+ "}"
+ "QPushButton:hover { background: %1; color: %3; }"
+ "QPushButton:disabled { color: %4; background: %5; border-color: %6; }")
+ .arg(ui::colors::AMBER, ui::colors::AMBER_DIM, ui::colors::BG_BASE,
+ ui::colors::TEXT_DIM, ui::colors::BG_RAISED, ui::colors::BORDER_DIM);
+}
+
+static QString link_style() {
+ return QString("QPushButton {"
+ " color: %1; background: transparent; border: none;"
+ " font-size: 12px; font-weight: 400;"
+ " font-family: 'Consolas','Courier New',monospace;"
+ "}"
+ "QPushButton:hover { color: %2; }")
+ .arg(ui::colors::TEXT_SECONDARY, ui::colors::TEXT_PRIMARY);
+}
+
+static QString label_style() {
+ return QString("color: %1; font-size: 12px; font-weight: 700;"
+ "background: transparent; letter-spacing: 0.5px;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_SECONDARY);
+}
+
+static QString muted_style() {
+ return QString("color: %1; font-size: 12px; background: transparent;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_TERTIARY);
+}
+
+static QString check_off() {
+ return QString("color: %1; font-size: 11px; background: transparent;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_DIM);
+}
+
+static QString check_on() {
+ return QString("color: %1; font-size: 11px; background: transparent;"
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::POSITIVE);
+}
static QFrame* make_separator() {
auto* sep = new QFrame;
sep->setFixedHeight(1);
- sep->setStyleSheet("background: #1a1a1a; border: none;");
+ sep->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BORDER_DIM));
return sep;
}
@@ -109,9 +136,9 @@ RegisterScreen::RegisterScreen(QWidget* parent) : QWidget(parent) {
void RegisterScreen::paintEvent(QPaintEvent* /*event*/) {
QPainter p(this);
- p.fillRect(rect(), QColor(0x08, 0x08, 0x08));
+ p.fillRect(rect(), QColor(ui::colors::BG_BASE()));
- p.setPen(QPen(QColor(0x12, 0x12, 0x12), 1));
+ p.setPen(QPen(QColor(ui::colors::BG_RAISED()), 1));
const int step = 24;
for (int x = 0; x < width(); x += step)
p.drawLine(x, 0, x, height());
@@ -123,7 +150,7 @@ void RegisterScreen::paintEvent(QPaintEvent* /*event*/) {
void RegisterScreen::build_form_page() {
auto* page = new QWidget;
- page->setStyleSheet(CARD_STYLE);
+ page->setStyleSheet(card_style());
auto* vl = new QVBoxLayout(page);
vl->setContentsMargins(28, 18, 28, 18);
@@ -132,22 +159,24 @@ void RegisterScreen::build_form_page() {
// Header bar
auto* header = new QWidget;
header->setFixedHeight(38);
- header->setStyleSheet("background: #111111; border: none;");
+ header->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BG_RAISED));
auto* hl = new QHBoxLayout(header);
hl->setContentsMargins(14, 0, 14, 0);
auto* back = new QPushButton("<");
back->setFixedSize(24, 24);
- back->setStyleSheet("QPushButton { color: #808080; background: transparent; border: none;"
+ back->setStyleSheet(QString("QPushButton { color: %1; background: transparent; border: none;"
" font-size: 16px; font-family: 'Consolas','Courier New',monospace; }"
- "QPushButton:hover { color: #e5e5e5; }");
+ "QPushButton:hover { color: %2; }")
+ .arg(ui::colors::TEXT_SECONDARY, ui::colors::TEXT_PRIMARY));
connect(back, &QPushButton::clicked, this, &RegisterScreen::navigate_login);
hl->addWidget(back);
auto* title = new QLabel("CREATE ACCOUNT");
- title->setStyleSheet("color: #d97706; font-size: 14px; font-weight: 700;"
+ title->setStyleSheet(QString("color: %1; font-size: 14px; font-weight: 700;"
"background: transparent; letter-spacing: 1px;"
- "font-family: 'Consolas','Courier New',monospace;");
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::AMBER));
hl->addWidget(title);
hl->addStretch();
vl->addWidget(header);
@@ -157,7 +186,7 @@ void RegisterScreen::build_form_page() {
// Helper to add a compact field
auto add_field = [&](QLineEdit*& field, const char* label, const char* placeholder, QLayout* parent) {
auto* lbl = new QLabel(label);
- lbl->setStyleSheet(LABEL_STYLE);
+ lbl->setStyleSheet(label_style());
if (auto* vbl = qobject_cast<QVBoxLayout*>(static_cast<QObject*>(nullptr)); !vbl) {
// parent is a layout — just add
}
@@ -165,7 +194,7 @@ void RegisterScreen::build_form_page() {
field = new QLineEdit;
field->setPlaceholderText(placeholder);
field->setFixedHeight(30);
- field->setStyleSheet(INPUT_STYLE);
+ field->setStyleSheet(input_style());
static_cast<QBoxLayout*>(parent)->addWidget(field);
};
@@ -221,7 +250,7 @@ void RegisterScreen::build_form_page() {
auto make_check = [&](QLabel*& lbl, const char* text) {
lbl = new QLabel(text);
- lbl->setStyleSheet(CHECK_OFF);
+ lbl->setStyleSheet(check_off());
pcl->addWidget(lbl);
};
make_check(pw_len_, "8+");
@@ -240,10 +269,11 @@ void RegisterScreen::build_form_page() {
// Error
error_label_ = new QLabel;
error_label_->setWordWrap(true);
- error_label_->setStyleSheet("color: #dc2626; font-size: 12px;"
+ error_label_->setStyleSheet(QString("color: %1; font-size: 12px;"
"background: rgba(220,38,38,0.08);"
"border: 1px solid #7f1d1d; padding: 4px 8px;"
- "font-family: 'Consolas','Courier New',monospace;");
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::NEGATIVE));
error_label_->hide();
vl->addWidget(error_label_);
@@ -251,7 +281,7 @@ void RegisterScreen::build_form_page() {
register_btn_ = new QPushButton(" CREATE ACCOUNT ");
register_btn_->setFixedHeight(32);
- register_btn_->setStyleSheet(BTN_PRIMARY);
+ register_btn_->setStyleSheet(btn_primary());
connect(register_btn_, &QPushButton::clicked, this, &RegisterScreen::on_register);
vl->addWidget(register_btn_);
@@ -265,14 +295,15 @@ void RegisterScreen::build_form_page() {
lrl->setContentsMargins(0, 0, 0, 0);
auto* have = new QLabel("Already have an account?");
- have->setStyleSheet(MUTED_STYLE);
+ have->setStyleSheet(muted_style());
lrl->addWidget(have);
auto* signin = new QPushButton("SIGN IN");
- signin->setStyleSheet("QPushButton { color: #d97706; background: transparent; border: none;"
+ signin->setStyleSheet(QString("QPushButton { color: %1; background: transparent; border: none;"
" font-size: 12px; font-weight: 700;"
" font-family: 'Consolas','Courier New',monospace; }"
- "QPushButton:hover { color: #e5e5e5; }");
+ "QPushButton:hover { color: %2; }")
+ .arg(ui::colors::AMBER, ui::colors::TEXT_PRIMARY));
connect(signin, &QPushButton::clicked, this, &RegisterScreen::navigate_login);
lrl->addWidget(signin);
vl->addWidget(login_row);
@@ -284,7 +315,7 @@ void RegisterScreen::build_form_page() {
void RegisterScreen::build_otp_page() {
auto* page = new QWidget;
- page->setStyleSheet(CARD_STYLE);
+ page->setStyleSheet(card_style());
auto* vl = new QVBoxLayout(page);
vl->setContentsMargins(28, 22, 28, 22);
@@ -293,64 +324,69 @@ void RegisterScreen::build_otp_page() {
// Header
auto* header = new QWidget;
header->setFixedHeight(38);
- header->setStyleSheet("background: #111111; border: none;");
+ header->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BG_RAISED));
auto* hl = new QHBoxLayout(header);
hl->setContentsMargins(14, 0, 14, 0);
auto* title = new QLabel("VERIFY EMAIL");
- title->setStyleSheet("color: #d97706; font-size: 14px; font-weight: 700;"
+ title->setStyleSheet(QString("color: %1; font-size: 14px; font-weight: 700;"
"background: transparent; letter-spacing: 1px;"
- "font-family: 'Consolas','Courier New',monospace;");
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::AMBER));
hl->addWidget(title);
hl->addStretch();
vl->addWidget(header);
otp_email_ = new QLabel;
otp_email_->setWordWrap(true);
- otp_email_->setStyleSheet(MUTED_STYLE);
+ otp_email_->setStyleSheet(muted_style());
vl->addWidget(otp_email_);
vl->addWidget(make_separator());
auto* lbl = new QLabel("VERIFICATION CODE");
- lbl->setStyleSheet(LABEL_STYLE);
+ lbl->setStyleSheet(label_style());
vl->addWidget(lbl);
otp_input_ = new QLineEdit;
otp_input_->setPlaceholderText("enter code from email");
otp_input_->setFixedHeight(34);
- otp_input_->setStyleSheet("QLineEdit {"
- " background: #0a0a0a; color: #e5e5e5;"
- " border: 1px solid #1a1a1a;"
+ otp_input_->setStyleSheet(QString("QLineEdit {"
+ " background: %1; color: %2;"
+ " border: 1px solid %3;"
" padding: 6px 10px; font-size: 15px;"
" font-family: 'Consolas','Courier New',monospace;"
- " selection-background-color: #d97706; selection-color: #080808;"
+ " selection-background-color: %4; selection-color: %5;"
"}"
- "QLineEdit:focus { border: 1px solid #333333; }");
+ "QLineEdit:focus { border: 1px solid %6; }")
+ .arg(ui::colors::BG_SURFACE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM,
+ ui::colors::AMBER, ui::colors::BG_BASE,
+ ui::colors::BORDER_BRIGHT));
vl->addWidget(otp_input_);
otp_error_ = new QLabel;
otp_error_->setWordWrap(true);
- otp_error_->setStyleSheet("color: #dc2626; font-size: 12px;"
+ otp_error_->setStyleSheet(QString("color: %1; font-size: 12px;"
"background: rgba(220,38,38,0.08);"
"border: 1px solid #7f1d1d; padding: 4px 8px;"
- "font-family: 'Consolas','Courier New',monospace;");
+ "font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::NEGATIVE));
otp_error_->hide();
vl->addWidget(otp_error_);
verify_btn_ = new QPushButton(" VERIFY ");
verify_btn_->setFixedHeight(32);
- verify_btn_->setStyleSheet(BTN_PRIMARY);
+ verify_btn_->setStyleSheet(btn_primary());
connect(verify_btn_, &QPushButton::clicked, this, &RegisterScreen::on_verify_otp);
vl->addWidget(verify_btn_);
auto* resend = new QPushButton("DIDN'T RECEIVE? RESEND");
- resend->setStyleSheet(LINK_STYLE);
+ resend->setStyleSheet(link_style());
connect(resend, &QPushButton::clicked, this, &RegisterScreen::on_resend_otp);
vl->addWidget(resend, 0, Qt::AlignCenter);
auto* back2 = new QPushButton("BACK TO FORM");
- back2->setStyleSheet(LINK_STYLE);
+ back2->setStyleSheet(link_style());
connect(back2, &QPushButton::clicked, this, [this]() { pages_->setCurrentIndex(0); });
vl->addWidget(back2, 0, Qt::AlignCenter);
@@ -363,11 +399,11 @@ void RegisterScreen::build_otp_page() {
void RegisterScreen::update_password_strength() {
auto s = auth::validate_password(password_->text());
- pw_len_->setStyleSheet(s.min_length ? CHECK_ON : CHECK_OFF);
- pw_up_->setStyleSheet(s.has_upper ? CHECK_ON : CHECK_OFF);
- pw_low_->setStyleSheet(s.has_lower ? CHECK_ON : CHECK_OFF);
- pw_num_->setStyleSheet(s.has_number ? CHECK_ON : CHECK_OFF);
- pw_spec_->setStyleSheet(s.has_special ? CHECK_ON : CHECK_OFF);
+ pw_len_->setStyleSheet(s.min_length ? check_on() : check_off());
+ pw_up_->setStyleSheet(s.has_upper ? check_on() : check_off());
+ pw_low_->setStyleSheet(s.has_lower ? check_on() : check_off());
+ pw_num_->setStyleSheet(s.has_number ? check_on() : check_off());
+ pw_spec_->setStyleSheet(s.has_special ? check_on() : check_off());
}
// ── Actions ──────────────────────────────────────────────────────────────────
diff --git a/fincept-qt/src/screens/backtesting/BacktestingScreen.cpp b/fincept-qt/src/screens/backtesting/BacktestingScreen.cpp
index dd11ac642..8a59365ee 100644
--- a/fincept-qt/src/screens/backtesting/BacktestingScreen.cpp
+++ b/fincept-qt/src/screens/backtesting/BacktestingScreen.cpp
@@ -2,6 +2,7 @@
#include "screens/backtesting/BacktestingScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "services/backtesting/BacktestingService.h"
#include "services/file_manager/FileManagerService.h"
#include "ui/theme/Theme.h"
@@ -1026,6 +1027,7 @@ void BacktestingScreen::on_provider_changed(int index) {
svc.load_strategies(slug);
svc.load_command_options(slug);
svc.execute(slug, "get_indicators", {});
+ ScreenStateManager::instance().notify_changed(this);
}
void BacktestingScreen::update_provider_buttons() {
@@ -1576,4 +1578,22 @@ void BacktestingScreen::on_error(const QString& context, const QString& message)
display_error(QString("[%1] %2").arg(context, message));
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap BacktestingScreen::save_state() const {
+ return {
+ {"provider", active_provider_},
+ {"command", active_command_},
+ };
+}
+
+void BacktestingScreen::restore_state(const QVariantMap& state) {
+ const int prov = state.value("provider", 0).toInt();
+ const int cmd = state.value("command", 0).toInt();
+ if (prov != active_provider_)
+ on_provider_changed(prov);
+ if (cmd != active_command_)
+ on_command_changed(cmd);
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/backtesting/BacktestingScreen.h b/fincept-qt/src/screens/backtesting/BacktestingScreen.h
index 159a387cd..692afb0ea 100644
--- a/fincept-qt/src/screens/backtesting/BacktestingScreen.h
+++ b/fincept-qt/src/screens/backtesting/BacktestingScreen.h
@@ -1,5 +1,6 @@
// src/screens/backtesting/BacktestingScreen.h
#pragma once
+#include "screens/IStatefulScreen.h"
#include "services/backtesting/BacktestingTypes.h"
#include <QCheckBox>
@@ -24,11 +25,16 @@
namespace fincept::screens {
/// Multi-provider backtesting terminal with 6 providers, 9 commands, 50+ strategies.
-class BacktestingScreen : public QWidget {
+class BacktestingScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit BacktestingScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "backtesting"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) override;
diff --git a/fincept-qt/src/screens/chat_mode/ChatAgentPanel.cpp b/fincept-qt/src/screens/chat_mode/ChatAgentPanel.cpp
index 5f6a2b271..9f1f63e80 100644
--- a/fincept-qt/src/screens/chat_mode/ChatAgentPanel.cpp
+++ b/fincept-qt/src/screens/chat_mode/ChatAgentPanel.cpp
@@ -1,23 +1,44 @@
#include "screens/chat_mode/ChatAgentPanel.h"
#include "screens/chat_mode/ChatModeService.h"
#include "core/logging/Logger.h"
+#include "ui/theme/Theme.h"
#include <QHBoxLayout>
#include <QInputDialog>
+#include <QJsonArray>
+#include <QJsonObject>
#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;}";
+static QString list_ss() {
+ return QString(
+ "QListWidget{background:%1;border:1px solid %2;color:%3;"
+ "font-size:12px;font-family:'Consolas','Courier New',monospace;"
+ "border-radius:0px;outline:none;}"
+ "QListWidget::item{padding:6px 8px;border-bottom:1px solid %4;}"
+ "QListWidget::item:selected{background:%4;color:%5;}"
+ "QListWidget::item:hover{background:%7;}"
+ "QScrollBar:vertical{background:transparent;width:4px;}"
+ "QScrollBar::handle:vertical{background:%6;border-radius:0px;}"
+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM, ui::colors::TEXT_PRIMARY,
+ ui::colors::BG_RAISED, ui::colors::AMBER, ui::colors::BORDER_MED,
+ ui::colors::BG_HOVER);
+}
+
+static QString section_title_ss() {
+ return QString("color:%1;font-size:11px;font-weight:700;letter-spacing:0.5px;"
+ "font-family:'Consolas','Courier New',monospace;background:transparent;")
+ .arg(ui::colors::TEXT_SECONDARY);
+}
+
+static QString hint_ss() {
+ return QString("color:%1;font-size:11px;"
+ "font-family:'Consolas','Courier New',monospace;background:transparent;")
+ .arg(ui::colors::TEXT_DIM);
+}
// ── Constructor ───────────────────────────────────────────────────────────────
@@ -26,51 +47,62 @@ ChatAgentPanel::ChatAgentPanel(QWidget* parent) : QWidget(parent) {
refresh_memory();
refresh_schedules();
refresh_tasks();
+ refresh_mcp_servers();
+ refresh_monitors();
}
// ── Build UI ──────────────────────────────────────────────────────────────────
void ChatAgentPanel::build_ui() {
setFixedWidth(280);
- setStyleSheet("background:#0a0a0a;border-left:1px solid #1a1a1a;");
+ setStyleSheet(QString("background:%1;border-left:1px solid %2;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
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("Mem");
+ tab_bar_->addTab("Sched");
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;}");
+ tab_bar_->addTab("MCP");
+ tab_bar_->addTab("Monitor");
+ tab_bar_->setStyleSheet(QString(
+ "QTabBar{background:%1;border-bottom:1px solid %2;}"
+ "QTabBar::tab{background:%1;color:%3;padding:6px 0;"
+ "font-size:11px;font-family:'Consolas','Courier New',monospace;"
+ "border:none;border-bottom:2px solid transparent;}"
+ "QTabBar::tab:selected{color:%4;border-bottom:2px solid %4;}"
+ "QTabBar::tab:hover{color:%5;}")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM, ui::colors::TEXT_TERTIARY,
+ ui::colors::AMBER, ui::colors::TEXT_PRIMARY));
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());
+ stack_->addWidget(build_mcp_tab());
+ stack_->addWidget(build_monitors_tab());
vl->addWidget(stack_, 1);
}
-QPushButton* ChatAgentPanel::make_action_btn(const QString& text, const QString& tooltip) {
+QPushButton* ChatAgentPanel::make_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;}");
+ btn->setFixedHeight(22);
+ btn->setStyleSheet(QString(
+ "QPushButton{background:%1;color:%2;border:1px solid %3;"
+ "border-radius:0px;font-size:11px;"
+ "font-family:'Consolas','Courier New',monospace;}"
+ "QPushButton:hover{background:%4;color:%5;border-color:%6;}"
+ "QPushButton:disabled{color:%7;border-color:%1;}")
+ .arg(ui::colors::BG_RAISED, ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM,
+ ui::colors::BG_HOVER, ui::colors::TEXT_PRIMARY, ui::colors::AMBER,
+ ui::colors::BORDER_BRIGHT));
return btn;
}
@@ -80,21 +112,19 @@ QWidget* ChatAgentPanel::build_memory_tab() {
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;");
+ auto* title = new QLabel("AGENT MEMORY");
+ title->setStyleSheet(section_title_ss());
vl->addWidget(title);
memory_list_ = new QListWidget;
- memory_list_->setStyleSheet(LIST_SS);
+ 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_add_btn_ = make_btn("+ Add", "Add memory entry");
+ mem_del_btn_ = make_btn("Delete", "Delete selected");
+ mem_clear_btn_ = make_btn("Clear", "Clear all memory");
mem_del_btn_->setEnabled(false);
btn_row->addWidget(mem_add_btn_);
btn_row->addWidget(mem_del_btn_);
@@ -117,27 +147,24 @@ QWidget* ChatAgentPanel::build_schedules_tab() {
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;");
+ auto* title = new QLabel("SCHEDULED QUERIES");
+ title->setStyleSheet(section_title_ss());
vl->addWidget(title);
- auto* hint = new QLabel("Run agent queries on a schedule (e.g. daily at 9 AM).");
+ auto* hint = new QLabel("Cron-based agent queries (e.g. daily 9 AM).");
hint->setWordWrap(true);
- hint->setStyleSheet(
- "color:#404040;font-size:10px;font-family:'Consolas',monospace;background:transparent;");
+ hint->setStyleSheet(hint_ss());
vl->addWidget(hint);
sched_list_ = new QListWidget;
- sched_list_->setStyleSheet(LIST_SS);
+ 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_add_btn_ = make_btn("+ Add", "Create schedule");
+ sched_del_btn_ = make_btn("Delete", "Delete selected");
+ sched_toggle_btn_ = make_btn("Pause", "Pause/resume");
sched_del_btn_->setEnabled(false);
sched_toggle_btn_->setEnabled(false);
btn_row->addWidget(sched_add_btn_);
@@ -163,37 +190,132 @@ QWidget* ChatAgentPanel::build_tasks_tab() {
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;");
+ auto* title = new QLabel("BACKGROUND TASKS");
+ title->setStyleSheet(section_title_ss());
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;");
+ task_status_lbl_->setStyleSheet(hint_ss());
vl->addWidget(task_status_lbl_);
task_list_ = new QListWidget;
- task_list_->setStyleSheet(LIST_SS);
+ task_list_->setStyleSheet(list_ss());
vl->addWidget(task_list_, 1);
+ auto* row1 = new QHBoxLayout;
+ row1->setSpacing(4);
+ task_refresh_btn_ = make_btn("Refresh", "Refresh task list");
+ task_detail_btn_ = make_btn("Detail", "View task result");
+ task_detail_btn_->setEnabled(false);
+ row1->addWidget(task_refresh_btn_);
+ row1->addWidget(task_detail_btn_);
+ vl->addLayout(row1);
+
+ auto* row2 = new QHBoxLayout;
+ row2->setSpacing(4);
+ task_feedback_btn_ = make_btn("Feedback", "Send feedback");
+ task_cancel_btn_ = make_btn("Cancel", "Cancel task");
+ task_feedback_btn_->setEnabled(false);
+ task_cancel_btn_->setEnabled(false);
+ row2->addWidget(task_feedback_btn_);
+ row2->addWidget(task_cancel_btn_);
+ row2->addStretch();
+ vl->addLayout(row2);
+
+ connect(task_list_, &QListWidget::itemSelectionChanged, this, [this]() {
+ const bool sel = !task_list_->selectedItems().isEmpty();
+ task_cancel_btn_->setEnabled(sel);
+ task_detail_btn_->setEnabled(sel);
+ task_feedback_btn_->setEnabled(sel);
+ });
+ connect(task_refresh_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_refresh_tasks);
+ connect(task_cancel_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_cancel_task);
+ connect(task_detail_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_view_task_detail);
+ connect(task_feedback_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_send_feedback);
+
+ return w;
+}
+
+QWidget* ChatAgentPanel::build_mcp_tab() {
+ auto* w = new QWidget;
+ auto* vl = new QVBoxLayout(w);
+ vl->setContentsMargins(8, 8, 8, 8);
+ vl->setSpacing(6);
+
+ auto* title = new QLabel("MCP SERVERS");
+ title->setStyleSheet(section_title_ss());
+ vl->addWidget(title);
+
+ mcp_tools_lbl_ = new QLabel("Model Context Protocol tool servers.");
+ mcp_tools_lbl_->setWordWrap(true);
+ mcp_tools_lbl_->setStyleSheet(hint_ss());
+ vl->addWidget(mcp_tools_lbl_);
+
+ mcp_list_ = new QListWidget;
+ mcp_list_->setStyleSheet(list_ss());
+ vl->addWidget(mcp_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();
+ mcp_add_btn_ = make_btn("+ Add", "Add MCP server");
+ mcp_del_btn_ = make_btn("Delete", "Remove selected");
+ mcp_refresh_btn_ = make_btn("Refresh", "Refresh all");
+ mcp_del_btn_->setEnabled(false);
+ btn_row->addWidget(mcp_add_btn_);
+ btn_row->addWidget(mcp_refresh_btn_);
+ btn_row->addWidget(mcp_del_btn_);
vl->addLayout(btn_row);
- connect(task_list_, &QListWidget::itemSelectionChanged, this, [this]() {
- task_cancel_btn_->setEnabled(!task_list_->selectedItems().isEmpty());
+ connect(mcp_list_, &QListWidget::itemSelectionChanged, this, [this]() {
+ mcp_del_btn_->setEnabled(!mcp_list_->selectedItems().isEmpty());
+ });
+ connect(mcp_add_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_add_mcp_server);
+ connect(mcp_del_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_delete_mcp_server);
+ connect(mcp_refresh_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_refresh_mcp_servers);
+
+ return w;
+}
+
+QWidget* ChatAgentPanel::build_monitors_tab() {
+ auto* w = new QWidget;
+ auto* vl = new QVBoxLayout(w);
+ vl->setContentsMargins(8, 8, 8, 8);
+ vl->setSpacing(6);
+
+ auto* title = new QLabel("DATA MONITORS");
+ title->setStyleSheet(section_title_ss());
+ vl->addWidget(title);
+
+ auto* hint = new QLabel("Watch sources, trigger agent analysis.");
+ hint->setWordWrap(true);
+ hint->setStyleSheet(hint_ss());
+ vl->addWidget(hint);
+
+ monitor_list_ = new QListWidget;
+ monitor_list_->setStyleSheet(list_ss());
+ vl->addWidget(monitor_list_, 1);
+
+ auto* btn_row = new QHBoxLayout;
+ btn_row->setSpacing(4);
+ mon_add_btn_ = make_btn("+ Add", "Create monitor");
+ mon_del_btn_ = make_btn("Delete", "Delete selected");
+ mon_toggle_btn_ = make_btn("Pause", "Pause/resume");
+ mon_del_btn_->setEnabled(false);
+ mon_toggle_btn_->setEnabled(false);
+ btn_row->addWidget(mon_add_btn_);
+ btn_row->addWidget(mon_toggle_btn_);
+ btn_row->addWidget(mon_del_btn_);
+ vl->addLayout(btn_row);
+
+ connect(monitor_list_, &QListWidget::itemSelectionChanged, this, [this]() {
+ const bool sel = !monitor_list_->selectedItems().isEmpty();
+ mon_del_btn_->setEnabled(sel);
+ mon_toggle_btn_->setEnabled(sel);
});
- connect(task_refresh_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_refresh_tasks);
- connect(task_cancel_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_cancel_task);
+ connect(mon_add_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_add_monitor);
+ connect(mon_del_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_delete_monitor);
+ connect(mon_toggle_btn_, &QPushButton::clicked, this, &ChatAgentPanel::on_toggle_monitor);
return w;
}
@@ -211,22 +333,22 @@ void ChatAgentPanel::refresh_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.");
+ auto* item = new QListWidgetItem("Not available.");
item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+ memory_list_->addItem(item);
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.");
+ auto* item = new QListWidgetItem("No entries yet.");
item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+ memory_list_->addItem(item);
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->setText(QString("[%1] %2: %3").arg(m.memory_type, m.key, m.value));
item->setData(Qt::UserRole, m.key);
}
});
@@ -237,23 +359,23 @@ void ChatAgentPanel::refresh_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.");
+ auto* item = new QListWidgetItem("Not available.");
item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+ sched_list_->addItem(item);
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.");
+ auto* item = new QListWidgetItem("No schedules yet.");
item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+ sched_list_->addItem(item);
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));
+ const QString icon = (s.status == "active") ? ">" : "||";
+ item->setText(QString("%1 %2\n %3").arg(icon, s.query.left(30), s.cron_expression));
item->setData(Qt::UserRole, s.schedule_id);
item->setData(Qt::UserRole + 1, s.status);
}
@@ -265,28 +387,107 @@ void ChatAgentPanel::refresh_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.");
+ auto* item = new QListWidgetItem("Not available.");
item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+ task_list_->addItem(item);
LOG_WARN("ChatAgentPanel", "Tasks load failed: " + err);
return;
}
tasks_ = std::move(tasks);
+ task_status_lbl_->setText(
+ QString("%1 task(s)").arg(tasks_.size()));
if (tasks_.isEmpty()) {
- auto* item = new QListWidgetItem(task_list_);
- item->setText("No background tasks yet.");
+ auto* item = new QListWidgetItem("No tasks yet.");
item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+ task_list_->addItem(item);
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));
+ t.status == "completed" ? "[OK]" :
+ t.status == "error" ? "[!]" :
+ t.status == "cancelled" ? "[x]" :
+ t.status == "running" ? "[..]" : "[.]";
+ item->setText(QString("%1 %2\n %3").arg(icon, t.query.left(35), t.status));
item->setData(Qt::UserRole, t.task_id);
+ // Color by status
+ if (t.status == "completed")
+ item->setForeground(QColor(ui::colors::POSITIVE()));
+ else if (t.status == "error")
+ item->setForeground(QColor(ui::colors::NEGATIVE()));
+ else if (t.status == "running")
+ item->setForeground(QColor(ui::colors::AMBER()));
+ }
+ });
+}
+
+void ChatAgentPanel::refresh_mcp_servers() {
+ ChatModeService::instance().list_mcp_servers(
+ [this](bool ok, QVector<McpServer> servers, int total_tools, QString err) {
+ mcp_list_->clear();
+ if (!ok) {
+ auto* item = new QListWidgetItem("Not available.");
+ item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+ mcp_list_->addItem(item);
+ mcp_tools_lbl_->setText("MCP not available.");
+ LOG_WARN("ChatAgentPanel", "MCP load failed: " + err);
+ return;
+ }
+ mcp_servers_ = std::move(servers);
+ mcp_tools_lbl_->setText(
+ QString("%1 server(s) | %2 tools")
+ .arg(mcp_servers_.size()).arg(total_tools));
+
+ if (mcp_servers_.isEmpty()) {
+ auto* item = new QListWidgetItem("No servers connected.");
+ item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+ mcp_list_->addItem(item);
+ return;
+ }
+ for (const auto& s : mcp_servers_) {
+ auto* item = new QListWidgetItem(mcp_list_);
+ item->setText(QString("%1\n %2 | %3 tools")
+ .arg(s.name, s.status).arg(s.tools_count));
+ item->setData(Qt::UserRole, s.name);
+ if (s.status == "connected")
+ item->setForeground(QColor(ui::colors::POSITIVE()));
+ else if (s.status == "error")
+ item->setForeground(QColor(ui::colors::NEGATIVE()));
+ else
+ item->setForeground(QColor(ui::colors::TEXT_SECONDARY()));
+ }
+ });
+}
+
+void ChatAgentPanel::refresh_monitors() {
+ ChatModeService::instance().list_monitors(
+ [this](bool ok, QVector<AgentMonitor> monitors, QString err) {
+ monitor_list_->clear();
+ if (!ok) {
+ auto* item = new QListWidgetItem("Not available.");
+ item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+ monitor_list_->addItem(item);
+ LOG_WARN("ChatAgentPanel", "Monitors load failed: " + err);
+ return;
+ }
+ monitors_ = std::move(monitors);
+ if (monitors_.isEmpty()) {
+ auto* item = new QListWidgetItem("No monitors configured.");
+ item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+ monitor_list_->addItem(item);
+ return;
+ }
+ for (const auto& m : monitors_) {
+ auto* item = new QListWidgetItem(monitor_list_);
+ const QString icon = (m.status == "active") ? ">" : "||";
+ item->setText(QString("%1 %2\n %3 | %4s")
+ .arg(icon, m.name, m.source_type)
+ .arg(m.check_interval_seconds));
+ item->setData(Qt::UserRole, m.monitor_id);
+ item->setData(Qt::UserRole + 1, m.status);
+ if (m.status == "active")
+ item->setForeground(QColor(ui::colors::POSITIVE()));
}
});
}
@@ -296,26 +497,22 @@ void ChatAgentPanel::refresh_tasks() {
void ChatAgentPanel::on_add_memory() {
bool ok = false;
const QString key = QInputDialog::getText(
- this, "Add Memory", "Key (e.g. risk_tolerance):", QLineEdit::Normal, {}, &ok);
+ this, "Add Memory", "Key:", 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);
+ this, "Type", "Memory 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;
- }
+ if (!saved_ok) LOG_WARN("ChatAgentPanel", "Save memory failed: " + err);
refresh_memory();
});
}
@@ -325,7 +522,7 @@ void ChatAgentPanel::on_delete_memory() {
if (!item) return;
const QString key = item->data(Qt::UserRole).toString();
if (QMessageBox::question(this, "Delete Memory",
- QString("Delete memory entry \"%1\"?").arg(key),
+ QString("Delete \"%1\"?").arg(key),
QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes)
return;
ChatModeService::instance().delete_memory(
@@ -336,8 +533,8 @@ void ChatAgentPanel::on_delete_memory() {
}
void ChatAgentPanel::on_clear_all_memory() {
- if (QMessageBox::question(this, "Clear All Memory",
- "Delete ALL agent memory entries? This cannot be undone.",
+ if (QMessageBox::question(this, "Clear Memory",
+ "Delete ALL memory entries?",
QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes)
return;
ChatModeService::instance().clear_all_memory(
@@ -352,22 +549,18 @@ void ChatAgentPanel::on_clear_all_memory() {
void ChatAgentPanel::on_add_schedule() {
bool ok = false;
const QString query = QInputDialog::getText(
- this, "New Schedule", "Query to run:", QLineEdit::Normal, {}, &ok);
+ this, "New Schedule", "Query:", 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):",
+ this, "New Schedule", "Cron (e.g. 0 9 * * 1-5):",
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;
- }
+ if (!created_ok) LOG_WARN("ChatAgentPanel", "Create schedule failed: " + err);
refresh_schedules();
});
}
@@ -375,9 +568,9 @@ void ChatAgentPanel::on_add_schedule() {
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) {
+ item->data(Qt::UserRole).toString(),
+ [this](bool ok, QString err) {
if (!ok) LOG_WARN("ChatAgentPanel", "Delete schedule failed: " + err);
refresh_schedules();
});
@@ -388,37 +581,242 @@ void ChatAgentPanel::on_toggle_schedule() {
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();
- });
- }
+ auto cb = [this](bool ok, QString err) {
+ if (!ok) LOG_WARN("ChatAgentPanel", "Toggle schedule failed: " + err);
+ refresh_schedules();
+ };
+ if (status == "active")
+ ChatModeService::instance().pause_schedule(id, cb);
+ else
+ ChatModeService::instance().resume_schedule(id, cb);
}
// ── Task actions ──────────────────────────────────────────────────────────────
-void ChatAgentPanel::on_refresh_tasks() {
- refresh_tasks();
-}
+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) {
+ item->data(Qt::UserRole).toString(),
+ [this](bool ok, QString err) {
if (!ok) LOG_WARN("ChatAgentPanel", "Cancel task failed: " + err);
refresh_tasks();
});
}
+void ChatAgentPanel::on_view_task_detail() {
+ auto* item = task_list_->currentItem();
+ if (!item) return;
+ ChatModeService::instance().get_task(
+ item->data(Qt::UserRole).toString(),
+ [this](bool ok, AgentTask task, QString err) {
+ if (!ok) { QMessageBox::warning(this, "Task", "Failed: " + err); return; }
+ QString info = QString(
+ "ID: %1\nQuery: %2\nStatus: %3\n"
+ "Created: %4\nStarted: %5\nCompleted: %6\n\n"
+ "Result:\n%7")
+ .arg(task.task_id, task.query, task.status,
+ task.created_at, task.started_at, task.completed_at,
+ task.result.isEmpty() ? "(none)" : task.result.left(2000));
+ QMessageBox::information(this, "Task Detail", info);
+ });
+}
+
+void ChatAgentPanel::on_send_feedback() {
+ auto* item = task_list_->currentItem();
+ if (!item) return;
+ bool ok = false;
+ const QString feedback = QInputDialog::getText(
+ this, "Task Feedback", "Feedback:", QLineEdit::Normal, {}, &ok);
+ if (!ok || feedback.trimmed().isEmpty()) return;
+
+ ChatModeService::instance().send_task_feedback(
+ item->data(Qt::UserRole).toString(), feedback.trimmed(),
+ [this](bool sent_ok, QString err) {
+ if (!sent_ok) LOG_WARN("ChatAgentPanel", "Feedback failed: " + err);
+ else QMessageBox::information(this, "Feedback", "Sent.");
+ });
+}
+
+// ── MCP Server actions ────────────────────────────────────────────────────────
+
+void ChatAgentPanel::on_add_mcp_server() {
+ bool ok = false;
+ const QString name = QInputDialog::getText(
+ this, "Add MCP Server", "Name:", QLineEdit::Normal, {}, &ok);
+ if (!ok || name.trimmed().isEmpty()) return;
+
+ const QStringList transports = {"stdio", "sse"};
+ const QString transport = QInputDialog::getItem(
+ this, "Transport", "Type:", transports, 0, false, &ok);
+ if (!ok) return;
+
+ QJsonObject config;
+ config["transport"] = transport;
+
+ if (transport == "stdio") {
+ const QString command = QInputDialog::getText(
+ this, "Command", "Command (e.g. uvx, npx):",
+ QLineEdit::Normal, "uvx", &ok);
+ if (!ok || command.trimmed().isEmpty()) return;
+
+ const QString args_str = QInputDialog::getText(
+ this, "Arguments", "Args (space-separated):",
+ QLineEdit::Normal, {}, &ok);
+ if (!ok) return;
+
+ config["command"] = command.trimmed();
+ QJsonArray args;
+ for (const auto& a : args_str.split(' ', Qt::SkipEmptyParts))
+ args.append(a.trimmed());
+ config["args"] = args;
+ } else {
+ const QString url = QInputDialog::getText(
+ this, "SSE URL", "URL:", QLineEdit::Normal, {}, &ok);
+ if (!ok || url.trimmed().isEmpty()) return;
+ config["url"] = url.trimmed();
+ }
+
+ ChatModeService::instance().add_mcp_server(
+ name.trimmed(), config,
+ [this](bool added_ok, McpServer srv, QString err) {
+ if (!added_ok) {
+ QMessageBox::warning(this, "MCP Server", "Failed: " + err);
+ return;
+ }
+ if (srv.status == "error")
+ QMessageBox::warning(this, "MCP Server",
+ QString("'%1' added with errors.").arg(srv.name));
+ refresh_mcp_servers();
+ });
+}
+
+void ChatAgentPanel::on_delete_mcp_server() {
+ auto* item = mcp_list_->currentItem();
+ if (!item) return;
+ const QString name = item->data(Qt::UserRole).toString();
+ if (QMessageBox::question(this, "Remove Server",
+ QString("Remove \"%1\"?").arg(name),
+ QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes)
+ return;
+ ChatModeService::instance().delete_mcp_server(
+ name, [this](bool ok, QString err) {
+ if (!ok) LOG_WARN("ChatAgentPanel", "Delete MCP server failed: " + err);
+ refresh_mcp_servers();
+ });
+}
+
+void ChatAgentPanel::on_refresh_mcp_servers() {
+ ChatModeService::instance().refresh_mcp_servers(
+ [this](bool ok, QVector<McpServer> servers, int total_tools, QString err) {
+ if (!ok) { LOG_WARN("ChatAgentPanel", "Refresh MCP failed: " + err); return; }
+ mcp_servers_ = std::move(servers);
+ mcp_list_->clear();
+ mcp_tools_lbl_->setText(
+ QString("%1 server(s) | %2 tools")
+ .arg(mcp_servers_.size()).arg(total_tools));
+ if (mcp_servers_.isEmpty()) {
+ auto* item = new QListWidgetItem("No servers connected.");
+ item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+ mcp_list_->addItem(item);
+ return;
+ }
+ for (const auto& s : mcp_servers_) {
+ auto* item = new QListWidgetItem(mcp_list_);
+ item->setText(QString("%1\n %2 | %3 tools")
+ .arg(s.name, s.status).arg(s.tools_count));
+ item->setData(Qt::UserRole, s.name);
+ if (s.status == "connected")
+ item->setForeground(QColor(ui::colors::POSITIVE()));
+ else if (s.status == "error")
+ item->setForeground(QColor(ui::colors::NEGATIVE()));
+ else
+ item->setForeground(QColor(ui::colors::TEXT_SECONDARY()));
+ }
+ });
+}
+
+// ── Monitor actions ───────────────────────────────────────────────────────────
+
+void ChatAgentPanel::on_add_monitor() {
+ bool ok = false;
+ const QString name = QInputDialog::getText(
+ this, "New Monitor", "Name:", QLineEdit::Normal, {}, &ok);
+ if (!ok || name.trimmed().isEmpty()) return;
+
+ const QStringList types = {"equity", "macro", "news"};
+ const QString source_type = QInputDialog::getItem(
+ this, "Source", "Data source:", types, 0, false, &ok);
+ if (!ok) return;
+
+ const QString analysis = QInputDialog::getText(
+ this, "Analysis", "What should the agent analyze?:",
+ QLineEdit::Normal, {}, &ok);
+ if (!ok || analysis.trimmed().isEmpty()) return;
+
+ const int interval = QInputDialog::getInt(
+ this, "Interval", "Check interval (seconds):", 300, 60, 86400, 60, &ok);
+ if (!ok) return;
+
+ QJsonObject source_config;
+ if (source_type == "equity") {
+ const QString sym = QInputDialog::getText(this, "Symbol", "Symbol:", QLineEdit::Normal, {}, &ok);
+ if (!ok || sym.trimmed().isEmpty()) return;
+ source_config["symbol"] = sym.trimmed();
+ } else if (source_type == "macro") {
+ const QString ind = QInputDialog::getText(this, "Indicator", "Indicator:", QLineEdit::Normal, {}, &ok);
+ if (!ok || ind.trimmed().isEmpty()) return;
+ source_config["indicator"] = ind.trimmed();
+ } else {
+ const QString q = QInputDialog::getText(this, "Query", "News query:", QLineEdit::Normal, {}, &ok);
+ if (!ok || q.trimmed().isEmpty()) return;
+ source_config["query"] = q.trimmed();
+ }
+
+ QJsonObject trigger_config;
+ const QString cond = QInputDialog::getText(
+ this, "Trigger", "Condition:", QLineEdit::Normal, "any", &ok);
+ if (!ok) return;
+ trigger_config["condition"] = cond;
+
+ ChatModeService::instance().create_monitor(
+ name.trimmed(), source_type, source_config, trigger_config,
+ analysis.trimmed(), interval, {},
+ [this](bool created_ok, AgentMonitor, QString err) {
+ if (!created_ok) QMessageBox::warning(this, "Monitor", "Failed: " + err);
+ refresh_monitors();
+ });
+}
+
+void ChatAgentPanel::on_delete_monitor() {
+ auto* item = monitor_list_->currentItem();
+ if (!item) return;
+ if (QMessageBox::question(this, "Delete Monitor", "Delete?",
+ QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes)
+ return;
+ ChatModeService::instance().delete_monitor(
+ item->data(Qt::UserRole).toString(),
+ [this](bool ok, QString err) {
+ if (!ok) LOG_WARN("ChatAgentPanel", "Delete monitor failed: " + err);
+ refresh_monitors();
+ });
+}
+
+void ChatAgentPanel::on_toggle_monitor() {
+ auto* item = monitor_list_->currentItem();
+ if (!item) return;
+ const QString id = item->data(Qt::UserRole).toString();
+ const QString status = item->data(Qt::UserRole + 1).toString();
+ auto cb = [this](bool ok, QString err) {
+ if (!ok) LOG_WARN("ChatAgentPanel", "Toggle monitor failed: " + err);
+ refresh_monitors();
+ };
+ if (status == "active")
+ ChatModeService::instance().pause_monitor(id, cb);
+ else
+ ChatModeService::instance().resume_monitor(id, cb);
+}
+
} // namespace fincept::chat_mode
diff --git a/fincept-qt/src/screens/chat_mode/ChatAgentPanel.h b/fincept-qt/src/screens/chat_mode/ChatAgentPanel.h
index f4c6d0e71..675ec6c57 100644
--- a/fincept-qt/src/screens/chat_mode/ChatAgentPanel.h
+++ b/fincept-qt/src/screens/chat_mode/ChatAgentPanel.h
@@ -11,7 +11,7 @@
namespace fincept::chat_mode {
-/// Right panel — tabs for Memory, Schedules, Tasks.
+/// Right panel — tabs for Memory, Schedules, Tasks, MCP Servers, Monitors.
class ChatAgentPanel : public QWidget {
Q_OBJECT
public:
@@ -20,6 +20,8 @@ class ChatAgentPanel : public QWidget {
void refresh_memory();
void refresh_schedules();
void refresh_tasks();
+ void refresh_mcp_servers();
+ void refresh_monitors();
private slots:
void on_tab_changed(int index);
@@ -37,6 +39,18 @@ class ChatAgentPanel : public QWidget {
// Tasks
void on_refresh_tasks();
void on_cancel_task();
+ void on_view_task_detail();
+ void on_send_feedback();
+
+ // MCP Servers
+ void on_add_mcp_server();
+ void on_delete_mcp_server();
+ void on_refresh_mcp_servers();
+
+ // Monitors
+ void on_add_monitor();
+ void on_delete_monitor();
+ void on_toggle_monitor();
private:
QTabBar* tab_bar_ = nullptr;
@@ -58,18 +72,37 @@ class ChatAgentPanel : public QWidget {
QListWidget* task_list_ = nullptr;
QPushButton* task_refresh_btn_ = nullptr;
QPushButton* task_cancel_btn_ = nullptr;
+ QPushButton* task_detail_btn_ = nullptr;
+ QPushButton* task_feedback_btn_ = nullptr;
QLabel* task_status_lbl_ = nullptr;
+ // MCP Servers tab
+ QListWidget* mcp_list_ = nullptr;
+ QPushButton* mcp_add_btn_ = nullptr;
+ QPushButton* mcp_del_btn_ = nullptr;
+ QPushButton* mcp_refresh_btn_ = nullptr;
+ QLabel* mcp_tools_lbl_ = nullptr;
+
+ // Monitors tab
+ QListWidget* monitor_list_ = nullptr;
+ QPushButton* mon_add_btn_ = nullptr;
+ QPushButton* mon_del_btn_ = nullptr;
+ QPushButton* mon_toggle_btn_ = nullptr;
+
QVector<AgentMemory> memories_;
QVector<AgentSchedule> schedules_;
QVector<AgentTask> tasks_;
+ QVector<McpServer> mcp_servers_;
+ QVector<AgentMonitor> monitors_;
void build_ui();
QWidget* build_memory_tab();
QWidget* build_schedules_tab();
QWidget* build_tasks_tab();
+ QWidget* build_mcp_tab();
+ QWidget* build_monitors_tab();
- static QPushButton* make_action_btn(const QString& text, const QString& tooltip);
+ static QPushButton* make_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
index 4ea1cb51a..2b16e0224 100644
--- a/fincept-qt/src/screens/chat_mode/ChatMessagePanel.cpp
+++ b/fincept-qt/src/screens/chat_mode/ChatMessagePanel.cpp
@@ -1,52 +1,76 @@
#include "screens/chat_mode/ChatMessagePanel.h"
#include "screens/chat_mode/ChatModeService.h"
#include "ui/markdown/MarkdownRenderer.h"
+#include "ui/theme/Theme.h"
+#include <algorithm>
#include <QEvent>
#include <QHBoxLayout>
#include <QKeyEvent>
+#include <QLocale>
+#include <QPalette>
#include <QScrollBar>
#include <QSizePolicy>
-#include <QTimer>
namespace fincept::chat_mode {
-// ── Stylesheet constants ──────────────────────────────────────────────────────
+static constexpr const char* FONT = "'Consolas','Courier New',monospace";
-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 QString user_bubble_ss() {
+ return QString(
+ "background:rgba(120,53,15,0.35);color:%1;border:1px solid rgba(217,119,6,0.2);"
+ "border-radius:0px;padding:8px 12px;font-size:14px;"
+ "font-family:'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_PRIMARY);
+}
-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 QString ai_bubble_ss() {
+ return QString(
+ "background:%1;color:%2;border:1px solid %3;"
+ "border-radius:0px;padding:8px 12px;font-size:14px;"
+ "font-family:'Consolas','Courier New',monospace;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM);
+}
-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;";
+static QString error_bubble_ss() {
+ return QString(
+ "background:rgba(50,12,12,0.7);color:%1;border:1px solid rgba(220,38,38,0.2);"
+ "border-radius:0px;padding:8px 12px;font-size:13px;"
+ "font-family:'Consolas','Courier New',monospace;")
+ .arg(ui::colors::NEGATIVE);
+}
-// ── Constructor ───────────────────────────────────────────────────────────────
+static void apply_obsidian_palette(QTextEdit* edit) {
+ QPalette p = edit->palette();
+ p.setColor(QPalette::Link, QColor(ui::colors::AMBER()));
+ p.setColor(QPalette::LinkVisited, QColor(ui::colors::AMBER()));
+ p.setColor(QPalette::Highlight, QColor(ui::colors::AMBER_DIM()));
+ p.setColor(QPalette::HighlightedText, QColor(ui::colors::TEXT_PRIMARY()));
+ p.setColor(QPalette::Base, Qt::transparent);
+ p.setColor(QPalette::Text, QColor(ui::colors::TEXT_PRIMARY()));
+ edit->setPalette(p);
+}
ChatMessagePanel::ChatMessagePanel(QWidget* parent) : QWidget(parent) {
build_ui();
-}
-// ── Build UI ──────────────────────────────────────────────────────────────────
+ render_timer_ = new QTimer(this);
+ render_timer_->setSingleShot(true);
+ render_timer_->setInterval(120);
+ connect(render_timer_, &QTimer::timeout, this, [this]() {
+ if (!streaming_bubble_ || streaming_buffer_.isEmpty()) return;
+ streaming_bubble_->setHtml(ui::MarkdownRenderer::render(streaming_buffer_));
+ resize_bubble(streaming_bubble_);
+ render_dirty_ = false;
+ if (!scroll_locked_) scroll_to_bottom();
+ });
+}
void ChatMessagePanel::build_ui() {
- setStyleSheet("background:#080808;");
+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
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());
@@ -55,29 +79,44 @@ void ChatMessagePanel::build_ui() {
QWidget* ChatMessagePanel::build_header() {
auto* hdr = new QWidget;
- hdr->setFixedHeight(40);
- hdr->setStyleSheet("background:#0a0a0a;border-bottom:1px solid #1a1a1a;");
+ hdr->setFixedHeight(34);
+ hdr->setStyleSheet(QString("background:%1;border-bottom:1px solid %2;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* hl = new QHBoxLayout(hdr);
- hl->setContentsMargins(16, 0, 16, 0);
- hl->setSpacing(8);
+ hl->setContentsMargins(14, 0, 14, 0);
+ hl->setSpacing(10);
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;");
+ QString("color:%1;font-size:14px;font-weight:600;"
+ "font-family:%2;background:transparent;")
+ .arg(ui::colors::TEXT_PRIMARY, FONT));
hl->addWidget(hdr_title_lbl_);
-
hl->addStretch();
- // Mode toggle button
+ hdr_credits_lbl_ = new QLabel;
+ hdr_credits_lbl_->setStyleSheet(
+ QString("color:%1;font-size:12px;font-weight:600;"
+ "font-family:%2;background:transparent;")
+ .arg(ui::colors::CYAN, FONT));
+ hl->addWidget(hdr_credits_lbl_);
+
+ hdr_tools_lbl_ = new QLabel;
+ hdr_tools_lbl_->setStyleSheet(
+ QString("color:%1;font-size:12px;font-family:%2;background:transparent;")
+ .arg(ui::colors::TEXT_TERTIARY, FONT));
+ hl->addWidget(hdr_tools_lbl_);
+
mode_btn_ = new QPushButton("LITE");
mode_btn_->setFixedHeight(22);
- mode_btn_->setToolTip("Toggle between Lite (fast) and Deep (multi-step) mode");
+ mode_btn_->setToolTip("Toggle Lite / Deep 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;}");
+ QString("QPushButton{background:%1;color:%2;border:1px solid %3;"
+ "border-radius:0px;font-size:11px;font-weight:600;padding:0 10px;"
+ "font-family:%4;letter-spacing:0.5px;}"
+ "QPushButton:hover{background:%5;border-color:%2;}")
+ .arg(ui::colors::BG_RAISED, ui::colors::AMBER, ui::colors::BORDER_MED,
+ FONT, ui::colors::BG_HOVER));
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");
@@ -87,8 +126,8 @@ QWidget* ChatMessagePanel::build_header() {
hdr_tokens_lbl_ = new QLabel("0 tokens");
hdr_tokens_lbl_->setStyleSheet(
- "color:#404040;font-size:11px;font-family:'Consolas',monospace;"
- "background:transparent;");
+ QString("color:%1;font-size:12px;font-family:%2;background:transparent;")
+ .arg(ui::colors::TEXT_DIM, FONT));
hl->addWidget(hdr_tokens_lbl_);
return hdr;
@@ -98,21 +137,23 @@ 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;}");
+ scroll_area_->setStyleSheet(QString(
+ "QScrollArea{background:%1;border:none;}"
+ "QScrollBar:vertical{background:transparent;width:4px;margin:2px;}"
+ "QScrollBar::handle:vertical{background:%2;border-radius:0px;min-height:30px;}"
+ "QScrollBar::handle:vertical:hover{background:%3;}"
+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")
+ .arg(ui::colors::BG_BASE, ui::colors::BORDER_MED, ui::colors::BORDER_BRIGHT));
messages_container_ = new QWidget;
- messages_container_->setStyleSheet("background:#080808;");
+ messages_container_->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
messages_layout_ = new QVBoxLayout(messages_container_);
- messages_layout_->setContentsMargins(16, 12, 16, 12);
- messages_layout_->setSpacing(12);
- messages_layout_->addStretch(1);
+ messages_layout_->setContentsMargins(14, 10, 14, 10);
+ messages_layout_->setSpacing(10);
welcome_panel_ = build_welcome();
- messages_layout_->insertWidget(0, welcome_panel_);
+ messages_layout_->addWidget(welcome_panel_);
+ messages_layout_->addStretch(1);
scroll_area_->setWidget(messages_container_);
return scroll_area_;
@@ -121,153 +162,180 @@ QWidget* ChatMessagePanel::build_messages_area() {
QWidget* ChatMessagePanel::build_welcome() {
auto* w = new QWidget;
auto* vl = new QVBoxLayout(w);
- vl->setContentsMargins(32, 40, 32, 40);
- vl->setSpacing(16);
+ vl->setContentsMargins(14, 40, 14, 40);
+ vl->setSpacing(14);
vl->setAlignment(Qt::AlignCenter);
- auto* logo = new QLabel("◈ FINCEPT AGENT");
+ 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;");
+ QString("color:%1;font-size:20px;font-weight:700;letter-spacing:1px;"
+ "font-family:%2;background:transparent;")
+ .arg(ui::colors::AMBER, FONT));
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.");
+ auto* sub = new QLabel("AI-powered financial intelligence.\n"
+ "Markets, equities, portfolio, macro 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;");
+ QString("color:%1;font-size:13px;font-family:%2;background:transparent;")
+ .arg(ui::colors::TEXT_TERTIARY, FONT));
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?"
+ const QStringList chips = {
+ "Outlook for AAPL?", "Today's market news",
+ "Portfolio risk analysis", "Key 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);
+ auto* row = new QWidget;
+ auto* rl = new QHBoxLayout(row);
+ rl->setContentsMargins(0, 8, 0, 0);
+ rl->setSpacing(6);
+ rl->setAlignment(Qt::AlignCenter);
+ for (const auto& text : chips) {
+ auto* btn = new QPushButton(text);
+ btn->setStyleSheet(
+ QString("QPushButton{background:%1;color:%2;border:1px solid %3;"
+ "border-radius:0px;padding:6px 12px;font-size:12px;"
+ "font-family:%4;}"
+ "QPushButton:hover{background:%5;color:%6;border-color:%7;}")
+ .arg(ui::colors::BG_RAISED, ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM,
+ FONT, ui::colors::BG_HOVER, ui::colors::TEXT_PRIMARY, ui::colors::AMBER));
+ connect(btn, &QPushButton::clicked, this, [this, text]() {
+ input_box_->setPlainText(text);
on_send_clicked();
});
- chips_layout->addWidget(chip);
+ rl->addWidget(btn);
}
- vl->addWidget(chips_row);
-
+ vl->addWidget(row);
return w;
}
QWidget* ChatMessagePanel::build_typing_indicator() {
typing_indicator_ = new QWidget;
- typing_indicator_->setFixedHeight(28);
- typing_indicator_->setStyleSheet("background:#080808;");
+ typing_indicator_->setFixedHeight(26);
+ typing_indicator_->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
typing_indicator_->setVisible(false);
auto* hl = new QHBoxLayout(typing_indicator_);
- hl->setContentsMargins(16, 4, 16, 4);
+ hl->setContentsMargins(14, 4, 14, 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);
+ auto* lbl = new QLabel("Agent");
+ lbl->setStyleSheet(QString("color:%1;font-size:12px;font-weight:600;"
+ "font-family:%2;background:transparent;")
+ .arg(ui::colors::AMBER, FONT));
+ hl->addWidget(lbl);
- typing_dots_lbl_ = new QLabel("●");
+ typing_dots_lbl_ = new QLabel(".");
typing_dots_lbl_->setStyleSheet(
- "color:#d97706;font-size:11px;background:transparent;");
+ QString("color:%1;font-size:12px;background:transparent;font-family:%2;")
+ .arg(ui::colors::AMBER, FONT));
hl->addWidget(typing_dots_lbl_);
+
+ typing_status_lbl_ = new QLabel;
+ typing_status_lbl_->setStyleSheet(
+ QString("color:%1;font-size:11px;background:transparent;font-family:%2;")
+ .arg(ui::colors::TEXT_DIM, FONT));
+ hl->addWidget(typing_status_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;");
+ container->setStyleSheet(QString("background:%1;border-top:1px solid %2;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* vl = new QVBoxLayout(container);
- vl->setContentsMargins(16, 8, 16, 12);
+ vl->setContentsMargins(14, 8, 14, 10);
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_->setPlaceholderText("Ask anything... (Enter to send, Shift+Enter for new line)");
+ input_box_->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+ input_box_->setFixedHeight(36);
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;}");
+ QString("QPlainTextEdit{background:%1;color:%2;border:1px solid %3;"
+ "border-radius:0px;padding:6px 12px;font-size:14px;font-family:%4;}"
+ "QPlainTextEdit:focus{border:1px solid %5;}"
+ "QScrollBar:vertical{background:%1;width:4px;}"
+ "QScrollBar::handle:vertical{background:%6;}"
+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")
+ .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM,
+ FONT, ui::colors::BORDER_BRIGHT, ui::colors::BORDER_MED));
input_box_->installEventFilter(this);
vl->addWidget(input_box_);
- // Bottom row: char count + buttons
- auto* bottom_row = new QHBoxLayout;
- bottom_row->setSpacing(6);
+ auto* bottom = new QHBoxLayout;
+ bottom->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();
+ QString("color:%1;font-size:11px;font-family:%2;background:transparent;")
+ .arg(ui::colors::TEXT_DIM, FONT));
+ bottom->addWidget(char_lbl_);
+ bottom->addStretch();
connect(input_box_, &QPlainTextEdit::textChanged, this, [this]() {
- const int n = input_box_->toPlainText().length();
- char_lbl_->setText(QString("%1 / 4000").arg(n));
+ const QString text = input_box_->toPlainText();
+ char_lbl_->setText(QString("%1 / 4000").arg(text.length()));
+ if (text.isEmpty()) {
+ input_box_->setFixedHeight(36);
+ return;
+ }
+ auto* doc = input_box_->document();
+ doc->setTextWidth(input_box_->viewport()->width());
+ const int need = static_cast<int>(doc->size().height()) + 16;
+ const int h = (need < 36) ? 36 : (need > 160) ? 160 : need;
+ if (input_box_->height() != h)
+ input_box_->setFixedHeight(h);
});
- stop_btn_ = new QPushButton("■ Stop");
- stop_btn_->setFixedHeight(30);
+ optimize_btn_ = new QPushButton("Optimize");
+ optimize_btn_->setFixedHeight(26);
+ optimize_btn_->setToolTip("Optimize prompt with AI");
+ optimize_btn_->setStyleSheet(
+ QString("QPushButton{background:%1;color:%2;border:1px solid %3;"
+ "border-radius:0px;font-size:12px;padding:0 10px;font-family:%4;}"
+ "QPushButton:hover{background:%5;color:%6;border-color:%6;}"
+ "QPushButton:disabled{color:%7;border-color:%1;}")
+ .arg(ui::colors::BG_RAISED, ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM,
+ FONT, ui::colors::BG_HOVER, ui::colors::AMBER, ui::colors::BORDER_BRIGHT));
+ connect(optimize_btn_, &QPushButton::clicked, this, &ChatMessagePanel::on_optimize_clicked);
+ bottom->addWidget(optimize_btn_);
+
+ stop_btn_ = new QPushButton("Stop");
+ stop_btn_->setFixedHeight(26);
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;}");
+ QString("QPushButton{background:rgba(50,12,12,0.7);color:%1;"
+ "border:1px solid rgba(220,38,38,0.2);border-radius:0px;"
+ "font-size:12px;padding:0 12px;font-family:%2;}"
+ "QPushButton:hover{background:rgba(60,15,15,0.8);}")
+ .arg(ui::colors::NEGATIVE, FONT));
connect(stop_btn_, &QPushButton::clicked, this, []() {
- ChatModeService::instance().abort_stream(); // forward declaration needed — see note
+ ChatModeService::instance().abort_stream();
});
- bottom_row->addWidget(stop_btn_);
+ bottom->addWidget(stop_btn_);
- send_btn_ = new QPushButton("Send ↵");
- send_btn_->setFixedHeight(30);
+ send_btn_ = new QPushButton("Send");
+ send_btn_->setFixedHeight(26);
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;}");
+ QString("QPushButton{background:%1;color:%2;border:none;"
+ "border-radius:0px;font-size:12px;font-weight:600;padding:0 16px;"
+ "font-family:%3;}"
+ "QPushButton:hover{background:#b45309;}"
+ "QPushButton:disabled{background:%4;color:%5;}")
+ .arg(ui::colors::AMBER, ui::colors::BG_BASE, FONT,
+ ui::colors::BG_RAISED, ui::colors::TEXT_DIM));
connect(send_btn_, &QPushButton::clicked, this, &ChatMessagePanel::on_send_clicked);
- bottom_row->addWidget(send_btn_);
+ bottom->addWidget(send_btn_);
- vl->addLayout(bottom_row);
+ vl->addLayout(bottom);
return container;
}
@@ -286,18 +354,18 @@ void ChatMessagePanel::load_messages(const QVector<ChatMessage>& messages) {
}
void ChatMessagePanel::clear_messages() {
- // Remove all bubble widgets (leave stretch + welcome panel)
- QLayoutItem* item = nullptr;
- while ((item = messages_layout_->takeAt(messages_layout_->count() - 1))) {
+ while (messages_layout_->count() > 0) {
+ auto* item = messages_layout_->takeAt(0);
if (item->widget() && item->widget() != welcome_panel_)
item->widget()->deleteLater();
delete item;
}
- // Re-add stretch + welcome
+ messages_layout_->addWidget(welcome_panel_);
messages_layout_->addStretch(1);
show_welcome(true);
total_tokens_ = 0;
- update_tokens_label();
+ hdr_tokens_lbl_->setText("0 tokens");
+ thinking_card_ = nullptr;
}
void ChatMessagePanel::set_session_title(const QString& title) {
@@ -309,67 +377,63 @@ void ChatMessagePanel::set_stream_mode(StreamMode mode) {
mode_btn_->setText(mode == StreamMode::Lite ? "LITE" : "DEEP");
}
-// ── Message bubbles ───────────────────────────────────────────────────────────
+// ── Bubble creation ──────────────────────────────────────────────────────────
+
+void ChatMessagePanel::resize_bubble(QTextEdit* bubble) {
+ auto* doc = bubble->document();
+ const int vw = bubble->viewport()->width();
+ doc->setTextWidth(vw > 0 ? vw : 600);
+ bubble->setFixedHeight(static_cast<int>(doc->size().height()) + 20);
+}
void ChatMessagePanel::add_message_bubble(const QString& role, const QString& content,
- const QString& timestamp)
-{
+ 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);
+ apply_obsidian_palette(bubble);
+ bubble->setStyleSheet(role == "user" ? user_bubble_ss() : ai_bubble_ss());
bubble->setFrameShape(QFrame::NoFrame);
- bubble->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
+ bubble->document()->setDocumentMargin(4);
+ bubble->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
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);
+ if (role == "user")
+ bubble->setPlainText(content);
+ else
+ bubble->setHtml(ui::MarkdownRenderer::render(content));
+
+ resize_bubble(bubble);
+ QTimer::singleShot(0, bubble, [this, bubble]() { resize_bubble(bubble); });
- // Role label row
auto* row = new QWidget;
auto* row_vl = new QVBoxLayout(row);
row_vl->setContentsMargins(0, 0, 0, 0);
- row_vl->setSpacing(3);
+ row_vl->setSpacing(2);
- // Role + timestamp header
- auto* meta_row = new QHBoxLayout;
- meta_row->setSpacing(6);
+ auto* meta = new QHBoxLayout;
+ meta->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);
+ QString("color:%1;font-size:11px;font-weight:600;font-family:%2;"
+ "background:transparent;letter-spacing:0.5px;")
+ .arg(role == "user" ? QString(ui::colors::TEXT_SECONDARY()) : QString(ui::colors::AMBER()), FONT));
+ meta->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);
+ auto* ts = new QLabel(timestamp.left(16));
+ ts->setStyleSheet(QString("color:%1;font-size:11px;font-family:%2;"
+ "background:transparent;")
+ .arg(ui::colors::TEXT_DIM, FONT));
+ meta->addWidget(ts);
}
- meta_row->addStretch();
- row_vl->addLayout(meta_row);
+ meta->addStretch();
+ row_vl->addLayout(meta);
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(); });
+ const int pos = messages_layout_->count() - 1; // before stretch
+ messages_layout_->insertWidget(pos, row);
}
QTextEdit* ChatMessagePanel::add_streaming_bubble() {
@@ -377,46 +441,106 @@ QTextEdit* ChatMessagePanel::add_streaming_bubble() {
auto* bubble = new QTextEdit;
bubble->setReadOnly(true);
- bubble->setStyleSheet(AI_BUBBLE_SS);
+ apply_obsidian_palette(bubble);
+ bubble->setStyleSheet(ai_bubble_ss());
bubble->setFrameShape(QFrame::NoFrame);
- bubble->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
+ bubble->document()->setDocumentMargin(4);
+ bubble->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
bubble->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
bubble->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- bubble->setFixedHeight(44);
+ bubble->setFixedHeight(40);
- // 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->setSpacing(2);
+ auto* lbl = new QLabel("Agent");
+ lbl->setStyleSheet(
+ QString("color:%1;font-size:11px;font-weight:600;font-family:%2;"
+ "background:transparent;letter-spacing:0.5px;")
+ .arg(ui::colors::AMBER, FONT));
+ row_vl->addWidget(lbl);
row_vl->addWidget(bubble);
- const int insert_pos = messages_layout_->count() - 1;
- messages_layout_->insertWidget(insert_pos, row);
-
+ const int pos = messages_layout_->count() - 1;
+ messages_layout_->insertWidget(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);
+void ChatMessagePanel::insert_collapsed_thinking_card(int before_index) {
+ if (pending_thinking_.isEmpty() && pending_tools_.isEmpty())
+ return;
+
+ auto* card = new QWidget;
+ auto* vl = new QVBoxLayout(card);
+ vl->setContentsMargins(8, 4, 8, 4);
+ vl->setSpacing(2);
+ card->setStyleSheet(QString("background:%1;border:1px solid %2;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
+
+ QString summary;
+ if (!pending_tools_.isEmpty()) {
+ QStringList tool_names;
+ for (const auto& [name, ms] : pending_tools_)
+ tool_names.append(QString("%1 (%2ms)").arg(name).arg(ms));
+ summary = QString("> %1 thinking steps | tools: %2")
+ .arg(pending_thinking_.size())
+ .arg(tool_names.join(", "));
+ } else {
+ summary = QString("> %1 thinking steps").arg(pending_thinking_.size());
+ }
+
+ auto* header = new QPushButton(summary);
+ header->setCursor(Qt::PointingHandCursor);
+ header->setStyleSheet(
+ QString("QPushButton{background:transparent;color:%1;border:none;"
+ "font-size:11px;font-family:%2;text-align:left;padding:2px 0;}"
+ "QPushButton:hover{color:%3;}")
+ .arg(ui::colors::TEXT_TERTIARY, FONT, ui::colors::TEXT_SECONDARY));
+ vl->addWidget(header);
+
+ auto* detail = new QWidget;
+ detail->setVisible(false);
+ auto* dvl = new QVBoxLayout(detail);
+ dvl->setContentsMargins(4, 4, 0, 0);
+ dvl->setSpacing(1);
+
+ // Merge thinking chunks into one block
+ const QString merged = pending_thinking_.join(" ").left(1000);
+ auto* thought = new QLabel(merged);
+ thought->setWordWrap(true);
+ thought->setStyleSheet(
+ QString("color:%1;font-size:11px;font-style:italic;"
+ "font-family:%2;background:transparent;")
+ .arg(ui::colors::TEXT_DIM, FONT));
+ dvl->addWidget(thought);
+
+ for (const auto& [name, ms] : pending_tools_) {
+ auto* line = new QLabel(QString(":: %1 %2ms").arg(name).arg(ms));
+ line->setStyleSheet(
+ QString("color:%1;font-size:11px;font-family:%2;"
+ "background:transparent;")
+ .arg(ui::colors::AMBER, FONT));
+ dvl->addWidget(line);
+ }
+ vl->addWidget(detail);
+
+ connect(header, &QPushButton::clicked, this, [detail]() {
+ detail->setVisible(!detail->isVisible());
+ });
+
+ // Insert before the agent bubble (or at end if index unknown)
+ const int pos = (before_index >= 0) ? before_index : (messages_layout_->count() - 1);
+ messages_layout_->insertWidget(pos, card);
- const int insert_pos = messages_layout_->count() - 1;
- messages_layout_->insertWidget(insert_pos, badge, 0, Qt::AlignLeft);
+ pending_thinking_.clear();
+ pending_tools_.clear();
+ thinking_card_ = card;
}
// ── SSE slots ─────────────────────────────────────────────────────────────────
-void ChatMessagePanel::on_stream_session_meta(const QString& /*session_id*/,
- const QString& new_title)
-{
+void ChatMessagePanel::on_stream_session_meta(const QString&, const QString& new_title) {
if (!new_title.isEmpty())
set_session_title(new_title);
}
@@ -424,76 +548,108 @@ void ChatMessagePanel::on_stream_session_meta(const QString& /*session_id*/,
void ChatMessagePanel::on_stream_text_delta(const QString& text) {
if (!streaming_bubble_) return;
- // Accumulate raw markdown in buffer
streaming_buffer_ += text;
+ render_dirty_ = true;
- // Show plain text while streaming (fast, no HTML parse overhead per chunk)
- streaming_bubble_->setPlainText(streaming_buffer_);
+ if (!render_timer_->isActive())
+ render_timer_->start();
+}
- // 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));
+void ChatMessagePanel::on_stream_tool_end(const QString& tool_name, int duration_ms) {
+ pending_tools_.append({tool_name, duration_ms});
+ typing_status_lbl_->setText(QString("used %1").arg(tool_name));
+}
- scroll_to_bottom();
+void ChatMessagePanel::on_stream_step_start(int step_number) {
+ typing_status_lbl_->setText(QString("step %1").arg(step_number));
}
-void ChatMessagePanel::on_stream_tool_end(const QString& tool_name, int duration_ms) {
- append_tool_badge(tool_name, duration_ms);
+void ChatMessagePanel::on_stream_step_finish(int tokens_used) {
+ total_tokens_ += tokens_used;
+ hdr_tokens_lbl_->setText(QString("%1 tokens").arg(total_tokens_));
+}
+
+void ChatMessagePanel::on_stream_thinking(const QString& content) {
+ if (!content.isEmpty()) {
+ pending_thinking_.append(content);
+ typing_status_lbl_->setText("thinking...");
+ }
}
void ChatMessagePanel::on_stream_finish(int total_tokens) {
total_tokens_ += total_tokens;
- update_tokens_label();
+ hdr_tokens_lbl_->setText(QString("%1 tokens").arg(total_tokens_));
- // Re-render the complete streamed text as proper markdown HTML
+ render_timer_->stop();
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));
+ resize_bubble(streaming_bubble_);
+ }
+
+ // Insert collapsed thinking card between user query and agent response
+ if (!pending_thinking_.isEmpty() || !pending_tools_.isEmpty()) {
+ // Find the streaming bubble's parent row widget index
+ QWidget* bubble_row = streaming_bubble_ ? streaming_bubble_->parentWidget() : nullptr;
+ int bubble_idx = -1;
+ if (bubble_row) {
+ bubble_idx = messages_layout_->indexOf(bubble_row);
+ }
+ insert_collapsed_thinking_card(bubble_idx);
}
streaming_ = false;
streaming_bubble_ = nullptr;
streaming_buffer_.clear();
+ scroll_locked_ = false;
show_typing(false);
set_input_enabled(true);
send_btn_->setVisible(true);
+ optimize_btn_->setVisible(true);
stop_btn_->setVisible(false);
scroll_to_bottom();
}
void ChatMessagePanel::on_stream_error(const QString& message) {
+ render_timer_->stop();
streaming_ = false;
streaming_bubble_ = nullptr;
streaming_buffer_.clear();
+ scroll_locked_ = false;
+ pending_thinking_.clear();
+ pending_tools_.clear();
show_typing(false);
set_input_enabled(true);
send_btn_->setVisible(true);
+ optimize_btn_->setVisible(true);
stop_btn_->setVisible(false);
- // Show error bubble
- auto* err = new QLabel("⚠ " + message);
+ 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);
+ err->setStyleSheet(error_bubble_ss());
+ const int pos = messages_layout_->count() - 1;
+ messages_layout_->insertWidget(pos, err);
scroll_to_bottom();
}
-void ChatMessagePanel::on_stream_heartbeat() {
- // Keep-alive — nothing to do
-}
+void ChatMessagePanel::on_stream_heartbeat() {}
void ChatMessagePanel::on_insufficient_credits() {
- on_stream_error("Insufficient credits. Please top up your account to continue.");
+ on_stream_error("Insufficient credits. Top up to continue.");
+}
+
+void ChatMessagePanel::on_tools_registered(int count) {
+ hdr_tools_lbl_->setText(count > 0 ? QString("%1 tools").arg(count) : QString());
}
-// ── Send ──────────────────────────────────────────────────────────────────────
+void ChatMessagePanel::set_credits(int credits) {
+ if (credits > 0)
+ hdr_credits_lbl_->setText(
+ QString("%1 credits").arg(QLocale(QLocale::English).toString(credits)));
+ else
+ hdr_credits_lbl_->setText("0 credits");
+}
+
+// ── Send / Optimize ──────────────────────────────────────────────────────────
void ChatMessagePanel::on_send_clicked() {
const QString text = input_box_->toPlainText().trimmed();
@@ -502,22 +658,44 @@ void ChatMessagePanel::on_send_clicked() {
input_box_->clear();
streaming_ = true;
streaming_buffer_.clear();
+ scroll_locked_ = false;
+ pending_thinking_.clear();
+ pending_tools_.clear();
+ thinking_card_ = nullptr;
- // 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);
+ optimize_btn_->setVisible(false);
stop_btn_->setVisible(true);
-
streaming_bubble_ = add_streaming_bubble();
+ scroll_to_bottom();
emit send_requested(text, current_mode_);
}
-// ── Input event filter (Enter to send) ───────────────────────────────────────
+void ChatMessagePanel::on_optimize_clicked() {
+ const QString text = input_box_->toPlainText().trimmed();
+ if (text.isEmpty() || streaming_) return;
+
+ optimize_btn_->setEnabled(false);
+ optimize_btn_->setText("...");
+
+ QPointer<ChatMessagePanel> self = this;
+ ChatModeService::instance().optimize_prompt(
+ text, current_mode_ == StreamMode::Deep ? "deep" : "lite",
+ [self](bool ok, OptimizedPrompt result, QString err) {
+ if (!self) return;
+ self->optimize_btn_->setEnabled(true);
+ self->optimize_btn_->setText("Optimize");
+ if (!ok) { self->on_stream_error("Optimize failed: " + err); return; }
+ if (!result.optimized.isEmpty())
+ self->input_box_->setPlainText(result.optimized);
+ });
+}
+
+// ── Event filter ─────────────────────────────────────────────────────────────
bool ChatMessagePanel::eventFilter(QObject* obj, QEvent* ev) {
if (obj == input_box_ && ev->type() == QEvent::KeyPress) {
@@ -530,37 +708,37 @@ bool ChatMessagePanel::eventFilter(QObject* obj, QEvent* ev) {
return QWidget::eventFilter(obj, ev);
}
-// ── Helpers ───────────────────────────────────────────────────────────────────
+// ── Helpers ──────────────────────────────────────────────────────────────────
void ChatMessagePanel::scroll_to_bottom() {
- QScrollBar* sb = scroll_area_->verticalScrollBar();
- sb->setValue(sb->maximum());
+ QTimer::singleShot(10, this, [this]() {
+ auto* bar = scroll_area_->verticalScrollBar();
+ if (bar) bar->setValue(bar->maximum());
+ });
}
void ChatMessagePanel::show_welcome(bool show) {
- if (welcome_panel_)
- welcome_panel_->setVisible(show);
+ if (welcome_panel_) welcome_panel_->setVisible(show);
}
void ChatMessagePanel::show_typing(bool show) {
typing_indicator_->setVisible(show);
- if (show)
+ if (show) {
+ typing_status_lbl_->clear();
+ typing_step_ = 0;
typing_timer_->start();
- else
+ } 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]);
+ static const char* dots[] = {".", ". .", ". . ."};
+ typing_dots_lbl_->setText(QLatin1String(dots[typing_step_ % 3]));
++typing_step_;
}
diff --git a/fincept-qt/src/screens/chat_mode/ChatMessagePanel.h b/fincept-qt/src/screens/chat_mode/ChatMessagePanel.h
index e5b42e965..2331ceb1e 100644
--- a/fincept-qt/src/screens/chat_mode/ChatMessagePanel.h
+++ b/fincept-qt/src/screens/chat_mode/ChatMessagePanel.h
@@ -13,24 +13,15 @@
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:
@@ -38,52 +29,65 @@ class ChatMessagePanel : public QWidget {
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_step_start(int step_number);
+ void on_stream_step_finish(int tokens_used);
+ void on_stream_thinking(const QString& content);
void on_stream_finish(int total_tokens);
void on_stream_error(const QString& message);
void on_stream_heartbeat();
-
void on_insufficient_credits();
+ void on_tools_registered(int count);
+ void set_credits(int credits);
private slots:
void on_send_clicked();
+ void on_optimize_clicked();
void on_typing_tick();
+
+ protected:
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;
+ QLabel* hdr_title_lbl_ = nullptr;
+ QLabel* hdr_credits_lbl_ = nullptr;
+ QLabel* hdr_tools_lbl_ = nullptr;
+ QLabel* hdr_tokens_lbl_ = nullptr;
+ QPushButton* mode_btn_ = nullptr;
+
+ 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;
+ QVBoxLayout* messages_layout_ = nullptr;
+ QWidget* welcome_panel_ = nullptr;
+
+ QWidget* typing_indicator_ = nullptr;
+ QLabel* typing_dots_lbl_ = nullptr;
+ QLabel* typing_status_lbl_ = nullptr;
+ QTimer* typing_timer_ = nullptr;
+ int typing_step_ = 0;
+
+ QPlainTextEdit* input_box_ = nullptr;
+ QPushButton* send_btn_ = nullptr;
+ QPushButton* stop_btn_ = nullptr;
+ QPushButton* optimize_btn_ = nullptr;
+ QLabel* char_lbl_ = nullptr;
+
+ StreamMode current_mode_ = StreamMode::Lite;
+ bool streaming_ = false;
+ QPointer<QTextEdit> streaming_bubble_;
+ QString streaming_buffer_;
+ int total_tokens_ = 0;
+ bool scroll_locked_ = false;
+
+ QTimer* render_timer_ = nullptr;
+ bool render_dirty_ = false;
+
+ // Thinking accumulator — collapsed into one card on finish
+ QStringList pending_thinking_;
+ QVector<QPair<QString,int>> pending_tools_;
+ QWidget* thinking_card_ = nullptr;
void build_ui();
QWidget* build_header();
@@ -95,13 +99,12 @@ class ChatMessagePanel : public QWidget {
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 insert_collapsed_thinking_card(int before_index = -1);
+ void resize_bubble(QTextEdit* bubble);
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
index 347e4411a..ac7aaa495 100644
--- a/fincept-qt/src/screens/chat_mode/ChatModeScreen.cpp
+++ b/fincept-qt/src/screens/chat_mode/ChatModeScreen.cpp
@@ -1,11 +1,15 @@
#include "screens/chat_mode/ChatModeScreen.h"
+#include "core/session/ScreenStateManager.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 "screens/chat_mode/TerminalToolBridge.h"
#include "core/logging/Logger.h"
+#include "ui/theme/Theme.h"
#include <QHBoxLayout>
+#include <QHideEvent>
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
@@ -20,7 +24,7 @@ ChatModeScreen::ChatModeScreen(QWidget* parent) : QWidget(parent) {
}
void ChatModeScreen::build_ui() {
- setStyleSheet("background:#080808;");
+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
auto* hl = new QHBoxLayout(this);
hl->setContentsMargins(0, 0, 0, 0);
@@ -29,6 +33,7 @@ void ChatModeScreen::build_ui() {
session_panel_ = new ChatSessionPanel(this);
message_panel_ = new ChatMessagePanel(this);
agent_panel_ = new ChatAgentPanel(this);
+ tool_bridge_ = new TerminalToolBridge(this);
hl->addWidget(session_panel_);
hl->addWidget(message_panel_, 1);
@@ -38,7 +43,7 @@ void ChatModeScreen::build_ui() {
void ChatModeScreen::wire_signals() {
auto& svc = ChatModeService::instance();
- // Session panel → screen
+ // Session panel -> screen
connect(session_panel_, &ChatSessionPanel::session_selected,
this, &ChatModeScreen::on_session_selected);
connect(session_panel_, &ChatSessionPanel::new_session_requested,
@@ -50,17 +55,23 @@ void ChatModeScreen::wire_signals() {
connect(session_panel_, &ChatSessionPanel::exit_chat_mode_requested,
this, &ChatModeScreen::exit_requested);
- // Message panel → screen (sends a message)
+ // Message panel -> screen
connect(message_panel_, &ChatMessagePanel::send_requested,
this, &ChatModeScreen::on_send_requested);
- // SSE service → message panel
+ // 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_step_start,
+ message_panel_, &ChatMessagePanel::on_stream_step_start);
+ connect(&svc, &ChatModeService::stream_step_finish,
+ message_panel_, &ChatMessagePanel::on_stream_step_finish);
+ connect(&svc, &ChatModeService::stream_thinking,
+ message_panel_, &ChatMessagePanel::on_stream_thinking);
connect(&svc, &ChatModeService::stream_finish,
message_panel_, &ChatMessagePanel::on_stream_finish);
connect(&svc, &ChatModeService::stream_error,
@@ -70,79 +81,98 @@ void ChatModeScreen::wire_signals() {
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
+ // SSE session-meta -> refresh sidebar
connect(&svc, &ChatModeService::stream_session_meta,
- this, [this](const QString& /*id*/, const QString& new_title) {
+ this, [this](const QString&, const QString& new_title) {
if (!new_title.isEmpty())
session_panel_->refresh_sessions();
});
- // SSE finish → refresh session list (message count updated server-side)
+ // SSE finish -> refresh sidebar + credits (delayed to let backend settle)
connect(&svc, &ChatModeService::stream_finish,
- this, [this](int) { session_panel_->refresh_sessions(); });
+ this, [this](int) {
+ session_panel_->refresh_sessions();
+ QPointer<ChatModeScreen> s = this;
+ QTimer::singleShot(1500, this, [s]() {
+ if (!s) return;
+ ChatModeService::instance().get_credits(
+ [s](bool ok, int credits, QString) {
+ if (s && ok) s->message_panel_->set_credits(credits);
+ });
+ });
+ });
+
+ // Tool bridge -> message panel (shows tool count in header)
+ connect(tool_bridge_, &TerminalToolBridge::tools_registered,
+ message_panel_, &ChatMessagePanel::on_tools_registered);
}
-// ── Show event — load initial state ──────────────────────────────────────────
+// ── Show/Hide — lifecycle ────────────────────────────────────────────────────
void ChatModeScreen::showEvent(QShowEvent* e) {
QWidget::showEvent(e);
LOG_INFO("ChatModeScreen", "Entered chat mode");
session_panel_->refresh_sessions();
+ // Start tool bridge
+ tool_bridge_->start();
+
QPointer<ChatModeScreen> self = this;
- // Load stats for sidebar
+ // Load credits
+ ChatModeService::instance().get_credits(
+ [self](bool ok, int credits, QString) {
+ if (self && ok) self->message_panel_->set_credits(credits);
+ });
+
+ // Load stats
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
+ // Restore most recent session
if (active_session_uuid_.isEmpty()) {
- LOG_INFO("ChatModeScreen", "No active session — loading most recent");
+ 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));
+ if (!ok) { LOG_WARN("ChatModeScreen", "List sessions failed: " + err); return; }
+ if (sessions.isEmpty()) return;
self->on_session_selected(sessions.first().uuid);
});
- } else {
- LOG_INFO("ChatModeScreen", QString("Re-entering with active session: %1").arg(active_session_uuid_));
}
}
+void ChatModeScreen::hideEvent(QHideEvent* e) {
+ QWidget::hideEvent(e);
+ tool_bridge_->stop();
+ LOG_INFO("ChatModeScreen", "Exited chat mode");
+}
+
// ── 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);
+ fincept::ScreenStateManager::instance().notify_changed(this);
- // 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;
- }
+ if (!ok) { LOG_WARN("ChatModeScreen", "Load session failed: " + 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());
@@ -158,10 +188,7 @@ void ChatModeScreen::on_new_session() {
"New Conversation",
[self](bool ok, ChatSession session, QString err) {
if (!self) return;
- if (!ok) {
- LOG_WARN("ChatModeScreen", "Failed to create session: " + err);
- return;
- }
+ if (!ok) { LOG_WARN("ChatModeScreen", "Create session failed: " + err); return; }
self->message_panel_->clear_messages();
self->session_panel_->refresh_sessions();
self->on_session_selected(session.uuid);
@@ -173,10 +200,7 @@ void ChatModeScreen::on_delete_session(const QString& uuid) {
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 (!ok) { LOG_WARN("ChatModeScreen", "Delete failed: " + err); return; }
if (self->active_session_uuid_ == uuid)
self->active_session_uuid_.clear();
self->session_panel_->refresh_sessions();
@@ -185,10 +209,7 @@ void ChatModeScreen::on_delete_session(const QString& uuid) {
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;
- }
+ if (!list_ok || sessions.isEmpty()) { self->on_new_session(); return; }
self->on_session_selected(sessions.first().uuid);
});
});
@@ -207,7 +228,7 @@ void ChatModeScreen::on_rename_session(const QString& uuid, const QString& title
// ── Send message ──────────────────────────────────────────────────────────────
void ChatModeScreen::on_send_requested(const QString& message, StreamMode mode) {
- LOG_INFO("ChatModeScreen", QString("Send requested [%1]: \"%2\"")
+ LOG_INFO("ChatModeScreen", QString("Send [%1]: \"%2\"")
.arg(mode == StreamMode::Deep ? "deep" : "lite")
.arg(message.left(60)));
ensure_active_session([this, message, mode](const QString& uuid) {
@@ -225,10 +246,7 @@ void ChatModeScreen::ensure_active_session(std::function<void(const QString&)> t
"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;
- }
+ if (!ok) { LOG_WARN("ChatModeScreen", "Auto-create session failed: " + err); return; }
self->active_session_uuid_ = session.uuid;
self->session_panel_->refresh_sessions();
self->session_panel_->set_active_session(session.uuid);
@@ -236,4 +254,16 @@ void ChatModeScreen::ensure_active_session(std::function<void(const QString&)> t
});
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap ChatModeScreen::save_state() const {
+ return {{"session_uuid", active_session_uuid_}};
+}
+
+void ChatModeScreen::restore_state(const QVariantMap& state) {
+ const QString uuid = state.value("session_uuid").toString();
+ if (!uuid.isEmpty() && uuid != active_session_uuid_)
+ on_session_selected(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
index d737b64e4..58efa7e36 100644
--- a/fincept-qt/src/screens/chat_mode/ChatModeScreen.h
+++ b/fincept-qt/src/screens/chat_mode/ChatModeScreen.h
@@ -1,4 +1,5 @@
#pragma once
+#include "screens/IStatefulScreen.h"
#include "screens/chat_mode/ChatModeTypes.h"
#include <QWidget>
@@ -9,24 +10,32 @@ namespace fincept::chat_mode {
class ChatSessionPanel;
class ChatMessagePanel;
class ChatAgentPanel;
+class TerminalToolBridge;
/// Full-screen chat mode — replaces the entire terminal UI.
/// Layout: [ChatSessionPanel | ChatMessagePanel | ChatAgentPanel]
-class ChatModeScreen : public QWidget {
+class ChatModeScreen : public QWidget, public fincept::screens::IStatefulScreen {
Q_OBJECT
public:
explicit ChatModeScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "chat_mode"; }
+ int state_version() const override { return 1; }
+
signals:
void exit_requested();
protected:
void showEvent(QShowEvent* e) override;
+ void hideEvent(QHideEvent* e) override;
private:
- ChatSessionPanel* session_panel_ = nullptr;
- ChatMessagePanel* message_panel_ = nullptr;
- ChatAgentPanel* agent_panel_ = nullptr;
+ ChatSessionPanel* session_panel_ = nullptr;
+ ChatMessagePanel* message_panel_ = nullptr;
+ ChatAgentPanel* agent_panel_ = nullptr;
+ TerminalToolBridge* tool_bridge_ = nullptr;
QString active_session_uuid_;
diff --git a/fincept-qt/src/screens/chat_mode/ChatModeService.cpp b/fincept-qt/src/screens/chat_mode/ChatModeService.cpp
index afd7076c7..0aa289d4f 100644
--- a/fincept-qt/src/screens/chat_mode/ChatModeService.cpp
+++ b/fincept-qt/src/screens/chat_mode/ChatModeService.cpp
@@ -3,6 +3,7 @@
#include "auth/AuthManager.h"
#include "core/logging/Logger.h"
+#include <QDateTime>
#include <QJsonArray>
#include <QJsonDocument>
#include <QNetworkReply>
@@ -242,6 +243,38 @@ void ChatModeService::activate_session(const QString& uuid, VoidCallback cb)
[cb = std::move(cb)](bool ok, QJsonDocument, QString err) { cb(ok, err); });
}
+// ── Save message ──────────────────────────────────────────────────────────────
+
+void ChatModeService::save_message(const QString& session_uuid, const QString& role,
+ const QString& content, MessageCallback cb,
+ const QString& provider, const QString& model,
+ int tokens_used, int response_time_ms)
+{
+ LOG_INFO("ChatModeService", QString("Saving %1 message to session %2")
+ .arg(role, session_uuid));
+ QJsonObject body;
+ body["role"] = role;
+ body["content"] = content;
+ if (!provider.isEmpty()) body["provider"] = provider;
+ if (!model.isEmpty()) body["model"] = model;
+ if (tokens_used > 0) body["tokens_used"] = tokens_used;
+ if (response_time_ms > 0) body["response_time_ms"] = response_time_ms;
+
+ post("/chat/sessions/" + session_uuid + "/save-message", 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();
+ const QJsonObject msg_obj = data.value("message").toObject();
+ ChatMessage msg;
+ msg.uuid = msg_obj["message_uuid"].toString();
+ msg.role = msg_obj["role"].toString();
+ msg.content = msg_obj["content"].toString();
+ msg.created_at = msg_obj["created_at"].toString();
+ const QString new_title = data["new_title"].toString();
+ cb(true, msg, new_title, {});
+ });
+}
+
// ── Session utilities ─────────────────────────────────────────────────────────
void ChatModeService::get_stats(StatsCallback cb)
@@ -297,11 +330,152 @@ void ChatModeService::export_sessions(const QStringList& uuids,
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();
+ const QJsonArray data = doc.object().value("data").toObject().value("data").toArray();
cb(true, data, {});
});
}
+// ── Optimize prompt ───────────────────────────────────────────────────────────
+
+void ChatModeService::optimize_prompt(const QString& prompt, const QString& mode,
+ OptimizeCallback cb)
+{
+ LOG_INFO("ChatModeService", QString("Optimizing prompt (%1): \"%2\"")
+ .arg(mode, prompt.left(60)));
+ QJsonObject body;
+ body["prompt"] = prompt;
+ if (!mode.isEmpty()) body["mode"] = mode;
+
+ // Longer timeout for LLM calls
+ auto* reply = nam_->post(build_request("/chat/optimize-prompt"),
+ QJsonDocument(body).toJson(QJsonDocument::Compact));
+ // Override default 15s timeout — LLM needs more time
+ auto* timer = new QTimer(reply);
+ timer->setSingleShot(true);
+ timer->setInterval(45000);
+ connect(timer, &QTimer::timeout, reply, [reply]() {
+ LOG_WARN("ChatModeService", "optimize-prompt timed out");
+ reply->abort();
+ });
+ timer->start();
+
+ connect(reply, &QNetworkReply::finished, this,
+ [this, reply, cb = std::move(cb)]() mutable {
+ const int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+ const QByteArray data = reply->readAll();
+ const auto net_err = reply->error();
+ reply->deleteLater();
+
+ if (net_err != QNetworkReply::NoError &&
+ net_err != QNetworkReply::OperationCanceledError) {
+ cb(false, {}, "Optimize prompt request failed");
+ return;
+ }
+
+ QJsonParseError pe;
+ QJsonDocument doc = QJsonDocument::fromJson(data, &pe);
+ if (pe.error != QJsonParseError::NoError) {
+ cb(false, {}, "JSON parse error");
+ return;
+ }
+
+ const QJsonObject root = doc.object();
+ if (root.contains("success") && !root["success"].toBool()) {
+ cb(false, {}, root["message"].toString("Optimize failed"));
+ return;
+ }
+
+ const QJsonObject res_data = root.value("data").toObject();
+ OptimizedPrompt result;
+ result.original = res_data["original"].toString();
+
+ // Response can have optimized_prompt as array or optimized as string
+ if (res_data.contains("optimized")) {
+ result.optimized = res_data["optimized"].toString();
+ } else if (res_data.contains("optimized_prompt")) {
+ // Array format — extract the "text" type entry
+ const QJsonArray arr = res_data["optimized_prompt"].toArray();
+ for (const auto& v : arr) {
+ const QJsonObject item = v.toObject();
+ if (item["type"].toString() == "text") {
+ result.optimized = item["text"].toString();
+ break;
+ }
+ }
+ }
+
+ LOG_INFO("ChatModeService",
+ QString("Prompt optimized: %1 chars -> %2 chars")
+ .arg(result.original.length()).arg(result.optimized.length()));
+ cb(true, result, {});
+ });
+}
+
+// ── Agent chat (non-streaming) ────────────────────────────────────────────────
+
+void ChatModeService::agent_chat(const QString& query, const QString& session_id,
+ StreamMode mode, AgentChatCallback cb,
+ const QString& source, bool auto_approve)
+{
+ LOG_INFO("ChatModeService",
+ QString("Agent chat [%1]: \"%2\"")
+ .arg(mode == StreamMode::Deep ? "deep" : "lite", query.left(60)));
+
+ QJsonObject body;
+ body["query"] = query;
+ body["mode"] = (mode == StreamMode::Deep) ? "deep" : "lite";
+ body["auto_approve"] = auto_approve;
+ if (!session_id.isEmpty()) body["session_id"] = session_id;
+ if (!source.isEmpty()) body["source"] = source;
+
+ // Longer timeout for agent calls
+ auto* reply = nam_->post(build_request("/chat/agent/chat"),
+ QJsonDocument(body).toJson(QJsonDocument::Compact));
+ auto* timer = new QTimer(reply);
+ timer->setSingleShot(true);
+ timer->setInterval(120000); // 2 min for deep analysis
+ connect(timer, &QTimer::timeout, reply, [reply]() {
+ LOG_WARN("ChatModeService", "agent/chat timed out");
+ reply->abort();
+ });
+ timer->start();
+
+ connect(reply, &QNetworkReply::finished, this,
+ [this, reply, cb = std::move(cb)]() mutable {
+ const int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+ const QByteArray data = reply->readAll();
+ const auto net_err = reply->error();
+ reply->deleteLater();
+
+ if (status == 402) {
+ emit insufficient_credits();
+ cb(false, {}, "Insufficient credits");
+ return;
+ }
+
+ if (net_err != QNetworkReply::NoError &&
+ net_err != QNetworkReply::OperationCanceledError) {
+ cb(false, {}, "Agent chat request failed");
+ return;
+ }
+
+ QJsonParseError pe;
+ QJsonDocument doc = QJsonDocument::fromJson(data, &pe);
+ if (pe.error != QJsonParseError::NoError) {
+ cb(false, {}, "JSON parse error");
+ return;
+ }
+
+ const QJsonObject root = doc.object();
+ if (root.contains("success") && !root["success"].toBool()) {
+ cb(false, {}, root["message"].toString("Agent chat failed"));
+ return;
+ }
+
+ cb(true, AgentChatResponse::from_json(root), {});
+ });
+}
+
// ── Agent memory ──────────────────────────────────────────────────────────────
void ChatModeService::list_memory(MemoriesCallback cb)
@@ -441,6 +615,276 @@ void ChatModeService::send_task_feedback(const QString& task_id, const QString&
[cb = std::move(cb)](bool ok, QJsonDocument, QString err) { cb(ok, err); });
}
+void ChatModeService::get_task_history(const QString& task_id, HistoryCallback cb)
+{
+ get("/chat/agent/tasks/" + task_id + "/history",
+ [cb = std::move(cb), task_id](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { cb(false, {}, {}, {}, err); return; }
+ const QJsonObject root = doc.object();
+ const QString tid = root["task_id"].toString();
+ const QString thread = root["thread_id"].toString();
+ QVector<TaskHistoryStep> steps;
+ for (const auto& v : root["history"].toArray())
+ steps.append(TaskHistoryStep::from_json(v.toObject()));
+ cb(true, tid, thread, steps, {});
+ });
+}
+
+void ChatModeService::get_task_activity(const QString& task_id, ActivityCallback cb,
+ int after_id, int limit)
+{
+ QString path = QString("/chat/agent/tasks/%1/activity?limit=%2").arg(task_id).arg(limit);
+ if (after_id > 0)
+ path += QString("&after_id=%1").arg(after_id);
+
+ get(path, [cb = std::move(cb), task_id](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { cb(false, {}, {}, 0, err); return; }
+ const QJsonObject root = doc.object();
+ QVector<TaskActivity> events;
+ for (const auto& v : root["events"].toArray())
+ events.append(TaskActivity::from_json(v.toObject()));
+ const int count = root["count"].toInt();
+ cb(true, task_id, events, count, {});
+ });
+}
+
+// ── Task activity SSE stream ──────────────────────────────────────────────────
+
+QNetworkReply* ChatModeService::stream_task_activity(const QString& task_id, int after_id)
+{
+ abort_task_activity_stream();
+
+ const QString path = QString("/chat/agent/tasks/%1/activity/stream?after_id=%2")
+ .arg(task_id).arg(after_id);
+ QNetworkRequest req = build_request(path);
+ req.setRawHeader("Accept", "text/event-stream");
+ req.setAttribute(QNetworkRequest::CacheLoadControlAttribute,
+ QNetworkRequest::AlwaysNetwork);
+
+ task_sse_reply_ = sse_nam_->get(req);
+ task_sse_event_.clear();
+
+ connect(task_sse_reply_, &QNetworkReply::readyRead, this, [this]() {
+ while (task_sse_reply_ && task_sse_reply_->canReadLine()) {
+ const QByteArray line = task_sse_reply_->readLine().trimmed();
+ handle_task_sse_line(line);
+ }
+ });
+
+ connect(task_sse_reply_, &QNetworkReply::finished, this, [this]() {
+ if (!task_sse_reply_) return;
+ task_sse_reply_->deleteLater();
+ task_sse_reply_ = nullptr;
+ });
+
+ return task_sse_reply_;
+}
+
+void ChatModeService::abort_task_activity_stream()
+{
+ if (task_sse_reply_) {
+ task_sse_reply_->abort();
+ task_sse_reply_->deleteLater();
+ task_sse_reply_ = nullptr;
+ }
+}
+
+void ChatModeService::handle_task_sse_line(const QByteArray& line)
+{
+ if (line.startsWith("event:")) {
+ task_sse_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 QString& ev = task_sse_event_;
+ if (ev == "activity") {
+ emit task_activity_event(TaskActivity::from_json(doc.object()));
+ } else if (ev == "done") {
+ emit task_activity_done();
+ }
+
+ task_sse_event_.clear();
+ }
+}
+
+// ── Credits ──────────────────────────────────────────────────────────────────
+
+void ChatModeService::get_credits(CreditsCallback cb)
+{
+ const QString path = QString("/user/profile?_t=%1").arg(QDateTime::currentMSecsSinceEpoch());
+ get(path, [cb = std::move(cb)](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { cb(false, 0, err); return; }
+ const int credits = doc.object().value("data").toObject()
+ .value("credit_balance").toInt();
+ cb(true, credits, {});
+ });
+}
+
+// ── Terminal tool bridge ──────────────────────────────────────────────────────
+
+void ChatModeService::register_terminal_tools(const QJsonArray& tools,
+ const QString& version,
+ int tool_count,
+ RegisterCallback cb)
+{
+ LOG_INFO("ChatModeService",
+ QString("Registering %1 terminal tools (v%2)").arg(tool_count).arg(version));
+ QJsonObject body;
+ body["tools"] = tools;
+ body["terminal_version"] = version;
+ body["tool_count"] = tool_count;
+ post("/chat/agent/terminal-tools/register", body,
+ [cb = std::move(cb)](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { cb(false, 0, err); return; }
+ const int reg = doc.object()["registered"].toInt();
+ cb(true, reg, {});
+ });
+}
+
+void ChatModeService::poll_pending_calls(PendingCallsCallback cb, int limit)
+{
+ const QString path = QString("/chat/agent/terminal-tools/pending?limit=%1").arg(limit);
+ get(path, [cb = std::move(cb)](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { cb(false, {}, err); return; }
+ cb(true, doc.object()["calls"].toArray(), {});
+ });
+}
+
+void ChatModeService::submit_tool_result(const QString& call_id,
+ const QJsonObject& result,
+ VoidCallback cb)
+{
+ QJsonObject body;
+ body["call_id"] = call_id;
+ body["result"] = result;
+ post("/chat/agent/terminal-tools/result", body,
+ [cb = std::move(cb)](bool ok, QJsonDocument, QString err) { cb(ok, err); });
+}
+
+// ── MCP servers ───────────────────────────────────────────────────────────────
+
+void ChatModeService::list_mcp_servers(McpServersCallback cb)
+{
+ get("/chat/agent/mcp/servers",
+ [cb = std::move(cb)](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { cb(false, {}, 0, err); return; }
+ const QJsonObject root = doc.object();
+ QVector<McpServer> servers;
+ for (const auto& v : root["servers"].toArray())
+ servers.append(McpServer::from_json(v.toObject()));
+ const int total_tools = root["total_tools"].toInt();
+ cb(true, servers, total_tools, {});
+ });
+}
+
+void ChatModeService::add_mcp_server(const QString& name, const QJsonObject& config,
+ McpServerCallback cb)
+{
+ LOG_INFO("ChatModeService", QString("Adding MCP server: %1").arg(name));
+ QJsonObject body;
+ body["name"] = name;
+ body["config"] = config;
+ post("/chat/agent/mcp/servers", body,
+ [cb = std::move(cb), name](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { cb(false, {}, err); return; }
+ const QJsonObject root = doc.object();
+ McpServer srv;
+ srv.name = root["name"].toString(name);
+ srv.tools_count = root["tools_loaded"].toInt();
+ srv.status = root.contains("error") && !root["error"].toString().isEmpty()
+ ? "error" : "connected";
+ for (const auto& v : root["tools"].toArray())
+ srv.tools.append(McpTool::from_json(v.toObject()));
+ cb(true, srv, {});
+ });
+}
+
+void ChatModeService::delete_mcp_server(const QString& server_name, VoidCallback cb)
+{
+ del("/chat/agent/mcp/servers/" + server_name,
+ [cb = std::move(cb)](bool ok, QJsonDocument, QString err) { cb(ok, err); });
+}
+
+void ChatModeService::refresh_mcp_servers(McpServersCallback cb)
+{
+ post("/chat/agent/mcp/servers/refresh", {},
+ [cb = std::move(cb)](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { cb(false, {}, 0, err); return; }
+ const QJsonObject root = doc.object();
+ QVector<McpServer> servers;
+ for (const auto& v : root["servers"].toArray())
+ servers.append(McpServer::from_json(v.toObject()));
+ const int total_tools = root["total_tools"].toInt();
+ cb(true, servers, total_tools, {});
+ });
+}
+
+// ── Agent monitors ────────────────────────────────────────────────────────────
+
+void ChatModeService::list_monitors(MonitorsCallback cb)
+{
+ get("/chat/agent/monitors",
+ [cb = std::move(cb)](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { cb(false, {}, err); return; }
+ QVector<AgentMonitor> monitors;
+ for (const auto& v : doc.object()["monitors"].toArray())
+ monitors.append(AgentMonitor::from_json(v.toObject()));
+ cb(true, monitors, {});
+ });
+}
+
+void ChatModeService::create_monitor(const QString& name, const QString& source_type,
+ const QJsonObject& source_config,
+ const QJsonObject& trigger_config,
+ const QString& analysis_query,
+ int check_interval_seconds,
+ const QString& session_id,
+ MonitorCallback cb)
+{
+ LOG_INFO("ChatModeService", QString("Creating monitor: %1").arg(name));
+ QJsonObject body;
+ body["name"] = name;
+ body["source_type"] = source_type;
+ body["source_config"] = source_config;
+ body["trigger_config"] = trigger_config;
+ body["analysis_query"] = analysis_query;
+ body["check_interval_seconds"] = check_interval_seconds;
+ if (!session_id.isEmpty())
+ body["session_id"] = session_id;
+
+ post("/chat/agent/monitors", body,
+ [cb = std::move(cb)](bool ok, QJsonDocument doc, QString err) {
+ if (!ok) { cb(false, {}, err); return; }
+ const QJsonObject root = doc.object();
+ cb(true, AgentMonitor::from_json(root), {});
+ });
+}
+
+void ChatModeService::delete_monitor(const QString& monitor_id, VoidCallback cb)
+{
+ del("/chat/agent/monitors/" + monitor_id,
+ [cb = std::move(cb)](bool ok, QJsonDocument, QString err) { cb(ok, err); });
+}
+
+void ChatModeService::pause_monitor(const QString& monitor_id, VoidCallback cb)
+{
+ put("/chat/agent/monitors/" + monitor_id + "/pause", {},
+ [cb = std::move(cb)](bool ok, QJsonDocument, QString err) { cb(ok, err); });
+}
+
+void ChatModeService::resume_monitor(const QString& monitor_id, VoidCallback cb)
+{
+ put("/chat/agent/monitors/" + monitor_id + "/resume", {},
+ [cb = std::move(cb)](bool ok, QJsonDocument, QString err) { cb(ok, err); });
+}
+
// ── SSE streaming ─────────────────────────────────────────────────────────────
QNetworkReply* ChatModeService::stream_message(const QString& message,
@@ -549,10 +993,20 @@ void ChatModeService::handle_sse_line(const QByteArray& line)
LOG_DEBUG("ChatModeService",
QString("SSE tool-end: %1 (%2ms)").arg(tool).arg(dur));
emit stream_tool_end(tool, dur);
+ } else if (ev == "step-start") {
+ const int step = data["stepNumber"].toInt();
+ LOG_DEBUG("ChatModeService",
+ QString("SSE step-start: step %1").arg(step));
+ emit stream_step_start(step);
} 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 == "thinking") {
+ const QString content = data["content"].toString();
+ LOG_DEBUG("ChatModeService",
+ QString("SSE thinking: %1 chars").arg(content.length()));
+ emit stream_thinking(content);
} else if (ev == "finish") {
const int total = data["totalTokens"].toInt();
LOG_INFO("ChatModeService",
diff --git a/fincept-qt/src/screens/chat_mode/ChatModeService.h b/fincept-qt/src/screens/chat_mode/ChatModeService.h
index 25335a3e2..e7f7aca3e 100644
--- a/fincept-qt/src/screens/chat_mode/ChatModeService.h
+++ b/fincept-qt/src/screens/chat_mode/ChatModeService.h
@@ -31,7 +31,15 @@ class ChatModeService : public QObject {
void rename_session(const QString& uuid, const QString& title, VoidCallback cb);
void activate_session(const QString& uuid, VoidCallback cb);
- // ── Session utilities (Phase 2) ───────────────────────────────────────────
+ // ── Save message ─────────────────────────────────────────────────────────
+ using MessageCallback = std::function<void(bool ok, ChatMessage msg, QString new_title, QString error)>;
+
+ void save_message(const QString& session_uuid, const QString& role,
+ const QString& content, MessageCallback cb,
+ const QString& provider = {}, const QString& model = {},
+ int tokens_used = 0, int response_time_ms = 0);
+
+ // ── Session utilities ────────────────────────────────────────────────────
using StatsCallback = std::function<void(bool ok, ChatStats stats, QString error)>;
using SearchCallback = std::function<void(bool ok, QVector<ChatMessage> results, QString error)>;
@@ -41,6 +49,18 @@ class ChatModeService : public QObject {
void export_sessions(const QStringList& uuids,
std::function<void(bool ok, QJsonArray data, QString error)> cb);
+ // ── Optimize prompt ──────────────────────────────────────────────────────
+ using OptimizeCallback = std::function<void(bool ok, OptimizedPrompt result, QString error)>;
+
+ void optimize_prompt(const QString& prompt, const QString& mode, OptimizeCallback cb);
+
+ // ── Agent chat (non-streaming) ───────────────────────────────────────────
+ using AgentChatCallback = std::function<void(bool ok, AgentChatResponse resp, QString error)>;
+
+ void agent_chat(const QString& query, const QString& session_id,
+ StreamMode mode, AgentChatCallback cb,
+ const QString& source = {}, bool auto_approve = false);
+
// ── Agent memory ──────────────────────────────────────────────────────────
using MemoriesCallback = std::function<void(bool ok, QVector<AgentMemory> memories, QString error)>;
@@ -62,14 +82,63 @@ class ChatModeService : public QObject {
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)>;
+ using TasksCallback = std::function<void(bool ok, QVector<AgentTask> tasks, QString error)>;
+ using TaskCallback = std::function<void(bool ok, AgentTask task, QString error)>;
+ using HistoryCallback = std::function<void(bool ok, QString task_id, QString thread_id,
+ QVector<TaskHistoryStep> history, QString error)>;
+ using ActivityCallback = std::function<void(bool ok, QString task_id,
+ QVector<TaskActivity> events, int count, 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);
+ void get_task_history(const QString& task_id, HistoryCallback cb);
+ void get_task_activity(const QString& task_id, ActivityCallback cb,
+ int after_id = 0, int limit = 500);
+
+ // ── Task activity SSE stream ──────────────────────────────────────────────
+ /// Starts an SSE stream for task activity. Emits task_activity_event as events arrive.
+ /// Returns the reply for caller to manage.
+ QNetworkReply* stream_task_activity(const QString& task_id, int after_id = 0);
+ void abort_task_activity_stream();
+
+ // ── MCP servers ───────────────────────────────────────────────────────────
+ using McpServersCallback = std::function<void(bool ok, QVector<McpServer> servers,
+ int total_tools, QString error)>;
+ using McpServerCallback = std::function<void(bool ok, McpServer server, QString error)>;
+
+ void list_mcp_servers(McpServersCallback cb);
+ void add_mcp_server(const QString& name, const QJsonObject& config, McpServerCallback cb);
+ void delete_mcp_server(const QString& server_name, VoidCallback cb);
+ void refresh_mcp_servers(McpServersCallback cb);
+
+ // ── Agent monitors ────────────────────────────────────────────────────────
+ using MonitorsCallback = std::function<void(bool ok, QVector<AgentMonitor> monitors, QString error)>;
+ using MonitorCallback = std::function<void(bool ok, AgentMonitor monitor, QString error)>;
+
+ void list_monitors(MonitorsCallback cb);
+ void create_monitor(const QString& name, const QString& source_type,
+ const QJsonObject& source_config, const QJsonObject& trigger_config,
+ const QString& analysis_query, int check_interval_seconds,
+ const QString& session_id, MonitorCallback cb);
+ void delete_monitor(const QString& monitor_id, VoidCallback cb);
+ void pause_monitor(const QString& monitor_id, VoidCallback cb);
+ void resume_monitor(const QString& monitor_id, VoidCallback cb);
+
+ // ── Credits ───────────────────────────────────────────────────────────────
+ using CreditsCallback = std::function<void(bool ok, int credits, QString error)>;
+ void get_credits(CreditsCallback cb);
+
+ // ── Terminal tool bridge ─────────────────────────────────────────────────
+ using RegisterCallback = std::function<void(bool ok, int registered, QString error)>;
+ using PendingCallsCallback = std::function<void(bool ok, QJsonArray calls, QString error)>;
+
+ void register_terminal_tools(const QJsonArray& tools, const QString& version,
+ int tool_count, RegisterCallback cb);
+ void poll_pending_calls(PendingCallsCallback cb, int limit = 10);
+ void submit_tool_result(const QString& call_id, const QJsonObject& result, VoidCallback cb);
// ── SSE streaming ─────────────────────────────────────────────────────────
/// Starts a streaming agent call. Emits signals below as events arrive.
@@ -89,15 +158,21 @@ class ChatModeService : public QObject {
std::function<void(bool ok, QJsonDocument doc, QString error)> cb);
signals:
- // SSE events
+ // SSE events — agent stream
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_start(int step_number);
void stream_step_finish(int tokens_used);
+ void stream_thinking(const QString& content);
void stream_finish(int total_tokens);
void stream_error(const QString& message);
void stream_heartbeat();
+ // SSE events — task activity stream
+ void task_activity_event(const TaskActivity& event);
+ void task_activity_done();
+
// Credit error (HTTP 402)
void insufficient_credits();
@@ -122,11 +197,15 @@ class ChatModeService : public QObject {
std::function<void(bool ok, QJsonDocument doc, QString error)> cb);
void handle_sse_line(const QByteArray& line);
+ void handle_task_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
+ QNetworkReply* sse_reply_ = nullptr; // active agent SSE connection
+ QString sse_current_event_; // tracks "event:" field
+
+ QNetworkReply* task_sse_reply_ = nullptr; // active task activity SSE
+ QString task_sse_event_;
};
} // namespace fincept::chat_mode
diff --git a/fincept-qt/src/screens/chat_mode/ChatModeTypes.h b/fincept-qt/src/screens/chat_mode/ChatModeTypes.h
index 4fdee662b..0ab94f57a 100644
--- a/fincept-qt/src/screens/chat_mode/ChatModeTypes.h
+++ b/fincept-qt/src/screens/chat_mode/ChatModeTypes.h
@@ -41,6 +41,8 @@ struct ChatMessage {
QString created_at;
int tokens_used = 0;
int response_time_ms = 0;
+ QString provider;
+ QString model;
static ChatMessage from_json(const QJsonObject& o) {
ChatMessage m;
@@ -50,6 +52,8 @@ struct ChatMessage {
m.created_at = o["created_at"].toString();
m.tokens_used = o["tokens_used"].toInt();
m.response_time_ms = o["response_time_ms"].toInt();
+ m.provider = o["provider"].toString();
+ m.model = o["model"].toString();
return m;
}
};
@@ -79,6 +83,8 @@ struct AgentSchedule {
QString status; // "active" | "paused"
QString session_id;
QString created_at;
+ QString last_run_at;
+ QString next_run_at;
static AgentSchedule from_json(const QJsonObject& o) {
AgentSchedule s;
@@ -88,6 +94,8 @@ struct AgentSchedule {
s.status = o["status"].toString();
s.session_id = o["session_id"].toString();
s.created_at = o["created_at"].toString();
+ s.last_run_at = o["last_run_at"].toString();
+ s.next_run_at = o["next_run_at"].toString();
return s;
}
};
@@ -96,25 +104,64 @@ struct AgentSchedule {
struct AgentTask {
QString task_id;
QString query;
- QString status; // "queued" | "running" | "complete" | "error" | "cancelled"
+ QString status; // "queued" | "running" | "completed" | "error" | "cancelled"
QString session_id;
QString result;
QString created_at;
QString updated_at;
+ QString started_at;
+ QString completed_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();
+ 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();
+ t.started_at = o["started_at"].toString();
+ t.completed_at = o["completed_at"].toString();
return t;
}
};
+// ── Task history step ─────────────────────────────────────────────────────────
+struct TaskHistoryStep {
+ int step = 0;
+ QString timestamp;
+ QStringList next;
+
+ static TaskHistoryStep from_json(const QJsonObject& o) {
+ TaskHistoryStep h;
+ h.step = o["step"].toInt();
+ h.timestamp = o["timestamp"].toString();
+ for (const auto& v : o["next"].toArray())
+ h.next.append(v.toString());
+ return h;
+ }
+};
+
+// ── Task activity event ───────────────────────────────────────────────────────
+struct TaskActivity {
+ int id = 0;
+ QString event_type;
+ QString timestamp;
+ QJsonObject details;
+ QJsonObject data;
+
+ static TaskActivity from_json(const QJsonObject& o) {
+ TaskActivity a;
+ a.id = o["id"].toInt();
+ a.event_type = o["event_type"].toString();
+ a.timestamp = o["timestamp"].toString();
+ a.details = o["details"].toObject();
+ a.data = o["data"].toObject();
+ return a;
+ }
+};
+
// ── Chat stats ────────────────────────────────────────────────────────────────
struct ChatStats {
int total_sessions = 0;
@@ -130,4 +177,115 @@ struct ChatStats {
}
};
+// ── MCP tool ──────────────────────────────────────────────────────────────────
+struct McpTool {
+ QString name;
+ QString description;
+ QJsonObject input_schema;
+
+ static McpTool from_json(const QJsonObject& o) {
+ McpTool t;
+ t.name = o["name"].toString();
+ t.description = o["description"].toString();
+ t.input_schema = o["input_schema"].toObject();
+ return t;
+ }
+};
+
+// ── MCP server ────────────────────────────────────────────────────────────────
+struct McpServer {
+ QString name;
+ QString transport; // "stdio" | "sse"
+ QString status; // "connected" | "disconnected" | "error"
+ int tools_count = 0;
+ QStringList tool_names;
+ QVector<McpTool> tools;
+ QJsonObject config;
+
+ static McpServer from_json(const QJsonObject& o) {
+ McpServer s;
+ s.name = o["name"].toString();
+ s.transport = o["transport"].toString();
+ s.status = o["status"].toString();
+ s.tools_count = o["tools_count"].toInt();
+ s.config = o["config"].toObject();
+ for (const auto& v : o["tool_names"].toArray())
+ s.tool_names.append(v.toString());
+ for (const auto& v : o["tools"].toArray())
+ s.tools.append(McpTool::from_json(v.toObject()));
+ return s;
+ }
+};
+
+// ── Agent monitor ─────────────────────────────────────────────────────────────
+struct AgentMonitor {
+ QString monitor_id;
+ QString name;
+ QString source_type; // "equity" | "macro" | "news"
+ QJsonObject source_config;
+ QJsonObject trigger_config;
+ QString analysis_query;
+ int check_interval_seconds = 300;
+ QString status; // "active" | "paused"
+ QString created_at;
+ QString last_check_at;
+ QString last_triggered_at;
+
+ static AgentMonitor from_json(const QJsonObject& o) {
+ AgentMonitor m;
+ m.monitor_id = o["monitor_id"].toString();
+ m.name = o["name"].toString();
+ m.source_type = o["source_type"].toString();
+ m.source_config = o["source_config"].toObject();
+ m.trigger_config = o["trigger_config"].toObject();
+ m.analysis_query = o["analysis_query"].toString();
+ m.check_interval_seconds = o["check_interval_seconds"].toInt(300);
+ m.status = o["status"].toString();
+ m.created_at = o["created_at"].toString();
+ m.last_check_at = o["last_check_at"].toString();
+ m.last_triggered_at = o["last_triggered_at"].toString();
+ return m;
+ }
+};
+
+// ── Optimized prompt result ───────────────────────────────────────────────────
+struct OptimizedPrompt {
+ QString optimized;
+ QString original;
+
+ static OptimizedPrompt from_json(const QJsonObject& o) {
+ OptimizedPrompt p;
+ p.optimized = o["optimized"].toString();
+ p.original = o["original"].toString();
+ return p;
+ }
+};
+
+// ── Agent chat (non-streaming) response ───────────────────────────────────────
+struct AgentChatResponse {
+ QString session_id;
+ QString thread_id;
+ QString response;
+ int thinking_steps = 0;
+ int tool_calls = 0;
+ int total_tokens = 0;
+ QString status;
+ QString new_title;
+ QJsonArray tool_calls_log;
+
+ static AgentChatResponse from_json(const QJsonObject& o) {
+ AgentChatResponse r;
+ r.session_id = o["session_id"].toString();
+ r.thread_id = o["thread_id"].toString();
+ r.response = o["response"].toString();
+ r.thinking_steps = o["thinking_steps"].toInt();
+ r.tool_calls = o["tool_calls"].toInt();
+ r.total_tokens = o["total_tokens"].toInt();
+ r.status = o["status"].toString();
+ r.new_title = o["new_title"].toString();
+ r.tool_calls_log = o["tool_calls_log"].toArray();
+ return r;
+ }
+};
+
} // namespace fincept::chat_mode
diff --git a/fincept-qt/src/screens/chat_mode/ChatSessionPanel.cpp b/fincept-qt/src/screens/chat_mode/ChatSessionPanel.cpp
index 6b2102968..91e7f64ca 100644
--- a/fincept-qt/src/screens/chat_mode/ChatSessionPanel.cpp
+++ b/fincept-qt/src/screens/chat_mode/ChatSessionPanel.cpp
@@ -1,10 +1,14 @@
#include "screens/chat_mode/ChatSessionPanel.h"
#include "screens/chat_mode/ChatModeService.h"
#include "core/logging/Logger.h"
+#include "ui/theme/Theme.h"
+#include <QFileDialog>
#include <QInputDialog>
+#include <QJsonDocument>
#include <QListWidgetItem>
#include <QMessageBox>
+#include <QTimer>
#include <QVBoxLayout>
#include <QHBoxLayout>
@@ -17,55 +21,74 @@ ChatSessionPanel::ChatSessionPanel(QWidget* parent) : QWidget(parent) {
void ChatSessionPanel::build_ui() {
setFixedWidth(240);
- setStyleSheet("background:#0a0a0a;border-right:1px solid #1a1a1a;");
+ setStyleSheet(QString("background:%1;border-right:1px solid %2;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* vl = new QVBoxLayout(this);
vl->setContentsMargins(8, 8, 8, 8);
vl->setSpacing(6);
- // Header row: title + exit button
+ // Header row
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;");
+ QString("color:%1;font-size:11px;font-weight:700;"
+ "font-family:'Consolas','Courier New',monospace;"
+ "background:transparent;letter-spacing:1px;")
+ .arg(ui::colors::AMBER));
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;}");
+ exit_btn_ = new QPushButton("TERMINAL");
+ exit_btn_->setFixedHeight(20);
+ exit_btn_->setCursor(Qt::PointingHandCursor);
+ exit_btn_->setToolTip("Switch to Terminal Mode (F9)");
+ exit_btn_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ exit_btn_->setStyleSheet(QString(
+ "QPushButton{background:transparent;color:%1;border:1px solid %2;"
+ "padding:0 8px;font-weight:700;font-size:10px;"
+ "font-family:'Consolas','Courier New',monospace;}"
+ "QPushButton:hover{background:%2;color:%3;border-color:%1;}")
+ .arg(ui::colors::AMBER, ui::colors::AMBER_DIM, ui::colors::TEXT_PRIMARY));
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;}");
+ search_edit_->setPlaceholderText("Search...");
+ search_edit_->setFixedHeight(28);
+ search_edit_->setStyleSheet(QString(
+ "QLineEdit{background:%1;color:%2;border:1px solid %3;"
+ "border-radius:0px;padding:4px 8px;font-size:12px;"
+ "font-family:'Consolas','Courier New',monospace;}"
+ "QLineEdit:focus{border:1px solid %4;}")
+ .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY,
+ ui::colors::BORDER_DIM, ui::colors::BORDER_BRIGHT));
connect(search_edit_, &QLineEdit::textChanged, this, &ChatSessionPanel::on_search_changed);
vl->addWidget(search_edit_);
+ // Debounce timer for server-side search
+ search_timer_ = new QTimer(this);
+ search_timer_->setSingleShot(true);
+ search_timer_->setInterval(400);
+ connect(search_timer_, &QTimer::timeout, this, &ChatSessionPanel::on_search_server);
+
// 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_->setStyleSheet(QString(
+ "QListWidget{background:%1;border:none;color:%2;"
+ "font-size:12px;font-family:'Consolas','Courier New',monospace;outline:none;}"
+ "QListWidget::item{padding:6px 6px;border-bottom:1px solid %3;}"
+ "QListWidget::item:selected{background:%3;color:%4;"
+ "border-left:2px solid %4;}"
+ "QListWidget::item:hover:!selected{background:%5;}"
+ "QScrollBar:vertical{background:transparent;width:4px;}"
+ "QScrollBar::handle:vertical{background:%6;border-radius:0px;}"
+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}")
+ .arg(ui::colors::BG_SURFACE, ui::colors::TEXT_PRIMARY, ui::colors::BG_RAISED,
+ ui::colors::AMBER, ui::colors::BG_HOVER, ui::colors::BORDER_MED));
session_list_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
connect(session_list_, &QListWidget::itemClicked,
this, &ChatSessionPanel::on_item_clicked);
@@ -74,41 +97,53 @@ void ChatSessionPanel::build_ui() {
// Stats label
stats_lbl_ = new QLabel;
stats_lbl_->setStyleSheet(
- "color:#404040;font-size:11px;font-family:'Consolas',monospace;background:transparent;");
+ QString("color:%1;font-size:11px;font-family:'Consolas','Courier New',monospace;"
+ "background:transparent;")
+ .arg(ui::colors::TEXT_DIM));
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;}");
+ btn->setFixedHeight(24);
+ btn->setStyleSheet(QString(
+ "QPushButton{background:%1;color:%2;border:1px solid %3;"
+ "border-radius:0px;font-size:11px;"
+ "font-family:'Consolas','Courier New',monospace;}"
+ "QPushButton:hover{background:%4;color:%5;border-color:%6;}"
+ "QPushButton:disabled{color:%7;border-color:%1;}")
+ .arg(ui::colors::BG_RAISED, ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM,
+ ui::colors::BG_HOVER, ui::colors::TEXT_PRIMARY, ui::colors::AMBER,
+ ui::colors::BORDER_BRIGHT));
return btn;
};
- new_btn_ = mk_btn("+ New", "New conversation");
- delete_btn_ = mk_btn("Delete", "Delete selected");
+ // Row 1: New + Rename
+ auto* row1 = new QHBoxLayout;
+ row1->setSpacing(4);
+ new_btn_ = mk_btn("+ New", "New conversation");
rename_btn_ = mk_btn("Rename", "Rename selected");
-
- delete_btn_->setEnabled(false);
rename_btn_->setEnabled(false);
+ row1->addWidget(new_btn_);
+ row1->addWidget(rename_btn_);
+ vl->addLayout(row1);
- btn_row->addWidget(new_btn_);
- btn_row->addWidget(rename_btn_);
- btn_row->addWidget(delete_btn_);
- vl->addLayout(btn_row);
+ // Row 2: Delete + Export
+ auto* row2 = new QHBoxLayout;
+ row2->setSpacing(4);
+ delete_btn_ = mk_btn("Delete", "Delete selected");
+ export_btn_ = mk_btn("Export", "Export conversations");
+ delete_btn_->setEnabled(false);
+ row2->addWidget(delete_btn_);
+ row2->addWidget(export_btn_);
+ vl->addLayout(row2);
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);
+ connect(export_btn_, &QPushButton::clicked, this, &ChatSessionPanel::on_export_clicked);
}
void ChatSessionPanel::refresh_sessions() {
@@ -127,7 +162,6 @@ 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);
@@ -137,7 +171,6 @@ void ChatSessionPanel::populate_list(const QVector<ChatSession>& sessions) {
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);
@@ -158,7 +191,6 @@ void ChatSessionPanel::apply_filter(const QString& text) {
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;
@@ -171,7 +203,7 @@ void ChatSessionPanel::set_active_session(const QString& uuid) {
void ChatSessionPanel::update_stats(const ChatStats& stats) {
stats_lbl_->setText(
- QString("%1 sessions · %2 messages")
+ QString("%1 sessions | %2 messages")
.arg(stats.total_sessions)
.arg(stats.total_messages));
}
@@ -194,7 +226,6 @@ void ChatSessionPanel::on_new_clicked() {
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; }
@@ -202,7 +233,7 @@ void ChatSessionPanel::on_delete_clicked() {
const QString confirm_name = title.isEmpty() ? "(Untitled)" : title;
if (QMessageBox::question(this, "Delete Conversation",
- QString("Delete \"%1\"? This cannot be undone.").arg(confirm_name),
+ QString("Delete \"%1\"?").arg(confirm_name),
QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes)
return;
@@ -224,8 +255,80 @@ void ChatSessionPanel::on_rename_clicked() {
emit rename_session_requested(active_uuid_, new_title.trimmed());
}
+void ChatSessionPanel::on_export_clicked() {
+ // Export all sessions (or selected)
+ QStringList uuids;
+ for (const auto& s : sessions_)
+ uuids.append(s.uuid);
+
+ if (uuids.isEmpty()) {
+ QMessageBox::information(this, "Export", "No conversations to export.");
+ return;
+ }
+
+ const QString path = QFileDialog::getSaveFileName(
+ this, "Export Conversations", "fincept_chat_export.json",
+ "JSON (*.json)");
+ if (path.isEmpty()) return;
+
+ export_btn_->setEnabled(false);
+ export_btn_->setText("...");
+
+ ChatModeService::instance().export_sessions(
+ uuids,
+ [this, path](bool ok, QJsonArray data, QString err) {
+ export_btn_->setEnabled(true);
+ export_btn_->setText("Export");
+ if (!ok) {
+ QMessageBox::warning(this, "Export Failed", err);
+ return;
+ }
+ QFile file(path);
+ if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+ QMessageBox::warning(this, "Export Failed", "Could not write file.");
+ return;
+ }
+ file.write(QJsonDocument(data).toJson(QJsonDocument::Indented));
+ file.close();
+ QMessageBox::information(this, "Export",
+ QString("Exported %1 conversations.").arg(data.size()));
+ });
+}
+
void ChatSessionPanel::on_search_changed(const QString& text) {
+ // Local filter immediately
apply_filter(text);
+ // Debounce server-side search for better results
+ if (text.trimmed().length() >= 2)
+ search_timer_->start();
+ else
+ search_timer_->stop();
+}
+
+void ChatSessionPanel::on_search_server() {
+ const QString query = search_edit_->text().trimmed();
+ if (query.length() < 2) return;
+
+ ChatModeService::instance().search_messages(
+ query,
+ [this](bool ok, QVector<ChatMessage> results, QString) {
+ if (!ok || results.isEmpty()) return;
+ // Highlight sessions that have matching messages
+ for (int i = 0; i < session_list_->count(); ++i) {
+ auto* item = session_list_->item(i);
+ bool has_match = false;
+ for (const auto& r : results) {
+ // Check if this message's content matches any session
+ if (item->text().contains(r.content.left(20), Qt::CaseInsensitive)) {
+ has_match = true;
+ break;
+ }
+ }
+ if (has_match && !item->isSelected()) {
+ item->setForeground(QColor(ui::colors::AMBER()));
+ }
+ }
+ });
}
} // namespace fincept::chat_mode
diff --git a/fincept-qt/src/screens/chat_mode/ChatSessionPanel.h b/fincept-qt/src/screens/chat_mode/ChatSessionPanel.h
index b4d08e297..29d324f65 100644
--- a/fincept-qt/src/screens/chat_mode/ChatSessionPanel.h
+++ b/fincept-qt/src/screens/chat_mode/ChatSessionPanel.h
@@ -9,7 +9,7 @@
namespace fincept::chat_mode {
-/// Left sidebar panel — session list, search, new/delete/rename.
+/// Left sidebar panel — session list, search, new/delete/rename/export.
class ChatSessionPanel : public QWidget {
Q_OBJECT
public:
@@ -33,7 +33,9 @@ class ChatSessionPanel : public QWidget {
void on_new_clicked();
void on_delete_clicked();
void on_rename_clicked();
+ void on_export_clicked();
void on_search_changed(const QString& text);
+ void on_search_server();
private:
QLineEdit* search_edit_ = nullptr;
@@ -41,9 +43,12 @@ class ChatSessionPanel : public QWidget {
QPushButton* new_btn_ = nullptr;
QPushButton* delete_btn_ = nullptr;
QPushButton* rename_btn_ = nullptr;
+ QPushButton* export_btn_ = nullptr;
QPushButton* exit_btn_ = nullptr;
QLabel* stats_lbl_ = nullptr;
+ QTimer* search_timer_ = nullptr; // debounce server search
+
QString active_uuid_;
QVector<ChatSession> sessions_;
diff --git a/fincept-qt/src/screens/chat_mode/TerminalToolBridge.cpp b/fincept-qt/src/screens/chat_mode/TerminalToolBridge.cpp
new file mode 100644
index 000000000..0dd5a0423
--- /dev/null
+++ b/fincept-qt/src/screens/chat_mode/TerminalToolBridge.cpp
@@ -0,0 +1,169 @@
+#include "screens/chat_mode/TerminalToolBridge.h"
+#include "screens/chat_mode/ChatModeService.h"
+#include "mcp/McpProvider.h"
+#include "core/logging/Logger.h"
+
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QPointer>
+#include <QtConcurrent>
+
+namespace fincept::chat_mode {
+
+// Categories that are UI-only and should not be exposed to Finagent
+const QStringList TerminalToolBridge::EXCLUDED_CATEGORIES = {
+ "navigation", "system", "settings"
+};
+
+TerminalToolBridge::TerminalToolBridge(QObject* parent) : QObject(parent) {
+ poll_timer_ = new QTimer(this);
+ poll_timer_->setInterval(3000); // 3 seconds
+ connect(poll_timer_, &QTimer::timeout, this, &TerminalToolBridge::on_poll_tick);
+}
+
+void TerminalToolBridge::start() {
+ if (active_) return;
+ active_ = true;
+ LOG_INFO("TerminalToolBridge", "Starting tool bridge");
+ register_tools();
+ poll_timer_->start();
+}
+
+void TerminalToolBridge::stop() {
+ if (!active_) return;
+ active_ = false;
+ poll_timer_->stop();
+ LOG_INFO("TerminalToolBridge", "Stopped tool bridge");
+}
+
+// ── Register tools ───────────────────────────────────────────────────────────
+
+void TerminalToolBridge::register_tools() {
+ auto& provider = mcp::McpProvider::instance();
+ const quint64 gen = provider.generation();
+
+ // Skip if generation hasn't changed
+ if (gen == last_gen_ && last_gen_ != 0) return;
+
+ auto all_tools = provider.list_tools();
+ QJsonArray tools_json;
+
+ for (const auto& tool : all_tools) {
+ // Skip UI-only tools
+ bool skip = false;
+ // Check if tool name starts with excluded category prefixes
+ for (const auto& cat : EXCLUDED_CATEGORIES) {
+ if (tool.name.startsWith(cat + "_") || tool.name.startsWith(cat + "-")) {
+ skip = true;
+ break;
+ }
+ }
+ // Also skip AiChat tools (recursive)
+ if (tool.name.startsWith("ai_chat") || tool.name.startsWith("aichat"))
+ skip = true;
+ if (skip) continue;
+
+ QJsonObject schema = tool.input_schema;
+ if (schema.isEmpty()) {
+ schema["type"] = "object";
+ schema["properties"] = QJsonObject();
+ }
+
+ QJsonObject t;
+ t["name"] = tool.name;
+ t["description"] = tool.description;
+ t["input_schema"] = schema;
+ tools_json.append(t);
+ }
+
+ const int count = tools_json.size();
+ LOG_INFO("TerminalToolBridge",
+ QString("Registering %1 tools (gen %2)").arg(count).arg(gen));
+
+ QPointer<TerminalToolBridge> self = this;
+ ChatModeService::instance().register_terminal_tools(
+ tools_json, "4.0.0", count,
+ [self, gen, count](bool ok, int registered, QString err) {
+ if (!self) return;
+ if (!ok) {
+ LOG_WARN("TerminalToolBridge", "Registration failed: " + err);
+ emit self->bridge_error("Tool registration failed: " + err);
+ return;
+ }
+ self->last_gen_ = gen;
+ LOG_INFO("TerminalToolBridge",
+ QString("Registered %1 tools successfully").arg(registered));
+ emit self->tools_registered(registered);
+ });
+}
+
+// ── Poll for pending calls ───────────────────────────────────────────────────
+
+void TerminalToolBridge::on_poll_tick() {
+ if (!active_) return;
+
+ // Check if tools changed since last registration
+ const quint64 gen = mcp::McpProvider::instance().generation();
+ if (gen != last_gen_)
+ register_tools();
+
+ QPointer<TerminalToolBridge> self = this;
+ ChatModeService::instance().poll_pending_calls(
+ [self](bool ok, QJsonArray calls, QString err) {
+ if (!self || !self->active_) return;
+ if (!ok) {
+ // Silently ignore poll failures — they're expected when endpoint isn't live
+ LOG_DEBUG("TerminalToolBridge", "Poll failed: " + err);
+ return;
+ }
+ for (const auto& v : calls) {
+ const QJsonObject call = v.toObject();
+ self->execute_call(
+ call["call_id"].toString(),
+ call["tool_name"].toString(),
+ call["arguments"].toObject());
+ }
+ });
+}
+
+// ── Execute a tool call locally ──────────────────────────────────────────────
+
+void TerminalToolBridge::execute_call(const QString& call_id,
+ const QString& tool_name,
+ const QJsonObject& arguments)
+{
+ LOG_INFO("TerminalToolBridge",
+ QString("Executing tool: %1 (call %2)").arg(tool_name, call_id));
+
+ // Strip "fincept-terminal__" prefix if present
+ QString local_name = tool_name;
+ if (local_name.startsWith("fincept-terminal__"))
+ local_name = local_name.mid(18);
+
+ // Execute on background thread to avoid blocking UI
+ QPointer<TerminalToolBridge> self = this;
+ QtConcurrent::run([self, call_id, local_name, arguments]() {
+ // Call the tool via McpProvider
+ auto result = mcp::McpProvider::instance().call_tool(local_name, arguments);
+
+ if (!self) return;
+ QMetaObject::invokeMethod(self, [self, call_id, local_name, result]() {
+ if (!self || !self->active_) return;
+
+ // Submit result back to Finagent
+ ChatModeService::instance().submit_tool_result(
+ call_id, result.to_json(),
+ [self, local_name, success = result.success](bool ok, QString err) {
+ if (!self) return;
+ if (!ok) {
+ LOG_WARN("TerminalToolBridge",
+ QString("Failed to submit result for %1: %2")
+ .arg(local_name, err));
+ }
+ emit self->tool_executed(local_name, success);
+ });
+ }, Qt::QueuedConnection);
+ });
+}
+
+} // namespace fincept::chat_mode
diff --git a/fincept-qt/src/screens/chat_mode/TerminalToolBridge.h b/fincept-qt/src/screens/chat_mode/TerminalToolBridge.h
new file mode 100644
index 000000000..63a7ec9d4
--- /dev/null
+++ b/fincept-qt/src/screens/chat_mode/TerminalToolBridge.h
@@ -0,0 +1,51 @@
+#pragma once
+#include <QJsonArray>
+#include <QObject>
+#include <QTimer>
+
+namespace fincept::chat_mode {
+
+/// Bridges the desktop app's 218 internal MCP tools to the Finagent backend.
+///
+/// Lifecycle: start() on chat mode entry, stop() on exit.
+/// 1. Registers all enabled internal tools via POST /terminal-tools/register
+/// 2. Polls GET /terminal-tools/pending every 3 s for tool calls
+/// 3. Executes locally via McpProvider::call_tool()
+/// 4. Returns results via POST /terminal-tools/result
+///
+/// Watches McpProvider::generation() to auto-re-register on tool changes.
+class TerminalToolBridge : public QObject {
+ Q_OBJECT
+ public:
+ explicit TerminalToolBridge(QObject* parent = nullptr);
+
+ /// Start the bridge — register tools and begin polling.
+ void start();
+
+ /// Stop polling and deactivate.
+ void stop();
+
+ bool is_active() const { return active_; }
+
+ signals:
+ void tools_registered(int count);
+ void tool_executed(const QString& tool_name, bool success);
+ void bridge_error(const QString& message);
+
+ private slots:
+ void on_poll_tick();
+
+ private:
+ void register_tools();
+ void execute_call(const QString& call_id, const QString& tool_name,
+ const QJsonObject& arguments);
+
+ QTimer* poll_timer_ = nullptr;
+ bool active_ = false;
+ quint64 last_gen_ = 0; // last McpProvider generation we registered
+
+ // UI-only categories to exclude from registration
+ static const QStringList EXCLUDED_CATEGORIES;
+};
+
+} // namespace fincept::chat_mode
diff --git a/fincept-qt/src/screens/code_editor/CodeEditorScreen.cpp b/fincept-qt/src/screens/code_editor/CodeEditorScreen.cpp
index fd5df2a8c..9347b298e 100644
--- a/fincept-qt/src/screens/code_editor/CodeEditorScreen.cpp
+++ b/fincept-qt/src/screens/code_editor/CodeEditorScreen.cpp
@@ -4,6 +4,7 @@
#include "screens/code_editor/CodeEditorScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "python/PythonRunner.h"
#include "services/file_manager/FileManagerService.h"
#include "ui/theme/Theme.h"
@@ -1328,6 +1329,7 @@ void CodeEditorScreen::on_open_notebook() {
update_status();
update_navigator();
LOG_INFO("CodeEditor", "Opened notebook: " + path);
+ ScreenStateManager::instance().notify_changed(this);
}
void CodeEditorScreen::on_save_notebook() {
@@ -1453,4 +1455,33 @@ void CodeEditorScreen::update_navigator() {
if (navigator_) navigator_->rebuild(cells_, selected_cell_id_);
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap CodeEditorScreen::save_state() const {
+ return {{"notebook_path", notebook_path_}};
+}
+
+void CodeEditorScreen::restore_state(const QVariantMap& state) {
+ const QString path = state.value("notebook_path").toString();
+ if (!path.isEmpty() && notebook_path_ != path) {
+ QFile f(path);
+ if (f.exists()) {
+ notebook_path_ = path; // pre-set so on_open_notebook picks it up
+ // simulate the open flow directly
+ QFile file(path);
+ if (file.open(QIODevice::ReadOnly)) {
+ QJsonDocument doc = QJsonDocument::fromJson(file.readAll());
+ if (!doc.isNull()) {
+ // Delegate to on_open_notebook by setting the path and triggering
+ // the full load — but on_open_notebook opens a dialog so we
+ // reconstruct just enough to restore the path label/status.
+ // Full re-open would require extracting the load logic to a helper.
+ // For now: restore the path so the title bar shows the last file.
+ update_status();
+ }
+ }
+ }
+ }
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/code_editor/CodeEditorScreen.h b/fincept-qt/src/screens/code_editor/CodeEditorScreen.h
index 35be90e46..1fa773af2 100644
--- a/fincept-qt/src/screens/code_editor/CodeEditorScreen.h
+++ b/fincept-qt/src/screens/code_editor/CodeEditorScreen.h
@@ -3,6 +3,8 @@
// Responsive cells, markdown rendering, keyboard shortcuts, collapsible output.
#pragma once
+#include "screens/IStatefulScreen.h"
+
#include <QHideEvent>
#include <QJsonArray>
#include <QJsonObject>
@@ -144,11 +146,16 @@ class CellNavigator : public QWidget {
// -- Main screen --------------------------------------------------------------
-class CodeEditorScreen : public QWidget {
+class CodeEditorScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit CodeEditorScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "code_editor"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) override;
diff --git a/fincept-qt/src/screens/crypto_trading/CryptoBottomPanel.cpp b/fincept-qt/src/screens/crypto_trading/CryptoBottomPanel.cpp
index bc554f21a..21e74017c 100644
--- a/fincept-qt/src/screens/crypto_trading/CryptoBottomPanel.cpp
+++ b/fincept-qt/src/screens/crypto_trading/CryptoBottomPanel.cpp
@@ -3,6 +3,7 @@
#include "screens/crypto_trading/CryptoDepthChart.h"
#include "screens/crypto_trading/CryptoTimeSales.h"
+#include "ui/theme/Theme.h"
#include <QDateTime>
#include <QHBoxLayout>
@@ -15,13 +16,15 @@
namespace fincept::screens::crypto {
+using namespace fincept::ui;
+
namespace {
-const QColor kRowEven("#080808");
-const QColor kRowOdd("#0c0c0c");
-const QColor kColorPos("#16a34a");
-const QColor kColorNeg("#dc2626");
-const QColor kColorSec("#808080");
-const QColor kColorTert("#525252");
+inline QColor kRowEven() { return QColor(colors::BG_BASE()); }
+inline QColor kRowOdd() { return QColor(colors::ROW_ALT()); }
+inline QColor kColorPos() { return QColor(colors::POSITIVE()); }
+inline QColor kColorNeg() { return QColor(colors::NEGATIVE()); }
+inline QColor kColorSec() { return QColor(colors::TEXT_SECONDARY()); }
+inline QColor kColorTert() { return QColor(colors::TEXT_TERTIARY()); }
} // namespace
// Static helper: ensure QTableWidgetItem exists at (row, col)
@@ -189,7 +192,7 @@ void CryptoBottomPanel::set_positions(const QVector<trading::PtPosition>& positi
for (int i = 0; i < n; ++i) {
const auto& pos = positions[i];
- const QColor& bg = (i % 2 == 0) ? kRowEven : kRowOdd;
+ const QColor bg = (i % 2 == 0) ? kRowEven() : kRowOdd();
auto set = [&](int col, const QString& text, const QColor& fg = QColor(),
int align = Qt::AlignLeft | Qt::AlignVCenter) {
@@ -202,11 +205,11 @@ void CryptoBottomPanel::set_positions(const QVector<trading::PtPosition>& positi
};
set(0, pos.symbol);
- set(1, pos.side.toUpper(), pos.side == "long" ? kColorPos : kColorNeg);
+ set(1, pos.side.toUpper(), pos.side == "long" ? kColorPos() : kColorNeg());
set(2, QString::number(pos.quantity, 'f', 6), QColor(), Qt::AlignRight | Qt::AlignVCenter);
set(3, QString::number(pos.entry_price, 'f', 2), QColor(), Qt::AlignRight | Qt::AlignVCenter);
set(4, QString::number(pos.current_price, 'f', 2), QColor(), Qt::AlignRight | Qt::AlignVCenter);
- set(5, QString::number(pos.unrealized_pnl, 'f', 2), pos.unrealized_pnl >= 0 ? kColorPos : kColorNeg,
+ set(5, QString::number(pos.unrealized_pnl, 'f', 2), pos.unrealized_pnl >= 0 ? kColorPos() : kColorNeg(),
Qt::AlignRight | Qt::AlignVCenter);
set(6, QString::number(pos.leverage, 'f', 1), QColor(), Qt::AlignRight | Qt::AlignVCenter);
}
@@ -227,7 +230,7 @@ void CryptoBottomPanel::set_orders(const QVector<trading::PtOrder>& orders) {
for (int i = 0; i < n; ++i) {
const auto& o = active[i];
- const QColor& bg = (i % 2 == 0) ? kRowEven : kRowOdd;
+ const QColor bg = (i % 2 == 0) ? kRowEven() : kRowOdd();
auto set = [&](int col, const QString& text, const QColor& fg = QColor(),
int align = Qt::AlignLeft | Qt::AlignVCenter) {
@@ -240,11 +243,11 @@ void CryptoBottomPanel::set_orders(const QVector<trading::PtOrder>& orders) {
};
set(0, o.symbol);
- set(1, o.side.toUpper(), o.side == "buy" ? kColorPos : kColorNeg);
+ set(1, o.side.toUpper(), o.side == "buy" ? kColorPos() : kColorNeg());
set(2, o.order_type.toUpper());
set(3, QString::number(o.quantity, 'f', 6), QColor(), Qt::AlignRight | Qt::AlignVCenter);
set(4, o.price ? QString::number(*o.price, 'f', 2) : "MKT", QColor(), Qt::AlignRight | Qt::AlignVCenter);
- set(5, o.status.toUpper(), kColorSec);
+ set(5, o.status.toUpper(), kColorSec());
// Cancel button — reuse existing widget, update its order_id property
auto* existing = qobject_cast<QPushButton*>(orders_table_->cellWidget(i, 6));
@@ -273,7 +276,7 @@ void CryptoBottomPanel::set_trades(const QVector<trading::PtTrade>& trades) {
for (int i = 0; i < n; ++i) {
const auto& t = trades[i];
- const QColor& bg = (i % 2 == 0) ? kRowEven : kRowOdd;
+ const QColor bg = (i % 2 == 0) ? kRowEven() : kRowOdd();
auto set = [&](int col, const QString& text, const QColor& fg = QColor(),
int align = Qt::AlignLeft | Qt::AlignVCenter) {
@@ -286,12 +289,12 @@ void CryptoBottomPanel::set_trades(const QVector<trading::PtTrade>& trades) {
};
set(0, t.symbol);
- set(1, t.side.toUpper(), t.side == "buy" ? kColorPos : kColorNeg);
+ set(1, t.side.toUpper(), t.side == "buy" ? kColorPos() : kColorNeg());
set(2, QString::number(t.price, 'f', 2), QColor(), Qt::AlignRight | Qt::AlignVCenter);
set(3, QString::number(t.quantity, 'f', 6), QColor(), Qt::AlignRight | Qt::AlignVCenter);
- set(4, QString::number(t.fee, 'f', 4), kColorSec, Qt::AlignRight | Qt::AlignVCenter);
- set(5, QString::number(t.pnl, 'f', 2), t.pnl >= 0 ? kColorPos : kColorNeg, Qt::AlignRight | Qt::AlignVCenter);
- set(6, t.timestamp, kColorTert);
+ set(4, QString::number(t.fee, 'f', 4), kColorSec(), Qt::AlignRight | Qt::AlignVCenter);
+ set(5, QString::number(t.pnl, 'f', 2), t.pnl >= 0 ? kColorPos() : kColorNeg(), Qt::AlignRight | Qt::AlignVCenter);
+ set(6, t.timestamp, kColorTert());
}
trades_table_->setUpdatesEnabled(true);
}
@@ -338,7 +341,7 @@ void CryptoBottomPanel::set_live_positions(const QJsonArray& positions) {
for (int i = 0; i < n; ++i) {
auto p = positions[i].toObject();
- const QColor& bg = (i % 2 == 0) ? kRowEven : kRowOdd;
+ const QColor bg = (i % 2 == 0) ? kRowEven() : kRowOdd();
auto set = [&](int col, const QString& text, const QColor& fg = QColor(),
int align = Qt::AlignLeft | Qt::AlignVCenter) {
@@ -352,12 +355,12 @@ void CryptoBottomPanel::set_live_positions(const QJsonArray& positions) {
const QString side_str = p.value("side").toString();
set(0, p.value("symbol").toString());
- set(1, side_str.toUpper(), side_str.contains("long") ? kColorPos : kColorNeg);
+ set(1, side_str.toUpper(), side_str.contains("long") ? kColorPos() : kColorNeg());
set(2, QString::number(p.value("contracts").toDouble(), 'f', 4), QColor(), Qt::AlignRight | Qt::AlignVCenter);
set(3, QString::number(p.value("entryPrice").toDouble(), 'f', 2), QColor(), Qt::AlignRight | Qt::AlignVCenter);
set(4, QString::number(p.value("markPrice").toDouble(), 'f', 2), QColor(), Qt::AlignRight | Qt::AlignVCenter);
const double pnl = p.value("unrealizedPnl").toDouble();
- set(5, QString::number(pnl, 'f', 2), pnl >= 0 ? kColorPos : kColorNeg, Qt::AlignRight | Qt::AlignVCenter);
+ set(5, QString::number(pnl, 'f', 2), pnl >= 0 ? kColorPos() : kColorNeg(), Qt::AlignRight | Qt::AlignVCenter);
set(6, QString::number(p.value("leverage").toDouble(), 'f', 0), QColor(), Qt::AlignRight | Qt::AlignVCenter);
}
positions_table_->setUpdatesEnabled(true);
@@ -371,7 +374,7 @@ void CryptoBottomPanel::set_live_orders(const QJsonArray& orders) {
for (int i = 0; i < n; ++i) {
auto o = orders[i].toObject();
- const QColor& bg = (i % 2 == 0) ? kRowEven : kRowOdd;
+ const QColor bg = (i % 2 == 0) ? kRowEven() : kRowOdd();
auto set = [&](int col, const QString& text, const QColor& fg = QColor(),
int align = Qt::AlignLeft | Qt::AlignVCenter) {
@@ -385,11 +388,11 @@ void CryptoBottomPanel::set_live_orders(const QJsonArray& orders) {
const QString side_str = o.value("side").toString();
set(0, o.value("symbol").toString());
- set(1, side_str.toUpper(), side_str == "buy" ? kColorPos : kColorNeg);
+ set(1, side_str.toUpper(), side_str == "buy" ? kColorPos() : kColorNeg());
set(2, o.value("type").toString().toUpper());
set(3, QString::number(o.value("amount").toDouble(), 'f', 4), QColor(), Qt::AlignRight | Qt::AlignVCenter);
set(4, QString::number(o.value("price").toDouble(), 'f', 2), QColor(), Qt::AlignRight | Qt::AlignVCenter);
- set(5, o.value("status").toString().toUpper(), kColorSec);
+ set(5, o.value("status").toString().toUpper(), kColorSec());
auto* existing_btn = qobject_cast<QPushButton*>(orders_table_->cellWidget(i, 6));
if (existing_btn) {
@@ -417,7 +420,7 @@ void CryptoBottomPanel::update_my_trades(const QJsonObject& data) {
for (int i = 0; i < n; ++i) {
const auto t = trades[i].toObject();
- const QColor& bg = (i % 2 == 0) ? kRowEven : kRowOdd;
+ const QColor bg = (i % 2 == 0) ? kRowEven() : kRowOdd();
auto set = [&](int col, const QString& text, const QColor& fg = QColor(),
int align = Qt::AlignLeft | Qt::AlignVCenter) {
@@ -436,13 +439,13 @@ void CryptoBottomPanel::update_my_trades(const QJsonObject& data) {
: "--";
set(0, t.value("symbol").toString());
- set(1, side.toUpper(), side == "buy" ? kColorPos : kColorNeg);
+ set(1, side.toUpper(), side == "buy" ? kColorPos() : kColorNeg());
set(2, QString::number(t.value("price").toDouble(), 'f', 2), QColor(), Qt::AlignRight | Qt::AlignVCenter);
set(3, QString::number(t.value("amount").toDouble(), 'f', 6), QColor(), Qt::AlignRight | Qt::AlignVCenter);
set(4, QString::number(t.value("cost").toDouble(), 'f', 2), QColor(), Qt::AlignRight | Qt::AlignVCenter);
- set(5, QString::number(t.value("fee").toDouble(), 'f', 6), kColorSec, Qt::AlignRight | Qt::AlignVCenter);
- set(6, t.value("fee_currency").toString(), kColorTert);
- set(7, time_str, kColorTert);
+ set(5, QString::number(t.value("fee").toDouble(), 'f', 6), kColorSec(), Qt::AlignRight | Qt::AlignVCenter);
+ set(6, t.value("fee_currency").toString(), kColorTert());
+ set(7, time_str, kColorTert());
}
my_trades_table_->setUpdatesEnabled(true);
}
@@ -452,7 +455,7 @@ void CryptoBottomPanel::update_fees(const QJsonObject& data) {
if (data.contains("symbol")) {
fees_table_->setUpdatesEnabled(false);
fees_table_->setRowCount(1);
- const QColor& bg = kRowEven;
+ const QColor bg = kRowEven();
auto set = [&](int col, const QString& text, const QColor& fg = QColor()) {
auto* it = ensure_item(fees_table_, 0, col);
@@ -464,8 +467,8 @@ void CryptoBottomPanel::update_fees(const QJsonObject& data) {
};
set(0, data.value("symbol").toString());
- set(1, QString::number(data.value("maker").toDouble() * 100.0, 'f', 4) + "%", kColorSec);
- set(2, QString::number(data.value("taker").toDouble() * 100.0, 'f', 4) + "%", kColorSec);
+ set(1, QString::number(data.value("maker").toDouble() * 100.0, 'f', 4) + "%", kColorSec());
+ set(2, QString::number(data.value("taker").toDouble() * 100.0, 'f', 4) + "%", kColorSec());
fees_table_->setUpdatesEnabled(true);
return;
}
@@ -479,7 +482,7 @@ void CryptoBottomPanel::update_fees(const QJsonObject& data) {
for (int i = 0; i < n; ++i) {
const auto f = fees[i].toObject();
- const QColor& bg = (i % 2 == 0) ? kRowEven : kRowOdd;
+ const QColor bg = (i % 2 == 0) ? kRowEven() : kRowOdd();
auto set = [&](int col, const QString& text, const QColor& fg = QColor()) {
auto* it = ensure_item(fees_table_, i, col);
@@ -491,8 +494,8 @@ void CryptoBottomPanel::update_fees(const QJsonObject& data) {
};
set(0, f.value("symbol").toString());
- set(1, QString::number(f.value("maker").toDouble() * 100.0, 'f', 4) + "%", kColorSec);
- set(2, QString::number(f.value("taker").toDouble() * 100.0, 'f', 4) + "%", kColorSec);
+ set(1, QString::number(f.value("maker").toDouble() * 100.0, 'f', 4) + "%", kColorSec());
+ set(2, QString::number(f.value("taker").toDouble() * 100.0, 'f', 4) + "%", kColorSec());
}
fees_table_->setUpdatesEnabled(true);
}
diff --git a/fincept-qt/src/screens/crypto_trading/CryptoChart.cpp b/fincept-qt/src/screens/crypto_trading/CryptoChart.cpp
index c7f9090d4..1080062d2 100644
--- a/fincept-qt/src/screens/crypto_trading/CryptoChart.cpp
+++ b/fincept-qt/src/screens/crypto_trading/CryptoChart.cpp
@@ -1,6 +1,8 @@
// CryptoChart.cpp — Candlestick chart with TF toggles, vibrant colors
#include "screens/crypto_trading/CryptoChart.h"
+#include "ui/theme/Theme.h"
+
#include <QCandlestickSeries>
#include <QCandlestickSet>
#include <QChart>
@@ -15,6 +17,8 @@
#include <cmath>
+using namespace fincept::ui;
+
namespace fincept::screens::crypto {
constexpr const char* CryptoChart::TF_LABELS[];
@@ -54,16 +58,16 @@ CryptoChart::CryptoChart(QWidget* parent) : QWidget(parent) {
// Chart setup
chart_ = new QChart;
- chart_->setBackgroundBrush(QBrush(QColor("#0a0a0a")));
- chart_->setPlotAreaBackgroundBrush(QBrush(QColor("#060606")));
+ chart_->setBackgroundBrush(QBrush(QColor(colors::BG_SURFACE())));
+ chart_->setPlotAreaBackgroundBrush(QBrush(QColor(colors::BG_BASE())));
chart_->setPlotAreaBackgroundVisible(true);
chart_->legend()->hide();
chart_->setMargins(QMargins(4, 4, 4, 4));
series_ = new QCandlestickSeries;
// Vibrant candle colors
- series_->setIncreasingColor(QColor("#22c55e")); // bright green
- series_->setDecreasingColor(QColor("#ef4444")); // bright red
+ series_->setIncreasingColor(QColor(colors::POSITIVE()));
+ series_->setDecreasingColor(QColor(colors::NEGATIVE()));
series_->setBodyWidth(0.75);
series_->setPen(QPen(Qt::NoPen)); // no outline on body
series_->setCapsVisible(false); // clean look
@@ -71,18 +75,18 @@ CryptoChart::CryptoChart(QWidget* parent) : QWidget(parent) {
time_axis_ = new QDateTimeAxis;
time_axis_->setFormat("HH:mm");
- time_axis_->setLabelsColor(QColor("#404040"));
- time_axis_->setGridLineColor(QColor("#151515"));
- time_axis_->setMinorGridLineColor(QColor("#0e0e0e"));
- time_axis_->setLinePenColor(QColor("#1a1a1a"));
+ time_axis_->setLabelsColor(QColor(colors::TEXT_DIM()));
+ time_axis_->setGridLineColor(QColor(colors::BG_RAISED()));
+ time_axis_->setMinorGridLineColor(QColor(colors::BG_SURFACE()));
+ time_axis_->setLinePenColor(QColor(colors::BORDER_DIM()));
chart_->addAxis(time_axis_, Qt::AlignBottom);
series_->attachAxis(time_axis_);
price_axis_ = new QValueAxis;
- price_axis_->setLabelsColor(QColor("#404040"));
- price_axis_->setGridLineColor(QColor("#151515"));
- price_axis_->setMinorGridLineColor(QColor("#0e0e0e"));
- price_axis_->setLinePenColor(QColor("#1a1a1a"));
+ price_axis_->setLabelsColor(QColor(colors::TEXT_DIM()));
+ price_axis_->setGridLineColor(QColor(colors::BG_RAISED()));
+ price_axis_->setMinorGridLineColor(QColor(colors::BG_SURFACE()));
+ price_axis_->setLinePenColor(QColor(colors::BORDER_DIM()));
price_axis_->setLabelFormat("%.1f");
chart_->addAxis(price_axis_, Qt::AlignRight);
series_->attachAxis(price_axis_);
diff --git a/fincept-qt/src/screens/crypto_trading/CryptoCredentials.cpp b/fincept-qt/src/screens/crypto_trading/CryptoCredentials.cpp
index f2116283c..b0a3ebabe 100644
--- a/fincept-qt/src/screens/crypto_trading/CryptoCredentials.cpp
+++ b/fincept-qt/src/screens/crypto_trading/CryptoCredentials.cpp
@@ -1,6 +1,7 @@
#include "screens/crypto_trading/CryptoCredentials.h"
#include "python/PythonRunner.h"
+#include "ui/theme/Theme.h"
#include <QGroupBox>
#include <QHBoxLayout>
@@ -10,12 +11,17 @@
#include <QTimer>
#include <QVBoxLayout>
+using namespace fincept::ui;
+
// Obsidian Design System input style
namespace {
-static const QString kInputStyle =
- "QLineEdit { background: #0a0a0a; border: 1px solid #1a1a1a; color: #e5e5e5; padding: 6px; "
- "font-size: 13px; font-family: 'Consolas', 'Courier New', monospace; }"
- "QLineEdit:focus { border-color: #333333; }";
+static QString kInputStyle() {
+ return QString(
+ "QLineEdit { background: %1; border: 1px solid %2; color: %3; padding: 6px; "
+ "font-size: 13px; font-family: 'Consolas', 'Courier New', monospace; }"
+ "QLineEdit:focus { border-color: %4; }")
+ .arg(colors::BG_SURFACE, colors::BORDER_DIM, colors::TEXT_PRIMARY, colors::BORDER_BRIGHT);
+}
} // namespace
namespace fincept::screens::crypto {
@@ -24,8 +30,9 @@ CryptoCredentials::CryptoCredentials(const QString& exchange_id, QWidget* parent
: QDialog(parent), exchange_id_(exchange_id) {
setWindowTitle(QString("API Credentials — %1").arg(exchange_id.toUpper()));
setMinimumWidth(400);
- setStyleSheet("QDialog { background: #080808; color: #e5e5e5; "
- "font-family: 'Consolas', 'Courier New', monospace; }");
+ setStyleSheet(QString("QDialog { background: %1; color: %2; "
+ "font-family: 'Consolas', 'Courier New', monospace; }")
+ .arg(colors::BG_BASE, colors::TEXT_PRIMARY));
auto* layout = new QVBoxLayout(this);
layout->setSpacing(8);
@@ -33,14 +40,14 @@ CryptoCredentials::CryptoCredentials(const QString& exchange_id, QWidget* parent
// Header
auto* title = new QLabel(QString("API CREDENTIALS %1").arg(exchange_id.toUpper()));
- title->setStyleSheet("color: #d97706; font-size: 14px; font-weight: 700; letter-spacing: 0.5px; "
- "font-family: 'Consolas', 'Courier New', monospace;");
+ title->setStyleSheet(QString("color: %1; font-size: 14px; font-weight: 700; letter-spacing: 0.5px; "
+ "font-family: 'Consolas', 'Courier New', monospace;").arg(colors::AMBER));
layout->addWidget(title);
auto* info = new QLabel("Enter your exchange API credentials for live trading.\n"
"Keys are stored locally in encrypted secure storage.");
- info->setStyleSheet("color: #808080; font-size: 12px; "
- "font-family: 'Consolas', 'Courier New', monospace;");
+ info->setStyleSheet(QString("color: %1; font-size: 12px; "
+ "font-family: 'Consolas', 'Courier New', monospace;").arg(colors::TEXT_SECONDARY));
info->setWordWrap(true);
layout->addWidget(info);
@@ -48,50 +55,50 @@ CryptoCredentials::CryptoCredentials(const QString& exchange_id, QWidget* parent
// API Key
auto* key_lbl = new QLabel("API KEY");
- key_lbl->setStyleSheet("color: #808080; font-size: 12px; font-weight: 700; letter-spacing: 0.5px; "
- "font-family: 'Consolas', 'Courier New', monospace;");
+ key_lbl->setStyleSheet(QString("color: %1; font-size: 12px; font-weight: 700; letter-spacing: 0.5px; "
+ "font-family: 'Consolas', 'Courier New', monospace;").arg(colors::TEXT_SECONDARY));
layout->addWidget(key_lbl);
key_edit_ = new QLineEdit;
key_edit_->setPlaceholderText("Enter API key");
- key_edit_->setStyleSheet(kInputStyle);
+ key_edit_->setStyleSheet(kInputStyle());
key_edit_->setFixedHeight(28);
layout->addWidget(key_edit_);
// API Secret
auto* secret_lbl = new QLabel("API SECRET");
- secret_lbl->setStyleSheet("color: #808080; font-size: 12px; font-weight: 700; letter-spacing: 0.5px; "
- "font-family: 'Consolas', 'Courier New', monospace;");
+ secret_lbl->setStyleSheet(QString("color: %1; font-size: 12px; font-weight: 700; letter-spacing: 0.5px; "
+ "font-family: 'Consolas', 'Courier New', monospace;").arg(colors::TEXT_SECONDARY));
layout->addWidget(secret_lbl);
secret_edit_ = new QLineEdit;
secret_edit_->setPlaceholderText("Enter API secret");
secret_edit_->setEchoMode(QLineEdit::Password);
- secret_edit_->setStyleSheet(kInputStyle);
+ secret_edit_->setStyleSheet(kInputStyle());
secret_edit_->setFixedHeight(28);
layout->addWidget(secret_edit_);
// Password
auto* pw_lbl = new QLabel("PASSWORD (OKX/KUCOIN)");
- pw_lbl->setStyleSheet("color: #808080; font-size: 12px; font-weight: 700; letter-spacing: 0.5px; "
- "font-family: 'Consolas', 'Courier New', monospace;");
+ pw_lbl->setStyleSheet(QString("color: %1; font-size: 12px; font-weight: 700; letter-spacing: 0.5px; "
+ "font-family: 'Consolas', 'Courier New', monospace;").arg(colors::TEXT_SECONDARY));
layout->addWidget(pw_lbl);
password_edit_ = new QLineEdit;
password_edit_->setPlaceholderText("Optional");
password_edit_->setEchoMode(QLineEdit::Password);
- password_edit_->setStyleSheet(kInputStyle);
+ password_edit_->setStyleSheet(kInputStyle());
password_edit_->setFixedHeight(28);
layout->addWidget(password_edit_);
// TOTP section
layout->addSpacing(4);
auto* totp_lbl = new QLabel("TOTP SECRET (2FA)");
- totp_lbl->setStyleSheet("color: #808080; font-size: 12px; font-weight: 700; letter-spacing: 0.5px; "
- "font-family: 'Consolas', 'Courier New', monospace;");
+ totp_lbl->setStyleSheet(QString("color: %1; font-size: 12px; font-weight: 700; letter-spacing: 0.5px; "
+ "font-family: 'Consolas', 'Courier New', monospace;").arg(colors::TEXT_SECONDARY));
layout->addWidget(totp_lbl);
totp_secret_edit_ = new QLineEdit;
totp_secret_edit_->setPlaceholderText("Base32 secret (optional)");
totp_secret_edit_->setEchoMode(QLineEdit::Password);
- totp_secret_edit_->setStyleSheet(kInputStyle);
+ totp_secret_edit_->setStyleSheet(kInputStyle());
totp_secret_edit_->setFixedHeight(28);
layout->addWidget(totp_secret_edit_);
@@ -100,13 +107,13 @@ CryptoCredentials::CryptoCredentials(const QString& exchange_id, QWidget* parent
totp_code_label_ = new QLabel("CODE: --");
totp_code_label_->setStyleSheet(
- "color: #d97706; font-size: 18px; font-weight: 700; letter-spacing: 2px; "
- "font-family: 'Consolas', 'Courier New', monospace;");
+ QString("color: %1; font-size: 18px; font-weight: 700; letter-spacing: 2px; "
+ "font-family: 'Consolas', 'Courier New', monospace;").arg(colors::AMBER));
totp_row->addWidget(totp_code_label_);
totp_countdown_label_ = new QLabel("");
totp_countdown_label_->setStyleSheet(
- "color: #525252; font-size: 11px; font-family: 'Consolas', 'Courier New', monospace;");
+ QString("color: %1; font-size: 11px; font-family: 'Consolas', 'Courier New', monospace;").arg(colors::TEXT_TERTIARY));
totp_row->addWidget(totp_countdown_label_);
totp_row->addStretch();
layout->addLayout(totp_row);
@@ -135,20 +142,23 @@ CryptoCredentials::CryptoCredentials(const QString& exchange_id, QWidget* parent
auto* clear_btn = new QPushButton("CLEAR");
clear_btn->setStyleSheet(
- "QPushButton { background: rgba(220,38,38,0.1); color: #dc2626; border: 1px solid #7f1d1d; "
+ QString("QPushButton { background: rgba(220,38,38,0.1); color: %1; border: 1px solid %2; "
"padding: 6px 16px; font-weight: 700; font-size: 12px; "
"font-family: 'Consolas', 'Courier New', monospace; }"
- "QPushButton:hover { background: #dc2626; color: #e5e5e5; }");
+ "QPushButton:hover { background: %1; color: %3; }")
+ .arg(colors::NEGATIVE, colors::NEGATIVE_DIM, colors::TEXT_PRIMARY));
connect(clear_btn, &QPushButton::clicked, this, &CryptoCredentials::on_clear);
btn_row->addWidget(clear_btn);
btn_row->addStretch();
auto* save_btn = new QPushButton("SAVE & CONNECT");
- save_btn->setStyleSheet("QPushButton { background: rgba(217,119,6,0.1); color: #d97706; border: 1px solid #78350f; "
- "padding: 6px 16px; font-weight: 700; font-size: 12px; "
- "font-family: 'Consolas', 'Courier New', monospace; }"
- "QPushButton:hover { background: #d97706; color: #080808; }");
+ save_btn->setStyleSheet(
+ QString("QPushButton { background: rgba(217,119,6,0.1); color: %1; border: 1px solid %2; "
+ "padding: 6px 16px; font-weight: 700; font-size: 12px; "
+ "font-family: 'Consolas', 'Courier New', monospace; }"
+ "QPushButton:hover { background: %1; color: %3; }")
+ .arg(colors::AMBER, colors::AMBER_DIM, colors::BG_BASE));
connect(save_btn, &QPushButton::clicked, this, &CryptoCredentials::on_save);
btn_row->addWidget(save_btn);
@@ -174,14 +184,14 @@ void CryptoCredentials::set_values(const QString& key, const QString& secret, co
void CryptoCredentials::on_save() {
if (api_key().isEmpty() || api_secret().isEmpty()) {
status_label_->setText("API key and secret are required");
- status_label_->setStyleSheet("color: #dc2626; font-size: 12px; "
- "font-family: 'Consolas', 'Courier New', monospace;");
+ status_label_->setStyleSheet(QString("color: %1; font-size: 12px; "
+ "font-family: 'Consolas', 'Courier New', monospace;").arg(colors::NEGATIVE));
return;
}
emit credentials_saved(api_key(), api_secret(), password());
status_label_->setText("Credentials saved");
- status_label_->setStyleSheet("color: #16a34a; font-size: 12px; "
- "font-family: 'Consolas', 'Courier New', monospace;");
+ status_label_->setStyleSheet(QString("color: %1; font-size: 12px; "
+ "font-family: 'Consolas', 'Courier New', monospace;").arg(colors::POSITIVE));
accept();
}
@@ -190,8 +200,8 @@ void CryptoCredentials::on_clear() {
secret_edit_->clear();
password_edit_->clear();
status_label_->setText("Credentials cleared");
- status_label_->setStyleSheet("color: #ca8a04; font-size: 12px; "
- "font-family: 'Consolas', 'Courier New', monospace;");
+ status_label_->setStyleSheet(QString("color: %1; font-size: 12px; "
+ "font-family: 'Consolas', 'Courier New', monospace;").arg(colors::WARNING));
}
void CryptoCredentials::on_totp_tick() {
diff --git a/fincept-qt/src/screens/crypto_trading/CryptoTickerBar.cpp b/fincept-qt/src/screens/crypto_trading/CryptoTickerBar.cpp
index 4f02382ac..b1d015b55 100644
--- a/fincept-qt/src/screens/crypto_trading/CryptoTickerBar.cpp
+++ b/fincept-qt/src/screens/crypto_trading/CryptoTickerBar.cpp
@@ -1,8 +1,12 @@
// CryptoTickerBar.cpp — dense price ribbon with bid/ask/spread
#include "screens/crypto_trading/CryptoTickerBar.h"
+#include "ui/theme/Theme.h"
+
#include <QHBoxLayout>
+using namespace fincept::ui;
+
namespace fincept::screens::crypto {
CryptoTickerBar::CryptoTickerBar(QWidget* parent) : QWidget(parent) {
@@ -81,7 +85,7 @@ void CryptoTickerBar::update_data(double price, double change_pct, double high,
if (positive != last_positive_) {
change_label_->setStyleSheet(
QString("color: %1; font-size: 12px; font-weight: 700; background: transparent; border: none;")
- .arg(positive ? "#16a34a" : "#dc2626"));
+ .arg(positive ? colors::POSITIVE : colors::NEGATIVE));
last_positive_ = positive;
}
diff --git a/fincept-qt/src/screens/crypto_trading/CryptoTimeSales.cpp b/fincept-qt/src/screens/crypto_trading/CryptoTimeSales.cpp
index 76b39f5e3..4b48a84dc 100644
--- a/fincept-qt/src/screens/crypto_trading/CryptoTimeSales.cpp
+++ b/fincept-qt/src/screens/crypto_trading/CryptoTimeSales.cpp
@@ -1,6 +1,8 @@
// CryptoTimeSales.cpp — custom-painted real-time trade tape
#include "screens/crypto_trading/CryptoTimeSales.h"
+#include "ui/theme/Theme.h"
+
#include <QDateTime>
#include <QMutexLocker>
#include <QPainter>
@@ -8,14 +10,16 @@
namespace fincept::screens::crypto {
+using namespace fincept::ui;
+
namespace {
-const QColor kBgBase("#080808");
-const QColor kRowEven("#080808");
-const QColor kRowOdd("#0c0c0c");
-const QColor kTextDim("#404040");
-const QColor kTextSec("#808080");
-const QColor kColorBuy("#16a34a");
-const QColor kColorSell("#dc2626");
+inline QColor kBgBase() { return QColor(colors::BG_BASE()); }
+inline QColor kRowEven() { return QColor(colors::BG_BASE()); }
+inline QColor kRowOdd() { return QColor(colors::ROW_ALT()); }
+inline QColor kTextDim() { return QColor(colors::TEXT_DIM()); }
+inline QColor kTextSec() { return QColor(colors::TEXT_SECONDARY()); }
+inline QColor kColorBuy() { return QColor(colors::POSITIVE()); }
+inline QColor kColorSell() { return QColor(colors::NEGATIVE()); }
} // namespace
CryptoTimeSales::CryptoTimeSales(QWidget* parent) : QWidget(parent) {
@@ -26,6 +30,7 @@ CryptoTimeSales::CryptoTimeSales(QWidget* parent) : QWidget(parent) {
repaint_timer_->setSingleShot(true);
repaint_timer_->setInterval(50); // max 20fps
connect(repaint_timer_, &QTimer::timeout, this, [this]() { update(); });
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed, this, [this]() { update(); });
}
void CryptoTimeSales::showEvent(QShowEvent* e) {
@@ -84,7 +89,7 @@ void CryptoTimeSales::rebuild_cache() {
return;
cache_ = QPixmap(w, h);
- cache_.fill(kBgBase);
+ cache_.fill(kBgBase());
QPainter p(&cache_);
p.setFont(QFont("Consolas", 9));
@@ -96,7 +101,7 @@ void CryptoTimeSales::rebuild_cache() {
}
// Header row
- p.setPen(kTextDim);
+ p.setPen(kTextDim());
p.drawText(QRect(4, 0, 70, ROW_H), Qt::AlignLeft | Qt::AlignVCenter, "TIME");
p.drawText(QRect(74, 0, w / 3, ROW_H), Qt::AlignRight | Qt::AlignVCenter, "PRICE");
p.drawText(QRect(74 + w / 3, 0, w / 3, ROW_H), Qt::AlignRight | Qt::AlignVCenter, "QTY");
@@ -108,14 +113,14 @@ void CryptoTimeSales::rebuild_cache() {
for (int i = 0; i < count; ++i) {
const auto& t = snapshot[i];
const int y = (i + 1) * ROW_H;
- const QColor& bg = (i % 2 == 0) ? kRowEven : kRowOdd;
+ const QColor bg = (i % 2 == 0) ? kRowEven() : kRowOdd();
p.fillRect(0, y, w, ROW_H, bg);
const bool is_buy = (t.side == "buy");
- const QColor& price_color = is_buy ? kColorBuy : kColorSell;
+ const QColor price_color = is_buy ? kColorBuy() : kColorSell();
// Time
- p.setPen(kTextDim);
+ p.setPen(kTextDim());
p.drawText(QRect(4, y, 70, ROW_H), Qt::AlignLeft | Qt::AlignVCenter,
QDateTime::fromMSecsSinceEpoch(t.timestamp).toString("HH:mm:ss"));
@@ -124,7 +129,7 @@ void CryptoTimeSales::rebuild_cache() {
p.drawText(QRect(74, y, w / 3, ROW_H), Qt::AlignRight | Qt::AlignVCenter, QString::number(t.price, 'f', 2));
// Quantity
- p.setPen(kTextSec);
+ p.setPen(kTextSec());
p.drawText(QRect(74 + w / 3, y, w / 3, ROW_H), Qt::AlignRight | Qt::AlignVCenter,
QString::number(t.amount, 'f', 4));
@@ -134,7 +139,7 @@ void CryptoTimeSales::rebuild_cache() {
}
if (count == 0) {
- p.setPen(kTextDim);
+ p.setPen(kTextDim());
p.drawText(rect(), Qt::AlignCenter, "Waiting for trades...");
}
diff --git a/fincept-qt/src/screens/crypto_trading/CryptoTradingScreen.cpp b/fincept-qt/src/screens/crypto_trading/CryptoTradingScreen.cpp
index c2a2cba3b..62cc40dc3 100644
--- a/fincept-qt/src/screens/crypto_trading/CryptoTradingScreen.cpp
+++ b/fincept-qt/src/screens/crypto_trading/CryptoTradingScreen.cpp
@@ -2,6 +2,7 @@
#include "screens/crypto_trading/CryptoTradingScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "screens/crypto_trading/CryptoBottomPanel.h"
#include "screens/crypto_trading/CryptoChart.h"
#include "screens/crypto_trading/CryptoCredentials.h"
@@ -13,6 +14,7 @@
#include "trading/OrderMatcher.h"
#include "trading/PaperTrading.h"
#include "ui/theme/StyleSheets.h"
+#include "ui/theme/Theme.h"
#include <QCompleter>
#include <QDateTime>
@@ -159,7 +161,7 @@ void CryptoTradingScreen::setup_ui() {
// WS status
ws_status_ = new QLabel("REST");
ws_status_->setObjectName("cryptoWsStatus");
- ws_status_->setStyleSheet("color: #ca8a04;");
+ ws_status_->setStyleSheet(QString("color: %1;").arg(ui::colors::WARNING));
cmd_layout->addWidget(ws_status_);
// Clock
@@ -306,7 +308,7 @@ void CryptoTradingScreen::update_clock() {
// Update WS status
const bool connected = ExchangeService::instance().is_ws_connected();
ws_status_->setText(connected ? "LIVE" : "REST");
- ws_status_->setStyleSheet(connected ? "color: #16a34a;" : "color: #ca8a04;");
+ ws_status_->setStyleSheet(QString("color: %1;").arg(connected ? ui::colors::POSITIVE : ui::colors::WARNING));
}
// ============================================================================
@@ -482,12 +484,14 @@ void CryptoTradingScreen::on_exchange_changed(const QString& exchange) {
es.start_ws_stream(selected_symbol_, watchlist_symbols_);
load_portfolio();
async_fetch_candles(selected_symbol_, chart_->current_timeframe());
+ ScreenStateManager::instance().notify_changed(this);
}
void CryptoTradingScreen::on_symbol_selected(const QString& symbol) {
if (symbol.isEmpty() || symbol == selected_symbol_)
return;
switch_symbol(symbol);
+ ScreenStateManager::instance().notify_changed(this);
}
void CryptoTradingScreen::switch_symbol(const QString& symbol) {
@@ -895,4 +899,23 @@ void CryptoTradingScreen::async_set_margin_mode(const QString& mode) {
});
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap CryptoTradingScreen::save_state() const {
+ return {
+ {"exchange_id", exchange_id_},
+ {"selected_symbol", selected_symbol_},
+ };
+}
+
+void CryptoTradingScreen::restore_state(const QVariantMap& state) {
+ const QString exch = state.value("exchange_id", "kraken").toString();
+ const QString sym = state.value("selected_symbol", "BTC/USDT").toString();
+
+ if (exch != exchange_id_)
+ on_exchange_changed(exch);
+ if (sym != selected_symbol_)
+ on_symbol_selected(sym);
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/crypto_trading/CryptoTradingScreen.h b/fincept-qt/src/screens/crypto_trading/CryptoTradingScreen.h
index a196207cc..8571dc71c 100644
--- a/fincept-qt/src/screens/crypto_trading/CryptoTradingScreen.h
+++ b/fincept-qt/src/screens/crypto_trading/CryptoTradingScreen.h
@@ -1,6 +1,7 @@
#pragma once
// Crypto Trading Screen — Bloomberg-style coordinator
+#include "screens/IStatefulScreen.h"
#include "screens/crypto_trading/CryptoTypes.h"
#include "trading/TradingTypes.h"
@@ -29,12 +30,17 @@ class CryptoBottomPanel;
namespace fincept::screens {
-class CryptoTradingScreen : public QWidget {
+class CryptoTradingScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit CryptoTradingScreen(QWidget* parent = nullptr);
~CryptoTradingScreen();
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "crypto_trading"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) override;
diff --git a/fincept-qt/src/screens/crypto_trading/CryptoWatchlist.cpp b/fincept-qt/src/screens/crypto_trading/CryptoWatchlist.cpp
index 68b74d086..eb95a00a9 100644
--- a/fincept-qt/src/screens/crypto_trading/CryptoWatchlist.cpp
+++ b/fincept-qt/src/screens/crypto_trading/CryptoWatchlist.cpp
@@ -1,6 +1,8 @@
// CryptoWatchlist.cpp — compact watchlist, 3-column, no horizontal scroll
#include "screens/crypto_trading/CryptoWatchlist.h"
+#include "ui/theme/Theme.h"
+
#include <QHBoxLayout>
#include <QHeaderView>
#include <QMutexLocker>
@@ -10,16 +12,18 @@
namespace fincept::screens::crypto {
-// ── Static color cache ──────────────────────────────────────────────────────
+using namespace fincept::ui;
+
+// ── Color accessors (theme-aware) ───────────────────────────────────────────
namespace {
-const QColor kColorPrimary("#e5e5e5");
-const QColor kColorDim("#404040");
-const QColor kColorSecondary("#808080");
-const QColor kColorPos("#16a34a");
-const QColor kColorNeg("#dc2626");
-const QColor kColorAmber("#d97706");
-const QColor kRowEven("#080808");
-const QColor kRowOdd("#0c0c0c");
+inline QColor kColorPrimary() { return QColor(colors::TEXT_PRIMARY()); }
+inline QColor kColorDim() { return QColor(colors::TEXT_DIM()); }
+inline QColor kColorSecondary() { return QColor(colors::TEXT_SECONDARY()); }
+inline QColor kColorPos() { return QColor(colors::POSITIVE()); }
+inline QColor kColorNeg() { return QColor(colors::NEGATIVE()); }
+inline QColor kColorAmber() { return QColor(colors::AMBER()); }
+inline QColor kRowEven() { return QColor(colors::BG_BASE()); }
+inline QColor kRowOdd() { return QColor(colors::ROW_ALT()); }
const QColor kRowPosHint(22, 163, 74, 12);
const QColor kRowNegHint(220, 38, 38, 12);
} // namespace
@@ -166,16 +170,16 @@ void CryptoWatchlist::update_prices(const QVector<trading::TickerData>& tickers)
price_str = QString::number(e.price, 'f', 6);
price_item->setText(price_str);
- price_item->setForeground(kColorPrimary);
+ price_item->setForeground(kColorPrimary());
chg_item->setText(QString("%1%").arg(e.change_pct, 0, 'f', 2));
- chg_item->setForeground(e.change_pct >= 0 ? kColorPos : kColorNeg);
+ chg_item->setForeground(e.change_pct >= 0 ? kColorPos() : kColorNeg());
- QColor bg = (i % 2 == 0) ? kRowEven : kRowOdd;
+ QColor bg = (i % 2 == 0) ? kRowEven() : kRowOdd();
if (e.change_pct > 0.0) bg = kRowPosHint;
else if (e.change_pct < 0.0) bg = kRowNegHint;
- sym_item->setForeground(e.symbol == active_symbol_ ? kColorAmber : kColorPrimary);
+ sym_item->setForeground(e.symbol == active_symbol_ ? kColorAmber() : kColorPrimary());
for (int c = 0; c < 3; ++c) {
auto* it = table_->item(i, c);
if (it) it->setBackground(bg);
@@ -229,7 +233,7 @@ void CryptoWatchlist::rebuild_table() {
table_->setRowCount(n);
for (int i = 0; i < n; ++i) {
- const QColor& bg = (i % 2 == 0) ? kRowEven : kRowOdd;
+ const QColor bg = (i % 2 == 0) ? kRowEven() : kRowOdd();
auto ensure = [&](int col, const QString& text, const QColor& fg,
int align = Qt::AlignLeft | Qt::AlignVCenter) {
auto* it = table_->item(i, col);
@@ -239,9 +243,9 @@ void CryptoWatchlist::rebuild_table() {
it->setBackground(bg);
it->setTextAlignment(align);
};
- ensure(0, filtered[i].symbol, kColorPrimary);
- ensure(1, filtered[i].type, kColorSecondary);
- ensure(2, "--", kColorDim, Qt::AlignRight | Qt::AlignVCenter);
+ ensure(0, filtered[i].symbol, kColorPrimary());
+ ensure(1, filtered[i].type, kColorSecondary());
+ ensure(2, "--", kColorDim(), Qt::AlignRight | Qt::AlignVCenter);
}
table_->setUpdatesEnabled(true);
return;
@@ -262,7 +266,7 @@ void CryptoWatchlist::rebuild_table() {
for (int i = 0; i < n; ++i) {
const auto& e = visible[i];
- QColor bg = (i % 2 == 0) ? kRowEven : kRowOdd;
+ QColor bg = (i % 2 == 0) ? kRowEven() : kRowOdd();
if (e.has_data && e.change_pct > 0.0) bg = kRowPosHint;
else if (e.has_data && e.change_pct < 0.0) bg = kRowNegHint;
@@ -276,7 +280,7 @@ void CryptoWatchlist::rebuild_table() {
it->setTextAlignment(align);
};
- QColor sym_color = (e.symbol == active_symbol_) ? kColorAmber : kColorPrimary;
+ QColor sym_color = (e.symbol == active_symbol_) ? kColorAmber() : kColorPrimary();
ensure(0, e.symbol, sym_color);
// Price — adaptive decimal places
@@ -289,12 +293,12 @@ void CryptoWatchlist::rebuild_table() {
else
price_str = QString::number(e.price, 'f', 6);
}
- ensure(1, price_str, e.has_data ? kColorPrimary : kColorDim,
+ ensure(1, price_str, e.has_data ? kColorPrimary() : kColorDim(),
Qt::AlignRight | Qt::AlignVCenter);
ensure(2,
e.has_data ? QString("%1%").arg(e.change_pct, 0, 'f', 2) : QString("--"),
- e.has_data ? (e.change_pct >= 0.0 ? kColorPos : kColorNeg) : kColorDim,
+ e.has_data ? (e.change_pct >= 0.0 ? kColorPos() : kColorNeg()) : kColorDim(),
Qt::AlignRight | Qt::AlignVCenter);
}
table_->setUpdatesEnabled(true);
diff --git a/fincept-qt/src/screens/dashboard/DashboardStatusBar.cpp b/fincept-qt/src/screens/dashboard/DashboardStatusBar.cpp
index f5ea70250..727e4fa46 100644
--- a/fincept-qt/src/screens/dashboard/DashboardStatusBar.cpp
+++ b/fincept-qt/src/screens/dashboard/DashboardStatusBar.cpp
@@ -13,14 +13,9 @@
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);
+ setObjectName("dashStatusBar");
start_time_ = QDateTime::currentMSecsSinceEpoch();
@@ -28,47 +23,46 @@ DashboardStatusBar::DashboardStatusBar(QWidget* parent) : QWidget(parent) {
hl->setContentsMargins(12, 0, 12, 0);
hl->setSpacing(0);
- auto make_lbl = [](const QString& text, const QString& color, bool bold = false) {
+ auto make_lbl = [](const QString& text, const QString& name) {
auto* l = new QLabel(text);
- l->setStyleSheet(lbl_ss(color, bold));
+ l->setObjectName(name);
return l;
};
- auto make_sep = [&]() { return make_lbl("|", ui::colors::BORDER_MED()); };
+ auto make_sep = [&]() { return make_lbl("|", "dsSep"); };
// ── Left ──
auto* left = new QWidget;
- left->setStyleSheet("background:transparent;");
auto* ll = new QHBoxLayout(left);
ll->setContentsMargins(0, 0, 0, 0);
ll->setSpacing(8);
- ll->addWidget(make_lbl("v4.0.0", ui::colors::TEXT_SECONDARY(), true));
+ ll->addWidget(make_lbl("v4.0.0", "dsVersion"));
ll->addWidget(make_sep());
- 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()},
- };
- for (auto& f : feeds)
- ll->addWidget(make_lbl(f.label, f.color, true));
+ const char* feed_names[] = {"EQ", "FX", "CM", "FI", "CR"};
+ for (auto& f : feed_names) {
+ auto* fl = make_lbl(f, "dsFeed");
+ // CM gets warning color — handled in refresh_theme via property
+ if (QString(f) == "CM") fl->setProperty("warn", true);
+ ll->addWidget(fl);
+ }
ll->addWidget(make_sep());
- ll->addWidget(make_lbl("SESSION:", ui::colors::TEXT_SECONDARY()));
+ ll->addWidget(make_lbl("SESSION:", "dsLabel"));
uptime_label_ = new QLabel("00:00:00");
- uptime_label_->setStyleSheet(lbl_ss(ui::colors::CYAN(), true));
+ uptime_label_->setObjectName("dsUptime");
ll->addWidget(uptime_label_);
ll->addWidget(make_sep());
- ll->addWidget(make_lbl("LAYOUT:", ui::colors::TEXT_SECONDARY()));
+ ll->addWidget(make_lbl("LAYOUT:", "dsLabel"));
layout_label_ = new QLabel("ACTIVE");
- layout_label_->setStyleSheet(lbl_ss(ui::colors::POSITIVE(), true));
+ layout_label_->setObjectName("dsLayout");
ll->addWidget(layout_label_);
ll->addWidget(make_sep());
- ll->addWidget(make_lbl("FEEDS:", ui::colors::TEXT_SECONDARY()));
+ ll->addWidget(make_lbl("FEEDS:", "dsLabel"));
feeds_label_ = new QLabel("CONNECTED");
- feeds_label_->setStyleSheet(lbl_ss(ui::colors::POSITIVE(), true));
+ feeds_label_->setObjectName("dsFeeds");
ll->addWidget(feeds_label_);
hl->addWidget(left);
@@ -76,28 +70,25 @@ DashboardStatusBar::DashboardStatusBar(QWidget* parent) : QWidget(parent) {
// ── Right ──
auto* right = new QWidget;
- right->setStyleSheet("background:transparent;");
auto* rl = new QHBoxLayout(right);
rl->setContentsMargins(0, 0, 0, 0);
rl->setSpacing(8);
- rl->addWidget(make_lbl("MEM: OPTIMAL", ui::colors::CYAN()));
+ rl->addWidget(make_lbl("MEM: OPTIMAL", "dsMem"));
rl->addWidget(make_sep());
latency_label_ = new QLabel("LAT: ---");
- latency_label_->setStyleSheet(lbl_ss(ui::colors::TEXT_SECONDARY(), true));
+ latency_label_->setObjectName("dsLatency");
rl->addWidget(latency_label_);
rl->addWidget(make_sep());
- rl->addWidget(make_lbl("● READY", ui::colors::POSITIVE(), true));
+ rl->addWidget(make_lbl(QString::fromUtf8("● READY"), "dsReady"));
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);
@@ -118,8 +109,26 @@ DashboardStatusBar::DashboardStatusBar(QWidget* parent) : QWidget(parent) {
}
void DashboardStatusBar::refresh_theme() {
- setStyleSheet(QString("background:%1;border-top:1px solid %2;")
- .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
+ setStyleSheet(QString(
+ "#dashStatusBar { background:%1; border-top:1px solid %2; }"
+ "#dsSep { color:%3; background:transparent; }"
+ "#dsVersion { color:%4; font-weight:bold; background:transparent; }"
+ "#dsLabel { color:%4; background:transparent; }"
+ "#dsFeed { color:%5; font-weight:bold; background:transparent; }"
+ "#dsFeed[warn=\"true\"] { color:%6; }"
+ "#dsUptime { color:%7; font-weight:bold; background:transparent; }"
+ "#dsLayout { color:%5; font-weight:bold; background:transparent; }"
+ "#dsFeeds { color:%5; font-weight:bold; background:transparent; }"
+ "#dsMem { color:%7; background:transparent; }"
+ "#dsLatency { color:%4; font-weight:bold; background:transparent; }"
+ "#dsReady { color:%5; font-weight:bold; background:transparent; }"
+ ).arg(ui::colors::BG_SURFACE()) // %1
+ .arg(ui::colors::BORDER_DIM()) // %2
+ .arg(ui::colors::BORDER_MED()) // %3
+ .arg(ui::colors::TEXT_SECONDARY())// %4
+ .arg(ui::colors::POSITIVE()) // %5
+ .arg(ui::colors::WARNING()) // %6
+ .arg(ui::colors::CYAN())); // %7
}
void DashboardStatusBar::update_uptime() {
@@ -134,14 +143,16 @@ void DashboardStatusBar::update_uptime() {
void DashboardStatusBar::set_widget_count(int count) {
layout_label_->setText(count > 0 ? "ACTIVE" : "EMPTY");
layout_label_->setStyleSheet(
- lbl_ss(count > 0 ? ui::colors::POSITIVE() : ui::colors::TEXT_SECONDARY(), true));
+ QString("color:%1;font-weight:bold;background:transparent;")
+ .arg(count > 0 ? ui::colors::POSITIVE() : ui::colors::TEXT_SECONDARY()));
}
void DashboardStatusBar::set_connected(bool connected) {
connected_ = connected;
feeds_label_->setText(connected ? "CONNECTED" : "DISCONNECTED");
feeds_label_->setStyleSheet(
- lbl_ss(connected ? ui::colors::POSITIVE() : ui::colors::NEGATIVE(), true));
+ QString("color:%1;font-weight:bold;background:transparent;")
+ .arg(connected ? ui::colors::POSITIVE() : ui::colors::NEGATIVE()));
}
void DashboardStatusBar::ping_api() {
@@ -159,14 +170,16 @@ void DashboardStatusBar::ping_api() {
void DashboardStatusBar::set_latency(int ms) {
if (ms < 0) {
latency_label_->setText("LAT: ERR");
- latency_label_->setStyleSheet(lbl_ss(ui::colors::NEGATIVE(), true));
+ latency_label_->setStyleSheet(
+ QString("color:%1;font-weight:bold;background:transparent;").arg(ui::colors::NEGATIVE()));
return;
}
latency_label_->setText(QString("LAT: %1ms").arg(ms));
const QString color = ms < 100 ? ui::colors::POSITIVE()
: ms < 300 ? ui::colors::AMBER()
: ui::colors::NEGATIVE();
- latency_label_->setStyleSheet(lbl_ss(color, true));
+ latency_label_->setStyleSheet(
+ QString("color:%1;font-weight:bold;background:transparent;").arg(color));
}
void DashboardStatusBar::toggle_notif_panel() {
diff --git a/fincept-qt/src/screens/dashboard/DashboardToolBar.cpp b/fincept-qt/src/screens/dashboard/DashboardToolBar.cpp
index ed12fedd4..684ac60f5 100644
--- a/fincept-qt/src/screens/dashboard/DashboardToolBar.cpp
+++ b/fincept-qt/src/screens/dashboard/DashboardToolBar.cpp
@@ -7,82 +7,69 @@
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);
+ setObjectName("dashToolBar");
auto* hl = new QHBoxLayout(this);
hl->setContentsMargins(12, 0, 12, 0);
hl->setSpacing(0);
auto* left = new QWidget;
- left->setStyleSheet("background:transparent;");
auto* ll = new QHBoxLayout(left);
ll->setContentsMargins(0, 0, 0, 0);
ll->setSpacing(8);
auto make_sep = [&](QBoxLayout* layout) {
auto* s = new QLabel("|");
- s->setStyleSheet(lbl_ss(ui::colors::BORDER_MED()));
+ s->setObjectName("dtSep");
layout->addWidget(s);
};
auto* brand = new QLabel("FINCEPT");
- brand->setStyleSheet(lbl_ss(ui::colors::AMBER(), true) + "letter-spacing:1px;");
+ brand->setObjectName("dtBrand");
ll->addWidget(brand);
auto* sub = new QLabel("TERMINAL");
- sub->setStyleSheet(lbl_ss(ui::colors::TEXT_TERTIARY(), true));
+ sub->setObjectName("dtSub");
ll->addWidget(sub);
make_sep(ll);
status_text_ = new QLabel("LIVE");
- status_text_->setStyleSheet(lbl_ss(ui::colors::POSITIVE(), true));
+ status_text_->setObjectName("dtStatus");
ll->addWidget(status_text_);
make_sep(ll);
clock_label_ = new QLabel;
- clock_label_->setStyleSheet(lbl_ss(ui::colors::TEXT_SECONDARY()));
+ clock_label_->setObjectName("dtClock");
ll->addWidget(clock_label_);
update_clock();
make_sep(ll);
widget_count_ = new QLabel("0 WIDGETS");
- widget_count_->setStyleSheet(lbl_ss(ui::colors::CYAN(), true));
+ widget_count_->setObjectName("dtWidgetCount");
ll->addWidget(widget_count_);
hl->addWidget(left);
hl->addStretch();
auto* right = new QWidget;
- right->setStyleSheet("background:transparent;");
auto* rl = new QHBoxLayout(right);
rl->setContentsMargins(0, 0, 0, 0);
rl->setSpacing(4);
compact_btn_ = new QPushButton("COMPACT");
compact_btn_->setFixedHeight(20);
- compact_btn_->setStyleSheet(btn_ss(ui::colors::BORDER_DIM(), ui::colors::TEXT_SECONDARY()));
+ compact_btn_->setObjectName("dtBtn");
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_ss(ui::colors::BORDER_DIM(), ui::colors::TEXT_SECONDARY()));
+ pulse_btn_->setObjectName("dtBtn");
connect(pulse_btn_, &QPushButton::clicked, this, &DashboardToolBar::toggle_pulse_clicked);
rl->addWidget(pulse_btn_);
@@ -90,19 +77,19 @@ DashboardToolBar::DashboardToolBar(QWidget* parent) : QWidget(parent) {
auto* add_btn = new QPushButton("+ ADD");
add_btn->setFixedHeight(20);
- add_btn->setStyleSheet(btn_ss(ui::colors::AMBER_DIM(), ui::colors::AMBER()));
+ add_btn->setObjectName("dtAddBtn");
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_ss(ui::colors::BORDER_DIM(), ui::colors::TEXT_SECONDARY()));
+ save_btn->setObjectName("dtBtn");
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_ss(ui::colors::NEGATIVE(), ui::colors::NEGATIVE()));
+ reset_btn->setObjectName("dtResetBtn");
connect(reset_btn, &QPushButton::clicked, this, &DashboardToolBar::reset_layout_clicked);
rl->addWidget(reset_btn);
@@ -118,8 +105,34 @@ DashboardToolBar::DashboardToolBar(QWidget* parent) : QWidget(parent) {
}
void DashboardToolBar::refresh_theme() {
- setStyleSheet(QString("background:%1;border-bottom:1px solid %2;")
- .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
+ setStyleSheet(QString(
+ "#dashToolBar { background:%1; border-bottom:1px solid %2; }"
+ "#dtSep { color:%3; background:transparent; }"
+ "#dtBrand { color:%4; font-weight:bold; letter-spacing:1px; background:transparent; }"
+ "#dtSub { color:%5; font-weight:bold; background:transparent; }"
+ "#dtStatus { color:%6; font-weight:bold; background:transparent; }"
+ "#dtClock { color:%7; background:transparent; }"
+ "#dtWidgetCount { color:%8; font-weight:bold; background:transparent; }"
+ "#dtBtn { background:%9; border:1px solid %3; color:%7; padding:0 10px; font-weight:bold; }"
+ "#dtBtn:hover { background:%10; color:%11; border-color:%12; }"
+ "#dtAddBtn { background:%9; border:1px solid %13; color:%4; padding:0 10px; font-weight:bold; }"
+ "#dtAddBtn:hover { background:%10; color:%11; border-color:%12; }"
+ "#dtResetBtn { background:%9; border:1px solid %14; color:%14; padding:0 10px; font-weight:bold; }"
+ "#dtResetBtn:hover { background:%10; color:%11; border-color:%12; }"
+ ).arg(ui::colors::BG_SURFACE()) // %1
+ .arg(ui::colors::BORDER_DIM()) // %2
+ .arg(ui::colors::BORDER_MED()) // %3
+ .arg(ui::colors::AMBER()) // %4
+ .arg(ui::colors::TEXT_TERTIARY()) // %5
+ .arg(ui::colors::POSITIVE()) // %6
+ .arg(ui::colors::TEXT_SECONDARY())// %7
+ .arg(ui::colors::CYAN()) // %8
+ .arg(ui::colors::BG_RAISED()) // %9
+ .arg(ui::colors::BG_HOVER()) // %10
+ .arg(ui::colors::TEXT_PRIMARY()) // %11
+ .arg(ui::colors::BORDER_BRIGHT())// %12
+ .arg(ui::colors::AMBER_DIM()) // %13
+ .arg(ui::colors::NEGATIVE())); // %14
}
void DashboardToolBar::update_clock() {
@@ -133,8 +146,10 @@ void DashboardToolBar::set_widget_count(int count) {
void DashboardToolBar::set_connected(bool connected) {
connected_ = connected;
status_text_->setText(connected ? "LIVE" : "OFFLINE");
+ // refresh_theme handles the base color; override just this label dynamically
status_text_->setStyleSheet(
- lbl_ss(connected ? ui::colors::POSITIVE() : ui::colors::NEGATIVE(), true));
+ QString("color:%1;font-weight:bold;background:transparent;")
+ .arg(connected ? ui::colors::POSITIVE() : ui::colors::NEGATIVE()));
}
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/dashboard/MarketPulsePanel.cpp b/fincept-qt/src/screens/dashboard/MarketPulsePanel.cpp
index db92f3bcf..df7eb58df 100644
--- a/fincept-qt/src/screens/dashboard/MarketPulsePanel.cpp
+++ b/fincept-qt/src/screens/dashboard/MarketPulsePanel.cpp
@@ -47,9 +47,9 @@ MarketPulsePanel::MarketPulsePanel(QWidget* parent) : QWidget(parent) {
vl->addWidget(build_header());
- auto* scroll = new QScrollArea;
- scroll->setWidgetResizable(true);
- scroll->setStyleSheet(
+ scroll_area_ = new QScrollArea;
+ scroll_area_->setWidgetResizable(true);
+ 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;}"
@@ -69,8 +69,8 @@ MarketPulsePanel::MarketPulsePanel(QWidget* parent) : QWidget(parent) {
cl->addWidget(build_market_hours_section());
cl->addStretch();
- scroll->setWidget(content);
- vl->addWidget(scroll, 1);
+ scroll_area_->setWidget(content);
+ vl->addWidget(scroll_area_, 1);
// ── Timers ──
refresh_timer_ = new QTimer(this);
@@ -82,10 +82,159 @@ MarketPulsePanel::MarketPulsePanel(QWidget* parent) : QWidget(parent) {
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()));
- });
+ this, [this](const ui::ThemeTokens&) { refresh_theme(); });
+ refresh_theme();
+}
+
+// ── Theme refresh ────────────────────────────────────────────────────────────
+
+void MarketPulsePanel::refresh_theme() {
+ // ── Root panel ──
setStyleSheet(QString("background:%1;").arg(ui::colors::PANEL()));
+
+ // ── Header bar ──
+ if (header_bar_)
+ header_bar_->setStyleSheet(
+ QString("background: %1; border-bottom: 1px solid %2;")
+ .arg(ui::colors::BG_RAISED(), ui::colors::AMBER_DIM()));
+ if (header_icon_)
+ header_icon_->setStyleSheet(
+ QString("color: %1; font-size: 12px; background: transparent;").arg(ui::colors::AMBER()));
+ if (header_title_)
+ header_title_->setStyleSheet(
+ QString("color: %1; font-size: 10px; font-weight: bold; letter-spacing: 1px; background: transparent;")
+ .arg(ui::colors::AMBER()));
+ if (header_live_dot_)
+ header_live_dot_->setStyleSheet(
+ QString("background: %1; border-radius: 3px;").arg(ui::colors::POSITIVE()));
+
+ // ── Scroll area ──
+ 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()));
+
+ // ── Section headers ──
+ auto style_section = [](SectionHeader& sh, const QString& icon_color) {
+ if (sh.container)
+ sh.container->setStyleSheet(
+ QString("background: %1; border-bottom: 1px solid %2; border-top: 1px solid %2;")
+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));
+ if (sh.icon)
+ sh.icon->setStyleSheet(
+ QString("color: %1; font-size: 10px; background: transparent;").arg(icon_color));
+ if (sh.title)
+ sh.title->setStyleSheet(
+ QString("color: %1; font-size: 9px; font-weight: bold; letter-spacing: 0.5px; background: transparent;")
+ .arg(ui::colors::TEXT_SECONDARY()));
+ };
+
+ style_section(sh_breadth_, ui::colors::CYAN());
+ style_section(sh_gainers_, ui::colors::POSITIVE());
+ style_section(sh_losers_, ui::colors::NEGATIVE());
+ style_section(sh_snapshot_, ui::colors::INFO());
+ style_section(sh_hours_, ui::colors::WARNING());
+
+ // ── Fear & Greed ──
+ if (fg_header_label_)
+ fg_header_label_->setStyleSheet(
+ QString("color: %1; font-size: 9px; font-weight: bold; letter-spacing: 0.5px; background: transparent;")
+ .arg(ui::colors::TEXT_SECONDARY()));
+ if (fg_gauge_icon_)
+ fg_gauge_icon_->setStyleSheet(
+ QString("color: %1; font-size: 12px; background: transparent;").arg(ui::colors::AMBER()));
+ // fg_gradient_bar_ uses fixed colors (red->green gradient), no theme tokens — skip
+ if (fg_score_val_)
+ fg_score_val_->setStyleSheet(
+ QString("color: %1; font-size: 18px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+ if (fg_score_max_)
+ fg_score_max_->setStyleSheet(
+ QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
+ if (fg_sentiment_)
+ fg_sentiment_->setStyleSheet(
+ QString("color: %1; font-size: 9px; font-weight: bold; letter-spacing: 0.5px; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+
+ // ── Market Breadth rows ──
+ auto style_breadth = [](BreadthRow& row) {
+ if (row.name)
+ row.name->setStyleSheet(
+ QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_SECONDARY()));
+ if (row.adv)
+ row.adv->setStyleSheet(
+ QString("color: %1; font-size: 8px; background: transparent;").arg(ui::colors::POSITIVE()));
+ if (row.slash)
+ row.slash->setStyleSheet(
+ QString("color: %1; font-size: 8px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
+ if (row.dec)
+ row.dec->setStyleSheet(
+ QString("color: %1; font-size: 8px; background: transparent;").arg(ui::colors::NEGATIVE()));
+ if (row.green)
+ row.green->setStyleSheet(
+ QString("background: %1; border-radius: 0;").arg(ui::colors::POSITIVE()));
+ if (row.red)
+ row.red->setStyleSheet(
+ QString("background: %1; border-radius: 0;").arg(ui::colors::NEGATIVE()));
+ };
+
+ style_breadth(nyse_row_);
+ style_breadth(nasdaq_row_);
+ style_breadth(sp500_row_);
+
+ // ── Global Snapshot rows ──
+ // Each stat row has a fixed val_color that maps to a specific token.
+ // Re-resolve them here so theme changes take effect.
+ struct StatDef {
+ StatRow& row;
+ QString val_color;
+ };
+ StatDef stat_defs[] = {
+ {vix_row_, ui::colors::WARNING()},
+ {us10y_row_, ui::colors::CYAN()},
+ {dxy_row_, ui::colors::CYAN()},
+ {gold_row_, ui::colors::WARNING()},
+ {oil_row_, ui::colors::CYAN()},
+ {btc_row_, ui::colors::AMBER()},
+ };
+
+ for (auto& sd : stat_defs) {
+ if (sd.row.container)
+ sd.row.container->setStyleSheet(
+ QString("border-bottom: 1px solid %1;").arg(ui::colors::BORDER_DIM()));
+ if (sd.row.name_lbl)
+ sd.row.name_lbl->setStyleSheet(
+ QString("color: %1; font-size: 9px; font-weight: bold; letter-spacing: 0.3px; background: transparent;")
+ .arg(ui::colors::TEXT_SECONDARY()));
+ if (sd.row.val)
+ sd.row.val->setStyleSheet(
+ QString("color: %1; font-size: 10px; font-weight: bold; background: transparent;")
+ .arg(sd.val_color));
+ if (sd.row.chg)
+ sd.row.chg->setStyleSheet(
+ QString("color: %1; font-size: 8px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+ }
+
+ // ── Market Hours rows ──
+ for (auto& hr : hours_rows_) {
+ if (hr.container)
+ hr.container->setStyleSheet(
+ QString("border-bottom: 1px solid %1;").arg(ui::colors::BORDER_DIM()));
+ if (hr.name_lbl)
+ hr.name_lbl->setStyleSheet(
+ QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_SECONDARY()));
+ // dot and status colors are data-driven (open/closed/pre) —
+ // refresh_market_hours() handles those, call it to re-resolve tokens.
+ }
+
+ // Re-resolve data-driven status dot/label colors.
+ refresh_market_hours();
}
void MarketPulsePanel::showEvent(QShowEvent* e) {
@@ -105,31 +254,31 @@ void MarketPulsePanel::hideEvent(QHideEvent* e) {
// ── Header ───────────────────────────────────────────────────────────────────
QWidget* MarketPulsePanel::build_header() {
- auto* bar = new QWidget;
- bar->setFixedHeight(30);
- bar->setStyleSheet(
- QString("background: %1; border-bottom: 1px solid rgba(217,119,6,0.25);").arg(ui::colors::BG_RAISED()));
+ header_bar_ = new QWidget;
+ header_bar_->setFixedHeight(30);
+ header_bar_->setStyleSheet(
+ QString("background: %1; border-bottom: 1px solid %2;").arg(ui::colors::BG_RAISED(), ui::colors::AMBER_DIM()));
- auto* hl = new QHBoxLayout(bar);
+ auto* hl = new QHBoxLayout(header_bar_);
hl->setContentsMargins(12, 0, 12, 0);
- auto* icon = new QLabel(QChar(0x25C8));
- icon->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent;").arg(ui::colors::AMBER()));
- hl->addWidget(icon);
+ header_icon_ = new QLabel(QChar(0x25C8));
+ header_icon_->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent;").arg(ui::colors::AMBER()));
+ hl->addWidget(header_icon_);
- auto* title = new QLabel("MARKET PULSE");
- title->setStyleSheet(
+ header_title_ = new QLabel("MARKET PULSE");
+ header_title_->setStyleSheet(
QString("color: %1; font-size: 10px; font-weight: bold; letter-spacing: 1px; background: transparent;")
.arg(ui::colors::AMBER()));
- hl->addWidget(title);
+ hl->addWidget(header_title_);
hl->addStretch();
- auto* live_dot = new QLabel;
- live_dot->setFixedSize(6, 6);
- live_dot->setStyleSheet(QString("background: %1; border-radius: 3px;").arg(ui::colors::POSITIVE()));
- hl->addWidget(live_dot);
+ header_live_dot_ = new QLabel;
+ header_live_dot_->setFixedSize(6, 6);
+ header_live_dot_->setStyleSheet(QString("background: %1; border-radius: 3px;").arg(ui::colors::POSITIVE()));
+ hl->addWidget(header_live_dot_);
- return bar;
+ return header_bar_;
}
QWidget* MarketPulsePanel::build_section_header(const QString& title, const QString& icon_char,
@@ -153,6 +302,21 @@ QWidget* MarketPulsePanel::build_section_header(const QString& title, const QStr
hl->addWidget(lbl);
hl->addStretch();
+ // Store pointers into the corresponding SectionHeader member
+ // so refresh_theme() can re-apply styles later.
+ SectionHeader* sh = nullptr;
+ if (title == "MARKET BREADTH") sh = &sh_breadth_;
+ else if (title == "TOP GAINERS") sh = &sh_gainers_;
+ else if (title == "TOP LOSERS") sh = &sh_losers_;
+ else if (title == "GLOBAL SNAPSHOT") sh = &sh_snapshot_;
+ else if (title == "MARKET HOURS") sh = &sh_hours_;
+
+ if (sh) {
+ sh->container = w;
+ sh->icon = icn;
+ sh->title = lbl;
+ }
+
return w;
}
@@ -169,16 +333,16 @@ QWidget* MarketPulsePanel::build_fear_greed_section() {
auto* hrl = new QHBoxLayout(header_row);
hrl->setContentsMargins(0, 0, 0, 0);
- auto* label = new QLabel("FEAR & GREED INDEX");
- label->setStyleSheet(
+ fg_header_label_ = new QLabel("FEAR & GREED INDEX");
+ fg_header_label_->setStyleSheet(
QString("color: %1; font-size: 9px; font-weight: bold; letter-spacing: 0.5px; background: transparent;")
.arg(ui::colors::TEXT_SECONDARY()));
- hrl->addWidget(label);
+ hrl->addWidget(fg_header_label_);
hrl->addStretch();
- auto* gauge_icon = new QLabel(QChar(0x25CE));
- gauge_icon->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent;").arg(ui::colors::AMBER()));
- hrl->addWidget(gauge_icon);
+ fg_gauge_icon_ = new QLabel(QChar(0x25CE));
+ fg_gauge_icon_->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent;").arg(ui::colors::AMBER()));
+ hrl->addWidget(fg_gauge_icon_);
vl->addWidget(header_row);
@@ -244,10 +408,10 @@ QWidget* MarketPulsePanel::build_breadth_section() {
auto* tl = new QHBoxLayout(top);
tl->setContentsMargins(0, 0, 0, 0);
- auto* nm = new QLabel(name);
- nm->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
+ row.name = new QLabel(name);
+ row.name->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
.arg(ui::colors::TEXT_SECONDARY()));
- tl->addWidget(nm);
+ tl->addWidget(row.name);
tl->addStretch();
row.adv = new QLabel("--");
@@ -255,10 +419,10 @@ QWidget* MarketPulsePanel::build_breadth_section() {
QString("color: %1; font-size: 8px; background: transparent;").arg(ui::colors::POSITIVE()));
tl->addWidget(row.adv);
- auto* slash = new QLabel("/");
- slash->setStyleSheet(
+ row.slash = new QLabel("/");
+ row.slash->setStyleSheet(
QString("color: %1; font-size: 8px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
- tl->addWidget(slash);
+ tl->addWidget(row.slash);
row.dec = new QLabel("--");
row.dec->setStyleSheet(
@@ -455,6 +619,9 @@ QWidget* MarketPulsePanel::build_global_snapshot_section() {
hl->addWidget(lbl);
hl->addStretch();
+ d.row.container = rw;
+ d.row.name_lbl = lbl;
+
d.row.val = new QLabel("--");
d.row.val->setStyleSheet(
QString("color: %1; font-size: 10px; font-weight: bold; background: transparent;").arg(d.color));
@@ -509,7 +676,9 @@ QWidget* MarketPulsePanel::build_market_hours_section() {
rl->addStretch();
HoursRow hr;
- hr.region = ex.region;
+ hr.container = row;
+ hr.name_lbl = name;
+ hr.region = ex.region;
hr.dot = new QLabel;
hr.dot->setFixedSize(5, 5);
@@ -662,7 +831,7 @@ void MarketPulsePanel::refresh_data() {
sentiment_color = ui::colors::NEGATIVE();
} else if (score <= 40) {
sentiment_text = "FEAR";
- sentiment_color = "#FF6644";
+ sentiment_color = ui::colors::WARNING();
} else if (score <= 60) {
sentiment_text = "NEUTRAL";
sentiment_color = ui::colors::WARNING();
diff --git a/fincept-qt/src/screens/dashboard/MarketPulsePanel.h b/fincept-qt/src/screens/dashboard/MarketPulsePanel.h
index 9ab34be1c..43eab67aa 100644
--- a/fincept-qt/src/screens/dashboard/MarketPulsePanel.h
+++ b/fincept-qt/src/screens/dashboard/MarketPulsePanel.h
@@ -5,6 +5,8 @@
#include <QVBoxLayout>
#include <QWidget>
+class QFrame;
+
namespace fincept::screens {
/// Right-side market pulse panel — Fear/Greed, breadth, top movers, global snapshot, market hours.
@@ -37,21 +39,49 @@ class MarketPulsePanel : public QWidget {
const QString& color);
QWidget* build_breadth_bar(const QString& label, int advancing, int declining);
+ /// Re-apply all token-based styles so a theme switch updates every child widget.
+ void refresh_theme();
+
static QString market_status(const QString& region);
+ // ── Header ──
+ QWidget* header_bar_ = nullptr;
+ QLabel* header_icon_ = nullptr;
+ QLabel* header_title_ = nullptr;
+ QLabel* header_live_dot_ = nullptr;
+
+ // ── Scroll area ──
+ QScrollArea* scroll_area_ = nullptr;
+
+ // ── Section headers (5 total) ──
+ struct SectionHeader {
+ QWidget* container = nullptr;
+ QLabel* icon = nullptr;
+ QLabel* title = nullptr;
+ };
+ SectionHeader sh_breadth_;
+ SectionHeader sh_gainers_;
+ SectionHeader sh_losers_;
+ SectionHeader sh_snapshot_;
+ SectionHeader sh_hours_;
+
// ── Fear & Greed ──
- QLabel* fg_score_val_ = nullptr;
- QLabel* fg_score_max_ = nullptr;
- QLabel* fg_sentiment_ = nullptr;
- QFrame* fg_gradient_bar_= nullptr;
+ QLabel* fg_header_label_ = nullptr;
+ QLabel* fg_gauge_icon_ = nullptr;
+ QLabel* fg_score_val_ = nullptr;
+ QLabel* fg_score_max_ = nullptr;
+ QLabel* fg_sentiment_ = nullptr;
+ QFrame* fg_gradient_bar_ = nullptr;
// ── Market Breadth ──
- // per-exchange: {adv_label, dec_label, green_bar, red_bar}
+ // per-exchange: {name_label, adv_label, slash_label, dec_label, green_bar, red_bar}
struct BreadthRow {
- QLabel* adv = nullptr;
- QLabel* dec = nullptr;
- QWidget* green= nullptr;
- QWidget* red = nullptr;
+ QLabel* name = nullptr;
+ QLabel* adv = nullptr;
+ QLabel* slash = nullptr;
+ QLabel* dec = nullptr;
+ QWidget* green = nullptr;
+ QWidget* red = nullptr;
};
BreadthRow nyse_row_;
BreadthRow nasdaq_row_;
@@ -63,8 +93,10 @@ class MarketPulsePanel : public QWidget {
// ── Global Snapshot ──
struct StatRow {
- QLabel* val = nullptr;
- QLabel* chg = nullptr;
+ QWidget* container = nullptr;
+ QLabel* name_lbl = nullptr;
+ QLabel* val = nullptr;
+ QLabel* chg = nullptr;
};
StatRow vix_row_;
StatRow us10y_row_;
@@ -75,9 +107,11 @@ class MarketPulsePanel : public QWidget {
// ── Market Hours ──
struct HoursRow {
- QLabel* dot = nullptr;
- QLabel* status = nullptr;
- QString region;
+ QWidget* container = nullptr;
+ QLabel* name_lbl = nullptr;
+ QLabel* dot = nullptr;
+ QLabel* status = nullptr;
+ QString region;
};
QVector<HoursRow> hours_rows_;
diff --git a/fincept-qt/src/screens/dashboard/canvas/AddWidgetDialog.cpp b/fincept-qt/src/screens/dashboard/canvas/AddWidgetDialog.cpp
index 5c98f86f8..99c681bd0 100644
--- a/fincept-qt/src/screens/dashboard/canvas/AddWidgetDialog.cpp
+++ b/fincept-qt/src/screens/dashboard/canvas/AddWidgetDialog.cpp
@@ -97,11 +97,13 @@ AddWidgetDialog::AddWidgetDialog(QWidget* parent) : QDialog(parent) {
// ── Scrollable card grid ──
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
- scroll->setStyleSheet("QScrollArea { border: none; background: transparent; }"
- "QScrollBar:vertical { width: 5px; background: transparent; }"
- "QScrollBar::handle:vertical { background: #333; border-radius: 2px; min-height: 20px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }"
- "QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { background: transparent; }");
+ scroll->setStyleSheet(
+ QString("QScrollArea { border: none; background: transparent; }"
+ "QScrollBar:vertical { width: 5px; background: transparent; }"
+ "QScrollBar::handle:vertical { background: %1; border-radius: 2px; min-height: 20px; }"
+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }"
+ "QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { background: transparent; }")
+ .arg(ui::colors::BORDER_BRIGHT));
card_container_ = new QWidget;
card_container_->setStyleSheet("background: transparent;");
@@ -131,11 +133,12 @@ AddWidgetDialog::AddWidgetDialog(QWidget* parent) : QDialog(parent) {
add_btn_->setFixedSize(110, 30);
add_btn_->setCursor(Qt::PointingHandCursor);
add_btn_->setEnabled(false);
- add_btn_->setStyleSheet(QString("QPushButton { background: %1; color: #000; border: none; "
+ add_btn_->setStyleSheet(QString("QPushButton { background: %1; color: %4; border: none; "
"font-size: 10px; font-weight: bold; border-radius: 2px; letter-spacing: 0.5px; }"
- "QPushButton:hover { background: #f59e0b; }"
+ "QPushButton:hover { background: %5; }"
"QPushButton:disabled { background: %2; color: %3; }")
- .arg(ui::colors::AMBER(), ui::colors::BG_RAISED(), ui::colors::TEXT_TERTIARY()));
+ .arg(ui::colors::AMBER(), ui::colors::BG_RAISED(), ui::colors::TEXT_TERTIARY(),
+ ui::colors::BG_BASE(), ui::colors::WARNING()));
connect(add_btn_, &QPushButton::clicked, this, &AddWidgetDialog::confirm);
bot->addWidget(add_btn_);
root->addLayout(bot);
@@ -175,8 +178,9 @@ void AddWidgetDialog::build_category_bar(QVBoxLayout* root) {
"padding: 2px 12px; font-size: 10px; font-weight: bold; "
"letter-spacing: 0.5px; border-radius: 2px; }"
"QPushButton:hover { border-color: %4; color: %4; }"
- "QPushButton:checked { background: %4; color: #000; border-color: %4; }")
- .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_MED(), ui::colors::TEXT_PRIMARY(), accent));
+ "QPushButton:checked { background: %4; color: %5; border-color: %4; }")
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_MED(), ui::colors::TEXT_PRIMARY(),
+ accent, ui::colors::BG_BASE()));
if (cat == "All")
btn->setChecked(true);
diff --git a/fincept-qt/src/screens/dashboard/canvas/PlaceholderOverlay.cpp b/fincept-qt/src/screens/dashboard/canvas/PlaceholderOverlay.cpp
index 7877ff0f2..0a529278b 100644
--- a/fincept-qt/src/screens/dashboard/canvas/PlaceholderOverlay.cpp
+++ b/fincept-qt/src/screens/dashboard/canvas/PlaceholderOverlay.cpp
@@ -1,4 +1,5 @@
#include "screens/dashboard/canvas/PlaceholderOverlay.h"
+#include "ui/theme/Theme.h"
#include <QPainter>
#include <QPen>
@@ -14,10 +15,13 @@ PlaceholderOverlay::PlaceholderOverlay(QWidget* parent) : QWidget(parent) {
void PlaceholderOverlay::paintEvent(QPaintEvent*) {
QPainter p(this);
- // Orange fill, very low alpha — matches react-grid-layout placeholder
- p.fillRect(rect(), QColor(217, 119, 6, 22)); // AMBER at ~9% opacity
- // Dashed orange border
- QPen pen(QColor(217, 119, 6, 180), 1, Qt::DashLine);
+ QColor accent(ui::colors::AMBER());
+ // Accent fill at ~9% opacity
+ accent.setAlpha(22);
+ p.fillRect(rect(), accent);
+ // Dashed accent border
+ accent.setAlpha(180);
+ QPen pen(accent, 1, Qt::DashLine);
p.setPen(pen);
p.drawRect(rect().adjusted(0, 0, -1, -1));
}
diff --git a/fincept-qt/src/screens/dashboard/canvas/TemplatePicker.cpp b/fincept-qt/src/screens/dashboard/canvas/TemplatePicker.cpp
index 6aa98125e..71b076b1b 100644
--- a/fincept-qt/src/screens/dashboard/canvas/TemplatePicker.cpp
+++ b/fincept-qt/src/screens/dashboard/canvas/TemplatePicker.cpp
@@ -24,7 +24,7 @@ class TemplatePreview : public QWidget {
protected:
void paintEvent(QPaintEvent*) override {
QPainter p(this);
- p.fillRect(rect(), QColor("#0a0a0a"));
+ p.fillRect(rect(), QColor(ui::colors::BG_SURFACE()));
const int cols = 12;
const int rows = 14;
diff --git a/fincept-qt/src/screens/dashboard/widgets/BaseWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/BaseWidget.cpp
index 227a72ddc..f6fc68b48 100644
--- a/fincept-qt/src/screens/dashboard/widgets/BaseWidget.cpp
+++ b/fincept-qt/src/screens/dashboard/widgets/BaseWidget.cpp
@@ -108,6 +108,15 @@ void BaseWidget::refresh_base_theme() {
title_bar_->setStyleSheet(
QString("background:%1;border-bottom:1px solid %2;")
.arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));
+ if (title_label_)
+ title_label_->setStyleSheet(
+ QString("color:%1;font-size:9px;font-weight:bold;letter-spacing:0.5px;"
+ "background:transparent;text-transform:uppercase;").arg(accent_color_));
+ if (accent_bar_)
+ accent_bar_->setStyleSheet(QString("background:%1;border-radius:1px;").arg(accent_color_));
+ if (loading_label_)
+ loading_label_->setStyleSheet(
+ QString("color:%1;font-size:9px;background:transparent;").arg(ui::colors::AMBER()));
if (refresh_btn_)
refresh_btn_->setStyleSheet(
QString("QPushButton{color:%1;background:%2;border:1px solid %3;border-radius:2px;padding:0;}"
diff --git a/fincept-qt/src/screens/dashboard/widgets/CommoditiesWidget.h b/fincept-qt/src/screens/dashboard/widgets/CommoditiesWidget.h
index b023343b7..f66b1e578 100644
--- a/fincept-qt/src/screens/dashboard/widgets/CommoditiesWidget.h
+++ b/fincept-qt/src/screens/dashboard/widgets/CommoditiesWidget.h
@@ -1,5 +1,6 @@
#pragma once
#include "screens/dashboard/widgets/QuoteTableWidget.h"
+#include "ui/theme/Theme.h"
namespace fincept::screens::widgets {
@@ -9,8 +10,8 @@ inline QuoteTableWidget* create_commodities_widget(QWidget* parent = nullptr) {
{"GC=F", "Gold"}, {"SI=F", "Silver"}, {"CL=F", "Crude WTI"}, {"BZ=F", "Brent"},
{"NG=F", "Nat Gas"}, {"HG=F", "Copper"}, {"PL=F", "Platinum"}, {"PA=F", "Palladium"},
};
- return new QuoteTableWidget("COMMODITIES", services::MarketDataService::commodity_symbols(), labels, 2, "#ca8a04",
- parent);
+ return new QuoteTableWidget("COMMODITIES", services::MarketDataService::commodity_symbols(), labels, 2,
+ ui::colors::WARNING(), parent);
}
} // namespace fincept::screens::widgets
diff --git a/fincept-qt/src/screens/dashboard/widgets/CryptoWidget.h b/fincept-qt/src/screens/dashboard/widgets/CryptoWidget.h
index 918c4ca3c..a40bd66ec 100644
--- a/fincept-qt/src/screens/dashboard/widgets/CryptoWidget.h
+++ b/fincept-qt/src/screens/dashboard/widgets/CryptoWidget.h
@@ -1,5 +1,6 @@
#pragma once
#include "screens/dashboard/widgets/QuoteTableWidget.h"
+#include "ui/theme/Theme.h"
namespace fincept::screens::widgets {
@@ -9,8 +10,8 @@ inline QuoteTableWidget* create_crypto_widget(QWidget* parent = nullptr) {
{"BTC-USD", "BTC"}, {"ETH-USD", "ETH"}, {"BNB-USD", "BNB"}, {"SOL-USD", "SOL"}, {"XRP-USD", "XRP"},
{"ADA-USD", "ADA"}, {"DOGE-USD", "DOGE"}, {"DOT-USD", "DOT"}, {"LTC-USD", "LTC"},
};
- return new QuoteTableWidget("CRYPTOCURRENCY", services::MarketDataService::crypto_symbols(), labels, 2, "#d97706",
- parent);
+ return new QuoteTableWidget("CRYPTOCURRENCY", services::MarketDataService::crypto_symbols(), labels, 2,
+ ui::colors::AMBER(), parent);
}
} // namespace fincept::screens::widgets
diff --git a/fincept-qt/src/screens/dashboard/widgets/EconomicCalendarWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/EconomicCalendarWidget.cpp
index 78bf65251..6e8c6c578 100644
--- a/fincept-qt/src/screens/dashboard/widgets/EconomicCalendarWidget.cpp
+++ b/fincept-qt/src/screens/dashboard/widgets/EconomicCalendarWidget.cpp
@@ -16,16 +16,14 @@ EconomicCalendarWidget::EconomicCalendarWidget(QWidget* parent)
vl->setSpacing(0);
// Column headers
- auto* header = new QWidget;
- header->setStyleSheet(QString("background: %1;").arg(ui::colors::BG_RAISED()));
- auto* hl = new QHBoxLayout(header);
+ header_widget_ = new QWidget;
+ auto* hl = new QHBoxLayout(header_widget_);
hl->setContentsMargins(8, 4, 8, 4);
auto make_hdr = [&](const QString& text, int stretch, Qt::Alignment align = Qt::AlignLeft) {
auto* lbl = new QLabel(text);
- lbl->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_TERTIARY()));
lbl->setAlignment(align);
+ header_labels_.append(lbl);
hl->addWidget(lbl, stretch);
};
make_hdr("EVENT", 4);
@@ -34,20 +32,15 @@ EconomicCalendarWidget::EconomicCalendarWidget(QWidget* parent)
make_hdr("ACT", 1, Qt::AlignRight);
make_hdr("FCST", 1, Qt::AlignRight);
make_hdr("IMP", 1, Qt::AlignRight);
- vl->addWidget(header);
+ vl->addWidget(header_widget_);
- auto* sep = new QFrame;
- sep->setFixedHeight(1);
- sep->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_DIM()));
- vl->addWidget(sep);
+ header_sep_ = new QFrame;
+ header_sep_->setFixedHeight(1);
+ vl->addWidget(header_sep_);
// Scrollable list
- auto* scroll = new QScrollArea;
- scroll->setWidgetResizable(true);
- scroll->setStyleSheet("QScrollArea { border: none; background: transparent; }"
- "QScrollBar:vertical { width: 4px; background: transparent; }"
- + QString("QScrollBar::handle:vertical { background: %1; border-radius: 2px; min-height: 20px; }").arg(ui::colors::BORDER_MED) +
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }");
+ scroll_area_ = new QScrollArea;
+ scroll_area_->setWidgetResizable(true);
auto* list_widget = new QWidget;
list_widget->setStyleSheet("background: transparent;");
@@ -57,19 +50,43 @@ EconomicCalendarWidget::EconomicCalendarWidget(QWidget* parent)
status_label_ = new QLabel("Loading...");
status_label_->setAlignment(Qt::AlignCenter);
- status_label_->setStyleSheet(
- QString("color: %1; font-size: 10px; padding: 16px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
list_layout_->addWidget(status_label_);
list_layout_->addStretch();
- scroll->setWidget(list_widget);
- vl->addWidget(scroll, 1);
+ scroll_area_->setWidget(list_widget);
+ vl->addWidget(scroll_area_, 1);
connect(this, &BaseWidget::refresh_requested, this, &EconomicCalendarWidget::refresh_data);
+
+ apply_styles();
set_loading(true);
refresh_data();
}
+void EconomicCalendarWidget::apply_styles() {
+ header_widget_->setStyleSheet(
+ QString("background: %1;").arg(ui::colors::BG_RAISED()));
+ for (auto* lbl : header_labels_)
+ lbl->setStyleSheet(
+ QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+ header_sep_->setStyleSheet(
+ QString("background: %1;").arg(ui::colors::BORDER_DIM()));
+ scroll_area_->setStyleSheet(
+ QString("QScrollArea { border: none; background: transparent; }"
+ "QScrollBar:vertical { width: 4px; background: transparent; }"
+ "QScrollBar::handle:vertical { background: %1; border-radius: 2px; min-height: 20px; }"
+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }")
+ .arg(ui::colors::BORDER_MED()));
+ status_label_->setStyleSheet(
+ QString("color: %1; font-size: 10px; padding: 16px; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+}
+
+void EconomicCalendarWidget::on_theme_changed() {
+ apply_styles();
+}
+
void EconomicCalendarWidget::refresh_data() {
set_loading(true);
diff --git a/fincept-qt/src/screens/dashboard/widgets/EconomicCalendarWidget.h b/fincept-qt/src/screens/dashboard/widgets/EconomicCalendarWidget.h
index 0441b0c22..1d3641aeb 100644
--- a/fincept-qt/src/screens/dashboard/widgets/EconomicCalendarWidget.h
+++ b/fincept-qt/src/screens/dashboard/widgets/EconomicCalendarWidget.h
@@ -15,12 +15,20 @@ class EconomicCalendarWidget : public BaseWidget {
public:
explicit EconomicCalendarWidget(QWidget* parent = nullptr);
+ protected:
+ void on_theme_changed() override;
+
private:
+ void apply_styles();
void refresh_data();
void populate(const QJsonArray& events);
+ QWidget* header_widget_ = nullptr;
+ QFrame* header_sep_ = nullptr;
+ QScrollArea* scroll_area_ = nullptr;
QVBoxLayout* list_layout_ = nullptr;
QLabel* status_label_ = nullptr;
+ QVector<QLabel*> header_labels_;
};
} // namespace fincept::screens::widgets
diff --git a/fincept-qt/src/screens/dashboard/widgets/MarketSentimentWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/MarketSentimentWidget.cpp
index d112c1c48..2dad834f0 100644
--- a/fincept-qt/src/screens/dashboard/widgets/MarketSentimentWidget.cpp
+++ b/fincept-qt/src/screens/dashboard/widgets/MarketSentimentWidget.cpp
@@ -10,9 +10,8 @@ MarketSentimentWidget::MarketSentimentWidget(QWidget* parent) : BaseWidget("MARK
vl->setSpacing(8);
// ── Score banner ──
- auto* banner = new QWidget;
- banner->setStyleSheet(QString("background: %1; border-radius: 2px;").arg(ui::colors::BG_RAISED()));
- auto* bl = new QVBoxLayout(banner);
+ banner_ = new QWidget;
+ auto* bl = new QVBoxLayout(banner_);
bl->setContentsMargins(12, 10, 12, 10);
bl->setSpacing(4);
bl->setAlignment(Qt::AlignCenter);
@@ -23,25 +22,19 @@ MarketSentimentWidget::MarketSentimentWidget(QWidget* parent) : BaseWidget("MARK
srl->setAlignment(Qt::AlignCenter);
srl->setSpacing(8);
- auto* arrow = new QLabel(QChar(0x2014)); // em-dash placeholder
- arrow->setStyleSheet(
- QString("font-size: 18px; background: transparent; color: %1;").arg(ui::colors::TEXT_TERTIARY()));
- srl->addWidget(arrow);
+ arrow_label_ = new QLabel(QChar(0x2014)); // em-dash placeholder
+ srl->addWidget(arrow_label_);
score_label_ = new QLabel("--");
- score_label_->setStyleSheet(QString("color: %1; font-size: 24px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_TERTIARY()));
srl->addWidget(score_label_);
bl->addWidget(score_row);
verdict_label_ = new QLabel("LOADING...");
verdict_label_->setAlignment(Qt::AlignCenter);
- verdict_label_->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_TERTIARY()));
bl->addWidget(verdict_label_);
- vl->addWidget(banner);
+ vl->addWidget(banner_);
// ── Sentiment bar ──
auto* bar_container = new QWidget;
@@ -51,15 +44,12 @@ MarketSentimentWidget::MarketSentimentWidget(QWidget* parent) : BaseWidget("MARK
bar_layout->setSpacing(1);
bull_bar_ = new QFrame;
- bull_bar_->setStyleSheet(QString("background: %1; border-radius: 0;").arg(ui::colors::POSITIVE()));
bar_layout->addWidget(bull_bar_, 1);
neutral_bar_ = new QFrame;
- neutral_bar_->setStyleSheet(QString("background: %1; border-radius: 0;").arg(ui::colors::TEXT_TERTIARY()));
bar_layout->addWidget(neutral_bar_, 1);
bear_bar_ = new QFrame;
- bear_bar_->setStyleSheet(QString("background: %1; border-radius: 0;").arg(ui::colors::NEGATIVE()));
bar_layout->addWidget(bear_bar_, 1);
vl->addWidget(bar_container);
@@ -70,66 +60,92 @@ MarketSentimentWidget::MarketSentimentWidget(QWidget* parent) : BaseWidget("MARK
bll->setContentsMargins(0, 0, 0, 0);
bull_label_ = new QLabel("-- BULL");
- bull_label_->setStyleSheet(
- QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::POSITIVE()));
bll->addWidget(bull_label_);
bll->addStretch();
neutral_label_ = new QLabel("-- NEUTRAL");
- neutral_label_->setStyleSheet(
- QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
bll->addWidget(neutral_label_);
bll->addStretch();
bear_label_ = new QLabel("-- BEAR");
- bear_label_->setStyleSheet(
- QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::NEGATIVE()));
bll->addWidget(bear_label_);
vl->addWidget(bar_labels);
// ── VIX and Breadth ──
- auto* sep = new QFrame;
- sep->setFixedHeight(1);
- sep->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_DIM()));
- vl->addWidget(sep);
+ separator_ = new QFrame;
+ separator_->setFixedHeight(1);
+ vl->addWidget(separator_);
auto* stats = new QWidget;
auto* stl = new QVBoxLayout(stats);
stl->setContentsMargins(0, 4, 0, 0);
stl->setSpacing(4);
- auto make_stat_row = [&](const QString& label, QLabel*& val_out) {
+ auto make_stat_row = [&](const QString& label, QLabel*& title_out, QLabel*& val_out) {
auto* row = new QWidget;
auto* rl = new QHBoxLayout(row);
rl->setContentsMargins(0, 0, 0, 0);
- auto* lbl = new QLabel(label);
- lbl->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_TERTIARY()));
- rl->addWidget(lbl);
+ title_out = new QLabel(label);
+ rl->addWidget(title_out);
rl->addStretch();
val_out = new QLabel("--");
- val_out->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_PRIMARY()));
rl->addWidget(val_out);
stl->addWidget(row);
};
- make_stat_row("VIX (Fear Gauge)", vix_label_);
- make_stat_row("Advance/Decline", breadth_label_);
+ make_stat_row("VIX (Fear Gauge)", vix_title_label_, vix_label_);
+ make_stat_row("Advance/Decline", breadth_title_label_, breadth_label_);
vl->addWidget(stats);
vl->addStretch();
connect(this, &BaseWidget::refresh_requested, this, &MarketSentimentWidget::refresh_data);
+ apply_styles();
set_loading(true);
refresh_data();
}
+void MarketSentimentWidget::apply_styles() {
+ banner_->setStyleSheet(QString("background: %1; border-radius: 2px;").arg(ui::colors::BG_RAISED()));
+ arrow_label_->setStyleSheet(
+ QString("font-size: 18px; background: transparent; color: %1;").arg(ui::colors::TEXT_TERTIARY()));
+ score_label_->setStyleSheet(QString("color: %1; font-size: 24px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+ verdict_label_->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+
+ bull_bar_->setStyleSheet(QString("background: %1; border-radius: 0;").arg(ui::colors::POSITIVE()));
+ neutral_bar_->setStyleSheet(QString("background: %1; border-radius: 0;").arg(ui::colors::TEXT_TERTIARY()));
+ bear_bar_->setStyleSheet(QString("background: %1; border-radius: 0;").arg(ui::colors::NEGATIVE()));
+
+ bull_label_->setStyleSheet(
+ QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::POSITIVE()));
+ neutral_label_->setStyleSheet(
+ QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
+ bear_label_->setStyleSheet(
+ QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::NEGATIVE()));
+
+ separator_->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_DIM()));
+
+ vix_title_label_->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+ breadth_title_label_->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+ vix_label_->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_PRIMARY()));
+ breadth_label_->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_PRIMARY()));
+}
+
+void MarketSentimentWidget::on_theme_changed() {
+ apply_styles();
+}
+
void MarketSentimentWidget::refresh_data() {
set_loading(true);
diff --git a/fincept-qt/src/screens/dashboard/widgets/MarketSentimentWidget.h b/fincept-qt/src/screens/dashboard/widgets/MarketSentimentWidget.h
index a7d196e74..4a9d5b54a 100644
--- a/fincept-qt/src/screens/dashboard/widgets/MarketSentimentWidget.h
+++ b/fincept-qt/src/screens/dashboard/widgets/MarketSentimentWidget.h
@@ -15,7 +15,11 @@ class MarketSentimentWidget : public BaseWidget {
public:
explicit MarketSentimentWidget(QWidget* parent = nullptr);
+ protected:
+ void on_theme_changed() override;
+
private:
+ void apply_styles();
void refresh_data();
void populate(const QVector<services::QuoteData>& quotes);
@@ -29,6 +33,13 @@ class MarketSentimentWidget : public BaseWidget {
QFrame* neutral_bar_ = nullptr;
QLabel* vix_label_ = nullptr;
QLabel* breadth_label_ = nullptr;
+
+ // Widgets needing theme-aware restyling
+ QWidget* banner_ = nullptr;
+ QLabel* arrow_label_ = nullptr;
+ QFrame* separator_ = nullptr;
+ QLabel* vix_title_label_ = nullptr;
+ QLabel* breadth_title_label_ = nullptr;
};
} // namespace fincept::screens::widgets
diff --git a/fincept-qt/src/screens/dashboard/widgets/NewsWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/NewsWidget.cpp
index ea48cb083..9afdfdca7 100644
--- a/fincept-qt/src/screens/dashboard/widgets/NewsWidget.cpp
+++ b/fincept-qt/src/screens/dashboard/widgets/NewsWidget.cpp
@@ -10,12 +10,8 @@
namespace fincept::screens::widgets {
NewsWidget::NewsWidget(QWidget* parent) : BaseWidget("MARKET NEWS", parent, ui::colors::CYAN) {
- auto* scroll = new QScrollArea;
- scroll->setWidgetResizable(true);
- scroll->setStyleSheet("QScrollArea { border: none; background: transparent; }"
- "QScrollBar:vertical { width: 6px; background: transparent; }"
- + QString("QScrollBar::handle:vertical { background: %1; border-radius: 3px; }").arg(ui::colors::BORDER_MED) +
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }");
+ scroll_area_ = new QScrollArea;
+ scroll_area_->setWidgetResizable(true);
auto* container = new QWidget;
news_layout_ = new QVBoxLayout(container);
@@ -23,15 +19,29 @@ NewsWidget::NewsWidget(QWidget* parent) : BaseWidget("MARKET NEWS", parent, ui::
news_layout_->setSpacing(0);
news_layout_->addStretch();
- scroll->setWidget(container);
- content_layout()->addWidget(scroll);
+ scroll_area_->setWidget(container);
+ content_layout()->addWidget(scroll_area_);
connect(this, &BaseWidget::refresh_requested, this, &NewsWidget::refresh_data);
+ apply_styles();
set_loading(true);
refresh_data();
}
+void NewsWidget::apply_styles() {
+ scroll_area_->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()));
+}
+
+void NewsWidget::on_theme_changed() {
+ apply_styles();
+}
+
void NewsWidget::refresh_data() {
set_loading(true);
diff --git a/fincept-qt/src/screens/dashboard/widgets/NewsWidget.h b/fincept-qt/src/screens/dashboard/widgets/NewsWidget.h
index 52f08964d..2c7cdbb8c 100644
--- a/fincept-qt/src/screens/dashboard/widgets/NewsWidget.h
+++ b/fincept-qt/src/screens/dashboard/widgets/NewsWidget.h
@@ -11,10 +11,15 @@ class NewsWidget : public BaseWidget {
public:
explicit NewsWidget(QWidget* parent = nullptr);
+ protected:
+ void on_theme_changed() override;
+
private:
+ void apply_styles();
void refresh_data();
void populate(const QJsonArray& articles);
+ QScrollArea* scroll_area_ = nullptr;
QVBoxLayout* news_layout_ = nullptr;
};
diff --git a/fincept-qt/src/screens/dashboard/widgets/PerformanceWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/PerformanceWidget.cpp
index 6677b45fa..da5372e05 100644
--- a/fincept-qt/src/screens/dashboard/widgets/PerformanceWidget.cpp
+++ b/fincept-qt/src/screens/dashboard/widgets/PerformanceWidget.cpp
@@ -18,25 +18,19 @@ PerformanceWidget::PerformanceWidget(QWidget* parent)
for (const auto& label : labels) {
auto* row = new QWidget;
- row->setStyleSheet(QString("border-bottom: 1px solid %1;").arg(ui::colors::BORDER_DIM()));
auto* rl = new QHBoxLayout(row);
rl->setContentsMargins(8, 4, 8, 4);
MetricRow mr;
+ mr.row_widget = row;
mr.label = new QLabel(label);
- mr.label->setStyleSheet(
- QString("color: %1; font-size: 11px; background: transparent;").arg(ui::colors::TEXT_SECONDARY()));
rl->addWidget(mr.label);
rl->addStretch();
mr.period = new QLabel("TODAY");
- mr.period->setStyleSheet(
- QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
rl->addWidget(mr.period);
mr.value = new QLabel("--");
- mr.value->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_PRIMARY()));
rl->addWidget(mr.value);
rows_.append(mr);
@@ -46,10 +40,29 @@ PerformanceWidget::PerformanceWidget(QWidget* parent)
connect(this, &BaseWidget::refresh_requested, this, &PerformanceWidget::refresh_data);
+ apply_styles();
set_loading(true);
refresh_data();
}
+void PerformanceWidget::apply_styles() {
+ for (const auto& mr : rows_) {
+ mr.row_widget->setStyleSheet(
+ QString("border-bottom: 1px solid %1;").arg(ui::colors::BORDER_DIM()));
+ mr.label->setStyleSheet(
+ QString("color: %1; font-size: 11px; background: transparent;").arg(ui::colors::TEXT_SECONDARY()));
+ mr.period->setStyleSheet(
+ QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
+ mr.value->setStyleSheet(
+ QString("color: %1; font-size: 11px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_PRIMARY()));
+ }
+}
+
+void PerformanceWidget::on_theme_changed() {
+ apply_styles();
+}
+
void PerformanceWidget::refresh_data() {
set_loading(true);
diff --git a/fincept-qt/src/screens/dashboard/widgets/PerformanceWidget.h b/fincept-qt/src/screens/dashboard/widgets/PerformanceWidget.h
index 9c8ca45f9..6511ff1e2 100644
--- a/fincept-qt/src/screens/dashboard/widgets/PerformanceWidget.h
+++ b/fincept-qt/src/screens/dashboard/widgets/PerformanceWidget.h
@@ -13,11 +13,16 @@ class PerformanceWidget : public BaseWidget {
public:
explicit PerformanceWidget(QWidget* parent = nullptr);
+ protected:
+ void on_theme_changed() override;
+
private:
+ void apply_styles();
void refresh_data();
void populate(const QVector<services::QuoteData>& quotes);
struct MetricRow {
+ QWidget* row_widget = nullptr;
QLabel* label = nullptr;
QLabel* value = nullptr;
QLabel* period = nullptr;
diff --git a/fincept-qt/src/screens/dashboard/widgets/PortfolioSummaryWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/PortfolioSummaryWidget.cpp
index 48bbe7775..ff9047034 100644
--- a/fincept-qt/src/screens/dashboard/widgets/PortfolioSummaryWidget.cpp
+++ b/fincept-qt/src/screens/dashboard/widgets/PortfolioSummaryWidget.cpp
@@ -22,22 +22,19 @@ PortfolioSummaryWidget::PortfolioSummaryWidget(QWidget* parent)
vl->setSpacing(6);
// ── Summary card ──
- auto* summary = new QWidget;
- summary->setStyleSheet(QString("background: %1; border-radius: 2px;").arg(ui::colors::BG_RAISED));
- auto* sl = new QGridLayout(summary);
+ summary_card_ = new QWidget;
+ auto* sl = new QGridLayout(summary_card_);
sl->setContentsMargins(10, 8, 10, 8);
sl->setHorizontalSpacing(16);
sl->setVerticalSpacing(4);
auto make_metric = [&](const QString& label, QLabel*& value_out, int row, int col) {
auto* lbl = new QLabel(label);
- lbl->setStyleSheet(
- QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_TERTIARY));
+ metric_labels_.append(lbl);
sl->addWidget(lbl, row * 2, col);
value_out = new QLabel("--");
- value_out->setStyleSheet(QString("color: %1; font-size: 13px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_PRIMARY));
+ metric_values_.append(value_out);
sl->addWidget(value_out, row * 2 + 1, col);
};
@@ -46,19 +43,17 @@ PortfolioSummaryWidget::PortfolioSummaryWidget(QWidget* parent)
make_metric("TOTAL P&L", total_pnl_lbl_, 1, 0);
make_metric("HOLDINGS", num_holdings_lbl_, 1, 1);
- vl->addWidget(summary);
+ vl->addWidget(summary_card_);
// ── Holdings list header ──
- auto* hdr = new QWidget;
- hdr->setStyleSheet(QString("background: %1;").arg(ui::colors::BG_RAISED));
- auto* hl = new QHBoxLayout(hdr);
+ header_row_ = new QWidget;
+ auto* hl = new QHBoxLayout(header_row_);
hl->setContentsMargins(8, 3, 8, 3);
auto make_hdr_lbl = [&](const QString& t, int s, Qt::Alignment a = Qt::AlignLeft) {
auto* l = new QLabel(t);
- l->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_TERTIARY));
l->setAlignment(a);
+ header_labels_.append(l);
hl->addWidget(l, s);
};
make_hdr_lbl("SYM", 1);
@@ -66,15 +61,11 @@ PortfolioSummaryWidget::PortfolioSummaryWidget(QWidget* parent)
make_hdr_lbl("PRICE", 1, Qt::AlignRight);
make_hdr_lbl("VALUE", 1, Qt::AlignRight);
make_hdr_lbl("P&L", 1, Qt::AlignRight);
- vl->addWidget(hdr);
+ vl->addWidget(header_row_);
// Scrollable holdings list
- auto* scroll = new QScrollArea;
- scroll->setWidgetResizable(true);
- scroll->setStyleSheet("QScrollArea { border: none; background: transparent; }"
- "QScrollBar:vertical { width: 4px; background: transparent; }"
- + QString("QScrollBar::handle:vertical { background: %1; border-radius: 2px; min-height: 20px; }").arg(ui::colors::BORDER_MED) +
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }");
+ scroll_area_ = new QScrollArea;
+ scroll_area_->setWidgetResizable(true);
auto* list_widget = new QWidget;
list_widget->setStyleSheet("background: transparent;");
@@ -83,14 +74,44 @@ PortfolioSummaryWidget::PortfolioSummaryWidget(QWidget* parent)
list_layout_->setSpacing(0);
list_layout_->addStretch();
- scroll->setWidget(list_widget);
- vl->addWidget(scroll, 1);
+ scroll_area_->setWidget(list_widget);
+ vl->addWidget(scroll_area_, 1);
connect(this, &BaseWidget::refresh_requested, this, [this] { load_holdings(); });
+
+ apply_styles();
set_loading(true);
load_holdings();
}
+void PortfolioSummaryWidget::apply_styles() {
+ summary_card_->setStyleSheet(
+ QString("background: %1; border-radius: 2px;").arg(ui::colors::BG_RAISED()));
+ for (auto* lbl : metric_labels_)
+ lbl->setStyleSheet(
+ QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
+ for (auto* val : metric_values_)
+ val->setStyleSheet(
+ QString("color: %1; font-size: 13px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_PRIMARY()));
+ header_row_->setStyleSheet(
+ QString("background: %1;").arg(ui::colors::BG_RAISED()));
+ for (auto* lbl : header_labels_)
+ lbl->setStyleSheet(
+ QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+ scroll_area_->setStyleSheet(
+ QString("QScrollArea { border: none; background: transparent; }"
+ "QScrollBar:vertical { width: 4px; background: transparent; }"
+ "QScrollBar::handle:vertical { background: %1; border-radius: 2px; min-height: 20px; }"
+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }")
+ .arg(ui::colors::BORDER_MED()));
+}
+
+void PortfolioSummaryWidget::on_theme_changed() {
+ apply_styles();
+}
+
void PortfolioSummaryWidget::load_holdings() {
QVector<Holding> holdings;
diff --git a/fincept-qt/src/screens/dashboard/widgets/PortfolioSummaryWidget.h b/fincept-qt/src/screens/dashboard/widgets/PortfolioSummaryWidget.h
index a4678fc64..20453c62f 100644
--- a/fincept-qt/src/screens/dashboard/widgets/PortfolioSummaryWidget.h
+++ b/fincept-qt/src/screens/dashboard/widgets/PortfolioSummaryWidget.h
@@ -2,7 +2,9 @@
#include "screens/dashboard/widgets/BaseWidget.h"
#include "services/markets/MarketDataService.h"
+#include <QGridLayout>
#include <QLabel>
+#include <QScrollArea>
#include <QVBoxLayout>
namespace fincept::screens::widgets {
@@ -21,6 +23,13 @@ class PortfolioSummaryWidget : public BaseWidget {
double avg_cost = 0;
};
+ protected:
+ void on_theme_changed() override;
+
+ private:
+ void apply_styles();
+
+ public:
void load_holdings();
void fetch_prices(const QVector<Holding>& holdings);
void render(const QVector<Holding>& holdings, const QVector<services::QuoteData>& quotes);
@@ -33,6 +42,14 @@ class PortfolioSummaryWidget : public BaseWidget {
// Holdings list layout
QVBoxLayout* list_layout_ = nullptr;
+
+ // Widgets needing theme refresh
+ QWidget* summary_card_ = nullptr;
+ QWidget* header_row_ = nullptr;
+ QScrollArea* scroll_area_ = nullptr;
+ QVector<QLabel*> metric_labels_;
+ QVector<QLabel*> metric_values_;
+ QVector<QLabel*> header_labels_;
};
} // namespace fincept::screens::widgets
diff --git a/fincept-qt/src/screens/dashboard/widgets/QuickTradeWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/QuickTradeWidget.cpp
index 66e30d086..b5f716011 100644
--- a/fincept-qt/src/screens/dashboard/widgets/QuickTradeWidget.cpp
+++ b/fincept-qt/src/screens/dashboard/widgets/QuickTradeWidget.cpp
@@ -42,36 +42,23 @@ QuickTradeWidget::QuickTradeWidget(QWidget* parent) : BaseWidget("QUICK TRADE",
symbol_input_ = new QLineEdit;
symbol_input_->setPlaceholderText("Symbol (e.g. AAPL)");
- symbol_input_->setStyleSheet(input_style());
symbol_input_->setText("AAPL");
srl->addWidget(symbol_input_, 1);
lookup_btn_ = new QPushButton("LOOKUP");
- lookup_btn_->setStyleSheet(QString("QPushButton { background: %1; color: %2; border: 1px solid %3; "
- "font-size: 10px; font-weight: bold; padding: 4px 10px; }"
- "QPushButton:hover { background: %4; }")
- .arg(ui::colors::BG_RAISED())
- .arg(ui::colors::AMBER())
- .arg(ui::colors::AMBER())
- .arg(ui::colors::BG_HOVER()));
srl->addWidget(lookup_btn_);
vl->addWidget(search_row);
// ── Quote display ──
- auto* quote_card = new QWidget;
- quote_card->setStyleSheet(QString("background: %1; border-radius: 2px;").arg(ui::colors::BG_RAISED()));
- auto* qcl = new QHBoxLayout(quote_card);
+ quote_card_ = new QWidget;
+ auto* qcl = new QHBoxLayout(quote_card_);
qcl->setContentsMargins(10, 8, 10, 8);
qcl->setSpacing(12);
auto* sym_col = new QVBoxLayout;
sym_label_ = new QLabel("--");
- sym_label_->setStyleSheet(QString("color: %1; font-size: 14px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_PRIMARY()));
sym_col->addWidget(sym_label_);
change_label_ = new QLabel("--");
- change_label_->setStyleSheet(
- QString("color: %1; font-size: 10px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
sym_col->addWidget(change_label_);
qcl->addLayout(sym_col);
@@ -81,28 +68,23 @@ QuickTradeWidget::QuickTradeWidget(QWidget* parent) : BaseWidget("QUICK TRADE",
price_col->setAlignment(Qt::AlignRight);
price_label_ = new QLabel("--");
price_label_->setAlignment(Qt::AlignRight);
- price_label_->setStyleSheet(QString("color: %1; font-size: 20px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_PRIMARY()));
price_col->addWidget(price_label_);
auto* bid_ask_row = new QHBoxLayout;
bid_label_ = new QLabel("BID --");
- bid_label_->setStyleSheet(QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::POSITIVE()));
bid_ask_row->addWidget(bid_label_);
bid_ask_row->addSpacing(8);
ask_label_ = new QLabel("ASK --");
- ask_label_->setStyleSheet(QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::NEGATIVE()));
bid_ask_row->addWidget(ask_label_);
price_col->addLayout(bid_ask_row);
qcl->addLayout(price_col);
- vl->addWidget(quote_card);
+ vl->addWidget(quote_card_);
// ── Separator ──
- auto* sep = new QFrame;
- sep->setFixedHeight(1);
- sep->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_DIM()));
- vl->addWidget(sep);
+ separator_ = new QFrame;
+ separator_->setFixedHeight(1);
+ vl->addWidget(separator_);
// ── Order form ──
// Side + Type row
@@ -111,12 +93,10 @@ QuickTradeWidget::QuickTradeWidget(QWidget* parent) : BaseWidget("QUICK TRADE",
side_combo_ = new QComboBox;
side_combo_->addItems({"BUY", "SELL", "SHORT"});
- side_combo_->setStyleSheet(combo_style());
st_row->addWidget(side_combo_, 1);
order_type_ = new QComboBox;
order_type_->addItems({"MARKET", "LIMIT", "STOP"});
- order_type_->setStyleSheet(combo_style());
st_row->addWidget(order_type_, 1);
vl->addLayout(st_row);
@@ -124,44 +104,28 @@ QuickTradeWidget::QuickTradeWidget(QWidget* parent) : BaseWidget("QUICK TRADE",
auto* qp_row = new QHBoxLayout;
qp_row->setSpacing(6);
- auto* qty_lbl = new QLabel("QTY");
- qty_lbl->setStyleSheet(
- QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
- qp_row->addWidget(qty_lbl);
+ qty_lbl_ = new QLabel("QTY");
+ qp_row->addWidget(qty_lbl_);
qty_input_ = new QLineEdit("10");
- qty_input_->setStyleSheet(input_style());
qty_input_->setValidator(new QDoubleValidator(0, 1e9, 4, qty_input_));
qp_row->addWidget(qty_input_, 1);
- auto* price_lbl = new QLabel("PRICE");
- price_lbl->setStyleSheet(
- QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
- qp_row->addWidget(price_lbl);
+ price_lbl_ = new QLabel("PRICE");
+ qp_row->addWidget(price_lbl_);
price_input_ = new QLineEdit;
price_input_->setPlaceholderText("market");
- price_input_->setStyleSheet(input_style(ui::colors::BORDER_DIM()));
qp_row->addWidget(price_input_, 1);
vl->addLayout(qp_row);
// Estimated total
est_total_ = new QLabel("EST. TOTAL --");
- est_total_->setStyleSheet(
- QString("color: %1; font-size: 10px; background: transparent;").arg(ui::colors::TEXT_SECONDARY()));
vl->addWidget(est_total_);
// Submit button
submit_btn_ = new QPushButton("PLACE ORDER");
submit_btn_->setFixedHeight(32);
- submit_btn_->setStyleSheet(QString("QPushButton { background: %1; color: #ffffff; border: none; "
- "font-size: 11px; font-weight: bold; }"
- "QPushButton:hover { background: %2; }"
- "QPushButton:disabled { background: %3; color: %4; }")
- .arg(ui::colors::POSITIVE())
- .arg(ui::colors::POSITIVE())
- .arg(ui::colors::BG_RAISED())
- .arg(ui::colors::TEXT_TERTIARY()));
vl->addWidget(submit_btn_);
// ── Connections ──
@@ -182,11 +146,56 @@ QuickTradeWidget::QuickTradeWidget(QWidget* parent) : BaseWidget("QUICK TRADE",
});
connect(this, &BaseWidget::refresh_requested, this, &QuickTradeWidget::lookup_symbol);
+ apply_styles();
+
// Initial lookup
set_loading(true);
lookup_symbol();
}
+void QuickTradeWidget::apply_styles() {
+ symbol_input_->setStyleSheet(input_style());
+ lookup_btn_->setStyleSheet(QString("QPushButton { background: %1; color: %2; border: 1px solid %3; "
+ "font-size: 10px; font-weight: bold; padding: 4px 10px; }"
+ "QPushButton:hover { background: %4; }")
+ .arg(ui::colors::BG_RAISED())
+ .arg(ui::colors::AMBER())
+ .arg(ui::colors::AMBER())
+ .arg(ui::colors::BG_HOVER()));
+
+ quote_card_->setStyleSheet(QString("background: %1; border-radius: 2px;").arg(ui::colors::BG_RAISED()));
+ sym_label_->setStyleSheet(QString("color: %1; font-size: 14px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_PRIMARY()));
+ change_label_->setStyleSheet(
+ QString("color: %1; font-size: 10px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
+ price_label_->setStyleSheet(QString("color: %1; font-size: 20px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_PRIMARY()));
+ bid_label_->setStyleSheet(QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::POSITIVE()));
+ ask_label_->setStyleSheet(QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::NEGATIVE()));
+
+ separator_->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_DIM()));
+
+ side_combo_->setStyleSheet(combo_style());
+ order_type_->setStyleSheet(combo_style());
+
+ qty_lbl_->setStyleSheet(
+ QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
+ qty_input_->setStyleSheet(input_style());
+ price_lbl_->setStyleSheet(
+ QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
+ price_input_->setStyleSheet(input_style(ui::colors::BORDER_DIM()));
+
+ est_total_->setStyleSheet(
+ QString("color: %1; font-size: 10px; background: transparent;").arg(ui::colors::TEXT_SECONDARY()));
+
+ // Submit button color depends on current side selection
+ on_side_changed(side_combo_->currentIndex());
+}
+
+void QuickTradeWidget::on_theme_changed() {
+ apply_styles();
+}
+
void QuickTradeWidget::lookup_symbol() {
QString sym = symbol_input_->text().trimmed().toUpper();
if (sym.isEmpty()) {
@@ -233,11 +242,10 @@ void QuickTradeWidget::on_side_changed(int idx) {
// BUY = green, SELL/SHORT = red
QString color = (idx == 0) ? ui::colors::POSITIVE() : ui::colors::NEGATIVE();
submit_btn_->setText(idx == 0 ? "PLACE BUY ORDER" : idx == 1 ? "PLACE SELL ORDER" : "PLACE SHORT ORDER");
- submit_btn_->setStyleSheet(QString("QPushButton { background: %1; color: #ffffff; border: none; "
+ submit_btn_->setStyleSheet(QString("QPushButton { background: %1; color: %3; border: none; "
"font-size: 11px; font-weight: bold; }"
"QPushButton:hover { background: %2; }")
- .arg(color)
- .arg(color));
+ .arg(color, color, ui::colors::TEXT_PRIMARY()));
}
void QuickTradeWidget::submit_order() {
diff --git a/fincept-qt/src/screens/dashboard/widgets/QuickTradeWidget.h b/fincept-qt/src/screens/dashboard/widgets/QuickTradeWidget.h
index 0f4c649c7..f93c87197 100644
--- a/fincept-qt/src/screens/dashboard/widgets/QuickTradeWidget.h
+++ b/fincept-qt/src/screens/dashboard/widgets/QuickTradeWidget.h
@@ -3,6 +3,7 @@
#include "services/markets/MarketDataService.h"
#include <QComboBox>
+#include <QFrame>
#include <QLabel>
#include <QLineEdit>
#include <QPushButton>
@@ -17,7 +18,11 @@ class QuickTradeWidget : public BaseWidget {
public:
explicit QuickTradeWidget(QWidget* parent = nullptr);
+ protected:
+ void on_theme_changed() override;
+
private:
+ void apply_styles();
void lookup_symbol();
void on_side_changed(int idx);
void submit_order();
@@ -43,6 +48,12 @@ class QuickTradeWidget : public BaseWidget {
double current_price_ = 0;
QString current_symbol_;
+
+ // Widgets needing theme-aware restyling
+ QWidget* quote_card_ = nullptr;
+ QFrame* separator_ = nullptr;
+ QLabel* qty_lbl_ = nullptr;
+ QLabel* price_lbl_ = nullptr;
};
} // namespace fincept::screens::widgets
diff --git a/fincept-qt/src/screens/dashboard/widgets/QuoteTableWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/QuoteTableWidget.cpp
index f00989d18..ee05cba06 100644
--- a/fincept-qt/src/screens/dashboard/widgets/QuoteTableWidget.cpp
+++ b/fincept-qt/src/screens/dashboard/widgets/QuoteTableWidget.cpp
@@ -20,10 +20,19 @@ QuoteTableWidget::QuoteTableWidget(const QString& title, const QStringList& symb
connect(this, &BaseWidget::refresh_requested, this, &QuoteTableWidget::refresh_data);
+ apply_styles();
set_loading(true);
refresh_data();
}
+void QuoteTableWidget::apply_styles() {
+ // QuoteTableWidget delegates styling to DataTable; nothing extra needed.
+}
+
+void QuoteTableWidget::on_theme_changed() {
+ apply_styles();
+}
+
void QuoteTableWidget::refresh_data() {
set_loading(true);
diff --git a/fincept-qt/src/screens/dashboard/widgets/QuoteTableWidget.h b/fincept-qt/src/screens/dashboard/widgets/QuoteTableWidget.h
index 9c9fb1974..df454ed62 100644
--- a/fincept-qt/src/screens/dashboard/widgets/QuoteTableWidget.h
+++ b/fincept-qt/src/screens/dashboard/widgets/QuoteTableWidget.h
@@ -22,7 +22,11 @@ class QuoteTableWidget : public BaseWidget {
void refresh_data();
+ protected:
+ void on_theme_changed() override;
+
private:
+ void apply_styles();
void populate(const QVector<fincept::services::QuoteData>& quotes);
QStringList symbols_;
diff --git a/fincept-qt/src/screens/dashboard/widgets/RecentFilesWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/RecentFilesWidget.cpp
index be9474e26..c3a46ee84 100644
--- a/fincept-qt/src/screens/dashboard/widgets/RecentFilesWidget.cpp
+++ b/fincept-qt/src/screens/dashboard/widgets/RecentFilesWidget.cpp
@@ -20,11 +20,8 @@ static const char* MF = "font-family:'Consolas','Courier New',monospace;";
RecentFilesWidget::RecentFilesWidget(QWidget* parent)
: BaseWidget("Recent Files", parent, ui::colors::AMBER.get()) {
- auto* scroll = new QScrollArea;
- scroll->setWidgetResizable(true);
- scroll->setStyleSheet("QScrollArea{border:none;background:transparent;}"
- "QScrollBar:vertical{background:transparent;width:4px;}"
- + QString("QScrollBar::handle:vertical{background:%1;}").arg(ui::colors::BORDER_MED));
+ scroll_ = new QScrollArea;
+ scroll_->setWidgetResizable(true);
auto* container = new QWidget;
container->setStyleSheet("background:transparent;");
@@ -32,14 +29,16 @@ RecentFilesWidget::RecentFilesWidget(QWidget* parent)
list_layout_->setContentsMargins(4, 4, 4, 4);
list_layout_->setSpacing(3);
list_layout_->addStretch();
- scroll->setWidget(container);
+ scroll_->setWidget(container);
- content_layout()->addWidget(scroll);
+ content_layout()->addWidget(scroll_);
// Refresh when service changes
connect(&FileManagerService::instance(), &FileManagerService::files_changed,
this, &RecentFilesWidget::refresh_data);
connect(this, &BaseWidget::refresh_requested, this, &RecentFilesWidget::refresh_data);
+
+ apply_styles();
}
void RecentFilesWidget::showEvent(QShowEvent* e) {
@@ -122,4 +121,19 @@ void RecentFilesWidget::refresh_data() {
list_layout_->addStretch();
}
+void RecentFilesWidget::apply_styles() {
+ scroll_->setStyleSheet("QScrollArea{border:none;background:transparent;}"
+ "QScrollBar:vertical{background:transparent;width:4px;}"
+ + QString("QScrollBar::handle:vertical{background:%1;}").arg(ui::colors::BORDER_MED));
+
+ // Rows are built dynamically in refresh_data() using current tokens,
+ // so re-running refresh_data() picks up the new theme.
+ if (loaded_)
+ refresh_data();
+}
+
+void RecentFilesWidget::on_theme_changed() {
+ apply_styles();
+}
+
} // namespace fincept::screens::widgets
diff --git a/fincept-qt/src/screens/dashboard/widgets/RecentFilesWidget.h b/fincept-qt/src/screens/dashboard/widgets/RecentFilesWidget.h
index 174a7b3b5..f8e127d5b 100644
--- a/fincept-qt/src/screens/dashboard/widgets/RecentFilesWidget.h
+++ b/fincept-qt/src/screens/dashboard/widgets/RecentFilesWidget.h
@@ -1,6 +1,8 @@
#pragma once
#include "screens/dashboard/widgets/BaseWidget.h"
+#include <QScrollArea>
+
namespace fincept::screens::widgets {
/// Dashboard widget — shows the 8 most recently added files from FileManagerService.
@@ -12,9 +14,12 @@ class RecentFilesWidget : public BaseWidget {
protected:
void showEvent(QShowEvent* e) override;
void hideEvent(QHideEvent* e) override;
+ void on_theme_changed() override;
private:
+ void apply_styles();
void refresh_data();
+ QScrollArea* scroll_ = nullptr;
QVBoxLayout* list_layout_ = nullptr;
bool loaded_ = false;
};
diff --git a/fincept-qt/src/screens/dashboard/widgets/RiskMetricsWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/RiskMetricsWidget.cpp
index ae9a812a5..21e7dd050 100644
--- a/fincept-qt/src/screens/dashboard/widgets/RiskMetricsWidget.cpp
+++ b/fincept-qt/src/screens/dashboard/widgets/RiskMetricsWidget.cpp
@@ -19,31 +19,24 @@ RiskMetricsWidget::RiskMetricsWidget(QWidget* parent) : BaseWidget("RISK METRICS
vl->setSpacing(6);
// ── VIX section ──
- auto* vix_card = new QWidget;
- vix_card->setStyleSheet(QString("background: %1; border-radius: 2px;").arg(ui::colors::BG_RAISED()));
- auto* vcl = new QVBoxLayout(vix_card);
+ vix_card_ = new QWidget;
+ auto* vcl = new QVBoxLayout(vix_card_);
vcl->setContentsMargins(10, 8, 10, 8);
vcl->setSpacing(4);
auto* vix_header = new QHBoxLayout;
- auto* vix_lbl = new QLabel("VIX FEAR GAUGE");
- vix_lbl->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_TERTIARY()));
- vix_header->addWidget(vix_lbl);
+ vix_header_lbl_ = new QLabel("VIX FEAR GAUGE");
+ vix_header->addWidget(vix_header_lbl_);
vix_header->addStretch();
vix_regime_ = new QLabel("--");
- vix_regime_->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_TERTIARY()));
vix_header->addWidget(vix_regime_);
vcl->addLayout(vix_header);
vix_value_ = new QLabel("--");
- vix_value_->setStyleSheet(QString("color: %1; font-size: 22px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_TERTIARY()));
vcl->addWidget(vix_value_);
- // VIX gradient bar (0–40 range, 5 segments)
+ // VIX gradient bar (0-40 range, 5 segments) — uses fixed colors, not theme tokens
auto* bar_row = new QWidget;
bar_row->setFixedHeight(6);
auto* brl = new QHBoxLayout(bar_row);
@@ -58,25 +51,20 @@ RiskMetricsWidget::RiskMetricsWidget(QWidget* parent) : BaseWidget("RISK METRICS
vcl->addWidget(bar_row);
// Bar position indicator
- vix_bar_fill_ = new QLabel("▲");
- vix_bar_fill_->setStyleSheet(
- QString("color: %1; font-size: 8px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
+ vix_bar_fill_ = new QLabel(QString::fromUtf8("\xe2\x96\xb2"));
vix_bar_fill_->setAlignment(Qt::AlignLeft);
vcl->addWidget(vix_bar_fill_);
- vl->addWidget(vix_card);
+ vl->addWidget(vix_card_);
// ── Section separator ──
- auto* sep1 = new QFrame;
- sep1->setFixedHeight(1);
- sep1->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_DIM()));
- vl->addWidget(sep1);
+ sep1_ = new QFrame;
+ sep1_->setFixedHeight(1);
+ vl->addWidget(sep1_);
// ── Volatile stocks section ──
- auto* stocks_hdr = new QLabel("HIGH-BETA STOCKS");
- stocks_hdr->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_TERTIARY()));
- vl->addWidget(stocks_hdr);
+ stocks_hdr_ = new QLabel("HIGH-BETA STOCKS");
+ vl->addWidget(stocks_hdr_);
static const QStringList kVolatile = {"NVDA", "TSLA", "AMD", "META", "PLTR", "COIN"};
for (const auto& sym : kVolatile) {
@@ -86,20 +74,14 @@ RiskMetricsWidget::RiskMetricsWidget(QWidget* parent) : BaseWidget("RISK METRICS
StockRisk sr;
sr.symbol = new QLabel(sym);
- sr.symbol->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_PRIMARY()));
sr.symbol->setFixedWidth(48);
rl->addWidget(sr.symbol);
sr.chg_pct = new QLabel("--");
- sr.chg_pct->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_TERTIARY()));
sr.chg_pct->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
rl->addWidget(sr.chg_pct, 1);
sr.hi_lo = new QLabel("--");
- sr.hi_lo->setStyleSheet(
- QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
sr.hi_lo->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
rl->addWidget(sr.hi_lo, 1);
@@ -108,28 +90,22 @@ RiskMetricsWidget::RiskMetricsWidget(QWidget* parent) : BaseWidget("RISK METRICS
}
// ── Correlation proxies ──
- auto* sep2 = new QFrame;
- sep2->setFixedHeight(1);
- sep2->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_DIM()));
- vl->addWidget(sep2);
+ sep2_ = new QFrame;
+ sep2_->setFixedHeight(1);
+ vl->addWidget(sep2_);
- auto* corr_hdr = new QLabel("SPREAD PROXIES");
- corr_hdr->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_TERTIARY()));
- vl->addWidget(corr_hdr);
+ corr_hdr_ = new QLabel("SPREAD PROXIES");
+ vl->addWidget(corr_hdr_);
auto make_spread_row = [&](const QString& label, QLabel*& out) {
auto* row = new QWidget;
auto* rl = new QHBoxLayout(row);
rl->setContentsMargins(0, 2, 0, 2);
auto* lbl = new QLabel(label);
- lbl->setStyleSheet(
- QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_SECONDARY()));
+ spread_labels_.append(lbl);
rl->addWidget(lbl);
rl->addStretch();
out = new QLabel("--");
- out->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_PRIMARY()));
rl->addWidget(out);
vl->addWidget(row);
};
@@ -141,10 +117,67 @@ RiskMetricsWidget::RiskMetricsWidget(QWidget* parent) : BaseWidget("RISK METRICS
vl->addStretch();
connect(this, &BaseWidget::refresh_requested, this, &RiskMetricsWidget::refresh_data);
+
+ apply_styles();
set_loading(true);
refresh_data();
}
+void RiskMetricsWidget::apply_styles() {
+ vix_card_->setStyleSheet(
+ QString("background: %1; border-radius: 2px;").arg(ui::colors::BG_RAISED()));
+ vix_header_lbl_->setStyleSheet(
+ QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+ vix_regime_->setStyleSheet(
+ QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+ vix_value_->setStyleSheet(
+ QString("color: %1; font-size: 22px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+ vix_bar_fill_->setStyleSheet(
+ QString("color: %1; font-size: 8px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
+
+ sep1_->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_DIM()));
+ sep2_->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_DIM()));
+
+ stocks_hdr_->setStyleSheet(
+ QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+ corr_hdr_->setStyleSheet(
+ QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+
+ for (const auto& sr : stock_rows_) {
+ sr.symbol->setStyleSheet(
+ QString("color: %1; font-size: 10px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_PRIMARY()));
+ sr.chg_pct->setStyleSheet(
+ QString("color: %1; font-size: 10px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+ sr.hi_lo->setStyleSheet(
+ QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
+ }
+
+ for (auto* lbl : spread_labels_)
+ lbl->setStyleSheet(
+ QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_SECONDARY()));
+
+ spy_qqq_spread_->setStyleSheet(
+ QString("color: %1; font-size: 10px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_PRIMARY()));
+ spy_iwm_spread_->setStyleSheet(
+ QString("color: %1; font-size: 10px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_PRIMARY()));
+ equity_bond_lbl_->setStyleSheet(
+ QString("color: %1; font-size: 10px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_PRIMARY()));
+}
+
+void RiskMetricsWidget::on_theme_changed() {
+ apply_styles();
+}
+
void RiskMetricsWidget::refresh_data() {
set_loading(true);
services::MarketDataService::instance().fetch_quotes(kRiskSymbols,
@@ -180,7 +213,7 @@ void RiskMetricsWidget::populate(const QVector<services::QuoteData>& quotes) {
color = ui::colors::NEGATIVE();
} else {
regime = "EXTREME FEAR";
- color = "#ff0000";
+ color = ui::colors::NEGATIVE();
}
vix_value_->setStyleSheet(
QString("color: %1; font-size: 22px; font-weight: bold; background: transparent;").arg(color));
diff --git a/fincept-qt/src/screens/dashboard/widgets/RiskMetricsWidget.h b/fincept-qt/src/screens/dashboard/widgets/RiskMetricsWidget.h
index 6c8accb2a..d006b8752 100644
--- a/fincept-qt/src/screens/dashboard/widgets/RiskMetricsWidget.h
+++ b/fincept-qt/src/screens/dashboard/widgets/RiskMetricsWidget.h
@@ -13,15 +13,27 @@ class RiskMetricsWidget : public BaseWidget {
public:
explicit RiskMetricsWidget(QWidget* parent = nullptr);
+ protected:
+ void on_theme_changed() override;
+
private:
+ void apply_styles();
void refresh_data();
void populate(const QVector<services::QuoteData>& quotes);
// VIX section
+ QWidget* vix_card_ = nullptr;
+ QLabel* vix_header_lbl_ = nullptr;
QLabel* vix_value_ = nullptr;
QLabel* vix_regime_ = nullptr;
QLabel* vix_bar_fill_ = nullptr;
+ // Separators and section headers
+ QFrame* sep1_ = nullptr;
+ QFrame* sep2_ = nullptr;
+ QLabel* stocks_hdr_ = nullptr;
+ QLabel* corr_hdr_ = nullptr;
+
// Volatility cluster labels [6 stocks]
struct StockRisk {
QLabel* symbol = nullptr;
@@ -30,6 +42,8 @@ class RiskMetricsWidget : public BaseWidget {
};
QVector<StockRisk> stock_rows_;
+ // Spread row labels (the left-hand descriptors)
+ QVector<QLabel*> spread_labels_;
// Correlation proxies
QLabel* spy_qqq_spread_ = nullptr;
QLabel* spy_iwm_spread_ = nullptr;
diff --git a/fincept-qt/src/screens/dashboard/widgets/ScreenerWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/ScreenerWidget.cpp
index 33f018a19..85fbf451a 100644
--- a/fincept-qt/src/screens/dashboard/widgets/ScreenerWidget.cpp
+++ b/fincept-qt/src/screens/dashboard/widgets/ScreenerWidget.cpp
@@ -21,63 +21,44 @@ ScreenerWidget::ScreenerWidget(QWidget* parent) : BaseWidget("STOCK SCREENER", p
vl->setSpacing(0);
// Filter bar
- auto* filter_bar = new QWidget;
- filter_bar->setStyleSheet(QString("background: %1;").arg(ui::colors::BG_RAISED()));
- auto* fl = new QHBoxLayout(filter_bar);
+ filter_bar_ = new QWidget;
+ auto* fl = new QHBoxLayout(filter_bar_);
fl->setContentsMargins(8, 6, 8, 6);
fl->setSpacing(8);
- auto* filter_lbl = new QLabel("SORT BY");
- filter_lbl->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_TERTIARY()));
- fl->addWidget(filter_lbl);
+ filter_lbl_ = new QLabel("SORT BY");
+ fl->addWidget(filter_lbl_);
filter_combo_ = new QComboBox;
filter_combo_->addItems({"% CHANGE ↑", "% CHANGE ↓", "VOLUME ↓", "PRICE ↓", "PRICE ↑"});
- filter_combo_->setStyleSheet(
- QString("QComboBox { background: %1; color: %2; border: 1px solid %3; font-size: 10px; padding: 2px 6px; }"
- "QComboBox::drop-down { border: none; }"
- "QComboBox QAbstractItemView { background: %1; color: %2; border: 1px solid %3; }")
- .arg(ui::colors::BG_BASE())
- .arg(ui::colors::TEXT_PRIMARY())
- .arg(ui::colors::BORDER_MED()));
fl->addWidget(filter_combo_);
fl->addStretch();
- auto* count_lbl = new QLabel(QString("%1 symbols").arg(kScreenerSymbols.size()));
- count_lbl->setStyleSheet(
- QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
- fl->addWidget(count_lbl);
+ count_lbl_ = new QLabel(QString("%1 symbols").arg(kScreenerSymbols.size()));
+ fl->addWidget(count_lbl_);
- vl->addWidget(filter_bar);
+ vl->addWidget(filter_bar_);
// Column headers
- auto* header = new QWidget;
- header->setStyleSheet(
- QString("background: %1; border-bottom: 1px solid %2;").arg(ui::colors::BG_RAISED()).arg(ui::colors::BORDER_DIM()));
- auto* hl = new QHBoxLayout(header);
+ header_ = new QWidget;
+ auto* hl = new QHBoxLayout(header_);
hl->setContentsMargins(8, 3, 8, 3);
auto make_hdr = [&](const QString& t, int s, Qt::Alignment a = Qt::AlignLeft) {
auto* l = new QLabel(t);
- l->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_TERTIARY()));
l->setAlignment(a);
+ header_labels_.append(l);
hl->addWidget(l, s);
};
make_hdr("SYMBOL", 2);
make_hdr("PRICE", 2, Qt::AlignRight);
make_hdr("CHG%", 1, Qt::AlignRight);
make_hdr("VOLUME", 2, Qt::AlignRight);
- vl->addWidget(header);
+ vl->addWidget(header_);
// Scrollable list
- auto* scroll = new QScrollArea;
- scroll->setWidgetResizable(true);
- scroll->setStyleSheet("QScrollArea { border: none; background: transparent; }"
- "QScrollBar:vertical { width: 4px; background: transparent; }"
- + QString("QScrollBar::handle:vertical { background: %1; border-radius: 2px; min-height: 20px; }").arg(ui::colors::BORDER_MED) +
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }");
+ scroll_ = new QScrollArea;
+ scroll_->setWidgetResizable(true);
auto* list_widget = new QWidget;
list_widget->setStyleSheet("background: transparent;");
@@ -86,16 +67,52 @@ ScreenerWidget::ScreenerWidget(QWidget* parent) : BaseWidget("STOCK SCREENER", p
list_layout_->setSpacing(0);
list_layout_->addStretch();
- scroll->setWidget(list_widget);
- vl->addWidget(scroll, 1);
+ scroll_->setWidget(list_widget);
+ vl->addWidget(scroll_, 1);
connect(filter_combo_, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ScreenerWidget::apply_filter);
connect(this, &BaseWidget::refresh_requested, this, &ScreenerWidget::refresh_data);
+ apply_styles();
set_loading(true);
refresh_data();
}
+void ScreenerWidget::apply_styles() {
+ filter_bar_->setStyleSheet(QString("background: %1;").arg(ui::colors::BG_RAISED()));
+ filter_lbl_->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+ filter_combo_->setStyleSheet(
+ QString("QComboBox { background: %1; color: %2; border: 1px solid %3; font-size: 10px; padding: 2px 6px; }"
+ "QComboBox::drop-down { border: none; }"
+ "QComboBox QAbstractItemView { background: %1; color: %2; border: 1px solid %3; }")
+ .arg(ui::colors::BG_BASE())
+ .arg(ui::colors::TEXT_PRIMARY())
+ .arg(ui::colors::BORDER_MED()));
+ count_lbl_->setStyleSheet(
+ QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
+
+ header_->setStyleSheet(
+ QString("background: %1; border-bottom: 1px solid %2;").arg(ui::colors::BG_RAISED()).arg(ui::colors::BORDER_DIM()));
+ for (auto* lbl : header_labels_) {
+ lbl->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+ }
+
+ scroll_->setStyleSheet("QScrollArea { border: none; background: transparent; }"
+ "QScrollBar:vertical { width: 4px; background: transparent; }"
+ + QString("QScrollBar::handle:vertical { background: %1; border-radius: 2px; min-height: 20px; }").arg(ui::colors::BORDER_MED) +
+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }");
+
+ // Re-render data rows with current tokens if data exists
+ if (!all_quotes_.isEmpty())
+ apply_filter();
+}
+
+void ScreenerWidget::on_theme_changed() {
+ apply_styles();
+}
+
void ScreenerWidget::refresh_data() {
set_loading(true);
services::MarketDataService::instance().fetch_quotes(kScreenerSymbols,
diff --git a/fincept-qt/src/screens/dashboard/widgets/ScreenerWidget.h b/fincept-qt/src/screens/dashboard/widgets/ScreenerWidget.h
index 2b6ea4ab4..3c885f171 100644
--- a/fincept-qt/src/screens/dashboard/widgets/ScreenerWidget.h
+++ b/fincept-qt/src/screens/dashboard/widgets/ScreenerWidget.h
@@ -16,7 +16,11 @@ class ScreenerWidget : public BaseWidget {
public:
explicit ScreenerWidget(QWidget* parent = nullptr);
+ protected:
+ void on_theme_changed() override;
+
private:
+ void apply_styles();
void refresh_data();
void apply_filter();
void render_rows(const QVector<services::QuoteData>& sorted);
@@ -24,6 +28,14 @@ class ScreenerWidget : public BaseWidget {
QComboBox* filter_combo_ = nullptr;
QVBoxLayout* list_layout_ = nullptr;
QVector<services::QuoteData> all_quotes_;
+
+ // Widgets needing theme-aware restyling
+ QWidget* filter_bar_ = nullptr;
+ QLabel* filter_lbl_ = nullptr;
+ QLabel* count_lbl_ = nullptr;
+ QWidget* header_ = nullptr;
+ QVector<QLabel*> header_labels_;
+ QScrollArea* scroll_ = nullptr;
};
} // namespace fincept::screens::widgets
diff --git a/fincept-qt/src/screens/dashboard/widgets/SectorHeatmapWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/SectorHeatmapWidget.cpp
index 8bdcaeb75..093209f9b 100644
--- a/fincept-qt/src/screens/dashboard/widgets/SectorHeatmapWidget.cpp
+++ b/fincept-qt/src/screens/dashboard/widgets/SectorHeatmapWidget.cpp
@@ -31,10 +31,24 @@ SectorHeatmapWidget::SectorHeatmapWidget(QWidget* parent) : BaseWidget("SECTOR H
connect(this, &BaseWidget::refresh_requested, this, &SectorHeatmapWidget::refresh_data);
+ apply_styles();
set_loading(true);
refresh_data();
}
+void SectorHeatmapWidget::apply_styles() {
+ // The grid cells are rebuilt dynamically in populate() using current tokens.
+ // Re-populate with existing data to pick up new theme colors.
+ // If no data yet, nothing to restyle.
+}
+
+void SectorHeatmapWidget::on_theme_changed() {
+ apply_styles();
+ // Re-populate the grid with current data so cells pick up new token values
+ if (grid_->count() > 0)
+ refresh_data();
+}
+
void SectorHeatmapWidget::refresh_data() {
set_loading(true);
@@ -65,11 +79,9 @@ void SectorHeatmapWidget::populate(const QVector<services::QuoteData>& quotes) {
cell->setMinimumSize(80, 40);
int intensity = static_cast<int>(std::min(std::abs(q.change_pct) * 60.0, 200.0));
- QString bg_color;
- if (q.change_pct >= 0)
- bg_color = QString("rgba(22, 163, 74, %1)").arg(40 + intensity);
- else
- bg_color = QString("rgba(220, 38, 38, %1)").arg(40 + intensity);
+ QColor tint(q.change_pct >= 0 ? ui::colors::POSITIVE() : ui::colors::NEGATIVE());
+ tint.setAlpha(40 + intensity);
+ QString bg_color = tint.name(QColor::HexArgb);
cell->setStyleSheet(
QString("background: %1; border: 1px solid %2; border-radius: 2px;").arg(bg_color, ui::colors::BORDER_DIM));
diff --git a/fincept-qt/src/screens/dashboard/widgets/SectorHeatmapWidget.h b/fincept-qt/src/screens/dashboard/widgets/SectorHeatmapWidget.h
index d5266c68d..0702b06ab 100644
--- a/fincept-qt/src/screens/dashboard/widgets/SectorHeatmapWidget.h
+++ b/fincept-qt/src/screens/dashboard/widgets/SectorHeatmapWidget.h
@@ -13,7 +13,11 @@ class SectorHeatmapWidget : public BaseWidget {
public:
explicit SectorHeatmapWidget(QWidget* parent = nullptr);
+ protected:
+ void on_theme_changed() override;
+
private:
+ void apply_styles();
void refresh_data();
void populate(const QVector<services::QuoteData>& quotes);
diff --git a/fincept-qt/src/screens/dashboard/widgets/StockQuoteWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/StockQuoteWidget.cpp
index c763e3f1e..a8ea49ee8 100644
--- a/fincept-qt/src/screens/dashboard/widgets/StockQuoteWidget.cpp
+++ b/fincept-qt/src/screens/dashboard/widgets/StockQuoteWidget.cpp
@@ -19,8 +19,6 @@ StockQuoteWidget::StockQuoteWidget(const QString& symbol, QWidget* parent)
prl->setSpacing(8);
price_label_ = new QLabel("--");
- price_label_->setStyleSheet(QString("color: %1; font-size: 28px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_PRIMARY()));
prl->addWidget(price_label_);
auto* change_col = new QWidget;
@@ -29,29 +27,23 @@ StockQuoteWidget::StockQuoteWidget(const QString& symbol, QWidget* parent)
ccl->setSpacing(0);
arrow_label_ = new QLabel;
- arrow_label_->setStyleSheet("font-size: 12px; background: transparent;");
ccl->addWidget(arrow_label_);
change_label_ = new QLabel("--");
- change_label_->setStyleSheet(
- QString("font-size: 11px; font-weight: bold; background: transparent;").arg(ui::colors::TEXT_SECONDARY()));
ccl->addWidget(change_label_);
prl->addWidget(change_col);
prl->addStretch();
- auto* ticker_label = new QLabel(symbol_);
- ticker_label->setStyleSheet(
- QString("color: %1; font-size: 14px; font-weight: bold; background: transparent;").arg(ui::colors::AMBER()));
- prl->addWidget(ticker_label);
+ ticker_label_ = new QLabel(symbol_);
+ prl->addWidget(ticker_label_);
vl->addWidget(price_row);
// ── Separator ──
- auto* sep = new QFrame;
- sep->setFixedHeight(1);
- sep->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_DIM()));
- vl->addWidget(sep);
+ sep_ = new QFrame;
+ sep_->setFixedHeight(1);
+ vl->addWidget(sep_);
// ── Stats grid ──
auto* stats = new QWidget;
@@ -61,19 +53,17 @@ StockQuoteWidget::StockQuoteWidget(const QString& symbol, QWidget* parent)
auto make_stat = [&](int row, int col, const QString& label, QLabel*& val_out) {
auto* cell = new QWidget;
- cell->setStyleSheet(QString("background: %1; border-radius: 2px;").arg(ui::colors::BG_RAISED()));
+ stat_cells_.append(cell);
auto* cl = new QVBoxLayout(cell);
cl->setContentsMargins(8, 6, 8, 6);
cl->setSpacing(2);
auto* lbl = new QLabel(label);
- lbl->setStyleSheet(
- QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
+ stat_labels_.append(lbl);
cl->addWidget(lbl);
val_out = new QLabel("--");
- val_out->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_PRIMARY()));
+ stat_values_.append(val_out);
cl->addWidget(val_out);
gl->addWidget(cell, row, col);
@@ -90,10 +80,40 @@ StockQuoteWidget::StockQuoteWidget(const QString& symbol, QWidget* parent)
connect(this, &BaseWidget::refresh_requested, this, &StockQuoteWidget::refresh_data);
+ apply_styles();
set_loading(true);
refresh_data();
}
+void StockQuoteWidget::apply_styles() {
+ price_label_->setStyleSheet(
+ QString("color: %1; font-size: 28px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_PRIMARY()));
+ arrow_label_->setStyleSheet("font-size: 12px; background: transparent;");
+ change_label_->setStyleSheet(
+ QString("color: %1; font-size: 11px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_SECONDARY()));
+ ticker_label_->setStyleSheet(
+ QString("color: %1; font-size: 14px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::AMBER()));
+ sep_->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_DIM()));
+
+ for (auto* cell : stat_cells_)
+ cell->setStyleSheet(
+ QString("background: %1; border-radius: 2px;").arg(ui::colors::BG_RAISED()));
+ for (auto* lbl : stat_labels_)
+ lbl->setStyleSheet(
+ QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_TERTIARY()));
+ for (auto* val : stat_values_)
+ val->setStyleSheet(
+ QString("color: %1; font-size: 11px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_PRIMARY()));
+}
+
+void StockQuoteWidget::on_theme_changed() {
+ apply_styles();
+}
+
void StockQuoteWidget::set_symbol(const QString& symbol) {
symbol_ = symbol.toUpper();
set_title(QString("QUOTE: %1").arg(symbol_));
diff --git a/fincept-qt/src/screens/dashboard/widgets/StockQuoteWidget.h b/fincept-qt/src/screens/dashboard/widgets/StockQuoteWidget.h
index 092da2b29..d67d75f72 100644
--- a/fincept-qt/src/screens/dashboard/widgets/StockQuoteWidget.h
+++ b/fincept-qt/src/screens/dashboard/widgets/StockQuoteWidget.h
@@ -16,7 +16,11 @@ class StockQuoteWidget : public BaseWidget {
void set_symbol(const QString& symbol);
+ protected:
+ void on_theme_changed() override;
+
private:
+ void apply_styles();
void refresh_data();
void populate(const services::QuoteData& quote);
@@ -25,11 +29,18 @@ class StockQuoteWidget : public BaseWidget {
QLabel* price_label_ = nullptr;
QLabel* change_label_ = nullptr;
QLabel* arrow_label_ = nullptr;
+ QLabel* ticker_label_ = nullptr;
+ QFrame* sep_ = nullptr;
QLabel* open_val_ = nullptr;
QLabel* high_val_ = nullptr;
QLabel* low_val_ = nullptr;
QLabel* volume_val_ = nullptr;
QLabel* prev_val_ = nullptr;
+
+ // Stat cells and their title labels for theme refresh
+ QVector<QWidget*> stat_cells_;
+ QVector<QLabel*> stat_labels_;
+ QVector<QLabel*> stat_values_;
};
} // namespace fincept::screens::widgets
diff --git a/fincept-qt/src/screens/dashboard/widgets/TopMoversWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/TopMoversWidget.cpp
index 0d8cc3a62..f904111dd 100644
--- a/fincept-qt/src/screens/dashboard/widgets/TopMoversWidget.cpp
+++ b/fincept-qt/src/screens/dashboard/widgets/TopMoversWidget.cpp
@@ -12,21 +12,9 @@ TopMoversWidget::TopMoversWidget(QWidget* parent) : BaseWidget("TOP MOVERS", par
tl->setContentsMargins(4, 2, 4, 2);
tl->setSpacing(0);
- auto active_style = [](const QString& color) {
- return QString("QPushButton { background: %1; color: %2; border: none; "
- "font-size: 9px; font-weight: bold; padding: 4px; }")
- .arg(color, ui::colors::BG_BASE);
- };
- auto inactive_style = QString("QPushButton { background: %1; color: %2; border: none; "
- "font-size: 9px; font-weight: bold; padding: 4px; }")
- .arg(ui::colors::BG_SURFACE, ui::colors::TEXT_TERTIARY);
-
gainers_btn_ = new QPushButton(QString(QChar(0x25B2)) + " GAINERS");
losers_btn_ = new QPushButton(QString(QChar(0x25BC)) + " LOSERS");
- gainers_btn_->setStyleSheet(active_style(ui::colors::POSITIVE));
- losers_btn_->setStyleSheet(inactive_style);
-
connect(gainers_btn_, &QPushButton::clicked, this, [this]() { show_tab(true); });
connect(losers_btn_, &QPushButton::clicked, this, [this]() { show_tab(false); });
@@ -43,10 +31,20 @@ TopMoversWidget::TopMoversWidget(QWidget* parent) : BaseWidget("TOP MOVERS", par
connect(this, &BaseWidget::refresh_requested, this, &TopMoversWidget::refresh_data);
+ apply_styles();
set_loading(true);
refresh_data();
}
+void TopMoversWidget::apply_styles() {
+ // Apply styles based on current tab state
+ show_tab(showing_gainers_);
+}
+
+void TopMoversWidget::on_theme_changed() {
+ apply_styles();
+}
+
void TopMoversWidget::refresh_data() {
set_loading(true);
diff --git a/fincept-qt/src/screens/dashboard/widgets/TopMoversWidget.h b/fincept-qt/src/screens/dashboard/widgets/TopMoversWidget.h
index 202dcdf4a..7b4b7eb24 100644
--- a/fincept-qt/src/screens/dashboard/widgets/TopMoversWidget.h
+++ b/fincept-qt/src/screens/dashboard/widgets/TopMoversWidget.h
@@ -15,7 +15,11 @@ class TopMoversWidget : public BaseWidget {
public:
explicit TopMoversWidget(QWidget* parent = nullptr);
+ protected:
+ void on_theme_changed() override;
+
private:
+ void apply_styles();
void refresh_data();
void show_tab(bool gainers);
diff --git a/fincept-qt/src/screens/dashboard/widgets/VideoPlayerWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/VideoPlayerWidget.cpp
index bd9285baa..c0f1234c1 100644
--- a/fincept-qt/src/screens/dashboard/widgets/VideoPlayerWidget.cpp
+++ b/fincept-qt/src/screens/dashboard/widgets/VideoPlayerWidget.cpp
@@ -53,6 +53,7 @@ VideoPlayerWidget::VideoPlayerWidget(QWidget* parent) : BaseWidget("LIVE TV / ST
connect(this, &BaseWidget::refresh_requested, this, &VideoPlayerWidget::refresh_data);
+ apply_styles();
stack_->setCurrentIndex(0);
}
@@ -60,23 +61,16 @@ VideoPlayerWidget::VideoPlayerWidget(QWidget* parent) : BaseWidget("LIVE TV / ST
void VideoPlayerWidget::build_channel_list() {
list_page_ = new QWidget;
- auto* scroll = new QScrollArea;
- scroll->setWidgetResizable(true);
- scroll->setStyleSheet("QScrollArea { border: none; background: transparent; }"
- "QScrollBar:vertical { width: 5px; background: transparent; }"
- "QScrollBar::handle:vertical { background: #222; border-radius: 2px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }");
+ scroll_ = new QScrollArea;
+ scroll_->setWidgetResizable(true);
auto* container = new QWidget;
auto* vl = new QVBoxLayout(container);
vl->setContentsMargins(6, 6, 6, 6);
vl->setSpacing(3);
- auto* header = new QLabel("FINANCIAL TV");
- header->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; letter-spacing: 0.5px; "
- "background: transparent; padding: 2px 0;")
- .arg(ui::colors::TEXT_TERTIARY));
- vl->addWidget(header);
+ channel_header_ = new QLabel("FINANCIAL TV");
+ vl->addWidget(channel_header_);
for (int i = 0; i < kPresetCount; ++i) {
const auto& ch = kPresets[i];
@@ -84,10 +78,7 @@ void VideoPlayerWidget::build_channel_list() {
auto* row = new QPushButton;
row->setCursor(Qt::PointingHandCursor);
row->setFixedHeight(32);
- row->setStyleSheet(QString("QPushButton { background: %1; border: 1px solid %2; border-radius: 2px; "
- "text-align: left; padding: 0 8px; }"
- "QPushButton:hover { background: %3; border-color: %4; }")
- .arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM, ui::colors::BG_HOVER, ch.accent));
+ channel_rows_.append(row);
auto* rl = new QHBoxLayout(row);
rl->setContentsMargins(8, 0, 8, 0);
@@ -103,13 +94,11 @@ void VideoPlayerWidget::build_channel_list() {
rl->addWidget(play);
auto* name = new QLabel(ch.name);
- name->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_PRIMARY));
+ channel_name_labels_.append(name);
rl->addWidget(name);
auto* desc = new QLabel(ch.description);
- desc->setStyleSheet(
- QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_TERTIARY));
+ channel_desc_labels_.append(desc);
rl->addWidget(desc, 1);
connect(row, &QPushButton::clicked, this, [this, i]() { play_preset(i); });
@@ -117,19 +106,15 @@ void VideoPlayerWidget::build_channel_list() {
}
// Separator
- auto* sep = new QLabel;
- sep->setFixedHeight(1);
- sep->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_DIM));
+ channel_sep_ = new QLabel;
+ channel_sep_->setFixedHeight(1);
vl->addSpacing(4);
- vl->addWidget(sep);
+ vl->addWidget(channel_sep_);
vl->addSpacing(4);
// Custom URL
- auto* custom_header = new QLabel("CUSTOM STREAM");
- custom_header->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; letter-spacing: 0.5px; "
- "background: transparent;")
- .arg(ui::colors::TEXT_TERTIARY));
- vl->addWidget(custom_header);
+ custom_header_ = new QLabel("CUSTOM STREAM");
+ vl->addWidget(custom_header_);
auto* input_row = new QWidget;
input_row->setStyleSheet("background: transparent;");
@@ -139,36 +124,26 @@ void VideoPlayerWidget::build_channel_list() {
url_input_ = new QLineEdit;
url_input_->setPlaceholderText("YouTube URL, HLS (.m3u8), MP4, or direct stream...");
- url_input_->setStyleSheet(
- QString("QLineEdit { background: %1; color: %2; border: 1px solid %3; "
- "border-radius: 2px; padding: 4px 8px; font-size: 10px; }"
- "QLineEdit:focus { border-color: %4; }")
- .arg(ui::colors::BG_BASE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM, "#9D4EDD"));
connect(url_input_, &QLineEdit::returnPressed, this, &VideoPlayerWidget::play_custom_url);
irl->addWidget(url_input_, 1);
- auto* open_btn = new QPushButton("PLAY");
- open_btn->setFixedWidth(50);
- open_btn->setCursor(Qt::PointingHandCursor);
- open_btn->setStyleSheet(QString("QPushButton { background: #9D4EDD; color: %1; border: none; border-radius: 2px; "
- "font-size: 9px; font-weight: bold; padding: 5px; }"
- "QPushButton:hover { background: #7C3AED; }")
- .arg(ui::colors::TEXT_PRIMARY));
- connect(open_btn, &QPushButton::clicked, this, &VideoPlayerWidget::play_custom_url);
- irl->addWidget(open_btn);
+ play_btn_ = new QPushButton("PLAY");
+ play_btn_->setFixedWidth(50);
+ play_btn_->setCursor(Qt::PointingHandCursor);
+ connect(play_btn_, &QPushButton::clicked, this, &VideoPlayerWidget::play_custom_url);
+ irl->addWidget(play_btn_);
vl->addWidget(input_row);
- auto* helper = new QLabel("YouTube streams resolved via yt-dlp and played inline.");
- helper->setStyleSheet(QString("color: %1; font-size: 8px; background: transparent;").arg(ui::colors::TEXT_DIM));
- vl->addWidget(helper);
+ helper_label_ = new QLabel("YouTube streams resolved via yt-dlp and played inline.");
+ vl->addWidget(helper_label_);
vl->addStretch();
- scroll->setWidget(container);
+ scroll_->setWidget(container);
auto* page_layout = new QVBoxLayout(list_page_);
page_layout->setContentsMargins(0, 0, 0, 0);
- page_layout->addWidget(scroll);
+ page_layout->addWidget(scroll_);
stack_->addWidget(list_page_);
}
@@ -183,7 +158,6 @@ void VideoPlayerWidget::build_player_view() {
#ifdef HAS_QT_MULTIMEDIA
video_widget_ = new QVideoWidget;
- video_widget_->setStyleSheet("background: #000;");
vl->addWidget(video_widget_, 1);
player_ = new QMediaPlayer(this);
@@ -192,49 +166,36 @@ void VideoPlayerWidget::build_player_view() {
player_->setAudioOutput(audio_output_);
player_->setVideoOutput(video_widget_);
#else
- auto* placeholder = new QLabel("Qt Multimedia not available.\nBuild with Qt6 Multimedia for inline playback.");
- placeholder->setAlignment(Qt::AlignCenter);
- placeholder->setStyleSheet(
- QString("color: %1; font-size: 11px; background: #000;").arg(ui::colors::TEXT_SECONDARY));
- vl->addWidget(placeholder, 1);
+ status_label_placeholder_ = new QLabel("Qt Multimedia not available.\nBuild with Qt6 Multimedia for inline playback.");
+ status_label_placeholder_->setAlignment(Qt::AlignCenter);
+ vl->addWidget(status_label_placeholder_, 1);
#endif
// Status overlay (loading / error)
status_label_ = new QLabel;
status_label_->setAlignment(Qt::AlignCenter);
status_label_->setFixedHeight(20);
- status_label_->setStyleSheet(QString("color: %1; font-size: 9px; background: %2; padding: 0 8px;")
- .arg(ui::colors::TEXT_SECONDARY, ui::colors::BG_RAISED));
status_label_->hide();
vl->addWidget(status_label_);
// Control bar
- auto* controls = new QWidget;
- controls->setFixedHeight(28);
- controls->setStyleSheet(
- QString("background: %1; border-top: 1px solid %2;").arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM));
+ controls_ = new QWidget;
+ controls_->setFixedHeight(28);
- auto* cl = new QHBoxLayout(controls);
+ auto* cl = new QHBoxLayout(controls_);
cl->setContentsMargins(8, 0, 8, 0);
cl->setSpacing(8);
now_playing_ = new QLabel("—");
- now_playing_->setStyleSheet(
- QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;").arg("#9D4EDD"));
cl->addWidget(now_playing_, 1);
- auto* stop_btn = new QPushButton(QString(QChar(0x25A0)) + " STOP");
- stop_btn->setCursor(Qt::PointingHandCursor);
- stop_btn->setFixedHeight(20);
- stop_btn->setStyleSheet(QString("QPushButton { background: %1; border: 1px solid %2; color: %3; "
- "font-size: 9px; font-weight: bold; padding: 0 10px; border-radius: 2px; }"
- "QPushButton:hover { background: %4; color: %5; }")
- .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM, ui::colors::TEXT_SECONDARY,
- ui::colors::NEGATIVE, ui::colors::TEXT_PRIMARY));
- connect(stop_btn, &QPushButton::clicked, this, &VideoPlayerWidget::stop_playback);
- cl->addWidget(stop_btn);
+ stop_btn_ = new QPushButton(QString(QChar(0x25A0)) + " STOP");
+ stop_btn_->setCursor(Qt::PointingHandCursor);
+ stop_btn_->setFixedHeight(20);
+ connect(stop_btn_, &QPushButton::clicked, this, &VideoPlayerWidget::stop_playback);
+ cl->addWidget(stop_btn_);
- vl->addWidget(controls);
+ vl->addWidget(controls_);
stack_->addWidget(player_page_);
}
@@ -413,5 +374,85 @@ void VideoPlayerWidget::set_loading(bool loading) {
}
}
+void VideoPlayerWidget::apply_styles() {
+ // Channel list page
+ scroll_->setStyleSheet(
+ QString("QScrollArea { border: none; background: transparent; }"
+ "QScrollBar:vertical { width: 5px; background: transparent; }"
+ "QScrollBar::handle:vertical { background: %1; border-radius: 2px; }"
+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }")
+ .arg(ui::colors::BORDER_MED));
+
+ channel_header_->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; letter-spacing: 0.5px; "
+ "background: transparent; padding: 2px 0;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+
+ for (int i = 0; i < channel_rows_.size() && i < kPresetCount; ++i) {
+ const auto& ch = kPresets[i];
+ channel_rows_[i]->setStyleSheet(
+ QString("QPushButton { background: %1; border: 1px solid %2; border-radius: 2px; "
+ "text-align: left; padding: 0 8px; }"
+ "QPushButton:hover { background: %3; border-color: %4; }")
+ .arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM, ui::colors::BG_HOVER, ch.accent));
+ }
+ for (auto* lbl : channel_name_labels_) {
+ lbl->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_PRIMARY));
+ }
+ for (auto* lbl : channel_desc_labels_) {
+ lbl->setStyleSheet(
+ QString("color: %1; font-size: 9px; background: transparent;").arg(ui::colors::TEXT_TERTIARY));
+ }
+
+ channel_sep_->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_DIM));
+
+ custom_header_->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; letter-spacing: 0.5px; "
+ "background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY));
+
+ url_input_->setStyleSheet(
+ QString("QLineEdit { background: %1; color: %2; border: 1px solid %3; "
+ "border-radius: 2px; padding: 4px 8px; font-size: 10px; }"
+ "QLineEdit:focus { border-color: %4; }")
+ .arg(ui::colors::BG_BASE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM, "#9D4EDD"));
+
+ play_btn_->setStyleSheet(QString("QPushButton { background: #9D4EDD; color: %1; border: none; border-radius: 2px; "
+ "font-size: 9px; font-weight: bold; padding: 5px; }"
+ "QPushButton:hover { background: #7C3AED; }")
+ .arg(ui::colors::TEXT_PRIMARY));
+
+ helper_label_->setStyleSheet(
+ QString("color: %1; font-size: 8px; background: transparent;").arg(ui::colors::TEXT_DIM));
+
+ // Player page
+#ifdef HAS_QT_MULTIMEDIA
+ video_widget_->setStyleSheet(QString("background: %1;").arg(ui::colors::BG_BASE()));
+#else
+ if (status_label_placeholder_)
+ status_label_placeholder_->setStyleSheet(
+ QString("color: %1; font-size: 11px; background: %2;").arg(ui::colors::TEXT_SECONDARY(), ui::colors::BG_BASE()));
+#endif
+
+ status_label_->setStyleSheet(QString("color: %1; font-size: 9px; background: %2; padding: 0 8px;")
+ .arg(ui::colors::TEXT_SECONDARY, ui::colors::BG_RAISED));
+
+ controls_->setStyleSheet(
+ QString("background: %1; border-top: 1px solid %2;").arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM));
+
+ // now_playing_ uses brand color #9D4EDD intentionally
+ now_playing_->setStyleSheet(
+ QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;").arg("#9D4EDD"));
+
+ stop_btn_->setStyleSheet(QString("QPushButton { background: %1; border: 1px solid %2; color: %3; "
+ "font-size: 9px; font-weight: bold; padding: 0 10px; border-radius: 2px; }"
+ "QPushButton:hover { background: %4; color: %5; }")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM, ui::colors::TEXT_SECONDARY,
+ ui::colors::NEGATIVE, ui::colors::TEXT_PRIMARY));
+}
+
+void VideoPlayerWidget::on_theme_changed() {
+ apply_styles();
+}
+
} // namespace fincept::screens::widgets
diff --git a/fincept-qt/src/screens/dashboard/widgets/VideoPlayerWidget.h b/fincept-qt/src/screens/dashboard/widgets/VideoPlayerWidget.h
index db217f332..5a605c50b 100644
--- a/fincept-qt/src/screens/dashboard/widgets/VideoPlayerWidget.h
+++ b/fincept-qt/src/screens/dashboard/widgets/VideoPlayerWidget.h
@@ -5,6 +5,7 @@
#include <QLineEdit>
#include <QProcess>
#include <QPushButton>
+#include <QScrollArea>
#include <QStackedWidget>
#ifdef HAS_QT_MULTIMEDIA
@@ -31,7 +32,11 @@ class VideoPlayerWidget : public BaseWidget {
void on_ytdlp_finished(int exit_code, QProcess::ExitStatus status);
void on_ytdlp_error(QProcess::ProcessError error);
+ protected:
+ void on_theme_changed() override;
+
private:
+ void apply_styles();
void build_channel_list();
void build_player_view();
void play_url(const QString& url, const QString& title);
@@ -51,6 +56,20 @@ class VideoPlayerWidget : public BaseWidget {
QString current_url_; // currently selected stream URL (original, may be YouTube)
QString current_title_; // title of current stream for refresh
+ // Widgets needing theme-aware restyling
+ QScrollArea* scroll_ = nullptr;
+ QLabel* channel_header_ = nullptr;
+ QVector<QPushButton*> channel_rows_;
+ QVector<QLabel*> channel_name_labels_;
+ QVector<QLabel*> channel_desc_labels_;
+ QLabel* channel_sep_ = nullptr;
+ QLabel* custom_header_ = nullptr;
+ QPushButton* play_btn_ = nullptr;
+ QLabel* helper_label_ = nullptr;
+ QLabel* status_label_placeholder_ = nullptr; // #ifndef HAS_QT_MULTIMEDIA placeholder
+ QWidget* controls_ = nullptr;
+ QPushButton* stop_btn_ = nullptr;
+
#ifdef HAS_QT_MULTIMEDIA
QMediaPlayer* player_ = nullptr;
QVideoWidget* video_widget_ = nullptr;
diff --git a/fincept-qt/src/screens/dashboard/widgets/WatchlistWidget.cpp b/fincept-qt/src/screens/dashboard/widgets/WatchlistWidget.cpp
index 7e19435f7..20e042973 100644
--- a/fincept-qt/src/screens/dashboard/widgets/WatchlistWidget.cpp
+++ b/fincept-qt/src/screens/dashboard/widgets/WatchlistWidget.cpp
@@ -18,26 +18,15 @@ WatchlistWidget::WatchlistWidget(QWidget* parent)
irl->setContentsMargins(4, 4, 4, 4);
irl->setSpacing(4);
- auto* lbl = new QLabel("SYMBOLS:");
- lbl->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
- .arg(ui::colors::TEXT_TERTIARY));
- irl->addWidget(lbl);
+ symbols_label_ = new QLabel("SYMBOLS:");
+ irl->addWidget(symbols_label_);
symbols_input_ = new QLineEdit(symbols_.join(", "));
- symbols_input_->setStyleSheet(
- QString("QLineEdit { background: %1; color: %2; border: 1px solid %3; "
- "font-size: 10px; padding: 2px 6px; font-family: Consolas; }"
- "QLineEdit:focus { border-color: %4; }")
- .arg(ui::colors::BG_BASE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM, ui::colors::AMBER));
irl->addWidget(symbols_input_, 1);
- auto* go_btn = new QPushButton("GO");
- go_btn->setFixedWidth(32);
- go_btn->setStyleSheet(QString("QPushButton { background: %1; color: %2; border: none; "
- "font-size: 9px; font-weight: bold; padding: 3px; }"
- + QString("QPushButton:hover { background: %1; }").arg(ui::colors::AMBER))
- .arg(ui::colors::AMBER, ui::colors::BG_BASE));
- connect(go_btn, &QPushButton::clicked, this, [this]() {
+ go_btn_ = new QPushButton("GO");
+ go_btn_->setFixedWidth(32);
+ connect(go_btn_, &QPushButton::clicked, this, [this]() {
QString text = symbols_input_->text().trimmed().toUpper();
symbols_.clear();
for (auto& s : text.split(",")) {
@@ -47,7 +36,7 @@ WatchlistWidget::WatchlistWidget(QWidget* parent)
}
refresh_data();
});
- irl->addWidget(go_btn);
+ irl->addWidget(go_btn_);
vl->addWidget(input_row);
@@ -59,10 +48,31 @@ WatchlistWidget::WatchlistWidget(QWidget* parent)
connect(this, &BaseWidget::refresh_requested, this, &WatchlistWidget::refresh_data);
+ apply_styles();
set_loading(true);
refresh_data();
}
+void WatchlistWidget::apply_styles() {
+ symbols_label_->setStyleSheet(
+ QString("color: %1; font-size: 9px; font-weight: bold; background: transparent;")
+ .arg(ui::colors::TEXT_TERTIARY()));
+ symbols_input_->setStyleSheet(
+ QString("QLineEdit { background: %1; color: %2; border: 1px solid %3; "
+ "font-size: 10px; padding: 2px 6px; font-family: Consolas; }"
+ "QLineEdit:focus { border-color: %4; }")
+ .arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY(), ui::colors::BORDER_DIM(), ui::colors::AMBER()));
+ go_btn_->setStyleSheet(
+ QString("QPushButton { background: %1; color: %2; border: none; "
+ "font-size: 9px; font-weight: bold; padding: 3px; }"
+ "QPushButton:hover { background: %1; }")
+ .arg(ui::colors::AMBER(), ui::colors::BG_BASE()));
+}
+
+void WatchlistWidget::on_theme_changed() {
+ apply_styles();
+}
+
void WatchlistWidget::refresh_data() {
if (symbols_.isEmpty())
return;
diff --git a/fincept-qt/src/screens/dashboard/widgets/WatchlistWidget.h b/fincept-qt/src/screens/dashboard/widgets/WatchlistWidget.h
index bd43edd6f..64e4ba32c 100644
--- a/fincept-qt/src/screens/dashboard/widgets/WatchlistWidget.h
+++ b/fincept-qt/src/screens/dashboard/widgets/WatchlistWidget.h
@@ -11,11 +11,17 @@ class WatchlistWidget : public BaseWidget {
public:
explicit WatchlistWidget(QWidget* parent = nullptr);
+ protected:
+ void on_theme_changed() override;
+
private:
+ void apply_styles();
void refresh_data();
void populate(const QVector<services::QuoteData>& quotes);
QLineEdit* symbols_input_ = nullptr;
+ QLabel* symbols_label_ = nullptr;
+ QPushButton* go_btn_ = nullptr;
ui::DataTable* table_ = nullptr;
QStringList symbols_;
};
diff --git a/fincept-qt/src/screens/data_mapping/DataMappingScreen.cpp b/fincept-qt/src/screens/data_mapping/DataMappingScreen.cpp
index 839d3cf84..77bcb895e 100644
--- a/fincept-qt/src/screens/data_mapping/DataMappingScreen.cpp
+++ b/fincept-qt/src/screens/data_mapping/DataMappingScreen.cpp
@@ -1,6 +1,7 @@
#include "screens/data_mapping/DataMappingScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "network/http/HttpClient.h"
#include "services/data_normalization/DataNormalizationService.h"
#include "storage/repositories/DataMappingRepository.h"
@@ -79,7 +80,7 @@ static const QString kStyle =
"#dmSecondaryBtn:hover { color: %4; }"
"#dmSaveBtn { background: %6; color: %1; border: none; padding: 6px 20px; "
" font-size: 10px; font-weight: 700; }"
- "#dmSaveBtn:hover { background: #22c55e; }"
+ "#dmSaveBtn:hover { background: %6; }"
"#dmSaveBtn:disabled { background: %10; color: %11; }"
"QTableWidget { background: %1; color: %4; border: none; gridline-color: %8; "
@@ -1578,6 +1579,7 @@ void DataMappingScreen::on_view_changed(int view) {
}
LOG_INFO("DataMapping", "View: " + names[view]);
+ ScreenStateManager::instance().notify_changed(this);
}
void DataMappingScreen::on_step_changed(int step) {
@@ -1907,4 +1909,19 @@ void DataMappingScreen::build_mapping_config(QJsonObject& config) {
config["field_mappings"] = mappings;
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap DataMappingScreen::save_state() const {
+ return {
+ {"view", current_view_},
+ };
+}
+
+void DataMappingScreen::restore_state(const QVariantMap& state) {
+ const int view = state.value("view", 0).toInt();
+ // Only restore the list/templates view — don't resume a partial wizard
+ if (view == 0 || view == 1)
+ on_view_changed(view);
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/data_mapping/DataMappingScreen.h b/fincept-qt/src/screens/data_mapping/DataMappingScreen.h
index 7f1dfb996..3b9ca3c59 100644
--- a/fincept-qt/src/screens/data_mapping/DataMappingScreen.h
+++ b/fincept-qt/src/screens/data_mapping/DataMappingScreen.h
@@ -1,5 +1,6 @@
#pragma once
+#include "screens/IStatefulScreen.h"
#include "storage/repositories/DataMappingRepository.h"
#include <QComboBox>
@@ -24,11 +25,16 @@ namespace fincept::screens {
/// 5-step wizard: API Config → Schema Select → Field Mapping → Cache → Test & Save.
/// Supports predefined schemas (OHLCV, QUOTE, TICK, ORDER, POSITION, PORTFOLIO, INSTRUMENT),
/// custom schemas, multiple parser engines, and Indian broker templates.
-class DataMappingScreen : public QWidget {
+class DataMappingScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit DataMappingScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "data_mapping"; }
+ int state_version() const override { return 1; }
+
private slots:
void on_view_changed(int view); // 0=list, 1=create, 2=templates
void on_step_changed(int step); // 0..4
diff --git a/fincept-qt/src/screens/data_sources/DataSourceTypes.h b/fincept-qt/src/screens/data_sources/DataSourceTypes.h
index 808886070..409387194 100644
--- a/fincept-qt/src/screens/data_sources/DataSourceTypes.h
+++ b/fincept-qt/src/screens/data_sources/DataSourceTypes.h
@@ -1,7 +1,6 @@
#pragma once
// Data Sources Screen — shared types for connector configs, connections, and UI state.
-#include <QColor>
#include <QString>
#include <QStringList>
#include <QVector>
@@ -108,20 +107,4 @@ enum class ConnStatus { Connected, Disconnected, Error, Testing };
enum class ViewMode { Gallery, Connections };
-// ── Obsidian colors ────────────────────────────────────────────────────────
-
-inline const QColor BG_BASE = QColor("#080808");
-inline const QColor BG_SURFACE = QColor("#0a0a0a");
-inline const QColor BG_RAISED = QColor("#111111");
-inline const QColor BG_HOVER = QColor("#161616");
-inline const QColor BORDER_DIM = QColor("#1a1a1a");
-inline const QColor BORDER_MED = QColor("#222222");
-inline const QColor TEXT_PRIMARY = QColor("#e5e5e5");
-inline const QColor TEXT_SECONDARY = QColor("#808080");
-inline const QColor TEXT_TERTIARY = QColor("#525252");
-inline const QColor COLOR_ACCENT = QColor("#d97706");
-inline const QColor COLOR_BUY = QColor("#16a34a");
-inline const QColor COLOR_SELL = QColor("#dc2626");
-inline const QColor COLOR_WARNING = QColor("#ca8a04");
-
} // namespace fincept::screens::datasources
diff --git a/fincept-qt/src/screens/data_sources/DataSourcesScreen.cpp b/fincept-qt/src/screens/data_sources/DataSourcesScreen.cpp
index 246f06d03..0cc35c400 100644
--- a/fincept-qt/src/screens/data_sources/DataSourcesScreen.cpp
+++ b/fincept-qt/src/screens/data_sources/DataSourcesScreen.cpp
@@ -2,6 +2,7 @@
#include "screens/data_sources/DataSourcesScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "screens/data_sources/ConnectorRegistry.h"
#include "services/file_manager/FileManagerService.h"
#include "ui/theme/Theme.h"
@@ -144,7 +145,7 @@ int enabled_connections_for_provider(const QVector<DataSource>& rows, const QStr
}
QTableWidgetItem* make_item(const QString& text,
- const QColor& color = QColor("#e5e5e5"),
+ const QColor& color = QColor(col::TEXT_PRIMARY.get()),
Qt::Alignment alignment = Qt::AlignLeft | Qt::AlignVCenter) {
auto* item = new QTableWidgetItem(text);
item->setForeground(color);
@@ -373,14 +374,14 @@ static const QString kScreenStylesheet = R"(
#dsBtnAccent:disabled { opacity: 0.4; }
#dsBtnDanger {
background: rgba(220,38,38,0.08); color: %14;
- border: 1px solid #7f1d1d; padding: 0 10px;
+ border: 1px solid %15; 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;
+ border: 1px solid %16; 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; }
@@ -477,7 +478,9 @@ void DataSourcesScreen::setup_ui() {
.arg(col::BORDER_BRIGHT) // %11
.arg(col::AMBER_DIM) // %12
.arg(col::POSITIVE) // %13
- .arg(col::NEGATIVE); // %14
+ .arg(col::NEGATIVE) // %14
+ .arg(col::NEGATIVE_DIM) // %15
+ .arg(col::POSITIVE_DIM); // %16
setStyleSheet(style);
auto* root = new QVBoxLayout(this);
@@ -832,7 +835,7 @@ QWidget* DataSourcesScreen::build_connector_panel() {
connector_table_->setAlternatingRowColors(true);
connector_table_->setStyleSheet(
connector_table_->styleSheet() +
- "QTableWidget { alternate-background-color: #0c0c0c; }");
+ QString("QTableWidget { alternate-background-color: %1; }").arg(col::ROW_ALT));
connect(connector_table_, &QTableWidget::itemSelectionChanged,
this, &DataSourcesScreen::on_connector_selection_changed);
connect(connector_table_, &QTableWidget::cellDoubleClicked,
@@ -1139,7 +1142,7 @@ QWidget* DataSourcesScreen::build_connections_page() {
connections_table_->setAlternatingRowColors(true);
connections_table_->setStyleSheet(
connections_table_->styleSheet() +
- "QTableWidget { alternate-background-color: #0c0c0c; }");
+ QString("QTableWidget { alternate-background-color: %1; }").arg(col::ROW_ALT));
connect(connections_table_, &QTableWidget::itemSelectionChanged,
this, &DataSourcesScreen::on_connection_selection_changed);
@@ -1684,11 +1687,13 @@ void DataSourcesScreen::update_stats_strip() {
// Highlight active stat filter
auto reset_color = [](QLabel* v) {
v->setStyleSheet(
- "color:#e5e5e5;font-size:22px;font-weight:700;background:transparent;");
+ QString("color:%1;font-size:22px;font-weight:700;background:transparent;")
+ .arg(col::TEXT_PRIMARY));
};
auto set_amber = [](QLabel* v) {
v->setStyleSheet(
- "color:#d97706;font-size:22px;font-weight:700;background:transparent;");
+ QString("color:%1;font-size:22px;font-weight:700;background:transparent;")
+ .arg(col::AMBER));
};
reset_color(universe_stat_value_);
@@ -1932,6 +1937,7 @@ void DataSourcesScreen::on_search_changed(const QString& /*text*/) {
void DataSourcesScreen::on_connector_clicked(const QString& connector_id) {
if (const auto* cfg = find_connector_config(connector_id)) {
selected_connector_id_ = cfg->id;
+ ScreenStateManager::instance().notify_changed(this);
const QString existing_connection = preferred_connection_for_connector(cfg->id);
show_config_dialog(*cfg, existing_connection);
}
@@ -2290,16 +2296,17 @@ 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;font-family:'Consolas','Courier New',monospace;}"
+ QString("QDialog{background:%1;color:%2;font-family:'Consolas','Courier New',monospace;}"
"QLabel{font-size:13px;background:transparent;}"
- "QPushButton{background:#111111;color:#e5e5e5;border:1px solid #1a1a1a;"
+ "QPushButton{background:%3;color:%2;border:1px solid %4;"
"padding:6px 18px;font-size:12px;font-weight:700;}"
- "QPushButton:hover{background:#1a1a1a;}");
+ "QPushButton:hover{background:%4;}")
+ .arg(col::BG_SURFACE, col::TEXT_PRIMARY, col::BG_RAISED, col::BORDER_DIM));
auto* vl = new QVBoxLayout(&result_dlg);
vl->setContentsMargins(24, 20, 24, 16); vl->setSpacing(10);
auto* lbl = new QLabel("This connector does not support connectivity testing.");
lbl->setWordWrap(true);
- lbl->setStyleSheet("color:#808080;font-size:13px;background:transparent;");
+ lbl->setStyleSheet(QString("color:%1;font-size:13px;background:transparent;").arg(col::TEXT_SECONDARY));
vl->addWidget(lbl); vl->addStretch();
auto* btn = new QPushButton("Close");
btn->setCursor(Qt::PointingHandCursor);
@@ -2420,17 +2427,18 @@ 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;font-family:'Consolas','Courier New',monospace;}"
+ QString("QDialog{background:%1;color:%2;font-family:'Consolas','Courier New',monospace;}"
"QLabel{font-size:13px;background:transparent;}"
- "QPushButton{background:#111111;color:#e5e5e5;border:1px solid #1a1a1a;"
+ "QPushButton{background:%3;color:%2;border:1px solid %4;"
"padding:6px 18px;font-size:12px;font-weight:700;}"
- "QPushButton:hover{background:#1a1a1a;}");
+ "QPushButton:hover{background:%4;}")
+ .arg(col::BG_SURFACE, col::TEXT_PRIMARY, col::BG_RAISED, col::BORDER_DIM));
auto* vl = new QVBoxLayout(&result_dlg);
vl->setContentsMargins(24, 20, 24, 16); vl->setSpacing(10);
auto* lbl = new QLabel("No testable endpoint found in the saved configuration.\n"
"Ensure required fields (URL, host, or API key) are filled in.");
lbl->setWordWrap(true);
- lbl->setStyleSheet("color:#808080;font-size:13px;background:transparent;");
+ lbl->setStyleSheet(QString("color:%1;font-size:13px;background:transparent;").arg(col::TEXT_SECONDARY));
vl->addWidget(lbl); vl->addStretch();
auto* btn = new QPushButton("Close");
btn->setCursor(Qt::PointingHandCursor);
@@ -2490,11 +2498,12 @@ 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;font-family:'Consolas','Courier New',monospace;}"
+ QString("QDialog{background:%1;color:%2;font-family:'Consolas','Courier New',monospace;}"
"QLabel{font-size:13px;background:transparent;}"
- "QPushButton{background:#111111;color:#e5e5e5;border:1px solid #1a1a1a;"
+ "QPushButton{background:%3;color:%2;border:1px solid %4;"
"padding:6px 18px;font-size:12px;font-weight:700;}"
- "QPushButton:hover{background:#1a1a1a;}");
+ "QPushButton:hover{background:%4;}")
+ .arg(col::BG_SURFACE, col::TEXT_PRIMARY, col::BG_RAISED, col::BORDER_DIM));
auto* vl = new QVBoxLayout(&result_dlg);
vl->setContentsMargins(24, 20, 24, 16);
@@ -2503,18 +2512,18 @@ void DataSourcesScreen::on_connection_test(const QString& conn_id) {
auto* status_lbl = new QLabel(success ? "Connection successful" : "Connection failed");
status_lbl->setStyleSheet(
QString("color:%1;font-size:14px;font-weight:700;background:transparent;")
- .arg(success ? "#16a34a" : "#dc2626"));
+ .arg(success ? col::POSITIVE.operator QString() : col::NEGATIVE.operator QString()));
vl->addWidget(status_lbl);
auto* msg_lbl = new QLabel(message);
msg_lbl->setWordWrap(true);
- msg_lbl->setStyleSheet("color:#808080;font-size:12px;background:transparent;");
+ msg_lbl->setStyleSheet(QString("color:%1;font-size:12px;background:transparent;").arg(col::TEXT_SECONDARY));
vl->addWidget(msg_lbl);
if (success) {
auto* note = new QLabel("Note: TCP reachability confirmed. API key validity is not verified here.");
note->setWordWrap(true);
- note->setStyleSheet("color:#525252;font-size:11px;font-style:italic;background:transparent;");
+ note->setStyleSheet(QString("color:%1;font-size:11px;font-style:italic;background:transparent;").arg(col::TEXT_TERTIARY));
vl->addWidget(note);
}
vl->addStretch();
@@ -2689,11 +2698,12 @@ void DataSourcesScreen::on_bulk_delete_selected() {
confirm.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);
confirm.setDefaultButton(QMessageBox::Cancel);
confirm.setStyleSheet(
- "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;"
+ QString("QMessageBox { background:%1; color:%2; font-family:'Consolas','Courier New',monospace; }"
+ "QLabel { color:%2; font-size:13px; background:transparent; }"
+ "QPushButton { background:%3; color:%2; border:1px solid %4;"
" padding:6px 18px; font-size:12px; font-weight:700; }"
- "QPushButton:hover { background:#1a1a1a; }");
+ "QPushButton:hover { background:%4; }")
+ .arg(col::BG_SURFACE, col::TEXT_PRIMARY, col::BG_RAISED, col::BORDER_DIM));
if (confirm.exec() != QMessageBox::Yes) return;
for (const auto& id : selected_ids) {
@@ -2918,4 +2928,19 @@ void DataSourcesScreen::update_clock() {
clock_label_->setText(QDateTime::currentDateTime().toString("HH:mm:ss"));
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap DataSourcesScreen::save_state() const {
+ return {
+ {"connector_id", selected_connector_id_},
+ {"category", static_cast<int>(active_category_)},
+ };
+}
+
+void DataSourcesScreen::restore_state(const QVariantMap& state) {
+ const QString id = state.value("connector_id").toString();
+ if (!id.isEmpty())
+ select_connector_by_id(id);
+}
+
} // namespace fincept::screens::datasources
diff --git a/fincept-qt/src/screens/data_sources/DataSourcesScreen.h b/fincept-qt/src/screens/data_sources/DataSourcesScreen.h
index 17c622bfe..4422bdae1 100644
--- a/fincept-qt/src/screens/data_sources/DataSourcesScreen.h
+++ b/fincept-qt/src/screens/data_sources/DataSourcesScreen.h
@@ -1,6 +1,7 @@
#pragma once
// Data Sources Screen — Bloomberg-style data connector command center.
+#include "screens/IStatefulScreen.h"
#include "screens/data_sources/DataSourceTypes.h"
#include "storage/repositories/DataSourceRepository.h"
@@ -19,11 +20,16 @@
namespace fincept::screens::datasources {
-class DataSourcesScreen : public QWidget {
+class DataSourcesScreen : public QWidget, public fincept::screens::IStatefulScreen {
Q_OBJECT
public:
explicit DataSourcesScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "data_sources"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) override;
diff --git a/fincept-qt/src/screens/dbnomics/DBnomicsDataTable.cpp b/fincept-qt/src/screens/dbnomics/DBnomicsDataTable.cpp
index 1b06c6fd0..55216b1d7 100644
--- a/fincept-qt/src/screens/dbnomics/DBnomicsDataTable.cpp
+++ b/fincept-qt/src/screens/dbnomics/DBnomicsDataTable.cpp
@@ -82,7 +82,7 @@ void DBnomicsDataTable::build_ui() {
.arg(ui::colors::BG_HOVER) // %4
.arg(ui::colors::BG_RAISED) // %5
.arg(ui::colors::TEXT_SECONDARY) // %6
- .arg("#0a0a0a")); // %7 alternate row
+ .arg(ui::colors::BG_SURFACE)); // %7 alternate row
stack_->addWidget(table_); // index 1
stack_->setCurrentIndex(1);
diff --git a/fincept-qt/src/screens/dbnomics/DBnomicsScreen.cpp b/fincept-qt/src/screens/dbnomics/DBnomicsScreen.cpp
index 00ef41b00..a8639c177 100644
--- a/fincept-qt/src/screens/dbnomics/DBnomicsScreen.cpp
+++ b/fincept-qt/src/screens/dbnomics/DBnomicsScreen.cpp
@@ -2,6 +2,7 @@
#include "screens/dbnomics/DBnomicsScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "screens/dbnomics/DBnomicsChartWidget.h"
#include "screens/dbnomics/DBnomicsDataTable.h"
#include "screens/dbnomics/DBnomicsSelectionPanel.h"
@@ -222,10 +223,12 @@ void DBnomicsScreen::build_ui() {
auto* single_splitter = new QSplitter(Qt::Vertical, single_page);
single_splitter->setHandleWidth(5);
single_splitter->setChildrenCollapsible(false);
- single_splitter->setStyleSheet("QSplitter::handle:vertical {"
- " background: #1a1a1a; height: 5px;"
- " border-top: 1px solid #222; border-bottom: 1px solid #222; }"
- "QSplitter::handle:vertical:hover { background: #d97706; }");
+ single_splitter->setStyleSheet(
+ QString("QSplitter::handle:vertical {"
+ " background: %1; height: 5px;"
+ " border-top: 1px solid %2; border-bottom: 1px solid %2; }"
+ "QSplitter::handle:vertical:hover { background: %3; }")
+ .arg(ui::colors::BORDER_DIM, ui::colors::BORDER_MED, ui::colors::AMBER));
chart_widget_ = new DBnomicsChartWidget(single_splitter);
data_table_ = new DBnomicsDataTable(single_splitter);
@@ -556,6 +559,7 @@ void DBnomicsScreen::on_provider_selected(const QString& code) {
set_status(QString("Loading datasets for %1...").arg(code));
selection_panel_->set_datasets_loading(true);
services::DBnomicsService::instance().fetch_datasets(code, 0);
+ ScreenStateManager::instance().notify_changed(this);
}
void DBnomicsScreen::on_dataset_selected(const QString& code) {
@@ -569,6 +573,7 @@ void DBnomicsScreen::on_series_selected(const QString& prov, const QString& ds,
chart_widget_->set_loading(true);
data_table_->set_loading(true);
services::DBnomicsService::instance().fetch_observations(prov, ds, code);
+ ScreenStateManager::instance().notify_changed(this);
}
// ─────────────────────────────────────────────────────────────────────────────
@@ -760,7 +765,8 @@ void DBnomicsScreen::rebuild_comparison_view() {
card->setMinimumHeight(260);
card->setMinimumWidth(320); // ensure Y-axis labels always have room
card->setObjectName("slotCard");
- card->setStyleSheet("QWidget#slotCard { background:#0d0d0d; border:1px solid #1f1f1f; }");
+ card->setStyleSheet(QString("QWidget#slotCard { background:%1; border:1px solid %2; }")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* card_vl = new QVBoxLayout(card);
card_vl->setContentsMargins(0, 0, 0, 0);
@@ -770,7 +776,8 @@ void DBnomicsScreen::rebuild_comparison_view() {
auto* header = new QWidget(card);
header->setFixedHeight(32);
header->setObjectName("cardHeader");
- header->setStyleSheet("QWidget#cardHeader { background:#111; border-bottom:1px solid #1f1f1f; }");
+ header->setStyleSheet(QString("QWidget#cardHeader { background:%1; border-bottom:1px solid %2; }")
+ .arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM));
auto* header_hl = new QHBoxLayout(header);
header_hl->setContentsMargins(10, 0, 8, 0);
@@ -811,8 +818,10 @@ void DBnomicsScreen::rebuild_comparison_view() {
auto* card_splitter = new QSplitter(Qt::Vertical, card);
card_splitter->setHandleWidth(4);
card_splitter->setChildrenCollapsible(false);
- card_splitter->setStyleSheet("QSplitter::handle:vertical { background:#1a1a1a; height:4px; }"
- "QSplitter::handle:vertical:hover { background:#d97706; }");
+ card_splitter->setStyleSheet(
+ QString("QSplitter::handle:vertical { background:%1; height:4px; }"
+ "QSplitter::handle:vertical:hover { background:%2; }")
+ .arg(ui::colors::BORDER_DIM, ui::colors::AMBER));
auto* chart = new DBnomicsChartWidget(card_splitter);
chart->set_compact(true); // tighter margins + no legend for grid slots
@@ -869,4 +878,34 @@ void DBnomicsScreen::rebuild_comparison_view() {
comparison_layout_->addWidget(grid_widget, 1);
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap DBnomicsScreen::save_state() const {
+ return {
+ {"provider", selection_panel_->selected_provider()},
+ {"dataset", selection_panel_->selected_dataset()},
+ {"series", selection_panel_->selected_series()},
+ {"view_mode", static_cast<int>(view_mode_)},
+ };
+}
+
+void DBnomicsScreen::restore_state(const QVariantMap& state) {
+ const QString prov = state.value("provider").toString();
+ const QString ds = state.value("dataset").toString();
+ const QString ser = state.value("series").toString();
+ const int mode = state.value("view_mode", 0).toInt();
+
+ if (mode == 1) {
+ view_mode_ = services::DbnViewMode::Comparison;
+ view_stack_->setCurrentIndex(1);
+ }
+
+ if (!prov.isEmpty())
+ on_provider_selected(prov);
+ if (!ds.isEmpty())
+ on_dataset_selected(ds);
+ if (!ser.isEmpty())
+ on_series_selected(prov, ds, ser);
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/dbnomics/DBnomicsScreen.h b/fincept-qt/src/screens/dbnomics/DBnomicsScreen.h
index 49d0f5815..abb7b7130 100644
--- a/fincept-qt/src/screens/dbnomics/DBnomicsScreen.h
+++ b/fincept-qt/src/screens/dbnomics/DBnomicsScreen.h
@@ -1,5 +1,6 @@
// src/screens/dbnomics/DBnomicsScreen.h
#pragma once
+#include "screens/IStatefulScreen.h"
#include "services/dbnomics/DBnomicsModels.h"
#include <QComboBox>
@@ -17,11 +18,16 @@ class DBnomicsSelectionPanel;
class DBnomicsChartWidget;
class DBnomicsDataTable;
-class DBnomicsScreen : public QWidget {
+class DBnomicsScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit DBnomicsScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "dbnomics"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) override;
diff --git a/fincept-qt/src/screens/dbnomics/DBnomicsSelectionPanel.cpp b/fincept-qt/src/screens/dbnomics/DBnomicsSelectionPanel.cpp
index f78eb9b32..58146990c 100644
--- a/fincept-qt/src/screens/dbnomics/DBnomicsSelectionPanel.cpp
+++ b/fincept-qt/src/screens/dbnomics/DBnomicsSelectionPanel.cpp
@@ -10,43 +10,48 @@
#include <QSizePolicy>
// ── Shared constants ─────────────────────────────────────────────────────────
+namespace col = fincept::ui::colors;
namespace {
-static const QString kSpinStyle = "QLabel { color: #525252; font-family: 'Consolas','Courier New',monospace;"
- " font-size: 11px; background: transparent; }";
+static QString kSpinStyle() {
+ return QString("QLabel { color: %1; font-family: 'Consolas','Courier New',monospace;"
+ " font-size: 11px; background: transparent; }")
+ .arg(col::TEXT_TERTIARY());
+}
// ── Style constants ─────────────────────────────────────────────────────────
-static const QString kListStyle = R"(
- QListWidget {
- background: #080808; color: #808080;
- border: none;
- font-family: 'Consolas','Courier New',monospace;
- font-size: 11px;
- }
- QListWidget::item { padding: 3px 6px; border-bottom: 1px solid #1a1a1a; }
- QListWidget::item:hover { background: #161616; color: #e5e5e5; }
- QListWidget::item:selected { background: rgba(217,119,6,0.15); color: #d97706; }
-)";
-
-static const QString kInputStyle = R"(
- QLineEdit {
- background: #0a0a0a; color: #e5e5e5; border: 1px solid #222222;
- padding: 4px 8px;
- font-family: 'Consolas','Courier New',monospace; font-size: 11px;
- }
- QLineEdit:focus { border: 1px solid #d97706; }
-)";
-
-static const QString kLoadMoreStyle = R"(
- QPushButton {
- background: transparent; color: #525252;
- border: 1px solid #1a1a1a; padding: 3px 8px;
- font-family: 'Consolas','Courier New',monospace; font-size: 10px;
- }
- QPushButton:hover { color: #d97706; border-color: #d97706; }
-)";
+static QString kListStyle() {
+ return QString("QListWidget {"
+ " background: %1; color: %2;"
+ " border: none;"
+ " font-family: 'Consolas','Courier New',monospace;"
+ " font-size: 11px; }"
+ "QListWidget::item { padding: 3px 6px; border-bottom: 1px solid %3; }"
+ "QListWidget::item:hover { background: %4; color: %5; }"
+ "QListWidget::item:selected { background: rgba(217,119,6,0.15); color: %6; }")
+ .arg(col::BG_BASE(), col::TEXT_SECONDARY(), col::BORDER_DIM(),
+ col::BG_HOVER(), col::TEXT_PRIMARY(), col::AMBER());
+}
+
+static QString kInputStyle() {
+ return QString("QLineEdit {"
+ " background: %1; color: %2; border: 1px solid %3;"
+ " padding: 4px 8px;"
+ " font-family: 'Consolas','Courier New',monospace; font-size: 11px; }"
+ "QLineEdit:focus { border: 1px solid %4; }")
+ .arg(col::BG_SURFACE(), col::TEXT_PRIMARY(), col::BORDER_MED(), col::AMBER());
+}
+
+static QString kLoadMoreStyle() {
+ return QString("QPushButton {"
+ " background: transparent; color: %1;"
+ " border: 1px solid %2; padding: 3px 8px;"
+ " font-family: 'Consolas','Courier New',monospace; font-size: 10px; }"
+ "QPushButton:hover { color: %3; border-color: %3; }")
+ .arg(col::TEXT_TERTIARY(), col::BORDER_DIM(), col::AMBER());
+}
} // namespace
@@ -56,7 +61,7 @@ static QLabel* make_spin_label(const QString& text, QWidget* parent) {
auto* lbl = new QLabel(text, parent);
lbl->setFixedHeight(80);
lbl->setAlignment(Qt::AlignCenter);
- lbl->setStyleSheet(kSpinStyle);
+ lbl->setStyleSheet(kSpinStyle());
lbl->hide();
return lbl;
}
@@ -79,15 +84,15 @@ QLabel* DBnomicsSelectionPanel::make_section_label(const QString& text) {
"font-family: 'Consolas','Courier New',monospace; "
"padding: 5px 8px; background: %2; "
"border-bottom: 1px solid %3;")
- .arg(ui::colors::AMBER)
- .arg(ui::colors::BG_RAISED)
- .arg(ui::colors::BORDER_DIM));
+ .arg(col::AMBER)
+ .arg(col::BG_RAISED)
+ .arg(col::BORDER_DIM));
return label;
}
QListWidget* DBnomicsSelectionPanel::make_styled_list(int fixed_height) {
auto* list = new QListWidget();
- list->setStyleSheet(kListStyle);
+ list->setStyleSheet(kListStyle());
list->setFixedHeight(fixed_height);
list->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
return list;
@@ -95,7 +100,7 @@ QListWidget* DBnomicsSelectionPanel::make_styled_list(int fixed_height) {
QPushButton* DBnomicsSelectionPanel::make_load_more_button() {
auto* btn = new QPushButton("LOAD MORE");
- btn->setStyleSheet(kLoadMoreStyle);
+ btn->setStyleSheet(kLoadMoreStyle());
btn->setFixedHeight(22);
btn->hide();
return btn;
@@ -112,7 +117,7 @@ QWidget* DBnomicsSelectionPanel::build_search_section() {
layout->addWidget(make_section_label("GLOBAL SEARCH"));
global_search_input_ = new QLineEdit(w);
- global_search_input_->setStyleSheet(kInputStyle);
+ global_search_input_->setStyleSheet(kInputStyle());
global_search_input_->setFixedHeight(28);
global_search_input_->setPlaceholderText("Search providers, datasets...");
layout->addWidget(global_search_input_);
@@ -184,7 +189,7 @@ QWidget* DBnomicsSelectionPanel::build_provider_section() {
pc_layout->setSpacing(0);
provider_filter_input_ = new QLineEdit(prov_content_);
- provider_filter_input_->setStyleSheet(kInputStyle);
+ provider_filter_input_->setStyleSheet(kInputStyle());
provider_filter_input_->setFixedHeight(26);
provider_filter_input_->setPlaceholderText("Filter providers...");
pc_layout->addWidget(provider_filter_input_);
@@ -278,7 +283,7 @@ QWidget* DBnomicsSelectionPanel::build_series_section() {
sc_layout->setSpacing(0);
series_search_input_ = new QLineEdit(series_content_);
- series_search_input_->setStyleSheet(kInputStyle);
+ series_search_input_->setStyleSheet(kInputStyle());
series_search_input_->setFixedHeight(26);
series_search_input_->setPlaceholderText("Search series...");
sc_layout->addWidget(series_search_input_);
@@ -325,8 +330,8 @@ QWidget* DBnomicsSelectionPanel::build_action_buttons() {
"border: 1px solid %2; padding: 3px 8px; "
"font-family: 'Consolas','Courier New',monospace; font-size: 10px; font-weight: 700; }"
"QPushButton:hover { background: rgba(217,119,6,0.2); }")
- .arg(ui::colors::AMBER)
- .arg(ui::colors::AMBER_DIM));
+ .arg(col::AMBER)
+ .arg(col::AMBER_DIM));
connect(add_btn, &QPushButton::clicked, this, [this]() { emit add_to_single_view_clicked(); });
layout->addWidget(add_btn);
@@ -338,7 +343,7 @@ QWidget* DBnomicsSelectionPanel::build_action_buttons() {
"border: 1px solid %2; padding: 3px 8px; "
"font-family: 'Consolas','Courier New',monospace; font-size: 10px; font-weight: 700; }"
"QPushButton:hover { background: rgba(220,38,38,0.2); }")
- .arg(ui::colors::NEGATIVE)
+ .arg(col::NEGATIVE)
.arg("#7f1d1d"));
connect(clear_btn, &QPushButton::clicked, this, [this]() { emit clear_all_clicked(); });
layout->addWidget(clear_btn);
@@ -362,7 +367,7 @@ QWidget* DBnomicsSelectionPanel::build_comparison_slots_section() {
"border: 1px solid rgba(22,163,74,0.4); padding: 3px 8px; "
"font-family: 'Consolas','Courier New',monospace; font-size: 10px; font-weight: 700; }"
"QPushButton:hover { background: rgba(22,163,74,0.2); }")
- .arg(ui::colors::POSITIVE));
+ .arg(col::POSITIVE));
connect(add_slot_btn, &QPushButton::clicked, this, [this]() { emit add_slot_clicked(); });
layout->addWidget(add_slot_btn);
@@ -380,7 +385,7 @@ QWidget* DBnomicsSelectionPanel::build_comparison_slots_section() {
void DBnomicsSelectionPanel::build_ui() {
setFixedWidth(280);
- setStyleSheet(QString("background: %1;").arg(ui::colors::BG_BASE));
+ setStyleSheet(QString("background: %1;").arg(col::BG_BASE));
auto* root_layout = new QVBoxLayout(this);
root_layout->setContentsMargins(0, 0, 0, 0);
@@ -394,8 +399,8 @@ void DBnomicsSelectionPanel::build_ui() {
"QScrollBar:vertical { background: %1; width: 6px; }"
"QScrollBar::handle:vertical { background: %2; }"
"QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }")
- .arg(ui::colors::BG_BASE)
- .arg(ui::colors::BORDER_DIM));
+ .arg(col::BG_BASE)
+ .arg(col::BORDER_DIM));
auto* content = new QWidget();
auto* content_layout = new QVBoxLayout(content);
@@ -419,9 +424,9 @@ void DBnomicsSelectionPanel::build_ui() {
"font-family: 'Consolas','Courier New',monospace; "
"padding: 3px 8px; background: %2; "
"border-top: 1px solid %3;")
- .arg(ui::colors::TEXT_TERTIARY)
- .arg(ui::colors::BG_RAISED)
- .arg(ui::colors::BORDER_DIM));
+ .arg(col::TEXT_TERTIARY)
+ .arg(col::BG_RAISED)
+ .arg(col::BORDER_DIM));
root_layout->addWidget(status_label_);
}
@@ -432,8 +437,8 @@ void DBnomicsSelectionPanel::add_comparison_slot() {
auto* slot_widget = new QWidget();
slot_widget->setStyleSheet(QString("QWidget { background: %1; border: 1px solid %2; }")
- .arg(ui::colors::BG_SURFACE)
- .arg(ui::colors::BORDER_DIM));
+ .arg(col::BG_SURFACE)
+ .arg(col::BORDER_DIM));
auto* slot_layout = new QVBoxLayout(slot_widget);
slot_layout->setContentsMargins(4, 4, 4, 4);
@@ -448,7 +453,7 @@ void DBnomicsSelectionPanel::add_comparison_slot() {
auto* slot_label = new QLabel(QString("SLOT %1").arg(slot_idx + 1));
slot_label->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: 700; "
"font-family: 'Consolas','Courier New',monospace;")
- .arg(ui::colors::AMBER));
+ .arg(col::AMBER));
header_layout->addWidget(slot_label);
header_layout->addStretch();
@@ -457,7 +462,7 @@ void DBnomicsSelectionPanel::add_comparison_slot() {
remove_btn->setStyleSheet(QString("QPushButton { background: rgba(220,38,38,0.1); color: %1; "
"border: 1px solid rgba(220,38,38,0.3); font-size: 11px; font-weight: 700; }"
"QPushButton:hover { background: rgba(220,38,38,0.25); }")
- .arg(ui::colors::NEGATIVE));
+ .arg(col::NEGATIVE));
connect(remove_btn, &QPushButton::clicked, this, [this, slot_idx]() { emit remove_slot_clicked(slot_idx); });
header_layout->addWidget(remove_btn);
slot_layout->addWidget(header_row);
@@ -469,9 +474,9 @@ void DBnomicsSelectionPanel::add_comparison_slot() {
"border: 1px solid %2; "
"font-family: 'Consolas','Courier New',monospace; font-size: 9px; }"
"QPushButton:hover { color: %3; border-color: %3; }")
- .arg(ui::colors::TEXT_TERTIARY)
- .arg(ui::colors::BORDER_DIM)
- .arg(ui::colors::AMBER));
+ .arg(col::TEXT_TERTIARY)
+ .arg(col::BORDER_DIM)
+ .arg(col::AMBER));
connect(add_series_btn, &QPushButton::clicked, this, [this, slot_idx]() { emit add_to_slot_clicked(slot_idx); });
slot_layout->addWidget(add_series_btn);
@@ -715,7 +720,7 @@ void DBnomicsSelectionPanel::update_slot_series(int slot_index, const QVector<se
auto* name_label = new QLabel(name);
name_label->setStyleSheet(QString("color: %1; font-size: 10px; "
"font-family: 'Consolas','Courier New',monospace;")
- .arg(ui::colors::TEXT_SECONDARY));
+ .arg(col::TEXT_SECONDARY));
name_label->setToolTip(dp.series_name);
row_layout->addWidget(name_label, 1);
@@ -726,8 +731,8 @@ void DBnomicsSelectionPanel::update_slot_series(int slot_index, const QVector<se
remove_btn->setStyleSheet(
QString("QPushButton { background: transparent; color: %1; border: none; font-size: 10px; }"
"QPushButton:hover { color: %2; }")
- .arg(ui::colors::TEXT_TERTIARY)
- .arg(ui::colors::NEGATIVE));
+ .arg(col::TEXT_TERTIARY)
+ .arg(col::NEGATIVE));
connect(remove_btn, &QPushButton::clicked, this,
[this, slot_index, series_id]() { emit remove_from_slot_clicked(slot_index, series_id); });
row_layout->addWidget(remove_btn);
diff --git a/fincept-qt/src/screens/docs/DocsScreen.cpp b/fincept-qt/src/screens/docs/DocsScreen.cpp
index 48988b207..8892cd7eb 100644
--- a/fincept-qt/src/screens/docs/DocsScreen.cpp
+++ b/fincept-qt/src/screens/docs/DocsScreen.cpp
@@ -15,30 +15,41 @@ namespace fincept::screens {
static const char* FONT = "'Consolas','Courier New',monospace";
-static const char* SIDEBAR_SS = "QTreeWidget { background: #0a0a0a; color: #808080; border: none;"
- " font-size: 12px; font-family: 'Consolas','Courier New',monospace;"
- " outline: none; }"
- "QTreeWidget::item { height: 26px; padding-left: 6px; border: none; }"
- "QTreeWidget::item:hover { background: #111111; color: #e5e5e5; }"
- "QTreeWidget::item:selected { background: #161616; color: #d97706; }"
- "QTreeWidget::branch { background: #0a0a0a; }"
- "QTreeWidget::branch:hover { background: #111111; }"
- "QTreeWidget::branch:has-children:!has-siblings:closed,"
- "QTreeWidget::branch:closed:has-children:has-siblings"
- " { border-image: none; image: none; }"
- "QTreeWidget::branch:open:has-children:!has-siblings,"
- "QTreeWidget::branch:open:has-children:has-siblings"
- " { border-image: none; image: none; }"
- "QScrollBar:vertical { width: 5px; background: transparent; }"
- "QScrollBar::handle:vertical { background: #222222; }"
- "QScrollBar::handle:vertical:hover { background: #333333; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }";
-
-static const char* SCROLL_SS = "QScrollArea { border: none; background: transparent; }"
- "QScrollBar:vertical { width: 5px; background: transparent; }"
- "QScrollBar::handle:vertical { background: #222222; }"
- "QScrollBar::handle:vertical:hover { background: #333333; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }";
+static QString SIDEBAR_SS() {
+ return QString(
+ "QTreeWidget { background: %1; color: %2; border: none;"
+ " font-size: 12px; font-family: 'Consolas','Courier New',monospace;"
+ " outline: none; }"
+ "QTreeWidget::item { height: 26px; padding-left: 6px; border: none; }"
+ "QTreeWidget::item:hover { background: %3; color: %4; }"
+ "QTreeWidget::item:selected { background: %5; color: %6; }"
+ "QTreeWidget::branch { background: %1; }"
+ "QTreeWidget::branch:hover { background: %3; }"
+ "QTreeWidget::branch:has-children:!has-siblings:closed,"
+ "QTreeWidget::branch:closed:has-children:has-siblings"
+ " { border-image: none; image: none; }"
+ "QTreeWidget::branch:open:has-children:!has-siblings,"
+ "QTreeWidget::branch:open:has-children:has-siblings"
+ " { border-image: none; image: none; }"
+ "QScrollBar:vertical { width: 5px; background: transparent; }"
+ "QScrollBar::handle:vertical { background: %7; }"
+ "QScrollBar::handle:vertical:hover { background: %8; }"
+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }")
+ .arg(ui::colors::BG_SURFACE, ui::colors::TEXT_SECONDARY,
+ ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY,
+ ui::colors::BG_HOVER, ui::colors::AMBER,
+ ui::colors::BORDER_MED, ui::colors::BORDER_BRIGHT);
+}
+
+static QString SCROLL_SS() {
+ return QString(
+ "QScrollArea { border: none; background: transparent; }"
+ "QScrollBar:vertical { width: 5px; background: transparent; }"
+ "QScrollBar::handle:vertical { background: %1; }"
+ "QScrollBar::handle:vertical:hover { background: %2; }"
+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }")
+ .arg(ui::colors::BORDER_MED, ui::colors::BORDER_BRIGHT);
+}
// ============================================================================
// Helpers
@@ -46,25 +57,25 @@ static const char* SCROLL_SS = "QScrollArea { border: none; background: transpar
QLabel* DocsScreen::make_heading(const QString& text) {
auto* lbl = new QLabel(text);
- lbl->setStyleSheet("color: #d97706; font-size: 14px; font-weight: bold; letter-spacing: 0.5px;"
- " background: transparent; font-family: 'Consolas','Courier New',monospace;"
- " padding: 4px 0;");
+ lbl->setStyleSheet(QString("color: %1; font-size: 14px; font-weight: bold; letter-spacing: 0.5px;"
+ " background: transparent; font-family: 'Consolas','Courier New',monospace;"
+ " padding: 4px 0;").arg(ui::colors::AMBER));
lbl->setWordWrap(true);
return lbl;
}
QLabel* DocsScreen::make_body_label(const QString& text) {
auto* lbl = new QLabel(text);
- lbl->setStyleSheet("color: #e5e5e5; font-size: 12px; background: transparent; line-height: 1.5;"
- " font-family: 'Consolas','Courier New',monospace;");
+ lbl->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent; line-height: 1.5;"
+ " font-family: 'Consolas','Courier New',monospace;").arg(ui::colors::TEXT_PRIMARY));
lbl->setWordWrap(true);
return lbl;
}
QLabel* DocsScreen::make_muted_label(const QString& text) {
auto* lbl = new QLabel(text);
- lbl->setStyleSheet("color: #808080; font-size: 11px; background: transparent;"
- " font-family: 'Consolas','Courier New',monospace;");
+ lbl->setStyleSheet(QString("color: %1; font-size: 11px; background: transparent;"
+ " font-family: 'Consolas','Courier New',monospace;").arg(ui::colors::TEXT_SECONDARY));
lbl->setWordWrap(true);
return lbl;
}
@@ -72,7 +83,8 @@ QLabel* DocsScreen::make_muted_label(const QString& text) {
QWidget* DocsScreen::make_section_panel(const QString& icon, const QString& title, const QString& body,
const QString& accent_color) {
auto* panel = new QWidget;
- panel->setStyleSheet("background: #0a0a0a; border: 1px solid #1a1a1a;");
+ panel->setStyleSheet(QString("background: %1; border: 1px solid %2;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* vl = new QVBoxLayout(panel);
vl->setContentsMargins(0, 0, 0, 0);
vl->setSpacing(0);
@@ -80,15 +92,16 @@ QWidget* DocsScreen::make_section_panel(const QString& icon, const QString& titl
// Header
auto* hdr = new QLabel(QString("%1 %2").arg(icon, title));
hdr->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: bold; letter-spacing: 0.5px;"
- " background: #111111; padding: 8px 12px; border-bottom: 1px solid #1a1a1a;"
+ " background: %2; padding: 8px 12px; border-bottom: 1px solid %3;"
" font-family: 'Consolas','Courier New',monospace;")
- .arg(accent_color));
+ .arg(accent_color, ui::colors::BG_RAISED, ui::colors::BORDER_DIM));
vl->addWidget(hdr);
// Body
auto* content = new QLabel(body);
- content->setStyleSheet("color: #e5e5e5; font-size: 12px; background: transparent; padding: 10px 12px;"
- " font-family: 'Consolas','Courier New',monospace; line-height: 1.6;");
+ content->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent; padding: 10px 12px;"
+ " font-family: 'Consolas','Courier New',monospace; line-height: 1.6;")
+ .arg(ui::colors::TEXT_PRIMARY));
content->setWordWrap(true);
vl->addWidget(content);
@@ -98,15 +111,17 @@ QWidget* DocsScreen::make_section_panel(const QString& icon, const QString& titl
QWidget* DocsScreen::make_skill_panel(const QString& beginner, const QString& intermediate, const QString& advanced,
const QString& pro) {
auto* panel = new QWidget;
- panel->setStyleSheet("background: #0a0a0a; border: 1px solid #1a1a1a;");
+ panel->setStyleSheet(QString("background: %1; border: 1px solid %2;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* vl = new QVBoxLayout(panel);
vl->setContentsMargins(0, 0, 0, 0);
vl->setSpacing(0);
auto* hdr = new QLabel("SKILL LEVELS");
- hdr->setStyleSheet("color: #d97706; font-size: 11px; font-weight: bold; letter-spacing: 0.5px;"
- " background: #111111; padding: 8px 12px; border-bottom: 1px solid #1a1a1a;"
- " font-family: 'Consolas','Courier New',monospace;");
+ hdr->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: bold; letter-spacing: 0.5px;"
+ " background: %2; padding: 8px 12px; border-bottom: 1px solid %3;"
+ " font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::AMBER, ui::colors::BG_RAISED, ui::colors::BORDER_DIM));
vl->addWidget(hdr);
struct Level {
@@ -115,15 +130,15 @@ QWidget* DocsScreen::make_skill_panel(const QString& beginner, const QString& in
const QString& text;
};
Level levels[] = {
- {"BEGINNER", "#16a34a", beginner},
- {"INTERMEDIATE", "#2563eb", intermediate},
- {"ADVANCED", "#d97706", advanced},
- {"PRO", "#dc2626", pro},
+ {"BEGINNER", ui::colors::POSITIVE(), beginner},
+ {"INTERMEDIATE", ui::colors::INFO(), intermediate},
+ {"ADVANCED", ui::colors::AMBER(), advanced},
+ {"PRO", ui::colors::NEGATIVE(), pro},
};
for (const auto& lvl : levels) {
auto* row = new QWidget;
- row->setStyleSheet("background: transparent; border-bottom: 1px solid #111111;");
+ row->setStyleSheet(QString("background: transparent; border-bottom: 1px solid %1;").arg(ui::colors::BG_RAISED));
auto* rl = new QHBoxLayout(row);
rl->setContentsMargins(12, 8, 12, 8);
rl->setSpacing(10);
@@ -136,8 +151,8 @@ QWidget* DocsScreen::make_skill_panel(const QString& beginner, const QString& in
rl->addWidget(badge);
auto* desc = new QLabel(lvl.text);
- desc->setStyleSheet("color: #e5e5e5; font-size: 11px; background: transparent;"
- " font-family: 'Consolas','Courier New',monospace;");
+ desc->setStyleSheet(QString("color: %1; font-size: 11px; background: transparent;"
+ " font-family: 'Consolas','Courier New',monospace;").arg(ui::colors::TEXT_PRIMARY));
desc->setWordWrap(true);
rl->addWidget(desc, 1);
@@ -160,7 +175,7 @@ QWidget* DocsScreen::make_page(const QString& title, const QString& subtitle,
const std::vector<std::pair<QString, QString>>& sections) {
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
- scroll->setStyleSheet(SCROLL_SS);
+ scroll->setStyleSheet(SCROLL_SS());
auto* page = new QWidget;
page->setStyleSheet(QString("background: %1;").arg(ui::colors::BG_BASE));
@@ -177,12 +192,12 @@ QWidget* DocsScreen::make_page(const QString& title, const QString& subtitle,
// Separator
auto* sep = new QFrame;
sep->setFrameShape(QFrame::HLine);
- sep->setStyleSheet("color: #1a1a1a;");
+ sep->setStyleSheet(QString("color: %1;").arg(ui::colors::BORDER_DIM));
vl->addWidget(sep);
// Sections
for (const auto& [heading, body] : sections) {
- vl->addWidget(make_section_panel("■", heading, body, "#d97706"));
+ vl->addWidget(make_section_panel("■", heading, body, ui::colors::AMBER));
}
vl->addStretch();
@@ -197,7 +212,7 @@ QWidget* DocsScreen::make_page(const QString& title, const QString& subtitle,
QWidget* DocsScreen::page_welcome() {
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
- scroll->setStyleSheet(SCROLL_SS);
+ scroll->setStyleSheet(SCROLL_SS());
auto* page = new QWidget;
page->setStyleSheet(QString("background: %1;").arg(ui::colors::BG_BASE));
@@ -210,7 +225,7 @@ QWidget* DocsScreen::page_welcome() {
auto* sep = new QFrame;
sep->setFrameShape(QFrame::HLine);
- sep->setStyleSheet("color: #1a1a1a;");
+ sep->setStyleSheet(QString("color: %1;").arg(ui::colors::BORDER_DIM));
vl->addWidget(sep);
vl->addWidget(
@@ -222,7 +237,7 @@ QWidget* DocsScreen::page_welcome() {
"With 45+ integrated screens, real-time WebSocket feeds, embedded Python analytics, "
"and support for 15+ broker integrations, Fincept Terminal bridges the gap between "
"retail and institutional tooling.",
- "#d97706"));
+ ui::colors::AMBER));
vl->addWidget(make_section_panel("■", "KEY CAPABILITIES",
"■ Real-time market data across equities, crypto, forex, commodities\n"
@@ -238,7 +253,7 @@ QWidget* DocsScreen::page_welcome() {
"■ Report builder with drag-and-drop components\n"
"■ Backtesting with 6 providers and 50+ strategies\n"
"■ Algorithmic trading with strategy builder and scanner",
- "#16a34a"));
+ ui::colors::POSITIVE));
vl->addWidget(make_section_panel("■", "WHO IS THIS FOR?",
"■ Retail traders seeking institutional-quality tools\n"
@@ -248,7 +263,7 @@ QWidget* DocsScreen::page_welcome() {
"■ Algorithmic trading developers\n"
"■ Crypto traders needing multi-exchange access\n"
"■ Economics researchers working with global datasets",
- "#2563eb"));
+ ui::colors::INFO));
vl->addWidget(make_section_panel("■", "NAVIGATION",
"Use the sidebar on the left to browse documentation by category. "
@@ -257,7 +272,7 @@ QWidget* DocsScreen::page_welcome() {
"■ Key Features — detailed capabilities\n"
"■ Real-World Usage — practical applications\n"
"■ Skill Levels — Beginner through Pro guidance",
- "#808080"));
+ ui::colors::TEXT_SECONDARY));
vl->addStretch();
scroll->setWidget(page);
@@ -267,7 +282,7 @@ QWidget* DocsScreen::page_welcome() {
QWidget* DocsScreen::page_getting_started() {
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
- scroll->setStyleSheet(SCROLL_SS);
+ scroll->setStyleSheet(SCROLL_SS());
auto* page = new QWidget;
page->setStyleSheet(QString("background: %1;").arg(ui::colors::BG_BASE));
@@ -280,7 +295,7 @@ QWidget* DocsScreen::page_getting_started() {
auto* sep = new QFrame;
sep->setFrameShape(QFrame::HLine);
- sep->setStyleSheet("color: #1a1a1a;");
+ sep->setStyleSheet(QString("color: %1;").arg(ui::colors::BORDER_DIM));
vl->addWidget(sep);
vl->addWidget(make_section_panel("1", "LAUNCH & LOGIN",
@@ -290,7 +305,7 @@ QWidget* DocsScreen::page_getting_started() {
"■ Continue as Guest (limited features)\n"
"■ Log in with existing credentials\n\n"
"After login, you'll land on the Dashboard — your home base.",
- "#16a34a"));
+ ui::colors::POSITIVE));
vl->addWidget(make_section_panel("2", "THE INTERFACE",
"The terminal has four main zones:\n\n"
@@ -300,14 +315,14 @@ QWidget* DocsScreen::page_getting_started() {
"STATUS BAR (bottom) — Version, market indicators, connection status\n\n"
"Use the Navigate menu (in toolbar) to access 30+ additional screens "
"organized by category: Markets & Data, Trading, Research, Tools, etc.",
- "#2563eb"));
+ ui::colors::INFO));
vl->addWidget(make_section_panel("3", "KEYBOARD SHORTCUTS",
"F11 — Toggle fullscreen\n"
"F10 — Focus mode (hide tab/status bars for maximum screen space)\n"
"F5 — Refresh current screen\n"
"Ctrl+P — Take screenshot (saved to home directory)",
- "#d97706"));
+ ui::colors::AMBER));
vl->addWidget(make_section_panel("4", "SUBSCRIPTION PLANS",
"Fincept Terminal offers tiered access:\n\n"
@@ -315,7 +330,7 @@ QWidget* DocsScreen::page_getting_started() {
"■ PRO — Full market data, all screens, real trading, AI chat\n"
"■ ENTERPRISE — Everything + API access, priority support\n\n"
"Manage your plan from Settings or the Pricing screen.",
- "#d97706"));
+ ui::colors::AMBER));
vl->addWidget(
make_skill_panel("Explore the Dashboard, set up a watchlist, browse market data",
@@ -360,7 +375,7 @@ QWidget* DocsScreen::page_keyboard_shortcuts() {
QWidget* DocsScreen::page_dashboard() {
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
- scroll->setStyleSheet(SCROLL_SS);
+ scroll->setStyleSheet(SCROLL_SS());
auto* page = new QWidget;
page->setStyleSheet(QString("background: %1;").arg(ui::colors::BG_BASE));
@@ -373,7 +388,7 @@ QWidget* DocsScreen::page_dashboard() {
auto* sep = new QFrame;
sep->setFrameShape(QFrame::HLine);
- sep->setStyleSheet("color: #1a1a1a;");
+ sep->setStyleSheet(QString("color: %1;").arg(ui::colors::BORDER_DIM));
vl->addWidget(sep);
vl->addWidget(
@@ -381,7 +396,7 @@ QWidget* DocsScreen::page_dashboard() {
"The Dashboard is your primary workspace. It features a draggable widget grid "
"where you can arrange market widgets, a scrolling ticker bar showing live prices, "
"a market pulse panel with sector performance, and a status bar showing connection state.",
- "#d97706"));
+ ui::colors::AMBER));
vl->addWidget(make_section_panel("■", "AVAILABLE WIDGETS",
"■ Stock Quote — Real-time price, change, volume for any symbol\n"
@@ -401,7 +416,7 @@ QWidget* DocsScreen::page_dashboard() {
"■ Crypto — Top cryptocurrency prices\n"
"■ Commodities — Gold, oil, silver, natural gas\n"
"■ Portfolio Summary — Holdings overview with allocation",
- "#16a34a"));
+ ui::colors::POSITIVE));
vl->addWidget(
make_section_panel("■", "REAL-WORLD USAGE",
@@ -409,7 +424,7 @@ QWidget* DocsScreen::page_dashboard() {
"■ Active trading: Pin stock quote + quick trade widgets, monitor watchlist\n"
"■ Portfolio management: Use portfolio summary + risk metrics + performance\n"
"■ Sector rotation: Combine sector heatmap + top movers + indices",
- "#2563eb"));
+ ui::colors::INFO));
vl->addWidget(make_skill_panel(
"Start with default layout. Add a Stock Quote widget for a symbol you follow. Watch the ticker bar.",
@@ -427,7 +442,7 @@ QWidget* DocsScreen::page_dashboard() {
QWidget* DocsScreen::page_markets() {
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
- scroll->setStyleSheet(SCROLL_SS);
+ scroll->setStyleSheet(SCROLL_SS());
auto* page = new QWidget;
page->setStyleSheet(QString("background: %1;").arg(ui::colors::BG_BASE));
@@ -440,14 +455,14 @@ QWidget* DocsScreen::page_markets() {
auto* sep = new QFrame;
sep->setFrameShape(QFrame::HLine);
- sep->setStyleSheet("color: #1a1a1a;");
+ sep->setStyleSheet(QString("color: %1;").arg(ui::colors::BORDER_DIM));
vl->addWidget(sep);
vl->addWidget(make_section_panel("■", "OVERVIEW",
"The Markets screen provides a comprehensive view of global markets organized "
"by region. It displays indices, equities, forex, commodities, and crypto in "
"panel-based layouts with configurable auto-refresh (default: 10 minutes).",
- "#d97706"));
+ ui::colors::AMBER));
vl->addWidget(make_section_panel("■", "KEY FEATURES",
"■ Regional panels — US, Europe, Asia, Global\n"
@@ -456,14 +471,14 @@ QWidget* DocsScreen::page_markets() {
"■ Market hours and session status indicators\n"
"■ Sort by name, price, change, or volume\n"
"■ Click any instrument to navigate to detailed view",
- "#16a34a"));
+ ui::colors::POSITIVE));
vl->addWidget(make_section_panel("■", "REAL-WORLD USAGE",
"■ Pre-market: Scan global indices to gauge overnight sentiment\n"
"■ Cross-market analysis: Compare US vs Europe vs Asia performance\n"
"■ Commodity tracking: Monitor gold, oil, natural gas alongside equities\n"
"■ FX correlation: Watch currency pairs relative to equity moves",
- "#2563eb"));
+ ui::colors::INFO));
vl->addWidget(
make_skill_panel("Browse the default view. Learn to read green (up) and red (down) color coding.",
@@ -532,7 +547,7 @@ QWidget* DocsScreen::page_watchlist() {
QWidget* DocsScreen::page_crypto_trading() {
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
- scroll->setStyleSheet(SCROLL_SS);
+ scroll->setStyleSheet(SCROLL_SS());
auto* page = new QWidget;
page->setStyleSheet(QString("background: %1;").arg(ui::colors::BG_BASE));
@@ -545,21 +560,21 @@ QWidget* DocsScreen::page_crypto_trading() {
auto* sep = new QFrame;
sep->setFrameShape(QFrame::HLine);
- sep->setStyleSheet("color: #1a1a1a;");
+ sep->setStyleSheet(QString("color: %1;").arg(ui::colors::BORDER_DIM));
vl->addWidget(sep);
vl->addWidget(make_section_panel("■", "OVERVIEW",
"A full-featured crypto trading terminal supporting 10+ exchanges with real-time "
"WebSocket feeds. Features OHLC charts, order book depth, order entry with market/"
"limit/stop orders, watchlist, and a paper trading engine for risk-free practice.",
- "#d97706"));
+ ui::colors::AMBER));
vl->addWidget(make_section_panel("■", "SUPPORTED EXCHANGES",
"Kraken | Binance | Bybit | OKX | Coinbase | Bitget\n"
"Gate | KuCoin | MEXC | HTX\n\n"
"Each exchange supports: spot trading, real-time orderbook, OHLC candles, "
"ticker data, and trade history via WebSocket.",
- "#16a34a"));
+ ui::colors::POSITIVE));
vl->addWidget(make_section_panel("■", "PANELS",
"■ Command Bar — Exchange selector, symbol input, paper/live toggle, API config\n"
@@ -569,7 +584,7 @@ QWidget* DocsScreen::page_crypto_trading() {
"■ Order Entry — Market, Limit, Stop-Limit with SL/TP\n"
"■ Order Book — Live bid/ask depth visualization\n"
"■ Bottom Panel — Open orders, order history, positions, balances",
- "#2563eb"));
+ ui::colors::INFO));
vl->addWidget(make_section_panel("■", "PAPER TRADING",
"Built-in paper trading engine with:\n"
@@ -578,7 +593,7 @@ QWidget* DocsScreen::page_crypto_trading() {
"■ P&L tracking per position\n"
"■ Order history persistence\n"
"■ Switch between Paper and Live mode with one click",
- "#0891b2"));
+ ui::colors::CYAN));
vl->addWidget(make_skill_panel(
"Start in Paper mode. Pick BTC/USDT, place a small market buy, watch it fill. Learn the order book.",
@@ -1331,7 +1346,7 @@ QWidget* DocsScreen::page_profile() {
void DocsScreen::build_sidebar() {
sidebar_ = new QTreeWidget;
sidebar_->setHeaderHidden(true);
- sidebar_->setStyleSheet(SIDEBAR_SS);
+ sidebar_->setStyleSheet(SIDEBAR_SS());
sidebar_->setIndentation(16);
sidebar_->setAnimated(true);
sidebar_->setRootIsDecorated(true);
@@ -1348,7 +1363,7 @@ void DocsScreen::build_sidebar() {
QFont f(FONT, 10);
f.setBold(true);
cat->setFont(0, f);
- cat->setForeground(0, QColor("#d97706"));
+ cat->setForeground(0, QColor(ui::colors::AMBER.get()));
cat->setExpanded(true);
return cat;
};
@@ -1520,32 +1535,37 @@ DocsScreen::DocsScreen(QWidget* parent) : QWidget(parent) {
// ── Command bar ──────────────────────────────────────────────────────────
auto* cmd = new QWidget;
- cmd->setStyleSheet("background: #0a0a0a; border-bottom: 1px solid #1a1a1a;");
+ cmd->setStyleSheet(QString("background: %1; border-bottom: 1px solid %2;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
cmd->setFixedHeight(32);
auto* cmd_hl = new QHBoxLayout(cmd);
cmd_hl->setContentsMargins(10, 0, 10, 0);
cmd_hl->setSpacing(10);
auto* title = new QLabel("DOCUMENTATION");
- title->setStyleSheet("color: #d97706; font-size: 12px; font-weight: bold; letter-spacing: 1px;"
- " background: transparent; font-family: 'Consolas','Courier New',monospace;");
+ title->setStyleSheet(QString("color: %1; font-size: 12px; font-weight: bold; letter-spacing: 1px;"
+ " background: transparent; font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::AMBER));
cmd_hl->addWidget(title);
auto* sep = new QLabel("|");
- sep->setStyleSheet("color: #333333; background: transparent; font-family: 'Consolas',monospace;");
+ sep->setStyleSheet(QString("color: %1; background: transparent; font-family: 'Consolas',monospace;")
+ .arg(ui::colors::BORDER_BRIGHT));
cmd_hl->addWidget(sep);
breadcrumb_ = new QLabel("FINCEPT TERMINAL v4.0.0");
- breadcrumb_->setStyleSheet("color: #808080; font-size: 11px; font-weight: bold;"
- " background: transparent; letter-spacing: 0.5px;"
- " font-family: 'Consolas','Courier New',monospace;");
+ breadcrumb_->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: bold;"
+ " background: transparent; letter-spacing: 0.5px;"
+ " font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_SECONDARY));
cmd_hl->addWidget(breadcrumb_);
cmd_hl->addStretch();
auto* count = new QLabel("35 TOPICS | 9 CATEGORIES");
- count->setStyleSheet("color: #525252; font-size: 11px; background: transparent;"
- " font-family: 'Consolas','Courier New',monospace;");
+ count->setStyleSheet(QString("color: %1; font-size: 11px; background: transparent;"
+ " font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_TERTIARY));
cmd_hl->addWidget(count);
root->addWidget(cmd);
@@ -1555,8 +1575,9 @@ DocsScreen::DocsScreen(QWidget* parent) : QWidget(parent) {
build_content_pages();
auto* splitter = new QSplitter(Qt::Horizontal);
- splitter->setStyleSheet("QSplitter { background: #080808; }"
- "QSplitter::handle { background: #1a1a1a; width: 1px; }");
+ splitter->setStyleSheet(QString("QSplitter { background: %1; }"
+ "QSplitter::handle { background: %2; width: 1px; }")
+ .arg(ui::colors::BG_BASE, ui::colors::BORDER_DIM));
splitter->addWidget(sidebar_);
splitter->addWidget(pages_);
splitter->setStretchFactor(0, 0);
diff --git a/fincept-qt/src/screens/economics/EconomicsScreen.cpp b/fincept-qt/src/screens/economics/EconomicsScreen.cpp
index a3b7cb79c..f29b27586 100644
--- a/fincept-qt/src/screens/economics/EconomicsScreen.cpp
+++ b/fincept-qt/src/screens/economics/EconomicsScreen.cpp
@@ -5,6 +5,9 @@
#include "screens/economics/EconomicsScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
+#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include "screens/economics/panels/AdbPanel.h"
#include "screens/economics/panels/AkShareChinaPanel.h"
#include "screens/economics/panels/BcbPanel.h"
@@ -125,6 +128,10 @@ EconomicsScreen::EconomicsScreen(QWidget* parent)
: QWidget(parent) {
setObjectName("econScreen");
build_ui();
+
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, &EconomicsScreen::refresh_theme);
+
// Activate first source
if (!sources_.isEmpty())
switch_to(sources_.first().id);
@@ -136,37 +143,29 @@ void EconomicsScreen::build_ui() {
root->setSpacing(0);
// ── Header ────────────────────────────────────────────────────────────────
- auto* header = new QWidget;
- header->setFixedHeight(40);
- header->setStyleSheet("background:#080808; border-bottom:1px solid #1a1a1a;");
- auto* hl = new QHBoxLayout(header);
+ header_ = new QWidget;
+ header_->setFixedHeight(40);
+ auto* hl = new QHBoxLayout(header_);
hl->setContentsMargins(12, 0, 12, 0);
hl->setSpacing(8);
- auto* title = new QLabel("ECONOMICS DATA EXPLORER");
- title->setStyleSheet(
- "color:#e5e5e5; font-size:12px; font-weight:700;"
- "letter-spacing:1.5px; background:transparent;");
-
- auto* sub = new QLabel("32 global data sources · 1000+ indicators");
- sub->setStyleSheet("color:#525252; font-size:10px; background:transparent;");
+ title_ = new QLabel("ECONOMICS DATA EXPLORER");
+ subtitle_ = new QLabel("32 global data sources · 1000+ indicators");
- hl->addWidget(title);
- hl->addWidget(sub);
+ hl->addWidget(title_);
+ hl->addWidget(subtitle_);
hl->addStretch();
- root->addWidget(header);
+ root->addWidget(header_);
// ── Badge bar (scrollable) ────────────────────────────────────────────────
- auto* scroll = new QScrollArea;
- scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- scroll->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- scroll->setFixedHeight(34);
- scroll->setWidgetResizable(true);
- scroll->setFrameShape(QFrame::NoFrame);
- scroll->setStyleSheet("background:#050505; border-bottom:1px solid #1a1a1a;");
+ scroll_ = new QScrollArea;
+ scroll_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ scroll_->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ scroll_->setFixedHeight(34);
+ scroll_->setWidgetResizable(true);
+ scroll_->setFrameShape(QFrame::NoFrame);
badge_bar_ = new QWidget;
- badge_bar_->setStyleSheet("background:#050505;");
auto* bhl = new QHBoxLayout(badge_bar_);
bhl->setContentsMargins(6, 3, 6, 3);
bhl->setSpacing(4);
@@ -180,18 +179,6 @@ void EconomicsScreen::build_ui() {
auto* btn = new QPushButton(src.label);
btn->setCheckable(true);
btn->setFixedHeight(26);
- btn->setStyleSheet(QString(
- "QPushButton { background:#0a0a0a; color:#525252; border:1px solid #1a1a1a;"
- " font-size:9px; font-weight:700; padding:0 10px; letter-spacing:0.3px; }"
- "QPushButton:hover { color:#e5e5e5; border-color:#333333; }"
- "QPushButton:checked { background:rgba(%1,0.12); color:%2;"
- " border-color:%2; }")
- .arg([]( const QString& hex ) {
- // convert #RRGGBB to "R,G,G" for rgba
- QColor c(hex);
- return QString("%1,%2,%3").arg(c.red()).arg(c.green()).arg(c.blue());
- }(src.color))
- .arg(src.color));
const QString sid = src.id;
connect(btn, &QPushButton::clicked, this, [this, sid]() {
@@ -204,13 +191,60 @@ void EconomicsScreen::build_ui() {
}
bhl->addStretch();
- scroll->setWidget(badge_bar_);
- root->addWidget(scroll);
+ scroll_->setWidget(badge_bar_);
+ root->addWidget(scroll_);
// ── Panel stack ───────────────────────────────────────────────────────────
stack_ = new QStackedWidget;
- stack_->setStyleSheet("background:#080808;");
root->addWidget(stack_, 1);
+
+ // Apply initial theme
+ refresh_theme();
+}
+
+// ── Theme refresh ─────────────────────────────────────────────────────────────
+
+void EconomicsScreen::refresh_theme() {
+ using namespace ui::colors;
+
+ header_->setStyleSheet(
+ QString("background:%1; border-bottom:1px solid %2;")
+ .arg(BG_BASE(), BORDER_DIM()));
+
+ title_->setStyleSheet(
+ QString("color:%1; font-size:12px; font-weight:700;"
+ "letter-spacing:1.5px; background:transparent;")
+ .arg(TEXT_PRIMARY()));
+
+ subtitle_->setStyleSheet(
+ QString("color:%1; font-size:10px; background:transparent;")
+ .arg(TEXT_TERTIARY()));
+
+ scroll_->setStyleSheet(
+ QString("background:%1; border-bottom:1px solid %2;")
+ .arg(BG_BASE(), BORDER_DIM()));
+
+ badge_bar_->setStyleSheet(
+ QString("background:%1;").arg(BG_BASE()));
+
+ // Re-style all badge buttons
+ for (const auto& entry : sources_) {
+ if (!entry.badge) continue;
+ QColor c(entry.color);
+ QString rgba = QString("%1,%2,%3").arg(c.red()).arg(c.green()).arg(c.blue());
+ static_cast<QPushButton*>(entry.badge)->setStyleSheet(QString(
+ "QPushButton { background:%1; color:%2; border:1px solid %3;"
+ " font-size:9px; font-weight:700; padding:0 10px; letter-spacing:0.3px; }"
+ "QPushButton:hover { color:%4; border-color:%5; }"
+ "QPushButton:checked { background:rgba(%6,0.12); color:%7;"
+ " border-color:%7; }")
+ .arg(BG_SURFACE(), TEXT_TERTIARY(), BORDER_DIM(),
+ TEXT_PRIMARY(), BORDER_BRIGHT())
+ .arg(rgba, entry.color));
+ }
+
+ stack_->setStyleSheet(
+ QString("background:%1;").arg(BG_BASE()));
}
// ── Panel switching ───────────────────────────────────────────────────────────
@@ -235,6 +269,7 @@ EconPanelBase* EconomicsScreen::get_or_create_panel(SourceEntry& entry) {
void EconomicsScreen::switch_to(const QString& source_id) {
if (active_id_ == source_id) return;
active_id_ = source_id;
+ ScreenStateManager::instance().notify_changed(this);
for (auto& entry : sources_) {
if (entry.badge)
@@ -251,4 +286,16 @@ void EconomicsScreen::switch_to(const QString& source_id) {
}
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap EconomicsScreen::save_state() const {
+ return {{"source_id", active_id_}};
+}
+
+void EconomicsScreen::restore_state(const QVariantMap& state) {
+ const QString id = state.value("source_id").toString();
+ if (!id.isEmpty())
+ switch_to(id);
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/economics/EconomicsScreen.h b/fincept-qt/src/screens/economics/EconomicsScreen.h
index 8a60490e5..c55a5efb7 100644
--- a/fincept-qt/src/screens/economics/EconomicsScreen.h
+++ b/fincept-qt/src/screens/economics/EconomicsScreen.h
@@ -5,25 +5,41 @@
// Each panel is lazy-constructed on first activation.
#pragma once
+#include "screens/IStatefulScreen.h"
+
#include <QHBoxLayout>
+#include <QLabel>
#include <QMap>
+#include <QScrollArea>
#include <QStackedWidget>
#include <QWidget>
+namespace fincept::ui { struct ThemeTokens; }
+
namespace fincept::screens {
class EconPanelBase;
-class EconomicsScreen : public QWidget {
+class EconomicsScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit EconomicsScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "economics"; }
+ int state_version() const override { return 1; }
+
private:
void build_ui();
void switch_to(const QString& source_id);
+ void refresh_theme();
// badge bar + stacked panels
+ QWidget* header_ = nullptr;
+ QLabel* title_ = nullptr;
+ QLabel* subtitle_ = nullptr;
+ QScrollArea* scroll_ = nullptr;
QWidget* badge_bar_ = nullptr;
QStackedWidget* stack_ = nullptr;
diff --git a/fincept-qt/src/screens/economics/panels/AdbPanel.cpp b/fincept-qt/src/screens/economics/panels/AdbPanel.cpp
index 8506dc71e..266d34c34 100644
--- a/fincept-qt/src/screens/economics/panels/AdbPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/AdbPanel.cpp
@@ -87,10 +87,9 @@ void AdbPanel::activate() {
// ── Controls ──────────────────────────────────────────────────────────────────
void AdbPanel::build_controls(QHBoxLayout* thl) {
- auto make_lbl = [](const QString& text) {
+ auto make_lbl = [this](const QString& text) {
auto* l = new QLabel(text);
- l->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ l->setStyleSheet(ctrl_label_style());
return l;
};
diff --git a/fincept-qt/src/screens/economics/panels/AkShareChinaPanel.cpp b/fincept-qt/src/screens/economics/panels/AkShareChinaPanel.cpp
index 3ee3cc7d4..adbb7e80a 100644
--- a/fincept-qt/src/screens/economics/panels/AkShareChinaPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/AkShareChinaPanel.cpp
@@ -51,8 +51,7 @@ void AkShareChinaPanel::activate() {
void AkShareChinaPanel::build_controls(QHBoxLayout* thl) {
auto* lbl = new QLabel("SERIES");
- lbl->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ lbl->setStyleSheet(ctrl_label_style());
series_combo_ = new QComboBox;
for (const auto& s : kAkShareSeries)
diff --git a/fincept-qt/src/screens/economics/panels/BcbPanel.cpp b/fincept-qt/src/screens/economics/panels/BcbPanel.cpp
index bab5cc8a4..dae381fda 100644
--- a/fincept-qt/src/screens/economics/panels/BcbPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/BcbPanel.cpp
@@ -63,8 +63,7 @@ void BcbPanel::activate() {
void BcbPanel::build_controls(QHBoxLayout* thl) {
auto* lbl = new QLabel("SERIES");
- lbl->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ lbl->setStyleSheet(ctrl_label_style());
series_combo_ = new QComboBox;
for (const auto& s : kBcbSeries)
diff --git a/fincept-qt/src/screens/economics/panels/BeaPanel.cpp b/fincept-qt/src/screens/economics/panels/BeaPanel.cpp
index a202f5f95..b3dc4cf65 100644
--- a/fincept-qt/src/screens/economics/panels/BeaPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/BeaPanel.cpp
@@ -118,20 +118,19 @@ BeaPanel::BeaPanel(QWidget* parent)
// ── Left: category + indicator selector ──────────────────────────────────
auto* left = new QWidget;
left->setFixedWidth(210);
- left->setStyleSheet("background:#0a0a0a; border-right:1px solid #1a1a1a;");
+ left->setStyleSheet(sidebar_style());
auto* lvl = new QVBoxLayout(left);
lvl->setContentsMargins(0, 0, 0, 0);
lvl->setSpacing(0);
// Category header
auto* cat_hdr = new QWidget;
- cat_hdr->setStyleSheet("background:#111111; border-bottom:1px solid #1a1a1a;");
+ cat_hdr->setStyleSheet(section_hdr_style());
cat_hdr->setFixedHeight(32);
auto* chl = new QHBoxLayout(cat_hdr);
chl->setContentsMargins(8, 0, 8, 0);
auto* cat_lbl = new QLabel("CATEGORY");
- cat_lbl->setStyleSheet(
- "color:#808080; font-size:9px; font-weight:700; background:transparent;");
+ cat_lbl->setStyleSheet(ctrl_label_style());
category_combo_ = new QComboBox;
for (const auto& c : kBeaCategories)
category_combo_->addItem(c.label);
@@ -145,9 +144,7 @@ BeaPanel::BeaPanel(QWidget* parent)
// Indicator search
indicator_search_ = new QLineEdit;
indicator_search_->setPlaceholderText("Filter indicators…");
- indicator_search_->setStyleSheet(
- "background:#080808; color:#e5e5e5; border:none;"
- "border-bottom:1px solid #1a1a1a; padding:4px 8px; font-size:10px;");
+ indicator_search_->setStyleSheet(search_input_style());
indicator_search_->setFixedHeight(28);
connect(indicator_search_, &QLineEdit::textChanged,
this, &BeaPanel::on_indicator_filter);
@@ -155,14 +152,7 @@ BeaPanel::BeaPanel(QWidget* parent)
// Indicator list
indicator_list_ = new QListWidget;
- indicator_list_->setStyleSheet(
- QString("QListWidget { background:#080808; border:none; outline:none; font-size:10px; }"
- "QListWidget::item { color:#808080; padding:4px 10px;"
- " border-bottom:1px solid #111111; }"
- "QListWidget::item:hover { color:#e5e5e5; background:#0f0f0f; }"
- "QListWidget::item:selected { color:%1;"
- " background:rgba(230,81,0,0.08);"
- " border-left:2px solid %1; padding-left:8px; }").arg(kBeaColor));
+ indicator_list_->setStyleSheet(list_style());
indicator_list_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
lvl->addWidget(indicator_list_, 1);
@@ -191,10 +181,9 @@ void BeaPanel::activate() {
// ── Controls ──────────────────────────────────────────────────────────────────
void BeaPanel::build_controls(QHBoxLayout* thl) {
- auto make_lbl = [](const QString& text) {
+ auto make_lbl = [this](const QString& text) {
auto* l = new QLabel(text);
- l->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ l->setStyleSheet(ctrl_label_style());
return l;
};
@@ -216,10 +205,9 @@ void BeaPanel::build_controls(QHBoxLayout* thl) {
thl->addWidget(end_input_);
// API key notice
- auto* notice = new QLabel("Requires BEA_API_KEY");
- notice->setStyleSheet(
- "color:#f59e0b; font-size:9px; background:transparent;");
- thl->addWidget(notice);
+ auto* notice_lbl = new QLabel("Requires BEA_API_KEY");
+ notice_lbl->setStyleSheet(notice_style());
+ thl->addWidget(notice_lbl);
}
void BeaPanel::on_category_changed(int index) {
diff --git a/fincept-qt/src/screens/economics/panels/BisPanel.cpp b/fincept-qt/src/screens/economics/panels/BisPanel.cpp
index b51193204..0319d51ef 100644
--- a/fincept-qt/src/screens/economics/panels/BisPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/BisPanel.cpp
@@ -62,10 +62,9 @@ void BisPanel::activate() {
// ── Controls ──────────────────────────────────────────────────────────────────
void BisPanel::build_controls(QHBoxLayout* thl) {
- auto make_lbl = [](const QString& text) {
+ auto make_lbl = [this](const QString& text) {
auto* l = new QLabel(text);
- l->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ l->setStyleSheet(ctrl_label_style());
return l;
};
diff --git a/fincept-qt/src/screens/economics/panels/BlsPanel.cpp b/fincept-qt/src/screens/economics/panels/BlsPanel.cpp
index ce3ea2e2e..4f7210852 100644
--- a/fincept-qt/src/screens/economics/panels/BlsPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/BlsPanel.cpp
@@ -63,10 +63,9 @@ void BlsPanel::activate() {
}
void BlsPanel::build_controls(QHBoxLayout* thl) {
- auto lbl = [](const QString& t) {
+ auto lbl = [this](const QString& t) {
auto* l = new QLabel(t);
- l->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ l->setStyleSheet(ctrl_label_style());
return l;
};
@@ -86,8 +85,7 @@ void BlsPanel::build_controls(QHBoxLayout* thl) {
});
auto* lbl2 = new QLabel("SERIES ID");
- lbl2->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ lbl2->setStyleSheet(ctrl_label_style());
series_input_ = new QLineEdit;
series_input_->setPlaceholderText("e.g. CES0000000001");
diff --git a/fincept-qt/src/screens/economics/panels/CensusPanel.cpp b/fincept-qt/src/screens/economics/panels/CensusPanel.cpp
index bc92946cc..e5b1aa5ad 100644
--- a/fincept-qt/src/screens/economics/panels/CensusPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/CensusPanel.cpp
@@ -81,8 +81,7 @@ void CensusPanel::activate() {
void CensusPanel::build_controls(QHBoxLayout* thl) {
auto* lbl = new QLabel("DATASET");
- lbl->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ lbl->setStyleSheet(ctrl_label_style());
dataset_combo_ = new QComboBox;
for (const auto& d : kCensusDatasets)
diff --git a/fincept-qt/src/screens/economics/panels/CftcPanel.cpp b/fincept-qt/src/screens/economics/panels/CftcPanel.cpp
index 0bb92d96b..c220914bc 100644
--- a/fincept-qt/src/screens/economics/panels/CftcPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/CftcPanel.cpp
@@ -11,6 +11,7 @@
#include "core/logging/Logger.h"
#include "services/economics/EconomicsService.h"
+#include "ui/theme/Theme.h"
#include <QFrame>
#include <QGridLayout>
@@ -107,10 +108,9 @@ void CftcPanel::activate() {
// ── Controls ──────────────────────────────────────────────────────────────────
void CftcPanel::build_controls(QHBoxLayout* thl) {
- auto make_lbl = [](const QString& text) {
+ auto make_lbl = [this](const QString& text) {
auto* l = new QLabel(text);
- l->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ l->setStyleSheet(ctrl_label_style());
return l;
};
@@ -143,29 +143,38 @@ void CftcPanel::build_controls(QHBoxLayout* thl) {
// ── Sentiment widget ──────────────────────────────────────────────────────────
void CftcPanel::build_sentiment_widget() {
+ using namespace ui::colors;
+
+ const auto card_bg = QString("background:%1; border:1px solid %2;")
+ .arg(BG_RAISED(), BORDER_DIM());
+ const auto lbl_ss = QString("color:%1; font-size:9px; font-weight:700;"
+ " letter-spacing:1px; background:transparent;").arg(TEXT_SECONDARY());
+
sentiment_widget_ = new QWidget;
- sentiment_widget_->setStyleSheet("background:#080808;");
+ sentiment_widget_->setStyleSheet(QString("background:%1;").arg(BG_BASE()));
auto* root = new QVBoxLayout(sentiment_widget_);
root->setContentsMargins(20, 16, 20, 16);
root->setSpacing(12);
// Header
auto* hdr = new QWidget;
- hdr->setStyleSheet("background:#111111; border:1px solid #1a1a1a;");
+ hdr->setStyleSheet(card_bg);
auto* hdr_hl = new QHBoxLayout(hdr);
hdr_hl->setContentsMargins(14, 10, 14, 10);
auto* title_lbl = new QLabel("COT MARKET SENTIMENT");
title_lbl->setStyleSheet(
- "color:#e5e5e5; font-size:12px; font-weight:700; background:transparent;");
+ QString("color:%1; font-size:12px; font-weight:700; background:transparent;")
+ .arg(TEXT_PRIMARY()));
sent_market_lbl_ = new QLabel("—");
sent_market_lbl_->setStyleSheet(
QString("color:%1; font-size:11px; font-weight:700; background:transparent;")
- .arg(kCftcColor));
+ .arg(color_));
sent_date_lbl_ = new QLabel("—");
sent_date_lbl_->setStyleSheet(
- "color:#525252; font-size:10px; background:transparent;");
+ QString("color:%1; font-size:10px; background:transparent;")
+ .arg(TEXT_TERTIARY()));
hdr_hl->addWidget(title_lbl);
hdr_hl->addStretch(1);
@@ -182,27 +191,29 @@ void CftcPanel::build_sentiment_widget() {
auto make_card = [&](const QString& title_text, QLabel*& bias_out,
QLabel*& net_out, const QString& desc) {
auto* card = new QWidget;
- card->setStyleSheet("background:#111111; border:1px solid #1a1a1a;");
+ card->setStyleSheet(card_bg);
card->setMinimumHeight(120);
auto* cvl = new QVBoxLayout(card);
cvl->setContentsMargins(14, 12, 14, 12);
cvl->setSpacing(4);
auto* ttl = new QLabel(title_text);
- ttl->setStyleSheet(
- "color:#808080; font-size:9px; font-weight:700; letter-spacing:1px;"
- "background:transparent;");
+ ttl->setStyleSheet(lbl_ss);
bias_out = new QLabel("—");
bias_out->setStyleSheet(
- "color:#e5e5e5; font-size:18px; font-weight:700; background:transparent;");
+ QString("color:%1; font-size:18px; font-weight:700; background:transparent;")
+ .arg(TEXT_PRIMARY()));
net_out = new QLabel("Net: —");
net_out->setStyleSheet(
- "color:#525252; font-size:10px; background:transparent;");
+ QString("color:%1; font-size:10px; background:transparent;")
+ .arg(TEXT_TERTIARY()));
auto* d = new QLabel(desc);
- d->setStyleSheet("color:#404040; font-size:9px; background:transparent;");
+ d->setStyleSheet(
+ QString("color:%1; font-size:9px; background:transparent;")
+ .arg(TEXT_DIM()));
d->setWordWrap(true);
cvl->addWidget(ttl);
@@ -220,24 +231,24 @@ void CftcPanel::build_sentiment_widget() {
// OI & trend row
auto* oi_row = new QWidget;
- oi_row->setStyleSheet("background:#111111; border:1px solid #1a1a1a;");
+ oi_row->setStyleSheet(card_bg);
auto* oi_hl = new QHBoxLayout(oi_row);
oi_hl->setContentsMargins(14, 8, 14, 8);
oi_hl->setSpacing(20);
auto* oi_lbl = new QLabel("OPEN INTEREST");
- oi_lbl->setStyleSheet(
- "color:#808080; font-size:9px; font-weight:700; background:transparent;");
+ oi_lbl->setStyleSheet(lbl_ss);
sent_oi_lbl_ = new QLabel("—");
sent_oi_lbl_->setStyleSheet(
- "color:#e5e5e5; font-size:13px; font-weight:700; background:transparent;");
+ QString("color:%1; font-size:13px; font-weight:700; background:transparent;")
+ .arg(TEXT_PRIMARY()));
auto* trend_lbl = new QLabel("OI TREND");
- trend_lbl->setStyleSheet(
- "color:#808080; font-size:9px; font-weight:700; background:transparent;");
+ trend_lbl->setStyleSheet(lbl_ss);
sent_oi_trend_ = new QLabel("—");
sent_oi_trend_->setStyleSheet(
- "color:#e5e5e5; font-size:13px; font-weight:700; background:transparent;");
+ QString("color:%1; font-size:13px; font-weight:700; background:transparent;")
+ .arg(TEXT_PRIMARY()));
oi_hl->addWidget(oi_lbl);
oi_hl->addWidget(sent_oi_lbl_);
@@ -366,25 +377,26 @@ void CftcPanel::show_sentiment(const QJsonObject& s) {
const double oi = s["open_interest"].toDouble();
sent_oi_lbl_->setText(oi > 0 ? QString::number(static_cast<qint64>(oi)) : "—");
+ using namespace ui::colors;
const QString oi_trend = s["overall_sentiment"].toObject()["oi_trend"].toString();
sent_oi_trend_->setText(oi_trend.isEmpty() ? "—" : oi_trend.toUpper());
sent_oi_trend_->setStyleSheet(
QString("color:%1; font-size:13px; font-weight:700; background:transparent;")
- .arg(oi_trend == "increasing" ? "#16a34a" : "#dc2626"));
+ .arg(oi_trend == "increasing" ? POSITIVE() : NEGATIVE()));
const QString comm_bias =
s["overall_sentiment"].toObject()["commercial_bias"].toString();
sent_comm_bias_->setText(comm_bias.isEmpty() ? "—" : comm_bias.toUpper());
sent_comm_bias_->setStyleSheet(
QString("color:%1; font-size:18px; font-weight:700; background:transparent;")
- .arg(comm_bias == "bullish" ? "#16a34a" : "#dc2626"));
+ .arg(comm_bias == "bullish" ? POSITIVE() : NEGATIVE()));
const QString noncomm_bias =
s["overall_sentiment"].toObject()["non_commercial_bias"].toString();
sent_noncomm_bias_->setText(noncomm_bias.isEmpty() ? "—" : noncomm_bias.toUpper());
sent_noncomm_bias_->setStyleSheet(
QString("color:%1; font-size:18px; font-weight:700; background:transparent;")
- .arg(noncomm_bias == "bullish" ? "#16a34a" : "#dc2626"));
+ .arg(noncomm_bias == "bullish" ? POSITIVE() : NEGATIVE()));
const QJsonObject comm = s["commercial_positions"].toObject();
const double comm_net = comm["net"].toDouble();
diff --git a/fincept-qt/src/screens/economics/panels/EcbPanel.cpp b/fincept-qt/src/screens/economics/panels/EcbPanel.cpp
index 772baea39..7835267de 100644
--- a/fincept-qt/src/screens/economics/panels/EcbPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/EcbPanel.cpp
@@ -53,10 +53,9 @@ void EcbPanel::activate() {
}
void EcbPanel::build_controls(QHBoxLayout* thl) {
- auto lbl = [](const QString& t) {
+ auto lbl = [this](const QString& t) {
auto* l = new QLabel(t);
- l->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ l->setStyleSheet(ctrl_label_style());
return l;
};
diff --git a/fincept-qt/src/screens/economics/panels/EconDbPanel.cpp b/fincept-qt/src/screens/economics/panels/EconDbPanel.cpp
index 67edd32c4..855f9b515 100644
--- a/fincept-qt/src/screens/economics/panels/EconDbPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/EconDbPanel.cpp
@@ -115,10 +115,9 @@ void EconDbPanel::activate() {
}
void EconDbPanel::build_controls(QHBoxLayout* thl) {
- auto lbl = [](const QString& t) {
+ auto lbl = [this](const QString& t) {
auto* l = new QLabel(t);
- l->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ l->setStyleSheet(ctrl_label_style());
return l;
};
diff --git a/fincept-qt/src/screens/economics/panels/EconPanelBase.cpp b/fincept-qt/src/screens/economics/panels/EconPanelBase.cpp
index e8860cade..3bd1120cd 100644
--- a/fincept-qt/src/screens/economics/panels/EconPanelBase.cpp
+++ b/fincept-qt/src/screens/economics/panels/EconPanelBase.cpp
@@ -1,6 +1,9 @@
// src/screens/economics/panels/EconPanelBase.cpp
#include "screens/economics/panels/EconPanelBase.h"
+#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
+
#include <QColor>
#include <QFile>
#include <QFileDialog>
@@ -11,53 +14,122 @@
namespace fincept::screens {
-// ── Stylesheet ────────────────────────────────────────────────────────────────
+// ── Stylesheet (token-based) ──────────────────────────────────────────────────
QString EconPanelBase::panel_style() const {
+ using namespace ui::colors;
int r = QColor(color_).red();
int g = QColor(color_).green();
int b = QColor(color_).blue();
return QString(
- "#econToolbar { background:#111111; border-bottom:1px solid #1a1a1a; }"
- "#econFetchBtn { background:%1; color:#080808; border:none;"
+ "#econToolbar { background:%5; border-bottom:1px solid %6; }"
+ "#econFetchBtn { background:%1; color:%7; border:none;"
" font-size:10px; font-weight:700; padding:4px 14px; }"
"#econFetchBtn:hover { background:rgba(%2,%3,%4,0.75); }"
- "#econFetchBtn:disabled { background:#1a1a1a; color:#404040; }"
- "#econCsvBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
+ "#econFetchBtn:disabled { background:%6; color:%8; }"
+ "#econCsvBtn { background:transparent; color:%9; border:1px solid %6;"
" font-size:10px; font-weight:700; padding:4px 10px; }"
- "#econCsvBtn:hover { color:#e5e5e5; background:#161616; }"
+ "#econCsvBtn:hover { color:%10; background:%11; }"
"QComboBox, QSpinBox, QDateEdit, QLineEdit {"
- " background:#080808; color:#e5e5e5; border:1px solid #1a1a1a;"
+ " background:%7; color:%10; border:1px solid %6;"
" font-size:11px; padding:2px 6px; }"
"QComboBox::drop-down, QDateEdit::drop-down { border:none; }"
- "QComboBox QAbstractItemView { background:#111111; color:#e5e5e5;"
- " border:1px solid #1a1a1a; }"
- "QTableWidget { background:#080808; color:#e5e5e5; border:none;"
- " gridline-color:#1a1a1a; font-size:11px; alternate-background-color:#0a0a0a; }"
- "QTableWidget::item { padding:5px 8px; border-bottom:1px solid #1a1a1a; }"
+ "QComboBox QAbstractItemView { background:%5; color:%10;"
+ " border:1px solid %6; }"
+ "QTableWidget { background:%7; color:%10; border:none;"
+ " gridline-color:%6; font-size:11px; alternate-background-color:%12; }"
+ "QTableWidget::item { padding:5px 8px; border-bottom:1px solid %6; }"
"QTableWidget::item:selected { background:rgba(%2,%3,%4,0.1); color:%1; }"
- "QHeaderView::section { background:#111111; color:#808080; border:none;"
- " border-bottom:2px solid #1a1a1a; border-right:1px solid #1a1a1a;"
+ "QHeaderView::section { background:%5; color:%9; border:none;"
+ " border-bottom:2px solid %6; border-right:1px solid %6;"
" padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"
- "#econStatCard { background:#0a0a0a; border:1px solid #1a1a1a; }"
- "#econStatCard:hover { border-color:#333333; }"
- "#econStatLabel { color:#808080; font-size:8px; font-weight:700;"
+ "#econStatCard { background:%12; border:1px solid %6; }"
+ "#econStatCard:hover { border-color:%13; }"
+ "#econStatLabel { color:%9; font-size:8px; font-weight:700;"
" letter-spacing:1px; background:transparent; }"
"#econStatVal { color:%1; font-size:15px; font-weight:700; background:transparent; }"
- "#econStatSub { color:#525252; font-size:9px; background:transparent; }"
- "#econEmptyPage { background:#080808; }"
- "#econEmptyMsg { color:#808080; font-size:13px; background:transparent; }"
- "#econErrMsg { color:#dc2626; font-size:12px; background:transparent; }"
- "#econTitleLbl { color:#e5e5e5; font-size:11px; font-weight:700;"
+ "#econStatSub { color:%14; font-size:9px; background:transparent; }"
+ "#econEmptyPage { background:%7; }"
+ "#econEmptyMsg { color:%9; font-size:13px; background:transparent; }"
+ "#econErrMsg { color:%15; font-size:12px; background:transparent; }"
+ "#econTitleLbl { color:%10; font-size:11px; font-weight:700;"
" background:transparent; }"
- "#econRowCount { color:#525252; font-size:9px; background:transparent; }"
- "QScrollBar:vertical { background:#080808; width:5px; }"
- "QScrollBar::handle:vertical { background:#1a1a1a; min-height:20px; }"
+ "#econRowCount { color:%14; font-size:9px; background:transparent; }"
+ "QScrollBar:vertical { background:%7; width:5px; }"
+ "QScrollBar::handle:vertical { background:%6; min-height:20px; }"
"QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }"
- "QScrollBar:horizontal { background:#080808; height:5px; }"
- "QScrollBar::handle:horizontal { background:#1a1a1a; min-width:20px; }"
+ "QScrollBar:horizontal { background:%7; height:5px; }"
+ "QScrollBar::handle:horizontal { background:%6; min-width:20px; }"
"QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { width:0; }"
- ).arg(color_).arg(r).arg(g).arg(b);
+ )
+ .arg(color_) // %1: source accent
+ .arg(r).arg(g).arg(b) // %2,%3,%4: accent RGB
+ .arg(BG_RAISED()) // %5
+ .arg(BORDER_DIM()) // %6
+ .arg(BG_BASE()) // %7
+ .arg(TEXT_DIM()) // %8
+ .arg(TEXT_SECONDARY()) // %9
+ .arg(TEXT_PRIMARY()) // %10
+ .arg(BG_HOVER()) // %11
+ .arg(BG_SURFACE()) // %12
+ .arg(BORDER_BRIGHT()) // %13
+ .arg(TEXT_TERTIARY()) // %14
+ .arg(NEGATIVE()); // %15
+}
+
+// ── Reusable token-based style helpers ────────────────────────────────────────
+
+QString EconPanelBase::sidebar_style() {
+ using namespace ui::colors;
+ return QString("background:%1; border-right:1px solid %2;")
+ .arg(BG_SURFACE(), BORDER_DIM());
+}
+
+QString EconPanelBase::section_hdr_style() {
+ using namespace ui::colors;
+ return QString("background:%1; border-bottom:1px solid %2;")
+ .arg(BG_RAISED(), BORDER_DIM());
+}
+
+QString EconPanelBase::section_lbl_style() {
+ using namespace ui::colors;
+ return QString("color:%1; font-size:8px; font-weight:700;"
+ " letter-spacing:1px; background:transparent; padding:4px 10px;")
+ .arg(TEXT_TERTIARY());
+}
+
+QString EconPanelBase::search_input_style() {
+ using namespace ui::colors;
+ return QString("background:%1; color:%2; border:none;"
+ " border-bottom:1px solid %3; padding:4px 10px; font-size:11px;")
+ .arg(BG_BASE(), TEXT_PRIMARY(), BORDER_DIM());
+}
+
+QString EconPanelBase::ctrl_label_style() {
+ using namespace ui::colors;
+ return QString("color:%1; font-size:9px; font-weight:700; background:transparent;")
+ .arg(TEXT_TERTIARY());
+}
+
+QString EconPanelBase::list_style() const {
+ using namespace ui::colors;
+ QColor c(color_);
+ QString rgba = QString("%1,%2,%3").arg(c.red()).arg(c.green()).arg(c.blue());
+ return QString(
+ "QListWidget { background:transparent; border:none; outline:none; }"
+ "QListWidget::item { color:%1; padding:5px 10px;"
+ " border-bottom:1px solid %2; font-size:11px; }"
+ "QListWidget::item:hover { color:%3; background:%4; }"
+ "QListWidget::item:selected { color:%5; background:rgba(%6,0.1);"
+ " border-left:2px solid %5; font-weight:700; }")
+ .arg(TEXT_SECONDARY(), BG_RAISED(), TEXT_PRIMARY(), BG_HOVER())
+ .arg(color_, rgba);
+}
+
+QString EconPanelBase::notice_style() {
+ using namespace ui::colors;
+ return QString("color:%1; font-size:9px; background:transparent;")
+ .arg(WARNING());
}
// ── Constructor ───────────────────────────────────────────────────────────────
@@ -65,11 +137,15 @@ QString EconPanelBase::panel_style() const {
EconPanelBase::EconPanelBase(const QString& source_id,
const QString& color,
QWidget* parent)
- : QWidget(parent), source_id_(source_id), color_(color) {}
+ : QWidget(parent), source_id_(source_id), color_(color) {
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, &EconPanelBase::refresh_panel_theme);
+}
// ── Build ─────────────────────────────────────────────────────────────────────
void EconPanelBase::build_base_ui(QWidget* container) {
+ container_ = container;
container->setStyleSheet(panel_style());
auto* root = new QVBoxLayout(container);
@@ -101,9 +177,8 @@ void EconPanelBase::build_base_ui(QWidget* container) {
root->addWidget(toolbar);
// Stat cards row
- auto* cards_row = new QWidget;
- cards_row->setStyleSheet("background:#080808; border-bottom:1px solid #1a1a1a;");
- auto* crhl = new QHBoxLayout(cards_row);
+ cards_row_ = new QWidget;
+ auto* crhl = new QHBoxLayout(cards_row_);
crhl->setContentsMargins(10, 6, 10, 6);
crhl->setSpacing(6);
@@ -129,12 +204,11 @@ void EconPanelBase::build_base_ui(QWidget* container) {
make_card("AVG", stat_avg_);
make_card("POINTS", stat_count_);
crhl->addStretch(1);
- root->addWidget(cards_row);
+ root->addWidget(cards_row_);
// Title bar
- auto* title_bar = new QWidget;
- title_bar->setStyleSheet("background:#0a0a0a; border-bottom:1px solid #1a1a1a;");
- auto* tbhl = new QHBoxLayout(title_bar);
+ title_bar_ = new QWidget;
+ auto* tbhl = new QHBoxLayout(title_bar_);
tbhl->setContentsMargins(12, 4, 12, 4);
title_lbl_ = new QLabel;
title_lbl_->setObjectName("econTitleLbl");
@@ -143,7 +217,7 @@ void EconPanelBase::build_base_ui(QWidget* container) {
tbhl->addWidget(title_lbl_);
tbhl->addStretch(1);
tbhl->addWidget(row_count_);
- root->addWidget(title_bar);
+ root->addWidget(title_bar_);
// Content stack
stack_ = new QStackedWidget;
@@ -168,6 +242,24 @@ void EconPanelBase::build_base_ui(QWidget* container) {
stack_->addWidget(table_); // index 1
root->addWidget(stack_, 1);
+
+ // Apply token-based inline styles for non-QSS-covered widgets
+ refresh_panel_theme();
+}
+
+// ── Theme refresh ─────────────────────────────────────────────────────────────
+
+void EconPanelBase::refresh_panel_theme() {
+ using namespace ui::colors;
+ if (container_) container_->setStyleSheet(panel_style());
+ if (cards_row_)
+ cards_row_->setStyleSheet(
+ QString("background:%1; border-bottom:1px solid %2;")
+ .arg(BG_BASE(), BORDER_DIM()));
+ if (title_bar_)
+ title_bar_->setStyleSheet(
+ QString("background:%1; border-bottom:1px solid %2;")
+ .arg(BG_SURFACE(), BORDER_DIM()));
}
// ── State ─────────────────────────────────────────────────────────────────────
@@ -182,16 +274,20 @@ void EconPanelBase::show_loading(const QString& msg) {
}
void EconPanelBase::show_error(const QString& msg) {
+ using namespace ui::colors;
if (!empty_lbl_) return;
- empty_lbl_->setStyleSheet("color:#dc2626; font-size:12px; background:transparent;");
+ empty_lbl_->setStyleSheet(
+ QString("color:%1; font-size:12px; background:transparent;").arg(NEGATIVE()));
empty_lbl_->setText("Error: " + msg);
stack_->setCurrentIndex(0);
if (fetch_btn_) fetch_btn_->setEnabled(true);
}
void EconPanelBase::show_empty(const QString& msg) {
+ using namespace ui::colors;
if (!empty_lbl_) return;
- empty_lbl_->setStyleSheet("color:#808080; font-size:13px; background:transparent;");
+ empty_lbl_->setStyleSheet(
+ QString("color:%1; font-size:13px; background:transparent;").arg(TEXT_SECONDARY()));
empty_lbl_->setText(msg);
stack_->setCurrentIndex(0);
if (fetch_btn_) fetch_btn_->setEnabled(true);
@@ -302,7 +398,7 @@ void EconPanelBase::update_stats(const QJsonArray& rows) {
QString::number(change, 'f', 2) + "%");
stat_change_->setStyleSheet(
QString("color:%1; font-size:15px; font-weight:700; background:transparent;")
- .arg(change >= 0 ? "#16a34a" : "#dc2626"));
+ .arg(change >= 0 ? ui::colors::POSITIVE() : ui::colors::NEGATIVE()));
}
if (stat_min_) stat_min_->setText(fmt(mn));
if (stat_max_) stat_max_->setText(fmt(mx));
diff --git a/fincept-qt/src/screens/economics/panels/EconPanelBase.h b/fincept-qt/src/screens/economics/panels/EconPanelBase.h
index 0caeaa5ab..5217f035d 100644
--- a/fincept-qt/src/screens/economics/panels/EconPanelBase.h
+++ b/fincept-qt/src/screens/economics/panels/EconPanelBase.h
@@ -51,9 +51,21 @@ class EconPanelBase : public QWidget {
void display(const QJsonArray& rows, const QString& title = {});
void export_csv();
- /// Per-provider accent color stylesheet.
+ /// Per-provider accent color stylesheet (uses live theme tokens).
QString panel_style() const;
+ /// Called when theme changes — re-applies panel_style(). Override for extra widgets.
+ virtual void refresh_panel_theme();
+
+ // ── Reusable token-based style helpers for sidebar panels ─────────────────
+ static QString sidebar_style(); // left panel background + border
+ static QString section_hdr_style(); // section header bar (e.g. "COUNTRY")
+ static QString section_lbl_style(); // section header label text
+ static QString search_input_style(); // search/filter QLineEdit
+ static QString ctrl_label_style(); // toolbar control labels ("YEARS", "PRESET")
+ QString list_style() const; // QListWidget using source accent color
+ static QString notice_style(); // warning/info notice label
+
// ── Shared widgets (accessible to subclasses) ─────────────────────────────
QLabel* stat_latest_ = nullptr;
QLabel* stat_change_ = nullptr;
@@ -70,11 +82,14 @@ class EconPanelBase : public QWidget {
private:
void update_stats(const QJsonArray& rows);
- QStackedWidget* stack_ = nullptr; // 0=empty/status 1=table
- QLabel* empty_lbl_ = nullptr;
- QTableWidget* table_ = nullptr;
- QLabel* title_lbl_ = nullptr;
- QLabel* row_count_ = nullptr;
+ QWidget* container_ = nullptr; // root widget that owns panel_style()
+ QWidget* cards_row_ = nullptr;
+ QWidget* title_bar_ = nullptr;
+ QStackedWidget* stack_ = nullptr; // 0=empty/status 1=table
+ QLabel* empty_lbl_ = nullptr;
+ QTableWidget* table_ = nullptr;
+ QLabel* title_lbl_ = nullptr;
+ QLabel* row_count_ = nullptr;
};
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/economics/panels/EconomicCalendarPanel.cpp b/fincept-qt/src/screens/economics/panels/EconomicCalendarPanel.cpp
index 9c9a5d0a6..f4c3e6699 100644
--- a/fincept-qt/src/screens/economics/panels/EconomicCalendarPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/EconomicCalendarPanel.cpp
@@ -55,10 +55,9 @@ void EconomicCalendarPanel::activate() {
}
void EconomicCalendarPanel::build_controls(QHBoxLayout* thl) {
- auto lbl = [](const QString& t) {
+ auto lbl = [this](const QString& t) {
auto* l = new QLabel(t);
- l->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ l->setStyleSheet(ctrl_label_style());
return l;
};
diff --git a/fincept-qt/src/screens/economics/panels/EiaPanel.cpp b/fincept-qt/src/screens/economics/panels/EiaPanel.cpp
index ebd80903f..4de47e171 100644
--- a/fincept-qt/src/screens/economics/panels/EiaPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/EiaPanel.cpp
@@ -19,6 +19,7 @@
#include "core/logging/Logger.h"
#include "services/economics/EconomicsService.h"
+#include "ui/theme/Theme.h"
#include <QHBoxLayout>
#include <QJsonArray>
@@ -80,10 +81,9 @@ void EiaPanel::activate() {
// ── Controls ──────────────────────────────────────────────────────────────────
void EiaPanel::build_controls(QHBoxLayout* thl) {
- auto make_lbl = [](const QString& text) {
+ auto make_lbl = [this](const QString& text) {
auto* l = new QLabel(text);
- l->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ l->setStyleSheet(ctrl_label_style());
return l;
};
@@ -105,7 +105,8 @@ void EiaPanel::build_controls(QHBoxLayout* thl) {
apikey_notice_ = new QLabel("No API key needed");
apikey_notice_->setStyleSheet(
- "color:#16a34a; font-size:9px; background:transparent;");
+ QString("color:%1; font-size:9px; background:transparent;")
+ .arg(ui::colors::POSITIVE()));
thl->addWidget(make_lbl("SOURCE"));
thl->addWidget(source_combo_);
@@ -122,14 +123,14 @@ void EiaPanel::on_source_changed(int index) {
category_combo_->addItem(c.first, c.second);
apikey_notice_->setText("No API key needed");
apikey_notice_->setStyleSheet(
- "color:#16a34a; font-size:9px; background:transparent;");
+ QString("color:%1; font-size:9px; background:transparent;")
+ .arg(ui::colors::POSITIVE()));
} else {
// STEO
for (const auto& t : kSteoTables)
category_combo_->addItem(t.first, t.second);
apikey_notice_->setText("Requires EIA_API_KEY");
- apikey_notice_->setStyleSheet(
- "color:#f59e0b; font-size:9px; background:transparent;");
+ apikey_notice_->setStyleSheet(notice_style());
}
}
diff --git a/fincept-qt/src/screens/economics/panels/EurostatPanel.cpp b/fincept-qt/src/screens/economics/panels/EurostatPanel.cpp
index 136e400b9..a8e680186 100644
--- a/fincept-qt/src/screens/economics/panels/EurostatPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/EurostatPanel.cpp
@@ -133,10 +133,9 @@ void EurostatPanel::activate() {
}
void EurostatPanel::build_controls(QHBoxLayout* thl) {
- auto lbl = [](const QString& t) {
+ auto lbl = [this](const QString& t) {
auto* l = new QLabel(t);
- l->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ l->setStyleSheet(ctrl_label_style());
return l;
};
diff --git a/fincept-qt/src/screens/economics/panels/FederalReservePanel.cpp b/fincept-qt/src/screens/economics/panels/FederalReservePanel.cpp
index e6b058496..b176b48a4 100644
--- a/fincept-qt/src/screens/economics/panels/FederalReservePanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/FederalReservePanel.cpp
@@ -52,8 +52,7 @@ void FederalReservePanel::activate() {
void FederalReservePanel::build_controls(QHBoxLayout* thl) {
auto* lbl = new QLabel("SERIES");
- lbl->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ lbl->setStyleSheet(ctrl_label_style());
series_combo_ = new QComboBox;
for (const auto& s : kFedReserveSeries)
diff --git a/fincept-qt/src/screens/economics/panels/FinceptMacroPanel.cpp b/fincept-qt/src/screens/economics/panels/FinceptMacroPanel.cpp
index 367e6ccdc..ab70cf8e1 100644
--- a/fincept-qt/src/screens/economics/panels/FinceptMacroPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/FinceptMacroPanel.cpp
@@ -39,9 +39,7 @@ void FinceptMacroPanel::activate() {
void FinceptMacroPanel::build_controls(QHBoxLayout* thl) {
auto* lbl = new QLabel("FINCEPT MACRO — COMING SOON");
- lbl->setStyleSheet(
- QString("color:%1; font-size:9px; font-weight:700;"
- "background:transparent; letter-spacing:1px;").arg(kFinceptMacroColor));
+ lbl->setStyleSheet(ctrl_label_style() + "letter-spacing:1px;");
thl->addWidget(lbl);
}
diff --git a/fincept-qt/src/screens/economics/panels/FiscalDataPanel.cpp b/fincept-qt/src/screens/economics/panels/FiscalDataPanel.cpp
index 185d48e51..92b31c4c9 100644
--- a/fincept-qt/src/screens/economics/panels/FiscalDataPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/FiscalDataPanel.cpp
@@ -51,8 +51,7 @@ void FiscalDataPanel::activate() {
void FiscalDataPanel::build_controls(QHBoxLayout* thl) {
auto* lbl = new QLabel("DATASET");
- lbl->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ lbl->setStyleSheet(ctrl_label_style());
series_combo_ = new QComboBox;
for (const auto& s : kFiscalDataSeries)
diff --git a/fincept-qt/src/screens/economics/panels/FredAnalyticsPanel.cpp b/fincept-qt/src/screens/economics/panels/FredAnalyticsPanel.cpp
index 3d514f02b..33b8d0493 100644
--- a/fincept-qt/src/screens/economics/panels/FredAnalyticsPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/FredAnalyticsPanel.cpp
@@ -60,8 +60,7 @@ void FredAnalyticsPanel::activate() {
void FredAnalyticsPanel::build_controls(QHBoxLayout* thl) {
auto* lbl = new QLabel("DATASET");
- lbl->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ lbl->setStyleSheet(ctrl_label_style());
dataset_combo_ = new QComboBox;
for (const auto& d : kFredAnalDatasets)
diff --git a/fincept-qt/src/screens/economics/panels/FredPanel.cpp b/fincept-qt/src/screens/economics/panels/FredPanel.cpp
index b0b247d86..0a50073b2 100644
--- a/fincept-qt/src/screens/economics/panels/FredPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/FredPanel.cpp
@@ -54,8 +54,7 @@ void FredPanel::activate() {
void FredPanel::build_controls(QHBoxLayout* thl) {
auto* lbl1 = new QLabel("PRESET");
- lbl1->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ lbl1->setStyleSheet(ctrl_label_style());
preset_combo_ = new QComboBox;
for (const auto& p : kFredPresets) preset_combo_->addItem(p.first, p.second);
@@ -68,8 +67,7 @@ void FredPanel::build_controls(QHBoxLayout* thl) {
});
auto* lbl2 = new QLabel("SERIES ID");
- lbl2->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ lbl2->setStyleSheet(ctrl_label_style());
series_input_ = new QLineEdit;
series_input_->setPlaceholderText("e.g. GDPC1");
diff --git a/fincept-qt/src/screens/economics/panels/GlobalCentralBanksPanel.cpp b/fincept-qt/src/screens/economics/panels/GlobalCentralBanksPanel.cpp
index d3e10ab07..bfd5d37ea 100644
--- a/fincept-qt/src/screens/economics/panels/GlobalCentralBanksPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/GlobalCentralBanksPanel.cpp
@@ -126,8 +126,7 @@ void GlobalCentralBanksPanel::activate() {
void GlobalCentralBanksPanel::build_controls(QHBoxLayout* thl) {
auto* blbl = new QLabel("BANK");
- blbl->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ blbl->setStyleSheet(ctrl_label_style());
bank_combo_ = new QComboBox;
for (const auto& b : kBanks)
@@ -136,8 +135,7 @@ void GlobalCentralBanksPanel::build_controls(QHBoxLayout* thl) {
bank_combo_->setMinimumWidth(230);
auto* slbl = new QLabel("SERIES");
- slbl->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ slbl->setStyleSheet(ctrl_label_style());
series_combo_ = new QComboBox;
series_combo_->setFixedHeight(26);
diff --git a/fincept-qt/src/screens/economics/panels/IlostatPanel.cpp b/fincept-qt/src/screens/economics/panels/IlostatPanel.cpp
index 803d3501e..83e46639a 100644
--- a/fincept-qt/src/screens/economics/panels/IlostatPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/IlostatPanel.cpp
@@ -48,9 +48,9 @@ void IlostatPanel::activate() {
}
void IlostatPanel::build_controls(QHBoxLayout* thl) {
- auto mk_lbl = [](const QString& t) {
+ auto mk_lbl = [this](const QString& t) {
auto* l = new QLabel(t);
- l->setStyleSheet("color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ l->setStyleSheet(ctrl_label_style());
return l;
};
diff --git a/fincept-qt/src/screens/economics/panels/ImfPanel.cpp b/fincept-qt/src/screens/economics/panels/ImfPanel.cpp
index 15a1d99a0..d43dd9cd3 100644
--- a/fincept-qt/src/screens/economics/panels/ImfPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/ImfPanel.cpp
@@ -76,35 +76,24 @@ ImfPanel::ImfPanel(QWidget* parent)
// Left: indicator list
auto* left = new QWidget;
left->setFixedWidth(240);
- left->setStyleSheet("background:#0a0a0a; border-right:1px solid #1a1a1a;");
+ left->setStyleSheet(sidebar_style());
auto* lvl = new QVBoxLayout(left);
lvl->setContentsMargins(0, 0, 0, 0);
lvl->setSpacing(0);
auto* hdr = new QLabel("IMF INDICATOR");
- hdr->setStyleSheet("color:#525252; font-size:8px; font-weight:700;"
- " letter-spacing:1px; background:#111111;"
- " padding:4px 10px; border-bottom:1px solid #1a1a1a;");
+ hdr->setStyleSheet(section_lbl_style() + section_hdr_style());
lvl->addWidget(hdr);
indicator_search_ = new QLineEdit;
indicator_search_->setPlaceholderText("Filter indicators…");
- indicator_search_->setStyleSheet(
- "background:#080808; color:#e5e5e5; border:none;"
- " border-bottom:1px solid #1a1a1a; padding:4px 10px; font-size:11px;");
+ indicator_search_->setStyleSheet(search_input_style());
connect(indicator_search_, &QLineEdit::textChanged,
this, &ImfPanel::on_indicator_filter);
lvl->addWidget(indicator_search_);
indicator_list_ = new QListWidget;
- indicator_list_->setStyleSheet(
- QString(
- "QListWidget { background:transparent; border:none; outline:none; }"
- "QListWidget::item { color:#808080; padding:5px 10px;"
- " border-bottom:1px solid #111111; font-size:11px; }"
- "QListWidget::item:hover { color:#e5e5e5; background:#161616; }"
- "QListWidget::item:selected { color:%1; background:rgba(0,0,0,0.3);"
- " border-left:2px solid %1; font-weight:700; }").arg(kImfColor));
+ indicator_list_->setStyleSheet(list_style());
for (const auto& pair : kImfIndicators) {
auto* item = new QListWidgetItem(pair.first, indicator_list_);
item->setData(Qt::UserRole, pair.second);
@@ -133,8 +122,7 @@ void ImfPanel::activate() {
void ImfPanel::build_controls(QHBoxLayout* thl) {
auto* lbl = new QLabel("COUNTRY");
- lbl->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ lbl->setStyleSheet(ctrl_label_style());
country_combo_ = new QComboBox;
for (const auto& pair : kImfCountries)
country_combo_->addItem(pair.first, pair.second);
diff --git a/fincept-qt/src/screens/economics/panels/OecdPanel.cpp b/fincept-qt/src/screens/economics/panels/OecdPanel.cpp
index 8167e35af..9add12142 100644
--- a/fincept-qt/src/screens/economics/panels/OecdPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/OecdPanel.cpp
@@ -56,10 +56,9 @@ void OecdPanel::activate() {
}
void OecdPanel::build_controls(QHBoxLayout* thl) {
- auto lbl = [](const QString& t) {
+ auto lbl = [this](const QString& t) {
auto* l = new QLabel(t);
- l->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ l->setStyleSheet(ctrl_label_style());
return l;
};
diff --git a/fincept-qt/src/screens/economics/panels/OnsPanel.cpp b/fincept-qt/src/screens/economics/panels/OnsPanel.cpp
index ab1abedb8..fde4664c1 100644
--- a/fincept-qt/src/screens/economics/panels/OnsPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/OnsPanel.cpp
@@ -55,8 +55,7 @@ void OnsPanel::activate() {
void OnsPanel::build_controls(QHBoxLayout* thl) {
auto* lbl = new QLabel("SERIES");
- lbl->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ lbl->setStyleSheet(ctrl_label_style());
series_combo_ = new QComboBox;
for (const auto& s : kOnsSeries)
diff --git a/fincept-qt/src/screens/economics/panels/OwIdPanel.cpp b/fincept-qt/src/screens/economics/panels/OwIdPanel.cpp
index d0932142c..f9d4cd686 100644
--- a/fincept-qt/src/screens/economics/panels/OwIdPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/OwIdPanel.cpp
@@ -53,9 +53,9 @@ void OwIdPanel::activate() {
}
void OwIdPanel::build_controls(QHBoxLayout* thl) {
- auto mk_lbl = [](const QString& t) {
+ auto mk_lbl = [this](const QString& t) {
auto* l = new QLabel(t);
- l->setStyleSheet("color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ l->setStyleSheet(ctrl_label_style());
return l;
};
diff --git a/fincept-qt/src/screens/economics/panels/StatCanPanel.cpp b/fincept-qt/src/screens/economics/panels/StatCanPanel.cpp
index ceaf40c15..72c6f4b89 100644
--- a/fincept-qt/src/screens/economics/panels/StatCanPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/StatCanPanel.cpp
@@ -53,8 +53,7 @@ void StatCanPanel::activate() {
void StatCanPanel::build_controls(QHBoxLayout* thl) {
auto* lbl = new QLabel("SERIES");
- lbl->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ lbl->setStyleSheet(ctrl_label_style());
series_combo_ = new QComboBox;
for (const auto& s : kStatCanSeries)
diff --git a/fincept-qt/src/screens/economics/panels/TradingEconomicsPanel.cpp b/fincept-qt/src/screens/economics/panels/TradingEconomicsPanel.cpp
index 0f964220b..eb681708c 100644
--- a/fincept-qt/src/screens/economics/panels/TradingEconomicsPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/TradingEconomicsPanel.cpp
@@ -59,10 +59,9 @@ void TradingEconomicsPanel::activate() {
}
void TradingEconomicsPanel::build_controls(QHBoxLayout* thl) {
- auto lbl = [](const QString& t) {
+ auto lbl = [this](const QString& t) {
auto* l = new QLabel(t);
- l->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ l->setStyleSheet(ctrl_label_style());
return l;
};
diff --git a/fincept-qt/src/screens/economics/panels/UnComtradePanel.cpp b/fincept-qt/src/screens/economics/panels/UnComtradePanel.cpp
index 407be1a1d..13e72197b 100644
--- a/fincept-qt/src/screens/economics/panels/UnComtradePanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/UnComtradePanel.cpp
@@ -51,10 +51,9 @@ void UnComtradePanel::activate() {
}
void UnComtradePanel::build_controls(QHBoxLayout* thl) {
- auto lbl = [](const QString& t) {
+ auto lbl = [this](const QString& t) {
auto* l = new QLabel(t);
- l->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ l->setStyleSheet(ctrl_label_style());
return l;
};
diff --git a/fincept-qt/src/screens/economics/panels/UnescoPanel.cpp b/fincept-qt/src/screens/economics/panels/UnescoPanel.cpp
index 43524d0ae..7d6a4f9a1 100644
--- a/fincept-qt/src/screens/economics/panels/UnescoPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/UnescoPanel.cpp
@@ -85,20 +85,19 @@ UnescoPanel::UnescoPanel(QWidget* parent)
// Left: theme + indicator selector
auto* left = new QWidget;
left->setFixedWidth(210);
- left->setStyleSheet("background:#0a0a0a; border-right:1px solid #1a1a1a;");
+ left->setStyleSheet(sidebar_style());
auto* lvl = new QVBoxLayout(left);
lvl->setContentsMargins(0, 0, 0, 0);
lvl->setSpacing(0);
// Theme header
auto* theme_hdr = new QWidget;
- theme_hdr->setStyleSheet("background:#111111; border-bottom:1px solid #1a1a1a;");
+ theme_hdr->setStyleSheet(section_hdr_style());
theme_hdr->setFixedHeight(32);
auto* thl = new QHBoxLayout(theme_hdr);
thl->setContentsMargins(8, 0, 8, 0);
auto* theme_lbl = new QLabel("THEME");
- theme_lbl->setStyleSheet(
- "color:#808080; font-size:9px; font-weight:700; background:transparent;");
+ theme_lbl->setStyleSheet(ctrl_label_style());
theme_combo_ = new QComboBox;
theme_combo_->addItem("Education", "education");
theme_combo_->addItem("Science & Tech", "science");
@@ -113,9 +112,7 @@ UnescoPanel::UnescoPanel(QWidget* parent)
// Indicator search
indicator_search_ = new QLineEdit;
indicator_search_->setPlaceholderText("Filter indicators…");
- indicator_search_->setStyleSheet(
- "background:#080808; color:#e5e5e5; border:none;"
- "border-bottom:1px solid #1a1a1a; padding:4px 8px; font-size:10px;");
+ indicator_search_->setStyleSheet(search_input_style());
indicator_search_->setFixedHeight(28);
connect(indicator_search_, &QLineEdit::textChanged,
this, &UnescoPanel::on_indicator_filter);
@@ -123,13 +120,7 @@ UnescoPanel::UnescoPanel(QWidget* parent)
// Indicator list
indicator_list_ = new QListWidget;
- indicator_list_->setStyleSheet(
- QString("QListWidget { background:#080808; border:none; outline:none; font-size:10px; }"
- "QListWidget::item { color:#808080; padding:4px 10px;"
- " border-bottom:1px solid #111111; }"
- "QListWidget::item:hover { color:#e5e5e5; background:#0f0f0f; }"
- "QListWidget::item:selected { color:%1; background:rgba(0,172,193,0.08);"
- " border-left:2px solid %1; padding-left:8px; }").arg(kUnescoColor));
+ indicator_list_->setStyleSheet(list_style());
indicator_list_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
lvl->addWidget(indicator_list_, 1);
@@ -158,10 +149,9 @@ void UnescoPanel::activate() {
// ── Controls ──────────────────────────────────────────────────────────────────
void UnescoPanel::build_controls(QHBoxLayout* thl) {
- auto make_lbl = [](const QString& text) {
+ auto make_lbl = [this](const QString& text) {
auto* l = new QLabel(text);
- l->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ l->setStyleSheet(ctrl_label_style());
return l;
};
diff --git a/fincept-qt/src/screens/economics/panels/WorldBankHealthPanel.cpp b/fincept-qt/src/screens/economics/panels/WorldBankHealthPanel.cpp
index 8ea9fbb24..70e8023c2 100644
--- a/fincept-qt/src/screens/economics/panels/WorldBankHealthPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/WorldBankHealthPanel.cpp
@@ -92,10 +92,9 @@ void WorldBankHealthPanel::activate() {
}
void WorldBankHealthPanel::build_controls(QHBoxLayout* thl) {
- auto lbl = [](const QString& t) {
+ auto lbl = [this](const QString& t) {
auto* l = new QLabel(t);
- l->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ l->setStyleSheet(ctrl_label_style());
return l;
};
diff --git a/fincept-qt/src/screens/economics/panels/WorldBankPanel.cpp b/fincept-qt/src/screens/economics/panels/WorldBankPanel.cpp
index e644b39fb..de1bf4f34 100644
--- a/fincept-qt/src/screens/economics/panels/WorldBankPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/WorldBankPanel.cpp
@@ -56,46 +56,29 @@ WorldBankPanel::WorldBankPanel(QWidget* parent)
// ── Left: country + indicator selectors ──────────────────────────────────
auto* left = new QWidget;
left->setFixedWidth(220);
- left->setStyleSheet("background:#0a0a0a; border-right:1px solid #1a1a1a;");
+ left->setStyleSheet(sidebar_style());
auto* lvl = new QVBoxLayout(left);
lvl->setContentsMargins(0, 0, 0, 0);
lvl->setSpacing(0);
- auto section_header = [](const QString& text) {
+ auto section_header = [this](const QString& text) {
auto* lbl = new QLabel(text);
- lbl->setStyleSheet("color:#525252; font-size:8px; font-weight:700;"
- " letter-spacing:1px; background:#111111;"
- " padding:4px 10px; border-bottom:1px solid #1a1a1a;");
+ lbl->setStyleSheet(section_lbl_style()
+ + section_hdr_style());
return lbl;
};
- auto list_style = [](const QString& col) {
- return QString(
- "QListWidget { background:transparent; border:none; outline:none; }"
- "QListWidget::item { color:#808080; padding:5px 10px;"
- " border-bottom:1px solid #111111; font-size:11px; }"
- "QListWidget::item:hover { color:#e5e5e5; background:#161616; }"
- "QListWidget::item:selected { color:%1; background:rgba(0,0,0,0.3);"
- " border-left:2px solid %1; font-weight:700; }").arg(col);
- };
-
- auto search_style = []() {
- return QString("background:#080808; color:#e5e5e5; border:none;"
- " border-bottom:1px solid #1a1a1a; padding:4px 10px;"
- " font-size:11px;");
- };
-
// Country
lvl->addWidget(section_header("COUNTRY"));
country_search_ = new QLineEdit;
country_search_->setPlaceholderText("Filter countries…");
- country_search_->setStyleSheet(search_style());
+ country_search_->setStyleSheet(search_input_style());
connect(country_search_, &QLineEdit::textChanged,
this, &WorldBankPanel::on_country_filter);
lvl->addWidget(country_search_);
country_list_ = new QListWidget;
- country_list_->setStyleSheet(list_style(kWorldBankColor));
+ country_list_->setStyleSheet(list_style());
connect(country_list_, &QListWidget::currentItemChanged, this,
[this](QListWidgetItem* item) {
if (item) selected_country_ = item->data(Qt::UserRole).toString();
@@ -106,13 +89,13 @@ WorldBankPanel::WorldBankPanel(QWidget* parent)
lvl->addWidget(section_header("INDICATOR"));
indicator_search_ = new QLineEdit;
indicator_search_->setPlaceholderText("Filter indicators…");
- indicator_search_->setStyleSheet(search_style());
+ indicator_search_->setStyleSheet(search_input_style());
connect(indicator_search_, &QLineEdit::textChanged,
this, &WorldBankPanel::on_indicator_filter);
lvl->addWidget(indicator_search_);
indicator_list_ = new QListWidget;
- indicator_list_->setStyleSheet(list_style(kWorldBankColor));
+ indicator_list_->setStyleSheet(list_style());
for (const auto& pair : kWbIndicators) {
auto* item = new QListWidgetItem(pair.first, indicator_list_);
item->setData(Qt::UserRole, pair.second);
@@ -150,8 +133,7 @@ void WorldBankPanel::load_countries() {
void WorldBankPanel::build_controls(QHBoxLayout* thl) {
auto* lbl = new QLabel("YEARS");
- lbl->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ lbl->setStyleSheet(ctrl_label_style());
date_preset_ = new QComboBox;
date_preset_->addItem("5 Years", 5);
date_preset_->addItem("10 Years", 10);
diff --git a/fincept-qt/src/screens/economics/panels/WtoPanel.cpp b/fincept-qt/src/screens/economics/panels/WtoPanel.cpp
index 7cd670833..b805ccbd0 100644
--- a/fincept-qt/src/screens/economics/panels/WtoPanel.cpp
+++ b/fincept-qt/src/screens/economics/panels/WtoPanel.cpp
@@ -22,6 +22,7 @@
#include "core/logging/Logger.h"
#include "services/economics/EconomicsService.h"
+#include "ui/theme/Theme.h"
#include <QHBoxLayout>
#include <QJsonArray>
@@ -67,10 +68,9 @@ void WtoPanel::activate() {
// ── Controls ──────────────────────────────────────────────────────────────────
void WtoPanel::build_controls(QHBoxLayout* thl) {
- auto make_lbl = [](const QString& text) {
+ auto make_lbl = [this](const QString& text) {
auto* l = new QLabel(text);
- l->setStyleSheet(
- "color:#525252; font-size:9px; font-weight:700; background:transparent;");
+ l->setStyleSheet(ctrl_label_style());
return l;
};
@@ -102,8 +102,7 @@ void WtoPanel::build_controls(QHBoxLayout* thl) {
years_input_->setFixedWidth(110);
apikey_notice_ = new QLabel("Requires WTO_API_KEY");
- apikey_notice_->setStyleSheet(
- "color:#f59e0b; font-size:9px; background:transparent;");
+ apikey_notice_->setStyleSheet(notice_style());
thl->addWidget(make_lbl("SECTION"));
thl->addWidget(section_combo_);
@@ -123,13 +122,13 @@ void WtoPanel::on_section_changed(int index) {
if (is_timeseries) {
apikey_notice_->setText("Requires WTO_API_KEY");
- apikey_notice_->setStyleSheet(
- "color:#f59e0b; font-size:9px; background:transparent;");
+ apikey_notice_->setStyleSheet(notice_style());
reporter_input_->setPlaceholderText("Reporter (e.g. US, CN, DE)");
} else {
apikey_notice_->setText("Free — no API key");
apikey_notice_->setStyleSheet(
- "color:#16a34a; font-size:9px; background:transparent;");
+ QString("color:%1; font-size:9px; background:transparent;")
+ .arg(ui::colors::POSITIVE()));
reporter_input_->setPlaceholderText("Member code (e.g. US, CN)");
}
}
diff --git a/fincept-qt/src/screens/equity_research/EquityAnalysisTab.cpp b/fincept-qt/src/screens/equity_research/EquityAnalysisTab.cpp
index 50136b760..2b0a782eb 100644
--- a/fincept-qt/src/screens/equity_research/EquityAnalysisTab.cpp
+++ b/fincept-qt/src/screens/equity_research/EquityAnalysisTab.cpp
@@ -105,8 +105,8 @@ void EquityAnalysisTab::build_ui() {
auto* hl_vl = static_cast<QVBoxLayout*>(health_panel->layout());
auto* health_grid = new QGridLayout;
health_grid->setSpacing(16);
- health_grid->addWidget(make_card("TOTAL CASH", cash_val_, "#22c55e"), 0, 0);
- health_grid->addWidget(make_card("TOTAL DEBT", debt_val_, "#ef4444"), 0, 1);
+ health_grid->addWidget(make_card("TOTAL CASH", cash_val_, ui::colors::POSITIVE), 0, 0);
+ health_grid->addWidget(make_card("TOTAL DEBT", debt_val_, ui::colors::NEGATIVE), 0, 1);
health_grid->addWidget(make_card("FREE CASHFLOW", fcf_val_, "#22d3ee"), 1, 0);
health_grid->addWidget(make_card("OPERATING CF", ocf_val_, "#60a5fa"), 1, 1);
hl_vl->addLayout(health_grid);
@@ -125,13 +125,13 @@ void EquityAnalysisTab::build_ui() {
ev_vl->addStretch();
// ── Panel 3: REVENUE & PROFITS (bottom-left, green) ───────────────────────
- auto* rev_panel = make_panel("REVENUE & PROFITS", "#22c55e");
+ auto* rev_panel = make_panel("REVENUE & PROFITS", ui::colors::POSITIVE);
auto* rev_vl = static_cast<QVBoxLayout*>(rev_panel->layout());
auto* rev_grid = new QGridLayout;
rev_grid->setSpacing(16);
- rev_grid->addWidget(make_card("TOTAL REVENUE", rev_val_, "#22c55e"), 0, 0);
+ rev_grid->addWidget(make_card("TOTAL REVENUE", rev_val_, ui::colors::POSITIVE), 0, 0);
rev_grid->addWidget(make_card("REVENUE/SHARE", rev_share_val_, "#22d3ee"), 0, 1);
- rev_grid->addWidget(make_card("GROSS PROFITS", gp_val_, "#22c55e"), 1, 0);
+ rev_grid->addWidget(make_card("GROSS PROFITS", gp_val_, ui::colors::POSITIVE), 1, 0);
rev_grid->addWidget(make_card("EBITDA MARGINS", ebitda_m_val_, "#eab308"), 1, 1);
rev_vl->addLayout(rev_grid);
rev_vl->addStretch();
@@ -143,10 +143,10 @@ void EquityAnalysisTab::build_ui() {
rat_grid->setSpacing(16);
rat_grid->addWidget(make_card("P/E RATIO", pe_val_, ui::colors::TEXT_PRIMARY), 0, 0);
rat_grid->addWidget(make_card("PEG RATIO", peg_val_, ui::colors::TEXT_PRIMARY), 0, 1);
- rat_grid->addWidget(make_card("ROE", roe_val_, "#22c55e"), 1, 0);
- rat_grid->addWidget(make_card("ROA", roa_val_, "#22c55e"), 1, 1);
+ rat_grid->addWidget(make_card("ROE", roe_val_, ui::colors::POSITIVE), 1, 0);
+ rat_grid->addWidget(make_card("ROA", roa_val_, ui::colors::POSITIVE), 1, 1);
rat_grid->addWidget(make_card("BETA", beta_val_, "#22d3ee"), 2, 0);
- rat_grid->addWidget(make_card("SHORT RATIO", short_rat_val_, "#ef4444"), 2, 1);
+ rat_grid->addWidget(make_card("SHORT RATIO", short_rat_val_, ui::colors::NEGATIVE), 2, 1);
rat_vl->addLayout(rat_grid);
rat_vl->addStretch();
diff --git a/fincept-qt/src/screens/equity_research/EquityFinancialsTab.cpp b/fincept-qt/src/screens/equity_research/EquityFinancialsTab.cpp
index dfb8ef9e3..f709c994a 100644
--- a/fincept-qt/src/screens/equity_research/EquityFinancialsTab.cpp
+++ b/fincept-qt/src/screens/equity_research/EquityFinancialsTab.cpp
@@ -34,8 +34,8 @@ namespace {
static const QString kAmber = "#f59e0b";
static const QString kCyan = "#22d3ee";
-static const QString kGreen = "#22c55e";
-static const QString kRed = "#ef4444";
+static const QString kGreen = ui::colors::POSITIVE;
+static const QString kRed = ui::colors::NEGATIVE;
static const QString kBlue = "#3b82f6";
static const QString kPurple = "#a855f7";
static const QString kOrange = "#f97316";
@@ -195,9 +195,9 @@ void EquityFinancialsTab::build_ui() {
border-radius:3px; padding:4px 14px; font-size:11px; font-weight:700;
}
QPushButton:checked { background:%3; color:%4; border-color:%3; }
- QPushButton:hover:!checked { border-color:%3; background:#1a1a1a; }
+ QPushButton:hover:!checked { border-color:%3; background:%5; }
)")
- .arg(ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM, kAmber, ui::colors::BG_BASE);
+ .arg(ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM, kAmber, ui::colors::BG_BASE, ui::colors::BG_HOVER);
auto make_btn = [&](const QString& label, QPushButton*& out) {
out = new QPushButton(label);
diff --git a/fincept-qt/src/screens/equity_research/EquityOverviewTab.cpp b/fincept-qt/src/screens/equity_research/EquityOverviewTab.cpp
index 53e8ba06b..55eedbf16 100644
--- a/fincept-qt/src/screens/equity_research/EquityOverviewTab.cpp
+++ b/fincept-qt/src/screens/equity_research/EquityOverviewTab.cpp
@@ -17,17 +17,7 @@
namespace fincept::screens {
-// ── Bloomberg-style constants ────────────────────────────────────────────────
-
-static constexpr const char* BG = "#080808";
-static constexpr const char* SURFACE = "#0e0e0e";
-static constexpr const char* RAISED = "#141414";
-static constexpr const char* BORDER = "#1c1c1c";
-static constexpr const char* TXT1 = "#e5e5e5";
-static constexpr const char* TXT2 = "#a0a0a0";
-static constexpr const char* AMBER = "#d97706";
-static constexpr const char* GREEN = "#22c55e";
-static constexpr const char* RED = "#ef4444";
+// ── Accent colors without a theme token ──────────────────────────────────────
static constexpr const char* CYAN = "#22d3ee";
static constexpr const char* YELLOW = "#eab308";
static constexpr const char* PURPLE = "#a855f7";
@@ -45,7 +35,7 @@ namespace {
QFrame* make_panel(const QString& title, const char* title_color) {
auto* f = new QFrame;
- f->setStyleSheet(QString("QFrame{background:%1;border:1px solid %2;border-radius:2px;}").arg(SURFACE, BORDER));
+ f->setStyleSheet(QString("QFrame{background:%1;border:1px solid %2;border-radius:2px;}").arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* vl = new QVBoxLayout(f);
vl->setContentsMargins(10, 7, 10, 7);
vl->setSpacing(4);
@@ -59,7 +49,7 @@ QFrame* make_panel(const QString& title, const char* title_color) {
auto* sep = new QFrame;
sep->setFrameShape(QFrame::HLine);
sep->setFixedHeight(1);
- sep->setStyleSheet(QString("border:0;background:%1;").arg(BORDER));
+ sep->setStyleSheet(QString("border:0;background:%1;").arg(ui::colors::BORDER_DIM));
vl->addWidget(sep);
}
return f;
@@ -71,7 +61,7 @@ QLabel* add_row(QFrame* panel, const QString& key, const char* val_color) {
hl->setContentsMargins(0, 0, 0, 0);
auto* k = new QLabel(key);
- k->setStyleSheet(QString("color:%1;font-size:%2px;background:transparent;border:0;").arg(TXT2).arg(FONT_KEY));
+ k->setStyleSheet(QString("color:%1;font-size:%2px;background:transparent;border:0;").arg(ui::colors::TEXT_SECONDARY).arg(FONT_KEY));
auto* v = new QLabel("\xe2\x80\x94");
v->setStyleSheet(QString("color:%1;font-size:%2px;font-weight:600;background:transparent;border:0;")
@@ -128,14 +118,14 @@ void ResearchCandleCanvas::rebuild_cache() {
if (W <= 0 || H <= 0) return;
cache_ = QPixmap(W, H);
- cache_.fill(QColor(BG));
+ cache_.fill(QColor(ui::colors::BG_BASE()));
QPainter p(&cache_);
p.setRenderHint(QPainter::Antialiasing, false);
const int total = candles_.size();
if (total == 0) {
- p.setPen(QColor(TXT2));
+ p.setPen(QColor(ui::colors::TEXT_SECONDARY()));
p.setFont(QFont("Consolas", 11));
p.drawText(cache_.rect(), Qt::AlignCenter, "Waiting for data...");
return;
@@ -165,7 +155,7 @@ void ResearchCandleCanvas::rebuild_cache() {
};
// Grid lines
- p.setPen(QPen(QColor(BORDER), 1, Qt::DotLine));
+ p.setPen(QPen(QColor(ui::colors::BORDER_DIM()), 1, Qt::DotLine));
for (int g = 1; g < 6; ++g) {
int gy = plot_h * g / 6;
p.drawLine(0, gy, plot_w, gy);
@@ -176,8 +166,8 @@ void ResearchCandleCanvas::rebuild_cache() {
const int body_w = qMax(1, static_cast<int>(slot_w * 0.65));
const int half = body_w / 2;
- const QColor bull_color(GREEN);
- const QColor bear_color(RED);
+ const QColor bull_color(ui::colors::POSITIVE.get());
+ const QColor bear_color(ui::colors::NEGATIVE.get());
const QColor wick_bull("#2a9d5c");
const QColor wick_bear("#b83a3a");
@@ -207,13 +197,13 @@ void ResearchCandleCanvas::rebuild_cache() {
}
// Price axis (right)
- p.setPen(QPen(QColor(BORDER), 1));
+ p.setPen(QPen(QColor(ui::colors::BORDER_DIM.get()), 1));
p.drawLine(plot_w, 0, plot_w, plot_h);
QFont lbl_font("Consolas", 9);
p.setFont(lbl_font);
QFontMetrics fm(lbl_font);
- p.setPen(QColor(TXT2));
+ p.setPen(QColor(ui::colors::TEXT_SECONDARY.get()));
const bool is_large = hi > 1000;
for (int g = 0; g <= 6; ++g) {
@@ -224,10 +214,10 @@ void ResearchCandleCanvas::rebuild_cache() {
}
// Time axis (bottom)
- p.setPen(QPen(QColor(BORDER), 1));
+ p.setPen(QPen(QColor(ui::colors::BORDER_DIM.get()), 1));
p.drawLine(0, plot_h, plot_w, plot_h);
- p.setPen(QColor(TXT2));
+ p.setPen(QColor(ui::colors::TEXT_SECONDARY.get()));
const qint64 span_sec = candles_.last().timestamp - candles_.first().timestamp;
const int label_step = qMax(1, count / 8);
@@ -252,7 +242,7 @@ void ResearchCandleCanvas::rebuild_cache() {
if (!candles_.isEmpty()) {
double last_close = candles_.last().close;
int ly = py(last_close);
- p.setPen(QPen(QColor(AMBER), 1, Qt::DashLine));
+ p.setPen(QPen(QColor(ui::colors::AMBER.get()), 1, Qt::DashLine));
p.drawLine(0, ly, plot_w, ly);
}
}
@@ -282,7 +272,7 @@ void EquityOverviewTab::set_symbol(const QString& symbol) {
// ── Build UI ──────────────────────────────────────────────────────────────────
void EquityOverviewTab::build_ui() {
- setStyleSheet(QString("background:%1;").arg(BG));
+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
loading_overlay_ = new ui::LoadingOverlay(this);
@@ -341,11 +331,11 @@ QWidget* EquityOverviewTab::build_col1() {
}
QWidget* EquityOverviewTab::build_trading_panel() {
- auto* p = make_panel("TODAY'S TRADING", AMBER);
+ auto* p = make_panel("TODAY'S TRADING", ui::colors::AMBER);
open_val_ = add_row(p, "OPEN", CYAN);
- high_val_ = add_row(p, "HIGH", GREEN);
- low_val_ = add_row(p, "LOW", RED);
- prev_close_val_ = add_row(p, "PREV CLOSE", TXT1);
+ high_val_ = add_row(p, "HIGH", ui::colors::POSITIVE);
+ low_val_ = add_row(p, "LOW", ui::colors::NEGATIVE);
+ prev_close_val_ = add_row(p, "PREV CLOSE", ui::colors::TEXT_PRIMARY);
vol_val_ = add_row(p, "VOLUME", YELLOW);
static_cast<QVBoxLayout*>(p->layout())->addStretch();
return p;
@@ -358,8 +348,8 @@ QWidget* EquityOverviewTab::build_valuation_panel() {
fwd_pe_val_ = add_row(p, "FWD P/E", YELLOW);
peg_val_ = add_row(p, "PEG RATIO", YELLOW);
pb_val_ = add_row(p, "P/B RATIO", CYAN);
- div_val_ = add_row(p, "DIV YIELD", GREEN);
- beta_val_ = add_row(p, "BETA", TXT1);
+ div_val_ = add_row(p, "DIV YIELD", ui::colors::POSITIVE);
+ beta_val_ = add_row(p, "BETA", ui::colors::TEXT_PRIMARY);
static_cast<QVBoxLayout*>(p->layout())->addStretch();
return p;
}
@@ -370,7 +360,7 @@ QWidget* EquityOverviewTab::build_share_stats_panel() {
float_val_ = add_row(p, "FLOAT", CYAN);
insiders_val_ = add_row(p, "INSIDERS", YELLOW);
institutions_val_ = add_row(p, "INSTITUTIONS", YELLOW);
- short_pct_val_ = add_row(p, "SHORT %", RED);
+ short_pct_val_ = add_row(p, "SHORT %", ui::colors::NEGATIVE);
static_cast<QVBoxLayout*>(p->layout())->addStretch();
return p;
}
@@ -379,7 +369,7 @@ QWidget* EquityOverviewTab::build_share_stats_panel() {
QWidget* EquityOverviewTab::build_chart_panel() {
auto* p = new QFrame;
- p->setStyleSheet(QString("QFrame{background:%1;border:1px solid %2;border-radius:2px;}").arg(SURFACE, BORDER));
+ p->setStyleSheet(QString("QFrame{background:%1;border:1px solid %2;border-radius:2px;}").arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* vl = new QVBoxLayout(p);
vl->setContentsMargins(8, 6, 8, 6);
@@ -391,19 +381,19 @@ QWidget* EquityOverviewTab::build_chart_panel() {
btn_row->setContentsMargins(0, 0, 0, 0);
auto* period_lbl = new QLabel("PERIOD");
- period_lbl->setStyleSheet(QString("color:%1;font-size:12px;font-weight:600;background:transparent;border:0;").arg(TXT2));
+ period_lbl->setStyleSheet(QString("color:%1;font-size:12px;font-weight:600;background:transparent;border:0;").arg(ui::colors::TEXT_SECONDARY));
btn_row->addWidget(period_lbl);
auto btn_style_inactive = QString(
"QPushButton{background:transparent;color:%1;border:1px solid %2;"
"border-radius:2px;padding:3px 10px;font-size:12px;font-weight:700;font-family:'Consolas',monospace;}"
"QPushButton:hover{border-color:%3;background:%4;}")
- .arg(TXT2, BORDER, AMBER, RAISED);
+ .arg(ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM, ui::colors::AMBER, ui::colors::BG_RAISED);
auto btn_style_active = QString(
"QPushButton{background:%1;color:%2;border:1px solid %1;"
"border-radius:2px;padding:3px 10px;font-size:12px;font-weight:700;font-family:'Consolas',monospace;}")
- .arg(AMBER, BG);
+ .arg(ui::colors::AMBER, ui::colors::BG_BASE);
auto make_btn = [&](const QString& label, QPushButton*& out, const QString& period) {
out = new QPushButton(label);
@@ -440,12 +430,12 @@ void EquityOverviewTab::switch_period(QPushButton* btn, const QString& period) {
"QPushButton{background:transparent;color:%1;border:1px solid %2;"
"border-radius:2px;padding:3px 10px;font-size:12px;font-weight:700;font-family:'Consolas',monospace;}"
"QPushButton:hover{border-color:%3;background:%4;}")
- .arg(TXT2, BORDER, AMBER, RAISED);
+ .arg(ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM, ui::colors::AMBER, ui::colors::BG_RAISED);
auto active = QString(
"QPushButton{background:%1;color:%2;border:1px solid %1;"
"border-radius:2px;padding:3px 10px;font-size:12px;font-weight:700;font-family:'Consolas',monospace;}")
- .arg(AMBER, BG);
+ .arg(ui::colors::AMBER, ui::colors::BG_BASE);
for (auto* b : {btn_1m_, btn_3m_, btn_6m_, btn_1y_, btn_5y_})
b->setStyleSheet(b == btn ? active : inactive);
@@ -472,15 +462,15 @@ QWidget* EquityOverviewTab::build_col4() {
QWidget* EquityOverviewTab::build_analyst_panel() {
auto* p = make_panel("ANALYST TARGETS", MAGENTA);
- target_high_val_ = add_row(p, "HIGH", GREEN);
+ target_high_val_ = add_row(p, "HIGH", ui::colors::POSITIVE);
target_mean_val_ = add_row(p, "MEAN", YELLOW);
- target_low_val_ = add_row(p, "LOW", RED);
+ target_low_val_ = add_row(p, "LOW", ui::colors::NEGATIVE);
analyst_count_val_ = add_row(p, "ANALYSTS", CYAN);
rec_key_label_ = new QLabel("\xe2\x80\x94");
rec_key_label_->setAlignment(Qt::AlignCenter);
rec_key_label_->setStyleSheet(QString("background:%1;color:%2;border-radius:2px;padding:3px 8px;"
- "font-size:12px;font-weight:700;").arg(RAISED, TXT2));
+ "font-size:12px;font-weight:700;").arg(ui::colors::BG_RAISED, ui::colors::TEXT_SECONDARY));
static_cast<QVBoxLayout*>(p->layout())->addWidget(rec_key_label_);
static_cast<QVBoxLayout*>(p->layout())->addStretch();
return p;
@@ -488,18 +478,18 @@ QWidget* EquityOverviewTab::build_analyst_panel() {
QWidget* EquityOverviewTab::build_52w_panel() {
auto* p = make_panel("52 WEEK RANGE", YELLOW);
- w52h_val_ = add_row(p, "HIGH", GREEN);
- w52l_val_ = add_row(p, "LOW", RED);
+ w52h_val_ = add_row(p, "HIGH", ui::colors::POSITIVE);
+ w52l_val_ = add_row(p, "LOW", ui::colors::NEGATIVE);
avg_vol_val_ = add_row(p, "AVG VOL", CYAN);
static_cast<QVBoxLayout*>(p->layout())->addStretch();
return p;
}
QWidget* EquityOverviewTab::build_profitability_panel() {
- auto* p = make_panel("PROFITABILITY", GREEN);
- gross_margin_val_ = add_row(p, "GROSS MARGIN", GREEN);
- op_margin_val_ = add_row(p, "OPER. MARGIN", GREEN);
- profit_margin_val_ = add_row(p, "PROFIT MARGIN", GREEN);
+ auto* p = make_panel("PROFITABILITY", ui::colors::POSITIVE);
+ gross_margin_val_ = add_row(p, "GROSS MARGIN", ui::colors::POSITIVE);
+ op_margin_val_ = add_row(p, "OPER. MARGIN", ui::colors::POSITIVE);
+ profit_margin_val_ = add_row(p, "PROFIT MARGIN", ui::colors::POSITIVE);
roa_val_ = add_row(p, "ROA", CYAN);
roe_val_ = add_row(p, "ROE", CYAN);
static_cast<QVBoxLayout*>(p->layout())->addStretch();
@@ -508,8 +498,8 @@ QWidget* EquityOverviewTab::build_profitability_panel() {
QWidget* EquityOverviewTab::build_growth_panel() {
auto* p = make_panel("GROWTH RATES", BLUE);
- rev_growth_val_ = add_row(p, "REVENUE", GREEN);
- earnings_growth_val_ = add_row(p, "EARNINGS", GREEN);
+ rev_growth_val_ = add_row(p, "REVENUE", ui::colors::POSITIVE);
+ earnings_growth_val_ = add_row(p, "EARNINGS", ui::colors::POSITIVE);
static_cast<QVBoxLayout*>(p->layout())->addStretch();
return p;
}
@@ -540,14 +530,14 @@ QWidget* EquityOverviewTab::build_company_desc_panel() {
company_desc_->setWordWrap(true);
company_desc_->setAlignment(Qt::AlignTop | Qt::AlignLeft);
company_desc_->setStyleSheet(QString("color:%1;font-size:%2px;line-height:1.5;"
- "background:transparent;border:0;").arg(TXT1).arg(FONT_DESC));
+ "background:transparent;border:0;").arg(ui::colors::TEXT_PRIMARY).arg(FONT_DESC));
company_desc_->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
static_cast<QVBoxLayout*>(p->layout())->addWidget(company_desc_);
return p;
}
QWidget* EquityOverviewTab::build_company_info_panel() {
- auto* p = make_panel("COMPANY INFO", TXT1);
+ auto* p = make_panel("COMPANY INFO", ui::colors::TEXT_PRIMARY);
company_emp_ = add_row(p, "EMPLOYEES", CYAN);
company_web_ = add_row(p, "WEBSITE", BLUE);
company_currency_ = add_row(p, "CURRENCY", CYAN);
@@ -556,9 +546,9 @@ QWidget* EquityOverviewTab::build_company_info_panel() {
}
QWidget* EquityOverviewTab::build_financial_health_panel() {
- auto* p = make_panel("FINANCIAL HEALTH", AMBER);
- cash_val_ = add_row(p, "CASH", GREEN);
- debt_val_ = add_row(p, "DEBT", RED);
+ auto* p = make_panel("FINANCIAL HEALTH", ui::colors::AMBER);
+ cash_val_ = add_row(p, "CASH", ui::colors::POSITIVE);
+ debt_val_ = add_row(p, "DEBT", ui::colors::NEGATIVE);
free_cf_val_ = add_row(p, "FREE CF", CYAN);
static_cast<QVBoxLayout*>(p->layout())->addStretch();
return p;
@@ -630,16 +620,16 @@ void EquityOverviewTab::on_info_loaded(services::equity::StockInfo info) {
analyst_count_val_->setText(info.analyst_count > 0 ? QString::number(info.analyst_count) : "N/A");
QString rec = info.recommendation_key.toUpper().replace("_", " ");
- const char* rec_color = TXT2;
+ const char* rec_color = ui::colors::TEXT_SECONDARY;
if (rec == "STRONG BUY" || rec == "BUY")
- rec_color = GREEN;
+ rec_color = ui::colors::POSITIVE;
else if (rec == "STRONG SELL" || rec == "SELL")
- rec_color = RED;
+ rec_color = ui::colors::NEGATIVE;
else if (rec == "HOLD")
- rec_color = AMBER;
+ rec_color = ui::colors::AMBER;
rec_key_label_->setText(rec.isEmpty() ? "\xe2\x80\x94" : rec);
rec_key_label_->setStyleSheet(QString("background:%1;color:%2;border-radius:2px;padding:3px 8px;"
- "font-size:12px;font-weight:700;").arg(RAISED, rec_color));
+ "font-size:12px;font-weight:700;").arg(ui::colors::BG_RAISED, rec_color));
// Profitability
gross_margin_val_->setText(fmt_pct(info.gross_margins));
diff --git a/fincept-qt/src/screens/equity_research/EquityPeersTab.cpp b/fincept-qt/src/screens/equity_research/EquityPeersTab.cpp
index 18a7da00d..b3229d1e6 100644
--- a/fincept-qt/src/screens/equity_research/EquityPeersTab.cpp
+++ b/fincept-qt/src/screens/equity_research/EquityPeersTab.cpp
@@ -156,17 +156,17 @@ void EquityPeersTab::populate_table(const QVector<services::equity::PeerData>& p
if (v <= 0.0)
return QColor("#6b7280");
if (v <= good)
- return QColor("#22c55e");
+ return QColor(ui::colors::POSITIVE());
if (v <= warn)
return QColor("#eab308");
- return QColor("#ef4444");
+ return QColor(ui::colors::NEGATIVE());
};
auto color_pct_pos = [](double v) -> QColor {
if (v == 0.0)
return QColor("#6b7280");
if (v > 0.0)
- return QColor("#22c55e");
- return QColor("#ef4444");
+ return QColor(ui::colors::POSITIVE());
+ return QColor(ui::colors::NEGATIVE());
};
auto set_cell = [&](int row, int col, const QString& text, const QColor& fg = QColor(),
@@ -208,8 +208,8 @@ void EquityPeersTab::populate_table(const QVector<services::equity::PeerData>& p
set_cell(r, 11, fmt_pct(p.operating_margin), color_pct_pos(p.operating_margin));
set_cell(r, 12, fmt_pct(p.revenue_growth), color_pct_pos(p.revenue_growth));
set_cell(r, 13, fmt(p.debt_to_equity, 2), color_ratio(p.debt_to_equity, 0.5, 2.0));
- set_cell(r, 14, fmt_pct(p.dividend_yield), p.dividend_yield > 0 ? QColor("#22c55e") : QColor("#6b7280"));
- set_cell(r, 15, fmt(p.beta, 2), p.beta >= 0 && p.beta <= 1.5 ? QColor("#22c55e") : QColor("#ef4444"));
+ set_cell(r, 14, fmt_pct(p.dividend_yield), p.dividend_yield > 0 ? QColor(ui::colors::POSITIVE()) : QColor("#6b7280"));
+ set_cell(r, 15, fmt(p.beta, 2), p.beta >= 0 && p.beta <= 1.5 ? QColor(ui::colors::POSITIVE()) : QColor(ui::colors::NEGATIVE()));
}
peer_table_->resizeColumnsToContents();
diff --git a/fincept-qt/src/screens/equity_research/EquityResearchScreen.cpp b/fincept-qt/src/screens/equity_research/EquityResearchScreen.cpp
index 522c0cc85..5c1aa196f 100644
--- a/fincept-qt/src/screens/equity_research/EquityResearchScreen.cpp
+++ b/fincept-qt/src/screens/equity_research/EquityResearchScreen.cpp
@@ -9,6 +9,7 @@
#include "screens/equity_research/EquityTalippTab.h"
#include "screens/equity_research/EquityTechnicalsTab.h"
#include "core/events/EventBus.h"
+#include "core/session/ScreenStateManager.h"
#include "services/equity/EquityResearchService.h"
#include "ui/theme/Theme.h"
@@ -180,6 +181,7 @@ void EquityResearchScreen::on_info_loaded(services::equity::StockInfo info) {
}
void EquityResearchScreen::on_tab_changed(int index) {
+ ScreenStateManager::instance().notify_changed(this);
if (current_symbol_.isEmpty())
return;
diff --git a/fincept-qt/src/screens/equity_research/EquityTalippTab.cpp b/fincept-qt/src/screens/equity_research/EquityTalippTab.cpp
index 670704a3e..4bb928efc 100644
--- a/fincept-qt/src/screens/equity_research/EquityTalippTab.cpp
+++ b/fincept-qt/src/screens/equity_research/EquityTalippTab.cpp
@@ -46,7 +46,7 @@ const QList<EquityTalippTab::CategoryDef>& EquityTalippTab::categories() {
}},
{"momentum",
"MOMENTUM",
- "#d97706",
+ ui::colors::AMBER,
{
{"rsi", "RSI", "prices"},
{"macd", "MACD", "prices"},
@@ -70,7 +70,7 @@ const QList<EquityTalippTab::CategoryDef>& EquityTalippTab::categories() {
}},
{"volume",
"VOLUME",
- "#22c55e",
+ ui::colors::POSITIVE,
{
{"obv", "OBV", "ohlcv"},
{"vwap", "VWAP", "ohlcv"},
@@ -213,10 +213,10 @@ void EquityTalippTab::build_ui() {
for (const auto& cat : categories()) {
auto* btn = new QPushButton(cat.label);
- btn->setStyleSheet(QString("QPushButton { background:transparent; color:#6b7280; "
+ btn->setStyleSheet(QString("QPushButton { background:transparent; color:%3; "
"border:1px solid %1; padding:5px 14px; font-size:10px; font-weight:700; }"
"QPushButton:hover { border-color:%2; color:%2; }")
- .arg(ui::colors::BORDER_DIM, cat.color));
+ .arg(ui::colors::BORDER_DIM, cat.color, ui::colors::TEXT_TERTIARY));
btn->setProperty("cat_id", cat.id);
connect(btn, &QPushButton::clicked, this, [this, id = cat.id]() { on_category_clicked(id); });
cat_buttons_[cat.id] = btn;
@@ -260,15 +260,16 @@ void EquityTalippTab::build_ui() {
cl->addStretch();
data_points_lbl_ = new QLabel("— data points | TALIpp Engine");
- data_points_lbl_->setStyleSheet("color:#6b7280; font-size:10px; background:transparent; border:0;");
+ data_points_lbl_->setStyleSheet(QString("color:%1; font-size:10px; background:transparent; border:0;").arg(ui::colors::TEXT_TERTIARY));
cl->addWidget(data_points_lbl_);
compute_btn_ = new QPushButton("▶ CALCULATE");
compute_btn_->setStyleSheet(QString("QPushButton { background:%1; color:%2; border:0; padding:6px 18px; "
"font-size:10px; font-weight:700; }"
- "QPushButton:hover { background:#b45309; }"
- "QPushButton:disabled { background:#374151; color:#6b7280; }")
- .arg(ui::colors::AMBER, ui::colors::BG_BASE));
+ "QPushButton:hover { background:%3; }"
+ "QPushButton:disabled { background:%4; color:%5; }")
+ .arg(ui::colors::AMBER, ui::colors::BG_BASE, ui::colors::AMBER_DIM,
+ ui::colors::TEXT_DIM, ui::colors::TEXT_TERTIARY));
connect(compute_btn_, &QPushButton::clicked, this, &EquityTalippTab::on_compute_clicked);
cl->addWidget(compute_btn_);
vl->addWidget(ctrl_frame);
@@ -283,13 +284,13 @@ void EquityTalippTab::build_ui() {
auto* ew_icon = new QLabel("◈");
ew_icon->setAlignment(Qt::AlignCenter);
- ew_icon->setStyleSheet("color:#374151; font-size:32px; background:transparent; border:0;");
+ ew_icon->setStyleSheet(QString("color:%1; font-size:32px; background:transparent; border:0;").arg(ui::colors::TEXT_DIM));
status_label_ = new QLabel("Select an indicator and click CALCULATE");
status_label_->setAlignment(Qt::AlignCenter);
- status_label_->setStyleSheet("color:#6b7280; font-size:13px; background:transparent; border:0;");
+ status_label_->setStyleSheet(QString("color:%1; font-size:13px; background:transparent; border:0;").arg(ui::colors::TEXT_TERTIARY));
auto* ew_sub = new QLabel("50+ indicators across 6 categories — powered by TALIpp incremental engine");
ew_sub->setAlignment(Qt::AlignCenter);
- ew_sub->setStyleSheet("color:#374151; font-size:10px; background:transparent; border:0;");
+ ew_sub->setStyleSheet(QString("color:%1; font-size:10px; background:transparent; border:0;").arg(ui::colors::TEXT_DIM));
ew_vl->addWidget(ew_icon);
ew_vl->addWidget(status_label_);
ew_vl->addWidget(ew_sub);
@@ -334,7 +335,7 @@ void EquityTalippTab::on_category_clicked(const QString& cat_id) {
it.value()->setStyleSheet(QString("QPushButton { background:%1; color:%2; border:1px solid %3; "
"padding:5px 14px; font-size:10px; font-weight:700; }"
"QPushButton:hover { border-color:%3; }")
- .arg(active ? color : "transparent", active ? ui::colors::BG_BASE() : "#6b7280",
+ .arg(active ? color : "transparent", active ? ui::colors::BG_BASE() : ui::colors::TEXT_TERTIARY(),
active ? color : ui::colors::BORDER_DIM));
}
@@ -382,7 +383,7 @@ void EquityTalippTab::rebuild_param_form(const QString& indicator_id) {
"padding:3px 6px; font-size:11px; }")
.arg(ui::colors::BG_BASE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM));
auto* lbl = new QLabel(name + ":");
- lbl->setStyleSheet("color:#9ca3af; font-size:10px; background:transparent; border:0;");
+ lbl->setStyleSheet(QString("color:%1; font-size:10px; background:transparent; border:0;").arg(ui::colors::TEXT_SECONDARY));
param_form_->addRow(lbl, spin);
}
}
@@ -435,8 +436,8 @@ void EquityTalippTab::rebuild_last_values(const QString& indicator_id, const QVe
wl->setContentsMargins(12, 8, 12, 8);
wl->setSpacing(2);
auto* l = new QLabel(lbl);
- l->setStyleSheet("color:#6b7280; font-size:9px; letter-spacing:0.5px; "
- "background:transparent; border:0;");
+ l->setStyleSheet(QString("color:%1; font-size:9px; letter-spacing:0.5px; "
+ "background:transparent; border:0;").arg(ui::colors::TEXT_TERTIARY));
auto* v = new QLabel(val);
v->setStyleSheet(QString("color:%1; font-size:15px; font-weight:700; font-family:monospace; "
"background:transparent; border:0;")
@@ -452,7 +453,7 @@ void EquityTalippTab::rebuild_last_values(const QString& indicator_id, const QVe
}
for (auto* spin : param_widget_->findChildren<QDoubleSpinBox*>())
- make_lv(spin->objectName().toUpper(), QString::number(spin->value(), 'f', 0), "#6b7280");
+ make_lv(spin->objectName().toUpper(), QString::number(spin->value(), 'f', 0), ui::colors::TEXT_TERTIARY());
hl->addStretch();
}
@@ -489,14 +490,14 @@ void EquityTalippTab::rebuild_chart(const QString& /*indicator_id*/, const QVect
auto* axisX = new QDateTimeAxis;
axisX->setFormat("MMM yy");
- axisX->setLabelsColor(QColor("#6b7280"));
+ axisX->setLabelsColor(QColor(ui::colors::TEXT_TERTIARY()));
axisX->setGridLineColor(QColor(ui::colors::BORDER_DIM()));
axisX->setLabelsFont(QFont("", 8));
chart->addAxis(axisX, Qt::AlignBottom);
series->attachAxis(axisX);
auto* axisY = new QValueAxis;
- axisY->setLabelsColor(QColor("#6b7280"));
+ axisY->setLabelsColor(QColor(ui::colors::TEXT_TERTIARY()));
axisY->setGridLineColor(QColor(ui::colors::BORDER_DIM()));
axisY->setLabelsFont(QFont("", 8));
chart->addAxis(axisY, Qt::AlignLeft);
diff --git a/fincept-qt/src/screens/equity_research/EquityTechnicalsTab.cpp b/fincept-qt/src/screens/equity_research/EquityTechnicalsTab.cpp
index 65b7a468a..6892fa7c3 100644
--- a/fincept-qt/src/screens/equity_research/EquityTechnicalsTab.cpp
+++ b/fincept-qt/src/screens/equity_research/EquityTechnicalsTab.cpp
@@ -2,6 +2,7 @@
#include "screens/equity_research/EquityTechnicalsTab.h"
#include "services/equity/EquityResearchService.h"
+#include "ui/theme/Theme.h"
#include <QFrame>
#include <QGridLayout>
@@ -12,18 +13,8 @@
namespace fincept::screens {
-// ── Bloomberg palette ────────────────────────────────────────────────────────
-static constexpr const char* BG = "#080808";
-static constexpr const char* SURFACE = "#0e0e0e";
-static constexpr const char* RAISED = "#141414";
-static constexpr const char* BORDER = "#1c1c1c";
-static constexpr const char* TXT1 = "#e5e5e5";
-static constexpr const char* TXT2 = "#a0a0a0";
-static constexpr const char* TXT3 = "#606060";
-static constexpr const char* AMBER = "#d97706";
-static constexpr const char* GREEN = "#22c55e";
+// ── Accent colors without a theme token ──────────────────────────────────────
static constexpr const char* LTGREEN = "#4ade80";
-static constexpr const char* RED = "#ef4444";
static constexpr const char* LTRED = "#f87171";
static constexpr const char* CYAN = "#22d3ee";
static constexpr const char* YELLOW = "#eab308";
@@ -47,10 +38,10 @@ QString EquityTechnicalsTab::signal_text(services::equity::TechSignal s) {
const char* EquityTechnicalsTab::signal_color(services::equity::TechSignal s) {
using S = services::equity::TechSignal;
switch (s) {
- case S::StrongBuy: return GREEN;
+ case S::StrongBuy: return ui::colors::POSITIVE;
case S::Buy: return LTGREEN;
case S::Sell: return LTRED;
- case S::StrongSell: return RED;
+ case S::StrongSell: return ui::colors::NEGATIVE;
default: return GRAY;
}
}
@@ -173,7 +164,7 @@ void EquityTechnicalsTab::set_symbol(const QString& symbol) {
// ── build_ui ─────────────────────────────────────────────────────────────────
void EquityTechnicalsTab::build_ui() {
- setStyleSheet(QString("background:%1;").arg(BG));
+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
loading_overlay_ = new ui::LoadingOverlay(this);
auto* outer = new QVBoxLayout(this);
@@ -196,17 +187,17 @@ void EquityTechnicalsTab::build_ui() {
// === RATING PANEL ===
auto* rating_panel = new QFrame;
rating_panel->setFixedWidth(260);
- rating_panel->setStyleSheet(QString("QFrame{background:%1;border:1px solid %2;border-radius:2px;}").arg(SURFACE, BORDER));
+ rating_panel->setStyleSheet(QString("QFrame{background:%1;border:1px solid %2;border-radius:2px;}").arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* rp_vl = new QVBoxLayout(rating_panel);
rp_vl->setContentsMargins(14, 10, 14, 10);
rp_vl->setSpacing(10);
auto* rp_title = new QLabel("TECHNICAL RATING");
- rp_title->setStyleSheet(QString("color:%1;font-size:12px;font-weight:700;letter-spacing:1px;background:transparent;border:0;").arg(AMBER));
+ rp_title->setStyleSheet(QString("color:%1;font-size:12px;font-weight:700;letter-spacing:1px;background:transparent;border:0;").arg(ui::colors::AMBER));
rp_vl->addWidget(rp_title);
auto* sep = new QFrame; sep->setFrameShape(QFrame::HLine); sep->setFixedHeight(1);
- sep->setStyleSheet(QString("background:%1;border:0;").arg(BORDER));
+ sep->setStyleSheet(QString("background:%1;border:0;").arg(ui::colors::BORDER_DIM));
rp_vl->addWidget(sep);
rating_label_ = new QLabel("\xe2\x80\x94");
@@ -222,7 +213,7 @@ void EquityTechnicalsTab::build_ui() {
gauge_bar_->setTextVisible(false);
gauge_bar_->setStyleSheet(QString(
"QProgressBar{background:%1;border:1px solid %2;border-radius:0;}"
- "QProgressBar::chunk{background:%3;}").arg(RED, BORDER, GREEN));
+ "QProgressBar::chunk{background:%3;}").arg(ui::colors::NEGATIVE, ui::colors::BORDER_DIM, ui::colors::POSITIVE));
rp_vl->addWidget(gauge_bar_);
// Signal counts — 5 columns
@@ -231,7 +222,7 @@ void EquityTechnicalsTab::build_ui() {
auto make_count = [&](const char* color, const QString& label, QLabel*& out) {
auto* w = new QWidget;
- w->setStyleSheet(QString("background:%1;border:0;").arg(RAISED));
+ w->setStyleSheet(QString("background:%1;border:0;").arg(ui::colors::BG_RAISED));
auto* cvl = new QVBoxLayout(w);
cvl->setContentsMargins(4, 4, 4, 4);
cvl->setSpacing(1);
@@ -241,22 +232,22 @@ void EquityTechnicalsTab::build_ui() {
out->setStyleSheet(QString("color:%1;font-size:16px;font-weight:700;background:transparent;border:0;").arg(color));
auto* lbl = new QLabel(label);
lbl->setAlignment(Qt::AlignCenter);
- lbl->setStyleSheet(QString("color:%1;font-size:8px;font-weight:600;letter-spacing:0.5px;background:transparent;border:0;").arg(TXT3));
+ lbl->setStyleSheet(QString("color:%1;font-size:8px;font-weight:600;letter-spacing:0.5px;background:transparent;border:0;").arg(ui::colors::TEXT_TERTIARY));
cvl->addWidget(out);
cvl->addWidget(lbl);
counts->addWidget(w, 1);
};
- make_count(GREEN, "STR.BUY", strong_buy_count_);
+ make_count(ui::colors::POSITIVE, "STR.BUY", strong_buy_count_);
make_count(LTGREEN, "BUY", buy_count_);
make_count(GRAY, "NEUTRAL", neutral_count_);
make_count(LTRED, "SELL", sell_count_);
- make_count(RED, "STR.SELL", strong_sell_count_);
+ make_count(ui::colors::NEGATIVE, "STR.SELL", strong_sell_count_);
rp_vl->addLayout(counts);
total_label_ = new QLabel("0 INDICATORS");
total_label_->setAlignment(Qt::AlignCenter);
- total_label_->setStyleSheet(QString("color:%1;font-size:10px;letter-spacing:1px;background:transparent;border:0;").arg(TXT3));
+ total_label_->setStyleSheet(QString("color:%1;font-size:10px;letter-spacing:1px;background:transparent;border:0;").arg(ui::colors::TEXT_TERTIARY));
rp_vl->addWidget(total_label_);
rp_vl->addStretch();
@@ -264,7 +255,7 @@ void EquityTechnicalsTab::build_ui() {
// === KEY INDICATORS PANEL ===
auto* key_panel = new QFrame;
- key_panel->setStyleSheet(QString("QFrame{background:%1;border:1px solid %2;border-radius:2px;}").arg(SURFACE, BORDER));
+ key_panel->setStyleSheet(QString("QFrame{background:%1;border:1px solid %2;border-radius:2px;}").arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* kp_vl = new QVBoxLayout(key_panel);
kp_vl->setContentsMargins(10, 10, 10, 10);
kp_vl->setSpacing(6);
@@ -274,7 +265,7 @@ void EquityTechnicalsTab::build_ui() {
kp_vl->addWidget(kp_title);
auto* ksep = new QFrame; ksep->setFrameShape(QFrame::HLine); ksep->setFixedHeight(1);
- ksep->setStyleSheet(QString("background:%1;border:0;").arg(BORDER));
+ ksep->setStyleSheet(QString("background:%1;border:0;").arg(ui::colors::BORDER_DIM));
kp_vl->addWidget(ksep);
key_container_ = new QWidget;
@@ -370,21 +361,21 @@ void EquityTechnicalsTab::populate(const services::equity::TechnicalsData& data)
auto* card = new QFrame;
const char* sc = signal_color(ti.signal);
card->setStyleSheet(QString("QFrame{background:%1;border:1px solid %2;border-left:3px solid %3;border-radius:2px;}")
- .arg(RAISED, BORDER, sc));
+ .arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM, sc));
auto* cl = new QVBoxLayout(card);
cl->setContentsMargins(10, 6, 10, 6);
cl->setSpacing(2);
// Name
auto* nm = new QLabel(ti.name.toUpper());
- nm->setStyleSheet(QString("color:%1;font-size:10px;font-weight:600;letter-spacing:0.5px;background:transparent;border:0;").arg(TXT2));
+ nm->setStyleSheet(QString("color:%1;font-size:10px;font-weight:600;letter-spacing:0.5px;background:transparent;border:0;").arg(ui::colors::TEXT_SECONDARY));
cl->addWidget(nm);
// Value + signal row
auto* vr = new QHBoxLayout;
vr->setSpacing(8);
auto* val = new QLabel(QString::number(ti.value, 'f', 2));
- val->setStyleSheet(QString("color:%1;font-size:16px;font-weight:700;font-family:'Consolas',monospace;background:transparent;border:0;").arg(TXT1));
+ val->setStyleSheet(QString("color:%1;font-size:16px;font-weight:700;font-family:'Consolas',monospace;background:transparent;border:0;").arg(ui::colors::TEXT_PRIMARY));
auto* sig = new QLabel(signal_text(ti.signal));
sig->setStyleSheet(QString("color:%1;font-size:10px;font-weight:700;background:transparent;border:0;").arg(sc));
sig->setAlignment(Qt::AlignRight | Qt::AlignBottom);
@@ -400,7 +391,7 @@ void EquityTechnicalsTab::populate(const services::equity::TechnicalsData& data)
if (!interp.isEmpty()) {
auto* desc = new QLabel(interp);
desc->setWordWrap(true);
- desc->setStyleSheet(QString("color:%1;font-size:10px;background:transparent;border:0;").arg(TXT3));
+ desc->setStyleSheet(QString("color:%1;font-size:10px;background:transparent;border:0;").arg(ui::colors::TEXT_TERTIARY));
cl->addWidget(desc);
}
@@ -419,7 +410,7 @@ void EquityTechnicalsTab::populate(const services::equity::TechnicalsData& data)
};
QList<CatDef> cats = {
{"TREND INDICATORS", &data.trend, CYAN},
- {"MOMENTUM INDICATORS", &data.momentum, GREEN},
+ {"MOMENTUM INDICATORS", &data.momentum, ui::colors::POSITIVE},
{"VOLATILITY INDICATORS", &data.volatility, YELLOW},
{"VOLUME INDICATORS", &data.volume, BLUE},
};
@@ -437,14 +428,14 @@ void EquityTechnicalsTab::populate(const services::equity::TechnicalsData& data)
}
auto* section = new QFrame;
- section->setStyleSheet(QString("QFrame{background:%1;border:1px solid %2;border-radius:2px;}").arg(SURFACE, BORDER));
+ section->setStyleSheet(QString("QFrame{background:%1;border:1px solid %2;border-radius:2px;}").arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* svl = new QVBoxLayout(section);
svl->setContentsMargins(0, 0, 0, 0);
svl->setSpacing(0);
// Header
auto* hdr = new QWidget;
- hdr->setStyleSheet(QString("background:%1;border:0;border-bottom:1px solid %2;").arg(RAISED, BORDER));
+ hdr->setStyleSheet(QString("background:%1;border:0;border-bottom:1px solid %2;").arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM));
auto* hl = new QHBoxLayout(hdr);
hl->setContentsMargins(12, 8, 12, 8);
hl->setSpacing(10);
@@ -454,7 +445,7 @@ void EquityTechnicalsTab::populate(const services::equity::TechnicalsData& data)
hl->addWidget(htitle);
auto* cnt = new QLabel(QString("%1 indicators").arg(cat.inds->size()));
- cnt->setStyleSheet(QString("color:%1;font-size:10px;background:transparent;border:0;").arg(TXT3));
+ cnt->setStyleSheet(QString("color:%1;font-size:10px;background:transparent;border:0;").arg(ui::colors::TEXT_TERTIARY));
hl->addWidget(cnt);
hl->addStretch();
@@ -464,15 +455,15 @@ void EquityTechnicalsTab::populate(const services::equity::TechnicalsData& data)
badge->setStyleSheet(QString("color:%1;font-size:10px;font-weight:700;padding:2px 6px;background:transparent;border:0;").arg(color));
hl->addWidget(badge);
};
- add_badge(cb, "BUY", GREEN);
+ add_badge(cb, "BUY", ui::colors::POSITIVE);
add_badge(cn, "HOLD", GRAY);
- add_badge(cs, "SELL", RED);
+ add_badge(cs, "SELL", ui::colors::NEGATIVE);
svl->addWidget(hdr);
// Table header
auto* tbl_hdr = new QWidget;
- tbl_hdr->setStyleSheet(QString("background:%1;border:0;border-bottom:1px solid %2;").arg(BG, BORDER));
+ tbl_hdr->setStyleSheet(QString("background:%1;border:0;border-bottom:1px solid %2;").arg(ui::colors::BG_BASE, ui::colors::BORDER_DIM));
auto* thl = new QHBoxLayout(tbl_hdr);
thl->setContentsMargins(12, 4, 12, 4);
thl->setSpacing(0);
@@ -480,7 +471,7 @@ void EquityTechnicalsTab::populate(const services::equity::TechnicalsData& data)
auto hdr_lbl = [&](const QString& text, int stretch, Qt::Alignment align = Qt::AlignLeft) {
auto* l = new QLabel(text);
l->setAlignment(align | Qt::AlignVCenter);
- l->setStyleSheet(QString("color:%1;font-size:10px;font-weight:600;letter-spacing:0.5px;background:transparent;border:0;").arg(TXT3));
+ l->setStyleSheet(QString("color:%1;font-size:10px;font-weight:600;letter-spacing:0.5px;background:transparent;border:0;").arg(ui::colors::TEXT_TERTIARY));
thl->addWidget(l, stretch);
};
hdr_lbl("INDICATOR", 2);
@@ -496,20 +487,20 @@ void EquityTechnicalsTab::populate(const services::equity::TechnicalsData& data)
auto* row = new QWidget;
row->setStyleSheet(QString("background:%1;border:0;border-bottom:1px solid %2;")
- .arg(alt ? RAISED : BG, BORDER));
+ .arg(alt ? ui::colors::BG_RAISED : ui::colors::BG_BASE, ui::colors::BORDER_DIM));
auto* rl = new QHBoxLayout(row);
rl->setContentsMargins(12, 5, 12, 5);
rl->setSpacing(0);
// Name
auto* name_lbl = new QLabel(ti.name);
- name_lbl->setStyleSheet(QString("color:%1;font-size:12px;font-weight:600;background:transparent;border:0;").arg(TXT1));
+ name_lbl->setStyleSheet(QString("color:%1;font-size:12px;font-weight:600;background:transparent;border:0;").arg(ui::colors::TEXT_PRIMARY));
rl->addWidget(name_lbl, 2);
// Value
auto* val_lbl = new QLabel(QString::number(ti.value, 'f', 4));
val_lbl->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
- val_lbl->setStyleSheet(QString("color:%1;font-size:12px;font-family:'Consolas',monospace;background:transparent;border:0;").arg(TXT2));
+ val_lbl->setStyleSheet(QString("color:%1;font-size:12px;font-family:'Consolas',monospace;background:transparent;border:0;").arg(ui::colors::TEXT_SECONDARY));
rl->addWidget(val_lbl, 1);
// Signal badge
@@ -522,7 +513,7 @@ void EquityTechnicalsTab::populate(const services::equity::TechnicalsData& data)
sig_lbl->setAlignment(Qt::AlignCenter);
sig_lbl->setFixedWidth(90);
sig_lbl->setStyleSheet(QString("color:%1;font-size:10px;font-weight:700;background:%2;"
- "border-radius:2px;padding:2px 6px;border:0;").arg(sc, RAISED));
+ "border-radius:2px;padding:2px 6px;border:0;").arg(sc, ui::colors::BG_RAISED));
sig_hl->addWidget(sig_lbl);
rl->addWidget(sig_w, 1);
@@ -544,7 +535,7 @@ void EquityTechnicalsTab::populate(const services::equity::TechnicalsData& data)
QString interp = interpretation(col_key, ti.value);
auto* interp_lbl = new QLabel(interp.isEmpty() ? "\xe2\x80\x94" : interp);
interp_lbl->setWordWrap(true);
- interp_lbl->setStyleSheet(QString("color:%1;font-size:11px;background:transparent;border:0;").arg(TXT3));
+ interp_lbl->setStyleSheet(QString("color:%1;font-size:11px;background:transparent;border:0;").arg(ui::colors::TEXT_TERTIARY));
rl->addWidget(interp_lbl, 3);
svl->addWidget(row);
diff --git a/fincept-qt/src/screens/equity_trading/EquityBottomPanel.cpp b/fincept-qt/src/screens/equity_trading/EquityBottomPanel.cpp
index 3a9ccd259..75c479dca 100644
--- a/fincept-qt/src/screens/equity_trading/EquityBottomPanel.cpp
+++ b/fincept-qt/src/screens/equity_trading/EquityBottomPanel.cpp
@@ -225,13 +225,13 @@ void EquityBottomPanel::set_paper_trades(const QVector<trading::PtTrade>& trades
void EquityBottomPanel::set_paper_stats(const trading::PtStats& stats) {
stat_values_[0]->setText(QString::number(stats.total_pnl, 'f', 2));
- stat_values_[0]->setStyleSheet(QString("color: %1;").arg(stats.total_pnl >= 0 ? "#16a34a" : "#dc2626"));
+ stat_values_[0]->setStyleSheet(QString("color: %1;").arg(stats.total_pnl >= 0 ? fincept::ui::colors::POSITIVE() : fincept::ui::colors::NEGATIVE()));
stat_values_[1]->setText(QString("%1%").arg(stats.win_rate * 100, 0, 'f', 1));
stat_values_[2]->setText(QString::number(stats.total_trades));
stat_values_[3]->setText(QString::number(stats.largest_win, 'f', 2));
- stat_values_[3]->setStyleSheet("color: #16a34a;");
+ stat_values_[3]->setStyleSheet(QString("color: %1;").arg(fincept::ui::colors::POSITIVE));
stat_values_[4]->setText(QString::number(stats.largest_loss, 'f', 2));
- stat_values_[4]->setStyleSheet("color: #dc2626;");
+ stat_values_[4]->setStyleSheet(QString("color: %1;").arg(fincept::ui::colors::NEGATIVE));
}
void EquityBottomPanel::set_positions(const QVector<trading::BrokerPosition>& positions) {
@@ -292,9 +292,10 @@ void EquityBottomPanel::set_orders(const QVector<trading::BrokerOrderInfo>& orde
auto* btn = new QPushButton("EDIT");
btn->setObjectName("eqTableBtn");
btn->setFixedHeight(18);
- btn->setStyleSheet("QPushButton#eqTableBtn { background: rgba(217,119,6,0.15); "
- "color: #d97706; border: 1px solid #92400e; font-size: 10px; "
- "padding: 0 6px; border-radius: 2px; }");
+ btn->setStyleSheet(QString("QPushButton#eqTableBtn { background: rgba(217,119,6,0.15); "
+ "color: %1; border: 1px solid %2; font-size: 10px; "
+ "padding: 0 6px; border-radius: 2px; }")
+ .arg(fincept::ui::colors::AMBER).arg(fincept::ui::colors::AMBER_DIM));
btn->setCursor(Qt::PointingHandCursor);
const QString oid = o.order_id;
const double qty = o.quantity;
@@ -304,12 +305,15 @@ void EquityBottomPanel::set_orders(const QVector<trading::BrokerOrderInfo>& orde
auto* dlg = new QDialog(this);
dlg->setWindowTitle("Modify Order");
dlg->setFixedWidth(280);
- dlg->setStyleSheet("QDialog { background: #0a0a0a; color: #e5e5e5; }"
- "QLabel { color: #808080; font-size: 11px; }"
- "QLineEdit { background: #080808; border: 1px solid #222; "
- " color: #e5e5e5; padding: 5px; border-radius: 2px; }"
- "QLineEdit:focus { border-color: #d97706; }"
- "QPushButton { padding: 6px 14px; font-weight: 700; border-radius: 2px; }");
+ dlg->setStyleSheet(QString("QDialog { background: %1; color: %2; }"
+ "QLabel { color: %3; font-size: 11px; }"
+ "QLineEdit { background: %4; border: 1px solid %5; "
+ " color: %2; padding: 5px; border-radius: 2px; }"
+ "QLineEdit:focus { border-color: %6; }"
+ "QPushButton { padding: 6px 14px; font-weight: 700; border-radius: 2px; }")
+ .arg(fincept::ui::colors::BG_SURFACE).arg(fincept::ui::colors::TEXT_PRIMARY)
+ .arg(fincept::ui::colors::TEXT_SECONDARY).arg(fincept::ui::colors::BG_BASE)
+ .arg(fincept::ui::colors::BORDER_MED).arg(fincept::ui::colors::AMBER));
auto* vlay = new QVBoxLayout(dlg);
vlay->setSpacing(6);
vlay->setContentsMargins(14, 14, 14, 14);
@@ -321,9 +325,11 @@ void EquityBottomPanel::set_orders(const QVector<trading::BrokerOrderInfo>& orde
auto* btn_row = new QHBoxLayout;
auto* ok_btn = new QPushButton("MODIFY");
- ok_btn->setStyleSheet("background: rgba(217,119,6,0.15); color: #d97706; border: 1px solid #92400e;");
+ ok_btn->setStyleSheet(QString("background: rgba(217,119,6,0.15); color: %1; border: 1px solid %2;")
+ .arg(fincept::ui::colors::AMBER).arg(fincept::ui::colors::AMBER_DIM));
auto* cancel_btn = new QPushButton("CANCEL");
- cancel_btn->setStyleSheet("background: rgba(220,38,38,0.1); color: #dc2626; border: 1px solid #7f1d1d;");
+ cancel_btn->setStyleSheet(QString("background: rgba(220,38,38,0.1); color: %1; border: 1px solid %2;")
+ .arg(fincept::ui::colors::NEGATIVE).arg(fincept::ui::colors::NEGATIVE_DIM));
connect(ok_btn, &QPushButton::clicked, dlg, [dlg, this, oid, qty_edit, prc_edit]() {
const double new_qty = qty_edit->text().toDouble();
@@ -383,9 +389,9 @@ void EquityBottomPanel::set_auctions(const QVector<trading::BrokerAuction>& auct
const int row = auctions_table_->rowCount();
auctions_table_->insertRow(row);
const bool is_open = (entry.auction_type == "O");
- const QColor type_color = is_open ? QColor("#d97706") : QColor("#3b82f6");
+ const QColor type_color = is_open ? QColor(fincept::ui::colors::AMBER()) : QColor(fincept::ui::colors::INFO());
- auto set = [&](int col, const QString& text, const QColor& fg = QColor("#e5e5e5")) {
+ auto set = [&](int col, const QString& text, const QColor& fg = QColor(fincept::ui::colors::TEXT_PRIMARY())) {
auto* item = new QTableWidgetItem(text);
item->setForeground(fg);
item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
@@ -394,12 +400,12 @@ void EquityBottomPanel::set_auctions(const QVector<trading::BrokerAuction>& auct
const QString time_str = QDateTime::fromString(entry.timestamp, Qt::ISODateWithMs)
.toLocalTime().toString("hh:mm:ss");
- set(0, auction.date, QColor("#737373"));
+ set(0, auction.date, QColor(fincept::ui::colors::TEXT_SECONDARY()));
set(1, is_open ? "OPEN" : "CLOSE", type_color);
- set(2, time_str, QColor("#737373"));
+ set(2, time_str, QColor(fincept::ui::colors::TEXT_SECONDARY()));
set(3, QString::number(entry.price, 'f', 2));
- set(4, QString::number(entry.size, 'f', 0), QColor("#a3a3a3"));
- set(5, entry.exchange, QColor("#737373"));
+ set(4, QString::number(entry.size, 'f', 0), QColor(fincept::ui::colors::TEXT_SECONDARY()));
+ set(5, entry.exchange, QColor(fincept::ui::colors::TEXT_SECONDARY()));
}
}
auctions_table_->setUpdatesEnabled(true);
@@ -433,23 +439,23 @@ static void fill_trade_row(QTableWidget* table, int row, const trading::BrokerTr
const QString time_str = QDateTime::fromString(t.timestamp, Qt::ISODateWithMs)
.toLocalTime().toString("hh:mm:ss.zzz");
- auto set = [&](int col, const QString& text, const QColor& fg = QColor("#e5e5e5")) {
+ auto set = [&](int col, const QString& text, const QColor& fg = QColor(fincept::ui::colors::TEXT_PRIMARY())) {
auto* item = new QTableWidgetItem(text);
item->setForeground(fg);
item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
table->setItem(row, col, item);
};
- set(0, time_str.isEmpty() ? t.timestamp.right(12) : time_str, QColor("#737373"));
+ set(0, time_str.isEmpty() ? t.timestamp.right(12) : time_str, QColor(fincept::ui::colors::TEXT_SECONDARY()));
set(1, QString::number(t.price, 'f', 2),
- t.price > 0 ? QColor("#e5e5e5") : QColor("#737373"));
- set(2, QString::number(t.size, 'f', 0), QColor("#a3a3a3"));
- set(3, t.exchange, QColor("#737373"));
+ t.price > 0 ? QColor(fincept::ui::colors::TEXT_PRIMARY()) : QColor(fincept::ui::colors::TEXT_SECONDARY()));
+ set(2, QString::number(t.size, 'f', 0), QColor(fincept::ui::colors::TEXT_SECONDARY()));
+ set(3, t.exchange, QColor(fincept::ui::colors::TEXT_SECONDARY()));
QStringList decoded;
for (const auto& c : t.conditions)
decoded.append(codes.contains(c) ? codes[c] : c);
- set(4, decoded.join(", "), QColor("#525252"));
- set(5, t.tape, QColor("#525252"));
+ set(4, decoded.join(", "), QColor(fincept::ui::colors::TEXT_TERTIARY()));
+ set(5, t.tape, QColor(fincept::ui::colors::TEXT_TERTIARY()));
}
void EquityBottomPanel::set_time_sales(const QVector<trading::BrokerTrade>& trades) {
@@ -483,18 +489,19 @@ void EquityBottomPanel::setup_calendar_tab() {
auto* banner = new QWidget;
banner->setObjectName("calClockBanner");
banner->setFixedHeight(28);
- banner->setStyleSheet("QWidget#calClockBanner { background: #0d0d0d; border-bottom: 1px solid #1a1a1a; }");
+ banner->setStyleSheet(QString("QWidget#calClockBanner { background: %1; border-bottom: 1px solid %2; }")
+ .arg(fincept::ui::colors::BG_BASE).arg(fincept::ui::colors::BORDER_DIM));
auto* banner_lay = new QHBoxLayout(banner);
banner_lay->setContentsMargins(10, 0, 10, 0);
banner_lay->setSpacing(16);
clock_status_label_ = new QLabel("● MARKET --");
clock_status_label_->setObjectName("calClockStatus");
- clock_status_label_->setStyleSheet("color: #525252; font-size: 11px; font-weight: 700;");
+ clock_status_label_->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: 700;").arg(fincept::ui::colors::TEXT_TERTIARY));
clock_next_label_ = new QLabel("");
clock_next_label_->setObjectName("calClockNext");
- clock_next_label_->setStyleSheet("color: #525252; font-size: 10px;");
+ clock_next_label_->setStyleSheet(QString("color: %1; font-size: 10px;").arg(fincept::ui::colors::TEXT_TERTIARY));
banner_lay->addWidget(clock_status_label_);
banner_lay->addWidget(clock_next_label_);
@@ -532,7 +539,7 @@ void EquityBottomPanel::set_calendar(const QVector<trading::MarketCalendarDay>&
auto* item = ensure_item(calendar_table_, i, col);
item->setText(text);
if (is_today) {
- item->setForeground(QColor("#d97706"));
+ item->setForeground(QColor(fincept::ui::colors::AMBER()));
item->setBackground(row_color);
}
};
@@ -557,10 +564,10 @@ void EquityBottomPanel::set_clock(const trading::MarketClock& clock) {
if (clock.is_open) {
clock_status_label_->setText("● MARKET OPEN");
- clock_status_label_->setStyleSheet("color: #16a34a; font-size: 11px; font-weight: 700;");
+ clock_status_label_->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: 700;").arg(fincept::ui::colors::POSITIVE));
} else {
clock_status_label_->setText("● MARKET CLOSED");
- clock_status_label_->setStyleSheet("color: #dc2626; font-size: 11px; font-weight: 700;");
+ clock_status_label_->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: 700;").arg(fincept::ui::colors::NEGATIVE));
}
// Parse ISO timestamps and show local-friendly next event
@@ -573,7 +580,7 @@ void EquityBottomPanel::set_clock(const trading::MarketClock& clock) {
QDateTime::fromString(clock.next_open, Qt::ISODateWithMs)
.toLocalTime().toString("MMM d h:mm ap"));
clock_next_label_->setText(next_event);
- clock_next_label_->setStyleSheet("color: #737373; font-size: 10px;");
+ clock_next_label_->setStyleSheet(QString("color: %1; font-size: 10px;").arg(fincept::ui::colors::TEXT_SECONDARY));
}
}
diff --git a/fincept-qt/src/screens/equity_trading/EquityCredentials.cpp b/fincept-qt/src/screens/equity_trading/EquityCredentials.cpp
index 3aabba43f..dcaa01a15 100644
--- a/fincept-qt/src/screens/equity_trading/EquityCredentials.cpp
+++ b/fincept-qt/src/screens/equity_trading/EquityCredentials.cpp
@@ -2,6 +2,7 @@
#include "screens/equity_trading/EquityCredentials.h"
#include "trading/BrokerRegistry.h"
+#include "ui/theme/Theme.h"
#include <QHBoxLayout>
#include <QJsonDocument>
@@ -11,6 +12,8 @@
namespace fincept::screens::equity {
+using namespace fincept::ui;
+
// ── helpers ──────────────────────────────────────────────────────────────────
static QGroupBox* make_section(const QString& title, const QString& color) {
@@ -44,21 +47,26 @@ EquityCredentials::EquityCredentials(const QString& broker_id,
setWindowTitle(QString("Connect — %1").arg(profile.display_name));
setMinimumWidth(420);
- setStyleSheet(
- "QDialog { background: #0a0a0a; color: #e5e5e5; }"
- "QLabel#fieldLabel { color: #808080; font-size: 11px; font-weight: 700; }"
- "QLabel#titleLabel { color: #d97706; font-size: 14px; font-weight: 700; }"
- "QLabel#infoLabel { color: #525252; font-size: 10px; }"
- "QLabel#savedLabel { color: #16a34a; font-size: 10px; font-weight: 700; }"
- "QLineEdit { background: #080808; border: 1px solid #222222; color: #e5e5e5;"
+ setStyleSheet(QString(
+ "QDialog { background: %1; color: %2; }"
+ "QLabel#fieldLabel { color: %3; font-size: 11px; font-weight: 700; }"
+ "QLabel#titleLabel { color: %4; font-size: 14px; font-weight: 700; }"
+ "QLabel#infoLabel { color: %5; font-size: 10px; }"
+ "QLabel#savedLabel { color: %6; font-size: 10px; font-weight: 700; }"
+ "QLineEdit { background: %7; border: 1px solid %8; color: %2;"
" padding: 6px; font-size: 12px; border-radius: 2px; }"
- "QLineEdit:focus { border-color: #d97706; }"
- "QComboBox { background: #080808; border: 1px solid #222222; color: #e5e5e5;"
+ "QLineEdit:focus { border-color: %4; }"
+ "QComboBox { background: %7; border: 1px solid %8; color: %2;"
" padding: 4px 6px; font-size: 12px; }"
"QComboBox::drop-down { border: none; }"
- "QComboBox QAbstractItemView { background: #111111; color: #e5e5e5;"
+ "QComboBox QAbstractItemView { background: %9; color: %2;"
" selection-background-color: rgba(217,119,6,0.3); }"
- "QPushButton { padding: 8px 16px; font-weight: 700; font-size: 12px; border-radius: 2px; }");
+ "QPushButton { padding: 8px 16px; font-weight: 700; font-size: 12px; border-radius: 2px; }")
+ .arg(colors::BG_SURFACE).arg(colors::TEXT_PRIMARY)
+ .arg(colors::TEXT_SECONDARY).arg(colors::AMBER)
+ .arg(colors::TEXT_TERTIARY).arg(colors::POSITIVE)
+ .arg(colors::BG_BASE).arg(colors::BORDER_MED)
+ .arg(colors::BG_RAISED));
auto* root = new QVBoxLayout(this);
root->setSpacing(8);
@@ -87,7 +95,7 @@ EquityCredentials::EquityCredentials(const QString& broker_id,
cols->setSpacing(12);
// --- LIVE section ---
- auto* live_box = make_section("LIVE ACCOUNT", "#d97706");
+ auto* live_box = make_section("LIVE ACCOUNT", colors::AMBER.get());
auto* live_lay = new QVBoxLayout(live_box);
live_lay->setSpacing(4);
@@ -104,15 +112,17 @@ EquityCredentials::EquityCredentials(const QString& broker_id,
live_lay->addWidget(live_status_);
auto* live_btn = new QPushButton("CONNECT LIVE");
- live_btn->setStyleSheet(
- "background: rgba(217,119,6,0.15); color: #d97706; border: 1px solid #92400e;");
+ live_btn->setStyleSheet(QString(
+ "background: rgba(217,119,6,0.15); color: %1; border: 1px solid %2;")
+ .arg(colors::AMBER).arg(colors::AMBER_DIM));
live_btn->setCursor(Qt::PointingHandCursor);
connect(live_btn, &QPushButton::clicked, this, [this]() { on_connect("live"); });
live_lay->addWidget(live_btn);
auto* live_clear = new QPushButton("CLEAR");
- live_clear->setStyleSheet(
- "background: rgba(220,38,38,0.1); color: #dc2626; border: 1px solid #7f1d1d;");
+ live_clear->setStyleSheet(QString(
+ "background: rgba(220,38,38,0.1); color: %1; border: 1px solid %2;")
+ .arg(colors::NEGATIVE).arg(colors::NEGATIVE_DIM));
live_clear->setCursor(Qt::PointingHandCursor);
connect(live_clear, &QPushButton::clicked, this, [this]() { on_clear("live"); });
live_lay->addWidget(live_clear);
@@ -142,8 +152,9 @@ EquityCredentials::EquityCredentials(const QString& broker_id,
paper_lay->addWidget(paper_btn);
auto* paper_clear = new QPushButton("CLEAR");
- paper_clear->setStyleSheet(
- "background: rgba(220,38,38,0.1); color: #dc2626; border: 1px solid #7f1d1d;");
+ paper_clear->setStyleSheet(QString(
+ "background: rgba(220,38,38,0.1); color: %1; border: 1px solid %2;")
+ .arg(colors::NEGATIVE).arg(colors::NEGATIVE_DIM));
paper_clear->setCursor(Qt::PointingHandCursor);
connect(paper_clear, &QPushButton::clicked, this, [this]() { on_clear("paper"); });
paper_lay->addWidget(paper_clear);
@@ -227,14 +238,16 @@ EquityCredentials::EquityCredentials(const QString& broker_id,
root->addSpacing(4);
auto* btn_row = new QHBoxLayout;
auto* save_btn = new QPushButton("CONNECT");
- save_btn->setStyleSheet(
- "background: rgba(217,119,6,0.15); color: #d97706; border: 1px solid #92400e;");
+ save_btn->setStyleSheet(QString(
+ "background: rgba(217,119,6,0.15); color: %1; border: 1px solid %2;")
+ .arg(colors::AMBER).arg(colors::AMBER_DIM));
save_btn->setCursor(Qt::PointingHandCursor);
connect(save_btn, &QPushButton::clicked, this, [this]() { on_connect(""); });
auto* clear_btn = new QPushButton("CLEAR");
- clear_btn->setStyleSheet(
- "background: rgba(220,38,38,0.1); color: #dc2626; border: 1px solid #7f1d1d;");
+ clear_btn->setStyleSheet(QString(
+ "background: rgba(220,38,38,0.1); color: %1; border: 1px solid %2;")
+ .arg(colors::NEGATIVE).arg(colors::NEGATIVE_DIM));
clear_btn->setCursor(Qt::PointingHandCursor);
connect(clear_btn, &QPushButton::clicked, this, [this]() { on_clear(""); });
@@ -281,18 +294,18 @@ void EquityCredentials::on_connect(const QString& env) {
if (key.isEmpty()) {
status_label_->setText("API Key is required");
- status_label_->setStyleSheet("color: #dc2626;");
+ status_label_->setStyleSheet(QString("color: %1;").arg(colors::NEGATIVE));
return;
}
if (secret.isEmpty() && (field_secret_ || field_live_secret_ || field_paper_secret_)) {
status_label_->setText("API Secret is required");
- status_label_->setStyleSheet("color: #dc2626;");
+ status_label_->setStyleSheet(QString("color: %1;").arg(colors::NEGATIVE));
return;
}
emit credentials_saved(broker_id_, key, secret, auth);
status_label_->setText("Connecting...");
- status_label_->setStyleSheet("color: #ca8a04;");
+ status_label_->setStyleSheet(QString("color: %1;").arg(colors::WARNING));
// Don't close — let the screen update the status label and close when done
}
@@ -311,7 +324,7 @@ void EquityCredentials::on_clear(const QString& env) {
if (field_auth_) field_auth_->clear();
}
status_label_->setText("Cleared");
- status_label_->setStyleSheet("color: #ca8a04;");
+ status_label_->setStyleSheet(QString("color: %1;").arg(colors::WARNING));
}
void EquityCredentials::mark_connected(const QString& env, const QString& account_id) {
@@ -322,12 +335,12 @@ void EquityCredentials::mark_connected(const QString& env, const QString& accoun
paper_status_->setText(label);
}
status_label_->setText("Connected successfully");
- status_label_->setStyleSheet("color: #16a34a;");
+ status_label_->setStyleSheet(QString("color: %1;").arg(colors::POSITIVE));
}
void EquityCredentials::mark_error(const QString& error) {
status_label_->setText(QString("Error: %1").arg(error));
- status_label_->setStyleSheet("color: #dc2626;");
+ status_label_->setStyleSheet(QString("color: %1;").arg(colors::NEGATIVE));
}
} // namespace fincept::screens::equity
diff --git a/fincept-qt/src/screens/equity_trading/EquityOrderBook.cpp b/fincept-qt/src/screens/equity_trading/EquityOrderBook.cpp
index 7440e16f5..70d405bf5 100644
--- a/fincept-qt/src/screens/equity_trading/EquityOrderBook.cpp
+++ b/fincept-qt/src/screens/equity_trading/EquityOrderBook.cpp
@@ -25,6 +25,7 @@ namespace fincept::screens::equity {
EquityOrderBook::EquityOrderBook(QWidget* parent) : QWidget(parent) {
setObjectName("eqOrderBook");
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed, this, [this]() { update(); });
auto* layout = new QVBoxLayout(this);
layout->setContentsMargins(0, 0, 0, 0);
@@ -146,7 +147,8 @@ void EquityOrderBook::rebuild_cache() {
// Depth bar
const double ratio = qty / max_qty;
const int bar_w = static_cast<int>(w * ratio * 0.4);
- p.fillRect(w - bar_w, y, bar_w, ROW_H, QColor(220, 38, 38, 25));
+ QColor sell_bar(color_sell()); sell_bar.setAlpha(25);
+ p.fillRect(w - bar_w, y, bar_w, ROW_H, sell_bar);
p.setPen(color_sell());
p.drawText(col_price, y, w / 2 - 8, ROW_H, Qt::AlignLeft | Qt::AlignVCenter, QString::number(price, 'f', 2));
@@ -163,7 +165,8 @@ void EquityOrderBook::rebuild_cache() {
const double ratio = qty / max_qty;
const int bar_w = static_cast<int>(w * ratio * 0.4);
- p.fillRect(w - bar_w, y, bar_w, ROW_H, QColor(22, 163, 74, 25));
+ QColor buy_bar(color_buy()); buy_bar.setAlpha(25);
+ p.fillRect(w - bar_w, y, bar_w, ROW_H, buy_bar);
p.setPen(color_buy());
p.drawText(col_price, y, w / 2 - 8, ROW_H, Qt::AlignLeft | Qt::AlignVCenter, QString::number(price, 'f', 2));
diff --git a/fincept-qt/src/screens/equity_trading/EquityOrderEntry.cpp b/fincept-qt/src/screens/equity_trading/EquityOrderEntry.cpp
index 129fc69a2..435ff472c 100644
--- a/fincept-qt/src/screens/equity_trading/EquityOrderEntry.cpp
+++ b/fincept-qt/src/screens/equity_trading/EquityOrderEntry.cpp
@@ -4,6 +4,7 @@
#include "core/logging/Logger.h"
#include "screens/equity_trading/EquityTypes.h"
#include "trading/BrokerRegistry.h"
+#include "ui/theme/Theme.h"
#include <QHBoxLayout>
#include <QMetaObject>
@@ -17,6 +18,8 @@
namespace fincept::screens::equity {
+using namespace fincept::ui;
+
EquityOrderEntry::EquityOrderEntry(QWidget* parent) : QWidget(parent) {
setObjectName("eqOrderEntry");
@@ -38,7 +41,7 @@ EquityOrderEntry::EquityOrderEntry(QWidget* parent) : QWidget(parent) {
mode_label_ = new QLabel("PAPER");
mode_label_->setObjectName("eqOeMode");
- mode_label_->setStyleSheet("color: #16a34a;");
+ mode_label_->setStyleSheet(QString("color: %1;").arg(colors::POSITIVE));
h_layout->addWidget(mode_label_);
layout->addWidget(header);
@@ -111,7 +114,7 @@ EquityOrderEntry::EquityOrderEntry(QWidget* parent) : QWidget(parent) {
// Brokerage info
brokerage_label_ = new QLabel("");
brokerage_label_->setObjectName("eqOeBrokerage");
- brokerage_label_->setStyleSheet("color: #525252; font-size: 10px;");
+ brokerage_label_->setStyleSheet(QString("color: %1; font-size: 10px;").arg(colors::TEXT_TERTIARY));
form->addWidget(brokerage_label_);
form->addSpacing(2);
@@ -325,7 +328,7 @@ void EquityOrderEntry::set_current_price(double price) {
void EquityOrderEntry::set_mode(bool is_paper) {
is_paper_ = is_paper;
mode_label_->setText(is_paper ? "PAPER" : "LIVE");
- mode_label_->setStyleSheet(QString("color: %1;").arg(is_paper ? "#16a34a" : "#dc2626"));
+ mode_label_->setStyleSheet(QString("color: %1;").arg(is_paper ? colors::POSITIVE() : colors::NEGATIVE()));
if (is_paper) margin_label_->hide();
}
@@ -348,7 +351,7 @@ void EquityOrderEntry::on_submit() {
const double qty = qty_edit_->text().toDouble();
if (qty <= 0) {
status_label_->setText("Enter a valid quantity");
- status_label_->setStyleSheet("color: #dc2626;");
+ status_label_->setStyleSheet(QString("color: %1;").arg(colors::NEGATIVE));
return;
}
@@ -379,7 +382,7 @@ void EquityOrderEntry::on_submit() {
void EquityOrderEntry::show_order_status(const QString& msg, bool success) {
status_label_->setText(msg);
- status_label_->setStyleSheet(success ? "color: #16a34a;" : "color: #dc2626;");
+ status_label_->setStyleSheet(QString("color: %1;").arg(success ? colors::POSITIVE() : colors::NEGATIVE()));
QTimer::singleShot(5000, status_label_, [this]() { status_label_->clear(); });
}
@@ -455,7 +458,7 @@ void EquityOrderEntry::fetch_margin_async() {
const QString sym = currency_symbol(self->current_currency_);
self->margin_label_->setText(
QString("Margin: %1%2").arg(sym).arg(m.total, 0, 'f', 2));
- self->margin_label_->setStyleSheet("color: #f59e0b; font-size: 10px;");
+ self->margin_label_->setStyleSheet(QString("color: %1; font-size: 10px;").arg(colors::AMBER));
self->margin_label_->show();
} else {
self->margin_label_->hide();
diff --git a/fincept-qt/src/screens/equity_trading/EquityTickerBar.cpp b/fincept-qt/src/screens/equity_trading/EquityTickerBar.cpp
index 9b294c7bc..7b70fc5ec 100644
--- a/fincept-qt/src/screens/equity_trading/EquityTickerBar.cpp
+++ b/fincept-qt/src/screens/equity_trading/EquityTickerBar.cpp
@@ -1,6 +1,8 @@
// EquityTickerBar.cpp — dense price ribbon with bid/ask/spread
#include "screens/equity_trading/EquityTickerBar.h"
+#include "ui/theme/Theme.h"
+
#include <QHBoxLayout>
#include <cmath>
@@ -74,7 +76,7 @@ void EquityTickerBar::update_quote(double ltp, double change, double change_pct,
if (positive != last_positive_) {
change_label_->setStyleSheet(
QString("color: %1; font-size: 12px; font-weight: 700; background: transparent; border: none;")
- .arg(positive ? "#16a34a" : "#dc2626"));
+ .arg(positive ? fincept::ui::colors::POSITIVE() : fincept::ui::colors::NEGATIVE()));
last_positive_ = positive;
}
diff --git a/fincept-qt/src/screens/equity_trading/EquityTradingScreen.cpp b/fincept-qt/src/screens/equity_trading/EquityTradingScreen.cpp
index aacfb4ea7..5edc6a927 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 "core/session/ScreenStateManager.h"
#include "services/workspace/WorkspaceManager.h"
#include "screens/equity_trading/EquityBottomPanel.h"
#include "screens/equity_trading/EquityChart.h"
@@ -19,6 +20,7 @@
#include "trading/UnifiedTrading.h"
#include "trading/websocket/AngelOneWebSocket.h"
#include "ui/theme/StyleSheets.h"
+#include "ui/theme/Theme.h"
#include <QCompleter>
#include <QDate>
@@ -97,6 +99,17 @@ EquityTradingScreen::~EquityTradingScreen() {
void EquityTradingScreen::showEvent(QShowEvent* event) {
QWidget::showEvent(event);
+ // Restore persisted session state on first show
+ if (!initialized_) {
+ const auto s = ScreenStateManager::instance().load_direct("equity_trading");
+ if (!s.isEmpty()) {
+ const QString broker = s.value("broker_id", broker_id_).toString();
+ const QString sym = s.value("selected_symbol", selected_symbol_).toString();
+ if (broker != broker_id_) on_broker_changed(broker);
+ if (sym != selected_symbol_) on_symbol_selected(sym);
+ }
+ }
+
// Start (or reconnect) WebSocket if available for this broker
if (ws_) {
if (!ws_->is_connected())
@@ -129,6 +142,11 @@ void EquityTradingScreen::hideEvent(QHideEvent* event) {
if (market_clock_timer_) market_clock_timer_->stop();
// Keep WebSocket connected in background — it will auto-reconnect on show
LOG_INFO(TAG, "Screen hidden — timers stopped");
+ ScreenStateManager::instance().save_direct("equity_trading", {
+ {"broker_id", broker_id_},
+ {"selected_symbol", selected_symbol_},
+ {"selected_exchange", selected_exchange_},
+ });
}
// ============================================================================
@@ -210,7 +228,7 @@ void EquityTradingScreen::setup_ui() {
// Connection status indicator
conn_label_ = new QLabel("○ NOT CONNECTED");
conn_label_->setObjectName("eqConnLabel");
- conn_label_->setStyleSheet("color: #525252; font-size: 10px; font-weight: 700;");
+ conn_label_->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: 700;").arg(ui::colors::TEXT_TERTIARY));
cmd_layout->addWidget(conn_label_);
// API button
@@ -356,7 +374,7 @@ void EquityTradingScreen::setup_timers() {
}
const QString env = env_str;
conn_label_->setText(QString("● %1%2").arg(acct, env));
- conn_label_->setStyleSheet("color: #16a34a; font-size: 10px; font-weight: 700;");
+ conn_label_->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: 700;").arg(ui::colors::POSITIVE));
async_fetch_positions();
async_fetch_holdings();
async_fetch_orders();
@@ -894,7 +912,7 @@ void EquityTradingScreen::on_broker_changed(const QString& broker) {
// Reset connection status, then check if credentials already saved
conn_label_->setText("○ NOT CONNECTED");
- conn_label_->setStyleSheet("color: #525252; font-size: 10px; font-weight: 700;");
+ conn_label_->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: 700;").arg(ui::colors::TEXT_TERTIARY));
// Update default watchlist based on broker region
auto* b = BrokerRegistry::instance().get(broker);
@@ -965,7 +983,7 @@ void EquityTradingScreen::on_broker_changed(const QString& broker) {
}
}
conn_label_->setText(QString("● %1%2").arg(acct, env_str));
- conn_label_->setStyleSheet("color: #16a34a; font-size: 10px; font-weight: 700;");
+ conn_label_->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: 700;").arg(ui::colors::POSITIVE));
async_fetch_positions();
async_fetch_holdings();
async_fetch_orders();
@@ -1044,7 +1062,7 @@ void EquityTradingScreen::handle_token_expired() {
return;
conn_label_->setText("⚠ TOKEN EXPIRED");
- conn_label_->setStyleSheet("color: #dc2626; font-size: 10px; font-weight: 700;");
+ conn_label_->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: 700;").arg(ui::colors::NEGATIVE));
LOG_WARN(TAG, QString("Access token expired for broker %1 — prompting re-auth").arg(broker_id_));
// Re-open the credentials dialog so the user can paste a new request_token
@@ -1065,7 +1083,7 @@ void EquityTradingScreen::on_api_clicked() {
[self, dlg_ptr](const QString& bid, const QString& key, const QString& secret, const QString& auth) {
if (!self) return;
self->conn_label_->setText("◌ CONNECTING...");
- self->conn_label_->setStyleSheet("color: #ca8a04; font-size: 10px; font-weight: 700;");
+ self->conn_label_->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: 700;").arg(ui::colors::WARNING));
self->api_btn_->setEnabled(false);
QtConcurrent::run([self, dlg_ptr, bid, key, secret, auth]() {
@@ -1103,7 +1121,7 @@ void EquityTradingScreen::on_api_clicked() {
? bid.toUpper() : token_result.user_id;
self->conn_label_->setText(QString("● %1").arg(acct));
self->conn_label_->setStyleSheet(
- "color: #16a34a; font-size: 10px; font-weight: 700;");
+ QString("color: %1; font-size: 10px; font-weight: 700;").arg(ui::colors::POSITIVE));
// Update dialog status — stays open so user can add other env
if (dlg_ptr)
@@ -1128,7 +1146,7 @@ void EquityTradingScreen::on_api_clicked() {
LOG_ERROR(TAG, QString("Auth failed %1: %2").arg(bid, token_result.error));
self->conn_label_->setText(QString("✕ %1").arg(token_result.error));
self->conn_label_->setStyleSheet(
- "color: #dc2626; font-size: 10px; font-weight: 700;");
+ QString("color: %1; font-size: 10px; font-weight: 700;").arg(ui::colors::NEGATIVE));
if (dlg_ptr) dlg_ptr->mark_error(token_result.error);
}
}, Qt::QueuedConnection);
@@ -1544,7 +1562,7 @@ void EquityTradingScreen::on_ws_connected() {
QString existing = conn_label_->text();
if (!existing.contains("[WS]"))
conn_label_->setText(existing + " [WS]");
- conn_label_->setStyleSheet("color: #16a34a; font-size: 10px; font-weight: 700;");
+ conn_label_->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: 700;").arg(ui::colors::POSITIVE));
ws_resubscribe();
}
diff --git a/fincept-qt/src/screens/equity_trading/EquityTradingScreen.h b/fincept-qt/src/screens/equity_trading/EquityTradingScreen.h
index 7ab77d181..9b338a6c2 100644
--- a/fincept-qt/src/screens/equity_trading/EquityTradingScreen.h
+++ b/fincept-qt/src/screens/equity_trading/EquityTradingScreen.h
@@ -2,6 +2,7 @@
// Equity Trading Screen — Bloomberg-style coordinator
// Routes to live brokers (16 supported) or paper trading engine.
+#include "screens/IStatefulScreen.h"
#include "screens/equity_trading/EquityTypes.h"
#include "services/workspace/IWorkspaceParticipant.h"
#include "trading/TradingTypes.h"
diff --git a/fincept-qt/src/screens/equity_trading/EquityWatchlist.cpp b/fincept-qt/src/screens/equity_trading/EquityWatchlist.cpp
index b8383fc99..2473f3919 100644
--- a/fincept-qt/src/screens/equity_trading/EquityWatchlist.cpp
+++ b/fincept-qt/src/screens/equity_trading/EquityWatchlist.cpp
@@ -245,7 +245,7 @@ void EquityWatchlist::on_add_symbol_entered() {
auto results = trading::InstrumentService::instance().search(sym, "", broker_id_, 1);
if (results.isEmpty()) {
// Not found — flash the edit red briefly to signal invalid
- add_edit_->setStyleSheet("border: 1px solid #dc2626;");
+ add_edit_->setStyleSheet(QString("border: 1px solid %1;").arg(fincept::ui::colors::NEGATIVE));
QTimer::singleShot(800, add_edit_, [this]() {
add_edit_->setStyleSheet("");
});
diff --git a/fincept-qt/src/screens/excel/ExcelScreen.cpp b/fincept-qt/src/screens/excel/ExcelScreen.cpp
index 074404b39..9e97fc5b9 100644
--- a/fincept-qt/src/screens/excel/ExcelScreen.cpp
+++ b/fincept-qt/src/screens/excel/ExcelScreen.cpp
@@ -2,6 +2,7 @@
#include "screens/excel/ExcelScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "screens/excel/SpreadsheetWidget.h"
#include "services/file_manager/FileManagerService.h"
#include "ui/theme/Theme.h"
@@ -21,7 +22,7 @@ namespace fincept::screens {
using namespace fincept::ui;
-static const QString kAccent = "#ea580c"; // Orange accent matching Tauri version
+static QString kAccent() { return QString("#ea580c"); } // Orange accent matching Tauri version
// ─────────────────────────────────────────────────────────────────────────────
// Constructor
@@ -50,7 +51,7 @@ void ExcelScreen::hideEvent(QHideEvent* event) {
// ─────────────────────────────────────────────────────────────────────────────
void ExcelScreen::build_ui() {
- setStyleSheet(QString("QWidget { background:#000000; color:%1; }").arg(colors::TEXT_PRIMARY));
+ setStyleSheet(QString("QWidget { background:%1; color:%2; }").arg(colors::BG_BASE, colors::TEXT_PRIMARY));
auto* root = new QVBoxLayout(this);
root->setContentsMargins(0, 0, 0, 0);
@@ -64,13 +65,16 @@ void ExcelScreen::build_ui() {
sheet_tabs_->setTabPosition(QTabWidget::South);
sheet_tabs_->setMovable(true);
sheet_tabs_->setTabsClosable(false); // We handle close via button
- sheet_tabs_->setStyleSheet(QString("QTabWidget::pane { border:none; background:#1a1a1a; }"
- "QTabBar { background:#2d2d2d; }"
- "QTabBar::tab { background:#404040; color:#a3a3a3; border:1px solid #525252;"
+ sheet_tabs_->setStyleSheet(QString("QTabWidget::pane { border:none; background:%3; }"
+ "QTabBar { background:%4; }"
+ "QTabBar::tab { background:%5; color:%6; border:1px solid %7;"
" padding:4px 14px; font-family:%1; font-size:10px; margin-right:2px; }"
- "QTabBar::tab:selected { background:%2; color:#fff; border-color:%2; }"
- "QTabBar::tab:hover { background:#525252; }")
- .arg(fonts::DATA_FAMILY, kAccent));
+ "QTabBar::tab:selected { background:%2; color:%8; border-color:%2; }"
+ "QTabBar::tab:hover { background:%7; }")
+ .arg(fonts::DATA_FAMILY, kAccent(),
+ colors::BG_HOVER, colors::BORDER_MED,
+ colors::TEXT_DIM, colors::TEXT_SECONDARY,
+ colors::TEXT_TERTIARY, colors::TEXT_PRIMARY));
// Add initial sheet
auto* sheet1 = new SpreadsheetWidget("Sheet1", 100, 26, sheet_tabs_);
@@ -83,14 +87,16 @@ void ExcelScreen::build_ui() {
// Status bar
auto* status_bar = new QWidget(this);
status_bar->setFixedHeight(24);
- status_bar->setStyleSheet(QString("background:#1a1a1a; border-top:1px solid #2d2d2d;"));
+ status_bar->setStyleSheet(QString("background:%1; border-top:1px solid %2;")
+ .arg(colors::BG_HOVER, colors::BORDER_MED));
auto* status_hl = new QHBoxLayout(status_bar);
status_hl->setContentsMargins(12, 0, 12, 0);
status_hl->setSpacing(12);
status_label_ = new QLabel(this);
- status_label_->setStyleSheet(QString("color:#a3a3a3; font-family:%1; font-size:9px;").arg(fonts::DATA_FAMILY));
+ status_label_->setStyleSheet(QString("color:%1; font-family:%2; font-size:9px;")
+ .arg(colors::TEXT_SECONDARY, fonts::DATA_FAMILY));
status_hl->addWidget(status_label_);
status_hl->addStretch();
@@ -102,7 +108,8 @@ void ExcelScreen::build_ui() {
QWidget* ExcelScreen::build_toolbar() {
auto* bar = new QWidget(this);
bar->setFixedHeight(40);
- bar->setStyleSheet("background:#2d2d2d; border-bottom:1px solid #404040;");
+ bar->setStyleSheet(QString("background:%1; border-bottom:1px solid %2;")
+ .arg(colors::BORDER_MED, colors::TEXT_DIM));
auto* hl = new QHBoxLayout(bar);
hl->setContentsMargins(12, 0, 12, 0);
@@ -111,18 +118,19 @@ QWidget* ExcelScreen::build_toolbar() {
// Title
auto* title = new QLabel("EXCEL SPREADSHEET", bar);
title->setStyleSheet(QString("color:%1; font-family:%2; font-size:11px; font-weight:700; margin-right:12px;")
- .arg(kAccent, fonts::DATA_FAMILY));
+ .arg(kAccent(), fonts::DATA_FAMILY));
hl->addWidget(title);
// Button factory
auto make_btn = [&](const QString& text, const QString& tooltip = {}) -> QPushButton* {
auto* btn = new QPushButton(text, bar);
btn->setToolTip(tooltip);
- btn->setStyleSheet(QString("QPushButton { background:#404040; color:#fff; border:none;"
+ btn->setStyleSheet(QString("QPushButton { background:%3; color:%4; border:none;"
" font-family:%1; font-size:10px; font-weight:600; padding:6px 12px; }"
- "QPushButton:hover { background:#525252; }"
+ "QPushButton:hover { background:%5; }"
"QPushButton:pressed { background:%2; }")
- .arg(fonts::DATA_FAMILY, kAccent));
+ .arg(fonts::DATA_FAMILY, kAccent(),
+ colors::TEXT_DIM, colors::TEXT_PRIMARY, colors::TEXT_TERTIARY));
return btn;
};
@@ -141,7 +149,7 @@ QWidget* ExcelScreen::build_toolbar() {
// Separator
auto* sep1 = new QWidget(bar);
sep1->setFixedSize(1, 20);
- sep1->setStyleSheet("background:#525252;");
+ sep1->setStyleSheet(QString("background:%1;").arg(colors::TEXT_TERTIARY));
hl->addWidget(sep1);
auto* add_btn = make_btn("+ SHEET", "Add new sheet");
@@ -153,10 +161,10 @@ QWidget* ExcelScreen::build_toolbar() {
hl->addWidget(rename_btn);
auto* del_btn = make_btn("DELETE", "Delete current sheet");
- del_btn->setStyleSheet(QString("QPushButton { background:#404040; color:#fff; border:none;"
+ del_btn->setStyleSheet(QString("QPushButton { background:%2; color:%3; border:none;"
" font-family:%1; font-size:10px; font-weight:600; padding:6px 12px; }"
- "QPushButton:hover { background:#ef4444; }")
- .arg(fonts::DATA_FAMILY));
+ "QPushButton:hover { background:%4; }")
+ .arg(fonts::DATA_FAMILY, colors::TEXT_DIM, colors::TEXT_PRIMARY, colors::NEGATIVE));
connect(del_btn, &QPushButton::clicked, this, &ExcelScreen::on_delete_sheet);
hl->addWidget(del_btn);
@@ -165,7 +173,8 @@ QWidget* ExcelScreen::build_toolbar() {
// File name label
auto* fname_label = new QLabel(file_name_, bar);
fname_label->setObjectName("excelFileName");
- fname_label->setStyleSheet(QString("color:#a3a3a3; font-family:%1; font-size:10px;").arg(fonts::DATA_FAMILY));
+ fname_label->setStyleSheet(QString("color:%1; font-family:%2; font-size:10px;")
+ .arg(colors::TEXT_SECONDARY, fonts::DATA_FAMILY));
hl->addWidget(fname_label);
return bar;
@@ -395,6 +404,7 @@ void ExcelScreen::on_rename_sheet() {
void ExcelScreen::on_tab_changed(int index) {
Q_UNUSED(index);
update_status();
+ ScreenStateManager::instance().notify_changed(this);
}
// ─────────────────────────────────────────────────────────────────────────────
@@ -427,4 +437,16 @@ void ExcelScreen::update_status() {
status_label_->setText(info);
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap ExcelScreen::save_state() const {
+ return {{"tab_index", sheet_tabs_ ? sheet_tabs_->currentIndex() : 0}};
+}
+
+void ExcelScreen::restore_state(const QVariantMap& state) {
+ const int idx = state.value("tab_index", 0).toInt();
+ if (sheet_tabs_ && idx < sheet_tabs_->count())
+ sheet_tabs_->setCurrentIndex(idx);
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/excel/ExcelScreen.h b/fincept-qt/src/screens/excel/ExcelScreen.h
index e64bd7be9..73aac0cc7 100644
--- a/fincept-qt/src/screens/excel/ExcelScreen.h
+++ b/fincept-qt/src/screens/excel/ExcelScreen.h
@@ -3,6 +3,8 @@
// formula bar, import/export (.xlsx), snapshots, and dark theme.
#pragma once
+#include "screens/IStatefulScreen.h"
+
#include <QHideEvent>
#include <QLabel>
#include <QPushButton>
@@ -15,11 +17,16 @@ namespace fincept::screens {
class SpreadsheetWidget;
-class ExcelScreen : public QWidget {
+class ExcelScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit ExcelScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "excel"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) override;
diff --git a/fincept-qt/src/screens/excel/SpreadsheetWidget.cpp b/fincept-qt/src/screens/excel/SpreadsheetWidget.cpp
index d1a2aa743..7af76a94b 100644
--- a/fincept-qt/src/screens/excel/SpreadsheetWidget.cpp
+++ b/fincept-qt/src/screens/excel/SpreadsheetWidget.cpp
@@ -346,13 +346,13 @@ void SpreadsheetWidget::build_ui(int rows, int cols) {
" border-right:1px solid %3; border-bottom:1px solid %3;"
" font-family:%4; font-size:10px; font-weight:600; padding:3px 4px; }"
"QTableCornerButton::section { background:%6; border:none; }")
- .arg("#1a1a1a", // cell bg
- "#d4d4d4", // cell text
- "#404040", // gridlines
- fonts::DATA_FAMILY,
- "#3f3f3f", // selection bg
- "#2d2d2d", // header bg
- "#a3a3a3")); // header text
+ .arg(colors::BG_HOVER, // %1 cell bg
+ colors::TEXT_PRIMARY, // %2 cell text
+ colors::TEXT_DIM, // %3 gridlines
+ fonts::DATA_FAMILY, // %4
+ colors::BORDER_BRIGHT, // %5 selection bg
+ colors::BORDER_MED, // %6 header bg
+ colors::TEXT_SECONDARY)); // %7 header text
root->addWidget(table_, 1);
}
@@ -498,7 +498,8 @@ void SpreadsheetWidget::on_context_menu(const QPoint& pos) {
"QMenu::item { padding:6px 20px; }"
"QMenu::item:selected { background:%5; }"
"QMenu::separator { height:1px; background:%3; margin:4px 8px; }")
- .arg("#2d2d2d", "#d4d4d4", "#404040", fonts::DATA_FAMILY, "#404040"));
+ .arg(colors::BORDER_MED, colors::TEXT_PRIMARY, colors::TEXT_DIM,
+ fonts::DATA_FAMILY, colors::TEXT_DIM));
menu.addAction("Cut", this, [this]() {
auto* item = table_->currentItem();
diff --git a/fincept-qt/src/screens/file_manager/FileManagerScreen.cpp b/fincept-qt/src/screens/file_manager/FileManagerScreen.cpp
index 3bbad01e3..d7343eba3 100644
--- a/fincept-qt/src/screens/file_manager/FileManagerScreen.cpp
+++ b/fincept-qt/src/screens/file_manager/FileManagerScreen.cpp
@@ -2,6 +2,7 @@
#include "screens/file_manager/FileManagerScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "ui/theme/Theme.h"
#include <QButtonGroup>
@@ -26,7 +27,10 @@ using namespace fincept::ui;
using fincept::services::FileManagerService;
static const char* MF = "font-family:'Consolas','Courier New',monospace;";
-static const char* PANEL = "background:#0d0d0d;border:1px solid #1a1a1a;border-radius:2px;";
+static QString panel_ss() {
+ return QString("background:%1;border:1px solid %2;border-radius:2px;")
+ .arg(colors::BG_SURFACE(), colors::BORDER_DIM());
+}
// ── Constructor ───────────────────────────────────────────────────────────────
@@ -39,7 +43,7 @@ FileManagerScreen::FileManagerScreen(QWidget* parent) : QWidget(parent) {
// ── UI ────────────────────────────────────────────────────────────────────────
void FileManagerScreen::build_ui() {
- setStyleSheet(QString("QWidget#FMRoot{background:%1;}").arg(colors::BG_BASE));
+ setStyleSheet(QString("QWidget#FMRoot{background:%1;}").arg(colors::BG_BASE()));
setObjectName("FMRoot");
auto* root = new QVBoxLayout(this);
@@ -49,7 +53,7 @@ void FileManagerScreen::build_ui() {
// ── Header ───────────────────────────────────────────────────────────────
auto* header = new QWidget;
header->setStyleSheet(
- QString("background:%1;border-bottom:1px solid %2;").arg(colors::BG_RAISED, colors::BORDER_DIM));
+ QString("background:%1;border-bottom:1px solid %2;").arg(colors::BG_RAISED(), colors::BORDER_DIM()));
auto* hhl = new QHBoxLayout(header);
hhl->setContentsMargins(14, 10, 14, 10);
hhl->setSpacing(8);
@@ -57,18 +61,18 @@ void FileManagerScreen::build_ui() {
auto* title = new QLabel("FILE MANAGER");
title->setStyleSheet(
QString("color:%1;font-size:14px;font-weight:700;letter-spacing:0.5px;background:transparent;%2")
- .arg(colors::AMBER, MF));
+ .arg(colors::AMBER(), MF));
hhl->addWidget(title);
auto* sub = new QLabel("Manage files across the terminal");
sub->setStyleSheet(
- QString("color:%1;font-size:12px;background:transparent;%2").arg(colors::TEXT_TERTIARY, MF));
+ QString("color:%1;font-size:12px;background:transparent;%2").arg(colors::TEXT_TERTIARY(), MF));
hhl->addWidget(sub);
hhl->addStretch();
stats_label_ = new QLabel("0 files | 0 B");
stats_label_->setStyleSheet(
- QString("color:%1;font-size:11px;background:transparent;%2").arg(colors::TEXT_DIM, MF));
+ QString("color:%1;font-size:11px;background:transparent;%2").arg(colors::TEXT_DIM(), MF));
hhl->addWidget(stats_label_);
refresh_btn_ = new QPushButton("REFRESH");
@@ -76,18 +80,18 @@ void FileManagerScreen::build_ui() {
refresh_btn_->setStyleSheet(
QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"
"padding:4px 12px;font-size:11px;%3}"
- "QPushButton:hover{color:#e5e5e5;background:%4;}")
- .arg(colors::TEXT_SECONDARY, colors::BORDER_DIM, MF, colors::BG_HOVER));
+ "QPushButton:hover{color:%4;background:%5;}")
+ .arg(colors::TEXT_SECONDARY(), colors::BORDER_DIM(), MF, colors::TEXT_PRIMARY(), colors::BG_HOVER()));
connect(refresh_btn_, &QPushButton::clicked, this, [this]() { render_files(); update_stats(); });
hhl->addWidget(refresh_btn_);
upload_btn_ = new QPushButton("UPLOAD FILES");
upload_btn_->setCursor(Qt::PointingHandCursor);
upload_btn_->setStyleSheet(
- QString("QPushButton{background:rgba(217,119,6,0.1);color:%1;border:1px solid #78350f;"
+ QString("QPushButton{background:rgba(217,119,6,0.1);color:%1;border:1px solid %3;"
"padding:4px 12px;font-size:11px;font-weight:700;%2}"
- "QPushButton:hover{background:%1;color:#080808;}")
- .arg(colors::AMBER, MF));
+ "QPushButton:hover{background:%1;color:%4;}")
+ .arg(colors::AMBER(), MF, colors::AMBER_DIM(), colors::BG_BASE()));
connect(upload_btn_, &QPushButton::clicked, this, &FileManagerScreen::upload_files);
hhl->addWidget(upload_btn_);
root->addWidget(header);
@@ -101,7 +105,7 @@ void FileManagerScreen::build_ui() {
// ── Bulk action bar (hidden until items checked) ──────────────────────────
bulk_bar_ = new QWidget;
bulk_bar_->setStyleSheet(
- QString("background:#1a0a00;border-bottom:1px solid #78350f;"));
+ QString("background:#1a0a00;border-bottom:1px solid %1;").arg(colors::AMBER_DIM()));
bulk_bar_->setVisible(false);
auto* bbl = new QHBoxLayout(bulk_bar_);
bbl->setContentsMargins(14, 6, 14, 6);
@@ -109,15 +113,15 @@ void FileManagerScreen::build_ui() {
auto* sel_lbl = new QLabel("Selected files:");
sel_lbl->setStyleSheet(
- QString("color:%1;font-size:11px;background:transparent;%2").arg(colors::TEXT_SECONDARY, MF));
+ QString("color:%1;font-size:11px;background:transparent;%2").arg(colors::TEXT_SECONDARY(), MF));
bbl->addWidget(sel_lbl);
bulk_delete_btn_ = new QPushButton("DELETE SELECTED");
bulk_delete_btn_->setCursor(Qt::PointingHandCursor);
bulk_delete_btn_->setStyleSheet(
- QString("QPushButton{background:transparent;color:#ef4444;border:1px solid #7f1d1d;"
- "padding:3px 12px;font-size:11px;font-weight:700;%1}"
- "QPushButton:hover{background:#ef4444;color:#fff;}").arg(MF));
+ QString("QPushButton{background:transparent;color:%1;border:1px solid #7f1d1d;"
+ "padding:3px 12px;font-size:11px;font-weight:700;%2}"
+ "QPushButton:hover{background:%1;color:%3;}").arg(colors::NEGATIVE(), MF, colors::TEXT_PRIMARY()));
connect(bulk_delete_btn_, &QPushButton::clicked, this, &FileManagerScreen::delete_selected);
bbl->addWidget(bulk_delete_btn_);
bbl->addStretch();
@@ -127,7 +131,7 @@ void FileManagerScreen::build_ui() {
desel_btn->setStyleSheet(
QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"
"padding:3px 12px;font-size:11px;%3}"
- "QPushButton:hover{color:#e5e5e5;}").arg(colors::TEXT_DIM, colors::BORDER_DIM, MF));
+ "QPushButton:hover{color:%4;}").arg(colors::TEXT_DIM(), colors::BORDER_DIM(), MF, colors::TEXT_PRIMARY()));
connect(desel_btn, &QPushButton::clicked, this, [this]() {
for (auto* btn : check_btns_) btn->setChecked(false);
update_bulk_bar();
@@ -137,7 +141,7 @@ void FileManagerScreen::build_ui() {
// ── Splitter: file list | preview ─────────────────────────────────────────
splitter_ = new QSplitter(Qt::Horizontal);
- splitter_->setStyleSheet("QSplitter::handle{background:#1a1a1a;width:1px;}");
+ splitter_->setStyleSheet(QString("QSplitter::handle{background:%1;width:1px;}").arg(colors::BORDER_DIM()));
splitter_->setChildrenCollapsible(false);
// Left: scroll area with file cards
@@ -145,11 +149,11 @@ void FileManagerScreen::build_ui() {
scroll->setWidgetResizable(true);
scroll->setStyleSheet("QScrollArea{border:none;background:transparent;}"
"QScrollBar:vertical{background:transparent;width:6px;}"
- "QScrollBar::handle:vertical{background:#222222;}"
- "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}");
+ + QString("QScrollBar::handle:vertical{background:%1;}"
+ "QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}").arg(colors::BORDER_MED()));
file_container_ = new QWidget;
- file_container_->setStyleSheet(QString("background:%1;").arg(colors::BG_BASE));
+ file_container_->setStyleSheet(QString("background:%1;").arg(colors::BG_BASE()));
file_layout_ = new QVBoxLayout(file_container_);
file_layout_->setContentsMargins(14, 8, 14, 8);
file_layout_->setSpacing(6);
@@ -167,14 +171,14 @@ void FileManagerScreen::build_ui() {
void FileManagerScreen::build_quota_bar(QVBoxLayout* root) {
auto* qw = new QWidget;
qw->setStyleSheet(QString("background:%1;border-bottom:1px solid %2;")
- .arg(colors::BG_BASE, colors::BORDER_DIM));
+ .arg(colors::BG_BASE(), colors::BORDER_DIM()));
auto* ql = new QHBoxLayout(qw);
ql->setContentsMargins(14, 6, 14, 6);
ql->setSpacing(10);
quota_label_ = new QLabel("Storage: 0 B / 500 MB");
quota_label_->setStyleSheet(
- QString("color:%1;font-size:11px;background:transparent;%2").arg(colors::TEXT_DIM, MF));
+ QString("color:%1;font-size:11px;background:transparent;%2").arg(colors::TEXT_DIM(), MF));
ql->addWidget(quota_label_);
quota_bar_ = new QProgressBar;
@@ -183,8 +187,8 @@ void FileManagerScreen::build_quota_bar(QVBoxLayout* root) {
quota_bar_->setTextVisible(false);
quota_bar_->setFixedHeight(6);
quota_bar_->setStyleSheet(
- "QProgressBar{background:#1a1a1a;border:none;border-radius:3px;}"
- "QProgressBar::chunk{background:#d97706;border-radius:3px;}");
+ QString("QProgressBar{background:%1;border:none;border-radius:3px;}"
+ "QProgressBar::chunk{background:%2;border-radius:3px;}").arg(colors::BORDER_DIM(), colors::AMBER()));
ql->addWidget(quota_bar_, 1);
root->addWidget(qw);
@@ -193,7 +197,7 @@ void FileManagerScreen::build_quota_bar(QVBoxLayout* root) {
void FileManagerScreen::build_filter_bar(QVBoxLayout* root) {
auto* bar = new QWidget;
bar->setStyleSheet(
- QString("background:%1;border-bottom:1px solid %2;").arg(colors::BG_BASE, colors::BORDER_DIM));
+ QString("background:%1;border-bottom:1px solid %2;").arg(colors::BG_BASE(), colors::BORDER_DIM()));
auto* bl = new QVBoxLayout(bar);
bl->setContentsMargins(14, 8, 14, 8);
bl->setSpacing(6);
@@ -211,13 +215,13 @@ void FileManagerScreen::build_filter_bar(QVBoxLayout* root) {
QString("QLineEdit{background:%1;color:%2;border:1px solid %3;"
"padding:5px 10px;font-size:12px;%4}"
"QLineEdit:focus{border-color:%5;}")
- .arg(colors::BG_SURFACE, colors::TEXT_PRIMARY, colors::BORDER_DIM, MF, colors::AMBER));
+ .arg(colors::BG_SURFACE(), colors::TEXT_PRIMARY(), colors::BORDER_DIM(), MF, colors::AMBER()));
connect(search_input_, &QLineEdit::textChanged, this, [this]() { render_files(); });
r1l->addWidget(search_input_, 1);
auto* sort_lbl = new QLabel("Sort:");
sort_lbl->setStyleSheet(
- QString("color:%1;font-size:11px;background:transparent;%2").arg(colors::TEXT_DIM, MF));
+ QString("color:%1;font-size:11px;background:transparent;%2").arg(colors::TEXT_DIM(), MF));
r1l->addWidget(sort_lbl);
sort_combo_ = new QComboBox;
@@ -229,7 +233,7 @@ void FileManagerScreen::build_filter_bar(QVBoxLayout* root) {
"QComboBox::drop-down{border:none;}"
"QComboBox QAbstractItemView{background:%1;color:%2;border:1px solid %3;"
"selection-background-color:%5;}")
- .arg(colors::BG_SURFACE, colors::TEXT_PRIMARY, colors::BORDER_DIM, MF, colors::BG_HOVER));
+ .arg(colors::BG_SURFACE(), colors::TEXT_PRIMARY(), colors::BORDER_DIM(), MF, colors::BG_HOVER()));
connect(sort_combo_, &QComboBox::currentIndexChanged, this, [this]() { render_files(); });
r1l->addWidget(sort_combo_);
bl->addWidget(row1);
@@ -249,7 +253,7 @@ void FileManagerScreen::build_filter_bar(QVBoxLayout* root) {
"border-radius:10px;padding:2px 10px;font-size:10px;%3}"
"QPushButton:checked{background:%4;color:#000;border-color:%4;}"
"QPushButton:hover:!checked{border-color:%4;}")
- .arg(colors::TEXT_SECONDARY, colors::BORDER_DIM, MF, colors::AMBER);
+ .arg(colors::TEXT_SECONDARY(), colors::BORDER_DIM(), MF, colors::AMBER());
static const QStringList screens = {
"All", "portfolio", "backtesting", "news", "equity_research",
@@ -266,7 +270,7 @@ void FileManagerScreen::build_filter_bar(QVBoxLayout* root) {
cl->addWidget(chip);
QString filter_val = (s == "All") ? "" : s;
connect(chip, &QPushButton::toggled, this, [this, filter_val](bool checked) {
- if (checked) { active_screen_filter_ = filter_val; render_files(); }
+ if (checked) { active_screen_filter_ = filter_val; render_files(); ScreenStateManager::instance().notify_changed(this); }
});
}
cl->addStretch();
@@ -278,7 +282,7 @@ void FileManagerScreen::build_filter_bar(QVBoxLayout* root) {
QWidget* FileManagerScreen::build_preview_panel() {
preview_panel_ = new QWidget;
preview_panel_->setStyleSheet(
- QString("background:%1;border-left:1px solid %2;").arg(colors::BG_RAISED, colors::BORDER_DIM));
+ QString("background:%1;border-left:1px solid %2;").arg(colors::BG_RAISED(), colors::BORDER_DIM()));
auto* vl = new QVBoxLayout(preview_panel_);
vl->setContentsMargins(0, 0, 0, 0);
vl->setSpacing(0);
@@ -286,14 +290,14 @@ QWidget* FileManagerScreen::build_preview_panel() {
// Preview header
auto* hdr = new QWidget;
hdr->setStyleSheet(
- QString("background:%1;border-bottom:1px solid %2;").arg(colors::BG_SURFACE, colors::BORDER_DIM));
+ QString("background:%1;border-bottom:1px solid %2;").arg(colors::BG_SURFACE(), colors::BORDER_DIM()));
auto* hhl = new QHBoxLayout(hdr);
hhl->setContentsMargins(12, 8, 12, 8);
auto* plbl = new QLabel("PREVIEW");
plbl->setStyleSheet(
QString("color:%1;font-size:11px;font-weight:700;letter-spacing:1px;background:transparent;%2")
- .arg(colors::AMBER, MF));
+ .arg(colors::AMBER(), MF));
hhl->addWidget(plbl);
hhl->addStretch();
@@ -302,7 +306,7 @@ QWidget* FileManagerScreen::build_preview_panel() {
close_btn->setCursor(Qt::PointingHandCursor);
close_btn->setStyleSheet(
QString("QPushButton{background:transparent;color:%1;border:none;font-size:12px;}"
- "QPushButton:hover{color:#ef4444;}").arg(colors::TEXT_DIM));
+ "QPushButton:hover{color:%2;}").arg(colors::TEXT_DIM(), colors::NEGATIVE()));
connect(close_btn, &QPushButton::clicked, this, &FileManagerScreen::clear_preview);
hhl->addWidget(close_btn);
vl->addWidget(hdr);
@@ -311,20 +315,20 @@ QWidget* FileManagerScreen::build_preview_panel() {
preview_title_ = new QLabel;
preview_title_->setWordWrap(true);
preview_title_->setStyleSheet(
- QString("color:#e5e5e5;font-size:12px;font-weight:600;background:transparent;"
- "padding:10px 12px 2px 12px;%1").arg(MF));
+ QString("color:%1;font-size:12px;font-weight:600;background:transparent;"
+ "padding:10px 12px 2px 12px;%2").arg(colors::TEXT_PRIMARY(), MF));
vl->addWidget(preview_title_);
preview_meta_ = new QLabel;
preview_meta_->setWordWrap(true);
preview_meta_->setStyleSheet(
QString("color:%1;font-size:10px;background:transparent;padding:0 12px 8px 12px;%2")
- .arg(colors::TEXT_DIM, MF));
+ .arg(colors::TEXT_DIM(), MF));
vl->addWidget(preview_meta_);
auto* div = new QFrame;
div->setFrameShape(QFrame::HLine);
- div->setStyleSheet("background:#1a1a1a;max-height:1px;border:none;");
+ div->setStyleSheet(QString("background:%1;max-height:1px;border:none;").arg(colors::BORDER_DIM()));
vl->addWidget(div);
// Text preview
@@ -333,7 +337,7 @@ QWidget* FileManagerScreen::build_preview_panel() {
preview_text_->setStyleSheet(
QString("QTextEdit{background:%1;color:%2;border:none;"
"padding:10px;font-size:11px;%3}")
- .arg(colors::BG_BASE, colors::TEXT_PRIMARY, MF));
+ .arg(colors::BG_BASE(), colors::TEXT_PRIMARY(), MF));
preview_text_->setVisible(false);
vl->addWidget(preview_text_, 1);
@@ -343,8 +347,8 @@ QWidget* FileManagerScreen::build_preview_panel() {
QString("QTableWidget{background:%1;color:%2;border:none;gridline-color:%3;font-size:11px;%4}"
"QHeaderView::section{background:%5;color:%6;border:none;"
"border-bottom:1px solid %3;padding:4px;font-size:10px;font-weight:700;%4}")
- .arg(colors::BG_BASE, colors::TEXT_PRIMARY, colors::BORDER_DIM, MF,
- colors::BG_SURFACE, colors::TEXT_SECONDARY));
+ .arg(colors::BG_BASE(), colors::TEXT_PRIMARY(), colors::BORDER_DIM(), MF,
+ colors::BG_SURFACE(), colors::TEXT_SECONDARY));
preview_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);
preview_table_->setSelectionMode(QAbstractItemView::SingleSelection);
preview_table_->horizontalHeader()->setStretchLastSection(true);
@@ -358,7 +362,7 @@ QWidget* FileManagerScreen::build_preview_panel() {
preview_empty_->setWordWrap(true);
preview_empty_->setStyleSheet(
QString("color:%1;font-size:12px;background:transparent;padding:30px;%2")
- .arg(colors::TEXT_DIM, MF));
+ .arg(colors::TEXT_DIM(), MF));
vl->addWidget(preview_empty_, 1);
return preview_panel_;
@@ -608,14 +612,14 @@ void FileManagerScreen::render_files() {
hero_lbl->setAlignment(Qt::AlignCenter);
hero_lbl->setStyleSheet(
QString("color:%1;font-size:36px;font-weight:700;background:transparent;%2")
- .arg(colors::AMBER, MF));
+ .arg(colors::AMBER(), MF));
skl->addWidget(hero_lbl);
auto* hero_sub = new QLabel("Your terminal file index is empty.");
hero_sub->setAlignment(Qt::AlignCenter);
hero_sub->setStyleSheet(
QString("color:%1;font-size:14px;background:transparent;%2")
- .arg(colors::TEXT_SECONDARY, MF));
+ .arg(colors::TEXT_SECONDARY(), MF));
skl->addWidget(hero_sub);
auto* hero_hint = new QLabel(
@@ -625,18 +629,18 @@ void FileManagerScreen::render_files() {
hero_hint->setWordWrap(true);
hero_hint->setStyleSheet(
QString("color:%1;font-size:12px;background:transparent;%2")
- .arg(colors::TEXT_DIM, MF));
+ .arg(colors::TEXT_DIM(), MF));
skl->addWidget(hero_hint);
auto* div = new QFrame;
div->setFrameShape(QFrame::HLine);
- div->setStyleSheet("background:#1a1a1a;max-height:1px;border:none;");
+ div->setStyleSheet(QString("background:%1;max-height:1px;border:none;").arg(colors::BORDER_DIM()));
skl->addWidget(div);
auto* sources_lbl = new QLabel("FILES ARE COLLECTED FROM");
sources_lbl->setStyleSheet(
QString("color:%1;font-size:10px;font-weight:700;letter-spacing:1px;"
- "background:transparent;%2").arg(colors::TEXT_DIM, MF));
+ "background:transparent;%2").arg(colors::TEXT_DIM(), MF));
skl->addWidget(sources_lbl);
struct SI { QString icon, name, desc; };
@@ -663,7 +667,7 @@ void FileManagerScreen::render_files() {
for (int i = 0; i < 11; ++i) {
const auto& s = sources[i];
auto* card = new QWidget;
- card->setStyleSheet("background:#0d0d0d;border:1px solid #1a1a1a;border-radius:2px;");
+ card->setStyleSheet(panel_ss());
auto* cl2 = new QHBoxLayout(card);
cl2->setContentsMargins(10,8,10,8); cl2->setSpacing(8);
auto* badge = new QLabel(s.icon);
@@ -671,18 +675,18 @@ void FileManagerScreen::render_files() {
badge->setAlignment(Qt::AlignCenter);
badge->setStyleSheet(
QString("color:%1;font-size:10px;font-weight:700;"
- "background:rgba(217,119,6,0.08);border:1px solid #78350f;"
- "border-radius:2px;padding:2px 0;%2").arg(colors::AMBER, MF));
+ "background:rgba(217,119,6,0.08);border:1px solid %2;"
+ "border-radius:2px;padding:2px 0;%3").arg(colors::AMBER(), colors::AMBER_DIM(), MF));
cl2->addWidget(badge);
auto* txt = new QWidget; txt->setStyleSheet("background:transparent;");
auto* tl = new QVBoxLayout(txt); tl->setContentsMargins(0,0,0,0); tl->setSpacing(1);
auto* nl = new QLabel(s.name);
nl->setStyleSheet(
- QString("color:#e5e5e5;font-size:11px;font-weight:600;background:transparent;%1").arg(MF));
+ QString("color:%1;font-size:11px;font-weight:600;background:transparent;%2").arg(colors::TEXT_PRIMARY(), MF));
tl->addWidget(nl);
auto* dl = new QLabel(s.desc);
dl->setStyleSheet(
- QString("color:%1;font-size:10px;background:transparent;%2").arg(colors::TEXT_DIM, MF));
+ QString("color:%1;font-size:10px;background:transparent;%2").arg(colors::TEXT_DIM(), MF));
tl->addWidget(dl);
cl2->addWidget(txt, 1);
grid->addWidget(card, i/3, i%3);
@@ -691,13 +695,13 @@ void FileManagerScreen::render_files() {
auto* div2 = new QFrame;
div2->setFrameShape(QFrame::HLine);
- div2->setStyleSheet("background:#1a1a1a;max-height:1px;border:none;");
+ div2->setStyleSheet(QString("background:%1;max-height:1px;border:none;").arg(colors::BORDER_DIM()));
skl->addWidget(div2);
auto* tips_lbl = new QLabel("TIPS");
tips_lbl->setStyleSheet(
QString("color:%1;font-size:10px;font-weight:700;letter-spacing:1px;"
- "background:transparent;%2").arg(colors::TEXT_DIM, MF));
+ "background:transparent;%2").arg(colors::TEXT_DIM(), MF));
skl->addWidget(tips_lbl);
for (const char* tip : {
@@ -710,7 +714,7 @@ void FileManagerScreen::render_files() {
tl2->setWordWrap(true);
tl2->setStyleSheet(
QString("color:%1;font-size:11px;background:transparent;%2")
- .arg(colors::TEXT_TERTIARY, MF));
+ .arg(colors::TEXT_TERTIARY(), MF));
skl->addWidget(tl2);
}
skl->addStretch();
@@ -719,7 +723,7 @@ void FileManagerScreen::render_files() {
auto* empty = new QLabel("No files match your search or filter.");
empty->setAlignment(Qt::AlignCenter);
empty->setStyleSheet(
- QString("color:%1;font-size:13px;padding:40px;%2").arg(colors::TEXT_DIM, MF));
+ QString("color:%1;font-size:13px;padding:40px;%2").arg(colors::TEXT_DIM(), MF));
file_layout_->addWidget(empty);
}
file_layout_->addStretch();
@@ -737,13 +741,13 @@ void FileManagerScreen::render_files() {
grp_lbl->setStyleSheet(
QString("color:%1;font-size:10px;font-weight:700;letter-spacing:1px;"
"background:transparent;padding:8px 0 2px 0;%2")
- .arg(colors::TEXT_DIM, MF));
+ .arg(colors::TEXT_DIM(), MF));
file_layout_->addWidget(grp_lbl);
}
// ── Card ─────────────────────────────────────────────────────────────
auto* card = new QWidget;
- card->setStyleSheet(QString(PANEL));
+ card->setStyleSheet(panel_ss());
card->setCursor(Qt::PointingHandCursor);
auto* hl = new QHBoxLayout(card);
hl->setContentsMargins(8, 8, 12, 8);
@@ -756,7 +760,7 @@ void FileManagerScreen::render_files() {
chk->setStyleSheet(
QString("QPushButton{background:transparent;color:%1;border:none;font-size:14px;}"
"QPushButton:checked{color:%2;}")
- .arg(colors::TEXT_DIM, colors::AMBER));
+ .arg(colors::TEXT_DIM(), colors::AMBER()));
connect(chk, &QPushButton::toggled, this, [this, chk](bool checked) {
chk->setText(checked ? "☑" : "☐");
update_bulk_bar();
@@ -784,7 +788,7 @@ void FileManagerScreen::render_files() {
auto* name_lbl = new QLabel(file["originalName"].toString());
name_lbl->setStyleSheet(
- QString("color:#e5e5e5;font-size:12px;font-weight:600;background:transparent;%1").arg(MF));
+ QString("color:%1;font-size:12px;font-weight:600;background:transparent;%2").arg(colors::TEXT_PRIMARY(), MF));
info_vl->addWidget(name_lbl);
QString date_str = QDateTime::fromString(file["uploadedAt"].toString(), Qt::ISODate)
@@ -792,7 +796,7 @@ void FileManagerScreen::render_files() {
auto* meta_lbl = new QLabel(
format_size(file["size"].toInteger()) + " | " + date_str);
meta_lbl->setStyleSheet(
- QString("color:%1;font-size:10px;background:transparent;%2").arg(colors::TEXT_DIM, MF));
+ QString("color:%1;font-size:10px;background:transparent;%2").arg(colors::TEXT_DIM(), MF));
info_vl->addWidget(meta_lbl);
QString fid = file["id"].toString();
@@ -807,7 +811,7 @@ void FileManagerScreen::render_files() {
QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"
"font-size:10px;font-weight:700;padding:0 8px;%3}"
"QPushButton:hover{color:%4;border-color:%4;}")
- .arg(colors::TEXT_DIM, colors::BORDER_DIM, MF, colors::AMBER));
+ .arg(colors::TEXT_DIM(), colors::BORDER_DIM(), MF, colors::AMBER()));
connect(preview_btn, &QPushButton::clicked, this, [this, fid]() { show_preview(fid); });
hl->addWidget(info, 1);
hl->addWidget(preview_btn);
@@ -822,7 +826,7 @@ void FileManagerScreen::render_files() {
QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"
"font-size:10px;font-weight:700;padding:0 8px;%3}"
"QPushButton:hover{color:%1;background:rgba(217,119,6,0.15);}")
- .arg(colors::AMBER, colors::BORDER_DIM, MF));
+ .arg(colors::AMBER(), colors::BORDER_DIM(), MF));
connect(open_btn, &QPushButton::clicked, this, [this, fid]() { open_with(fid); });
hl->addWidget(open_btn);
}
@@ -834,8 +838,8 @@ void FileManagerScreen::render_files() {
dl_btn->setStyleSheet(
QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"
"font-size:10px;font-weight:700;%3}"
- "QPushButton:hover{color:#38bdf8;background:#111111;}")
- .arg(colors::CYAN, colors::BORDER_DIM, MF));
+ "QPushButton:hover{color:#38bdf8;background:%4;}")
+ .arg(colors::CYAN(), colors::BORDER_DIM(), MF, colors::BG_RAISED()));
connect(dl_btn, &QPushButton::clicked, this, [this, fid]() { download_file(fid); });
hl->addWidget(dl_btn);
@@ -846,8 +850,8 @@ void FileManagerScreen::render_files() {
del_btn->setStyleSheet(
QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"
"font-size:10px;font-weight:700;%3}"
- "QPushButton:hover{color:#ef4444;background:rgba(239,68,68,0.1);}")
- .arg(colors::TEXT_DIM, colors::BORDER_DIM, MF));
+ "QPushButton:hover{color:%4;background:rgba(239,68,68,0.1);}")
+ .arg(colors::TEXT_DIM(), colors::BORDER_DIM(), MF, colors::NEGATIVE()));
connect(del_btn, &QPushButton::clicked, this, [this, fid]() { delete_file(fid); });
hl->addWidget(del_btn);
@@ -874,10 +878,10 @@ void FileManagerScreen::update_stats() {
quota_label_->setText(
QString("Storage: %1 / 500 MB").arg(format_size(total_size)));
// Turn red if > 80%
- QString chunk_color = (pct > 800) ? "#ef4444" : "#d97706";
+ QString chunk_color = (pct > 800) ? colors::NEGATIVE() : colors::AMBER();
quota_bar_->setStyleSheet(
- QString("QProgressBar{background:#1a1a1a;border:none;border-radius:3px;}"
- "QProgressBar::chunk{background:%1;border-radius:3px;}").arg(chunk_color));
+ QString("QProgressBar{background:%1;border:none;border-radius:3px;}"
+ "QProgressBar::chunk{background:%2;border-radius:3px;}").arg(colors::BORDER_DIM(), chunk_color));
}
}
@@ -891,14 +895,14 @@ QString FileManagerScreen::format_size(qint64 bytes) {
}
QString FileManagerScreen::file_type_color(const QString& mime) {
- if (mime.contains("spreadsheet")||mime.contains("csv")||mime.contains("excel")) return "#16a34a";
- if (mime.contains("image")) return "#2563eb";
+ if (mime.contains("spreadsheet")||mime.contains("csv")||mime.contains("excel")) return colors::POSITIVE();
+ if (mime.contains("image")) return colors::INFO();
if (mime.contains("video")) return "#7c3aed";
if (mime.contains("audio")) return "#db2777";
- if (mime.contains("zip")||mime.contains("archive")) return "#ca8a04";
- if (mime.contains("pdf")) return "#dc2626";
- if (mime.contains("json")||mime.contains("python")||mime.contains("ipynb")) return "#0891b2";
- return "#808080";
+ if (mime.contains("zip")||mime.contains("archive")) return colors::WARNING();
+ if (mime.contains("pdf")) return colors::NEGATIVE();
+ if (mime.contains("json")||mime.contains("python")||mime.contains("ipynb")) return colors::CYAN();
+ return colors::TEXT_SECONDARY();
}
QString FileManagerScreen::open_with_label(const QString& mime) {
@@ -915,4 +919,30 @@ QString FileManagerScreen::route_for_mime(const QString& mime) {
return {};
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap FileManagerScreen::save_state() const {
+ return {{"screen_filter", active_screen_filter_}};
+}
+
+void FileManagerScreen::restore_state(const QVariantMap& state) {
+ const QString filter = state.value("screen_filter").toString();
+ if (filter != active_screen_filter_) {
+ active_screen_filter_ = filter;
+ // Find and check the matching chip
+ if (chip_group_) {
+ for (auto* btn : chip_group_->buttons()) {
+ auto* chip = qobject_cast<QPushButton*>(btn);
+ if (!chip) continue;
+ QString chip_filter = chip->text() == "All" ? "" : chip->text();
+ if (chip_filter == filter) {
+ chip->setChecked(true);
+ break;
+ }
+ }
+ }
+ render_files();
+ }
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/file_manager/FileManagerScreen.h b/fincept-qt/src/screens/file_manager/FileManagerScreen.h
index 487b844be..937380396 100644
--- a/fincept-qt/src/screens/file_manager/FileManagerScreen.h
+++ b/fincept-qt/src/screens/file_manager/FileManagerScreen.h
@@ -1,4 +1,5 @@
#pragma once
+#include "screens/IStatefulScreen.h"
#include "services/file_manager/FileManagerService.h"
#include <QButtonGroup>
@@ -19,11 +20,16 @@ namespace fincept::screens {
/// File Manager Screen — lists all files tracked by FileManagerService.
/// Features: filter chips, sort controls, inline preview, bulk delete, quota bar.
-class FileManagerScreen : public QWidget {
+class FileManagerScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit FileManagerScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "file_manager"; }
+ int state_version() const override { return 1; }
+
signals:
void open_file_in_screen(const QString& route_id, const QString& file_path);
diff --git a/fincept-qt/src/screens/forum/ForumFeedPanel.cpp b/fincept-qt/src/screens/forum/ForumFeedPanel.cpp
index 8ff3fb367..b3b4f752f 100644
--- a/fincept-qt/src/screens/forum/ForumFeedPanel.cpp
+++ b/fincept-qt/src/screens/forum/ForumFeedPanel.cpp
@@ -425,9 +425,9 @@ void ForumFeedPanel::rebuild_posts() {
? QString("color:%1;font-size:15px;font-weight:700;"
"background:transparent;line-height:1.3;%2")
.arg(ui::colors::TEXT_PRIMARY(), M(15))
- : QString("color:#c8c8c8;font-size:15px;font-weight:600;"
- "background:transparent;line-height:1.3;%1")
- .arg(M(15)));
+ : QString("color:%1;font-size:15px;font-weight:600;"
+ "background:transparent;line-height:1.3;%2")
+ .arg(ui::colors::TEXT_PRIMARY(), M(15)));
cl->addWidget(title);
// ── Row 3: body preview ───────────────────────────────────────────────
diff --git a/fincept-qt/src/screens/forum/ForumPostListPanel.cpp b/fincept-qt/src/screens/forum/ForumPostListPanel.cpp
index dd0e8e031..e0471da84 100644
--- a/fincept-qt/src/screens/forum/ForumPostListPanel.cpp
+++ b/fincept-qt/src/screens/forum/ForumPostListPanel.cpp
@@ -58,7 +58,7 @@ ForumPostListPanel::ForumPostListPanel(QWidget* parent) : QWidget(parent) {
}
void ForumPostListPanel::build_ui() {
- setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));
auto* root = new QVBoxLayout(this);
root->setContentsMargins(0, 0, 0, 0);
root->setSpacing(0);
@@ -68,7 +68,7 @@ void ForumPostListPanel::build_ui() {
hdr->setFixedHeight(44);
hdr->setStyleSheet(
QString("background:%1;border-bottom:1px solid %2;")
- .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
auto* hdr_hl = new QHBoxLayout(hdr);
hdr_hl->setContentsMargins(16, 0, 16, 0);
hdr_hl->setSpacing(10);
@@ -76,18 +76,18 @@ void ForumPostListPanel::build_ui() {
auto* hash = new QLabel("#");
hash->setStyleSheet(
QString("color:%1;font-size:20px;font-weight:700;background:transparent;%2")
- .arg(ui::colors::AMBER, M(20)));
+ .arg(ui::colors::AMBER(), M(20)));
hash->setFixedWidth(18);
channel_label_ = new QLabel("all-posts");
channel_label_->setStyleSheet(
QString("color:%1;font-size:14px;font-weight:700;background:transparent;%2")
- .arg(ui::colors::TEXT_PRIMARY, M(14)));
+ .arg(ui::colors::TEXT_PRIMARY(), M(14)));
count_label_ = new QLabel;
count_label_->setStyleSheet(
QString("color:%1;font-size:11px;background:transparent;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(11)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(11)));
hdr_hl->addWidget(hash);
hdr_hl->addWidget(channel_label_, 1);
@@ -105,10 +105,10 @@ void ForumPostListPanel::build_ui() {
"border-radius:3px;}"
"QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical"
"{height:0;}")
- .arg(ui::colors::BG_BASE, ui::colors::BORDER_DIM));
+ .arg(ui::colors::BG_BASE(), ui::colors::BORDER_DIM()));
feed_container_ = new QWidget;
- feed_container_->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
+ feed_container_->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));
feed_layout_ = new QVBoxLayout(feed_container_);
feed_layout_->setContentsMargins(0, 0, 0, 0);
feed_layout_->setSpacing(0);
@@ -156,7 +156,7 @@ void ForumPostListPanel::show_skeleton() {
card->setFixedHeight(68);
card->setStyleSheet(
QString("background:%1;border:1px solid %2;border-radius:4px;")
- .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
auto* cvl = new QVBoxLayout(card);
cvl->setContentsMargins(14, 10, 14, 10);
cvl->setSpacing(8);
@@ -166,16 +166,16 @@ void ForumPostListPanel::show_skeleton() {
bar1->setStyleSheet(
QString("background:qlineargradient(x1:0,y1:0,x2:1,y2:0,"
"stop:0 %1,stop:%2 %3,stop:1 %1);border-radius:5px;")
- .arg(ui::colors::BORDER_DIM)
+ .arg(ui::colors::BORDER_DIM())
.arg(0.3 + (i % 4) * 0.15)
- .arg(ui::colors::BORDER_MED));
+ .arg(ui::colors::BORDER_MED()));
bar1->setMaximumWidth(200 + i * 20);
auto* bar2 = new QWidget;
bar2->setFixedHeight(7);
bar2->setStyleSheet(
QString("background:%1;border-radius:3px;")
- .arg(ui::colors::BORDER_DIM));
+ .arg(ui::colors::BORDER_DIM()));
bar2->setMaximumWidth(120);
cvl->addWidget(bar1);
@@ -198,9 +198,9 @@ void ForumPostListPanel::pulse_skeleton() {
double e = std::min(1.0, s + 0.3);
QString bg = QString("background:qlineargradient(x1:0,y1:0,x2:1,y2:0,"
"stop:0 %1,stop:%2 %3,stop:%4 %1);border-radius:5px;")
- .arg(ui::colors::BORDER_DIM)
+ .arg(ui::colors::BORDER_DIM())
.arg(s, 0, 'f', 2)
- .arg(ui::colors::BORDER_MED)
+ .arg(ui::colors::BORDER_MED())
.arg(e, 0, 'f', 2);
auto* lay = qobject_cast<QVBoxLayout*>(skeleton_widget_->layout());
@@ -268,20 +268,20 @@ void ForumPostListPanel::rebuild_feed() {
icon->setAlignment(Qt::AlignCenter);
icon->setStyleSheet(
QString("color:%1;font-size:24px;background:transparent;")
- .arg(ui::colors::BORDER_DIM));
+ .arg(ui::colors::BORDER_DIM()));
auto* lbl = new QLabel("NO POSTS YET");
lbl->setAlignment(Qt::AlignCenter);
lbl->setStyleSheet(
QString("color:%1;font-size:13px;font-weight:700;letter-spacing:1.5px;"
"background:transparent;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(13)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(13)));
auto* sub = new QLabel("Be the first to start a discussion");
sub->setAlignment(Qt::AlignCenter);
sub->setStyleSheet(
QString("color:%1;font-size:11px;background:transparent;%2")
- .arg(ui::colors::TEXT_DIM, M(11)));
+ .arg(ui::colors::TEXT_DIM(), M(11)));
el->addWidget(icon);
el->addWidget(lbl);
@@ -307,11 +307,11 @@ void ForumPostListPanel::rebuild_feed() {
? QString("background:rgba(217,119,6,0.04);"
"border-bottom:1px solid %1;"
"border-left:3px solid %2;")
- .arg(ui::colors::BORDER_DIM, cat_color)
+ .arg(ui::colors::BORDER_DIM(), cat_color)
: QString("background:%1;"
"border-bottom:1px solid %2;"
"border-left:3px solid transparent;")
- .arg(ui::colors::BG_BASE, ui::colors::BORDER_DIM));
+ .arg(ui::colors::BG_BASE(), ui::colors::BORDER_DIM()));
auto* card_vl = new QVBoxLayout(card);
card_vl->setContentsMargins(14, 10, 14, 8);
@@ -333,14 +333,14 @@ void ForumPostListPanel::rebuild_feed() {
avatar->setStyleSheet(
QString("color:%1;font-size:9px;font-weight:700;background:%2;"
"border-radius:12px;%3")
- .arg(ui::colors::BG_BASE, det_color(post.author_display_name),
+ .arg(ui::colors::BG_BASE(), det_color(post.author_display_name),
M(9)));
auto* author = new QLabel(post.author_display_name.left(16));
author->setStyleSheet(
QString("color:%1;font-size:11px;font-weight:600;"
"background:transparent;%2")
- .arg(ui::colors::TEXT_PRIMARY, M(11)));
+ .arg(ui::colors::TEXT_PRIMARY(), M(11)));
auto* cat_chip = new QLabel(post.category_name.toUpper().left(12));
cat_chip->setStyleSheet(
@@ -352,7 +352,7 @@ void ForumPostListPanel::rebuild_feed() {
auto* time_lbl = new QLabel(rel_time(post.created_at));
time_lbl->setStyleSheet(
QString("color:%1;font-size:10px;background:transparent;%2")
- .arg(ui::colors::TEXT_DIM, M(10)));
+ .arg(ui::colors::TEXT_DIM(), M(10)));
top_hl->addWidget(avatar);
top_hl->addWidget(author);
@@ -370,10 +370,10 @@ void ForumPostListPanel::rebuild_feed() {
active
? QString("color:%1;font-size:13px;font-weight:700;"
"background:transparent;%2")
- .arg(ui::colors::TEXT_PRIMARY, M(13))
- : QString("color:#c0c0c0;font-size:13px;font-weight:600;"
- "background:transparent;%1")
- .arg(M(13)));
+ .arg(ui::colors::TEXT_PRIMARY(), M(13))
+ : QString("color:%1;font-size:13px;font-weight:600;"
+ "background:transparent;%2")
+ .arg(ui::colors::TEXT_PRIMARY(), M(13)));
card_vl->addWidget(title_lbl);
// ── Engagement ────────────────────────────────────────────────────────
@@ -406,7 +406,7 @@ void ForumPostListPanel::rebuild_feed() {
QString("color:%1;font-size:9px;font-weight:700;"
"background:rgba(220,38,38,0.08);padding:1px 6px;"
"border-radius:6px;%2")
- .arg(ui::colors::NEGATIVE, M(9)));
+ .arg(ui::colors::NEGATIVE(), M(9)));
eng_hl->addWidget(hot);
}
card_vl->addWidget(eng_row);
@@ -440,8 +440,8 @@ void ForumPostListPanel::rebuild_feed() {
"border-top:1px solid %3;font-size:12px;font-weight:600;%4}"
"QPushButton:hover{color:%5;"
"background:rgba(217,119,6,0.04);}")
- .arg(ui::colors::BG_SURFACE, ui::colors::TEXT_TERTIARY,
- ui::colors::BORDER_DIM, M(12), ui::colors::AMBER));
+ .arg(ui::colors::BG_SURFACE(), ui::colors::TEXT_TERTIARY(),
+ ui::colors::BORDER_DIM(), M(12), ui::colors::AMBER()));
int next = current_page_.page + 1;
connect(more_btn, &QPushButton::clicked, this,
[this, next]() { emit load_more_requested(next); });
diff --git a/fincept-qt/src/screens/forum/ForumPostReaderPanel.cpp b/fincept-qt/src/screens/forum/ForumPostReaderPanel.cpp
index 838641114..40b8eee8f 100644
--- a/fincept-qt/src/screens/forum/ForumPostReaderPanel.cpp
+++ b/fincept-qt/src/screens/forum/ForumPostReaderPanel.cpp
@@ -49,7 +49,7 @@ ForumPostReaderPanel::ForumPostReaderPanel(QWidget* parent) : QWidget(parent) {
}
void ForumPostReaderPanel::build_ui() {
- setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));
auto* root = new QVBoxLayout(this);
root->setContentsMargins(0, 0, 0, 0);
root->setSpacing(0);
@@ -58,7 +58,7 @@ void ForumPostReaderPanel::build_ui() {
// ── Page 0: empty placeholder ─────────────────────────────────────────────
auto* empty_page = new QWidget;
- empty_page->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
+ empty_page->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));
{
auto* vl = new QVBoxLayout(empty_page);
vl->setAlignment(Qt::AlignCenter);
@@ -68,20 +68,20 @@ void ForumPostReaderPanel::build_ui() {
icon->setAlignment(Qt::AlignCenter);
icon->setStyleSheet(
QString("color:%1;font-size:40px;background:transparent;")
- .arg(ui::colors::BORDER_DIM));
+ .arg(ui::colors::BORDER_DIM()));
auto* lbl = new QLabel("SELECT A POST");
lbl->setAlignment(Qt::AlignCenter);
lbl->setStyleSheet(
QString("color:%1;font-size:14px;font-weight:700;letter-spacing:2px;"
"background:transparent;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(14)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(14)));
auto* sub = new QLabel("Click any post from the feed to read it");
sub->setAlignment(Qt::AlignCenter);
sub->setStyleSheet(
QString("color:%1;font-size:11px;background:transparent;%2")
- .arg(ui::colors::TEXT_DIM, M(11)));
+ .arg(ui::colors::TEXT_DIM(), M(11)));
vl->addWidget(icon);
vl->addSpacing(4);
@@ -92,7 +92,7 @@ void ForumPostReaderPanel::build_ui() {
// ── Page 1: loading ───────────────────────────────────────────────────────
auto* load_page = new QWidget;
- load_page->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
+ load_page->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));
{
auto* vl = new QVBoxLayout(load_page);
vl->setAlignment(Qt::AlignCenter);
@@ -102,13 +102,13 @@ void ForumPostReaderPanel::build_ui() {
spin_label_->setAlignment(Qt::AlignCenter);
spin_label_->setStyleSheet(
QString("color:%1;font-size:24px;background:transparent;%2")
- .arg(ui::colors::AMBER, M(24)));
+ .arg(ui::colors::AMBER(), M(24)));
auto* lt = new QLabel("Loading...");
lt->setAlignment(Qt::AlignCenter);
lt->setStyleSheet(
QString("color:%1;font-size:11px;background:transparent;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(11)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(11)));
vl->addWidget(spin_label_);
vl->addWidget(lt);
@@ -124,7 +124,7 @@ void ForumPostReaderPanel::build_ui() {
// ── Page 2: content ───────────────────────────────────────────────────────
content_page_ = new QWidget;
- content_page_->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
+ content_page_->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));
auto* content_root = new QVBoxLayout(content_page_);
content_root->setContentsMargins(0, 0, 0, 0);
content_root->setSpacing(0);
@@ -133,9 +133,9 @@ void ForumPostReaderPanel::build_ui() {
auto* post_hdr = new QWidget;
post_hdr->setStyleSheet(
QString("background:qlineargradient(x1:0,y1:0,x2:0,y2:1,"
- "stop:0 #0e0e0e,stop:1 %1);"
- "border-bottom:1px solid %2;")
- .arg(ui::colors::BG_BASE, ui::colors::BORDER_DIM));
+ "stop:0 %1,stop:1 %2);"
+ "border-bottom:1px solid %3;")
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BG_BASE(), ui::colors::BORDER_DIM()));
auto* hdr_vl = new QVBoxLayout(post_hdr);
hdr_vl->setContentsMargins(20, 16, 20, 14);
hdr_vl->setSpacing(8);
@@ -153,12 +153,12 @@ void ForumPostReaderPanel::build_ui() {
QString("color:%1;font-size:9px;font-weight:700;letter-spacing:0.8px;"
"background:transparent;border:1px solid %1;"
"padding:1px 8px;border-radius:9px;%2")
- .arg(ui::colors::AMBER, M(9)));
+ .arg(ui::colors::AMBER(), M(9)));
meta_label_ = new QLabel;
meta_label_->setStyleSheet(
QString("color:%1;font-size:10px;background:transparent;%2")
- .arg(ui::colors::TEXT_DIM, M(10)));
+ .arg(ui::colors::TEXT_DIM(), M(10)));
chip_hl->addWidget(category_chip_);
chip_hl->addStretch();
@@ -171,7 +171,7 @@ void ForumPostReaderPanel::build_ui() {
title_label_->setStyleSheet(
QString("color:%1;font-size:16px;font-weight:700;line-height:1.4;"
"background:transparent;%2")
- .arg(ui::colors::TEXT_PRIMARY, M(16)));
+ .arg(ui::colors::TEXT_PRIMARY(), M(16)));
hdr_vl->addWidget(title_label_);
// Author row
@@ -181,7 +181,7 @@ void ForumPostReaderPanel::build_ui() {
author_label_->setOpenExternalLinks(false);
author_label_->setStyleSheet(
QString("color:%1;font-size:11px;background:transparent;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(11)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(11)));
connect(author_label_, &QLabel::linkActivated, this,
[this](const QString& link) {
if (link.startsWith("author:"))
@@ -195,7 +195,7 @@ void ForumPostReaderPanel::build_ui() {
hdr_sep->setStyleSheet(
QString("background:qlineargradient(x1:0,y1:0,x2:1,y2:0,"
"stop:0 %1,stop:0.3 %2,stop:1 transparent);")
- .arg(ui::colors::AMBER, ui::colors::BORDER_DIM));
+ .arg(ui::colors::AMBER(), ui::colors::BORDER_DIM()));
hdr_vl->addWidget(hdr_sep);
content_root->addWidget(post_hdr);
@@ -210,10 +210,10 @@ void ForumPostReaderPanel::build_ui() {
"border-radius:3px;}"
"QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical"
"{height:0;}")
- .arg(ui::colors::BG_BASE, ui::colors::BORDER_DIM));
+ .arg(ui::colors::BG_BASE(), ui::colors::BORDER_DIM()));
auto* scroll_w = new QWidget;
- scroll_w->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
+ scroll_w->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));
auto* scroll_vl = new QVBoxLayout(scroll_w);
scroll_vl->setContentsMargins(0, 0, 0, 0);
scroll_vl->setSpacing(0);
@@ -226,7 +226,7 @@ void ForumPostReaderPanel::build_ui() {
body_label_->setStyleSheet(
QString("color:%1;font-size:13px;line-height:1.7;background:transparent;"
"padding:16px 20px;border-bottom:1px solid %2;%3")
- .arg(ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM, M(13)));
+ .arg(ui::colors::TEXT_SECONDARY(), ui::colors::BORDER_DIM(), M(13)));
scroll_vl->addWidget(body_label_);
// ── Engagement bar ────────────────────────────────────────────────────────
@@ -234,7 +234,7 @@ void ForumPostReaderPanel::build_ui() {
eng_bar->setFixedHeight(40);
eng_bar->setStyleSheet(
QString("background:%1;border-bottom:1px solid %2;")
- .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
auto* eng_hl = new QHBoxLayout(eng_bar);
eng_hl->setContentsMargins(20, 0, 20, 0);
eng_hl->setSpacing(14);
@@ -249,7 +249,7 @@ void ForumPostReaderPanel::build_ui() {
"border-radius:13px;%2}"
"QPushButton:hover{background:rgba(217,119,6,0.12);"
"color:%3;border-color:rgba(217,119,6,0.5);}")
- .arg(ui::colors::TEXT_SECONDARY, M(10), ui::colors::AMBER));
+ .arg(ui::colors::TEXT_SECONDARY(), M(10), ui::colors::AMBER()));
connect(up_btn, &QPushButton::clicked, this, [this]() {
if (!current_detail_.post.post_uuid.isEmpty())
emit vote_post(current_detail_.post.post_uuid, "up");
@@ -258,17 +258,17 @@ void ForumPostReaderPanel::build_ui() {
likes_label_ = new QLabel("▲ 0");
likes_label_->setStyleSheet(
QString("color:%1;font-size:11px;background:transparent;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(11)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(11)));
replies_label_ = new QLabel("◆ 0 replies");
replies_label_->setStyleSheet(
QString("color:%1;font-size:11px;background:transparent;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(11)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(11)));
views_label_ = new QLabel("◉ 0 views");
views_label_->setStyleSheet(
QString("color:%1;font-size:11px;background:transparent;%2")
- .arg(ui::colors::TEXT_DIM, M(11)));
+ .arg(ui::colors::TEXT_DIM(), M(11)));
eng_hl->addWidget(up_btn);
eng_hl->addWidget(likes_label_);
@@ -282,19 +282,19 @@ void ForumPostReaderPanel::build_ui() {
com_hdr->setFixedHeight(28);
com_hdr->setStyleSheet(
QString("background:%1;border-bottom:1px solid %2;")
- .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
auto* com_hdr_hl = new QHBoxLayout(com_hdr);
com_hdr_hl->setContentsMargins(20, 0, 20, 0);
com_hdr_hl->setSpacing(6);
auto* com_dot = new QLabel("◆");
com_dot->setStyleSheet(
QString("color:%1;font-size:7px;background:transparent;")
- .arg(ui::colors::CYAN));
+ .arg(ui::colors::CYAN()));
auto* com_hdr_lbl = new QLabel("REPLIES");
com_hdr_lbl->setStyleSheet(
QString("color:%1;font-size:10px;font-weight:700;letter-spacing:1.5px;"
"background:transparent;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(10)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(10)));
com_hdr_hl->addWidget(com_dot);
com_hdr_hl->addWidget(com_hdr_lbl);
com_hdr_hl->addStretch();
@@ -303,7 +303,7 @@ void ForumPostReaderPanel::build_ui() {
// Comments area
comments_area_ = new QWidget;
comments_area_->setStyleSheet(
- QString("background:%1;").arg(ui::colors::BG_BASE));
+ QString("background:%1;").arg(ui::colors::BG_BASE()));
comments_layout_ = new QVBoxLayout(comments_area_);
comments_layout_->setContentsMargins(0, 0, 0, 0);
comments_layout_->setSpacing(0);
@@ -318,7 +318,7 @@ void ForumPostReaderPanel::build_ui() {
compose->setFixedHeight(48);
compose->setStyleSheet(
QString("background:%1;border-top:1px solid %2;")
- .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
auto* compose_hl = new QHBoxLayout(compose);
compose_hl->setContentsMargins(16, 8, 16, 8);
compose_hl->setSpacing(8);
@@ -332,9 +332,9 @@ void ForumPostReaderPanel::build_ui() {
"border-radius:4px;%3}"
"QLineEdit:focus{border-color:%4;color:%5;}"
"QLineEdit::placeholder{color:%6;}")
- .arg(ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM,
- M(12), ui::colors::BORDER_BRIGHT,
- ui::colors::TEXT_PRIMARY, ui::colors::TEXT_DIM));
+ .arg(ui::colors::TEXT_SECONDARY(), ui::colors::BORDER_DIM(),
+ M(12), ui::colors::BORDER_BRIGHT(),
+ ui::colors::TEXT_PRIMARY(), ui::colors::TEXT_DIM()));
auto* send_btn = new QPushButton("Reply");
send_btn->setFixedSize(72, 32);
@@ -345,7 +345,7 @@ void ForumPostReaderPanel::build_ui() {
"font-weight:700;border-radius:4px;%2}"
"QPushButton:hover{background:rgba(217,119,6,0.2);"
"color:%3;border-color:rgba(217,119,6,0.5);}")
- .arg(ui::colors::TEXT_SECONDARY, M(11), ui::colors::AMBER));
+ .arg(ui::colors::TEXT_SECONDARY(), M(11), ui::colors::AMBER()));
auto submit = [this]() {
QString text = reply_input_->text().trimmed();
@@ -412,8 +412,8 @@ void ForumPostReaderPanel::show_post(const services::ForumPostDetail& detail) {
"&nbsp;"
"<a href='author:%4' style='color:%5;text-decoration:none;"
"font-family:Consolas;font-size:11px;font-weight:600;'>%6</a>")
- .arg(av_color, ui::colors::BG_BASE, initials,
- detail.post.author_name, ui::colors::TEXT_SECONDARY,
+ .arg(av_color, ui::colors::BG_BASE(), initials,
+ detail.post.author_name, ui::colors::TEXT_SECONDARY(),
detail.post.author_display_name));
body_label_->setText(detail.post.content);
@@ -421,8 +421,8 @@ void ForumPostReaderPanel::show_post(const services::ForumPostDetail& detail) {
// Engagement
bool voted = (detail.post.user_vote == "up");
QString lc = voted || detail.post.likes > 0
- ? ui::colors::AMBER
- : ui::colors::TEXT_DIM;
+ ? ui::colors::AMBER()
+ : ui::colors::TEXT_DIM();
likes_label_->setText(QString("▲ %1").arg(detail.post.likes));
likes_label_->setStyleSheet(
QString("color:%1;font-size:11px;font-weight:600;"
@@ -460,14 +460,14 @@ void ForumPostReaderPanel::rebuild_comments() {
icon->setAlignment(Qt::AlignCenter);
icon->setStyleSheet(
QString("color:%1;font-size:18px;background:transparent;")
- .arg(ui::colors::BORDER_DIM));
+ .arg(ui::colors::BORDER_DIM()));
auto* lbl = new QLabel("NO REPLIES YET");
lbl->setAlignment(Qt::AlignCenter);
lbl->setStyleSheet(
QString("color:%1;font-size:11px;font-weight:700;letter-spacing:1px;"
"background:transparent;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(11)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(11)));
vl->addWidget(icon);
vl->addWidget(lbl);
@@ -482,8 +482,8 @@ void ForumPostReaderPanel::rebuild_comments() {
auto* row = new QWidget;
row->setStyleSheet(
QString("background:%1;border-bottom:1px solid %2;")
- .arg(i % 2 == 0 ? ui::colors::BG_BASE : ui::colors::BG_SURFACE,
- ui::colors::BORDER_DIM));
+ .arg(i % 2 == 0 ? ui::colors::BG_BASE() : ui::colors::BG_SURFACE(),
+ ui::colors::BORDER_DIM()));
auto* row_vl = new QVBoxLayout(row);
row_vl->setContentsMargins(20, 10, 20, 8);
row_vl->setSpacing(5);
@@ -506,26 +506,26 @@ void ForumPostReaderPanel::rebuild_comments() {
av->setStyleSheet(
QString("color:%1;font-size:9px;font-weight:700;background:%2;"
"border-radius:11px;%3")
- .arg(ui::colors::BG_BASE, avc, M(9)));
+ .arg(ui::colors::BG_BASE(), avc, M(9)));
auto* author_lbl = new QLabel(c.author_display_name);
author_lbl->setStyleSheet(
QString("color:%1;font-size:11px;font-weight:600;"
"background:transparent;%2")
- .arg(ui::colors::TEXT_PRIMARY, M(11)));
+ .arg(ui::colors::TEXT_PRIMARY(), M(11)));
auto* time_lbl = new QLabel(rel_time(c.created_at));
time_lbl->setStyleSheet(
QString("color:%1;font-size:10px;background:transparent;%2")
- .arg(ui::colors::TEXT_DIM, M(10)));
+ .arg(ui::colors::TEXT_DIM(), M(10)));
bool voted = (c.user_vote == "up");
auto* likes_lbl = new QLabel(QString("▲ %1").arg(c.likes));
likes_lbl->setStyleSheet(
QString("color:%1;font-size:10px;font-weight:600;"
"background:transparent;%2")
- .arg(voted || c.likes > 0 ? ui::colors::AMBER
- : ui::colors::TEXT_DIM,
+ .arg(voted || c.likes > 0 ? ui::colors::AMBER()
+ : ui::colors::TEXT_DIM(),
M(10)));
com_hl->addWidget(thread_line);
@@ -545,7 +545,7 @@ void ForumPostReaderPanel::rebuild_comments() {
body->setStyleSheet(
QString("color:%1;font-size:12px;line-height:1.5;"
"background:transparent;padding-left:28px;%2")
- .arg(ui::colors::TEXT_SECONDARY, M(12)));
+ .arg(ui::colors::TEXT_SECONDARY(), M(12)));
row_vl->addWidget(body);
// ── Action row ────────────────────────────────────────────────────────
@@ -570,16 +570,16 @@ void ForumPostReaderPanel::rebuild_comments() {
: QString("QPushButton{background:transparent;color:%1;"
"border:none;font-size:10px;padding:0;%2}"
"QPushButton:hover{color:%3;}")
- .arg(ui::colors::TEXT_DIM, M(10), color));
+ .arg(ui::colors::TEXT_DIM(), M(10), color));
auto uuid = c.comment_uuid;
connect(btn, &QPushButton::clicked, this,
[this, uuid, vtype]() { emit vote_comment(uuid, vtype); });
return btn;
};
- act_hl->addWidget(make_act("▲ upvote", ui::colors::AMBER, "up"));
+ act_hl->addWidget(make_act("▲ upvote", ui::colors::AMBER(), "up"));
act_hl->addWidget(
- make_act("▼ downvote", ui::colors::TEXT_TERTIARY, "down"));
+ make_act("▼ downvote", ui::colors::TEXT_TERTIARY(), "down"));
act_hl->addStretch();
row_vl->addWidget(act_row);
diff --git a/fincept-qt/src/screens/forum/ForumScreen.cpp b/fincept-qt/src/screens/forum/ForumScreen.cpp
index 982ecbb1a..a187326a6 100644
--- a/fincept-qt/src/screens/forum/ForumScreen.cpp
+++ b/fincept-qt/src/screens/forum/ForumScreen.cpp
@@ -2,6 +2,7 @@
#include "screens/forum/ForumScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "screens/forum/ForumFeedPanel.h"
#include "screens/forum/ForumSidebarPanel.h"
#include "screens/forum/ForumThreadPanel.h"
@@ -37,7 +38,7 @@ ForumScreen::ForumScreen(QWidget* parent) : QWidget(parent) {
// build_ui — 3-column: sidebar | feed | thread (via splitter)
// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
void ForumScreen::build_ui() {
- setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));
auto* root = new QVBoxLayout(this);
root->setContentsMargins(0, 0, 0, 0);
root->setSpacing(0);
@@ -48,7 +49,7 @@ void ForumScreen::build_ui() {
splitter_->setStyleSheet(
QString("QSplitter{background:%1;}"
"QSplitter::handle{background:%2;}")
- .arg(ui::colors::BG_BASE, ui::colors::BORDER_DIM));
+ .arg(ui::colors::BG_BASE(), ui::colors::BORDER_DIM()));
// ── Left: Sidebar ─────────────────────────────────────────────────────────
sidebar_ = new ForumSidebarPanel;
@@ -190,7 +191,7 @@ void ForumScreen::build_ui() {
QString("QDialog{background:%1;border:1px solid %2;}"
"QLabel{background:transparent;"
"font-family:'Consolas','Courier New',monospace;}")
- .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
auto* vl = new QVBoxLayout(dlg);
vl->setContentsMargins(24, 20, 24, 18);
vl->setSpacing(10);
@@ -202,7 +203,7 @@ void ForumScreen::build_ui() {
hdr->setStyleSheet(
QString("background:qlineargradient(x1:0,y1:0,x2:1,y2:0,"
"stop:0 %1,stop:0.5 %2,stop:1 transparent);")
- .arg(avc, ui::colors::AMBER));
+ .arg(avc, ui::colors::AMBER()));
vl->addWidget(hdr);
// Avatar + name
@@ -218,7 +219,7 @@ void ForumScreen::build_ui() {
av->setStyleSheet(
QString("color:%1;font-size:16px;font-weight:700;"
"background:%2;border-radius:24px;%3")
- .arg(ui::colors::BG_BASE, avc, M(16)));
+ .arg(ui::colors::BG_BASE(), avc, M(16)));
auto* info = new QVBoxLayout;
info->setSpacing(2);
@@ -229,7 +230,7 @@ void ForumScreen::build_ui() {
auto* un = new QLabel("@" + profile.username);
un->setStyleSheet(
QString("color:%1;font-size:11px;%2")
- .arg(ui::colors::TEXT_SECONDARY, M(11)));
+ .arg(ui::colors::TEXT_SECONDARY(), M(11)));
info->addWidget(nm);
info->addWidget(un);
th->addWidget(av);
@@ -241,7 +242,7 @@ void ForumScreen::build_ui() {
bio->setWordWrap(true);
bio->setStyleSheet(
QString("color:%1;font-size:12px;font-style:italic;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(12)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(12)));
vl->addWidget(bio);
}
@@ -249,7 +250,7 @@ void ForumScreen::build_ui() {
sep->setFixedHeight(1);
sep->setStyleSheet(
QString("background:%1;border:none;")
- .arg(ui::colors::BORDER_DIM));
+ .arg(ui::colors::BORDER_DIM()));
vl->addWidget(sep);
// Stats grid
@@ -276,16 +277,16 @@ void ForumScreen::build_ui() {
l->setAlignment(Qt::AlignCenter);
l->setStyleSheet(
QString("color:%1;font-size:9px;letter-spacing:1px;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(9)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(9)));
cv->addWidget(v);
cv->addWidget(l);
return cell;
};
- gh->addWidget(mk_stat(QString::number(profile.reputation), "REP", ui::colors::AMBER));
- gh->addWidget(mk_stat(QString::number(profile.posts_count), "POSTS", ui::colors::TEXT_PRIMARY));
- gh->addWidget(mk_stat(QString::number(profile.comments_count), "REPLIES", ui::colors::CYAN));
- gh->addWidget(mk_stat(QString::number(profile.likes_received), "LIKES", ui::colors::POSITIVE));
+ gh->addWidget(mk_stat(QString::number(profile.reputation), "REP", ui::colors::AMBER()));
+ gh->addWidget(mk_stat(QString::number(profile.posts_count), "POSTS", ui::colors::TEXT_PRIMARY()));
+ gh->addWidget(mk_stat(QString::number(profile.comments_count), "REPLIES", ui::colors::CYAN()));
+ gh->addWidget(mk_stat(QString::number(profile.likes_received), "LIKES", ui::colors::POSITIVE()));
vl->addWidget(grid);
if (profile.is_own_profile) {
@@ -299,9 +300,9 @@ void ForumScreen::build_ui() {
"QPushButton:hover{color:%4;"
"border-color:rgba(217,119,6,0.5);"
"background:rgba(217,119,6,0.15);}")
- .arg(ui::colors::TEXT_TERTIARY,
- ui::colors::BORDER_DIM,
- M(11), ui::colors::AMBER));
+ .arg(ui::colors::TEXT_TERTIARY(),
+ ui::colors::BORDER_DIM(),
+ M(11), ui::colors::AMBER()));
connect(edit_btn, &QPushButton::clicked, this,
[this, dlg, profile]() {
dlg->accept();
@@ -400,6 +401,8 @@ void ForumScreen::on_category_selected(int id, const QString& name,
active_category_id_ = id;
active_category_name_ = name;
active_category_color_ = color;
+ current_detail_uuid_.clear();
+ ScreenStateManager::instance().notify_changed(this);
feed_->set_header(name);
feed_->set_loading(true);
feed_->clear_active();
@@ -418,6 +421,7 @@ void ForumScreen::on_category_selected(int id, const QString& name,
void ForumScreen::on_post_selected(const services::ForumPost& post) {
current_detail_uuid_ = post.post_uuid;
+ ScreenStateManager::instance().notify_changed(this);
feed_->set_active_post(post.post_uuid);
thread_->set_loading(true);
main_stack_->setCurrentIndex(1);
@@ -444,7 +448,7 @@ void ForumScreen::on_search(const QString& query) {
services::ForumService::instance().search(
query, 1, [this](bool ok, services::ForumPostsPage p) {
if (ok)
- feed_->set_posts(p, ui::colors::CYAN);
+ feed_->set_posts(p, ui::colors::CYAN());
else
feed_->set_loading(false);
});
@@ -461,7 +465,7 @@ void ForumScreen::on_trending() {
services::ForumService::instance().fetch_trending(
[this](bool ok, services::ForumPostsPage p) {
if (ok)
- feed_->set_posts(p, ui::colors::AMBER);
+ feed_->set_posts(p, ui::colors::AMBER());
else
feed_->set_loading(false);
});
@@ -486,9 +490,9 @@ void ForumScreen::show_new_post_dialog(int category_id) {
"border:1px solid %2;font-size:13px;"
"font-family:'Consolas','Courier New',monospace;padding:8px 12px;}"
"QLineEdit:focus,QTextEdit:focus{border-color:%6;}")
- .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM,
- ui::colors::TEXT_SECONDARY, ui::colors::BG_BASE,
- ui::colors::TEXT_PRIMARY, ui::colors::BORDER_BRIGHT));
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM(),
+ ui::colors::TEXT_SECONDARY(), ui::colors::BG_BASE(),
+ ui::colors::TEXT_PRIMARY(), ui::colors::BORDER_BRIGHT()));
auto* vl = new QVBoxLayout(dlg);
vl->setContentsMargins(24, 20, 24, 18);
vl->setSpacing(12);
@@ -499,19 +503,19 @@ void ForumScreen::show_new_post_dialog(int category_id) {
accent->setStyleSheet(
QString("background:qlineargradient(x1:0,y1:0,x2:1,y2:0,"
"stop:0 %1,stop:0.6 %2,stop:1 transparent);")
- .arg(ui::colors::AMBER, ui::colors::ORANGE));
+ .arg(ui::colors::AMBER(), ui::colors::ORANGE()));
vl->addWidget(accent);
auto* hdr = new QLabel("CREATE NEW POST");
hdr->setStyleSheet(
QString("color:%1;font-size:15px;font-weight:700;letter-spacing:1.5px;%2")
- .arg(ui::colors::TEXT_PRIMARY, M(15)));
+ .arg(ui::colors::TEXT_PRIMARY(), M(15)));
vl->addWidget(hdr);
auto* sub = new QLabel("Share your insights with the community");
sub->setStyleSheet(
QString("color:%1;font-size:11px;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(11)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(11)));
vl->addWidget(sub);
vl->addSpacing(4);
@@ -519,7 +523,7 @@ void ForumScreen::show_new_post_dialog(int category_id) {
auto* title_lbl = new QLabel("TITLE");
title_lbl->setStyleSheet(
QString("color:%1;font-size:10px;font-weight:700;letter-spacing:1px;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(10)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(10)));
auto* title_edit = new QLineEdit;
title_edit->setPlaceholderText("Give your post a descriptive title...");
title_edit->setFixedHeight(36);
@@ -527,7 +531,7 @@ void ForumScreen::show_new_post_dialog(int category_id) {
auto* content_lbl = new QLabel("CONTENT");
content_lbl->setStyleSheet(
QString("color:%1;font-size:10px;font-weight:700;letter-spacing:1px;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(10)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(10)));
auto* body_edit = new QTextEdit;
body_edit->setPlaceholderText("Write your thoughts...");
@@ -550,8 +554,8 @@ void ForumScreen::show_new_post_dialog(int category_id) {
"border:1px solid %2;font-size:11px;font-weight:700;"
"padding:0 20px;%3}"
"QPushButton:hover{color:%4;border-color:%5;}")
- .arg(ui::colors::TEXT_TERTIARY, ui::colors::BORDER_DIM,
- M(11), ui::colors::TEXT_SECONDARY, ui::colors::BORDER_MED));
+ .arg(ui::colors::TEXT_TERTIARY(), ui::colors::BORDER_DIM(),
+ M(11), ui::colors::TEXT_SECONDARY(), ui::colors::BORDER_MED()));
connect(cancel, &QPushButton::clicked, dlg, &QDialog::reject);
auto* submit = new QPushButton("PUBLISH POST");
@@ -564,7 +568,7 @@ void ForumScreen::show_new_post_dialog(int category_id) {
"QPushButton:hover{color:%3;"
"border-color:rgba(217,119,6,0.6);"
"background:rgba(217,119,6,0.2);}")
- .arg(ui::colors::TEXT_SECONDARY, M(11), ui::colors::AMBER));
+ .arg(ui::colors::TEXT_SECONDARY(), M(11), ui::colors::AMBER()));
connect(submit, &QPushButton::clicked, this,
[this, dlg, title_edit, body_edit, category_id]() {
QString title = title_edit->text().trimmed();
@@ -603,9 +607,9 @@ void ForumScreen::show_edit_profile_dialog(const services::ForumProfile& profile
"font-size:12px;font-family:'Consolas','Courier New',monospace;"
"padding:6px 12px;}"
"QLineEdit:focus{border-color:%6;}")
- .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM,
- ui::colors::TEXT_SECONDARY, ui::colors::BG_BASE,
- ui::colors::TEXT_PRIMARY, ui::colors::BORDER_BRIGHT));
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM(),
+ ui::colors::TEXT_SECONDARY(), ui::colors::BG_BASE(),
+ ui::colors::TEXT_PRIMARY(), ui::colors::BORDER_BRIGHT()));
auto* vl = new QVBoxLayout(dlg);
vl->setContentsMargins(24, 20, 24, 18);
vl->setSpacing(10);
@@ -616,13 +620,13 @@ void ForumScreen::show_edit_profile_dialog(const services::ForumProfile& profile
accent->setStyleSheet(
QString("background:qlineargradient(x1:0,y1:0,x2:1,y2:0,"
"stop:0 %1,stop:0.6 %2,stop:1 transparent);")
- .arg(ui::colors::CYAN, ui::colors::AMBER));
+ .arg(ui::colors::CYAN(), ui::colors::AMBER()));
vl->addWidget(accent);
auto* hdr = new QLabel("EDIT PROFILE");
hdr->setStyleSheet(
QString("color:%1;font-size:15px;font-weight:700;letter-spacing:1.5px;%2")
- .arg(ui::colors::TEXT_PRIMARY, M(15)));
+ .arg(ui::colors::TEXT_PRIMARY(), M(15)));
vl->addWidget(hdr);
vl->addSpacing(4);
@@ -630,7 +634,7 @@ void ForumScreen::show_edit_profile_dialog(const services::ForumProfile& profile
auto* l = new QLabel(lbl);
l->setStyleSheet(
QString("color:%1;font-size:10px;font-weight:700;letter-spacing:1px;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(10)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(10)));
vl->addWidget(l);
auto* e = new QLineEdit(val);
e->setFixedHeight(30);
@@ -655,8 +659,8 @@ void ForumScreen::show_edit_profile_dialog(const services::ForumProfile& profile
"border:1px solid %2;font-size:11px;font-weight:700;"
"padding:0 20px;%3}"
"QPushButton:hover{color:%4;}")
- .arg(ui::colors::TEXT_TERTIARY, ui::colors::BORDER_DIM,
- M(11), ui::colors::TEXT_SECONDARY));
+ .arg(ui::colors::TEXT_TERTIARY(), ui::colors::BORDER_DIM(),
+ M(11), ui::colors::TEXT_SECONDARY()));
connect(cc, &QPushButton::clicked, dlg, &QDialog::reject);
auto* sc = new QPushButton("SAVE CHANGES");
@@ -669,7 +673,7 @@ void ForumScreen::show_edit_profile_dialog(const services::ForumProfile& profile
"QPushButton:hover{color:%3;"
"border-color:rgba(217,119,6,0.6);"
"background:rgba(217,119,6,0.2);}")
- .arg(ui::colors::TEXT_SECONDARY, M(11), ui::colors::AMBER));
+ .arg(ui::colors::TEXT_SECONDARY(), M(11), ui::colors::AMBER()));
connect(sc, &QPushButton::clicked, this,
[this, dlg, name_e, bio_e, sig_e, col_e]() {
dlg->accept();
@@ -696,4 +700,31 @@ void ForumScreen::show_edit_profile_dialog(const services::ForumProfile& profile
dlg->exec();
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap ForumScreen::save_state() const {
+ return {
+ {"category_id", active_category_id_},
+ {"category_name", active_category_name_},
+ {"category_color",active_category_color_},
+ {"detail_uuid", current_detail_uuid_},
+ };
+}
+
+void ForumScreen::restore_state(const QVariantMap& state) {
+ const int cat_id = state.value("category_id", 0).toInt();
+ const QString cat_name = state.value("category_name").toString();
+ const QString cat_color = state.value("category_color").toString();
+ const QString uuid = state.value("detail_uuid").toString();
+
+ if (cat_id > 0 && !cat_name.isEmpty()) {
+ // Trigger normal category-load flow (also sets active_category_*)
+ on_category_selected(cat_id, cat_name,
+ cat_color.isEmpty() ? ui::colors::INFO() : cat_color);
+ }
+ // Individual post detail can't be re-fetched without a full ForumPost object;
+ // we record uuid for reference but leave the feed view active on restore.
+ current_detail_uuid_ = uuid;
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/forum/ForumScreen.h b/fincept-qt/src/screens/forum/ForumScreen.h
index 96e21ce71..95e6072d4 100644
--- a/fincept-qt/src/screens/forum/ForumScreen.h
+++ b/fincept-qt/src/screens/forum/ForumScreen.h
@@ -1,5 +1,6 @@
// src/screens/forum/ForumScreen.h
#pragma once
+#include "screens/IStatefulScreen.h"
#include "services/forum/ForumModels.h"
#include <QHBoxLayout>
@@ -15,11 +16,16 @@ class ForumFeedPanel;
class ForumThreadPanel;
class ForumSidebarPanel;
-class ForumScreen : public QWidget {
+class ForumScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit ForumScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "forum"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) override;
diff --git a/fincept-qt/src/screens/forum/ForumSidebarPanel.cpp b/fincept-qt/src/screens/forum/ForumSidebarPanel.cpp
index 4cbc5cb7e..f08593410 100644
--- a/fincept-qt/src/screens/forum/ForumSidebarPanel.cpp
+++ b/fincept-qt/src/screens/forum/ForumSidebarPanel.cpp
@@ -31,7 +31,7 @@ ForumSidebarPanel::ForumSidebarPanel(QWidget* parent) : QWidget(parent) {
void ForumSidebarPanel::build_ui() {
setFixedWidth(240);
setStyleSheet(QString("background:%1;border-right:1px solid %2;")
- .arg(ui::colors::BG_BASE, ui::colors::BORDER_DIM));
+ .arg(ui::colors::BG_BASE(), ui::colors::BORDER_DIM()));
auto* root = new QVBoxLayout(this);
root->setContentsMargins(0, 0, 0, 0);
@@ -42,9 +42,9 @@ void ForumSidebarPanel::build_ui() {
brand->setFixedHeight(56);
brand->setStyleSheet(
QString("background:qlineargradient(x1:0,y1:0,x2:0,y2:1,"
- "stop:0 #0f0f0f,stop:1 %1);"
- "border-bottom:1px solid %2;")
- .arg(ui::colors::BG_BASE, ui::colors::BORDER_DIM));
+ "stop:0 %1,stop:1 %2);"
+ "border-bottom:1px solid %3;")
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BG_BASE(), ui::colors::BORDER_DIM()));
auto* brand_vl = new QVBoxLayout(brand);
brand_vl->setContentsMargins(16, 10, 16, 0);
brand_vl->setSpacing(2);
@@ -58,13 +58,13 @@ void ForumSidebarPanel::build_ui() {
auto* brand_icon = new QLabel("◈");
brand_icon->setStyleSheet(
QString("color:%1;font-size:20px;background:transparent;")
- .arg(ui::colors::AMBER));
+ .arg(ui::colors::AMBER()));
auto* brand_title = new QLabel("COMMUNITY");
brand_title->setStyleSheet(
QString("color:%1;font-size:13px;font-weight:700;letter-spacing:2px;"
"background:transparent;%2")
- .arg(ui::colors::TEXT_PRIMARY, M(13)));
+ .arg(ui::colors::TEXT_PRIMARY(), M(13)));
brand_hl->addWidget(brand_icon);
brand_hl->addWidget(brand_title, 1);
@@ -76,7 +76,7 @@ void ForumSidebarPanel::build_ui() {
brand_accent_->setStyleSheet(
QString("background:qlineargradient(x1:0,y1:0,x2:1,y2:0,"
"stop:0 %1,stop:0.4 %2,stop:0.7 %3,stop:1 transparent);")
- .arg(ui::colors::AMBER, ui::colors::ORANGE, ui::colors::CYAN));
+ .arg(ui::colors::AMBER(), ui::colors::ORANGE(), ui::colors::CYAN()));
brand_vl->addWidget(brand_accent_);
root->addWidget(brand);
@@ -85,7 +85,7 @@ void ForumSidebarPanel::build_ui() {
auto* profile_card = new QWidget;
profile_card->setStyleSheet(
QString("background:%1;border-bottom:1px solid %2;")
- .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
auto* pc_hl = new QHBoxLayout(profile_card);
pc_hl->setContentsMargins(14, 12, 14, 12);
pc_hl->setSpacing(12);
@@ -96,7 +96,7 @@ void ForumSidebarPanel::build_ui() {
avatar_lbl_->setStyleSheet(
QString("color:%1;font-size:14px;font-weight:700;background:%2;"
"border-radius:18px;%3")
- .arg(ui::colors::BG_BASE, ui::colors::AMBER, M(14)));
+ .arg(ui::colors::BG_BASE(), ui::colors::AMBER(), M(14)));
auto* profile_info = new QVBoxLayout;
profile_info->setSpacing(1);
@@ -105,17 +105,17 @@ void ForumSidebarPanel::build_ui() {
profile_name_lbl_ = new QLabel("Loading...");
profile_name_lbl_->setStyleSheet(
QString("color:%1;font-size:12px;font-weight:700;background:transparent;%2")
- .arg(ui::colors::TEXT_PRIMARY, M(12)));
+ .arg(ui::colors::TEXT_PRIMARY(), M(12)));
profile_sub_lbl_ = new QLabel("...");
profile_sub_lbl_->setStyleSheet(
QString("color:%1;font-size:10px;background:transparent;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(10)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(10)));
profile_rep_lbl_ = new QLabel;
profile_rep_lbl_->setStyleSheet(
QString("color:%1;font-size:10px;font-weight:700;background:transparent;%2")
- .arg(ui::colors::AMBER, M(10)));
+ .arg(ui::colors::AMBER(), M(10)));
profile_info->addWidget(profile_name_lbl_);
profile_info->addWidget(profile_sub_lbl_);
@@ -130,7 +130,7 @@ void ForumSidebarPanel::build_ui() {
search_wrap->setFixedHeight(40);
search_wrap->setStyleSheet(
QString("background:%1;border-bottom:1px solid %2;")
- .arg(ui::colors::BG_BASE, ui::colors::BORDER_DIM));
+ .arg(ui::colors::BG_BASE(), ui::colors::BORDER_DIM()));
auto* search_hl = new QHBoxLayout(search_wrap);
search_hl->setContentsMargins(12, 6, 12, 6);
search_hl->setSpacing(6);
@@ -138,7 +138,7 @@ void ForumSidebarPanel::build_ui() {
auto* search_icon = new QLabel("⌕");
search_icon->setStyleSheet(
QString("color:%1;font-size:14px;background:transparent;")
- .arg(ui::colors::TEXT_TERTIARY));
+ .arg(ui::colors::TEXT_TERTIARY()));
search_icon->setFixedWidth(16);
search_input_ = new QLineEdit;
@@ -150,9 +150,9 @@ void ForumSidebarPanel::build_ui() {
"QLineEdit:focus{border-color:%4;color:%5;"
"background:rgba(255,255,255,0.05);}"
"QLineEdit::placeholder{color:%6;}")
- .arg(ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM,
- M(11), ui::colors::BORDER_BRIGHT,
- ui::colors::TEXT_PRIMARY, ui::colors::TEXT_DIM));
+ .arg(ui::colors::TEXT_SECONDARY(), ui::colors::BORDER_DIM(),
+ M(11), ui::colors::BORDER_BRIGHT(),
+ ui::colors::TEXT_PRIMARY(), ui::colors::TEXT_DIM()));
connect(search_input_, &QLineEdit::returnPressed, this,
[this]() { emit search_requested(search_input_->text().trimmed()); });
@@ -169,10 +169,10 @@ void ForumSidebarPanel::build_ui() {
scroll->setStyleSheet(
QString("QScrollArea{border:none;background:%1;}"
"QScrollBar:vertical{width:0px;}")
- .arg(ui::colors::BG_BASE));
+ .arg(ui::colors::BG_BASE()));
auto* body = new QWidget;
- body->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
+ body->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));
auto* body_vl = new QVBoxLayout(body);
body_vl->setContentsMargins(0, 0, 0, 0);
body_vl->setSpacing(0);
@@ -182,14 +182,14 @@ void ForumSidebarPanel::build_ui() {
stats_hdr->setFixedHeight(22);
stats_hdr->setStyleSheet(
QString("background:%1;border-bottom:1px solid %2;")
- .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
auto* sh_hl = new QHBoxLayout(stats_hdr);
sh_hl->setContentsMargins(14, 0, 14, 0);
auto* sh_lbl = new QLabel("ACTIVITY");
sh_lbl->setStyleSheet(
QString("color:%1;font-size:9px;font-weight:700;letter-spacing:1.5px;"
"background:transparent;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(9)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(9)));
sh_hl->addWidget(sh_lbl);
sh_hl->addStretch();
body_vl->addWidget(stats_hdr);
@@ -197,7 +197,7 @@ void ForumSidebarPanel::build_ui() {
auto* stats_row = new QWidget;
stats_row->setStyleSheet(
QString("background:%1;border-bottom:1px solid %2;")
- .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
auto* sr_hl = new QHBoxLayout(stats_row);
sr_hl->setContentsMargins(0, 0, 0, 0);
sr_hl->setSpacing(0);
@@ -216,15 +216,15 @@ void ForumSidebarPanel::build_ui() {
auto* l = new QLabel(label);
l->setStyleSheet(
QString("color:%1;font-size:8px;letter-spacing:0.8px;background:transparent;%2")
- .arg(ui::colors::TEXT_DIM, M(8)));
+ .arg(ui::colors::TEXT_DIM(), M(8)));
cvl->addWidget(out);
cvl->addWidget(l);
return cell;
};
- sr_hl->addWidget(mk_mini_stat("POSTS", ui::colors::TEXT_PRIMARY, stat_posts_val_));
- sr_hl->addWidget(mk_mini_stat("REPLIES", ui::colors::CYAN, stat_comments_val_));
- sr_hl->addWidget(mk_mini_stat("TODAY", ui::colors::AMBER, stat_active_val_));
+ sr_hl->addWidget(mk_mini_stat("POSTS", ui::colors::TEXT_PRIMARY(), stat_posts_val_));
+ sr_hl->addWidget(mk_mini_stat("REPLIES", ui::colors::CYAN(), stat_comments_val_));
+ sr_hl->addWidget(mk_mini_stat("TODAY", ui::colors::AMBER(), stat_active_val_));
body_vl->addWidget(stats_row);
// ── Trending button ───────────────────────────────────────────────────────
@@ -237,8 +237,8 @@ void ForumSidebarPanel::build_ui() {
"border-bottom:1px solid %2;text-align:left;padding:0 14px;"
"font-size:11px;font-weight:600;%3}"
"QPushButton:hover{background:rgba(217,119,6,0.1);color:%4;}")
- .arg(ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM,
- M(11), ui::colors::AMBER));
+ .arg(ui::colors::TEXT_SECONDARY(), ui::colors::BORDER_DIM(),
+ M(11), ui::colors::AMBER()));
connect(trending_btn, &QPushButton::clicked, this,
&ForumSidebarPanel::trending_clicked);
body_vl->addWidget(trending_btn);
@@ -248,19 +248,19 @@ void ForumSidebarPanel::build_ui() {
chan_hdr->setFixedHeight(26);
chan_hdr->setStyleSheet(
QString("background:%1;border-bottom:1px solid %2;")
- .arg(ui::colors::BG_BASE, ui::colors::BORDER_DIM));
+ .arg(ui::colors::BG_BASE(), ui::colors::BORDER_DIM()));
auto* ch_hl = new QHBoxLayout(chan_hdr);
ch_hl->setContentsMargins(14, 0, 14, 0);
ch_hl->setSpacing(6);
auto* ch_dot = new QLabel("●");
ch_dot->setStyleSheet(
QString("color:%1;font-size:6px;background:transparent;")
- .arg(ui::colors::AMBER));
+ .arg(ui::colors::AMBER()));
auto* ch_lbl = new QLabel("CHANNELS");
ch_lbl->setStyleSheet(
QString("color:%1;font-size:9px;font-weight:700;letter-spacing:1.5px;"
"background:transparent;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(9)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(9)));
auto* new_post_btn = new QPushButton("+");
new_post_btn->setFixedSize(18, 18);
@@ -270,7 +270,7 @@ void ForumSidebarPanel::build_ui() {
QString("QPushButton{background:transparent;color:%1;border:none;"
"font-size:14px;font-weight:700;%2}"
"QPushButton:hover{color:%3;}")
- .arg(ui::colors::TEXT_DIM, M(14), ui::colors::AMBER));
+ .arg(ui::colors::TEXT_DIM(), M(14), ui::colors::AMBER()));
connect(new_post_btn, &QPushButton::clicked, this, [this]() {
int cat_id = active_category_id_ > 0 ? active_category_id_ : 1;
emit new_post_requested(cat_id);
@@ -295,19 +295,19 @@ void ForumSidebarPanel::build_ui() {
lb_hdr->setStyleSheet(
QString("background:%1;border-top:1px solid %2;"
"border-bottom:1px solid %2;")
- .arg(ui::colors::BG_BASE, ui::colors::BORDER_DIM));
+ .arg(ui::colors::BG_BASE(), ui::colors::BORDER_DIM()));
auto* lb_hl = new QHBoxLayout(lb_hdr);
lb_hl->setContentsMargins(14, 0, 14, 0);
lb_hl->setSpacing(6);
auto* lb_dot = new QLabel("★");
lb_dot->setStyleSheet(
QString("color:%1;font-size:8px;background:transparent;")
- .arg(ui::colors::AMBER));
+ .arg(ui::colors::AMBER()));
auto* lb_lbl = new QLabel("LEADERBOARD");
lb_lbl->setStyleSheet(
QString("color:%1;font-size:9px;font-weight:700;letter-spacing:1.5px;"
"background:transparent;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(9)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(9)));
lb_hl->addWidget(lb_dot);
lb_hl->addWidget(lb_lbl);
lb_hl->addStretch();
@@ -323,7 +323,7 @@ void ForumSidebarPanel::build_ui() {
ph->setFixedHeight(28);
ph->setStyleSheet(
QString("color:%1;font-size:10px;background:transparent;%2")
- .arg(ui::colors::TEXT_DIM, M(10)));
+ .arg(ui::colors::TEXT_DIM(), M(10)));
contrib_layout_->addWidget(ph);
body_vl->addWidget(contrib_container_);
@@ -336,7 +336,7 @@ void ForumSidebarPanel::build_ui() {
// Data setters
// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
void ForumSidebarPanel::set_my_profile(const services::ForumProfile& profile) {
- QString color = profile.avatar_color.isEmpty() ? ui::colors::AMBER
+ QString color = profile.avatar_color.isEmpty() ? ui::colors::AMBER()
: profile.avatar_color;
QString initials = profile.display_name.isEmpty()
? "?"
@@ -345,7 +345,7 @@ void ForumSidebarPanel::set_my_profile(const services::ForumProfile& profile) {
avatar_lbl_->setStyleSheet(
QString("color:%1;font-size:14px;font-weight:700;background:%2;"
"border-radius:18px;%3")
- .arg(ui::colors::BG_BASE, color, M(14)));
+ .arg(ui::colors::BG_BASE(), color, M(14)));
profile_name_lbl_->setText(profile.display_name);
profile_sub_lbl_->setText("@" + profile.username);
@@ -402,7 +402,7 @@ void ForumSidebarPanel::rebuild_categories() {
for (const auto& cat : categories_) {
const bool active = (cat.id == active_category_id_);
- QString color = cat.color.isEmpty() ? ui::colors::AMBER : cat.color;
+ QString color = cat.color.isEmpty() ? ui::colors::AMBER() : cat.color;
auto* row = new QWidget;
row->setFixedHeight(34);
@@ -412,11 +412,11 @@ void ForumSidebarPanel::rebuild_categories() {
? QString("background:rgba(255,255,255,0.03);"
"border-bottom:1px solid %1;"
"border-left:2px solid %2;")
- .arg(ui::colors::BORDER_DIM, color)
+ .arg(ui::colors::BORDER_DIM(), color)
: QString("background:transparent;"
"border-bottom:1px solid %1;"
"border-left:2px solid transparent;")
- .arg(ui::colors::BORDER_DIM));
+ .arg(ui::colors::BORDER_DIM()));
auto* hl = new QHBoxLayout(row);
hl->setContentsMargins(10, 0, 10, 0);
@@ -427,7 +427,7 @@ void ForumSidebarPanel::rebuild_categories() {
hash->setFixedWidth(14);
hash->setStyleSheet(
QString("color:%1;font-size:13px;font-weight:600;background:transparent;%2")
- .arg(active ? ui::colors::TEXT_SECONDARY : ui::colors::TEXT_DIM,
+ .arg(active ? ui::colors::TEXT_SECONDARY() : ui::colors::TEXT_DIM(),
M(13)));
// Name
@@ -436,9 +436,9 @@ void ForumSidebarPanel::rebuild_categories() {
active
? QString("color:%1;font-size:12px;font-weight:600;"
"background:transparent;%2")
- .arg(ui::colors::TEXT_PRIMARY, M(12))
+ .arg(ui::colors::TEXT_PRIMARY(), M(12))
: QString("color:%1;font-size:12px;background:transparent;%2")
- .arg(ui::colors::TEXT_SECONDARY, M(12)));
+ .arg(ui::colors::TEXT_SECONDARY(), M(12)));
// Post count badge
auto* count_lbl = new QLabel;
@@ -451,7 +451,7 @@ void ForumSidebarPanel::rebuild_categories() {
QString("color:%1;font-size:9px;font-weight:700;"
"background:rgba(255,255,255,0.04);"
"border-radius:9px;padding:0 6px;%2")
- .arg(ui::colors::TEXT_TERTIARY, M(9)));
+ .arg(ui::colors::TEXT_TERTIARY(), M(9)));
}
// Click handler
@@ -489,14 +489,14 @@ void ForumSidebarPanel::rebuild_contributors() {
ph->setFixedHeight(28);
ph->setStyleSheet(
QString("color:%1;font-size:10px;background:transparent;%2")
- .arg(ui::colors::TEXT_DIM, M(10)));
+ .arg(ui::colors::TEXT_DIM(), M(10)));
contrib_layout_->addWidget(ph);
return;
}
// Medal icons for top 3
static const char* medals[] = {"🥇", "🥈", "🥉", " 4", " 5"};
- const QString rank_colors[] = {ui::colors::AMBER(), ui::colors::TEXT_SECONDARY(), "#cd7f32",
+ const QString rank_colors[] = {ui::colors::AMBER(), ui::colors::TEXT_SECONDARY(), ui::colors::WARNING(),
ui::colors::TEXT_TERTIARY(), ui::colors::TEXT_TERTIARY()};
for (int i = 0; i < std::min(5, (int)contributors_.size()); ++i) {
@@ -505,8 +505,8 @@ void ForumSidebarPanel::rebuild_contributors() {
row->setFixedHeight(32);
row->setStyleSheet(
QString("background:%1;border-bottom:1px solid %2;")
- .arg(i % 2 == 0 ? ui::colors::BG_BASE : ui::colors::BG_SURFACE,
- ui::colors::BORDER_DIM));
+ .arg(i % 2 == 0 ? ui::colors::BG_BASE() : ui::colors::BG_SURFACE(),
+ ui::colors::BORDER_DIM()));
auto* hl = new QHBoxLayout(row);
hl->setContentsMargins(14, 0, 14, 0);
hl->setSpacing(8);
@@ -529,13 +529,13 @@ void ForumSidebarPanel::rebuild_contributors() {
av->setStyleSheet(
QString("color:%1;font-size:10px;font-weight:700;background:%2;"
"border-radius:11px;%3")
- .arg(ui::colors::BG_BASE, det_color(c.display_name), M(10)));
+ .arg(ui::colors::BG_BASE(), det_color(c.display_name), M(10)));
// Name
auto* name = new QLabel(c.display_name.left(12));
name->setStyleSheet(
QString("color:%1;font-size:11px;background:transparent;%2")
- .arg(ui::colors::TEXT_SECONDARY, M(11)));
+ .arg(ui::colors::TEXT_SECONDARY(), M(11)));
// Rep
auto* rep = new QLabel(QString("★%1").arg(c.reputation));
diff --git a/fincept-qt/src/screens/forum/ForumThreadPanel.cpp b/fincept-qt/src/screens/forum/ForumThreadPanel.cpp
index 64547d5db..fba46a1b4 100644
--- a/fincept-qt/src/screens/forum/ForumThreadPanel.cpp
+++ b/fincept-qt/src/screens/forum/ForumThreadPanel.cpp
@@ -149,8 +149,8 @@ void ForumThreadPanel::build_ui() {
auto* hdr_outer = new QWidget;
hdr_outer->setStyleSheet(
QString("background:qlineargradient(x1:0,y1:0,x2:0,y2:1,"
- "stop:0 #0e0e0e,stop:1 %1);")
- .arg(ui::colors::BG_BASE()));
+ "stop:0 %1,stop:1 %2);")
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BG_BASE()));
auto* hdr_outer_hl = new QHBoxLayout(hdr_outer);
hdr_outer_hl->setContentsMargins(0, 0, 0, 0);
diff --git a/fincept-qt/src/screens/geopolitics/ConflictMonitorPanel.cpp b/fincept-qt/src/screens/geopolitics/ConflictMonitorPanel.cpp
index e2e1f67d9..c8e792f98 100644
--- a/fincept-qt/src/screens/geopolitics/ConflictMonitorPanel.cpp
+++ b/fincept-qt/src/screens/geopolitics/ConflictMonitorPanel.cpp
@@ -122,11 +122,12 @@ void ConflictMonitorPanel::build_ui() {
auto* stats_title = new QLabel("TOP CATEGORIES", sidebar);
stats_title->setStyleSheet(
- QString("color:#FF0000; font-size:%1px; font-weight:700; font-family:%2;"
- "letter-spacing:1px; padding-bottom:6px; border-bottom:1px solid %3;")
+ QString("color:%1; font-size:%2px; font-weight:700; font-family:%3;"
+ "letter-spacing:1px; padding-bottom:6px; border-bottom:1px solid %4;")
+ .arg(ui::colors::NEGATIVE())
.arg(ui::fonts::TINY)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::colors::BORDER_DIM));
+ .arg(ui::fonts::DATA_FAMILY())
+ .arg(ui::colors::BORDER_DIM()));
svl->addWidget(stats_title);
auto* stats_container = new QWidget(sidebar);
@@ -148,9 +149,14 @@ void ConflictMonitorPanel::build_ui() {
// Selected event detail panel
detail_panel_ = new QWidget(sidebar);
detail_panel_->setVisible(false);
- detail_panel_->setStyleSheet(
- "background:rgba(255,0,0,0.04); border:1px solid rgba(255,0,0,0.2);"
- "border-left:3px solid #FF0000; border-radius:2px;");
+ {
+ QColor neg(ui::colors::NEGATIVE());
+ auto neg_rgb = QString("%1,%2,%3").arg(neg.red()).arg(neg.green()).arg(neg.blue());
+ detail_panel_->setStyleSheet(
+ QString("background:rgba(%1,0.04); border:1px solid rgba(%1,0.2);"
+ "border-left:3px solid %2;")
+ .arg(neg_rgb).arg(ui::colors::NEGATIVE()));
+ }
auto* dvl = new QVBoxLayout(detail_panel_);
dvl->setContentsMargins(10, 10, 10, 10);
@@ -158,9 +164,10 @@ void ConflictMonitorPanel::build_ui() {
auto* detail_title = new QLabel("SELECTED EVENT", detail_panel_);
detail_title->setStyleSheet(
- QString("color:#FF0000; font-size:%1px; font-weight:700; font-family:%2; letter-spacing:1px;")
+ QString("color:%1; font-size:%2px; font-weight:700; font-family:%3; letter-spacing:1px;")
+ .arg(ui::colors::NEGATIVE())
.arg(ui::fonts::TINY)
- .arg(ui::fonts::DATA_FAMILY));
+ .arg(ui::fonts::DATA_FAMILY()));
dvl->addWidget(detail_title);
auto* grid_widget = new QWidget(detail_panel_);
@@ -304,7 +311,7 @@ void ConflictMonitorPanel::update_stats(const QVector<NewsEvent>& events) {
auto* row = new QWidget;
row->setStyleSheet(
QString("border-left:2px solid %1; padding-left:4px;"
- "background:rgba(%2,0.04); border-radius:1px;")
+ "background:rgba(%2,0.04);")
.arg(col_hex).arg(col_rgb));
auto* rl = new QHBoxLayout(row);
rl->setContentsMargins(6, 2, 4, 2);
diff --git a/fincept-qt/src/screens/geopolitics/GeopoliticsScreen.cpp b/fincept-qt/src/screens/geopolitics/GeopoliticsScreen.cpp
index c3bcb8b9e..fd7958759 100644
--- a/fincept-qt/src/screens/geopolitics/GeopoliticsScreen.cpp
+++ b/fincept-qt/src/screens/geopolitics/GeopoliticsScreen.cpp
@@ -2,6 +2,7 @@
#include "screens/geopolitics/GeopoliticsScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "screens/geopolitics/ConflictMonitorPanel.h"
#include "screens/geopolitics/HDXDataPanel.h"
#include "screens/geopolitics/RelationshipPanel.h"
@@ -125,10 +126,10 @@ QWidget* GeopoliticsScreen::build_top_bar() {
struct TabDef { QString label; QString color; };
const QVector<TabDef> tabs = {
- {"MONITOR", "#FF0000"},
- {"HDX DATA", "#00E5FF"},
- {"RELATIONS", "#9D4EDD"},
- {"TRADE", "#FFC400"},
+ {"MONITOR", ui::colors::NEGATIVE},
+ {"HDX DATA", ui::colors::CYAN},
+ {"RELATIONS", ui::colors::INFO},
+ {"TRADE", ui::colors::WARNING},
};
for (int i = 0; i < tabs.size(); ++i) {
@@ -136,7 +137,7 @@ QWidget* GeopoliticsScreen::build_top_bar() {
btn->setCursor(Qt::PointingHandCursor);
btn->setStyleSheet(
QString("QPushButton { color:%1; font-size:%2px; font-family:%3;"
- "padding:4px 14px; border:none; border-radius:0;"
+ "padding:4px 14px; border:none;"
"background:transparent; font-weight:400; }"
"QPushButton:hover { color:%4; background:rgba(%5,0.06); }")
.arg(ui::colors::TEXT_TERTIARY)
@@ -172,13 +173,18 @@ QWidget* GeopoliticsScreen::build_top_bar() {
hl->addWidget(div2);
event_count_label_ = new QLabel("0 EVENTS", bar);
- event_count_label_->setStyleSheet(
- QString("color:%1; font-size:%2px; font-family:%3; padding:3px 8px;"
- "background:rgba(220,38,38,0.08); border:1px solid rgba(220,38,38,0.25);"
- "border-radius:2px; font-weight:700;")
- .arg(ui::colors::NEGATIVE)
- .arg(ui::fonts::TINY)
- .arg(ui::fonts::DATA_FAMILY));
+ event_count_label_->setFixedHeight(22);
+ {
+ QColor neg(ui::colors::NEGATIVE());
+ auto neg_rgb = QString("%1,%2,%3").arg(neg.red()).arg(neg.green()).arg(neg.blue());
+ event_count_label_->setStyleSheet(
+ QString("color:%1; font-size:%2px; font-family:%3; padding:2px 6px;"
+ "background:rgba(%4,0.08); border:1px solid rgba(%4,0.25); font-weight:700;")
+ .arg(ui::colors::NEGATIVE())
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY())
+ .arg(neg_rgb));
+ }
hl->addWidget(event_count_label_);
return bar;
@@ -198,20 +204,22 @@ QWidget* GeopoliticsScreen::build_filter_panel() {
auto* title = new QLabel("FILTERS", panel);
title->setStyleSheet(
- QString("color:#FF0000; font-size:%1px; font-weight:700; font-family:%2;"
- "letter-spacing:1px; padding-bottom:4px; border-bottom:1px solid %3;")
+ QString("color:%1; font-size:%2px; font-weight:700; font-family:%3;"
+ "letter-spacing:1px; padding-bottom:4px; border-bottom:1px solid %4;")
+ .arg(ui::colors::NEGATIVE())
.arg(ui::fonts::TINY)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::colors::BORDER_DIM));
+ .arg(ui::fonts::DATA_FAMILY())
+ .arg(ui::colors::BORDER_DIM()));
vl->addWidget(title);
auto input_style =
QString("QLineEdit, QComboBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:5px 8px; border-radius:2px; }"
- "QLineEdit:focus, QComboBox:focus { border-color:#FF0000; }")
- .arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL);
+ "font-family:%4; font-size:%5px; padding:5px 8px; }"
+ "QLineEdit:focus, QComboBox:focus { border-color:%6; }")
+ .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_PRIMARY(), ui::colors::BORDER_MED())
+ .arg(ui::fonts::DATA_FAMILY())
+ .arg(ui::fonts::SMALL)
+ .arg(ui::colors::NEGATIVE());
auto label_style =
QString("color:%1; font-size:%2px; font-weight:700; font-family:%3; letter-spacing:1px;")
@@ -251,13 +259,18 @@ QWidget* GeopoliticsScreen::build_filter_panel() {
auto* apply_btn = new QPushButton("APPLY FILTERS", panel);
apply_btn->setCursor(Qt::PointingHandCursor);
- apply_btn->setStyleSheet(
- QString("QPushButton { background:#FF0000; color:%1; font-family:%2; font-size:%3px;"
- "font-weight:700; border:none; padding:6px 12px; border-radius:2px; }"
- "QPushButton:hover { background:#CC0000; }")
- .arg(ui::colors::BG_BASE)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL));
+ {
+ QColor neg(ui::colors::NEGATIVE());
+ apply_btn->setStyleSheet(
+ QString("QPushButton { background:%1; color:%2; font-family:%3; font-size:%4px;"
+ "font-weight:700; border:none; padding:6px 12px; }"
+ "QPushButton:hover { background:%5; }")
+ .arg(ui::colors::NEGATIVE())
+ .arg(ui::colors::BG_BASE())
+ .arg(ui::fonts::DATA_FAMILY())
+ .arg(ui::fonts::SMALL)
+ .arg(neg.darker(120).name()));
+ }
connect(apply_btn, &QPushButton::clicked, this, &GeopoliticsScreen::on_apply_filters);
vl->addWidget(apply_btn);
@@ -265,7 +278,7 @@ QWidget* GeopoliticsScreen::build_filter_panel() {
clear_btn->setCursor(Qt::PointingHandCursor);
clear_btn->setStyleSheet(
QString("QPushButton { background:transparent; color:%1; font-family:%2; font-size:%3px;"
- "border:1px solid %4; padding:5px 12px; border-radius:2px; }"
+ "border:1px solid %4; padding:5px 12px; }"
"QPushButton:hover { background:%5; }")
.arg(ui::colors::TEXT_SECONDARY)
.arg(ui::fonts::DATA_FAMILY)
@@ -390,32 +403,35 @@ void GeopoliticsScreen::on_tab_changed(int index) {
active_tab_ = index;
if (content_stack_)
content_stack_->setCurrentIndex(index);
+ ScreenStateManager::instance().notify_changed(this);
- const QStringList colors = {"#FF0000", "#00E5FF", "#9D4EDD", "#FFC400"};
+ const QStringList colors = {ui::colors::NEGATIVE, ui::colors::CYAN, ui::colors::INFO, ui::colors::WARNING};
for (int i = 0; i < tab_buttons_.size(); ++i) {
const bool active = (i == index);
+ QColor c(colors[i]);
+ auto rgb = QString("%1,%2,%3").arg(c.red()).arg(c.green()).arg(c.blue());
if (active) {
tab_buttons_[i]->setStyleSheet(
QString("QPushButton { color:%1; font-size:%2px; font-family:%3;"
"padding:4px 14px;"
"border-bottom:2px solid %1; border-top:none; border-left:none; border-right:none;"
- "border-radius:0; background:rgba(%4,0.06); font-weight:700; }"
+ "background:rgba(%4,0.06); font-weight:700; }"
"QPushButton:hover { background:rgba(%4,0.10); }")
.arg(colors[i])
.arg(ui::fonts::TINY)
.arg(ui::fonts::DATA_FAMILY)
- .arg(colors[i].mid(1)));
+ .arg(rgb));
} else {
tab_buttons_[i]->setStyleSheet(
QString("QPushButton { color:%1; font-size:%2px; font-family:%3;"
- "padding:4px 14px; border:none; border-radius:0;"
+ "padding:4px 14px; border:none;"
"background:transparent; font-weight:400; }"
"QPushButton:hover { color:%4; background:rgba(%5,0.06); }")
.arg(ui::colors::TEXT_TERTIARY)
.arg(ui::fonts::TINY)
.arg(ui::fonts::DATA_FAMILY)
.arg(colors[i])
- .arg(colors[i].mid(1)));
+ .arg(rgb));
}
}
}
@@ -423,14 +439,15 @@ void GeopoliticsScreen::on_tab_changed(int index) {
void GeopoliticsScreen::on_events_loaded(QVector<services::geo::NewsEvent> events, int total) {
event_count_label_->setText(QString("%1 EVENTS").arg(total));
const QString color = total > 0 ? ui::colors::POSITIVE() : ui::colors::NEGATIVE();
+ QColor clr(color);
+ auto clr_rgb = QString("%1,%2,%3").arg(clr.red()).arg(clr.green()).arg(clr.blue());
event_count_label_->setStyleSheet(
- QString("color:%1; font-size:%2px; font-family:%3; padding:3px 8px;"
- "background:rgba(%4,0.08); border:1px solid rgba(%4,0.25);"
- "border-radius:2px; font-weight:700;")
+ QString("color:%1; font-size:%2px; font-family:%3; padding:2px 6px;"
+ "background:rgba(%4,0.08); border:1px solid rgba(%4,0.25); font-weight:700;")
.arg(color)
.arg(ui::fonts::TINY)
.arg(ui::fonts::DATA_FAMILY)
- .arg(color.mid(1)));
+ .arg(clr_rgb));
status_label_->setText("READY");
status_label_->setStyleSheet(
QString("color:%1; font-size:%2px; font-weight:700; font-family:%3;")
@@ -450,4 +467,16 @@ void GeopoliticsScreen::on_error(const QString& context, const QString& message)
LOG_ERROR("Geopolitics", QString("[%1] %2").arg(context, message));
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap GeopoliticsScreen::save_state() const {
+ return {{"tab_index", active_tab_}};
+}
+
+void GeopoliticsScreen::restore_state(const QVariantMap& state) {
+ const int idx = state.value("tab_index", 0).toInt();
+ if (idx >= 0 && idx < tab_buttons_.size())
+ on_tab_changed(idx);
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/geopolitics/GeopoliticsScreen.h b/fincept-qt/src/screens/geopolitics/GeopoliticsScreen.h
index 9c1605547..bb35d21ed 100644
--- a/fincept-qt/src/screens/geopolitics/GeopoliticsScreen.h
+++ b/fincept-qt/src/screens/geopolitics/GeopoliticsScreen.h
@@ -1,5 +1,6 @@
// src/screens/geopolitics/GeopoliticsScreen.h
#pragma once
+#include "screens/IStatefulScreen.h"
#include "services/geopolitics/GeopoliticsTypes.h"
#include <QComboBox>
@@ -25,11 +26,16 @@ class TradeAnalysisPanel;
/// Left: filter controls (country, city, category)
/// Center: tab-switched content (Conflict Monitor, HDX, Relationships, Trade)
/// Right: event detail / legend panel
-class GeopoliticsScreen : public QWidget {
+class GeopoliticsScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit GeopoliticsScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "geopolitics"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) override;
diff --git a/fincept-qt/src/screens/geopolitics/HDXDataPanel.cpp b/fincept-qt/src/screens/geopolitics/HDXDataPanel.cpp
index 82c18487d..7a39df85f 100644
--- a/fincept-qt/src/screens/geopolitics/HDXDataPanel.cpp
+++ b/fincept-qt/src/screens/geopolitics/HDXDataPanel.cpp
@@ -12,6 +12,12 @@ namespace fincept::screens {
using namespace fincept::services::geo;
+// Helper: get cyan accent RGB string for rgba() usage
+static QString cyan_rgb() {
+ QColor c(ui::colors::CYAN());
+ return QString("%1,%2,%3").arg(c.red()).arg(c.green()).arg(c.blue());
+}
+
HDXDataPanel::HDXDataPanel(QWidget* parent) : QWidget(parent) {
build_ui();
connect_service();
@@ -40,9 +46,10 @@ void HDXDataPanel::build_ui() {
auto* title = new QLabel("HDX HUMANITARIAN DATA", header);
title->setStyleSheet(
- QString("color:#00E5FF; font-size:%1px; font-weight:700; font-family:%2; letter-spacing:1px;")
+ QString("color:%1; font-size:%2px; font-weight:700; font-family:%3; letter-spacing:1px;")
+ .arg(ui::colors::CYAN())
.arg(ui::fonts::TINY)
- .arg(ui::fonts::DATA_FAMILY));
+ .arg(ui::fonts::DATA_FAMILY()));
hhl->addWidget(title);
auto* div = new QWidget(header);
@@ -50,18 +57,21 @@ void HDXDataPanel::build_ui() {
div->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_DIM));
hhl->addWidget(div);
+ auto rgb = cyan_rgb();
const QStringList views = {"Conflicts", "Humanitarian", "Explorer", "Datasets"};
for (int i = 0; i < views.size(); ++i) {
auto* btn = new QPushButton(views[i].toUpper(), header);
btn->setCursor(Qt::PointingHandCursor);
btn->setStyleSheet(
QString("QPushButton { color:%1; font-size:%2px; font-family:%3;"
- "padding:4px 12px; border:none; border-radius:0; background:transparent;"
+ "padding:4px 12px; border:none; background:transparent;"
"font-weight:400; }"
- "QPushButton:hover { color:#00E5FF; background:rgba(0,229,255,0.04); }")
+ "QPushButton:hover { color:%4; background:rgba(%5,0.04); }")
.arg(ui::colors::TEXT_TERTIARY)
.arg(ui::fonts::TINY)
- .arg(ui::fonts::DATA_FAMILY));
+ .arg(ui::fonts::DATA_FAMILY)
+ .arg(ui::colors::CYAN())
+ .arg(rgb));
connect(btn, &QPushButton::clicked, this, [this, i]() { on_view_changed(i); });
hhl->addWidget(btn);
view_buttons_.append(btn);
@@ -74,11 +84,12 @@ void HDXDataPanel::build_ui() {
search_edit_->setFixedWidth(240);
search_edit_->setStyleSheet(
QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 8px; border-radius:2px; }"
- "QLineEdit:focus { border-color:#00E5FF; }")
+ "font-family:%4; font-size:%5px; padding:4px 8px; }"
+ "QLineEdit:focus { border-color:%6; }")
.arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
.arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL));
+ .arg(ui::fonts::SMALL)
+ .arg(ui::colors::CYAN()));
connect(search_edit_, &QLineEdit::returnPressed, this, [this]() {
auto q = search_edit_->text().trimmed();
if (!q.isEmpty()) {
@@ -89,12 +100,14 @@ void HDXDataPanel::build_ui() {
hhl->addWidget(search_edit_);
dataset_count_ = new QLabel("0 datasets", header);
+ dataset_count_->setFixedHeight(22);
dataset_count_->setStyleSheet(
- QString("color:#00E5FF; font-size:%1px; font-family:%2; padding:2px 8px;"
- "background:rgba(0,229,255,0.08); border:1px solid rgba(0,229,255,0.25);"
- "border-radius:2px; font-weight:700;")
+ QString("color:%1; font-size:%2px; font-family:%3; padding:2px 6px;"
+ "background:rgba(%4,0.08); border:1px solid rgba(%4,0.25); font-weight:700;")
+ .arg(ui::colors::CYAN())
.arg(ui::fonts::TINY)
- .arg(ui::fonts::DATA_FAMILY));
+ .arg(ui::fonts::DATA_FAMILY())
+ .arg(rgb));
hhl->addWidget(dataset_count_);
root->addWidget(header);
@@ -122,13 +135,14 @@ void HDXDataPanel::build_ui() {
QString("QTableWidget { background:%1; color:%2; gridline-color:%3;"
"font-family:%4; font-size:%5px; border:none; }"
"QTableWidget::item { padding:3px 8px; }"
- "QTableWidget::item:selected { background:rgba(0,229,255,0.15); }"
- "QHeaderView::section { background:%6; color:%7; font-weight:700;"
+ "QTableWidget::item:selected { background:rgba(%6,0.15); }"
+ "QHeaderView::section { background:%7; color:%8; font-weight:700;"
"padding:5px 8px; border:1px solid %3; font-family:%4; font-size:%5px; }"
- "QTableWidget::item:alternate { background:%8; }")
+ "QTableWidget::item:alternate { background:%9; }")
.arg(ui::colors::BG_SURFACE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_DIM)
.arg(ui::fonts::DATA_FAMILY)
.arg(ui::fonts::SMALL)
+ .arg(rgb)
.arg(ui::colors::BG_RAISED)
.arg(ui::colors::TEXT_SECONDARY)
.arg(ui::colors::ROW_ALT));
@@ -137,7 +151,8 @@ void HDXDataPanel::build_ui() {
loading_label_ = new QLabel("Loading HDX data...", this);
loading_label_->setAlignment(Qt::AlignCenter);
loading_label_->setStyleSheet(
- QString("color:#00E5FF; font-size:%1px; font-family:%2; background:%3;")
+ QString("color:%1; font-size:%2px; font-family:%3; background:%4;")
+ .arg(ui::colors::CYAN())
.arg(ui::fonts::DATA)
.arg(ui::fonts::DATA_FAMILY)
.arg(ui::colors::BG_SURFACE));
@@ -191,14 +206,18 @@ void HDXDataPanel::build_ui() {
auto* explore_btn = new QPushButton("SEARCH", explorer_bar_);
explore_btn->setCursor(Qt::PointingHandCursor);
- explore_btn->setStyleSheet(
- QString("QPushButton { background:#00E5FF; color:%1; font-family:%2;"
- "font-size:%3px; font-weight:700; border:none; padding:6px 16px;"
- "border-radius:2px; }"
- "QPushButton:hover { background:#00B8D4; }")
- .arg(ui::colors::BG_BASE)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL));
+ {
+ QColor cy(ui::colors::CYAN());
+ explore_btn->setStyleSheet(
+ QString("QPushButton { background:%1; color:%2; font-family:%3;"
+ "font-size:%4px; font-weight:700; border:none; padding:6px 16px; }"
+ "QPushButton:hover { background:%5; }")
+ .arg(ui::colors::CYAN())
+ .arg(ui::colors::BG_BASE())
+ .arg(ui::fonts::DATA_FAMILY())
+ .arg(ui::fonts::SMALL)
+ .arg(cy.darker(120).name()));
+ }
connect(explore_btn, &QPushButton::clicked, this, [this]() {
auto country = country_combo_->currentText().trimmed();
show_loading(true);
@@ -221,26 +240,31 @@ void HDXDataPanel::build_ui() {
void HDXDataPanel::on_view_changed(int index) {
active_view_ = index;
+ auto rgb = cyan_rgb();
for (int i = 0; i < view_buttons_.size(); ++i) {
const bool active = (i == index);
if (active) {
view_buttons_[i]->setStyleSheet(
- QString("QPushButton { color:#00E5FF; font-size:%1px; font-family:%2;"
+ QString("QPushButton { color:%1; font-size:%2px; font-family:%3;"
"padding:4px 12px;"
- "border-bottom:2px solid #00E5FF; border-top:none; border-left:none; border-right:none;"
- "border-radius:0; background:rgba(0,229,255,0.06); font-weight:700; }"
- "QPushButton:hover { background:rgba(0,229,255,0.10); }")
+ "border-bottom:2px solid %1; border-top:none; border-left:none; border-right:none;"
+ "background:rgba(%4,0.06); font-weight:700; }"
+ "QPushButton:hover { background:rgba(%4,0.10); }")
+ .arg(ui::colors::CYAN())
.arg(ui::fonts::TINY)
- .arg(ui::fonts::DATA_FAMILY));
+ .arg(ui::fonts::DATA_FAMILY)
+ .arg(rgb));
} else {
view_buttons_[i]->setStyleSheet(
QString("QPushButton { color:%1; font-size:%2px; font-family:%3;"
- "padding:4px 12px; border:none; border-radius:0; background:transparent;"
+ "padding:4px 12px; border:none; background:transparent;"
"font-weight:400; }"
- "QPushButton:hover { color:#00E5FF; background:rgba(0,229,255,0.04); }")
+ "QPushButton:hover { color:%4; background:rgba(%5,0.04); }")
.arg(ui::colors::TEXT_TERTIARY)
.arg(ui::fonts::TINY)
- .arg(ui::fonts::DATA_FAMILY));
+ .arg(ui::fonts::DATA_FAMILY)
+ .arg(ui::colors::CYAN())
+ .arg(rgb));
}
}
diff --git a/fincept-qt/src/screens/geopolitics/RelationshipPanel.cpp b/fincept-qt/src/screens/geopolitics/RelationshipPanel.cpp
index 21f0f8e08..b3dd908e4 100644
--- a/fincept-qt/src/screens/geopolitics/RelationshipPanel.cpp
+++ b/fincept-qt/src/screens/geopolitics/RelationshipPanel.cpp
@@ -38,11 +38,11 @@ static QVector<RelationshipNode> build_nodes() {
}
static QColor severity_color(const QString& sev) {
- if (sev == "critical") return QColor("#FF0000");
- if (sev == "high") return QColor("#FFA500");
- if (sev == "medium") return QColor("#FF9800");
- if (sev == "low") return QColor("#4CAF50");
- return QColor("#2196F3"); // organization
+ if (sev == "critical") return QColor(ui::colors::NEGATIVE());
+ if (sev == "high") return QColor(ui::colors::WARNING());
+ if (sev == "medium") return QColor(ui::colors::WARNING()).lighter(120);
+ if (sev == "low") return QColor(ui::colors::POSITIVE());
+ return QColor(ui::colors::INFO()); // organization
}
RelationshipPanel::RelationshipPanel(QWidget* parent) : QWidget(parent) {
@@ -66,9 +66,10 @@ void RelationshipPanel::build_ui() {
auto* title = new QLabel("GEOPOLITICAL RELATIONSHIP NETWORK", header);
title->setStyleSheet(
- QString("color:#9D4EDD; font-size:%1px; font-weight:700; font-family:%2; letter-spacing:1px;")
+ QString("color:%1; font-size:%2px; font-weight:700; font-family:%3; letter-spacing:1px;")
+ .arg(ui::colors::INFO())
.arg(ui::fonts::TINY)
- .arg(ui::fonts::DATA_FAMILY));
+ .arg(ui::fonts::DATA_FAMILY()));
hhl->addWidget(title);
hhl->addStretch();
@@ -85,7 +86,7 @@ void RelationshipPanel::build_ui() {
header);
stats->setStyleSheet(
QString("color:%1; font-size:%2px; font-family:%3; padding:2px 8px;"
- "background:rgba(255,255,255,0.04); border:1px solid %4; border-radius:2px;")
+ "background:rgba(255,255,255,0.04); border:1px solid %4;")
.arg(ui::colors::TEXT_TERTIARY)
.arg(ui::fonts::TINY)
.arg(ui::fonts::DATA_FAMILY)
@@ -146,9 +147,9 @@ void RelationshipPanel::build_ui() {
cvl->addWidget(grid_w);
};
- add_section("ACTIVE CONFLICTS", "#FF0000", "conflict");
- add_section("CRISIS TYPES", "#FFA500", "crisis");
- add_section("ORGANIZATIONS", "#2196F3", "organization");
+ add_section("ACTIVE CONFLICTS", ui::colors::NEGATIVE(), "conflict");
+ add_section("CRISIS TYPES", ui::colors::WARNING(), "crisis");
+ add_section("ORGANIZATIONS", ui::colors::INFO(), "organization");
cvl->addStretch();
scroll->setWidget(content);
@@ -167,7 +168,7 @@ QWidget* RelationshipPanel::build_node_card(const RelationshipNode& node, QWidge
card->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
card->setStyleSheet(
QString("#nodeCard { background:%1; border:1px solid rgba(%2,0.25);"
- "border-left:3px solid %3; border-radius:3px; }")
+ "border-left:3px solid %3; }")
.arg(ui::colors::BG_RAISED)
.arg(col_rgb)
.arg(col_hex));
diff --git a/fincept-qt/src/screens/geopolitics/TradeAnalysisPanel.cpp b/fincept-qt/src/screens/geopolitics/TradeAnalysisPanel.cpp
index a87878011..af5fefa49 100644
--- a/fincept-qt/src/screens/geopolitics/TradeAnalysisPanel.cpp
+++ b/fincept-qt/src/screens/geopolitics/TradeAnalysisPanel.cpp
@@ -31,25 +31,33 @@ void TradeAnalysisPanel::connect_service() {
}
// ── Shared style helpers ──────────────────────────────────────────────────────
+static QString warn_rgb() {
+ QColor c(ui::colors::WARNING());
+ return QString("%1,%2,%3").arg(c.red()).arg(c.green()).arg(c.blue());
+}
+
static QString combo_style() {
return QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 8px; border-radius:2px; }"
- "QComboBox:focus { border-color:#FFC400; }"
+ "font-family:%4; font-size:%5px; padding:4px 8px; }"
+ "QComboBox:focus { border-color:%6; }"
"QComboBox::drop-down { border:none; width:18px; }"
"QComboBox QAbstractItemView { background:%1; color:%2; "
- "selection-background-color:rgba(255,196,0,0.15); border:1px solid %3; }")
+ "selection-background-color:rgba(%7,0.15); border:1px solid %3; }")
.arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
.arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL);
+ .arg(ui::fonts::SMALL)
+ .arg(ui::colors::WARNING())
+ .arg(warn_rgb());
}
static QString spin_style() {
return QString("QDoubleSpinBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }"
- "QDoubleSpinBox:focus { border-color:#FFC400; }")
+ "font-family:%4; font-size:%5px; padding:4px 6px; }"
+ "QDoubleSpinBox:focus { border-color:%6; }")
.arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
.arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL);
+ .arg(ui::fonts::SMALL)
+ .arg(ui::colors::WARNING());
}
static QWidget* make_field(const QString& label_text, QWidget* input, QWidget* parent,
@@ -98,9 +106,10 @@ void TradeAnalysisPanel::build_ui() {
hhl->setContentsMargins(16, 0, 16, 0);
auto* title = new QLabel("TRADE GEOPOLITICS ANALYSIS", header);
title->setStyleSheet(
- QString("color:#FFC400; font-size:%1px; font-weight:700; font-family:%2; letter-spacing:1px;")
+ QString("color:%1; font-size:%2px; font-weight:700; font-family:%3; letter-spacing:1px;")
+ .arg(ui::colors::WARNING())
.arg(ui::fonts::TINY)
- .arg(ui::fonts::DATA_FAMILY));
+ .arg(ui::fonts::DATA_FAMILY()));
hhl->addWidget(title);
hhl->addStretch();
status_label_ = new QLabel(header);
@@ -137,12 +146,13 @@ void TradeAnalysisPanel::build_ui() {
QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
"QTabBar::tab { background:%3; color:%4; padding:5px 16px;"
"font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:#FFC400; font-weight:700;"
- "border-bottom:2px solid #FFC400; }")
+ "QTabBar::tab:selected { background:%2; color:%7; font-weight:700;"
+ "border-bottom:2px solid %7; }")
.arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
.arg(ui::colors::TEXT_SECONDARY)
.arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL));
+ .arg(ui::fonts::SMALL)
+ .arg(ui::colors::WARNING()));
// ── Page 0: Benefits & Costs ──────────────────────────────────────────────
auto* p0 = new QWidget;
@@ -179,10 +189,17 @@ void TradeAnalysisPanel::build_ui() {
auto* run0 = new QPushButton("RUN ANALYSIS", p0);
run0->setCursor(Qt::PointingHandCursor);
run0->setStyleSheet(
- QString("QPushButton { background:#FFC400; color:%1; font-family:%2; font-size:%3px;"
- "font-weight:700; border:none; padding:6px 16px; border-radius:2px; }"
- "QPushButton:hover { background:#E5B000; }")
- .arg(ui::colors::BG_BASE).arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL));
+ [&]() {
+ QColor w(ui::colors::WARNING());
+ return QString("QPushButton { background:%1; color:%2; font-family:%3; font-size:%4px;"
+ "font-weight:700; border:none; padding:6px 16px; }"
+ "QPushButton:hover { background:%5; }")
+ .arg(ui::colors::WARNING())
+ .arg(ui::colors::BG_BASE())
+ .arg(ui::fonts::DATA_FAMILY())
+ .arg(ui::fonts::SMALL)
+ .arg(w.darker(120).name());
+ }());
connect(run0, &QPushButton::clicked, this, [this, vol_spin, price_spin, cons_spin]() {
status_label_->setText("Analyzing...");
QJsonObject p;
@@ -242,10 +259,17 @@ void TradeAnalysisPanel::build_ui() {
auto* run1 = new QPushButton("RUN ANALYSIS", p1);
run1->setCursor(Qt::PointingHandCursor);
run1->setStyleSheet(
- QString("QPushButton { background:#FFC400; color:%1; font-family:%2; font-size:%3px;"
- "font-weight:700; border:none; padding:6px 16px; border-radius:2px; }"
- "QPushButton:hover { background:#E5B000; }")
- .arg(ui::colors::BG_BASE).arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL));
+ [&]() {
+ QColor w(ui::colors::WARNING());
+ return QString("QPushButton { background:%1; color:%2; font-family:%3; font-size:%4px;"
+ "font-weight:700; border:none; padding:6px 16px; }"
+ "QPushButton:hover { background:%5; }")
+ .arg(ui::colors::WARNING())
+ .arg(ui::colors::BG_BASE())
+ .arg(ui::fonts::DATA_FAMILY())
+ .arg(ui::fonts::SMALL)
+ .arg(w.darker(120).name());
+ }());
connect(run1, &QPushButton::clicked, this,
[this, tariff_spin, quota_spin, subsidy_spin, dev_combo, maturity_combo]() {
status_label_->setText("Analyzing...");
@@ -297,10 +321,17 @@ void TradeAnalysisPanel::build_ui() {
auto* run2 = new QPushButton("RUN ANALYSIS", p2);
run2->setCursor(Qt::PointingHandCursor);
run2->setStyleSheet(
- QString("QPushButton { background:#FFC400; color:%1; font-family:%2; font-size:%3px;"
- "font-weight:700; border:none; padding:6px 16px; border-radius:2px; }"
- "QPushButton:hover { background:#E5B000; }")
- .arg(ui::colors::BG_BASE).arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL));
+ [&]() {
+ QColor w(ui::colors::WARNING());
+ return QString("QPushButton { background:%1; color:%2; font-family:%3; font-size:%4px;"
+ "font-weight:700; border:none; padding:6px 16px; }"
+ "QPushButton:hover { background:%5; }")
+ .arg(ui::colors::WARNING())
+ .arg(ui::colors::BG_BASE())
+ .arg(ui::fonts::DATA_FAMILY())
+ .arg(ui::fonts::SMALL)
+ .arg(w.darker(120).name());
+ }());
connect(run2, &QPushButton::clicked, this, [this, bloc_combo, tc_spin, td_spin]() {
status_label_->setText("Analyzing...");
QJsonObject p;
@@ -349,10 +380,17 @@ void TradeAnalysisPanel::build_ui() {
auto* run3 = new QPushButton("RUN ANALYSIS", p3);
run3->setCursor(Qt::PointingHandCursor);
run3->setStyleSheet(
- QString("QPushButton { background:#FFC400; color:%1; font-family:%2; font-size:%3px;"
- "font-weight:700; border:none; padding:6px 16px; border-radius:2px; }"
- "QPushButton:hover { background:#E5B000; }")
- .arg(ui::colors::BG_BASE).arg(ui::fonts::DATA_FAMILY).arg(ui::fonts::SMALL));
+ [&]() {
+ QColor w(ui::colors::WARNING());
+ return QString("QPushButton { background:%1; color:%2; font-family:%3; font-size:%4px;"
+ "font-weight:700; border:none; padding:6px 16px; }"
+ "QPushButton:hover { background:%5; }")
+ .arg(ui::colors::WARNING())
+ .arg(ui::colors::BG_BASE())
+ .arg(ui::fonts::DATA_FAMILY())
+ .arg(ui::fonts::SMALL)
+ .arg(w.darker(120).name());
+ }());
connect(run3, &QPushButton::clicked, this, [this, lib_combo, tariff_cut_spin, gdp_spin]() {
status_label_->setText("Analyzing...");
QJsonObject p;
@@ -397,9 +435,9 @@ void TradeAnalysisPanel::display_result(const QJsonObject& data) {
auto* hdr = new QLabel("ANALYSIS RESULTS");
hdr->setStyleSheet(
- QString("color:#FFC400; font-size:%1px; font-weight:700; font-family:%2;"
+ QString("color:%1; font-size:%2px; font-weight:700; font-family:%3;"
"letter-spacing:1px; padding:8px 0 4px 0;")
- .arg(ui::fonts::TINY).arg(ui::fonts::DATA_FAMILY));
+ .arg(ui::colors::WARNING()).arg(ui::fonts::TINY).arg(ui::fonts::DATA_FAMILY()));
results_layout_->addWidget(hdr);
// Flatten and display JSON as a table
@@ -476,10 +514,13 @@ void TradeAnalysisPanel::on_error(const QString& context, const QString& message
auto* err = new QLabel(QString("[%1] %2").arg(context, message));
err->setWordWrap(true);
err->setStyleSheet(
- QString("color:%1; font-size:%2px; font-family:%3; padding:12px;"
- "background:rgba(220,38,38,0.08); border:1px solid rgba(220,38,38,0.3);"
- "border-radius:2px;")
- .arg(ui::colors::NEGATIVE).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY));
+ [&]() {
+ QColor neg(ui::colors::NEGATIVE());
+ auto neg_rgb = QString("%1,%2,%3").arg(neg.red()).arg(neg.green()).arg(neg.blue());
+ return QString("color:%1; font-size:%2px; font-family:%3; padding:12px;"
+ "background:rgba(%4,0.08); border:1px solid rgba(%4,0.3);")
+ .arg(ui::colors::NEGATIVE()).arg(ui::fonts::SMALL).arg(ui::fonts::DATA_FAMILY()).arg(neg_rgb);
+ }());
results_layout_->addWidget(err);
}
diff --git a/fincept-qt/src/screens/gov_data/GovDataAustraliaPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataAustraliaPanel.cpp
index 41f7f801c..a119afa2e 100644
--- a/fincept-qt/src/screens/gov_data/GovDataAustraliaPanel.cpp
+++ b/fincept-qt/src/screens/gov_data/GovDataAustraliaPanel.cpp
@@ -3,6 +3,7 @@
#include "core/logging/Logger.h"
#include "services/gov_data/GovDataService.h"
+#include "ui/theme/Theme.h"
#include <QDesktopServices>
#include <QFileDialog>
@@ -21,64 +22,78 @@ static constexpr const char* kGovDataAustraliaScript = "datagov_au_api.py";
static constexpr const char* kGovDataAustraliaColor = "#0EA5E9";
} // namespace
-// ── Panel stylesheet ─────────────────────────────────────────────────────────
-
-static const QString kAUStyle = QString(
- "#govPanelToolbar { background:#111111; border-bottom:1px solid #1a1a1a; }"
-
- "#govTabBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }"
- "#govTabBtn:hover { color:#e5e5e5; background:#161616; }"
- "#govTabBtn:checked { background:rgba(14,165,233,0.12); color:#0EA5E9;"
- " border:1px solid #0EA5E9; }"
-
- "#govBackBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#govBackBtn:hover { color:#e5e5e5; background:#161616; }"
-
- "#govFetchBtn { background:#0EA5E9; color:#080808; border:none;"
- " font-size:10px; font-weight:700; padding:4px 14px; }"
- "#govFetchBtn:hover { background:#0c94d4; }"
- "#govFetchBtn:disabled { background:#1a1a1a; color:#404040; }"
-
- "#govCsvBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#govCsvBtn:hover { color:#e5e5e5; background:#161616; }"
-
- "#govSearch { background:#080808; color:#e5e5e5; border:none;"
- " border-bottom:1px solid #1a1a1a; padding:4px 10px; font-size:11px; }"
- "#govSearch:focus { border-bottom:1px solid #0EA5E9; }"
-
- "QTableWidget { background:#080808; color:#e5e5e5; border:none;"
- " gridline-color:#1a1a1a; font-size:11px; alternate-background-color:#0a0a0a; }"
- "QTableWidget::item { padding:5px 8px; border-bottom:1px solid #1a1a1a; }"
- "QTableWidget::item:selected { background:rgba(14,165,233,0.10); color:#0EA5E9; }"
- "QHeaderView::section { background:#111111; color:#808080; border:none;"
- " border-bottom:2px solid #1a1a1a; border-right:1px solid #1a1a1a;"
- " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"
-
- "#govStatusPage { background:#080808; }"
- "#govStatusMsg { color:#808080; font-size:13px; background:transparent; }"
- "#govStatusErr { color:#dc2626; font-size:12px; background:transparent; }"
-
- "#govBreadcrumb { background:#0a0a0a; border-bottom:1px solid #1a1a1a; }"
- "#govBreadcrumbText { color:#808080; font-size:9px; background:transparent; }"
-
- "QScrollBar:vertical { background:#080808; width:5px; }"
- "QScrollBar::handle:vertical { background:#1a1a1a; min-height:20px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }"
-);
+using namespace fincept::ui;
+
+// ── Dynamic stylesheet ──────────────────────────────────────────────────────
+
+static QString build_australia_style() {
+ const auto& t = ui::ThemeManager::instance().tokens();
+ const auto cc = QColor(kGovDataAustraliaColor);
+ const QString cr = QString::number(cc.red());
+ const QString cg = QString::number(cc.green());
+ const QString cb = QString::number(cc.blue());
+ const QString c = kGovDataAustraliaColor;
+
+ QString s;
+ s += QString("#govPanelToolbar { background:%1; border-bottom:1px solid %2; }").arg(t.bg_raised, t.border_dim);
+
+ s += QString("#govTabBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govTabBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+ s += QString("#govTabBtn:checked { background:rgba(%1,%2,%3,0.12); color:%4;"
+ " border:1px solid %4; }").arg(cr, cg, cb, c);
+
+ s += QString("#govBackBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govBackBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+
+ s += QString("#govFetchBtn { background:%1; color:%2; border:none;"
+ " font-size:10px; font-weight:700; padding:4px 14px; }").arg(c, t.bg_base);
+ s += QString("#govFetchBtn:hover { background:%1; }").arg(cc.lighter(120).name());
+ s += QString("#govFetchBtn:disabled { background:%1; color:%2; }").arg(t.border_dim, t.text_dim);
+
+ s += QString("#govCsvBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govCsvBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+
+ s += QString("#govSearch { background:%1; color:%2; border:none;"
+ " border-bottom:1px solid %3; padding:4px 10px; font-size:11px; }").arg(t.bg_base, t.text_primary, t.border_dim);
+ s += QString("#govSearch:focus { border-bottom:1px solid %1; }").arg(c);
+
+ s += QString("QTableWidget { background:%1; color:%2; border:none;"
+ " gridline-color:%3; font-size:11px; alternate-background-color:%4; }").arg(t.bg_base, t.text_primary, t.border_dim, t.bg_surface);
+ s += QString("QTableWidget::item { padding:5px 8px; border-bottom:1px solid %1; }").arg(t.border_dim);
+ s += QString("QTableWidget::item:selected { background:rgba(%1,%2,%3,0.10); color:%4; }").arg(cr, cg, cb, c);
+ s += QString("QHeaderView::section { background:%1; color:%2; border:none;"
+ " border-bottom:2px solid %3; border-right:1px solid %3;"
+ " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }").arg(t.bg_raised, t.text_secondary, t.border_dim);
+
+ s += QString("#govStatusPage { background:%1; }").arg(t.bg_base);
+ s += QString("#govStatusMsg { color:%1; font-size:13px; background:transparent; }").arg(t.text_secondary);
+ s += QString("#govStatusErr { color:%1; font-size:12px; background:transparent; }").arg(t.negative);
+
+ s += QString("#govBreadcrumb { background:%1; border-bottom:1px solid %2; }").arg(t.bg_surface, t.border_dim);
+ s += QString("#govBreadcrumbText { color:%1; font-size:9px; background:transparent; }").arg(t.text_secondary);
+
+ s += QString("QScrollBar:vertical { background:%1; width:5px; }").arg(t.bg_base);
+ s += QString("QScrollBar::handle:vertical { background:%1; min-height:20px; }").arg(t.border_dim);
+ s += "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }";
+ return s;
+}
// ── Constructor ──────────────────────────────────────────────────────────────
GovDataAustraliaPanel::GovDataAustraliaPanel(QWidget* parent)
: QWidget(parent) {
- setStyleSheet(kAUStyle);
+ setStyleSheet(build_australia_style());
build_ui();
connect(&services::GovDataService::instance(),
&services::GovDataService::result_ready,
this,
&GovDataAustraliaPanel::on_result);
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed, this, [this]() {
+ setStyleSheet(build_australia_style());
+ });
}
// ── UI Construction ──────────────────────────────────────────────────────────
@@ -404,7 +419,7 @@ void GovDataAustraliaPanel::populate_agencies(const QJsonArray& data) {
if (desc.length() > 80)
desc = desc.left(77) + "…";
auto* desc_item = new QTableWidgetItem(desc);
- desc_item->setForeground(QColor("#808080"));
+ desc_item->setForeground(QColor(ui::colors::TEXT_SECONDARY()));
agencies_table_->setItem(i, 1, desc_item);
// Created date
@@ -438,7 +453,7 @@ void GovDataAustraliaPanel::populate_datasets(const QJsonArray& data, int total_
if (license.isEmpty()) license = obj["license_title"].toString();
if (license.isEmpty()) license = "—";
auto* lic_item = new QTableWidgetItem(license);
- lic_item->setForeground(QColor("#808080"));
+ lic_item->setForeground(QColor(ui::colors::TEXT_SECONDARY()));
lic_item->setToolTip(license);
datasets_table_->setItem(i, 1, lic_item);
@@ -657,7 +672,8 @@ void GovDataAustraliaPanel::show_loading(const QString& message) {
}
void GovDataAustraliaPanel::show_error(const QString& message) {
- status_label_->setStyleSheet("color:#dc2626; font-size:12px; background:transparent;");
+ status_label_->setStyleSheet(
+ QString("color:%1; font-size:12px; background:transparent;").arg(ui::colors::NEGATIVE()));
status_label_->setText("Error: " + message);
content_stack_->setCurrentIndex(Status);
}
diff --git a/fincept-qt/src/screens/gov_data/GovDataCKANPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataCKANPanel.cpp
index d88c6d3ea..e7bfd23e7 100644
--- a/fincept-qt/src/screens/gov_data/GovDataCKANPanel.cpp
+++ b/fincept-qt/src/screens/gov_data/GovDataCKANPanel.cpp
@@ -6,6 +6,7 @@
#include "core/logging/Logger.h"
#include "services/gov_data/GovDataService.h"
+#include "ui/theme/Theme.h"
#include <QDesktopServices>
#include <QFileDialog>
@@ -24,73 +25,94 @@ static constexpr const char* kGovDataCKANScript = "datagovuk_api.py";
static constexpr const char* kGovDataCKANColor = "#10B981";
} // namespace
-// ── Stylesheet ────────────────────────────────────────────────────────────────
-
-static const QString kPanelStyle = QStringLiteral(
- "#ckanPortalBar { background:#0d0d0d; border-bottom:1px solid #1a1a1a; }"
- "#ckanPortalLabel { color:#808080; font-size:9px; font-weight:700;"
- " letter-spacing:0.5px; background:transparent; }"
- "QComboBox#ckanPortalCombo { background:#111111; color:#10B981; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:2px 8px; min-width:160px; }"
- "QComboBox#ckanPortalCombo::drop-down { border:none; width:18px; }"
- "QComboBox#ckanPortalCombo QAbstractItemView { background:#111111; color:#e5e5e5;"
- " selection-background-color:rgba(16,185,129,0.12); border:1px solid #1a1a1a; }"
-
- "#ckanPanelToolbar { background:#111111; border-bottom:1px solid #1a1a1a; }"
-
- "#ckanTabBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }"
- "#ckanTabBtn:hover { color:#e5e5e5; background:#161616; }"
- "#ckanTabBtn:checked { background:rgba(16,185,129,0.12); color:#10B981;"
- " border:1px solid #10B981; }"
-
- "#ckanBackBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#ckanBackBtn:hover { color:#e5e5e5; background:#161616; }"
-
- "#ckanFetchBtn { background:#10B981; color:#080808; border:none;"
- " font-size:10px; font-weight:700; padding:4px 14px; }"
- "#ckanFetchBtn:hover { background:#059669; }"
- "#ckanFetchBtn:disabled { background:#1a1a1a; color:#404040; }"
-
- "#ckanCsvBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#ckanCsvBtn:hover { color:#e5e5e5; background:#161616; }"
-
- "#ckanSearch { background:#080808; color:#e5e5e5; border:none;"
- " border-bottom:1px solid #1a1a1a; padding:4px 10px; font-size:11px; }"
- "#ckanSearch:focus { border-bottom:1px solid #10B981; }"
-
- "QTableWidget { background:#080808; color:#e5e5e5; border:none;"
- " gridline-color:#1a1a1a; font-size:11px; alternate-background-color:#0a0a0a; }"
- "QTableWidget::item { padding:5px 8px; border-bottom:1px solid #1a1a1a; }"
- "QTableWidget::item:selected { background:rgba(16,185,129,0.10); color:#10B981; }"
- "QHeaderView::section { background:#111111; color:#808080; border:none;"
- " border-bottom:2px solid #1a1a1a; border-right:1px solid #1a1a1a;"
- " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"
-
- "#ckanStatusPage { background:#080808; }"
- "#ckanStatusMsg { color:#808080; font-size:13px; background:transparent; }"
- "#ckanStatusErr { color:#dc2626; font-size:12px; background:transparent; }"
-
- "#ckanBreadcrumb { background:#0a0a0a; border-bottom:1px solid #1a1a1a; }"
- "#ckanBreadText { color:#808080; font-size:9px; background:transparent; }"
- "#ckanBreadCount { color:#808080; font-size:9px; background:transparent; }"
-
- "QScrollBar:vertical { background:#080808; width:5px; }"
- "QScrollBar::handle:vertical { background:#1a1a1a; min-height:20px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }"
-);
+// ── Dynamic stylesheet ───────────────────────────────────────────────────────
+
+static QString build_ckan_style() {
+ const auto& t = ui::ThemeManager::instance().tokens();
+ const auto cc = QColor(kGovDataCKANColor);
+ const QString cr = QString::number(cc.red());
+ const QString cg = QString::number(cc.green());
+ const QString cb = QString::number(cc.blue());
+ const QString c = kGovDataCKANColor;
+
+ QString s;
+ // Portal bar
+ s += QString("#ckanPortalBar { background:%1; border-bottom:1px solid %2; }").arg(t.bg_surface, t.border_dim);
+ s += QString("#ckanPortalLabel { color:%1; font-size:9px; font-weight:700;"
+ " letter-spacing:0.5px; background:transparent; }").arg(t.text_secondary);
+ s += QString("QComboBox#ckanPortalCombo { background:%1; color:%2; border:1px solid %3;"
+ " font-size:10px; font-weight:700; padding:2px 8px; min-width:160px; }").arg(t.bg_raised, c, t.border_dim);
+ s += "QComboBox#ckanPortalCombo::drop-down { border:none; width:18px; }";
+ s += QString("QComboBox#ckanPortalCombo QAbstractItemView { background:%1; color:%2;"
+ " selection-background-color:rgba(%3,%4,%5,0.12); border:1px solid %6; }").arg(t.bg_raised, t.text_primary, cr, cg, cb, t.border_dim);
+
+ // Toolbar
+ s += QString("#ckanPanelToolbar { background:%1; border-bottom:1px solid %2; }").arg(t.bg_raised, t.border_dim);
+
+ // Tab buttons
+ s += QString("#ckanTabBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#ckanTabBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+ s += QString("#ckanTabBtn:checked { background:rgba(%1,%2,%3,0.12); color:%4;"
+ " border:1px solid %4; }").arg(cr, cg, cb, c);
+
+ // Back button
+ s += QString("#ckanBackBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#ckanBackBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+
+ // Fetch / action buttons
+ s += QString("#ckanFetchBtn { background:%1; color:%2; border:none;"
+ " font-size:10px; font-weight:700; padding:4px 14px; }").arg(c, t.bg_base);
+ s += QString("#ckanFetchBtn:hover { background:%1; }").arg(cc.lighter(120).name());
+ s += QString("#ckanFetchBtn:disabled { background:%1; color:%2; }").arg(t.border_dim, t.text_dim);
+ s += QString("#ckanCsvBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#ckanCsvBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+
+ // Search
+ s += QString("#ckanSearch { background:%1; color:%2; border:none;"
+ " border-bottom:1px solid %3; padding:4px 10px; font-size:11px; }").arg(t.bg_base, t.text_primary, t.border_dim);
+ s += QString("#ckanSearch:focus { border-bottom:1px solid %1; }").arg(c);
+
+ // Tables
+ s += QString("QTableWidget { background:%1; color:%2; border:none;"
+ " gridline-color:%3; font-size:11px; alternate-background-color:%4; }").arg(t.bg_base, t.text_primary, t.border_dim, t.bg_surface);
+ s += QString("QTableWidget::item { padding:5px 8px; border-bottom:1px solid %1; }").arg(t.border_dim);
+ s += QString("QTableWidget::item:selected { background:rgba(%1,%2,%3,0.10); color:%4; }").arg(cr, cg, cb, c);
+ s += QString("QHeaderView::section { background:%1; color:%2; border:none;"
+ " border-bottom:2px solid %3; border-right:1px solid %3;"
+ " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }").arg(t.bg_raised, t.text_secondary, t.border_dim);
+
+ // Status
+ s += QString("#ckanStatusPage { background:%1; }").arg(t.bg_base);
+ s += QString("#ckanStatusMsg { color:%1; font-size:13px; background:transparent; }").arg(t.text_secondary);
+ s += QString("#ckanStatusErr { color:%1; font-size:12px; background:transparent; }").arg(t.negative);
+
+ // Breadcrumb
+ s += QString("#ckanBreadcrumb { background:%1; border-bottom:1px solid %2; }").arg(t.bg_surface, t.border_dim);
+ s += QString("#ckanBreadText { color:%1; font-size:9px; background:transparent; }").arg(t.text_secondary);
+ s += QString("#ckanBreadCount { color:%1; font-size:9px; background:transparent; }").arg(t.text_secondary);
+
+ // Scrollbar
+ s += QString("QScrollBar:vertical { background:%1; width:5px; }").arg(t.bg_base);
+ s += QString("QScrollBar::handle:vertical { background:%1; min-height:20px; }").arg(t.border_dim);
+ s += "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }";
+ return s;
+}
// ── Constructor ───────────────────────────────────────────────────────────────
GovDataCKANPanel::GovDataCKANPanel(QWidget* parent)
: QWidget(parent) {
- setStyleSheet(kPanelStyle);
+ setStyleSheet(build_ckan_style());
build_ui();
connect(&services::GovDataService::instance(),
&services::GovDataService::result_ready,
this, &GovDataCKANPanel::on_result);
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed, this, [this]() {
+ setStyleSheet(build_ckan_style());
+ });
}
// ── Build UI ──────────────────────────────────────────────────────────────────
@@ -566,7 +588,7 @@ void GovDataCKANPanel::populate_datasets(const QJsonArray& data, int total_count
QString tags_str = tags.mid(0, 3).join(", ");
if (tags.size() > 3) tags_str += QString(" +%1").arg(tags.size() - 3);
auto* tag_item = new QTableWidgetItem(tags_str);
- tag_item->setForeground(QColor("#808080"));
+ tag_item->setForeground(QColor(ui::colors::TEXT_SECONDARY()));
datasets_table_->setItem(i, 3, tag_item);
}
@@ -631,16 +653,16 @@ void GovDataCKANPanel::show_loading(const QString& message) {
void GovDataCKANPanel::show_error(const QString& message) {
status_label_->setStyleSheet(
- "color:#dc2626; font-size:12px; background:transparent;");
+ QString("color:%1; font-size:12px; background:transparent;").arg(ui::colors::NEGATIVE()));
status_label_->setText("Error: " + message);
content_stack_->setCurrentIndex(3);
LOG_ERROR("GovCKAN", message);
}
void GovDataCKANPanel::show_status(const QString& message, bool is_error) {
- status_label_->setStyleSheet(is_error
- ? "color:#dc2626; font-size:12px; background:transparent;"
- : "color:#808080; font-size:12px; background:transparent;");
+ status_label_->setStyleSheet(
+ QString("color:%1; font-size:12px; background:transparent;")
+ .arg(is_error ? ui::colors::NEGATIVE() : ui::colors::TEXT_SECONDARY()));
status_label_->setText(message);
content_stack_->setCurrentIndex(3);
}
diff --git a/fincept-qt/src/screens/gov_data/GovDataCanadaPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataCanadaPanel.cpp
index aa1dbe275..347f9d76b 100644
--- a/fincept-qt/src/screens/gov_data/GovDataCanadaPanel.cpp
+++ b/fincept-qt/src/screens/gov_data/GovDataCanadaPanel.cpp
@@ -25,65 +25,77 @@ static constexpr const char* kGovDataCanadaColor = "#EF4444";
using namespace fincept::ui;
-// ── Panel stylesheet ─────────────────────────────────────────────────────────
-
-static const QString kCanadaStyle = QString(
- "#govPanelToolbar { background:#111111; border-bottom:1px solid #1a1a1a; }"
-
- "#govTabBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }"
- "#govTabBtn:hover { color:#e5e5e5; background:#161616; }"
- "#govTabBtn:checked { background:rgba(239,68,68,0.12); color:#EF4444;"
- " border:1px solid #EF4444; }"
-
- "#govBackBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#govBackBtn:hover { color:#e5e5e5; background:#161616; }"
-
- "#govFetchBtn { background:#EF4444; color:#080808; border:none;"
- " font-size:10px; font-weight:700; padding:4px 14px; }"
- "#govFetchBtn:hover { background:#f87171; }"
- "#govFetchBtn:disabled { background:#1a1a1a; color:#404040; }"
-
- "#govCsvBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#govCsvBtn:hover { color:#e5e5e5; background:#161616; }"
-
- "#govSearch { background:#080808; color:#e5e5e5; border:none;"
- " border-bottom:1px solid #1a1a1a; padding:4px 10px; font-size:11px; }"
- "#govSearch:focus { border-bottom:1px solid #EF4444; }"
-
- "QTableWidget { background:#080808; color:#e5e5e5; border:none;"
- " gridline-color:#1a1a1a; font-size:11px; alternate-background-color:#0a0a0a; }"
- "QTableWidget::item { padding:5px 8px; border-bottom:1px solid #1a1a1a; }"
- "QTableWidget::item:selected { background:rgba(239,68,68,0.10); color:#EF4444; }"
- "QHeaderView::section { background:#111111; color:#808080; border:none;"
- " border-bottom:2px solid #1a1a1a; border-right:1px solid #1a1a1a;"
- " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"
-
- "#govStatusPage { background:#080808; }"
- "#govStatusMsg { color:#808080; font-size:13px; background:transparent; }"
- "#govStatusErr { color:#dc2626; font-size:12px; background:transparent; }"
-
- "#govBreadcrumb { background:#0a0a0a; border-bottom:1px solid #1a1a1a; }"
- "#govBreadcrumbText { color:#808080; font-size:9px; background:transparent; }"
- "#govBreadcrumbActive { color:#EF4444; font-size:9px; font-weight:700; background:transparent; }"
-
- "QScrollBar:vertical { background:#080808; width:5px; }"
- "QScrollBar::handle:vertical { background:#1a1a1a; min-height:20px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }"
-);
+// ── Dynamic stylesheet ──────────────────────────────────────────────────────
+
+static QString build_canada_style() {
+ const auto& t = ui::ThemeManager::instance().tokens();
+ const auto cc = QColor(kGovDataCanadaColor);
+ const QString cr = QString::number(cc.red());
+ const QString cg = QString::number(cc.green());
+ const QString cb = QString::number(cc.blue());
+ const QString c = kGovDataCanadaColor;
+
+ QString s;
+ s += QString("#govPanelToolbar { background:%1; border-bottom:1px solid %2; }").arg(t.bg_raised, t.border_dim);
+
+ s += QString("#govTabBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govTabBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+ s += QString("#govTabBtn:checked { background:rgba(%1,%2,%3,0.12); color:%4;"
+ " border:1px solid %4; }").arg(cr, cg, cb, c);
+
+ s += QString("#govBackBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govBackBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+
+ s += QString("#govFetchBtn { background:%1; color:%2; border:none;"
+ " font-size:10px; font-weight:700; padding:4px 14px; }").arg(c, t.bg_base);
+ s += QString("#govFetchBtn:hover { background:%1; }").arg(cc.lighter(120).name());
+ s += QString("#govFetchBtn:disabled { background:%1; color:%2; }").arg(t.border_dim, t.text_dim);
+
+ s += QString("#govCsvBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govCsvBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+
+ s += QString("#govSearch { background:%1; color:%2; border:none;"
+ " border-bottom:1px solid %3; padding:4px 10px; font-size:11px; }").arg(t.bg_base, t.text_primary, t.border_dim);
+ s += QString("#govSearch:focus { border-bottom:1px solid %1; }").arg(c);
+
+ s += QString("QTableWidget { background:%1; color:%2; border:none;"
+ " gridline-color:%3; font-size:11px; alternate-background-color:%4; }").arg(t.bg_base, t.text_primary, t.border_dim, t.bg_surface);
+ s += QString("QTableWidget::item { padding:5px 8px; border-bottom:1px solid %1; }").arg(t.border_dim);
+ s += QString("QTableWidget::item:selected { background:rgba(%1,%2,%3,0.10); color:%4; }").arg(cr, cg, cb, c);
+ s += QString("QHeaderView::section { background:%1; color:%2; border:none;"
+ " border-bottom:2px solid %3; border-right:1px solid %3;"
+ " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }").arg(t.bg_raised, t.text_secondary, t.border_dim);
+
+ s += QString("#govStatusPage { background:%1; }").arg(t.bg_base);
+ s += QString("#govStatusMsg { color:%1; font-size:13px; background:transparent; }").arg(t.text_secondary);
+ s += QString("#govStatusErr { color:%1; font-size:12px; background:transparent; }").arg(t.negative);
+
+ s += QString("#govBreadcrumb { background:%1; border-bottom:1px solid %2; }").arg(t.bg_surface, t.border_dim);
+ s += QString("#govBreadcrumbText { color:%1; font-size:9px; background:transparent; }").arg(t.text_secondary);
+ s += QString("#govBreadcrumbActive { color:%1; font-size:9px; font-weight:700; background:transparent; }").arg(c);
+
+ s += QString("QScrollBar:vertical { background:%1; width:5px; }").arg(t.bg_base);
+ s += QString("QScrollBar::handle:vertical { background:%1; min-height:20px; }").arg(t.border_dim);
+ s += "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }";
+ return s;
+}
// ── Constructor ──────────────────────────────────────────────────────────────
GovDataCanadaPanel::GovDataCanadaPanel(QWidget* parent)
: QWidget(parent) {
- setStyleSheet(kCanadaStyle);
+ setStyleSheet(build_canada_style());
build_ui();
connect(&services::GovDataService::instance(),
&services::GovDataService::result_ready,
this,
&GovDataCanadaPanel::on_result);
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed, this, [this]() {
+ setStyleSheet(build_canada_style());
+ });
}
// ── Build UI ─────────────────────────────────────────────────────────────────
@@ -400,7 +412,7 @@ void GovDataCanadaPanel::populate_datasets(const QJsonArray& data, int total_cou
if (publisher.isEmpty()) publisher = pub_obj["name"].toString();
}
auto* pub_item = new QTableWidgetItem(publisher);
- pub_item->setForeground(QColor("#808080"));
+ pub_item->setForeground(QColor(ui::colors::TEXT_SECONDARY()));
datasets_table_->setItem(i, 3, pub_item);
}
@@ -572,14 +584,14 @@ void GovDataCanadaPanel::update_breadcrumb() {
void GovDataCanadaPanel::show_loading(const QString& message) {
status_label_->setStyleSheet(
- "color:#EF4444; font-size:13px; background:transparent;");
+ QString("color:%1; font-size:13px; background:transparent;").arg(kGovDataCanadaColor));
status_label_->setText(message);
content_stack_->setCurrentIndex(3);
}
void GovDataCanadaPanel::show_error(const QString& message) {
status_label_->setStyleSheet(
- "color:#dc2626; font-size:12px; background:transparent;");
+ QString("color:%1; font-size:12px; background:transparent;").arg(ui::colors::NEGATIVE()));
status_label_->setText("Error: " + message);
content_stack_->setCurrentIndex(3);
LOG_ERROR("GovDataCanada", "Error: " + message);
@@ -587,7 +599,7 @@ void GovDataCanadaPanel::show_error(const QString& message) {
void GovDataCanadaPanel::show_empty(const QString& message) {
status_label_->setStyleSheet(
- "color:#808080; font-size:12px; background:transparent;");
+ QString("color:%1; font-size:12px; background:transparent;").arg(ui::colors::TEXT_SECONDARY()));
status_label_->setText(message);
content_stack_->setCurrentIndex(3);
}
diff --git a/fincept-qt/src/screens/gov_data/GovDataCongressPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataCongressPanel.cpp
index 61d8f1a20..52d394871 100644
--- a/fincept-qt/src/screens/gov_data/GovDataCongressPanel.cpp
+++ b/fincept-qt/src/screens/gov_data/GovDataCongressPanel.cpp
@@ -21,62 +21,75 @@ using namespace fincept::ui;
static const QString kGovDataCongressColor = "#8B5CF6";
static const QString kGovDataCongressScript = "congress_gov_data.py";
-// ── Stylesheet ───────────────────────────────────────────────────────────────
-
-static const char* kGovDataCongressStyle =
- "#govCongressToolbar { background:#111111; border-bottom:1px solid #1a1a1a; }"
-
- "#govCongressTab { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }"
- "#govCongressTab:hover { color:#e5e5e5; background:#161616; }"
- "#govCongressTab:checked { background:rgba(139,92,246,0.12); color:#8B5CF6;"
- " border:1px solid #8B5CF6; }"
-
- "#govBackBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#govBackBtn:hover { color:#e5e5e5; background:#161616; }"
-
- "#govFetchBtn { background:#8B5CF6; color:#080808; border:none;"
- " font-size:10px; font-weight:700; padding:4px 14px; }"
- "#govFetchBtn:hover { background:#a78bfa; }"
- "#govFetchBtn:disabled { background:#1a1a1a; color:#404040; }"
- "#govCsvBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#govCsvBtn:hover { color:#e5e5e5; background:#161616; }"
-
- "QSpinBox { background:#080808; color:#e5e5e5; border:1px solid #1a1a1a;"
- " font-size:11px; padding:2px 6px; }"
- "QSpinBox::up-button, QSpinBox::down-button { width:14px; }"
- "QComboBox { background:#080808; color:#e5e5e5; border:1px solid #1a1a1a;"
- " font-size:11px; padding:2px 6px; }"
- "QComboBox::drop-down { border:none; }"
- "QComboBox QAbstractItemView { background:#111111; color:#e5e5e5; border:1px solid #1a1a1a; }"
-
- "QTableWidget { background:#080808; color:#e5e5e5; border:none;"
- " gridline-color:#1a1a1a; font-size:11px; alternate-background-color:#0a0a0a; }"
- "QTableWidget::item { padding:5px 8px; border-bottom:1px solid #1a1a1a; }"
- "QTableWidget::item:selected { background:rgba(139,92,246,0.1); color:#8B5CF6; }"
- "QHeaderView::section { background:#111111; color:#808080; border:none;"
- " border-bottom:2px solid #1a1a1a; border-right:1px solid #1a1a1a;"
- " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"
-
- "QTextBrowser { background:#080808; color:#e5e5e5; border:none; padding:16px; font-size:12px; }"
-
- "#govStatusPage { background:#080808; }"
- "#govStatusMsg { color:#808080; font-size:13px; background:transparent; }"
- "#govStatusErr { color:#dc2626; font-size:12px; background:transparent; }"
-
- "QScrollBar:vertical { background:#080808; width:5px; }"
- "QScrollBar::handle:vertical { background:#1a1a1a; min-height:20px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }";
+// ── Dynamic stylesheet ──────────────────────────────────────────────────────
+
+static QString build_congress_style() {
+ const auto& t = ThemeManager::instance().tokens();
+ const auto cc = QColor(kGovDataCongressColor);
+ const QString cr = QString::number(cc.red());
+ const QString cg = QString::number(cc.green());
+ const QString cb = QString::number(cc.blue());
+ const QString c = kGovDataCongressColor;
+
+ QString s;
+ s += QString("#govCongressToolbar { background:%1; border-bottom:1px solid %2; }").arg(t.bg_raised, t.border_dim);
+
+ s += QString("#govCongressTab { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govCongressTab:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+ s += QString("#govCongressTab:checked { background:rgba(%1,%2,%3,0.12); color:%4;"
+ " border:1px solid %4; }").arg(cr, cg, cb, c);
+
+ s += QString("#govBackBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govBackBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+
+ s += QString("#govFetchBtn { background:%1; color:%2; border:none;"
+ " font-size:10px; font-weight:700; padding:4px 14px; }").arg(c, t.bg_base);
+ s += QString("#govFetchBtn:hover { background:%1; }").arg(cc.lighter(120).name());
+ s += QString("#govFetchBtn:disabled { background:%1; color:%2; }").arg(t.border_dim, t.text_dim);
+ s += QString("#govCsvBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govCsvBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+
+ s += QString("QSpinBox { background:%1; color:%2; border:1px solid %3;"
+ " font-size:11px; padding:2px 6px; }").arg(t.bg_base, t.text_primary, t.border_dim);
+ s += "QSpinBox::up-button, QSpinBox::down-button { width:14px; }";
+ s += QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
+ " font-size:11px; padding:2px 6px; }").arg(t.bg_base, t.text_primary, t.border_dim);
+ s += "QComboBox::drop-down { border:none; }";
+ s += QString("QComboBox QAbstractItemView { background:%1; color:%2; border:1px solid %3; }").arg(t.bg_raised, t.text_primary, t.border_dim);
+
+ s += QString("QTableWidget { background:%1; color:%2; border:none;"
+ " gridline-color:%3; font-size:11px; alternate-background-color:%4; }").arg(t.bg_base, t.text_primary, t.border_dim, t.bg_surface);
+ s += QString("QTableWidget::item { padding:5px 8px; border-bottom:1px solid %1; }").arg(t.border_dim);
+ s += QString("QTableWidget::item:selected { background:rgba(%1,%2,%3,0.1); color:%4; }").arg(cr, cg, cb, c);
+ s += QString("QHeaderView::section { background:%1; color:%2; border:none;"
+ " border-bottom:2px solid %3; border-right:1px solid %3;"
+ " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }").arg(t.bg_raised, t.text_secondary, t.border_dim);
+
+ s += QString("QTextBrowser { background:%1; color:%2; border:none; padding:16px; font-size:12px; }").arg(t.bg_base, t.text_primary);
+
+ s += QString("#govStatusPage { background:%1; }").arg(t.bg_base);
+ s += QString("#govStatusMsg { color:%1; font-size:13px; background:transparent; }").arg(t.text_secondary);
+ s += QString("#govStatusErr { color:%1; font-size:12px; background:transparent; }").arg(t.negative);
+
+ s += QString("QScrollBar:vertical { background:%1; width:5px; }").arg(t.bg_base);
+ s += QString("QScrollBar::handle:vertical { background:%1; min-height:20px; }").arg(t.border_dim);
+ s += "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }";
+ return s;
+}
// ── Constructor ──────────────────────────────────────────────────────────────
GovDataCongressPanel::GovDataCongressPanel(QWidget* parent) : QWidget(parent) {
- setStyleSheet(kGovDataCongressStyle);
+ setStyleSheet(build_congress_style());
build_ui();
connect(&services::GovDataService::instance(), &services::GovDataService::result_ready,
this, &GovDataCongressPanel::on_result);
+ connect(&ThemeManager::instance(), &ThemeManager::theme_changed, this, [this]() {
+ setStyleSheet(build_congress_style());
+ });
}
// ── Build UI ─────────────────────────────────────────────────────────────────
@@ -181,7 +194,7 @@ QWidget* GovDataCongressPanel::build_toolbar() {
hl->addSpacing(14);
// Congress number
- auto lbl_style = "color:#525252; font-size:9px; font-weight:700; background:transparent;";
+ auto lbl_style = QString("color:%1; font-size:9px; font-weight:700; background:transparent;").arg(colors::TEXT_TERTIARY());
auto* cong_lbl = new QLabel("CONGRESS");
cong_lbl->setStyleSheet(lbl_style);
hl->addWidget(cong_lbl);
@@ -359,9 +372,11 @@ void GovDataCongressPanel::populate_bill_detail(const QJsonObject& data) {
"<h3 style='color:" + kGovDataCongressColor + ";'>\\1</h3>");
html.replace(QRegularExpression("\\*\\*(.+?)\\*\\*"), "<b>\\1</b>");
+ const auto& tk = ThemeManager::instance().tokens();
detail_browser_->setHtml(
- "<html><body style='background:#080808; color:#e5e5e5; font-family:Consolas,monospace;"
- " font-size:12px; padding:16px;'>" + html + "</body></html>");
+ QString("<html><body style='background:%1; color:%2; font-family:%3,monospace;"
+ " font-size:12px; padding:16px;'>").arg(tk.bg_base, tk.text_primary, tk.font_family)
+ + html + "</body></html>");
back_btn_->setVisible(true);
current_view_ = BillDetail;
}
@@ -392,7 +407,8 @@ void GovDataCongressPanel::show_loading(const QString& message) {
}
void GovDataCongressPanel::show_error(const QString& message) {
- status_label_->setStyleSheet("color:#dc2626; font-size:12px; background:transparent;");
+ status_label_->setStyleSheet(
+ QString("color:%1; font-size:12px; background:transparent;").arg(colors::NEGATIVE()));
status_label_->setText("Error: " + message);
content_stack_->setCurrentIndex(3);
}
diff --git a/fincept-qt/src/screens/gov_data/GovDataFrancePanel.cpp b/fincept-qt/src/screens/gov_data/GovDataFrancePanel.cpp
index 740e8c08e..4d1454aca 100644
--- a/fincept-qt/src/screens/gov_data/GovDataFrancePanel.cpp
+++ b/fincept-qt/src/screens/gov_data/GovDataFrancePanel.cpp
@@ -4,6 +4,7 @@
#include "core/logging/Logger.h"
#include "services/gov_data/GovDataService.h"
+#include "ui/theme/Theme.h"
#include <QDesktopServices>
#include <QFileDialog>
@@ -22,64 +23,78 @@ static constexpr const char* kGovDataFranceScript = "french_gov_api.py";
static constexpr const char* kGovDataFranceColor = "#2563EB";
} // namespace
-// ── Stylesheet ────────────────────────────────────────────────────────────────
-
-static const QString kPanelStyle = QStringLiteral(
- "#frPanelToolbar { background:#111111; border-bottom:1px solid #1a1a1a; }"
-
- "#frTabBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }"
- "#frTabBtn:hover { color:#e5e5e5; background:#161616; }"
- "#frTabBtn:checked { background:rgba(37,99,235,0.12); color:#2563EB;"
- " border:1px solid #2563EB; }"
-
- "#frBackBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#frBackBtn:hover { color:#e5e5e5; background:#161616; }"
-
- "#frFetchBtn { background:#2563EB; color:#e5e5e5; border:none;"
- " font-size:10px; font-weight:700; padding:4px 14px; }"
- "#frFetchBtn:hover { background:#1d4ed8; }"
- "#frFetchBtn:disabled { background:#1a1a1a; color:#404040; }"
-
- "#frCsvBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#frCsvBtn:hover { color:#e5e5e5; background:#161616; }"
-
- "#frSearch { background:#080808; color:#e5e5e5; border:none;"
- " border-bottom:1px solid #1a1a1a; padding:4px 10px; font-size:11px; }"
- "#frSearch:focus { border-bottom:1px solid #2563EB; }"
-
- "QTableWidget { background:#080808; color:#e5e5e5; border:none;"
- " gridline-color:#1a1a1a; font-size:11px; alternate-background-color:#0a0a0a; }"
- "QTableWidget::item { padding:5px 8px; border-bottom:1px solid #1a1a1a; }"
- "QTableWidget::item:selected { background:rgba(37,99,235,0.10); color:#2563EB; }"
- "QHeaderView::section { background:#111111; color:#808080; border:none;"
- " border-bottom:2px solid #1a1a1a; border-right:1px solid #1a1a1a;"
- " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"
-
- "#frStatusPage { background:#080808; }"
- "#frStatusMsg { color:#808080; font-size:13px; background:transparent; }"
- "#frStatusErr { color:#dc2626; font-size:12px; background:transparent; }"
-
- "#frBreadcrumb { background:#0a0a0a; border-bottom:1px solid #1a1a1a; }"
- "#frBreadText { color:#808080; font-size:9px; background:transparent; }"
- "#frBreadCount { color:#808080; font-size:9px; background:transparent; }"
-
- "QScrollBar:vertical { background:#080808; width:5px; }"
- "QScrollBar::handle:vertical { background:#1a1a1a; min-height:20px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }"
-);
+using namespace fincept::ui;
+
+// ── Dynamic stylesheet ───────────────────────────────────────────────────────
+
+static QString build_france_style() {
+ const auto& t = ui::ThemeManager::instance().tokens();
+ const auto cc = QColor(kGovDataFranceColor);
+ const QString cr = QString::number(cc.red());
+ const QString cg = QString::number(cc.green());
+ const QString cb = QString::number(cc.blue());
+ const QString c = kGovDataFranceColor;
+
+ QString s;
+ s += QString("#frPanelToolbar { background:%1; border-bottom:1px solid %2; }").arg(t.bg_raised, t.border_dim);
+
+ s += QString("#frTabBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#frTabBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+ s += QString("#frTabBtn:checked { background:rgba(%1,%2,%3,0.12); color:%4;"
+ " border:1px solid %4; }").arg(cr, cg, cb, c);
+
+ s += QString("#frBackBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#frBackBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+
+ s += QString("#frFetchBtn { background:%1; color:%2; border:none;"
+ " font-size:10px; font-weight:700; padding:4px 14px; }").arg(c, t.bg_base);
+ s += QString("#frFetchBtn:hover { background:%1; }").arg(cc.lighter(120).name());
+ s += QString("#frFetchBtn:disabled { background:%1; color:%2; }").arg(t.border_dim, t.text_dim);
+
+ s += QString("#frCsvBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#frCsvBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+
+ s += QString("#frSearch { background:%1; color:%2; border:none;"
+ " border-bottom:1px solid %3; padding:4px 10px; font-size:11px; }").arg(t.bg_base, t.text_primary, t.border_dim);
+ s += QString("#frSearch:focus { border-bottom:1px solid %1; }").arg(c);
+
+ s += QString("QTableWidget { background:%1; color:%2; border:none;"
+ " gridline-color:%3; font-size:11px; alternate-background-color:%4; }").arg(t.bg_base, t.text_primary, t.border_dim, t.bg_surface);
+ s += QString("QTableWidget::item { padding:5px 8px; border-bottom:1px solid %1; }").arg(t.border_dim);
+ s += QString("QTableWidget::item:selected { background:rgba(%1,%2,%3,0.10); color:%4; }").arg(cr, cg, cb, c);
+ s += QString("QHeaderView::section { background:%1; color:%2; border:none;"
+ " border-bottom:2px solid %3; border-right:1px solid %3;"
+ " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }").arg(t.bg_raised, t.text_secondary, t.border_dim);
+
+ s += QString("#frStatusPage { background:%1; }").arg(t.bg_base);
+ s += QString("#frStatusMsg { color:%1; font-size:13px; background:transparent; }").arg(t.text_secondary);
+ s += QString("#frStatusErr { color:%1; font-size:12px; background:transparent; }").arg(t.negative);
+
+ s += QString("#frBreadcrumb { background:%1; border-bottom:1px solid %2; }").arg(t.bg_surface, t.border_dim);
+ s += QString("#frBreadText { color:%1; font-size:9px; background:transparent; }").arg(t.text_secondary);
+ s += QString("#frBreadCount { color:%1; font-size:9px; background:transparent; }").arg(t.text_secondary);
+
+ s += QString("QScrollBar:vertical { background:%1; width:5px; }").arg(t.bg_base);
+ s += QString("QScrollBar::handle:vertical { background:%1; min-height:20px; }").arg(t.border_dim);
+ s += "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }";
+ return s;
+}
// ── Constructor ───────────────────────────────────────────────────────────────
GovDataFrancePanel::GovDataFrancePanel(QWidget* parent)
: QWidget(parent) {
- setStyleSheet(kPanelStyle);
+ setStyleSheet(build_france_style());
build_ui();
connect(&services::GovDataService::instance(),
&services::GovDataService::result_ready,
this, &GovDataFrancePanel::on_result);
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed, this, [this]() {
+ setStyleSheet(build_france_style());
+ });
}
// ── Build UI ──────────────────────────────────────────────────────────────────
@@ -483,7 +498,7 @@ void GovDataFrancePanel::populate_services(const QJsonArray& data) {
QString created = obj["created_at"].toString();
if (created.length() > 10) created = created.left(10);
auto* dt = new QTableWidgetItem(created);
- dt->setForeground(QColor("#808080"));
+ dt->setForeground(QColor(ui::colors::TEXT_SECONDARY()));
services_table_->setItem(i, 3, dt);
}
@@ -511,13 +526,13 @@ void GovDataFrancePanel::populate_datasets(const QJsonArray& data) {
// organization is a plain string in this API, not an object
QString org = obj["organization"].toString();
auto* org_item = new QTableWidgetItem(org);
- org_item->setForeground(QColor("#808080"));
+ org_item->setForeground(QColor(ui::colors::TEXT_SECONDARY()));
org_item->setToolTip(org);
datasets_table_->setItem(i, 1, org_item);
QString license = obj["license"].toString();
auto* lic_item = new QTableWidgetItem(license.isEmpty() ? "—" : license);
- lic_item->setForeground(QColor("#808080"));
+ lic_item->setForeground(QColor(ui::colors::TEXT_SECONDARY()));
datasets_table_->setItem(i, 2, lic_item);
int num_res = obj["num_resources"].toInt(0);
@@ -584,7 +599,7 @@ void GovDataFrancePanel::populate_resources(const QJsonArray& data) {
QString type = obj["format"].toString();
auto* type_item = new QTableWidgetItem(type.isEmpty() ? "—" : type);
- type_item->setForeground(QColor("#808080"));
+ type_item->setForeground(QColor(ui::colors::TEXT_SECONDARY()));
type_item->setTextAlignment(Qt::AlignCenter);
resources_table_->setItem(i, 1, type_item);
}
@@ -603,7 +618,7 @@ void GovDataFrancePanel::show_loading(const QString& message) {
void GovDataFrancePanel::show_error(const QString& message) {
status_label_->setStyleSheet(
- "color:#dc2626; font-size:12px; background:transparent;");
+ QString("color:%1; font-size:12px; background:transparent;").arg(ui::colors::NEGATIVE()));
status_label_->setText("Error: " + message);
content_stack_->setCurrentIndex(Status);
LOG_ERROR("GovFrance", message);
@@ -611,8 +626,8 @@ void GovDataFrancePanel::show_error(const QString& message) {
void GovDataFrancePanel::show_status(const QString& message, bool is_error) {
status_label_->setStyleSheet(is_error
- ? "color:#dc2626; font-size:12px; background:transparent;"
- : "color:#808080; font-size:12px; background:transparent;");
+ ? QString("color:%1; font-size:12px; background:transparent;").arg(ui::colors::NEGATIVE())
+ : QString("color:%1; font-size:12px; background:transparent;").arg(ui::colors::TEXT_SECONDARY()));
status_label_->setText(message);
content_stack_->setCurrentIndex(Status);
}
diff --git a/fincept-qt/src/screens/gov_data/GovDataHKPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataHKPanel.cpp
index 9a4279af0..c569800c2 100644
--- a/fincept-qt/src/screens/gov_data/GovDataHKPanel.cpp
+++ b/fincept-qt/src/screens/gov_data/GovDataHKPanel.cpp
@@ -6,6 +6,7 @@
#include "core/logging/Logger.h"
#include "services/gov_data/GovDataService.h"
+#include "ui/theme/Theme.h"
#include <QDesktopServices>
#include <QFileDialog>
@@ -24,64 +25,78 @@ static constexpr const char* kGovDataHKScript = "data_gov_hk_api.py";
static constexpr const char* kGovDataHKColor = "#F43F5E";
} // namespace
-// ── Stylesheet ────────────────────────────────────────────────────────────────
-
-static const QString kPanelStyle = QStringLiteral(
- "#hkPanelToolbar { background:#111111; border-bottom:1px solid #1a1a1a; }"
-
- "#hkTabBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }"
- "#hkTabBtn:hover { color:#e5e5e5; background:#161616; }"
- "#hkTabBtn:checked { background:rgba(244,63,94,0.12); color:#F43F5E;"
- " border:1px solid #F43F5E; }"
-
- "#hkBackBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#hkBackBtn:hover { color:#e5e5e5; background:#161616; }"
-
- "#hkFetchBtn { background:#F43F5E; color:#e5e5e5; border:none;"
- " font-size:10px; font-weight:700; padding:4px 14px; }"
- "#hkFetchBtn:hover { background:#e11d48; }"
- "#hkFetchBtn:disabled { background:#1a1a1a; color:#404040; }"
-
- "#hkCsvBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#hkCsvBtn:hover { color:#e5e5e5; background:#161616; }"
-
- "#hkSearch { background:#080808; color:#e5e5e5; border:none;"
- " border-bottom:1px solid #1a1a1a; padding:4px 10px; font-size:11px; }"
- "#hkSearch:focus { border-bottom:1px solid #F43F5E; }"
-
- "QTableWidget { background:#080808; color:#e5e5e5; border:none;"
- " gridline-color:#1a1a1a; font-size:11px; alternate-background-color:#0a0a0a; }"
- "QTableWidget::item { padding:5px 8px; border-bottom:1px solid #1a1a1a; }"
- "QTableWidget::item:selected { background:rgba(244,63,94,0.10); color:#F43F5E; }"
- "QHeaderView::section { background:#111111; color:#808080; border:none;"
- " border-bottom:2px solid #1a1a1a; border-right:1px solid #1a1a1a;"
- " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"
-
- "#hkStatusPage { background:#080808; }"
- "#hkStatusMsg { color:#808080; font-size:13px; background:transparent; }"
- "#hkStatusErr { color:#dc2626; font-size:12px; background:transparent; }"
-
- "#hkBreadcrumb { background:#0a0a0a; border-bottom:1px solid #1a1a1a; }"
- "#hkBreadText { color:#808080; font-size:9px; background:transparent; }"
- "#hkBreadCount { color:#808080; font-size:9px; background:transparent; }"
-
- "QScrollBar:vertical { background:#080808; width:5px; }"
- "QScrollBar::handle:vertical { background:#1a1a1a; min-height:20px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }"
-);
+using namespace fincept::ui;
+
+// ── Dynamic stylesheet ───────────────────────────────────────────────────────
+
+static QString build_hk_style() {
+ const auto& t = ui::ThemeManager::instance().tokens();
+ const auto cc = QColor(kGovDataHKColor);
+ const QString cr = QString::number(cc.red());
+ const QString cg = QString::number(cc.green());
+ const QString cb = QString::number(cc.blue());
+ const QString c = kGovDataHKColor;
+
+ QString s;
+ s += QString("#hkPanelToolbar { background:%1; border-bottom:1px solid %2; }").arg(t.bg_raised, t.border_dim);
+
+ s += QString("#hkTabBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#hkTabBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+ s += QString("#hkTabBtn:checked { background:rgba(%1,%2,%3,0.12); color:%4;"
+ " border:1px solid %4; }").arg(cr, cg, cb, c);
+
+ s += QString("#hkBackBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#hkBackBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+
+ s += QString("#hkFetchBtn { background:%1; color:%2; border:none;"
+ " font-size:10px; font-weight:700; padding:4px 14px; }").arg(c, t.bg_base);
+ s += QString("#hkFetchBtn:hover { background:%1; }").arg(cc.lighter(120).name());
+ s += QString("#hkFetchBtn:disabled { background:%1; color:%2; }").arg(t.border_dim, t.text_dim);
+
+ s += QString("#hkCsvBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#hkCsvBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+
+ s += QString("#hkSearch { background:%1; color:%2; border:none;"
+ " border-bottom:1px solid %3; padding:4px 10px; font-size:11px; }").arg(t.bg_base, t.text_primary, t.border_dim);
+ s += QString("#hkSearch:focus { border-bottom:1px solid %1; }").arg(c);
+
+ s += QString("QTableWidget { background:%1; color:%2; border:none;"
+ " gridline-color:%3; font-size:11px; alternate-background-color:%4; }").arg(t.bg_base, t.text_primary, t.border_dim, t.bg_surface);
+ s += QString("QTableWidget::item { padding:5px 8px; border-bottom:1px solid %1; }").arg(t.border_dim);
+ s += QString("QTableWidget::item:selected { background:rgba(%1,%2,%3,0.10); color:%4; }").arg(cr, cg, cb, c);
+ s += QString("QHeaderView::section { background:%1; color:%2; border:none;"
+ " border-bottom:2px solid %3; border-right:1px solid %3;"
+ " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }").arg(t.bg_raised, t.text_secondary, t.border_dim);
+
+ s += QString("#hkStatusPage { background:%1; }").arg(t.bg_base);
+ s += QString("#hkStatusMsg { color:%1; font-size:13px; background:transparent; }").arg(t.text_secondary);
+ s += QString("#hkStatusErr { color:%1; font-size:12px; background:transparent; }").arg(t.negative);
+
+ s += QString("#hkBreadcrumb { background:%1; border-bottom:1px solid %2; }").arg(t.bg_surface, t.border_dim);
+ s += QString("#hkBreadText { color:%1; font-size:9px; background:transparent; }").arg(t.text_secondary);
+ s += QString("#hkBreadCount { color:%1; font-size:9px; background:transparent; }").arg(t.text_secondary);
+
+ s += QString("QScrollBar:vertical { background:%1; width:5px; }").arg(t.bg_base);
+ s += QString("QScrollBar::handle:vertical { background:%1; min-height:20px; }").arg(t.border_dim);
+ s += "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }";
+ return s;
+}
// ── Constructor ───────────────────────────────────────────────────────────────
GovDataHKPanel::GovDataHKPanel(QWidget* parent)
: QWidget(parent) {
- setStyleSheet(kPanelStyle);
+ setStyleSheet(build_hk_style());
build_ui();
connect(&services::GovDataService::instance(),
&services::GovDataService::result_ready,
this, &GovDataHKPanel::on_result);
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed, this, [this]() {
+ setStyleSheet(build_hk_style());
+ });
}
// ── Build UI ──────────────────────────────────────────────────────────────────
@@ -579,7 +594,7 @@ void GovDataHKPanel::show_loading(const QString& message) {
void GovDataHKPanel::show_error(const QString& message) {
status_label_->setStyleSheet(
- "color:#dc2626; font-size:12px; background:transparent;");
+ QString("color:%1; font-size:12px; background:transparent;").arg(colors::NEGATIVE()));
status_label_->setText("Error: " + message);
content_stack_->setCurrentIndex(Status);
LOG_ERROR("GovHK", message);
@@ -587,8 +602,8 @@ void GovDataHKPanel::show_error(const QString& message) {
void GovDataHKPanel::show_status(const QString& message, bool is_error) {
status_label_->setStyleSheet(is_error
- ? "color:#dc2626; font-size:12px; background:transparent;"
- : "color:#808080; font-size:12px; background:transparent;");
+ ? QString("color:%1; font-size:12px; background:transparent;").arg(colors::NEGATIVE())
+ : QString("color:%1; font-size:12px; background:transparent;").arg(colors::TEXT_SECONDARY()));
status_label_->setText(message);
content_stack_->setCurrentIndex(Status);
}
diff --git a/fincept-qt/src/screens/gov_data/GovDataProviderPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataProviderPanel.cpp
index aa3ffa85e..2311ef587 100644
--- a/fincept-qt/src/screens/gov_data/GovDataProviderPanel.cpp
+++ b/fincept-qt/src/screens/gov_data/GovDataProviderPanel.cpp
@@ -24,64 +24,66 @@ using namespace fincept::ui;
// ── Shared panel stylesheet ──────────────────────────────────────────────────
static QString make_panel_style(const QString& color) {
- return QString(
- // Toolbar
- "#govPanelToolbar { background:#111111; border-bottom:1px solid #1a1a1a; }"
-
- // Tab buttons
- "#govTabBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }"
- "#govTabBtn:hover { color:#e5e5e5; background:#161616; }"
- "#govTabBtn:checked { background:rgba(%1,%2,%3,0.12); color:%4;"
- " border:1px solid %4; }"
-
- // Back button
- "#govBackBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#govBackBtn:hover { color:#e5e5e5; background:#161616; }"
-
- // Fetch / action buttons
- "#govFetchBtn { background:%4; color:#080808; border:none;"
- " font-size:10px; font-weight:700; padding:4px 14px; }"
- "#govFetchBtn:hover { background:#f59e0b; }"
- "#govFetchBtn:disabled { background:#1a1a1a; color:#404040; }"
- "#govCsvBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#govCsvBtn:hover { color:#e5e5e5; background:#161616; }"
-
- // Search
- "#govSearch { background:#080808; color:#e5e5e5; border:none;"
- " border-bottom:1px solid #1a1a1a; padding:4px 10px; font-size:11px; }"
- "#govSearch:focus { border-bottom:1px solid %4; }"
-
- // Tables
- "QTableWidget { background:#080808; color:#e5e5e5; border:none;"
- " gridline-color:#1a1a1a; font-size:11px; alternate-background-color:#0a0a0a; }"
- "QTableWidget::item { padding:5px 8px; border-bottom:1px solid #1a1a1a; }"
- "QTableWidget::item:selected { background:rgba(%1,%2,%3,0.1); color:%4; }"
- "QHeaderView::section { background:#111111; color:#808080; border:none;"
- " border-bottom:2px solid #1a1a1a; border-right:1px solid #1a1a1a;"
- " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"
-
- // Status / empty state
- "#govStatusPage { background:#080808; }"
- "#govStatusMsg { color:#808080; font-size:13px; background:transparent; }"
- "#govStatusErr { color:#dc2626; font-size:12px; background:transparent; }"
-
- // Breadcrumb
- "#govBreadcrumb { background:#0a0a0a; border-bottom:1px solid #1a1a1a; }"
- "#govBreadcrumbText { color:#808080; font-size:9px; background:transparent; }"
- "#govBreadcrumbActive { color:%4; font-size:9px; font-weight:700; background:transparent; }"
-
- // Scrollbar
- "QScrollBar:vertical { background:#080808; width:5px; }"
- "QScrollBar::handle:vertical { background:#1a1a1a; min-height:20px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }"
- )
- .arg(QColor(color).red())
- .arg(QColor(color).green())
- .arg(QColor(color).blue())
- .arg(color);
+ const auto& t = ThemeManager::instance().tokens();
+ const auto cc = QColor(color);
+ const QString cr = QString::number(cc.red());
+ const QString cg = QString::number(cc.green());
+ const QString cb = QString::number(cc.blue());
+
+ QString s;
+ // Toolbar
+ s += QString("#govPanelToolbar { background:%1; border-bottom:1px solid %2; }").arg(t.bg_raised, t.border_dim);
+
+ // Tab buttons
+ s += QString("#govTabBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govTabBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+ s += QString("#govTabBtn:checked { background:rgba(%1,%2,%3,0.12); color:%4;"
+ " border:1px solid %4; }").arg(cr, cg, cb, color);
+
+ // Back button
+ s += QString("#govBackBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govBackBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+
+ // Fetch / action buttons
+ s += QString("#govFetchBtn { background:%1; color:%2; border:none;"
+ " font-size:10px; font-weight:700; padding:4px 14px; }").arg(color, t.bg_base);
+ s += QString("#govFetchBtn:hover { background:%1; }").arg(cc.lighter(120).name());
+ s += QString("#govFetchBtn:disabled { background:%1; color:%2; }").arg(t.border_dim, t.text_dim);
+ s += QString("#govCsvBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govCsvBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+
+ // Search
+ s += QString("#govSearch { background:%1; color:%2; border:none;"
+ " border-bottom:1px solid %3; padding:4px 10px; font-size:11px; }").arg(t.bg_base, t.text_primary, t.border_dim);
+ s += QString("#govSearch:focus { border-bottom:1px solid %1; }").arg(color);
+
+ // Tables
+ s += QString("QTableWidget { background:%1; color:%2; border:none;"
+ " gridline-color:%3; font-size:11px; alternate-background-color:%4; }").arg(t.bg_base, t.text_primary, t.border_dim, t.bg_surface);
+ s += QString("QTableWidget::item { padding:5px 8px; border-bottom:1px solid %1; }").arg(t.border_dim);
+ s += QString("QTableWidget::item:selected { background:rgba(%1,%2,%3,0.1); color:%4; }").arg(cr, cg, cb, color);
+ s += QString("QHeaderView::section { background:%1; color:%2; border:none;"
+ " border-bottom:2px solid %3; border-right:1px solid %3;"
+ " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }").arg(t.bg_raised, t.text_secondary, t.border_dim);
+
+ // Status / empty state
+ s += QString("#govStatusPage { background:%1; }").arg(t.bg_base);
+ s += QString("#govStatusMsg { color:%1; font-size:13px; background:transparent; }").arg(t.text_secondary);
+ s += QString("#govStatusErr { color:%1; font-size:12px; background:transparent; }").arg(t.negative);
+
+ // Breadcrumb
+ s += QString("#govBreadcrumb { background:%1; border-bottom:1px solid %2; }").arg(t.bg_surface, t.border_dim);
+ s += QString("#govBreadcrumbText { color:%1; font-size:9px; background:transparent; }").arg(t.text_secondary);
+ s += QString("#govBreadcrumbActive { color:%1; font-size:9px; font-weight:700; background:transparent; }").arg(color);
+
+ // Scrollbar
+ s += QString("QScrollBar:vertical { background:%1; width:5px; }").arg(t.bg_base);
+ s += QString("QScrollBar::handle:vertical { background:%1; min-height:20px; }").arg(t.border_dim);
+ s += "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }";
+ return s;
}
// ── Constructor ──────────────────────────────────────────────────────────────
@@ -95,6 +97,9 @@ GovDataProviderPanel::GovDataProviderPanel(const QString& script,
build_ui();
connect(&services::GovDataService::instance(), &services::GovDataService::result_ready,
this, &GovDataProviderPanel::on_result);
+ connect(&ThemeManager::instance(), &ThemeManager::theme_changed, this, [this]() {
+ setStyleSheet(make_panel_style(color_));
+ });
}
// ── Build UI ─────────────────────────────────────────────────────────────────
@@ -390,7 +395,7 @@ void GovDataProviderPanel::populate_datasets(const QJsonArray& data, int total_c
QString tags_str = tags.mid(0, 3).join(", ");
if (tags.size() > 3) tags_str += QString(" +%1").arg(tags.size() - 3);
auto* tag_item = new QTableWidgetItem(tags_str);
- tag_item->setForeground(QColor("#808080"));
+ tag_item->setForeground(QColor(colors::TEXT_SECONDARY()));
datasets_table_->setItem(i, 3, tag_item);
}
@@ -543,7 +548,7 @@ void GovDataProviderPanel::show_loading(const QString& message) {
void GovDataProviderPanel::show_error(const QString& message) {
status_label_->setObjectName("govStatusErr");
status_label_->setStyleSheet(
- "color:#dc2626; font-size:12px; background:transparent;");
+ QString("color:%1; font-size:12px; background:transparent;").arg(colors::NEGATIVE()));
status_label_->setText("Error: " + message);
content_stack_->setCurrentIndex(3);
}
@@ -551,7 +556,7 @@ void GovDataProviderPanel::show_error(const QString& message) {
void GovDataProviderPanel::show_empty(const QString& message) {
status_label_->setObjectName("govStatusMsg");
status_label_->setStyleSheet(
- "color:#808080; font-size:12px; background:transparent;");
+ QString("color:%1; font-size:12px; background:transparent;").arg(colors::TEXT_SECONDARY()));
status_label_->setText(message);
content_stack_->setCurrentIndex(3);
}
diff --git a/fincept-qt/src/screens/gov_data/GovDataScreen.cpp b/fincept-qt/src/screens/gov_data/GovDataScreen.cpp
index efc2196c6..8dc38ac43 100644
--- a/fincept-qt/src/screens/gov_data/GovDataScreen.cpp
+++ b/fincept-qt/src/screens/gov_data/GovDataScreen.cpp
@@ -2,6 +2,7 @@
#include "screens/gov_data/GovDataScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "screens/gov_data/GovDataAustraliaPanel.h"
#include "screens/gov_data/GovDataCanadaPanel.h"
#include "screens/gov_data/GovDataProviderPanel.h"
@@ -27,47 +28,68 @@ namespace fincept::screens {
using namespace fincept::ui;
-// ── Shared stylesheet ────────────────────────────────────────────────────────
+// ── Dynamic stylesheet ──────────────────────────────────────────────────────
-static const char* kScreenStyle =
- "#govScreen { background:#080808; }"
+static QString build_screen_style() {
+ const auto& t = ThemeManager::instance().tokens();
+ const auto ac = QColor(t.accent);
+ const QString ar = QString("%1,%2,%3").arg(ac.red()).arg(ac.green()).arg(ac.blue());
+
+ const QString bg = QString::fromLatin1(t.bg_base);
+ const QString text = QString::fromLatin1(t.text_primary);
+ const QString raised = QString::fromLatin1(t.bg_raised);
+ const QString bdim = QString::fromLatin1(t.border_dim);
+ const QString surface = QString::fromLatin1(t.bg_surface);
+ const QString sec = QString::fromLatin1(t.text_secondary);
+ const QString hover = QString::fromLatin1(t.bg_hover);
+ const QString accent = QString::fromLatin1(t.accent);
+ const QString dim = QString::fromLatin1(t.text_dim);
+
+ QString s;
+ s += QString("#govScreen { background:%1; }").arg(bg);
// Toolbar
- "#govToolbar { background:#111111; border-bottom:1px solid #1a1a1a; }"
- "#govToolbarTitle { color:#e5e5e5; font-size:13px; font-weight:700;"
- " letter-spacing:1px; background:transparent; }"
- "#govToolbarSub { color:#808080; font-size:10px; background:transparent; }"
+ s += QString("#govToolbar { background:%1; border-bottom:1px solid %2; }").arg(raised, bdim);
+ s += QString("#govToolbarTitle { color:%1; font-size:13px; font-weight:700;"
+ " letter-spacing:1px; background:transparent; }").arg(text);
+ s += QString("#govToolbarSub { color:%1; font-size:10px; background:transparent; }").arg(sec);
// Sidebar
- "#govSidebar { background:#0a0a0a; border-right:1px solid #1a1a1a; }"
- "#govSidebarHeader { background:#111111; border-bottom:1px solid #1a1a1a; }"
- "#govSidebarTitle { color:#808080; font-size:9px; font-weight:700;"
- " letter-spacing:1px; background:transparent; }"
- "#govProviderList { background:transparent; border:none; outline:none; }"
- "#govProviderList::item { color:#808080; padding:10px 14px;"
- " border-bottom:1px solid #1a1a1a; font-size:11px; }"
- "#govProviderList::item:hover { color:#e5e5e5; background:#161616; }"
- "#govProviderList::item:selected { color:#d97706; background:rgba(217,119,6,0.08);"
- " border-left:2px solid #d97706; padding-left:12px; font-weight:700; }"
+ s += QString("#govSidebar { background:%1; border-right:1px solid %2; }").arg(surface, bdim);
+ s += QString("#govSidebarHeader { background:%1; border-bottom:1px solid %2; }").arg(raised, bdim);
+ s += QString("#govSidebarTitle { color:%1; font-size:9px; font-weight:700;"
+ " letter-spacing:1px; background:transparent; }").arg(sec);
+ s += "#govProviderList { background:transparent; border:none; outline:none; }";
+ s += QString("#govProviderList::item { color:%1; padding:10px 14px;"
+ " border-bottom:1px solid %2; font-size:11px; }").arg(sec, bdim);
+ s += QString("#govProviderList::item:hover { color:%1; background:%2; }").arg(text, hover);
+ s += QString("#govProviderList::item:selected { color:%1; background:rgba(%2,0.08);"
+ " border-left:2px solid %1; padding-left:12px; font-weight:700; }").arg(accent, ar);
// Status bar
- "#govStatusBar { background:#111111; border-top:1px solid #1a1a1a; }"
- "#govStatusText { color:#404040; font-size:9px; background:transparent; }"
- "#govStatusSep { color:#1a1a1a; font-size:9px; background:transparent; }"
- "#govStatusVal { color:#808080; font-size:9px; background:transparent; }"
- "#govStatusHigh { color:#d97706; font-size:9px; font-weight:700; background:transparent; }"
+ s += QString("#govStatusBar { background:%1; border-top:1px solid %2; }").arg(raised, bdim);
+ s += QString("#govStatusText { color:%1; font-size:9px; background:transparent; }").arg(dim);
+ s += QString("#govStatusSep { color:%1; font-size:9px; background:transparent; }").arg(bdim);
+ s += QString("#govStatusVal { color:%1; font-size:9px; background:transparent; }").arg(sec);
+ s += QString("#govStatusHigh { color:%1; font-size:9px; font-weight:700; background:transparent; }").arg(accent);
// Scrollbar
- "QScrollBar:vertical { background:#080808; width:5px; }"
- "QScrollBar::handle:vertical { background:#1a1a1a; min-height:20px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }";
+ s += QString("QScrollBar:vertical { background:%1; width:5px; }").arg(bg);
+ s += QString("QScrollBar::handle:vertical { background:%1; min-height:20px; }").arg(bdim);
+ s += "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }";
+ return s;
+}
// ── Constructor ──────────────────────────────────────────────────────────────
GovDataScreen::GovDataScreen(QWidget* parent) : QWidget(parent) {
setObjectName("govScreen");
- setStyleSheet(kScreenStyle);
+ setStyleSheet(build_screen_style());
build_ui();
+
+ connect(&ThemeManager::instance(), &ThemeManager::theme_changed, this, [this]() {
+ setStyleSheet(build_screen_style());
+ });
}
// ── Show / Hide ──────────────────────────────────────────────────────────────
@@ -173,9 +195,12 @@ QWidget* GovDataScreen::build_toolbar() {
// Source count badge
const auto& providers = services::GovDataService::providers();
auto* badge = new QLabel(QString::number(providers.size()) + " PORTALS");
+ const auto& t = ThemeManager::instance().tokens();
+ auto bc = QColor(t.accent);
badge->setStyleSheet(
- "color:#d97706; background:rgba(217,119,6,0.1); border:1px solid rgba(217,119,6,0.3);"
- " font-size:9px; font-weight:700; padding:3px 10px; letter-spacing:0.5px;");
+ QString("color:%1; background:rgba(%2,%3,%4,0.1); border:1px solid rgba(%2,%3,%4,0.3);"
+ " font-size:9px; font-weight:700; padding:3px 10px; letter-spacing:0.5px;")
+ .arg(t.accent).arg(bc.red()).arg(bc.green()).arg(bc.blue()));
hl->addWidget(badge);
return header_bar_;
@@ -202,12 +227,14 @@ QWidget* GovDataScreen::build_sidebar() {
htitle->setObjectName("govSidebarTitle");
const auto& providers = services::GovDataService::providers();
auto* hcount = new QLabel(QString::number(providers.size()));
- hcount->setStyleSheet(
- "background:rgba(217,119,6,0.15); color:#d97706; font-size:9px;"
- " font-weight:700; padding:1px 6px; background:transparent;");
- hcount->setStyleSheet(
- "color:#d97706; background:rgba(217,119,6,0.12); font-size:9px;"
- " font-weight:700; padding:1px 6px;");
+ {
+ const auto& tk = ThemeManager::instance().tokens();
+ auto ac2 = QColor(tk.accent);
+ hcount->setStyleSheet(
+ QString("color:%1; background:rgba(%2,%3,%4,0.12); font-size:9px;"
+ " font-weight:700; padding:1px 6px;")
+ .arg(tk.accent).arg(ac2.red()).arg(ac2.green()).arg(ac2.blue()));
+ }
hhl->addWidget(htitle);
hhl->addStretch(1);
hhl->addWidget(hcount);
@@ -275,11 +302,11 @@ QWidget* GovDataScreen::build_status_bar() {
// Ready dot
auto* dot = new QLabel;
dot->setFixedSize(6, 6);
- dot->setStyleSheet("background:#16a34a; border-radius:3px;");
+ dot->setStyleSheet(QString("background:%1; border-radius:3px;").arg(colors::POSITIVE()));
hl->addWidget(dot);
auto* ready = new QLabel("READY");
ready->setObjectName("govStatusText");
- ready->setStyleSheet("color:#16a34a; font-size:9px; background:transparent;");
+ ready->setStyleSheet(QString("color:%1; font-size:9px; background:transparent;").arg(colors::POSITIVE()));
hl->addWidget(ready);
return bar;
@@ -288,7 +315,10 @@ QWidget* GovDataScreen::build_status_bar() {
// ── Provider activation ──────────────────────────────────────────────────────
void GovDataScreen::on_provider_selected(int row) {
- if (row >= 0) activate_provider(row);
+ if (row >= 0) {
+ activate_provider(row);
+ ScreenStateManager::instance().notify_changed(this);
+ }
}
void GovDataScreen::activate_provider(int index) {
@@ -302,8 +332,9 @@ void GovDataScreen::activate_provider(int index) {
header_subtitle_->setText(QString("%1 %2").arg(prov.flag, prov.full_name));
header_subtitle_->setStyleSheet(
QString("color:%1; font-size:10px; background:transparent;").arg(prov.color));
+ const auto& tk = ThemeManager::instance().tokens();
header_bar_->setStyleSheet(
- QString("#govToolbar { background:#111111; border-bottom:2px solid %1; }").arg(prov.color));
+ QString("#govToolbar { background:%1; border-bottom:2px solid %2; }").arg(tk.bg_raised, prov.color));
// Status bar
if (status_portal_) status_portal_->setText(prov.name);
@@ -324,4 +355,16 @@ void GovDataScreen::activate_provider(int index) {
LOG_INFO("GovDataScreen", "Activated: " + prov.id);
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap GovDataScreen::save_state() const {
+ return {{"provider_index", active_index_}};
+}
+
+void GovDataScreen::restore_state(const QVariantMap& state) {
+ const int idx = state.value("provider_index", -1).toInt();
+ if (idx >= 0)
+ activate_provider(idx);
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/gov_data/GovDataScreen.h b/fincept-qt/src/screens/gov_data/GovDataScreen.h
index 980b6bc52..47cd95653 100644
--- a/fincept-qt/src/screens/gov_data/GovDataScreen.h
+++ b/fincept-qt/src/screens/gov_data/GovDataScreen.h
@@ -1,6 +1,8 @@
// src/screens/gov_data/GovDataScreen.h
#pragma once
+#include "screens/IStatefulScreen.h"
+
#include <QFrame>
#include <QHideEvent>
#include <QLabel>
@@ -11,11 +13,16 @@
namespace fincept::screens {
-class GovDataScreen : public QWidget {
+class GovDataScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit GovDataScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "gov_data"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) override;
diff --git a/fincept-qt/src/screens/gov_data/GovDataSwissPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataSwissPanel.cpp
index 37e3aec42..1169b734c 100644
--- a/fincept-qt/src/screens/gov_data/GovDataSwissPanel.cpp
+++ b/fincept-qt/src/screens/gov_data/GovDataSwissPanel.cpp
@@ -25,68 +25,80 @@ static constexpr const char* kGovDataSwissColor = "#E11D48";
using namespace fincept::ui;
-// ── Panel stylesheet ─────────────────────────────────────────────────────────
-
-static const QString kSwissStyle = QString(
- "#govPanelToolbar { background:#111111; border-bottom:1px solid #1a1a1a; }"
-
- "#govTabBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }"
- "#govTabBtn:hover { color:#e5e5e5; background:#161616; }"
- "#govTabBtn:checked { background:rgba(225,29,72,0.12); color:#E11D48;"
- " border:1px solid #E11D48; }"
-
- "#govBackBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#govBackBtn:hover { color:#e5e5e5; background:#161616; }"
-
- "#govFetchBtn { background:#E11D48; color:#080808; border:none;"
- " font-size:10px; font-weight:700; padding:4px 14px; }"
- "#govFetchBtn:hover { background:#fb7185; }"
- "#govFetchBtn:disabled { background:#1a1a1a; color:#404040; }"
-
- "#govCsvBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#govCsvBtn:hover { color:#e5e5e5; background:#161616; }"
-
- "#govSearch { background:#080808; color:#e5e5e5; border:none;"
- " border-bottom:1px solid #1a1a1a; padding:4px 10px; font-size:11px; }"
- "#govSearch:focus { border-bottom:1px solid #E11D48; }"
-
- "QTableWidget { background:#080808; color:#e5e5e5; border:none;"
- " gridline-color:#1a1a1a; font-size:11px; alternate-background-color:#0a0a0a; }"
- "QTableWidget::item { padding:5px 8px; border-bottom:1px solid #1a1a1a; }"
- "QTableWidget::item:selected { background:rgba(225,29,72,0.10); color:#E11D48; }"
- "QHeaderView::section { background:#111111; color:#808080; border:none;"
- " border-bottom:2px solid #1a1a1a; border-right:1px solid #1a1a1a;"
- " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"
-
- "#govStatusPage { background:#080808; }"
- "#govStatusMsg { color:#808080; font-size:13px; background:transparent; }"
- "#govStatusErr { color:#dc2626; font-size:12px; background:transparent; }"
-
- "#govBreadcrumb { background:#0a0a0a; border-bottom:1px solid #1a1a1a; }"
- "#govBreadcrumbText { color:#808080; font-size:9px; background:transparent; }"
- "#govBreadcrumbActive { color:#E11D48; font-size:9px; font-weight:700; background:transparent; }"
-
- "#govStatusBar { background:#0a0a0a; border-top:1px solid #1a1a1a; }"
- "#govWatermark { color:#404040; font-size:9px; background:transparent; }"
-
- "QScrollBar:vertical { background:#080808; width:5px; }"
- "QScrollBar::handle:vertical { background:#1a1a1a; min-height:20px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }"
-);
+// ── Dynamic stylesheet ──────────────────────────────────────────────────────
+
+static QString build_swiss_style() {
+ const auto& t = ui::ThemeManager::instance().tokens();
+ const auto cc = QColor(kGovDataSwissColor);
+ const QString cr = QString::number(cc.red());
+ const QString cg = QString::number(cc.green());
+ const QString cb = QString::number(cc.blue());
+ const QString c = kGovDataSwissColor;
+
+ QString s;
+ s += QString("#govPanelToolbar { background:%1; border-bottom:1px solid %2; }").arg(t.bg_raised, t.border_dim);
+
+ s += QString("#govTabBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govTabBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+ s += QString("#govTabBtn:checked { background:rgba(%1,%2,%3,0.12); color:%4;"
+ " border:1px solid %4; }").arg(cr, cg, cb, c);
+
+ s += QString("#govBackBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govBackBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+
+ s += QString("#govFetchBtn { background:%1; color:%2; border:none;"
+ " font-size:10px; font-weight:700; padding:4px 14px; }").arg(c, t.bg_base);
+ s += QString("#govFetchBtn:hover { background:%1; }").arg(cc.lighter(120).name());
+ s += QString("#govFetchBtn:disabled { background:%1; color:%2; }").arg(t.border_dim, t.text_dim);
+
+ s += QString("#govCsvBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govCsvBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+
+ s += QString("#govSearch { background:%1; color:%2; border:none;"
+ " border-bottom:1px solid %3; padding:4px 10px; font-size:11px; }").arg(t.bg_base, t.text_primary, t.border_dim);
+ s += QString("#govSearch:focus { border-bottom:1px solid %1; }").arg(c);
+
+ s += QString("QTableWidget { background:%1; color:%2; border:none;"
+ " gridline-color:%3; font-size:11px; alternate-background-color:%4; }").arg(t.bg_base, t.text_primary, t.border_dim, t.bg_surface);
+ s += QString("QTableWidget::item { padding:5px 8px; border-bottom:1px solid %1; }").arg(t.border_dim);
+ s += QString("QTableWidget::item:selected { background:rgba(%1,%2,%3,0.10); color:%4; }").arg(cr, cg, cb, c);
+ s += QString("QHeaderView::section { background:%1; color:%2; border:none;"
+ " border-bottom:2px solid %3; border-right:1px solid %3;"
+ " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }").arg(t.bg_raised, t.text_secondary, t.border_dim);
+
+ s += QString("#govStatusPage { background:%1; }").arg(t.bg_base);
+ s += QString("#govStatusMsg { color:%1; font-size:13px; background:transparent; }").arg(t.text_secondary);
+ s += QString("#govStatusErr { color:%1; font-size:12px; background:transparent; }").arg(t.negative);
+
+ s += QString("#govBreadcrumb { background:%1; border-bottom:1px solid %2; }").arg(t.bg_surface, t.border_dim);
+ s += QString("#govBreadcrumbText { color:%1; font-size:9px; background:transparent; }").arg(t.text_secondary);
+ s += QString("#govBreadcrumbActive { color:%1; font-size:9px; font-weight:700; background:transparent; }").arg(c);
+
+ s += QString("#govStatusBar { background:%1; border-top:1px solid %2; }").arg(t.bg_surface, t.border_dim);
+ s += QString("#govWatermark { color:%1; font-size:9px; background:transparent; }").arg(t.text_dim);
+
+ s += QString("QScrollBar:vertical { background:%1; width:5px; }").arg(t.bg_base);
+ s += QString("QScrollBar::handle:vertical { background:%1; min-height:20px; }").arg(t.border_dim);
+ s += "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }";
+ return s;
+}
// ── Constructor ──────────────────────────────────────────────────────────────
GovDataSwissPanel::GovDataSwissPanel(QWidget* parent)
: QWidget(parent) {
- setStyleSheet(kSwissStyle);
+ setStyleSheet(build_swiss_style());
build_ui();
connect(&services::GovDataService::instance(),
&services::GovDataService::result_ready,
this,
&GovDataSwissPanel::on_result);
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed, this, [this]() {
+ setStyleSheet(build_swiss_style());
+ });
}
// ── Build UI ─────────────────────────────────────────────────────────────────
@@ -427,7 +439,7 @@ void GovDataSwissPanel::populate_datasets(const QJsonArray& data, int total_coun
if (publisher.isEmpty()) publisher = pub_obj["name"].toString();
}
auto* pub_item = new QTableWidgetItem(publisher);
- pub_item->setForeground(QColor("#808080"));
+ pub_item->setForeground(QColor(ui::colors::TEXT_SECONDARY()));
datasets_table_->setItem(i, 3, pub_item);
}
@@ -598,14 +610,14 @@ void GovDataSwissPanel::update_breadcrumb() {
void GovDataSwissPanel::show_loading(const QString& message) {
status_label_->setStyleSheet(
- "color:#E11D48; font-size:13px; background:transparent;");
+ QString("color:%1; font-size:13px; background:transparent;").arg(kGovDataSwissColor));
status_label_->setText(message);
content_stack_->setCurrentIndex(3);
}
void GovDataSwissPanel::show_error(const QString& message) {
status_label_->setStyleSheet(
- "color:#dc2626; font-size:12px; background:transparent;");
+ QString("color:%1; font-size:12px; background:transparent;").arg(ui::colors::NEGATIVE()));
status_label_->setText("Error: " + message);
content_stack_->setCurrentIndex(3);
LOG_ERROR("GovDataSwiss", "Error: " + message);
@@ -613,7 +625,7 @@ void GovDataSwissPanel::show_error(const QString& message) {
void GovDataSwissPanel::show_empty(const QString& message) {
status_label_->setStyleSheet(
- "color:#808080; font-size:12px; background:transparent;");
+ QString("color:%1; font-size:12px; background:transparent;").arg(ui::colors::TEXT_SECONDARY()));
status_label_->setText(message);
content_stack_->setCurrentIndex(3);
}
diff --git a/fincept-qt/src/screens/gov_data/GovDataTreasuryPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataTreasuryPanel.cpp
index fb6b34236..02f07e9f4 100644
--- a/fincept-qt/src/screens/gov_data/GovDataTreasuryPanel.cpp
+++ b/fincept-qt/src/screens/gov_data/GovDataTreasuryPanel.cpp
@@ -22,67 +22,80 @@ using namespace fincept::ui;
static const QString kGovDataTreasuryColor = "#3B82F6";
static const QString kGovDataTreasuryScript = "government_us_data.py";
-// ── Stylesheet ───────────────────────────────────────────────────────────────
-
-static const char* kGovDataTreasuryStyle =
- "#govTreasuryToolbar { background:#111111; border-bottom:1px solid #1a1a1a; }"
-
- "#govTreasTab { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }"
- "#govTreasTab:hover { color:#e5e5e5; background:#161616; }"
- "#govTreasTab:checked { background:rgba(59,130,246,0.12); color:#3B82F6;"
- " border:1px solid #3B82F6; }"
-
- "#govFetchBtn { background:#3B82F6; color:#080808; border:none;"
- " font-size:10px; font-weight:700; padding:4px 14px; }"
- "#govFetchBtn:hover { background:#60a5fa; }"
- "#govFetchBtn:disabled { background:#1a1a1a; color:#404040; }"
- "#govCsvBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#govCsvBtn:hover { color:#e5e5e5; background:#161616; }"
-
- "QDateEdit { background:#080808; color:#e5e5e5; border:1px solid #1a1a1a;"
- " font-size:11px; padding:2px 6px; }"
- "QDateEdit::drop-down { border:none; }"
- "QComboBox { background:#080808; color:#e5e5e5; border:1px solid #1a1a1a;"
- " font-size:11px; padding:2px 6px; }"
- "QComboBox::drop-down { border:none; }"
- "QComboBox QAbstractItemView { background:#111111; color:#e5e5e5;"
- " border:1px solid #1a1a1a; }"
-
- "QTableWidget { background:#080808; color:#e5e5e5; border:none;"
- " gridline-color:#1a1a1a; font-size:11px; alternate-background-color:#0a0a0a; }"
- "QTableWidget::item { padding:5px 8px; border-bottom:1px solid #1a1a1a; }"
- "QTableWidget::item:selected { background:rgba(59,130,246,0.1); color:#3B82F6; }"
- "QHeaderView::section { background:#111111; color:#808080; border:none;"
- " border-bottom:2px solid #1a1a1a; border-right:1px solid #1a1a1a;"
- " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"
+// ── Dynamic stylesheet ──────────────────────────────────────────────────────
+
+static QString build_treasury_style() {
+ const auto& t = ThemeManager::instance().tokens();
+ const auto cc = QColor(kGovDataTreasuryColor);
+ const QString cr = QString::number(cc.red());
+ const QString cg = QString::number(cc.green());
+ const QString cb = QString::number(cc.blue());
+ const QString c = kGovDataTreasuryColor;
+
+ QString s;
+ s += QString("#govTreasuryToolbar { background:%1; border-bottom:1px solid %2; }").arg(t.bg_raised, t.border_dim);
+
+ s += QString("#govTreasTab { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govTreasTab:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+ s += QString("#govTreasTab:checked { background:rgba(%1,%2,%3,0.12); color:%4;"
+ " border:1px solid %4; }").arg(cr, cg, cb, c);
+
+ s += QString("#govFetchBtn { background:%1; color:%2; border:none;"
+ " font-size:10px; font-weight:700; padding:4px 14px; }").arg(c, t.bg_base);
+ s += QString("#govFetchBtn:hover { background:%1; }").arg(cc.lighter(120).name());
+ s += QString("#govFetchBtn:disabled { background:%1; color:%2; }").arg(t.border_dim, t.text_dim);
+ s += QString("#govCsvBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govCsvBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+
+ s += QString("QDateEdit { background:%1; color:%2; border:1px solid %3;"
+ " font-size:11px; padding:2px 6px; }").arg(t.bg_base, t.text_primary, t.border_dim);
+ s += "QDateEdit::drop-down { border:none; }";
+ s += QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
+ " font-size:11px; padding:2px 6px; }").arg(t.bg_base, t.text_primary, t.border_dim);
+ s += "QComboBox::drop-down { border:none; }";
+ s += QString("QComboBox QAbstractItemView { background:%1; color:%2;"
+ " border:1px solid %3; }").arg(t.bg_raised, t.text_primary, t.border_dim);
+
+ s += QString("QTableWidget { background:%1; color:%2; border:none;"
+ " gridline-color:%3; font-size:11px; alternate-background-color:%4; }").arg(t.bg_base, t.text_primary, t.border_dim, t.bg_surface);
+ s += QString("QTableWidget::item { padding:5px 8px; border-bottom:1px solid %1; }").arg(t.border_dim);
+ s += QString("QTableWidget::item:selected { background:rgba(%1,%2,%3,0.1); color:%4; }").arg(cr, cg, cb, c);
+ s += QString("QHeaderView::section { background:%1; color:%2; border:none;"
+ " border-bottom:2px solid %3; border-right:1px solid %3;"
+ " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }").arg(t.bg_raised, t.text_secondary, t.border_dim);
// Summary cards
- "#govSummaryPage { background:#080808; }"
- "#govSumCard { background:#0a0a0a; border:1px solid #1a1a1a; }"
- "#govSumCard:hover { border-color:#333333; }"
- "#govSumLabel { color:#808080; font-size:8px; font-weight:700;"
- " letter-spacing:1px; background:transparent; }"
- "#govSumValue { color:#3B82F6; font-size:16px; font-weight:700; background:transparent; }"
- "#govSumSub { color:#808080; font-size:9px; background:transparent; }"
+ s += QString("#govSummaryPage { background:%1; }").arg(t.bg_base);
+ s += QString("#govSumCard { background:%1; border:1px solid %2; }").arg(t.bg_surface, t.border_dim);
+ s += QString("#govSumCard:hover { border-color:%1; }").arg(t.border_bright);
+ s += QString("#govSumLabel { color:%1; font-size:8px; font-weight:700;"
+ " letter-spacing:1px; background:transparent; }").arg(t.text_secondary);
+ s += QString("#govSumValue { color:%1; font-size:16px; font-weight:700; background:transparent; }").arg(c);
+ s += QString("#govSumSub { color:%1; font-size:9px; background:transparent; }").arg(t.text_secondary);
// Status page
- "#govStatusPage { background:#080808; }"
- "#govStatusMsg { color:#808080; font-size:13px; background:transparent; }"
- "#govStatusErr { color:#dc2626; font-size:12px; background:transparent; }"
-
- "QScrollBar:vertical { background:#080808; width:5px; }"
- "QScrollBar::handle:vertical { background:#1a1a1a; min-height:20px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }";
+ s += QString("#govStatusPage { background:%1; }").arg(t.bg_base);
+ s += QString("#govStatusMsg { color:%1; font-size:13px; background:transparent; }").arg(t.text_secondary);
+ s += QString("#govStatusErr { color:%1; font-size:12px; background:transparent; }").arg(t.negative);
+
+ s += QString("QScrollBar:vertical { background:%1; width:5px; }").arg(t.bg_base);
+ s += QString("QScrollBar::handle:vertical { background:%1; min-height:20px; }").arg(t.border_dim);
+ s += "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }";
+ return s;
+}
// ── Constructor ──────────────────────────────────────────────────────────────
GovDataTreasuryPanel::GovDataTreasuryPanel(QWidget* parent) : QWidget(parent) {
- setStyleSheet(kGovDataTreasuryStyle);
+ setStyleSheet(build_treasury_style());
build_ui();
connect(&services::GovDataService::instance(), &services::GovDataService::result_ready,
this, &GovDataTreasuryPanel::on_result);
+ connect(&ThemeManager::instance(), &ThemeManager::theme_changed, this, [this]() {
+ setStyleSheet(build_treasury_style());
+ });
}
// ── Build UI ─────────────────────────────────────────────────────────────────
@@ -169,8 +182,8 @@ void GovDataTreasuryPanel::build_ui() {
// Breakdown table
auto* breakdown_hdr = new QLabel("SECURITY TYPE BREAKDOWN");
breakdown_hdr->setStyleSheet(
- "color:#3B82F6; font-size:9px; font-weight:700; letter-spacing:1px;"
- " background:transparent; margin-top:8px;");
+ QString("color:%1; font-size:9px; font-weight:700; letter-spacing:1px;"
+ " background:transparent; margin-top:8px;").arg(kGovDataTreasuryColor));
svl->addWidget(breakdown_hdr);
type_breakdown_table_ = new QTableWidget;
@@ -235,7 +248,7 @@ QWidget* GovDataTreasuryPanel::build_toolbar() {
hl->addSpacing(14);
// Date labels
- auto lbl_style = "color:#525252; font-size:9px; font-weight:700; background:transparent;";
+ auto lbl_style = QString("color:%1; font-size:9px; font-weight:700; background:transparent;").arg(colors::TEXT_TERTIARY());
auto* from_lbl = new QLabel("FROM");
from_lbl->setStyleSheet(lbl_style);
hl->addWidget(from_lbl);
@@ -462,7 +475,8 @@ void GovDataTreasuryPanel::show_loading(const QString& message) {
}
void GovDataTreasuryPanel::show_error(const QString& message) {
- status_label_->setStyleSheet("color:#dc2626; font-size:12px; background:transparent;");
+ status_label_->setStyleSheet(
+ QString("color:%1; font-size:12px; background:transparent;").arg(colors::NEGATIVE()));
status_label_->setText("Error: " + message);
content_stack_->setCurrentIndex(3);
}
diff --git a/fincept-qt/src/screens/gov_data/GovDataUKPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataUKPanel.cpp
index 389fd7be7..8d5281fbd 100644
--- a/fincept-qt/src/screens/gov_data/GovDataUKPanel.cpp
+++ b/fincept-qt/src/screens/gov_data/GovDataUKPanel.cpp
@@ -3,6 +3,7 @@
#include "core/logging/Logger.h"
#include "services/gov_data/GovDataService.h"
+#include "ui/theme/Theme.h"
#include <QDesktopServices>
#include <QFileDialog>
@@ -21,68 +22,82 @@ static constexpr const char* kGovDataUKScript = "datagovuk_api.py";
static constexpr const char* kGovDataUKColor = "#10B981";
} // namespace
-// ── Panel stylesheet ─────────────────────────────────────────────────────────
-
-static const QString kUKStyle = QString(
- "#govPanelToolbar { background:#111111; border-bottom:1px solid #1a1a1a; }"
-
- "#govTabBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }"
- "#govTabBtn:hover { color:#e5e5e5; background:#161616; }"
- "#govTabBtn:checked { background:rgba(16,185,129,0.12); color:#10B981;"
- " border:1px solid #10B981; }"
-
- "#govBackBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#govBackBtn:hover { color:#e5e5e5; background:#161616; }"
-
- "#govPopularBtn { background:transparent; color:#10B981; border:1px solid #10B981;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#govPopularBtn:hover { background:rgba(16,185,129,0.12); }"
-
- "#govFetchBtn { background:#10B981; color:#080808; border:none;"
- " font-size:10px; font-weight:700; padding:4px 14px; }"
- "#govFetchBtn:hover { background:#0ea572; }"
- "#govFetchBtn:disabled { background:#1a1a1a; color:#404040; }"
-
- "#govCsvBtn { background:transparent; color:#808080; border:1px solid #1a1a1a;"
- " font-size:10px; font-weight:700; padding:4px 10px; }"
- "#govCsvBtn:hover { color:#e5e5e5; background:#161616; }"
-
- "#govSearch { background:#080808; color:#e5e5e5; border:none;"
- " border-bottom:1px solid #1a1a1a; padding:4px 10px; font-size:11px; }"
- "#govSearch:focus { border-bottom:1px solid #10B981; }"
-
- "QTableWidget { background:#080808; color:#e5e5e5; border:none;"
- " gridline-color:#1a1a1a; font-size:11px; alternate-background-color:#0a0a0a; }"
- "QTableWidget::item { padding:5px 8px; border-bottom:1px solid #1a1a1a; }"
- "QTableWidget::item:selected { background:rgba(16,185,129,0.10); color:#10B981; }"
- "QHeaderView::section { background:#111111; color:#808080; border:none;"
- " border-bottom:2px solid #1a1a1a; border-right:1px solid #1a1a1a;"
- " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"
-
- "#govStatusPage { background:#080808; }"
- "#govStatusMsg { color:#808080; font-size:13px; background:transparent; }"
- "#govStatusErr { color:#dc2626; font-size:12px; background:transparent; }"
-
- "#govBreadcrumb { background:#0a0a0a; border-bottom:1px solid #1a1a1a; }"
- "#govBreadcrumbText { color:#808080; font-size:9px; background:transparent; }"
-
- "QScrollBar:vertical { background:#080808; width:5px; }"
- "QScrollBar::handle:vertical { background:#1a1a1a; min-height:20px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }"
-);
+// ── Dynamic stylesheet ──────────────────────────────────────────────────────
+
+using namespace fincept::ui;
+
+static QString build_uk_style() {
+ const auto& t = ThemeManager::instance().tokens();
+ const auto cc = QColor(kGovDataUKColor);
+ const QString cr = QString::number(cc.red());
+ const QString cg = QString::number(cc.green());
+ const QString cb = QString::number(cc.blue());
+ const QString c = kGovDataUKColor;
+
+ QString s;
+ s += QString("#govPanelToolbar { background:%1; border-bottom:1px solid %2; }").arg(t.bg_raised, t.border_dim);
+
+ s += QString("#govTabBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 12px; letter-spacing:0.5px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govTabBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+ s += QString("#govTabBtn:checked { background:rgba(%1,%2,%3,0.12); color:%4;"
+ " border:1px solid %4; }").arg(cr, cg, cb, c);
+
+ s += QString("#govBackBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govBackBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+
+ s += QString("#govPopularBtn { background:transparent; color:%1; border:1px solid %1;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(c);
+ s += QString("#govPopularBtn:hover { background:rgba(%1,%2,%3,0.12); }").arg(cr, cg, cb);
+
+ s += QString("#govFetchBtn { background:%1; color:%2; border:none;"
+ " font-size:10px; font-weight:700; padding:4px 14px; }").arg(c, t.bg_base);
+ s += QString("#govFetchBtn:hover { background:%1; }").arg(cc.lighter(120).name());
+ s += QString("#govFetchBtn:disabled { background:%1; color:%2; }").arg(t.border_dim, t.text_dim);
+
+ s += QString("#govCsvBtn { background:transparent; color:%1; border:1px solid %2;"
+ " font-size:10px; font-weight:700; padding:4px 10px; }").arg(t.text_secondary, t.border_dim);
+ s += QString("#govCsvBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);
+
+ s += QString("#govSearch { background:%1; color:%2; border:none;"
+ " border-bottom:1px solid %3; padding:4px 10px; font-size:11px; }").arg(t.bg_base, t.text_primary, t.border_dim);
+ s += QString("#govSearch:focus { border-bottom:1px solid %1; }").arg(c);
+
+ s += QString("QTableWidget { background:%1; color:%2; border:none;"
+ " gridline-color:%3; font-size:11px; alternate-background-color:%4; }").arg(t.bg_base, t.text_primary, t.border_dim, t.bg_surface);
+ s += QString("QTableWidget::item { padding:5px 8px; border-bottom:1px solid %1; }").arg(t.border_dim);
+ s += QString("QTableWidget::item:selected { background:rgba(%1,%2,%3,0.10); color:%4; }").arg(cr, cg, cb, c);
+ s += QString("QHeaderView::section { background:%1; color:%2; border:none;"
+ " border-bottom:2px solid %3; border-right:1px solid %3;"
+ " padding:5px 8px; font-size:10px; font-weight:700; letter-spacing:0.5px; }").arg(t.bg_raised, t.text_secondary, t.border_dim);
+
+ s += QString("#govStatusPage { background:%1; }").arg(t.bg_base);
+ s += QString("#govStatusMsg { color:%1; font-size:13px; background:transparent; }").arg(t.text_secondary);
+ s += QString("#govStatusErr { color:%1; font-size:12px; background:transparent; }").arg(t.negative);
+
+ s += QString("#govBreadcrumb { background:%1; border-bottom:1px solid %2; }").arg(t.bg_surface, t.border_dim);
+ s += QString("#govBreadcrumbText { color:%1; font-size:9px; background:transparent; }").arg(t.text_secondary);
+
+ s += QString("QScrollBar:vertical { background:%1; width:5px; }").arg(t.bg_base);
+ s += QString("QScrollBar::handle:vertical { background:%1; min-height:20px; }").arg(t.border_dim);
+ s += "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0; }";
+ return s;
+}
// ── Constructor ──────────────────────────────────────────────────────────────
GovDataUKPanel::GovDataUKPanel(QWidget* parent)
: QWidget(parent) {
- setStyleSheet(kUKStyle);
+ setStyleSheet(build_uk_style());
build_ui();
connect(&services::GovDataService::instance(),
&services::GovDataService::result_ready,
this,
&GovDataUKPanel::on_result);
+ connect(&ThemeManager::instance(), &ThemeManager::theme_changed, this, [this]() {
+ setStyleSheet(build_uk_style());
+ });
}
// ── UI Construction ──────────────────────────────────────────────────────────
@@ -421,7 +436,7 @@ void GovDataUKPanel::populate_datasets(const QJsonArray& data, int total_count)
if (tags.size() > 3)
tags_str += QString(" +%1").arg(tags.size() - 3);
auto* tag_item = new QTableWidgetItem(tags_str);
- tag_item->setForeground(QColor("#808080"));
+ tag_item->setForeground(QColor(colors::TEXT_SECONDARY()));
datasets_table_->setItem(i, 3, tag_item);
}
@@ -588,7 +603,8 @@ void GovDataUKPanel::show_loading(const QString& message) {
}
void GovDataUKPanel::show_error(const QString& message) {
- status_label_->setStyleSheet("color:#dc2626; font-size:12px; background:transparent;");
+ status_label_->setStyleSheet(
+ QString("color:%1; font-size:12px; background:transparent;").arg(colors::NEGATIVE()));
status_label_->setText("Error: " + message);
content_stack_->setCurrentIndex(Status);
}
diff --git a/fincept-qt/src/screens/info/ContactScreen.cpp b/fincept-qt/src/screens/info/ContactScreen.cpp
index 0f2b7fd3f..f75630e3c 100644
--- a/fincept-qt/src/screens/info/ContactScreen.cpp
+++ b/fincept-qt/src/screens/info/ContactScreen.cpp
@@ -17,37 +17,42 @@ using namespace fincept::ui;
// ── Style constants ──────────────────────────────────────────────────────────
-static const char* PANEL = "background: #0a0a0a; border: 1px solid #1a1a1a; border-radius: 2px;";
+static QString PANEL() {
+ return QString("background: %1; border: 1px solid %2; border-radius: 2px;")
+ .arg(colors::BG_SURFACE, colors::BORDER_DIM);
+}
static const char* MF = "font-family:'Consolas','Courier New',monospace;";
static QLabel* make_header(const QString& icon, const QString& title, const QString& icon_color) {
auto* lbl = new QLabel(QString("%1 %2").arg(icon, title));
lbl->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: bold; letter-spacing: 0.5px; "
- "background: #111111; padding: 10px 14px; border-bottom: 1px solid #1a1a1a; %2")
- .arg(icon_color, MF));
+ "background: %2; padding: 10px 14px; border-bottom: 1px solid %3; %4")
+ .arg(icon_color, colors::BG_RAISED, colors::BORDER_DIM, MF));
return lbl;
}
static QWidget* make_contact_card(const QString& title, const QString& value, const QString& detail) {
auto* card = new QWidget;
- card->setStyleSheet(PANEL);
+ card->setStyleSheet(PANEL());
auto* vl = new QVBoxLayout(card);
vl->setContentsMargins(14, 12, 14, 12);
vl->setSpacing(4);
auto* t = new QLabel(title);
- t->setStyleSheet(QString("color: #808080; font-size: 10px; font-weight: bold; "
- "letter-spacing: 0.5px; background: transparent; %1")
- .arg(MF));
+ t->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: bold; "
+ "letter-spacing: 0.5px; background: transparent; %2")
+ .arg(colors::TEXT_SECONDARY, MF));
vl->addWidget(t);
auto* v = new QLabel(value);
- v->setStyleSheet(QString("color: #e5e5e5; font-size: 13px; font-weight: 600; background: transparent; %1").arg(MF));
+ v->setStyleSheet(QString("color: %1; font-size: 13px; font-weight: 600; background: transparent; %2")
+ .arg(colors::TEXT_PRIMARY, MF));
vl->addWidget(v);
auto* d = new QLabel(detail);
- d->setStyleSheet(QString("color: #525252; font-size: 11px; background: transparent; %1").arg(MF));
+ d->setStyleSheet(QString("color: %1; font-size: 11px; background: transparent; %2")
+ .arg(colors::TEXT_TERTIARY, MF));
d->setWordWrap(true);
vl->addWidget(d);
@@ -77,9 +82,9 @@ ContactScreen::ContactScreen(QWidget* parent) : QWidget(parent) {
// ── Header ───────────────────────────────────────────────────────────────
auto* back_btn = new QPushButton("< BACK");
back_btn->setCursor(Qt::PointingHandCursor);
- back_btn->setStyleSheet(QString("QPushButton { color: #808080; background: transparent; border: none; "
- "font-size: 12px; %1 } QPushButton:hover { color: #e5e5e5; }")
- .arg(MF));
+ back_btn->setStyleSheet(QString("QPushButton { color: %1; background: transparent; border: none; "
+ "font-size: 12px; %2 } QPushButton:hover { color: %3; }")
+ .arg(colors::TEXT_SECONDARY, MF, colors::TEXT_PRIMARY));
connect(back_btn, &QPushButton::clicked, this, &ContactScreen::navigate_back);
vl->addWidget(back_btn, 0, Qt::AlignLeft);
@@ -99,7 +104,7 @@ ContactScreen::ContactScreen(QWidget* parent) : QWidget(parent) {
// ── Contact Information ──────────────────────────────────────────────────
{
auto* panel = new QWidget;
- panel->setStyleSheet(PANEL);
+ panel->setStyleSheet(PANEL());
auto* pvl = new QVBoxLayout(panel);
pvl->setContentsMargins(0, 0, 0, 0);
pvl->setSpacing(0);
@@ -124,7 +129,7 @@ ContactScreen::ContactScreen(QWidget* parent) : QWidget(parent) {
// ── Quick Actions ────────────────────────────────────────────────────────
{
auto* panel = new QWidget;
- panel->setStyleSheet(PANEL);
+ panel->setStyleSheet(PANEL());
auto* pvl = new QVBoxLayout(panel);
pvl->setContentsMargins(0, 0, 0, 0);
pvl->setSpacing(0);
@@ -141,10 +146,11 @@ ContactScreen::ContactScreen(QWidget* parent) : QWidget(parent) {
auto* btn = new QPushButton(text);
btn->setFixedHeight(36);
btn->setCursor(Qt::PointingHandCursor);
- btn->setStyleSheet(QString("QPushButton { background: #111111; color: #0891b2; border: 1px solid #1a1a1a; "
+ btn->setStyleSheet(QString("QPushButton { background: %1; color: %2; border: 1px solid %3; "
"border-radius: 2px; padding: 8px 16px; font-size: 12px; "
"font-family:'Consolas','Courier New',monospace; }"
- "QPushButton:hover { background: #161616; color: #38bdf8; }"));
+ "QPushButton:hover { background: %4; color: #38bdf8; }")
+ .arg(colors::BG_RAISED, colors::CYAN, colors::BORDER_DIM, colors::BG_HOVER));
return btn;
};
@@ -172,7 +178,7 @@ ContactScreen::ContactScreen(QWidget* parent) : QWidget(parent) {
// ── Common Issues ────────────────────────────────────────────────────────
{
auto* panel = new QWidget;
- panel->setStyleSheet(PANEL);
+ panel->setStyleSheet(PANEL());
auto* pvl = new QVBoxLayout(panel);
pvl->setContentsMargins(0, 0, 0, 0);
pvl->setSpacing(0);
@@ -201,12 +207,14 @@ ContactScreen::ContactScreen(QWidget* parent) : QWidget(parent) {
for (const auto& issue : issues) {
auto* q = new QLabel(QString("> %1").arg(issue.q));
q->setStyleSheet(
- QString("color: #e5e5e5; font-size: 12px; font-weight: 600; background: transparent; %1").arg(MF));
+ QString("color: %1; font-size: 12px; font-weight: 600; background: transparent; %2")
+ .arg(colors::TEXT_PRIMARY, MF));
bvl->addWidget(q);
auto* a = new QLabel(QString(" %1").arg(issue.a));
a->setWordWrap(true);
- a->setStyleSheet(QString("color: #525252; font-size: 11px; background: transparent; %1").arg(MF));
+ a->setStyleSheet(QString("color: %1; font-size: 11px; background: transparent; %2")
+ .arg(colors::TEXT_TERTIARY, MF));
bvl->addWidget(a);
bvl->addSpacing(4);
}
diff --git a/fincept-qt/src/screens/info/HelpScreen.cpp b/fincept-qt/src/screens/info/HelpScreen.cpp
index 35d7f5195..bcc918453 100644
--- a/fincept-qt/src/screens/info/HelpScreen.cpp
+++ b/fincept-qt/src/screens/info/HelpScreen.cpp
@@ -24,18 +24,19 @@ static QWidget* make_faq(const QString& question, const QString& answer) {
auto* q_btn = new QPushButton(QString("> %1").arg(question));
q_btn->setCursor(Qt::PointingHandCursor);
- q_btn->setStyleSheet(QString("QPushButton { color: #e5e5e5; background: #0a0a0a; border: 1px solid #1a1a1a; "
+ q_btn->setStyleSheet(QString("QPushButton { color: %1; background: %2; border: 1px solid %3; "
"border-radius: 2px; padding: 10px 14px; text-align: left; "
- "font-size: 12px; font-weight: 600; %1 }"
- "QPushButton:hover { background: #111111; }")
- .arg(MF));
+ "font-size: 12px; font-weight: 600; %4 }"
+ "QPushButton:hover { background: %5; }")
+ .arg(colors::TEXT_PRIMARY, colors::BG_SURFACE, colors::BORDER_DIM,
+ MF, colors::BG_RAISED));
auto* a_lbl = new QLabel(answer);
a_lbl->setWordWrap(true);
- a_lbl->setStyleSheet(QString("color: #808080; font-size: 12px; background: #0a0a0a; "
- "border: 1px solid #1a1a1a; border-top: none; "
- "padding: 10px 14px; %1")
- .arg(MF));
+ a_lbl->setStyleSheet(QString("color: %1; font-size: 12px; background: %2; "
+ "border: 1px solid %3; border-top: none; "
+ "padding: 10px 14px; %4")
+ .arg(colors::TEXT_SECONDARY, colors::BG_SURFACE, colors::BORDER_DIM, MF));
a_lbl->setVisible(false);
QObject::connect(q_btn, &QPushButton::clicked, a_lbl, [a_lbl, q_btn, question]() {
@@ -69,9 +70,9 @@ HelpScreen::HelpScreen(QWidget* parent) : QWidget(parent) {
// Back
auto* back_btn = new QPushButton("< BACK");
back_btn->setCursor(Qt::PointingHandCursor);
- back_btn->setStyleSheet(QString("QPushButton { color: #808080; background: transparent; border: none; "
- "font-size: 12px; %1 } QPushButton:hover { color: #e5e5e5; }")
- .arg(MF));
+ back_btn->setStyleSheet(QString("QPushButton { color: %1; background: transparent; border: none; "
+ "font-size: 12px; %2 } QPushButton:hover { color: %3; }")
+ .arg(colors::TEXT_SECONDARY, MF, colors::TEXT_PRIMARY));
connect(back_btn, &QPushButton::clicked, this, &HelpScreen::navigate_back);
vl->addWidget(back_btn, 0, Qt::AlignLeft);
@@ -138,10 +139,11 @@ HelpScreen::HelpScreen(QWidget* parent) : QWidget(parent) {
auto* btn = new QPushButton(text);
btn->setFixedHeight(40);
btn->setCursor(Qt::PointingHandCursor);
- btn->setStyleSheet(QString("QPushButton { background: #0a0a0a; color: #0891b2; border: 1px solid #1a1a1a; "
+ btn->setStyleSheet(QString("QPushButton { background: %1; color: %2; border: 1px solid %3; "
"border-radius: 2px; font-size: 12px; font-weight: 600; "
"font-family:'Consolas','Courier New',monospace; }"
- "QPushButton:hover { background: #111111; color: #38bdf8; }"));
+ "QPushButton:hover { background: %4; color: #38bdf8; }")
+ .arg(colors::BG_SURFACE, colors::CYAN, colors::BORDER_DIM, colors::BG_RAISED));
return btn;
};
@@ -161,7 +163,8 @@ HelpScreen::HelpScreen(QWidget* parent) : QWidget(parent) {
// ── Contact Information ──────────────────────────────────────────────────
{
auto* panel = new QWidget;
- panel->setStyleSheet("background: #0a0a0a; border: 1px solid #1a1a1a; border-radius: 2px;");
+ panel->setStyleSheet(QString("background: %1; border: 1px solid %2; border-radius: 2px;")
+ .arg(colors::BG_SURFACE, colors::BORDER_DIM));
auto* pvl = new QVBoxLayout(panel);
pvl->setContentsMargins(14, 12, 14, 12);
pvl->setSpacing(6);
@@ -174,8 +177,8 @@ HelpScreen::HelpScreen(QWidget* parent) : QWidget(parent) {
auto info = [](const QString& label, const QString& value) {
auto* lbl = new QLabel(QString("%1: %2").arg(label, value));
- lbl->setStyleSheet(QString("color: #808080; font-size: 12px; background: transparent; "
- "font-family:'Consolas','Courier New',monospace;"));
+ lbl->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent; "
+ "font-family:'Consolas','Courier New',monospace;").arg(colors::TEXT_SECONDARY));
return lbl;
};
diff --git a/fincept-qt/src/screens/info/PrivacyScreen.cpp b/fincept-qt/src/screens/info/PrivacyScreen.cpp
index 621ef3c9e..08df92517 100644
--- a/fincept-qt/src/screens/info/PrivacyScreen.cpp
+++ b/fincept-qt/src/screens/info/PrivacyScreen.cpp
@@ -16,40 +16,45 @@ static const char* MF = "font-family:'Consolas','Courier New',monospace;";
static QLabel* section_heading(const QString& icon, const QString& title) {
auto* lbl = new QLabel(QString("%1 %2").arg(icon, title));
- lbl->setStyleSheet(QString("color: #d97706; font-size: 14px; font-weight: 700; "
- "background: transparent; margin-top: 8px; %1")
- .arg(MF));
+ lbl->setStyleSheet(QString("color: %1; font-size: 14px; font-weight: 700; "
+ "background: transparent; margin-top: 8px; %2")
+ .arg(colors::AMBER, MF));
return lbl;
}
static QLabel* body_text(const QString& text) {
auto* lbl = new QLabel(text);
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color: #e5e5e5; font-size: 12px; background: transparent; %1").arg(MF));
+ lbl->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent; %2")
+ .arg(colors::TEXT_PRIMARY, MF));
return lbl;
}
static QLabel* bullet(const QString& text) {
auto* lbl = new QLabel(QString(" > %1").arg(text));
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color: #808080; font-size: 12px; background: transparent; %1").arg(MF));
+ lbl->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent; %2")
+ .arg(colors::TEXT_SECONDARY, MF));
return lbl;
}
static QWidget* info_card(const QString& title, const QString& desc) {
auto* card = new QWidget;
- card->setStyleSheet("background: #0a0a0a; border: 1px solid #1a1a1a; border-radius: 2px;");
+ card->setStyleSheet(QString("background: %1; border: 1px solid %2; border-radius: 2px;")
+ .arg(colors::BG_SURFACE, colors::BORDER_DIM));
auto* vl = new QVBoxLayout(card);
vl->setContentsMargins(12, 10, 12, 10);
vl->setSpacing(4);
auto* t = new QLabel(title);
- t->setStyleSheet(QString("color: #d97706; font-size: 11px; font-weight: 700; background: transparent; %1").arg(MF));
+ t->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: 700; background: transparent; %2")
+ .arg(colors::AMBER, MF));
vl->addWidget(t);
auto* d = new QLabel(desc);
d->setWordWrap(true);
- d->setStyleSheet(QString("color: #808080; font-size: 11px; background: transparent; %1").arg(MF));
+ d->setStyleSheet(QString("color: %1; font-size: 11px; background: transparent; %2")
+ .arg(colors::TEXT_SECONDARY, MF));
vl->addWidget(d);
return card;
@@ -75,9 +80,9 @@ PrivacyScreen::PrivacyScreen(QWidget* parent) : QWidget(parent) {
// Back
auto* back_btn = new QPushButton("< BACK");
back_btn->setCursor(Qt::PointingHandCursor);
- back_btn->setStyleSheet(QString("QPushButton { color: #808080; background: transparent; border: none; "
- "font-size: 12px; %1 } QPushButton:hover { color: #e5e5e5; }")
- .arg(MF));
+ back_btn->setStyleSheet(QString("QPushButton { color: %1; background: transparent; border: none; "
+ "font-size: 12px; %2 } QPushButton:hover { color: %3; }")
+ .arg(colors::TEXT_SECONDARY, MF, colors::TEXT_PRIMARY));
connect(back_btn, &QPushButton::clicked, this, &PrivacyScreen::navigate_back);
vl->addWidget(back_btn, 0, Qt::AlignLeft);
@@ -95,7 +100,8 @@ PrivacyScreen::PrivacyScreen(QWidget* parent) : QWidget(parent) {
// Main panel
auto* panel = new QWidget;
- panel->setStyleSheet("background: #0a0a0a; border: 1px solid #1a1a1a; border-radius: 2px;");
+ panel->setStyleSheet(QString("background: %1; border: 1px solid %2; border-radius: 2px;")
+ .arg(colors::BG_SURFACE, colors::BORDER_DIM));
auto* pvl = new QVBoxLayout(panel);
pvl->setContentsMargins(20, 16, 20, 16);
pvl->setSpacing(6);
@@ -188,9 +194,9 @@ PrivacyScreen::PrivacyScreen(QWidget* parent) : QWidget(parent) {
auto make_link = [](const QString& text) {
auto* btn = new QPushButton(text);
btn->setCursor(Qt::PointingHandCursor);
- btn->setStyleSheet("QPushButton { color: #0891b2; background: transparent; border: none; "
+ btn->setStyleSheet(QString("QPushButton { color: %1; background: transparent; border: none; "
"font-size: 12px; font-family:'Consolas','Courier New',monospace; }"
- "QPushButton:hover { color: #38bdf8; }");
+ "QPushButton:hover { color: #38bdf8; }").arg(colors::CYAN));
return btn;
};
diff --git a/fincept-qt/src/screens/info/TermsScreen.cpp b/fincept-qt/src/screens/info/TermsScreen.cpp
index 01f150371..8ce1e4447 100644
--- a/fincept-qt/src/screens/info/TermsScreen.cpp
+++ b/fincept-qt/src/screens/info/TermsScreen.cpp
@@ -15,9 +15,9 @@ static const char* MF = "font-family:'Consolas','Courier New',monospace;";
static QLabel* section_heading(const QString& number, const QString& title) {
auto* lbl = new QLabel(QString("%1. %2").arg(number, title));
- lbl->setStyleSheet(QString("color: #d97706; font-size: 14px; font-weight: 700; "
- "background: transparent; margin-top: 8px; %1")
- .arg(MF));
+ lbl->setStyleSheet(QString("color: %1; font-size: 14px; font-weight: 700; "
+ "background: transparent; margin-top: 8px; %2")
+ .arg(colors::AMBER, MF));
return lbl;
}
@@ -25,14 +25,16 @@ static QLabel* body_text(const QString& text) {
auto* lbl = new QLabel(text);
lbl->setWordWrap(true);
lbl->setStyleSheet(
- QString("color: #e5e5e5; font-size: 12px; line-height: 1.5; background: transparent; %1").arg(MF));
+ QString("color: %1; font-size: 12px; line-height: 1.5; background: transparent; %2")
+ .arg(colors::TEXT_PRIMARY, MF));
return lbl;
}
static QLabel* bullet(const QString& text) {
auto* lbl = new QLabel(QString(" > %1").arg(text));
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color: #808080; font-size: 12px; background: transparent; %1").arg(MF));
+ lbl->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent; %2")
+ .arg(colors::TEXT_SECONDARY, MF));
return lbl;
}
@@ -56,9 +58,9 @@ TermsScreen::TermsScreen(QWidget* parent) : QWidget(parent) {
// Back button
auto* back_btn = new QPushButton("< BACK");
back_btn->setCursor(Qt::PointingHandCursor);
- back_btn->setStyleSheet(QString("QPushButton { color: #808080; background: transparent; border: none; "
- "font-size: 12px; %1 } QPushButton:hover { color: #e5e5e5; }")
- .arg(MF));
+ back_btn->setStyleSheet(QString("QPushButton { color: %1; background: transparent; border: none; "
+ "font-size: 12px; %2 } QPushButton:hover { color: %3; }")
+ .arg(colors::TEXT_SECONDARY, MF, colors::TEXT_PRIMARY));
connect(back_btn, &QPushButton::clicked, this, &TermsScreen::navigate_back);
vl->addWidget(back_btn, 0, Qt::AlignLeft);
@@ -77,7 +79,8 @@ TermsScreen::TermsScreen(QWidget* parent) : QWidget(parent) {
// Panel container
auto* panel = new QWidget;
- panel->setStyleSheet("background: #0a0a0a; border: 1px solid #1a1a1a; border-radius: 2px;");
+ panel->setStyleSheet(QString("background: %1; border: 1px solid %2; border-radius: 2px;")
+ .arg(colors::BG_SURFACE, colors::BORDER_DIM));
auto* pvl = new QVBoxLayout(panel);
pvl->setContentsMargins(20, 16, 20, 16);
pvl->setSpacing(6);
@@ -150,9 +153,9 @@ TermsScreen::TermsScreen(QWidget* parent) : QWidget(parent) {
auto make_link = [](const QString& text) {
auto* btn = new QPushButton(text);
btn->setCursor(Qt::PointingHandCursor);
- btn->setStyleSheet(QString("QPushButton { color: #0891b2; background: transparent; border: none; "
+ btn->setStyleSheet(QString("QPushButton { color: %1; background: transparent; border: none; "
"font-size: 12px; font-family:'Consolas','Courier New',monospace; }"
- "QPushButton:hover { color: #38bdf8; }"));
+ "QPushButton:hover { color: #38bdf8; }").arg(colors::CYAN));
return btn;
};
diff --git a/fincept-qt/src/screens/info/TrademarksScreen.cpp b/fincept-qt/src/screens/info/TrademarksScreen.cpp
index 94c1c99ab..16c56295a 100644
--- a/fincept-qt/src/screens/info/TrademarksScreen.cpp
+++ b/fincept-qt/src/screens/info/TrademarksScreen.cpp
@@ -15,23 +15,25 @@ static const char* MF = "font-family:'Consolas','Courier New',monospace;";
static QLabel* heading(const QString& num, const QString& title) {
auto* lbl = new QLabel(QString("%1. %2").arg(num, title));
- lbl->setStyleSheet(QString("color: #d97706; font-size: 14px; font-weight: 700; "
- "background: transparent; margin-top: 8px; %1")
- .arg(MF));
+ lbl->setStyleSheet(QString("color: %1; font-size: 14px; font-weight: 700; "
+ "background: transparent; margin-top: 8px; %2")
+ .arg(colors::AMBER, MF));
return lbl;
}
static QLabel* body(const QString& text) {
auto* lbl = new QLabel(text);
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color: #e5e5e5; font-size: 12px; background: transparent; %1").arg(MF));
+ lbl->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent; %2")
+ .arg(colors::TEXT_PRIMARY, MF));
return lbl;
}
static QLabel* bullet(const QString& text) {
auto* lbl = new QLabel(QString(" > %1").arg(text));
lbl->setWordWrap(true);
- lbl->setStyleSheet(QString("color: #808080; font-size: 12px; background: transparent; %1").arg(MF));
+ lbl->setStyleSheet(QString("color: %1; font-size: 12px; background: transparent; %2")
+ .arg(colors::TEXT_SECONDARY, MF));
return lbl;
}
@@ -55,9 +57,9 @@ TrademarksScreen::TrademarksScreen(QWidget* parent) : QWidget(parent) {
// Back
auto* back_btn = new QPushButton("< BACK");
back_btn->setCursor(Qt::PointingHandCursor);
- back_btn->setStyleSheet(QString("QPushButton { color: #808080; background: transparent; border: none; "
- "font-size: 12px; %1 } QPushButton:hover { color: #e5e5e5; }")
- .arg(MF));
+ back_btn->setStyleSheet(QString("QPushButton { color: %1; background: transparent; border: none; "
+ "font-size: 12px; %2 } QPushButton:hover { color: %3; }")
+ .arg(colors::TEXT_SECONDARY, MF, colors::TEXT_PRIMARY));
connect(back_btn, &QPushButton::clicked, this, &TrademarksScreen::navigate_back);
vl->addWidget(back_btn, 0, Qt::AlignLeft);
@@ -75,7 +77,8 @@ TrademarksScreen::TrademarksScreen(QWidget* parent) : QWidget(parent) {
// Panel
auto* panel = new QWidget;
- panel->setStyleSheet("background: #0a0a0a; border: 1px solid #1a1a1a; border-radius: 2px;");
+ panel->setStyleSheet(QString("background: %1; border: 1px solid %2; border-radius: 2px;")
+ .arg(colors::BG_SURFACE, colors::BORDER_DIM));
auto* pvl = new QVBoxLayout(panel);
pvl->setContentsMargins(20, 16, 20, 16);
pvl->setSpacing(6);
diff --git a/fincept-qt/src/screens/ma_analytics/MAAnalyticsScreen.cpp b/fincept-qt/src/screens/ma_analytics/MAAnalyticsScreen.cpp
index 4f1689bb2..de65daf90 100644
--- a/fincept-qt/src/screens/ma_analytics/MAAnalyticsScreen.cpp
+++ b/fincept-qt/src/screens/ma_analytics/MAAnalyticsScreen.cpp
@@ -2,8 +2,10 @@
#include "screens/ma_analytics/MAAnalyticsScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "screens/ma_analytics/MAModulePanel.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QHBoxLayout>
#include <QScrollArea>
@@ -17,6 +19,9 @@ using namespace fincept::services::ma;
MAAnalyticsScreen::MAAnalyticsScreen(QWidget* parent) : QWidget(parent) {
modules_ = all_modules();
build_ui();
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) { refresh_theme(); });
+ refresh_theme();
LOG_INFO("MAAnalytics", "Screen constructed");
}
@@ -71,35 +76,29 @@ void MAAnalyticsScreen::build_ui() {
root->addWidget(body_widget, 1);
// Status bar
- root->addWidget(build_status_bar());
-
- setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
+ status_bar_ = build_status_bar();
+ root->addWidget(status_bar_);
}
// ── Top Nav Bar ──────────────────────────────────────────────────────────────
QWidget* MAAnalyticsScreen::build_top_bar() {
auto* bar = new QWidget(this);
bar->setFixedHeight(44);
- bar->setStyleSheet(
- QString("background:%1; border-bottom:1px solid %2;").arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM));
+ top_bar_ = bar;
auto* hl = new QHBoxLayout(bar);
hl->setContentsMargins(12, 0, 12, 0);
hl->setSpacing(12);
// Branding badge
- auto* brand = new QLabel("M&A ANALYTICS", bar);
- brand->setStyleSheet(QString("color:#FF6B35; font-size:%1px; font-weight:700; font-family:%2;"
- "padding:4px 12px; background:rgba(255,107,53,0.08);"
- "border:1px solid rgba(255,107,53,0.25); border-radius:2px;")
- .arg(ui::fonts::TINY)
- .arg(ui::fonts::DATA_FAMILY));
- hl->addWidget(brand);
+ brand_label_ = new QLabel("M&A ANALYTICS", bar);
+ brand_label_->setFixedHeight(22);
+ hl->addWidget(brand_label_);
// Divider
auto* div = new QWidget(bar);
div->setFixedSize(1, 20);
- div->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_DIM));
+ div->setObjectName("maTopDivider");
hl->addWidget(div);
// Module quick selector buttons
@@ -108,15 +107,7 @@ QWidget* MAAnalyticsScreen::build_top_bar() {
auto* btn = new QPushButton(mod.short_label, bar);
btn->setToolTip(mod.label);
btn->setCursor(Qt::PointingHandCursor);
- btn->setStyleSheet(
- QString("QPushButton { color:%1; font-size:9px; font-family:%2;"
- "padding:4px 8px; border:1px solid transparent; border-radius:2px;"
- "background:transparent; font-weight:400; }"
- "QPushButton:hover { background:rgba(%3,0.06); color:%4; }")
- .arg(ui::colors::TEXT_TERTIARY)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(QString("%1,%2,%3").arg(mod.color.red()).arg(mod.color.green()).arg(mod.color.blue()))
- .arg(mod.color.name()));
+ btn->setFixedHeight(22);
connect(btn, &QPushButton::clicked, this, [this, i]() { on_module_selected(i); });
hl->addWidget(btn);
quick_buttons_.append(btn);
@@ -125,19 +116,12 @@ QWidget* MAAnalyticsScreen::build_top_bar() {
hl->addStretch(1);
// Ready badge
- auto* ready = new QLabel("READY", bar);
- ready->setStyleSheet(QString("color:%1; font-size:9px; 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;")
- .arg(ui::colors::POSITIVE)
- .arg(ui::fonts::DATA_FAMILY));
- hl->addWidget(ready);
-
- auto* subtitle = new QLabel("CORPORATE FINANCE TOOLKIT", bar);
- subtitle->setStyleSheet(QString("color:%1; font-size:9px; font-family:%2; letter-spacing:1px;")
- .arg(ui::colors::TEXT_TERTIARY)
- .arg(ui::fonts::DATA_FAMILY));
- hl->addWidget(subtitle);
+ ready_label_ = new QLabel("READY", bar);
+ ready_label_->setFixedHeight(22);
+ hl->addWidget(ready_label_);
+
+ subtitle_label_ = new QLabel("CORPORATE FINANCE TOOLKIT", bar);
+ hl->addWidget(subtitle_label_);
return bar;
}
@@ -146,8 +130,6 @@ QWidget* MAAnalyticsScreen::build_top_bar() {
QWidget* MAAnalyticsScreen::build_left_sidebar() {
auto* panel = new QWidget(this);
panel->setFixedWidth(200);
- panel->setStyleSheet(
- QString("background:%1; border-right:1px solid %2;").arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* vl = new QVBoxLayout(panel);
vl->setContentsMargins(0, 0, 0, 0);
@@ -156,13 +138,11 @@ QWidget* MAAnalyticsScreen::build_left_sidebar() {
// Header
auto* header = new QWidget(panel);
header->setFixedHeight(36);
- header->setStyleSheet(QString("border-bottom:1px solid %1;").arg(ui::colors::BORDER_DIM));
+ header->setObjectName("maLeftHeader");
auto* hhl = new QHBoxLayout(header);
hhl->setContentsMargins(12, 0, 12, 0);
- auto* title = new QLabel("MODULES", header);
- title->setStyleSheet(QString("color:#FF6B35; font-size:9px; font-weight:700; font-family:%1; letter-spacing:1px;")
- .arg(ui::fonts::DATA_FAMILY));
- hhl->addWidget(title);
+ modules_title_ = new QLabel("MODULES", header);
+ hhl->addWidget(modules_title_);
hhl->addStretch();
vl->addWidget(header);
@@ -185,26 +165,13 @@ QWidget* MAAnalyticsScreen::build_left_sidebar() {
if (mod.category != last_cat) {
last_cat = mod.category;
auto* cat_label = new QLabel(mod.category, list_widget);
- cat_label->setStyleSheet(QString("color:%1; font-size:8px; font-weight:700; font-family:%2;"
- "padding:8px 12px 4px 12px; letter-spacing:1px;")
- .arg(ui::colors::TEXT_TERTIARY)
- .arg(ui::fonts::DATA_FAMILY));
+ cat_label->setObjectName("maCategoryLabel");
left_items_layout_->addWidget(cat_label);
}
// Module button
auto* btn = new QPushButton(mod.label, list_widget);
btn->setCursor(Qt::PointingHandCursor);
- btn->setStyleSheet(
- QString("QPushButton { text-align:left; padding:8px 12px; border:none;"
- "border-left:2px solid transparent; color:%1;"
- "font-size:10px; font-family:%2; background:transparent; }"
- "QPushButton:hover { background:rgba(%3,0.06); color:%4;"
- "border-left:2px solid %4; }")
- .arg(ui::colors::TEXT_SECONDARY)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(QString("%1,%2,%3").arg(mod.color.red()).arg(mod.color.green()).arg(mod.color.blue()))
- .arg(mod.color.name()));
connect(btn, &QPushButton::clicked, this, [this, i]() { on_module_selected(i); });
left_items_layout_->addWidget(btn);
module_buttons_.append(btn);
@@ -221,8 +188,6 @@ QWidget* MAAnalyticsScreen::build_left_sidebar() {
QWidget* MAAnalyticsScreen::build_right_sidebar() {
auto* panel = new QWidget(this);
panel->setFixedWidth(220);
- panel->setStyleSheet(
- QString("background:%1; border-left:1px solid %2;").arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* vl = new QVBoxLayout(panel);
vl->setContentsMargins(0, 0, 0, 0);
@@ -231,52 +196,42 @@ QWidget* MAAnalyticsScreen::build_right_sidebar() {
// Header
auto* header = new QWidget(panel);
header->setFixedHeight(36);
- header->setStyleSheet(QString("border-bottom:1px solid %1;").arg(ui::colors::BORDER_DIM));
+ header->setObjectName("maRightHeader");
auto* hhl = new QHBoxLayout(header);
hhl->setContentsMargins(12, 0, 12, 0);
- auto* title = new QLabel("MODULE INFO", header);
- title->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; font-family:%2; letter-spacing:1px;")
- .arg(ui::colors::CYAN)
- .arg(ui::fonts::DATA_FAMILY));
- hhl->addWidget(title);
+ info_title_ = new QLabel("MODULE INFO", header);
+ hhl->addWidget(info_title_);
hhl->addStretch();
vl->addWidget(header);
// Content area
auto* scroll = new QScrollArea(panel);
scroll->setWidgetResizable(true);
+ scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
scroll->setStyleSheet("QScrollArea { border:none; background:transparent; }");
auto* content = new QWidget(scroll);
auto* cl = new QVBoxLayout(content);
- cl->setContentsMargins(12, 12, 12, 12);
- cl->setSpacing(12);
+ cl->setContentsMargins(8, 8, 8, 8);
+ cl->setSpacing(8);
// Module info card
auto* info_card = new QWidget(content);
info_card->setObjectName("maInfoCard");
auto* icl = new QVBoxLayout(info_card);
- icl->setContentsMargins(12, 12, 12, 12);
- icl->setSpacing(6);
+ icl->setContentsMargins(8, 8, 8, 8);
+ icl->setSpacing(4);
right_title_ = new QLabel(content);
- right_title_->setStyleSheet(
- QString("font-size:10px; font-weight:700; font-family:%1;").arg(ui::fonts::DATA_FAMILY));
icl->addWidget(right_title_);
right_category_ = new QLabel(content);
- right_category_->setStyleSheet(QString("color:%1; font-size:9px; font-family:%2;")
- .arg(ui::colors::TEXT_SECONDARY)
- .arg(ui::fonts::DATA_FAMILY));
icl->addWidget(right_category_);
cl->addWidget(info_card);
// Capabilities section
- auto* cap_header = new QLabel("CAPABILITIES", content);
- cap_header->setStyleSheet(
- QString("color:#FF6B35; font-size:9px; font-weight:700; font-family:%1; letter-spacing:1px;")
- .arg(ui::fonts::DATA_FAMILY));
- cl->addWidget(cap_header);
+ cap_header_ = new QLabel("CAPABILITIES", content);
+ cl->addWidget(cap_header_);
auto* cap_container = new QWidget(content);
capabilities_layout_ = new QVBoxLayout(cap_container);
@@ -285,32 +240,23 @@ QWidget* MAAnalyticsScreen::build_right_sidebar() {
cl->addWidget(cap_container);
// Quick stats
- auto* stats_card = new QWidget(content);
- stats_card->setStyleSheet(QString("background:%1; border:1px solid %2; border-radius:2px; padding:10px;")
- .arg(ui::colors::BG_RAISED)
- .arg(ui::colors::BORDER_DIM));
- auto* sl = new QVBoxLayout(stats_card);
- sl->setContentsMargins(10, 10, 10, 10);
- sl->setSpacing(6);
-
- auto* stats_title = new QLabel("QUICK STATS", stats_card);
- stats_title->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; font-family:%2; letter-spacing:1px;")
- .arg(ui::colors::CYAN)
- .arg(ui::fonts::DATA_FAMILY));
- sl->addWidget(stats_title);
+ stats_card_ = new QWidget(content);
+ auto* sl = new QVBoxLayout(stats_card_);
+ sl->setContentsMargins(8, 8, 8, 8);
+ sl->setSpacing(4);
+
+ stats_title_ = new QLabel("QUICK STATS", stats_card_);
+ sl->addWidget(stats_title_);
auto add_stat = [&](const QString& label, const QString& value) {
- auto* row = new QWidget(stats_card);
+ auto* row = new QWidget(stats_card_);
+ row->setObjectName("maStatRow");
auto* rl = new QHBoxLayout(row);
rl->setContentsMargins(0, 0, 0, 0);
auto* lbl = new QLabel(label, row);
- lbl->setStyleSheet(QString("color:%1; font-size:9px; font-family:%2;")
- .arg(ui::colors::TEXT_TERTIARY)
- .arg(ui::fonts::DATA_FAMILY));
+ lbl->setObjectName("maStatLabel");
auto* val = new QLabel(value, row);
- val->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; font-family:%2;")
- .arg(ui::colors::TEXT_PRIMARY)
- .arg(ui::fonts::DATA_FAMILY));
+ val->setObjectName("maStatValue");
rl->addWidget(lbl);
rl->addStretch();
rl->addWidget(val);
@@ -320,20 +266,14 @@ QWidget* MAAnalyticsScreen::build_right_sidebar() {
add_stat("Valuation Methods", "15+");
add_stat("Python Scripts", "30+");
add_stat("Analysis Tools", "60+");
- cl->addWidget(stats_card);
+ cl->addWidget(stats_card_);
// Tips
- auto* tips = new QLabel("Click sidebar modules to switch views. "
- "Each module provides professional-grade analytics with export capabilities.",
- content);
- tips->setWordWrap(true);
- tips->setStyleSheet(QString("color:%1; font-size:8px; font-family:%2; line-height:1.5;"
- "background:%3; border:1px solid %4; border-radius:2px; padding:10px;")
- .arg(ui::colors::TEXT_TERTIARY)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::colors::BG_RAISED)
- .arg(ui::colors::BORDER_DIM));
- cl->addWidget(tips);
+ tips_label_ = new QLabel("Click sidebar modules to switch views. "
+ "Each module provides professional-grade analytics with export capabilities.",
+ content);
+ tips_label_->setWordWrap(true);
+ cl->addWidget(tips_label_);
cl->addStretch();
scroll->setWidget(content);
@@ -346,30 +286,24 @@ QWidget* MAAnalyticsScreen::build_right_sidebar() {
QWidget* MAAnalyticsScreen::build_status_bar() {
auto* bar = new QWidget(this);
bar->setFixedHeight(24);
- bar->setStyleSheet(
- QString("background:%1; border-top:1px solid %2;").arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM));
auto* hl = new QHBoxLayout(bar);
hl->setContentsMargins(12, 0, 12, 0);
hl->setSpacing(16);
- auto add_item = [&](const QString& label, const QString& value, const QString& color = "") {
+ auto add_item = [&](const QString& label, const QString& value, const QString& obj_name) {
auto* lbl = new QLabel(label, bar);
- lbl->setStyleSheet(QString("color:%1; font-size:8px; font-family:%2;")
- .arg(ui::colors::TEXT_TERTIARY)
- .arg(ui::fonts::DATA_FAMILY));
+ lbl->setObjectName("maStatusLabel");
hl->addWidget(lbl);
auto* val = new QLabel(value, bar);
- val->setStyleSheet(QString("color:%1; font-size:8px; font-weight:700; font-family:%2;")
- .arg(color.isEmpty() ? QLatin1String(ui::colors::TEXT_PRIMARY()) : color)
- .arg(ui::fonts::DATA_FAMILY));
+ val->setObjectName(obj_name);
hl->addWidget(val);
};
- add_item("MODULE:", "—");
- add_item("ENGINE:", "PYTHON + C++", ui::colors::POSITIVE);
+ add_item("MODULE:", QString::fromUtf8("\xe2\x80\x94"), "maStatusModule");
+ add_item("ENGINE:", "PYTHON + C++", "maStatusEngine");
hl->addStretch();
- add_item("STATUS:", "READY", ui::colors::POSITIVE);
+ add_item("STATUS:", "READY", "maStatusReady");
return bar;
}
@@ -383,29 +317,28 @@ void MAAnalyticsScreen::on_module_selected(int index) {
update_sidebar_selection();
update_right_panel();
LOG_INFO("MAAnalytics", QString("Switched to module: %1").arg(modules_[index].label));
+ ScreenStateManager::instance().notify_changed(this);
}
void MAAnalyticsScreen::update_sidebar_selection() {
for (int i = 0; i < module_buttons_.size(); ++i) {
const auto& mod = modules_[i];
bool active = (i == active_index_);
+ auto rgb = QString("%1,%2,%3").arg(mod.color.red()).arg(mod.color.green()).arg(mod.color.blue());
module_buttons_[i]->setStyleSheet(
QString("QPushButton { text-align:left; padding:8px 12px; border:none;"
"border-left:2px solid %1; color:%2;"
- "font-size:10px; font-family:%3; font-weight:%4;"
- "background:%5; }"
- "QPushButton:hover { background:rgba(%6,0.1); color:%7;"
- "border-left:2px solid %7; }")
+ "font-size:%3px; font-family:%4; font-weight:%5;"
+ "background:%6; }"
+ "QPushButton:hover { background:rgba(%7,0.1); color:%8;"
+ "border-left:2px solid %8; }")
.arg(active ? mod.color.name() : "transparent")
.arg(active ? mod.color.name() : ui::colors::TEXT_SECONDARY)
+ .arg(ui::fonts::SMALL)
.arg(ui::fonts::DATA_FAMILY)
.arg(active ? "700" : "400")
- .arg(active ? QString("rgba(%1,%2,%3,0.08)")
- .arg(mod.color.red())
- .arg(mod.color.green())
- .arg(mod.color.blue())
- : "transparent")
- .arg(QString("%1,%2,%3").arg(mod.color.red()).arg(mod.color.green()).arg(mod.color.blue()))
+ .arg(active ? QString("rgba(%1,0.08)").arg(rgb) : "transparent")
+ .arg(rgb)
.arg(mod.color.name()));
}
@@ -413,45 +346,44 @@ void MAAnalyticsScreen::update_sidebar_selection() {
for (int i = 0; i < quick_buttons_.size(); ++i) {
const auto& mod = modules_[i];
bool active = (i == active_index_);
+ auto rgb = QString("%1,%2,%3").arg(mod.color.red()).arg(mod.color.green()).arg(mod.color.blue());
quick_buttons_[i]->setStyleSheet(
- QString("QPushButton { color:%1; font-size:9px; font-family:%2;"
- "padding:4px 8px; border:1px solid %3; border-radius:2px;"
- "background:%4; font-weight:%5; }"
- "QPushButton:hover { background:rgba(%6,0.1); color:%7; }")
+ QString("QPushButton { color:%1; font-size:%2px; font-family:%3;"
+ "padding:4px 8px; border:1px solid %4;"
+ "background:%5; font-weight:%6; }"
+ "QPushButton:hover { background:rgba(%7,0.1); color:%8; }")
.arg(active ? mod.color.name() : ui::colors::TEXT_TERTIARY)
+ .arg(ui::fonts::TINY)
.arg(ui::fonts::DATA_FAMILY)
- .arg(active ? QString("rgba(%1,%2,%3,0.3)")
- .arg(mod.color.red())
- .arg(mod.color.green())
- .arg(mod.color.blue())
- : "transparent")
- .arg(active ? QString("rgba(%1,%2,%3,0.12)")
- .arg(mod.color.red())
- .arg(mod.color.green())
- .arg(mod.color.blue())
- : "transparent")
+ .arg(active ? QString("rgba(%1,0.3)").arg(rgb) : "transparent")
+ .arg(active ? QString("rgba(%1,0.12)").arg(rgb) : "transparent")
.arg(active ? "700" : "400")
- .arg(QString("%1,%2,%3").arg(mod.color.red()).arg(mod.color.green()).arg(mod.color.blue()))
+ .arg(rgb)
.arg(mod.color.name()));
}
}
void MAAnalyticsScreen::update_right_panel() {
const auto& mod = modules_[active_index_];
+ auto rgb = QString("%1,%2,%3").arg(mod.color.red()).arg(mod.color.green()).arg(mod.color.blue());
+
right_title_->setText(mod.label.toUpper());
- right_title_->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; font-family:%2;")
+ right_title_->setStyleSheet(QString("color:%1; font-size:%2px; font-weight:700; font-family:%3;")
.arg(mod.color.name())
+ .arg(ui::fonts::SMALL)
.arg(ui::fonts::DATA_FAMILY));
right_category_->setText(mod.category + " module");
+ right_category_->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
+ .arg(ui::colors::TEXT_SECONDARY)
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY));
// Update info card border
auto* card = right_panel_->findChild<QWidget*>("maInfoCard");
if (card) {
- card->setStyleSheet(QString("background:rgba(%1,%2,%3,0.04); border:1px solid rgba(%1,%2,%3,0.18);"
- "border-left:3px solid %4; border-radius:2px;")
- .arg(mod.color.red())
- .arg(mod.color.green())
- .arg(mod.color.blue())
+ card->setStyleSheet(QString("background:rgba(%1,0.04); border:1px solid rgba(%1,0.18);"
+ "border-left:3px solid %2;")
+ .arg(rgb)
.arg(mod.color.name()));
}
@@ -464,11 +396,217 @@ void MAAnalyticsScreen::update_right_panel() {
}
for (const auto& cap : module_capabilities(mod.id)) {
auto* row = new QLabel(QString("> %1").arg(cap));
- row->setStyleSheet(QString("color:%1; font-size:9px; font-family:%2;")
+ row->setWordWrap(true);
+ row->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
.arg(ui::colors::TEXT_PRIMARY)
+ .arg(ui::fonts::TINY)
.arg(ui::fonts::DATA_FAMILY));
capabilities_layout_->addWidget(row);
}
}
+// ── Theme refresh ───────────────────────────────────────────────────────────
+void MAAnalyticsScreen::refresh_theme() {
+ // Root background
+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));
+
+ // Top bar
+ if (top_bar_)
+ top_bar_->setStyleSheet(
+ QString("background:%1; border-bottom:1px solid %2;").arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));
+
+ // Brand badge — uses theme accent
+ if (brand_label_)
+ brand_label_->setStyleSheet(
+ QString("color:%1; font-size:%2px; font-weight:700; font-family:%3;"
+ "padding:2px 6px; background:rgba(%4,0.08);"
+ "border:1px solid rgba(%4,0.25);")
+ .arg(ui::colors::AMBER())
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY())
+ .arg([]() {
+ QColor c(ui::colors::AMBER());
+ return QString("%1,%2,%3").arg(c.red()).arg(c.green()).arg(c.blue());
+ }()));
+
+ // Top bar divider
+ auto* div = top_bar_ ? top_bar_->findChild<QWidget*>("maTopDivider") : nullptr;
+ if (div)
+ div->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_DIM()));
+
+ // Ready badge
+ if (ready_label_) {
+ QColor pos(ui::colors::POSITIVE());
+ ready_label_->setStyleSheet(
+ QString("color:%1; font-size:%2px; font-family:%3; padding:2px 6px;"
+ "background:rgba(%4,0.08); border:1px solid rgba(%4,0.25);")
+ .arg(ui::colors::POSITIVE())
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY())
+ .arg(QString("%1,%2,%3").arg(pos.red()).arg(pos.green()).arg(pos.blue())));
+ }
+
+ // Subtitle
+ if (subtitle_label_)
+ subtitle_label_->setStyleSheet(
+ QString("color:%1; font-size:%2px; font-family:%3; letter-spacing:1px;")
+ .arg(ui::colors::TEXT_TERTIARY())
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY()));
+
+ // Left panel
+ if (left_panel_)
+ left_panel_->setStyleSheet(
+ QString("background:%1; border-right:1px solid %2;").arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
+
+ // Left header
+ auto* left_hdr = left_panel_ ? left_panel_->findChild<QWidget*>("maLeftHeader") : nullptr;
+ if (left_hdr)
+ left_hdr->setStyleSheet(QString("border-bottom:1px solid %1;").arg(ui::colors::BORDER_DIM()));
+
+ // Modules title — uses theme accent
+ if (modules_title_)
+ modules_title_->setStyleSheet(
+ QString("color:%1; font-size:%2px; font-weight:700; font-family:%3; letter-spacing:1px;")
+ .arg(ui::colors::AMBER())
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY()));
+
+ // Category labels in sidebar
+ if (left_panel_) {
+ auto cat_labels = left_panel_->findChildren<QLabel*>("maCategoryLabel");
+ for (auto* cat : cat_labels)
+ cat->setStyleSheet(
+ QString("color:%1; font-size:%2px; font-weight:700; font-family:%3;"
+ "padding:8px 12px 4px 12px; letter-spacing:1px;")
+ .arg(ui::colors::TEXT_TERTIARY())
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY()));
+ }
+
+ // Right panel
+ if (right_panel_)
+ right_panel_->setStyleSheet(
+ QString("background:%1; border-left:1px solid %2;").arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));
+
+ // Right header
+ auto* right_hdr = right_panel_ ? right_panel_->findChild<QWidget*>("maRightHeader") : nullptr;
+ if (right_hdr)
+ right_hdr->setStyleSheet(QString("border-bottom:1px solid %1;").arg(ui::colors::BORDER_DIM()));
+
+ // Info title
+ if (info_title_)
+ info_title_->setStyleSheet(
+ QString("color:%1; font-size:%2px; font-weight:700; font-family:%3; letter-spacing:1px;")
+ .arg(ui::colors::CYAN())
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY()));
+
+ // Capabilities header — uses theme accent
+ if (cap_header_)
+ cap_header_->setStyleSheet(
+ QString("color:%1; font-size:%2px; font-weight:700; font-family:%3; letter-spacing:1px;")
+ .arg(ui::colors::AMBER())
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY()));
+
+ // Stats card
+ if (stats_card_)
+ stats_card_->setStyleSheet(
+ QString("background:%1; border:1px solid %2; padding:8px;")
+ .arg(ui::colors::BG_RAISED())
+ .arg(ui::colors::BORDER_DIM()));
+
+ // Stats title
+ if (stats_title_)
+ stats_title_->setStyleSheet(
+ QString("color:%1; font-size:%2px; font-weight:700; font-family:%3; letter-spacing:1px;")
+ .arg(ui::colors::CYAN())
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY()));
+
+ // Stat labels and values
+ if (stats_card_) {
+ auto stat_labels = stats_card_->findChildren<QLabel*>("maStatLabel");
+ for (auto* lbl : stat_labels)
+ lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
+ .arg(ui::colors::TEXT_TERTIARY())
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY()));
+ auto stat_values = stats_card_->findChildren<QLabel*>("maStatValue");
+ for (auto* val : stat_values)
+ val->setStyleSheet(QString("color:%1; font-size:%2px; font-weight:700; font-family:%3;")
+ .arg(ui::colors::TEXT_PRIMARY())
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY()));
+ }
+
+ // Tips label
+ if (tips_label_)
+ tips_label_->setStyleSheet(
+ QString("color:%1; font-size:%2px; font-family:%3; line-height:1.4;"
+ "background:%4; border:1px solid %5; padding:8px;")
+ .arg(ui::colors::TEXT_TERTIARY())
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY())
+ .arg(ui::colors::BG_RAISED())
+ .arg(ui::colors::BORDER_DIM()));
+
+ // Status bar
+ if (status_bar_)
+ status_bar_->setStyleSheet(
+ QString("background:%1; border-top:1px solid %2;").arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));
+
+ // Status bar labels
+ if (status_bar_) {
+ auto status_labels = status_bar_->findChildren<QLabel*>("maStatusLabel");
+ for (auto* lbl : status_labels)
+ lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")
+ .arg(ui::colors::TEXT_TERTIARY())
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY()));
+ auto* mod_val = status_bar_->findChild<QLabel*>("maStatusModule");
+ if (mod_val)
+ mod_val->setStyleSheet(QString("color:%1; font-size:%2px; font-weight:700; font-family:%3;")
+ .arg(ui::colors::TEXT_PRIMARY())
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY()));
+ auto* eng_val = status_bar_->findChild<QLabel*>("maStatusEngine");
+ if (eng_val)
+ eng_val->setStyleSheet(QString("color:%1; font-size:%2px; font-weight:700; font-family:%3;")
+ .arg(ui::colors::POSITIVE())
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY()));
+ auto* ready_val = status_bar_->findChild<QLabel*>("maStatusReady");
+ if (ready_val)
+ ready_val->setStyleSheet(QString("color:%1; font-size:%2px; font-weight:700; font-family:%3;")
+ .arg(ui::colors::POSITIVE())
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY()));
+ }
+
+ // Re-apply sidebar selection styles with current theme colors
+ update_sidebar_selection();
+ update_right_panel();
+
+ // Propagate to all module panels
+ for (int i = 0; i < content_stack_->count(); ++i) {
+ auto* panel = qobject_cast<MAModulePanel*>(content_stack_->widget(i));
+ if (panel)
+ panel->refresh_theme();
+ }
+}
+
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap MAAnalyticsScreen::save_state() const {
+ return {{"module_index", active_index_}};
+}
+
+void MAAnalyticsScreen::restore_state(const QVariantMap& state) {
+ const int idx = state.value("module_index", 0).toInt();
+ if (idx >= 0 && idx < modules_.size())
+ on_module_selected(idx);
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/ma_analytics/MAAnalyticsScreen.h b/fincept-qt/src/screens/ma_analytics/MAAnalyticsScreen.h
index 0aa9ff7cf..62cdabba5 100644
--- a/fincept-qt/src/screens/ma_analytics/MAAnalyticsScreen.h
+++ b/fincept-qt/src/screens/ma_analytics/MAAnalyticsScreen.h
@@ -1,5 +1,6 @@
// src/screens/ma_analytics/MAAnalyticsScreen.h
#pragma once
+#include "screens/IStatefulScreen.h"
#include "services/ma_analytics/MAAnalyticsTypes.h"
#include <QHideEvent>
@@ -18,17 +19,23 @@ class MAModulePanel;
/// Left: module navigation by category (CORE / SPECIALIZED / ANALYTICS)
/// Center: active module content (stacked widget)
/// Right: module info & capabilities sidebar
-class MAAnalyticsScreen : public QWidget {
+class MAAnalyticsScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit MAAnalyticsScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "ma_analytics"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) override;
private slots:
void on_module_selected(int index);
+ void refresh_theme();
private:
void build_ui();
@@ -58,6 +65,19 @@ class MAAnalyticsScreen : public QWidget {
// Top bar quick selector
QVector<QPushButton*> quick_buttons_;
+ // Themed widgets that need refresh
+ QWidget* top_bar_ = nullptr;
+ QWidget* status_bar_ = nullptr;
+ QLabel* brand_label_ = nullptr;
+ QLabel* ready_label_ = nullptr;
+ QLabel* subtitle_label_ = nullptr;
+ QLabel* modules_title_ = nullptr;
+ QLabel* info_title_ = nullptr;
+ QLabel* cap_header_ = nullptr;
+ QLabel* stats_title_ = nullptr;
+ QWidget* stats_card_ = nullptr;
+ QLabel* tips_label_ = nullptr;
+
bool left_open_ = true;
bool right_open_ = true;
bool first_show_ = true;
diff --git a/fincept-qt/src/screens/ma_analytics/MAModulePanel.cpp b/fincept-qt/src/screens/ma_analytics/MAModulePanel.cpp
index 9c93044e6..90e466f78 100644
--- a/fincept-qt/src/screens/ma_analytics/MAModulePanel.cpp
+++ b/fincept-qt/src/screens/ma_analytics/MAModulePanel.cpp
@@ -4,6 +4,7 @@
#include "core/logging/Logger.h"
#include "services/ma_analytics/MAAnalyticsService.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QFormLayout>
#include <QGridLayout>
@@ -31,7 +32,7 @@ QDoubleSpinBox* MAModulePanel::make_double_spin(double min, double max, double v
if (!suffix.isEmpty())
spin->setSuffix(suffix);
spin->setStyleSheet(QString("QDoubleSpinBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }"
+ "font-family:%4; font-size:%5px; padding:4px 6px; }"
"QDoubleSpinBox:focus { border-color:%6; }")
.arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
.arg(ui::fonts::DATA_FAMILY)
@@ -45,7 +46,7 @@ QSpinBox* MAModulePanel::make_int_spin(int min, int max, int val, QWidget* paren
spin->setRange(min, max);
spin->setValue(val);
spin->setStyleSheet(QString("QSpinBox { background:%1; color:%2; border:1px solid %3;"
- "font-family:%4; font-size:%5px; padding:4px 6px; border-radius:2px; }"
+ "font-family:%4; font-size:%5px; padding:4px 6px; }"
"QSpinBox:focus { border-color:%6; }")
.arg(ui::colors::BG_RAISED, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED)
.arg(ui::fonts::DATA_FAMILY)
@@ -58,7 +59,7 @@ QPushButton* MAModulePanel::make_run_button(const QString& text, QWidget* parent
auto* btn = new QPushButton(text, parent);
btn->setCursor(Qt::PointingHandCursor);
btn->setStyleSheet(QString("QPushButton { background:%1; color:%2; font-family:%3; font-size:%4px;"
- "font-weight:700; border:none; padding:8px 20px; border-radius:2px;"
+ "font-weight:700; border:none; padding:8px 20px;"
"letter-spacing:1px; }"
"QPushButton:hover { background:%5; }"
"QPushButton:pressed { background:%6; }")
@@ -90,19 +91,20 @@ QWidget* MAModulePanel::build_input_row(const QString& label, QWidget* input, QW
QWidget* MAModulePanel::build_metric_card(const QString& label, const QString& value, const QString& color,
QWidget* parent) {
auto* card = new QWidget(parent);
- card->setStyleSheet(QString("background:%1; border:1px solid %2; border-radius:2px; padding:10px;")
+ card->setStyleSheet(QString("background:%1; border:1px solid %2; padding:10px;")
.arg(ui::colors::BG_RAISED)
.arg(ui::colors::BORDER_DIM));
auto* vl = new QVBoxLayout(card);
vl->setContentsMargins(10, 8, 10, 8);
vl->setSpacing(4);
auto* lbl = new QLabel(label, card);
- lbl->setStyleSheet(QString("color:%1; font-size:8px; font-family:%2; letter-spacing:1px;")
+ lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3; letter-spacing:1px;")
.arg(ui::colors::TEXT_TERTIARY)
+ .arg(ui::fonts::TINY)
.arg(ui::fonts::DATA_FAMILY));
auto* val = new QLabel(value, card);
val->setStyleSheet(
- QString("color:%1; font-size:16px; font-weight:700; font-family:%2;").arg(color).arg(ui::fonts::DATA_FAMILY));
+ QString("color:%1; font-size:%2px; font-weight:700; font-family:%3;").arg(color).arg(ui::fonts::HEADER).arg(ui::fonts::DATA_FAMILY));
vl->addWidget(lbl);
vl->addWidget(val);
return card;
@@ -113,6 +115,7 @@ QWidget* MAModulePanel::build_metric_card(const QString& label, const QString& v
MAModulePanel::MAModulePanel(const ModuleInfo& info, QWidget* parent) : QWidget(parent), module_(info) {
build_ui();
connect_service();
+ refresh_theme();
}
void MAModulePanel::connect_service() {
@@ -129,36 +132,25 @@ void MAModulePanel::build_ui() {
root->setSpacing(0);
// Module header bar
- auto* header = new QWidget(this);
- header->setFixedHeight(36);
- header->setStyleSheet(
- QString("background:%1; border-bottom:1px solid %2;").arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM));
- auto* hhl = new QHBoxLayout(header);
+ header_bar_ = new QWidget(this);
+ header_bar_->setFixedHeight(36);
+ auto* hhl = new QHBoxLayout(header_bar_);
hhl->setContentsMargins(16, 0, 16, 0);
- auto* title = new QLabel(module_.label.toUpper(), header);
- title->setStyleSheet(QString("color:%1; font-size:%2px; font-weight:700; font-family:%3;"
- "letter-spacing:1px;")
- .arg(module_.color.name())
- .arg(ui::fonts::TINY)
- .arg(ui::fonts::DATA_FAMILY));
- hhl->addWidget(title);
-
- auto* div = new QWidget(header);
+ header_title_ = new QLabel(module_.label.toUpper(), header_bar_);
+ hhl->addWidget(header_title_);
+
+ auto* div = new QWidget(header_bar_);
div->setFixedSize(1, 14);
- div->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_DIM));
+ div->setObjectName("maPanelDivider");
hhl->addWidget(div);
- auto* cat = new QLabel(module_.category.toUpper(), header);
- cat->setStyleSheet(
- QString("color:%1; font-size:9px; font-family:%2;").arg(ui::colors::TEXT_TERTIARY).arg(ui::fonts::DATA_FAMILY));
- hhl->addWidget(cat);
+ header_category_ = new QLabel(module_.category.toUpper(), header_bar_);
+ hhl->addWidget(header_category_);
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));
+ status_label_ = new QLabel(header_bar_);
hhl->addWidget(status_label_);
- root->addWidget(header);
+ root->addWidget(header_bar_);
// Scrollable content area
auto* scroll = new QScrollArea(this);
@@ -208,16 +200,7 @@ QWidget* MAModulePanel::build_valuation_panel() {
vl->setSpacing(12);
sub_tabs_ = new QTabWidget(w);
- sub_tabs_->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 16px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700;"
- "border-bottom:2px solid %7; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL)
- .arg(module_.color.name()));
+ apply_tab_stylesheet();
// ── DCF Tab ──
auto* dcf = new QWidget;
@@ -575,16 +558,7 @@ QWidget* MAModulePanel::build_merger_panel() {
vl->setSpacing(12);
sub_tabs_ = new QTabWidget(w);
- sub_tabs_->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 16px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700;"
- "border-bottom:2px solid %7; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL)
- .arg(module_.color.name()));
+ apply_tab_stylesheet();
// ── Accretion/Dilution ──
auto* ad = new QWidget;
@@ -1074,16 +1048,7 @@ QWidget* MAModulePanel::build_startup_panel() {
vl->setSpacing(12);
sub_tabs_ = new QTabWidget(w);
- sub_tabs_->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 12px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700;"
- "border-bottom:2px solid %7; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL)
- .arg(module_.color.name()));
+ apply_tab_stylesheet();
// ── Berkus ──
auto* berkus = new QWidget;
@@ -1322,16 +1287,7 @@ QWidget* MAModulePanel::build_fairness_panel() {
vl->setSpacing(12);
sub_tabs_ = new QTabWidget(w);
- sub_tabs_->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 16px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700;"
- "border-bottom:2px solid %7; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL)
- .arg(module_.color.name()));
+ apply_tab_stylesheet();
// ── Fairness Analysis ──
auto* fa = new QWidget;
@@ -1464,16 +1420,7 @@ QWidget* MAModulePanel::build_industry_panel() {
vl->setSpacing(12);
sub_tabs_ = new QTabWidget(w);
- sub_tabs_->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 16px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700;"
- "border-bottom:2px solid %7; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL)
- .arg(module_.color.name()));
+ apply_tab_stylesheet();
// ── Technology ──
auto* tech = new QWidget;
@@ -1670,16 +1617,7 @@ QWidget* MAModulePanel::build_advanced_panel() {
vl->setSpacing(12);
sub_tabs_ = new QTabWidget(w);
- sub_tabs_->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 16px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700;"
- "border-bottom:2px solid %7; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL)
- .arg(module_.color.name()));
+ apply_tab_stylesheet();
// ── Monte Carlo ──
auto* mc = new QWidget;
@@ -1798,16 +1736,7 @@ QWidget* MAModulePanel::build_comparison_panel() {
vl->setSpacing(12);
sub_tabs_ = new QTabWidget(w);
- sub_tabs_->setStyleSheet(QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
- "QTabBar::tab { background:%3; color:%4; padding:6px 16px;"
- "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
- "QTabBar::tab:selected { background:%2; color:%7; font-weight:700;"
- "border-bottom:2px solid %7; }")
- .arg(ui::colors::BORDER_DIM, ui::colors::BG_SURFACE, ui::colors::BG_RAISED)
- .arg(ui::colors::TEXT_SECONDARY)
- .arg(ui::fonts::DATA_FAMILY)
- .arg(ui::fonts::SMALL)
- .arg(module_.color.name()));
+ apply_tab_stylesheet();
// ── Compare ──
auto* cmp = new QWidget;
@@ -1989,12 +1918,14 @@ void MAModulePanel::display_error(const QString& msg) {
clear_results();
auto* err = new QLabel(msg);
err->setWordWrap(true);
+ QColor neg(ui::colors::NEGATIVE());
+ auto neg_rgb = QString("%1,%2,%3").arg(neg.red()).arg(neg.green()).arg(neg.blue());
err->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3; padding:12px;"
- "background:rgba(220,38,38,0.08); border:1px solid rgba(220,38,38,0.3);"
- "border-radius:2px;")
- .arg(ui::colors::NEGATIVE)
+ "background:rgba(%4,0.08); border:1px solid rgba(%4,0.3);")
+ .arg(ui::colors::NEGATIVE())
.arg(ui::fonts::SMALL)
- .arg(ui::fonts::DATA_FAMILY));
+ .arg(ui::fonts::DATA_FAMILY())
+ .arg(neg_rgb));
results_layout_->addWidget(err);
status_label_->setText("Error");
}
@@ -2180,7 +2111,7 @@ void MAModulePanel::display_result(const QJsonObject& data) {
auto* lbl = new QLabel(items.join(", "));
lbl->setWordWrap(true);
lbl->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;"
- "padding:4px; background:%4; border:1px solid %5; border-radius:2px;")
+ "padding:4px; background:%4; border:1px solid %5;")
.arg(ui::colors::TEXT_PRIMARY)
.arg(ui::fonts::SMALL)
.arg(ui::fonts::DATA_FAMILY)
@@ -2211,11 +2142,11 @@ void MAModulePanel::display_result(const QJsonObject& data) {
// 3. Raw JSON viewer (collapsed)
auto* raw_btn = new QPushButton("Show Raw JSON", this);
raw_btn->setCursor(Qt::PointingHandCursor);
- raw_btn->setStyleSheet(QString("QPushButton { color:%1; font-size:9px; font-family:%2;"
- "background:transparent; border:1px solid %3; padding:4px 12px;"
- "border-radius:2px; }"
- "QPushButton:hover { background:%4; }")
+ raw_btn->setStyleSheet(QString("QPushButton { color:%1; font-size:%2px; font-family:%3;"
+ "background:transparent; border:1px solid %4; padding:4px 12px; }"
+ "QPushButton:hover { background:%5; }")
.arg(ui::colors::TEXT_SECONDARY)
+ .arg(ui::fonts::TINY)
.arg(ui::fonts::DATA_FAMILY)
.arg(ui::colors::BORDER_DIM)
.arg(ui::colors::BG_HOVER));
@@ -2280,4 +2211,64 @@ void MAModulePanel::on_error(const QString& context, const QString& message) {
}
}
+// ── Tab stylesheet helper ───────────────────────────────────────────────────
+void MAModulePanel::apply_tab_stylesheet() {
+ if (!sub_tabs_)
+ return;
+ sub_tabs_->setStyleSheet(
+ QString("QTabWidget::pane { border:1px solid %1; background:%2; }"
+ "QTabBar::tab { background:%3; color:%4; padding:6px 16px;"
+ "font-family:%5; font-size:%6px; border:1px solid %1; border-bottom:none; }"
+ "QTabBar::tab:selected { background:%2; color:%7; font-weight:700;"
+ "border-bottom:2px solid %7; }")
+ .arg(ui::colors::BORDER_DIM(), ui::colors::BG_SURFACE(), ui::colors::BG_RAISED())
+ .arg(ui::colors::TEXT_SECONDARY())
+ .arg(ui::fonts::DATA_FAMILY())
+ .arg(ui::fonts::SMALL)
+ .arg(module_.color.name()));
+}
+
+// ── Theme refresh ───────────────────────────────────────────────────────────
+void MAModulePanel::refresh_theme() {
+ // Header bar
+ if (header_bar_)
+ header_bar_->setStyleSheet(
+ QString("background:%1; border-bottom:1px solid %2;")
+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));
+
+ // Header title
+ if (header_title_)
+ header_title_->setStyleSheet(
+ QString("color:%1; font-size:%2px; font-weight:700; font-family:%3; letter-spacing:1px;")
+ .arg(module_.color.name())
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY()));
+
+ // Header divider
+ if (header_bar_) {
+ auto* div = header_bar_->findChild<QWidget*>("maPanelDivider");
+ if (div)
+ div->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_DIM()));
+ }
+
+ // Header category
+ if (header_category_)
+ header_category_->setStyleSheet(
+ QString("color:%1; font-size:%2px; font-family:%3;")
+ .arg(ui::colors::TEXT_TERTIARY())
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY()));
+
+ // Status label
+ if (status_label_)
+ status_label_->setStyleSheet(
+ QString("color:%1; font-size:%2px; font-family:%3;")
+ .arg(ui::colors::TEXT_TERTIARY())
+ .arg(ui::fonts::TINY)
+ .arg(ui::fonts::DATA_FAMILY()));
+
+ // Tab widget
+ apply_tab_stylesheet();
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/ma_analytics/MAModulePanel.h b/fincept-qt/src/screens/ma_analytics/MAModulePanel.h
index 20a4b7166..7948270d0 100644
--- a/fincept-qt/src/screens/ma_analytics/MAModulePanel.h
+++ b/fincept-qt/src/screens/ma_analytics/MAModulePanel.h
@@ -24,6 +24,9 @@ class MAModulePanel : public QWidget {
public:
explicit MAModulePanel(const fincept::services::ma::ModuleInfo& info, QWidget* parent = nullptr);
+ public slots:
+ void refresh_theme();
+
private slots:
void on_result_ready(const QString& context, const QJsonObject& data);
void on_error(const QString& context, const QString& message);
@@ -31,6 +34,7 @@ class MAModulePanel : public QWidget {
private:
void build_ui();
void connect_service();
+ void apply_tab_stylesheet();
// Module-specific builders
QWidget* build_valuation_panel();
@@ -57,6 +61,9 @@ class MAModulePanel : public QWidget {
fincept::services::ma::ModuleInfo module_;
QTabWidget* sub_tabs_ = nullptr;
+ QWidget* header_bar_ = nullptr;
+ QLabel* header_title_ = nullptr;
+ QLabel* header_category_ = nullptr;
QVBoxLayout* results_layout_ = nullptr;
QWidget* results_container_ = nullptr;
QLabel* status_label_ = nullptr;
diff --git a/fincept-qt/src/screens/mcp_servers/McpServersScreen.cpp b/fincept-qt/src/screens/mcp_servers/McpServersScreen.cpp
index eed1084ac..ca305ef95 100644
--- a/fincept-qt/src/screens/mcp_servers/McpServersScreen.cpp
+++ b/fincept-qt/src/screens/mcp_servers/McpServersScreen.cpp
@@ -6,6 +6,7 @@
#include "screens/mcp_servers/McpServersScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "mcp/McpManager.h"
#include "mcp/McpProvider.h"
#include "ui/theme/Theme.h"
@@ -452,6 +453,7 @@ QWidget* McpServersScreen::create_status_bar() {
void McpServersScreen::on_view_changed(int view) {
active_view_ = view;
view_stack_->setCurrentIndex(view);
+ ScreenStateManager::instance().notify_changed(this);
for (int i = 0; i < view_btns_.size(); ++i) {
view_btns_[i]->setProperty("active", i == view);
view_btns_[i]->style()->unpolish(view_btns_[i]);
@@ -1116,4 +1118,16 @@ void McpServersScreen::update_status_bar() {
status_running_->setText(QString::number(running) + " running");
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap McpServersScreen::save_state() const {
+ return {{"active_view", active_view_}};
+}
+
+void McpServersScreen::restore_state(const QVariantMap& state) {
+ const int view = state.value("active_view", 0).toInt();
+ if (view != active_view_)
+ on_view_changed(view);
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/mcp_servers/McpServersScreen.h b/fincept-qt/src/screens/mcp_servers/McpServersScreen.h
index cfeaf28ae..a93675f4f 100644
--- a/fincept-qt/src/screens/mcp_servers/McpServersScreen.h
+++ b/fincept-qt/src/screens/mcp_servers/McpServersScreen.h
@@ -1,6 +1,7 @@
#pragma once
#include "mcp/McpClient.h"
+#include "screens/IStatefulScreen.h"
#include <QLabel>
#include <QLineEdit>
@@ -13,11 +14,16 @@
namespace fincept::screens {
-class McpServersScreen : public QWidget {
+class McpServersScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit McpServersScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "mcp_servers"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* e) override;
void hideEvent(QHideEvent* e) override;
diff --git a/fincept-qt/src/screens/news/NewsScreen.cpp b/fincept-qt/src/screens/news/NewsScreen.cpp
index 431207a22..976bdf9cc 100644
--- a/fincept-qt/src/screens/news/NewsScreen.cpp
+++ b/fincept-qt/src/screens/news/NewsScreen.cpp
@@ -1,6 +1,7 @@
#include "screens/news/NewsScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "services/notifications/NotificationService.h"
#include "storage/repositories/NewsArticleRepository.h"
#include "storage/repositories/SettingsRepository.h"
@@ -304,6 +305,7 @@ void NewsScreen::on_category_changed(const QString& category) {
s.beginGroup("news");
s.setValue("category", category);
s.endGroup();
+ ScreenStateManager::instance().notify_changed(this);
apply_filters_async();
}
@@ -314,6 +316,7 @@ void NewsScreen::on_time_range_changed(const QString& range) {
s.beginGroup("news");
s.setValue("time_range", range);
s.endGroup();
+ ScreenStateManager::instance().notify_changed(this);
apply_filters_async();
}
@@ -323,6 +326,7 @@ void NewsScreen::on_sort_changed(const QString& sort) {
s.beginGroup("news");
s.setValue("sort_mode", sort);
s.endGroup();
+ ScreenStateManager::instance().notify_changed(this);
apply_filters_async();
}
@@ -332,12 +336,14 @@ void NewsScreen::on_view_mode_changed(const QString& mode) {
s.beginGroup("news");
s.setValue("view_mode", mode);
s.endGroup();
+ ScreenStateManager::instance().notify_changed(this);
feed_panel_->model()->set_view_mode(mode);
}
void NewsScreen::on_search_changed(const QString& query) {
search_query_ = query;
visible_article_count_ = PAGE_SIZE;
+ ScreenStateManager::instance().notify_changed(this);
apply_filters_async();
}
@@ -1015,4 +1021,30 @@ int64_t NewsScreen::time_window_seconds() const {
return 86400;
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap NewsScreen::save_state() const {
+ return {
+ {"category", active_category_},
+ {"time_range", time_range_},
+ {"sort_mode", sort_mode_},
+ {"view_mode", view_mode_},
+ {"search_query", search_query_},
+ {"variant", active_variant_},
+ };
+}
+
+void NewsScreen::restore_state(const QVariantMap& state) {
+ active_category_ = state.value("category", "ALL").toString();
+ time_range_ = state.value("time_range", "24H").toString();
+ sort_mode_ = state.value("sort_mode", "RELEVANCE").toString();
+ view_mode_ = state.value("view_mode", "WIRE").toString();
+ search_query_ = state.value("search_query").toString();
+ active_variant_ = state.value("variant", "FULL").toString();
+
+ // Apply active category to command bar if already built
+ if (command_bar_)
+ command_bar_->set_active_category(active_category_);
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/news/NewsScreen.h b/fincept-qt/src/screens/news/NewsScreen.h
index eac239dd2..10bc50c7a 100644
--- a/fincept-qt/src/screens/news/NewsScreen.h
+++ b/fincept-qt/src/screens/news/NewsScreen.h
@@ -1,4 +1,5 @@
#pragma once
+#include "screens/IStatefulScreen.h"
#include "services/news/NewsClusterService.h"
#include "services/news/NewsMonitorService.h"
#include "services/news/NewsService.h"
@@ -20,11 +21,16 @@ class NewsTickerStrip;
/// Main news screen orchestrator. Owns all state, connects all panels,
/// manages the async lifecycle with generation IDs for stale result rejection.
-class NewsScreen : public QWidget {
+class NewsScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit NewsScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "news"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) override;
diff --git a/fincept-qt/src/screens/node_editor/NodeEditorScreen.cpp b/fincept-qt/src/screens/node_editor/NodeEditorScreen.cpp
index 9a2d5b2fa..a02913385 100644
--- a/fincept-qt/src/screens/node_editor/NodeEditorScreen.cpp
+++ b/fincept-qt/src/screens/node_editor/NodeEditorScreen.cpp
@@ -1,6 +1,7 @@
#include "screens/node_editor/NodeEditorScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "screens/node_editor/canvas/MiniMap.h"
#include "screens/node_editor/canvas/NodeCanvas.h"
#include "screens/node_editor/canvas/NodeItem.h"
@@ -12,6 +13,7 @@
#include "screens/node_editor/toolbar/NodeEditorToolbar.h"
#include "services/workflow/NodeRegistry.h"
#include "services/workflow/WorkflowService.h"
+#include "ui/theme/Theme.h"
#include <QFileDialog>
#include <QFrame>
@@ -43,8 +45,11 @@ NodeEditorScreen::NodeEditorScreen(QWidget* parent)
void NodeEditorScreen::showEvent(QShowEvent* event) {
QWidget::showEvent(event);
auto_save_timer_->start();
- if (minimap_ && minimap_->findChild<QTimer*>())
- minimap_->findChild<QTimer*>()->start();
+ if (minimap_)
+ minimap_->start_tracking();
+ // Resume edge animations if execution is in progress
+ if (scene_ && scene_->has_animated_edges())
+ scene_->resume_edge_animations();
// Restore workspace state
QSettings settings;
@@ -71,8 +76,11 @@ void NodeEditorScreen::showEvent(QShowEvent* event) {
void NodeEditorScreen::hideEvent(QHideEvent* event) {
QWidget::hideEvent(event);
auto_save_timer_->stop();
- if (minimap_ && minimap_->findChild<QTimer*>())
- minimap_->findChild<QTimer*>()->stop();
+ if (minimap_)
+ minimap_->stop_tracking();
+ // Pause edge animations while hidden — no point rendering offscreen
+ if (scene_)
+ scene_->pause_edge_animations();
// Save workspace state
QSettings settings;
@@ -178,14 +186,15 @@ void NodeEditorScreen::build_ui() {
// ── Separator ──────────────────────────────────────────────────
auto* sep = new QFrame;
sep->setFixedHeight(1);
- sep->setStyleSheet("background: #2a2a2a; border: none;");
+ sep->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BORDER_MED));
root->addWidget(sep);
// ── 3-panel splitter ───────────────────────────────────────────
auto* splitter = new QSplitter(Qt::Horizontal);
splitter->setHandleWidth(1);
- splitter->setStyleSheet("QSplitter::handle { background: #2a2a2a; }"
- "QSplitter::handle:hover { background: #4a4a4a; }");
+ splitter->setStyleSheet(QString("QSplitter::handle { background: %1; }"
+ "QSplitter::handle:hover { background: %2; }")
+ .arg(ui::colors::BORDER_MED, ui::colors::TEXT_DIM));
// Left: Node palette
palette_ = new NodePalette;
@@ -509,6 +518,7 @@ void NodeEditorScreen::on_save_workflow() {
wf.id = current_workflow_id_;
wf.name = toolbar_->workflow_name();
WorkflowService::instance().save_workflow(wf);
+ ScreenStateManager::instance().notify_changed(this);
}
void NodeEditorScreen::on_load_workflow() {
@@ -679,6 +689,7 @@ void NodeEditorScreen::on_show_templates() {
make_edge(n1.id, "output_main", n4.id, "input_0");
make_edge(n2.id, "output_main", n5.id, "input_0");
make_edge(n3.id, "output_main", n5.id, "input_1");
+ make_edge(n4.id, "output_main", n5.id, "input_2");
make_edge(n5.id, "output_main", n6.id, "input_0");
toolbar_->set_workflow_name("Stock Quote Lookup");
} else if (idx == 2) {
@@ -703,6 +714,7 @@ void NodeEditorScreen::on_show_templates() {
make_edge(n2.id, "output_main", n5.id, "input_0");
make_edge(n3.id, "output_main", n6.id, "input_0");
make_edge(n4.id, "output_main", n6.id, "input_1");
+ make_edge(n5.id, "output_main", n6.id, "input_2");
make_edge(n6.id, "output_main", n7.id, "input_0");
toolbar_->set_workflow_name("Multi-Indicator Scanner");
} else if (idx == 3) {
@@ -726,6 +738,7 @@ void NodeEditorScreen::on_show_templates() {
make_edge(n1.id, "output_main", n4.id, "input_0");
make_edge(n2.id, "output_main", n5.id, "input_0");
make_edge(n3.id, "output_main", n5.id, "input_1");
+ make_edge(n4.id, "output_main", n5.id, "input_2");
make_edge(n5.id, "output_main", n6.id, "input_0");
make_edge(n6.id, "output_main", n7.id, "input_0");
toolbar_->set_workflow_name("Sector Correlation Analysis");
@@ -745,6 +758,7 @@ void NodeEditorScreen::on_show_templates() {
make_edge(n1.id, "output_main", n4.id, "input_0");
make_edge(n2.id, "output_main", n5.id, "input_0");
make_edge(n3.id, "output_main", n5.id, "input_1");
+ make_edge(n4.id, "output_main", n5.id, "input_2");
make_edge(n5.id, "output_main", n6.id, "input_0");
toolbar_->set_workflow_name("Economic Dashboard");
} else if (idx == 5) {
@@ -924,6 +938,7 @@ void NodeEditorScreen::on_show_templates() {
make_edge(n1.id, "output_main", n4.id, "input_0");
make_edge(n2.id, "output_main", n5.id, "input_0");
make_edge(n3.id, "output_main", n5.id, "input_1");
+ make_edge(n4.id, "output_main", n5.id, "input_2");
make_edge(n5.id, "output_main", n6.id, "input_0");
make_edge(n5.id, "output_main", n7.id, "input_0");
make_edge(n6.id, "output_main", n8.id, "input_0");
@@ -1030,4 +1045,20 @@ void NodeEditorScreen::on_deploy() {
}
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap NodeEditorScreen::save_state() const {
+ return {{"workflow_id", current_workflow_id_}};
+}
+
+void NodeEditorScreen::restore_state(const QVariantMap& state) {
+ const QString wf_id = state.value("workflow_id").toString();
+ if (wf_id.isEmpty()) return;
+
+ // wire_signals() already connected workflow_loaded → scene_->deserialize().
+ // Just trigger the load — the existing handler in wire_signals() does the rest.
+ current_workflow_id_ = wf_id;
+ WorkflowService::instance().load_workflow(wf_id);
+}
+
} // namespace fincept::workflow
diff --git a/fincept-qt/src/screens/node_editor/NodeEditorScreen.h b/fincept-qt/src/screens/node_editor/NodeEditorScreen.h
index 6895f3400..5ecde6223 100644
--- a/fincept-qt/src/screens/node_editor/NodeEditorScreen.h
+++ b/fincept-qt/src/screens/node_editor/NodeEditorScreen.h
@@ -1,5 +1,6 @@
#pragma once
+#include "screens/IStatefulScreen.h"
#include "screens/node_editor/NodeEditorTypes.h"
#include <QTimer>
@@ -18,11 +19,16 @@ class MiniMap;
class ExecutionResultsPanel;
/// Main node editor screen — 3-panel layout with toolbar.
-class NodeEditorScreen : public QWidget {
+class NodeEditorScreen : public QWidget, public fincept::screens::IStatefulScreen {
Q_OBJECT
public:
explicit NodeEditorScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "node_editor"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) override;
diff --git a/fincept-qt/src/screens/node_editor/canvas/EdgeItem.cpp b/fincept-qt/src/screens/node_editor/canvas/EdgeItem.cpp
index 6babc5ce2..35ba5081b 100644
--- a/fincept-qt/src/screens/node_editor/canvas/EdgeItem.cpp
+++ b/fincept-qt/src/screens/node_editor/canvas/EdgeItem.cpp
@@ -9,7 +9,6 @@
#include <QMenu>
#include <QPainter>
#include <QPainterPath>
-#include <QTimerEvent>
namespace fincept::workflow {
@@ -62,17 +61,14 @@ void EdgeItem::set_animated(bool animated) {
if (animated_ == animated)
return;
animated_ = animated;
+ dash_offset_ = 0.0;
+ update();
+}
- if (animated_) {
- dash_offset_ = 0.0;
- anim_timer_id_ = startTimer(50); // 20fps per P9
- } else {
- if (anim_timer_id_) {
- killTimer(anim_timer_id_);
- anim_timer_id_ = 0;
- }
- dash_offset_ = 0.0;
- }
+void EdgeItem::tick_animation() {
+ if (!animated_)
+ return;
+ dash_offset_ -= 1.0;
update();
}
@@ -101,13 +97,6 @@ void EdgeItem::paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget
painter->drawPath(path());
}
-void EdgeItem::timerEvent(QTimerEvent* event) {
- if (event->timerId() == anim_timer_id_) {
- dash_offset_ -= 1.0; // negative offset advances dashes along path direction (left → right)
- update();
- }
-}
-
void EdgeItem::keyPressEvent(QKeyEvent* event) {
if (event->key() == Qt::Key_Delete || event->key() == Qt::Key_Backspace) {
emit delete_requested(id_);
diff --git a/fincept-qt/src/screens/node_editor/canvas/EdgeItem.h b/fincept-qt/src/screens/node_editor/canvas/EdgeItem.h
index 306659fc6..6878533cf 100644
--- a/fincept-qt/src/screens/node_editor/canvas/EdgeItem.h
+++ b/fincept-qt/src/screens/node_editor/canvas/EdgeItem.h
@@ -27,6 +27,9 @@ class EdgeItem : public QObject, public QGraphicsPathItem {
void set_animated(bool animated);
bool is_animated() const { return animated_; }
+ /// Advance dash animation by one tick (called by NodeScene's global timer).
+ void tick_animation();
+
void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override;
signals:
@@ -35,7 +38,6 @@ class EdgeItem : public QObject, public QGraphicsPathItem {
protected:
QVariant itemChange(GraphicsItemChange change, const QVariant& value) override;
- void timerEvent(QTimerEvent* event) override;
void keyPressEvent(QKeyEvent* event) override;
void contextMenuEvent(QGraphicsSceneContextMenuEvent* event) override;
@@ -45,7 +47,6 @@ class EdgeItem : public QObject, public QGraphicsPathItem {
PortItem* target_ = nullptr;
bool animated_ = false;
qreal dash_offset_ = 0.0;
- int anim_timer_id_ = 0;
};
} // namespace fincept::workflow
diff --git a/fincept-qt/src/screens/node_editor/canvas/MiniMap.h b/fincept-qt/src/screens/node_editor/canvas/MiniMap.h
index 3803181b6..2e0bd8877 100644
--- a/fincept-qt/src/screens/node_editor/canvas/MiniMap.h
+++ b/fincept-qt/src/screens/node_editor/canvas/MiniMap.h
@@ -16,6 +16,10 @@ class MiniMap : public QGraphicsView {
void update_viewport_rect();
+ /// Start/stop the viewport tracking timer.
+ void start_tracking() { if (update_timer_) update_timer_->start(); }
+ void stop_tracking() { if (update_timer_) update_timer_->stop(); }
+
protected:
void paintEvent(QPaintEvent* event) override;
void mousePressEvent(QMouseEvent* event) override;
diff --git a/fincept-qt/src/screens/node_editor/canvas/NodeCanvas.cpp b/fincept-qt/src/screens/node_editor/canvas/NodeCanvas.cpp
index d6c94b292..060d3605e 100644
--- a/fincept-qt/src/screens/node_editor/canvas/NodeCanvas.cpp
+++ b/fincept-qt/src/screens/node_editor/canvas/NodeCanvas.cpp
@@ -3,6 +3,7 @@
#include "screens/node_editor/canvas/NodeScene.h"
#include "screens/node_editor/canvas/PortItem.h"
#include "services/workflow/NodeRegistry.h"
+#include "ui/theme/Theme.h"
#include "ui/theme/ThemeManager.h"
#include <QAction>
@@ -32,7 +33,8 @@ NodeCanvas::NodeCanvas(NodeScene* scene, QWidget* parent) : QGraphicsView(scene,
setAcceptDrops(true);
setTransformationAnchor(AnchorUnderMouse);
- setStyleSheet("QGraphicsView { background: #0d0d0d; border: none; }");
+ setStyleSheet(QString("QGraphicsView { background: %1; border: none; }")
+ .arg(ui::colors::BG_BASE));
connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
this, [this](const ui::ThemeTokens&) {
diff --git a/fincept-qt/src/screens/node_editor/canvas/NodeScene.cpp b/fincept-qt/src/screens/node_editor/canvas/NodeScene.cpp
index 6fbf16ffe..ab7d78e5c 100644
--- a/fincept-qt/src/screens/node_editor/canvas/NodeScene.cpp
+++ b/fincept-qt/src/screens/node_editor/canvas/NodeScene.cpp
@@ -13,6 +13,10 @@ namespace fincept::workflow {
NodeScene::NodeScene(QObject* parent) : QGraphicsScene(parent) {
setSceneRect(-5000, -5000, 10000, 10000);
+
+ // Single global timer for all edge animations (P9: 20fps)
+ anim_timer_.setInterval(50);
+ connect(&anim_timer_, &QTimer::timeout, this, &NodeScene::tick_edge_animations);
}
NodeItem* NodeScene::add_node(const NodeDef& def, const NodeTypeDef& type_def) {
@@ -219,17 +223,48 @@ void NodeScene::set_edges_animated(const QString& node_id, bool animated) {
if (!node)
return;
+ auto toggle = [this, animated](EdgeItem* edge) {
+ if (edge->is_animated() == animated)
+ return;
+ edge->set_animated(animated);
+ animated_edge_count_ += animated ? 1 : -1;
+ };
+
for (auto* port : node->input_ports())
for (auto* edge : port->edges())
- edge->set_animated(animated);
+ toggle(edge);
for (auto* port : node->output_ports())
for (auto* edge : port->edges())
- edge->set_animated(animated);
+ toggle(edge);
+
+ // Start/stop the single global timer based on whether any edges are animated
+ if (animated_edge_count_ > 0 && !anim_timer_.isActive())
+ anim_timer_.start();
+ else if (animated_edge_count_ <= 0 && anim_timer_.isActive())
+ anim_timer_.stop();
}
void NodeScene::stop_all_edge_animations() {
for (auto it = edges_.constBegin(); it != edges_.constEnd(); ++it)
it.value()->set_animated(false);
+ animated_edge_count_ = 0;
+ anim_timer_.stop();
+}
+
+void NodeScene::pause_edge_animations() {
+ anim_timer_.stop();
+}
+
+void NodeScene::resume_edge_animations() {
+ if (animated_edge_count_ > 0 && !anim_timer_.isActive())
+ anim_timer_.start();
+}
+
+void NodeScene::tick_edge_animations() {
+ for (auto it = edges_.constBegin(); it != edges_.constEnd(); ++it) {
+ if (it.value()->is_animated())
+ it.value()->tick_animation();
+ }
}
} // namespace fincept::workflow
diff --git a/fincept-qt/src/screens/node_editor/canvas/NodeScene.h b/fincept-qt/src/screens/node_editor/canvas/NodeScene.h
index 175a11478..2ba4d77e7 100644
--- a/fincept-qt/src/screens/node_editor/canvas/NodeScene.h
+++ b/fincept-qt/src/screens/node_editor/canvas/NodeScene.h
@@ -4,6 +4,7 @@
#include <QGraphicsScene>
#include <QMap>
+#include <QTimer>
namespace fincept::workflow {
@@ -70,15 +71,22 @@ class NodeScene : public QGraphicsScene {
public:
/// Animate edges connected to a node (during execution).
void set_edges_animated(const QString& node_id, bool animated);
- /// Stop all edge animations.
+ /// Stop all edge animations (clears animated state).
void stop_all_edge_animations();
+ /// Pause/resume the animation timer without clearing animated state.
+ void pause_edge_animations();
+ void resume_edge_animations();
+ bool has_animated_edges() const { return animated_edge_count_ > 0; }
private:
void adjust_edges_for_node(const QString& node_id);
+ void tick_edge_animations();
QMap<QString, NodeItem*> nodes_;
QMap<QString, EdgeItem*> edges_;
TempEdge* temp_edge_ = nullptr;
+ QTimer anim_timer_;
+ int animated_edge_count_ = 0;
};
} // namespace fincept::workflow
diff --git a/fincept-qt/src/screens/node_editor/canvas/TempEdge.cpp b/fincept-qt/src/screens/node_editor/canvas/TempEdge.cpp
index 6777088b1..4a4fbb91a 100644
--- a/fincept-qt/src/screens/node_editor/canvas/TempEdge.cpp
+++ b/fincept-qt/src/screens/node_editor/canvas/TempEdge.cpp
@@ -1,6 +1,7 @@
#include "screens/node_editor/canvas/TempEdge.h"
#include "screens/node_editor/canvas/PortItem.h"
+#include "ui/theme/Theme.h"
#include <QPainterPath>
#include <QPen>
@@ -10,7 +11,7 @@
namespace fincept::workflow {
TempEdge::TempEdge(PortItem* source, QGraphicsItem* parent) : QGraphicsPathItem(parent), source_(source) {
- setPen(QPen(QColor("#d97706"), 2.0, Qt::DashLine, Qt::RoundCap));
+ setPen(QPen(QColor(ui::colors::AMBER.get()), 2.0, Qt::DashLine, Qt::RoundCap));
setZValue(10); // above everything
}
diff --git a/fincept-qt/src/screens/node_editor/palette/NodePalette.cpp b/fincept-qt/src/screens/node_editor/palette/NodePalette.cpp
index 9bc8a7d22..dccacb01a 100644
--- a/fincept-qt/src/screens/node_editor/palette/NodePalette.cpp
+++ b/fincept-qt/src/screens/node_editor/palette/NodePalette.cpp
@@ -1,6 +1,7 @@
#include "screens/node_editor/palette/NodePalette.h"
#include "services/workflow/NodeRegistry.h"
+#include "ui/theme/Theme.h"
#include <QDrag>
#include <QFont>
@@ -29,12 +30,13 @@ void NodePalette::build_ui() {
// ── Header ─────────────────────────────────────────────────────
auto* header = new QWidget;
header->setFixedHeight(34);
- header->setStyleSheet("background: #1e1e1e;");
+ header->setStyleSheet(QString("background: %1;").arg(ui::colors::BG_HOVER));
auto* hl = new QHBoxLayout(header);
hl->setContentsMargins(10, 0, 10, 0);
auto* title = new QLabel("NODES");
- title->setStyleSheet("color: #d97706; font-family: Consolas; font-size: 12px;"
- "font-weight: bold; letter-spacing: 0.5px;");
+ title->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 12px;"
+ "font-weight: bold; letter-spacing: 0.5px;")
+ .arg(ui::colors::AMBER));
hl->addWidget(title);
hl->addStretch();
root->addWidget(header);
@@ -42,22 +44,25 @@ void NodePalette::build_ui() {
// ── Separator ──────────────────────────────────────────────────
auto* sep = new QFrame;
sep->setFixedHeight(1);
- sep->setStyleSheet("background: #2a2a2a; border: none;");
+ sep->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BORDER_MED));
root->addWidget(sep);
// ── Search bar ─────────────────────────────────────────────────
auto* search_wrap = new QWidget;
- search_wrap->setStyleSheet("background: #141414;");
+ search_wrap->setStyleSheet(QString("background: %1;").arg(ui::colors::BG_SURFACE));
auto* sl = new QHBoxLayout(search_wrap);
sl->setContentsMargins(8, 6, 8, 6);
search_input_ = new QLineEdit;
search_input_->setPlaceholderText("Search nodes...");
- search_input_->setStyleSheet("QLineEdit {"
- " background: #1e1e1e; color: #e5e5e5; border: 1px solid #2a2a2a;"
- " font-family: Consolas; font-size: 12px; padding: 4px 8px;"
- "}"
- "QLineEdit:focus { border: 1px solid #d97706; }");
+ search_input_->setStyleSheet(
+ QString("QLineEdit {"
+ " background: %1; color: %2; border: 1px solid %3;"
+ " font-family: Consolas; font-size: 12px; padding: 4px 8px;"
+ "}"
+ "QLineEdit:focus { border: 1px solid %4; }")
+ .arg(ui::colors::BG_HOVER, ui::colors::TEXT_PRIMARY,
+ ui::colors::BORDER_MED, ui::colors::AMBER));
sl->addWidget(search_input_);
root->addWidget(search_wrap);
@@ -67,16 +72,18 @@ void NodePalette::build_ui() {
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- scroll->setStyleSheet("QScrollArea { background: #141414; border: none; }"
- "QScrollBar:vertical {"
- " background: #141414; width: 6px; margin: 0;"
- "}"
- "QScrollBar::handle:vertical {"
- " background: #4a4a4a; min-height: 20px;"
- "}"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical {"
- " height: 0; background: none;"
- "}");
+ scroll->setStyleSheet(
+ QString("QScrollArea { background: %1; border: none; }"
+ "QScrollBar:vertical {"
+ " background: %1; width: 6px; margin: 0;"
+ "}"
+ "QScrollBar::handle:vertical {"
+ " background: %2; min-height: 20px;"
+ "}"
+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical {"
+ " height: 0; background: none;"
+ "}")
+ .arg(ui::colors::BG_SURFACE, ui::colors::TEXT_DIM));
categories_container_ = new QWidget;
categories_layout_ = new QVBoxLayout(categories_container_);
@@ -122,7 +129,7 @@ void NodePalette::rebuild_categories(const QString& filter) {
// Category header
auto* cat_header = new QWidget;
cat_header->setFixedHeight(26);
- cat_header->setStyleSheet("background: #1e1e1e;");
+ cat_header->setStyleSheet(QString("background: %1;").arg(ui::colors::BG_HOVER));
auto* chl = new QHBoxLayout(cat_header);
chl->setContentsMargins(10, 0, 10, 0);
auto* cat_label = new QLabel(cat.toUpper());
@@ -133,7 +140,8 @@ void NodePalette::rebuild_categories(const QString& filter) {
chl->addWidget(cat_label);
auto* count_label = new QLabel(QString::number(filtered.size()));
- count_label->setStyleSheet("color: #525252; font-family: Consolas; font-size: 10px;");
+ count_label->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 10px;")
+ .arg(ui::colors::TEXT_TERTIARY));
chl->addStretch();
chl->addWidget(count_label);
@@ -145,14 +153,17 @@ void NodePalette::rebuild_categories(const QString& filter) {
auto* btn = new QPushButton;
btn->setFixedHeight(32);
btn->setCursor(Qt::OpenHandCursor);
- btn->setStyleSheet("QPushButton {"
- " background: #141414; color: #e5e5e5; border: none;"
- " border-bottom: 1px solid #1e1e1e; font-family: Consolas;"
- " font-size: 11px; text-align: left; padding: 0 10px;"
- "}"
- "QPushButton:hover {"
- " background: #252525; color: #e5e5e5;"
- "}");
+ btn->setStyleSheet(
+ QString("QPushButton {"
+ " background: %1; color: %2; border: none;"
+ " border-bottom: 1px solid %3; font-family: Consolas;"
+ " font-size: 11px; text-align: left; padding: 0 10px;"
+ "}"
+ "QPushButton:hover {"
+ " background: %4; color: %2;"
+ "}")
+ .arg(ui::colors::BG_SURFACE, ui::colors::TEXT_PRIMARY,
+ ui::colors::BG_HOVER, ui::colors::BG_HOVER));
btn->setToolTip(n.description);
@@ -170,7 +181,8 @@ void NodePalette::rebuild_categories(const QString& filter) {
bl->addWidget(icon);
auto* name = new QLabel(n.display_name);
- name->setStyleSheet("color: #e5e5e5; font-family: Consolas; font-size: 11px;");
+ name->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 11px;")
+ .arg(ui::colors::TEXT_PRIMARY));
name->setAttribute(Qt::WA_TransparentForMouseEvents);
bl->addWidget(name, 1);
@@ -204,21 +216,21 @@ void NodePalette::start_drag(const QString& type_id) {
QPainter painter(&pixmap);
painter.setRenderHint(QPainter::Antialiasing, false);
painter.setPen(Qt::NoPen);
- painter.setBrush(QColor("#1e1e1e"));
+ painter.setBrush(QColor(ui::colors::BG_HOVER.get()));
painter.drawRect(0, 0, text_w, h);
// Accent left bar
- QString accent = type_def ? type_def->accent_color : "#d97706";
+ QString accent = type_def ? type_def->accent_color : QString(ui::colors::AMBER.get());
painter.setBrush(QColor(accent));
painter.drawRect(0, 0, 3, h);
// Text
painter.setFont(font);
- painter.setPen(QColor("#e5e5e5"));
+ painter.setPen(QColor(ui::colors::TEXT_PRIMARY.get()));
painter.drawText(QRect(8, 0, text_w - 8, h), Qt::AlignVCenter, label);
// Border
- painter.setPen(QPen(QColor("#2a2a2a"), 1));
+ painter.setPen(QPen(QColor(ui::colors::BORDER_MED.get()), 1));
painter.setBrush(Qt::NoBrush);
painter.drawRect(0, 0, text_w - 1, h - 1);
painter.end();
diff --git a/fincept-qt/src/screens/node_editor/properties/ExecutionResultsPanel.cpp b/fincept-qt/src/screens/node_editor/properties/ExecutionResultsPanel.cpp
index af2e1536a..017923b74 100644
--- a/fincept-qt/src/screens/node_editor/properties/ExecutionResultsPanel.cpp
+++ b/fincept-qt/src/screens/node_editor/properties/ExecutionResultsPanel.cpp
@@ -1,5 +1,7 @@
#include "screens/node_editor/properties/ExecutionResultsPanel.h"
+#include "ui/theme/Theme.h"
+
#include <QFrame>
#include <QHBoxLayout>
#include <QJsonArray>
@@ -41,11 +43,14 @@ static QWidget* make_result_card(const NodeExecutionResult& result) {
card->setObjectName("resultCard");
card->setStyleSheet(
QString("QWidget#resultCard {"
- " background: #161616;"
- " border-left: 3px solid %1;"
- " border-bottom: 1px solid #222;"
+ " background: %1;"
+ " border-left: 3px solid %2;"
+ " border-bottom: 1px solid %3;"
" margin: 0;"
- "}").arg(ok ? "#16a34a" : "#dc2626"));
+ "}")
+ .arg(ui::colors::BG_HOVER,
+ ok ? ui::colors::POSITIVE.get() : ui::colors::NEGATIVE.get(),
+ ui::colors::BORDER_MED));
auto* vl = new QVBoxLayout(card);
vl->setContentsMargins(10, 6, 10, 6);
@@ -62,12 +67,14 @@ static QWidget* make_result_card(const NodeExecutionResult& result) {
badge->setFixedWidth(16);
badge->setAlignment(Qt::AlignCenter);
badge->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 11px;"
- " font-weight: bold;").arg(ok ? "#16a34a" : "#dc2626"));
+ " font-weight: bold;")
+ .arg(ok ? ui::colors::POSITIVE.get() : ui::colors::NEGATIVE.get()));
hl->addWidget(badge);
// Node ID (truncated)
auto* id_lbl = new QLabel(result.node_id.left(8) + "…");
- id_lbl->setStyleSheet("color: #525252; font-family: Consolas; font-size: 9px;");
+ id_lbl->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 9px;")
+ .arg(ui::colors::TEXT_TERTIARY));
id_lbl->setToolTip(result.node_id);
hl->addWidget(id_lbl);
@@ -75,7 +82,8 @@ static QWidget* make_result_card(const NodeExecutionResult& result) {
// Duration
auto* dur_lbl = new QLabel(format_duration(result.duration_ms));
- dur_lbl->setStyleSheet("color: #525252; font-family: Consolas; font-size: 9px;");
+ dur_lbl->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 9px;")
+ .arg(ui::colors::TEXT_TERTIARY));
hl->addWidget(dur_lbl);
vl->addWidget(header_row);
@@ -86,8 +94,9 @@ static QWidget* make_result_card(const NodeExecutionResult& result) {
auto* err = new QLabel(result.error.isEmpty() ? "Unknown error" : result.error);
err->setWordWrap(true);
err->setTextInteractionFlags(Qt::TextSelectableByMouse);
- err->setStyleSheet("color: #f87171; font-family: Consolas; font-size: 10px;"
- " background: transparent; padding: 2px 0;");
+ err->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 10px;"
+ " background: transparent; padding: 2px 0;")
+ .arg(ui::colors::NEGATIVE));
vl->addWidget(err);
} else if (result.output.isObject()) {
auto obj = result.output.toObject();
@@ -102,15 +111,17 @@ static QWidget* make_result_card(const NodeExecutionResult& result) {
auto* text = new QLabel(response);
text->setWordWrap(true);
text->setTextInteractionFlags(Qt::TextSelectableByMouse);
- text->setStyleSheet("color: #e5e5e5; font-family: Consolas; font-size: 10px;"
- " background: transparent; line-height: 1.4;");
+ text->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 10px;"
+ " background: transparent; line-height: 1.4;")
+ .arg(ui::colors::TEXT_PRIMARY));
vl->addWidget(text);
// Show exec time if present
if (obj.contains("exec_ms")) {
auto* meta = new QLabel(QString("Agent ran in %1ms")
.arg(obj.value("exec_ms").toInt()));
- meta->setStyleSheet("color: #525252; font-family: Consolas; font-size: 9px;");
+ meta->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 9px;")
+ .arg(ui::colors::TEXT_TERTIARY));
vl->addWidget(meta);
}
}
@@ -119,8 +130,9 @@ static QWidget* make_result_card(const NodeExecutionResult& result) {
double price = obj["price"].toDouble();
auto* price_lbl = new QLabel(
QString("%1 $%2").arg(obj["symbol"].toString()).arg(price, 0, 'f', 2));
- price_lbl->setStyleSheet("color: #e5e5e5; font-family: Consolas; font-size: 11px;"
- " font-weight: bold;");
+ price_lbl->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 11px;"
+ " font-weight: bold;")
+ .arg(ui::colors::TEXT_PRIMARY));
vl->addWidget(price_lbl);
}
// Generic key-value pairs
@@ -138,14 +150,16 @@ static QWidget* make_result_card(const NodeExecutionResult& result) {
auto* key = new QLabel(it.key() + ":");
key->setFixedWidth(110);
- key->setStyleSheet("color: #808080; font-family: Consolas; font-size: 10px;");
+ key->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 10px;")
+ .arg(ui::colors::TEXT_SECONDARY));
rl->addWidget(key);
QString valStr = value_to_string(it.value());
auto* val = new QLabel(valStr);
val->setWordWrap(true);
val->setTextInteractionFlags(Qt::TextSelectableByMouse);
- val->setStyleSheet("color: #e5e5e5; font-family: Consolas; font-size: 10px;");
+ val->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 10px;")
+ .arg(ui::colors::TEXT_PRIMARY));
rl->addWidget(val, 1);
gl->addWidget(row);
@@ -157,7 +171,8 @@ static QWidget* make_result_card(const NodeExecutionResult& result) {
auto* val = new QLabel(value_to_string(result.output));
val->setWordWrap(true);
val->setTextInteractionFlags(Qt::TextSelectableByMouse);
- val->setStyleSheet("color: #e5e5e5; font-family: Consolas; font-size: 10px;");
+ val->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 10px;")
+ .arg(ui::colors::TEXT_PRIMARY));
vl->addWidget(val);
}
@@ -181,13 +196,13 @@ void ExecutionResultsPanel::build_ui() {
// ── Top separator ──────────────────────────────────────────────
auto* sep = new QFrame;
sep->setFixedHeight(1);
- sep->setStyleSheet("background: #2a2a2a; border: none;");
+ sep->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BORDER_MED));
root->addWidget(sep);
// ── Header bar ────────────────────────────────────────────────
auto* header = new QWidget;
header->setFixedHeight(32);
- header->setStyleSheet("background: #1a1a1a;");
+ header->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_DIM));
auto* hl = new QHBoxLayout(header);
hl->setContentsMargins(10, 0, 8, 0);
hl->setSpacing(8);
@@ -195,65 +210,77 @@ void ExecutionResultsPanel::build_ui() {
// Collapse toggle
collapse_btn_ = new QPushButton("▸");
collapse_btn_->setFixedSize(18, 18);
- collapse_btn_->setStyleSheet("QPushButton { background: transparent; color: #808080;"
- " border: none; font-size: 10px; }"
- "QPushButton:hover { color: #e5e5e5; }");
+ collapse_btn_->setStyleSheet(
+ QString("QPushButton { background: transparent; color: %1;"
+ " border: none; font-size: 10px; }"
+ "QPushButton:hover { color: %2; }")
+ .arg(ui::colors::TEXT_SECONDARY, ui::colors::TEXT_PRIMARY));
collapse_btn_->setToolTip("Expand / Collapse");
connect(collapse_btn_, &QPushButton::clicked, this,
[this]() { set_collapsed(!collapsed_); });
hl->addWidget(collapse_btn_);
auto* title = new QLabel("EXECUTION RESULTS");
- title->setStyleSheet("color: #d97706; font-family: Consolas; font-size: 10px;"
- " font-weight: bold; letter-spacing: 0.5px;");
+ title->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 10px;"
+ " font-weight: bold; letter-spacing: 0.5px;")
+ .arg(ui::colors::AMBER));
hl->addWidget(title);
// Node counter badge
node_counter_ = new QLabel("");
- node_counter_->setStyleSheet("color: #525252; font-family: Consolas; font-size: 10px;");
+ node_counter_->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 10px;")
+ .arg(ui::colors::TEXT_TERTIARY));
hl->addWidget(node_counter_);
hl->addStretch();
// Status label
status_label_ = new QLabel("IDLE");
- status_label_->setStyleSheet("color: #525252; font-family: Consolas;"
- " font-size: 10px; font-weight: bold;");
+ status_label_->setStyleSheet(QString("color: %1; font-family: Consolas;"
+ " font-size: 10px; font-weight: bold;")
+ .arg(ui::colors::TEXT_TERTIARY));
hl->addWidget(status_label_);
// Separator
auto* vsep = new QFrame;
vsep->setFixedSize(1, 16);
- vsep->setStyleSheet("background: #2a2a2a; border: none;");
+ vsep->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BORDER_MED));
hl->addWidget(vsep);
// Clear button
clear_btn_ = new QPushButton("CLEAR");
clear_btn_->setFixedHeight(20);
- clear_btn_->setStyleSheet("QPushButton { background: transparent; color: #525252;"
- " border: none; font-family: Consolas; font-size: 10px; }"
- "QPushButton:hover { color: #e5e5e5; }");
+ clear_btn_->setStyleSheet(
+ QString("QPushButton { background: transparent; color: %1;"
+ " border: none; font-family: Consolas; font-size: 10px; }"
+ "QPushButton:hover { color: %2; }")
+ .arg(ui::colors::TEXT_TERTIARY, ui::colors::TEXT_PRIMARY));
connect(clear_btn_, &QPushButton::clicked, this, &ExecutionResultsPanel::clear);
hl->addWidget(clear_btn_);
// Copy button
copy_btn_ = new QPushButton("COPY");
copy_btn_->setFixedHeight(20);
- copy_btn_->setStyleSheet("QPushButton { background: transparent; color: #525252;"
- " border: none; font-family: Consolas; font-size: 10px; }"
- "QPushButton:hover { color: #d97706; }");
+ copy_btn_->setStyleSheet(
+ QString("QPushButton { background: transparent; color: %1;"
+ " border: none; font-family: Consolas; font-size: 10px; }"
+ "QPushButton:hover { color: %2; }")
+ .arg(ui::colors::TEXT_TERTIARY, ui::colors::AMBER));
copy_btn_->setToolTip("Copy all results to clipboard");
connect(copy_btn_, &QPushButton::clicked, this, [this]() {
QGuiApplication::clipboard()->setText(copy_buffer_);
copy_btn_->setText("COPIED!");
- copy_btn_->setStyleSheet("QPushButton { background: transparent; color: #16a34a;"
- " border: none; font-family: Consolas; font-size: 10px; }");
+ copy_btn_->setStyleSheet(
+ QString("QPushButton { background: transparent; color: %1;"
+ " border: none; font-family: Consolas; font-size: 10px; }")
+ .arg(ui::colors::POSITIVE));
QTimer::singleShot(1500, copy_btn_, [this]() {
copy_btn_->setText("COPY");
copy_btn_->setStyleSheet(
- "QPushButton { background: transparent; color: #525252;"
- " border: none; font-family: Consolas; font-size: 10px; }"
- "QPushButton:hover { color: #d97706; }");
+ QString("QPushButton { background: transparent; color: %1;"
+ " border: none; font-family: Consolas; font-size: 10px; }"
+ "QPushButton:hover { color: %2; }")
+ .arg(ui::colors::TEXT_TERTIARY, ui::colors::AMBER));
});
});
hl->addWidget(copy_btn_);
@@ -266,13 +293,14 @@ void ExecutionResultsPanel::build_ui() {
scroll_area_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
scroll_area_->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
scroll_area_->setStyleSheet(
- "QScrollArea { background: #111; border: none; }"
- "QScrollBar:vertical { background: #111; width: 5px; border: none; }"
- "QScrollBar::handle:vertical { background: #333; min-height: 20px; border-radius: 2px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }");
+ QString("QScrollArea { background: %1; border: none; }"
+ "QScrollBar:vertical { background: %1; width: 5px; border: none; }"
+ "QScrollBar::handle:vertical { background: %2; min-height: 20px; border-radius: 2px; }"
+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }")
+ .arg(ui::colors::BG_RAISED, ui::colors::BORDER_BRIGHT));
results_container_ = new QWidget;
- results_container_->setStyleSheet("background: #111;");
+ results_container_->setStyleSheet(QString("background: %1;").arg(ui::colors::BG_RAISED));
results_layout_ = new QVBoxLayout(results_container_);
results_layout_->setContentsMargins(0, 0, 0, 0);
results_layout_->setSpacing(0);
@@ -302,8 +330,9 @@ void ExecutionResultsPanel::clear() {
copy_buffer_.clear();
node_counter_->setText("");
status_label_->setText("IDLE");
- status_label_->setStyleSheet("color: #525252; font-family: Consolas;"
- " font-size: 10px; font-weight: bold;");
+ status_label_->setStyleSheet(QString("color: %1; font-family: Consolas;"
+ " font-size: 10px; font-weight: bold;")
+ .arg(ui::colors::TEXT_TERTIARY));
}
void ExecutionResultsPanel::set_started(const QString& workflow_id) {
@@ -312,8 +341,9 @@ void ExecutionResultsPanel::set_started(const QString& workflow_id) {
show();
set_collapsed(false); // auto-expand when execution starts
status_label_->setText("RUNNING…");
- status_label_->setStyleSheet("color: #d97706; font-family: Consolas;"
- " font-size: 10px; font-weight: bold;");
+ status_label_->setStyleSheet(QString("color: %1; font-family: Consolas;"
+ " font-size: 10px; font-weight: bold;")
+ .arg(ui::colors::AMBER));
}
void ExecutionResultsPanel::add_node_result(const NodeExecutionResult& result) {
@@ -325,9 +355,10 @@ void ExecutionResultsPanel::add_node_result(const NodeExecutionResult& result) {
if (error_count_ > 0)
counter += QString(" %1 error%2").arg(error_count_).arg(error_count_ == 1 ? "" : "s");
node_counter_->setText(counter);
- node_counter_->setStyleSheet(error_count_ > 0
- ? "color: #dc2626; font-family: Consolas; font-size: 10px;"
- : "color: #525252; font-family: Consolas; font-size: 10px;");
+ node_counter_->setStyleSheet(
+ QString("color: %1; font-family: Consolas; font-size: 10px;")
+ .arg(error_count_ > 0 ? ui::colors::NEGATIVE.get()
+ : ui::colors::TEXT_TERTIARY.get()));
// Append plain-text representation to copy buffer
copy_buffer_ += QString("[%1] %2 %3\n")
@@ -366,15 +397,17 @@ void ExecutionResultsPanel::set_finished(const WorkflowExecutionResult& result)
if (result.success) {
status_label_->setText(
QString("DONE %1").arg(format_duration(result.total_duration_ms)));
- status_label_->setStyleSheet("color: #16a34a; font-family: Consolas;"
- " font-size: 10px; font-weight: bold;");
+ status_label_->setStyleSheet(QString("color: %1; font-family: Consolas;"
+ " font-size: 10px; font-weight: bold;")
+ .arg(ui::colors::POSITIVE));
} else {
QString msg = result.error.startsWith("Execution stopped")
? "STOPPED"
: QString("FAILED %1").arg(result.error);
status_label_->setText(msg);
- status_label_->setStyleSheet("color: #dc2626; font-family: Consolas;"
- " font-size: 10px; font-weight: bold;");
+ status_label_->setStyleSheet(QString("color: %1; font-family: Consolas;"
+ " font-size: 10px; font-weight: bold;")
+ .arg(ui::colors::NEGATIVE));
}
}
diff --git a/fincept-qt/src/screens/node_editor/properties/NodePropertiesPanel.cpp b/fincept-qt/src/screens/node_editor/properties/NodePropertiesPanel.cpp
index bd0b68533..ec2a70565 100644
--- a/fincept-qt/src/screens/node_editor/properties/NodePropertiesPanel.cpp
+++ b/fincept-qt/src/screens/node_editor/properties/NodePropertiesPanel.cpp
@@ -1,6 +1,7 @@
#include "screens/node_editor/properties/NodePropertiesPanel.h"
#include "screens/node_editor/properties/ParameterWidgets.h"
+#include "ui/theme/Theme.h"
#include <QFrame>
#include <QLabel>
@@ -30,7 +31,8 @@ void NodePropertiesPanel::build_ui() {
el->setAlignment(Qt::AlignCenter);
auto* empty_label = new QLabel("Select a node\nto edit properties");
empty_label->setAlignment(Qt::AlignCenter);
- empty_label->setStyleSheet("color: #525252; font-family: Consolas; font-size: 12px;");
+ empty_label->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 12px;")
+ .arg(ui::colors::TEXT_TERTIARY));
el->addWidget(empty_label);
// ── Editor page (populated dynamically) ────────────────────────
@@ -42,16 +44,18 @@ void NodePropertiesPanel::build_ui() {
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- scroll->setStyleSheet("QScrollArea { background: #141414; border: none; }"
- "QScrollBar:vertical {"
- " background: #141414; width: 6px; margin: 0;"
- "}"
- "QScrollBar::handle:vertical {"
- " background: #4a4a4a; min-height: 20px;"
- "}"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical {"
- " height: 0; background: none;"
- "}");
+ scroll->setStyleSheet(
+ QString("QScrollArea { background: %1; border: none; }"
+ "QScrollBar:vertical {"
+ " background: %1; width: 6px; margin: 0;"
+ "}"
+ "QScrollBar::handle:vertical {"
+ " background: %2; min-height: 20px;"
+ "}"
+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical {"
+ " height: 0; background: none;"
+ "}")
+ .arg(ui::colors::BG_SURFACE, ui::colors::TEXT_DIM));
auto* scroll_content = new QWidget;
editor_layout_ = new QVBoxLayout(scroll_content);
@@ -99,24 +103,27 @@ void NodePropertiesPanel::build_editor(const NodeDef& node, const NodeTypeDef& t
// ── Header ─────────────────────────────────────────────────────
auto* header = new QWidget;
header->setFixedHeight(34);
- header->setStyleSheet("background: #1e1e1e;");
+ header->setStyleSheet(QString("background: %1;").arg(ui::colors::BG_HOVER));
auto* hl = new QHBoxLayout(header);
hl->setContentsMargins(10, 0, 10, 0);
auto* title = new QLabel("PROPERTIES");
- title->setStyleSheet("color: #d97706; font-family: Consolas; font-size: 12px;"
- "font-weight: bold; letter-spacing: 0.5px;");
+ title->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 12px;"
+ "font-weight: bold; letter-spacing: 0.5px;")
+ .arg(ui::colors::AMBER));
hl->addWidget(title);
hl->addStretch();
auto* del_btn = new QPushButton("DEL");
del_btn->setFixedSize(36, 22);
- del_btn->setStyleSheet("QPushButton {"
- " background: rgba(220,38,38,0.1); color: #dc2626;"
- " border: 1px solid rgba(220,38,38,0.3); font-family: Consolas;"
- " font-size: 10px; font-weight: bold;"
- "}"
- "QPushButton:hover { background: #dc2626; color: #e5e5e5; }");
+ del_btn->setStyleSheet(
+ QString("QPushButton {"
+ " background: %1; color: %2;"
+ " border: 1px solid rgba(220,38,38,0.3); font-family: Consolas;"
+ " font-size: 10px; font-weight: bold;"
+ "}"
+ "QPushButton:hover { background: %2; color: %3; }")
+ .arg(ui::colors::NEGATIVE_BG, ui::colors::NEGATIVE, ui::colors::TEXT_PRIMARY));
QString node_id = node.id;
connect(del_btn, &QPushButton::clicked, this, [this, node_id]() { emit delete_requested(node_id); });
hl->addWidget(del_btn);
@@ -126,7 +133,7 @@ void NodePropertiesPanel::build_editor(const NodeDef& node, const NodeTypeDef& t
// ── Separator ──────────────────────────────────────────────────
auto* sep = new QFrame;
sep->setFixedHeight(1);
- sep->setStyleSheet("background: #2a2a2a; border: none;");
+ sep->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BORDER_MED));
editor_layout_->insertWidget(pos++, sep);
// ── Node name ──────────────────────────────────────────────────
@@ -136,15 +143,19 @@ void NodePropertiesPanel::build_editor(const NodeDef& node, const NodeTypeDef& t
nsl->setSpacing(4);
auto* name_label = new QLabel("NAME");
- name_label->setStyleSheet("color: #808080; font-family: Consolas; font-size: 11px; font-weight: bold;");
+ name_label->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 11px; font-weight: bold;")
+ .arg(ui::colors::TEXT_SECONDARY));
nsl->addWidget(name_label);
auto* name_edit = new QLineEdit(node.name);
- name_edit->setStyleSheet("QLineEdit {"
- " background: #1e1e1e; color: #e5e5e5; border: 1px solid #2a2a2a;"
- " font-family: Consolas; font-size: 12px; padding: 4px 6px;"
- "}"
- "QLineEdit:focus { border: 1px solid #d97706; }");
+ name_edit->setStyleSheet(
+ QString("QLineEdit {"
+ " background: %1; color: %2; border: 1px solid %3;"
+ " font-family: Consolas; font-size: 12px; padding: 4px 6px;"
+ "}"
+ "QLineEdit:focus { border: 1px solid %4; }")
+ .arg(ui::colors::BG_HOVER, ui::colors::TEXT_PRIMARY,
+ ui::colors::BORDER_MED, ui::colors::AMBER));
nsl->addWidget(name_edit);
connect(name_edit, &QLineEdit::textChanged, this, [this](const QString& text) {
@@ -156,20 +167,22 @@ void NodePropertiesPanel::build_editor(const NodeDef& node, const NodeTypeDef& t
// ── Type info ──────────────────────────────────────────────────
auto* type_label = new QLabel(QString("%1 | %2").arg(type_def.category, type_def.type_id));
- type_label->setStyleSheet("color: #525252; font-family: Consolas; font-size: 10px; padding: 0 0 6px 0;");
+ type_label->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 10px; padding: 0 0 6px 0;")
+ .arg(ui::colors::TEXT_TERTIARY));
editor_layout_->insertWidget(pos++, type_label);
// ── Separator ──────────────────────────────────────────────────
auto* sep2 = new QFrame;
sep2->setFixedHeight(1);
- sep2->setStyleSheet("background: #2a2a2a; border: none;");
+ sep2->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BORDER_MED));
editor_layout_->insertWidget(pos++, sep2);
// ── Parameters ─────────────────────────────────────────────────
if (!type_def.parameters.isEmpty()) {
auto* param_header = new QLabel("PARAMETERS");
- param_header->setStyleSheet("color: #d97706; font-family: Consolas; font-size: 11px;"
- "font-weight: bold; padding: 8px 0 4px 0; letter-spacing: 0.5px;");
+ param_header->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 11px;"
+ "font-weight: bold; padding: 8px 0 4px 0; letter-spacing: 0.5px;")
+ .arg(ui::colors::AMBER));
editor_layout_->insertWidget(pos++, param_header);
for (const auto& param : type_def.parameters) {
@@ -188,21 +201,24 @@ void NodePropertiesPanel::build_editor(const NodeDef& node, const NodeTypeDef& t
// ── Settings section ───────────────────────────────────────────
auto* sep3 = new QFrame;
sep3->setFixedHeight(1);
- sep3->setStyleSheet("background: #2a2a2a; border: none;");
+ sep3->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BORDER_MED));
editor_layout_->insertWidget(pos++, sep3);
auto* settings_header = new QLabel("SETTINGS");
- settings_header->setStyleSheet("color: #d97706; font-family: Consolas; font-size: 11px;"
- "font-weight: bold; padding: 8px 0 4px 0; letter-spacing: 0.5px;");
+ settings_header->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 11px;"
+ "font-weight: bold; padding: 8px 0 4px 0; letter-spacing: 0.5px;")
+ .arg(ui::colors::AMBER));
editor_layout_->insertWidget(pos++, settings_header);
// Disabled toggle
auto* disabled_check = new QCheckBox("Disabled");
disabled_check->setChecked(node.disabled);
disabled_check->setStyleSheet(
- "QCheckBox { color: #e5e5e5; font-family: Consolas; font-size: 12px; }"
- "QCheckBox::indicator { width: 14px; height: 14px; background: #1e1e1e; border: 1px solid #2a2a2a; }"
- "QCheckBox::indicator:checked { background: #d97706; }");
+ QString("QCheckBox { color: %1; font-family: Consolas; font-size: 12px; }"
+ "QCheckBox::indicator { width: 14px; height: 14px; background: %2; border: 1px solid %3; }"
+ "QCheckBox::indicator:checked { background: %4; }")
+ .arg(ui::colors::TEXT_PRIMARY, ui::colors::BG_HOVER,
+ ui::colors::BORDER_MED, ui::colors::AMBER));
editor_layout_->insertWidget(pos++, disabled_check);
// Continue on fail toggle
diff --git a/fincept-qt/src/screens/node_editor/properties/ParameterWidgets.cpp b/fincept-qt/src/screens/node_editor/properties/ParameterWidgets.cpp
index ea1b2da31..35cb2726d 100644
--- a/fincept-qt/src/screens/node_editor/properties/ParameterWidgets.cpp
+++ b/fincept-qt/src/screens/node_editor/properties/ParameterWidgets.cpp
@@ -5,6 +5,7 @@
#include "services/agents/AgentTypes.h"
#include "services/file_manager/FileManagerService.h"
#include "storage/repositories/LlmProfileRepository.h"
+#include "ui/theme/Theme.h"
#include <QFileDialog>
#include <QFileInfo>
@@ -12,14 +13,18 @@
#include <QJsonDocument>
#include <QPushButton>
-namespace {
-static const char* kInputStyle = "background: #1e1e1e; color: #e5e5e5; border: 1px solid #2a2a2a;"
- "font-family: Consolas; font-size: 12px; padding: 4px 6px;";
+namespace fincept::workflow {
-static const char* kLabelStyle = "color: #808080; font-family: Consolas; font-size: 11px; font-weight: bold;";
-} // namespace
+static QString input_style() {
+ return QString("background: %1; color: %2; border: 1px solid %3;"
+ "font-family: Consolas; font-size: 12px; padding: 4px 6px;")
+ .arg(ui::colors::BG_HOVER, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED);
+}
-namespace fincept::workflow {
+static QString label_style() {
+ return QString("color: %1; font-family: Consolas; font-size: 11px; font-weight: bold;")
+ .arg(ui::colors::TEXT_SECONDARY);
+}
QWidget* ParameterWidgetFactory::create(const ParamDef& param, const QJsonValue& current_value,
std::function<void(const QString& key, QJsonValue value)> on_change,
@@ -31,7 +36,7 @@ QWidget* ParameterWidgetFactory::create(const ParamDef& param, const QJsonValue&
// Label
auto* label = new QLabel(param.label + (param.required ? " *" : ""));
- label->setStyleSheet(kLabelStyle);
+ label->setStyleSheet(label_style());
layout->addWidget(label);
QString key = param.key;
@@ -41,7 +46,8 @@ QWidget* ParameterWidgetFactory::create(const ParamDef& param, const QJsonValue&
edit->setText(current_value.toString(param.default_value.toString()));
edit->setPlaceholderText(param.placeholder);
edit->setStyleSheet(
- QString("QLineEdit { %1 } QLineEdit:focus { border: 1px solid #d97706; }").arg(kInputStyle));
+ QString("QLineEdit { %1 } QLineEdit:focus { border: 1px solid %2; }")
+ .arg(input_style(), ui::colors::AMBER));
layout->addWidget(edit);
QObject::connect(edit, &QLineEdit::textChanged, container,
@@ -53,9 +59,9 @@ QWidget* ParameterWidgetFactory::create(const ParamDef& param, const QJsonValue&
spin->setValue(current_value.toDouble(param.default_value.toDouble()));
spin->setStyleSheet(QString("QDoubleSpinBox { %1 }"
"QDoubleSpinBox::up-button, QDoubleSpinBox::down-button {"
- " background: #2a2a2a; border: 1px solid #2a2a2a; width: 14px;"
+ " background: %2; border: 1px solid %2; width: 14px;"
"}")
- .arg(kInputStyle));
+ .arg(input_style(), ui::colors::BORDER_MED));
layout->addWidget(spin);
QObject::connect(spin, &QDoubleSpinBox::valueChanged, container,
@@ -63,11 +69,14 @@ QWidget* ParameterWidgetFactory::create(const ParamDef& param, const QJsonValue&
} else if (param.type == "boolean") {
auto* check = new QCheckBox(param.label);
check->setChecked(current_value.toBool(param.default_value.toBool()));
- check->setStyleSheet("QCheckBox { color: #e5e5e5; font-family: Consolas; font-size: 12px; }"
- "QCheckBox::indicator {"
- " width: 14px; height: 14px; background: #1e1e1e; border: 1px solid #2a2a2a;"
- "}"
- "QCheckBox::indicator:checked { background: #d97706; }");
+ check->setStyleSheet(
+ QString("QCheckBox { color: %1; font-family: Consolas; font-size: 12px; }"
+ "QCheckBox::indicator {"
+ " width: 14px; height: 14px; background: %2; border: 1px solid %3;"
+ "}"
+ "QCheckBox::indicator:checked { background: %4; }")
+ .arg(ui::colors::TEXT_PRIMARY, ui::colors::BG_HOVER,
+ ui::colors::BORDER_MED, ui::colors::AMBER));
layout->addWidget(check);
// Remove the label since checkbox has its own
@@ -81,13 +90,15 @@ QWidget* ParameterWidgetFactory::create(const ParamDef& param, const QJsonValue&
combo->setCurrentText(current_value.toString(param.default_value.toString()));
combo->setStyleSheet(QString("QComboBox { %1 }"
"QComboBox::drop-down {"
- " background: #2a2a2a; border: 1px solid #2a2a2a; width: 18px;"
+ " background: %2; border: 1px solid %2; width: 18px;"
"}"
"QComboBox QAbstractItemView {"
- " background: #1e1e1e; color: #e5e5e5; border: 1px solid #2a2a2a;"
- " selection-background-color: #d97706; font-family: Consolas;"
+ " background: %3; color: %4; border: 1px solid %2;"
+ " selection-background-color: %5; font-family: Consolas;"
"}")
- .arg(kInputStyle));
+ .arg(input_style(), ui::colors::BORDER_MED,
+ ui::colors::BG_HOVER, ui::colors::TEXT_PRIMARY,
+ ui::colors::AMBER));
layout->addWidget(combo);
QObject::connect(combo, &QComboBox::currentTextChanged, container,
@@ -109,8 +120,8 @@ QWidget* ParameterWidgetFactory::create(const ParamDef& param, const QJsonValue&
text_edit->setMinimumHeight(80);
text_edit->setMaximumHeight(200);
text_edit->setStyleSheet(QString("QPlainTextEdit { %1 }"
- "QPlainTextEdit:focus { border: 1px solid #d97706; }")
- .arg(kInputStyle));
+ "QPlainTextEdit:focus { border: 1px solid %2; }")
+ .arg(input_style(), ui::colors::AMBER));
layout->addWidget(text_edit);
QObject::connect(
@@ -140,13 +151,15 @@ QWidget* ParameterWidgetFactory::create(const ParamDef& param, const QJsonValue&
auto* combo = new QComboBox;
combo->setStyleSheet(QString("QComboBox { %1 }"
"QComboBox::drop-down {"
- " background: #2a2a2a; border: 1px solid #2a2a2a; width: 18px;"
+ " background: %2; border: 1px solid %2; width: 18px;"
"}"
"QComboBox QAbstractItemView {"
- " background: #1e1e1e; color: #e5e5e5; border: 1px solid #2a2a2a;"
- " selection-background-color: #d97706; font-family: Consolas;"
+ " background: %3; color: %4; border: 1px solid %2;"
+ " selection-background-color: %5; font-family: Consolas;"
"}")
- .arg(kInputStyle));
+ .arg(input_style(), ui::colors::BORDER_MED,
+ ui::colors::BG_HOVER, ui::colors::TEXT_PRIMARY,
+ ui::colors::AMBER));
// Build file filter string for QFileDialog e.g. "Spreadsheets (*.xlsx *.csv)"
QString dialog_filter;
@@ -192,10 +205,12 @@ QWidget* ParameterWidgetFactory::create(const ParamDef& param, const QJsonValue&
auto* import_btn = new QPushButton("+ Import");
import_btn->setFixedHeight(24);
import_btn->setToolTip("Import a file from your PC into the File Manager");
- import_btn->setStyleSheet("QPushButton { background: #2a2a2a; color: #d97706;"
- " border: 1px solid #3a3a3a; font-family: Consolas;"
- " font-size: 10px; padding: 0 6px; }"
- "QPushButton:hover { background: #3a3a3a; }");
+ import_btn->setStyleSheet(
+ QString("QPushButton { background: %1; color: %2;"
+ " border: 1px solid %3; font-family: Consolas;"
+ " font-size: 10px; padding: 0 6px; }"
+ "QPushButton:hover { background: %3; }")
+ .arg(ui::colors::BORDER_MED, ui::colors::AMBER, ui::colors::TEXT_DIM));
rl->addWidget(import_btn);
layout->addWidget(row);
@@ -204,7 +219,8 @@ QWidget* ParameterWidgetFactory::create(const ParamDef& param, const QJsonValue&
if (!allowed_exts.isEmpty()) {
auto* hint = new QLabel("Accepted: " + allowed_exts.join(", ").toUpper()
+ " • Or pick an already-imported file above");
- hint->setStyleSheet("color: #525252; font-family: Consolas; font-size: 10px;");
+ hint->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 10px;")
+ .arg(ui::colors::TEXT_TERTIARY));
hint->setWordWrap(true);
layout->addWidget(hint);
}
@@ -244,10 +260,12 @@ QWidget* ParameterWidgetFactory::create(const ParamDef& param, const QJsonValue&
auto* combo = new QComboBox;
combo->setStyleSheet(QString("QComboBox { %1 }"
- "QComboBox::drop-down { background:#2a2a2a; border:1px solid #2a2a2a; width:18px; }"
- "QComboBox QAbstractItemView { background:#1e1e1e; color:#e5e5e5;"
- " border:1px solid #2a2a2a; selection-background-color:#7c3aed;"
- " font-family:Consolas; }").arg(kInputStyle));
+ "QComboBox::drop-down { background:%2; border:1px solid %2; width:18px; }"
+ "QComboBox QAbstractItemView { background:%3; color:%4;"
+ " border:1px solid %2; selection-background-color:#7c3aed;"
+ " font-family:Consolas; }")
+ .arg(input_style(), ui::colors::BORDER_MED,
+ ui::colors::BG_HOVER, ui::colors::TEXT_PRIMARY));
// Constrain combo so it never overflows the panel
combo->setMaximumWidth(260);
@@ -297,9 +315,11 @@ QWidget* ParameterWidgetFactory::create(const ParamDef& param, const QJsonValue&
auto* refresh_btn = new QPushButton("↻");
refresh_btn->setFixedSize(24, 24);
refresh_btn->setToolTip("Refresh agent list");
- refresh_btn->setStyleSheet("QPushButton { background:#2a2a2a; color:#7c3aed;"
- " border:1px solid #2a2a2a; font-size:13px; }"
- "QPushButton:hover { background:#3a3a3a; }");
+ refresh_btn->setStyleSheet(
+ QString("QPushButton { background:%1; color:#7c3aed;"
+ " border:1px solid %1; font-size:13px; }"
+ "QPushButton:hover { background:%2; }")
+ .arg(ui::colors::BORDER_MED, ui::colors::TEXT_DIM));
rl->addWidget(refresh_btn);
layout->addWidget(row);
@@ -317,10 +337,12 @@ QWidget* ParameterWidgetFactory::create(const ParamDef& param, const QJsonValue&
combo->setMaximumWidth(260);
combo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
combo->setStyleSheet(QString("QComboBox { %1 }"
- "QComboBox::drop-down { background:#2a2a2a; border:1px solid #2a2a2a; width:18px; }"
- "QComboBox QAbstractItemView { background:#1e1e1e; color:#e5e5e5;"
- " border:1px solid #2a2a2a; selection-background-color:#7c3aed;"
- " font-family:Consolas; }").arg(kInputStyle));
+ "QComboBox::drop-down { background:%2; border:1px solid %2; width:18px; }"
+ "QComboBox QAbstractItemView { background:%3; color:%4;"
+ " border:1px solid %2; selection-background-color:#7c3aed;"
+ " font-family:Consolas; }")
+ .arg(input_style(), ui::colors::BORDER_MED,
+ ui::colors::BG_HOVER, ui::colors::TEXT_PRIMARY));
combo->addItem("— agent default —", QString());
QString saved = current_value.toString();
@@ -336,7 +358,8 @@ QWidget* ParameterWidgetFactory::create(const ParamDef& param, const QJsonValue&
layout->addWidget(combo);
auto* hint = new QLabel("Leave blank to use the LLM assigned to the agent in Agent Config");
- hint->setStyleSheet("color:#525252; font-family:Consolas; font-size:10px;");
+ hint->setStyleSheet(QString("color:%1; font-family:Consolas; font-size:10px;")
+ .arg(ui::colors::TEXT_TERTIARY));
hint->setWordWrap(true);
layout->addWidget(hint);
@@ -357,10 +380,12 @@ QWidget* ParameterWidgetFactory::create(const ParamDef& param, const QJsonValue&
combo->setMaximumWidth(260);
combo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
combo->setStyleSheet(QString("QComboBox { %1 }"
- "QComboBox::drop-down { background:#2a2a2a; border:1px solid #2a2a2a; width:18px; }"
- "QComboBox QAbstractItemView { background:#1e1e1e; color:#e5e5e5;"
- " border:1px solid #2a2a2a; selection-background-color:#6366f1;"
- " font-family:Consolas; }").arg(kInputStyle));
+ "QComboBox::drop-down { background:%2; border:1px solid %2; width:18px; }"
+ "QComboBox QAbstractItemView { background:%3; color:%4;"
+ " border:1px solid %2; selection-background-color:#6366f1;"
+ " font-family:Consolas; }")
+ .arg(input_style(), ui::colors::BORDER_MED,
+ ui::colors::BG_HOVER, ui::colors::TEXT_PRIMARY));
auto populate_tools = [combo, current_value]() {
QString saved = combo->count() > 0 ? combo->currentData().toString()
@@ -379,7 +404,7 @@ QWidget* ParameterWidgetFactory::create(const ParamDef& param, const QJsonValue&
if (model) {
auto* sep = model->item(combo->count() - 1);
sep->setFlags(sep->flags() & ~Qt::ItemIsEnabled);
- sep->setData(QColor("#525252"), Qt::ForegroundRole);
+ sep->setData(QColor(ui::colors::TEXT_TERTIARY.get()), Qt::ForegroundRole);
}
last_server = t.server_name;
}
@@ -403,14 +428,17 @@ QWidget* ParameterWidgetFactory::create(const ParamDef& param, const QJsonValue&
auto* refresh_btn = new QPushButton("↻");
refresh_btn->setFixedSize(24, 24);
refresh_btn->setToolTip("Refresh tool list");
- refresh_btn->setStyleSheet("QPushButton { background:#2a2a2a; color:#6366f1;"
- " border:1px solid #2a2a2a; font-size:13px; }"
- "QPushButton:hover { background:#3a3a3a; }");
+ refresh_btn->setStyleSheet(
+ QString("QPushButton { background:%1; color:#6366f1;"
+ " border:1px solid %1; font-size:13px; }"
+ "QPushButton:hover { background:%2; }")
+ .arg(ui::colors::BORDER_MED, ui::colors::TEXT_DIM));
rl->addWidget(refresh_btn);
layout->addWidget(row);
auto* hint = new QLabel("All Fincept internal tools. Input JSON flows in as arguments.");
- hint->setStyleSheet("color:#525252; font-family:Consolas; font-size:10px;");
+ hint->setStyleSheet(QString("color:%1; font-family:Consolas; font-size:10px;")
+ .arg(ui::colors::TEXT_TERTIARY));
hint->setWordWrap(true);
layout->addWidget(hint);
diff --git a/fincept-qt/src/screens/node_editor/toolbar/DeployDialog.cpp b/fincept-qt/src/screens/node_editor/toolbar/DeployDialog.cpp
index e5be7b8c7..4d00d40f5 100644
--- a/fincept-qt/src/screens/node_editor/toolbar/DeployDialog.cpp
+++ b/fincept-qt/src/screens/node_editor/toolbar/DeployDialog.cpp
@@ -1,5 +1,7 @@
#include "screens/node_editor/toolbar/DeployDialog.h"
+#include "ui/theme/Theme.h"
+
#include <QFrame>
#include <QHBoxLayout>
#include <QLabel>
@@ -8,13 +10,16 @@
namespace fincept::workflow {
-static const char* kDeployInputStyle = "background: #1e1e1e; color: #e5e5e5; border: 1px solid #2a2a2a;"
- "font-family: Consolas; font-size: 12px; padding: 6px 8px;";
+static QString deploy_input_style() {
+ return QString("background: %1; color: %2; border: 1px solid %3;"
+ "font-family: Consolas; font-size: 12px; padding: 6px 8px;")
+ .arg(ui::colors::BG_HOVER, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED);
+}
DeployDialog::DeployDialog(const QString& current_name, QWidget* parent) : QDialog(parent) {
setWindowTitle("Deploy Workflow");
setFixedSize(420, 320);
- setStyleSheet("QDialog { background: #141414; }");
+ setStyleSheet(QString("QDialog { background: %1; }").arg(ui::colors::BG_SURFACE));
build_ui(current_name);
}
@@ -32,36 +37,41 @@ void DeployDialog::build_ui(const QString& current_name) {
// ── Title ──────────────────────────────────────────────────────
auto* title = new QLabel("DEPLOY WORKFLOW");
- title->setStyleSheet("color: #d97706; font-family: Consolas; font-size: 14px;"
- "font-weight: bold; letter-spacing: 0.5px;");
+ title->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 14px;"
+ "font-weight: bold; letter-spacing: 0.5px;")
+ .arg(ui::colors::AMBER));
root->addWidget(title);
// ── Separator ──────────────────────────────────────────────────
auto* sep = new QFrame;
sep->setFixedHeight(1);
- sep->setStyleSheet("background: #2a2a2a; border: none;");
+ sep->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BORDER_MED));
root->addWidget(sep);
// ── Name ───────────────────────────────────────────────────────
auto* name_label = new QLabel("WORKFLOW NAME");
- name_label->setStyleSheet("color: #808080; font-family: Consolas; font-size: 11px; font-weight: bold;");
+ name_label->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 11px; font-weight: bold;")
+ .arg(ui::colors::TEXT_SECONDARY));
root->addWidget(name_label);
name_edit_ = new QLineEdit(current_name);
name_edit_->setStyleSheet(
- QString("QLineEdit { %1 } QLineEdit:focus { border: 1px solid #d97706; }").arg(kDeployInputStyle));
+ QString("QLineEdit { %1 } QLineEdit:focus { border: 1px solid %2; }")
+ .arg(deploy_input_style(), ui::colors::AMBER));
root->addWidget(name_edit_);
// ── Description ────────────────────────────────────────────────
auto* desc_label = new QLabel("DESCRIPTION");
- desc_label->setStyleSheet("color: #808080; font-family: Consolas; font-size: 11px; font-weight: bold;");
+ desc_label->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 11px; font-weight: bold;")
+ .arg(ui::colors::TEXT_SECONDARY));
root->addWidget(desc_label);
desc_edit_ = new QPlainTextEdit;
desc_edit_->setPlaceholderText("Describe what this workflow does...");
desc_edit_->setMaximumHeight(80);
desc_edit_->setStyleSheet(
- QString("QPlainTextEdit { %1 } QPlainTextEdit:focus { border: 1px solid #d97706; }").arg(kDeployInputStyle));
+ QString("QPlainTextEdit { %1 } QPlainTextEdit:focus { border: 1px solid %2; }")
+ .arg(deploy_input_style(), ui::colors::AMBER));
root->addWidget(desc_edit_);
root->addStretch();
@@ -72,11 +82,15 @@ void DeployDialog::build_ui(const QString& current_name) {
auto* cancel_btn = new QPushButton("CANCEL");
cancel_btn->setFixedHeight(28);
- cancel_btn->setStyleSheet("QPushButton {"
- " background: #1e1e1e; color: #808080; border: 1px solid #2a2a2a;"
- " font-family: Consolas; font-size: 11px; font-weight: bold; padding: 0 16px;"
- "}"
- "QPushButton:hover { color: #e5e5e5; background: #252525; }");
+ cancel_btn->setStyleSheet(
+ QString("QPushButton {"
+ " background: %1; color: %2; border: 1px solid %3;"
+ " font-family: Consolas; font-size: 11px; font-weight: bold; padding: 0 16px;"
+ "}"
+ "QPushButton:hover { color: %4; background: %5; }")
+ .arg(ui::colors::BG_HOVER, ui::colors::TEXT_SECONDARY,
+ ui::colors::BORDER_MED, ui::colors::TEXT_PRIMARY,
+ ui::colors::BG_HOVER));
connect(cancel_btn, &QPushButton::clicked, this, &QDialog::reject);
btn_row->addWidget(cancel_btn);
@@ -84,11 +98,14 @@ void DeployDialog::build_ui(const QString& current_name) {
auto* draft_btn = new QPushButton("SAVE DRAFT");
draft_btn->setFixedHeight(28);
- draft_btn->setStyleSheet("QPushButton {"
- " background: #1e1e1e; color: #e5e5e5; border: 1px solid #2a2a2a;"
- " font-family: Consolas; font-size: 11px; font-weight: bold; padding: 0 16px;"
- "}"
- "QPushButton:hover { background: #252525; }");
+ draft_btn->setStyleSheet(
+ QString("QPushButton {"
+ " background: %1; color: %2; border: 1px solid %3;"
+ " font-family: Consolas; font-size: 11px; font-weight: bold; padding: 0 16px;"
+ "}"
+ "QPushButton:hover { background: %4; }")
+ .arg(ui::colors::BG_HOVER, ui::colors::TEXT_PRIMARY,
+ ui::colors::BORDER_MED, ui::colors::BG_HOVER));
connect(draft_btn, &QPushButton::clicked, this, [this]() {
deploy_ = false;
accept();
@@ -97,12 +114,15 @@ void DeployDialog::build_ui(const QString& current_name) {
auto* deploy_btn = new QPushButton("DEPLOY");
deploy_btn->setFixedHeight(28);
- deploy_btn->setStyleSheet("QPushButton {"
- " background: rgba(217,119,6,0.1); color: #d97706;"
- " border: 1px solid #78350f; font-family: Consolas;"
- " font-size: 11px; font-weight: bold; padding: 0 16px;"
- "}"
- "QPushButton:hover { background: #d97706; color: #080808; }");
+ deploy_btn->setStyleSheet(
+ QString("QPushButton {"
+ " background: %1; color: %2;"
+ " border: 1px solid %3; font-family: Consolas;"
+ " font-size: 11px; font-weight: bold; padding: 0 16px;"
+ "}"
+ "QPushButton:hover { background: %2; color: %4; }")
+ .arg(ui::colors::ACCENT_BG, ui::colors::AMBER,
+ ui::colors::AMBER_DIM, ui::colors::BG_BASE));
connect(deploy_btn, &QPushButton::clicked, this, [this]() {
deploy_ = true;
accept();
diff --git a/fincept-qt/src/screens/node_editor/toolbar/NodeEditorToolbar.cpp b/fincept-qt/src/screens/node_editor/toolbar/NodeEditorToolbar.cpp
index 01ca0c2ac..ac7573846 100644
--- a/fincept-qt/src/screens/node_editor/toolbar/NodeEditorToolbar.cpp
+++ b/fincept-qt/src/screens/node_editor/toolbar/NodeEditorToolbar.cpp
@@ -1,29 +1,36 @@
#include "screens/node_editor/toolbar/NodeEditorToolbar.h"
+#include "ui/theme/Theme.h"
+
#include <QFrame>
#include <QHBoxLayout>
#include <QLabel>
-namespace {
-
-static const char* kBtnStyle = "QPushButton {"
- " background: #1e1e1e; color: #808080; border: 1px solid #2a2a2a;"
- " font-family: Consolas; font-size: 11px; font-weight: bold;"
- " padding: 0 10px; min-height: 22px;"
- "}"
- "QPushButton:hover { color: #e5e5e5; background: #252525; }"
- "QPushButton:disabled { color: #4a4a4a; }";
-
-static const char* kAccentBtnStyle = "QPushButton {"
- " background: rgba(217,119,6,0.1); color: #d97706;"
- " border: 1px solid #78350f; font-family: Consolas;"
- " font-size: 11px; font-weight: bold; padding: 0 12px; min-height: 22px;"
- "}"
- "QPushButton:hover { background: #d97706; color: #080808; }";
+namespace fincept::workflow {
-} // namespace
+static QString btn_style() {
+ return QString("QPushButton {"
+ " background: %1; color: %2; border: 1px solid %3;"
+ " font-family: Consolas; font-size: 11px; font-weight: bold;"
+ " padding: 0 10px; min-height: 22px;"
+ "}"
+ "QPushButton:hover { color: %4; background: %5; }"
+ "QPushButton:disabled { color: %6; }")
+ .arg(ui::colors::BG_HOVER, ui::colors::TEXT_SECONDARY,
+ ui::colors::BORDER_MED, ui::colors::TEXT_PRIMARY,
+ ui::colors::BG_HOVER, ui::colors::TEXT_DIM);
+}
-namespace fincept::workflow {
+static QString accent_btn_style() {
+ return QString("QPushButton {"
+ " background: %1; color: %2;"
+ " border: 1px solid %3; font-family: Consolas;"
+ " font-size: 11px; font-weight: bold; padding: 0 12px; min-height: 22px;"
+ "}"
+ "QPushButton:hover { background: %2; color: %4; }")
+ .arg(ui::colors::ACCENT_BG, ui::colors::AMBER,
+ ui::colors::AMBER_DIM, ui::colors::BG_BASE);
+}
NodeEditorToolbar::NodeEditorToolbar(QWidget* parent) : QWidget(parent) {
setFixedHeight(34);
@@ -47,26 +54,20 @@ void NodeEditorToolbar::set_can_redo(bool can) {
}
void NodeEditorToolbar::set_executing(bool running) {
- static const char* kStopStyle = "QPushButton {"
- " background: rgba(220,38,38,0.15); color: #dc2626;"
- " border: 1px solid rgba(220,38,38,0.4); font-family: Consolas;"
- " font-size: 11px; font-weight: bold; padding: 0 12px; min-height: 22px;"
- "}"
- "QPushButton:hover { background: #dc2626; color: #e5e5e5; }";
-
- static const char* kExecStyle = "QPushButton {"
- " background: rgba(217,119,6,0.1); color: #d97706;"
- " border: 1px solid #78350f; font-family: Consolas;"
- " font-size: 11px; font-weight: bold; padding: 0 12px; min-height: 22px;"
- "}"
- "QPushButton:hover { background: #d97706; color: #080808; }";
+ QString stop_style = QString("QPushButton {"
+ " background: %1; color: %2;"
+ " border: 1px solid rgba(220,38,38,0.4); font-family: Consolas;"
+ " font-size: 11px; font-weight: bold; padding: 0 12px; min-height: 22px;"
+ "}"
+ "QPushButton:hover { background: %2; color: %3; }")
+ .arg(ui::colors::NEGATIVE_BG, ui::colors::NEGATIVE, ui::colors::TEXT_PRIMARY);
execute_btn_->setText(running ? "STOP" : "EXECUTE");
- execute_btn_->setStyleSheet(running ? kStopStyle : kExecStyle);
+ execute_btn_->setStyleSheet(running ? stop_style : accent_btn_style());
}
void NodeEditorToolbar::build_ui() {
- setStyleSheet("background: #1e1e1e;");
+ setStyleSheet(QString("background: %1;").arg(ui::colors::BG_HOVER));
auto* layout = new QHBoxLayout(this);
layout->setContentsMargins(10, 0, 10, 0);
@@ -75,34 +76,37 @@ void NodeEditorToolbar::build_ui() {
// ── Workflow name ──────────────────────────────────────────────
name_edit_ = new QLineEdit("Untitled Workflow");
name_edit_->setFixedWidth(200);
- name_edit_->setStyleSheet("QLineEdit {"
- " background: transparent; color: #e5e5e5; border: none;"
- " border-bottom: 1px solid #4a4a4a; font-family: Consolas;"
- " font-size: 13px; font-weight: bold; padding: 2px 4px;"
- "}"
- "QLineEdit:focus { border-bottom: 1px solid #d97706; }");
+ name_edit_->setStyleSheet(
+ QString("QLineEdit {"
+ " background: transparent; color: %1; border: none;"
+ " border-bottom: 1px solid %2; font-family: Consolas;"
+ " font-size: 13px; font-weight: bold; padding: 2px 4px;"
+ "}"
+ "QLineEdit:focus { border-bottom: 1px solid %3; }")
+ .arg(ui::colors::TEXT_PRIMARY, ui::colors::TEXT_DIM, ui::colors::AMBER));
layout->addWidget(name_edit_);
connect(name_edit_, &QLineEdit::textChanged, this, &NodeEditorToolbar::name_changed);
// ── Status badge ───────────────────────────────────────────────
auto* status = new QLabel("DRAFT");
- status->setStyleSheet("color: #525252; font-family: Consolas; font-size: 10px;"
- "font-weight: bold; letter-spacing: 0.5px; padding: 0 6px;");
+ status->setStyleSheet(QString("color: %1; font-family: Consolas; font-size: 10px;"
+ "font-weight: bold; letter-spacing: 0.5px; padding: 0 6px;")
+ .arg(ui::colors::TEXT_TERTIARY));
layout->addWidget(status);
layout->addStretch();
// ── Undo / Redo ────────────────────────────────────────────────
undo_btn_ = new QPushButton("UNDO");
- undo_btn_->setStyleSheet(kBtnStyle);
+ undo_btn_->setStyleSheet(btn_style());
undo_btn_->setEnabled(false);
undo_btn_->setToolTip("Undo last action (Ctrl+Z)");
layout->addWidget(undo_btn_);
connect(undo_btn_, &QPushButton::clicked, this, &NodeEditorToolbar::undo_clicked);
redo_btn_ = new QPushButton("REDO");
- redo_btn_->setStyleSheet(kBtnStyle);
+ redo_btn_->setStyleSheet(btn_style());
redo_btn_->setEnabled(false);
redo_btn_->setToolTip("Redo last action (Ctrl+Y)");
layout->addWidget(redo_btn_);
@@ -111,71 +115,71 @@ void NodeEditorToolbar::build_ui() {
// ── Separator ──────────────────────────────────────────────────
auto* sep1 = new QFrame;
sep1->setFixedSize(1, 18);
- sep1->setStyleSheet("background: #4a4a4a; border: none;");
+ sep1->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::TEXT_DIM));
layout->addWidget(sep1);
// ── Save / Load / Clear ────────────────────────────────────────
auto* save_btn = new QPushButton("SAVE");
- save_btn->setStyleSheet(kBtnStyle);
+ save_btn->setStyleSheet(btn_style());
save_btn->setToolTip("Save workflow to database");
layout->addWidget(save_btn);
connect(save_btn, &QPushButton::clicked, this, &NodeEditorToolbar::save_clicked);
auto* load_btn = new QPushButton("LOAD");
- load_btn->setStyleSheet(kBtnStyle);
+ load_btn->setStyleSheet(btn_style());
load_btn->setToolTip("Load a saved workflow");
layout->addWidget(load_btn);
connect(load_btn, &QPushButton::clicked, this, &NodeEditorToolbar::load_clicked);
auto* clear_btn = new QPushButton("CLEAR");
- clear_btn->setStyleSheet(kBtnStyle);
+ clear_btn->setStyleSheet(btn_style());
layout->addWidget(clear_btn);
connect(clear_btn, &QPushButton::clicked, this, &NodeEditorToolbar::clear_clicked);
// ── Separator ──────────────────────────────────────────────────
auto* sep2 = new QFrame;
sep2->setFixedSize(1, 18);
- sep2->setStyleSheet("background: #4a4a4a; border: none;");
+ sep2->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::TEXT_DIM));
layout->addWidget(sep2);
// ── Import / Export ────────────────────────────────────────────
auto* import_btn = new QPushButton("IMPORT");
- import_btn->setStyleSheet(kBtnStyle);
+ import_btn->setStyleSheet(btn_style());
layout->addWidget(import_btn);
connect(import_btn, &QPushButton::clicked, this, &NodeEditorToolbar::import_clicked);
auto* export_btn = new QPushButton("EXPORT");
- export_btn->setStyleSheet(kBtnStyle);
+ export_btn->setStyleSheet(btn_style());
layout->addWidget(export_btn);
connect(export_btn, &QPushButton::clicked, this, &NodeEditorToolbar::export_clicked);
// ── Separator ──────────────────────────────────────────────────
auto* sep3 = new QFrame;
sep3->setFixedSize(1, 18);
- sep3->setStyleSheet("background: #4a4a4a; border: none;");
+ sep3->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::TEXT_DIM));
layout->addWidget(sep3);
// ── Templates ──────────────────────────────────────────────────
auto* templates_btn = new QPushButton("TEMPLATES");
- templates_btn->setStyleSheet(kBtnStyle);
+ templates_btn->setStyleSheet(btn_style());
layout->addWidget(templates_btn);
connect(templates_btn, &QPushButton::clicked, this, &NodeEditorToolbar::templates_clicked);
// ── Deploy ─────────────────────────────────────────────────────
auto* deploy_btn = new QPushButton("DEPLOY");
- deploy_btn->setStyleSheet(kBtnStyle);
+ deploy_btn->setStyleSheet(btn_style());
layout->addWidget(deploy_btn);
connect(deploy_btn, &QPushButton::clicked, this, &NodeEditorToolbar::deploy_clicked);
// ── Separator ──────────────────────────────────────────────────
auto* sep4 = new QFrame;
sep4->setFixedSize(1, 18);
- sep4->setStyleSheet("background: #4a4a4a; border: none;");
+ sep4->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::TEXT_DIM));
layout->addWidget(sep4);
// ── Execute ────────────────────────────────────────────────────
execute_btn_ = new QPushButton("EXECUTE");
- execute_btn_->setStyleSheet(kAccentBtnStyle);
+ execute_btn_->setStyleSheet(accent_btn_style());
layout->addWidget(execute_btn_);
connect(execute_btn_, &QPushButton::clicked, this, &NodeEditorToolbar::execute_clicked);
}
diff --git a/fincept-qt/src/screens/notes/NotesScreen.cpp b/fincept-qt/src/screens/notes/NotesScreen.cpp
index 3cfcd72f8..537b68b2e 100644
--- a/fincept-qt/src/screens/notes/NotesScreen.cpp
+++ b/fincept-qt/src/screens/notes/NotesScreen.cpp
@@ -1,6 +1,7 @@
#include "screens/notes/NotesScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "services/file_manager/FileManagerService.h"
#include "ui/theme/Theme.h"
@@ -24,52 +25,75 @@ using namespace fincept::ui::colors;
// ── Style constants (Obsidian Design System) ────────────────────────────────
// §5.2 — List items: 26px row, alternating bg, hairline borders
-static const QString kListItem =
- "QListWidget { background: %1; border: none; font-family: 'Consolas','Courier New',monospace; font-size: 12px; }"
- "QListWidget::item { padding: 6px 12px; color: #e5e5e5; border-bottom: 1px solid %2; height: 26px; }"
- "QListWidget::item:selected { background: #161616; color: #e5e5e5; }"
- "QListWidget::item:hover { background: #161616; }";
-
-// §5.6 — Input fields: #0a0a0a bg, focus → #333333
-static const QString kInput =
- "QLineEdit { background: #0a0a0a; color: #e5e5e5; border: 1px solid #1a1a1a; "
- "padding: 3px 6px; font-size: 13px; font-family: 'Consolas','Courier New',monospace; height: 28px; }"
- "QLineEdit:focus { border-color: #333333; }"
- "QLineEdit::selection { background: #d97706; color: #080808; }";
+static QString kListItem() {
+ return QString(
+ "QListWidget { background: %1; border: none; font-family: 'Consolas','Courier New',monospace; font-size: 12px; }"
+ "QListWidget::item { padding: 6px 12px; color: %3; border-bottom: 1px solid %2; height: 26px; }"
+ "QListWidget::item:selected { background: %4; color: %3; }"
+ "QListWidget::item:hover { background: %4; }")
+ .arg(BG_SURFACE(), BORDER_DIM(), TEXT_PRIMARY(), BG_HOVER());
+}
+
+// §5.6 — Input fields
+static QString kInput() {
+ return QString(
+ "QLineEdit { background: %1; color: %2; border: 1px solid %3; "
+ "padding: 3px 6px; font-size: 13px; font-family: 'Consolas','Courier New',monospace; height: 28px; }"
+ "QLineEdit:focus { border-color: %4; }"
+ "QLineEdit::selection { background: %5; color: %6; }")
+ .arg(BG_BASE(), TEXT_PRIMARY(), BORDER_DIM(), BORDER_BRIGHT(), AMBER(), BG_BASE());
+}
// §5.6 — Combo: same input style
-static const QString kCombo = "QComboBox { background: #0a0a0a; color: #e5e5e5; border: 1px solid #1a1a1a; "
- "padding: 3px 6px; font-size: 12px; font-family: 'Consolas','Courier New',monospace; }"
- "QComboBox:focus { border-color: #333333; }"
- "QComboBox QAbstractItemView { background: #0a0a0a; color: #e5e5e5; "
- "selection-background-color: #1a1a1a; border: 1px solid #1a1a1a; }";
+static QString kCombo() {
+ return QString(
+ "QComboBox { background: %1; color: %2; border: 1px solid %3; "
+ "padding: 3px 6px; font-size: 12px; font-family: 'Consolas','Courier New',monospace; }"
+ "QComboBox:focus { border-color: %4; }"
+ "QComboBox QAbstractItemView { background: %1; color: %2; "
+ "selection-background-color: %3; border: 1px solid %3; }")
+ .arg(BG_BASE(), TEXT_PRIMARY(), BORDER_DIM(), BORDER_BRIGHT());
+}
// §5.6 — Text editor: same as input
-static const QString kTextEdit = "QTextEdit { background: #0a0a0a; color: #e5e5e5; border: 1px solid #1a1a1a; "
- "padding: 6px; font-size: 14px; font-family: 'Consolas','Courier New',monospace; }"
- "QTextEdit:focus { border-color: #333333; }"
- "QTextEdit::selection { background: #d97706; color: #080808; }";
+static QString kTextEdit() {
+ return QString(
+ "QTextEdit { background: %1; color: %2; border: 1px solid %3; "
+ "padding: 6px; font-size: 14px; font-family: 'Consolas','Courier New',monospace; }"
+ "QTextEdit:focus { border-color: %4; }"
+ "QTextEdit::selection { background: %5; color: %6; }")
+ .arg(BG_BASE(), TEXT_PRIMARY(), BORDER_DIM(), BORDER_BRIGHT(), AMBER(), BG_BASE());
+}
// §5.5 — Accent button (amber): rgba bg + amber text + amber_dim border
-static const QString kActionBtn =
- "QPushButton { background: rgba(217,119,6,0.1); color: #d97706; "
- "border: 1px solid #78350f; padding: 0 12px; height: 24px; "
- "font-size: 12px; font-weight: 700; font-family: 'Consolas','Courier New',monospace; }"
- "QPushButton:hover { background: #d97706; color: #080808; }";
-
-// §5.5 — Standard button: #111111 bg + #808080 text
-static const QString kSecondaryBtn =
- "QPushButton { background: #111111; color: #808080; border: 1px solid #1a1a1a; "
- "padding: 0 10px; height: 24px; "
- "font-size: 11px; font-weight: 700; font-family: 'Consolas','Courier New',monospace; }"
- "QPushButton:hover { color: #e5e5e5; background: #161616; }";
+static QString kActionBtn() {
+ return QString(
+ "QPushButton { background: rgba(217,119,6,0.1); color: %1; "
+ "border: 1px solid %2; padding: 0 12px; height: 24px; "
+ "font-size: 12px; font-weight: 700; font-family: 'Consolas','Courier New',monospace; }"
+ "QPushButton:hover { background: %1; color: %3; }")
+ .arg(AMBER(), AMBER_DIM(), BG_BASE());
+}
+
+// §5.5 — Standard button
+static QString kSecondaryBtn() {
+ return QString(
+ "QPushButton { background: %1; color: %2; border: 1px solid %3; "
+ "padding: 0 10px; height: 24px; "
+ "font-size: 11px; font-weight: 700; font-family: 'Consolas','Courier New',monospace; }"
+ "QPushButton:hover { color: %4; background: %5; }")
+ .arg(BG_RAISED(), TEXT_SECONDARY(), BORDER_DIM(), TEXT_PRIMARY(), BG_HOVER());
+}
// §5.5 — Danger button (red): rgba bg + red text + dark red border
-static const QString kDangerBtn =
- "QPushButton { background: rgba(220,38,38,0.1); color: #dc2626; "
- "border: 1px solid #7f1d1d; padding: 0 10px; height: 24px; "
- "font-size: 11px; font-weight: 700; font-family: 'Consolas','Courier New',monospace; }"
- "QPushButton:hover { background: #dc2626; color: #e5e5e5; }";
+static QString kDangerBtn() {
+ return QString(
+ "QPushButton { background: rgba(220,38,38,0.1); color: %1; "
+ "border: 1px solid #7f1d1d; padding: 0 10px; height: 24px; "
+ "font-size: 11px; font-weight: 700; font-family: 'Consolas','Courier New',monospace; }"
+ "QPushButton:hover { background: %1; color: %2; }")
+ .arg(NEGATIVE(), TEXT_PRIMARY());
+}
// ── Categories ───────────────────────────────────────────────────────────────
@@ -89,18 +113,18 @@ static const QStringList kSentiments = {"BULLISH", "BEARISH", "NEUTRAL"};
static QString priority_color(const QString& p) {
if (p == "HIGH")
- return "#dc2626";
+ return NEGATIVE();
if (p == "MEDIUM")
- return "#ca8a04";
- return "#16a34a";
+ return WARNING();
+ return POSITIVE();
}
static QString sentiment_color(const QString& s) {
if (s == "BULLISH")
- return "#16a34a";
+ return POSITIVE();
if (s == "BEARISH")
- return "#dc2626";
- return "#ca8a04";
+ return NEGATIVE();
+ return WARNING();
}
// ── Constructor ──────────────────────────────────────────────────────────────
@@ -117,7 +141,7 @@ void NotesScreen::build_ui() {
root->setSpacing(0);
auto* splitter = new QSplitter(Qt::Horizontal);
- splitter->setStyleSheet("QSplitter::handle { background: #1a1a1a; width: 1px; }");
+ splitter->setStyleSheet(QString("QSplitter::handle { background: %1; width: 1px; }").arg(BORDER_DIM()));
splitter->addWidget(build_category_sidebar());
splitter->addWidget(build_notes_list_panel());
@@ -150,7 +174,7 @@ QWidget* NotesScreen::build_category_sidebar() {
// Category list
category_list_ = new QListWidget;
- category_list_->setStyleSheet(kListItem.arg(BG_SURFACE, BORDER_DIM));
+ category_list_->setStyleSheet(kListItem());
for (const auto& cat : kCategories) {
category_list_->addItem(cat.label);
}
@@ -191,14 +215,14 @@ QWidget* NotesScreen::build_notes_list_panel() {
search_input_ = new QLineEdit;
search_input_->setPlaceholderText("Search notes...");
- search_input_->setStyleSheet(kInput);
+ search_input_->setStyleSheet(kInput());
search_input_->setFixedHeight(28);
connect(search_input_, &QLineEdit::textChanged, this, &NotesScreen::on_search_changed);
tl->addWidget(search_input_);
auto* new_btn = new QPushButton("+ NEW");
new_btn->setFixedSize(70, 24);
- new_btn->setStyleSheet(kActionBtn);
+ new_btn->setStyleSheet(kActionBtn());
connect(new_btn, &QPushButton::clicked, this, &NotesScreen::on_new_note);
tl->addWidget(new_btn);
@@ -206,7 +230,7 @@ QWidget* NotesScreen::build_notes_list_panel() {
// Notes list
notes_list_ = new QListWidget;
- notes_list_->setStyleSheet(kListItem.arg(BG_SURFACE, BORDER_DIM));
+ notes_list_->setStyleSheet(kListItem());
connect(notes_list_, &QListWidget::currentRowChanged, this, &NotesScreen::on_note_selected);
lay->addWidget(notes_list_);
@@ -248,22 +272,22 @@ QWidget* NotesScreen::build_editor_panel() {
// View toolbar
auto* view_toolbar = new QHBoxLayout;
auto* edit_btn = new QPushButton("EDIT");
- edit_btn->setStyleSheet(kSecondaryBtn);
+ edit_btn->setStyleSheet(kSecondaryBtn());
connect(edit_btn, &QPushButton::clicked, this, &NotesScreen::enter_edit_mode);
view_toolbar->addWidget(edit_btn);
auto* fav_btn = new QPushButton("FAV");
- fav_btn->setStyleSheet(kSecondaryBtn);
+ fav_btn->setStyleSheet(kSecondaryBtn());
connect(fav_btn, &QPushButton::clicked, this, &NotesScreen::on_toggle_favorite);
view_toolbar->addWidget(fav_btn);
auto* archive_btn = new QPushButton("ARCHIVE");
- archive_btn->setStyleSheet(kSecondaryBtn);
+ archive_btn->setStyleSheet(kSecondaryBtn());
connect(archive_btn, &QPushButton::clicked, this, &NotesScreen::on_toggle_archive);
view_toolbar->addWidget(archive_btn);
auto* del_btn = new QPushButton("DELETE");
- del_btn->setStyleSheet(kDangerBtn);
+ del_btn->setStyleSheet(kDangerBtn());
connect(del_btn, &QPushButton::clicked, this, &NotesScreen::on_delete_note);
view_toolbar->addWidget(del_btn);
@@ -314,12 +338,12 @@ QWidget* NotesScreen::build_editor_panel() {
// Save/Cancel bar
auto* edit_toolbar = new QHBoxLayout;
auto* save_btn = new QPushButton("SAVE");
- save_btn->setStyleSheet(kActionBtn);
+ save_btn->setStyleSheet(kActionBtn());
connect(save_btn, &QPushButton::clicked, this, &NotesScreen::on_save_note);
edit_toolbar->addWidget(save_btn);
auto* cancel_btn = new QPushButton("CANCEL");
- cancel_btn->setStyleSheet(kSecondaryBtn);
+ cancel_btn->setStyleSheet(kSecondaryBtn());
connect(cancel_btn, &QPushButton::clicked, this, [this]() {
if (selected_note_id_ > 0) {
enter_view_mode();
@@ -331,7 +355,7 @@ QWidget* NotesScreen::build_editor_panel() {
edit_toolbar->addWidget(cancel_btn);
auto* export_btn = new QPushButton("EXPORT");
- export_btn->setStyleSheet(kSecondaryBtn);
+ export_btn->setStyleSheet(kSecondaryBtn());
export_btn->setToolTip("Export this note as a Markdown file to the File Manager");
connect(export_btn, &QPushButton::clicked, this, &NotesScreen::on_export_note);
edit_toolbar->addWidget(export_btn);
@@ -342,7 +366,7 @@ QWidget* NotesScreen::build_editor_panel() {
// Title
edit_title_ = new QLineEdit;
edit_title_->setPlaceholderText("Note title...");
- edit_title_->setStyleSheet(kInput + " QLineEdit { font-size: 16px; font-weight: 700; }");
+ edit_title_->setStyleSheet(kInput() + " QLineEdit { font-size: 16px; font-weight: 700; }");
edit_title_->setFixedHeight(28);
edl->addWidget(edit_title_);
@@ -359,14 +383,14 @@ QWidget* NotesScreen::build_editor_panel() {
meta_row->addWidget(make_label("CAT:"));
edit_category_ = new QComboBox;
- edit_category_->setStyleSheet(kCombo);
+ edit_category_->setStyleSheet(kCombo());
for (int i = 1; i < kCategories.size(); ++i) // skip "ALL"
edit_category_->addItem(kCategories[i].label, kCategories[i].id);
meta_row->addWidget(edit_category_);
meta_row->addWidget(make_label("PRI:"));
edit_priority_ = new QComboBox;
- edit_priority_->setStyleSheet(kCombo);
+ edit_priority_->setStyleSheet(kCombo());
for (const auto& p : kPriorities)
edit_priority_->addItem(p);
edit_priority_->setCurrentText("MEDIUM");
@@ -374,7 +398,7 @@ QWidget* NotesScreen::build_editor_panel() {
meta_row->addWidget(make_label("SENT:"));
edit_sentiment_ = new QComboBox;
- edit_sentiment_->setStyleSheet(kCombo);
+ edit_sentiment_->setStyleSheet(kCombo());
for (const auto& s : kSentiments)
edit_sentiment_->addItem(s);
edit_sentiment_->setCurrentText("NEUTRAL");
@@ -389,19 +413,19 @@ QWidget* NotesScreen::build_editor_panel() {
tag_row->addWidget(make_label("TAGS:"));
edit_tags_ = new QLineEdit;
edit_tags_->setPlaceholderText("tag1, tag2, ...");
- edit_tags_->setStyleSheet(kInput);
+ edit_tags_->setStyleSheet(kInput());
tag_row->addWidget(edit_tags_);
tag_row->addWidget(make_label("TICKERS:"));
edit_tickers_ = new QLineEdit;
edit_tickers_->setPlaceholderText("AAPL, MSFT, ...");
- edit_tickers_->setStyleSheet(kInput);
+ edit_tickers_->setStyleSheet(kInput());
tag_row->addWidget(edit_tickers_);
edl->addLayout(tag_row);
// Content editor
edit_content_ = new QTextEdit;
- edit_content_->setStyleSheet(kTextEdit);
+ edit_content_->setStyleSheet(kTextEdit());
edit_content_->setPlaceholderText("Write your note here...");
edl->addWidget(edit_content_, 1);
@@ -477,6 +501,7 @@ void NotesScreen::on_category_selected(int row) {
update_notes_list();
right_stack_->setCurrentIndex(0);
selected_note_id_ = -1;
+ ScreenStateManager::instance().notify_changed(this);
}
void NotesScreen::on_note_selected(int row) {
@@ -486,6 +511,7 @@ void NotesScreen::on_note_selected(int row) {
selected_note_id_ = note.id;
show_note(note);
enter_view_mode();
+ ScreenStateManager::instance().notify_changed(this);
}
void NotesScreen::on_new_note() {
@@ -684,4 +710,36 @@ void NotesScreen::enter_view_mode() {
right_stack_->setCurrentIndex(1);
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap NotesScreen::save_state() const {
+ return {
+ {"category", current_category_},
+ {"note_id", selected_note_id_},
+ };
+}
+
+void NotesScreen::restore_state(const QVariantMap& state) {
+ const QString cat = state.value("category", "ALL").toString();
+ const int note_id = state.value("note_id", -1).toInt();
+
+ // Select the matching category row
+ for (int i = 0; i < kCategories.size(); ++i) {
+ if (kCategories[i].id == cat) {
+ on_category_selected(i);
+ break;
+ }
+ }
+
+ // Select the matching note
+ if (note_id >= 0) {
+ for (int i = 0; i < filtered_notes_.size(); ++i) {
+ if (filtered_notes_[i].id == note_id) {
+ on_note_selected(i);
+ break;
+ }
+ }
+ }
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/notes/NotesScreen.h b/fincept-qt/src/screens/notes/NotesScreen.h
index 70f038c65..832d55d00 100644
--- a/fincept-qt/src/screens/notes/NotesScreen.h
+++ b/fincept-qt/src/screens/notes/NotesScreen.h
@@ -1,4 +1,5 @@
#pragma once
+#include "screens/IStatefulScreen.h"
#include "storage/repositories/NotesRepository.h"
#include <QComboBox>
@@ -14,11 +15,16 @@ namespace fincept::screens {
/// Financial Notes Screen — 3-panel layout:
/// Category Sidebar | Notes List | Editor / Viewer
-class NotesScreen : public QWidget {
+class NotesScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit NotesScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "notes"; }
+ int state_version() const override { return 1; }
+
private slots:
void on_category_selected(int row);
void on_note_selected(int row);
diff --git a/fincept-qt/src/screens/polymarket/PolymarketScreen.cpp b/fincept-qt/src/screens/polymarket/PolymarketScreen.cpp
index 2e441a035..ac64bcb17 100644
--- a/fincept-qt/src/screens/polymarket/PolymarketScreen.cpp
+++ b/fincept-qt/src/screens/polymarket/PolymarketScreen.cpp
@@ -1,6 +1,7 @@
#include "screens/polymarket/PolymarketScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "screens/polymarket/PolymarketBrowsePanel.h"
#include "screens/polymarket/PolymarketCommandBar.h"
#include "screens/polymarket/PolymarketDetailPanel.h"
@@ -152,6 +153,7 @@ void PolymarketScreen::on_view_changed(const QString& view) {
void PolymarketScreen::on_category_changed(const QString& category) {
active_category_ = category;
command_bar_->set_active_category(category);
+ ScreenStateManager::instance().notify_changed(this);
load_current_view();
}
@@ -373,4 +375,24 @@ void PolymarketScreen::on_ws_status_changed(bool connected) {
status_bar_->set_ws_status(connected);
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap PolymarketScreen::save_state() const {
+ return {
+ {"category", active_category_},
+ {"view", active_view_},
+ {"sort", active_sort_},
+ };
+}
+
+void PolymarketScreen::restore_state(const QVariantMap& state) {
+ const QString cat = state.value("category", "ALL").toString();
+ const QString view = state.value("view", "MARKETS").toString();
+ const QString sort = state.value("sort", "volume").toString();
+
+ active_sort_ = sort;
+ active_view_ = view;
+ on_category_changed(cat);
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/polymarket/PolymarketScreen.h b/fincept-qt/src/screens/polymarket/PolymarketScreen.h
index 9469b063d..98e9002ea 100644
--- a/fincept-qt/src/screens/polymarket/PolymarketScreen.h
+++ b/fincept-qt/src/screens/polymarket/PolymarketScreen.h
@@ -1,5 +1,6 @@
#pragma once
+#include "screens/IStatefulScreen.h"
#include "services/polymarket/PolymarketTypes.h"
#include <QTimer>
@@ -19,12 +20,17 @@ namespace fincept::screens {
/// Production-grade Polymarket Prediction Markets screen.
/// Thin coordinator owning 5 sub-widget panels, wiring service + WebSocket.
-class PolymarketScreen : public QWidget {
+class PolymarketScreen : public QWidget, public fincept::screens::IStatefulScreen {
Q_OBJECT
public:
explicit PolymarketScreen(QWidget* parent = nullptr);
~PolymarketScreen() override;
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "polymarket"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* e) override;
void hideEvent(QHideEvent* e) override;
diff --git a/fincept-qt/src/screens/portfolio/PortfolioAgentPanel.cpp b/fincept-qt/src/screens/portfolio/PortfolioAgentPanel.cpp
index 9f10d81b2..91d07cd00 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioAgentPanel.cpp
+++ b/fincept-qt/src/screens/portfolio/PortfolioAgentPanel.cpp
@@ -32,7 +32,7 @@ void PortfolioAgentPanel::build_ui() {
// ── Header ───────────────────────────────────────────────────────────────
auto* header = new QWidget;
header->setFixedHeight(32);
- header->setStyleSheet("background:rgba(0,212,170,0.07); border-bottom:1px solid #2A2A2A;");
+ header->setStyleSheet(QString("background:rgba(0,212,170,0.07); border-bottom:1px solid %1;").arg(ui::colors::BORDER_MED));
auto* h_layout = new QHBoxLayout(header);
h_layout->setContentsMargins(12, 0, 8, 0);
@@ -55,8 +55,8 @@ void PortfolioAgentPanel::build_ui() {
close_btn_ = new QPushButton("\u2715");
close_btn_->setFixedSize(18, 18);
close_btn_->setCursor(Qt::PointingHandCursor);
- close_btn_->setStyleSheet("QPushButton { background:none; border:none; color:#787878; font-size:11px; }"
- "QPushButton:hover { color:#e5e5e5; }");
+ close_btn_->setStyleSheet(QString("QPushButton { background:none; border:none; color:%1; font-size:11px; }"
+ "QPushButton:hover { color:%2; }").arg(ui::colors::TEXT_SECONDARY, ui::colors::TEXT_PRIMARY));
connect(close_btn_, &QPushButton::clicked, this, [this]() {
hide();
emit close_requested();
@@ -67,22 +67,22 @@ void PortfolioAgentPanel::build_ui() {
// ── Agent selector ───────────────────────────────────────────────────────
auto* selector = new QWidget;
- selector->setStyleSheet(QString("background:%1; border-bottom:1px solid #1A1A1A;").arg(ui::colors::BG_SURFACE));
+ selector->setStyleSheet(QString("background:%1; border-bottom:1px solid %2;").arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* sel_layout = new QVBoxLayout(selector);
sel_layout->setContentsMargins(12, 8, 12, 8);
sel_layout->setSpacing(4);
auto* sel_label = new QLabel("SELECT AGENT");
- sel_label->setStyleSheet("color:#555; font-size:8px; font-weight:700; letter-spacing:0.5px;");
+ sel_label->setStyleSheet(QString("color:%1; font-size:8px; font-weight:700; letter-spacing:0.5px;").arg(ui::colors::TEXT_TERTIARY));
sel_layout->addWidget(sel_label);
agent_cb_ = new QComboBox;
agent_cb_->setFixedHeight(26);
- agent_cb_->setStyleSheet(QString("QComboBox { background:%1; color:%2; border:1px solid #2A2A2A;"
+ agent_cb_->setStyleSheet(QString("QComboBox { background:%1; color:%2; border:1px solid %3;"
" padding:0 8px; font-size:10px; }"
"QComboBox::drop-down { border:none; }"
"QComboBox QAbstractItemView { background:%1; color:%2; }")
- .arg(ui::colors::BG_BASE, ui::colors::TEXT_PRIMARY));
+ .arg(ui::colors::BG_BASE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED));
connect(agent_cb_, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int) {
QString id = agent_cb_->currentData().toString();
if (result_cache_.contains(id))
@@ -96,11 +96,11 @@ void PortfolioAgentPanel::build_ui() {
run_btn_ = new QPushButton("\U0001F916 RUN AGENT ON PORTFOLIO");
run_btn_->setFixedHeight(26);
run_btn_->setCursor(Qt::PointingHandCursor);
- run_btn_->setStyleSheet("QPushButton { background:rgba(0,212,170,0.13); color:#00D4AA;"
+ run_btn_->setStyleSheet(QString("QPushButton { background:rgba(0,212,170,0.13); color:#00D4AA;"
" border:1px solid rgba(0,212,170,0.27); font-size:9px; font-weight:700;"
" letter-spacing:0.5px; margin-top:6px; }"
"QPushButton:hover { background:rgba(0,212,170,0.22); }"
- "QPushButton:disabled { color:#555; }");
+ "QPushButton:disabled { color:%1; }").arg(ui::colors::TEXT_TERTIARY));
connect(run_btn_, &QPushButton::clicked, this, [this]() { run_agent(true); });
sel_layout->addWidget(run_btn_);
@@ -234,7 +234,7 @@ void PortfolioAgentPanel::run_agent(bool force) {
html.replace("\n", "<br>");
static const QRegularExpression bold_re("\\*\\*(.+?)\\*\\*");
html.replace(bold_re, "<b>\\1</b>");
- html = QString("<div style='font-size:11px; line-height:1.6; color:#e5e5e5;'>%1</div>").arg(html);
+ html = QString("<div style='font-size:11px; line-height:1.6; color:%1;'>%2</div>").arg(ui::colors::TEXT_PRIMARY).arg(html);
self->result_cache_[agent_id] = html;
self->content_->setHtml(html);
diff --git a/fincept-qt/src/screens/portfolio/PortfolioAiPanel.cpp b/fincept-qt/src/screens/portfolio/PortfolioAiPanel.cpp
index 4d7b05f90..25f82f821 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioAiPanel.cpp
+++ b/fincept-qt/src/screens/portfolio/PortfolioAiPanel.cpp
@@ -29,7 +29,7 @@ void PortfolioAiPanel::build_ui() {
// ── Header ───────────────────────────────────────────────────────────────
auto* header = new QWidget;
header->setFixedHeight(32);
- header->setStyleSheet("background:rgba(157,78,221,0.09); border-bottom:1px solid #2A2A2A;");
+ header->setStyleSheet(QString("background:rgba(157,78,221,0.09); border-bottom:1px solid %1;").arg(ui::colors::BORDER_MED));
auto* h_layout = new QHBoxLayout(header);
h_layout->setContentsMargins(12, 0, 8, 0);
@@ -52,8 +52,8 @@ void PortfolioAiPanel::build_ui() {
close_btn_ = new QPushButton("\u2715");
close_btn_->setFixedSize(18, 18);
close_btn_->setCursor(Qt::PointingHandCursor);
- close_btn_->setStyleSheet("QPushButton { background:none; border:none; color:#787878; font-size:11px; }"
- "QPushButton:hover { color:#e5e5e5; }");
+ close_btn_->setStyleSheet(QString("QPushButton { background:none; border:none; color:%1; font-size:11px; }"
+ "QPushButton:hover { color:%2; }").arg(ui::colors::TEXT_SECONDARY, ui::colors::TEXT_PRIMARY));
connect(close_btn_, &QPushButton::clicked, this, [this]() {
hide();
emit close_requested();
@@ -65,7 +65,7 @@ void PortfolioAiPanel::build_ui() {
// ── Analysis type selector ───────────────────────────────────────────────
auto* type_bar = new QWidget;
type_bar->setFixedHeight(28);
- type_bar->setStyleSheet(QString("background:%1; border-bottom:1px solid #2A2A2A;").arg(ui::colors::BG_SURFACE));
+ type_bar->setStyleSheet(QString("background:%1; border-bottom:1px solid %2;").arg(ui::colors::BG_SURFACE, ui::colors::BORDER_MED));
auto* type_layout = new QHBoxLayout(type_bar);
type_layout->setContentsMargins(0, 0, 0, 0);
@@ -75,12 +75,12 @@ void PortfolioAiPanel::build_ui() {
auto* btn = new QPushButton(text);
btn->setCheckable(true);
btn->setCursor(Qt::PointingHandCursor);
- btn->setStyleSheet("QPushButton { background:transparent; color:#787878; border:none;"
+ btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:none;"
" border-bottom:2px solid transparent; padding:4px 8px;"
" font-size:8px; font-weight:700; letter-spacing:0.5px; }"
"QPushButton:checked { color:#9D4EDD; border-bottom:2px solid #9D4EDD;"
" background:rgba(157,78,221,0.08); }"
- "QPushButton:hover { color:#9D4EDD; }");
+ "QPushButton:hover { color:#9D4EDD; }").arg(ui::colors::TEXT_SECONDARY));
connect(btn, &QPushButton::clicked, this, [this, type_id]() { set_analysis_type(type_id); });
type_layout->addWidget(btn, 1);
return btn;
@@ -98,11 +98,11 @@ void PortfolioAiPanel::build_ui() {
run_btn_ = new QPushButton("\U0001F916 RUN FULL ANALYSIS");
run_btn_->setFixedHeight(28);
run_btn_->setCursor(Qt::PointingHandCursor);
- run_btn_->setStyleSheet("QPushButton { background:rgba(157,78,221,0.13); color:#9D4EDD;"
+ run_btn_->setStyleSheet(QString("QPushButton { background:rgba(157,78,221,0.13); color:#9D4EDD;"
" border:1px solid rgba(157,78,221,0.27); font-size:9px; font-weight:700;"
" letter-spacing:0.5px; margin:6px 12px; }"
"QPushButton:hover { background:rgba(157,78,221,0.22); }"
- "QPushButton:disabled { color:#555; }");
+ "QPushButton:disabled { color:%1; }").arg(ui::colors::TEXT_TERTIARY));
connect(run_btn_, &QPushButton::clicked, this, [this]() { run_analysis(true); });
layout->addWidget(run_btn_);
@@ -230,7 +230,7 @@ void PortfolioAiPanel::run_analysis(bool force) {
html.replace("\n", "<br>");
static const QRegularExpression bold_re("\\*\\*(.+?)\\*\\*");
html.replace(bold_re, "<b>\\1</b>");
- html = QString("<div style='font-size:11px; line-height:1.6; color:#e5e5e5;'>%1</div>").arg(html);
+ html = QString("<div style='font-size:11px; line-height:1.6; color:%1;'>%2</div>").arg(ui::colors::TEXT_PRIMARY).arg(html);
self->result_cache_[type] = html;
self->content_->setHtml(html);
diff --git a/fincept-qt/src/screens/portfolio/PortfolioBlotter.cpp b/fincept-qt/src/screens/portfolio/PortfolioBlotter.cpp
index fabc9d48f..a20a3f03f 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioBlotter.cpp
+++ b/fincept-qt/src/screens/portfolio/PortfolioBlotter.cpp
@@ -51,12 +51,14 @@ void PortfolioBlotter::build_ui() {
table_->setStyleSheet(QString("QTableWidget { background:%1; color:%2; border:none;"
" font-size:11px; font-family:%3; gridline-color:transparent; }"
- "QTableWidget::item { padding:3px 6px; border-bottom:1px solid %4; }"
- "QTableWidget::item:selected { background:%5; color:%6; }"
+ "QTableWidget::item { padding:5px 8px; border-bottom:1px solid %4; }"
+ "QTableWidget::item:selected { background:rgba(217,119,6,0.10); color:%6; }"
"QTableWidget::item:hover { background:%7; }"
"QHeaderView::section { background:%8; color:%9; border:none;"
- " border-bottom:2px solid %10; padding:4px 6px;"
- " font-size:9px; font-weight:700; letter-spacing:0.5px; }")
+ " border-bottom:2px solid %10; border-right:1px solid %4; padding:5px 8px;"
+ " font-size:10px; font-weight:700; letter-spacing:0.5px; }"
+ "QScrollBar:vertical { width:5px; background:%1; }"
+ "QScrollBar::handle:vertical { background:%4; min-height:20px; }")
.arg(ui::colors::BG_BASE, ui::colors::TEXT_PRIMARY, ui::fonts::DATA_FAMILY,
ui::colors::BORDER_DIM, ui::colors::AMBER_DIM, ui::colors::AMBER,
ui::colors::BG_HOVER, ui::colors::BG_SURFACE, ui::colors::TEXT_SECONDARY)
@@ -383,7 +385,7 @@ void PortfolioBlotter::on_context_menu(const QPoint& pos) {
// Style delete action in red
delete_act->setData("danger");
menu.setStyleSheet(menu.styleSheet() +
- "QMenu::item[data='danger'] { color:#ef4444; }");
+ QString("QMenu::item[data='danger'] { color:%1; }").arg(ui::colors::NEGATIVE));
connect(edit_act, &QAction::triggered, this, [this, symbol]() {
emit edit_transaction_requested(symbol);
@@ -395,4 +397,24 @@ void PortfolioBlotter::on_context_menu(const QPoint& pos) {
menu.exec(table_->viewport()->mapToGlobal(pos));
}
+void PortfolioBlotter::refresh_theme() {
+ const QString bsz = QString::number(ui::fonts::font_px(0));
+ const QString hsz = QString::number(ui::fonts::font_px(-2));
+ table_->setStyleSheet(QString("QTableWidget { background:%1; color:%2; border:none;"
+ " font-size:" + bsz + "px; font-family:%3; gridline-color:transparent; }"
+ "QTableWidget::item { padding:5px 8px; border-bottom:1px solid %4; }"
+ "QTableWidget::item:selected { background:rgba(217,119,6,0.10); color:%6; }"
+ "QTableWidget::item:hover { background:%7; }"
+ "QHeaderView::section { background:%8; color:%9; border:none;"
+ " border-bottom:2px solid %10; border-right:1px solid %4; padding:5px 8px;"
+ " font-size:" + hsz + "px; font-weight:700; letter-spacing:0.5px; }"
+ "QScrollBar:vertical { width:5px; background:%1; }"
+ "QScrollBar::handle:vertical { background:%4; min-height:20px; }")
+ .arg(ui::colors::BG_BASE, ui::colors::TEXT_PRIMARY, ui::fonts::DATA_FAMILY,
+ ui::colors::BORDER_DIM, ui::colors::AMBER_DIM, ui::colors::AMBER,
+ ui::colors::BG_HOVER, ui::colors::BG_SURFACE, ui::colors::TEXT_SECONDARY)
+ .arg(ui::colors::AMBER));
+ populate_table();
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/portfolio/PortfolioBlotter.h b/fincept-qt/src/screens/portfolio/PortfolioBlotter.h
index c171f632c..f168a6457 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioBlotter.h
+++ b/fincept-qt/src/screens/portfolio/PortfolioBlotter.h
@@ -22,6 +22,7 @@ class PortfolioBlotter : public QWidget {
void set_filter(const QString& text);
/// Show only rows whose symbol is in @p symbols. Empty list = show all.
void set_sector_filter(const QStringList& symbols);
+ void refresh_theme();
signals:
void symbol_selected(QString symbol);
diff --git a/fincept-qt/src/screens/portfolio/PortfolioCommandBar.cpp b/fincept-qt/src/screens/portfolio/PortfolioCommandBar.cpp
index 5bed9550f..1ed74c7d7 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioCommandBar.cpp
+++ b/fincept-qt/src/screens/portfolio/PortfolioCommandBar.cpp
@@ -4,6 +4,7 @@
#include "ui/theme/Theme.h"
#include <QApplication>
+#include <QFrame>
#include <QHBoxLayout>
#include <QScrollArea>
#include <QVBoxLayout>
@@ -34,22 +35,37 @@ PortfolioCommandBar::PortfolioCommandBar(QWidget* parent) : QWidget(parent) {
}
void PortfolioCommandBar::build_ui() {
- setFixedHeight(40);
+ setFixedHeight(36);
setObjectName("portfolioCommandBar");
setStyleSheet(QString("#portfolioCommandBar { background:%1; border-bottom:2px solid %2; }")
.arg(ui::colors::BG_SURFACE, ui::colors::AMBER));
- auto* layout = new QHBoxLayout(this);
- layout->setContentsMargins(8, 0, 8, 0);
- layout->setSpacing(4);
+ auto* outer = new QHBoxLayout(this);
+ outer->setContentsMargins(0, 0, 0, 0);
+ outer->setSpacing(0);
+
+ // Wrap entire bar in scroll area to prevent horizontal overflow
+ auto* scroll = new QScrollArea;
+ scroll->setWidgetResizable(true);
+ scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ scroll->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ scroll->setFrameShape(QFrame::NoFrame);
+ scroll->setStyleSheet("QScrollArea { background:transparent; border:none; }");
+
+ auto* inner = new QWidget;
+ inner->setStyleSheet("background:transparent;");
+ auto* layout = new QHBoxLayout(inner);
+ layout->setContentsMargins(6, 0, 6, 0);
+ layout->setSpacing(3);
build_portfolio_selector(layout);
// Inline stats (wrapped in container for show/hide)
stats_container_ = new QWidget;
+ stats_container_->setStyleSheet("background:transparent;");
auto* stats_layout = new QHBoxLayout(stats_container_);
stats_layout->setContentsMargins(0, 0, 0, 0);
- stats_layout->setSpacing(4);
+ stats_layout->setSpacing(3);
stats_layout->addWidget(nav_label_);
stats_layout->addWidget(pnl_label_);
stats_layout->addWidget(day_label_);
@@ -58,36 +74,36 @@ void PortfolioCommandBar::build_ui() {
// Action buttons (wrapped for show/hide)
actions_container_ = new QWidget;
+ actions_container_->setStyleSheet("background:transparent;");
auto* actions_layout = new QHBoxLayout(actions_container_);
actions_layout->setContentsMargins(0, 0, 0, 0);
- actions_layout->setSpacing(4);
+ actions_layout->setSpacing(3);
build_action_buttons(actions_layout);
layout->addWidget(actions_container_);
// Separator
auto* sep = new QWidget;
- sep->setFixedSize(1, 20);
+ sep->setFixedSize(1, 18);
sep->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_MED));
layout->addWidget(sep);
// Detail buttons + AI/Agent (wrapped for show/hide)
details_container_ = new QWidget;
+ details_container_->setStyleSheet("background:transparent;");
auto* details_layout = new QHBoxLayout(details_container_);
details_layout->setContentsMargins(0, 0, 0, 0);
- details_layout->setSpacing(4);
+ details_layout->setSpacing(2);
build_detail_buttons(details_layout);
- details_layout->addStretch();
-
// AI + Agent buttons inside details container
auto make_tool_btn = [&](const QString& text, const char* color, auto signal) {
auto* btn = new QPushButton(text);
- btn->setFixedHeight(22);
+ btn->setFixedHeight(20);
btn->setCursor(Qt::PointingHandCursor);
btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"
- " padding:0 8px; font-size:9px; font-weight:700; letter-spacing:0.5px; }"
- "QPushButton:hover { background:%1; color:#000; }")
- .arg(color));
+ " padding:0 6px; font-size:9px; font-weight:700; }"
+ "QPushButton:hover { background:%1; color:%2; }")
+ .arg(color, ui::colors::BG_BASE));
connect(btn, &QPushButton::clicked, this, signal);
details_layout->addWidget(btn);
return btn;
@@ -97,7 +113,9 @@ void PortfolioCommandBar::build_ui() {
make_tool_btn("AGENT", "#00D4AA", &PortfolioCommandBar::agent_run_requested);
layout->addWidget(details_container_);
- layout->addStretch();
+
+ scroll->setWidget(inner);
+ outer->addWidget(scroll);
// Initially hide everything until portfolios load
stats_container_->hide();
@@ -108,7 +126,8 @@ void PortfolioCommandBar::build_ui() {
void PortfolioCommandBar::build_portfolio_selector(QHBoxLayout* layout) {
// Selector button (dropdown trigger)
selector_btn_ = new QPushButton("SELECT PORTFOLIO \u25BE");
- selector_btn_->setFixedHeight(24);
+ selector_btn_->setFixedHeight(22);
+ selector_btn_->setMaximumWidth(240);
selector_btn_->setCursor(Qt::PointingHandCursor);
selector_btn_->setStyleSheet(
QString("QPushButton { background:%1; color:%2; border:1px solid %3;"
@@ -121,7 +140,7 @@ void PortfolioCommandBar::build_portfolio_selector(QHBoxLayout* layout) {
// Create stat labels (added to stats_container_ in build_ui, not here)
auto make_stat = [](QLabel*& lbl) {
lbl = new QLabel;
- lbl->setStyleSheet(QString("color:%1; font-size:10px; font-weight:600;").arg(ui::colors::TEXT_TERTIARY));
+ lbl->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700;").arg(ui::colors::TEXT_SECONDARY));
};
make_stat(nav_label_);
make_stat(pnl_label_);
@@ -187,10 +206,10 @@ void PortfolioCommandBar::build_portfolio_selector(QHBoxLayout* layout) {
auto* create_btn = new QPushButton("+ CREATE NEW");
create_btn->setFixedHeight(22);
create_btn->setCursor(Qt::PointingHandCursor);
- create_btn->setStyleSheet(QString("QPushButton { background:%1; color:#000; border:none;"
+ create_btn->setStyleSheet(QString("QPushButton { background:%1; color:%3; border:none;"
" font-size:9px; font-weight:700; }"
"QPushButton:hover { background:%2; }")
- .arg(ui::colors::AMBER, ui::colors::WARNING));
+ .arg(ui::colors::AMBER, ui::colors::WARNING, ui::colors::BG_BASE));
connect(create_btn, &QPushButton::clicked, this, [this]() {
dropdown_->hide();
dropdown_visible_ = false;
@@ -203,8 +222,8 @@ void PortfolioCommandBar::build_portfolio_selector(QHBoxLayout* layout) {
delete_btn->setCursor(Qt::PointingHandCursor);
delete_btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"
" font-size:9px; font-weight:700; }"
- "QPushButton:hover { background:%1; color:#000; }")
- .arg(ui::colors::NEGATIVE));
+ "QPushButton:hover { background:%1; color:%2; }")
+ .arg(ui::colors::NEGATIVE, ui::colors::BG_BASE));
connect(delete_btn, &QPushButton::clicked, this, [this]() {
if (!selected_id_.isEmpty()) {
dropdown_->hide();
@@ -221,19 +240,19 @@ void PortfolioCommandBar::build_portfolio_selector(QHBoxLayout* layout) {
void PortfolioCommandBar::build_action_buttons(QHBoxLayout* layout) {
auto make_btn = [&](const QString& text, const char* bg, const char* fg) {
auto* btn = new QPushButton(text);
- btn->setFixedHeight(22);
+ btn->setFixedHeight(20);
btn->setCursor(Qt::PointingHandCursor);
- btn->setStyleSheet(QString("QPushButton { background:%1; color:%2; border:none;"
- " padding:0 10px; font-size:9px; font-weight:700; letter-spacing:0.5px; }"
+ btn->setStyleSheet(QString("QPushButton { background:%1; color:%2; border:none; border-radius:2px;"
+ " padding:0 8px; font-size:9px; font-weight:700; letter-spacing:0.5px; }"
"QPushButton:hover { opacity:0.85; }")
.arg(bg, fg));
layout->addWidget(btn);
return btn;
};
- buy_btn_ = make_btn("BUY", ui::colors::POSITIVE, "#000000");
- sell_btn_ = make_btn("SELL", ui::colors::NEGATIVE, "#ffffff");
- auto* div_btn = make_btn("DIV", ui::colors::CYAN, "#000000");
+ buy_btn_ = make_btn("BUY", ui::colors::POSITIVE, ui::colors::BG_BASE);
+ sell_btn_ = make_btn("SELL", ui::colors::NEGATIVE, ui::colors::TEXT_PRIMARY);
+ auto* div_btn = make_btn("DIV", ui::colors::CYAN, ui::colors::BG_BASE);
connect(buy_btn_, &QPushButton::clicked, this, &PortfolioCommandBar::buy_requested);
connect(sell_btn_, &QPushButton::clicked, this, &PortfolioCommandBar::sell_requested);
@@ -241,10 +260,10 @@ void PortfolioCommandBar::build_action_buttons(QHBoxLayout* layout) {
// Refresh
refresh_btn_ = new QPushButton("\u21BB");
- refresh_btn_->setFixedSize(22, 22);
+ refresh_btn_->setFixedSize(20, 20);
refresh_btn_->setCursor(Qt::PointingHandCursor);
refresh_btn_->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %2;"
- " font-size:12px; }"
+ " font-size:11px; }"
"QPushButton:hover { border-color:%1; }")
.arg(ui::colors::AMBER, ui::colors::BORDER_MED));
connect(refresh_btn_, &QPushButton::clicked, this, &PortfolioCommandBar::refresh_requested);
@@ -252,7 +271,7 @@ void PortfolioCommandBar::build_action_buttons(QHBoxLayout* layout) {
// Refresh interval selector
interval_cb_ = new QComboBox;
- interval_cb_->setFixedHeight(22);
+ interval_cb_->setFixedHeight(20);
interval_cb_->addItem("1m", 60000);
interval_cb_->addItem("5m", 300000);
interval_cb_->addItem("10m", 600000);
@@ -283,14 +302,14 @@ void PortfolioCommandBar::build_action_buttons(QHBoxLayout* layout) {
// FFN toggle
ffn_btn_ = new QPushButton("FFN");
- ffn_btn_->setFixedHeight(22);
+ ffn_btn_->setFixedHeight(20);
ffn_btn_->setCheckable(true);
ffn_btn_->setCursor(Qt::PointingHandCursor);
ffn_btn_->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %2;"
" padding:0 8px; font-size:9px; font-weight:700; }"
- "QPushButton:checked { background:%3; color:#000; border-color:%3; }"
+ "QPushButton:checked { background:%3; color:%4; border-color:%3; }"
"QPushButton:hover { border-color:%3; }")
- .arg(ui::colors::TEXT_SECONDARY, ui::colors::BORDER_MED, ui::colors::AMBER));
+ .arg(ui::colors::TEXT_SECONDARY, ui::colors::BORDER_MED, ui::colors::AMBER, ui::colors::BG_BASE));
connect(ffn_btn_, &QPushButton::clicked, this, &PortfolioCommandBar::ffn_toggled);
layout->addWidget(ffn_btn_);
}
@@ -303,11 +322,12 @@ void PortfolioCommandBar::build_detail_buttons(QHBoxLayout* layout) {
btn->setProperty("detailView", static_cast<int>(def.view));
QString color = def.color;
+ QString rgb_str = [&]() { QColor c(color); return QString("%1,%2,%3").arg(c.red()).arg(c.green()).arg(c.blue()); }();
btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %2;"
" padding:0 6px; font-size:8px; font-weight:700; letter-spacing:0.3px; }"
- "QPushButton:hover { background:%3; color:#000; border-color:%3; }"
- "QPushButton[active=\"true\"] { background:%3; color:#000; border-color:%3; }")
- .arg(color, ui::colors::BORDER_DIM, color));
+ "QPushButton:hover { background:rgba(%5,0.12); color:%3; border-color:%3; }"
+ "QPushButton[active=\"true\"] { background:rgba(%5,0.15); color:%3; border-color:%3; }")
+ .arg(color, ui::colors::BORDER_DIM, color, ui::colors::BG_BASE, rgb_str));
connect(btn, &QPushButton::clicked, this, [this, view = def.view]() { emit detail_view_selected(view); });
@@ -366,14 +386,14 @@ void PortfolioCommandBar::set_summary(const portfolio::PortfolioSummary& s) {
pnl_label_->setText(
QString("P&L %1%2%").arg(s.total_unrealized_pnl >= 0 ? "+" : "").arg(fmt(s.total_unrealized_pnl_percent)));
- pnl_label_->setStyleSheet(QString("color:%1; font-size:10px; font-weight:600;").arg(color(s.total_unrealized_pnl)));
+ pnl_label_->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700;").arg(color(s.total_unrealized_pnl)));
day_label_->setText(
QString("DAY %1%2%").arg(s.total_day_change >= 0 ? "+" : "").arg(fmt(s.total_day_change_percent)));
- day_label_->setStyleSheet(QString("color:%1; font-size:10px; font-weight:600;").arg(color(s.total_day_change)));
+ day_label_->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700;").arg(color(s.total_day_change)));
pos_label_->setText(QString("POS %1 | W%2/L%3").arg(s.total_positions).arg(s.gainers).arg(s.losers));
- pos_label_->setStyleSheet(QString("color:%1; font-size:10px; font-weight:600;").arg(ui::colors::TEXT_SECONDARY));
+ pos_label_->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700;").arg(ui::colors::TEXT_SECONDARY));
}
void PortfolioCommandBar::set_refreshing(bool refreshing) {
@@ -418,4 +438,24 @@ void PortfolioCommandBar::set_refresh_interval(int ms) {
}
}
+void PortfolioCommandBar::refresh_theme() {
+ setStyleSheet(QString("#portfolioCommandBar { background:%1; border-bottom:2px solid %2; }")
+ .arg(ui::colors::BG_SURFACE, ui::colors::AMBER));
+
+ selector_btn_->setStyleSheet(
+ QString("QPushButton { background:%1; color:%2; border:1px solid %3;"
+ " padding:0 12px; font-size:10px; font-weight:700; letter-spacing:0.5px; }"
+ "QPushButton:hover { border-color:%4; color:%4; }")
+ .arg(ui::colors::BG_RAISED, ui::colors::TEXT_SECONDARY, ui::colors::BORDER_MED, ui::colors::AMBER));
+
+ dropdown_->setStyleSheet(
+ QString("background:%1; border:1px solid %2;").arg(ui::colors::BG_SURFACE, ui::colors::BORDER_MED));
+
+ // Detail buttons keep their per-view accent colors but refresh base tokens
+ for (auto* btn : detail_btns_) {
+ btn->style()->unpolish(btn);
+ btn->style()->polish(btn);
+ }
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/portfolio/PortfolioCommandBar.h b/fincept-qt/src/screens/portfolio/PortfolioCommandBar.h
index a8b9906d8..1059c314c 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioCommandBar.h
+++ b/fincept-qt/src/screens/portfolio/PortfolioCommandBar.h
@@ -25,6 +25,7 @@ class PortfolioCommandBar : public QWidget {
void set_has_selection(bool has_selection);
void set_has_portfolios(bool has_portfolios);
void set_refresh_interval(int ms);
+ void refresh_theme();
signals:
void portfolio_selected(QString id);
diff --git a/fincept-qt/src/screens/portfolio/PortfolioDialogs.cpp b/fincept-qt/src/screens/portfolio/PortfolioDialogs.cpp
index e04a1ccd2..7ee6f19c3 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioDialogs.cpp
+++ b/fincept-qt/src/screens/portfolio/PortfolioDialogs.cpp
@@ -97,10 +97,10 @@ CreatePortfolioDialog::CreatePortfolioDialog(QWidget* parent) : QDialog(parent)
auto* create_btn = new QPushButton("CREATE");
create_btn->setFixedSize(90, 30);
create_btn->setCursor(Qt::PointingHandCursor);
- create_btn->setStyleSheet(QString("QPushButton { background:%1; color:#000; border:none;"
+ create_btn->setStyleSheet(QString("QPushButton { background:%1; color:%3; border:none;"
" font-size:10px; font-weight:700; }"
"QPushButton:hover { background:%2; }")
- .arg(ui::colors::AMBER, ui::colors::WARNING));
+ .arg(ui::colors::AMBER, ui::colors::WARNING, ui::colors::BG_BASE));
connect(create_btn, &QPushButton::clicked, this, [this]() {
if (!name_edit_->text().trimmed().isEmpty())
accept();
@@ -163,10 +163,10 @@ ConfirmDeleteDialog::ConfirmDeleteDialog(const QString& portfolio_name, QWidget*
auto* delete_btn = new QPushButton("DELETE");
delete_btn->setFixedSize(90, 30);
delete_btn->setCursor(Qt::PointingHandCursor);
- delete_btn->setStyleSheet(QString("QPushButton { background:%1; color:#fff; border:none;"
+ delete_btn->setStyleSheet(QString("QPushButton { background:%1; color:%2; border:none;"
" font-size:10px; font-weight:700; }"
- "QPushButton:hover { background:#ef4444; }")
- .arg(ui::colors::NEGATIVE));
+ "QPushButton:hover { background:%1; }")
+ .arg(ui::colors::NEGATIVE, ui::colors::TEXT_PRIMARY));
connect(delete_btn, &QPushButton::clicked, this, &QDialog::accept);
btn_layout->addWidget(delete_btn);
@@ -238,10 +238,10 @@ AddAssetDialog::AddAssetDialog(QWidget* parent) : QDialog(parent) {
auto* add_btn = new QPushButton("ADD");
add_btn->setFixedSize(80, 28);
add_btn->setCursor(Qt::PointingHandCursor);
- add_btn->setStyleSheet(QString("QPushButton { background:%1; color:#000; border:none;"
+ add_btn->setStyleSheet(QString("QPushButton { background:%1; color:%2; border:none;"
" font-size:10px; font-weight:700; }"
- "QPushButton:hover { background:#22c55e; }")
- .arg(ui::colors::POSITIVE));
+ "QPushButton:hover { background:%1; }")
+ .arg(ui::colors::POSITIVE, ui::colors::BG_BASE));
connect(add_btn, &QPushButton::clicked, this, [this]() {
if (!symbol_edit_->text().trimmed().isEmpty() && quantity() > 0 && price() > 0)
accept();
@@ -254,7 +254,8 @@ AddAssetDialog::AddAssetDialog(QWidget* parent) : QDialog(parent) {
search_frame_ = new QFrame(this);
search_frame_->setObjectName("assetSearchFrame");
search_frame_->setStyleSheet(
- "QFrame#assetSearchFrame { background:#0e0e0e; border:1px solid #2a2a2a; border-top:none; }");
+ QString("QFrame#assetSearchFrame { background:%1; border:1px solid %2; border-top:none; }")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_MED));
search_frame_->hide();
auto* frame_layout = new QVBoxLayout(search_frame_);
@@ -263,9 +264,10 @@ AddAssetDialog::AddAssetDialog(QWidget* parent) : QDialog(parent) {
search_list_ = new QListWidget(search_frame_);
search_list_->setStyleSheet(
- "QListWidget { background:transparent; border:none; outline:none; }"
+ QString("QListWidget { background:transparent; border:none; outline:none; }"
"QListWidget::item { padding:0; border:none; background:transparent; }"
- "QListWidget::item:selected { background:#1a1a1a; border-left:3px solid #d97706; }");
+ "QListWidget::item:selected { background:%1; border-left:3px solid %2; }")
+ .arg(ui::colors::BORDER_DIM, ui::colors::AMBER));
search_list_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
search_list_->setCursor(Qt::PointingHandCursor);
frame_layout->addWidget(search_list_);
@@ -342,7 +344,7 @@ void AddAssetDialog::show_results(const QJsonArray& results) {
auto* rl = new QHBoxLayout(row);
rl->setContentsMargins(10, 6, 10, 6);
auto* lbl = new QLabel("No results found");
- lbl->setStyleSheet("color:#525252; font-size:11px; font-family:'Consolas',monospace; background:transparent;");
+ lbl->setStyleSheet(QString("color:%1; font-size:11px; font-family:'Consolas',monospace; background:transparent;").arg(ui::colors::TEXT_TERTIARY));
rl->addWidget(lbl);
item->setSizeHint(QSize(0, 28));
search_list_->setItemWidget(item, row);
@@ -383,13 +385,13 @@ void AddAssetDialog::show_results(const QJsonArray& results) {
hl->setSpacing(8);
auto* sym_lbl = new QLabel(yf_sym);
- sym_lbl->setStyleSheet("color:#e5e5e5; font-size:12px; font-weight:700;"
- "font-family:'Consolas',monospace; background:transparent;");
+ sym_lbl->setStyleSheet(QString("color:%1; font-size:12px; font-weight:700;"
+ "font-family:'Consolas',monospace; background:transparent;").arg(ui::colors::TEXT_PRIMARY));
sym_lbl->setFixedWidth(100);
auto* name_lbl = new QLabel(name);
- name_lbl->setStyleSheet("color:#a3a3a3; font-size:11px; background:transparent;"
- "font-family:'Consolas',monospace;");
+ name_lbl->setStyleSheet(QString("color:%1; font-size:11px; background:transparent;"
+ "font-family:'Consolas',monospace;").arg(ui::colors::TEXT_SECONDARY));
name_lbl->setMaximumWidth(180);
hl->addWidget(sym_lbl);
@@ -397,15 +399,15 @@ void AddAssetDialog::show_results(const QJsonArray& results) {
if (!exch.isEmpty()) {
auto* exch_lbl = new QLabel(exch);
- exch_lbl->setStyleSheet("color:#525252; font-size:10px; font-family:'Consolas',monospace;"
- "background:transparent;");
+ exch_lbl->setStyleSheet(QString("color:%1; font-size:10px; font-family:'Consolas',monospace;"
+ "background:transparent;").arg(ui::colors::TEXT_TERTIARY));
hl->addWidget(exch_lbl);
}
auto* type_lbl = new QLabel(type.toUpper());
- type_lbl->setStyleSheet("color:#d97706; font-size:9px; font-weight:700;"
- "font-family:'Consolas',monospace; background:#1a1a1a;"
- "padding:1px 4px; border-radius:2px;");
+ type_lbl->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700;"
+ "font-family:'Consolas',monospace; background:%2;"
+ "padding:1px 4px; border-radius:2px;").arg(ui::colors::AMBER, ui::colors::BORDER_DIM));
hl->addWidget(type_lbl);
item->setSizeHint(QSize(0, 30));
@@ -535,10 +537,10 @@ SellAssetDialog::SellAssetDialog(const QString& symbol, double held_qty, QWidget
auto* sell_btn = new QPushButton("SELL");
sell_btn->setFixedSize(80, 28);
sell_btn->setCursor(Qt::PointingHandCursor);
- sell_btn->setStyleSheet(QString("QPushButton { background:%1; color:#fff; border:none;"
+ sell_btn->setStyleSheet(QString("QPushButton { background:%1; color:%2; border:none;"
" font-size:10px; font-weight:700; }"
- "QPushButton:hover { background:#ef4444; }")
- .arg(ui::colors::NEGATIVE));
+ "QPushButton:hover { background:%1; }")
+ .arg(ui::colors::NEGATIVE, ui::colors::TEXT_PRIMARY));
connect(sell_btn, &QPushButton::clicked, this, [this, held_qty]() {
if (quantity() > 0 && quantity() <= held_qty && price() > 0)
accept();
@@ -595,10 +597,10 @@ ImportPortfolioDialog::ImportPortfolioDialog(const QVector<portfolio::Portfolio>
auto* browse_btn = new QPushButton("BROWSE");
browse_btn->setFixedSize(80, 30);
browse_btn->setCursor(Qt::PointingHandCursor);
- browse_btn->setStyleSheet(QString("QPushButton { background:%1; color:#000; border:none;"
+ browse_btn->setStyleSheet(QString("QPushButton { background:%1; color:%2; border:none;"
" font-size:10px; font-weight:700; }"
- "QPushButton:hover { background:%2; }")
- .arg(ui::colors::CYAN, "#0ea5e9"));
+ "QPushButton:hover { background:%1; }")
+ .arg(ui::colors::CYAN, ui::colors::BG_BASE));
connect(browse_btn, &QPushButton::clicked, this, &ImportPortfolioDialog::browse_file);
file_row->addWidget(browse_btn);
@@ -615,8 +617,8 @@ ImportPortfolioDialog::ImportPortfolioDialog(const QVector<portfolio::Portfolio>
demo_dl_btn->setCursor(Qt::PointingHandCursor);
demo_dl_btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"
" font-size:9px; font-weight:700; letter-spacing:0.3px; }"
- "QPushButton:hover { background:%1; color:#000; }")
- .arg(ui::colors::CYAN));
+ "QPushButton:hover { background:%1; color:%2; }")
+ .arg(ui::colors::CYAN, ui::colors::BG_BASE));
connect(demo_dl_btn, &QPushButton::clicked, this, [this]() {
QString path = QFileDialog::getSaveFileName(this, "Save Demo Portfolio JSON",
"demo_portfolio.json", "JSON Files (*.json)");
@@ -713,10 +715,10 @@ ImportPortfolioDialog::ImportPortfolioDialog(const QVector<portfolio::Portfolio>
auto* import_btn = new QPushButton("IMPORT");
import_btn->setFixedSize(80, 28);
import_btn->setCursor(Qt::PointingHandCursor);
- import_btn->setStyleSheet(QString("QPushButton { background:%1; color:#000; border:none;"
+ import_btn->setStyleSheet(QString("QPushButton { background:%1; color:%2; border:none;"
" font-size:10px; font-weight:700; }"
- "QPushButton:hover { background:#0ea5e9; }")
- .arg(ui::colors::CYAN));
+ "QPushButton:hover { background:%1; }")
+ .arg(ui::colors::CYAN, ui::colors::BG_BASE));
connect(import_btn, &QPushButton::clicked, this, [this]() {
if (!file_edit_->text().isEmpty())
accept();
@@ -817,10 +819,10 @@ EditTransactionDialog::EditTransactionDialog(const portfolio::Transaction& txn,
auto* save_btn = new QPushButton("SAVE");
save_btn->setFixedSize(80, 28);
save_btn->setCursor(Qt::PointingHandCursor);
- save_btn->setStyleSheet(QString("QPushButton { background:%1; color:#000; border:none;"
+ save_btn->setStyleSheet(QString("QPushButton { background:%1; color:%3; border:none;"
" font-size:10px; font-weight:700; }"
"QPushButton:hover { background:%2; }")
- .arg(ui::colors::AMBER, ui::colors::WARNING));
+ .arg(ui::colors::AMBER, ui::colors::WARNING, ui::colors::BG_BASE));
connect(save_btn, &QPushButton::clicked, this, [this]() {
if (quantity() > 0 && price() > 0)
accept();
@@ -881,9 +883,9 @@ SectorMappingDialog::SectorMappingDialog(const QVector<portfolio::HoldingWithQuo
// Scrollable grid
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
- scroll->setStyleSheet("QScrollArea { border:none; }"
+ scroll->setStyleSheet(QString("QScrollArea { border:none; }"
"QScrollBar:vertical { width:4px; background:transparent; }"
- "QScrollBar::handle:vertical { background:#333; }");
+ "QScrollBar::handle:vertical { background:%1; }").arg(ui::colors::BORDER_BRIGHT));
auto* grid_w = new QWidget;
auto* grid = new QFormLayout(grid_w);
@@ -920,10 +922,10 @@ SectorMappingDialog::SectorMappingDialog(const QVector<portfolio::HoldingWithQuo
auto* save_btn = new QPushButton("SAVE");
save_btn->setFixedSize(80, 28);
save_btn->setCursor(Qt::PointingHandCursor);
- save_btn->setStyleSheet(QString("QPushButton { background:%1; color:#000; border:none;"
+ save_btn->setStyleSheet(QString("QPushButton { background:%1; color:%3; border:none;"
" font-size:10px; font-weight:700; }"
"QPushButton:hover { background:%2; }")
- .arg(ui::colors::AMBER, ui::colors::WARNING));
+ .arg(ui::colors::AMBER, ui::colors::WARNING, ui::colors::BG_BASE));
connect(save_btn, &QPushButton::clicked, this, &QDialog::accept);
btn_layout->addWidget(save_btn);
@@ -1011,10 +1013,10 @@ AddDividendDialog::AddDividendDialog(const QStringList& symbols, QWidget* parent
auto* ok = new QPushButton("RECORD");
ok->setFixedHeight(32);
ok->setStyleSheet(
- QString("QPushButton { background:%1; color:#000; border:none;"
+ QString("QPushButton { background:%1; color:%3; border:none;"
" font-size:10px; font-weight:700; padding:0 16px; }"
"QPushButton:hover { background:%2; }")
- .arg(ui::colors::CYAN, ui::colors::TEXT_PRIMARY));
+ .arg(ui::colors::CYAN, ui::colors::TEXT_PRIMARY, ui::colors::BG_BASE));
connect(ok, &QPushButton::clicked, this, [this]() {
if (amount_edit_->text().trimmed().isEmpty()) {
amount_edit_->setPlaceholderText("Required!");
diff --git a/fincept-qt/src/screens/portfolio/PortfolioFFNView.cpp b/fincept-qt/src/screens/portfolio/PortfolioFFNView.cpp
index 9cbac9807..b7960fafe 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioFFNView.cpp
+++ b/fincept-qt/src/screens/portfolio/PortfolioFFNView.cpp
@@ -85,8 +85,8 @@ void PortfolioFFNView::build_ui() {
back_btn_->setStyleSheet(
QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"
" padding:0 10px; font-size:9px; font-weight:700; }"
- "QPushButton:hover { background:%1; color:#000; }")
- .arg(ui::colors::AMBER));
+ "QPushButton:hover { background:%1; color:%2; }")
+ .arg(ui::colors::AMBER, ui::colors::BG_BASE));
connect(back_btn_, &QPushButton::clicked, this, &PortfolioFFNView::back_requested);
h_layout->addWidget(back_btn_);
@@ -112,11 +112,11 @@ void PortfolioFFNView::build_ui() {
run_btn_->setFixedHeight(24);
run_btn_->setCursor(Qt::PointingHandCursor);
run_btn_->setStyleSheet(
- QString("QPushButton { background:%1; color:#000; border:none;"
+ QString("QPushButton { background:%1; color:%4; border:none;"
" padding:0 12px; font-size:9px; font-weight:700; letter-spacing:0.5px; }"
- "QPushButton:hover { background:#22c55e; }"
+ "QPushButton:hover { background:%1; }"
"QPushButton:disabled { background:%2; color:%3; }")
- .arg(ui::colors::POSITIVE, ui::colors::BG_SURFACE, ui::colors::TEXT_TERTIARY));
+ .arg(ui::colors::POSITIVE, ui::colors::BG_SURFACE, ui::colors::TEXT_TERTIARY, ui::colors::BG_BASE));
connect(run_btn_, &QPushButton::clicked, this, &PortfolioFFNView::run_ffn);
h_layout->addWidget(run_btn_);
diff --git a/fincept-qt/src/screens/portfolio/PortfolioHeatmap.cpp b/fincept-qt/src/screens/portfolio/PortfolioHeatmap.cpp
index 279459d16..3d2f6becd 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioHeatmap.cpp
+++ b/fincept-qt/src/screens/portfolio/PortfolioHeatmap.cpp
@@ -13,7 +13,8 @@
namespace fincept::screens {
PortfolioHeatmap::PortfolioHeatmap(QWidget* parent) : QWidget(parent) {
- setFixedWidth(220);
+ setMinimumWidth(180);
+ setMaximumWidth(220);
build_ui();
}
@@ -22,26 +23,28 @@ void PortfolioHeatmap::build_ui() {
QString("background:%1; border-right:1px solid %2;").arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* layout = new QVBoxLayout(this);
- layout->setContentsMargins(6, 6, 6, 6);
- layout->setSpacing(4);
+ layout->setContentsMargins(8, 8, 8, 6);
+ layout->setSpacing(5);
// Header: title + mode buttons
auto* header = new QHBoxLayout;
auto* title = new QLabel("HOLDINGS");
title->setStyleSheet(
- QString("color:%1; font-size:10px; font-weight:700; letter-spacing:1px;").arg(ui::colors::TEXT_SECONDARY));
+ QString("color:%1; font-size:11px; font-weight:700; letter-spacing:1.5px;").arg(ui::colors::TEXT_SECONDARY));
header->addWidget(title);
header->addStretch();
auto make_mode_btn = [&](const QString& text) {
auto* btn = new QPushButton(text);
- btn->setFixedSize(36, 18);
+ btn->setFixedSize(38, 20);
btn->setCheckable(true);
btn->setCursor(Qt::PointingHandCursor);
btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid %2;"
- " font-size:8px; font-weight:700; }"
- "QPushButton:checked { background:%3; color:#000; border-color:%3; }")
- .arg(ui::colors::TEXT_TERTIARY, ui::colors::BORDER_DIM, ui::colors::AMBER));
+ " font-size:9px; font-weight:700; border-radius:2px; }"
+ "QPushButton:checked { background:%3; color:%4; border-color:%3; }"
+ "QPushButton:hover:!checked { color:%5; border-color:%5; }")
+ .arg(ui::colors::TEXT_TERTIARY, ui::colors::BORDER_DIM, ui::colors::AMBER,
+ ui::colors::BG_BASE, ui::colors::TEXT_PRIMARY));
header->addWidget(btn);
return btn;
};
@@ -69,9 +72,9 @@ void PortfolioHeatmap::build_ui() {
auto* scroll = new QScrollArea;
scroll->setWidgetResizable(true);
scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- scroll->setStyleSheet("QScrollArea { border:none; background:transparent; }"
+ scroll->setStyleSheet(QString("QScrollArea { border:none; background:transparent; }"
"QScrollBar:vertical { width:4px; background:transparent; }"
- "QScrollBar::handle:vertical { background:#333; }");
+ "QScrollBar::handle:vertical { background:%1; }").arg(ui::colors::BORDER_BRIGHT));
blocks_container_ = new QWidget;
blocks_container_->setStyleSheet("background:transparent;");
@@ -89,17 +92,17 @@ void PortfolioHeatmap::build_ui() {
dp_layout->setSpacing(2);
detail_symbol_ = new QLabel;
- detail_symbol_->setStyleSheet(QString("color:%1; font-size:13px; font-weight:700;").arg(ui::colors::CYAN));
+ detail_symbol_->setStyleSheet(QString("color:%1; font-size:14px; font-weight:700;").arg(ui::colors::CYAN));
dp_layout->addWidget(detail_symbol_);
auto add_detail_row = [&](QLabel*& lbl, const QString& prefix) {
auto* row = new QHBoxLayout;
auto* lab = new QLabel(prefix);
- lab->setStyleSheet(QString("color:%1; font-size:9px;").arg(ui::colors::TEXT_TERTIARY));
+ lab->setStyleSheet(QString("color:%1; font-size:9px; font-weight:600;").arg(ui::colors::TEXT_TERTIARY));
row->addWidget(lab);
lbl = new QLabel("--");
lbl->setAlignment(Qt::AlignRight);
- lbl->setStyleSheet(QString("color:%1; font-size:9px; font-weight:600;").arg(ui::colors::TEXT_PRIMARY));
+ lbl->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700;").arg(ui::colors::TEXT_PRIMARY));
row->addWidget(lbl);
dp_layout->addLayout(row);
};
@@ -118,42 +121,42 @@ void PortfolioHeatmap::build_ui() {
// Risk gauge
auto* risk_header = new QLabel("RISK SCORE");
risk_header->setStyleSheet(
- QString("color:%1; font-size:8px; font-weight:700; letter-spacing:0.5px;").arg(ui::colors::TEXT_TERTIARY));
+ QString("color:%1; font-size:8px; font-weight:700; letter-spacing:1px;").arg(ui::colors::TEXT_TERTIARY));
layout->addWidget(risk_header);
risk_bar_ = new QWidget;
- risk_bar_->setFixedHeight(8);
- risk_bar_->setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
+ risk_bar_->setFixedHeight(10);
+ risk_bar_->setStyleSheet(QString("background:%1; border-radius:2px;").arg(ui::colors::BG_BASE));
layout->addWidget(risk_bar_);
risk_value_ = new QLabel("--");
risk_value_->setAlignment(Qt::AlignCenter);
- risk_value_->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700;").arg(ui::colors::TEXT_SECONDARY));
+ risk_value_->setStyleSheet(QString("color:%1; font-size:12px; font-weight:700;").arg(ui::colors::TEXT_SECONDARY));
layout->addWidget(risk_value_);
// Top movers
auto* movers_header = new QLabel("TOP MOVERS");
movers_header->setStyleSheet(
- QString("color:%1; font-size:8px; font-weight:700; letter-spacing:0.5px;").arg(ui::colors::TEXT_TERTIARY));
+ QString("color:%1; font-size:8px; font-weight:700; letter-spacing:1px;").arg(ui::colors::TEXT_TERTIARY));
layout->addWidget(movers_header);
top_gainer_ = new QLabel;
- top_gainer_->setStyleSheet(QString("color:%1; font-size:9px;").arg(ui::colors::POSITIVE));
+ top_gainer_->setStyleSheet(QString("color:%1; font-size:10px; font-weight:600;").arg(ui::colors::POSITIVE));
layout->addWidget(top_gainer_);
top_loser_ = new QLabel;
- top_loser_->setStyleSheet(QString("color:%1; font-size:9px;").arg(ui::colors::NEGATIVE));
+ top_loser_->setStyleSheet(QString("color:%1; font-size:10px; font-weight:600;").arg(ui::colors::NEGATIVE));
layout->addWidget(top_loser_);
// Quick stats
auto add_stat = [&](QLabel*& lbl, const QString& prefix) {
auto* row = new QHBoxLayout;
auto* lab = new QLabel(prefix);
- lab->setStyleSheet(QString("color:%1; font-size:8px;").arg(ui::colors::TEXT_TERTIARY));
+ lab->setStyleSheet(QString("color:%1; font-size:9px; font-weight:600;").arg(ui::colors::TEXT_TERTIARY));
row->addWidget(lab);
lbl = new QLabel("--");
lbl->setAlignment(Qt::AlignRight);
- lbl->setStyleSheet(QString("color:%1; font-size:9px; font-weight:600;").arg(ui::colors::TEXT_SECONDARY));
+ lbl->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700;").arg(ui::colors::TEXT_SECONDARY));
row->addWidget(lbl);
layout->addLayout(row);
};
@@ -259,13 +262,13 @@ void PortfolioHeatmap::rebuild_blocks() {
: QString("border:1px solid %1;").arg(ui::colors::BORDER_DIM);
block->setStyleSheet(QString("QPushButton { background:rgb(%1,%2,%3); %4"
- " text-align:left; padding:4px 6px;"
- " color:#ffffff; font-size:9px; font-weight:700; }"
+ " text-align:left; padding:4px 6px; border-radius:2px;"
+ " color:%6; font-size:10px; font-weight:700; }"
"QPushButton:hover { border-color:%5; }")
.arg(bg.red())
.arg(bg.green())
.arg(bg.blue())
- .arg(border_style, ui::colors::AMBER));
+ .arg(border_style, ui::colors::AMBER, ui::colors::TEXT_PRIMARY));
// Content
double chg_val = mode_ == portfolio::HeatmapMode::DayChange ? h.day_change_percent
@@ -374,4 +377,15 @@ void PortfolioHeatmap::update_top_movers() {
.arg(QString::number(worst->day_change_percent, 'f', 2)));
}
+void PortfolioHeatmap::refresh_theme() {
+ setStyleSheet(
+ QString("background:%1; border-right:1px solid %2;").arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
+
+ detail_panel_->setStyleSheet(
+ QString("background:%1; border:1px solid %2; padding:4px;").arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM));
+
+ // Rebuild blocks picks up new theme colors for borders/text
+ rebuild_blocks();
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/portfolio/PortfolioHeatmap.h b/fincept-qt/src/screens/portfolio/PortfolioHeatmap.h
index c31b70f64..07c8bc2b2 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioHeatmap.h
+++ b/fincept-qt/src/screens/portfolio/PortfolioHeatmap.h
@@ -19,6 +19,7 @@ class PortfolioHeatmap : public QWidget {
void set_metrics(const portfolio::ComputedMetrics& metrics);
void set_selected_symbol(const QString& symbol);
void set_currency(const QString& currency);
+ void refresh_theme();
signals:
void symbol_selected(QString symbol);
diff --git a/fincept-qt/src/screens/portfolio/PortfolioOrderPanel.cpp b/fincept-qt/src/screens/portfolio/PortfolioOrderPanel.cpp
index f8166ed5e..263110e04 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioOrderPanel.cpp
+++ b/fincept-qt/src/screens/portfolio/PortfolioOrderPanel.cpp
@@ -117,10 +117,10 @@ void PortfolioOrderPanel::build_ui() {
submit_btn_ = new QPushButton("OPEN BUY ORDER");
submit_btn_->setFixedHeight(32);
submit_btn_->setCursor(Qt::PointingHandCursor);
- submit_btn_->setStyleSheet(QString("QPushButton { background:%1; color:#000; border:none;"
+ submit_btn_->setStyleSheet(QString("QPushButton { background:%1; color:%2; border:none;"
" font-size:10px; font-weight:700; letter-spacing:0.5px; }"
"QPushButton:hover { opacity:0.9; }")
- .arg(ui::colors::POSITIVE));
+ .arg(ui::colors::POSITIVE, ui::colors::BG_BASE));
connect(submit_btn_, &QPushButton::clicked, this, [this]() {
if (side_ == "BUY")
emit buy_submitted();
diff --git a/fincept-qt/src/screens/portfolio/PortfolioPerfChart.cpp b/fincept-qt/src/screens/portfolio/PortfolioPerfChart.cpp
index 064b35e06..f1ba8c50a 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioPerfChart.cpp
+++ b/fincept-qt/src/screens/portfolio/PortfolioPerfChart.cpp
@@ -132,25 +132,26 @@ void PortfolioPerfChart::build_ui() {
// Header: PERFORMANCE + period buttons
auto* header = new QHBoxLayout;
- header->setContentsMargins(8, 4, 8, 4);
+ header->setContentsMargins(10, 6, 10, 4);
auto* title = new QLabel("PERFORMANCE");
title->setStyleSheet(
- QString("color:%1; font-size:10px; font-weight:700; letter-spacing:1px;").arg(ui::colors::TEXT_SECONDARY));
+ QString("color:%1; font-size:11px; font-weight:700; letter-spacing:1.5px;").arg(ui::colors::TEXT_SECONDARY));
header->addWidget(title);
header->addStretch();
for (const auto& p : kPeriods) {
auto* btn = new QPushButton(p);
- btn->setFixedSize(28, 18);
+ btn->setFixedSize(32, 22);
btn->setCheckable(true);
btn->setCursor(Qt::PointingHandCursor);
- btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:none;"
- " font-size:8px; font-weight:700; border-radius:2px; }"
- "QPushButton:checked { color:#000; background:%2;"
- " border:none; }"
- "QPushButton:hover:!checked { color:%3; }")
- .arg(ui::colors::TEXT_TERTIARY, ui::colors::AMBER, ui::colors::TEXT_PRIMARY));
+ btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid transparent;"
+ " font-size:9px; font-weight:700; border-radius:2px; }"
+ "QPushButton:checked { color:%4; background:%2;"
+ " border:1px solid %2; }"
+ "QPushButton:hover:!checked { color:%3; border-color:%5; }")
+ .arg(ui::colors::TEXT_TERTIARY, ui::colors::AMBER, ui::colors::TEXT_PRIMARY,
+ ui::colors::BG_BASE, ui::colors::BORDER_MED));
if (p == current_period_)
btn->setChecked(true);
@@ -163,16 +164,16 @@ void PortfolioPerfChart::build_ui() {
// Benchmark toggle
benchmark_btn_ = new QPushButton("SPY");
- benchmark_btn_->setFixedSize(28, 18);
+ benchmark_btn_->setFixedSize(34, 22);
benchmark_btn_->setCheckable(true);
benchmark_btn_->setCursor(Qt::PointingHandCursor);
benchmark_btn_->setToolTip("Overlay SPY benchmark (normalised to portfolio start value)");
benchmark_btn_->setStyleSheet(
QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"
- " font-size:8px; font-weight:700; border-radius:2px; }"
- "QPushButton:checked { color:#000; background:%2; border:none; }"
+ " font-size:9px; font-weight:700; border-radius:2px; }"
+ "QPushButton:checked { color:%4; background:%2; border:1px solid %2; }"
"QPushButton:hover:!checked { color:%3; border-color:%3; }")
- .arg(ui::colors::CYAN, ui::colors::CYAN, ui::colors::TEXT_PRIMARY));
+ .arg(ui::colors::CYAN, ui::colors::CYAN, ui::colors::TEXT_PRIMARY, ui::colors::BG_BASE));
connect(benchmark_btn_, &QPushButton::clicked, this, [this]() {
show_benchmark_ = benchmark_btn_->isChecked();
update_chart();
@@ -184,8 +185,8 @@ void PortfolioPerfChart::build_ui() {
// Info bar: period change, total return, NAV
auto* info_bar = new QHBoxLayout;
- info_bar->setContentsMargins(8, 0, 8, 4);
- info_bar->setSpacing(12);
+ info_bar->setContentsMargins(10, 2, 10, 6);
+ info_bar->setSpacing(14);
period_change_label_ = new QLabel;
period_change_label_->setStyleSheet(
@@ -193,7 +194,7 @@ void PortfolioPerfChart::build_ui() {
info_bar->addWidget(period_change_label_);
auto* sep1 = new QLabel("|");
- sep1->setStyleSheet(QString("color:%1;").arg(ui::colors::BORDER_MED));
+ sep1->setStyleSheet(QString("color:%1; font-size:11px;").arg(ui::colors::BORDER_MED));
info_bar->addWidget(sep1);
total_return_label_ = new QLabel;
@@ -202,7 +203,7 @@ void PortfolioPerfChart::build_ui() {
info_bar->addWidget(total_return_label_);
auto* sep2 = new QLabel("|");
- sep2->setStyleSheet(QString("color:%1;").arg(ui::colors::BORDER_MED));
+ sep2->setStyleSheet(QString("color:%1; font-size:11px;").arg(ui::colors::BORDER_MED));
info_bar->addWidget(sep2);
nav_label_ = new QLabel;
@@ -349,7 +350,7 @@ void PortfolioPerfChart::update_chart() {
period_change_label_->setText(
QString("%1 — (no history yet, showing NAV only)").arg(current_period_));
period_change_label_->setStyleSheet(
- QString("color:%1; font-size:10px; font-weight:500;").arg(ui::colors::TEXT_TERTIARY));
+ QString("color:%1; font-size:11px; font-weight:500;").arg(ui::colors::TEXT_TERTIARY));
}
// ── Period P&L from the series endpoints ─────────────────────────────────
@@ -379,19 +380,24 @@ void PortfolioPerfChart::update_chart() {
x_axis->setFormat("dd MMM");
x_axis->setTickCount(5);
x_axis->setLabelsColor(QColor(ui::colors::TEXT_TERTIARY()));
- x_axis->setGridLineColor(QColor(ui::colors::BORDER_DIM()));
- x_axis->setLinePen(QPen(QColor(ui::colors::BORDER_DIM())));
- x_axis->setLabelsFont(QFont("monospace", 7));
+ x_axis->setGridLineVisible(false);
+ x_axis->setMinorGridLineVisible(false);
+ x_axis->setLinePen(QPen(QColor(ui::colors::BORDER_DIM()), 1));
+ x_axis->setLabelsFont(QFont(ui::fonts::DATA_FAMILY(), 8));
double padding = std::max((max_val - min_val) * 0.08, max_val * 0.01);
auto* y_axis = new QValueAxis;
y_axis->setRange(min_val - padding, max_val + padding);
y_axis->setLabelFormat("%.0f");
- y_axis->setTickCount(4);
+ y_axis->setTickCount(5);
y_axis->setLabelsColor(QColor(ui::colors::TEXT_TERTIARY()));
- y_axis->setGridLineColor(QColor(ui::colors::BORDER_DIM()));
- y_axis->setLinePen(QPen(QColor(ui::colors::BORDER_DIM())));
- y_axis->setLabelsFont(QFont("monospace", 7));
+ {
+ QPen grid_pen(QColor(ui::colors::BORDER_DIM()), 1, Qt::DotLine);
+ y_axis->setGridLinePen(grid_pen);
+ }
+ y_axis->setMinorGridLineVisible(false);
+ y_axis->setLinePen(QPen(QColor(ui::colors::BORDER_DIM()), 1));
+ y_axis->setLabelsFont(QFont(ui::fonts::DATA_FAMILY(), 8));
chart->addAxis(x_axis, Qt::AlignBottom);
chart->addAxis(y_axis, Qt::AlignLeft);
@@ -482,4 +488,35 @@ void PortfolioPerfChart::update_chart() {
QString("NAV %1 %2").arg(currency_).arg(QString::number(last_val, 'f', 2)));
}
+void PortfolioPerfChart::refresh_theme() {
+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
+
+ const QString bsz = QString::number(ui::fonts::font_px(-3));
+ // Re-style period buttons
+ for (auto* btn : period_btns_) {
+ btn->setStyleSheet(QString("QPushButton { background:transparent; color:%1; border:1px solid transparent;"
+ " font-size:" + bsz + "px; font-weight:700; border-radius:2px; }"
+ "QPushButton:checked { color:%4; background:%2;"
+ " border:1px solid %2; }"
+ "QPushButton:hover:!checked { color:%3; border-color:%5; }")
+ .arg(ui::colors::TEXT_TERTIARY, ui::colors::AMBER, ui::colors::TEXT_PRIMARY,
+ ui::colors::BG_BASE, ui::colors::BORDER_MED));
+ }
+ if (benchmark_btn_) {
+ benchmark_btn_->setStyleSheet(
+ QString("QPushButton { background:transparent; color:%1; border:1px solid %1;"
+ " font-size:" + bsz + "px; font-weight:700; border-radius:2px; }"
+ "QPushButton:checked { color:%4; background:%2; border:1px solid %2; }"
+ "QPushButton:hover:!checked { color:%3; border-color:%3; }")
+ .arg(ui::colors::CYAN, ui::colors::CYAN, ui::colors::TEXT_PRIMARY, ui::colors::BG_BASE));
+ }
+
+ // Chart background
+ if (chart_view_ && chart_view_->chart())
+ chart_view_->chart()->setBackgroundBrush(QColor(ui::colors::BG_BASE()));
+
+ // Rebuild chart with current theme colors (axes, line colors, etc.)
+ update_chart();
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/portfolio/PortfolioPerfChart.h b/fincept-qt/src/screens/portfolio/PortfolioPerfChart.h
index 126192240..30fe5b495 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioPerfChart.h
+++ b/fincept-qt/src/screens/portfolio/PortfolioPerfChart.h
@@ -44,6 +44,7 @@ class PortfolioPerfChart : public QWidget {
void set_currency(const QString& currency);
/// Feed real SPY close prices for benchmark overlay.
void set_spy_history(const QStringList& dates, const QVector<double>& closes);
+ void refresh_theme();
private:
void build_ui();
diff --git a/fincept-qt/src/screens/portfolio/PortfolioScreen.cpp b/fincept-qt/src/screens/portfolio/PortfolioScreen.cpp
index 3b376036c..fe39d4c3d 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioScreen.cpp
+++ b/fincept-qt/src/screens/portfolio/PortfolioScreen.cpp
@@ -1,6 +1,7 @@
// src/screens/portfolio/PortfolioScreen.cpp
#include "screens/portfolio/PortfolioScreen.h"
+#include "core/session/ScreenStateManager.h"
#include "screens/portfolio/PortfolioAgentPanel.h"
#include "screens/portfolio/PortfolioAiPanel.h"
#include "screens/portfolio/PortfolioBlotter.h"
@@ -35,6 +36,7 @@ namespace fincept::screens {
PortfolioScreen::PortfolioScreen(QWidget* parent) : QWidget(parent) {
build_ui();
+ refresh_theme(); // Apply theme-aware font sizes and colors on first build
// Connect to PortfolioService signals
auto& svc = services::PortfolioService::instance();
@@ -91,6 +93,10 @@ PortfolioScreen::PortfolioScreen(QWidget* parent) : QWidget(parent) {
// Load portfolios
svc.load_portfolios();
+
+ // Theme change: refresh all child component styles
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed,
+ this, [this](const ui::ThemeTokens&) { refresh_theme(); });
}
void PortfolioScreen::build_ui() {
@@ -268,10 +274,10 @@ QWidget* PortfolioScreen::build_empty_state() {
auto* create_btn = new QPushButton("CREATE NEW");
create_btn->setFixedSize(120, 32);
create_btn->setCursor(Qt::PointingHandCursor);
- create_btn->setStyleSheet(QString("QPushButton { background:%1; color:#000; border:none;"
+ create_btn->setStyleSheet(QString("QPushButton { background:%1; color:%3; border:none;"
" font-size:10px; font-weight:700; letter-spacing:0.5px; }"
"QPushButton:hover { background:%2; }")
- .arg(ui::colors::AMBER, ui::colors::WARNING));
+ .arg(ui::colors::AMBER, ui::colors::WARNING, ui::colors::BG_BASE));
connect(create_btn, &QPushButton::clicked, this, &PortfolioScreen::on_create_requested);
btn_row->addWidget(create_btn);
@@ -399,6 +405,7 @@ void PortfolioScreen::on_portfolio_selected(const QString& id) {
return;
selected_id_ = id;
+ ScreenStateManager::instance().notify_changed(this);
summary_loaded_ = false;
active_detail_ = std::nullopt;
command_bar_->set_detail_view(std::nullopt);
@@ -624,10 +631,11 @@ QWidget* PortfolioScreen::build_main_view() {
top_split->addWidget(perf_chart_);
top_split->addWidget(sector_panel_);
- top_split->setStretchFactor(0, 3); // 60%
- top_split->setStretchFactor(1, 2); // 40%
+ top_split->setStretchFactor(0, 7); // ~70%
+ top_split->setStretchFactor(1, 3); // ~30%
+ sector_panel_->setMinimumWidth(180);
- center_layout->addWidget(top_split, 42); // 42% of vertical space
+ center_layout->addWidget(top_split, 40); // 40% of vertical space
// Separator
auto* sep = new QWidget;
@@ -706,10 +714,11 @@ QWidget* PortfolioScreen::build_main_view() {
// Transaction history panel below blotter
txn_panel_ = new PortfolioTxnPanel;
+ txn_panel_->setMinimumHeight(80);
+ txn_panel_->setMaximumHeight(160);
blotter_layout->addWidget(txn_panel_);
- txn_panel_->setFixedHeight(130);
- center_layout->addWidget(blotter_section, 58); // 58% of vertical space
+ center_layout->addWidget(blotter_section, 60); // 60% of vertical space
h_layout->addWidget(center, 1); // center takes remaining space
@@ -764,6 +773,17 @@ void PortfolioScreen::update_main_view_data() {
}
}
+void PortfolioScreen::refresh_theme() {
+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
+
+ if (command_bar_) command_bar_->refresh_theme();
+ if (stats_ribbon_) stats_ribbon_->refresh_theme();
+ if (perf_chart_) perf_chart_->refresh_theme();
+ if (heatmap_) heatmap_->refresh_theme();
+ if (blotter_) blotter_->refresh_theme();
+ if (txn_panel_) txn_panel_->refresh_theme();
+}
+
void PortfolioScreen::on_symbol_selected(const QString& symbol) {
selected_symbol_ = symbol;
if (heatmap_)
diff --git a/fincept-qt/src/screens/portfolio/PortfolioScreen.h b/fincept-qt/src/screens/portfolio/PortfolioScreen.h
index d85f29b7a..7a2a68b29 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioScreen.h
+++ b/fincept-qt/src/screens/portfolio/PortfolioScreen.h
@@ -60,6 +60,7 @@ class PortfolioScreen : public QWidget, public IStatefulScreen {
private:
void build_ui();
+ void refresh_theme();
QWidget* build_empty_state();
QWidget* build_loading_state();
QWidget* build_main_view();
diff --git a/fincept-qt/src/screens/portfolio/PortfolioSectorPanel.cpp b/fincept-qt/src/screens/portfolio/PortfolioSectorPanel.cpp
index 7e28f2b35..e8cf91f23 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioSectorPanel.cpp
+++ b/fincept-qt/src/screens/portfolio/PortfolioSectorPanel.cpp
@@ -533,7 +533,7 @@ void PortfolioSectorPanel::update_correlation() {
bg = QColor(220, 38, 38, static_cast<int>(std::abs(corr) * 140 + 20));
}
- const char* text_color = is_diag ? "#000000" : ui::colors::TEXT_PRIMARY;
+ const char* text_color = is_diag ? ui::colors::BG_BASE : ui::colors::TEXT_PRIMARY;
cell->setStyleSheet(
QString("background:rgba(%1,%2,%3,%4); color:%5;"
"font-size:7px; font-weight:600;")
diff --git a/fincept-qt/src/screens/portfolio/PortfolioSparkline.cpp b/fincept-qt/src/screens/portfolio/PortfolioSparkline.cpp
index 0d4a5dfb3..7ce74fa0f 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioSparkline.cpp
+++ b/fincept-qt/src/screens/portfolio/PortfolioSparkline.cpp
@@ -1,6 +1,8 @@
// src/screens/portfolio/PortfolioSparkline.cpp
#include "screens/portfolio/PortfolioSparkline.h"
+#include "ui/theme/Theme.h"
+
#include <QPainter>
#include <algorithm>
@@ -11,6 +13,10 @@ PortfolioSparkline::PortfolioSparkline(int w, int h, QWidget* parent) : QWidget(
if (w > 0 && h > 0)
setFixedSize(w, h);
setAttribute(Qt::WA_OpaquePaintEvent);
+ connect(&ui::ThemeManager::instance(), &ui::ThemeManager::theme_changed, this, [this]() {
+ dirty_ = true;
+ update();
+ });
}
void PortfolioSparkline::set_data(const QVector<double>& data) {
@@ -39,7 +45,7 @@ void PortfolioSparkline::resizeEvent(QResizeEvent* event) {
void PortfolioSparkline::rebuild_pixmap() {
cached_ = QPixmap(size());
- cached_.fill(QColor("#0d0d0d")); // match BG_BASE
+ cached_.fill(QColor(ui::colors::BG_BASE()));
if (data_.size() < 2) {
dirty_ = false;
diff --git a/fincept-qt/src/screens/portfolio/PortfolioSparkline.h b/fincept-qt/src/screens/portfolio/PortfolioSparkline.h
index 952265a30..e50c771eb 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioSparkline.h
+++ b/fincept-qt/src/screens/portfolio/PortfolioSparkline.h
@@ -1,5 +1,7 @@
// src/screens/portfolio/PortfolioSparkline.h
#pragma once
+#include "ui/theme/Theme.h"
+
#include <QColor>
#include <QPixmap>
#include <QVector>
@@ -25,7 +27,7 @@ class PortfolioSparkline : public QWidget {
void rebuild_pixmap();
QVector<double> data_;
- QColor color_ = QColor("#16a34a");
+ QColor color_ = QColor(ui::colors::POSITIVE());
QPixmap cached_;
bool dirty_ = true;
};
diff --git a/fincept-qt/src/screens/portfolio/PortfolioStatsRibbon.cpp b/fincept-qt/src/screens/portfolio/PortfolioStatsRibbon.cpp
index 6f80cf0d4..3bb3255e7 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioStatsRibbon.cpp
+++ b/fincept-qt/src/screens/portfolio/PortfolioStatsRibbon.cpp
@@ -3,7 +3,9 @@
#include "ui/theme/Theme.h"
+#include <QFrame>
#include <QHBoxLayout>
+#include <QScrollArea>
#include <QVBoxLayout>
#include <cmath>
@@ -14,11 +16,25 @@ PortfolioStatsRibbon::PortfolioStatsRibbon(QWidget* parent) : QWidget(parent) {
setFixedHeight(52);
setObjectName("portfolioStatsRibbon");
setStyleSheet(QString("#portfolioStatsRibbon { background:%1; border-bottom:1px solid %2; }")
- .arg(ui::colors::BG_BASE, ui::colors::BORDER_DIM));
-
- auto* layout = new QHBoxLayout(this);
- layout->setContentsMargins(0, 0, 0, 0);
- layout->setSpacing(0);
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
+
+ auto* outer = new QHBoxLayout(this);
+ outer->setContentsMargins(0, 0, 0, 0);
+ outer->setSpacing(0);
+
+ // Scroll area prevents horizontal overflow
+ auto* scroll = new QScrollArea;
+ scroll->setWidgetResizable(true);
+ scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ scroll->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ scroll->setFrameShape(QFrame::NoFrame);
+ scroll->setStyleSheet("QScrollArea { background:transparent; border:none; }");
+
+ auto* inner = new QWidget;
+ inner->setStyleSheet("background:transparent;");
+ cells_layout_ = new QHBoxLayout(inner);
+ cells_layout_->setContentsMargins(0, 0, 0, 0);
+ cells_layout_->setSpacing(0);
total_value_ = add_cell("TOTAL VALUE", ui::colors::WARNING);
total_value_.container->setToolTip(
@@ -88,13 +104,17 @@ PortfolioStatsRibbon::PortfolioStatsRibbon(QWidget* parent) : QWidget(parent) {
"single-day loss 95% of the time based on historical returns.\n"
"E.g., VaR = -2.5% means you should not lose more than\n"
"2.5% on 95% of trading days.");
+
+ scroll->setWidget(inner);
+ outer->addWidget(scroll);
}
PortfolioStatsRibbon::MetricCell PortfolioStatsRibbon::add_cell(const QString& label_text, const char* value_color) {
auto* container = new QWidget;
+ container->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
auto* vlayout = new QVBoxLayout(container);
- vlayout->setContentsMargins(8, 4, 8, 4);
+ vlayout->setContentsMargins(6, 3, 6, 3);
vlayout->setSpacing(0);
MetricCell cell;
@@ -102,21 +122,21 @@ PortfolioStatsRibbon::MetricCell PortfolioStatsRibbon::add_cell(const QString& l
cell.label = new QLabel(label_text);
cell.label->setStyleSheet(
- QString("color:%1; font-size:8px; font-weight:600; letter-spacing:0.5px;").arg(ui::colors::TEXT_TERTIARY));
+ QString("color:%1; font-size:8px; font-weight:700; letter-spacing:1px;").arg(ui::colors::TEXT_TERTIARY));
vlayout->addWidget(cell.label);
cell.value = new QLabel("--");
- cell.value->setStyleSheet(QString("color:%1; font-size:13px; font-weight:700;").arg(value_color));
+ cell.value->setStyleSheet(QString("color:%1; font-size:%2px; font-weight:700;").arg(value_color).arg(ui::fonts::font_px(0)));
vlayout->addWidget(cell.value);
cell.sub = new QLabel;
- cell.sub->setStyleSheet(QString("color:%1; font-size:8px;").arg(ui::colors::TEXT_TERTIARY));
+ cell.sub->setStyleSheet(QString("color:%1; font-size:9px;").arg(ui::colors::TEXT_TERTIARY));
vlayout->addWidget(cell.sub);
// Right border separator
container->setStyleSheet(QString("border-right:1px solid %1;").arg(ui::colors::BORDER_DIM));
- static_cast<QHBoxLayout*>(layout())->addWidget(container, 1);
+ cells_layout_->addWidget(container, 1);
return cell;
}
@@ -126,7 +146,7 @@ void PortfolioStatsRibbon::set_summary(const portfolio::PortfolioSummary& s) {
auto color = [](double v) -> const char* { return v >= 0 ? ui::colors::POSITIVE : ui::colors::NEGATIVE; };
auto set_val_color = [](MetricCell& c, const QString& text, const char* col) {
c.value->setText(text);
- c.value->setStyleSheet(QString("color:%1; font-size:13px; font-weight:700;").arg(col));
+ c.value->setStyleSheet(QString("color:%1; font-size:%2px; font-weight:700;").arg(col).arg(ui::fonts::font_px(0)));
};
set_val_color(total_value_, fmt(s.total_market_value), ui::colors::WARNING);
@@ -171,7 +191,7 @@ void PortfolioStatsRibbon::set_metrics(const portfolio::ComputedMetrics& m) {
double rs = *m.risk_score;
const char* rs_color = rs < 30 ? ui::colors::POSITIVE : rs < 60 ? ui::colors::WARNING : ui::colors::NEGATIVE;
risk_score_.value->setText(QString::number(rs, 'f', 0));
- risk_score_.value->setStyleSheet(QString("color:%1; font-size:13px; font-weight:700;").arg(rs_color));
+ risk_score_.value->setStyleSheet(QString("color:%1; font-size:%2px; font-weight:700;").arg(rs_color).arg(ui::fonts::font_px(0)));
} else {
risk_score_.value->setText("--");
}
@@ -180,4 +200,36 @@ void PortfolioStatsRibbon::set_metrics(const portfolio::ComputedMetrics& m) {
var95_.sub->setText("1-Day");
}
+void PortfolioStatsRibbon::refresh_theme() {
+ setStyleSheet(QString("#portfolioStatsRibbon { background:%1; border-bottom:1px solid %2; }")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
+
+ const QString lsz = QString::number(ui::fonts::font_px(-4));
+ const QString vsz = QString::number(ui::fonts::font_px(0));
+ const QString ssz = QString::number(ui::fonts::font_px(-3));
+
+ auto refresh_cell = [&](MetricCell& c) {
+ if (c.label)
+ c.label->setStyleSheet(
+ QString("color:%1; font-size:" + lsz + "px; font-weight:700; letter-spacing:1px;").arg(ui::colors::TEXT_TERTIARY));
+ if (c.sub)
+ c.sub->setStyleSheet(QString("color:%1; font-size:" + ssz + "px;").arg(ui::colors::TEXT_TERTIARY));
+ if (c.container)
+ c.container->setStyleSheet(QString("border-right:1px solid %1;").arg(ui::colors::BORDER_DIM));
+ };
+
+ refresh_cell(total_value_);
+ refresh_cell(pnl_);
+ refresh_cell(day_change_);
+ refresh_cell(cost_basis_);
+ refresh_cell(positions_);
+ refresh_cell(concentration_);
+ refresh_cell(sharpe_);
+ refresh_cell(beta_);
+ refresh_cell(volatility_);
+ refresh_cell(max_drawdown_);
+ refresh_cell(risk_score_);
+ refresh_cell(var95_);
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/portfolio/PortfolioStatsRibbon.h b/fincept-qt/src/screens/portfolio/PortfolioStatsRibbon.h
index 5b537d1c2..8148f61b6 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioStatsRibbon.h
+++ b/fincept-qt/src/screens/portfolio/PortfolioStatsRibbon.h
@@ -2,6 +2,7 @@
#pragma once
#include "screens/portfolio/PortfolioTypes.h"
+#include <QHBoxLayout>
#include <QLabel>
#include <QWidget>
@@ -14,6 +15,7 @@ class PortfolioStatsRibbon : public QWidget {
void set_summary(const portfolio::PortfolioSummary& summary);
void set_metrics(const portfolio::ComputedMetrics& metrics);
+ void refresh_theme();
private:
struct MetricCell {
@@ -25,6 +27,7 @@ class PortfolioStatsRibbon : public QWidget {
MetricCell add_cell(const QString& label_text, const char* value_color);
+ QHBoxLayout* cells_layout_ = nullptr;
MetricCell total_value_;
MetricCell pnl_;
MetricCell day_change_;
diff --git a/fincept-qt/src/screens/portfolio/PortfolioTxnPanel.cpp b/fincept-qt/src/screens/portfolio/PortfolioTxnPanel.cpp
index 988933739..b4a60cf17 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioTxnPanel.cpp
+++ b/fincept-qt/src/screens/portfolio/PortfolioTxnPanel.cpp
@@ -23,17 +23,17 @@ void PortfolioTxnPanel::build_ui() {
// Header bar
auto* header = new QWidget;
- header->setFixedHeight(24);
+ header->setFixedHeight(28);
header->setStyleSheet(
- QString("background:%1; border-bottom:1px solid %2;")
+ QString("background:%1; border-top:1px solid %2; border-bottom:1px solid %2;")
.arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* hl = new QHBoxLayout(header);
- hl->setContentsMargins(8, 0, 8, 0);
+ hl->setContentsMargins(10, 0, 10, 0);
hl->setSpacing(8);
auto* title = new QLabel("TRANSACTION HISTORY");
title->setStyleSheet(
- QString("color:%1; font-size:9px; font-weight:700; letter-spacing:0.5px;")
+ QString("color:%1; font-size:10px; font-weight:700; letter-spacing:1px;")
.arg(ui::colors::TEXT_SECONDARY));
hl->addWidget(title);
@@ -41,7 +41,7 @@ void PortfolioTxnPanel::build_ui() {
count_label_ = new QLabel;
count_label_->setStyleSheet(
- QString("color:%1; font-size:9px;").arg(ui::colors::TEXT_TERTIARY));
+ QString("color:%1; font-size:9px; font-weight:600;").arg(ui::colors::TEXT_TERTIARY));
hl->addWidget(count_label_);
layout->addWidget(header);
@@ -67,20 +67,21 @@ void PortfolioTxnPanel::build_ui() {
" background:%1; color:%2; border:none;"
" font-size:11px; font-family:%3; gridline-color:%4;"
"}"
- "QTableWidget::item { padding:2px 6px; border-bottom:1px solid %4; }"
+ "QTableWidget::item { padding:4px 8px; border-bottom:1px solid %4; }"
"QTableWidget::item:selected { background:%5; color:%2; }"
"QHeaderView::section {"
" background:%6; color:%7; border:none;"
- " border-bottom:1px solid %4; font-size:9px; font-weight:700;"
- " letter-spacing:0.5px; padding:3px 6px; }"
- "QScrollBar:vertical { background:%1; width:6px; }"
- "QScrollBar::handle:vertical { background:%4; border-radius:3px; }"
+ " border-bottom:2px solid %4; border-right:1px solid %4;"
+ " font-size:10px; font-weight:700;"
+ " letter-spacing:0.5px; padding:4px 8px; }"
+ "QScrollBar:vertical { background:%1; width:5px; }"
+ "QScrollBar::handle:vertical { background:%4; min-height:20px; }"
"QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0px; }")
.arg(ui::colors::BG_BASE, ui::colors::TEXT_PRIMARY, ui::fonts::DATA_FAMILY,
ui::colors::BORDER_DIM, ui::colors::BG_HOVER,
ui::colors::BG_SURFACE, ui::colors::TEXT_TERTIARY));
- table_->verticalHeader()->setDefaultSectionSize(22);
+ table_->verticalHeader()->setDefaultSectionSize(24);
layout->addWidget(table_, 1);
}
@@ -157,4 +158,31 @@ void PortfolioTxnPanel::populate() {
count_label_->setText(QString("%1 transactions").arg(txns_.size()));
}
+void PortfolioTxnPanel::refresh_theme() {
+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
+
+ const QString bsz = QString::number(ui::fonts::font_px(0));
+ const QString hsz = QString::number(ui::fonts::font_px(-2));
+ table_->setStyleSheet(
+ QString("QTableWidget {"
+ " background:%1; color:%2; border:none;"
+ " font-size:" + bsz + "px; font-family:%3; gridline-color:%4;"
+ "}"
+ "QTableWidget::item { padding:4px 8px; border-bottom:1px solid %4; }"
+ "QTableWidget::item:selected { background:%5; color:%2; }"
+ "QHeaderView::section {"
+ " background:%6; color:%7; border:none;"
+ " border-bottom:2px solid %4; border-right:1px solid %4;"
+ " font-size:" + hsz + "px; font-weight:700;"
+ " letter-spacing:0.5px; padding:4px 8px; }"
+ "QScrollBar:vertical { background:%1; width:5px; }"
+ "QScrollBar::handle:vertical { background:%4; min-height:20px; }"
+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height:0px; }")
+ .arg(ui::colors::BG_BASE, ui::colors::TEXT_PRIMARY, ui::fonts::DATA_FAMILY,
+ ui::colors::BORDER_DIM, ui::colors::BG_HOVER,
+ ui::colors::BG_SURFACE, ui::colors::TEXT_TERTIARY));
+
+ populate();
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/portfolio/PortfolioTxnPanel.h b/fincept-qt/src/screens/portfolio/PortfolioTxnPanel.h
index 51a9b7e91..290291c98 100644
--- a/fincept-qt/src/screens/portfolio/PortfolioTxnPanel.h
+++ b/fincept-qt/src/screens/portfolio/PortfolioTxnPanel.h
@@ -20,6 +20,7 @@ class PortfolioTxnPanel : public QWidget {
/// Clear the table (e.g. when portfolio changes).
void clear();
+ void refresh_theme();
private:
void build_ui();
diff --git a/fincept-qt/src/screens/portfolio/views/AnalyticsSectorsView.cpp b/fincept-qt/src/screens/portfolio/views/AnalyticsSectorsView.cpp
index 201052bf7..555c70e48 100644
--- a/fincept-qt/src/screens/portfolio/views/AnalyticsSectorsView.cpp
+++ b/fincept-qt/src/screens/portfolio/views/AnalyticsSectorsView.cpp
@@ -341,7 +341,7 @@ void AnalyticsSectorsView::update_correlation() {
else
bg = QColor(220, 38, 38, static_cast<int>(std::abs(corr) * 140));
- const char* tc = (r == c) ? "#000" : ui::colors::TEXT_PRIMARY;
+ const char* tc = (r == c) ? ui::colors::BG_BASE : ui::colors::TEXT_PRIMARY;
cell->setStyleSheet(QString("background:rgba(%1,%2,%3,%4); color:%5;"
"font-size:8px; font-weight:600;")
.arg(bg.red())
diff --git a/fincept-qt/src/screens/portfolio/views/CustomIndexView.cpp b/fincept-qt/src/screens/portfolio/views/CustomIndexView.cpp
index 6384d8f56..0e890b6e7 100644
--- a/fincept-qt/src/screens/portfolio/views/CustomIndexView.cpp
+++ b/fincept-qt/src/screens/portfolio/views/CustomIndexView.cpp
@@ -143,10 +143,10 @@ QWidget* CustomIndexView::build_create_panel() {
create_btn_->setFixedHeight(26);
create_btn_->setCursor(Qt::PointingHandCursor);
create_btn_->setStyleSheet(
- QString("QPushButton { background:%1; color:#000; border:none;"
+ QString("QPushButton { background:%1; color:%3; border:none;"
" padding:0 16px; font-size:10px; font-weight:700; }"
"QPushButton:hover { background:%2; }")
- .arg(ui::colors::AMBER, ui::colors::WARNING));
+ .arg(ui::colors::AMBER, ui::colors::WARNING, ui::colors::BG_BASE));
connect(create_btn_, &QPushButton::clicked, this, &CustomIndexView::create_index);
config->addWidget(create_btn_);
@@ -210,10 +210,10 @@ QWidget* CustomIndexView::build_index_list_panel() {
delete_btn_->setFixedHeight(26);
delete_btn_->setCursor(Qt::PointingHandCursor);
delete_btn_->setStyleSheet(
- QString("QPushButton { background:%1; color:#fff; border:none;"
+ QString("QPushButton { background:%1; color:%2; border:none;"
" padding:0 14px; font-size:9px; font-weight:700; }"
- "QPushButton:hover { background:#dc2626; }")
- .arg(ui::colors::NEGATIVE));
+ "QPushButton:hover { background:%1; }")
+ .arg(ui::colors::NEGATIVE, ui::colors::TEXT_PRIMARY));
connect(delete_btn_, &QPushButton::clicked, this, &CustomIndexView::delete_selected_index);
header_row->addWidget(delete_btn_);
layout->addLayout(header_row);
diff --git a/fincept-qt/src/screens/portfolio/views/PortfolioOptimizationView.cpp b/fincept-qt/src/screens/portfolio/views/PortfolioOptimizationView.cpp
index 1196fdf1a..0dfa59d3e 100644
--- a/fincept-qt/src/screens/portfolio/views/PortfolioOptimizationView.cpp
+++ b/fincept-qt/src/screens/portfolio/views/PortfolioOptimizationView.cpp
@@ -139,12 +139,12 @@ QWidget* PortfolioOptimizationView::build_optimize_tab() {
run_btn_->setFixedHeight(26);
run_btn_->setCursor(Qt::PointingHandCursor);
run_btn_->setStyleSheet(
- QString("QPushButton { background:%1; color:#000; border:none;"
+ QString("QPushButton { background:%1; color:%5; border:none;"
" padding:0 16px; font-size:10px; font-weight:700; }"
"QPushButton:hover { background:%2; }"
"QPushButton:disabled { background:%3; color:%4; }")
.arg(ui::colors::AMBER, ui::colors::WARNING,
- ui::colors::BG_RAISED, ui::colors::TEXT_TERTIARY));
+ ui::colors::BG_RAISED, ui::colors::TEXT_TERTIARY, ui::colors::BG_BASE));
connect(run_btn_, &QPushButton::clicked, this, &PortfolioOptimizationView::run_optimization);
config->addWidget(run_btn_);
diff --git a/fincept-qt/src/screens/profile/ProfileScreen.cpp b/fincept-qt/src/screens/profile/ProfileScreen.cpp
index 0b852c7ba..38048fbe9 100644
--- a/fincept-qt/src/screens/profile/ProfileScreen.cpp
+++ b/fincept-qt/src/screens/profile/ProfileScreen.cpp
@@ -19,23 +19,27 @@
namespace fincept::screens {
static const char* MF = "font-family:'Consolas',monospace;";
-static const char* PANEL_SS = "background:#0a0a0a;border:1px solid #1a1a1a;";
-static const char* HDR_SS = "background:#111111;border-bottom:1px solid #1a1a1a;";
+static QString PANEL_SS() {
+ return QString("background:%1;border:1px solid %2;").arg(ui::colors::BG_BASE, ui::colors::BORDER_DIM);
+}
+static QString HDR_SS() {
+ return QString("background:%1;border-bottom:1px solid %2;").arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM);
+}
QWidget* ProfileScreen::make_panel(const QString& title) {
auto* w = new QWidget;
- w->setStyleSheet(PANEL_SS);
+ w->setStyleSheet(PANEL_SS());
auto* vl = new QVBoxLayout(w);
vl->setContentsMargins(0, 0, 0, 0);
vl->setSpacing(0);
auto* hdr = new QWidget;
hdr->setFixedHeight(34);
- hdr->setStyleSheet(HDR_SS);
+ hdr->setStyleSheet(HDR_SS());
auto* hl = new QHBoxLayout(hdr);
hl->setContentsMargins(12, 0, 12, 0);
auto* t = new QLabel(title);
t->setStyleSheet(
- QString("color:#d97706;font-size:12px;font-weight:700;background:transparent;letter-spacing:0.5px;%1").arg(MF));
+ QString("color:%1;font-size:12px;font-weight:700;background:transparent;letter-spacing:0.5px;%2").arg(ui::colors::AMBER, MF));
hl->addWidget(t);
hl->addStretch();
vl->addWidget(hdr);
@@ -44,23 +48,23 @@ QWidget* ProfileScreen::make_panel(const QString& title) {
QWidget* ProfileScreen::make_data_row(const QString& label, QLabel*& value_out) {
auto* row = new QWidget;
- row->setStyleSheet("background:transparent;border-bottom:1px solid #1a1a1a;");
+ row->setStyleSheet(QString("background:transparent;border-bottom:1px solid %1;").arg(ui::colors::BORDER_DIM));
auto* hl = new QHBoxLayout(row);
hl->setContentsMargins(12, 6, 12, 6);
auto* lbl = new QLabel(label);
lbl->setStyleSheet(
- QString("color:#808080;font-size:12px;font-weight:700;background:transparent;letter-spacing:0.5px;%1").arg(MF));
+ QString("color:%1;font-size:12px;font-weight:700;background:transparent;letter-spacing:0.5px;%2").arg(ui::colors::TEXT_SECONDARY, MF));
hl->addWidget(lbl);
hl->addStretch();
value_out = new QLabel("\xe2\x80\x94");
- value_out->setStyleSheet(QString("color:#e5e5e5;font-size:13px;font-weight:700;background:transparent;%1").arg(MF));
+ value_out->setStyleSheet(QString("color:%1;font-size:13px;font-weight:700;background:transparent;%2").arg(ui::colors::TEXT_PRIMARY, MF));
hl->addWidget(value_out);
return row;
}
QWidget* ProfileScreen::make_stat_box(const QString& label, QLabel*& value_out, const QString& color) {
auto* w = new QWidget;
- w->setStyleSheet("background:#111111;border:1px solid #1a1a1a;");
+ w->setStyleSheet(QString("background:%1;border:1px solid %2;").arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM));
auto* vl = new QVBoxLayout(w);
vl->setContentsMargins(12, 14, 12, 14);
vl->setAlignment(Qt::AlignCenter);
@@ -72,13 +76,13 @@ QWidget* ProfileScreen::make_stat_box(const QString& label, QLabel*& value_out,
auto* l = new QLabel(label);
l->setAlignment(Qt::AlignCenter);
l->setStyleSheet(
- QString("color:#808080;font-size:10px;font-weight:700;background:transparent;letter-spacing:0.5px;%1").arg(MF));
+ QString("color:%1;font-size:10px;font-weight:700;background:transparent;letter-spacing:0.5px;%2").arg(ui::colors::TEXT_SECONDARY, MF));
vl->addWidget(l);
return w;
}
ProfileScreen::ProfileScreen(QWidget* parent) : QWidget(parent) {
- setStyleSheet("background:#080808;");
+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE));
auto* root = new QVBoxLayout(this);
root->setContentsMargins(0, 0, 0, 0);
root->setSpacing(0);
@@ -100,32 +104,35 @@ ProfileScreen::ProfileScreen(QWidget* parent) : QWidget(parent) {
void ProfileScreen::build_header(QVBoxLayout* root) {
auto* bar = new QWidget;
bar->setFixedHeight(38);
- bar->setStyleSheet("background:#0a0a0a;border-bottom:1px solid #1a1a1a;");
+ bar->setStyleSheet(QString("background:%1;border-bottom:1px solid %2;").arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* hl = new QHBoxLayout(bar);
hl->setContentsMargins(14, 0, 14, 0);
hl->setSpacing(8);
auto* title = new QLabel("PROFILE & ACCOUNT");
- title->setStyleSheet(QString("color:#d97706;font-size:14px;font-weight:700;background:transparent;%1").arg(MF));
+ title->setStyleSheet(QString("color:%1;font-size:14px;font-weight:700;background:transparent;%2").arg(ui::colors::AMBER, MF));
hl->addWidget(title);
username_header_ = new QLabel;
- username_header_->setStyleSheet(QString("color:#e5e5e5;font-size:13px;background:transparent;%1").arg(MF));
+ username_header_->setStyleSheet(QString("color:%1;font-size:13px;background:transparent;%2").arg(ui::colors::TEXT_PRIMARY, MF));
hl->addWidget(username_header_);
hl->addStretch();
credits_badge_ = new QLabel;
credits_badge_->setStyleSheet(
- QString("color:#0891b2;font-size:12px;font-weight:700;background:transparent;%1").arg(MF));
+ QString("color:%1;font-size:12px;font-weight:700;background:transparent;%2").arg(ui::colors::CYAN, MF));
hl->addWidget(credits_badge_);
plan_badge_ = new QLabel;
plan_badge_->setStyleSheet(
- QString("color:#d97706;font-size:12px;font-weight:700;background:transparent;%1").arg(MF));
+ QString("color:%1;font-size:12px;font-weight:700;background:transparent;%2").arg(ui::colors::AMBER, MF));
hl->addWidget(plan_badge_);
auto* rb = new QPushButton("REFRESH");
rb->setFixedHeight(22);
rb->setCursor(Qt::PointingHandCursor);
rb->setStyleSheet(
- "QPushButton{background:#111111;color:#808080;border:1px solid #1a1a1a;padding:0 10px;"
- "font-size:11px;font-weight:700;font-family:'Consolas',monospace;}QPushButton:hover{color:#e5e5e5;}");
- connect(rb, &QPushButton::clicked, this, &ProfileScreen::refresh_all);
+ QString("QPushButton{background:%1;color:%2;border:1px solid %3;padding:0 10px;"
+ "font-size:11px;font-weight:700;font-family:'Consolas',monospace;}QPushButton:hover{color:%4;}")
+ .arg(ui::colors::BG_RAISED, ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM, ui::colors::TEXT_PRIMARY));
+ connect(rb, &QPushButton::clicked, this, [this]() {
+ auth::AuthManager::instance().refresh_user_data();
+ });
hl->addWidget(rb);
root->addWidget(bar);
}
@@ -133,7 +140,7 @@ void ProfileScreen::build_header(QVBoxLayout* root) {
void ProfileScreen::build_tab_nav(QVBoxLayout* root) {
auto* nav = new QWidget;
nav->setFixedHeight(32);
- nav->setStyleSheet("background:#111111;border-bottom:1px solid #1a1a1a;");
+ nav->setStyleSheet(QString("background:%1;border-bottom:1px solid %2;").arg(ui::colors::BG_RAISED, ui::colors::BORDER_DIM));
auto* hl = new QHBoxLayout(nav);
hl->setContentsMargins(4, 0, 4, 0);
hl->setSpacing(0);
@@ -158,11 +165,13 @@ void ProfileScreen::on_section_changed(int index) {
continue;
btn->setStyleSheet(
v.toInt() == index
- ? "QPushButton{background:#d97706;color:#080808;border:none;padding:0 14px;"
- "font-size:12px;font-weight:700;letter-spacing:0.5px;font-family:'Consolas',monospace;}"
- : "QPushButton{background:transparent;color:#525252;border:none;padding:0 14px;"
- "font-size:12px;font-weight:700;letter-spacing:0.5px;font-family:'Consolas',monospace;}"
- "QPushButton:hover{color:#808080;}");
+ ? QString("QPushButton{background:%1;color:%2;border:none;padding:0 14px;"
+ "font-size:12px;font-weight:700;letter-spacing:0.5px;font-family:'Consolas',monospace;}")
+ .arg(ui::colors::AMBER, ui::colors::BG_BASE)
+ : QString("QPushButton{background:transparent;color:%1;border:none;padding:0 14px;"
+ "font-size:12px;font-weight:700;letter-spacing:0.5px;font-family:'Consolas',monospace;}"
+ "QPushButton:hover{color:%2;}")
+ .arg(ui::colors::TEXT_TERTIARY, ui::colors::TEXT_SECONDARY));
}
if (index == 1)
fetch_usage_data();
@@ -197,8 +206,9 @@ QWidget* ProfileScreen::build_overview() {
eb->setFixedHeight(26);
eb->setCursor(Qt::PointingHandCursor);
eb->setStyleSheet(
- "QPushButton{background:#111111;color:#808080;border:1px solid #1a1a1a;padding:0 12px;margin:8px 12px;"
- "font-size:11px;font-weight:700;font-family:'Consolas',monospace;}QPushButton:hover{color:#e5e5e5;}");
+ QString("QPushButton{background:%1;color:%2;border:1px solid %3;padding:0 12px;margin:8px 12px;"
+ "font-size:11px;font-weight:700;font-family:'Consolas',monospace;}QPushButton:hover{color:%4;}")
+ .arg(ui::colors::BG_RAISED, ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM, ui::colors::TEXT_PRIMARY));
connect(eb, &QPushButton::clicked, this, &ProfileScreen::show_edit_profile_dialog);
avl->addWidget(eb);
grid->addWidget(acct, 0, 0);
@@ -208,17 +218,17 @@ QWidget* ProfileScreen::build_overview() {
ov_credits_big_ = new QLabel("0");
ov_credits_big_->setAlignment(Qt::AlignCenter);
ov_credits_big_->setStyleSheet(
- QString("color:#0891b2;font-size:42px;font-weight:700;background:transparent;padding:20px 0 4px 0;%1").arg(MF));
+ QString("color:%1;font-size:42px;font-weight:700;background:transparent;padding:20px 0 4px 0;%2").arg(ui::colors::CYAN, MF));
cvl2->addWidget(ov_credits_big_);
auto* cl = new QLabel("AVAILABLE CREDITS");
cl->setAlignment(Qt::AlignCenter);
- cl->setStyleSheet(QString("color:#808080;font-size:10px;font-weight:700;background:transparent;letter-spacing:0."
- "5px;padding-bottom:12px;%1")
- .arg(MF));
+ cl->setStyleSheet(QString("color:%1;font-size:10px;font-weight:700;background:transparent;letter-spacing:0."
+ "5px;padding-bottom:12px;%2")
+ .arg(ui::colors::TEXT_SECONDARY, MF));
cvl2->addWidget(cl);
auto* sp = new QFrame;
sp->setFixedHeight(1);
- sp->setStyleSheet("background:#1a1a1a;");
+ sp->setStyleSheet(QString("background:%1;").arg(ui::colors::BORDER_DIM));
cvl2->addWidget(sp);
cvl2->addWidget(make_data_row("PLAN", ov_plan_));
grid->addWidget(cred, 0, 1);
@@ -233,16 +243,17 @@ QWidget* ProfileScreen::build_overview() {
auto* eb2 = new QPushButton("EDIT PROFILE");
eb2->setFixedHeight(26);
eb2->setStyleSheet(
- "QPushButton{background:#111111;color:#808080;border:1px solid #1a1a1a;padding:0 12px;"
- "font-size:11px;font-weight:700;font-family:'Consolas',monospace;}QPushButton:hover{color:#e5e5e5;}");
+ QString("QPushButton{background:%1;color:%2;border:1px solid %3;padding:0 12px;"
+ "font-size:11px;font-weight:700;font-family:'Consolas',monospace;}QPushButton:hover{color:%4;}")
+ .arg(ui::colors::BG_RAISED, ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM, ui::colors::TEXT_PRIMARY));
connect(eb2, &QPushButton::clicked, this, &ProfileScreen::show_edit_profile_dialog);
arl->addWidget(eb2);
auto* lb = new QPushButton("LOGOUT");
lb->setFixedHeight(26);
lb->setStyleSheet(
- "QPushButton{background:rgba(220,38,38,0.1);color:#dc2626;border:1px solid #7f1d1d;padding:0 12px;"
- "font-size:11px;font-weight:700;font-family:'Consolas',monospace;}QPushButton:hover{background:#dc2626;color:#"
- "e5e5e5;}");
+ QString("QPushButton{background:rgba(220,38,38,0.1);color:%1;border:1px solid #7f1d1d;padding:0 12px;"
+ "font-size:11px;font-weight:700;font-family:'Consolas',monospace;}QPushButton:hover{background:%1;color:%2;}")
+ .arg(ui::colors::NEGATIVE, ui::colors::TEXT_PRIMARY));
connect(lb, &QPushButton::clicked, this, &ProfileScreen::show_logout_confirm);
arl->addWidget(lb);
arl->addStretch();
@@ -267,9 +278,9 @@ QWidget* ProfileScreen::build_usage() {
auto* srl = new QHBoxLayout(sr);
srl->setContentsMargins(0, 0, 0, 0);
srl->setSpacing(8);
- srl->addWidget(make_stat_box("CREDIT BALANCE", usg_credits_, "#0891b2"));
- srl->addWidget(make_stat_box("ACCOUNT TYPE", usg_plan_, "#d97706"));
- srl->addWidget(make_stat_box("RATE LIMIT/HR", usg_rate_, "#e5e5e5"));
+ srl->addWidget(make_stat_box("CREDIT BALANCE", usg_credits_, ui::colors::CYAN));
+ srl->addWidget(make_stat_box("ACCOUNT TYPE", usg_plan_, ui::colors::AMBER));
+ srl->addWidget(make_stat_box("RATE LIMIT/HR", usg_rate_, ui::colors::TEXT_PRIMARY));
vl->addWidget(sr);
auto* sp = make_panel("USAGE SUMMARY \xe2\x80\x94 LAST 30 DAYS");
auto* svl = qobject_cast<QVBoxLayout*>(sp->layout());
@@ -278,10 +289,10 @@ QWidget* ProfileScreen::build_usage() {
auto* smrl = new QHBoxLayout(smr);
smrl->setContentsMargins(8, 8, 8, 8);
smrl->setSpacing(8);
- smrl->addWidget(make_stat_box("TOTAL REQUESTS", usg_total_req_, "#0891b2"));
- smrl->addWidget(make_stat_box("CREDITS USED", usg_cred_used_, "#ca8a04"));
- smrl->addWidget(make_stat_box("AVG CR/REQ", usg_avg_cred_, "#e5e5e5"));
- smrl->addWidget(make_stat_box("AVG RESP (ms)", usg_avg_resp_, "#e5e5e5"));
+ smrl->addWidget(make_stat_box("TOTAL REQUESTS", usg_total_req_, ui::colors::CYAN));
+ smrl->addWidget(make_stat_box("CREDITS USED", usg_cred_used_, ui::colors::WARNING));
+ smrl->addWidget(make_stat_box("AVG CR/REQ", usg_avg_cred_, ui::colors::TEXT_PRIMARY));
+ smrl->addWidget(make_stat_box("AVG RESP (ms)", usg_avg_resp_, ui::colors::TEXT_PRIMARY));
svl->addWidget(smr);
vl->addWidget(sp);
auto* dp = make_panel("DAILY USAGE");
@@ -329,13 +340,14 @@ QWidget* ProfileScreen::build_security() {
krl->setContentsMargins(12, 10, 12, 10);
krl->setSpacing(8);
sec_api_key_ = new QLabel(QString(20, QChar(0x2022)));
- sec_api_key_->setStyleSheet(QString("color:#e5e5e5;font-size:13px;background:transparent;%1").arg(MF));
+ sec_api_key_->setStyleSheet(QString("color:%1;font-size:13px;background:transparent;%2").arg(ui::colors::TEXT_PRIMARY, MF));
krl->addWidget(sec_api_key_, 1);
auto* sb = new QPushButton("SHOW");
sb->setFixedHeight(22);
sb->setStyleSheet(
- "QPushButton{background:#111111;color:#808080;border:1px solid #1a1a1a;padding:0 10px;"
- "font-size:10px;font-weight:700;font-family:'Consolas',monospace;}QPushButton:hover{color:#e5e5e5;}");
+ QString("QPushButton{background:%1;color:%2;border:1px solid %3;padding:0 10px;"
+ "font-size:10px;font-weight:700;font-family:'Consolas',monospace;}QPushButton:hover{color:%4;}")
+ .arg(ui::colors::BG_RAISED, ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM, ui::colors::TEXT_PRIMARY));
connect(sb, &QPushButton::clicked, this, [this, sb]() {
api_key_visible_ = !api_key_visible_;
sb->setText(api_key_visible_ ? "HIDE" : "SHOW");
@@ -346,8 +358,9 @@ QWidget* ProfileScreen::build_security() {
auto* cb = new QPushButton("COPY");
cb->setFixedHeight(22);
cb->setStyleSheet(
- "QPushButton{background:#111111;color:#808080;border:1px solid #1a1a1a;padding:0 10px;"
- "font-size:10px;font-weight:700;font-family:'Consolas',monospace;}QPushButton:hover{color:#e5e5e5;}");
+ QString("QPushButton{background:%1;color:%2;border:1px solid %3;padding:0 10px;"
+ "font-size:10px;font-weight:700;font-family:'Consolas',monospace;}QPushButton:hover{color:%4;}")
+ .arg(ui::colors::BG_RAISED, ui::colors::TEXT_SECONDARY, ui::colors::BORDER_DIM, ui::colors::TEXT_PRIMARY));
connect(cb, &QPushButton::clicked, this, [cb]() {
auto key = auth::AuthManager::instance().session().api_key;
if (!key.isEmpty()) {
@@ -360,9 +373,9 @@ QWidget* ProfileScreen::build_security() {
auto* rg = new QPushButton("REGENERATE");
rg->setFixedHeight(22);
rg->setStyleSheet(
- "QPushButton{background:rgba(217,119,6,0.1);color:#d97706;border:1px solid #78350f;padding:0 10px;"
- "font-size:10px;font-weight:700;font-family:'Consolas',monospace;}QPushButton:hover{background:#d97706;color:#"
- "080808;}");
+ QString("QPushButton{background:rgba(217,119,6,0.1);color:%1;border:1px solid %2;padding:0 10px;"
+ "font-size:10px;font-weight:700;font-family:'Consolas',monospace;}QPushButton:hover{background:%1;color:%3;}")
+ .arg(ui::colors::AMBER, ui::colors::AMBER_DIM, ui::colors::BG_BASE));
connect(rg, &QPushButton::clicked, this, &ProfileScreen::show_regen_confirm);
krl->addWidget(rg);
kvl->addWidget(kr);
@@ -441,11 +454,11 @@ QWidget* ProfileScreen::build_support() {
wl->setSpacing(2);
auto* lb = new QLabel(l);
lb->setStyleSheet(
- QString("color:#525252;font-size:10px;font-weight:700;background:transparent;letter-spacing:0.5px;%1")
- .arg(MF));
+ QString("color:%1;font-size:10px;font-weight:700;background:transparent;letter-spacing:0.5px;%2")
+ .arg(ui::colors::TEXT_TERTIARY, MF));
wl->addWidget(lb);
auto* em = new QLabel(e);
- em->setStyleSheet(QString("color:#0891b2;font-size:13px;background:transparent;%1").arg(MF));
+ em->setStyleSheet(QString("color:%1;font-size:13px;background:transparent;%2").arg(ui::colors::CYAN, MF));
wl->addWidget(em);
cg->addWidget(w, r, c2);
};
@@ -466,8 +479,10 @@ QWidget* ProfileScreen::build_support() {
auto* b = new QPushButton(s);
b->setFixedHeight(26);
b->setStyleSheet(
- "QPushButton{background:#111111;color:#0891b2;border:1px solid #1a1a1a;padding:0 12px;"
- "font-size:11px;font-family:'Consolas',monospace;}QPushButton:hover{color:#e5e5e5;background:#161616;}");
+ QString("QPushButton{background:%1;color:%2;border:1px solid %3;padding:0 12px;"
+ "font-size:11px;font-family:'Consolas',monospace;}QPushButton:hover{color:%4;background:%5;}")
+ .arg(ui::colors::BG_RAISED, ui::colors::CYAN, ui::colors::BORDER_DIM,
+ ui::colors::TEXT_PRIMARY, ui::colors::BG_HOVER));
lrl->addWidget(b);
}
lrl->addStretch();
@@ -490,27 +505,27 @@ void ProfileScreen::refresh_all() {
ov_user_type_->setText("REGISTERED");
ov_account_type_->setText(s.account_type().toUpper());
ov_account_type_->setStyleSheet(
- QString("color:#d97706;font-size:13px;font-weight:700;background:transparent;%1").arg(MF));
+ QString("color:%1;font-size:13px;font-weight:700;background:transparent;%2").arg(ui::colors::AMBER, MF));
ov_phone_->setText(s.user_info.phone.isEmpty() ? "\xe2\x80\x94" : s.user_info.phone);
ov_country_->setText(s.user_info.country.isEmpty() ? "\xe2\x80\x94" : s.user_info.country);
ov_verified_->setText(s.user_info.is_verified ? "YES" : "NO");
ov_verified_->setStyleSheet(QString("color:%1;font-size:13px;font-weight:700;background:transparent;%2")
- .arg(s.user_info.is_verified ? "#16a34a" : "#dc2626")
+ .arg(s.user_info.is_verified ? ui::colors::POSITIVE() : ui::colors::NEGATIVE())
.arg(MF));
ov_mfa_->setText(s.user_info.mfa_enabled ? "YES" : "NO");
ov_mfa_->setStyleSheet(QString("color:%1;font-size:13px;font-weight:700;background:transparent;%2")
- .arg(s.user_info.mfa_enabled ? "#16a34a" : "#dc2626")
+ .arg(s.user_info.mfa_enabled ? ui::colors::POSITIVE() : ui::colors::NEGATIVE())
.arg(MF));
ov_credits_big_->setText(QString::number(static_cast<int>(s.user_info.credit_balance)));
ov_plan_->setText(s.account_type().toUpper());
- ov_plan_->setStyleSheet(QString("color:#d97706;font-size:13px;font-weight:700;background:transparent;%1").arg(MF));
+ ov_plan_->setStyleSheet(QString("color:%1;font-size:13px;font-weight:700;background:transparent;%2").arg(ui::colors::AMBER, MF));
sec_verified_->setText(s.user_info.is_verified ? "YES" : "NO");
sec_verified_->setStyleSheet(QString("color:%1;font-size:13px;font-weight:700;background:transparent;%2")
- .arg(s.user_info.is_verified ? "#16a34a" : "#dc2626")
+ .arg(s.user_info.is_verified ? ui::colors::POSITIVE() : ui::colors::NEGATIVE())
.arg(MF));
sec_mfa_->setText(s.user_info.mfa_enabled ? "ENABLED" : "DISABLED");
sec_mfa_->setStyleSheet(QString("color:%1;font-size:13px;font-weight:700;background:transparent;%2")
- .arg(s.user_info.mfa_enabled ? "#16a34a" : "#808080")
+ .arg(s.user_info.mfa_enabled ? ui::colors::POSITIVE() : ui::colors::TEXT_SECONDARY())
.arg(MF));
bill_plan_->setText(s.account_type().toUpper());
bill_credits_->setText(QString::number(s.user_info.credit_balance, 'f', 2));
@@ -639,17 +654,17 @@ void ProfileScreen::show_edit_profile_dialog() {
auto* dlg = new QDialog(this);
dlg->setWindowTitle("Edit Profile");
dlg->setFixedSize(420, 300);
- dlg->setStyleSheet("background:#0a0a0a;color:#e5e5e5;font-family:'Consolas',monospace;");
+ dlg->setStyleSheet(QString("background:%1;color:%2;font-family:'Consolas',monospace;").arg(ui::colors::BG_SURFACE, ui::colors::TEXT_PRIMARY));
auto* vl = new QVBoxLayout(dlg);
vl->setContentsMargins(20, 16, 20, 16);
vl->setSpacing(10);
auto* t = new QLabel("EDIT PROFILE");
- t->setStyleSheet("color:#d97706;font-size:14px;font-weight:700;background:transparent;");
+ t->setStyleSheet(QString("color:%1;font-size:14px;font-weight:700;background:transparent;").arg(ui::colors::AMBER));
vl->addWidget(t);
const auto& s = auth::AuthManager::instance().session();
auto add_f = [&](const QString& l, const QString& v) -> QLineEdit* {
auto* lb = new QLabel(l);
- lb->setStyleSheet("color:#808080;font-size:11px;font-weight:700;background:transparent;");
+ lb->setStyleSheet(QString("color:%1;font-size:11px;font-weight:700;background:transparent;").arg(ui::colors::TEXT_SECONDARY));
vl->addWidget(lb);
auto* i = new QLineEdit(v);
i->setFixedHeight(28);
@@ -672,8 +687,9 @@ void ProfileScreen::show_edit_profile_dialog() {
auto* sv = new QPushButton("SAVE");
sv->setFixedHeight(26);
sv->setStyleSheet(
- "QPushButton{background:#d97706;color:#080808;border:none;padding:0 16px;"
- "font-size:11px;font-weight:700;font-family:'Consolas',monospace;}QPushButton:hover{background:#b45309;}");
+ QString("QPushButton{background:%1;color:%2;border:none;padding:0 16px;"
+ "font-size:11px;font-weight:700;font-family:'Consolas',monospace;}QPushButton:hover{background:#b45309;}")
+ .arg(ui::colors::AMBER, ui::colors::BG_BASE));
connect(sv, &QPushButton::clicked, this, [=]() {
QJsonObject data;
if (!un->text().trimmed().isEmpty())
diff --git a/fincept-qt/src/screens/profile/ProfileScreen.h b/fincept-qt/src/screens/profile/ProfileScreen.h
index 48b219149..4961e23d9 100644
--- a/fincept-qt/src/screens/profile/ProfileScreen.h
+++ b/fincept-qt/src/screens/profile/ProfileScreen.h
@@ -77,7 +77,7 @@ class ProfileScreen : public QWidget {
// Helpers
QWidget* make_panel(const QString& title);
QWidget* make_data_row(const QString& label, QLabel*& value_out);
- QWidget* make_stat_box(const QString& label, QLabel*& value_out, const QString& color = "#0891b2");
+ QWidget* make_stat_box(const QString& label, QLabel*& value_out, const QString& color);
void show_edit_profile_dialog();
void show_logout_confirm();
diff --git a/fincept-qt/src/screens/quantlib/QuantLibScreen.cpp b/fincept-qt/src/screens/quantlib/QuantLibScreen.cpp
index 8932fb92c..6e03adcf6 100644
--- a/fincept-qt/src/screens/quantlib/QuantLibScreen.cpp
+++ b/fincept-qt/src/screens/quantlib/QuantLibScreen.cpp
@@ -1,6 +1,7 @@
#include "screens/quantlib/QuantLibScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "services/quantlib/QuantLibClient.h"
#include "ui/theme/Theme.h"
@@ -459,6 +460,7 @@ void QuantLibScreen::on_module_changed(int index) {
populate_panels(index);
LOG_INFO("QuantLib", "Module: " + m.name);
+ ScreenStateManager::instance().notify_changed(this);
}
void QuantLibScreen::on_panel_changed(QListWidgetItem* item) {
@@ -466,6 +468,7 @@ void QuantLibScreen::on_panel_changed(QListWidgetItem* item) {
return;
active_panel_ = item->text();
status_panel_->setText(active_panel_);
+ ScreenStateManager::instance().notify_changed(this);
}
void QuantLibScreen::on_endpoint_changed(int index) {
@@ -1329,4 +1332,32 @@ void QuantLibScreen::set_loading(bool loading) {
exec_btn_->setText(loading ? "COMPUTING..." : "EXECUTE COMPUTATION");
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap QuantLibScreen::save_state() const {
+ return {
+ {"module", active_module_},
+ {"panel", active_panel_},
+ };
+}
+
+void QuantLibScreen::restore_state(const QVariantMap& state) {
+ const int mod = state.value("module", 0).toInt();
+ if (mod != active_module_)
+ on_module_changed(mod);
+
+ const QString panel = state.value("panel").toString();
+ if (!panel.isEmpty() && module_tree_) {
+ // Find matching item in the tree and select it
+ auto items = module_tree_->findItems(panel, Qt::MatchExactly | Qt::MatchRecursive);
+ if (!items.isEmpty()) {
+ module_tree_->setCurrentItem(items.first());
+ // on_panel_changed expects QListWidgetItem* — extract text directly
+ active_panel_ = items.first()->text(0);
+ status_panel_->setText(active_panel_);
+ ScreenStateManager::instance().notify_changed(this);
+ }
+ }
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/quantlib/QuantLibScreen.h b/fincept-qt/src/screens/quantlib/QuantLibScreen.h
index ac94b923e..47c82515b 100644
--- a/fincept-qt/src/screens/quantlib/QuantLibScreen.h
+++ b/fincept-qt/src/screens/quantlib/QuantLibScreen.h
@@ -1,5 +1,7 @@
#pragma once
+#include "screens/IStatefulScreen.h"
+
#include <QComboBox>
#include <QJsonObject>
#include <QLabel>
@@ -27,11 +29,16 @@ struct QuantModule {
/// Numerical, Physics, Portfolio, Pricing, Regulatory, Risk, Scheduling,
/// Solver, Statistics, Stochastic, Volatility.
/// All computations via api.fincept.in REST API.
-class QuantLibScreen : public QWidget {
+class QuantLibScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit QuantLibScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "quantlib"; }
+ int state_version() const override { return 1; }
+
private slots:
void on_module_changed(int index);
void on_panel_changed(QListWidgetItem* item);
diff --git a/fincept-qt/src/screens/relationship_map/RelationshipGraphScene.cpp b/fincept-qt/src/screens/relationship_map/RelationshipGraphScene.cpp
index 6a6eb62ee..035d63b01 100644
--- a/fincept-qt/src/screens/relationship_map/RelationshipGraphScene.cpp
+++ b/fincept-qt/src/screens/relationship_map/RelationshipGraphScene.cpp
@@ -74,7 +74,7 @@ class GraphNodeItem : public QGraphicsRectItem {
auto* label = new QGraphicsTextItem(this);
label->setPlainText(data.label);
label->setFont(data.category == NodeCategory::Company ? QFont("Consolas", 12, QFont::Bold) : mono_bold);
- label->setDefaultTextColor(QColor("#e5e5e5"));
+ label->setDefaultTextColor(QColor(ui::colors::TEXT_PRIMARY()));
label->setPos(-sz.width() / 2 + 8, -sz.height() / 2 + 18);
// Sublabel
@@ -82,7 +82,7 @@ class GraphNodeItem : public QGraphicsRectItem {
auto* sub = new QGraphicsTextItem(this);
sub->setPlainText(data.sublabel);
sub->setFont(mono_small);
- sub->setDefaultTextColor(QColor("#808080"));
+ sub->setDefaultTextColor(QColor(ui::colors::TEXT_SECONDARY()));
sub->setPos(-sz.width() / 2 + 8, -sz.height() / 2 + 38);
}
@@ -135,7 +135,7 @@ class GraphNodeItem : public QGraphicsRectItem {
// ── Scene ────────────────────────────────────────────────────────────────────
RelationshipGraphScene::RelationshipGraphScene(QObject* parent) : QGraphicsScene(parent) {
- setBackgroundBrush(QBrush(QColor("#080808")));
+ setBackgroundBrush(QBrush(QColor(ui::colors::BG_BASE())));
}
void RelationshipGraphScene::clear_graph() {
@@ -428,7 +428,7 @@ RelationshipGraphView::RelationshipGraphView(QGraphicsScene* scene, QWidget* par
setDragMode(QGraphicsView::ScrollHandDrag);
setTransformationAnchor(QGraphicsView::AnchorUnderMouse);
setViewportUpdateMode(QGraphicsView::SmartViewportUpdate);
- setStyleSheet("QGraphicsView { border: none; background: #080808; }");
+ setStyleSheet(QString("QGraphicsView { border: none; background: %1; }").arg(ui::colors::BG_BASE));
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
diff --git a/fincept-qt/src/screens/relationship_map/RelationshipMapScreen.cpp b/fincept-qt/src/screens/relationship_map/RelationshipMapScreen.cpp
index ae6e4ad1c..c1e30aa3c 100644
--- a/fincept-qt/src/screens/relationship_map/RelationshipMapScreen.cpp
+++ b/fincept-qt/src/screens/relationship_map/RelationshipMapScreen.cpp
@@ -1,6 +1,7 @@
// src/screens/relationship_map/RelationshipMapScreen.cpp
#include "screens/relationship_map/RelationshipMapScreen.h"
+#include "core/session/ScreenStateManager.h"
#include "screens/relationship_map/RelationshipGraphScene.h"
#include "services/relationship_map/RelationshipMapService.h"
#include "ui/theme/Theme.h"
@@ -17,7 +18,9 @@ namespace fincept::screens {
using namespace fincept::ui;
using namespace fincept::relmap;
-static const char* MF = "font-family:'Consolas','Courier New',monospace;";
+static inline QString MF() {
+ return QStringLiteral("font-family:'Consolas','Courier New',monospace;");
+}
// ── Constructor ──────────────────────────────────────────────────────────────
@@ -60,7 +63,7 @@ void RelationshipMapScreen::build_ui() {
auto* title = new QLabel("CORPORATE INTELLIGENCE MAP");
title->setStyleSheet(QString("color: %1; font-size: 12px; font-weight: 700; "
"letter-spacing: 0.5px; %2")
- .arg(colors::AMBER, MF));
+ .arg(colors::AMBER, MF()));
hhl->addWidget(title);
// Search
@@ -71,7 +74,7 @@ void RelationshipMapScreen::build_ui() {
QString("QLineEdit { background: %1; color: %2; border: 1px solid %3; "
"padding: 4px 10px; font-size: 12px; %4 }"
"QLineEdit:focus { border-color: %5; }")
- .arg(colors::BG_SURFACE, colors::TEXT_PRIMARY, colors::BORDER_DIM, MF, colors::AMBER));
+ .arg(colors::BG_SURFACE, colors::TEXT_PRIMARY, colors::BORDER_DIM, MF(), colors::AMBER));
connect(search_input_, &QLineEdit::returnPressed, this, &RelationshipMapScreen::on_search);
hhl->addWidget(search_input_);
@@ -79,10 +82,10 @@ void RelationshipMapScreen::build_ui() {
search_btn->setCursor(Qt::PointingHandCursor);
search_btn->setFixedHeight(28);
search_btn->setStyleSheet(
- QString("QPushButton { background: rgba(217,119,6,0.15); color: %1; border: 1px solid #78350f; "
+ QString("QPushButton { background: rgba(217,119,6,0.15); color: %1; border: 1px solid %3; "
"padding: 0 14px; font-size: 11px; font-weight: 700; %2 }"
- "QPushButton:hover { background: %1; color: #080808; }")
- .arg(colors::AMBER, MF));
+ "QPushButton:hover { background: %1; color: %4; }")
+ .arg(colors::AMBER, MF(), colors::AMBER_DIM, colors::BG_BASE));
connect(search_btn, &QPushButton::clicked, this, &RelationshipMapScreen::on_search);
hhl->addWidget(search_btn);
@@ -95,11 +98,12 @@ void RelationshipMapScreen::build_ui() {
layout_combo_->addItem("FORCE", (int)LayoutMode::Force);
layout_combo_->setStyleSheet(QString("QComboBox { background: %1; color: %2; border: 1px solid %3; "
"padding: 3px 8px; font-size: 10px; %4 }")
- .arg(colors::BG_SURFACE, colors::TEXT_SECONDARY, colors::BORDER_DIM, MF));
+ .arg(colors::BG_SURFACE, colors::TEXT_SECONDARY, colors::BORDER_DIM, MF()));
connect(layout_combo_, &QComboBox::currentIndexChanged, this, [this](int idx) {
layout_mode_ = static_cast<LayoutMode>(layout_combo_->itemData(idx).toInt());
if (has_data_)
rebuild_graph();
+ ScreenStateManager::instance().notify_changed(this);
});
hhl->addWidget(layout_combo_);
@@ -111,9 +115,10 @@ void RelationshipMapScreen::build_ui() {
filter_btn_->setStyleSheet(
QString("QPushButton { background: transparent; color: %1; border: 1px solid %2; "
"padding: 0 10px; font-size: 10px; %3 }"
- "QPushButton:hover { color: #e5e5e5; } "
- "QPushButton:checked { background: rgba(217,119,6,0.1); color: %4; border-color: #78350f; }")
- .arg(colors::TEXT_SECONDARY, colors::BORDER_DIM, MF, colors::AMBER));
+ "QPushButton:hover { color: %5; } "
+ "QPushButton:checked { background: rgba(217,119,6,0.1); color: %4; border-color: %6; }")
+ .arg(colors::TEXT_SECONDARY, colors::BORDER_DIM, MF(), colors::AMBER,
+ colors::TEXT_PRIMARY, colors::AMBER_DIM));
connect(filter_btn_, &QPushButton::toggled, this, [this](bool checked) { filter_panel_->setVisible(checked); });
hhl->addWidget(filter_btn_);
@@ -127,7 +132,7 @@ void RelationshipMapScreen::build_ui() {
phl->setContentsMargins(12, 2, 12, 2);
progress_label_ = new QLabel("Ready");
- progress_label_->setStyleSheet(QString("color: %1; font-size: 9px; %2").arg(colors::TEXT_DIM, MF));
+ progress_label_->setStyleSheet(QString("color: %1; font-size: 9px; %2").arg(colors::TEXT_DIM, MF()));
phl->addWidget(progress_label_);
progress_bar_ = new QProgressBar;
@@ -181,19 +186,19 @@ void RelationshipMapScreen::build_ui() {
shl->setContentsMargins(12, 0, 12, 0);
status_nodes_ = new QLabel("READY");
- status_nodes_->setStyleSheet(QString("color: %1; font-size: 9px; %2").arg(colors::TEXT_DIM, MF));
+ status_nodes_->setStyleSheet(QString("color: %1; font-size: 9px; %2").arg(colors::TEXT_DIM, MF()));
shl->addWidget(status_nodes_);
shl->addStretch();
status_quality_ = new QLabel("");
- status_quality_->setStyleSheet(QString("color: %1; font-size: 9px; %2").arg(colors::TEXT_DIM, MF));
+ status_quality_->setStyleSheet(QString("color: %1; font-size: 9px; %2").arg(colors::TEXT_DIM, MF()));
shl->addWidget(status_quality_);
shl->addStretch();
status_brand_ = new QLabel("FINCEPT TERMINAL");
- status_brand_->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: 700; %2").arg(colors::AMBER, MF));
+ status_brand_->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: 700; %2").arg(colors::AMBER, MF()));
shl->addWidget(status_brand_);
root->addWidget(status);
@@ -216,7 +221,7 @@ QWidget* RelationshipMapScreen::build_filter_panel() {
auto* title = new QLabel("FILTERS");
title->setStyleSheet(QString("color: %1; font-size: 10px; font-weight: 700; "
"letter-spacing: 0.5px; %2")
- .arg(colors::AMBER, MF));
+ .arg(colors::AMBER, MF()));
vl->addWidget(title);
auto make_check = [&](const QString& label, bool& state, NodeCategory cat) {
@@ -227,7 +232,7 @@ QWidget* RelationshipMapScreen::build_filter_panel() {
"QCheckBox::indicator { width: 12px; height: 12px; "
"border: 1px solid %3; background: transparent; }"
"QCheckBox::indicator:checked { background: %3; }")
- .arg(colors::TEXT_SECONDARY, MF, col.name()));
+ .arg(colors::TEXT_SECONDARY, MF(), col.name()));
connect(cb, &QCheckBox::toggled, this, [this, &state](bool checked) {
state = checked;
if (has_data_)
@@ -261,7 +266,7 @@ QWidget* RelationshipMapScreen::build_detail_panel() {
auto* header = new QHBoxLayout;
detail_title_ = new QLabel("SELECT A NODE");
detail_title_->setStyleSheet(
- QString("color: %1; font-size: 12px; font-weight: 700; %2").arg(colors::TEXT_PRIMARY, MF));
+ QString("color: %1; font-size: 12px; font-weight: 700; %2").arg(colors::TEXT_PRIMARY, MF()));
header->addWidget(detail_title_);
header->addStretch();
@@ -269,8 +274,8 @@ QWidget* RelationshipMapScreen::build_detail_panel() {
close_btn->setFixedSize(20, 20);
close_btn->setCursor(Qt::PointingHandCursor);
close_btn->setStyleSheet(QString("QPushButton { color: %1; background: transparent; border: none; "
- "font-size: 11px; %2 } QPushButton:hover { color: #e5e5e5; }")
- .arg(colors::TEXT_DIM, MF));
+ "font-size: 11px; %2 } QPushButton:hover { color: %3; }")
+ .arg(colors::TEXT_DIM, MF(), colors::TEXT_PRIMARY));
connect(close_btn, &QPushButton::clicked, this, [this]() {
detail_panel_->hide();
scene_->clearSelection();
@@ -281,7 +286,7 @@ QWidget* RelationshipMapScreen::build_detail_panel() {
detail_category_ = new QLabel("");
detail_category_->setStyleSheet(QString("color: %1; font-size: 9px; font-weight: 700; "
"letter-spacing: 0.5px; %2")
- .arg(colors::TEXT_TERTIARY, MF));
+ .arg(colors::TEXT_TERTIARY, MF()));
vl->addWidget(detail_category_);
// Scrollable properties
@@ -314,7 +319,7 @@ QWidget* RelationshipMapScreen::build_legend() {
auto* title = new QLabel("LEGEND");
title->setStyleSheet(QString("color: %1; font-size: 8px; font-weight: 700; "
"letter-spacing: 0.5px; %2")
- .arg(colors::TEXT_DIM, MF));
+ .arg(colors::TEXT_DIM, MF()));
vl->addWidget(title);
auto add_entry = [&](NodeCategory cat) {
@@ -330,7 +335,7 @@ QWidget* RelationshipMapScreen::build_legend() {
hl->addWidget(dot);
auto* lbl = new QLabel(category_label(cat));
- lbl->setStyleSheet(QString("color: %1; font-size: 8px; %2").arg(colors::TEXT_TERTIARY, MF));
+ lbl->setStyleSheet(QString("color: %1; font-size: 8px; %2").arg(colors::TEXT_TERTIARY, MF()));
hl->addWidget(lbl);
hl->addStretch();
vl->addWidget(row);
@@ -362,6 +367,7 @@ void RelationshipMapScreen::on_search() {
has_data_ = false;
services::RelationshipMapService::instance().fetch(ticker);
+ ScreenStateManager::instance().notify_changed(this);
}
void RelationshipMapScreen::on_progress(int percent, const QString& message) {
@@ -389,7 +395,7 @@ void RelationshipMapScreen::on_data_ready(const RelationshipData& data) {
void RelationshipMapScreen::on_fetch_failed(const QString& error) {
progress_bar_->hide();
progress_label_->setText("Error: " + error);
- progress_label_->setStyleSheet(QString("color: %1; font-size: 9px; %2").arg(colors::NEGATIVE, MF));
+ progress_label_->setStyleSheet(QString("color: %1; font-size: 9px; %2").arg(colors::NEGATIVE, MF()));
}
void RelationshipMapScreen::rebuild_graph() {
@@ -435,7 +441,7 @@ void RelationshipMapScreen::on_node_selected() {
detail_title_->setText(label.isEmpty() ? "NODE" : label);
detail_category_->setText(category_text);
detail_category_->setStyleSheet(
- QString("color: %1; font-size: 9px; font-weight: 700; letter-spacing: 0.5px; %2").arg(colors::AMBER, MF));
+ QString("color: %1; font-size: 9px; font-weight: 700; letter-spacing: 0.5px; %2").arg(colors::AMBER, MF()));
// Clear and repopulate properties
auto* layout = detail_props_container_->layout();
@@ -449,7 +455,7 @@ void RelationshipMapScreen::on_node_selected() {
if (!sublabel.isEmpty()) {
auto* sub = new QLabel(sublabel);
sub->setWordWrap(true);
- sub->setStyleSheet(QString("color: %1; font-size: 11px; %2").arg(colors::TEXT_SECONDARY, MF));
+ sub->setStyleSheet(QString("color: %1; font-size: 11px; %2").arg(colors::TEXT_SECONDARY, MF()));
layout->addWidget(sub);
}
@@ -465,7 +471,7 @@ void RelationshipMapScreen::on_node_selected() {
if (label == current_data_.company.ticker) {
auto add_prop = [&](const QString& key, const QString& val) {
auto* row = new QLabel(QString("%1: %2").arg(key, val));
- row->setStyleSheet(QString("color: %1; font-size: 10px; %2").arg(colors::TEXT_SECONDARY, MF));
+ row->setStyleSheet(QString("color: %1; font-size: 10px; %2").arg(colors::TEXT_SECONDARY, MF()));
layout->addWidget(row);
};
add_prop("Sector", current_data_.company.sector);
@@ -485,7 +491,7 @@ void RelationshipMapScreen::on_node_selected() {
if (p.ticker == label) {
auto add_prop = [&](const QString& key, const QString& val) {
auto* row = new QLabel(QString("%1: %2").arg(key, val));
- row->setStyleSheet(QString("color: %1; font-size: 10px; %2").arg(colors::TEXT_SECONDARY, MF));
+ row->setStyleSheet(QString("color: %1; font-size: 10px; %2").arg(colors::TEXT_SECONDARY, MF()));
layout->addWidget(row);
};
add_prop("Mkt Cap", QString("$%1B").arg(p.market_cap / 1e9, 0, 'f', 1));
@@ -517,4 +523,33 @@ void RelationshipMapScreen::update_status_bar() {
status_quality_->setText(QString("QUALITY: %1%").arg(current_data_.data_quality));
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap RelationshipMapScreen::save_state() const {
+ return {
+ {"ticker", search_input_ ? search_input_->text().trimmed() : QString{}},
+ {"layout_mode", static_cast<int>(layout_mode_)},
+ };
+}
+
+void RelationshipMapScreen::restore_state(const QVariantMap& state) {
+ const QString ticker = state.value("ticker").toString();
+ const int layout = state.value("layout_mode", 0).toInt();
+
+ if (layout_combo_) {
+ // Find the combo item whose data matches layout_mode
+ for (int i = 0; i < layout_combo_->count(); ++i) {
+ if (layout_combo_->itemData(i).toInt() == layout) {
+ layout_combo_->setCurrentIndex(i);
+ break;
+ }
+ }
+ }
+
+ if (!ticker.isEmpty() && search_input_) {
+ search_input_->setText(ticker);
+ on_search();
+ }
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/relationship_map/RelationshipMapScreen.h b/fincept-qt/src/screens/relationship_map/RelationshipMapScreen.h
index 05e076e19..4068c5e27 100644
--- a/fincept-qt/src/screens/relationship_map/RelationshipMapScreen.h
+++ b/fincept-qt/src/screens/relationship_map/RelationshipMapScreen.h
@@ -1,6 +1,7 @@
// src/screens/relationship_map/RelationshipMapScreen.h
#pragma once
+#include "screens/IStatefulScreen.h"
#include "screens/relationship_map/RelationshipMapTypes.h"
#include <QComboBox>
@@ -19,11 +20,16 @@ namespace fincept::screens {
/// Corporate Intelligence Relationship Map — full screen with search, graph,
/// filter panel, detail panel, legend, and status bar.
-class RelationshipMapScreen : public QWidget {
+class RelationshipMapScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit RelationshipMapScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "relationship_map"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) override;
diff --git a/fincept-qt/src/screens/report_builder/DocumentCanvas.cpp b/fincept-qt/src/screens/report_builder/DocumentCanvas.cpp
index a5e824359..086c84c08 100644
--- a/fincept-qt/src/screens/report_builder/DocumentCanvas.cpp
+++ b/fincept-qt/src/screens/report_builder/DocumentCanvas.cpp
@@ -238,16 +238,17 @@ DocumentCanvas::DocumentCanvas(QWidget* parent) : QWidget(parent) {
scroll_->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
scroll_->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
scroll_->setStyleSheet(
- "QScrollArea { background: #1a1a1a; border: none; }"
- "QScrollBar:vertical { background: #111111; width: 10px; }"
- "QScrollBar::handle:vertical { background: #333333; border-radius: 5px; min-height: 20px; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0px; }"
- "QScrollBar:horizontal { background: #111111; height: 10px; }"
- "QScrollBar::handle:horizontal { background: #333333; border-radius: 5px; min-width: 20px; }"
- "QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { width: 0px; }");
+ QString("QScrollArea { background: %1; border: none; }"
+ "QScrollBar:vertical { background: %2; width: 10px; }"
+ "QScrollBar::handle:vertical { background: %3; border-radius: 5px; min-height: 20px; }"
+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0px; }"
+ "QScrollBar:horizontal { background: %2; height: 10px; }"
+ "QScrollBar::handle:horizontal { background: %3; border-radius: 5px; min-width: 20px; }"
+ "QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { width: 0px; }")
+ .arg(ui::colors::BORDER_DIM, ui::colors::BG_RAISED, ui::colors::BORDER_BRIGHT));
container_ = new QWidget;
- container_->setStyleSheet("background: #1a1a1a;");
+ container_->setStyleSheet(QString("background: %1;").arg(ui::colors::BORDER_DIM));
pages_layout_ = new QVBoxLayout(container_);
pages_layout_->setContentsMargins(40, 40, 40, 40);
pages_layout_->setSpacing(24); // gap between pages
diff --git a/fincept-qt/src/screens/report_builder/ReportBuilderScreen.cpp b/fincept-qt/src/screens/report_builder/ReportBuilderScreen.cpp
index 3995b36be..793176641 100644
--- a/fincept-qt/src/screens/report_builder/ReportBuilderScreen.cpp
+++ b/fincept-qt/src/screens/report_builder/ReportBuilderScreen.cpp
@@ -1,5 +1,6 @@
#include "screens/report_builder/ReportBuilderScreen.h"
+#include "core/session/ScreenStateManager.h"
#include "services/file_manager/FileManagerService.h"
#include "services/markets/MarketDataService.h"
#include "ui/theme/Theme.h"
@@ -118,6 +119,7 @@ void ReportBuilderScreen::add_component_direct(const ReportComponent& comp, int
}
refresh_canvas();
refresh_structure();
+ ScreenStateManager::instance().notify_changed(this);
}
void ReportBuilderScreen::remove_component_direct(int index) {
@@ -127,6 +129,7 @@ void ReportBuilderScreen::remove_component_direct(int index) {
refresh_canvas();
refresh_structure();
select_component(selected_);
+ ScreenStateManager::instance().notify_changed(this);
}
}
@@ -169,8 +172,10 @@ ReportBuilderScreen::ReportBuilderScreen(QWidget* parent) : QWidget(parent) {
splitter_ = new QSplitter(Qt::Horizontal);
splitter_->setHandleWidth(1);
- splitter_->setStyleSheet("QSplitter::handle { background: #1A1A1A; }"
- "QSplitter::handle:hover { background: #333333; }");
+ splitter_->setStyleSheet(
+ QString("QSplitter::handle { background: %1; }"
+ "QSplitter::handle:hover { background: %2; }")
+ .arg(ui::colors::BORDER_DIM, ui::colors::BORDER_BRIGHT));
comp_toolbar_ = new ComponentToolbar;
canvas_ = new DocumentCanvas;
@@ -1822,4 +1827,18 @@ void ReportBuilderScreen::hideEvent(QHideEvent* e) {
autosave_->stop();
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap ReportBuilderScreen::save_state() const {
+ return {{"current_file", current_file_}};
+}
+
+void ReportBuilderScreen::restore_state(const QVariantMap& state) {
+ // current_file_ is only a reference path — the actual content lives in
+ // the undo stack and components_ vector. Just restore the title display.
+ const QString file = state.value("current_file").toString();
+ if (!file.isEmpty())
+ current_file_ = file;
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/report_builder/ReportBuilderScreen.h b/fincept-qt/src/screens/report_builder/ReportBuilderScreen.h
index 3197d98e3..48cc2ca1a 100644
--- a/fincept-qt/src/screens/report_builder/ReportBuilderScreen.h
+++ b/fincept-qt/src/screens/report_builder/ReportBuilderScreen.h
@@ -1,4 +1,5 @@
#pragma once
+#include "screens/IStatefulScreen.h"
#include "screens/report_builder/ComponentToolbar.h"
#include "screens/report_builder/DocumentCanvas.h"
#include "screens/report_builder/PropertiesPanel.h"
@@ -130,11 +131,16 @@ class MoveComponentCommand : public QUndoCommand {
// ── Main Screen ────────────────────────────────────────────────────────────────
-class ReportBuilderScreen : public QWidget {
+class ReportBuilderScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit ReportBuilderScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "report_builder"; }
+ int state_version() const override { return 1; }
+
// Called by undo commands — do NOT push to undo stack inside these
void add_component_direct(const ReportComponent& comp, int at);
void remove_component_direct(int index);
diff --git a/fincept-qt/src/screens/settings/LlmConfigSection.cpp b/fincept-qt/src/screens/settings/LlmConfigSection.cpp
index 08fb9858b..83defad90 100644
--- a/fincept-qt/src/screens/settings/LlmConfigSection.cpp
+++ b/fincept-qt/src/screens/settings/LlmConfigSection.cpp
@@ -49,7 +49,7 @@ QString LlmConfigSection::default_base_url(const QString& provider) {
if (p == "ollama")
return "http://localhost:11434";
if (p == "fincept")
- return "https://api.fincept.in/research/llm";
+ return {}; // endpoints are hardcoded in LlmService, no base_url needed
return {};
}
@@ -325,6 +325,16 @@ QWidget* LlmConfigSection::build_form_panel() {
field_style(base_url_edit_);
form->addRow(b_lbl, base_url_edit_);
+ // Tools toggle
+ tools_check_ = new QCheckBox("Enable MCP Tools (navigation, market data, portfolio, etc.)");
+ tools_check_->setChecked(true);
+ tools_check_->setStyleSheet(
+ "QCheckBox{color:" + QString(ui::colors::TEXT_PRIMARY()) + ";spacing:8px;}"
+ "QCheckBox::indicator{width:16px;height:16px;border:1px solid " + QString(ui::colors::BORDER_MED()) + ";border-radius:3px;background:" + QString(ui::colors::BG_RAISED()) + ";}"
+ "QCheckBox::indicator:checked{background:" + QString(ui::colors::AMBER()) + ";border-color:" + QString(ui::colors::AMBER()) + ";}");
+ tools_check_->setToolTip("When enabled, the AI can interact with the terminal: navigate screens, fetch market data, manage watchlists, etc.");
+ form->addRow(new QLabel(""), tools_check_);
+
vl->addLayout(form);
// Buttons
@@ -444,15 +454,20 @@ void LlmConfigSection::load_providers() {
auto result = LlmConfigRepository::instance().list_providers();
if (result.is_ok()) {
for (const auto& p : result.value()) {
- QString display = p.provider;
+ bool is_fincept = (p.provider.toLower() == "fincept");
+ QString display = is_fincept ? "Fincept LLM" : p.provider;
if (p.is_active)
display += " ✓";
- if (!p.model.isEmpty())
+ // Show model tag only for non-fincept providers
+ if (!is_fincept && !p.model.isEmpty())
display += " [" + p.model + "]";
auto* item = new QListWidgetItem(display);
item->setData(Qt::UserRole, p.provider);
+ // Only the active provider gets amber color
if (p.is_active)
- item->setForeground(QColor("" + QString(ui::colors::AMBER()) + ""));
+ item->setForeground(QColor(ui::colors::AMBER()));
+ else
+ item->setForeground(QColor(ui::colors::TEXT_SECONDARY()));
provider_list_->addItem(item);
}
}
@@ -502,26 +517,34 @@ void LlmConfigSection::populate_form(const QString& provider) {
}
base_url_edit_->setText(p.base_url.isEmpty() ? def_url : p.base_url);
+ // Tools toggle — always visible
+ tools_check_->setChecked(p.tools_enabled);
+ tools_check_->setVisible(true);
+
if (is_fincept) {
api_key_edit_->clear();
auto stored = SettingsRepository::instance().get("fincept_api_key");
if (stored.is_ok() && !stored.value().isEmpty()) {
QString masked = stored.value().left(8) + "...";
- api_key_edit_->setPlaceholderText("From session: " + masked);
+ api_key_edit_->setPlaceholderText("Linked to your Fincept account: " + masked);
} else {
- api_key_edit_->setPlaceholderText("Login to auto-configure");
+ api_key_edit_->setPlaceholderText("Login to your Fincept account to enable");
}
api_key_edit_->setEnabled(false);
- model_combo_->setEnabled(true); // allow model selection
- base_url_edit_->setEnabled(false);
- fetch_btn_->setEnabled(true); // allow fetching available models
+ // Fincept is a managed service — hide model/base_url/fetch
+ model_combo_->setVisible(false);
+ fetch_btn_->setVisible(false);
+ base_url_edit_->setVisible(false);
} else {
api_key_edit_->setText(p.api_key);
api_key_edit_->setEnabled(true);
api_key_edit_->setPlaceholderText("sk-...");
+ model_combo_->setVisible(true);
model_combo_->setEnabled(true);
- base_url_edit_->setEnabled(true);
+ fetch_btn_->setVisible(true);
fetch_btn_->setEnabled(true);
+ base_url_edit_->setVisible(true);
+ base_url_edit_->setEnabled(true);
}
return;
}
@@ -530,10 +553,24 @@ void LlmConfigSection::populate_form(const QString& provider) {
// New provider — clear form
api_key_edit_->clear();
api_key_edit_->setEnabled(!is_fincept);
- base_url_edit_->setText(def_url);
- base_url_edit_->setEnabled(!is_fincept);
- model_combo_->setEnabled(true); // fincept allows model selection
- fetch_btn_->setEnabled(true); // fincept supports fetching models
+ if (is_fincept) {
+ auto stored = SettingsRepository::instance().get("fincept_api_key");
+ if (stored.is_ok() && !stored.value().isEmpty())
+ api_key_edit_->setPlaceholderText("Linked to your Fincept account: " + stored.value().left(8) + "...");
+ else
+ api_key_edit_->setPlaceholderText("Login to your Fincept account to enable");
+ model_combo_->setVisible(false);
+ fetch_btn_->setVisible(false);
+ base_url_edit_->setVisible(false);
+ } else {
+ model_combo_->setVisible(true);
+ model_combo_->setEnabled(true);
+ fetch_btn_->setVisible(true);
+ fetch_btn_->setEnabled(true);
+ base_url_edit_->setVisible(true);
+ base_url_edit_->setEnabled(true);
+ base_url_edit_->setText(def_url);
+ }
}
// ============================================================================
@@ -566,13 +603,13 @@ void LlmConfigSection::on_save_provider() {
cfg.model = model_combo_->currentText().trimmed();
cfg.base_url = base_url_edit_->text().trimmed();
cfg.is_active = true;
+ cfg.tools_enabled = tools_check_->isChecked();
- // Fincept defaults
+ // Fincept defaults — endpoints are hardcoded in LlmService, base_url not needed
if (is_fincept) {
if (cfg.model.isEmpty())
cfg.model = "MiniMax-M2.7";
- if (cfg.base_url.isEmpty())
- cfg.base_url = "https://api.fincept.in/research/llm";
+ cfg.base_url = {}; // not used for fincept
}
// Basic validation
@@ -580,19 +617,18 @@ void LlmConfigSection::on_save_provider() {
show_status("API key is required for " + provider, true);
return;
}
- if (cfg.model.isEmpty()) {
+ if (!is_fincept && cfg.model.isEmpty()) {
show_status("Model name is required", true);
return;
}
- // Set this as active (deactivates others)
- LlmConfigRepository::instance().set_active(provider);
+ // Save first (INSERT OR REPLACE), THEN set active (deactivates others + activates this one)
auto r2 = LlmConfigRepository::instance().save_provider(cfg);
-
if (r2.is_err()) {
show_status("Failed to save: " + QString::fromStdString(r2.error()), true);
return;
}
+ LlmConfigRepository::instance().set_active(provider);
show_status("Saved and set as active provider", false);
load_providers();
@@ -648,7 +684,17 @@ void LlmConfigSection::on_test_connection() {
return;
}
- if (provider != "ollama" && provider != "fincept") {
+ if (provider == "fincept") {
+ // Fincept is a managed service — verify API key exists
+ auto stored = SettingsRepository::instance().get("fincept_api_key");
+ if (stored.is_ok() && !stored.value().isEmpty())
+ show_status("Fincept connected — API key active", false);
+ else
+ show_status("Not connected — login to your Fincept account first", true);
+ return;
+ }
+
+ if (provider != "ollama") {
if (api_key_edit_->text().trimmed().isEmpty()) {
show_status("API key required for test", true);
return;
@@ -685,7 +731,12 @@ void LlmConfigSection::on_fetch_models() {
return;
}
- if (provider != "ollama" && provider != "fincept") {
+ if (provider == "fincept") {
+ show_status("Fincept manages models automatically", false);
+ return;
+ }
+
+ if (provider != "ollama") {
if (api_key_edit_->text().trimmed().isEmpty()) {
show_status("Enter API key first, then fetch models", true);
return;
diff --git a/fincept-qt/src/screens/settings/LlmConfigSection.h b/fincept-qt/src/screens/settings/LlmConfigSection.h
index e81ed4c52..90bbdd660 100644
--- a/fincept-qt/src/screens/settings/LlmConfigSection.h
+++ b/fincept-qt/src/screens/settings/LlmConfigSection.h
@@ -3,6 +3,7 @@
#include "storage/repositories/LlmProfileRepository.h"
+#include <QCheckBox>
#include <QComboBox>
#include <QDoubleSpinBox>
#include <QGroupBox>
@@ -62,6 +63,7 @@ class LlmConfigSection : public QWidget {
QPushButton* fetch_btn_ = nullptr;
QPushButton* save_btn_ = nullptr;
QPushButton* test_btn_ = nullptr;
+ QCheckBox* tools_check_ = nullptr;
QLabel* status_lbl_ = nullptr;
// Global settings (lives at bottom of provider tab)
diff --git a/fincept-qt/src/screens/settings/SettingsScreen.cpp b/fincept-qt/src/screens/settings/SettingsScreen.cpp
index 6e05fbb1f..21acdf1ad 100644
--- a/fincept-qt/src/screens/settings/SettingsScreen.cpp
+++ b/fincept-qt/src/screens/settings/SettingsScreen.cpp
@@ -4,10 +4,13 @@
#include "screens/settings/SettingsScreen.h"
#include "ai_chat/LlmService.h"
+#include "auth/InactivityGuard.h"
+#include "auth/PinManager.h"
#include "core/config/AppConfig.h"
#include "core/events/EventBus.h"
#include "core/config/ProfileManager.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "services/notifications/NotificationService.h"
#include "screens/settings/LlmConfigSection.h"
#include "screens/settings/McpServersSection.h"
@@ -22,7 +25,6 @@
#include "ui/theme/ThemeManager.h"
#include <QCheckBox>
-#include <QColorDialog>
#include <QComboBox>
#include <QCoreApplication>
#include <QFontDatabase>
@@ -159,7 +161,8 @@ SettingsScreen::SettingsScreen(QWidget* parent) : QWidget(parent) {
sections_->addWidget(build_llm_config()); // 5
sections_->addWidget(build_mcp_servers()); // 6
sections_->addWidget(build_logging()); // 7
- sections_->addWidget(build_profiles()); // 8
+ sections_->addWidget(build_security()); // 8
+ sections_->addWidget(build_profiles()); // 9
QList<QPushButton*> nav_btns;
auto make_btn = [&](const QString& text, int idx) {
@@ -176,6 +179,7 @@ SettingsScreen::SettingsScreen(QWidget* parent) : QWidget(parent) {
}
btn->setChecked(true);
sections_->setCurrentIndex(idx);
+ ScreenStateManager::instance().notify_changed(this);
});
nvl->addWidget(btn);
nav_btns.append(btn);
@@ -190,7 +194,8 @@ SettingsScreen::SettingsScreen(QWidget* parent) : QWidget(parent) {
make_btn("LLM Config", 5);
make_btn("MCP Servers", 6);
make_btn("Logging", 7);
- make_btn("Profiles", 8);
+ make_btn("Security", 8);
+ make_btn("Profiles", 9);
first->setChecked(true);
@@ -227,6 +232,7 @@ void SettingsScreen::showEvent(QShowEvent* e) {
load_credentials();
load_appearance();
load_notifications();
+ load_security();
refresh_storage_stats();
if (auto* llm = qobject_cast<LlmConfigSection*>(sections_->widget(5)))
llm->reload();
@@ -486,27 +492,6 @@ QWidget* SettingsScreen::build_appearance() {
fincept::ui::ThemeManager::instance().apply_theme(name);
});
- // Accent color override
- accent_color_btn_ = new QPushButton("Pick Color");
- accent_color_btn_->setFixedWidth(120);
- accent_color_btn_->setStyleSheet(btn_secondary_ss());
- connect(accent_color_btn_, &QPushButton::clicked, this, [this]() {
- QColor initial = custom_accent_color_.isEmpty()
- ? QColor(fincept::ui::ThemeManager::instance().tokens().accent)
- : QColor(custom_accent_color_);
- QColor chosen = QColorDialog::getColor(initial, this, "Choose Accent Color");
- if (chosen.isValid()) {
- custom_accent_color_ = chosen.name();
- accent_color_btn_->setStyleSheet(
- QString("QPushButton { background: %1; color: %2; border: none; "
- "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_);
- }
- });
- vl->addWidget(make_row("Accent Color", accent_color_btn_, "Overrides the theme's default accent color."));
-
app_density_ = new QComboBox;
app_density_->addItems(fincept::ui::ThemeManager::available_densities());
app_density_->setCurrentText("Default");
@@ -564,8 +549,6 @@ QWidget* SettingsScreen::build_appearance() {
ticker_bar_toggle_->isChecked() ? "true" : "false", "appearance");
repo.set("appearance.animations",
animations_toggle_->isChecked() ? "true" : "false", "appearance");
- if (!custom_accent_color_.isEmpty())
- repo.set("appearance.accent_color", custom_accent_color_, "appearance");
// Flush any pending debounce immediately on save
if (appearance_debounce_->isActive()) {
@@ -575,8 +558,6 @@ QWidget* SettingsScreen::build_appearance() {
tm.apply_font(app_font_family_->currentText(), px);
tm.apply_density(app_density_->currentText());
}
- if (!custom_accent_color_.isEmpty())
- tm.apply_accent(custom_accent_color_);
LOG_INFO("Settings", "Appearance saved and applied");
});
@@ -622,19 +603,6 @@ void SettingsScreen::load_appearance() {
load_check(chat_bubble_toggle_, "appearance.show_chat_bubble", true);
load_check(ticker_bar_toggle_, "appearance.show_ticker_bar", true);
load_check(animations_toggle_, "appearance.animations", true);
-
- // Restore custom accent color if set
- auto r_accent = repo.get("appearance.accent_color");
- if (r_accent.is_ok() && !r_accent.value().isEmpty()) {
- custom_accent_color_ = r_accent.value();
- if (accent_color_btn_) {
- accent_color_btn_->setStyleSheet(
- QString("QPushButton { background: %1; color: %2; border: none; "
- "padding: 0 12px; height: 32px; }")
- .arg(custom_accent_color_,
- QString(fincept::ui::ThemeManager::instance().tokens().bg_base)));
- }
- }
}
// ── Notifications ─────────────────────────────────────────────────────────────
@@ -1139,9 +1107,9 @@ static QWidget* make_category_row(const QString& name, QLabel* count_lbl,
clear_btn->setFixedSize(56, 20);
clear_btn->setStyleSheet(
- QString("QPushButton{background:rgba(220,38,38,0.1);color:%1;border:1px solid #7f1d1d;font-weight:700;}"
+ QString("QPushButton{background:rgba(220,38,38,0.1);color:%1;border:1px solid %3;font-weight:700;}"
"QPushButton:hover{background:%1;color:%2;}")
- .arg(ui::colors::NEGATIVE(), ui::colors::TEXT_PRIMARY()));
+ .arg(ui::colors::NEGATIVE(), ui::colors::TEXT_PRIMARY(), ui::colors::NEGATIVE_DIM()));
hl->addWidget(clear_btn);
return row;
@@ -1187,9 +1155,9 @@ static QWidget* make_file_action_row(const QString& name, QLabel* size_lbl,
btn->setFixedSize(56, 20);
btn->setStyleSheet(
- QString("QPushButton{background:rgba(220,38,38,0.1);color:%1;border:1px solid #7f1d1d;font-weight:700;}"
+ QString("QPushButton{background:rgba(220,38,38,0.1);color:%1;border:1px solid %3;font-weight:700;}"
"QPushButton:hover{background:%1;color:%2;}")
- .arg(ui::colors::NEGATIVE(), ui::colors::TEXT_PRIMARY()));
+ .arg(ui::colors::NEGATIVE(), ui::colors::TEXT_PRIMARY(), ui::colors::NEGATIVE_DIM()));
hl->addWidget(btn);
return row;
@@ -1731,8 +1699,8 @@ QWidget* SettingsScreen::build_storage() {
// ═══════════════════════════════════════════════════════════════════════════
{
auto* panel = new QFrame;
- panel->setStyleSheet(QString("QFrame{background:%1;border:1px solid #7f1d1d;}")
- .arg(ui::colors::BG_SURFACE()));
+ panel->setStyleSheet(QString("QFrame{background:%1;border:1px solid %2;}")
+ .arg(ui::colors::BG_SURFACE(), ui::colors::NEGATIVE_DIM()));
auto* pvl = new QVBoxLayout(panel);
pvl->setContentsMargins(0, 0, 0, 0);
pvl->setSpacing(0);
@@ -1740,7 +1708,8 @@ QWidget* SettingsScreen::build_storage() {
// Red header
auto* hdr = new QWidget;
hdr->setFixedHeight(34);
- hdr->setStyleSheet("background:rgba(220,38,38,0.08);border-bottom:1px solid #7f1d1d;");
+ hdr->setStyleSheet(QString("background:rgba(220,38,38,0.08);border-bottom:1px solid %1;")
+ .arg(ui::colors::NEGATIVE_DIM()));
auto* hhl = new QHBoxLayout(hdr);
hhl->setContentsMargins(12, 0, 12, 0);
auto* hlbl = new QLabel("DANGER ZONE");
@@ -1775,9 +1744,9 @@ QWidget* SettingsScreen::build_storage() {
auto* cache_btn = new QPushButton("CLEAR CACHE");
cache_btn->setFixedSize(110, 26);
cache_btn->setStyleSheet(
- QString("QPushButton{background:rgba(220,38,38,0.1);color:%1;border:1px solid #7f1d1d;font-weight:700;}"
+ QString("QPushButton{background:rgba(220,38,38,0.1);color:%1;border:1px solid %3;font-weight:700;}"
"QPushButton:hover{background:%1;color:%2;}")
- .arg(ui::colors::NEGATIVE(), ui::colors::TEXT_PRIMARY()));
+ .arg(ui::colors::NEGATIVE(), ui::colors::TEXT_PRIMARY(), ui::colors::NEGATIVE_DIM()));
connect(cache_btn, &QPushButton::clicked, this, [this]() {
auto answer = QMessageBox::warning(this, "Clear All Cache",
"Delete all temporary cached data?\nData will be re-fetched on next access.",
@@ -2189,9 +2158,9 @@ QWidget* SettingsScreen::build_data_sources() {
auto* disable_all = new QPushButton("DISABLE ALL");
disable_all->setFixedHeight(24);
disable_all->setStyleSheet(
- QString("QPushButton{background:rgba(220,38,38,0.1);color:%1;border:1px solid #7f1d1d;font-weight:700;padding:0 10px;}"
+ QString("QPushButton{background:rgba(220,38,38,0.1);color:%1;border:1px solid %3;font-weight:700;padding:0 10px;}"
"QPushButton:hover{background:%1;color:%2;}")
- .arg(ui::colors::NEGATIVE(), ui::colors::TEXT_PRIMARY()));
+ .arg(ui::colors::NEGATIVE(), ui::colors::TEXT_PRIMARY(), ui::colors::NEGATIVE_DIM()));
connect(disable_all, &QPushButton::clicked, this, [this]() {
auto answer = QMessageBox::warning(this, "Disable All",
"Disable all data source connections?",
@@ -2434,6 +2403,301 @@ QWidget* SettingsScreen::build_logging() {
return scroll;
}
+// ── Security ─────────────────────────────────────────────────────────────────
+
+QWidget* SettingsScreen::build_security() {
+ auto* scroll = new QScrollArea;
+ scroll->setWidgetResizable(true);
+ scroll->setStyleSheet(
+ QString("QScrollArea { border: none; background: transparent; }"
+ "QScrollBar:vertical { background: %1; width: 6px; }"
+ "QScrollBar::handle:vertical { background: %2; }"
+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }")
+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_MED()));
+
+ auto* page = new QWidget;
+ auto* vl = new QVBoxLayout(page);
+ vl->setContentsMargins(24, 24, 24, 24);
+ vl->setSpacing(8);
+
+ // ── PIN STATUS ────────────────────────────────────────────────────────────
+ auto* t1 = new QLabel("PIN AUTHENTICATION");
+ t1->setStyleSheet(section_title_ss());
+ vl->addWidget(t1);
+ vl->addWidget(make_sep());
+ vl->addSpacing(8);
+
+ sec_pin_status_ = new QLabel;
+ sec_pin_status_->setStyleSheet(
+ QString("color:%1;background:transparent;").arg(ui::colors::TEXT_PRIMARY()));
+ vl->addWidget(make_row("PIN Status", sec_pin_status_,
+ "A 6-digit PIN is required to unlock the terminal."));
+
+ sec_lockout_status_ = new QLabel;
+ sec_lockout_status_->setStyleSheet(
+ QString("color:%1;background:transparent;").arg(ui::colors::TEXT_SECONDARY()));
+ vl->addWidget(make_row("Failed Attempts", sec_lockout_status_,
+ "PIN lockout engages after 5 consecutive failures."));
+
+ vl->addSpacing(8);
+ vl->addWidget(make_sep());
+ vl->addSpacing(8);
+
+ // ── CHANGE PIN ────────────────────────────────────────────────────────────
+ auto* t2 = new QLabel("CHANGE PIN");
+ t2->setStyleSheet(sub_title_ss());
+ vl->addWidget(t2);
+ vl->addSpacing(4);
+
+ sec_change_pin_btn_ = new QPushButton("Change PIN");
+ sec_change_pin_btn_->setFixedWidth(140);
+ sec_change_pin_btn_->setStyleSheet(btn_secondary_ss());
+ vl->addWidget(sec_change_pin_btn_);
+
+ // Expandable change-PIN form (hidden by default)
+ sec_change_pin_form_ = new QWidget;
+ sec_change_pin_form_->setStyleSheet("background: transparent;");
+ auto* cpfl = new QVBoxLayout(sec_change_pin_form_);
+ cpfl->setContentsMargins(0, 8, 0, 0);
+ cpfl->setSpacing(6);
+
+ auto make_pin_field = [&](const QString& placeholder) {
+ auto* input = new QLineEdit;
+ input->setPlaceholderText(placeholder);
+ input->setMaxLength(6);
+ input->setEchoMode(QLineEdit::Password);
+ input->setFixedWidth(200);
+ input->setStyleSheet(input_ss());
+ return input;
+ };
+
+ sec_current_pin_ = make_pin_field("Current PIN");
+ cpfl->addWidget(make_row("Current PIN", sec_current_pin_));
+
+ sec_new_pin_ = make_pin_field("New PIN");
+ cpfl->addWidget(make_row("New PIN", sec_new_pin_));
+
+ sec_confirm_pin_ = make_pin_field("Confirm PIN");
+ cpfl->addWidget(make_row("Confirm PIN", sec_confirm_pin_));
+
+ sec_pin_error_ = new QLabel;
+ sec_pin_error_->setWordWrap(true);
+ sec_pin_error_->setStyleSheet(
+ QString("color:%1;background:rgba(220,38,38,0.08);border:1px solid %2;padding:6px 8px;")
+ .arg(ui::colors::NEGATIVE(), ui::colors::NEGATIVE_DIM()));
+ sec_pin_error_->hide();
+ cpfl->addWidget(sec_pin_error_);
+
+ sec_pin_success_ = new QLabel;
+ sec_pin_success_->setWordWrap(true);
+ sec_pin_success_->setStyleSheet(
+ QString("color:%1;background:rgba(22,163,74,0.08);border:1px solid %2;padding:6px 8px;")
+ .arg(ui::colors::POSITIVE(), ui::colors::POSITIVE_DIM()));
+ sec_pin_success_->hide();
+ cpfl->addWidget(sec_pin_success_);
+
+ auto* save_pin_btn = new QPushButton("Update PIN");
+ save_pin_btn->setFixedWidth(140);
+ save_pin_btn->setStyleSheet(btn_primary_ss());
+ cpfl->addWidget(save_pin_btn);
+
+ sec_change_pin_form_->hide();
+ vl->addWidget(sec_change_pin_form_);
+
+ // Toggle form visibility
+ connect(sec_change_pin_btn_, &QPushButton::clicked, this, [this]() {
+ bool showing = sec_change_pin_form_->isVisible();
+ sec_change_pin_form_->setVisible(!showing);
+ sec_change_pin_btn_->setText(showing ? "Change PIN" : "Cancel");
+ if (!showing) {
+ sec_current_pin_->clear();
+ sec_new_pin_->clear();
+ sec_confirm_pin_->clear();
+ sec_pin_error_->hide();
+ sec_pin_success_->hide();
+ sec_current_pin_->setFocus();
+ }
+ });
+
+ // Save PIN handler
+ connect(save_pin_btn, &QPushButton::clicked, this, [this]() {
+ sec_pin_error_->hide();
+ sec_pin_success_->hide();
+
+ auto& pm = auth::PinManager::instance();
+ const QString current = sec_current_pin_->text();
+ const QString new_pin = sec_new_pin_->text();
+ const QString confirm = sec_confirm_pin_->text();
+
+ // Verify current PIN
+ if (!pm.verify_pin(current)) {
+ sec_pin_error_->setText("Current PIN is incorrect");
+ sec_pin_error_->show();
+ sec_current_pin_->clear();
+ sec_current_pin_->setFocus();
+ return;
+ }
+
+ // Validate new PIN
+ if (new_pin.length() != 6) {
+ sec_pin_error_->setText("New PIN must be exactly 6 digits");
+ sec_pin_error_->show();
+ return;
+ }
+ for (const QChar& c : new_pin) {
+ if (!c.isDigit()) {
+ sec_pin_error_->setText("PIN must contain only digits");
+ sec_pin_error_->show();
+ return;
+ }
+ }
+ if (new_pin != confirm) {
+ sec_pin_error_->setText("New PINs do not match");
+ sec_pin_error_->show();
+ sec_confirm_pin_->clear();
+ sec_confirm_pin_->setFocus();
+ return;
+ }
+ if (new_pin == current) {
+ sec_pin_error_->setText("New PIN must be different from current PIN");
+ sec_pin_error_->show();
+ return;
+ }
+
+ auto result = pm.set_pin(new_pin);
+ if (result.is_err()) {
+ sec_pin_error_->setText(QString::fromStdString(result.error()));
+ sec_pin_error_->show();
+ return;
+ }
+
+ sec_pin_success_->setText("PIN updated successfully");
+ sec_pin_success_->show();
+ sec_current_pin_->clear();
+ sec_new_pin_->clear();
+ sec_confirm_pin_->clear();
+ load_security();
+
+ LOG_INFO("Settings", "PIN changed via Security settings");
+ });
+
+ vl->addSpacing(8);
+ vl->addWidget(make_sep());
+ vl->addSpacing(8);
+
+ // ── AUTO-LOCK ─────────────────────────────────────────────────────────────
+ auto* t3 = new QLabel("AUTO-LOCK");
+ t3->setStyleSheet(sub_title_ss());
+ vl->addWidget(t3);
+ vl->addSpacing(4);
+
+ sec_autolock_toggle_ = new QCheckBox("Enable auto-lock on inactivity");
+ sec_autolock_toggle_->setChecked(true);
+ sec_autolock_toggle_->setStyleSheet(check_ss());
+ vl->addWidget(make_row("Auto-Lock", sec_autolock_toggle_,
+ "Locks the terminal after a period of inactivity."));
+
+ sec_lock_timeout_ = new QComboBox;
+ sec_lock_timeout_->addItem("1 min", 1);
+ sec_lock_timeout_->addItem("2 min", 2);
+ sec_lock_timeout_->addItem("5 min", 5);
+ sec_lock_timeout_->addItem("10 min", 10);
+ sec_lock_timeout_->addItem("15 min", 15);
+ sec_lock_timeout_->addItem("30 min", 30);
+ sec_lock_timeout_->addItem("60 min", 60);
+ sec_lock_timeout_->setCurrentIndex(3); // default 10 min
+ sec_lock_timeout_->setStyleSheet(combo_ss());
+ vl->addWidget(make_row("Lock Timeout", sec_lock_timeout_,
+ "Time of inactivity before the terminal locks."));
+
+ // Enable/disable timeout combo based on toggle
+ connect(sec_autolock_toggle_, &QCheckBox::toggled, this, [this](bool checked) {
+ sec_lock_timeout_->setEnabled(checked);
+ });
+
+ vl->addSpacing(16);
+
+ // ── SAVE ──────────────────────────────────────────────────────────────────
+ auto* save_btn = new QPushButton("Save Security Settings");
+ save_btn->setFixedWidth(200);
+ save_btn->setStyleSheet(btn_primary_ss());
+ connect(save_btn, &QPushButton::clicked, this, [this]() {
+ auto& repo = SettingsRepository::instance();
+ auto& guard = auth::InactivityGuard::instance();
+
+ bool autolock = sec_autolock_toggle_->isChecked();
+ int minutes = sec_lock_timeout_->currentData().toInt();
+
+ repo.set("security.autolock_enabled", autolock ? "true" : "false", "security");
+ repo.set("security.lock_timeout_minutes", QString::number(minutes), "security");
+
+ guard.set_timeout_minutes(minutes);
+ guard.set_enabled(autolock);
+
+ LOG_INFO("Settings", QString("Security settings saved: autolock=%1, timeout=%2min")
+ .arg(autolock).arg(minutes));
+ });
+ vl->addWidget(save_btn);
+
+ vl->addStretch();
+ scroll->setWidget(page);
+ return scroll;
+}
+
+void SettingsScreen::load_security() {
+ auto& pm = auth::PinManager::instance();
+ auto& repo = SettingsRepository::instance();
+
+ // PIN status
+ if (sec_pin_status_) {
+ if (pm.has_pin())
+ sec_pin_status_->setText("CONFIGURED");
+ else
+ sec_pin_status_->setText("NOT SET");
+ sec_pin_status_->setStyleSheet(
+ QString("color:%1;font-weight:700;background:transparent;")
+ .arg(pm.has_pin() ? ui::colors::POSITIVE() : ui::colors::NEGATIVE()));
+ }
+
+ // Lockout status
+ if (sec_lockout_status_) {
+ int attempts = pm.failed_attempts();
+ if (attempts == 0) {
+ sec_lockout_status_->setText("0 / 5");
+ } else {
+ sec_lockout_status_->setText(QString("%1 / 5").arg(attempts));
+ }
+ sec_lockout_status_->setStyleSheet(
+ QString("color:%1;font-weight:700;background:transparent;")
+ .arg(attempts > 0 ? ui::colors::WARNING() : ui::colors::TEXT_SECONDARY()));
+ }
+
+ // Change PIN button visibility (only if PIN exists)
+ if (sec_change_pin_btn_)
+ sec_change_pin_btn_->setEnabled(pm.has_pin());
+
+ // Auto-lock settings
+ if (sec_autolock_toggle_ && sec_lock_timeout_) {
+ const QSignalBlocker b1(sec_autolock_toggle_);
+ const QSignalBlocker b2(sec_lock_timeout_);
+
+ auto r_enabled = repo.get("security.autolock_enabled");
+ bool enabled = !r_enabled.is_ok() || r_enabled.value() != "false"; // default true
+ sec_autolock_toggle_->setChecked(enabled);
+ sec_lock_timeout_->setEnabled(enabled);
+
+ auto r_timeout = repo.get("security.lock_timeout_minutes");
+ int minutes = r_timeout.is_ok() ? r_timeout.value().toInt() : 10;
+ // Find matching combo index by data
+ for (int i = 0; i < sec_lock_timeout_->count(); ++i) {
+ if (sec_lock_timeout_->itemData(i).toInt() == minutes) {
+ sec_lock_timeout_->setCurrentIndex(i);
+ break;
+ }
+ }
+ }
+}
+
// ── Profiles ──────────────────────────────────────────────────────────────────
QWidget* SettingsScreen::build_profiles() {
auto* scroll = new QScrollArea;
diff --git a/fincept-qt/src/screens/settings/SettingsScreen.h b/fincept-qt/src/screens/settings/SettingsScreen.h
index 50eea6e1a..80e9e5699 100644
--- a/fincept-qt/src/screens/settings/SettingsScreen.h
+++ b/fincept-qt/src/screens/settings/SettingsScreen.h
@@ -16,7 +16,7 @@ namespace fincept::screens {
/// Full-featured settings screen.
/// Sections: Credentials | Appearance | Notifications | Storage & Cache |
-/// Data Sources | LLM Config | MCP Servers | Logging
+/// Data Sources | LLM Config | MCP Servers | Logging | Security | Profiles
class SettingsScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
@@ -42,6 +42,7 @@ class SettingsScreen : public QWidget, public IStatefulScreen {
QWidget* build_llm_config();
QWidget* build_mcp_servers();
QWidget* build_logging();
+ QWidget* build_security();
QWidget* build_profiles();
// ── Shared layout helper ──────────────────────────────────────────────────
@@ -60,8 +61,6 @@ class SettingsScreen : public QWidget, public IStatefulScreen {
QCheckBox* chat_bubble_toggle_ = nullptr;
QCheckBox* ticker_bar_toggle_ = nullptr;
QCheckBox* animations_toggle_ = nullptr;
- QPushButton* accent_color_btn_ = nullptr;
- QString custom_accent_color_;
QTimer* appearance_debounce_ = nullptr; // coalesces rapid font/density changes
// ── Notifications state ───────────────────────────────────────────────────
@@ -107,11 +106,26 @@ class SettingsScreen : public QWidget, public IStatefulScreen {
QWidget* log_tag_list_ = nullptr; // VBox container for tag rows
QVBoxLayout* log_tag_layout_ = nullptr;
+ // ── Security state ──────────────────────────────────────────────────────────
+ QLabel* sec_pin_status_ = nullptr;
+ QComboBox* sec_lock_timeout_ = nullptr;
+ QCheckBox* sec_autolock_toggle_ = nullptr;
+ QLabel* sec_lockout_status_ = nullptr;
+ QPushButton* sec_change_pin_btn_ = nullptr;
+ // Change PIN sub-widgets (shown/hidden dynamically)
+ QWidget* sec_change_pin_form_ = nullptr;
+ QLineEdit* sec_current_pin_ = nullptr;
+ QLineEdit* sec_new_pin_ = nullptr;
+ QLineEdit* sec_confirm_pin_ = nullptr;
+ QLabel* sec_pin_error_ = nullptr;
+ QLabel* sec_pin_success_ = nullptr;
+
// ── Data loaders (called from showEvent) ──────────────────────────────────
void refresh_theme();
void load_credentials();
void load_appearance();
void load_notifications();
+ void load_security();
void refresh_storage_stats();
// ── Notification helpers ──────────────────────────────────────────────────
diff --git a/fincept-qt/src/screens/setup/SetupScreen.cpp b/fincept-qt/src/screens/setup/SetupScreen.cpp
index 212d584d5..f63594229 100644
--- a/fincept-qt/src/screens/setup/SetupScreen.cpp
+++ b/fincept-qt/src/screens/setup/SetupScreen.cpp
@@ -18,7 +18,7 @@ namespace fincept::screens {
using namespace fincept::ui;
-static const QString kAccent = "#d97706"; // Amber
+static const QString kAccent = colors::AMBER;
// ─────────────────────────────────────────────────────────────────────────────
// Constructor
diff --git a/fincept-qt/src/screens/support/SupportScreen.cpp b/fincept-qt/src/screens/support/SupportScreen.cpp
index 6c6156079..448e64344 100644
--- a/fincept-qt/src/screens/support/SupportScreen.cpp
+++ b/fincept-qt/src/screens/support/SupportScreen.cpp
@@ -18,45 +18,68 @@ namespace fincept::screens {
// ── Style constants ───────────────────────────────────────────────────────────
-static const char* SS_INPUT =
- "QLineEdit, QTextEdit, QComboBox {"
- " background: #080808; color: #e5e5e5;"
- " border: 1px solid #222222; padding: 6px 8px;"
- " font-size: 12px; font-family: 'Consolas','Courier New',monospace; }"
- "QLineEdit:focus, QTextEdit:focus { border-color: #333333; }"
- "QComboBox::drop-down { border: none; }"
- "QComboBox QAbstractItemView { background: #0a0a0a; color: #e5e5e5; border: 1px solid #222; }";
-
-static const char* SS_BTN_AMBER = "QPushButton { background: #d97706; color: #000; border: none;"
- " padding: 4px 14px; font-size: 11px; font-weight: bold;"
- " font-family: 'Consolas','Courier New',monospace; }"
- "QPushButton:hover { background: #b45309; }"
- "QPushButton:disabled { background: #404040; color: #666; }";
-
-static const char* SS_BTN_GREEN = "QPushButton { background: #16a34a; color: #000; border: none;"
- " padding: 4px 14px; font-size: 11px; font-weight: bold;"
- " font-family: 'Consolas','Courier New',monospace; }"
- "QPushButton:hover { background: #15803d; }"
- "QPushButton:disabled { background: #404040; color: #666; }";
-
-static const char* SS_BTN_GRAY = "QPushButton { background: #1a1a1a; color: #808080; border: 1px solid #222;"
- " padding: 4px 14px; font-size: 11px; font-weight: bold;"
- " font-family: 'Consolas','Courier New',monospace; }"
- "QPushButton:hover { background: #222; color: #e5e5e5; }";
-
-static const char* SS_BTN_RED_OUTLINE =
- "QPushButton { background: transparent; color: #dc2626; border: 1px solid #dc2626;"
- " padding: 4px 10px; font-size: 10px; font-weight: bold;"
- " font-family: 'Consolas','Courier New',monospace; }"
- "QPushButton:hover { background: #dc262620; }"
- "QPushButton:disabled { border-color: #404040; color: #404040; }";
-
-static const char* SS_BTN_GREEN_OUTLINE =
- "QPushButton { background: transparent; color: #16a34a; border: 1px solid #16a34a;"
- " padding: 4px 10px; font-size: 10px; font-weight: bold;"
- " font-family: 'Consolas','Courier New',monospace; }"
- "QPushButton:hover { background: #16a34a20; }"
- "QPushButton:disabled { border-color: #404040; color: #404040; }";
+static QString SS_INPUT() {
+ return QString(
+ "QLineEdit, QTextEdit, QComboBox {"
+ " background: %1; color: %2;"
+ " border: 1px solid %3; padding: 6px 8px;"
+ " font-size: 12px; font-family: 'Consolas','Courier New',monospace; }"
+ "QLineEdit:focus, QTextEdit:focus { border-color: %4; }"
+ "QComboBox::drop-down { border: none; }"
+ "QComboBox QAbstractItemView { background: %5; color: %2; border: 1px solid %3; }")
+ .arg(ui::colors::BG_BASE, ui::colors::TEXT_PRIMARY, ui::colors::BORDER_MED,
+ ui::colors::BORDER_BRIGHT, ui::colors::BG_SURFACE);
+}
+
+static QString SS_BTN_AMBER() {
+ return QString(
+ "QPushButton { background: %1; color: %2; border: none;"
+ " padding: 4px 14px; font-size: 11px; font-weight: bold;"
+ " font-family: 'Consolas','Courier New',monospace; }"
+ "QPushButton:hover { background: #b45309; }"
+ "QPushButton:disabled { background: %2; color: #666; }")
+ .arg(ui::colors::AMBER, ui::colors::TEXT_DIM);
+}
+
+static QString SS_BTN_GREEN() {
+ return QString(
+ "QPushButton { background: %1; color: %2; border: none;"
+ " padding: 4px 14px; font-size: 11px; font-weight: bold;"
+ " font-family: 'Consolas','Courier New',monospace; }"
+ "QPushButton:hover { background: #15803d; }"
+ "QPushButton:disabled { background: %2; color: #666; }")
+ .arg(ui::colors::POSITIVE, ui::colors::TEXT_DIM);
+}
+
+static QString SS_BTN_GRAY() {
+ return QString(
+ "QPushButton { background: %1; color: %2; border: 1px solid %3;"
+ " padding: 4px 14px; font-size: 11px; font-weight: bold;"
+ " font-family: 'Consolas','Courier New',monospace; }"
+ "QPushButton:hover { background: %3; color: %4; }")
+ .arg(ui::colors::BORDER_DIM, ui::colors::TEXT_SECONDARY,
+ ui::colors::BORDER_MED, ui::colors::TEXT_PRIMARY);
+}
+
+static QString SS_BTN_RED_OUTLINE() {
+ return QString(
+ "QPushButton { background: transparent; color: %1; border: 1px solid %1;"
+ " padding: 4px 10px; font-size: 10px; font-weight: bold;"
+ " font-family: 'Consolas','Courier New',monospace; }"
+ "QPushButton:hover { background: %1; }"
+ "QPushButton:disabled { border-color: %2; color: %2; }")
+ .arg(ui::colors::NEGATIVE, ui::colors::TEXT_DIM);
+}
+
+static QString SS_BTN_GREEN_OUTLINE() {
+ return QString(
+ "QPushButton { background: transparent; color: %1; border: 1px solid %1;"
+ " padding: 4px 10px; font-size: 10px; font-weight: bold;"
+ " font-family: 'Consolas','Courier New',monospace; }"
+ "QPushButton:hover { background: %1; }"
+ "QPushButton:disabled { border-color: %2; color: %2; }")
+ .arg(ui::colors::POSITIVE, ui::colors::TEXT_DIM);
+}
static const char* SS_MONO = "font-family: 'Consolas','Courier New',monospace;";
@@ -65,23 +88,23 @@ static const char* SS_MONO = "font-family: 'Consolas','Courier New',monospace;";
QString SupportScreen::status_color(const QString& s) {
QString l = s.toLower();
if (l == "open" || l == "in_progress")
- return "#0891b2";
+ return ui::colors::CYAN;
if (l == "resolved" || l == "closed")
- return "#16a34a";
+ return ui::colors::POSITIVE;
if (l == "pending")
- return "#ca8a04";
- return "#808080";
+ return ui::colors::WARNING;
+ return ui::colors::TEXT_SECONDARY;
}
QString SupportScreen::priority_color(const QString& p) {
QString l = p.toLower();
if (l == "high" || l == "urgent")
- return "#dc2626";
+ return ui::colors::NEGATIVE;
if (l == "medium")
- return "#d97706";
+ return ui::colors::AMBER;
if (l == "low")
- return "#16a34a";
- return "#808080";
+ return ui::colors::POSITIVE;
+ return ui::colors::TEXT_SECONDARY;
}
static QLabel* mono_label(const QString& text, const QString& color, int size = 12, bool bold = false) {
@@ -98,7 +121,7 @@ static QWidget* hsep() {
auto* f = new QFrame;
f->setFrameShape(QFrame::HLine);
f->setFixedHeight(1);
- f->setStyleSheet("background: #1a1a1a; border: none;");
+ f->setStyleSheet(QString("background: %1; border: none;").arg(ui::colors::BORDER_DIM));
return f;
}
@@ -123,19 +146,19 @@ SupportScreen::SupportScreen(QWidget* parent) : QWidget(parent) {
refresh_btn_ = new QPushButton("↻ REFRESH");
refresh_btn_->setFixedHeight(24);
- refresh_btn_->setStyleSheet(SS_BTN_AMBER);
+ refresh_btn_->setStyleSheet(SS_BTN_AMBER());
connect(refresh_btn_, &QPushButton::clicked, this, &SupportScreen::load_tickets);
bl->addWidget(refresh_btn_);
new_ticket_btn_ = new QPushButton("+ NEW TICKET");
new_ticket_btn_->setFixedHeight(24);
- new_ticket_btn_->setStyleSheet(SS_BTN_GREEN);
+ new_ticket_btn_->setStyleSheet(SS_BTN_GREEN());
connect(new_ticket_btn_, &QPushButton::clicked, this, [this]() { switch_to(1); });
bl->addWidget(new_ticket_btn_);
back_btn_ = new QPushButton("← BACK TO LIST");
back_btn_->setFixedHeight(24);
- back_btn_->setStyleSheet(SS_BTN_GRAY);
+ back_btn_->setStyleSheet(SS_BTN_GRAY());
back_btn_->hide();
connect(back_btn_, &QPushButton::clicked, this, [this]() { switch_to(0); });
bl->addWidget(back_btn_);
@@ -147,7 +170,7 @@ SupportScreen::SupportScreen(QWidget* parent) : QWidget(parent) {
bl->addWidget(stat_total_);
bl->addWidget(mono_label("|", ui::colors::TEXT_TERTIARY(), 11));
bl->addWidget(mono_label("OPEN:", ui::colors::TEXT_TERTIARY(), 11));
- stat_open_ = mono_label("0", "#ca8a04", 11, true);
+ stat_open_ = mono_label("0", ui::colors::WARNING(), 11, true);
bl->addWidget(stat_open_);
bl->addWidget(mono_label("|", ui::colors::TEXT_TERTIARY(), 11));
bl->addWidget(mono_label("RESOLVED:", ui::colors::TEXT_TERTIARY(), 11));
@@ -224,7 +247,8 @@ QWidget* SupportScreen::build_create_page() {
// Form card
auto* card = new QWidget;
- card->setStyleSheet("background: #0a0a0a; border: 1px solid #1a1a1a; border-left: 3px solid #16a34a;");
+ card->setStyleSheet(QString("background: %1; border: 1px solid %2; border-left: 3px solid %3;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM, ui::colors::POSITIVE));
auto* cl = new QVBoxLayout(card);
cl->setContentsMargins(18, 14, 18, 16);
cl->setSpacing(10);
@@ -235,7 +259,7 @@ QWidget* SupportScreen::build_create_page() {
subject_input_ = new QLineEdit;
subject_input_->setPlaceholderText("Brief description of your issue");
subject_input_->setFixedHeight(32);
- subject_input_->setStyleSheet(SS_INPUT);
+ subject_input_->setStyleSheet(SS_INPUT());
cl->addWidget(subject_input_);
// Category + Priority row
@@ -251,7 +275,7 @@ QWidget* SupportScreen::build_create_page() {
category_combo_ = new QComboBox;
category_combo_->addItems({"technical", "billing", "feature", "bug", "account", "other"});
category_combo_->setFixedHeight(32);
- category_combo_->setStyleSheet(SS_INPUT);
+ category_combo_->setStyleSheet(SS_INPUT());
cat_vl->addWidget(category_combo_);
crl->addLayout(cat_vl);
@@ -262,7 +286,7 @@ QWidget* SupportScreen::build_create_page() {
priority_combo_->addItems({"low", "medium", "high"});
priority_combo_->setCurrentIndex(1);
priority_combo_->setFixedHeight(32);
- priority_combo_->setStyleSheet(SS_INPUT);
+ priority_combo_->setStyleSheet(SS_INPUT());
pri_vl->addWidget(priority_combo_);
crl->addLayout(pri_vl);
@@ -272,12 +296,12 @@ QWidget* SupportScreen::build_create_page() {
desc_input_ = new QTextEdit;
desc_input_->setPlaceholderText("Provide detailed information about your issue...");
desc_input_->setMinimumHeight(200);
- desc_input_->setStyleSheet(SS_INPUT);
+ desc_input_->setStyleSheet(SS_INPUT());
cl->addWidget(desc_input_);
create_btn_ = new QPushButton("CREATE TICKET");
create_btn_->setFixedHeight(34);
- create_btn_->setStyleSheet(SS_BTN_GREEN);
+ create_btn_->setStyleSheet(SS_BTN_GREEN());
connect(create_btn_, &QPushButton::clicked, this, &SupportScreen::on_create_ticket);
cl->addWidget(create_btn_);
@@ -309,14 +333,16 @@ QWidget* SupportScreen::build_detail_page() {
demo_banner_ = new QLabel("DEMO TICKET — This shows how the support system works. "
"Create your own ticket to get real support!");
demo_banner_->setWordWrap(true);
- demo_banner_->setStyleSheet("background: #2563eb; color: #000; font-size: 11px; font-weight: bold;"
- " padding: 8px 12px; font-family: 'Consolas','Courier New',monospace;");
+ demo_banner_->setStyleSheet(QString("background: %1; color: %2; font-size: 11px; font-weight: bold;"
+ " padding: 8px 12px;")
+ .arg(ui::colors::INFO, ui::colors::BG_BASE));
demo_banner_->hide();
vl->addWidget(demo_banner_);
// Ticket info card
auto* info_card = new QWidget;
- info_card->setStyleSheet("background: #0a0a0a; border: 1px solid #1a1a1a;");
+ info_card->setStyleSheet(QString("background: %1; border: 1px solid %2;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* icl = new QVBoxLayout(info_card);
icl->setContentsMargins(14, 12, 14, 12);
icl->setSpacing(8);
@@ -334,14 +360,14 @@ QWidget* SupportScreen::build_detail_page() {
close_btn_ = new QPushButton("CLOSE");
close_btn_->setFixedHeight(26);
- close_btn_->setStyleSheet(SS_BTN_RED_OUTLINE);
+ close_btn_->setStyleSheet(SS_BTN_RED_OUTLINE());
close_btn_->hide();
connect(close_btn_, &QPushButton::clicked, this, &SupportScreen::on_close_ticket);
srl->addWidget(close_btn_);
reopen_btn_ = new QPushButton("REOPEN");
reopen_btn_->setFixedHeight(26);
- reopen_btn_->setStyleSheet(SS_BTN_GREEN_OUTLINE);
+ reopen_btn_->setStyleSheet(SS_BTN_GREEN_OUTLINE());
reopen_btn_->hide();
connect(reopen_btn_, &QPushButton::clicked, this, &SupportScreen::on_reopen_ticket);
srl->addWidget(reopen_btn_);
@@ -356,9 +382,10 @@ QWidget* SupportScreen::build_detail_page() {
detail_body_lbl_ = new QLabel;
detail_body_lbl_->setWordWrap(true);
detail_body_lbl_->setTextFormat(Qt::PlainText);
- detail_body_lbl_->setStyleSheet("color: #e5e5e5; font-size: 12px; background: #080808;"
- " border-left: 3px solid #2563eb; padding: 10px 12px;"
- " font-family: 'Consolas','Courier New',monospace;");
+ detail_body_lbl_->setStyleSheet(QString("color: %1; font-size: 12px; background: %2;"
+ " border-left: 3px solid %3; padding: 10px 12px;"
+ " font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::TEXT_PRIMARY, ui::colors::BG_BASE, ui::colors::INFO));
icl->addWidget(detail_body_lbl_);
vl->addWidget(info_card);
@@ -384,7 +411,8 @@ QWidget* SupportScreen::build_detail_page() {
// Reply box
reply_box_ = new QWidget;
- reply_box_->setStyleSheet("background: #0a0a0a; border: 1px solid #1a1a1a; border-left: 3px solid #16a34a;");
+ reply_box_->setStyleSheet(QString("background: %1; border: 1px solid %2; border-left: 3px solid %3;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM, ui::colors::POSITIVE));
auto* rbl = new QVBoxLayout(reply_box_);
rbl->setContentsMargins(14, 10, 14, 12);
rbl->setSpacing(8);
@@ -393,12 +421,12 @@ QWidget* SupportScreen::build_detail_page() {
msg_input_ = new QTextEdit;
msg_input_->setPlaceholderText("Type your message here...");
msg_input_->setFixedHeight(80);
- msg_input_->setStyleSheet(SS_INPUT);
+ msg_input_->setStyleSheet(SS_INPUT());
rbl->addWidget(msg_input_);
send_btn_ = new QPushButton("✉ SEND MESSAGE");
send_btn_->setFixedHeight(30);
- send_btn_->setStyleSheet(SS_BTN_GREEN);
+ send_btn_->setStyleSheet(SS_BTN_GREEN());
connect(send_btn_, &QPushButton::clicked, this, &SupportScreen::on_send_message);
rbl->addWidget(send_btn_);
@@ -406,11 +434,12 @@ QWidget* SupportScreen::build_detail_page() {
// Demo-ticket read-only notice
demo_box_ = new QWidget;
- demo_box_->setStyleSheet("background: #0a0a0a; border: 1px solid #2563eb; border-left: 3px solid #2563eb;");
+ demo_box_->setStyleSheet(QString("background: %1; border: 1px solid %2; border-left: 3px solid %2;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::INFO));
auto* dbl = new QVBoxLayout(demo_box_);
dbl->setContentsMargins(14, 10, 14, 12);
dbl->setSpacing(6);
- dbl->addWidget(mono_label("DEMO TICKET — READ ONLY", "#2563eb", 11, true));
+ dbl->addWidget(mono_label("DEMO TICKET — READ ONLY", ui::colors::INFO(), 11, true));
dbl->addWidget(mono_label("This is a demonstration ticket. You cannot add messages here.\n"
"Click BACK TO LIST → + NEW TICKET to create a real support request.",
ui::colors::TEXT_TERTIARY(), 11));
@@ -523,10 +552,12 @@ void SupportScreen::load_tickets() {
}
auto* row = new QWidget;
- row->setStyleSheet(QString("background: #0a0a0a;"
- "border: 1px solid %1;"
- "border-left: 3px solid %2;")
- .arg(is_demo ? "#2563eb" : "#1a1a1a", status_color(status)));
+ row->setStyleSheet(QString("background: %1;"
+ "border: 1px solid %2;"
+ "border-left: 3px solid %3;")
+ .arg(ui::colors::BG_SURFACE,
+ is_demo ? ui::colors::INFO() : ui::colors::BORDER_DIM(),
+ status_color(status)));
row->setCursor(Qt::PointingHandCursor);
auto* rl = new QGridLayout(row);
@@ -548,9 +579,9 @@ void SupportScreen::load_tickets() {
// Col 3: Priority badge
auto* pr_lbl = new QLabel(priority.toUpper());
- pr_lbl->setStyleSheet(QString("background: %1; color: #000; font-size: 9px; font-weight: bold;"
+ pr_lbl->setStyleSheet(QString("background: %1; color: %2; font-size: 9px; font-weight: bold;"
" padding: 2px 6px; font-family: 'Consolas','Courier New',monospace;")
- .arg(priority_color(priority)));
+ .arg(priority_color(priority), ui::colors::BG_BASE));
pr_lbl->setFixedHeight(18);
rl->addWidget(pr_lbl, 0, 3);
@@ -565,8 +596,9 @@ void SupportScreen::load_tickets() {
// Demo badge
if (is_demo) {
auto* badge = new QLabel("DEMO");
- badge->setStyleSheet("background: #2563eb; color: #000; font-size: 9px; font-weight: bold;"
- " padding: 2px 6px; font-family: 'Consolas','Courier New',monospace;");
+ badge->setStyleSheet(QString("background: %1; color: %2; font-size: 9px; font-weight: bold;"
+ " padding: 2px 6px; font-family: 'Consolas','Courier New',monospace;")
+ .arg(ui::colors::INFO, ui::colors::BG_BASE));
rl->addWidget(badge, 0, 6);
}
@@ -582,8 +614,9 @@ void SupportScreen::load_tickets() {
// Wrap row in a flat QPushButton for click + hover handling
auto* btn = new QPushButton;
btn->setFlat(true);
- btn->setStyleSheet("QPushButton { border: none; background: transparent; padding: 0; }"
- "QPushButton:hover > QWidget { background: #111111; }");
+ btn->setStyleSheet(QString("QPushButton { border: none; background: transparent; padding: 0; }"
+ "QPushButton:hover > QWidget { background: %1; }")
+ .arg(ui::colors::BG_RAISED));
auto* inner_lay = new QHBoxLayout(btn);
inner_lay->setContentsMargins(0, 0, 0, 0);
row->setParent(btn);
@@ -615,8 +648,9 @@ void SupportScreen::load_tickets() {
if (demo_copy) {
// Add a canned support message
auto* m = new QWidget;
- m->setStyleSheet("background: #0a0a0a; border: 1px solid #1a1a1a;"
- " border-left: 3px solid #9333ea;");
+ m->setStyleSheet(QString("background: %1; border: 1px solid %2;"
+ " border-left: 3px solid #9333ea;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM));
auto* ml = new QVBoxLayout(m);
ml->setContentsMargins(12, 8, 12, 10);
ml->setSpacing(4);
@@ -658,9 +692,9 @@ void SupportScreen::load_tickets() {
ts = mdt.toLocalTime().toString("MMM d, yyyy hh:mm");
auto* m = new QWidget;
- m->setStyleSheet(QString("background: #0a0a0a; border: 1px solid #1a1a1a;"
- " border-left: 3px solid %1;")
- .arg(border_color));
+ m->setStyleSheet(QString("background: %1; border: 1px solid %2;"
+ " border-left: 3px solid %3;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM, border_color));
auto* ml = new QVBoxLayout(m);
ml->setContentsMargins(12, 8, 12, 10);
ml->setSpacing(4);
@@ -732,8 +766,9 @@ void SupportScreen::on_send_message() {
if (!mcl)
return;
auto* m = new QWidget;
- m->setStyleSheet("background: #0a0a0a; border: 1px solid #1a1a1a;"
- " border-left: 3px solid #0891b2;");
+ m->setStyleSheet(QString("background: %1; border: 1px solid %2;"
+ " border-left: 3px solid %3;")
+ .arg(ui::colors::BG_SURFACE, ui::colors::BORDER_DIM, ui::colors::CYAN));
auto* ml = new QVBoxLayout(m);
ml->setContentsMargins(12, 8, 12, 10);
ml->setSpacing(4);
diff --git a/fincept-qt/src/screens/surface_analytics/SurfaceAnalyticsScreen.cpp b/fincept-qt/src/screens/surface_analytics/SurfaceAnalyticsScreen.cpp
index ec54dd89e..297b1b1d1 100644
--- a/fincept-qt/src/screens/surface_analytics/SurfaceAnalyticsScreen.cpp
+++ b/fincept-qt/src/screens/surface_analytics/SurfaceAnalyticsScreen.cpp
@@ -2,9 +2,11 @@
#include "Surface3DWidget.h"
#include "SurfaceCsvImporter.h"
+#include "core/session/ScreenStateManager.h"
#include "SurfaceDatabentoPanel.h"
#include "SurfaceMetricsPanel.h"
#include "SurfaceTableWidget.h"
+#include "ui/theme/Theme.h"
#include <QComboBox>
#include <QFileDialog>
@@ -22,21 +24,8 @@
namespace fincept::surface {
-// ── Obsidian palette tokens ──────────────────────────────────────────────────
-static const char* BG_BASE = "#080808";
-static const char* BG_SURFACE = "#0a0a0a";
-static const char* BG_RAISED = "#111111";
-static const char* BG_HOVER = "#161616";
-static const char* BORDER_DIM = "#1a1a1a";
-static const char* BORDER_MED = "#222222";
-static const char* BORDER_BRT = "#333333";
-static const char* TEXT_PRI = "#e5e5e5";
-static const char* TEXT_SEC = "#808080";
-static const char* TEXT_TER = "#525252";
-static const char* AMBER = "#d97706";
-static const char* AMBER_DIM = "#78350f";
-static const char* POSITIVE = "#16a34a";
-static const char* NEGATIVE = "#dc2626";
+using namespace fincept::ui;
+
static const char* MONO = "'Consolas','Courier New',monospace";
// ── Category accent colors (muted, functional only) ─────────────────────────
@@ -60,7 +49,7 @@ static QLabel* make_sep(QWidget* parent) {
auto* s = new QLabel("|", parent);
s->setStyleSheet(QString("color:%1; font-size:11px; background:transparent;"
" font-family:%2;")
- .arg(BORDER_MED)
+ .arg(colors::BORDER_MED)
.arg(MONO));
return s;
}
@@ -70,32 +59,35 @@ static QString btn_inactive() {
" font-size:11px; font-weight:bold; font-family:%4;"
" padding:0 10px; }"
"QPushButton:hover { background:%5; color:%6; border-color:%7; }")
- .arg(BG_RAISED)
- .arg(BORDER_DIM)
- .arg(TEXT_SEC)
+ .arg(colors::BG_RAISED)
+ .arg(colors::BORDER_DIM)
+ .arg(colors::TEXT_SECONDARY)
.arg(MONO)
- .arg(BG_HOVER)
- .arg(TEXT_PRI)
- .arg(BORDER_BRT);
+ .arg(colors::BG_HOVER)
+ .arg(colors::TEXT_PRIMARY)
+ .arg(colors::BORDER_BRIGHT);
}
static QString btn_active_amber() {
return QString("QPushButton { background:rgba(217,119,6,0.12); border:1px solid %1; color:%2;"
" font-size:11px; font-weight:bold; font-family:%3;"
" padding:0 10px; }"
- "QPushButton:hover { background:%2; color:#080808; }")
- .arg(AMBER_DIM)
- .arg(AMBER)
- .arg(MONO);
+ "QPushButton:hover { background:%2; color:%4; }")
+ .arg(colors::AMBER_DIM)
+ .arg(colors::AMBER)
+ .arg(MONO)
+ .arg(colors::BG_BASE);
}
static QString btn_danger() {
- return QString("QPushButton { background:rgba(220,38,38,0.08); border:1px solid #7f1d1d; color:%1;"
- " font-size:11px; font-weight:bold; font-family:%2;"
+ return QString("QPushButton { background:rgba(220,38,38,0.08); border:1px solid %1; color:%2;"
+ " font-size:11px; font-weight:bold; font-family:%3;"
" padding:0 10px; }"
- "QPushButton:hover { background:%1; color:#e5e5e5; }")
- .arg(NEGATIVE)
- .arg(MONO);
+ "QPushButton:hover { background:%2; color:%4; }")
+ .arg(colors::NEGATIVE_DIM)
+ .arg(colors::NEGATIVE)
+ .arg(MONO)
+ .arg(colors::TEXT_PRIMARY);
}
// ── Constructor ──────────────────────────────────────────────────────────────
@@ -109,7 +101,7 @@ SurfaceAnalyticsScreen::SurfaceAnalyticsScreen(QWidget* parent) : QWidget(parent
// ── Layout ───────────────────────────────────────────────────────────────────
void SurfaceAnalyticsScreen::setup_ui() {
- setStyleSheet(QString("QWidget { background:%1; color:%2; font-family:%3; }").arg(BG_BASE).arg(TEXT_PRI).arg(MONO));
+ setStyleSheet(QString("QWidget { background:%1; color:%2; font-family:%3; }").arg(colors::BG_BASE).arg(colors::TEXT_PRIMARY).arg(MONO));
auto* root = new QVBoxLayout(this);
root->setContentsMargins(0, 0, 0, 0);
@@ -126,14 +118,14 @@ void SurfaceAnalyticsScreen::setup_ui() {
// Content — metrics panel | chart area
auto* splitter = new QSplitter(Qt::Horizontal, this);
splitter->setHandleWidth(1);
- splitter->setStyleSheet(QString("QSplitter::handle { background:%1; }").arg(BORDER_DIM));
+ splitter->setStyleSheet(QString("QSplitter::handle { background:%1; }").arg(colors::BORDER_DIM));
metrics_panel_ = new SurfaceMetricsPanel(splitter);
splitter->addWidget(metrics_panel_);
// Right: view stack + databento panel
auto* right = new QWidget(splitter);
- right->setStyleSheet(QString("background:%1;").arg(BG_BASE));
+ right->setStyleSheet(QString("background:%1;").arg(colors::BG_BASE));
auto* rvl = new QVBoxLayout(right);
rvl->setContentsMargins(0, 0, 0, 0);
rvl->setSpacing(0);
@@ -161,7 +153,7 @@ QWidget* SurfaceAnalyticsScreen::build_category_bar() {
auto* bar = new QWidget(this);
bar->setFixedHeight(32);
bar->setStyleSheet(
- QString("QWidget { background:%1; border-bottom:1px solid %2; }").arg(BG_SURFACE).arg(BORDER_DIM));
+ QString("QWidget { background:%1; border-bottom:1px solid %2; }").arg(colors::BG_SURFACE).arg(colors::BORDER_DIM));
auto* hl = new QHBoxLayout(bar);
hl->setContentsMargins(8, 0, 8, 0);
@@ -174,11 +166,12 @@ QWidget* SurfaceAnalyticsScreen::build_category_bar() {
btn->setFixedHeight(32);
if (active) {
- btn->setStyleSheet(QString("QPushButton { background:#b45309; color:#e5e5e5;"
- " border:none; border-bottom:2px solid %1;"
+ btn->setStyleSheet(QString("QPushButton { background:#b45309; color:%1;"
+ " border:none; border-bottom:2px solid %2;"
" padding:0 14px; font-size:11px; font-weight:bold;"
- " font-family:%2; }"
+ " font-family:%3; }"
"QPushButton:hover { background:#b45309; }")
+ .arg(colors::TEXT_PRIMARY)
.arg(cat_hex(i))
.arg(MONO));
} else {
@@ -186,10 +179,10 @@ QWidget* SurfaceAnalyticsScreen::build_category_bar() {
" border:none; padding:0 14px; font-size:11px;"
" font-family:%2; }"
"QPushButton:hover { background:%3; color:%4; }")
- .arg(TEXT_TER)
+ .arg(colors::TEXT_TERTIARY)
.arg(MONO)
- .arg(BG_RAISED)
- .arg(TEXT_SEC));
+ .arg(colors::BG_RAISED)
+ .arg(colors::TEXT_SECONDARY));
}
btn->setProperty("cat_index", i);
@@ -245,7 +238,7 @@ QWidget* SurfaceAnalyticsScreen::build_surface_bar() {
auto* bar = new QWidget(this);
bar->setFixedHeight(26);
bar->setStyleSheet(
- QString("QWidget { background:%1; border-bottom:1px solid %2; }").arg(BG_SURFACE).arg(BORDER_DIM));
+ QString("QWidget { background:%1; border-bottom:1px solid %2; }").arg(colors::BG_SURFACE).arg(colors::BORDER_DIM));
auto* hl = new QHBoxLayout(bar);
hl->setContentsMargins(8, 0, 8, 0);
@@ -277,17 +270,18 @@ QWidget* SurfaceAnalyticsScreen::build_surface_bar() {
if (active) {
btn->setStyleSheet(QString("QPushButton { background:rgba(217,119,6,0.12); border:1px solid %1; color:%2;"
" font-size:11px; font-weight:bold; font-family:%3; padding:0 8px; }"
- "QPushButton:hover { background:%2; color:#080808; }")
- .arg(AMBER_DIM)
- .arg(AMBER)
- .arg(MONO));
+ "QPushButton:hover { background:%2; color:%4; }")
+ .arg(colors::AMBER_DIM)
+ .arg(colors::AMBER)
+ .arg(MONO)
+ .arg(colors::BG_BASE));
} else {
btn->setStyleSheet(QString("QPushButton { background:transparent; border:none; color:%1;"
" font-size:11px; font-family:%2; padding:0 8px; }"
"QPushButton:hover { color:%3; border-bottom:1px solid %4; }")
- .arg(TEXT_SEC)
+ .arg(colors::TEXT_SECONDARY)
.arg(MONO)
- .arg(TEXT_PRI)
+ .arg(colors::TEXT_PRIMARY)
.arg(acol));
}
@@ -301,7 +295,7 @@ QWidget* SurfaceAnalyticsScreen::build_surface_bar() {
if (active_category_ == 0) {
auto* sym_lbl = new QLabel("SYM:", bar);
sym_lbl->setStyleSheet(
- QString("color:%1; font-size:11px; background:transparent; font-family:%2;").arg(TEXT_SEC).arg(MONO));
+ QString("color:%1; font-size:11px; background:transparent; font-family:%2;").arg(colors::TEXT_SECONDARY).arg(MONO));
hl->addWidget(sym_lbl);
symbol_combo_ = new QComboBox(bar);
@@ -314,11 +308,11 @@ QWidget* SurfaceAnalyticsScreen::build_surface_bar() {
"QComboBox::drop-down { border:none; }"
"QComboBox QAbstractItemView { background:%1; color:%2;"
" border:1px solid %3; selection-background-color:%5; }")
- .arg(BG_RAISED)
- .arg(TEXT_PRI)
- .arg(BORDER_DIM)
+ .arg(colors::BG_RAISED)
+ .arg(colors::TEXT_PRIMARY)
+ .arg(colors::BORDER_DIM)
.arg(MONO)
- .arg(BG_HOVER));
+ .arg(colors::BG_HOVER));
connect(symbol_combo_, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
&SurfaceAnalyticsScreen::on_symbol_changed);
hl->addWidget(symbol_combo_);
@@ -879,6 +873,7 @@ void SurfaceAnalyticsScreen::on_category_clicked(int index) {
databento_panel_->set_active_chart(active_chart_, VOL_SYMBOLS[selected_symbol_], VOL_SPOTS[selected_symbol_]);
update_chart();
update_metrics();
+ fincept::ScreenStateManager::instance().notify_changed(this);
}
void SurfaceAnalyticsScreen::on_surface_clicked(int cat, int surf_index) {
@@ -968,10 +963,38 @@ void SurfaceAnalyticsScreen::dispatch_csv(const QString& path) {
// ── Databento slots ───────────────────────────────────────────────────────────
void SurfaceAnalyticsScreen::on_vol_surface_received(const fincept::DatabentoVolSurfaceResult& r) {
- if (r.success && !r.vol.z.empty()) {
- vol_data_ = r.vol;
- vol_data_.underlying = VOL_SYMBOLS[selected_symbol_];
- vol_data_.spot_price = VOL_SPOTS[selected_symbol_];
+ if (r.success) {
+ const char* sym = VOL_SYMBOLS[selected_symbol_];
+ float spot = VOL_SPOTS[selected_symbol_];
+ if (!r.vol.z.empty()) {
+ vol_data_ = r.vol;
+ vol_data_.underlying = sym;
+ vol_data_.spot_price = spot;
+ }
+ if (!r.delta.z.empty()) {
+ delta_data_ = r.delta;
+ delta_data_.underlying = sym;
+ delta_data_.spot_price = spot;
+ }
+ if (!r.gamma.z.empty()) {
+ gamma_data_ = r.gamma;
+ gamma_data_.underlying = sym;
+ gamma_data_.spot_price = spot;
+ }
+ if (!r.vega.z.empty()) {
+ vega_data_ = r.vega;
+ vega_data_.underlying = sym;
+ vega_data_.spot_price = spot;
+ }
+ if (!r.theta.z.empty()) {
+ theta_data_ = r.theta;
+ theta_data_.underlying = sym;
+ theta_data_.spot_price = spot;
+ }
+ if (!r.skew.z.empty()) {
+ skew_data_ = r.skew;
+ skew_data_.underlying = sym;
+ }
}
update_chart();
update_metrics();
@@ -982,7 +1005,73 @@ void SurfaceAnalyticsScreen::on_ohlcv_received(const fincept::DatabentoOhlcvResu
update_metrics();
}
-void SurfaceAnalyticsScreen::on_futures_received(const fincept::DatabentoFuturesResult&) {
+void SurfaceAnalyticsScreen::on_futures_received(const fincept::DatabentoFuturesResult& r) {
+ if (r.success) {
+ if (!r.forward.z.empty())
+ cmdty_fwd_data_ = r.forward;
+ if (!r.contango.z.empty())
+ contango_data_ = r.contango;
+ }
+ update_chart();
+ update_metrics();
+}
+
+void SurfaceAnalyticsScreen::on_surface_received(const fincept::DatabentoSurfaceResult& r) {
+ if (!r.success) {
+ update_chart();
+ return;
+ }
+ const auto& type = r.type;
+
+ if (type == "local_vol" && !r.z.empty()) {
+ local_vol_data_.strikes.assign(r.x_axis.begin(), r.x_axis.end());
+ local_vol_data_.expirations.assign(r.y_axis.begin(), r.y_axis.end());
+ local_vol_data_.z = r.z;
+ local_vol_data_.underlying = VOL_SYMBOLS[selected_symbol_];
+ local_vol_data_.spot_price = VOL_SPOTS[selected_symbol_];
+ } else if (type == "implied_dividend" && !r.z.empty()) {
+ impl_div_data_.strikes.assign(r.x_axis.begin(), r.x_axis.end());
+ impl_div_data_.expirations.assign(r.y_axis.begin(), r.y_axis.end());
+ impl_div_data_.z = r.z;
+ impl_div_data_.underlying = VOL_SYMBOLS[selected_symbol_];
+ } else if (type == "liquidity" && !r.z.empty()) {
+ liquidity_data_.strikes.assign(r.x_axis.begin(), r.x_axis.end());
+ liquidity_data_.expirations.assign(r.y_axis.begin(), r.y_axis.end());
+ liquidity_data_.z = r.z;
+ liquidity_data_.underlying = VOL_SYMBOLS[selected_symbol_];
+ } else if (type == "commodity_vol" && !r.z.empty()) {
+ cmdty_vol_data_.strikes.assign(r.x_axis.begin(), r.x_axis.end());
+ cmdty_vol_data_.expirations.assign(r.y_axis.begin(), r.y_axis.end());
+ cmdty_vol_data_.z = r.z;
+ cmdty_vol_data_.commodity = "CL";
+ } else if (type == "crack_spread" && !r.z.empty()) {
+ crack_data_.spread_types = r.x_labels;
+ crack_data_.contract_months.assign(r.y_axis.begin(), r.y_axis.end());
+ crack_data_.z = r.z;
+ } else if (type == "stress_test" && !r.z.empty()) {
+ stress_data_.scenarios = r.x_labels;
+ stress_data_.portfolios = r.y_labels;
+ stress_data_.z = r.z;
+ } else if (type == "yield_curve" && !r.z.empty()) {
+ yield_data_.maturities.clear();
+ for (float f : r.x_axis) yield_data_.maturities.push_back((int)f);
+ yield_data_.time_points.assign(r.y_axis.begin(), r.y_axis.end());
+ yield_data_.z = r.z;
+ } else if (type == "forward_rate" && !r.z.empty()) {
+ fwd_rate_data_.start_tenors.clear();
+ for (float f : r.x_axis) fwd_rate_data_.start_tenors.push_back((int)f);
+ fwd_rate_data_.forward_periods.assign(r.y_axis.begin(), r.y_axis.end());
+ fwd_rate_data_.z = r.z;
+ } else if (type == "rate_path" && !r.z.empty()) {
+ monetary_data_.central_banks = r.x_labels;
+ monetary_data_.meetings_ahead.assign(r.y_axis.begin(), r.y_axis.end());
+ monetary_data_.z = r.z;
+ } else if (type == "fx_forward_points" && !r.z.empty()) {
+ fx_fwd_data_.pairs = r.x_labels;
+ fx_fwd_data_.tenors.assign(r.y_axis.begin(), r.y_axis.end());
+ fx_fwd_data_.z = r.z;
+ }
+
update_chart();
update_metrics();
}
@@ -996,16 +1085,28 @@ void SurfaceAnalyticsScreen::showEvent(QShowEvent* e) {
Qt::UniqueConnection);
connect(databento_panel_, &SurfaceDatabentoPanel::futures_received, this,
&SurfaceAnalyticsScreen::on_futures_received, Qt::UniqueConnection);
+ connect(databento_panel_, &SurfaceDatabentoPanel::surface_received, this,
+ &SurfaceAnalyticsScreen::on_surface_received, Qt::UniqueConnection);
}
void SurfaceAnalyticsScreen::hideEvent(QHideEvent* e) {
QWidget::hideEvent(e);
- disconnect(databento_panel_, &SurfaceDatabentoPanel::vol_surface_received, this,
- &SurfaceAnalyticsScreen::on_vol_surface_received);
- disconnect(databento_panel_, &SurfaceDatabentoPanel::ohlcv_received, this,
- &SurfaceAnalyticsScreen::on_ohlcv_received);
- disconnect(databento_panel_, &SurfaceDatabentoPanel::futures_received, this,
- &SurfaceAnalyticsScreen::on_futures_received);
+ disconnect(databento_panel_, nullptr, this, nullptr);
+}
+
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap SurfaceAnalyticsScreen::save_state() const {
+ return {
+ {"category", active_category_},
+ {"chart", static_cast<int>(active_chart_)},
+ };
+}
+
+void SurfaceAnalyticsScreen::restore_state(const QVariantMap& state) {
+ const int cat = state.value("category", 0).toInt();
+ if (cat != active_category_)
+ on_category_clicked(cat);
}
} // namespace fincept::surface
diff --git a/fincept-qt/src/screens/surface_analytics/SurfaceAnalyticsScreen.h b/fincept-qt/src/screens/surface_analytics/SurfaceAnalyticsScreen.h
index 1d76f467a..8cf4981fe 100644
--- a/fincept-qt/src/screens/surface_analytics/SurfaceAnalyticsScreen.h
+++ b/fincept-qt/src/screens/surface_analytics/SurfaceAnalyticsScreen.h
@@ -4,6 +4,7 @@
#include "SurfaceDemoData.h"
#include "SurfaceTypes.h"
+#include "screens/IStatefulScreen.h"
#include "services/databento/DatabentoService.h"
#include <QComboBox>
@@ -22,11 +23,16 @@ class SurfaceTableWidget;
class SurfaceMetricsPanel;
class SurfaceDatabentoPanel;
-class SurfaceAnalyticsScreen : public QWidget {
+class SurfaceAnalyticsScreen : public QWidget, public fincept::screens::IStatefulScreen {
Q_OBJECT
public:
explicit SurfaceAnalyticsScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "surface_analytics"; }
+ int state_version() const override { return 1; }
+
private slots:
void on_category_clicked(int index);
void on_surface_clicked(int cat, int surf_index);
@@ -39,6 +45,7 @@ class SurfaceAnalyticsScreen : public QWidget {
void on_vol_surface_received(const fincept::DatabentoVolSurfaceResult& r);
void on_ohlcv_received(const fincept::DatabentoOhlcvResult& r);
void on_futures_received(const fincept::DatabentoFuturesResult& r);
+ void on_surface_received(const fincept::DatabentoSurfaceResult& r);
protected:
void showEvent(QShowEvent* e) override;
diff --git a/fincept-qt/src/screens/surface_analytics/SurfaceDatabentoPanel.cpp b/fincept-qt/src/screens/surface_analytics/SurfaceDatabentoPanel.cpp
index d589dfa38..86bbaaf50 100644
--- a/fincept-qt/src/screens/surface_analytics/SurfaceDatabentoPanel.cpp
+++ b/fincept-qt/src/screens/surface_analytics/SurfaceDatabentoPanel.cpp
@@ -1,6 +1,7 @@
#include "SurfaceDatabentoPanel.h"
#include "core/logging/Logger.h"
+#include "ui/theme/Theme.h"
#include <QDateTime>
#include <QFrame>
@@ -8,21 +9,24 @@
namespace fincept::surface {
+using namespace fincept::ui;
+
SurfaceDatabentoPanel::SurfaceDatabentoPanel(QWidget* parent) : QWidget(parent) {
setup_ui();
update_key_status();
}
void SurfaceDatabentoPanel::setup_ui() {
- setStyleSheet("background:#0d1117; color:#c9d1d9;");
+ setStyleSheet(QString("background:%1; color:%2;").arg(colors::BG_BASE).arg(colors::TEXT_PRIMARY));
auto* layout = new QVBoxLayout(this);
layout->setContentsMargins(8, 8, 8, 8);
layout->setSpacing(6);
// ── Section title ─────────────────────────────────────────────────────
auto* title = new QLabel("DATABENTO DATA SOURCE", this);
- title->setStyleSheet("color:#3399ff; font-size:10px; font-weight:bold;"
- "border-bottom:1px solid #21262d; padding-bottom:4px;");
+ title->setStyleSheet(QString("color:%1; font-size:10px; font-weight:bold;"
+ "border-bottom:1px solid %2; padding-bottom:4px;")
+ .arg(colors::INFO).arg(colors::BORDER_DIM));
layout->addWidget(title);
// ── API Key row ───────────────────────────────────────────────────────
@@ -34,22 +38,28 @@ void SurfaceDatabentoPanel::setup_ui() {
api_key_input_ = new QLineEdit(key_row);
api_key_input_->setPlaceholderText("Databento API key (db-...)");
api_key_input_->setEchoMode(QLineEdit::Password);
- api_key_input_->setStyleSheet("QLineEdit { background:#161b22; color:#c9d1d9; border:1px solid #30363d;"
+ api_key_input_->setStyleSheet(QString("QLineEdit { background:%1; color:%2; border:1px solid %3;"
" padding:4px 8px; font-size:10px; border-radius:2px; }"
- "QLineEdit:focus { border-color:#3399ff; }");
+ "QLineEdit:focus { border-color:%4; }")
+ .arg(colors::BG_HOVER).arg(colors::TEXT_PRIMARY)
+ .arg(colors::BORDER_MED).arg(colors::INFO));
key_hl->addWidget(api_key_input_, 1);
save_key_btn_ = new QPushButton("SAVE", key_row);
- save_key_btn_->setStyleSheet("QPushButton { background:#21262d; color:#8b949e; border:1px solid #30363d;"
+ save_key_btn_->setStyleSheet(QString("QPushButton { background:%1; color:%2; border:1px solid %3;"
" padding:4px 8px; font-size:10px; border-radius:2px; }"
- "QPushButton:hover { background:#30363d; color:#c9d1d9; }");
+ "QPushButton:hover { background:%3; color:%4; }")
+ .arg(colors::BG_RAISED).arg(colors::TEXT_SECONDARY)
+ .arg(colors::BORDER_MED).arg(colors::TEXT_PRIMARY));
connect(save_key_btn_, &QPushButton::clicked, this, &SurfaceDatabentoPanel::on_save_key_clicked);
key_hl->addWidget(save_key_btn_);
test_btn_ = new QPushButton("TEST", key_row);
- test_btn_->setStyleSheet("QPushButton { background:#21262d; color:#8b949e; border:1px solid #30363d;"
+ test_btn_->setStyleSheet(QString("QPushButton { background:%1; color:%2; border:1px solid %3;"
" padding:4px 8px; font-size:10px; border-radius:2px; }"
- "QPushButton:hover { background:#30363d; color:#c9d1d9; }");
+ "QPushButton:hover { background:%3; color:%4; }")
+ .arg(colors::BG_RAISED).arg(colors::TEXT_SECONDARY)
+ .arg(colors::BORDER_MED).arg(colors::TEXT_PRIMARY));
connect(test_btn_, &QPushButton::clicked, &DatabentoService::instance(), &DatabentoService::test_connection);
key_hl->addWidget(test_btn_);
@@ -57,34 +67,36 @@ void SurfaceDatabentoPanel::setup_ui() {
// ── Key status ────────────────────────────────────────────────────────
key_status_lbl_ = new QLabel(this);
- key_status_lbl_->setStyleSheet("font-size:9px; color:#8b949e;");
+ key_status_lbl_->setStyleSheet(QString("font-size:9px; color:%1;").arg(colors::TEXT_SECONDARY));
layout->addWidget(key_status_lbl_);
// ── Divider ───────────────────────────────────────────────────────────
auto* line = new QFrame(this);
line->setFrameShape(QFrame::HLine);
- line->setStyleSheet("border:none; border-top:1px solid #21262d;");
+ line->setStyleSheet(QString("border:none; border-top:1px solid %1;").arg(colors::BORDER_DIM));
layout->addWidget(line);
// ── Fetch button ──────────────────────────────────────────────────────
fetch_btn_ = new QPushButton("FETCH LIVE DATA", this);
- fetch_btn_->setStyleSheet("QPushButton { background:rgba(31,77,153,255); color:#88bbff;"
+ fetch_btn_->setStyleSheet(QString("QPushButton { background:rgba(31,77,153,255); color:%1;"
" border:1px solid rgba(64,140,255,100); padding:6px 12px;"
" font-size:10px; font-weight:bold; border-radius:2px; }"
"QPushButton:hover { background:rgba(46,102,191,255); }"
- "QPushButton:disabled { background:#161b22; color:#484f58; border-color:#21262d; }");
+ "QPushButton:disabled { background:%2; color:%3; border-color:%4; }")
+ .arg(colors::INFO).arg(colors::BG_HOVER)
+ .arg(colors::TEXT_DIM).arg(colors::BORDER_DIM));
connect(fetch_btn_, &QPushButton::clicked, this, &SurfaceDatabentoPanel::on_fetch_clicked);
layout->addWidget(fetch_btn_);
// ── Status label ──────────────────────────────────────────────────────
status_lbl_ = new QLabel(this);
status_lbl_->setWordWrap(true);
- status_lbl_->setStyleSheet("font-size:9px; color:#8b949e;");
+ status_lbl_->setStyleSheet(QString("font-size:9px; color:%1;").arg(colors::TEXT_SECONDARY));
layout->addWidget(status_lbl_);
// ── Last fetch timestamp ──────────────────────────────────────────────
last_fetch_lbl_ = new QLabel(this);
- last_fetch_lbl_->setStyleSheet("font-size:9px; color:#484f58;");
+ last_fetch_lbl_->setStyleSheet(QString("font-size:9px; color:%1;").arg(colors::TEXT_DIM));
layout->addWidget(last_fetch_lbl_);
layout->addStretch();
@@ -94,7 +106,7 @@ void SurfaceDatabentoPanel::setup_ui() {
"Fetches options chains, OHLCV, and futures curves.",
this);
note->setWordWrap(true);
- note->setStyleSheet("font-size:9px; color:#484f58; font-style:italic;");
+ note->setStyleSheet(QString("font-size:9px; color:%1; font-style:italic;").arg(colors::TEXT_DIM));
layout->addWidget(note);
}
@@ -102,12 +114,12 @@ void SurfaceDatabentoPanel::update_key_status() {
auto& svc = DatabentoService::instance();
if (svc.has_api_key()) {
key_status_lbl_->setText("API key stored");
- key_status_lbl_->setStyleSheet("font-size:9px; color:#3fb950;");
+ key_status_lbl_->setStyleSheet(QString("font-size:9px; color:%1;").arg(colors::POSITIVE));
fetch_btn_->setEnabled(true);
test_btn_->setEnabled(true);
} else {
key_status_lbl_->setText("No API key — enter key above");
- key_status_lbl_->setStyleSheet("font-size:9px; color:#f85149;");
+ key_status_lbl_->setStyleSheet(QString("font-size:9px; color:%1;").arg(colors::NEGATIVE));
fetch_btn_->setEnabled(false);
test_btn_->setEnabled(false);
}
@@ -127,8 +139,28 @@ void SurfaceDatabentoPanel::set_active_chart(ChartType type, const QString& symb
// Update fetch button label based on what data we'll request
if (needs_vol_surface())
fetch_btn_->setText("FETCH OPTIONS CHAIN");
+ else if (needs_local_vol())
+ fetch_btn_->setText("FETCH LOCAL VOL");
+ else if (needs_implied_dividend())
+ fetch_btn_->setText("FETCH IMPLIED DIV");
+ else if (needs_liquidity())
+ fetch_btn_->setText("FETCH LIQUIDITY");
else if (needs_futures())
fetch_btn_->setText("FETCH FUTURES CURVE");
+ else if (needs_commodity_vol())
+ fetch_btn_->setText("FETCH COMMODITY VOL");
+ else if (needs_crack_spread())
+ fetch_btn_->setText("FETCH CRACK SPREAD");
+ else if (needs_stress_test())
+ fetch_btn_->setText("FETCH STRESS TEST");
+ else if (needs_yield_curve())
+ fetch_btn_->setText("FETCH YIELD CURVE");
+ else if (needs_forward_rate())
+ fetch_btn_->setText("FETCH FORWARD RATE");
+ else if (needs_rate_path())
+ fetch_btn_->setText("FETCH RATE PATH");
+ else if (needs_fx_forward_points())
+ fetch_btn_->setText("FETCH FX FORWARDS");
else if (needs_ohlcv())
fetch_btn_->setText("FETCH OHLCV DATA");
else
@@ -150,13 +182,52 @@ bool SurfaceDatabentoPanel::needs_ohlcv() const {
}
bool SurfaceDatabentoPanel::needs_futures() const {
- return active_chart_ == ChartType::CommodityForward || active_chart_ == ChartType::ContangoBackwardation ||
- active_chart_ == ChartType::CrackSpread || active_chart_ == ChartType::CommodityVol;
+ return active_chart_ == ChartType::CommodityForward || active_chart_ == ChartType::ContangoBackwardation;
+}
+
+bool SurfaceDatabentoPanel::needs_local_vol() const {
+ return active_chart_ == ChartType::LocalVolSurface;
+}
+
+bool SurfaceDatabentoPanel::needs_implied_dividend() const {
+ return active_chart_ == ChartType::ImpliedDividend;
+}
+
+bool SurfaceDatabentoPanel::needs_liquidity() const {
+ return active_chart_ == ChartType::LiquidityHeatmap;
+}
+
+bool SurfaceDatabentoPanel::needs_commodity_vol() const {
+ return active_chart_ == ChartType::CommodityVol;
+}
+
+bool SurfaceDatabentoPanel::needs_crack_spread() const {
+ return active_chart_ == ChartType::CrackSpread;
+}
+
+bool SurfaceDatabentoPanel::needs_stress_test() const {
+ return active_chart_ == ChartType::StressTestPnL;
+}
+
+bool SurfaceDatabentoPanel::needs_yield_curve() const {
+ return active_chart_ == ChartType::YieldCurve;
+}
+
+bool SurfaceDatabentoPanel::needs_forward_rate() const {
+ return active_chart_ == ChartType::ForwardRate;
+}
+
+bool SurfaceDatabentoPanel::needs_rate_path() const {
+ return active_chart_ == ChartType::MonetaryPolicyPath;
+}
+
+bool SurfaceDatabentoPanel::needs_fx_forward_points() const {
+ return active_chart_ == ChartType::FXForwardPoints;
}
void SurfaceDatabentoPanel::set_status(const QString& msg, bool is_error) {
status_lbl_->setText(msg);
- status_lbl_->setStyleSheet(QString("font-size:9px; color:%1;").arg(is_error ? "#f85149" : "#8b949e"));
+ status_lbl_->setStyleSheet(QString("font-size:9px; color:%1;").arg(is_error ? colors::NEGATIVE() : colors::TEXT_SECONDARY()));
}
// ── Show/Hide — P3 compliance (no timers here, but connect/disconnect signals) ─
@@ -173,6 +244,8 @@ void SurfaceDatabentoPanel::showEvent(QShowEvent* e) {
Qt::UniqueConnection);
connect(&svc, &DatabentoService::futures_ready, this, &SurfaceDatabentoPanel::on_futures_ready,
Qt::UniqueConnection);
+ connect(&svc, &DatabentoService::surface_ready, this, &SurfaceDatabentoPanel::on_surface_ready,
+ Qt::UniqueConnection);
update_key_status();
}
@@ -198,16 +271,41 @@ void SurfaceDatabentoPanel::on_save_key_clicked() {
void SurfaceDatabentoPanel::on_fetch_clicked() {
set_status("Fetching...");
fetch_btn_->setEnabled(false);
+ auto& svc = DatabentoService::instance();
if (needs_vol_surface()) {
- DatabentoService::instance().fetch_options_surface(active_symbol_, active_spot_);
+ svc.fetch_options_surface(active_symbol_, active_spot_);
+ } else if (needs_local_vol()) {
+ svc.fetch_local_vol(active_symbol_, active_spot_);
+ } else if (needs_implied_dividend()) {
+ svc.fetch_implied_dividend(active_symbol_, active_spot_);
+ } else if (needs_liquidity()) {
+ svc.fetch_liquidity(active_symbol_, active_spot_);
} else if (needs_futures()) {
- QStringList commodities = {"CL", "BRN", "NG", "GC", "SI", "HG"};
- DatabentoService::instance().fetch_futures_term_structure(commodities);
+ QStringList commodities = {"CL", "NG", "GC", "SI", "HG", "ZC"};
+ svc.fetch_futures_term_structure(commodities);
+ } else if (needs_commodity_vol()) {
+ svc.fetch_commodity_vol("CL");
+ } else if (needs_crack_spread()) {
+ svc.fetch_crack_spread();
+ } else if (needs_stress_test()) {
+ QStringList syms = {"SPY", "QQQ", "IWM", "GLD", "TLT"};
+ svc.fetch_stress_test(syms);
+ } else if (needs_yield_curve()) {
+ svc.fetch_yield_curve();
+ } else if (needs_forward_rate()) {
+ svc.fetch_forward_rate();
+ } else if (needs_rate_path()) {
+ svc.fetch_rate_path();
+ } else if (needs_fx_forward_points()) {
+ svc.fetch_fx_forward_points();
+ } else if (needs_ohlcv()) {
+ QStringList syms = {"SPY", "QQQ", "IWM", "DIA", "GLD", "TLT", "IEF", "HYG"};
+ svc.fetch_ohlcv(syms, 60);
} else {
- // Default: OHLCV for correlation assets
+ // Fallback: OHLCV
QStringList syms = {"SPY", "QQQ", "IWM", "DIA", "GLD", "TLT", "IEF", "HYG"};
- DatabentoService::instance().fetch_ohlcv(syms, 60);
+ svc.fetch_ohlcv(syms, 60);
}
}
@@ -216,7 +314,7 @@ void SurfaceDatabentoPanel::on_connection_tested(bool ok, const QString& msg) {
set_status(ok ? "Connected: " + msg : "Failed: " + msg, !ok);
if (ok) {
key_status_lbl_->setText("API key valid");
- key_status_lbl_->setStyleSheet("font-size:9px; color:#3fb950;");
+ key_status_lbl_->setStyleSheet(QString("font-size:9px; color:%1;").arg(colors::POSITIVE));
}
}
@@ -265,4 +363,15 @@ void SurfaceDatabentoPanel::on_futures_ready(const fincept::DatabentoFuturesResu
emit futures_received(r);
}
+void SurfaceDatabentoPanel::on_surface_ready(const fincept::DatabentoSurfaceResult& r) {
+ fetch_btn_->setEnabled(true);
+ if (!r.success) {
+ set_status(r.error, true);
+ return;
+ }
+ set_status(QString("%1 ready: %2 rows").arg(r.type).arg(r.z.size()));
+ last_fetch_lbl_->setText("Last fetch: " + DatabentoService::instance().last_fetch_time().toString("hh:mm:ss"));
+ emit surface_received(r);
+}
+
} // namespace fincept::surface
diff --git a/fincept-qt/src/screens/surface_analytics/SurfaceDatabentoPanel.h b/fincept-qt/src/screens/surface_analytics/SurfaceDatabentoPanel.h
index 7f6cc2d9f..48e21f1de 100644
--- a/fincept-qt/src/screens/surface_analytics/SurfaceDatabentoPanel.h
+++ b/fincept-qt/src/screens/surface_analytics/SurfaceDatabentoPanel.h
@@ -27,6 +27,7 @@ class SurfaceDatabentoPanel : public QWidget {
void vol_surface_received(const fincept::DatabentoVolSurfaceResult& result);
void ohlcv_received(const fincept::DatabentoOhlcvResult& result);
void futures_received(const fincept::DatabentoFuturesResult& result);
+ void surface_received(const fincept::DatabentoSurfaceResult& result);
protected:
void showEvent(QShowEvent* e) override;
@@ -41,6 +42,7 @@ class SurfaceDatabentoPanel : public QWidget {
void on_ohlcv_ready(const fincept::DatabentoOhlcvResult& r);
void on_vol_ready(const fincept::DatabentoVolSurfaceResult& r);
void on_futures_ready(const fincept::DatabentoFuturesResult& r);
+ void on_surface_ready(const fincept::DatabentoSurfaceResult& r);
private:
void setup_ui();
@@ -49,6 +51,16 @@ class SurfaceDatabentoPanel : public QWidget {
bool needs_ohlcv() const;
bool needs_vol_surface() const;
bool needs_futures() const;
+ bool needs_local_vol() const;
+ bool needs_implied_dividend() const;
+ bool needs_liquidity() const;
+ bool needs_commodity_vol() const;
+ bool needs_crack_spread() const;
+ bool needs_stress_test() const;
+ bool needs_yield_curve() const;
+ bool needs_forward_rate() const;
+ bool needs_rate_path() const;
+ bool needs_fx_forward_points() const;
// Widgets
QLineEdit* api_key_input_ = nullptr;
diff --git a/fincept-qt/src/screens/surface_analytics/SurfaceMetricsPanel.cpp b/fincept-qt/src/screens/surface_analytics/SurfaceMetricsPanel.cpp
index e89d870e4..c4990a5cd 100644
--- a/fincept-qt/src/screens/surface_analytics/SurfaceMetricsPanel.cpp
+++ b/fincept-qt/src/screens/surface_analytics/SurfaceMetricsPanel.cpp
@@ -1,15 +1,19 @@
#include "SurfaceMetricsPanel.h"
+#include "ui/theme/Theme.h"
+
#include <algorithm>
#include <cmath>
namespace fincept::surface {
+using namespace fincept::ui;
+
static const char* MONO = "'Consolas','Courier New',monospace";
SurfaceMetricsPanel::SurfaceMetricsPanel(QWidget* parent) : QWidget(parent) {
setFixedWidth(190);
- setStyleSheet("QWidget { background:#0a0a0a; border-right:1px solid #1a1a1a; }");
+ setStyleSheet(QString("QWidget { background:%1; border-right:1px solid %2; }").arg(colors::BG_SURFACE).arg(colors::BORDER_DIM));
layout_ = new QVBoxLayout(this);
layout_->setContentsMargins(0, 0, 0, 0);
layout_->setSpacing(0);
@@ -29,31 +33,35 @@ void SurfaceMetricsPanel::add_section(const QString& title, const char* color) {
auto* lbl = new QLabel(title, this);
lbl->setFixedHeight(26);
lbl->setStyleSheet(QString("color:%1; font-size:11px; font-weight:bold; letter-spacing:0.5px;"
- " background:#111111; padding:0 10px;"
- " border-bottom:1px solid #1a1a1a;"
- " font-family:%2;")
+ " background:%2; padding:0 10px;"
+ " border-bottom:1px solid %3;"
+ " font-family:%4;")
.arg(color)
+ .arg(colors::BG_RAISED)
+ .arg(colors::BORDER_DIM)
.arg(MONO));
layout_->addWidget(lbl);
}
void SurfaceMetricsPanel::add_row(const QString& label, const QString& value, const char* value_color) {
+ const char* vc = value_color ? value_color : colors::TEXT_PRIMARY();
auto* row = new QWidget(this);
row->setFixedHeight(22);
- row->setStyleSheet("QWidget { background:transparent; border-bottom:1px solid #111111; }");
+ row->setStyleSheet(QString("QWidget { background:transparent; border-bottom:1px solid %1; }").arg(colors::BG_RAISED));
auto* hl = new QHBoxLayout(row);
hl->setContentsMargins(10, 0, 10, 0);
hl->setSpacing(4);
auto* lbl = new QLabel(label, row);
- lbl->setStyleSheet(QString("color:#808080; font-size:11px; background:transparent;"
- " font-family:%1; border:none;")
+ lbl->setStyleSheet(QString("color:%1; font-size:11px; background:transparent;"
+ " font-family:%2; border:none;")
+ .arg(colors::TEXT_SECONDARY)
.arg(MONO));
auto* val = new QLabel(value, row);
val->setStyleSheet(QString("color:%1; font-size:11px; font-weight:bold; background:transparent;"
" font-family:%2; border:none;")
- .arg(value_color)
+ .arg(vc)
.arg(MONO));
val->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
@@ -89,12 +97,12 @@ void SurfaceMetricsPanel::update_metrics(
}
};
- const char* POS = "#16a34a";
- const char* NEG = "#dc2626";
- const char* PRI = "#e5e5e5";
- const char* SEC = "#808080";
- const char* AMB = "#d97706";
- const char* CYN = "#0891b2";
+ const char* POS = colors::POSITIVE();
+ const char* NEG = colors::NEGATIVE();
+ const char* PRI = colors::TEXT_PRIMARY();
+ const char* SEC = colors::TEXT_SECONDARY();
+ const char* AMB = colors::AMBER();
+ const char* CYN = colors::CYAN();
switch (type) {
// ── EQUITY DERIVATIVES ────────────────────────────────────────────────────
@@ -169,7 +177,7 @@ void SurfaceMetricsPanel::update_metrics(
case ChartType::YieldCurve: {
if (yield.z.empty())
break;
- add_section("■ YIELD CURVE", "#16a34a");
+ add_section("■ YIELD CURVE", POS);
const auto& last = yield.z.back();
if (!last.empty()) {
add_row("2Y", fmt(last[1], 2) + "%", PRI);
@@ -184,7 +192,7 @@ void SurfaceMetricsPanel::update_metrics(
case ChartType::SwaptionVol: {
if (swaption.z.empty())
break;
- add_section("■ SWAPTION VOL", "#16a34a");
+ add_section("■ SWAPTION VOL", POS);
int me = (int)swaption.z.size() / 2, ms = (int)swaption.z[me].size() / 2;
add_row("BELLY ATM", fmt(swaption.z[me][ms], 1) + "bp", CYN);
float mn, mx;
@@ -199,7 +207,7 @@ void SurfaceMetricsPanel::update_metrics(
case ChartType::CapFloorVol: {
if (capfloor.z.empty())
break;
- add_section("■ CAP/FLOOR VOL", "#16a34a");
+ add_section("■ CAP/FLOOR VOL", POS);
float mn, mx;
minmax_z(capfloor.z, mn, mx);
add_row("RANGE", fmt(mn, 0) + "-" + fmt(mx, 0) + "bp", SEC);
@@ -209,7 +217,7 @@ void SurfaceMetricsPanel::update_metrics(
case ChartType::BondSpread: {
if (bond_spread.z.empty())
break;
- add_section("■ BOND SPREADS", "#16a34a");
+ add_section("■ BOND SPREADS", POS);
if (bond_spread.z.size() > 3)
add_row("BBB 5Y", fmt(bond_spread.z[3][4], 0) + "bp", PRI);
if (bond_spread.z.size() > 4)
@@ -220,7 +228,7 @@ void SurfaceMetricsPanel::update_metrics(
case ChartType::OISBasis: {
if (ois.z.empty())
break;
- add_section("■ OIS BASIS", "#16a34a");
+ add_section("■ OIS BASIS", POS);
float mn, mx;
minmax_z(ois.z, mn, mx);
add_row("RANGE", fmt(mn, 1) + "-" + fmt(mx, 1) + "bp", SEC);
@@ -230,7 +238,7 @@ void SurfaceMetricsPanel::update_metrics(
case ChartType::RealYield: {
if (real_yield.z.empty())
break;
- add_section("■ REAL YIELD", "#16a34a");
+ add_section("■ REAL YIELD", POS);
const auto& last = real_yield.z.back();
if (!last.empty()) {
add_row("5Y REAL", fmt(last[2], 2) + "%", last[2] > 0 ? POS : NEG);
@@ -241,7 +249,7 @@ void SurfaceMetricsPanel::update_metrics(
case ChartType::ForwardRate: {
if (fwd_rate.z.empty())
break;
- add_section("■ FORWARD RATE", "#16a34a");
+ add_section("■ FORWARD RATE", POS);
float mn, mx;
minmax_z(fwd_rate.z, mn, mx);
add_row("MIN", fmt(mn, 2) + "%", PRI);
@@ -254,7 +262,7 @@ void SurfaceMetricsPanel::update_metrics(
case ChartType::FXVol: {
if (fx_vol.z.empty())
break;
- add_section("■ FX VOL", "#ca8a04");
+ add_section("■ FX VOL", colors::WARNING());
add_row("PAIR", QString::fromStdString(fx_vol.pair), AMB);
if (fx_vol.z.size() > 2)
add_row("1M ATM", fmt(fx_vol.z[2][2], 2) + "%", PRI);
@@ -266,7 +274,7 @@ void SurfaceMetricsPanel::update_metrics(
case ChartType::FXForwardPoints: {
if (fx_fwd.z.empty())
break;
- add_section("■ FX FWD PTS", "#ca8a04");
+ add_section("■ FX FWD PTS", colors::WARNING());
add_row("PAIRS", QString::number(fx_fwd.z.size()), SEC);
add_row("TENORS", QString::number(fx_fwd.tenors.size()), SEC);
break;
@@ -274,7 +282,7 @@ void SurfaceMetricsPanel::update_metrics(
case ChartType::CrossCurrencyBasis: {
if (xccy.z.empty())
break;
- add_section("■ XCCY BASIS", "#ca8a04");
+ add_section("■ XCCY BASIS", colors::WARNING());
float mn, mx;
minmax_z(xccy.z, mn, mx);
add_row("RANGE", fmt(mn, 1) + "-" + fmt(mx, 1) + "bp", SEC);
@@ -286,7 +294,7 @@ void SurfaceMetricsPanel::update_metrics(
case ChartType::CDSSpread: {
if (cds.z.empty())
break;
- add_section("■ CDS SPREADS", "#dc2626");
+ add_section("■ CDS SPREADS", NEG);
if (!cds.entities.empty())
add_row(QString::fromStdString(cds.entities[0]) + " 5Y", fmt(cds.z[0][4], 0) + "bp", NEG);
if (cds.z.size() > 1)
@@ -297,7 +305,7 @@ void SurfaceMetricsPanel::update_metrics(
case ChartType::CreditTransition: {
if (credit_trans.z.empty())
break;
- add_section("■ TRANSITION", "#dc2626");
+ add_section("■ TRANSITION", NEG);
add_row("AAA→AAA", fmt(credit_trans.z[0][0], 1) + "%", POS);
if (credit_trans.z.size() > 6)
add_row("CCC→D", fmt(credit_trans.z[6][7], 1) + "%", NEG);
@@ -307,7 +315,7 @@ void SurfaceMetricsPanel::update_metrics(
case ChartType::RecoveryRate: {
if (recovery.z.empty())
break;
- add_section("■ RECOVERY RATE", "#dc2626");
+ add_section("■ RECOVERY RATE", NEG);
float mn, mx;
minmax_z(recovery.z, mn, mx);
add_row("RANGE", fmt(mn, 1) + "-" + fmt(mx, 1) + "%", SEC);
@@ -478,8 +486,8 @@ void SurfaceMetricsPanel::update_metrics(
}
default:
- add_section("■ METRICS", "#525252");
- add_row("SELECT", "A SURFACE", "#525252");
+ add_section("■ METRICS", colors::TEXT_TERTIARY());
+ add_row("SELECT", "A SURFACE", colors::TEXT_TERTIARY());
break;
}
diff --git a/fincept-qt/src/screens/surface_analytics/SurfaceMetricsPanel.h b/fincept-qt/src/screens/surface_analytics/SurfaceMetricsPanel.h
index e72f583f6..37497a821 100644
--- a/fincept-qt/src/screens/surface_analytics/SurfaceMetricsPanel.h
+++ b/fincept-qt/src/screens/surface_analytics/SurfaceMetricsPanel.h
@@ -1,5 +1,6 @@
#pragma once
#include "SurfaceTypes.h"
+#include "ui/theme/Theme.h"
#include <QLabel>
#include <QVBoxLayout>
@@ -33,7 +34,7 @@ class SurfaceMetricsPanel : public QWidget {
private:
QVBoxLayout* layout_;
void clear_rows();
- void add_row(const QString& label, const QString& value, const char* value_color = "#e5e5e5");
+ void add_row(const QString& label, const QString& value, const char* value_color = nullptr);
void add_section(const QString& title, const char* color);
};
diff --git a/fincept-qt/src/screens/surface_analytics/SurfaceTableWidget.cpp b/fincept-qt/src/screens/surface_analytics/SurfaceTableWidget.cpp
index 5edcd435c..2e752c1b8 100644
--- a/fincept-qt/src/screens/surface_analytics/SurfaceTableWidget.cpp
+++ b/fincept-qt/src/screens/surface_analytics/SurfaceTableWidget.cpp
@@ -1,5 +1,7 @@
#include "SurfaceTableWidget.h"
+#include "ui/theme/Theme.h"
+
#include <QColor>
#include <QHeaderView>
@@ -9,29 +11,35 @@
namespace fincept::surface {
+using namespace fincept::ui;
+
SurfaceTableWidget::SurfaceTableWidget(QWidget* parent) : QWidget(parent) {
auto* layout = new QVBoxLayout(this);
layout->setContentsMargins(0, 0, 0, 0);
layout->setSpacing(0);
table_ = new QTableWidget(this);
- table_->setStyleSheet("QTableWidget {"
- " background:#080808; color:#e5e5e5;"
- " gridline-color:#111111; border:none;"
+ table_->setStyleSheet(QString("QTableWidget {"
+ " background:%1; color:%2;"
+ " gridline-color:%3; border:none;"
" font-size:11px; font-family:'Consolas','Courier New',monospace; }"
"QHeaderView::section {"
- " background:#0a0a0a; color:#404040;"
- " border:none; border-right:1px solid #1a1a1a;"
- " border-bottom:1px solid #1a1a1a;"
+ " background:%4; color:%5;"
+ " border:none; border-right:1px solid %6;"
+ " border-bottom:1px solid %6;"
" padding:0 6px; font-size:11px; font-weight:bold;"
" font-family:'Consolas','Courier New',monospace; }"
"QTableWidget::item {"
- " padding:0 6px; border-bottom:1px solid #111111; }"
+ " padding:0 6px; border-bottom:1px solid %3; }"
"QScrollBar:vertical { width:5px; background:transparent; }"
- "QScrollBar::handle:vertical { background:#222222; }"
- "QScrollBar::handle:vertical:hover { background:#333333; }"
+ "QScrollBar::handle:vertical { background:%7; }"
+ "QScrollBar::handle:vertical:hover { background:%8; }"
"QScrollBar:horizontal { height:5px; background:transparent; }"
- "QScrollBar::handle:horizontal { background:#222222; }"
- "QScrollBar::handle:horizontal:hover { background:#333333; }");
+ "QScrollBar::handle:horizontal { background:%7; }"
+ "QScrollBar::handle:horizontal:hover { background:%8; }")
+ .arg(colors::BG_BASE).arg(colors::TEXT_PRIMARY)
+ .arg(colors::BG_RAISED).arg(colors::BG_SURFACE)
+ .arg(colors::TEXT_DIM).arg(colors::BORDER_DIM)
+ .arg(colors::BORDER_MED).arg(colors::BORDER_BRIGHT));
table_->horizontalHeader()->setDefaultSectionSize(72);
table_->verticalHeader()->setDefaultSectionSize(22);
table_->horizontalHeader()->setMinimumSectionSize(48);
diff --git a/fincept-qt/src/screens/trade_viz/TradeVizScreen.cpp b/fincept-qt/src/screens/trade_viz/TradeVizScreen.cpp
index c8dbfa2f5..f9ef2e362 100644
--- a/fincept-qt/src/screens/trade_viz/TradeVizScreen.cpp
+++ b/fincept-qt/src/screens/trade_viz/TradeVizScreen.cpp
@@ -20,29 +20,40 @@ namespace fincept::screens {
static const char* FONT = "'Consolas','Courier New',monospace";
-static const char* COMBO_SS = "QComboBox { background: #111111; color: #e5e5e5; border: 1px solid #1a1a1a;"
- " padding: 2px 8px; font-size: 11px; font-family: 'Consolas','Courier New',monospace;"
- " min-width: 100px; }"
- "QComboBox:hover { border-color: #333333; }"
- "QComboBox::drop-down { border: none; width: 16px; }"
- "QComboBox::down-arrow { image: none; border-left: 4px solid transparent;"
- " border-right: 4px solid transparent; border-top: 5px solid #808080; }"
- "QComboBox QAbstractItemView { background: #0a0a0a; color: #e5e5e5;"
- " border: 1px solid #1a1a1a; selection-background-color: #161616;"
- " selection-color: #d97706; font-family: 'Consolas','Courier New',monospace; }";
-
-static const char* TABLE_SS =
- "QTableWidget { background: #080808; color: #e5e5e5; border: none;"
- " gridline-color: #111111; font-size: 13px; font-family: 'Consolas','Courier New',monospace; }"
- "QTableWidget::item { padding: 3px 10px; border-bottom: 1px solid #111111; }"
- "QTableWidget::item:selected { background: #161616; color: #e5e5e5; }"
- "QHeaderView::section { background: #0a0a0a; color: #808080; font-size: 12px;"
- " font-weight: bold; border: none; border-bottom: 1px solid #1a1a1a;"
- " padding: 6px 10px; font-family: 'Consolas','Courier New',monospace; }"
- "QScrollBar:vertical { width: 5px; background: transparent; }"
- "QScrollBar::handle:vertical { background: #222222; }"
- "QScrollBar::handle:vertical:hover { background: #333333; }"
- "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }";
+static QString combo_ss() {
+ return QString(
+ "QComboBox { background: %1; color: %2; border: 1px solid %3;"
+ " padding: 2px 8px; font-size: 11px; font-family: 'Consolas','Courier New',monospace;"
+ " min-width: 100px; }"
+ "QComboBox:hover { border-color: %4; }"
+ "QComboBox::drop-down { border: none; width: 16px; }"
+ "QComboBox::down-arrow { image: none; border-left: 4px solid transparent;"
+ " border-right: 4px solid transparent; border-top: 5px solid %5; }"
+ "QComboBox QAbstractItemView { background: %6; color: %2;"
+ " border: 1px solid %3; selection-background-color: %7;"
+ " selection-color: %8; font-family: 'Consolas','Courier New',monospace; }")
+ .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_PRIMARY(), ui::colors::BORDER_DIM(),
+ ui::colors::BORDER_BRIGHT(), ui::colors::TEXT_SECONDARY(), ui::colors::BG_BASE(),
+ ui::colors::BG_HOVER(), ui::colors::AMBER());
+}
+
+static QString table_ss() {
+ return QString(
+ "QTableWidget { background: %1; color: %2; border: none;"
+ " gridline-color: %3; font-size: 13px; font-family: 'Consolas','Courier New',monospace; }"
+ "QTableWidget::item { padding: 3px 10px; border-bottom: 1px solid %3; }"
+ "QTableWidget::item:selected { background: %4; color: %2; }"
+ "QHeaderView::section { background: %5; color: %6; font-size: 12px;"
+ " font-weight: bold; border: none; border-bottom: 1px solid %7;"
+ " padding: 6px 10px; font-family: 'Consolas','Courier New',monospace; }"
+ "QScrollBar:vertical { width: 5px; background: transparent; }"
+ "QScrollBar::handle:vertical { background: %8; }"
+ "QScrollBar::handle:vertical:hover { background: %9; }"
+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }")
+ .arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY(), ui::colors::BG_RAISED(),
+ ui::colors::BG_HOVER(), ui::colors::BG_BASE(), ui::colors::TEXT_SECONDARY(),
+ ui::colors::BORDER_DIM(), ui::colors::BORDER_MED(), ui::colors::BORDER_BRIGHT());
+}
// ── Trade data ──────────────────────────────────────────────────────────────
@@ -71,7 +82,7 @@ static constexpr int NUM_PARTNERS = 15;
class TradeFlowChordWidget : public QWidget {
public:
explicit TradeFlowChordWidget(QWidget* parent = nullptr) : QWidget(parent) {
- setStyleSheet("background: #080808;");
+ setStyleSheet(QString("background: %1;").arg(ui::colors::BG_BASE()));
}
protected:
@@ -204,7 +215,7 @@ class TradeFlowChordWidget : public QWidget {
QFont lf(FONT, 9);
lf.setBold(true);
p.setFont(lf);
- p.setPen(QColor("#e5e5e5"));
+ p.setPen(QColor(ui::colors::TEXT_PRIMARY()));
QRect lr(lx - 32, ly - 9, 64, 18);
p.drawText(lr, Qt::AlignCenter, g_partners[i].abbrev);
}
@@ -212,19 +223,19 @@ class TradeFlowChordWidget : public QWidget {
// ── Center "US" node ─────────────────────────────────────────────────
QRect us_rect(cx - 16, cy - 12, 32, 24);
p.fillRect(us_rect, QColor(30, 30, 30));
- p.setPen(QPen(QColor("#d97706"), 1));
+ p.setPen(QPen(QColor(ui::colors::AMBER()), 1));
p.drawRect(us_rect);
QFont us_font(FONT, 10);
us_font.setBold(true);
p.setFont(us_font);
- p.setPen(QColor("#d97706"));
+ p.setPen(QColor(ui::colors::AMBER()));
p.drawText(us_rect, Qt::AlignCenter, "US");
// ── Scale axis labels ────────────────────────────────────────────────
QFont sf(FONT, 7);
p.setFont(sf);
- p.setPen(QColor("#404040"));
+ p.setPen(QColor(ui::colors::TEXT_DIM()));
// Import scale — above center
int sx = cx - 50;
@@ -251,7 +262,7 @@ class TradeFlowChordWidget : public QWidget {
p.fillRect(bx + i, by, 1, 8, QColor(r_comp, g_comp, b_comp));
}
p.setFont(QFont(FONT, 7));
- p.setPen(QColor("#808080"));
+ p.setPen(QColor(ui::colors::TEXT_SECONDARY()));
double lo = max_val * 0.1;
double mid = max_val * 0.5;
double hi = max_val;
@@ -267,7 +278,8 @@ class TradeFlowChordWidget : public QWidget {
QWidget* TradeVizScreen::build_tab_bar() {
auto* bar = new QWidget;
- bar->setStyleSheet("background: #0a0a0a; border-bottom: 1px solid #333333;");
+ bar->setStyleSheet(QString("background: %1; border-bottom: 1px solid %2;")
+ .arg(ui::colors::BG_BASE(), ui::colors::BORDER_BRIGHT()));
bar->setFixedHeight(28);
auto* hl = new QHBoxLayout(bar);
hl->setContentsMargins(0, 0, 0, 0);
@@ -293,13 +305,13 @@ QWidget* TradeVizScreen::build_tab_bar() {
bl->setSpacing(4);
auto* num = new QLabel(t.num);
- num->setStyleSheet("color: #808080; font-size: 11px; background: transparent;"
- " font-family: 'Consolas','Courier New',monospace;");
+ num->setStyleSheet(QString("color: %1; font-size: 11px; background: transparent;"
+ " font-family: 'Consolas','Courier New',monospace;").arg(ui::colors::TEXT_SECONDARY()));
bl->addWidget(num);
auto* lbl = new QLabel(t.label);
- lbl->setStyleSheet("color: #e5e5e5; font-size: 13px; font-weight: bold; background: transparent;"
- " font-family: 'Consolas','Courier New',monospace;");
+ lbl->setStyleSheet(QString("color: %1; font-size: 13px; font-weight: bold; background: transparent;"
+ " font-family: 'Consolas','Courier New',monospace;").arg(ui::colors::TEXT_PRIMARY()));
bl->addWidget(lbl);
hl->addWidget(btn);
@@ -309,8 +321,8 @@ QWidget* TradeVizScreen::build_tab_bar() {
// Right side: "Trade Flow" title
auto* title = new QLabel("Trade Flow");
- title->setStyleSheet("color: #d97706; font-size: 16px; font-weight: bold; background: transparent;"
- " padding-right: 14px; font-family: 'Consolas','Courier New',monospace;");
+ title->setStyleSheet(QString("color: %1; font-size: 16px; font-weight: bold; background: transparent;"
+ " padding-right: 14px; font-family: 'Consolas','Courier New',monospace;").arg(ui::colors::AMBER()));
hl->addWidget(title);
return bar;
@@ -322,7 +334,8 @@ QWidget* TradeVizScreen::build_tab_bar() {
QWidget* TradeVizScreen::build_filter_bar() {
auto* bar = new QWidget;
- bar->setStyleSheet("background: #111111; border-bottom: 1px solid #1a1a1a;");
+ bar->setStyleSheet(QString("background: %1; border-bottom: 1px solid %2;")
+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));
bar->setFixedHeight(32);
auto* hl = new QHBoxLayout(bar);
hl->setContentsMargins(10, 0, 10, 0);
@@ -330,7 +343,7 @@ QWidget* TradeVizScreen::build_filter_bar() {
// Country selector
country_combo_ = new QComboBox;
- country_combo_->setStyleSheet(COMBO_SS);
+ country_combo_->setStyleSheet(combo_ss());
country_combo_->addItems({"United States", "China", "Germany", "Japan", "United Kingdom", "France", "India",
"Italy", "Canada", "South Korea", "Mexico", "Brazil", "Australia", "Netherlands",
"Switzerland"});
@@ -339,20 +352,20 @@ QWidget* TradeVizScreen::build_filter_bar() {
// Browse button
auto* browse = new QLabel("20) Browse");
- browse->setStyleSheet("color: #e5e5e5; font-size: 12px; font-weight: bold; background: transparent;"
- " font-family: 'Consolas','Courier New',monospace;");
+ browse->setStyleSheet(QString("color: %1; font-size: 12px; font-weight: bold; background: transparent;"
+ " font-family: 'Consolas','Courier New',monospace;").arg(ui::colors::TEXT_PRIMARY()));
hl->addWidget(browse);
hl->addSpacing(10);
// Order by
auto* order_lbl = new QLabel("Order by");
- order_lbl->setStyleSheet("color: #808080; font-size: 11px; font-weight: bold; background: transparent;"
- " font-family: 'Consolas','Courier New',monospace;");
+ order_lbl->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: bold; background: transparent;"
+ " font-family: 'Consolas','Courier New',monospace;").arg(ui::colors::TEXT_SECONDARY()));
hl->addWidget(order_lbl);
order_combo_ = new QComboBox;
- order_combo_->setStyleSheet(COMBO_SS);
+ order_combo_->setStyleSheet(combo_ss());
order_combo_->addItems({"Total Trade", "Imports", "Exports", "Trade Balance", "% of GDP"});
hl->addWidget(order_combo_);
@@ -360,12 +373,12 @@ QWidget* TradeVizScreen::build_filter_bar() {
// Periodicity
auto* period_lbl = new QLabel("Periodicity");
- period_lbl->setStyleSheet("color: #808080; font-size: 11px; font-weight: bold; background: transparent;"
- " font-family: 'Consolas','Courier New',monospace;");
+ period_lbl->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: bold; background: transparent;"
+ " font-family: 'Consolas','Courier New',monospace;").arg(ui::colors::TEXT_SECONDARY()));
hl->addWidget(period_lbl);
period_combo_ = new QComboBox;
- period_combo_->setStyleSheet(COMBO_SS);
+ period_combo_->setStyleSheet(combo_ss());
period_combo_->addItems({"Yearly", "Quarterly", "Monthly"});
hl->addWidget(period_combo_);
@@ -373,12 +386,12 @@ QWidget* TradeVizScreen::build_filter_bar() {
// Year navigation
auto* prev_btn = new QLabel("<<");
- prev_btn->setStyleSheet("color: #808080; font-size: 12px; font-weight: bold; background: transparent;"
- " font-family: 'Consolas','Courier New',monospace;");
+ prev_btn->setStyleSheet(QString("color: %1; font-size: 12px; font-weight: bold; background: transparent;"
+ " font-family: 'Consolas','Courier New',monospace;").arg(ui::colors::TEXT_SECONDARY()));
hl->addWidget(prev_btn);
year_combo_ = new QComboBox;
- year_combo_->setStyleSheet(COMBO_SS);
+ year_combo_->setStyleSheet(combo_ss());
year_combo_->setFixedWidth(80);
for (int y = 2024; y >= 2010; --y) {
year_combo_->addItem(QString::number(y));
@@ -386,16 +399,16 @@ QWidget* TradeVizScreen::build_filter_bar() {
hl->addWidget(year_combo_);
auto* next_btn = new QLabel(">>");
- next_btn->setStyleSheet("color: #808080; font-size: 12px; font-weight: bold; background: transparent;"
- " font-family: 'Consolas','Courier New',monospace;");
+ next_btn->setStyleSheet(QString("color: %1; font-size: 12px; font-weight: bold; background: transparent;"
+ " font-family: 'Consolas','Courier New',monospace;").arg(ui::colors::TEXT_SECONDARY()));
hl->addWidget(next_btn);
hl->addStretch();
// Clock
clock_label_ = new QLabel(QDateTime::currentDateTime().toString("HH:mm:ss"));
- clock_label_->setStyleSheet("color: #525252; font-size: 11px; background: transparent;"
- " font-family: 'Consolas','Courier New',monospace;");
+ clock_label_->setStyleSheet(QString("color: %1; font-size: 11px; background: transparent;"
+ " font-family: 'Consolas','Courier New',monospace;").arg(ui::colors::TEXT_TERTIARY()));
hl->addWidget(clock_label_);
return bar;
@@ -407,13 +420,13 @@ QWidget* TradeVizScreen::build_filter_bar() {
QWidget* TradeVizScreen::build_partner_table() {
auto* panel = new QWidget;
- panel->setStyleSheet("background: #080808;");
+ panel->setStyleSheet(QString("background: %1;").arg(ui::colors::BG_BASE()));
auto* vl = new QVBoxLayout(panel);
vl->setContentsMargins(0, 0, 0, 0);
vl->setSpacing(0);
partner_table_ = new QTableWidget;
- partner_table_->setStyleSheet(TABLE_SS);
+ partner_table_->setStyleSheet(table_ss());
partner_table_->setColumnCount(3);
partner_table_->setHorizontalHeaderLabels({"", "Trading Partner", "Total Trade ($M)"});
partner_table_->verticalHeader()->setVisible(false);
@@ -422,7 +435,7 @@ QWidget* TradeVizScreen::build_partner_table() {
partner_table_->setShowGrid(false);
partner_table_->setAlternatingRowColors(true);
partner_table_->setStyleSheet(partner_table_->styleSheet() +
- " QTableWidget { alternate-background-color: #0c0c0c; }");
+ QString(" QTableWidget { alternate-background-color: %1; }").arg(ui::colors::BG_SURFACE()));
auto* hdr = partner_table_->horizontalHeader();
hdr->setSectionResizeMode(0, QHeaderView::Fixed);
@@ -441,18 +454,18 @@ void TradeVizScreen::populate_partner_table() {
double total = g_partners[i].imports + g_partners[i].exports;
auto* rank = new QTableWidgetItem(QString("%1)").arg(i + 1));
- rank->setForeground(QColor("#808080"));
+ rank->setForeground(QColor(ui::colors::TEXT_SECONDARY()));
rank->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
rank->setFont(QFont(FONT, 12));
partner_table_->setItem(i, 0, rank);
auto* name = new QTableWidgetItem(g_partners[i].name);
- name->setForeground(QColor("#16a34a"));
+ name->setForeground(QColor(ui::colors::POSITIVE()));
name->setFont(QFont(FONT, 13, QFont::Bold));
partner_table_->setItem(i, 1, name);
auto* val = new QTableWidgetItem(QString::number(total, 'f', 2));
- val->setForeground(QColor("#e5e5e5"));
+ val->setForeground(QColor(ui::colors::TEXT_PRIMARY()));
val->setFont(QFont(FONT, 13, QFont::Bold));
val->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
partner_table_->setItem(i, 2, val);
@@ -514,8 +527,9 @@ void TradeVizScreen::setup_ui() {
// ── Main content: chord diagram (left) + partner table (right) ───────────
auto* splitter = new QSplitter(Qt::Horizontal);
- splitter->setStyleSheet("QSplitter { background: #080808; }"
- "QSplitter::handle { background: #1a1a1a; width: 1px; }");
+ splitter->setStyleSheet(QString("QSplitter { background: %1; }"
+ "QSplitter::handle { background: %2; width: 1px; }")
+ .arg(ui::colors::BG_BASE(), ui::colors::BORDER_DIM()));
splitter->addWidget(new TradeFlowChordWidget);
splitter->addWidget(build_partner_table());
diff --git a/fincept-qt/src/screens/watchlist/WatchlistScreen.cpp b/fincept-qt/src/screens/watchlist/WatchlistScreen.cpp
index bb1e09787..af4e57f0b 100644
--- a/fincept-qt/src/screens/watchlist/WatchlistScreen.cpp
+++ b/fincept-qt/src/screens/watchlist/WatchlistScreen.cpp
@@ -1,7 +1,9 @@
#include "screens/watchlist/WatchlistScreen.h"
#include "core/logging/Logger.h"
+#include "core/session/ScreenStateManager.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QHBoxLayout>
#include <QHideEvent>
@@ -13,48 +15,91 @@
namespace fincept::screens {
-using namespace fincept::ui::colors;
-
-// ── Style constants (Obsidian Design System) ────────────────────────────────
-
-// §5.5 Accent button
-static const QString kAccentBtn =
- "QPushButton { background: rgba(217,119,6,0.1); color: #d97706; "
- "border: 1px solid #78350f; padding: 0 12px; height: 24px; "
- "font-size: 11px; font-weight: 700; font-family: 'Consolas','Courier New',monospace; }"
- "QPushButton:hover { background: #d97706; color: #080808; }";
-
-// §5.5 Standard button
-static const QString kStdBtn = "QPushButton { background: #111111; color: #808080; border: 1px solid #1a1a1a; "
- "padding: 0 10px; height: 24px; "
- "font-size: 11px; font-weight: 700; font-family: 'Consolas','Courier New',monospace; }"
- "QPushButton:hover { color: #e5e5e5; background: #161616; }";
-
-// §5.5 Danger button
-static const QString kDangerBtn =
- "QPushButton { background: rgba(220,38,38,0.1); color: #dc2626; "
- "border: 1px solid #7f1d1d; padding: 0 10px; height: 24px; "
- "font-size: 11px; font-weight: 700; font-family: 'Consolas','Courier New',monospace; }"
- "QPushButton:hover { background: #dc2626; color: #e5e5e5; }";
-
-// §5.6 Input
-static const QString kInput =
- "QLineEdit { background: #0a0a0a; color: #e5e5e5; border: 1px solid #1a1a1a; "
- "padding: 3px 6px; font-size: 13px; font-family: 'Consolas','Courier New',monospace; height: 28px; }"
- "QLineEdit:focus { border-color: #333333; }"
- "QLineEdit::selection { background: #d97706; color: #080808; }";
-
-// §5.2 List
-static const QString kList =
- "QListWidget { background: %1; border: none; font-family: 'Consolas','Courier New',monospace; font-size: 12px; }"
- "QListWidget::item { padding: 6px 12px; color: #e5e5e5; border-bottom: 1px solid %2; height: 26px; }"
- "QListWidget::item:selected { background: #161616; }"
- "QListWidget::item:hover { background: #161616; }";
+using namespace fincept::ui;
+
+// ── Style builders (read live theme tokens) ─────────────────────────────────
+
+static QString accent_btn_style() {
+ QColor acc(colors::AMBER());
+ auto rgb = QString("%1,%2,%3").arg(acc.red()).arg(acc.green()).arg(acc.blue());
+ return QString(
+ "QPushButton { background:rgba(%1,0.1); color:%2; "
+ "border:1px solid %3; padding:0 12px; height:24px; "
+ "font-size:%4px; font-weight:700; font-family:%5; }"
+ "QPushButton:hover { background:%2; color:%6; }")
+ .arg(rgb)
+ .arg(colors::AMBER())
+ .arg(colors::AMBER_DIM())
+ .arg(fonts::TINY)
+ .arg(fonts::DATA_FAMILY())
+ .arg(colors::BG_BASE());
+}
+
+static QString std_btn_style() {
+ return QString(
+ "QPushButton { background:%1; color:%2; border:1px solid %3; "
+ "padding:0 10px; height:24px; "
+ "font-size:%4px; font-weight:700; font-family:%5; }"
+ "QPushButton:hover { color:%6; background:%7; }")
+ .arg(colors::BG_RAISED())
+ .arg(colors::TEXT_SECONDARY())
+ .arg(colors::BORDER_DIM())
+ .arg(fonts::TINY)
+ .arg(fonts::DATA_FAMILY())
+ .arg(colors::TEXT_PRIMARY())
+ .arg(colors::BG_HOVER());
+}
+
+static QString danger_btn_style() {
+ QColor neg(colors::NEGATIVE());
+ auto rgb = QString("%1,%2,%3").arg(neg.red()).arg(neg.green()).arg(neg.blue());
+ return QString(
+ "QPushButton { background:rgba(%1,0.1); color:%2; "
+ "border:1px solid rgba(%1,0.3); padding:0 10px; height:24px; "
+ "font-size:%3px; font-weight:700; font-family:%4; }"
+ "QPushButton:hover { background:%2; color:%5; }")
+ .arg(rgb)
+ .arg(colors::NEGATIVE())
+ .arg(fonts::TINY)
+ .arg(fonts::DATA_FAMILY())
+ .arg(colors::TEXT_PRIMARY());
+}
+
+static QString input_style() {
+ QColor acc(colors::AMBER());
+ auto acc_rgb = QString("%1,%2,%3").arg(acc.red()).arg(acc.green()).arg(acc.blue());
+ return QString(
+ "QLineEdit { background:%1; color:%2; border:1px solid %3; "
+ "padding:3px 6px; font-size:%4px; font-family:%5; height:28px; }"
+ "QLineEdit:focus { border-color:%6; }"
+ "QLineEdit::selection { background:%7; color:%8; }")
+ .arg(colors::BG_BASE())
+ .arg(colors::TEXT_PRIMARY())
+ .arg(colors::BORDER_DIM())
+ .arg(fonts::SMALL)
+ .arg(fonts::DATA_FAMILY())
+ .arg(colors::BORDER_BRIGHT())
+ .arg(colors::AMBER())
+ .arg(colors::BG_BASE());
+}
+
+static QString list_style() {
+ return QString(
+ "QListWidget { background:%1; border:none; font-family:%2; font-size:%3px; }"
+ "QListWidget::item { padding:6px 12px; color:%4; border-bottom:1px solid %5; height:26px; }"
+ "QListWidget::item:selected { background:%6; }"
+ "QListWidget::item:hover { background:%6; }")
+ .arg(colors::BG_SURFACE())
+ .arg(fonts::DATA_FAMILY())
+ .arg(fonts::TINY)
+ .arg(colors::TEXT_PRIMARY())
+ .arg(colors::BORDER_DIM())
+ .arg(colors::BG_HOVER());
+}
// ── Constructor ──────────────────────────────────────────────────────────────
WatchlistScreen::WatchlistScreen(QWidget* parent) : QWidget(parent) {
- setStyleSheet(QString("background: %1;").arg(BG_BASE));
build_ui();
load_watchlists();
@@ -62,6 +107,10 @@ WatchlistScreen::WatchlistScreen(QWidget* parent) : QWidget(parent) {
refresh_timer_ = new QTimer(this);
connect(refresh_timer_, &QTimer::timeout, this, &WatchlistScreen::on_refresh);
refresh_timer_->setInterval(30000);
+
+ connect(&ThemeManager::instance(), &ThemeManager::theme_changed,
+ this, [this](const ThemeTokens&) { refresh_theme(); });
+ refresh_theme();
}
void WatchlistScreen::showEvent(QShowEvent* event) {
@@ -82,55 +131,47 @@ void WatchlistScreen::build_ui() {
root->setContentsMargins(0, 0, 0, 0);
root->setSpacing(0);
- auto* splitter = new QSplitter(Qt::Horizontal);
- splitter->setStyleSheet("QSplitter::handle { background: #1a1a1a; width: 1px; }");
+ splitter_ = new QSplitter(Qt::Horizontal);
- splitter->addWidget(build_sidebar());
- splitter->addWidget(build_main_panel());
- splitter->setStretchFactor(0, 0);
- splitter->setStretchFactor(1, 1);
+ splitter_->addWidget(build_sidebar());
+ splitter_->addWidget(build_main_panel());
+ splitter_->setStretchFactor(0, 0);
+ splitter_->setStretchFactor(1, 1);
- root->addWidget(splitter);
+ root->addWidget(splitter_);
}
// ── Sidebar ──────────────────────────────────────────────────────────────────
QWidget* WatchlistScreen::build_sidebar() {
- auto* panel = new QWidget;
- panel->setMinimumWidth(180);
- panel->setMaximumWidth(280);
- panel->setStyleSheet(QString("background: %1; border-right: 1px solid %2;").arg(BG_SURFACE, BORDER_DIM));
+ sidebar_ = new QWidget;
+ sidebar_->setMinimumWidth(180);
+ sidebar_->setMaximumWidth(280);
- auto* lay = new QVBoxLayout(panel);
+ auto* lay = new QVBoxLayout(sidebar_);
lay->setContentsMargins(0, 0, 0, 0);
lay->setSpacing(0);
- // §5.1 Panel header — 34px, #111111 bg, amber title
- auto* header = new QWidget;
- header->setFixedHeight(34);
- header->setStyleSheet(QString("background: %1; border-bottom: 1px solid %2;").arg(BG_RAISED, BORDER_DIM));
- auto* hl = new QHBoxLayout(header);
+ // Panel header
+ sidebar_header_ = new QWidget;
+ sidebar_header_->setFixedHeight(34);
+ auto* hl = new QHBoxLayout(sidebar_header_);
hl->setContentsMargins(12, 0, 8, 0);
hl->setSpacing(6);
- auto* title = new QLabel("WATCHLISTS");
- title->setStyleSheet(QString("color: %1; font-size: 12px; font-weight: 700; letter-spacing: 0.5px; "
- "font-family: 'Consolas','Courier New',monospace; background: transparent;")
- .arg(AMBER));
- hl->addWidget(title);
+ sidebar_title_ = new QLabel("WATCHLISTS");
+ hl->addWidget(sidebar_title_);
hl->addStretch();
- auto* add_wl_btn = new QPushButton("+");
- add_wl_btn->setFixedSize(24, 24);
- add_wl_btn->setStyleSheet(kAccentBtn);
- connect(add_wl_btn, &QPushButton::clicked, this, &WatchlistScreen::on_add_watchlist);
- hl->addWidget(add_wl_btn);
+ add_wl_btn_ = new QPushButton("+");
+ add_wl_btn_->setFixedSize(24, 24);
+ connect(add_wl_btn_, &QPushButton::clicked, this, &WatchlistScreen::on_add_watchlist);
+ hl->addWidget(add_wl_btn_);
- lay->addWidget(header);
+ lay->addWidget(sidebar_header_);
// Watchlist list
wl_list_ = new QListWidget;
- wl_list_->setStyleSheet(kList.arg(BG_SURFACE, BORDER_DIM));
connect(wl_list_, &QListWidget::currentRowChanged, this, &WatchlistScreen::on_watchlist_selected);
lay->addWidget(wl_list_);
@@ -138,93 +179,72 @@ QWidget* WatchlistScreen::build_sidebar() {
wl_count_ = new QLabel("0 lists");
wl_count_->setFixedHeight(26);
wl_count_->setAlignment(Qt::AlignCenter);
- wl_count_->setStyleSheet(QString("background: %1; color: %2; font-size: 11px; border-top: 1px solid %3; "
- "font-family: 'Consolas','Courier New',monospace;")
- .arg(BG_SURFACE, TEXT_TERTIARY, BORDER_DIM));
lay->addWidget(wl_count_);
- return panel;
+ return sidebar_;
}
// ── Main Panel ───────────────────────────────────────────────────────────────
QWidget* WatchlistScreen::build_main_panel() {
- auto* panel = new QWidget;
- panel->setStyleSheet(QString("background: %1;").arg(BG_BASE));
+ main_panel_ = new QWidget;
- auto* lay = new QVBoxLayout(panel);
+ auto* lay = new QVBoxLayout(main_panel_);
lay->setContentsMargins(0, 0, 0, 0);
lay->setSpacing(0);
// Top bar: title + controls
- auto* top_bar = new QWidget;
- top_bar->setFixedHeight(34);
- top_bar->setStyleSheet(QString("background: %1; border-bottom: 1px solid %2;").arg(BG_RAISED, BORDER_DIM));
- auto* tl = new QHBoxLayout(top_bar);
+ top_bar_ = new QWidget;
+ top_bar_->setFixedHeight(34);
+ auto* tl = new QHBoxLayout(top_bar_);
tl->setContentsMargins(14, 0, 14, 0);
tl->setSpacing(8);
panel_title_ = new QLabel("Select a watchlist");
- panel_title_->setStyleSheet(QString("color: %1; font-size: 13px; font-weight: 700; "
- "font-family: 'Consolas','Courier New',monospace; background: transparent;")
- .arg(TEXT_PRIMARY));
tl->addWidget(panel_title_);
tl->addStretch();
stock_count_ = new QLabel;
- stock_count_->setStyleSheet(QString("color: %1; font-size: 11px; font-family: 'Consolas','Courier New',monospace; "
- "background: transparent;")
- .arg(TEXT_TERTIARY));
tl->addWidget(stock_count_);
- auto* refresh_btn = new QPushButton("REFRESH");
- refresh_btn->setStyleSheet(kStdBtn);
- connect(refresh_btn, &QPushButton::clicked, this, &WatchlistScreen::on_refresh);
- tl->addWidget(refresh_btn);
+ refresh_btn_ = new QPushButton("REFRESH");
+ connect(refresh_btn_, &QPushButton::clicked, this, &WatchlistScreen::on_refresh);
+ tl->addWidget(refresh_btn_);
- auto* del_wl_btn = new QPushButton("DELETE LIST");
- del_wl_btn->setStyleSheet(kDangerBtn);
- connect(del_wl_btn, &QPushButton::clicked, this, &WatchlistScreen::on_delete_watchlist);
- tl->addWidget(del_wl_btn);
+ del_wl_btn_ = new QPushButton("DELETE LIST");
+ connect(del_wl_btn_, &QPushButton::clicked, this, &WatchlistScreen::on_delete_watchlist);
+ tl->addWidget(del_wl_btn_);
- lay->addWidget(top_bar);
+ lay->addWidget(top_bar_);
// Add stock bar
- auto* add_bar = new QWidget;
- add_bar->setFixedHeight(34);
- add_bar->setStyleSheet(QString("background: %1; border-bottom: 1px solid %2;").arg(BG_SURFACE, BORDER_DIM));
- auto* al = new QHBoxLayout(add_bar);
+ add_bar_ = new QWidget;
+ add_bar_->setFixedHeight(34);
+ auto* al = new QHBoxLayout(add_bar_);
al->setContentsMargins(14, 0, 14, 0);
al->setSpacing(6);
- auto* add_label = new QLabel("ADD:");
- add_label->setStyleSheet(QString("color: %1; font-size: 11px; font-weight: 700; letter-spacing: 0.5px; "
- "font-family: 'Consolas','Courier New',monospace; background: transparent;")
- .arg(TEXT_SECONDARY));
- al->addWidget(add_label);
+ add_label_ = new QLabel("ADD:");
+ al->addWidget(add_label_);
add_input_ = new QLineEdit;
add_input_->setPlaceholderText("AAPL, MSFT, TSLA...");
- add_input_->setStyleSheet(kInput);
add_input_->setFixedHeight(28);
al->addWidget(add_input_, 1);
- auto* add_btn = new QPushButton("ADD");
- add_btn->setStyleSheet(kAccentBtn);
- connect(add_btn, &QPushButton::clicked, this, &WatchlistScreen::on_add_stock);
- // Also add on Enter key
+ add_btn_ = new QPushButton("ADD");
+ connect(add_btn_, &QPushButton::clicked, this, &WatchlistScreen::on_add_stock);
connect(add_input_, &QLineEdit::returnPressed, this, &WatchlistScreen::on_add_stock);
- al->addWidget(add_btn);
+ al->addWidget(add_btn_);
- auto* remove_btn = new QPushButton("REMOVE SELECTED");
- remove_btn->setStyleSheet(kDangerBtn);
- connect(remove_btn, &QPushButton::clicked, this, &WatchlistScreen::on_remove_stock);
- al->addWidget(remove_btn);
+ remove_btn_ = new QPushButton("REMOVE SELECTED");
+ connect(remove_btn_, &QPushButton::clicked, this, &WatchlistScreen::on_remove_stock);
+ al->addWidget(remove_btn_);
- lay->addWidget(add_bar);
+ lay->addWidget(add_bar_);
- // §5.4 Table — the main data area
+ // Table — the main data area
table_ = new ui::DataTable;
table_->set_headers({"SYMBOL", "NAME", "PRICE", "CHANGE", "CHG %", "HIGH", "LOW", "VOLUME"});
table_->set_column_widths({100, 160, 100, 90, 80, 90, 90, 110});
@@ -232,7 +252,100 @@ QWidget* WatchlistScreen::build_main_panel() {
table_->setSelectionMode(QAbstractItemView::SingleSelection);
lay->addWidget(table_, 1);
- return panel;
+ return main_panel_;
+}
+
+// ── Theme refresh ───────────────────────────────────────────────────────────
+
+void WatchlistScreen::refresh_theme() {
+ // Root
+ setStyleSheet(QString("background:%1;").arg(colors::BG_BASE()));
+
+ // Splitter
+ if (splitter_)
+ splitter_->setStyleSheet(QString("QSplitter::handle { background:%1; width:1px; }").arg(colors::BORDER_DIM()));
+
+ // Sidebar
+ if (sidebar_)
+ sidebar_->setStyleSheet(
+ QString("background:%1; border-right:1px solid %2;").arg(colors::BG_SURFACE(), colors::BORDER_DIM()));
+
+ if (sidebar_header_)
+ sidebar_header_->setStyleSheet(
+ QString("background:%1; border-bottom:1px solid %2;").arg(colors::BG_RAISED(), colors::BORDER_DIM()));
+
+ if (sidebar_title_)
+ sidebar_title_->setStyleSheet(
+ QString("color:%1; font-size:%2px; font-weight:700; letter-spacing:0.5px; "
+ "font-family:%3; background:transparent;")
+ .arg(colors::AMBER())
+ .arg(fonts::TINY)
+ .arg(fonts::DATA_FAMILY()));
+
+ if (add_wl_btn_)
+ add_wl_btn_->setStyleSheet(accent_btn_style());
+
+ if (wl_list_)
+ wl_list_->setStyleSheet(list_style());
+
+ if (wl_count_)
+ wl_count_->setStyleSheet(
+ QString("background:%1; color:%2; font-size:%3px; border-top:1px solid %4; font-family:%5;")
+ .arg(colors::BG_SURFACE())
+ .arg(colors::TEXT_TERTIARY())
+ .arg(fonts::TINY)
+ .arg(colors::BORDER_DIM())
+ .arg(fonts::DATA_FAMILY()));
+
+ // Main panel
+ if (main_panel_)
+ main_panel_->setStyleSheet(QString("background:%1;").arg(colors::BG_BASE()));
+
+ if (top_bar_)
+ top_bar_->setStyleSheet(
+ QString("background:%1; border-bottom:1px solid %2;").arg(colors::BG_RAISED(), colors::BORDER_DIM()));
+
+ if (panel_title_)
+ panel_title_->setStyleSheet(
+ QString("color:%1; font-size:%2px; font-weight:700; font-family:%3; background:transparent;")
+ .arg(colors::TEXT_PRIMARY())
+ .arg(fonts::SMALL)
+ .arg(fonts::DATA_FAMILY()));
+
+ if (stock_count_)
+ stock_count_->setStyleSheet(
+ QString("color:%1; font-size:%2px; font-family:%3; background:transparent;")
+ .arg(colors::TEXT_TERTIARY())
+ .arg(fonts::TINY)
+ .arg(fonts::DATA_FAMILY()));
+
+ if (refresh_btn_)
+ refresh_btn_->setStyleSheet(std_btn_style());
+
+ if (del_wl_btn_)
+ del_wl_btn_->setStyleSheet(danger_btn_style());
+
+ // Add bar
+ if (add_bar_)
+ add_bar_->setStyleSheet(
+ QString("background:%1; border-bottom:1px solid %2;").arg(colors::BG_SURFACE(), colors::BORDER_DIM()));
+
+ if (add_label_)
+ add_label_->setStyleSheet(
+ QString("color:%1; font-size:%2px; font-weight:700; letter-spacing:0.5px; "
+ "font-family:%3; background:transparent;")
+ .arg(colors::TEXT_SECONDARY())
+ .arg(fonts::TINY)
+ .arg(fonts::DATA_FAMILY()));
+
+ if (add_input_)
+ add_input_->setStyleSheet(input_style());
+
+ if (add_btn_)
+ add_btn_->setStyleSheet(accent_btn_style());
+
+ if (remove_btn_)
+ remove_btn_->setStyleSheet(danger_btn_style());
}
// ── Data Loading ─────────────────────────────────────────────────────────────
@@ -248,7 +361,8 @@ void WatchlistScreen::load_watchlists() {
// Ensure at least one default watchlist exists
if (watchlists_.isEmpty()) {
- auto cr = fincept::WatchlistRepository::instance().create("Default", "#d97706");
+ QColor acc(colors::AMBER());
+ auto cr = fincept::WatchlistRepository::instance().create("Default", acc.name());
if (cr.is_ok()) {
watchlists_.append(cr.value());
// Add some starter symbols
@@ -338,8 +452,8 @@ void WatchlistScreen::populate_table(const QVector<services::QuoteData>& quotes)
QString::number(static_cast<qint64>(q.volume))});
int row = table_->rowCount() - 1;
- // §8 Rule 6: Green = good, Red = bad
- QString chg_color = q.change_pct >= 0 ? POSITIVE : NEGATIVE;
+ // Green = good, Red = bad
+ QString chg_color = q.change_pct >= 0 ? colors::POSITIVE : colors::NEGATIVE;
table_->set_cell_color(row, 3, chg_color);
table_->set_cell_color(row, 4, chg_color);
} else {
@@ -356,6 +470,7 @@ void WatchlistScreen::on_watchlist_selected(int row) {
current_wl_id_ = watchlists_[row].id;
panel_title_->setText(watchlists_[row].name.toUpper());
load_stocks();
+ ScreenStateManager::instance().notify_changed(this);
}
void WatchlistScreen::on_add_watchlist() {
@@ -430,4 +545,27 @@ void WatchlistScreen::on_refresh() {
}
}
+// ── IStatefulScreen ───────────────────────────────────────────────────────────
+
+QVariantMap WatchlistScreen::save_state() const {
+ return {
+ {"watchlist_id", current_wl_id_},
+ };
+}
+
+void WatchlistScreen::restore_state(const QVariantMap& state) {
+ const QString wl_id = state.value("watchlist_id").toString();
+ if (wl_id.isEmpty()) return;
+
+ // Find and select the matching watchlist row
+ for (int i = 0; i < watchlists_.size(); ++i) {
+ if (watchlists_[i].id == wl_id) {
+ wl_list_->setCurrentRow(i);
+ on_watchlist_selected(i);
+ return;
+ }
+ }
+ // Watchlist not found (may have been deleted) — leave default selection
+}
+
} // namespace fincept::screens
diff --git a/fincept-qt/src/screens/watchlist/WatchlistScreen.h b/fincept-qt/src/screens/watchlist/WatchlistScreen.h
index 08ad31da4..39bf3d01d 100644
--- a/fincept-qt/src/screens/watchlist/WatchlistScreen.h
+++ b/fincept-qt/src/screens/watchlist/WatchlistScreen.h
@@ -1,4 +1,5 @@
#pragma once
+#include "screens/IStatefulScreen.h"
#include "services/markets/MarketDataService.h"
#include "storage/repositories/WatchlistRepository.h"
#include "ui/tables/DataTable.h"
@@ -9,6 +10,7 @@
#include <QListWidget>
#include <QPushButton>
#include <QShowEvent>
+#include <QSplitter>
#include <QTimer>
#include <QWidget>
@@ -16,11 +18,16 @@ namespace fincept::screens {
/// Full-screen Watchlist — manage multiple watchlists with live quotes.
/// Layout: Watchlist Sidebar | Stock Table + Controls
-class WatchlistScreen : public QWidget {
+class WatchlistScreen : public QWidget, public IStatefulScreen {
Q_OBJECT
public:
explicit WatchlistScreen(QWidget* parent = nullptr);
+ void restore_state(const QVariantMap& state) override;
+ QVariantMap save_state() const override;
+ QString state_key() const override { return "watchlist"; }
+ int state_version() const override { return 1; }
+
protected:
void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) override;
@@ -32,6 +39,7 @@ class WatchlistScreen : public QWidget {
void on_add_stock();
void on_remove_stock();
void on_refresh();
+ void refresh_theme();
private:
void build_ui();
@@ -48,15 +56,28 @@ class WatchlistScreen : public QWidget {
QString current_wl_id_;
// Sidebar
+ QWidget* sidebar_ = nullptr;
+ QWidget* sidebar_header_ = nullptr;
+ QLabel* sidebar_title_ = nullptr;
QListWidget* wl_list_ = nullptr;
QLabel* wl_count_ = nullptr;
+ QPushButton* add_wl_btn_ = nullptr;
// Main panel
+ QWidget* main_panel_ = nullptr;
+ QWidget* top_bar_ = nullptr;
+ QWidget* add_bar_ = nullptr;
QLabel* panel_title_ = nullptr;
QLabel* stock_count_ = nullptr;
+ QLabel* add_label_ = nullptr;
QLineEdit* add_input_ = nullptr;
+ QPushButton* refresh_btn_ = nullptr;
+ QPushButton* del_wl_btn_ = nullptr;
+ QPushButton* add_btn_ = nullptr;
+ QPushButton* remove_btn_ = nullptr;
ui::DataTable* table_ = nullptr;
QTimer* refresh_timer_ = nullptr;
+ QSplitter* splitter_ = nullptr;
};
} // namespace fincept::screens
diff --git a/fincept-qt/src/services/databento/DatabentoService.cpp b/fincept-qt/src/services/databento/DatabentoService.cpp
index d1a559805..1766f25bd 100644
--- a/fincept-qt/src/services/databento/DatabentoService.cpp
+++ b/fincept-qt/src/services/databento/DatabentoService.cpp
@@ -73,6 +73,8 @@ void DatabentoService::clear_api_key() {
}
// ── Core runner — wraps PythonRunner per P4 ────────────────────────────────
+// Python script expects: databento_provider.py <command> <json_args>
+// where json_args is a JSON object with api_key and other parameters.
void DatabentoService::run_script(const QStringList& args, std::function<void(bool, const QJsonObject&)> cb) {
QString key = api_key();
if (key.isEmpty()) {
@@ -80,12 +82,30 @@ void DatabentoService::run_script(const QStringList& args, std::function<void(bo
return;
}
- QStringList full_args = {"--api-key", key};
- full_args += args;
+ // args[0] = command name, args[1..] = key=value pairs to pack into JSON
+ if (args.isEmpty()) {
+ cb(false, {{"error", "No command specified"}});
+ return;
+ }
+
+ QString command = args[0];
+
+ // Build JSON args object — always includes api_key
+ QJsonObject json_args;
+ json_args["api_key"] = key;
+
+ // Pack remaining args as key=value pairs into the JSON object
+ for (int i = 1; i < args.size(); i += 2) {
+ if (i + 1 < args.size()) {
+ json_args[args[i]] = args[i + 1];
+ }
+ }
+
+ QStringList script_args = {command, QString::fromUtf8(QJsonDocument(json_args).toJson(QJsonDocument::Compact))};
QPointer<DatabentoService> self = this;
- PythonRunner::instance().run(SCRIPT, full_args, [self, cb](PythonResult result) {
+ PythonRunner::instance().run(SCRIPT, script_args, [self, cb](PythonResult result) {
if (!self)
return;
if (!result.success) {
@@ -109,7 +129,7 @@ void DatabentoService::run_script(const QStringList& args, std::function<void(bo
void DatabentoService::test_connection() {
emit fetch_started("Testing Databento connection...");
QPointer<DatabentoService> self = this;
- run_script({"--action", "test_connection"}, [self](bool ok, const QJsonObject& j) {
+ run_script({"test_connection"}, [self](bool ok, const QJsonObject& j) {
if (!self)
return;
if (!ok) {
@@ -128,8 +148,8 @@ void DatabentoService::fetch_ohlcv(const QStringList& symbols, int days) {
LOG_INFO("Databento", "fetch_ohlcv symbols=" + symbols.join(",") + " days=" + QString::number(days));
QPointer<DatabentoService> self = this;
- QStringList args = {"--action", "get_historical_ohlcv", "--symbols", symbols.join(","),
- "--days", QString::number(days)};
+ QStringList args = {"historical_ohlcv", "symbols", symbols.join(","),
+ "days", QString::number(days)};
run_script(args, [self, symbols](bool ok, const QJsonObject& j) {
if (!self)
@@ -164,8 +184,7 @@ void DatabentoService::fetch_options_surface(const QString& symbol, float spot)
LOG_INFO("Databento", "fetch_options_surface symbol=" + symbol);
QPointer<DatabentoService> self = this;
- QStringList args = {
- "--action", "get_options_definitions", "--symbols", symbol, "--spot", QString::number((double)spot, 'f', 2)};
+ QStringList args = {"options_chain", "symbol", symbol, "spot", QString::number((double)spot, 'f', 2)};
run_script(args, [self, symbol, spot](bool ok, const QJsonObject& j) {
if (!self)
@@ -199,7 +218,8 @@ void DatabentoService::fetch_futures_term_structure(const QStringList& commoditi
LOG_INFO("Databento", "fetch_futures_term_structure");
QPointer<DatabentoService> self = this;
- QStringList args = {"--action", "get_futures_term_structure", "--symbols", commodities.join(",")};
+ QStringList args = {"futures_term_structure", "root_symbol", commodities.join(","),
+ "num_contracts", QString::number(6)};
run_script(args, [self](bool ok, const QJsonObject& j) {
if (!self)
@@ -223,6 +243,278 @@ void DatabentoService::fetch_futures_term_structure(const QStringList& commoditi
});
}
+// ── Generic surface fetch helper ──────────────────────────────────────────
+// All 10 extended surface fetches use this: call Python, parse into DatabentoSurfaceResult.
+void DatabentoService::fetch_local_vol(const QString& symbol, float spot) {
+ emit fetch_started("Computing local vol for " + symbol + "...");
+ QPointer<DatabentoService> self = this;
+ run_script({"local_vol", "symbol", symbol, "spot", QString::number((double)spot, 'f', 2)},
+ [self](bool ok, const QJsonObject& j) {
+ if (!self) return;
+ DatabentoSurfaceResult res;
+ res.type = "local_vol";
+ if (!ok || j["error"].toBool(false)) {
+ res.success = false;
+ res.error = ok ? j["message"].toString("Unknown error") : j["error"].toString();
+ emit self->fetch_failed(res.error);
+ } else {
+ res.success = true;
+ for (const auto& v : j["strikes"].toArray()) res.x_axis.push_back((float)v.toDouble());
+ for (const auto& v : j["expirations"].toArray()) res.y_axis.push_back(v.toInt());
+ for (const auto& row : j["z"].toArray()) {
+ std::vector<float> r;
+ for (const auto& v : row.toArray()) r.push_back((float)v.toDouble());
+ res.z.push_back(r);
+ }
+ self->last_fetch_time_ = QDateTime::currentDateTime();
+ }
+ emit self->surface_ready(res);
+ });
+}
+
+void DatabentoService::fetch_implied_dividend(const QString& symbol, float spot) {
+ emit fetch_started("Computing implied dividends for " + symbol + "...");
+ QPointer<DatabentoService> self = this;
+ run_script({"implied_dividend", "symbol", symbol, "spot", QString::number((double)spot, 'f', 2)},
+ [self](bool ok, const QJsonObject& j) {
+ if (!self) return;
+ DatabentoSurfaceResult res;
+ res.type = "implied_dividend";
+ if (!ok || j["error"].toBool(false)) {
+ res.success = false;
+ res.error = ok ? j["message"].toString("Unknown error") : j["error"].toString();
+ emit self->fetch_failed(res.error);
+ } else {
+ res.success = true;
+ for (const auto& v : j["strikes"].toArray()) res.x_axis.push_back((float)v.toDouble());
+ for (const auto& v : j["expirations"].toArray()) res.y_axis.push_back(v.toInt());
+ for (const auto& row : j["z"].toArray()) {
+ std::vector<float> r;
+ for (const auto& v : row.toArray()) r.push_back((float)v.toDouble());
+ res.z.push_back(r);
+ }
+ self->last_fetch_time_ = QDateTime::currentDateTime();
+ }
+ emit self->surface_ready(res);
+ });
+}
+
+void DatabentoService::fetch_liquidity(const QString& symbol, float spot) {
+ emit fetch_started("Building liquidity heatmap for " + symbol + "...");
+ QPointer<DatabentoService> self = this;
+ run_script({"liquidity_heatmap", "symbol", symbol, "spot", QString::number((double)spot, 'f', 2)},
+ [self](bool ok, const QJsonObject& j) {
+ if (!self) return;
+ DatabentoSurfaceResult res;
+ res.type = "liquidity";
+ if (!ok || j["error"].toBool(false)) {
+ res.success = false;
+ res.error = ok ? j["message"].toString("Unknown error") : j["error"].toString();
+ emit self->fetch_failed(res.error);
+ } else {
+ res.success = true;
+ for (const auto& v : j["strikes"].toArray()) res.x_axis.push_back((float)v.toDouble());
+ for (const auto& v : j["expirations"].toArray()) res.y_axis.push_back(v.toInt());
+ for (const auto& row : j["z"].toArray()) {
+ std::vector<float> r;
+ for (const auto& v : row.toArray()) r.push_back((float)v.toDouble());
+ res.z.push_back(r);
+ }
+ self->last_fetch_time_ = QDateTime::currentDateTime();
+ }
+ emit self->surface_ready(res);
+ });
+}
+
+void DatabentoService::fetch_commodity_vol(const QString& root_symbol) {
+ emit fetch_started("Computing commodity vol for " + root_symbol + "...");
+ QPointer<DatabentoService> self = this;
+ run_script({"commodity_vol", "root_symbol", root_symbol},
+ [self](bool ok, const QJsonObject& j) {
+ if (!self) return;
+ DatabentoSurfaceResult res;
+ res.type = "commodity_vol";
+ if (!ok || j["error"].toBool(false)) {
+ res.success = false;
+ res.error = ok ? j["message"].toString("Unknown error") : j["error"].toString();
+ emit self->fetch_failed(res.error);
+ } else {
+ res.success = true;
+ for (const auto& v : j["strikes"].toArray()) res.x_axis.push_back((float)v.toDouble());
+ for (const auto& v : j["expirations"].toArray()) res.y_axis.push_back(v.toInt());
+ for (const auto& row : j["z"].toArray()) {
+ std::vector<float> r;
+ for (const auto& v : row.toArray()) r.push_back((float)v.toDouble());
+ res.z.push_back(r);
+ }
+ self->last_fetch_time_ = QDateTime::currentDateTime();
+ }
+ emit self->surface_ready(res);
+ });
+}
+
+void DatabentoService::fetch_crack_spread() {
+ emit fetch_started("Computing crack spreads...");
+ QPointer<DatabentoService> self = this;
+ run_script({"crack_spread"},
+ [self](bool ok, const QJsonObject& j) {
+ if (!self) return;
+ DatabentoSurfaceResult res;
+ res.type = "crack_spread";
+ if (!ok || j["error"].toBool(false)) {
+ res.success = false;
+ res.error = ok ? j["message"].toString("Unknown error") : j["error"].toString();
+ emit self->fetch_failed(res.error);
+ } else {
+ res.success = true;
+ for (const auto& v : j["spread_types"].toArray()) res.x_labels.push_back(v.toString().toStdString());
+ for (const auto& v : j["contract_months"].toArray()) res.y_axis.push_back(v.toInt());
+ for (const auto& row : j["z"].toArray()) {
+ std::vector<float> r;
+ for (const auto& v : row.toArray()) r.push_back((float)v.toDouble());
+ res.z.push_back(r);
+ }
+ self->last_fetch_time_ = QDateTime::currentDateTime();
+ }
+ emit self->surface_ready(res);
+ });
+}
+
+void DatabentoService::fetch_stress_test(const QStringList& symbols) {
+ emit fetch_started("Running stress test scenarios...");
+ QPointer<DatabentoService> self = this;
+ run_script({"stress_test", "symbols", symbols.join(",")},
+ [self](bool ok, const QJsonObject& j) {
+ if (!self) return;
+ DatabentoSurfaceResult res;
+ res.type = "stress_test";
+ if (!ok || j["error"].toBool(false)) {
+ res.success = false;
+ res.error = ok ? j["message"].toString("Unknown error") : j["error"].toString();
+ emit self->fetch_failed(res.error);
+ } else {
+ res.success = true;
+ for (const auto& v : j["scenarios"].toArray()) res.x_labels.push_back(v.toString().toStdString());
+ for (const auto& v : j["portfolios"].toArray()) res.y_labels.push_back(v.toString().toStdString());
+ for (const auto& row : j["z"].toArray()) {
+ std::vector<float> r;
+ for (const auto& v : row.toArray()) r.push_back((float)v.toDouble());
+ res.z.push_back(r);
+ }
+ self->last_fetch_time_ = QDateTime::currentDateTime();
+ }
+ emit self->surface_ready(res);
+ });
+}
+
+void DatabentoService::fetch_yield_curve() {
+ emit fetch_started("Building yield curve from treasury futures...");
+ QPointer<DatabentoService> self = this;
+ run_script({"yield_curve"},
+ [self](bool ok, const QJsonObject& j) {
+ if (!self) return;
+ DatabentoSurfaceResult res;
+ res.type = "yield_curve";
+ if (!ok || j["error"].toBool(false)) {
+ res.success = false;
+ res.error = ok ? j["message"].toString("Unknown error") : j["error"].toString();
+ emit self->fetch_failed(res.error);
+ } else {
+ res.success = true;
+ for (const auto& v : j["time_points"].toArray()) res.y_axis.push_back(v.toInt());
+ for (const auto& v : j["maturities"].toArray()) res.x_axis.push_back((float)v.toInt());
+ for (const auto& row : j["z"].toArray()) {
+ std::vector<float> r;
+ for (const auto& v : row.toArray()) r.push_back((float)v.toDouble());
+ res.z.push_back(r);
+ }
+ self->last_fetch_time_ = QDateTime::currentDateTime();
+ }
+ emit self->surface_ready(res);
+ });
+}
+
+void DatabentoService::fetch_forward_rate() {
+ emit fetch_started("Building forward rate surface...");
+ QPointer<DatabentoService> self = this;
+ run_script({"forward_rate"},
+ [self](bool ok, const QJsonObject& j) {
+ if (!self) return;
+ DatabentoSurfaceResult res;
+ res.type = "forward_rate";
+ if (!ok || j["error"].toBool(false)) {
+ res.success = false;
+ res.error = ok ? j["message"].toString("Unknown error") : j["error"].toString();
+ emit self->fetch_failed(res.error);
+ } else {
+ res.success = true;
+ for (const auto& v : j["start_tenors"].toArray()) res.x_axis.push_back((float)v.toInt());
+ for (const auto& v : j["forward_periods"].toArray()) res.y_axis.push_back(v.toInt());
+ for (const auto& row : j["z"].toArray()) {
+ std::vector<float> r;
+ for (const auto& v : row.toArray()) r.push_back((float)v.toDouble());
+ res.z.push_back(r);
+ }
+ self->last_fetch_time_ = QDateTime::currentDateTime();
+ }
+ emit self->surface_ready(res);
+ });
+}
+
+void DatabentoService::fetch_rate_path() {
+ emit fetch_started("Building monetary policy rate path...");
+ QPointer<DatabentoService> self = this;
+ run_script({"rate_path"},
+ [self](bool ok, const QJsonObject& j) {
+ if (!self) return;
+ DatabentoSurfaceResult res;
+ res.type = "rate_path";
+ if (!ok || j["error"].toBool(false)) {
+ res.success = false;
+ res.error = ok ? j["message"].toString("Unknown error") : j["error"].toString();
+ emit self->fetch_failed(res.error);
+ } else {
+ res.success = true;
+ for (const auto& v : j["central_banks"].toArray()) res.x_labels.push_back(v.toString().toStdString());
+ for (const auto& v : j["meetings_ahead"].toArray()) res.y_axis.push_back(v.toInt());
+ for (const auto& row : j["z"].toArray()) {
+ std::vector<float> r;
+ for (const auto& v : row.toArray()) r.push_back((float)v.toDouble());
+ res.z.push_back(r);
+ }
+ self->last_fetch_time_ = QDateTime::currentDateTime();
+ }
+ emit self->surface_ready(res);
+ });
+}
+
+void DatabentoService::fetch_fx_forward_points() {
+ emit fetch_started("Building FX forward points...");
+ QPointer<DatabentoService> self = this;
+ run_script({"fx_forward_points"},
+ [self](bool ok, const QJsonObject& j) {
+ if (!self) return;
+ DatabentoSurfaceResult res;
+ res.type = "fx_forward_points";
+ if (!ok || j["error"].toBool(false)) {
+ res.success = false;
+ res.error = ok ? j["message"].toString("Unknown error") : j["error"].toString();
+ emit self->fetch_failed(res.error);
+ } else {
+ res.success = true;
+ for (const auto& v : j["pairs"].toArray()) res.x_labels.push_back(v.toString().toStdString());
+ for (const auto& v : j["tenors"].toArray()) res.y_axis.push_back(v.toInt());
+ for (const auto& row : j["z"].toArray()) {
+ std::vector<float> r;
+ for (const auto& v : row.toArray()) r.push_back((float)v.toDouble());
+ res.z.push_back(r);
+ }
+ self->last_fetch_time_ = QDateTime::currentDateTime();
+ }
+ emit self->surface_ready(res);
+ });
+}
+
// ── Parsers ────────────────────────────────────────────────────────────────
surface::VolatilitySurfaceData DatabentoService::parse_vol_surface(const QJsonObject& j, const std::string& symbol,
float spot) {
diff --git a/fincept-qt/src/services/databento/DatabentoService.h b/fincept-qt/src/services/databento/DatabentoService.h
index 7e3fea978..e800996a9 100644
--- a/fincept-qt/src/services/databento/DatabentoService.h
+++ b/fincept-qt/src/services/databento/DatabentoService.h
@@ -11,6 +11,7 @@
#include <QString>
#include <string>
+#include <vector>
namespace fincept {
@@ -37,6 +38,18 @@ struct DatabentoFuturesResult {
surface::ContangoData contango;
};
+// Generic surface result — carries any strike×expiry or row×col surface
+struct DatabentoSurfaceResult {
+ bool success = false;
+ QString error;
+ QString type; // e.g. "local_vol", "liquidity", "implied_dividend", etc.
+ std::vector<float> x_axis; // strikes or row labels (numeric)
+ std::vector<int> y_axis; // expirations or col labels
+ std::vector<std::string> x_labels; // string labels (if non-numeric)
+ std::vector<std::string> y_labels; // string labels (if non-numeric)
+ std::vector<std::vector<float>> z;
+};
+
class DatabentoService : public QObject {
Q_OBJECT
public:
@@ -60,6 +73,18 @@ class DatabentoService : public QObject {
// Fetch futures term structure → commodity forwards + contango
void fetch_futures_term_structure(const QStringList& commodities);
+ // ── Extended surface fetches ──────────────────────────────────────────
+ void fetch_local_vol(const QString& symbol, float spot);
+ void fetch_implied_dividend(const QString& symbol, float spot);
+ void fetch_liquidity(const QString& symbol, float spot);
+ void fetch_commodity_vol(const QString& root_symbol);
+ void fetch_crack_spread();
+ void fetch_stress_test(const QStringList& symbols);
+ void fetch_yield_curve();
+ void fetch_forward_rate();
+ void fetch_rate_path();
+ void fetch_fx_forward_points();
+
// Cache access (returns last fetched data, empty if never fetched)
const DatabentoOhlcvResult& last_ohlcv() const { return cached_ohlcv_; }
const DatabentoVolSurfaceResult& last_vol() const { return cached_vol_; }
@@ -71,6 +96,7 @@ class DatabentoService : public QObject {
void ohlcv_ready(const DatabentoOhlcvResult& result);
void vol_surface_ready(const DatabentoVolSurfaceResult& result);
void futures_ready(const DatabentoFuturesResult& result);
+ void surface_ready(const DatabentoSurfaceResult& result);
void fetch_started(const QString& description);
void fetch_failed(const QString& error);
diff --git a/fincept-qt/src/services/workflow/NodeRegistry.cpp b/fincept-qt/src/services/workflow/NodeRegistry.cpp
index b04d0e6a1..addb625a5 100644
--- a/fincept-qt/src/services/workflow/NodeRegistry.cpp
+++ b/fincept-qt/src/services/workflow/NodeRegistry.cpp
@@ -13,6 +13,9 @@
#include "services/workflow/nodes/TradingNodes.h"
#include "services/workflow/nodes/TriggerNodes.h"
#include "services/workflow/nodes/UtilityNodes.h"
+#include "services/workflow/ExpressionEngine.h"
+
+#include <QRegularExpression>
namespace fincept::workflow {
@@ -176,10 +179,80 @@ void NodeRegistry::register_builtin_nodes() {
.execute =
[](const QJsonObject& params, const QVector<QJsonValue>& inputs,
std::function<void(bool, QJsonValue, QString)> cb) {
- // Placeholder: always takes the true branch
- Q_UNUSED(params);
auto data = inputs.isEmpty() ? QJsonValue{} : inputs[0];
- cb(true, data, {});
+ QString cond_str = params.value("condition").toString().trimmed();
+
+ bool result = false;
+
+ if (cond_str.isEmpty()) {
+ // No condition — evaluate truthiness of input
+ if (data.isBool())
+ result = data.toBool();
+ else if (data.isDouble())
+ result = data.toDouble() != 0.0;
+ else if (data.isString())
+ result = !data.toString().isEmpty();
+ else if (data.isObject() || data.isArray())
+ result = true;
+ } else {
+ // Strip ={{ }} wrapper if present
+ QString expr = cond_str;
+ if (expr.startsWith("={{") && expr.endsWith("}}"))
+ expr = expr.mid(3, expr.length() - 5).trimmed();
+
+ // Build context from input data
+ QJsonObject context;
+ if (data.isObject())
+ context = data.toObject();
+ else
+ context["value"] = data;
+
+ // Parse simple comparisons: field op value
+ // Supported: >, <, >=, <=, ==, !=
+ static QRegularExpression cmp_re(
+ R"(^\s*(\$?[\w.]+)\s*(>=|<=|!=|==|>|<)\s*(.+)\s*$)");
+ auto match = cmp_re.match(expr);
+
+ if (match.hasMatch()) {
+ QString lhs_path = match.captured(1).trimmed();
+ QString op = match.captured(2);
+ QString rhs_str = match.captured(3).trimmed();
+
+ // Resolve LHS from context
+ QJsonValue lhs_val = ExpressionEngine::evaluate(
+ QJsonValue("={{" + lhs_path + "}}"), context);
+ double lhs = lhs_val.toDouble(0);
+ double rhs = rhs_str.toDouble();
+
+ if (op == ">") result = lhs > rhs;
+ else if (op == "<") result = lhs < rhs;
+ else if (op == ">=") result = lhs >= rhs;
+ else if (op == "<=") result = lhs <= rhs;
+ else if (op == "==") result = lhs == rhs;
+ else if (op == "!=") result = lhs != rhs;
+ } else {
+ // Single value expression — resolve and check truthiness
+ QJsonValue val = ExpressionEngine::evaluate(
+ QJsonValue("={{" + expr + "}}"), context);
+ if (val.isBool())
+ result = val.toBool();
+ else if (val.isDouble())
+ result = val.toDouble() != 0.0;
+ else if (val.isString())
+ result = !val.toString().isEmpty() && val.toString() != "false";
+ else
+ result = !val.isNull() && !val.isUndefined();
+ }
+ }
+
+ // Annotate the output with the branch taken
+ QJsonObject out;
+ if (data.isObject())
+ out = data.toObject();
+ else
+ out["value"] = data;
+ out["_branch"] = result ? "true" : "false";
+ cb(true, out, {});
},
});
diff --git a/fincept-qt/src/services/workflow/NodeRegistry.h b/fincept-qt/src/services/workflow/NodeRegistry.h
index e0be5b36c..8d10c789c 100644
--- a/fincept-qt/src/services/workflow/NodeRegistry.h
+++ b/fincept-qt/src/services/workflow/NodeRegistry.h
@@ -2,7 +2,7 @@
#include "screens/node_editor/NodeEditorTypes.h"
-#include <QMap>
+#include <QHash>
#include <QString>
#include <QStringList>
#include <QVector>
@@ -24,7 +24,7 @@ class NodeRegistry {
NodeRegistry();
void register_builtin_nodes();
- QMap<QString, NodeTypeDef> registry_;
+ QHash<QString, NodeTypeDef> registry_;
};
} // namespace fincept::workflow
diff --git a/fincept-qt/src/services/workflow/WorkflowExecutor.cpp b/fincept-qt/src/services/workflow/WorkflowExecutor.cpp
index dfe89c92c..8112780d3 100644
--- a/fincept-qt/src/services/workflow/WorkflowExecutor.cpp
+++ b/fincept-qt/src/services/workflow/WorkflowExecutor.cpp
@@ -6,7 +6,7 @@
#include "services/workflow/NodeRegistry.h"
#include <QDateTime>
-#include <QElapsedTimer>
+#include <QJsonArray>
#include <QMetaObject>
#include <QSet>
@@ -23,13 +23,24 @@ void WorkflowExecutor::execute(const WorkflowDef& workflow) {
workflow_ = workflow;
running_ = true;
stop_requested_ = false;
- current_index_ = 0;
+ pending_count_ = 0;
+ completed_count_ = 0;
results_.clear();
node_map_.clear();
+ type_cache_.clear();
+ in_degree_.clear();
- // Index nodes by id
- for (const auto& nd : workflow_.nodes)
+ const int n = workflow_.nodes.size();
+ node_map_.reserve(n);
+ results_.reserve(n);
+ type_cache_.reserve(n);
+ in_degree_.reserve(n);
+
+ // Index nodes by id and pre-resolve type pointers
+ for (const auto& nd : workflow_.nodes) {
node_map_.insert(nd.id, nd);
+ type_cache_.insert(nd.id, NodeRegistry::instance().find(nd.type));
+ }
build_graph();
@@ -45,9 +56,9 @@ void WorkflowExecutor::execute(const WorkflowDef& workflow) {
return;
}
- execution_order_ = topological_sort();
+ QVector<QString> order = topological_sort();
- if (execution_order_.isEmpty()) {
+ if (order.isEmpty()) {
LOG_WARN("Executor", "No executable nodes in workflow");
running_ = false;
WorkflowExecutionResult wr;
@@ -57,15 +68,32 @@ void WorkflowExecutor::execute(const WorkflowDef& workflow) {
return;
}
+ // Build in-degree map from topological set
+ QSet<QString> exec_set;
+ exec_set.reserve(order.size());
+ for (const auto& id : order)
+ exec_set.insert(id);
+
+ for (const auto& id : order) {
+ int deg = 0;
+ for (const auto& edge : incoming_edges_.value(id)) {
+ if (exec_set.contains(edge.source_node))
+ ++deg;
+ }
+ in_degree_.insert(id, deg);
+ }
+
+ total_count_ = order.size();
+
start_time_ms_ = QDateTime::currentMSecsSinceEpoch();
ExecutionHooks::instance().emit_workflow_start(workflow_.id);
AuditLogger::instance().log(AuditAction::WorkflowStarted, workflow_.id, {}, {},
- QString("Started: %1 (%2 nodes)").arg(workflow_.name).arg(execution_order_.size()));
+ QString("Started: %1 (%2 nodes)").arg(workflow_.name).arg(total_count_));
emit execution_started(workflow_.id);
- LOG_INFO("Executor", QString("Starting execution: %1 (%2 nodes)").arg(workflow_.name).arg(execution_order_.size()));
+ LOG_INFO("Executor", QString("Starting execution: %1 (%2 nodes)").arg(workflow_.name).arg(total_count_));
- execute_next();
+ launch_ready_nodes();
}
void WorkflowExecutor::execute_from(const WorkflowDef& workflow, const QString& start_node_id) {
@@ -77,12 +105,21 @@ void WorkflowExecutor::execute_from(const WorkflowDef& workflow, const QString&
workflow_ = workflow;
running_ = true;
stop_requested_ = false;
- current_index_ = 0;
+ pending_count_ = 0;
+ completed_count_ = 0;
results_.clear();
node_map_.clear();
+ type_cache_.clear();
+ in_degree_.clear();
+
+ const int n = workflow_.nodes.size();
+ node_map_.reserve(n);
+ type_cache_.reserve(n);
- for (const auto& nd : workflow_.nodes)
+ for (const auto& nd : workflow_.nodes) {
node_map_.insert(nd.id, nd);
+ type_cache_.insert(nd.id, NodeRegistry::instance().find(nd.type));
+ }
build_graph();
@@ -115,13 +152,14 @@ void WorkflowExecutor::execute_from(const WorkflowDef& workflow, const QString&
}
// Filter topo order to only downstream nodes
- execution_order_.clear();
+ QVector<QString> order;
+ order.reserve(downstream.size());
for (const auto& id : full_order) {
if (downstream.contains(id))
- execution_order_.append(id);
+ order.append(id);
}
- if (execution_order_.isEmpty()) {
+ if (order.isEmpty()) {
running_ = false;
WorkflowExecutionResult wr;
wr.workflow_id = workflow_.id;
@@ -130,14 +168,33 @@ void WorkflowExecutor::execute_from(const WorkflowDef& workflow, const QString&
return;
}
+ // Build in-degree map for the downstream subset
+ QSet<QString> exec_set;
+ exec_set.reserve(order.size());
+ for (const auto& id : order)
+ exec_set.insert(id);
+
+ in_degree_.reserve(order.size());
+ results_.reserve(order.size());
+ for (const auto& id : order) {
+ int deg = 0;
+ for (const auto& edge : incoming_edges_.value(id)) {
+ if (exec_set.contains(edge.source_node))
+ ++deg;
+ }
+ in_degree_.insert(id, deg);
+ }
+
+ total_count_ = order.size();
+
start_time_ms_ = QDateTime::currentMSecsSinceEpoch();
ExecutionHooks::instance().emit_workflow_start(workflow_.id);
emit execution_started(workflow_.id);
LOG_INFO("Executor",
- QString("Partial execution from %1: %2 nodes").arg(start_node_id).arg(execution_order_.size()));
+ QString("Partial execution from %1: %2 nodes").arg(start_node_id).arg(total_count_));
- execute_next();
+ launch_ready_nodes();
}
void WorkflowExecutor::stop() {
@@ -145,36 +202,32 @@ void WorkflowExecutor::stop() {
return;
stop_requested_ = true;
LOG_INFO("Executor", "Stop requested");
- // Force immediate completion — don't wait for the in-flight node to finish.
- // Set running_ false and emit execution_finished right now so the UI unlocks.
- running_ = false;
- WorkflowExecutionResult wr;
- wr.workflow_id = workflow_.id;
- wr.total_duration_ms = static_cast<int>(QDateTime::currentMSecsSinceEpoch() - start_time_ms_);
- wr.success = false;
- wr.error = "Execution stopped by user";
- for (auto it = results_.constBegin(); it != results_.constEnd(); ++it)
- wr.node_results.append(it.value());
- ExecutionHooks::instance().emit_workflow_end(workflow_.id, false, wr.total_duration_ms);
- AuditLogger::instance().log(AuditAction::WorkflowFailed, workflow_.id, {}, {}, "Stopped by user");
- emit execution_finished(wr);
+
+ // If no nodes are in-flight, finish immediately.
+ // Otherwise, in-flight nodes will complete and on_node_done will
+ // see stop_requested_ and trigger finish_execution when pending reaches 0.
+ if (pending_count_ == 0)
+ finish_execution();
}
// ── Graph construction ─────────────────────────────────────────────────
void WorkflowExecutor::build_graph() {
+ const int n = workflow_.nodes.size();
adjacency_.clear();
- reverse_adj_.clear();
+ adjacency_.reserve(n);
+ incoming_edges_.clear();
+ incoming_edges_.reserve(n);
// Initialize all nodes
for (const auto& nd : workflow_.nodes) {
adjacency_[nd.id];
- reverse_adj_[nd.id];
+ incoming_edges_[nd.id];
}
for (const auto& ed : workflow_.edges) {
adjacency_[ed.source_node].append(ed.target_node);
- reverse_adj_[ed.target_node].append(ed.source_node);
+ incoming_edges_[ed.target_node].append(ed);
}
}
@@ -182,7 +235,8 @@ void WorkflowExecutor::build_graph() {
bool WorkflowExecutor::has_cycle() const {
enum Color { White, Gray, Black };
- QMap<QString, Color> color;
+ QHash<QString, Color> color;
+ color.reserve(adjacency_.size());
for (auto it = adjacency_.constBegin(); it != adjacency_.constEnd(); ++it)
color[it.key()] = White;
@@ -208,22 +262,25 @@ bool WorkflowExecutor::has_cycle() const {
// ── Topological sort (Kahn's algorithm) ────────────────────────────────
QVector<QString> WorkflowExecutor::topological_sort() const {
- QMap<QString, int> in_degree;
+ QHash<QString, int> in_deg;
+ in_deg.reserve(adjacency_.size());
for (auto it = adjacency_.constBegin(); it != adjacency_.constEnd(); ++it)
- in_degree[it.key()] = 0;
+ in_deg[it.key()] = 0;
for (auto it = adjacency_.constBegin(); it != adjacency_.constEnd(); ++it) {
for (const auto& v : it.value())
- in_degree[v]++;
+ in_deg[v]++;
}
QVector<QString> queue;
- for (auto it = in_degree.constBegin(); it != in_degree.constEnd(); ++it) {
+ queue.reserve(adjacency_.size());
+ for (auto it = in_deg.constBegin(); it != in_deg.constEnd(); ++it) {
if (it.value() == 0)
queue.append(it.key());
}
QVector<QString> order;
+ order.reserve(adjacency_.size());
int front = 0;
while (front < queue.size()) {
QString u = queue[front++];
@@ -236,8 +293,8 @@ QVector<QString> WorkflowExecutor::topological_sort() const {
order.append(u);
for (const auto& v : adjacency_.value(u)) {
- in_degree[v]--;
- if (in_degree[v] == 0)
+ in_deg[v]--;
+ if (in_deg[v] == 0)
queue.append(v);
}
}
@@ -245,52 +302,40 @@ QVector<QString> WorkflowExecutor::topological_sort() const {
return order;
}
-// ── Execution loop ─────────────────────────────────────────────────────
-
-void WorkflowExecutor::execute_next() {
- if (stop_requested_ || current_index_ >= execution_order_.size()) {
- // Execution complete
- running_ = false;
-
- WorkflowExecutionResult wr;
- wr.workflow_id = workflow_.id;
- wr.total_duration_ms = static_cast<int>(QDateTime::currentMSecsSinceEpoch() - start_time_ms_);
+// ── Parallel execution ─────────────────────────────────────────────────
- // Check if any node failed
- wr.success = true;
- for (auto it = results_.constBegin(); it != results_.constEnd(); ++it) {
- wr.node_results.append(it.value());
- if (!it->success)
- wr.success = false;
- }
+void WorkflowExecutor::launch_ready_nodes() {
+ if (stop_requested_) {
+ if (pending_count_ == 0)
+ finish_execution();
+ return;
+ }
- if (stop_requested_) {
- wr.success = false;
- wr.error = "Execution stopped by user";
+ // Collect all nodes with in_degree_ == 0 (ready to run)
+ QVector<QString> ready;
+ for (auto it = in_degree_.begin(); it != in_degree_.end(); ++it) {
+ if (it.value() == 0) {
+ ready.append(it.key());
+ it.value() = -1; // mark as launched
}
-
- LOG_INFO("Executor",
- QString("Execution %1 in %2ms").arg(wr.success ? "completed" : "failed").arg(wr.total_duration_ms));
-
- ExecutionHooks::instance().emit_workflow_end(workflow_.id, wr.success, wr.total_duration_ms);
- AuditLogger::instance().log(
- wr.success ? AuditAction::WorkflowCompleted : AuditAction::WorkflowFailed, workflow_.id, {}, {},
- QString("%1 in %2ms").arg(wr.success ? "Completed" : "Failed").arg(wr.total_duration_ms));
-
- emit execution_finished(wr);
- return;
}
- QString node_id = execution_order_[current_index_];
+ for (const QString& node_id : ready)
+ launch_single_node(node_id);
+}
+
+void WorkflowExecutor::launch_single_node(const QString& node_id) {
auto nd_it = node_map_.constFind(node_id);
if (nd_it == node_map_.constEnd()) {
- current_index_++;
- execute_next();
+ // Unknown node — skip
+ completed_count_++;
+ if (completed_count_ == total_count_)
+ finish_execution();
return;
}
const NodeDef& nd = nd_it.value();
- const auto* type_def = NodeRegistry::instance().find(nd.type);
+ const auto* type_def = type_cache_.value(node_id, nullptr);
if (!type_def || !type_def->execute) {
// No executor — pass through with warning
@@ -301,9 +346,19 @@ void WorkflowExecutor::execute_next() {
nr.output = QJsonObject{{"pass_through", true}};
results_.insert(node_id, nr);
emit node_completed(node_id, nr);
- current_index_++;
- // Use queued invocation to avoid deep recursion
- QMetaObject::invokeMethod(this, &WorkflowExecutor::execute_next, Qt::QueuedConnection);
+ completed_count_++;
+
+ // Propagate readiness to downstream nodes
+ for (const auto& downstream : adjacency_.value(node_id)) {
+ auto deg_it = in_degree_.find(downstream);
+ if (deg_it != in_degree_.end() && deg_it.value() > 0)
+ deg_it.value()--;
+ }
+
+ if (completed_count_ == total_count_)
+ finish_execution();
+ else
+ QMetaObject::invokeMethod(this, &WorkflowExecutor::launch_ready_nodes, Qt::QueuedConnection);
return;
}
@@ -311,6 +366,41 @@ void WorkflowExecutor::execute_next() {
emit node_started(node_id);
QVector<QJsonValue> inputs = collect_inputs(node_id);
+
+ // Skip nodes whose upstream branching filtered out all inputs.
+ if (inputs.isEmpty() && !incoming_edges_.value(node_id).isEmpty()) {
+ bool has_upstream_results = false;
+ for (const auto& edge : incoming_edges_.value(node_id)) {
+ if (results_.contains(edge.source_node)) {
+ has_upstream_results = true;
+ break;
+ }
+ }
+ if (has_upstream_results) {
+ // Upstream nodes ran but outputs were filtered by port routing — skip.
+ NodeExecutionResult nr;
+ nr.node_id = node_id;
+ nr.success = true;
+ nr.output = QJsonObject{{"_skipped", true}};
+ results_.insert(node_id, nr);
+ emit node_completed(node_id, nr);
+ completed_count_++;
+
+ for (const auto& downstream : adjacency_.value(node_id)) {
+ auto deg_it = in_degree_.find(downstream);
+ if (deg_it != in_degree_.end() && deg_it.value() > 0)
+ deg_it.value()--;
+ }
+
+ if (completed_count_ == total_count_)
+ finish_execution();
+ else
+ QMetaObject::invokeMethod(this, &WorkflowExecutor::launch_ready_nodes, Qt::QueuedConnection);
+ return;
+ }
+ }
+
+ pending_count_++;
qint64 node_start = QDateTime::currentMSecsSinceEpoch();
// Execute asynchronously with QPointer guard (P8)
@@ -321,27 +411,29 @@ void WorkflowExecutor::execute_next() {
return;
QMetaObject::invokeMethod(
self,
- [self, node_id, success, output, error, node_start]() {
+ [self, node_id, success, output = std::move(output),
+ error = std::move(error), node_start]() {
if (!self)
return;
- NodeExecutionResult nr;
- nr.node_id = node_id;
- nr.success = success;
- nr.output = output;
- nr.error = error;
- nr.duration_ms = static_cast<int>(QDateTime::currentMSecsSinceEpoch() - node_start);
- self->on_node_done(node_id, success, output, error);
+ int duration = static_cast<int>(
+ QDateTime::currentMSecsSinceEpoch() - node_start);
+ self->on_node_done(node_id, success, output, error, duration);
},
Qt::QueuedConnection);
});
}
-void WorkflowExecutor::on_node_done(const QString& node_id, bool success, QJsonValue output, QString error) {
+void WorkflowExecutor::on_node_done(const QString& node_id, bool success,
+ const QJsonValue& output, const QString& error,
+ int duration_ms) {
+ pending_count_--;
+
NodeExecutionResult nr;
nr.node_id = node_id;
nr.success = success;
nr.output = output;
nr.error = error;
+ nr.duration_ms = duration_ms;
results_.insert(node_id, nr);
@@ -354,6 +446,7 @@ void WorkflowExecutor::on_node_done(const QString& node_id, bool success, QJsonV
}
emit node_completed(node_id, nr);
+ completed_count_++;
if (!success) {
auto nd_it = node_map_.constFind(node_id);
@@ -362,22 +455,107 @@ void WorkflowExecutor::on_node_done(const QString& node_id, bool success, QJsonV
if (!continue_on_fail) {
LOG_ERROR("Executor", QString("Node %1 failed: %2 — aborting").arg(node_id, error));
stop_requested_ = true;
+ if (pending_count_ == 0)
+ finish_execution();
+ return;
} else {
LOG_WARN("Executor", QString("Node %1 failed but continue_on_fail is set: %2").arg(node_id, error));
}
}
- current_index_++;
- execute_next();
+ // Propagate readiness to downstream nodes
+ for (const auto& downstream : adjacency_.value(node_id)) {
+ auto deg_it = in_degree_.find(downstream);
+ if (deg_it != in_degree_.end() && deg_it.value() > 0)
+ deg_it.value()--;
+ }
+
+ if (completed_count_ == total_count_) {
+ finish_execution();
+ } else if (!stop_requested_) {
+ launch_ready_nodes();
+ } else if (pending_count_ == 0) {
+ finish_execution();
+ }
+}
+
+void WorkflowExecutor::finish_execution() {
+ running_ = false;
+
+ WorkflowExecutionResult wr;
+ wr.workflow_id = workflow_.id;
+ wr.total_duration_ms = static_cast<int>(QDateTime::currentMSecsSinceEpoch() - start_time_ms_);
+
+ wr.success = true;
+ wr.node_results.reserve(results_.size());
+ for (auto it = results_.constBegin(); it != results_.constEnd(); ++it) {
+ wr.node_results.append(it.value());
+ if (!it->success)
+ wr.success = false;
+ }
+
+ if (stop_requested_) {
+ wr.success = false;
+ if (wr.error.isEmpty())
+ wr.error = "Execution stopped";
+ }
+
+ LOG_INFO("Executor",
+ QString("Execution %1 in %2ms").arg(wr.success ? "completed" : "failed").arg(wr.total_duration_ms));
+
+ ExecutionHooks::instance().emit_workflow_end(workflow_.id, wr.success, wr.total_duration_ms);
+ AuditLogger::instance().log(
+ wr.success ? AuditAction::WorkflowCompleted : AuditAction::WorkflowFailed, workflow_.id, {}, {},
+ QString("%1 in %2ms").arg(wr.success ? "Completed" : "Failed").arg(wr.total_duration_ms));
+
+ emit execution_finished(wr);
}
QVector<QJsonValue> WorkflowExecutor::collect_inputs(const QString& node_id) const {
QVector<QJsonValue> inputs;
- for (const auto& upstream_id : reverse_adj_.value(node_id)) {
- auto it = results_.constFind(upstream_id);
- if (it != results_.constEnd())
- inputs.append(it->output);
+
+ for (const auto& edge : incoming_edges_.value(node_id)) {
+ auto it = results_.constFind(edge.source_node);
+ if (it == results_.constEnd())
+ continue;
+
+ const QJsonValue& output = it->output;
+
+ // Port-based routing: if upstream output has _branch or _route annotation,
+ // only flow data through the matching source_port.
+ if (output.isObject()) {
+ QJsonObject obj = output.toObject();
+
+ // If/Else branching: _branch = "true" or "false"
+ if (obj.contains("_branch")) {
+ QString branch = obj.value("_branch").toString();
+ bool is_true_port = (edge.source_port == "output_true"
+ || edge.source_port == "output_pass"
+ || edge.source_port == "output_open");
+ bool is_false_port = (edge.source_port == "output_false"
+ || edge.source_port == "output_fail"
+ || edge.source_port == "output_closed");
+ if (is_true_port && branch != "true")
+ continue;
+ if (is_false_port && branch != "false")
+ continue;
+ }
+
+ // Switch routing: _route = 0, 1, 2
+ if (obj.contains("_route")) {
+ int route = obj.value("_route").toInt(-1);
+ if (edge.source_port == "output_0" && route != 0)
+ continue;
+ if (edge.source_port == "output_1" && route != 1)
+ continue;
+ if (edge.source_port == "output_2" && route != 2)
+ continue;
+ }
+ }
+
+ inputs.append(output);
}
+
return inputs;
}
diff --git a/fincept-qt/src/services/workflow/WorkflowExecutor.h b/fincept-qt/src/services/workflow/WorkflowExecutor.h
index 77409c88c..ea81804bc 100644
--- a/fincept-qt/src/services/workflow/WorkflowExecutor.h
+++ b/fincept-qt/src/services/workflow/WorkflowExecutor.h
@@ -2,7 +2,7 @@
#include "screens/node_editor/NodeEditorTypes.h"
-#include <QMap>
+#include <QHash>
#include <QObject>
#include <QPointer>
#include <QVector>
@@ -10,7 +10,7 @@
namespace fincept::workflow {
/// Executes a WorkflowDef as a DAG — topological sort, cycle detection,
-/// async per-node execution with signal-driven progress.
+/// parallel per-level execution with signal-driven progress.
class WorkflowExecutor : public QObject {
Q_OBJECT
public:
@@ -44,29 +44,41 @@ class WorkflowExecutor : public QObject {
/// Compute topological ordering.
QVector<QString> topological_sort() const;
- /// Execute the next ready node in the queue.
- void execute_next();
+ /// Launch all nodes whose in-degree has reached zero.
+ void launch_ready_nodes();
+
+ /// Launch a single node for execution.
+ void launch_single_node(const QString& node_id);
/// Called when a node finishes execution.
- void on_node_done(const QString& node_id, bool success, QJsonValue output, QString error);
+ void on_node_done(const QString& node_id, bool success,
+ const QJsonValue& output, const QString& error, int duration_ms = 0);
/// Collect input data for a node from its upstream nodes' outputs.
QVector<QJsonValue> collect_inputs(const QString& node_id) const;
+ /// Emit execution_finished with aggregated results.
+ void finish_execution();
+
WorkflowDef workflow_;
bool running_ = false;
bool stop_requested_ = false;
// Graph: node_id -> list of downstream node_ids
- QMap<QString, QVector<QString>> adjacency_;
- // Reverse: node_id -> list of upstream node_ids
- QMap<QString, QVector<QString>> reverse_adj_;
-
- // Execution state
- QVector<QString> execution_order_;
- int current_index_ = 0;
- QMap<QString, NodeExecutionResult> results_;
- QMap<QString, NodeDef> node_map_;
+ QHash<QString, QVector<QString>> adjacency_;
+ // Edge lookup: target_node_id -> list of edges pointing to it
+ QHash<QString, QVector<EdgeDef>> incoming_edges_;
+
+ // Parallel execution state
+ QHash<QString, int> in_degree_; // remaining unfinished dependencies (-1 = launched)
+ int pending_count_ = 0; // nodes currently in-flight
+ int completed_count_ = 0; // total completed
+ int total_count_ = 0; // total nodes to execute
+
+ // Node data
+ QHash<QString, NodeExecutionResult> results_;
+ QHash<QString, NodeDef> node_map_;
+ QHash<QString, const NodeTypeDef*> type_cache_; // pre-resolved type pointers
// Timing
qint64 start_time_ms_ = 0;
diff --git a/fincept-qt/src/services/workflow/nodes/AnalyticsNodes.cpp b/fincept-qt/src/services/workflow/nodes/AnalyticsNodes.cpp
index 310333737..926e8de28 100644
--- a/fincept-qt/src/services/workflow/nodes/AnalyticsNodes.cpp
+++ b/fincept-qt/src/services/workflow/nodes/AnalyticsNodes.cpp
@@ -33,6 +33,14 @@ void analytics_run_python_json(const QString& script, const QStringList& args,
cb(false, {}, "Invalid JSON: " + res.output.left(200));
return;
}
+ // Check for Python-level error: {"success": false, "error": "..."}
+ if (doc.isObject()) {
+ auto obj = doc.object();
+ if (obj.contains("success") && !obj.value("success").toBool(true)) {
+ cb(false, {}, obj.value("error").toString("Python script returned failure"));
+ return;
+ }
+ }
cb(true, doc.isObject() ? QJsonValue(doc.object()) : QJsonValue(doc.array()), {});
});
}
diff --git a/fincept-qt/src/services/workflow/nodes/ControlFlowNodes.cpp b/fincept-qt/src/services/workflow/nodes/ControlFlowNodes.cpp
index f538d91b1..389d4df35 100644
--- a/fincept-qt/src/services/workflow/nodes/ControlFlowNodes.cpp
+++ b/fincept-qt/src/services/workflow/nodes/ControlFlowNodes.cpp
@@ -129,6 +129,8 @@ void register_control_flow_nodes(NodeRegistry& registry) {
{
{"input_0", "Branch 1", PortDirection::Input, ConnectionType::Main},
{"input_1", "Branch 2", PortDirection::Input, ConnectionType::Main},
+ {"input_2", "Branch 3", PortDirection::Input, ConnectionType::Main},
+ {"input_3", "Branch 4", PortDirection::Input, ConnectionType::Main},
},
.outputs = {{"output_main", "Main", PortDirection::Output, ConnectionType::Main}},
.parameters =
diff --git a/fincept-qt/src/services/workflow/nodes/MarketDataNodes.cpp b/fincept-qt/src/services/workflow/nodes/MarketDataNodes.cpp
index 93627a3df..ada1df1ce 100644
--- a/fincept-qt/src/services/workflow/nodes/MarketDataNodes.cpp
+++ b/fincept-qt/src/services/workflow/nodes/MarketDataNodes.cpp
@@ -28,6 +28,18 @@ void run_python_json(const QString& script, const QStringList& args,
cb(false, {}, "Invalid JSON: " + res.output.left(200));
return;
}
+ // Check for Python-level error: {"success": false, "error": "..."} or {"error": "..."}
+ if (doc.isObject()) {
+ auto obj = doc.object();
+ if (obj.contains("success") && !obj.value("success").toBool(true)) {
+ cb(false, {}, obj.value("error").toString("Python script returned failure"));
+ return;
+ }
+ if (obj.contains("error") && obj.size() <= 2 && !obj.contains("data")) {
+ cb(false, {}, obj.value("error").toString("Unknown error"));
+ return;
+ }
+ }
cb(true, doc.isObject() ? QJsonValue(doc.object()) : QJsonValue(doc.array()), {});
});
}
diff --git a/fincept-qt/src/services/workflow/nodes/SafetyNodes.cpp b/fincept-qt/src/services/workflow/nodes/SafetyNodes.cpp
index 0473e2802..5d2abd3be 100644
--- a/fincept-qt/src/services/workflow/nodes/SafetyNodes.cpp
+++ b/fincept-qt/src/services/workflow/nodes/SafetyNodes.cpp
@@ -64,15 +64,15 @@ void register_safety_nodes(NodeRegistry& registry) {
.arg(max_vol, 0, 'f', 3);
QJsonObject out = trade;
- out["risk_check_passed"] = failures.isEmpty();
- if (!failures.isEmpty()) {
+ bool passed = failures.isEmpty();
+ out["risk_check_passed"] = passed;
+ out["_branch"] = passed ? "true" : "false";
+ if (!passed) {
QJsonArray fa;
for (const QString& f : failures) fa.append(f);
out["risk_failures"] = fa;
- cb(false, out, failures.join("; "));
- } else {
- cb(true, out, {});
}
+ cb(true, out, {});
},
});
@@ -116,14 +116,14 @@ void register_safety_nodes(NodeRegistry& registry) {
failures << QString("Weekly loss $%1 exceeds limit $%2")
.arg(-weekly_pnl, 0, 'f', 2).arg(weekly_limit, 0, 'f', 2);
- obj["loss_limit_passed"] = failures.isEmpty();
- if (!failures.isEmpty()) {
+ bool passed = failures.isEmpty();
+ obj["loss_limit_passed"] = passed;
+ obj["_branch"] = passed ? "true" : "false";
+ if (!passed) {
QJsonArray fa; for (const QString& f : failures) fa.append(f);
obj["loss_failures"] = fa;
- cb(false, obj, failures.join("; "));
- } else {
- cb(true, obj, {});
}
+ cb(true, obj, {});
},
});
@@ -167,14 +167,14 @@ void register_safety_nodes(NodeRegistry& registry) {
failures << QString("Trade value $%1 exceeds max $%2")
.arg(trade_val, 0, 'f', 2).arg(max_value, 0, 'f', 2);
- obj["size_limit_passed"] = failures.isEmpty();
- if (!failures.isEmpty()) {
+ bool passed = failures.isEmpty();
+ obj["size_limit_passed"] = passed;
+ obj["_branch"] = passed ? "true" : "false";
+ if (!passed) {
QJsonArray fa; for (const QString& f : failures) fa.append(f);
obj["size_failures"] = fa;
- cb(false, obj, failures.join("; "));
- } else {
- cb(true, obj, {});
}
+ cb(true, obj, {});
},
});
@@ -236,12 +236,9 @@ void register_safety_nodes(NodeRegistry& registry) {
obj["exchange"] = exchange;
obj["utc_time"] = utc_now.toString("HH:mm");
obj["session_type"] = in_regular ? "regular" : (in_premarket ? "pre_market" : "closed");
-
- if (is_open)
- cb(true, obj, {});
- else
- cb(false, obj, QString("Market closed: %1 UTC on %2")
- .arg(utc_now.toString("HH:mm"), exchange));
+ // Route: output_open = true branch, output_closed = false branch
+ obj["_branch"] = is_open ? "true" : "false";
+ cb(true, obj, {});
},
});
@@ -282,15 +279,12 @@ void register_safety_nodes(NodeRegistry& registry) {
drawdown_pct = (peak > 0) ? ((peak - current) / peak * 100.0) : 0;
}
+ bool passed = drawdown_pct <= max_dd;
obj["drawdown_pct"] = drawdown_pct;
obj["max_drawdown_pct"] = max_dd;
- obj["drawdown_check_passed"]= drawdown_pct <= max_dd;
-
- if (drawdown_pct > max_dd)
- cb(false, obj, QString("Drawdown %1% exceeds max %2%")
- .arg(drawdown_pct, 0, 'f', 2).arg(max_dd, 0, 'f', 2));
- else
- cb(true, obj, {});
+ obj["drawdown_check_passed"]= passed;
+ obj["_branch"] = passed ? "true" : "false";
+ cb(true, obj, {});
},
});
@@ -324,14 +318,11 @@ void register_safety_nodes(NodeRegistry& registry) {
double max_corr = params.value("max_correlation").toDouble(0.8);
double corr = std::abs(obj.value("correlation").toDouble(0));
- obj["correlation_check_passed"] = corr <= max_corr;
+ bool passed = corr <= max_corr;
+ obj["correlation_check_passed"] = passed;
obj["correlation_abs"] = corr;
-
- if (corr > max_corr)
- cb(false, obj, QString("Correlation %1 exceeds max %2")
- .arg(corr, 0, 'f', 3).arg(max_corr, 0, 'f', 3));
- else
- cb(true, obj, {});
+ obj["_branch"] = passed ? "true" : "false";
+ cb(true, obj, {});
},
});
@@ -382,10 +373,8 @@ void register_safety_nodes(NodeRegistry& registry) {
}
obj["volatility_check_passed"] = !exceeded;
- if (exceeded)
- cb(false, obj, reason);
- else
- cb(true, obj, {});
+ obj["_branch"] = exceeded ? "false" : "true";
+ cb(true, obj, {});
},
});
}
diff --git a/fincept-qt/src/storage/cache/TabSessionStore.cpp b/fincept-qt/src/storage/cache/TabSessionStore.cpp
index 74a886491..75d2f46c3 100644
--- a/fincept-qt/src/storage/cache/TabSessionStore.cpp
+++ b/fincept-qt/src/storage/cache/TabSessionStore.cpp
@@ -77,4 +77,52 @@ Result<void> TabSessionStore::clear_all() {
return Result<void>::ok();
}
+Result<void> TabSessionStore::save_screen_state(const QString& key,
+ const QJsonObject& state,
+ int state_version,
+ const QString& session_id) {
+ auto& cdb = CacheDatabase::instance();
+ if (!cdb.is_open())
+ return Result<void>::err("Cache database not open");
+
+ const QString json = QString::fromUtf8(
+ QJsonDocument(state).toJson(QJsonDocument::Compact));
+
+ auto r = cdb.execute(
+ "INSERT OR REPLACE INTO screen_state "
+ "(screen_key, state_version, state_json, updated_at, session_id) "
+ "VALUES (?, ?, ?, strftime('%Y-%m-%dT%H:%M:%fZ','now'), ?)",
+ {key, state_version, json, session_id});
+
+ if (r.is_err())
+ return Result<void>::err(r.error());
+ return Result<void>::ok();
+}
+
+Result<QJsonObject> TabSessionStore::load_screen_state(const QString& key,
+ int expected_version) {
+ auto& cdb = CacheDatabase::instance();
+ if (!cdb.is_open())
+ return Result<QJsonObject>::err("Cache database not open");
+
+ auto r = cdb.execute(
+ "SELECT state_version, state_json FROM screen_state WHERE screen_key = ?",
+ {key});
+
+ if (r.is_err())
+ return Result<QJsonObject>::err(r.error());
+
+ auto& q = r.value();
+ if (!q.next())
+ return Result<QJsonObject>::ok(QJsonObject{}); // no saved state yet
+
+ const int saved_version = q.value(0).toInt();
+ if (saved_version != expected_version)
+ return Result<QJsonObject>::ok(QJsonObject{}); // version mismatch — start fresh
+
+ const QJsonObject obj =
+ QJsonDocument::fromJson(q.value(1).toString().toUtf8()).object();
+ return Result<QJsonObject>::ok(obj);
+}
+
} // namespace fincept
diff --git a/fincept-qt/src/storage/cache/TabSessionStore.h b/fincept-qt/src/storage/cache/TabSessionStore.h
index bc55f2bd4..df16ab2dc 100644
--- a/fincept-qt/src/storage/cache/TabSessionStore.h
+++ b/fincept-qt/src/storage/cache/TabSessionStore.h
@@ -25,6 +25,15 @@ class TabSessionStore {
Result<void> remove(const QString& tab_id);
Result<void> clear_all();
+ /// Persist screen UI state keyed by screen_key.
+ /// state_version is stored alongside — if the loaded version doesn't match
+ /// expected_version, an empty QJsonObject is returned so the screen starts fresh.
+ Result<void> save_screen_state(const QString& key,
+ const QJsonObject& state,
+ int state_version,
+ const QString& session_id = {});
+ Result<QJsonObject> load_screen_state(const QString& key, int expected_version);
+
private:
TabSessionStore() = default;
};
diff --git a/fincept-qt/src/storage/repositories/LlmConfigRepository.cpp b/fincept-qt/src/storage/repositories/LlmConfigRepository.cpp
index 393539881..da1ef898b 100644
--- a/fincept-qt/src/storage/repositories/LlmConfigRepository.cpp
+++ b/fincept-qt/src/storage/repositories/LlmConfigRepository.cpp
@@ -9,7 +9,7 @@ LlmConfigRepository& LlmConfigRepository::instance() {
LlmConfig LlmConfigRepository::map_config(QSqlQuery& q) {
return {q.value(0).toString(), q.value(1).toString(), q.value(2).toString(), q.value(3).toString(),
- q.value(4).toBool(), q.value(5).toString(), q.value(6).toString()};
+ q.value(4).toBool(), q.value(5).toBool(), q.value(6).toString(), q.value(7).toString()};
}
LlmModelConfig LlmConfigRepository::map_model(QSqlQuery& q) {
@@ -19,21 +19,21 @@ LlmModelConfig LlmConfigRepository::map_model(QSqlQuery& q) {
}
Result<QVector<LlmConfig>> LlmConfigRepository::list_providers() {
- return query_list("SELECT provider, api_key, base_url, model, is_active, created_at, updated_at "
+ return query_list("SELECT provider, api_key, base_url, model, is_active, tools_enabled, created_at, updated_at "
"FROM llm_configs ORDER BY provider",
{}, map_config);
}
Result<LlmConfig> LlmConfigRepository::get_active_provider() {
- return query_one("SELECT provider, api_key, base_url, model, is_active, created_at, updated_at "
+ return query_one("SELECT provider, api_key, base_url, model, is_active, tools_enabled, created_at, updated_at "
"FROM llm_configs WHERE is_active = 1 LIMIT 1",
{}, map_config);
}
Result<void> LlmConfigRepository::save_provider(const LlmConfig& c) {
- return exec_write("INSERT OR REPLACE INTO llm_configs (provider, api_key, base_url, model, is_active, updated_at) "
- "VALUES (?, ?, ?, ?, ?, datetime('now'))",
- {c.provider, c.api_key, c.base_url, c.model, c.is_active ? 1 : 0});
+ return exec_write("INSERT OR REPLACE INTO llm_configs (provider, api_key, base_url, model, is_active, tools_enabled, updated_at) "
+ "VALUES (?, ?, ?, ?, ?, ?, datetime('now'))",
+ {c.provider, c.api_key, c.base_url, c.model, c.is_active ? 1 : 0, c.tools_enabled ? 1 : 0});
}
Result<void> LlmConfigRepository::set_active(const QString& provider) {
diff --git a/fincept-qt/src/storage/repositories/LlmConfigRepository.h b/fincept-qt/src/storage/repositories/LlmConfigRepository.h
index d38b661f3..5ffa3b168 100644
--- a/fincept-qt/src/storage/repositories/LlmConfigRepository.h
+++ b/fincept-qt/src/storage/repositories/LlmConfigRepository.h
@@ -9,6 +9,7 @@ struct LlmConfig {
QString base_url;
QString model;
bool is_active = false;
+ bool tools_enabled = true;
QString created_at;
QString updated_at;
};
diff --git a/fincept-qt/src/storage/sqlite/CacheDatabase.cpp b/fincept-qt/src/storage/sqlite/CacheDatabase.cpp
index 47e24108b..3b7a463d6 100644
--- a/fincept-qt/src/storage/sqlite/CacheDatabase.cpp
+++ b/fincept-qt/src/storage/sqlite/CacheDatabase.cpp
@@ -108,6 +108,21 @@ Result<void> CacheDatabase::create_tables() {
if (r.is_err())
return r;
+ // Screen UI state — survives crashes, restored per screen on next open
+ r = exec("CREATE TABLE IF NOT EXISTS screen_state ("
+ " screen_key TEXT PRIMARY KEY,"
+ " state_version INTEGER NOT NULL DEFAULT 1,"
+ " state_json TEXT NOT NULL DEFAULT '{}',"
+ " updated_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ','now')),"
+ " session_id TEXT NOT NULL DEFAULT ''"
+ ")");
+ if (r.is_err())
+ return r;
+
+ r = exec("CREATE INDEX IF NOT EXISTS idx_screen_state_updated ON screen_state(updated_at)");
+ if (r.is_err())
+ return r;
+
LOG_INFO("CacheDB", "Cache tables initialized");
return Result<void>::ok();
}
diff --git a/fincept-qt/src/storage/sqlite/migrations/MigrationRunner.h b/fincept-qt/src/storage/sqlite/migrations/MigrationRunner.h
index 0dc6bf5e8..b2d73968d 100644
--- a/fincept-qt/src/storage/sqlite/migrations/MigrationRunner.h
+++ b/fincept-qt/src/storage/sqlite/migrations/MigrationRunner.h
@@ -60,5 +60,7 @@ void register_migration_v010();
void register_migration_v011();
void register_migration_v012();
void register_migration_v013();
+void register_migration_v014();
+void register_migration_v015();
} // namespace fincept
diff --git a/fincept-qt/src/storage/sqlite/migrations/v014_llm_tools_toggle.cpp b/fincept-qt/src/storage/sqlite/migrations/v014_llm_tools_toggle.cpp
new file mode 100644
index 000000000..99440e9c7
--- /dev/null
+++ b/fincept-qt/src/storage/sqlite/migrations/v014_llm_tools_toggle.cpp
@@ -0,0 +1,42 @@
+// v014_llm_tools_toggle — Add tools_enabled column to llm_configs.
+// Allows per-provider control over whether MCP tools are sent to the LLM.
+
+#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_v014(QSqlDatabase& db) {
+ // Add tools_enabled column — defaults to 1 (enabled) for all providers
+ auto r = sql(db, "ALTER TABLE llm_configs ADD COLUMN tools_enabled INTEGER DEFAULT 1");
+ if (r.is_err()) {
+ // Column may already exist if user ran a dev build — ignore
+ QSqlQuery check(db);
+ check.exec("SELECT tools_enabled FROM llm_configs LIMIT 1");
+ if (check.lastError().isValid())
+ return r; // real error
+ }
+ return Result<void>::ok();
+}
+
+} // anonymous namespace
+
+void register_migration_v014() {
+ static bool done = false;
+ if (done)
+ return;
+ done = true;
+ MigrationRunner::register_migration({14, "llm_tools_toggle", apply_v014});
+}
+
+} // namespace fincept
diff --git a/fincept-qt/src/storage/sqlite/migrations/v015_screen_state.cpp b/fincept-qt/src/storage/sqlite/migrations/v015_screen_state.cpp
new file mode 100644
index 000000000..821a5e93a
--- /dev/null
+++ b/fincept-qt/src/storage/sqlite/migrations/v015_screen_state.cpp
@@ -0,0 +1,59 @@
+// v015_screen_state — Add screen_state table to cache.db (via CacheDatabase).
+// This is NOT a fincept.db migration — it runs against cache.db directly.
+// The MigrationRunner here only creates the table once in the main DB's
+// schema_version tracking, but the actual DDL executes on CacheDatabase.
+// See ScreenStateManager::ensure_table() which calls this at init time.
+
+#include "storage/sqlite/migrations/MigrationRunner.h"
+#include "storage/sqlite/CacheDatabase.h"
+
+#include <QSqlError>
+#include <QSqlQuery>
+
+namespace fincept {
+namespace {
+
+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_v015(QSqlDatabase& /*db*/) {
+ // This migration runs its DDL on cache.db, not fincept.db.
+ // The version record is still tracked in fincept.db schema_version
+ // so we don't re-run it. The actual table creation is idempotent
+ // (CREATE TABLE IF NOT EXISTS) and also happens in CacheDatabase::create_tables().
+ auto& cdb = CacheDatabase::instance();
+ if (!cdb.is_open())
+ return Result<void>::ok(); // cache.db not open yet — table created on open
+
+ auto r = cdb.exec(
+ "CREATE TABLE IF NOT EXISTS screen_state ("
+ " screen_key TEXT PRIMARY KEY,"
+ " state_version INTEGER NOT NULL DEFAULT 1,"
+ " state_json TEXT NOT NULL DEFAULT '{}',"
+ " updated_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ','now')),"
+ " session_id TEXT NOT NULL DEFAULT ''"
+ ")"
+ );
+ if (r.is_err())
+ return r;
+
+ cdb.exec("CREATE INDEX IF NOT EXISTS idx_screen_state_updated "
+ "ON screen_state(updated_at)");
+
+ return Result<void>::ok();
+}
+
+} // anonymous namespace
+
+void register_migration_v015() {
+ static bool done = false;
+ if (done) return;
+ done = true;
+ MigrationRunner::register_migration({15, "screen_state", apply_v015});
+}
+
+} // namespace fincept
diff --git a/fincept-qt/src/ui/markdown/MarkdownRenderer.cpp b/fincept-qt/src/ui/markdown/MarkdownRenderer.cpp
index cee246f09..4ac3684db 100644
--- a/fincept-qt/src/ui/markdown/MarkdownRenderer.cpp
+++ b/fincept-qt/src/ui/markdown/MarkdownRenderer.cpp
@@ -23,33 +23,33 @@ QString MarkdownRenderer::wrap_html(const QString& body) {
// We embed a <style> block that overrides the defaults.
static const QLatin1String kStyle(R"(
<style>
-body { color:#cdd6f4; font-family:'Segoe UI',Arial,sans-serif; font-size:13px; margin:0; padding:0; }
-h1 { color:#cba6f7; font-size:18px; font-weight:700; margin:8px 0 4px; }
-h2 { color:#cba6f7; font-size:16px; font-weight:700; margin:7px 0 3px; }
-h3 { color:#b4befe; font-size:14px; font-weight:700; margin:6px 0 2px; }
-h4,h5,h6 { color:#b4befe; font-size:13px; font-weight:600; margin:5px 0 2px; }
+body { color:#e5e5e5; font-family:'Consolas','Courier New',monospace; font-size:14px; margin:0; padding:0; }
+h1 { color:#d97706; font-size:18px; font-weight:700; margin:8px 0 4px; }
+h2 { color:#d97706; font-size:16px; font-weight:700; margin:7px 0 3px; }
+h3 { color:#d97706; font-size:14px; font-weight:700; margin:6px 0 2px; }
+h4,h5,h6 { color:#b45309; font-size:13px; font-weight:600; margin:5px 0 2px; }
p { margin:4px 0; line-height:1.55; }
-a { color:#89dceb; text-decoration:none; }
-strong,b { color:#f9e2af; font-weight:700; }
-em,i { color:#f2cdcd; font-style:italic; }
-code { font-family:'Cascadia Code','Consolas','Courier New',monospace;
- font-size:12px; color:#a6e3a1;
- background:#1e1e2e; padding:1px 5px; border-radius:3px; }
-pre { background:#1e1e2e; border:1px solid #45475a;
- border-radius:5px; padding:10px 12px; margin:6px 0;
- font-family:'Cascadia Code','Consolas','Courier New',monospace;
- font-size:12px; color:#a6e3a1; white-space:pre-wrap; }
-pre code { background:transparent; padding:0; border-radius:0; }
-blockquote { border-left:3px solid #6c7086; margin:6px 0 6px 4px;
- padding:4px 10px; color:#9399b2; font-style:italic; }
+a { color:#d97706; text-decoration:none; }
+strong,b { color:#f59e0b; font-weight:700; }
+em,i { color:#808080; font-style:italic; }
+code { font-family:'Consolas','Courier New',monospace;
+ font-size:13px; color:#16a34a;
+ background:#111111; padding:1px 5px; }
+pre { background:#111111; border:1px solid #1a1a1a;
+ padding:10px 12px; margin:6px 0;
+ font-family:'Consolas','Courier New',monospace;
+ font-size:13px; color:#16a34a; white-space:pre-wrap; }
+pre code { background:transparent; padding:0; }
+blockquote { border-left:2px solid #d97706; margin:6px 0 6px 4px;
+ padding:4px 10px; color:#808080; font-style:italic; }
ul,ol { margin:4px 0; padding-left:22px; }
li { margin:2px 0; line-height:1.5; }
table { border-collapse:collapse; margin:6px 0; width:100%; }
-th { background:#313244; color:#cba6f7; font-weight:700;
- padding:5px 10px; border:1px solid #45475a; text-align:left; }
-td { padding:4px 10px; border:1px solid #45475a; color:#cdd6f4; }
-tr:nth-child(even) td { background:#1e1e2e; }
-hr { border:none; border-top:1px solid #45475a; margin:8px 0; }
+th { background:#111111; color:#d97706; font-weight:700;
+ padding:5px 10px; border:1px solid #1a1a1a; text-align:left; }
+td { padding:4px 10px; border:1px solid #1a1a1a; color:#e5e5e5; }
+tr:nth-child(even) td { background:#0d0d0d; }
+hr { border:none; border-top:1px solid #1a1a1a; margin:8px 0; }
</style>
)");
return kStyle + body;
diff --git a/fincept-qt/src/ui/navigation/CommandBar.cpp b/fincept-qt/src/ui/navigation/CommandBar.cpp
index ea16e135e..51ccf33ff 100644
--- a/fincept-qt/src/ui/navigation/CommandBar.cpp
+++ b/fincept-qt/src/ui/navigation/CommandBar.cpp
@@ -3,6 +3,7 @@
#include "core/events/EventBus.h"
#include "network/http/HttpClient.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QApplication>
#include <QEvent>
@@ -296,6 +297,15 @@ CommandBar::CommandBar(QWidget* parent) : QWidget(parent) {
if (!now || (now != input_ && !dropdown_->isAncestorOf(now) && now != list_))
hide_dropdown();
});
+
+ connect(&ThemeManager::instance(), &ThemeManager::theme_changed,
+ this, [this](const ThemeTokens&) { refresh_theme(); });
+}
+
+void CommandBar::refresh_theme() {
+ if (input_) input_->setStyleSheet(input_ss());
+ if (dropdown_) dropdown_->setStyleSheet(drop_ss());
+ if (list_) list_->setStyleSheet(list_ss());
}
// ── event filter (keyboard nav in input) ─────────────────────────────────────
@@ -325,19 +335,39 @@ bool CommandBar::eventFilter(QObject* obj, QEvent* event) {
case Qt::Key_Tab:
if (list_->currentItem()) {
const QString autocomplete = list_->currentItem()->data(Qt::UserRole + 1).toString();
- input_->setText(autocomplete);
- // If we just autocompleted a slash type, activate asset mode
if (mode_ == Mode::SlashPicker) {
+ // Autocomplete slash type and activate asset search
+ input_->setText(autocomplete);
for (const auto& at : asset_types_) {
if (at.slash == autocomplete) {
activate_asset_mode(at.api_type);
- // Put cursor after "/type " so user can type the query
input_->setText(autocomplete + " ");
input_->setCursorPosition(input_->text().length());
break;
}
}
+ } else if (mode_ == Mode::DockSecondary && !dock_primary_id_.isEmpty()
+ && !dock_verb_.isEmpty()) {
+ // Autocomplete the secondary screen into the full command
+ const QString screen_id = list_->currentItem()->data(Qt::UserRole).toString();
+ if (!screen_id.isEmpty()) {
+ input_->setText(dock_primary_id_ + " " + dock_verb_ + " " + screen_id);
+ input_->setCursorPosition(input_->text().length());
+ }
+ } else if (mode_ == Mode::DockCommand && !dock_primary_id_.isEmpty()) {
+ // Autocomplete the verb
+ const QString verb = list_->currentItem()->data(Qt::UserRole).toString();
+ dock_verb_ = verb;
+ if (verb == "remove") {
+ input_->setText(dock_primary_id_ + " remove");
+ } else {
+ mode_ = Mode::DockSecondary;
+ input_->setText(dock_primary_id_ + " " + verb + " ");
+ }
+ input_->setCursorPosition(input_->text().length());
} else {
+ // Normal screen mode — autocomplete with the alias
+ input_->setText(autocomplete);
hide_dropdown();
}
}
@@ -595,11 +625,21 @@ void CommandBar::on_return_pressed() {
return;
}
+ // ── Try compound dock command from typed text in any dock-related mode ──
if (!dropdown_->isVisible() || !list_->currentItem()) {
+ const QString text = input_->text().trimmed();
+ // Try compound dock command: "X add Y", "X replace Y", "X remove"
+ // Works from Screen, DockCommand, or DockSecondary modes
+ if (mode_ == Mode::Screen || mode_ == Mode::DockCommand
+ || mode_ == Mode::DockSecondary) {
+ if (try_parse_dock_command(text)) {
+ mode_ = Mode::Screen;
+ dock_primary_id_.clear();
+ dock_verb_.clear();
+ return;
+ }
+ }
if (mode_ == Mode::Screen) {
- const QString text = input_->text().trimmed();
- // Try compound dock command first: "X add Y", "X replace Y", "X remove"
- if (try_parse_dock_command(text)) return;
// Fall back to simple screen navigation
const auto results = search(text);
if (!results.isEmpty()) {
@@ -628,6 +668,39 @@ void CommandBar::on_return_pressed() {
return;
}
+ // ── DockCommand: user pressed Enter on a verb suggestion ────────────
+ if (mode_ == Mode::DockCommand) {
+ const QString verb = item->data(Qt::UserRole).toString();
+ const QString primary = item->data(Qt::UserRole + 1).toString();
+ if (verb == "remove") {
+ emit dock_command("remove", primary, {});
+ input_->clear(); mode_ = Mode::Screen;
+ dock_primary_id_.clear(); dock_verb_.clear();
+ hide_dropdown(); input_->clearFocus();
+ } else {
+ // Transition to secondary — append verb to input
+ dock_verb_ = verb;
+ mode_ = Mode::DockSecondary;
+ const QString current = input_->text().trimmed();
+ input_->setText(current.endsWith(' ') ? current + verb + " "
+ : current + " " + verb + " ");
+ input_->setCursorPosition(input_->text().length());
+ input_->setFocus();
+ }
+ return;
+ }
+
+ // ── DockSecondary: user pressed Enter on a secondary screen ─────────
+ if (mode_ == Mode::DockSecondary) {
+ const QString secondary_id = item->data(Qt::UserRole).toString();
+ if (secondary_id.isEmpty()) return; // header row
+ emit dock_command(dock_verb_, dock_primary_id_, secondary_id);
+ input_->clear(); mode_ = Mode::Screen;
+ dock_primary_id_.clear(); dock_verb_.clear();
+ hide_dropdown(); input_->clearFocus();
+ return;
+ }
+
// Screen mode — navigate to the selected screen
execute_index(list_->currentRow());
}
@@ -1015,8 +1088,8 @@ QString CommandBar::resolve_screen_id(const QString& token) const {
}
bool CommandBar::try_parse_dock_command(const QString& text) {
- // Only active in Screen mode — not during asset search or slash picker
- if (mode_ != Mode::Screen) return false;
+ // Not active during asset search or slash picker
+ if (mode_ == Mode::AssetSearch || mode_ == Mode::SlashPicker) return false;
const QString t = text.trimmed();
diff --git a/fincept-qt/src/ui/navigation/CommandBar.h b/fincept-qt/src/ui/navigation/CommandBar.h
index 51c0e76b9..f69545d2d 100644
--- a/fincept-qt/src/ui/navigation/CommandBar.h
+++ b/fincept-qt/src/ui/navigation/CommandBar.h
@@ -95,6 +95,9 @@ class CommandBar : public QWidget {
QString dock_primary_id_; // screen id locked in after user types "<screen> "
QString dock_verb_; // "add" or "replace" — locked in after user picks verb
+ // ── Theme ─────────────────────────────────────────────────────────────────
+ void refresh_theme();
+
// ── Dropdown helpers ───────────────────────────────────────────────────────
void show_dropdown();
void hide_dropdown();
diff --git a/fincept-qt/src/ui/navigation/FKeyBar.cpp b/fincept-qt/src/ui/navigation/FKeyBar.cpp
index 7fb0e3c95..27bd63fdc 100644
--- a/fincept-qt/src/ui/navigation/FKeyBar.cpp
+++ b/fincept-qt/src/ui/navigation/FKeyBar.cpp
@@ -1,13 +1,12 @@
#include "ui/navigation/FKeyBar.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
namespace fincept::ui {
TabBar::TabBar(QWidget* parent) : QWidget(parent) {
setFixedHeight(32);
- setStyleSheet(QString("background:%1;border-bottom:1px solid %2;")
- .arg(colors::BG_BASE).arg(colors::BORDER_DIM));
auto* scroll_area = new QScrollArea(this);
scroll_area->setWidgetResizable(true);
scroll_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -41,7 +40,10 @@ TabBar::TabBar(QWidget* parent) : QWidget(parent) {
auto* root = new QHBoxLayout(this);
root->setContentsMargins(0, 0, 0, 0);
root->addWidget(scroll_area);
- update_styles();
+
+ connect(&ThemeManager::instance(), &ThemeManager::theme_changed,
+ this, [this](const ThemeTokens&) { refresh_theme(); });
+ refresh_theme();
}
void TabBar::add_tab(const TabDef& def) {
@@ -66,6 +68,12 @@ void TabBar::set_active(const QString& tab_id) {
update_styles();
}
+void TabBar::refresh_theme() {
+ setStyleSheet(QString("background:%1;border-bottom:1px solid %2;")
+ .arg(colors::BG_BASE).arg(colors::BORDER_DIM));
+ update_styles();
+}
+
void TabBar::update_styles() {
for (auto* btn : tab_buttons_) {
bool active = btn->property("tab_id").toString() == active_id_;
diff --git a/fincept-qt/src/ui/navigation/FKeyBar.h b/fincept-qt/src/ui/navigation/FKeyBar.h
index 5b615bad1..14ee2bcd4 100644
--- a/fincept-qt/src/ui/navigation/FKeyBar.h
+++ b/fincept-qt/src/ui/navigation/FKeyBar.h
@@ -31,6 +31,7 @@ class TabBar : public QWidget {
QString active_id_ = "dashboard";
void add_tab(const TabDef& def);
+ void refresh_theme();
void update_styles();
};
diff --git a/fincept-qt/src/ui/navigation/NavigationBar.cpp b/fincept-qt/src/ui/navigation/NavigationBar.cpp
index 36e80c61f..af8ed5b27 100644
--- a/fincept-qt/src/ui/navigation/NavigationBar.cpp
+++ b/fincept-qt/src/ui/navigation/NavigationBar.cpp
@@ -2,6 +2,7 @@
#include "auth/AuthManager.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QDateTime>
@@ -9,49 +10,43 @@ namespace fincept::ui {
NavigationBar::NavigationBar(QWidget* parent) : QWidget(parent) {
setFixedHeight(38);
- setStyleSheet(QString("background:%1;border-bottom:1px solid %2;")
- .arg(colors::BG_BASE).arg(colors::BORDER_DIM));
+ setObjectName("navBar");
+
auto* hl = new QHBoxLayout(this);
hl->setContentsMargins(14, 0, 14, 0);
hl->setSpacing(0);
- auto mk = [](const QString& t, const QString& c, bool b = false) {
+ auto mk = [](const QString& t, const QString& name) {
auto* l = new QLabel(t);
- l->setStyleSheet(QString("color:%1;%2background:transparent;")
- .arg(c)
- .arg(b ? "font-weight:700;" : ""));
+ l->setObjectName(name);
return l;
};
- hl->addWidget(mk("FINCEPT", colors::AMBER.get(), true));
- hl->addWidget(mk("TERMINAL", colors::TEXT_PRIMARY.get()));
- hl->addWidget(mk(" ", colors::BG_BASE.get()));
- hl->addWidget(mk("\xe2\x97\x8f", colors::POSITIVE.get()));
- hl->addWidget(mk(" LIVE", colors::POSITIVE.get(), true));
+ hl->addWidget(mk("FINCEPT", "navBrand"));
+ hl->addWidget(mk("TERMINAL", "navTitle"));
+ hl->addWidget(mk(" ", "navSpacer"));
+ hl->addWidget(mk("\xe2\x97\x8f", "navLiveDot"));
+ hl->addWidget(mk(" LIVE", "navLive"));
hl->addStretch();
- clock_label_ = mk("", colors::TEXT_TERTIARY.get());
+ clock_label_ = mk("", "navClock");
hl->addWidget(clock_label_);
hl->addStretch();
- user_label_ = mk("---", colors::AMBER.get());
+ user_label_ = mk("---", "navUser");
hl->addWidget(user_label_);
- hl->addWidget(mk(" | ", colors::BORDER_DIM.get()));
- credits_label_ = mk("---", colors::POSITIVE.get());
+ hl->addWidget(mk(" | ", "navSep"));
+ credits_label_ = mk("---", "navCredits");
hl->addWidget(credits_label_);
- hl->addWidget(mk(" | ", colors::BORDER_DIM.get()));
- plan_label_ = mk("---", colors::TEXT_PRIMARY.get());
+ hl->addWidget(mk(" | ", "navSep"));
+ plan_label_ = mk("---", "navPlan");
hl->addWidget(plan_label_);
- hl->addWidget(mk(" | ", colors::BORDER_DIM.get()));
-
- auto* logout_btn = new QPushButton("LOGOUT");
- logout_btn->setFixedHeight(24);
- logout_btn->setCursor(Qt::PointingHandCursor);
- logout_btn->setStyleSheet(
- QString("QPushButton{background:transparent;color:%1;border:1px solid %1;"
- "padding:0 10px;font-weight:700;}"
- "QPushButton:hover{background:%1;color:%2;border-color:%1;}")
- .arg(colors::NEGATIVE).arg(colors::TEXT_PRIMARY));
- connect(logout_btn, &QPushButton::clicked, this, &NavigationBar::logout_clicked);
- hl->addWidget(logout_btn);
+ hl->addWidget(mk(" | ", "navSep"));
+
+ logout_btn_ = new QPushButton("LOGOUT");
+ logout_btn_->setFixedHeight(24);
+ logout_btn_->setCursor(Qt::PointingHandCursor);
+ logout_btn_->setObjectName("navLogout");
+ connect(logout_btn_, &QPushButton::clicked, this, &NavigationBar::logout_clicked);
+ hl->addWidget(logout_btn_);
clock_timer_ = new QTimer(this);
clock_timer_->setInterval(1000);
@@ -61,7 +56,37 @@ NavigationBar::NavigationBar(QWidget* parent) : QWidget(parent) {
connect(&auth::AuthManager::instance(), &auth::AuthManager::auth_state_changed, this,
&NavigationBar::refresh_user_display);
+
+ connect(&ThemeManager::instance(), &ThemeManager::theme_changed,
+ this, [this](const ThemeTokens&) { refresh_theme(); });
+
refresh_user_display();
+ refresh_theme();
+}
+
+void NavigationBar::refresh_theme() {
+ setStyleSheet(QString(
+ "#navBar { background:%1; border-bottom:1px solid %2; }"
+ "#navBrand { color:%3; font-weight:700; background:transparent; }"
+ "#navTitle { color:%4; background:transparent; }"
+ "#navSpacer { background:transparent; }"
+ "#navLiveDot { color:%5; background:transparent; }"
+ "#navLive { color:%5; font-weight:700; background:transparent; }"
+ "#navClock { color:%6; background:transparent; }"
+ "#navUser { color:%3; background:transparent; }"
+ "#navSep { color:%2; background:transparent; }"
+ "#navCredits { color:%5; background:transparent; }"
+ "#navPlan { color:%4; background:transparent; }"
+ "#navLogout { background:transparent; color:%7; border:1px solid %7;"
+ " padding:0 10px; font-weight:700; }"
+ "#navLogout:hover { background:%7; color:%4; border-color:%7; }"
+ ).arg(colors::BG_BASE()) // %1
+ .arg(colors::BORDER_DIM()) // %2
+ .arg(colors::AMBER()) // %3
+ .arg(colors::TEXT_PRIMARY()) // %4
+ .arg(colors::POSITIVE()) // %5
+ .arg(colors::TEXT_TERTIARY()) // %6
+ .arg(colors::NEGATIVE())); // %7
}
void NavigationBar::update_clock() {
diff --git a/fincept-qt/src/ui/navigation/NavigationBar.h b/fincept-qt/src/ui/navigation/NavigationBar.h
index 9abda8f07..2f5d82bb0 100644
--- a/fincept-qt/src/ui/navigation/NavigationBar.h
+++ b/fincept-qt/src/ui/navigation/NavigationBar.h
@@ -23,11 +23,14 @@ class NavigationBar : public QWidget {
void update_clock();
private:
- QLabel* clock_label_ = nullptr;
- QLabel* user_label_ = nullptr;
- QLabel* credits_label_ = nullptr;
- QLabel* plan_label_ = nullptr;
- QTimer* clock_timer_ = nullptr;
+ void refresh_theme();
+
+ QLabel* clock_label_ = nullptr;
+ QLabel* user_label_ = nullptr;
+ QLabel* credits_label_ = nullptr;
+ QLabel* plan_label_ = nullptr;
+ QPushButton* logout_btn_ = nullptr;
+ QTimer* clock_timer_ = nullptr;
};
} // namespace fincept::ui
diff --git a/fincept-qt/src/ui/navigation/StatusBar.cpp b/fincept-qt/src/ui/navigation/StatusBar.cpp
index c1d41d243..d12fdc022 100644
--- a/fincept-qt/src/ui/navigation/StatusBar.cpp
+++ b/fincept-qt/src/ui/navigation/StatusBar.cpp
@@ -1,44 +1,59 @@
#include "ui/navigation/StatusBar.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
namespace fincept::ui {
StatusBar::StatusBar(QWidget* parent) : QWidget(parent) {
setFixedHeight(26);
- setStyleSheet(QString("background:%1;border-top:1px solid %2;")
- .arg(colors::BG_BASE).arg(colors::BORDER_DIM));
+ setObjectName("appStatusBar");
+
auto* hl = new QHBoxLayout(this);
hl->setContentsMargins(12, 0, 12, 0);
hl->setSpacing(0);
- auto mk = [](const QString& t, const QString& c, int sz = 12, bool b = false) {
+ auto mk = [](const QString& t, const QString& name) {
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;" : ""));
+ l->setObjectName(name);
return l;
};
- hl->addWidget(mk("v4.0.0", colors::TEXT_DIM.get()));
- hl->addWidget(mk(" | ", colors::BORDER_DIM.get()));
+ hl->addWidget(mk("v4.0.0", "sbVersion"));
+ hl->addWidget(mk(" | ", "sbSep"));
const char* feeds[] = {"EQ", "FX", "CM", "FI", "CR"};
for (auto& f : feeds) {
- hl->addWidget(mk(f, colors::TEXT_DIM.get()));
- hl->addWidget(mk(" ", colors::BG_BASE.get()));
+ hl->addWidget(mk(f, "sbFeed"));
+ hl->addWidget(mk(" ", "sbSpacer"));
}
hl->addStretch();
- ready_label_ = mk("READY", colors::POSITIVE.get(), 8, true);
+ ready_label_ = mk("READY", "sbReady");
hl->addWidget(ready_label_);
+
+ connect(&ThemeManager::instance(), &ThemeManager::theme_changed,
+ this, [this](const ThemeTokens&) { refresh_theme(); });
+ refresh_theme();
+}
+
+void StatusBar::refresh_theme() {
+ setStyleSheet(QString(
+ "#appStatusBar { background:%1; border-top:1px solid %2; }"
+ "#sbVersion { color:%3; background:transparent; }"
+ "#sbSep { color:%2; background:transparent; }"
+ "#sbFeed { color:%3; background:transparent; }"
+ "#sbSpacer { background:transparent; }"
+ "#sbReady { color:%4; font-weight:700; background:transparent; }"
+ ).arg(colors::BG_BASE())
+ .arg(colors::BORDER_DIM())
+ .arg(colors::TEXT_DIM())
+ .arg(colors::POSITIVE()));
}
void StatusBar::set_ready(bool ready) {
ready_label_->setText(ready ? "READY" : "BUSY");
- ready_label_->setStyleSheet(QString("color:%1;font-size:12px;font-weight:700;background:transparent;"
- "font-family:'Consolas',monospace;")
- .arg(ready ? colors::POSITIVE.get() : colors::TEXT_TERTIARY.get()));
+ ready_label_->setStyleSheet(
+ QString("color:%1;font-weight:700;background:transparent;")
+ .arg(ready ? colors::POSITIVE() : colors::TEXT_TERTIARY()));
}
} // namespace fincept::ui
diff --git a/fincept-qt/src/ui/navigation/StatusBar.h b/fincept-qt/src/ui/navigation/StatusBar.h
index e2d835652..632dd3151 100644
--- a/fincept-qt/src/ui/navigation/StatusBar.h
+++ b/fincept-qt/src/ui/navigation/StatusBar.h
@@ -13,6 +13,7 @@ class StatusBar : public QWidget {
void set_ready(bool ready);
private:
+ void refresh_theme();
QLabel* ready_label_ = nullptr;
};
diff --git a/fincept-qt/src/ui/navigation/ToolBar.cpp b/fincept-qt/src/ui/navigation/ToolBar.cpp
index 9cd69d60a..a81942d50 100644
--- a/fincept-qt/src/ui/navigation/ToolBar.cpp
+++ b/fincept-qt/src/ui/navigation/ToolBar.cpp
@@ -2,6 +2,7 @@
#include "auth/AuthManager.h"
#include "ui/theme/Theme.h"
+#include "ui/theme/ThemeManager.h"
#include <QAction>
#include <QDateTime>
@@ -36,8 +37,6 @@ static QString popup_ss() {
ToolBar::ToolBar(QWidget* parent) : QWidget(parent) {
setFixedHeight(32);
- setStyleSheet(QString("background:%1;border-bottom:1px solid %2;")
- .arg(colors::BG_BASE).arg(colors::BORDER_DIM));
auto* hl = new QHBoxLayout(this);
hl->setContentsMargins(4, 0, 6, 0);
hl->setSpacing(0);
@@ -62,49 +61,44 @@ ToolBar::ToolBar(QWidget* parent) : QWidget(parent) {
auto sep = [&]() -> QLabel* {
auto* s = new QLabel("|");
- s->setStyleSheet(QString("color:%1;background:transparent;padding:0 3px;")
- .arg(colors::TEXT_DIM));
s->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
hl->addWidget(s);
separators_.append(s);
return s;
};
- auto mk = [](const QString& t, const QString& c, bool b = false) -> QLabel* {
+ auto mk = [](const QString& t) -> QLabel* {
auto* l = new QLabel(t);
- l->setStyleSheet(QString("color:%1;%2background:transparent;")
- .arg(c)
- .arg(b ? "font-weight:700;" : ""));
l->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
return l;
};
sep();
- auto* fincept_lbl = mk("FINCEPT ", colors::AMBER.get(), true);
- hl->addWidget(fincept_lbl);
- branding_label_ = mk("TERMINAL", colors::TEXT_PRIMARY.get(), true);
+ fincept_label_ = mk("FINCEPT ");
+ hl->addWidget(fincept_label_);
+ branding_label_ = mk("TERMINAL");
hl->addWidget(branding_label_);
- subtitle_label_ = mk(" | PROFESSIONAL RESEARCH DESK", colors::TEXT_SECONDARY.get());
+ subtitle_label_ = mk(" | PROFESSIONAL RESEARCH DESK");
hl->addWidget(subtitle_label_);
- hl->addWidget(mk(" ", colors::BG_BASE.get()));
- live_dot_ = mk("\xe2\x97\x8f", colors::POSITIVE.get());
+ hl->addWidget(mk(" "));
+ live_dot_ = mk("\xe2\x97\x8f");
hl->addWidget(live_dot_);
- live_label_ = mk(" LIVE", colors::POSITIVE.get(), true);
+ live_label_ = mk(" LIVE");
hl->addWidget(live_label_);
hl->addStretch(1);
- clock_label_ = mk("", colors::TEXT_PRIMARY.get());
+ clock_label_ = mk("");
clock_label_->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
hl->addWidget(clock_label_);
hl->addStretch(1);
- user_label_ = mk("---", colors::AMBER.get());
+ user_label_ = mk("---");
user_label_->setMaximumWidth(120);
hl->addWidget(user_label_);
sep();
- credits_label_ = mk("---", colors::POSITIVE.get());
+ credits_label_ = mk("---");
credits_label_->setMaximumWidth(100);
hl->addWidget(credits_label_);
sep();
@@ -112,38 +106,25 @@ ToolBar::ToolBar(QWidget* parent) : QWidget(parent) {
plan_btn_->setCursor(Qt::PointingHandCursor);
plan_btn_->setToolTip("View Plans & Pricing");
plan_btn_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
- plan_btn_->setStyleSheet(QString("QPushButton{color:%1;background:transparent;border:none;padding:0 2px;}"
- "QPushButton:hover{color:%2;}")
- .arg(colors::TEXT_PRIMARY).arg(colors::AMBER));
connect(plan_btn_, &QPushButton::clicked, this, &ToolBar::plan_clicked);
hl->addWidget(plan_btn_);
sep();
- chat_mode_btn_ = new QPushButton("⬡ CHAT");
+ chat_mode_btn_ = new QPushButton(QString::fromUtf8("⬡ 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(
- QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"
- "padding:0 8px;font-weight:700;}"
- "QPushButton:hover{background:%2;color:%3;border-color:%1;}")
- .arg(colors::AMBER).arg(colors::AMBER_DIM).arg(colors::TEXT_PRIMARY));
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(
- QString("QPushButton{background:transparent;color:%1;border:1px solid %1;"
- "padding:0 8px;font-weight:700;}"
- "QPushButton:hover{background:%1;color:%2;border-color:%1;}")
- .arg(colors::NEGATIVE).arg(colors::TEXT_PRIMARY));
- connect(logout_btn, &QPushButton::clicked, this, &ToolBar::logout_clicked);
- hl->addWidget(logout_btn);
+ logout_btn_ = new QPushButton("LOGOUT");
+ logout_btn_->setFixedHeight(20);
+ logout_btn_->setCursor(Qt::PointingHandCursor);
+ logout_btn_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+ connect(logout_btn_, &QPushButton::clicked, this, &ToolBar::logout_clicked);
+ hl->addWidget(logout_btn_);
clock_timer_ = new QTimer(this);
clock_timer_->setInterval(1000);
@@ -153,7 +134,56 @@ ToolBar::ToolBar(QWidget* parent) : QWidget(parent) {
connect(&auth::AuthManager::instance(), &auth::AuthManager::auth_state_changed, this,
&ToolBar::refresh_user_display);
+
+ connect(&ThemeManager::instance(), &ThemeManager::theme_changed,
+ this, [this](const ThemeTokens&) { refresh_theme(); });
+
refresh_user_display();
+ refresh_theme();
+}
+
+void ToolBar::refresh_theme() {
+ // Bar background
+ setStyleSheet(QString("background:%1;border-bottom:1px solid %2;")
+ .arg(colors::BG_BASE).arg(colors::BORDER_DIM));
+ // Menu bar + popup menus
+ if (menu_bar_) {
+ menu_bar_->setStyleSheet(menu_ss());
+ for (auto* action : menu_bar_->actions())
+ if (action->menu()) action->menu()->setStyleSheet(popup_ss());
+ }
+ // Separators
+ for (auto* s : separators_)
+ s->setStyleSheet(QString("color:%1;background:transparent;padding:0 3px;").arg(colors::TEXT_DIM));
+ // Branding labels
+ auto lbl = [](QLabel* l, const QString& c, bool b = false) {
+ if (l) l->setStyleSheet(QString("color:%1;%2background:transparent;").arg(c, b ? "font-weight:700;" : ""));
+ };
+ lbl(fincept_label_, colors::AMBER(), true);
+ lbl(branding_label_, colors::TEXT_PRIMARY(), true);
+ lbl(subtitle_label_, colors::TEXT_SECONDARY());
+ lbl(live_dot_, colors::POSITIVE());
+ lbl(live_label_, colors::POSITIVE(), true);
+ lbl(clock_label_, colors::TEXT_PRIMARY());
+ lbl(user_label_, colors::AMBER());
+ lbl(credits_label_, colors::POSITIVE());
+ // Buttons
+ if (plan_btn_)
+ plan_btn_->setStyleSheet(QString("QPushButton{color:%1;background:transparent;border:none;padding:0 2px;}"
+ "QPushButton:hover{color:%2;}")
+ .arg(colors::TEXT_PRIMARY).arg(colors::AMBER));
+ if (chat_mode_btn_)
+ chat_mode_btn_->setStyleSheet(
+ QString("QPushButton{background:transparent;color:%1;border:1px solid %2;"
+ "padding:0 8px;font-weight:700;}"
+ "QPushButton:hover{background:%2;color:%3;border-color:%1;}")
+ .arg(colors::AMBER).arg(colors::AMBER_DIM).arg(colors::TEXT_PRIMARY));
+ if (logout_btn_)
+ logout_btn_->setStyleSheet(
+ QString("QPushButton{background:transparent;color:%1;border:1px solid %1;"
+ "padding:0 8px;font-weight:700;}"
+ "QPushButton:hover{background:%1;color:%2;border-color:%1;}")
+ .arg(colors::NEGATIVE).arg(colors::TEXT_PRIMARY));
}
void ToolBar::resizeEvent(QResizeEvent* e) {
@@ -233,8 +263,8 @@ QMenu* ToolBar::build_file_menu() {
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"); });
+ m->addAction("Import Workspace", this, [this]() { emit action_triggered("import_data"); });
+ m->addAction("Export Workspace", this, [this]() { emit action_triggered("export_data"); });
m->addSeparator();
m->addAction("File Manager", this, [this]() { emit navigate_to("file_manager"); });
m->addSeparator();
@@ -346,15 +376,48 @@ QMenu* ToolBar::build_view_menu() {
panels->addAction("AI Chat", this, [this]() { emit action_triggered("panel_ai_chat"); });
m->addSeparator();
- // Quick Switch — jump to a preset screen
+ // Quick Switch — jump to a preset screen layout
auto* persp = m->addMenu("Quick Switch");
persp->setStyleSheet(popup_ss());
persp->addAction("Save Workspace", this, [this]() { emit action_triggered("perspective_save"); });
persp->addSeparator();
- persp->addAction("Trading View", this, [this]() { emit action_triggered("perspective_trading"); });
- persp->addAction("Research View", this, [this]() { emit action_triggered("perspective_research"); });
- persp->addAction("News View", this, [this]() { emit action_triggered("perspective_news"); });
+
+ // Trading
+ auto* qs_trading = persp->addMenu("Trading");
+ qs_trading->setStyleSheet(popup_ss());
+ qs_trading->addAction("Crypto Trading", this, [this]() { emit action_triggered("perspective_trading"); });
+ qs_trading->addAction("Equity Trading", this, [this]() { emit action_triggered("perspective_equity"); });
+ qs_trading->addAction("Algo Trading", this, [this]() { emit action_triggered("perspective_algo"); });
+
+ // Research
+ auto* qs_research = persp->addMenu("Research");
+ qs_research->setStyleSheet(popup_ss());
+ qs_research->addAction("Equity Research", this, [this]() { emit action_triggered("perspective_research"); });
+ qs_research->addAction("Derivatives", this, [this]() { emit action_triggered("perspective_derivatives"); });
+ qs_research->addAction("M&&A Analytics", this, [this]() { emit action_triggered("perspective_ma"); });
+
+ // Portfolio & Markets
persp->addAction("Portfolio View", this, [this]() { emit action_triggered("perspective_portfolio"); });
+ persp->addAction("Markets View", this, [this]() { emit action_triggered("perspective_markets"); });
+ persp->addAction("News View", this, [this]() { emit action_triggered("perspective_news"); });
+
+ // Economics & Data
+ auto* qs_econ = persp->addMenu("Economics && Data");
+ qs_econ->setStyleSheet(popup_ss());
+ qs_econ->addAction("Economics", this, [this]() { emit action_triggered("perspective_economics"); });
+ qs_econ->addAction("Data Sources", this, [this]() { emit action_triggered("perspective_data"); });
+
+ // Geopolitics
+ persp->addAction("Geopolitics View", this, [this]() { emit action_triggered("perspective_geopolitics"); });
+
+ // AI & Quant
+ auto* qs_ai = persp->addMenu("AI && Quant");
+ qs_ai->setStyleSheet(popup_ss());
+ qs_ai->addAction("Quant Lab", this, [this]() { emit action_triggered("perspective_quant"); });
+ qs_ai->addAction("AI Chat", this, [this]() { emit action_triggered("perspective_ai"); });
+
+ // Tools
+ persp->addAction("Tools View", this, [this]() { emit action_triggered("perspective_tools"); });
m->addSeparator();
m->addAction("Refresh Screen\tF5", this, [this]() { emit action_triggered("refresh"); });
diff --git a/fincept-qt/src/ui/navigation/ToolBar.h b/fincept-qt/src/ui/navigation/ToolBar.h
index 63ee2c0a0..59aceebe8 100644
--- a/fincept-qt/src/ui/navigation/ToolBar.h
+++ b/fincept-qt/src/ui/navigation/ToolBar.h
@@ -44,11 +44,14 @@ class ToolBar : public QWidget {
QLabel* live_label_ = nullptr;
QPushButton* plan_btn_ = nullptr;
QPushButton* chat_mode_btn_ = nullptr;
+ QPushButton* logout_btn_ = nullptr;
QTimer* clock_timer_ = nullptr;
QVector<QLabel*> separators_;
+ QLabel* fincept_label_ = nullptr;
CommandBar* command_bar_ = nullptr;
+ void refresh_theme();
void apply_responsive_layout(int width);
QMenu* build_file_menu();
diff --git a/fincept-qt/src/ui/theme/StyleSheets.cpp b/fincept-qt/src/ui/theme/StyleSheets.cpp
index 4385788d7..eaf725496 100644
--- a/fincept-qt/src/ui/theme/StyleSheets.cpp
+++ b/fincept-qt/src/ui/theme/StyleSheets.cpp
@@ -37,15 +37,15 @@ QString data_value() {
QString accent_button() {
return QString("QPushButton { background: %1; color: %2; border: 1px solid %3; "
"padding: 4px 12px; font-size: 12px; font-weight: bold; }"
- "QPushButton:hover { background: #111111; color: #FF8800; }")
- .arg(colors::PANEL, colors::ORANGE, colors::BORDER);
+ "QPushButton:hover { background: %4; color: %2; }")
+ .arg(colors::PANEL, colors::ORANGE, colors::BORDER, colors::BG_RAISED);
}
QString muted_button() {
return QString("QPushButton { background: %1; color: %2; border: 1px solid %3; "
"padding: 4px 12px; font-size: 12px; }"
- "QPushButton:hover { background: #111111; color: %4; }")
- .arg(colors::PANEL, colors::MUTED, colors::BORDER, colors::GRAY);
+ "QPushButton:hover { background: %4; color: %5; }")
+ .arg(colors::PANEL, colors::MUTED, colors::BORDER, colors::BG_RAISED, colors::GRAY);
}
QString news_screen_styles() {
@@ -84,7 +84,7 @@ QString news_screen_styles() {
"#newsFeedList::item:hover { background: transparent; }"
/* ── Breaking banner ── */
- "#newsBreakingBanner { background: rgba(220,38,38,0.15); border-bottom: 1px solid %11; }"
+ "#newsBreakingBanner { background: %17; border-bottom: 1px solid %11; }"
"#newsBreakingTag { color: %4; background: %11; font-size: 10px; font-weight: 700; "
" letter-spacing: 1px; padding: 1px 4px; }"
"#newsBreakingHeadline { color: %4; font-size: 12px; font-weight: 700; background: transparent; }"
@@ -159,7 +159,7 @@ QString news_screen_styles() {
"#newsDetailOpenBtn, #newsDetailCopyBtn { background: %8; color: %7; "
" border: 1px solid %3; font-size: 11px; font-weight: 700; padding: 0 10px; }"
"#newsDetailOpenBtn:hover, #newsDetailCopyBtn:hover { color: %4; }"
- "#newsDetailAnalyzeBtn { background: rgba(217,119,6,0.1); color: %12; "
+ "#newsDetailAnalyzeBtn { background: %16; color: %12; "
" border: 1px solid %10; font-size: 11px; font-weight: 700; padding: 0 10px; }"
"#newsDetailAnalyzeBtn:hover { background: %12; color: %1; }"
"#newsDetailAnalyzeBtn:disabled { color: %6; background: %8; border-color: %3; }"
@@ -196,6 +196,7 @@ QString news_screen_styles() {
.arg(colors::CYAN) // %14
.arg(colors::POSITIVE) // %15
.arg(colors::WARNING) // %16
+ .arg(colors::NEGATIVE_BG) // %17
;
}
@@ -210,7 +211,7 @@ QString crypto_trading_styles() {
" letter-spacing: 1px; background: transparent; border: none; }"
"#cryptoCommandBarSep { color: %3; font-size: 14px; background: transparent; border: none; }"
- "#cryptoExchangeBtn { background: rgba(217,119,6,0.08); color: %12; "
+ "#cryptoExchangeBtn { background: %16; color: %12; "
" border: 1px solid %10; padding: 2px 10px; font-size: 11px; "
" font-weight: 700; letter-spacing: 0.5px; }"
"#cryptoExchangeBtn:hover { background: %12; color: %1; }"
@@ -231,10 +232,10 @@ QString crypto_trading_styles() {
"#cryptoStatLabel { color: %6; font-size: 11px; background: transparent; border: none; }"
"#cryptoModeBtn { padding: 2px 10px; font-weight: 700; font-size: 11px; letter-spacing: 0.5px; }"
- "#cryptoModeBtn[mode=\"paper\"] { background: rgba(22,163,74,0.1); color: %15; border: 1px solid "
- "#14532d; }"
- "#cryptoModeBtn[mode=\"live\"] { background: rgba(220,38,38,0.1); color: %11; border: 1px solid "
- "#7f1d1d; }"
+ "#cryptoModeBtn[mode=\"paper\"] { background: %17; color: %15; border: 1px solid "
+ "%19; }"
+ "#cryptoModeBtn[mode=\"live\"] { background: %18; color: %11; border: 1px solid "
+ "%20; }"
"#cryptoApiBtn { background: %8; color: %7; border: 1px solid %3; "
" padding: 2px 10px; font-size: 11px; font-weight: 700; }"
"#cryptoApiBtn:hover { color: %4; background: %13; }"
@@ -259,7 +260,7 @@ QString crypto_trading_styles() {
" color: %4; padding: 3px 10px; font-size: 12px; }"
"#cryptoWatchlistSearch:focus { border-bottom-color: %5; }"
"#cryptoWatchlistTable { background: %1; border: none; color: %4; font-size: 12px; }"
- "#cryptoWatchlistTable::item { padding: 0 4px; border-bottom: 1px solid #111111; }"
+ "#cryptoWatchlistTable::item { padding: 0 4px; border-bottom: 1px solid %3; }"
"#cryptoWatchlistTable::item:selected { background: %13; }"
"QHeaderView::section { background: %2; color: %9; font-size: 11px; font-weight: 700; "
" border: none; border-bottom: 1px solid %3; padding: 0 4px; }"
@@ -332,11 +333,11 @@ QString crypto_trading_styles() {
"#cryptoOeStatus { font-size: 11px; background: transparent; border: none; }"
"#cryptoOeStatus[error=\"true\"] { color: %11; }"
- "#cryptoBuySubmit { background: rgba(22,163,74,0.12); color: %15; "
- " border: 1px solid #14532d; padding: 8px; font-weight: 700; font-size: 13px; }"
+ "#cryptoBuySubmit { background: %17; color: %15; "
+ " border: 1px solid %19; padding: 8px; font-weight: 700; font-size: 13px; }"
"#cryptoBuySubmit:hover { background: %15; color: %1; }"
- "#cryptoSellSubmit { background: rgba(220,38,38,0.12); color: %11; "
- " border: 1px solid #7f1d1d; padding: 8px; font-weight: 700; font-size: 13px; }"
+ "#cryptoSellSubmit { background: %18; color: %11; "
+ " border: 1px solid %20; padding: 8px; font-weight: 700; font-size: 13px; }"
"#cryptoSellSubmit:hover { background: %11; color: %4; }"
"#cryptoAdvToggle { background: transparent; color: %6; border: none; "
@@ -353,12 +354,12 @@ QString crypto_trading_styles() {
"#cryptoBottomTabs QTabBar::tab:hover:!selected { color: %7; }"
"#cryptoBottomTable { background: %1; border: none; color: %4; font-size: 12px; }"
- "#cryptoBottomTable::item { padding: 0 4px; border-bottom: 1px solid #111111; }"
+ "#cryptoBottomTable::item { padding: 0 4px; border-bottom: 1px solid %3; }"
"#cryptoBottomTable QHeaderView::section { background: %2; color: %9; "
" font-size: 11px; font-weight: 700; border: none; border-bottom: 1px solid %3; padding: 0 4px; }"
- "#cryptoCancelBtn { background: rgba(220,38,38,0.1); color: %11; "
- " border: 1px solid #7f1d1d; padding: 1px 6px; font-size: 10px; font-weight: 700; }"
+ "#cryptoCancelBtn { background: %18; color: %11; "
+ " border: 1px solid %20; padding: 1px 6px; font-size: 10px; font-weight: 700; }"
"#cryptoCancelBtn:hover { background: %11; color: %4; }"
"#cryptoInfoRow { border-bottom: 1px solid %3; }"
@@ -395,6 +396,11 @@ QString crypto_trading_styles() {
.arg(colors::BG_HOVER) // %13
.arg(colors::CYAN) // %14
.arg(colors::POSITIVE) // %15
+ .arg(colors::ACCENT_BG) // %16
+ .arg(colors::POSITIVE_BG) // %17
+ .arg(colors::NEGATIVE_BG) // %18
+ .arg(colors::POSITIVE_DIM) // %19
+ .arg(colors::NEGATIVE_DIM) // %20
;
}
@@ -408,7 +414,7 @@ QString equity_trading_styles() {
"#eqCommandBar { background: %8; border-bottom: 1px solid %3; }"
"#eqCommandBarSep { color: %3; font-size: 14px; background: transparent; border: none; }"
- "#eqBrokerBtn { background: rgba(217,119,6,0.08); color: %12; "
+ "#eqBrokerBtn { background: %16; color: %12; "
" border: 1px solid %10; padding: 2px 10px; font-size: 11px; "
" font-weight: 700; letter-spacing: 0.5px; }"
"#eqBrokerBtn:hover { background: %12; color: %1; }"
@@ -434,8 +440,8 @@ QString equity_trading_styles() {
"#eqStatLabel { color: %6; font-size: 11px; background: transparent; border: none; }"
"#eqModeBtn { padding: 2px 10px; font-weight: 700; font-size: 11px; letter-spacing: 0.5px; }"
- "#eqModeBtn[mode=\"paper\"] { background: rgba(22,163,74,0.1); color: %15; border: 1px solid #14532d; }"
- "#eqModeBtn[mode=\"live\"] { background: rgba(220,38,38,0.1); color: %11; border: 1px solid #7f1d1d; }"
+ "#eqModeBtn[mode=\"paper\"] { background: %17; color: %15; border: 1px solid %19; }"
+ "#eqModeBtn[mode=\"live\"] { background: %18; color: %11; border: 1px solid %20; }"
"#eqApiBtn { background: %8; color: %7; border: 1px solid %3; "
" padding: 2px 10px; font-size: 11px; font-weight: 700; }"
"#eqApiBtn:hover { color: %4; background: %13; }"
@@ -458,7 +464,7 @@ QString equity_trading_styles() {
" color: %4; padding: 3px 10px; font-size: 12px; }"
"#eqWatchlistSearch:focus { border-bottom-color: %5; }"
"#eqWatchlistTable { background: %1; border: none; color: %4; font-size: 12px; }"
- "#eqWatchlistTable::item { padding: 0 4px; border-bottom: 1px solid #111111; }"
+ "#eqWatchlistTable::item { padding: 0 4px; border-bottom: 1px solid %3; }"
"#eqWatchlistTable::item:selected { background: %13; }"
"#eqWatchlistTable QHeaderView::section { background: %2; color: %9; font-size: 11px; "
" font-weight: 700; border: none; border-bottom: 1px solid %3; padding: 0 4px; }"
@@ -525,11 +531,11 @@ QString equity_trading_styles() {
"#eqOeCost { color: %6; font-size: 11px; background: transparent; border: none; }"
"#eqOeStatus { font-size: 11px; background: transparent; border: none; }"
- "#eqBuySubmit { background: rgba(22,163,74,0.12); color: %15; "
- " border: 1px solid #14532d; padding: 8px; font-weight: 700; font-size: 13px; }"
+ "#eqBuySubmit { background: %17; color: %15; "
+ " border: 1px solid %19; padding: 8px; font-weight: 700; font-size: 13px; }"
"#eqBuySubmit:hover { background: %15; color: %1; }"
- "#eqSellSubmit { background: rgba(220,38,38,0.12); color: %11; "
- " border: 1px solid #7f1d1d; padding: 8px; font-weight: 700; font-size: 13px; }"
+ "#eqSellSubmit { background: %18; color: %11; "
+ " border: 1px solid %20; padding: 8px; font-weight: 700; font-size: 13px; }"
"#eqSellSubmit:hover { background: %11; color: %4; }"
"#eqAdvToggle { background: transparent; color: %6; border: none; "
@@ -546,7 +552,7 @@ QString equity_trading_styles() {
"#eqBottomTabs QTabBar::tab:hover:!selected { color: %7; }"
"#eqTable { background: %1; border: none; color: %4; font-size: 12px; }"
- "#eqTable::item { padding: 0 4px; border-bottom: 1px solid #111111; }"
+ "#eqTable::item { padding: 0 4px; border-bottom: 1px solid %3; }"
"#eqTable QHeaderView::section { background: %2; color: %9; "
" font-size: 11px; font-weight: 700; border: none; border-bottom: 1px solid %3; padding: 0 4px; }")
.arg(colors::BG_BASE) // %1
@@ -564,6 +570,11 @@ QString equity_trading_styles() {
.arg(colors::BG_HOVER) // %13
.arg(colors::CYAN) // %14
.arg(colors::POSITIVE) // %15
+ .arg(colors::ACCENT_BG) // %16
+ .arg(colors::POSITIVE_BG) // %17
+ .arg(colors::NEGATIVE_BG) // %18
+ .arg(colors::POSITIVE_DIM) // %19
+ .arg(colors::NEGATIVE_DIM) // %20
;
}
diff --git a/fincept-qt/src/ui/theme/Theme.h b/fincept-qt/src/ui/theme/Theme.h
index 951320ad0..18f9902c7 100644
--- a/fincept-qt/src/ui/theme/Theme.h
+++ b/fincept-qt/src/ui/theme/Theme.h
@@ -53,13 +53,23 @@ inline constexpr ColorToken TEXT_DIM {&ThemeTokens::text_dim};
inline constexpr ColorToken AMBER {&ThemeTokens::accent};
inline constexpr ColorToken AMBER_DIM {&ThemeTokens::accent_dim};
inline constexpr ColorToken ORANGE {&ThemeTokens::accent};
+inline constexpr ColorToken TEXT_ON_ACCENT{&ThemeTokens::text_on_accent};
+
+inline constexpr ColorToken ICON_DIM {&ThemeTokens::icon_dim};
+inline constexpr ColorToken ICON_HOVER {&ThemeTokens::icon_hover};
inline constexpr ColorToken POSITIVE {&ThemeTokens::positive};
+inline constexpr ColorToken POSITIVE_DIM {&ThemeTokens::positive_dim};
inline constexpr ColorToken NEGATIVE {&ThemeTokens::negative};
+inline constexpr ColorToken NEGATIVE_DIM {&ThemeTokens::negative_dim};
inline constexpr ColorToken WARNING {&ThemeTokens::warning};
inline constexpr ColorToken INFO {&ThemeTokens::info};
inline constexpr ColorToken CYAN {&ThemeTokens::cyan};
+inline constexpr ColorToken ACCENT_BG {&ThemeTokens::accent_bg};
+inline constexpr ColorToken POSITIVE_BG {&ThemeTokens::positive_bg};
+inline constexpr ColorToken NEGATIVE_BG {&ThemeTokens::negative_bg};
+
// Legacy aliases
inline constexpr ColorToken GREEN {&ThemeTokens::positive};
inline constexpr ColorToken RED {&ThemeTokens::negative};
@@ -94,6 +104,14 @@ constexpr int DATA = 14;
constexpr int SMALL = 13;
constexpr int TINY = 12;
+/// Runtime font size relative to the user-configured base size.
+/// offset=0 → base (e.g. 14px), offset=-2 → 12px, offset=+2 → 16px.
+/// Minimum clamped to 7px.
+inline int font_px(int offset = 0) {
+ int v = ThemeManager::instance().tokens().font_size_base + offset;
+ return v < 7 ? 7 : v;
+}
+
} // namespace fonts
/// Returns "#16a34a" for positive values, "#dc2626" for negative.
diff --git a/fincept-qt/src/ui/theme/ThemeManager.cpp b/fincept-qt/src/ui/theme/ThemeManager.cpp
index 326a72cce..e323e731d 100644
--- a/fincept-qt/src/ui/theme/ThemeManager.cpp
+++ b/fincept-qt/src/ui/theme/ThemeManager.cpp
@@ -23,11 +23,19 @@ const ThemeTokens THEME_OBSIDIAN = {
.text_dim = "#404040",
.accent = "#d97706",
.accent_dim = "#78350f",
+ .text_on_accent= "#ffffff",
+ .icon_dim = "#808080",
+ .icon_hover = "#e5e5e5",
.positive = "#16a34a",
+ .positive_dim = "#14532d",
.negative = "#dc2626",
+ .negative_dim = "#7f1d1d",
.warning = "#ca8a04",
.info = "#2563eb",
.cyan = "#0891b2",
+ .accent_bg = "#1a1000",
+ .positive_bg = "#0a1a0f",
+ .negative_bg = "#1a0a0a",
.row_alt = "#0c0c0c",
.font_family = "'Consolas','Courier New',monospace",
.font_size_base= 14,
@@ -49,69 +57,25 @@ const ThemeTokens THEME_BLOOMBERG = {
.text_dim = "#3a3a3a",
.accent = "#ff6600",
.accent_dim = "#7c2d00",
+ .text_on_accent= "#ffffff",
+ .icon_dim = "#999999",
+ .icon_hover = "#ffffff",
.positive = "#16a34a",
+ .positive_dim = "#14532d",
.negative = "#ff3333",
+ .negative_dim = "#7f1d1d",
.warning = "#ca8a04",
.info = "#2563eb",
.cyan = "#00b4d8",
+ .accent_bg = "#1a0d00",
+ .positive_bg = "#0a1a0f",
+ .negative_bg = "#1a0808",
.row_alt = "#0d0d0d",
.font_family = "'Consolas','Courier New',monospace",
.font_size_base= 14,
.chart_colors = {"#ff6600","#00b4d8","#16a34a","#ff3333","#2563eb","#ca8a04"},
};
-const ThemeTokens THEME_MATRIX = {
- .name = "Matrix",
- .bg_base = "#030a03",
- .bg_surface = "#051005",
- .bg_raised = "#0a1a0a",
- .bg_hover = "#0f240f",
- .border_dim = "#0d2b0d",
- .border_med = "#143d14",
- .border_bright = "#1e5c1e",
- .text_primary = "#00ff41",
- .text_secondary= "#00bb30",
- .text_tertiary = "#007a1f",
- .text_dim = "#004d13",
- .accent = "#00ff41",
- .accent_dim = "#003d10",
- .positive = "#00ff41",
- .negative = "#ff0000",
- .warning = "#ffff00",
- .info = "#00ccff",
- .cyan = "#00ccff",
- .row_alt = "#040c04",
- .font_family = "'Consolas','Courier New',monospace",
- .font_size_base= 14,
- .chart_colors = {"#00ff41","#00ccff","#ffff00","#ff0000","#00bb30","#007a1f"},
-};
-
-const ThemeTokens THEME_MIDNIGHT = {
- .name = "Midnight Blue",
- .bg_base = "#050a14",
- .bg_surface = "#080f1e",
- .bg_raised = "#0d1628",
- .bg_hover = "#121e33",
- .border_dim = "#0f1f3a",
- .border_med = "#162845",
- .border_bright = "#1e3a5f",
- .text_primary = "#e2e8f0",
- .text_secondary= "#94a3b8",
- .text_tertiary = "#475569",
- .text_dim = "#2d3f55",
- .accent = "#2563eb",
- .accent_dim = "#1e3a8a",
- .positive = "#22c55e",
- .negative = "#ef4444",
- .warning = "#f59e0b",
- .info = "#38bdf8",
- .cyan = "#38bdf8",
- .row_alt = "#060c18",
- .font_family = "'Consolas','Courier New',monospace",
- .font_size_base= 14,
- .chart_colors = {"#2563eb","#38bdf8","#22c55e","#ef4444","#f59e0b","#a78bfa"},
-};
-
const ThemeTokens THEME_LIGHT = {
.name = "Light",
// --- Backgrounds (lightest → slightly darker) ---
@@ -131,12 +95,20 @@ const ThemeTokens THEME_LIGHT = {
// --- Accent (darker amber for white-bg contrast, WCAG AA compliant) ---
.accent = "#b45309",
.accent_dim = "#fef3c7",
+ .text_on_accent= "#ffffff",
+ .icon_dim = "#737373",
+ .icon_hover = "#171717",
// --- Functional (deepened for white-bg readability) ---
.positive = "#15803d",
+ .positive_dim = "#bbf7d0",
.negative = "#dc2626",
+ .negative_dim = "#fecaca",
.warning = "#a16207",
.info = "#1d4ed8",
.cyan = "#0e7490",
+ .accent_bg = "#fef3c7",
+ .positive_bg = "#f0fdf4",
+ .negative_bg = "#fef2f2",
// --- Table ---
.row_alt = "#fafafa",
// --- Font ---
@@ -162,21 +134,9 @@ ThemeManager& ThemeManager::instance() {
void ThemeManager::apply_theme(const QString& name) {
if (name == "Bloomberg Dark") current_ = THEME_BLOOMBERG;
- else if (name == "Matrix") current_ = THEME_MATRIX;
- else if (name == "Midnight Blue") current_ = THEME_MIDNIGHT;
else if (name == "Light") current_ = THEME_LIGHT;
else current_ = THEME_OBSIDIAN;
- // Re-apply custom accent override if one was set
- if (!accent_override_.isEmpty())
- current_.accent = accent_override_.constData();
-
- rebuild_and_apply();
-}
-
-void ThemeManager::apply_accent(const QString& hex) {
- accent_override_ = hex.toUtf8(); // owned storage — no dangling pointer
- current_.accent = accent_override_.constData();
rebuild_and_apply();
}
@@ -200,7 +160,7 @@ QString ThemeManager::current_theme_name() const {
}
QStringList ThemeManager::available_themes() {
- return {"Obsidian", "Bloomberg Dark", "Matrix", "Midnight Blue", "Light"};
+ return {"Obsidian", "Bloomberg Dark", "Light"};
}
QStringList ThemeManager::available_densities() {
@@ -322,28 +282,86 @@ QString ThemeManager::build_global_qss() const {
QMenu::item:selected { background: %12; }
QMenu::separator { background: %6; height: 1px; }
+ QScrollArea { border: none; background: %1; }
+ QFrame { background: transparent; border: none; }
+ QDialog { background: %1; color: %2; }
+
+ QTabWidget::pane { border: none; background: %1; }
+
+ QSpinBox, QDoubleSpinBox {
+ background: %5; color: %2; border: 1px solid %6;
+ padding: %7px %8px;
+ }
+ QSpinBox:focus, QDoubleSpinBox:focus { border: 1px solid %4; }
+ QSpinBox::up-button, QSpinBox::down-button,
+ QDoubleSpinBox::up-button, QDoubleSpinBox::down-button {
+ border: none; background: %11; width: 16px;
+ }
+
+ QTextBrowser {
+ background: %1; color: %2; border: none; padding: 12px;
+ }
+
+ QToolButton {
+ background: transparent; color: %10; border: none;
+ padding: %7px %8px;
+ }
+ QToolButton:hover { background: %11; color: %2; }
+ QToolButton:pressed { background: %12; }
+ QToolButton:checked { background: %12; color: %2; border-bottom: 2px solid %9; }
+
+ QRadioButton { color: %10; }
+ QRadioButton::indicator {
+ width: 12px; height: 12px; border: 1px solid %4;
+ border-radius: 6px; background: %5;
+ }
+ QRadioButton::indicator:checked {
+ background: %9; border-color: %9;
+ }
+
+ QGroupBox {
+ border: 1px solid %6; margin-top: 12px;
+ padding: %8px %7px; color: %10;
+ }
+ QGroupBox::title {
+ subcontrol-origin: margin; left: 8px;
+ padding: 0 4px; color: %9;
+ }
+
+ QSlider::groove:horizontal {
+ height: 4px; background: %6; border-radius: 2px;
+ }
+ QSlider::handle:horizontal {
+ width: 12px; height: 12px; margin: -4px 0;
+ background: %9; border-radius: 6px;
+ }
+ QSlider::handle:horizontal:hover { background: %2; }
+
+ QStatusBar { border: none; background: %1; padding: 0; }
+ QToolBar { border: none; background: %1; spacing: 0; padding: 0; }
+
/* ── ADS Docking System ─────────────────────────────────────────── */
ads--CDockContainerWidget { background: %1; }
ads--CDockAreaWidget { background: %1; }
ads--CDockAreaTitleBar {
- background: %1;
- border-bottom: 1px solid %6;
+ background: %12;
+ border-bottom: 1px solid %3;
padding: 0px;
- min-height: 22px;
- max-height: 22px;
+ min-height: 24px;
+ max-height: 24px;
}
ads--CDockAreaWidget[focused="true"] ads--CDockAreaTitleBar {
- border-bottom: 1px solid %9;
+ border-bottom: 2px solid %9;
}
ads--CDockWidgetTab {
- background: %1;
+ background: %12;
border: none;
- padding: 1px 6px;
- min-height: 20px;
- max-height: 20px;
+ padding: 2px 8px;
+ min-height: 22px;
+ max-height: 22px;
}
ads--CDockWidgetTab[activeTab="true"] {
- background: %5;
+ background: %11;
border-bottom: 2px solid %9;
}
ads--CDockWidgetTab[focused="true"] {
@@ -351,42 +369,93 @@ QString ThemeManager::build_global_qss() const {
}
ads--CDockWidgetTab #dockWidgetTabLabel {
color: %10;
- font-size: 10px;
+ font-size: 11px;
font-weight: 600;
+ background: transparent;
}
ads--CDockWidgetTab[activeTab="true"] #dockWidgetTabLabel {
color: %2;
}
ads--CDockWidgetTab[focused="true"] #dockWidgetTabLabel {
- color: #ffffff;
+ color: %17;
}
ads--CDockWidget {
background: %1;
border: none;
}
ads--CDockSplitter::handle {
- background-color: %6;
+ background-color: %3;
}
#tabCloseButton {
background: none; border: none; padding: 0px;
- max-width: 12px; max-height: 12px; color: #bbbbbb;
+ max-width: 12px; max-height: 12px; color: %10;
}
- #tabCloseButton:hover { background: rgba(255, 255, 255, 24); color: #ffffff; }
- #tabCloseButton:pressed { background: rgba(255, 255, 255, 48); }
+ #tabCloseButton:hover { background: %11; color: %19; }
+ #tabCloseButton:pressed { background: %12; }
ads--CDockWidgetTab[focused="true"] > #tabCloseButton:hover {
- background: rgba(255, 255, 255, 48);
+ background: %12;
}
- #tabsMenuButton { background: none; border: none; padding: 0px; color: #bbbbbb; }
+ #tabsMenuButton { background: none; border: none; padding: 0px; color: %10; }
#tabsMenuButton::menu-indicator { image: none; }
- #tabsMenuButton:hover { background: rgba(255, 255, 255, 24); color: #ffffff; }
- #dockAreaCloseButton { background: none; border: none; padding: 0px; color: #bbbbbb; }
- #dockAreaCloseButton:hover { background: rgba(255, 255, 255, 24); color: #ffffff; }
- #detachGroupButton { background: none; border: none; padding: 0px; color: #bbbbbb; }
- #detachGroupButton:hover { background: rgba(255, 255, 255, 24); color: #ffffff; }
- ads--CTitleBarButton { padding: 0px; max-width: 14px; max-height: 14px; color: #bbbbbb; }
- ads--CTitleBarButton:hover { color: #ffffff; }
+ #tabsMenuButton:hover { background: %11; color: %19; }
+ #dockAreaCloseButton { background: none; border: none; padding: 0px; color: %10; }
+ #dockAreaCloseButton:hover { background: %11; color: %19; }
+ #detachGroupButton { background: none; border: none; padding: 0px; color: %10; }
+ #detachGroupButton:hover { background: %11; color: %19; }
+ ads--CTitleBarButton { padding: 0px; max-width: 14px; max-height: 14px; color: %10; }
+ ads--CTitleBarButton:hover { color: %19; }
ads--CAutoHideSideBar { background: %1; border: none; }
QScrollArea#dockWidgetScrollArea { padding: 0px; border: none; }
+
+ /* ── Reusable object-name selectors ────────────────────────────── */
+ #sectionTitle {
+ color: %9; font-size: 13px; font-weight: 700;
+ background: transparent; border: none; padding: 0;
+ }
+ #sectionHeader {
+ color: %10; font-size: 11px; font-weight: 600;
+ text-transform: uppercase; letter-spacing: 1px;
+ background: transparent; border: none;
+ border-bottom: 1px solid %6; padding-bottom: 4px;
+ }
+ #cardFrame {
+ background: %5; border: 1px solid %6; border-radius: 6px;
+ padding: %8px;
+ }
+ #commandBar {
+ background: %5; border-bottom: 1px solid %6;
+ padding: %7px %8px;
+ }
+ #accentButton {
+ background: %9; color: %17; border: none;
+ padding: %7px %8px; font-weight: 600;
+ }
+ #accentButton:hover { background: %4; }
+ #accentButton:pressed { background: %12; }
+ #mutedButton {
+ background: %12; color: %10; border: 1px solid %6;
+ padding: %7px %8px;
+ }
+ #mutedButton:hover { background: %11; color: %2; }
+ #statusLabel {
+ color: %10; font-size: 11px; background: transparent;
+ border: none; padding: 0;
+ }
+ #dimLabel {
+ color: %13; font-size: 11px; background: transparent;
+ border: none; padding: 0;
+ }
+ #dataLabel {
+ color: %10; font-size: 13px; background: transparent;
+ border: none; padding: 0;
+ }
+ #dataValue {
+ color: %2; font-size: 13px; font-weight: 600;
+ background: transparent; border: none; padding: 0;
+ }
+ #positiveText { color: %20; }
+ #negativeText { color: %21; }
+ #warningText { color: %22; }
)")
// %1 bg_base
.arg(t.bg_base)
@@ -419,7 +488,29 @@ QString ThemeManager::build_global_qss() const {
// %15 font-family
.arg(font_family_)
// %16 font-size
- .arg(font_size_px_);
+ .arg(font_size_px_)
+ // %17 text_on_accent
+ .arg(t.text_on_accent)
+ // %18 icon_dim
+ .arg(t.icon_dim)
+ // %19 icon_hover
+ .arg(t.icon_hover)
+ // %20 positive
+ .arg(t.positive)
+ // %21 negative
+ .arg(t.negative)
+ // %22 warning
+ .arg(t.warning)
+ // %23 positive_dim
+ .arg(t.positive_dim)
+ // %24 negative_dim
+ .arg(t.negative_dim)
+ // %25 accent_bg
+ .arg(t.accent_bg)
+ // %26 positive_bg
+ .arg(t.positive_bg)
+ // %27 negative_bg
+ .arg(t.negative_bg);
}
} // namespace fincept::ui
diff --git a/fincept-qt/src/ui/theme/ThemeManager.h b/fincept-qt/src/ui/theme/ThemeManager.h
index 65a9a6fb4..152c4fc36 100644
--- a/fincept-qt/src/ui/theme/ThemeManager.h
+++ b/fincept-qt/src/ui/theme/ThemeManager.h
@@ -21,15 +21,11 @@ class ThemeManager : public QObject {
public:
static ThemeManager& instance();
- /// Apply a named preset ("Obsidian", "Bloomberg Dark", "Matrix", "Midnight Blue", "Light").
+ /// Apply a named preset ("Obsidian", "Bloomberg Dark", "Light").
/// Builds global QSS from tokens and calls qApp->setStyleSheet().
/// Emits theme_changed(tokens) so custom painters can update.
void apply_theme(const QString& name);
- /// Override the active theme's accent color with a custom hex string (e.g. "#ff0000").
- /// Re-applies QSS and emits theme_changed.
- void apply_accent(const QString& hex);
-
/// Change the application font family and base size.
/// Calls qApp->setFont() immediately — takes effect on all widgets.
void apply_font(const QString& family, int size_px);
@@ -48,7 +44,7 @@ public:
static QStringList available_densities(); // single source of truth for density names
signals:
- /// Emitted after every successful apply_theme / apply_accent / apply_density call.
+ /// Emitted after every successful apply_theme / apply_density call.
/// Custom paintEvent widgets connect to this to invalidate caches and call update().
void theme_changed(const fincept::ui::ThemeTokens& tokens);
@@ -62,7 +58,6 @@ private:
QString font_family_ = "Consolas";
int font_size_px_ = 14;
int density_pad_ = 4; // px padding driven by density setting
- QByteArray accent_override_; // owns memory for custom accent const char*
mutable QString cached_qss_; // last built QSS — skip rebuild if tokens unchanged
};
diff --git a/fincept-qt/src/ui/theme/ThemeTokens.h b/fincept-qt/src/ui/theme/ThemeTokens.h
index 12fa06cc5..b22506c7b 100644
--- a/fincept-qt/src/ui/theme/ThemeTokens.h
+++ b/fincept-qt/src/ui/theme/ThemeTokens.h
@@ -29,13 +29,25 @@ struct ThemeTokens {
// --- Accent (theme-defining color) ---
const char* accent; // primary highlight (amber/green/blue/orange)
const char* accent_dim; // dimmed accent for backgrounds / fills
+ const char* text_on_accent; // text color when accent is the background
+
+ // --- Interactive chrome (close buttons, toolbar icons) ---
+ const char* icon_dim; // muted icon/button color (close, menu, detach)
+ const char* icon_hover; // icon color on hover
// --- Functional (semantic, consistent meaning across all themes) ---
- const char* positive; // gain / success / buy
- const char* negative; // loss / error / sell
- const char* warning; // caution
- const char* info; // informational
- const char* cyan; // secondary highlight / links
+ const char* positive; // gain / success / buy
+ const char* positive_dim; // dimmed positive for borders
+ const char* negative; // loss / error / sell
+ const char* negative_dim; // dimmed negative for borders
+ const char* warning; // caution
+ const char* info; // informational
+ const char* cyan; // secondary highlight / links
+
+ // --- Tinted backgrounds (subtle fills for buy/sell/accent areas) ---
+ const char* accent_bg; // translucent accent background
+ const char* positive_bg; // translucent positive background
+ const char* negative_bg; // translucent negative background
// --- Table ---
const char* row_alt; // alternating row background
@@ -53,8 +65,6 @@ struct ThemeTokens {
// ---------------------------------------------------------------------------
extern const ThemeTokens THEME_OBSIDIAN;
extern const ThemeTokens THEME_BLOOMBERG;
-extern const ThemeTokens THEME_MATRIX;
-extern const ThemeTokens THEME_MIDNIGHT;
extern const ThemeTokens THEME_LIGHT;
} // namespace fincept::ui