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.
C++ ai-agentsalgorithmic-tradingbloomberg-terminalcppfinancefinancial-marketsfintechgood-first-issueinvestmentinvestment-researchmachine-learningopensourcepythonqtquantitative-financestock-markettrading
ai quant lab updated
tilakpatel225a79bc263759
diff --git a/.gitignore b/.gitignoreindex e9b447680..28ecde9a2 100644--- a/.gitignore+++ b/.gitignore@@ -135,3 +135,4 @@ fincept-qt/scripts/exchange/.cache/# ── Internal planning docs ────────────────────────────────────fincept-qt/docs/superpowers/+docs/superpowers/diff --git a/fincept-qt/CMakeLists.txt b/fincept-qt/CMakeLists.txtindex cdee33594..e1c3a39e4 100644--- a/fincept-qt/CMakeLists.txt+++ b/fincept-qt/CMakeLists.txt@@ -1,6 +1,5 @@cmake_minimum_required(VERSION 3.20)project(FinceptTerminal VERSION 4.0.0 LANGUAGES CXX)-enable_testing()set(CMAKE_CXX_STANDARD 20)set(CMAKE_CXX_STANDARD_REQUIRED ON)@@ -266,6 +265,7 @@ set(CORE_SOURCESsrc/core/events/EventBus.cppsrc/core/session/SessionManager.cppsrc/core/session/ScreenStateManager.cpp+ src/core/keys/KeyConfigManager.cpp)# Network@@ -568,6 +568,7 @@ set(SCREEN_SOURCESsrc/screens/settings/SettingsScreen.cppsrc/screens/settings/LlmConfigSection.cppsrc/screens/settings/McpServersSection.cpp+ src/screens/settings/KeybindingsSection.cppsrc/screens/about/AboutScreen.cppsrc/screens/support/SupportScreen.cppsrc/screens/trade_viz/TradeVizScreen.cpp@@ -591,6 +592,8 @@ set(SCREEN_SOURCESsrc/services/relationship_map/RelationshipMapService.cppsrc/screens/markets/MarketsScreen.cppsrc/screens/markets/MarketPanel.cpp+ src/screens/markets/MarketPanelStore.cpp+ src/screens/markets/MarketPanelEditor.cppsrc/screens/dashboard/DashboardScreen.cppsrc/screens/dashboard/DashboardToolBar.cppsrc/screens/dashboard/DashboardStatusBar.cpp@@ -696,11 +699,8 @@ set(SCREEN_SOURCESsrc/screens/gov_data/GovDataProviderPanel.cppsrc/screens/gov_data/GovDataTreasuryPanel.cppsrc/screens/gov_data/GovDataCongressPanel.cpp- src/screens/gov_data/GovDataCanadaPanel.cpp- src/screens/gov_data/GovDataSwissPanel.cppsrc/screens/gov_data/GovDataFrancePanel.cppsrc/screens/gov_data/GovDataHKPanel.cpp- src/screens/gov_data/GovDataCKANPanel.cppsrc/screens/gov_data/GovDataUKPanel.cppsrc/screens/gov_data/GovDataAustraliaPanel.cpp@@ -1004,11 +1004,8 @@ set_source_files_properties(src/screens/gov_data/GovDataProviderPanel.cppsrc/screens/gov_data/GovDataScreen.cppsrc/screens/gov_data/GovDataTreasuryPanel.cpp- src/screens/gov_data/GovDataCanadaPanel.cpp- src/screens/gov_data/GovDataSwissPanel.cppsrc/screens/gov_data/GovDataFrancePanel.cppsrc/screens/gov_data/GovDataHKPanel.cpp- src/screens/gov_data/GovDataCKANPanel.cppsrc/screens/gov_data/GovDataUKPanel.cppsrc/screens/gov_data/GovDataAustraliaPanel.cppsrc/screens/info/ContactScreen.cpp@@ -1020,6 +1017,8 @@ set_source_files_properties(src/screens/ma_analytics/MAModulePanel.cppsrc/screens/maritime/MaritimeScreen.cppsrc/screens/markets/MarketPanel.cpp+ src/screens/markets/MarketPanelStore.cpp+ src/screens/markets/MarketPanelEditor.cppsrc/screens/markets/MarketsScreen.cppsrc/screens/mcp_servers/McpServersScreen.cppsrc/screens/news/NewsCommandBar.cpp@@ -1077,6 +1076,7 @@ set_source_files_properties(src/screens/report_builder/DocumentCanvas.cppsrc/screens/report_builder/PropertiesPanel.cppsrc/screens/report_builder/ReportBuilderScreen.cpp+ src/screens/settings/KeybindingsSection.cppsrc/screens/settings/LlmConfigSection.cppsrc/screens/settings/McpServersSection.cppsrc/screens/settings/SettingsScreen.cpp@@ -1522,14 +1522,6 @@ target_link_libraries(FinceptTerminal PRIVATEOpenSSL::Crypto)-add_executable(fincept_market_sentiment_support_test- tests/MarketSentimentSupportTest.cpp- src/services/equity/MarketSentimentSupport.cpp-)-target_include_directories(fincept_market_sentiment_support_test PRIVATE src)-target_link_libraries(fincept_market_sentiment_support_test PRIVATE Qt6::Core)-add_test(NAME fincept_market_sentiment_support_test COMMAND fincept_market_sentiment_support_test)-# macOS: also link Security.framework for Keychain in SecureStorageif(APPLE)target_link_libraries(FinceptTerminal PRIVATE "-framework Security")diff --git a/fincept-qt/build_err.txt b/fincept-qt/build_err.txtnew file mode 100644index 000000000..eced1b11d--- /dev/null+++ b/fincept-qt/build_err.txt@@ -0,0 +1,2 @@+'vswhere.exe' is not recognized as an internal or external command,+operable program or batch file.diff --git a/fincept-qt/build_log.txt b/fincept-qt/build_log.txtnew file mode 100644index 000000000..e7bb54097--- /dev/null+++ b/fincept-qt/build_log.txt@@ -0,0 +1,42 @@+**********************************************************************+** Visual Studio 2022 Developer Command Prompt v17.0+** Copyright (c) 2022 Microsoft Corporation+**********************************************************************+[vcvarsall.bat] Environment initialized for: 'x64'+MSBuild version 17.14.8+a7a4d5af0 for .NET Framework++ Automatic MOC and UIC for target QSimpleUpdater+ QSimpleUpdater.vcxproj -> C:\windowsdisk\finceptTerminal\fincept-qt\build\_deps\qsimpleupdater-build\Release\QSimpleUpdater.lib+ Automatic MOC and UIC for target QXlsx+ QXlsx.vcxproj -> C:\windowsdisk\finceptTerminal\fincept-qt\build\_deps\qxlsx-build\Release\QXlsxQt6.lib+ Automatic MOC and UIC for target SingleApplication+ SingleApplication.vcxproj -> C:\windowsdisk\finceptTerminal\fincept-qt\build\_deps\singleapplication-build\Release\SingleApplication.lib+ Automatic MOC and UIC for target ggml-base+ ggml-base.vcxproj -> C:\windowsdisk\finceptTerminal\fincept-qt\build\_deps\whisper-build\ggml\src\Release\ggml-base.lib+ Automatic MOC and UIC for target ggml-cpu+ ggml-cpu.vcxproj -> C:\windowsdisk\finceptTerminal\fincept-qt\build\_deps\whisper-build\ggml\src\Release\ggml-cpu.lib+ Automatic MOC and UIC for target ggml+ ggml.vcxproj -> C:\windowsdisk\finceptTerminal\fincept-qt\build\_deps\whisper-build\ggml\src\Release\ggml.lib+ Automatic MOC and UIC for target md4c+ md4c.vcxproj -> C:\windowsdisk\finceptTerminal\fincept-qt\build\_deps\md4c-build\src\Release\md4c.lib+ Automatic MOC and UIC for target md4c-html+ md4c-html.vcxproj -> C:\windowsdisk\finceptTerminal\fincept-qt\build\_deps\md4c-build\src\Release\md4c-html.lib+ Automatic MOC and UIC for target qgeoview+ qgeoview.vcxproj -> C:\windowsdisk\finceptTerminal\fincept-qt\build\_deps\qgeoview-build\lib\Release\qgeoview.dll+ Automatic MOC and UIC for target qtadvanceddocking-qt6+ qtadvanceddocking-qt6.vcxproj -> C:\windowsdisk\finceptTerminal\fincept-qt\build\x64\lib\Release\qtadvanceddocking-qt6_static.lib+ Automatic MOC and UIC for target whisper+ whisper.vcxproj -> C:\windowsdisk\finceptTerminal\fincept-qt\build\_deps\whisper-build\src\Release\whisper.lib+ Automatic MOC and UIC for target FinceptTerminal+ QuantModulePanel.cpp+ Generating code+ 189 of 129224 functions ( 0.1%) were compiled, the rest were copied from previous compilation.+ 147 functions were new in current compilation+ 1231 functions had inline decision re-evaluated but remain unchanged+ Finished generating code+ FinceptTerminal.vcxproj -> C:\windowsdisk\finceptTerminal\fincept-qt\build\Release\FinceptTerminal.exe+ 'pwsh.exe' is not recognized as an internal or external command,+ operable program or batch file.+ Copying OpenSSL DLLs... Copying qgeoview.dll... Overwriting sqldrivers with consistent Qt_temp plugins... Copying Python scripts to build output... Copying yt-dlp for dashboard video playback...+ Automatic MOC and UIC for target md2html+ md2html.vcxproj -> C:\windowsdisk\finceptTerminal\fincept-qt\build\_deps\md4c-build\md2html\Release\md2html.exediff --git a/fincept-qt/build_run.bat b/fincept-qt/build_run.batnew file mode 100644index 000000000..68ee81ad7--- /dev/null+++ b/fincept-qt/build_run.bat@@ -0,0 +1,5 @@+@echo off+call "C:\Program Files\Microsoft Visual Studio\2022\Preview\VC\Auxiliary\Build\vcvars64.bat" > C:\windowsdisk\finceptTerminal\fincept-qt\build_log.txt 2>&1+echo VCVARS loaded >> C:\windowsdisk\finceptTerminal\fincept-qt\build_log.txt+cmake --build "C:\windowsdisk\finceptTerminal\fincept-qt\build" --config Release >> C:\windowsdisk\finceptTerminal\fincept-qt\build_log.txt 2>&1+echo BUILD_EXIT=%ERRORLEVEL% >> C:\windowsdisk\finceptTerminal\fincept-qt\build_log.txtdiff --git a/fincept-qt/scripts/ai_quant_lab/qlib_advanced_backtest.py b/fincept-qt/scripts/ai_quant_lab/qlib_advanced_backtest.pyindex a73e601fa..c0dee404e 100644--- a/fincept-qt/scripts/ai_quant_lab/qlib_advanced_backtest.py+++ b/fincept-qt/scripts/ai_quant_lab/qlib_advanced_backtest.py@@ -653,6 +653,181 @@ class AdvancedBacktestEngine:}+def run_backtest(params: Dict[str, Any]) -> Dict[str, Any]:+ """+ Run a multi-strategy backtest using market data fetched via yfinance.++ Expected params keys (all optional with defaults):+ dataset_config.instruments : comma-separated tickers, e.g. "AAPL,MSFT"+ dataset_config.start_date : "YYYY-MM-DD"+ dataset_config.end_date : "YYYY-MM-DD"+ strategy_config.type : "topk_dropout" | "weight_based" | "enhanced_indexing"+ strategy_config.topk : int (default 10)+ portfolio_config.initial_capital : float (default 1_000_000)+ portfolio_config.benchmark : str ticker (default "SPY")+ """+ if not PANDAS_AVAILABLE:+ return {"success": False, "error": "pandas/numpy not available"}++ try:+ import yfinance as yf+ except ImportError:+ return {"success": False, "error": "yfinance not installed. Run: pip install yfinance"}++ # ── Parse params ────────────────────────────────────────────────────────+ dataset_cfg = params.get("dataset_config", {})+ strategy_cfg = params.get("strategy_config", {})+ portfolio_cfg = params.get("portfolio_config", {})++ raw_instruments = dataset_cfg.get("instruments", "AAPL,MSFT,GOOG,AMZN")+ tickers = [t.strip().upper() for t in raw_instruments.split(",") if t.strip()]+ start_date = dataset_cfg.get("start_date", "2020-01-01")+ end_date = dataset_cfg.get("end_date", "2024-01-01")++ strategy_type = strategy_cfg.get("type", "topk_dropout")+ topk = int(strategy_cfg.get("topk", min(10, len(tickers))))++ initial_capital = float(portfolio_cfg.get("initial_capital", 1_000_000))+ benchmark_ticker = portfolio_cfg.get("benchmark", "SPY") or "SPY"++ # ── Fetch price data ─────────────────────────────────────────────────────+ all_tickers = list(set(tickers + [benchmark_ticker]))+ raw = yf.download(all_tickers, start=start_date, end=end_date,+ auto_adjust=True, progress=False)++ if raw.empty:+ return {"success": False, "error": "No data returned from yfinance. Check tickers and date range."}++ # Handle single vs multi ticker response+ if isinstance(raw.columns, pd.MultiIndex):+ close = raw["Close"].dropna(how="all")+ volume = raw["Volume"].dropna(how="all")+ else:+ close = raw[["Close"]].rename(columns={"Close": tickers[0]}).dropna()+ volume = raw[["Volume"]].rename(columns={"Volume": tickers[0]}).dropna()++ # Drop benchmark from strategy tickers+ strat_tickers = [t for t in tickers if t in close.columns]+ if not strat_tickers:+ return {"success": False, "error": f"None of the requested tickers had data: {tickers}"}++ topk = min(topk, len(strat_tickers))++ # ── Simple momentum strategy signal ──────────────────────────────────────+ # Rank tickers by trailing 20-day return, hold top-K equally weighted+ returns = close[strat_tickers].pct_change()+ momentum_20d = close[strat_tickers].pct_change(20)++ portfolio_returns = []+ dates = returns.index[20:] # skip warmup++ for dt in dates:+ row_mom = momentum_20d.loc[dt].dropna()+ if row_mom.empty:+ portfolio_returns.append(0.0)+ continue++ if strategy_type == "topk_dropout":+ selected = row_mom.nlargest(topk).index.tolist()+ elif strategy_type == "weight_based":+ # weight proportional to momentum score (long only)+ pos = row_mom[row_mom > 0]+ selected = pos.nlargest(topk).index.tolist()+ else: # enhanced_indexing — equal weight all+ selected = row_mom.index.tolist()++ if not selected:+ portfolio_returns.append(0.0)+ continue++ day_ret = returns.loc[dt, selected].mean()+ portfolio_returns.append(float(day_ret) if not pd.isna(day_ret) else 0.0)++ # ── Benchmark returns ────────────────────────────────────────────────────+ bm_col = benchmark_ticker if benchmark_ticker in close.columns else None+ if bm_col:+ bm_returns = close[bm_col].pct_change().loc[dates].fillna(0.0).tolist()+ else:+ bm_returns = [0.0] * len(dates)++ # ── Compute equity curve & metrics ───────────────────────────────────────+ port_series = pd.Series(portfolio_returns, index=dates)+ bm_series = pd.Series(bm_returns, index=dates)++ port_cum = (1 + port_series).cumprod() * initial_capital+ bm_cum = (1 + bm_series).cumprod() * initial_capital++ # Annualised return+ n_years = len(dates) / 252+ final_val = float(port_cum.iloc[-1]) if not port_cum.empty else initial_capital+ total_ret = (final_val - initial_capital) / initial_capital+ ann_ret = (1 + total_ret) ** (1 / n_years) - 1 if n_years > 0 else 0.0++ # Volatility & Sharpe+ ann_vol = float(port_series.std() * np.sqrt(252))+ sharpe = ann_ret / ann_vol if ann_vol > 0 else 0.0++ # Max drawdown+ running_max = port_cum.cummax()+ drawdown = (port_cum - running_max) / running_max+ max_dd = float(drawdown.min())++ # Calmar+ calmar = ann_ret / abs(max_dd) if max_dd != 0 else 0.0++ # Win rate+ win_rate = float((port_series > 0).mean())++ # Transaction cost estimate (using AdvancedBacktestEngine)+ engine = AdvancedBacktestEngine(initial_capital=initial_capital)+ avg_price = float(close[strat_tickers].iloc[-1].mean())+ avg_vol_val = float(volume[strat_tickers].iloc[-20:].mean().mean()) if strat_tickers[0] in volume.columns else 1e6+ sample_execution = engine.simulate_order(+ strat_tickers[0], "buy", 1000, avg_price, avg_vol_val,+ float(port_series.std()), "market"+ )++ # Equity curve (downsample to ~100 points for display)+ step = max(1, len(port_cum) // 100)+ equity_curve = [+ {"date": str(d.date()), "portfolio": round(float(v), 2),+ "benchmark": round(float(b), 2)}+ for d, v, b in zip(port_cum.index[::step],+ port_cum.values[::step],+ bm_cum.values[::step])+ ]++ return {+ "success": True,+ "strategy": strategy_type,+ "tickers": strat_tickers,+ "start_date": start_date,+ "end_date": end_date,+ "metrics": {+ "initial_capital": round(initial_capital, 2),+ "final_value": round(final_val, 2),+ "total_return_pct": round(total_ret * 100, 2),+ "annualised_return": round(ann_ret * 100, 2),+ "annualised_vol": round(ann_vol * 100, 2),+ "sharpe_ratio": round(sharpe, 3),+ "max_drawdown_pct": round(max_dd * 100, 2),+ "calmar_ratio": round(calmar, 3),+ "win_rate_pct": round(win_rate * 100, 2),+ "trading_days": len(dates),+ },+ "execution_cost_estimate": {+ "commission_bps": round(sample_execution.get("market_impact_bps", 0), 2),+ "expected_slippage_bps": round(sample_execution.get("expected_slippage_bps", 0), 2),+ },+ "equity_curve": equity_curve,+ }+++def optimize_portfolio(params: Dict[str, Any]) -> Dict[str, Any]:+ """Placeholder for portfolio optimisation — returns not-yet-implemented."""+ return {"success": False, "error": "optimize_portfolio not yet implemented"}++def main():"""CLI interface"""if len(sys.argv) < 2:@@ -674,10 +849,24 @@ def main():"VWAP execution","Implementation Shortfall","POV execution",- "Transaction cost analysis"+ "Transaction cost analysis",+ "run_backtest (yfinance momentum strategy)",]}print(json.dumps(result))++ elif command == "run_backtest":+ raw = sys.argv[2] if len(sys.argv) > 2 else "{}"+ params = json.loads(raw)+ result = run_backtest(params)+ print(json.dumps(result))++ elif command == "optimize_portfolio":+ raw = sys.argv[2] if len(sys.argv) > 2 else "{}"+ params = json.loads(raw)+ result = optimize_portfolio(params)+ print(json.dumps(result))+else:result = {"success": False, "error": f"Unknown command: {command}"}print(json.dumps(result))diff --git a/fincept-qt/scripts/ai_quant_lab/qlib_high_frequency.py b/fincept-qt/scripts/ai_quant_lab/qlib_high_frequency.pyindex 5a2997262..d25d03503 100644--- a/fincept-qt/scripts/ai_quant_lab/qlib_high_frequency.py+++ b/fincept-qt/scripts/ai_quant_lab/qlib_high_frequency.py@@ -1,530 +1,461 @@"""-AI Quant Lab - High Frequency Trading Module-HFT operations: tick data processing, microstructure analysis, latency optimization-Order book dynamics, market making strategies, and ultra-low latency execution+AI Quant Lab — High Frequency Trading Module+Real-world microstructure analysis engine backed by live CCXT market data.++Commands (all accept JSON as second argv):+ fetch_orderbook {"exchange":"binance","symbol":"BTC/USDT","depth":20}+ fetch_trades {"exchange":"binance","symbol":"BTC/USDT","limit":100}+ analyze {"exchange":"binance","symbol":"BTC/USDT","depth":20,"limit":100,"inventory":0,"spread_multiplier":1.5}+ market_making {"exchange":"binance","symbol":"BTC/USDT","inventory":0,"spread_multiplier":1.5}+ toxic_flow {"exchange":"binance","symbol":"BTC/USDT","limit":200}+ slippage {"exchange":"binance","symbol":"BTC/USDT","side":"buy","quantity":1.0}++All commands output a single JSON object to stdout."""import jsonimport sysimport os-from datetime import datetime, timedelta-from typing import Dict, List, Any, Optional, Union, Tuple-from collections import deque-import warnings-warnings.filterwarnings('ignore')+import time+from datetime import datetime+from typing import Anyimport numpy as np-import pandas as pd-# Qlib high-frequency imports-HFT_AVAILABLE = False-HFT_ERROR = None+# ── Exchange client path ──────────────────────────────────────────────────────+_EXCHANGE_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "exchange")+if _EXCHANGE_DIR not in sys.path:+ sys.path.insert(0, _EXCHANGE_DIR)++import warnings+warnings.filterwarnings("ignore")try:- import qlib- from qlib.contrib.ops.high_freq import *- from qlib.data import D- from qlib.config import REG_CN, REG_US- HFT_AVAILABLE = True+ from exchange_client import make_exchange+ _CCXT_AVAILABLE = Trueexcept ImportError as e:- HFT_ERROR = str(e)+ _CCXT_AVAILABLE = False+ _CCXT_ERROR = str(e)-class OrderBook:- """- Order Book simulator for high-frequency trading- Maintains bid/ask levels and provides microstructure features- """+# ── Helpers ───────────────────────────────────────────────────────────────────- def __init__(self, depth: int = 10):- self.depth = depth- self.bids = {} # {price: volume}- self.asks = {} # {price: volume}- self.trades = deque(maxlen=1000)- self.timestamp = None-- def update(self, bids: Dict[float, float], asks: Dict[float, float], timestamp: datetime):- """Update order book with new levels"""- self.bids = bids- self.asks = asks- self.timestamp = timestamp-- def add_trade(self, price: float, volume: float, side: str, timestamp: datetime):- """Record a trade"""- self.trades.append({- 'price': price,- 'volume': volume,- 'side': side,- 'timestamp': timestamp- })-- def get_best_bid(self) -> Optional[Tuple[float, float]]:- """Get best bid (highest buy price)"""- if not self.bids:- return None- best_price = max(self.bids.keys())- return best_price, self.bids[best_price]-- def get_best_ask(self) -> Optional[Tuple[float, float]]:- """Get best ask (lowest sell price)"""- if not self.asks:- return None- best_price = min(self.asks.keys())- return best_price, self.asks[best_price]-- def get_spread(self) -> Optional[float]:- """Get bid-ask spread"""- best_bid = self.get_best_bid()- best_ask = self.get_best_ask()- if best_bid and best_ask:- return best_ask[0] - best_bid[0]- return None-- def get_mid_price(self) -> Optional[float]:- """Get mid price"""- best_bid = self.get_best_bid()- best_ask = self.get_best_ask()- if best_bid and best_ask:- return (best_bid[0] + best_ask[0]) / 2- return None-- def get_vwap(self, n_levels: int = 5) -> Dict[str, float]:- """Volume-weighted average price for top N levels"""- bid_prices = sorted(self.bids.keys(), reverse=True)[:n_levels]- ask_prices = sorted(self.asks.keys())[:n_levels]-- bid_vwap = sum(p * self.bids[p] for p in bid_prices) / sum(self.bids[p] for p in bid_prices) if bid_prices else 0- ask_vwap = sum(p * self.asks[p] for p in ask_prices) / sum(self.asks[p] for p in ask_prices) if ask_prices else 0-- return {'bid_vwap': bid_vwap, 'ask_vwap': ask_vwap}-- def get_depth_imbalance(self, n_levels: int = 5) -> float:- """- Order book imbalance- Positive = more buy pressure, Negative = more sell pressure- """- bid_prices = sorted(self.bids.keys(), reverse=True)[:n_levels]- ask_prices = sorted(self.asks.keys())[:n_levels]-- total_bid_volume = sum(self.bids[p] for p in bid_prices)- total_ask_volume = sum(self.asks[p] for p in ask_prices)-- if total_bid_volume + total_ask_volume == 0:- return 0.0-- return (total_bid_volume - total_ask_volume) / (total_bid_volume + total_ask_volume)-- def get_microstructure_features(self) -> Dict[str, float]:- """Calculate microstructure features"""- features = {- 'spread': self.get_spread() or 0.0,- 'mid_price': self.get_mid_price() or 0.0,- 'depth_imbalance': self.get_depth_imbalance(),- 'total_bid_volume': sum(self.bids.values()),- 'total_ask_volume': sum(self.asks.values()),- }-- # VWAP features- vwap = self.get_vwap()- features.update(vwap)-- # Recent trade features- if len(self.trades) > 0:- recent_trades = list(self.trades)[-10:]- features['recent_trade_price_mean'] = np.mean([t['price'] for t in recent_trades])- features['recent_trade_price_std'] = np.std([t['price'] for t in recent_trades])- features['recent_trade_volume_sum'] = sum(t['volume'] for t in recent_trades)-- return features---class HighFrequencyTrader:- """- High Frequency Trading System- Implements HFT strategies, tick data processing, and market making- """+def _ok(data: dict) -> None:+ print(json.dumps({"success": True, **data}, default=str))- def __init__(self):- self.qlib_initialized = False- self.order_books = {}- self.tick_data = {}- self.strategies = {}- self.positions = {}- self.pnl = 0.0-- def initialize(self,- provider_uri: str = "~/.qlib/qlib_data/cn_data",- region: str = "cn") -> Dict[str, Any]:- """Initialize Qlib for HFT"""- try:- if region == "cn":- qlib.init(provider_uri=provider_uri, region=REG_CN)- else:- qlib.init(provider_uri=provider_uri, region=REG_US)-- self.qlib_initialized = True- return {- 'success': True,- 'message': 'Qlib initialized for HFT',- 'hft_module_available': HFT_AVAILABLE- }- except Exception as e:- return {'success': False, 'error': str(e)}-- def create_order_book(self,- symbol: str,- depth: int = 10) -> Dict[str, Any]:- """Create order book for a symbol"""- try:- self.order_books[symbol] = OrderBook(depth=depth)- self.positions[symbol] = 0.0-- return {- 'success': True,- 'symbol': symbol,- 'depth': depth,- 'message': f'Order book created for {symbol}'- }- except Exception as e:- return {'success': False, 'error': str(e)}-- def update_order_book(self,- symbol: str,- bids: Dict[float, float],- asks: Dict[float, float],- timestamp: Optional[datetime] = None) -> Dict[str, Any]:- """Update order book with new data"""- if symbol not in self.order_books:- return {'success': False, 'error': f'Order book for {symbol} not found'}+def _err(msg: str) -> None:+ print(json.dumps({"success": False, "error": msg}))+def _params() -> dict:+ if len(sys.argv) > 2:try:- timestamp = timestamp or datetime.now()- self.order_books[symbol].update(bids, asks, timestamp)-- features = self.order_books[symbol].get_microstructure_features()-- return {- 'success': True,- 'symbol': symbol,- 'timestamp': timestamp.isoformat(),- 'features': features- }- except Exception as e:- return {'success': False, 'error': str(e)}-- def add_trade(self,- symbol: str,- price: float,- volume: float,- side: str,- timestamp: Optional[datetime] = None) -> Dict[str, Any]:- """Record a trade"""- if symbol not in self.order_books:- return {'success': False, 'error': f'Order book for {symbol} not found'}+ return json.loads(sys.argv[2])+ except (json.JSONDecodeError, ValueError):+ return {}+ return {}- try:- timestamp = timestamp or datetime.now()- self.order_books[symbol].add_trade(price, volume, side, timestamp)-- return {- 'success': True,- 'symbol': symbol,- 'trade': {- 'price': price,- 'volume': volume,- 'side': side,- 'timestamp': timestamp.isoformat()- }- }- except Exception as e:- return {'success': False, 'error': str(e)}-- def calculate_market_making_quotes(self,- symbol: str,- inventory: float = 0.0,- risk_aversion: float = 0.01,- spread_multiplier: float = 1.5) -> Dict[str, Any]:- """- Calculate market making bid/ask quotes- Uses Avellaneda-Stoikov model for optimal quoting- """- if symbol not in self.order_books:- return {'success': False, 'error': f'Order book for {symbol} not found'}- try:- order_book = self.order_books[symbol]- mid_price = order_book.get_mid_price()- spread = order_book.get_spread()-- if mid_price is None or spread is None:- return {'success': False, 'error': 'Insufficient market data'}-- # Adjust for inventory (inventory risk)- inventory_adjustment = risk_aversion * inventory * spread-- # Calculate optimal bid/ask- optimal_spread = spread * spread_multiplier- bid_price = mid_price - (optimal_spread / 2) - inventory_adjustment- ask_price = mid_price + (optimal_spread / 2) - inventory_adjustment-- # Calculate quote size based on market depth- depth_imbalance = order_book.get_depth_imbalance()- base_size = 100 # Base order size-- bid_size = base_size * (1 + depth_imbalance) if depth_imbalance > 0 else base_size- ask_size = base_size * (1 - depth_imbalance) if depth_imbalance < 0 else base_size-- return {- 'success': True,- 'symbol': symbol,- 'mid_price': mid_price,- 'spread': spread,- 'quotes': {- 'bid': {'price': round(bid_price, 2), 'size': int(bid_size)},- 'ask': {'price': round(ask_price, 2), 'size': int(ask_size)}- },- 'inventory': inventory,- 'depth_imbalance': depth_imbalance- }- except Exception as e:- return {'success': False, 'error': str(e)}-- def detect_toxic_flow(self,- symbol: str,- window_size: int = 100) -> Dict[str, Any]:- """- Detect informed trading / toxic order flow- High volume imbalance + price movement suggests informed traders- """- if symbol not in self.order_books:- return {'success': False, 'error': f'Order book for {symbol} not found'}+# ── Order book analytics ──────────────────────────────────────────────────────- try:- order_book = self.order_books[symbol]-- # Analyze recent trades- if len(order_book.trades) < window_size:- return {'success': False, 'error': 'Insufficient trade history'}-- recent_trades = list(order_book.trades)[-window_size:]-- buy_volume = sum(t['volume'] for t in recent_trades if t['side'] == 'buy')- sell_volume = sum(t['volume'] for t in recent_trades if t['side'] == 'sell')-- volume_imbalance = (buy_volume - sell_volume) / (buy_volume + sell_volume) if (buy_volume + sell_volume) > 0 else 0-- # Price momentum- prices = [t['price'] for t in recent_trades]- price_change = (prices[-1] - prices[0]) / prices[0] if prices[0] != 0 else 0-- # Toxicity score: high when volume imbalance aligns with price movement- toxicity_score = abs(volume_imbalance) * abs(price_change) * 100-- is_toxic = toxicity_score > 0.5 # Threshold for toxic flow-- return {- 'success': True,- 'symbol': symbol,- 'toxicity_score': float(toxicity_score),- 'is_toxic': is_toxic,- 'volume_imbalance': float(volume_imbalance),- 'price_change': float(price_change),- 'action': 'widen_spreads' if is_toxic else 'normal'- }- except Exception as e:- return {'success': False, 'error': str(e)}-- def execute_aggressive_order(self,- symbol: str,- side: str,- size: float,- max_slippage: float = 0.001) -> Dict[str, Any]:- """- Execute aggressive order by crossing the spread- Implements smart order routing with slippage control- """- if symbol not in self.order_books:- return {'success': False, 'error': f'Order book for {symbol} not found'}+def _compute_book_metrics(bids: list, asks: list, n_levels: int = 10) -> dict:+ """Compute microstructure metrics from raw [price, size] arrays."""+ if not bids or not asks:+ return {}- try:- order_book = self.order_books[symbol]-- if side == 'buy':- best_ask = order_book.get_best_ask()- if not best_ask:- return {'success': False, 'error': 'No asks available'}-- execution_price = best_ask[0]- available_size = best_ask[1]-- else: # sell- best_bid = order_book.get_best_bid()- if not best_bid:- return {'success': False, 'error': 'No bids available'}-- execution_price = best_bid[0]- available_size = best_bid[1]-- # Check slippage- mid_price = order_book.get_mid_price()- slippage = abs(execution_price - mid_price) / mid_price if mid_price else 0-- if slippage > max_slippage:- return {- 'success': False,- 'error': f'Slippage {slippage:.4f} exceeds maximum {max_slippage}'- }-- # Execute- executed_size = min(size, available_size)- self.positions[symbol] += executed_size if side == 'buy' else -executed_size-- return {- 'success': True,- 'symbol': symbol,- 'side': side,- 'executed_price': execution_price,- 'executed_size': executed_size,- 'slippage': float(slippage),- 'position': self.positions[symbol]- }- except Exception as e:- return {'success': False, 'error': str(e)}-- def get_latency_stats(self) -> Dict[str, Any]:- """Get latency statistics (simulated for now)"""- return {- 'success': True,- 'latency_stats': {- 'mean_latency_us': 150, # microseconds- 'p50_latency_us': 120,- 'p99_latency_us': 300,- 'p999_latency_us': 500,- 'max_latency_us': 1000- },- 'message': 'Latency stats (simulated)'- }-- def get_order_book_snapshot(self, symbol: str, n_levels: int = 5) -> Dict[str, Any]:- """Get order book snapshot"""- if symbol not in self.order_books:- return {'success': False, 'error': f'Order book for {symbol} not found'}+ best_bid, best_bid_sz = bids[0][0], bids[0][1]+ best_ask, best_ask_sz = asks[0][0], asks[0][1]+ spread = best_ask - best_bid+ mid_price = (best_bid + best_ask) / 2+ spread_bps = (spread / mid_price) * 10_000++ # Top-N volume+ bid_slice = bids[:n_levels]+ ask_slice = asks[:n_levels]+ bid_vol = sum(b[1] for b in bid_slice)+ ask_vol = sum(a[1] for a in ask_slice)+ total_vol = bid_vol + ask_vol++ # Order book imbalance (OBI) — key signal for short-term price direction+ obi = (bid_vol - ask_vol) / total_vol if total_vol > 0 else 0.0++ # VWAP per side (top N levels)+ bid_vwap = (sum(b[0] * b[1] for b in bid_slice) / bid_vol) if bid_vol > 0 else best_bid+ ask_vwap = (sum(a[0] * a[1] for a in ask_slice) / ask_vol) if ask_vol > 0 else best_ask++ # Weighted mid price (accounts for liquidity at each level)+ weighted_mid = (bid_vwap * ask_vol + ask_vwap * bid_vol) / (bid_vol + ask_vol) if total_vol > 0 else mid_price++ return {+ "best_bid": best_bid,+ "best_bid_size": best_bid_sz,+ "best_ask": best_ask,+ "best_ask_size": best_ask_sz,+ "spread": round(spread, 8),+ "spread_bps": round(spread_bps, 4),+ "mid_price": mid_price,+ "weighted_mid": round(weighted_mid, 8),+ "bid_volume": round(bid_vol, 4),+ "ask_volume": round(ask_vol, 4),+ "obi": round(obi, 4), # +1 = all bids, -1 = all asks+ "bid_vwap": round(bid_vwap, 8),+ "ask_vwap": round(ask_vwap, 8),+ "pressure": "BUY" if obi > 0.1 else "SELL" if obi < -0.1 else "NEUTRAL",+ }+++# ── Market making (Avellaneda-Stoikov) ────────────────────────────────────────++def _market_making_quotes(metrics: dict, inventory: float, spread_multiplier: float,+ risk_aversion: float = 0.01) -> dict:+ """+ Avellaneda-Stoikov optimal quoting model.+ inventory: current position in base asset (positive = long, negative = short)+ spread_multiplier: widens the quoted spread beyond raw market spread+ """+ mid = metrics["mid_price"]+ sprd = metrics["spread"]- try:- order_book = self.order_books[symbol]+ if mid == 0 or sprd == 0:+ return {"error": "Insufficient market data for quoting"}- bid_prices = sorted(order_book.bids.keys(), reverse=True)[:n_levels]- ask_prices = sorted(order_book.asks.keys())[:n_levels]+ inventory_adj = risk_aversion * inventory * sprd+ optimal_spread = sprd * spread_multiplier+ base_size = 100 # normalised quote size- bids = [{'price': p, 'size': order_book.bids[p]} for p in bid_prices]- asks = [{'price': p, 'size': order_book.asks[p]} for p in ask_prices]+ obi = metrics.get("obi", 0.0)+ bid_size = round(base_size * (1 + obi), 2) if obi > 0 else base_size+ ask_size = round(base_size * (1 - obi), 2) if obi < 0 else base_size- return {- 'success': True,- 'symbol': symbol,- 'timestamp': order_book.timestamp.isoformat() if order_book.timestamp else None,- 'bids': bids,- 'asks': asks,- 'spread': order_book.get_spread(),- 'mid_price': order_book.get_mid_price()- }- except Exception as e:- return {'success': False, 'error': str(e)}+ bid_price = mid - (optimal_spread / 2) - inventory_adj+ ask_price = mid + (optimal_spread / 2) - inventory_adj+ edge_per_side = (optimal_spread / 2)+ edge_bps = (edge_per_side / mid) * 10_000-def main():- """Main CLI interface"""- if len(sys.argv) < 2:- print(json.dumps({- 'success': False,- 'error': 'Usage: python qlib_high_frequency.py <command> [args...]'- }))- return+ return {+ "bid_price": round(bid_price, 8),+ "ask_price": round(ask_price, 8),+ "bid_size": bid_size,+ "ask_size": ask_size,+ "quoted_spread": round(optimal_spread, 8),+ "quoted_spread_bps": round((optimal_spread / mid) * 10_000, 4),+ "edge_per_side_bps": round(edge_bps, 4),+ "inventory_adj": round(inventory_adj, 8),+ "inventory": inventory,+ "recommendation": "WIDEN" if metrics.get("pressure") == "SELL" and inventory > 0 else+ "TIGHTEN" if metrics.get("pressure") == "BUY" else "MAINTAIN",+ }- command = sys.argv[1]- trader = HighFrequencyTrader()-- # Helper: parse second arg as JSON dict or return empty dict- def params_or_empty():- if len(sys.argv) > 2:- try:- return json.loads(sys.argv[2])- except (json.JSONDecodeError, ValueError):- return {}- return {}- # Helper: get symbol from JSON params or positional arg- def get_symbol(default='AAPL'):- if len(sys.argv) > 2:- try:- p = json.loads(sys.argv[2])- return p.get('symbol', default)- except (json.JSONDecodeError, ValueError):- return sys.argv[2]- return default+# ── Toxic flow detection ──────────────────────────────────────────────────────+def _detect_toxic_flow(trades: list, metrics: dict) -> dict:+ """+ Probability of Informed Trading (PIN) approximation.+ Combines:+ - Volume imbalance (buy vs sell pressure in recent trades)+ - Price impact (did trade flow move the price?)+ - Order book pressure (OBI)+ """+ if len(trades) < 10:+ return {"error": f"Need at least 10 trades, got {len(trades)}"}++ buys = [t for t in trades if t.get("side") == "buy"]+ sells = [t for t in trades if t.get("side") == "sell"]++ buy_vol = sum(t.get("amount", 0) for t in buys)+ sell_vol = sum(t.get("amount", 0) for t in sells)+ total = buy_vol + sell_vol++ if total == 0:+ return {"error": "No volume in trade data"}++ # Volume imbalance ratio+ vol_imbalance = (buy_vol - sell_vol) / total++ # Price impact: first vs last trade price+ prices = [t.get("price", 0) for t in trades if t.get("price")]+ price_chg = ((prices[-1] - prices[0]) / prices[0] * 100) if len(prices) >= 2 and prices[0] else 0.0+ price_chg_bps = price_chg * 100++ # Trade size concentration (large trades = more likely informed)+ amounts = [t.get("amount", 0) for t in trades]+ avg_size = np.mean(amounts) if amounts else 0+ max_size = max(amounts) if amounts else 0+ size_ratio = (max_size / avg_size) if avg_size > 0 else 1.0++ # OBI from live book+ obi = metrics.get("obi", 0.0)++ # Composite toxicity score (0-100)+ toxicity = (+ abs(vol_imbalance) * 40 ++ min(abs(price_chg_bps) / 10, 1.0) * 30 ++ min((size_ratio - 1) / 9, 1.0) * 20 ++ abs(obi) * 10+ )++ is_toxic = toxicity > 45+ aligns_with_book = (vol_imbalance > 0 and obi > 0) or (vol_imbalance < 0 and obi < 0)++ return {+ "toxicity_score": round(toxicity, 2), # 0-100+ "is_toxic": is_toxic,+ "vol_imbalance": round(vol_imbalance, 4), # -1 to +1+ "price_impact_bps": round(price_chg_bps, 2),+ "avg_trade_size": round(avg_size, 6),+ "max_trade_size": round(max_size, 6),+ "size_concentration": round(size_ratio, 2),+ "obi": round(obi, 4),+ "aligns_with_book": aligns_with_book,+ "buy_volume": round(buy_vol, 4),+ "sell_volume": round(sell_vol, 4),+ "trade_count": len(trades),+ "action": "WIDEN_SPREADS" if is_toxic else+ "STEP_BACK" if toxicity > 30 else "NORMAL",+ "classification": "HIGH_RISK" if toxicity > 60 else+ "ELEVATED" if toxicity > 30 else "CLEAN",+ }+++# ── Slippage estimation ───────────────────────────────────────────────────────++def _estimate_slippage(bids: list, asks: list, side: str, quantity: float) -> dict:+ """+ Walk the order book to estimate real slippage for a given quantity.+ Returns fills, average price, total cost, and slippage vs mid.+ """+ levels = asks if side == "buy" else bids+ if not levels:+ return {"error": "No liquidity on requested side"}++ mid_price = ((bids[0][0] if bids else 0) + (asks[0][0] if asks else 0)) / 2+ remaining = quantity+ fills = []+ total_cost = 0.0++ for price, size in levels:+ if remaining <= 0:+ break+ fill_qty = min(remaining, size)+ fill_cost = fill_qty * price+ fills.append({"price": price, "quantity": round(fill_qty, 8), "cost": round(fill_cost, 6)})+ total_cost += fill_cost+ remaining -= fill_qty++ if remaining > 0:+ return {"error": f"Insufficient liquidity — {round(remaining, 8)} units unfilled"}++ filled_qty = quantity - remaining+ avg_price = total_cost / filled_qty if filled_qty > 0 else 0+ slippage_bps = abs(avg_price - mid_price) / mid_price * 10_000 if mid_price > 0 else 0++ return {+ "side": side,+ "quantity": quantity,+ "filled_quantity": round(filled_qty, 8),+ "average_price": round(avg_price, 8),+ "total_cost": round(total_cost, 6),+ "slippage_bps": round(slippage_bps, 4),+ "mid_price": round(mid_price, 8),+ "fills": fills,+ "fill_count": len(fills),+ "viable": slippage_bps < 20, # <2bps = acceptable for most algos+ }+++# ── Command handlers ──────────────────────────────────────────────────────────++def cmd_fetch_orderbook(p: dict) -> None:+ if not _CCXT_AVAILABLE:+ _err(f"CCXT not available: {_CCXT_ERROR}")+ return+ exchange_id = p.get("exchange", "binance")+ symbol = p.get("symbol", "BTC/USDT")+ depth = int(p.get("depth", 20))+ t0 = time.monotonic()+ try:+ ex = make_exchange(exchange_id)+ ob = ex.fetch_order_book(symbol, limit=depth)+ except Exception as e:+ _err(str(e))+ return+ latency_ms = round((time.monotonic() - t0) * 1000, 1)+ bids = ob.get("bids", [])+ asks = ob.get("asks", [])+ metrics = _compute_book_metrics(bids, asks)+ _ok({+ "symbol": symbol,+ "exchange": exchange_id,+ "timestamp": datetime.utcnow().isoformat() + "Z",+ "latency_ms": latency_ms,+ "bids": bids[:depth],+ "asks": asks[:depth],+ **metrics,+ })+++def cmd_fetch_trades(p: dict) -> None:+ if not _CCXT_AVAILABLE:+ _err(f"CCXT not available: {_CCXT_ERROR}")+ return+ exchange_id = p.get("exchange", "binance")+ symbol = p.get("symbol", "BTC/USDT")+ limit = int(p.get("limit", 100))try:- if command == 'initialize':- p = params_or_empty()- provider_uri = p.get('provider_uri', "~/.qlib/qlib_data/cn_data")- region = p.get('region', "cn")- result = trader.initialize(provider_uri, region)-- elif command == 'create_orderbook':- p = params_or_empty()- symbol = p.get('symbol', get_symbol())- depth = p.get('depth', int(sys.argv[3]) if len(sys.argv) > 3 else 10)- result = trader.create_order_book(symbol, depth)-- elif command == 'update_orderbook':- result = trader.update_order_book(**params_or_empty())-- elif command == 'market_making_quotes':- p = params_or_empty()- symbol = p.get('symbol', get_symbol())- # Auto-create orderbook if not present- if symbol not in trader.order_books:- trader.create_order_book(symbol, p.get('depth', 10))- result = trader.calculate_market_making_quotes(- symbol=symbol,- inventory=p.get('inventory', 0),- risk_aversion=p.get('risk_aversion', 0.01),- spread_multiplier=p.get('spread_multiplier', 1.5)- )-- elif command == 'detect_toxic':- p = params_or_empty()- symbol = p.get('symbol', get_symbol())- if symbol not in trader.order_books:- trader.create_order_book(symbol)- result = trader.detect_toxic_flow(symbol)-- elif command == 'execute_order':- p = params_or_empty()- symbol = p.get('symbol', 'AAPL')- if symbol not in trader.order_books:- trader.create_order_book(symbol)- result = trader.execute_aggressive_order(**p)-- elif command == 'latency_stats':- result = trader.get_latency_stats()-- elif command == 'snapshot':- p = params_or_empty()- symbol = p.get('symbol', get_symbol())- if symbol not in trader.order_books:- trader.create_order_book(symbol)- n_levels = p.get('n_levels', 5)- result = trader.get_order_book_snapshot(symbol, n_levels)-- else:- result = {'success': False, 'error': f'Unknown command: {command}'}+ ex = make_exchange(exchange_id)+ raw = ex.fetch_trades(symbol, limit=limit)+ trades = [{"id": t.get("id"), "timestamp": t.get("timestamp"),+ "side": t.get("side"), "price": t.get("price"),+ "amount": t.get("amount"), "cost": t.get("cost")} for t in raw]+ except Exception as e:+ _err(str(e))+ return+ _ok({"symbol": symbol, "exchange": exchange_id,+ "trades": trades, "count": len(trades)})++def cmd_analyze(p: dict) -> None:+ """Single call: fetch live book + trades → compute all metrics."""+ if not _CCXT_AVAILABLE:+ _err(f"CCXT not available: {_CCXT_ERROR}")+ return+ exchange_id = p.get("exchange", "binance")+ symbol = p.get("symbol", "BTC/USDT")+ depth = int(p.get("depth", 20))+ limit = int(p.get("limit", 100))+ inventory = float(p.get("inventory", 0.0))+ spread_mult = float(p.get("spread_multiplier", 1.5))+ t0 = time.monotonic()+ try:+ ex = make_exchange(exchange_id)+ ob = ex.fetch_order_book(symbol, limit=depth)+ raw = ex.fetch_trades(symbol, limit=limit)+ except Exception as e:+ _err(str(e))+ return+ latency_ms = round((time.monotonic() - t0) * 1000, 1)++ bids = ob.get("bids", [])+ asks = ob.get("asks", [])+ trades = [{"side": t.get("side"), "price": t.get("price"),+ "amount": t.get("amount"), "timestamp": t.get("timestamp")} for t in raw]++ metrics = _compute_book_metrics(bids, asks)+ mm = _market_making_quotes(metrics, inventory, spread_mult)+ toxic = _detect_toxic_flow(trades, metrics)+ slippage = _estimate_slippage(bids, asks, "buy", float(p.get("quantity", 1.0)))++ _ok({+ "symbol": symbol,+ "exchange": exchange_id,+ "timestamp": datetime.utcnow().isoformat() + "Z",+ "latency_ms": latency_ms,+ "bids": bids[:depth],+ "asks": asks[:depth],+ "book_metrics": metrics,+ "market_making": mm,+ "toxic_flow": toxic,+ "slippage": slippage,+ "trade_count": len(trades),+ })+++def cmd_market_making(p: dict) -> None:+ if not _CCXT_AVAILABLE:+ _err(f"CCXT not available: {_CCXT_ERROR}")+ return+ exchange_id = p.get("exchange", "binance")+ symbol = p.get("symbol", "BTC/USDT")+ try:+ ex = make_exchange(exchange_id)+ ob = ex.fetch_order_book(symbol, limit=20)+ except Exception as e:+ _err(str(e))+ return+ metrics = _compute_book_metrics(ob.get("bids", []), ob.get("asks", []))+ mm = _market_making_quotes(+ metrics,+ float(p.get("inventory", 0.0)),+ float(p.get("spread_multiplier", 1.5)),+ float(p.get("risk_aversion", 0.01)),+ )+ _ok({"symbol": symbol, "exchange": exchange_id,+ "book_metrics": metrics, "market_making": mm,+ "timestamp": datetime.utcnow().isoformat() + "Z"})+++def cmd_toxic_flow(p: dict) -> None:+ if not _CCXT_AVAILABLE:+ _err(f"CCXT not available: {_CCXT_ERROR}")+ return+ exchange_id = p.get("exchange", "binance")+ symbol = p.get("symbol", "BTC/USDT")+ limit = int(p.get("limit", 200))+ try:+ ex = make_exchange(exchange_id)+ ob = ex.fetch_order_book(symbol, limit=10)+ raw = ex.fetch_trades(symbol, limit=limit)except Exception as e:- result = {'success': False, 'error': str(e)}+ _err(str(e))+ return+ metrics = _compute_book_metrics(ob.get("bids", []), ob.get("asks", []))+ trades = [{"side": t.get("side"), "price": t.get("price"),+ "amount": t.get("amount")} for t in raw]+ toxic = _detect_toxic_flow(trades, metrics)+ _ok({"symbol": symbol, "exchange": exchange_id,+ "book_metrics": metrics, "toxic_flow": toxic,+ "timestamp": datetime.utcnow().isoformat() + "Z"})+++def cmd_slippage(p: dict) -> None:+ if not _CCXT_AVAILABLE:+ _err(f"CCXT not available: {_CCXT_ERROR}")+ return+ exchange_id = p.get("exchange", "binance")+ symbol = p.get("symbol", "BTC/USDT")+ side = p.get("side", "buy")+ quantity = float(p.get("quantity", 1.0))+ try:+ ex = make_exchange(exchange_id)+ ob = ex.fetch_order_book(symbol, limit=50)+ except Exception as e:+ _err(str(e))+ return+ result = _estimate_slippage(ob.get("bids", []), ob.get("asks", []), side, quantity)+ _ok({"symbol": symbol, "exchange": exchange_id, **result,+ "timestamp": datetime.utcnow().isoformat() + "Z"})+++# ── Entrypoint ────────────────────────────────────────────────────────────────++def main() -> None:+ if len(sys.argv) < 2:+ _err("Usage: python qlib_high_frequency.py <command> [json_params]")+ return++ command = sys.argv[1]+ p = _params()++ dispatch = {+ "fetch_orderbook": cmd_fetch_orderbook,+ "fetch_trades": cmd_fetch_trades,+ "analyze": cmd_analyze,+ "market_making": cmd_market_making,+ "market_making_quotes": cmd_market_making, # legacy alias+ "toxic_flow": cmd_toxic_flow,+ "detect_toxic": cmd_toxic_flow, # legacy alias+ "slippage": cmd_slippage,+ "execute_order": cmd_slippage, # legacy alias → slippage estimate+ }++ handler = dispatch.get(command)+ if handler is None:+ _err(f"Unknown command: {command}. Available: {list(dispatch)}")+ return- print(json.dumps(result, indent=2))+ handler(p)-if __name__ == '__main__':+if __name__ == "__main__":main()diff --git a/fincept-qt/scripts/relationship_map.py b/fincept-qt/scripts/relationship_map.pyindex 782207c3f..f4ad7899b 100644--- a/fincept-qt/scripts/relationship_map.py+++ b/fincept-qt/scripts/relationship_map.py@@ -1,8 +1,9 @@#!/usr/bin/env python3"""-Relationship Map Data Fetcher-Fetches corporate intelligence data: company info, peers, institutional holders,-insiders, events from Yahoo Finance.+Relationship Map Data Fetcher — v2+Fetches comprehensive corporate intelligence: company info, governance,+officers, analysts, mutual funds, institutional/insider holders, peers,+earnings calendar, technicals, and short interest from Yahoo Finance.Usage: python relationship_map.py <TICKER>Output: JSON to stdout@@ -11,8 +12,26 @@ Output: JSON to stdoutimport jsonimport sys++def _safe_float(val, default=0.0):+ try:+ return float(val) if val is not None else default+ except (TypeError, ValueError):+ return default+++def _safe_int(val, default=0):+ try:+ return int(val) if val is not None else default+ except (TypeError, ValueError):+ return default+++def _safe_str(val, default=""):+ return str(val) if val is not None else default++def fetch_company_data(ticker: str) -> dict:- """Fetch comprehensive company data from yfinance."""try:import yfinance as yfexcept ImportError:@@ -20,10 +39,20 @@ def fetch_company_data(ticker: str) -> dict:result = {"company": {},+ "governance": {},+ "technicals": {},+ "short_interest": {},+ "enterprise": {},+ "margins": {},+ "analyst_targets": {},+ "recommendations_summary": [],+ "upgrades_downgrades": [],+ "officers": [],"institutional_holders": [],+ "mutualfund_holders": [],"insider_holders": [],"peers": [],- "events": [],+ "calendar": {},"supply_chain": [],"data_quality": 0,}@@ -38,61 +67,252 @@ def fetch_company_data(ticker: str) -> dict:"name": info.get("longName", info.get("shortName", ticker)),"sector": info.get("sector", ""),"industry": info.get("industry", ""),- "market_cap": info.get("marketCap", 0),- "current_price": info.get("currentPrice", info.get("regularMarketPrice", 0)),- "pe_ratio": info.get("trailingPE", 0),- "forward_pe": info.get("forwardPE", 0),- "price_to_book": info.get("priceToBook", 0),- "roe": info.get("returnOnEquity", 0),- "revenue_growth": info.get("revenueGrowth", 0),- "profit_margins": info.get("profitMargins", 0),- "revenue": info.get("totalRevenue", 0),- "ebitda": info.get("ebitda", 0),- "free_cashflow": info.get("freeCashflow", 0),- "total_cash": info.get("totalCash", 0),- "total_debt": info.get("totalDebt", 0),- "insider_percent": info.get("heldPercentInsiders", 0),- "institutional_percent": info.get("heldPercentInstitutions", 0),- "employees": info.get("fullTimeEmployees", 0),+ "website": info.get("website", ""),+ "description": info.get("longBusinessSummary", "")[:300],+ "employees": _safe_int(info.get("fullTimeEmployees")),+ "country": info.get("country", ""),+ "exchange": info.get("exchange", ""),+ "currency": info.get("currency", "USD"),+ "market_cap": _safe_float(info.get("marketCap")),+ "current_price": _safe_float(info.get("currentPrice", info.get("regularMarketPrice"))),+ "previous_close": _safe_float(info.get("previousClose")),+ "day_change_pct": _safe_float(info.get("regularMarketChangePercent")),+ "pe_ratio": _safe_float(info.get("trailingPE")),+ "forward_pe": _safe_float(info.get("forwardPE")),+ "price_to_book": _safe_float(info.get("priceToBook")),+ "roe": _safe_float(info.get("returnOnEquity")),+ "roa": _safe_float(info.get("returnOnAssets")),+ "revenue_growth": _safe_float(info.get("revenueGrowth")),+ "earnings_growth": _safe_float(info.get("earningsGrowth")),+ "profit_margins": _safe_float(info.get("profitMargins")),+ "revenue": _safe_float(info.get("totalRevenue")),+ "ebitda": _safe_float(info.get("ebitda")),+ "free_cashflow": _safe_float(info.get("freeCashflow")),+ "operating_cashflow": _safe_float(info.get("operatingCashflow")),+ "total_cash": _safe_float(info.get("totalCash")),+ "total_debt": _safe_float(info.get("totalDebt")),+ "insider_percent": _safe_float(info.get("heldPercentInsiders")),+ "institutional_percent": _safe_float(info.get("heldPercentInstitutions")),"recommendation": info.get("recommendationKey", ""),- "target_price": info.get("targetMeanPrice", 0),- "analyst_count": info.get("numberOfAnalystOpinions", 0),+ "recommendation_mean": _safe_float(info.get("recommendationMean")),+ "target_high": _safe_float(info.get("targetHighPrice")),+ "target_low": _safe_float(info.get("targetLowPrice")),+ "target_mean": _safe_float(info.get("targetMeanPrice")),+ "target_median": _safe_float(info.get("targetMedianPrice")),+ "analyst_count": _safe_int(info.get("numberOfAnalystOpinions")),+ "dividend_yield": _safe_float(info.get("dividendYield")),+ "payout_ratio": _safe_float(info.get("payoutRatio")),+ "trailing_eps": _safe_float(info.get("trailingEps")),+ "forward_eps": _safe_float(info.get("forwardEps")),+ "shares_outstanding": _safe_float(info.get("sharesOutstanding")),+ }++ quality = 30++ # ── Governance Risk ───────────────────────────────────────────────+ audit = _safe_int(info.get("auditRisk"))+ board = _safe_int(info.get("boardRisk"))+ comp = _safe_int(info.get("compensationRisk"))+ shr = _safe_int(info.get("shareHolderRightsRisk"))+ overall = _safe_int(info.get("overallRisk"))+ if overall > 0:+ quality += 5+ result["governance"] = {+ "audit_risk": audit,+ "board_risk": board,+ "compensation_risk": comp,+ "shareholder_rights_risk": shr,+ "overall_risk": overall,+ }++ # ── Technicals ────────────────────────────────────────────────────+ result["technicals"] = {+ "fifty_two_week_high": _safe_float(info.get("fiftyTwoWeekHigh")),+ "fifty_two_week_low": _safe_float(info.get("fiftyTwoWeekLow")),+ "fifty_day_avg": _safe_float(info.get("fiftyDayAverage")),+ "two_hundred_day_avg": _safe_float(info.get("twoHundredDayAverage")),+ "beta": _safe_float(info.get("beta")),+ "week52_change_pct": _safe_float(info.get("52WeekChange")),+ "sp500_52wk_change": _safe_float(info.get("SandP52WeekChange")),+ "avg_volume": _safe_int(info.get("averageVolume")),+ "avg_volume_10d": _safe_int(info.get("averageDailyVolume10Day")),+ }+ quality += 5++ # ── Short Interest ────────────────────────────────────────────────+ shares_short = _safe_float(info.get("sharesShort"))+ if shares_short > 0:+ quality += 5+ result["short_interest"] = {+ "shares_short": shares_short,+ "short_ratio": _safe_float(info.get("shortRatio")),+ "short_pct_float": _safe_float(info.get("shortPercentOfFloat")),+ "float_shares": _safe_float(info.get("floatShares")),+ }++ # ── Enterprise Metrics ────────────────────────────────────────────+ result["enterprise"] = {+ "enterprise_value": _safe_float(info.get("enterpriseValue")),+ "ev_to_revenue": _safe_float(info.get("enterpriseToRevenue")),+ "ev_to_ebitda": _safe_float(info.get("enterpriseToEbitda")),+ "peg_ratio": _safe_float(info.get("trailingPegRatio")),+ "price_to_sales": _safe_float(info.get("priceToSalesTrailing12Months")),+ "book_value": _safe_float(info.get("bookValue")),+ }++ # ── Margins ───────────────────────────────────────────────────────+ result["margins"] = {+ "gross": _safe_float(info.get("grossMargins")),+ "operating": _safe_float(info.get("operatingMargins")),+ "ebitda": _safe_float(info.get("ebitdaMargins")),+ "net": _safe_float(info.get("profitMargins")),+ "debt_to_equity": _safe_float(info.get("debtToEquity")),+ "current_ratio": _safe_float(info.get("currentRatio")),+ "quick_ratio": _safe_float(info.get("quickRatio")),}+ quality += 5- quality = 30 # base for having company info+ # ── Analyst Price Targets ─────────────────────────────────────────+ try:+ apt = stock.analyst_price_targets+ if isinstance(apt, dict) and apt:+ quality += 5+ result["analyst_targets"] = {+ "current": _safe_float(apt.get("current")),+ "high": _safe_float(apt.get("high")),+ "low": _safe_float(apt.get("low")),+ "mean": _safe_float(apt.get("mean")),+ "median": _safe_float(apt.get("median")),+ }+ except Exception:+ pass++ # ── Recommendations Summary ───────────────────────────────────────+ try:+ rec = stock.recommendations_summary+ if rec is not None and not rec.empty:+ quality += 5+ for _, row in rec.iterrows():+ result["recommendations_summary"].append({+ "period": _safe_str(row.get("period")),+ "strong_buy": _safe_int(row.get("strongBuy")),+ "buy": _safe_int(row.get("buy")),+ "hold": _safe_int(row.get("hold")),+ "sell": _safe_int(row.get("sell")),+ "strong_sell": _safe_int(row.get("strongSell")),+ })+ except Exception:+ pass++ # ── Upgrades / Downgrades ─────────────────────────────────────────+ try:+ ud = stock.upgrades_downgrades+ if ud is not None and not ud.empty:+ quality += 5+ for idx, row in ud.head(8).iterrows():+ result["upgrades_downgrades"].append({+ "date": _safe_str(idx)[:10],+ "firm": _safe_str(row.get("Firm")),+ "to_grade": _safe_str(row.get("ToGrade")),+ "from_grade": _safe_str(row.get("FromGrade")),+ "action": _safe_str(row.get("Action")),+ "price_target": _safe_float(row.get("currentPriceTarget")),+ "prior_target": _safe_float(row.get("priorPriceTarget")),+ })+ except Exception:+ pass++ # ── Company Officers ──────────────────────────────────────────────+ try:+ officers = info.get("companyOfficers", [])+ if officers:+ quality += 5+ for o in officers[:8]:+ result["officers"].append({+ "name": _safe_str(o.get("name")),+ "title": _safe_str(o.get("title")),+ "total_pay": _safe_int(o.get("totalPay")),+ "year_born": _safe_int(o.get("yearBorn")),+ })+ except Exception:+ pass++ # ── Calendar (Earnings, Dividends) ────────────────────────────────+ try:+ cal = stock.calendar+ if isinstance(cal, dict) and cal:+ quality += 5+ result["calendar"] = {+ "earnings_date": _safe_str(cal.get("Earnings Date", [None])[0] if isinstance(cal.get("Earnings Date"), list) else cal.get("Earnings Date")),+ "earnings_avg": _safe_float(cal.get("Earnings Average")),+ "earnings_low": _safe_float(cal.get("Earnings Low")),+ "earnings_high": _safe_float(cal.get("Earnings High")),+ "revenue_avg": _safe_float(cal.get("Revenue Average")),+ "revenue_low": _safe_float(cal.get("Revenue Low")),+ "revenue_high": _safe_float(cal.get("Revenue High")),+ "ex_dividend_date": _safe_str(cal.get("Ex-Dividend Date")),+ "dividend_date": _safe_str(cal.get("Dividend Date")),+ }+ except Exception:+ pass# ── Institutional Holders ─────────────────────────────────────────try:inst = stock.institutional_holdersif inst is not None and not inst.empty:- quality += 20- for _, row in inst.head(25).iterrows():+ quality += 10+ for _, row in inst.head(20).iterrows():+ pct = _safe_float(row.get("% Out", row.get("pctHeld", 0)))+ if pct < 1:+ pct *= 100holder = {- "name": str(row.get("Holder", "")),- "shares": float(row.get("Shares", 0)),- "value": float(row.get("Value", 0)),- "percentage": float(row.get("% Out", row.get("pctHeld", 0))) * 100- if float(row.get("% Out", row.get("pctHeld", 0))) < 1- else float(row.get("% Out", row.get("pctHeld", 0))),- "change_percent": 0,+ "name": _safe_str(row.get("Holder")),+ "shares": _safe_float(row.get("Shares")),+ "value": _safe_float(row.get("Value")),+ "percentage": pct,+ "change_percent": 0.0,"fund_family": "",+ "type": "institutional",}if holder["name"]:result["institutional_holders"].append(holder)except Exception:pass+ # ── Mutual Fund Holders ───────────────────────────────────────────+ try:+ mf = stock.mutualfund_holders+ if mf is not None and not mf.empty:+ quality += 5+ for _, row in mf.head(10).iterrows():+ pct = _safe_float(row.get("pctHeld", 0))+ if pct < 1:+ pct *= 100+ holder = {+ "name": _safe_str(row.get("Holder")),+ "shares": _safe_float(row.get("Shares")),+ "value": _safe_float(row.get("Value")),+ "percentage": pct,+ "change_percent": _safe_float(row.get("pctChange", 0)) * 100,+ "fund_family": "",+ "type": "mutualfund",+ }+ if holder["name"]:+ result["mutualfund_holders"].append(holder)+ except Exception:+ pass+# ── Insider Holders ───────────────────────────────────────────────try:insiders = stock.insider_holdersif insiders is not None and not insiders.empty:- quality += 15- for _, row in insiders.head(15).iterrows():+ quality += 5+ for _, row in insiders.head(12).iterrows():insider = {- "name": str(row.get("Name", row.get("Insider", ""))),- "title": str(row.get("Position", row.get("Relation", ""))),- "shares": float(row.get("Shares", row.get("sharesOwned", 0))),- "percentage": 0,+ "name": _safe_str(row.get("Name", row.get("Insider"))),+ "title": _safe_str(row.get("Position", row.get("Relation"))),+ "shares": _safe_float(row.get("Shares", row.get("sharesOwned", 0))),+ "percentage": 0.0,"last_transaction": "",}if insider["name"]:@@ -100,68 +320,54 @@ def fetch_company_data(ticker: str) -> dict:except Exception:pass- # Try insider transactions for more detail+ # enrich insiders with transaction directiontry:txns = stock.insider_transactionsif txns is not None and not txns.empty:- for _, row in txns.head(10).iterrows():- name = str(row.get("Insider", row.get("Name", "")))- tx_type = str(row.get("Transaction", row.get("Text", ""))).lower()- # Update existing insider with transaction info+ for _, row in txns.head(15).iterrows():+ name = _safe_str(row.get("Insider", row.get("Name")))+ tx = _safe_str(row.get("Transaction", row.get("Text", ""))).lower()for ins in result["insider_holders"]:if name and name.split()[0].lower() in ins["name"].lower():- ins["last_transaction"] = "buy" if "purchase" in tx_type or "buy" in tx_type else "sell"+ ins["last_transaction"] = "buy" if ("purchase" in tx or "buy" in tx) else "sell"breakexcept Exception:pass- # ── Major Holders Summary ─────────────────────────────────────────- try:- major = stock.major_holders- if major is not None and not major.empty:- for _, row in major.iterrows():- val = row.iloc[0] if len(row) > 0 else 0- desc = str(row.iloc[1]) if len(row) > 1 else ""- if "insider" in desc.lower():- try:- result["company"]["insider_percent"] = float(str(val).replace('%', '')) / 100- except (ValueError, TypeError):- pass- elif "institution" in desc.lower():- try:- result["company"]["institutional_percent"] = float(str(val).replace('%', '')) / 100- except (ValueError, TypeError):- pass- except Exception:- pass-# ── Peer Companies ────────────────────────────────────────────────INDUSTRY_PEERS = {- "Technology": ["AAPL", "MSFT", "GOOGL", "META", "AMZN", "NVDA", "CRM", "ORCL", "ADBE"],- "Software": ["MSFT", "CRM", "ORCL", "ADBE", "NOW", "INTU", "SNOW", "PLTR"],- "Semiconductors": ["NVDA", "AMD", "INTC", "AVGO", "QCOM", "TXN", "MU"],- "Electric Vehicles": ["TSLA", "RIVN", "LCID", "NIO", "XPEV"],- "Auto Manufacturers": ["TSLA", "F", "GM", "TM", "HMC", "STLA"],- "Banks": ["JPM", "BAC", "WFC", "C", "GS", "MS"],- "Pharmaceuticals": ["JNJ", "PFE", "MRK", "ABBV", "LLY", "BMY"],- "Oil & Gas": ["XOM", "CVX", "COP", "EOG", "SLB"],- "Retail": ["WMT", "COST", "TGT", "HD", "LOW"],- "Payments": ["V", "MA", "PYPL", "SQ"],- "Cloud Computing": ["AMZN", "MSFT", "GOOGL", "CRM", "SNOW"],+ "Technology": ["AAPL", "MSFT", "GOOGL", "META", "AMZN", "NVDA", "CRM", "ORCL", "ADBE"],+ "Software": ["MSFT", "CRM", "ORCL", "ADBE", "NOW", "INTU", "SNOW", "PLTR"],+ "Semiconductors": ["NVDA", "AMD", "INTC", "AVGO", "QCOM", "TXN", "MU", "AMAT"],+ "Electric Vehicles": ["TSLA", "RIVN", "LCID", "NIO", "XPEV", "LI"],+ "Auto Manufacturers":["TSLA", "F", "GM", "TM", "HMC", "STLA"],+ "Banks": ["JPM", "BAC", "WFC", "C", "GS", "MS", "USB"],+ "Pharmaceuticals": ["JNJ", "PFE", "MRK", "ABBV", "LLY", "BMY", "AMGN"],+ "Oil & Gas": ["XOM", "CVX", "COP", "EOG", "SLB", "PSX"],+ "Retail": ["WMT", "COST", "TGT", "HD", "LOW", "AMZN"],+ "Payments": ["V", "MA", "PYPL", "SQ", "FIS", "FISV"],+ "Cloud Computing": ["AMZN", "MSFT", "GOOGL", "CRM", "SNOW", "NOW"],+ "Telecom": ["T", "VZ", "TMUS", "CMCSA"],+ "Healthcare": ["UNH", "CVS", "HCA", "MCK", "ABC"],+ "Insurance": ["BRK-B", "MET", "PRU", "AFL", "AIG"],+ "Real Estate": ["AMT", "PLD", "CCI", "EQIX", "SPG"],+ "Consumer": ["PG", "KO", "PEP", "UL", "CL", "MCD", "SBUX"],+ "Airlines": ["DAL", "UAL", "AAL", "LUV", "ALK"],+ "Defense": ["LMT", "RTX", "NOC", "GD", "BA"],+ "Energy": ["NEE", "DUK", "SO", "AEP", "D"],}- industry = result["company"]["industry"]- sector = result["company"]["sector"]+ industry = result["company"].get("industry", "")+ sector = result["company"].get("sector", "")peer_tickers = []- for key, peers in INDUSTRY_PEERS.items():+ for key, peers_list in INDUSTRY_PEERS.items():if key.lower() in industry.lower() or key.lower() in sector.lower():- peer_tickers = [p for p in peers if p != ticker.upper()][:8]+ peer_tickers = [p for p in peers_list if p != ticker.upper()][:8]breakif not peer_tickers:- peer_tickers = ["AAPL", "MSFT", "GOOGL", "AMZN", "META"]- peer_tickers = [p for p in peer_tickers if p != ticker.upper()][:5]+ peer_tickers = [p for p in ["AAPL", "MSFT", "GOOGL", "AMZN", "META"] if p != ticker.upper()][:5]for pt in peer_tickers:try:@@ -169,21 +375,27 @@ def fetch_company_data(ticker: str) -> dict:peer = {"ticker": pt,"name": pi.get("longName", pi.get("shortName", pt)),- "market_cap": pi.get("marketCap", 0),- "pe_ratio": pi.get("trailingPE", 0),- "roe": pi.get("returnOnEquity", 0),- "revenue_growth": pi.get("revenueGrowth", 0),- "profit_margins": pi.get("profitMargins", 0),- "current_price": pi.get("currentPrice", pi.get("regularMarketPrice", 0)),+ "market_cap": _safe_float(pi.get("marketCap")),+ "pe_ratio": _safe_float(pi.get("trailingPE")),+ "forward_pe": _safe_float(pi.get("forwardPE")),+ "roe": _safe_float(pi.get("returnOnEquity")),+ "revenue_growth": _safe_float(pi.get("revenueGrowth")),+ "profit_margins": _safe_float(pi.get("profitMargins")),+ "gross_margins": _safe_float(pi.get("grossMargins")),+ "current_price": _safe_float(pi.get("currentPrice", pi.get("regularMarketPrice"))),"sector": pi.get("sector", ""),+ "beta": _safe_float(pi.get("beta")),+ "ev_to_ebitda": _safe_float(pi.get("enterpriseToEbitda")),+ "price_to_book": _safe_float(pi.get("priceToBook")),+ "week52_change": _safe_float(pi.get("52WeekChange")),+ "recommendation": pi.get("recommendationKey", ""),}result["peers"].append(peer)- quality += 5+ quality += 3except Exception:pass- quality = min(quality, 100)- result["data_quality"] = quality+ result["data_quality"] = min(quality, 100)except Exception as e:result["error"] = str(e)diff --git a/fincept-qt/src/app/MainWindow.cpp b/fincept-qt/src/app/MainWindow.cppindex 7411788c2..5204c61e7 100644--- a/fincept-qt/src/app/MainWindow.cpp+++ b/fincept-qt/src/app/MainWindow.cpp@@ -8,6 +8,7 @@#include "auth/PinManager.h"#include "core/config/ProfileManager.h"#include "core/events/EventBus.h"+#include "core/keys/KeyConfigManager.h"#include "core/logging/Logger.h"#include "core/session/SessionManager.h"#include "screens/ComingSoonScreen.h"@@ -255,19 +256,25 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), widock_router_, [this, screen_id]() { dock_router_->navigate(screen_id); }, Qt::QueuedConnection);});- auto* sc_chat = new QShortcut(QKeySequence(Qt::Key_F9), this);- connect(sc_chat, &QShortcut::activated, this, &MainWindow::toggle_chat_mode);+ // ── Keyboard shortcuts via KeyConfigManager ───────────────────────────────+ auto& km = KeyConfigManager::instance();- auto* sc_fullscreen = new QShortcut(QKeySequence(Qt::Key_F11), this);- connect(sc_fullscreen, &QShortcut::activated, this, [this]() {+ auto* act_chat = km.action(KeyAction::ToggleChat);+ act_chat->setParent(this);+ connect(act_chat, &QAction::triggered, this, &MainWindow::toggle_chat_mode);++ auto* act_fs = km.action(KeyAction::Fullscreen);+ act_fs->setParent(this);+ connect(act_fs, &QAction::triggered, this, [this]() {if (isFullScreen())showNormal();elseshowFullScreen();});- auto* sc_focus = new QShortcut(QKeySequence(Qt::Key_F10), this);- connect(sc_focus, &QShortcut::activated, this, [this]() {+ auto* act_focus = km.action(KeyAction::FocusMode);+ act_focus->setParent(this);+ connect(act_focus, &QAction::triggered, this, [this]() {focus_mode_ = !focus_mode_;if (dock_toolbar_)dock_toolbar_->setVisible(!focus_mode_);@@ -275,8 +282,9 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), widock_status_bar_->setVisible(!focus_mode_);});- auto* sc_refresh = new QShortcut(QKeySequence(Qt::Key_F5), this);- connect(sc_refresh, &QShortcut::activated, this, [this]() {+ auto* act_refresh = km.action(KeyAction::Refresh);+ act_refresh->setParent(this);+ connect(act_refresh, &QAction::triggered, this, [this]() {if (dock_manager_) {auto* focused = dock_manager_->focusedDockWidget();if (focused && focused->widget())@@ -284,8 +292,9 @@ MainWindow::MainWindow(int window_id, QWidget* parent) : QMainWindow(parent), wi}});- auto* sc_screenshot = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_P), this);- connect(sc_screenshot, &QShortcut::activated, this, [this]() {+ auto* act_screenshot = km.action(KeyAction::Screenshot);+ act_screenshot->setParent(this);+ connect(act_screenshot, &QAction::triggered, this, [this]() {QScreen* scr = this->screen();if (!scr)scr = QApplication::primaryScreen();diff --git a/fincept-qt/src/app/MainWindow.h b/fincept-qt/src/app/MainWindow.hindex f9360d216..a9742c200 100644--- a/fincept-qt/src/app/MainWindow.h+++ b/fincept-qt/src/app/MainWindow.h@@ -3,7 +3,6 @@#include "app/ScreenRouter.h"#include <QMainWindow>-#include <QShortcut>#include <QStackedWidget>#include <QTimer>diff --git a/fincept-qt/src/app/main.cpp b/fincept-qt/src/app/main.cppindex 43e5f86cd..d33ef19e6 100644--- a/fincept-qt/src/app/main.cpp+++ b/fincept-qt/src/app/main.cpp@@ -7,6 +7,7 @@#include "core/config/AppConfig.h"#include "core/config/AppPaths.h"#include "core/config/ProfileManager.h"+#include "core/keys/KeyConfigManager.h"#include "core/logging/Logger.h"#include "core/session/ScreenStateManager.h"#include "core/session/SessionManager.h"@@ -324,6 +325,7 @@ int main(int argc, char* argv[]) {setup_screen->hide();setup_screen->deleteLater();+ fincept::KeyConfigManager::instance(); // init before MainWindow registers shortcutsauto* window = new fincept::MainWindow(0); // primary windowwindow->setAttribute(Qt::WA_DeleteOnClose);window->show();@@ -349,6 +351,9 @@ int main(int argc, char* argv[]) {return app.exec();}+ // Ensure KeyConfigManager is initialized before MainWindow registers shortcuts+ fincept::KeyConfigManager::instance();+// Python already set up — launch main window directlyfincept::MainWindow window;window.show();diff --git a/fincept-qt/src/core/keys/KeyActions.h b/fincept-qt/src/core/keys/KeyActions.hnew file mode 100644index 000000000..7aa44e90f--- /dev/null+++ b/fincept-qt/src/core/keys/KeyActions.h@@ -0,0 +1,32 @@+// src/core/keys/KeyActions.h+#pragma once++namespace fincept {++enum class KeyAction {+ // Global (MainWindow)+ Refresh,+ ToggleChat,+ FocusMode,+ Fullscreen,+ Screenshot,++ // Navigation (CommandBar)+ NavNext,+ NavPrev,+ NavAccept,+ NavEscape,++ // News Screen+ NewsNext,+ NewsPrev,+ NewsOpen,+ NewsClose,++ // Code Editor+ RunCell,+ RunAndNext,+ RenameCell,+};++} // namespace finceptdiff --git a/fincept-qt/src/core/keys/KeyConfigManager.cpp b/fincept-qt/src/core/keys/KeyConfigManager.cppnew file mode 100644index 000000000..cfa16c7d3--- /dev/null+++ b/fincept-qt/src/core/keys/KeyConfigManager.cpp@@ -0,0 +1,202 @@+// src/core/keys/KeyConfigManager.cpp+#include "core/keys/KeyConfigManager.h"++#include "core/logging/Logger.h"+#include "storage/repositories/SettingsRepository.h"++#include <optional>++namespace fincept {++// Storage key format: "key.refresh", "key.toggle_chat", etc.+static QString storage_key(KeyAction a) {+ switch (a) {+ case KeyAction::Refresh: return "key.refresh";+ case KeyAction::ToggleChat: return "key.toggle_chat";+ case KeyAction::FocusMode: return "key.focus_mode";+ case KeyAction::Fullscreen: return "key.fullscreen";+ case KeyAction::Screenshot: return "key.screenshot";+ case KeyAction::NavNext: return "key.nav_next";+ case KeyAction::NavPrev: return "key.nav_prev";+ case KeyAction::NavAccept: return "key.nav_accept";+ case KeyAction::NavEscape: return "key.nav_escape";+ case KeyAction::NewsNext: return "key.news_next";+ case KeyAction::NewsPrev: return "key.news_prev";+ case KeyAction::NewsOpen: return "key.news_open";+ case KeyAction::NewsClose: return "key.news_close";+ case KeyAction::RunCell: return "key.run_cell";+ case KeyAction::RunAndNext: return "key.run_and_next";+ case KeyAction::RenameCell: return "key.rename_cell";+ }+ return {};+}++KeyConfigManager::KeyConfigManager() {+ // Define defaults+ defaults_[KeyAction::Refresh] = QKeySequence(Qt::Key_F5);+ defaults_[KeyAction::ToggleChat] = QKeySequence(Qt::Key_F9);+ defaults_[KeyAction::FocusMode] = QKeySequence(Qt::Key_F10);+ defaults_[KeyAction::Fullscreen] = QKeySequence(Qt::Key_F11);+ defaults_[KeyAction::Screenshot] = QKeySequence(Qt::CTRL | Qt::Key_P);+ defaults_[KeyAction::NavNext] = QKeySequence(Qt::Key_Down);+ defaults_[KeyAction::NavPrev] = QKeySequence(Qt::Key_Up);+ defaults_[KeyAction::NavAccept] = QKeySequence(Qt::Key_Tab);+ defaults_[KeyAction::NavEscape] = QKeySequence(Qt::Key_Escape);+ defaults_[KeyAction::NewsNext] = QKeySequence("J");+ defaults_[KeyAction::NewsPrev] = QKeySequence("K");+ defaults_[KeyAction::NewsOpen] = QKeySequence(Qt::Key_Return);+ defaults_[KeyAction::NewsClose] = QKeySequence(Qt::Key_Escape);+ defaults_[KeyAction::RunCell] = QKeySequence(Qt::CTRL | Qt::Key_Return);+ defaults_[KeyAction::RunAndNext] = QKeySequence(Qt::SHIFT | Qt::Key_Return);+ defaults_[KeyAction::RenameCell] = QKeySequence(Qt::Key_F2);++ // Create QActions with default sequences+ for (auto it = defaults_.begin(); it != defaults_.end(); ++it) {+ auto* act = new QAction(this);+ act->setShortcut(it.value());+ act->setShortcutContext(Qt::WindowShortcut);+ actions_[it.key()] = act;+ }++ load_from_storage();+}++KeyConfigManager& KeyConfigManager::instance() {+ static KeyConfigManager s;+ return s;+}++void KeyConfigManager::load_from_storage() {+ auto result = SettingsRepository::instance().get_by_category("keybindings");+ if (!result.is_ok())+ return;+ for (const auto& setting : result.value()) {+ for (auto it = defaults_.begin(); it != defaults_.end(); ++it) {+ if (storage_key(it.key()) == setting.key) {+ QKeySequence seq(setting.value);+ if (!seq.isEmpty()) {+ actions_[it.key()]->setShortcut(seq);+ LOG_DEBUG("KeyConfig", QString("Loaded %1 = %2").arg(setting.key, setting.value));+ }+ break;+ }+ }+ }+}++void KeyConfigManager::persist(KeyAction a, const QKeySequence& seq) {+ SettingsRepository::instance().set(storage_key(a), seq.toString(), "keybindings");+}++QAction* KeyConfigManager::action(KeyAction a) const {+ return actions_.value(a, nullptr);+}++QKeySequence KeyConfigManager::key(KeyAction a) const {+ if (auto* act = actions_.value(a, nullptr))+ return act->shortcut();+ return {};+}++QKeySequence KeyConfigManager::default_key(KeyAction a) const {+ return defaults_.value(a);+}++QString KeyConfigManager::display_name(KeyAction a) const {+ switch (a) {+ case KeyAction::Refresh: return "Refresh Screen";+ case KeyAction::ToggleChat: return "Toggle Chat";+ case KeyAction::FocusMode: return "Focus Mode";+ case KeyAction::Fullscreen: return "Fullscreen";+ case KeyAction::Screenshot: return "Screenshot";+ case KeyAction::NavNext: return "Next Suggestion";+ case KeyAction::NavPrev: return "Previous Suggestion";+ case KeyAction::NavAccept: return "Autocomplete";+ case KeyAction::NavEscape: return "Dismiss";+ case KeyAction::NewsNext: return "Next Article";+ case KeyAction::NewsPrev: return "Previous Article";+ case KeyAction::NewsOpen: return "Open Article";+ case KeyAction::NewsClose: return "Close Panel";+ case KeyAction::RunCell: return "Run Cell";+ case KeyAction::RunAndNext: return "Run & Move Next";+ case KeyAction::RenameCell: return "Rename Cell";+ }+ return {};+}++QString KeyConfigManager::group_name(KeyAction a) const {+ switch (a) {+ case KeyAction::Refresh:+ case KeyAction::ToggleChat:+ case KeyAction::FocusMode:+ case KeyAction::Fullscreen:+ case KeyAction::Screenshot:+ return "Global";+ case KeyAction::NavNext:+ case KeyAction::NavPrev:+ case KeyAction::NavAccept:+ case KeyAction::NavEscape:+ return "Navigation";+ case KeyAction::NewsNext:+ case KeyAction::NewsPrev:+ case KeyAction::NewsOpen:+ case KeyAction::NewsClose:+ return "News";+ case KeyAction::RunCell:+ case KeyAction::RunAndNext:+ case KeyAction::RenameCell:+ return "Code Editor";+ }+ return {};+}++QList<KeyAction> KeyConfigManager::all_actions() const {+ return {+ KeyAction::Refresh, KeyAction::ToggleChat, KeyAction::FocusMode,+ KeyAction::Fullscreen, KeyAction::Screenshot,+ KeyAction::NavNext, KeyAction::NavPrev, KeyAction::NavAccept, KeyAction::NavEscape,+ KeyAction::NewsNext, KeyAction::NewsPrev, KeyAction::NewsOpen, KeyAction::NewsClose,+ KeyAction::RunCell, KeyAction::RunAndNext, KeyAction::RenameCell,+ };+}++void KeyConfigManager::set_key(KeyAction a, const QKeySequence& seq) {+ if (auto* act = actions_.value(a, nullptr)) {+ act->setShortcut(seq);+ persist(a, seq);+ emit key_changed(a, seq);+ LOG_INFO("KeyConfig", QString("Rebound %1 to %2").arg(display_name(a), seq.toString()));+ }+}++void KeyConfigManager::reset_key(KeyAction a) {+ const QKeySequence def = defaults_.value(a);+ if (auto* act = actions_.value(a, nullptr)) {+ act->setShortcut(def);+ SettingsRepository::instance().remove(storage_key(a));+ emit key_changed(a, def);+ }+}++void KeyConfigManager::reset_all() {+ SettingsRepository::instance().clear_category("keybindings");+ for (auto it = defaults_.begin(); it != defaults_.end(); ++it) {+ if (auto* act = actions_.value(it.key(), nullptr)) {+ act->setShortcut(it.value());+ emit key_changed(it.key(), it.value());+ }+ }+ LOG_INFO("KeyConfig", "All keybindings reset to defaults");+}++std::optional<KeyAction> KeyConfigManager::find_conflict(const QKeySequence& seq, KeyAction exclude) const {+ for (auto it = actions_.begin(); it != actions_.end(); ++it) {+ if (it.key() == exclude)+ continue;+ if (it.value()->shortcut() == seq)+ return it.key();+ }+ return std::nullopt;+}++} // namespace finceptdiff --git a/fincept-qt/src/core/keys/KeyConfigManager.h b/fincept-qt/src/core/keys/KeyConfigManager.hnew file mode 100644index 000000000..f7bc61a39--- /dev/null+++ b/fincept-qt/src/core/keys/KeyConfigManager.h@@ -0,0 +1,65 @@+// src/core/keys/KeyConfigManager.h+#pragma once+#include "core/keys/KeyActions.h"++#include <QAction>+#include <QKeySequence>+#include <QMap>+#include <QObject>+#include <QString>+#include <optional>++namespace fincept {++/// Singleton that owns one QAction per KeyAction.+/// Widgets connect to action(a)->triggered instead of QShortcut::activated.+/// Calling set_key() updates the QAction shortcut live and persists to SettingsRepository.+class KeyConfigManager : public QObject {+ Q_OBJECT+ public:+ static KeyConfigManager& instance();++ /// The QAction for this action. Widgets connect to its triggered() signal.+ QAction* action(KeyAction a) const;++ /// Current key sequence for this action.+ QKeySequence key(KeyAction a) const;++ /// Default key sequence for this action.+ QKeySequence default_key(KeyAction a) const;++ /// Human-readable name shown in the Settings UI.+ QString display_name(KeyAction a) const;++ /// Group name for the Settings UI ("Global", "News", "Code Editor", "Navigation").+ QString group_name(KeyAction a) const;++ /// All actions in definition order.+ QList<KeyAction> all_actions() const;++ /// Update the key for an action. Updates QAction shortcut and persists to DB.+ void set_key(KeyAction a, const QKeySequence& seq);++ /// Reset one action to its default.+ void reset_key(KeyAction a);++ /// Reset all actions to defaults and clear the "keybindings" category in DB.+ void reset_all();++ /// Returns the KeyAction that currently uses seq, or nullopt if none.+ /// Pass exclude to skip the action being edited (conflict check).+ std::optional<KeyAction> find_conflict(const QKeySequence& seq, KeyAction exclude) const;++ signals:+ void key_changed(fincept::KeyAction a, QKeySequence seq);++ private:+ KeyConfigManager();+ void load_from_storage();+ void persist(KeyAction a, const QKeySequence& seq);++ QMap<KeyAction, QAction*> actions_;+ QMap<KeyAction, QKeySequence> defaults_;+};++} // namespace finceptdiff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.cpp b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.cppindex ff2e5a4c2..d46be2ed8 100644--- a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.cpp+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.cpp@@ -8,8 +8,14 @@#include "ui/theme/Theme.h"#include "ui/theme/ThemeManager.h"+#include <QAreaSeries>+#include <QChart>+#include <QChartView>#include <QDateTime>+#include <QDateTimeAxis>#include <QDesktopServices>+#include <QLineSeries>+#include <QValueAxis>#include <QFile>#include <QFileInfo>#include <QGridLayout>@@ -635,16 +641,18 @@ QWidget* QuantModulePanel::build_backtesting_panel() {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");+ auto* start_date = new QDateEdit(QDate(2020, 1, 1), w);+ start_date->setDisplayFormat("yyyy-MM-dd");+ start_date->setCalendarPopup(true);start_date->setStyleSheet(input_ss());- text_inputs_["bt_start"] = start_date;+ date_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");+ auto* end_date = new QDateEdit(QDate(2024, 1, 1), w);+ end_date->setDisplayFormat("yyyy-MM-dd");+ end_date->setCalendarPopup(true);end_date->setStyleSheet(input_ss());- text_inputs_["bt_end"] = end_date;+ date_inputs_["bt_end"] = end_date;vl->addWidget(build_input_row("End Date", end_date, w));auto* capital = make_double_spin(1000, 1e12, 1e6, 0, "", w);@@ -674,8 +682,8 @@ QWidget* QuantModulePanel::build_backtesting_panel() {params["strategy_config"] = strategy_config;QJsonObject dataset;dataset["instruments"] = text_inputs_["bt_instruments"]->text();- dataset["start_date"] = text_inputs_["bt_start"]->text();- dataset["end_date"] = text_inputs_["bt_end"]->text();+ dataset["start_date"] = date_inputs_["bt_start"]->date().toString("yyyy-MM-dd");+ dataset["end_date"] = date_inputs_["bt_end"]->date().toString("yyyy-MM-dd");params["dataset_config"] = dataset;QJsonObject portfolio;portfolio["initial_capital"] = double_inputs_["bt_capital"]->value();@@ -1472,6 +1480,343 @@ static QString format_val(const QJsonValue& val) {return QString::fromUtf8("\u2014");}+// ── Backtest Result Display ───────────────────────────────────────────────────++void QuantModulePanel::display_backtest_result(const QJsonObject& data) {+ clear_results();++ if (!data["success"].toBool()) {+ display_error(data["error"].toString("Unknown error"));+ return;+ }++ const QJsonObject metrics = data["metrics"].toObject();+ const QJsonArray curve = data["equity_curve"].toArray();+ const QJsonObject costs = data["execution_cost_estimate"].toObject();+ const QStringList tickers = [&]() {+ QStringList t;+ for (const auto& v : data["tickers"].toArray())+ t << v.toString();+ return t;+ }();++ const QString strategy = data["strategy"].toString();+ const QString start_date = data["start_date"].toString();+ const QString end_date = data["end_date"].toString();++ const QColor accent = module_.color;+ const QString accent_hex = accent.name();+ const QColor accent_dim = accent.darker(160);+ const QString green_hex = ui::colors::POSITIVE();+ const QString red_hex = ui::colors::NEGATIVE();+ const QString text_p = ui::colors::TEXT_PRIMARY();+ const QString text_s = ui::colors::TEXT_SECONDARY();+ const QString text_t = ui::colors::TEXT_TERTIARY();+ const QString bg_surface = ui::colors::BG_SURFACE();+ const QString bg_raised = ui::colors::BG_RAISED();+ const QString border_dim = ui::colors::BORDER_DIM();+ const QString border_med = ui::colors::BORDER_MED();+ const QString font_data = ui::fonts::DATA_FAMILY;+ const int fs_sm = ui::fonts::SMALL;+ const int fs_md = ui::fonts::DATA;+ const int fs_lg = ui::fonts::HEADER;++ // ── 1. Header bar ──────────────────────────────────────────────────────+ auto* header_w = new QWidget;+ auto* header_h = new QHBoxLayout(header_w);+ header_h->setContentsMargins(0, 0, 0, 8);+ header_h->setSpacing(8);++ auto* title_lbl = new QLabel("BACKTEST RESULTS");+ title_lbl->setStyleSheet(+ QString("color:%1; font-size:%2px; font-family:%3; font-weight:800; letter-spacing:2px;")+ .arg(accent_hex).arg(fs_lg).arg(font_data));+ header_h->addWidget(title_lbl);++ header_h->addSpacing(16);++ auto make_chip = [&](const QString& text, const QString& fg, const QString& bg_hex) -> QLabel* {+ auto* c = new QLabel(text);+ c->setStyleSheet(+ QString("color:%1; background:%2; border-radius:3px; padding:2px 8px;"+ "font-size:%3px; font-family:%4; font-weight:600;")+ .arg(fg, bg_hex).arg(fs_sm).arg(font_data));+ return c;+ };++ QString strat_display = strategy;+ strat_display.replace('_', ' ');+ strat_display = strat_display.toUpper();+ header_h->addWidget(make_chip(strat_display, accent_hex,+ QColor(accent).darker(300).name() + "55"));++ header_h->addWidget(make_chip(start_date + " → " + end_date,+ text_s, bg_raised));++ for (const auto& t : tickers)+ header_h->addWidget(make_chip(t, text_p, bg_raised));++ header_h->addStretch();+ results_layout_->addWidget(header_w);++ // ── 2. KPI cards row ──────────────────────────────────────────────────+ struct KpiCard {+ QString label;+ QString value;+ QString sub;+ bool positive = true;+ bool neutral = false;+ };++ double total_ret = metrics["total_return_pct"].toDouble();+ double ann_ret = metrics["annualised_return"].toDouble();+ double ann_vol = metrics["annualised_vol"].toDouble();+ double sharpe = metrics["sharpe_ratio"].toDouble();+ double max_dd = metrics["max_drawdown_pct"].toDouble();+ double calmar = metrics["calmar_ratio"].toDouble();+ double win_rate = metrics["win_rate_pct"].toDouble();+ double final_val = metrics["final_value"].toDouble();+ double init_cap = metrics["initial_capital"].toDouble();+ int t_days = metrics["trading_days"].toInt();++ auto fmt_pct = [](double v) { return QString("%1%2%").arg(v >= 0 ? "+" : "").arg(v, 0, 'f', 2); };+ auto fmt_usd = [](double v) -> QString {+ if (v >= 1e6) return QString("$%1M").arg(v / 1e6, 0, 'f', 2);+ return QString("$%1K").arg(v / 1e3, 0, 'f', 0);+ };++ QList<KpiCard> kpis = {+ {"TOTAL RETURN", fmt_pct(total_ret), fmt_usd(final_val) + " final", total_ret >= 0, false},+ {"ANN. RETURN", fmt_pct(ann_ret), QString("Vol: %1%").arg(ann_vol, 0, 'f', 1), ann_ret >= 0, false},+ {"SHARPE RATIO", QString::number(sharpe, 'f', 3),+ sharpe >= 1 ? "Excellent" : sharpe >= 0.5 ? "Good" : "Weak", sharpe >= 0.5, false},+ {"MAX DRAWDOWN", fmt_pct(max_dd), QString("Calmar: %1").arg(calmar, 0, 'f', 3), false, false},+ {"WIN RATE", QString("%1%").arg(win_rate, 0, 'f', 1), QString("%1 days").arg(t_days), win_rate >= 50, false},+ {"CAPITAL", fmt_usd(init_cap), "Initial capital", true, true},+ };++ auto* cards_w = new QWidget;+ auto* cards_gl = new QGridLayout(cards_w);+ cards_gl->setContentsMargins(0, 0, 0, 0);+ cards_gl->setSpacing(8);++ for (int i = 0; i < kpis.size(); ++i) {+ const auto& k = kpis[i];+ auto* card = new QWidget;+ card->setObjectName("btKpiCard");+ card->setStyleSheet(+ QString("#btKpiCard { background:%1; border:1px solid %2; border-radius:4px; }")+ .arg(bg_surface, border_dim));++ auto* cl = new QVBoxLayout(card);+ cl->setContentsMargins(12, 10, 12, 10);+ cl->setSpacing(2);++ auto* lbl = new QLabel(k.label);+ lbl->setStyleSheet(+ QString("color:%1; font-size:%2px; font-family:%3; font-weight:600; letter-spacing:1px;")+ .arg(text_t).arg(fs_sm - 1).arg(font_data));++ QString val_color = k.neutral ? text_s : (k.positive ? green_hex : red_hex);+ auto* val = new QLabel(k.value);+ val->setStyleSheet(+ QString("color:%1; font-size:%2px; font-family:%3; font-weight:800;")+ .arg(val_color).arg(fs_lg + 2).arg(font_data));++ auto* sub = new QLabel(k.sub);+ sub->setStyleSheet(+ QString("color:%1; font-size:%2px; font-family:%3;")+ .arg(text_t).arg(fs_sm - 1).arg(font_data));++ cl->addWidget(lbl);+ cl->addWidget(val);+ cl->addWidget(sub);+ cards_gl->addWidget(card, i / 3, i % 3);+ }++ results_layout_->addWidget(cards_w);++ // ── 3. Equity curve chart ─────────────────────────────────────────────+ if (!curve.isEmpty()) {+ auto* port_series = new QLineSeries;+ auto* bm_series = new QLineSeries;+ auto* port_upper = new QLineSeries; // for area fill+ auto* port_base = new QLineSeries; // baseline for area++ port_series->setName("Portfolio");+ bm_series->setName("Benchmark");++ // Style lines+ QPen port_pen(accent);+ port_pen.setWidth(2);+ port_series->setPen(port_pen);++ {+ QString bm_col_str = QString(text_t);+ QPen bm_pen;+ bm_pen.setColor(::QColor(bm_col_str));+ bm_pen.setWidth(1);+ bm_pen.setStyle(Qt::DashLine);+ bm_series->setPen(bm_pen);+ }++ double min_val = 1e18, max_val = -1e18;++ for (const auto& pt_val : curve) {+ auto pt = pt_val.toObject();+ QDateTime dt = QDateTime::fromString(pt["date"].toString(), "yyyy-MM-dd");+ qint64 ms = dt.toMSecsSinceEpoch();+ double pv = pt["portfolio"].toDouble();+ double bv = pt["benchmark"].toDouble();+ port_series->append(ms, pv);+ bm_series->append(ms, bv);+ port_upper->append(ms, pv);+ port_base->append(ms, init_cap);+ min_val = std::min({min_val, pv, bv});+ max_val = std::max({max_val, pv, bv});+ }++ // Area series for portfolio fill+ auto* area = new QAreaSeries(port_upper, port_base);+ QColor fill_color = accent;+ fill_color.setAlpha(30);+ area->setBrush(fill_color);+ QPen area_pen(Qt::transparent);+ area->setPen(area_pen);++ auto* chart = new QChart;+ chart->addSeries(area);+ chart->addSeries(port_series);+ chart->addSeries(bm_series);+ chart->setBackgroundBrush(QBrush(QColor(QString(bg_surface))));+ chart->setBackgroundRoundness(0);+ chart->setMargins(QMargins(4, 4, 4, 4));+ chart->legend()->setLabelColor(QColor(QString(text_s)));+ chart->legend()->setAlignment(Qt::AlignTop);+ chart->setAnimationOptions(QChart::NoAnimation);+ chart->setTitle("");++ auto* x_axis = new QDateTimeAxis;+ x_axis->setFormat("MMM yy");+ x_axis->setLabelsColor(QColor(QString(text_t)));+ x_axis->setGridLineColor(QColor(QString(border_dim)));+ x_axis->setLinePen(QPen(QColor(QString(border_med))));+ chart->addAxis(x_axis, Qt::AlignBottom);++ auto* y_axis = new QValueAxis;+ double padding = (max_val - min_val) * 0.05;+ y_axis->setRange(min_val - padding, max_val + padding);+ y_axis->setLabelFormat("$%.0f");+ y_axis->setLabelsColor(QColor(QString(text_t)));+ y_axis->setGridLineColor(QColor(QString(border_dim)));+ y_axis->setLinePen(QPen(QColor(QString(border_med))));+ chart->addAxis(y_axis, Qt::AlignLeft);++ for (auto* s : chart->series()) {+ s->attachAxis(x_axis);+ s->attachAxis(y_axis);+ }++ auto* chart_view = new QChartView(chart);+ chart_view->setRenderHint(QPainter::Antialiasing);+ chart_view->setFixedHeight(280);+ chart_view->setStyleSheet(+ QString("background:%1; border:1px solid %2; border-radius:4px;")+ .arg(bg_surface, border_dim));++ // Chart title label above+ auto* chart_title = new QLabel("EQUITY CURVE");+ chart_title->setStyleSheet(+ QString("color:%1; font-size:%2px; font-family:%3; font-weight:700;"+ "letter-spacing:1px; padding:8px 0 2px 0;")+ .arg(text_s).arg(fs_sm).arg(font_data));+ results_layout_->addWidget(chart_title);+ results_layout_->addWidget(chart_view);+ }++ // ── 4. Execution cost strip ────────────────────────────────────────────+ auto* cost_w = new QWidget;+ cost_w->setStyleSheet(+ QString("background:%1; border:1px solid %2; border-radius:4px;")+ .arg(bg_surface, border_dim));+ auto* cost_h = new QHBoxLayout(cost_w);+ cost_h->setContentsMargins(16, 8, 16, 8);+ cost_h->setSpacing(24);++ auto add_cost_item = [&](const QString& lbl, const QString& val) {+ auto* w = new QWidget;+ auto* l = new QHBoxLayout(w);+ l->setContentsMargins(0, 0, 0, 0);+ l->setSpacing(6);+ auto* k = new QLabel(lbl);+ k->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3;")+ .arg(text_t).arg(fs_sm).arg(font_data));+ auto* v = new QLabel(val);+ v->setStyleSheet(QString("color:%1; font-size:%2px; font-family:%3; font-weight:700;")+ .arg(text_s).arg(fs_sm).arg(font_data));+ l->addWidget(k);+ l->addWidget(v);+ cost_h->addWidget(w);+ };++ auto* cost_hdr = new QLabel("EXECUTION COSTS");+ cost_hdr->setStyleSheet(+ QString("color:%1; font-size:%2px; font-family:%3; font-weight:700; letter-spacing:1px;")+ .arg(text_t).arg(fs_sm - 1).arg(font_data));+ cost_h->addWidget(cost_hdr);+ cost_h->addWidget([&]() {+ auto* sep = new QFrame;+ sep->setFrameShape(QFrame::VLine);+ sep->setStyleSheet(QString("color:%1;").arg(border_dim));+ return sep;+ }());++ add_cost_item("Commission",+ QString("%1 bps").arg(costs["commission_bps"].toDouble(), 0, 'f', 2));+ add_cost_item("Expected Slippage",+ QString("%1 bps").arg(costs["expected_slippage_bps"].toDouble(), 0, 'f', 2));+ cost_h->addStretch();+ results_layout_->addWidget(cost_w);++ // ── 5. Export button ───────────────────────────────────────────────────+ auto* export_btn = new QPushButton("EXPORT JSON");+ export_btn->setCursor(Qt::PointingHandCursor);+ export_btn->setFixedHeight(28);+ export_btn->setStyleSheet(+ QString("QPushButton { background:transparent; color:%1; border:1px solid %2;"+ "font-size:%3px; font-family:%4; padding:0 14px; border-radius:3px; }"+ "QPushButton:hover { background:rgba(255,255,255,0.05); }")+ .arg(accent_hex, border_dim).arg(fs_sm).arg(font_data));++ QString json_str = QJsonDocument(data).toJson(QJsonDocument::Indented);+ connect(export_btn, &QPushButton::clicked, this, [this, json_str]() {+ QString safe = module_.label;+ safe.replace(QRegularExpression("[^a-zA-Z0-9_\\-]"), "_");+ QString fname = safe + "_" + QString::number(QDateTime::currentMSecsSinceEpoch()) + ".json";+ QString dest = services::FileManagerService::instance().storage_dir() + "/" + fname;+ QFile f(dest);+ if (f.open(QIODevice::WriteOnly | QIODevice::Text)) {+ f.write(json_str.toUtf8());+ f.close();+ services::FileManagerService::instance().register_file(+ fname, module_.label + "_backtest.json", QFileInfo(dest).size(),+ "application/json", "ai_quant_lab");+ LOG_INFO("AIQuantLab", "Backtest exported: " + fname);+ }+ });++ auto* export_row = new QWidget;+ auto* export_hl = new QHBoxLayout(export_row);+ export_hl->setContentsMargins(0, 4, 0, 0);+ export_hl->addStretch();+ export_hl->addWidget(export_btn);+ results_layout_->addWidget(export_row);++ status_label_->setText(QString("Done — %1% return | Sharpe %2")+ .arg(total_ret, 0, 'f', 2)+ .arg(sharpe, 0, 'f', 3));+}+void QuantModulePanel::display_result(const QJsonObject& data) {clear_results();@@ -1555,11 +1900,6 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& commanif (module_id != module_.id)return;- if (module_id != "deep_agent") {- display_result(data);- return;- }-// ── LangGraph deep analysis result ───────────────────────────────────────if (command == "execute_task") {if (!data["success"].toBool()) {@@ -1770,6 +2110,20 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& commanreturn;}+ // ── Backtesting ───────────────────────────────────────────────────────────+ if (module_id == "backtesting") {+ if (!data["success"].toBool()) {+ display_error(data["error"].toString("Unknown error"));+ return;+ }+ if (command == "run_backtest") {+ display_backtest_result(data);+ return;+ }+ display_result(data);+ return;+ }+// ── Factor Discovery ─────────────────────────────────────────────────────if (module_id == "factor_discovery") {if (!data["success"].toBool()) {@@ -2132,91 +2486,246 @@ void QuantModulePanel::on_result(const QString& module_id, const QString& commandisplay_error(data["error"].toString());return;}- clear_results();- if (command == "create_orderbook") {- 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;").arg(ui::colors::TEXT_PRIMARY()));- results_layout_->addWidget(lbl);- status_label_->setText("Order book ready");++ // Helper: find a named child label in this panel and set its text+ auto set_card = [this](const QString& name, const QString& text, const QString& color = {}) {+ auto* lbl = this->findChild<QLabel*>(name);+ if (!lbl) return;+ lbl->setText(text);+ if (!color.isEmpty())+ lbl->setStyleSheet(+ QString("color:%1; font-size:13px; font-weight:700; font-family:'Courier New'; background:transparent;")+ .arg(color));+ };++ // Helper: populate a bid or ask QTableWidget from a JSON array [[price,size],...]+ auto fill_book_table = [this](const QString& name, const QJsonArray& levels, bool is_bid) {+ auto* tbl = this->findChild<QTableWidget*>(name);+ if (!tbl) return;+ const int n = qMin(levels.size(), 10);+ tbl->setRowCount(n);+ double cumulative = 0.0;+ const QString price_col = is_bid ? QString(ui::colors::POSITIVE()) : QString(ui::colors::NEGATIVE());+ for (int i = 0; i < n; ++i) {+ const auto row = levels[i].toArray();+ const double price = row.size() > 0 ? row[0].toDouble() : 0.0;+ const double size = row.size() > 1 ? row[1].toDouble() : 0.0;+ cumulative += size;+ auto* pi = new QTableWidgetItem(QString::number(price, 'f', 4));+ pi->setForeground(QColor(price_col));+ auto* si = new QTableWidgetItem(QString::number(size, 'g', 5));+ si->setForeground(QColor(QString(ui::colors::TEXT_PRIMARY())));+ auto* ci = new QTableWidgetItem(QString::number(cumulative, 'g', 6));+ ci->setForeground(QColor(QString(ui::colors::TEXT_TERTIARY())));+ tbl->setItem(i, 0, pi);+ tbl->setItem(i, 1, si);+ tbl->setItem(i, 2, ci);+ tbl->setRowHeight(i, 22);+ }+ };++ // ── fetch_orderbook ────────────────────────────────────────────────+ if (command == "fetch_orderbook") {+ const auto bids = data["bids"].toArray();+ const auto asks = data["asks"].toArray();+ const double mid = data["mid_price"].toDouble();+ const double spread_bps = data["spread_bps"].toDouble();+ const double obi = data["obi"].toDouble();+ const QString pres = data["pressure"].toString();+ const double wmid = data["weighted_mid"].toDouble();+ const double lat = data["latency_ms"].toDouble();++ // Update latency badge+ if (auto* lbl = this->findChild<QLabel*>("hftLatency"))+ lbl->setText(QString("LATENCY %1 ms").arg(lat, 0, 'f', 1));++ // Metric cards+ set_card("hft_mid_val", QString::number(mid, 'f', 4));+ set_card("hft_spread_val", QString::number(spread_bps, 'f', 3) + " bps");+ const QString obi_color = obi > 0.1 ? QString(ui::colors::POSITIVE())+ : obi < -0.1 ? QString(ui::colors::NEGATIVE())+ : QString(ui::colors::TEXT_PRIMARY());+ set_card("hft_obi_val", QString::number(obi, 'f', 4), obi_color);+ const QString pres_color = pres == "BUY" ? QString(ui::colors::POSITIVE())+ : pres == "SELL" ? QString(ui::colors::NEGATIVE())+ : QString(ui::colors::TEXT_PRIMARY());+ set_card("hft_pressure_val", pres, pres_color);+ set_card("hft_wmid_val", QString::number(wmid, 'f', 4));++ fill_book_table("hft_bid_table", bids, true);+ fill_book_table("hft_ask_table", asks, false);++ status_label_->setText(+ QString("%1 mid: %2 spread: %3 bps OBI: %4")+ .arg(data["symbol"].toString())+ .arg(mid, 0, 'f', 4)+ .arg(spread_bps, 0, 'f', 3)+ .arg(obi, 0, 'f', 4));return;}- if (command == "snapshot") {- auto bid = data["bids"].toArray();- auto ask = data["asks"].toArray();- auto mid = data["mid_price"];- auto spread = data["spread"];- QString out = QString("Symbol: %1\nMid: %2 | Spread: %3\n\nTop Bids:\n")- .arg(data["symbol"].toString())- .arg(mid.isNull() ? "N/A" : QString::number(mid.toDouble(), 'f', 4))- .arg(spread.isNull() ? "N/A" : QString::number(spread.toDouble(), 'f', 4));- for (int i = 0; i < qMin(5, (int)bid.size()); ++i) {- auto b = bid[i].toObject();- out +=- QString(" %1 x %2\n").arg(b["price"].toDouble(), 0, 'f', 4).arg(b["size"].toDouble(), 0, 'f', 0);- }- out += "\nTop Asks:\n";- for (int i = 0; i < qMin(5, (int)ask.size()); ++i) {- auto a = ask[i].toObject();- out +=- QString(" %1 x %2\n").arg(a["price"].toDouble(), 0, 'f', 4).arg(a["size"].toDouble(), 0, 'f', 0);++ // ── market_making ─────────────────────────────────────────────────+ if (command == "market_making") {+ const auto mm = data["market_making"].toObject();+ // Also update book metrics if present+ if (data.contains("book_metrics")) {+ const auto bm = data["book_metrics"].toObject();+ set_card("hft_mid_val", QString::number(bm["mid_price"].toDouble(), 'f', 4));+ set_card("hft_spread_val", QString::number(bm["spread_bps"].toDouble(), 'f', 3) + " bps");}- auto* lbl = new QLabel(out, this);- lbl->setWordWrap(true);- lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));- results_layout_->addWidget(lbl);+ set_card("hft_mm_bid", QString::number(mm["bid_price"].toDouble(), 'f', 4),+ QString(ui::colors::POSITIVE()));+ set_card("hft_mm_ask", QString::number(mm["ask_price"].toDouble(), 'f', 4),+ QString(ui::colors::NEGATIVE()));+ set_card("hft_mm_qspread", QString::number(mm["quoted_spread_bps"].toDouble(), 'f', 3) + " bps");+ set_card("hft_mm_edge", QString::number(mm["edge_per_side_bps"].toDouble(), 'f', 3) + " bps");+ const QString rec = mm["recommendation"].toString();+ const QString r_col = rec == "WIDEN" ? QString(ui::colors::WARNING())+ : rec == "TIGHTEN" ? QString(ui::colors::POSITIVE())+ : QString(ui::colors::TEXT_PRIMARY());+ set_card("hft_mm_rec", rec, r_col);status_label_->setText(- QString("Spread: %1").arg(spread.isNull() ? "N/A" : QString::number(spread.toDouble(), 'f', 4)));+ QString("Bid: %1 Ask: %2 Edge: %3 bps/side")+ .arg(mm["bid_price"].toDouble(), 0, 'f', 4)+ .arg(mm["ask_price"].toDouble(), 0, 'f', 4)+ .arg(mm["edge_per_side_bps"].toDouble(), 0, 'f', 3));return;}- if (command == "market_making_quotes") {- auto bid_p = data["bid_price"].toDouble();- auto ask_p = data["ask_price"].toDouble();- auto spread = data["spread"].toDouble();- auto* lbl = new QLabel(QString("Market Making Quotes\nBid: %1 | Ask: %2\nSpread: %3 | Mid: %4")- .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;").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));++ // ── toxic_flow ────────────────────────────────────────────────────+ if (command == "toxic_flow") {+ const auto tf = data["toxic_flow"].toObject();+ const bool is_toxic = tf["is_toxic"].toBool();+ const double score = tf["toxicity_score"].toDouble();+ const QString cls = tf["classification"].toString();+ const QString action = tf["action"].toString();++ const QString score_col = score > 60 ? QString(ui::colors::NEGATIVE())+ : score > 30 ? QString(ui::colors::WARNING())+ : QString(ui::colors::POSITIVE());+ set_card("hft_tox_pin", QString::number(score, 'f', 1), score_col);+ set_card("hft_tox_vol", QString::number(tf["vol_imbalance"].toDouble(), 'f', 4));+ set_card("hft_tox_impact", QString::number(tf["price_impact_bps"].toDouble(), 'f', 2) + " bps");+ const QString cls_col = cls == "HIGH_RISK" ? QString(ui::colors::NEGATIVE())+ : cls == "ELEVATED" ? QString(ui::colors::WARNING())+ : QString(ui::colors::POSITIVE());+ set_card("hft_tox_class", cls, cls_col);+ const QString act_col = action == "WIDEN_SPREADS" || action == "STEP_BACK"+ ? QString(ui::colors::WARNING())+ : QString(ui::colors::POSITIVE());+ set_card("hft_tox_action", QString(action).replace('_', ' '), act_col);+ status_label_->setText(+ is_toxic ? QString("TOXIC FLOW DETECTED — score: %1 — %2").arg(score, 0, 'f', 1).arg(cls)+ : QString("Flow clean — score: %1 — %2").arg(score, 0, 'f', 1).arg(cls));return;}- if (command == "detect_toxic") {- auto is_toxic = data["is_toxic"].toBool();- auto pin = data["pin_score"].toDouble();- auto* lbl = new QLabel(QString("Toxic Flow: %1\nPIN Score: %2\nClassification: %3")- .arg(is_toxic ? "DETECTED" : "none")- .arg(pin, 0, 'f', 4)- .arg(data["classification"].toString("-")),- this);- lbl->setWordWrap(true);- 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");++ // ── slippage ──────────────────────────────────────────────────────+ if (command == "slippage") {+ const auto sl = data; // flat: average_price, slippage_bps, fills, etc at top level+ const double avg_p = sl["average_price"].toDouble();+ const double sl_bps = sl["slippage_bps"].toDouble();+ const double cost = sl["total_cost"].toDouble();+ const int n_fills = sl["fill_count"].toInt();+ const bool viable = sl["viable"].toBool();++ set_card("hft_slip_avgp", QString::number(avg_p, 'f', 4));+ const QString bps_col = sl_bps < 5 ? QString(ui::colors::POSITIVE())+ : sl_bps < 20 ? QString(ui::colors::WARNING())+ : QString(ui::colors::NEGATIVE());+ set_card("hft_slip_bps", QString::number(sl_bps, 'f', 4) + " bps", bps_col);+ set_card("hft_slip_cost", QString::number(cost, 'f', 4));+ set_card("hft_slip_fills", QString::number(n_fills));+ set_card("hft_slip_viable",+ viable ? "VIABLE" : "HIGH SLIP",+ viable ? QString(ui::colors::POSITIVE()) : QString(ui::colors::NEGATIVE()));++ // Populate fills table+ if (auto* tbl = this->findChild<QTableWidget*>("hft_slip_table")) {+ const auto fills = sl["fills"].toArray();+ tbl->setRowCount(fills.size());+ for (int i = 0; i < fills.size(); ++i) {+ const auto f = fills[i].toObject();+ tbl->setItem(i, 0, new QTableWidgetItem(QString::number(f["price"].toDouble(), 'f', 4)));+ tbl->setItem(i, 1, new QTableWidgetItem(QString::number(f["quantity"].toDouble(), 'g', 6)));+ tbl->setItem(i, 2, new QTableWidgetItem(QString::number(f["cost"].toDouble(), 'f', 4)));+ tbl->setRowHeight(i, 20);+ }+ }+ status_label_->setText(+ QString("Avg fill: %1 | Slippage: %2 bps | %3")+ .arg(avg_p, 0, 'f', 4)+ .arg(sl_bps, 0, 'f', 4)+ .arg(viable ? "VIABLE" : "HIGH SLIPPAGE"));return;}- if (command == "execute_order") {- auto fills = data["fills"].toArray();- auto filled_qty = data["filled_quantity"].toDouble();- auto avg_price = data["average_price"].toDouble();- auto* lbl = new QLabel(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;").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));++ // ── analyze (full analysis) ───────────────────────────────────────+ if (command == "analyze") {+ // Dispatch sub-results to each section+ if (data.contains("bids")) {+ const auto bids = data["bids"].toArray();+ const auto asks = data["asks"].toArray();+ fill_book_table("hft_bid_table", bids, true);+ fill_book_table("hft_ask_table", asks, false);+ }+ if (data.contains("book_metrics")) {+ const auto bm = data["book_metrics"].toObject();+ set_card("hft_mid_val", QString::number(bm["mid_price"].toDouble(), 'f', 4));+ set_card("hft_spread_val", QString::number(bm["spread_bps"].toDouble(), 'f', 3) + " bps");+ const double obi = bm["obi"].toDouble();+ const QString obi_col = obi > 0.1 ? QString(ui::colors::POSITIVE())+ : obi < -0.1 ? QString(ui::colors::NEGATIVE())+ : QString(ui::colors::TEXT_PRIMARY());+ set_card("hft_obi_val", QString::number(obi, 'f', 4), obi_col);+ const QString pres = bm["pressure"].toString();+ const QString p_col = pres == "BUY" ? QString(ui::colors::POSITIVE())+ : pres == "SELL" ? QString(ui::colors::NEGATIVE())+ : QString(ui::colors::TEXT_PRIMARY());+ set_card("hft_pressure_val", pres, p_col);+ set_card("hft_wmid_val", QString::number(bm["weighted_mid"].toDouble(), 'f', 4));+ }+ if (data.contains("market_making")) {+ const auto mm = data["market_making"].toObject();+ set_card("hft_mm_bid", QString::number(mm["bid_price"].toDouble(), 'f', 4),+ QString(ui::colors::POSITIVE()));+ set_card("hft_mm_ask", QString::number(mm["ask_price"].toDouble(), 'f', 4),+ QString(ui::colors::NEGATIVE()));+ set_card("hft_mm_qspread", QString::number(mm["quoted_spread_bps"].toDouble(), 'f', 3) + " bps");+ set_card("hft_mm_edge", QString::number(mm["edge_per_side_bps"].toDouble(), 'f', 3) + " bps");+ set_card("hft_mm_rec", mm["recommendation"].toString());+ }+ if (data.contains("toxic_flow")) {+ const auto tf = data["toxic_flow"].toObject();+ const double sc = tf["toxicity_score"].toDouble();+ const QString col = sc > 60 ? QString(ui::colors::NEGATIVE())+ : sc > 30 ? QString(ui::colors::WARNING())+ : QString(ui::colors::POSITIVE());+ set_card("hft_tox_pin", QString::number(sc, 'f', 1), col);+ set_card("hft_tox_vol", QString::number(tf["vol_imbalance"].toDouble(), 'f', 4));+ set_card("hft_tox_impact", QString::number(tf["price_impact_bps"].toDouble(), 'f', 2) + " bps");+ set_card("hft_tox_class", tf["classification"].toString());+ set_card("hft_tox_action", QString(tf["action"].toString()).replace('_', ' '));+ }+ if (data.contains("slippage")) {+ const auto sl = data["slippage"].toObject();+ set_card("hft_slip_avgp", QString::number(sl["average_price"].toDouble(), 'f', 4));+ set_card("hft_slip_bps", QString::number(sl["slippage_bps"].toDouble(), 'f', 4) + " bps");+ set_card("hft_slip_cost", QString::number(sl["total_cost"].toDouble(), 'f', 4));+ set_card("hft_slip_fills", QString::number(sl["fill_count"].toInt()));+ const bool v = sl["viable"].toBool();+ set_card("hft_slip_viable", v ? "VIABLE" : "HIGH SLIP",+ v ? QString(ui::colors::POSITIVE()) : QString(ui::colors::NEGATIVE()));+ }+ if (auto* lat_lbl = this->findChild<QLabel*>("hftLatency"))+ lat_lbl->setText(QString("LATENCY %1 ms").arg(data["latency_ms"].toDouble(), 0, 'f', 1));++ status_label_->setText(+ QString("Full analysis complete — %1 @ %2")+ .arg(data["symbol"].toString(), data["timestamp"].toString().left(19)));return;}+display_result(data);return;}@@ -3707,149 +4216,440 @@ QWidget* QuantModulePanel::build_meta_learning_panel() {// HFT PANEL// ═══════════════════════════════════════════════════════════════════════════════QWidget* QuantModulePanel::build_hft_panel() {- auto* w = new QWidget(this);- auto* vl = new QVBoxLayout(w);- vl->setContentsMargins(16, 16, 16, 16);- vl->setSpacing(12);+ const QString accent = module_.color.name();- auto* tabs = new QTabWidget(w);- tabs->setStyleSheet(tab_ss(module_.color.name()));+ auto* w = new QWidget(this);+ auto* vl = new QVBoxLayout(w);+ vl->setContentsMargins(0, 0, 0, 0);+ vl->setSpacing(0);- // ── Order Book ──- auto* ob_tab = new QWidget(this);- auto* obvl = new QVBoxLayout(ob_tab);- obvl->setContentsMargins(12, 12, 12, 12);- obvl->setSpacing(8);- auto* hft_symbol = new QLineEdit(ob_tab);- hft_symbol->setPlaceholderText("Symbol (e.g. AAPL)");+ // ── Shared exchange/symbol bar ────────────────────────────────────────────+ auto* top_bar = new QWidget(w);+ top_bar->setStyleSheet(QString("background:%1; border-bottom:1px solid %2;")+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));+ auto* top_hl = new QHBoxLayout(top_bar);+ top_hl->setContentsMargins(12, 8, 12, 8);+ top_hl->setSpacing(8);++ auto* exch_lbl = new QLabel("EXCHANGE", top_bar);+ exch_lbl->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; letter-spacing:0.5px;")+ .arg(ui::colors::TEXT_TERTIARY()));+ auto* hft_exchange = new QComboBox(top_bar);+ hft_exchange->addItems({"binance", "kraken", "coinbase", "bybit", "okx", "hyperliquid"});+ hft_exchange->setStyleSheet(combo_ss());+ hft_exchange->setFixedWidth(110);+ combo_inputs_["hft_exchange"] = hft_exchange;++ auto* sym_lbl = new QLabel("SYMBOL", top_bar);+ sym_lbl->setStyleSheet(exch_lbl->styleSheet());+ auto* hft_symbol = new QLineEdit(top_bar);+ hft_symbol->setText("BTC/USDT");+ hft_symbol->setFixedWidth(100);hft_symbol->setStyleSheet(input_ss());+ hft_symbol->setToolTip("e.g. BTC/USDT, ETH/USDT");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);- connect(ob_create, &QPushButton::clicked, this, [this]() {- status_label_->setText("Creating...");- QJsonObject params;- params["symbol"] = text_inputs_["hft_symbol"]->text().trimmed().toUpper();- AIQuantLabService::instance().hft_create_orderbook(params);++ auto* depth_lbl = new QLabel("DEPTH", top_bar);+ depth_lbl->setStyleSheet(exch_lbl->styleSheet());+ auto* hft_depth = new QComboBox(top_bar);+ hft_depth->addItems({"10", "20", "50", "100"});+ hft_depth->setCurrentIndex(1);+ hft_depth->setFixedWidth(60);+ hft_depth->setStyleSheet(combo_ss());+ combo_inputs_["hft_depth"] = hft_depth;++ top_hl->addWidget(exch_lbl);+ top_hl->addWidget(hft_exchange);+ top_hl->addWidget(sym_lbl);+ top_hl->addWidget(hft_symbol);+ top_hl->addWidget(depth_lbl);+ top_hl->addWidget(hft_depth);+ top_hl->addStretch();++ // Live latency badge+ auto* latency_lbl = new QLabel("LATENCY —", top_bar);+ latency_lbl->setObjectName("hftLatency");+ latency_lbl->setStyleSheet(QString("color:%1; font-size:9px; font-family:'Courier New'; background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));+ top_hl->addWidget(latency_lbl);+ vl->addWidget(top_bar);++ // ── Tab widget ────────────────────────────────────────────────────────────+ auto* tabs = new QTabWidget(w);+ tabs->setStyleSheet(tab_ss(accent));++ // ════════════════════════════════════════════════════════+ // TAB 1 — LIVE ORDER BOOK+ // ════════════════════════════════════════════════════════+ auto* ob_tab = new QWidget(this);+ auto* ob_root = new QVBoxLayout(ob_tab);+ ob_root->setContentsMargins(12, 10, 12, 10);+ ob_root->setSpacing(8);++ // Controls row+ auto* ob_ctrl = new QHBoxLayout;+ ob_ctrl->setSpacing(8);+ auto* ob_fetch = make_run_button("FETCH LIVE ORDER BOOK", ob_tab);+ connect(ob_fetch, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Fetching live order book...");+ QJsonObject p;+ p["exchange"] = combo_inputs_["hft_exchange"]->currentText();+ p["symbol"] = text_inputs_["hft_symbol"]->text().trimmed();+ p["depth"] = combo_inputs_["hft_depth"]->currentText().toInt();+ AIQuantLabService::instance().hft_create_orderbook(p);});- obvl->addWidget(ob_create);- auto* ob_snap = make_run_button("GET SNAPSHOT", ob_tab);- connect(ob_snap, &QPushButton::clicked, this, [this]() {- status_label_->setText("Fetching...");- QJsonObject params;- params["symbol"] = text_inputs_["hft_symbol"]->text().trimmed().toUpper();- AIQuantLabService::instance().hft_snapshot(params);- });- obvl->addWidget(ob_snap);- obvl->addStretch();- tabs->addTab(ob_tab, "Order Book");-- // ── Market Making ──- auto* mm_tab = new QWidget(this);- auto* mmvl = new QVBoxLayout(mm_tab);- mmvl->setContentsMargins(12, 12, 12, 12);- mmvl->setSpacing(8);- auto* mm_sym = new QLineEdit(mm_tab);- mm_sym->setPlaceholderText("Symbol (e.g. AAPL)");- 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_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_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);+ ob_ctrl->addWidget(ob_fetch);+ ob_ctrl->addStretch();+ ob_root->addLayout(ob_ctrl);++ // Metrics row — 5 cards in a grid+ auto* metrics_row = new QHBoxLayout;+ metrics_row->setSpacing(6);++ auto make_card = [&](const QString& label, QWidget* parent) -> QPair<QWidget*, QLabel*> {+ auto* card = new QWidget(parent);+ card->setStyleSheet(QString("background:%1; border:1px solid %2; border-radius:3px;")+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));+ auto* cvl = new QVBoxLayout(card);+ cvl->setContentsMargins(10, 6, 10, 6);+ cvl->setSpacing(2);+ auto* l = new QLabel(label, card);+ l->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; letter-spacing:0.5px; background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY()));+ auto* v = new QLabel("—", card);+ v->setObjectName("hftCardVal");+ v->setStyleSheet(QString("color:%1; font-size:13px; font-weight:700; font-family:'Courier New'; background:transparent;")+ .arg(ui::colors::TEXT_PRIMARY()));+ cvl->addWidget(l);+ cvl->addWidget(v);+ return {card, v};+ };++ auto [mid_card, mid_val] = make_card("MID PRICE", ob_tab);+ auto [spread_card, spread_val] = make_card("SPREAD BPS", ob_tab);+ auto [obi_card, obi_val] = make_card("ORDER BOOK IMBALANCE", ob_tab);+ auto [pressure_card, pres_val] = make_card("PRESSURE", ob_tab);+ auto [wmid_card, wmid_val] = make_card("WEIGHTED MID", ob_tab);++ // Store for result update+ mid_val->setObjectName("hft_mid_val");+ spread_val->setObjectName("hft_spread_val");+ obi_val->setObjectName("hft_obi_val");+ pres_val->setObjectName("hft_pressure_val");+ wmid_val->setObjectName("hft_wmid_val");++ metrics_row->addWidget(mid_card, 1);+ metrics_row->addWidget(spread_card, 1);+ metrics_row->addWidget(obi_card, 1);+ metrics_row->addWidget(pressure_card, 1);+ metrics_row->addWidget(wmid_card, 1);+ ob_root->addLayout(metrics_row);++ // Bid / Ask tables side by side+ auto* books_row = new QHBoxLayout;+ books_row->setSpacing(8);++ // Bids+ auto* bids_frame = new QWidget(ob_tab);+ bids_frame->setStyleSheet(QString("background:%1; border:1px solid %2; border-radius:3px;")+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));+ auto* bids_vl = new QVBoxLayout(bids_frame);+ bids_vl->setContentsMargins(0, 0, 0, 0);+ bids_vl->setSpacing(0);+ auto* bids_hdr = new QLabel(" BIDS", bids_frame);+ bids_hdr->setFixedHeight(24);+ bids_hdr->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; letter-spacing:1px;"+ "background:%2; border-bottom:1px solid %3;")+ .arg(ui::colors::POSITIVE(), ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));+ auto* bid_table = new QTableWidget(10, 3, bids_frame);+ bid_table->setObjectName("hft_bid_table");+ bid_table->setHorizontalHeaderLabels({"Price", "Size", "Cumulative"});+ bid_table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ bid_table->verticalHeader()->setVisible(false);+ bid_table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ bid_table->setSelectionMode(QAbstractItemView::NoSelection);+ bid_table->setShowGrid(false);+ bid_table->setStyleSheet(+ QString("QTableWidget { background:%1; border:none; }"+ "QHeaderView::section { background:%2; color:%3; font-size:9px; font-weight:700;"+ " padding:3px 6px; border:none; border-bottom:1px solid %4; }"+ "QTableWidget::item { padding:2px 6px; font-family:'Courier New'; font-size:10px; border:none; }")+ .arg(ui::colors::BG_RAISED(), ui::colors::BG_SURFACE(),+ ui::colors::TEXT_TERTIARY(), ui::colors::BORDER_DIM()));+ bids_vl->addWidget(bids_hdr);+ bids_vl->addWidget(bid_table, 1);++ // Asks+ auto* asks_frame = new QWidget(ob_tab);+ asks_frame->setStyleSheet(bids_frame->styleSheet());+ auto* asks_vl = new QVBoxLayout(asks_frame);+ asks_vl->setContentsMargins(0, 0, 0, 0);+ asks_vl->setSpacing(0);+ auto* asks_hdr = new QLabel(" ASKS", asks_frame);+ asks_hdr->setFixedHeight(24);+ asks_hdr->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700; letter-spacing:1px;"+ "background:%2; border-bottom:1px solid %3;")+ .arg(ui::colors::NEGATIVE(), ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));+ auto* ask_table = new QTableWidget(10, 3, asks_frame);+ ask_table->setObjectName("hft_ask_table");+ ask_table->setHorizontalHeaderLabels({"Price", "Size", "Cumulative"});+ ask_table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ ask_table->verticalHeader()->setVisible(false);+ ask_table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ ask_table->setSelectionMode(QAbstractItemView::NoSelection);+ ask_table->setShowGrid(false);+ ask_table->setStyleSheet(bid_table->styleSheet());+ asks_vl->addWidget(asks_hdr);+ asks_vl->addWidget(ask_table, 1);++ books_row->addWidget(bids_frame, 1);+ books_row->addWidget(asks_frame, 1);+ ob_root->addLayout(books_row, 1);+ tabs->addTab(ob_tab, "Live Order Book");++ // ════════════════════════════════════════════════════════+ // TAB 2 — MICROSTRUCTURE (Market Making + Toxic Flow)+ // ════════════════════════════════════════════════════════+ auto* micro_tab = new QWidget(this);+ auto* micro_root = new QVBoxLayout(micro_tab);+ micro_root->setContentsMargins(12, 10, 12, 10);+ micro_root->setSpacing(10);++ // ─ Market Making section ─+ auto* mm_section = new QWidget(micro_tab);+ mm_section->setStyleSheet(QString("background:%1; border:1px solid %2; border-radius:3px;")+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));+ auto* mm_vl = new QVBoxLayout(mm_section);+ mm_vl->setContentsMargins(12, 10, 12, 10);+ mm_vl->setSpacing(8);++ auto* mm_title = new QLabel("MARKET MAKING — Avellaneda-Stoikov Model", mm_section);+ mm_title->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; letter-spacing:0.5px; background:transparent;")+ .arg(accent));+ mm_vl->addWidget(mm_title);++ auto* mm_params = new QHBoxLayout;+ mm_params->setSpacing(8);+ auto* inv_spin = make_double_spin(-1000, 1000, 0.0, 4, " units", mm_section);+ int_inputs_["hft_inventory"] = nullptr;+ double_inputs_["hft_inventory_d"] = inv_spin;+ mm_params->addWidget(build_input_row("Inventory", inv_spin, mm_section));+ auto* spread_spin = make_double_spin(1.0, 10.0, 1.5, 2, "×", mm_section);+ double_inputs_["hft_spread_mult"] = spread_spin;+ mm_params->addWidget(build_input_row("Spread Mult", spread_spin, mm_section));+ auto* risk_spin = make_double_spin(0.001, 0.1, 0.01, 3, "", mm_section);+ double_inputs_["hft_risk_aversion"] = risk_spin;+ mm_params->addWidget(build_input_row("Risk Aversion", risk_spin, mm_section));+ mm_vl->addLayout(mm_params);++ auto* mm_run = make_run_button("CALCULATE OPTIMAL QUOTES", mm_section);connect(mm_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Calculating...");- QJsonObject params;- params["symbol"] = text_inputs_["hft_mm_symbol"]->text().trimmed().toUpper();- params["mid_price"] = text_inputs_["hft_mm_mid"]->text().trimmed().toDouble();- params["spread_multiplier"] = text_inputs_["hft_mm_spread"]->text().trimmed().toDouble();- AIQuantLabService::instance().hft_market_making_quotes(params);- });- mmvl->addWidget(mm_run);- mmvl->addStretch();- tabs->addTab(mm_tab, "Market Making");-- // ── Toxic Flow Detection ──- auto* toxic_tab = new QWidget(this);- auto* toxicvl = new QVBoxLayout(toxic_tab);- toxicvl->setContentsMargins(12, 12, 12, 12);- toxicvl->setSpacing(8);- auto* tox_sym = new QLineEdit(toxic_tab);- tox_sym->setPlaceholderText("Symbol (e.g. AAPL)");- 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_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_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);+ status_label_->setText("Fetching live data + computing quotes...");+ QJsonObject p;+ p["exchange"] = combo_inputs_["hft_exchange"]->currentText();+ p["symbol"] = text_inputs_["hft_symbol"]->text().trimmed();+ p["inventory"] = double_inputs_["hft_inventory_d"]->value();+ p["spread_multiplier"] = double_inputs_["hft_spread_mult"]->value();+ p["risk_aversion"] = double_inputs_["hft_risk_aversion"]->value();+ AIQuantLabService::instance().hft_market_making_quotes(p);+ });+ mm_vl->addWidget(mm_run);++ // MM result cards+ auto* mm_results = new QHBoxLayout;+ mm_results->setSpacing(6);+ auto [bid_card, bid_val2] = make_card("BID QUOTE", mm_section);+ auto [ask_card, ask_val2] = make_card("ASK QUOTE", mm_section);+ auto [qs_card, qs_val] = make_card("QUOTED SPREAD BPS", mm_section);+ auto [edge_card, edge_val] = make_card("EDGE/SIDE BPS", mm_section);+ auto [rec_card, rec_val] = make_card("RECOMMENDATION", mm_section);+ bid_val2->setObjectName("hft_mm_bid");+ ask_val2->setObjectName("hft_mm_ask");+ qs_val->setObjectName("hft_mm_qspread");+ edge_val->setObjectName("hft_mm_edge");+ rec_val->setObjectName("hft_mm_rec");+ mm_results->addWidget(bid_card, 1);+ mm_results->addWidget(ask_card, 1);+ mm_results->addWidget(qs_card, 1);+ mm_results->addWidget(edge_card, 1);+ mm_results->addWidget(rec_card, 1);+ mm_vl->addLayout(mm_results);+ micro_root->addWidget(mm_section);++ // ─ Toxic Flow section ─+ auto* tox_section = new QWidget(micro_tab);+ tox_section->setStyleSheet(mm_section->styleSheet());+ auto* tox_vl = new QVBoxLayout(tox_section);+ tox_vl->setContentsMargins(12, 10, 12, 10);+ tox_vl->setSpacing(8);++ auto* tox_title = new QLabel("TOXIC FLOW DETECTION — PIN Score Model", tox_section);+ tox_title->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; letter-spacing:0.5px; background:transparent;")+ .arg(accent));+ tox_vl->addWidget(tox_title);++ auto* tox_params = new QHBoxLayout;+ tox_params->setSpacing(8);+ auto* tox_limit = new QComboBox(tox_section);+ tox_limit->addItems({"50", "100", "200", "500"});+ tox_limit->setCurrentIndex(2);+ tox_limit->setStyleSheet(combo_ss());+ combo_inputs_["hft_tox_limit"] = tox_limit;+ tox_params->addWidget(build_input_row("Trade History", tox_limit, tox_section));+ tox_params->addStretch();+ tox_vl->addLayout(tox_params);++ auto* tox_run = make_run_button("DETECT TOXIC FLOW", tox_section);connect(tox_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Detecting...");- QJsonObject params;- params["symbol"] = text_inputs_["hft_tox_symbol"]->text().trimmed().toUpper();- params["trade_price"] = text_inputs_["hft_tox_price"]->text().trimmed().toDouble();- params["trade_size"] = text_inputs_["hft_tox_size"]->text().trimmed().toDouble();- AIQuantLabService::instance().hft_detect_toxic(params);- });- toxicvl->addWidget(tox_run);- toxicvl->addStretch();- tabs->addTab(toxic_tab, "Toxic Flow");-- // ── Order Execution ──- auto* exec_tab = new QWidget(this);- auto* execvl = new QVBoxLayout(exec_tab);- execvl->setContentsMargins(12, 12, 12, 12);- execvl->setSpacing(8);- auto* exec_sym = new QLineEdit(exec_tab);- exec_sym->setPlaceholderText("Symbol (e.g. AAPL)");- 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_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_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_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);- connect(exec_run, &QPushButton::clicked, this, [this]() {- status_label_->setText("Executing...");- QJsonObject params;- params["symbol"] = text_inputs_["hft_exec_symbol"]->text().trimmed().toUpper();- params["side"] = combo_inputs_["hft_exec_side"]->currentText();- params["quantity"] = text_inputs_["hft_exec_qty"]->text().trimmed().toDouble();- params["price"] = text_inputs_["hft_exec_price"]->text().trimmed().toDouble();- AIQuantLabService::instance().hft_execute_order(params);+ status_label_->setText("Fetching trades + analyzing flow...");+ QJsonObject p;+ p["exchange"] = combo_inputs_["hft_exchange"]->currentText();+ p["symbol"] = text_inputs_["hft_symbol"]->text().trimmed();+ p["limit"] = combo_inputs_["hft_tox_limit"]->currentText().toInt();+ AIQuantLabService::instance().hft_detect_toxic(p);});- execvl->addWidget(exec_run);- execvl->addStretch();- tabs->addTab(exec_tab, "Order Execution");+ tox_vl->addWidget(tox_run);++ auto* tox_results = new QHBoxLayout;+ tox_results->setSpacing(6);+ auto [pin_card, pin_val] = make_card("PIN SCORE (0-100)", tox_section);+ auto [vol_card, vol_val] = make_card("VOLUME IMBALANCE", tox_section);+ auto [impact_card, impact_val] = make_card("PRICE IMPACT BPS", tox_section);+ auto [class_card, class_val] = make_card("CLASSIFICATION", tox_section);+ auto [action_card, action_val] = make_card("RECOMMENDED ACTION", tox_section);+ pin_val->setObjectName("hft_tox_pin");+ vol_val->setObjectName("hft_tox_vol");+ impact_val->setObjectName("hft_tox_impact");+ class_val->setObjectName("hft_tox_class");+ action_val->setObjectName("hft_tox_action");+ tox_results->addWidget(pin_card, 1);+ tox_results->addWidget(vol_card, 1);+ tox_results->addWidget(impact_card, 1);+ tox_results->addWidget(class_card, 1);+ tox_results->addWidget(action_card, 1);+ tox_vl->addLayout(tox_results);+ micro_root->addWidget(tox_section);+ micro_root->addStretch();+ tabs->addTab(micro_tab, "Microstructure");++ // ════════════════════════════════════════════════════════+ // TAB 3 — SLIPPAGE ESTIMATOR+ // ════════════════════════════════════════════════════════+ auto* slip_tab = new QWidget(this);+ auto* slip_root = new QVBoxLayout(slip_tab);+ slip_root->setContentsMargins(12, 10, 12, 10);+ slip_root->setSpacing(10);++ auto* slip_section = new QWidget(slip_tab);+ slip_section->setStyleSheet(QString("background:%1; border:1px solid %2; border-radius:3px;")+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));+ auto* slip_vl = new QVBoxLayout(slip_section);+ slip_vl->setContentsMargins(12, 10, 12, 10);+ slip_vl->setSpacing(8);++ auto* slip_title = new QLabel("SLIPPAGE ESTIMATOR — Real Order Book Walk", slip_section);+ slip_title->setStyleSheet(QString("color:%1; font-size:10px; font-weight:700; letter-spacing:0.5px; background:transparent;")+ .arg(accent));+ slip_vl->addWidget(slip_title);++ auto* slip_desc = new QLabel(+ "Walks the live order book level-by-level to compute actual fill price and slippage for a given order size.", slip_section);+ slip_desc->setWordWrap(true);+ slip_desc->setStyleSheet(QString("color:%1; font-size:10px; background:transparent;").arg(ui::colors::TEXT_SECONDARY()));+ slip_vl->addWidget(slip_desc);++ auto* slip_params = new QHBoxLayout;+ slip_params->setSpacing(8);+ auto* slip_side = new QComboBox(slip_section);+ slip_side->addItems({"buy", "sell"});+ slip_side->setStyleSheet(combo_ss());+ combo_inputs_["hft_slip_side"] = slip_side;+ slip_params->addWidget(build_input_row("Side", slip_side, slip_section));+ auto* slip_qty = make_double_spin(0.0001, 1'000'000, 1.0, 6, "", slip_section);+ double_inputs_["hft_slip_qty"] = slip_qty;+ slip_params->addWidget(build_input_row("Quantity", slip_qty, slip_section));+ slip_vl->addLayout(slip_params);++ auto* slip_run = make_run_button("ESTIMATE SLIPPAGE", slip_section);+ connect(slip_run, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Walking order book...");+ QJsonObject p;+ p["exchange"] = combo_inputs_["hft_exchange"]->currentText();+ p["symbol"] = text_inputs_["hft_symbol"]->text().trimmed();+ p["side"] = combo_inputs_["hft_slip_side"]->currentText();+ p["quantity"] = double_inputs_["hft_slip_qty"]->value();+ AIQuantLabService::instance().hft_execute_order(p);+ });+ slip_vl->addWidget(slip_run);++ // Slippage result cards+ auto* slip_results = new QHBoxLayout;+ slip_results->setSpacing(6);+ auto [avgp_card, avgp_val] = make_card("AVG FILL PRICE", slip_section);+ auto [slbps_card, slbps_val] = make_card("SLIPPAGE BPS", slip_section);+ auto [cost_card, cost_val] = make_card("TOTAL COST", slip_section);+ auto [fills_card, fills_val] = make_card("FILL LEVELS", slip_section);+ auto [viable_card, viable_val] = make_card("VIABILITY", slip_section);+ avgp_val->setObjectName("hft_slip_avgp");+ slbps_val->setObjectName("hft_slip_bps");+ cost_val->setObjectName("hft_slip_cost");+ fills_val->setObjectName("hft_slip_fills");+ viable_val->setObjectName("hft_slip_viable");+ slip_results->addWidget(avgp_card, 1);+ slip_results->addWidget(slbps_card, 1);+ slip_results->addWidget(cost_card, 1);+ slip_results->addWidget(fills_card, 1);+ slip_results->addWidget(viable_card, 1);+ slip_vl->addLayout(slip_results);++ // Fills table+ auto* fills_table = new QTableWidget(0, 3, slip_section);+ fills_table->setObjectName("hft_slip_table");+ fills_table->setHorizontalHeaderLabels({"Fill Price", "Quantity", "Cost"});+ fills_table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);+ fills_table->verticalHeader()->setVisible(false);+ fills_table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ fills_table->setSelectionMode(QAbstractItemView::NoSelection);+ fills_table->setShowGrid(false);+ fills_table->setMaximumHeight(160);+ fills_table->setStyleSheet(+ QString("QTableWidget { background:%1; border:1px solid %2; }"+ "QHeaderView::section { background:%3; color:%4; font-size:9px; font-weight:700;"+ " padding:3px 6px; border:none; border-bottom:1px solid %2; }"+ "QTableWidget::item { padding:2px 6px; font-family:'Courier New'; font-size:10px; }")+ .arg(ui::colors::BG_BASE(), ui::colors::BORDER_DIM(),+ ui::colors::BG_SURFACE(), ui::colors::TEXT_TERTIARY()));+ slip_vl->addWidget(fills_table);++ slip_root->addWidget(slip_section);+ slip_root->addStretch();+ tabs->addTab(slip_tab, "Slippage Estimator");++ // ── Full Analyze button (bottom bar) ─────────────────────────────────────+ auto* bottom_bar = new QWidget(w);+ bottom_bar->setStyleSheet(QString("background:%1; border-top:1px solid %2;")+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));+ auto* bot_hl = new QHBoxLayout(bottom_bar);+ bot_hl->setContentsMargins(12, 6, 12, 6);+ auto* analyze_btn = make_run_button("⚡ FULL ANALYSIS — FETCH ALL & COMPUTE", bottom_bar);+ analyze_btn->setToolTip("Fetches live order book + trades, computes book metrics, market making quotes, toxic flow, and slippage in one call");+ connect(analyze_btn, &QPushButton::clicked, this, [this]() {+ status_label_->setText("Running full microstructure analysis...");+ QJsonObject p;+ p["exchange"] = combo_inputs_["hft_exchange"]->currentText();+ p["symbol"] = text_inputs_["hft_symbol"]->text().trimmed();+ p["depth"] = combo_inputs_["hft_depth"]->currentText().toInt();+ p["limit"] = combo_inputs_["hft_tox_limit"]->currentText().toInt();+ p["inventory"] = double_inputs_["hft_inventory_d"]->value();+ p["spread_multiplier"] = double_inputs_["hft_spread_mult"]->value();+ p["quantity"] = double_inputs_["hft_slip_qty"]->value();+ AIQuantLabService::instance().hft_snapshot(p);+ });+ bot_hl->addWidget(analyze_btn, 1);vl->addWidget(tabs, 1);+ vl->addWidget(bottom_bar);+results_layout_ = new QVBoxLayout;vl->addLayout(results_layout_);return w;diff --git a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.h b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.hindex 4de877187..e75a52afa 100644--- a/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.h+++ b/fincept-qt/src/screens/ai_quant_lab/QuantModulePanel.h@@ -4,6 +4,7 @@#include "storage/repositories/LlmProfileRepository.h"#include <QComboBox>+#include <QDateEdit>#include <QDoubleSpinBox>#include <QHash>#include <QJsonObject>@@ -64,6 +65,7 @@ class QuantModulePanel : public QWidget {QWidget* build_llm_picker(QWidget* parent, QComboBox** out_combo);QJsonObject llm_config_from_combo(QComboBox* combo) const;void display_result(const QJsonObject& data);+ void display_backtest_result(const QJsonObject& data);void display_error(const QString& msg);void clear_results();@@ -83,6 +85,7 @@ class QuantModulePanel : public QWidget {QHash<QString, QLineEdit*> text_inputs_;QHash<QString, QComboBox*> combo_inputs_;QHash<QString, QSpinBox*> int_inputs_;+ QHash<QString, QDateEdit*> date_inputs_;};} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/code_editor/CodeEditorScreen.cpp b/fincept-qt/src/screens/code_editor/CodeEditorScreen.cppindex 16083305c..931115993 100644--- a/fincept-qt/src/screens/code_editor/CodeEditorScreen.cpp+++ b/fincept-qt/src/screens/code_editor/CodeEditorScreen.cpp@@ -3,6 +3,7 @@// Responsive cells, markdown rendering, keyboard shortcuts, collapsible output.#include "screens/code_editor/CodeEditorScreen.h"+#include "core/keys/KeyConfigManager.h"#include "core/logging/Logger.h"#include "core/session/ScreenStateManager.h"#include "python/PythonRunner.h"@@ -46,15 +47,16 @@ using namespace fincept::ui;CodeTextEdit::CodeTextEdit(QWidget* parent) : QTextEdit(parent) {}void CodeTextEdit::keyPressEvent(QKeyEvent* event) {- if (event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) {- if (event->modifiers() & Qt::ControlModifier) {- emit run_shortcut();- return;- }- if (event->modifiers() & Qt::ShiftModifier) {- emit run_and_next();- return;- }+ auto& km = KeyConfigManager::instance();+ const QKeySequence pressed(event->keyCombination());++ if (pressed == km.key(KeyAction::RunCell)) {+ emit run_shortcut();+ return;+ }+ if (pressed == km.key(KeyAction::RunAndNext)) {+ emit run_and_next();+ return;}// Tab inserts 4 spacesif (event->key() == Qt::Key_Tab && !(event->modifiers() & Qt::ShiftModifier)) {@@ -750,8 +752,7 @@ CellNavigator::CellNavigator(QWidget* parent) : QWidget(parent) {}});- auto* rename_shortcut = new QAction("Rename Cell", this);- rename_shortcut->setShortcut(QKeySequence(Qt::Key_F2));+ auto* rename_shortcut = KeyConfigManager::instance().action(KeyAction::RenameCell);rename_shortcut->setShortcutContext(Qt::WidgetWithChildrenShortcut);list_->addAction(rename_shortcut);connect(rename_shortcut, &QAction::triggered, this, [this]() {diff --git a/fincept-qt/src/screens/economics/panels/CftcPanel.cpp b/fincept-qt/src/screens/economics/panels/CftcPanel.cppindex 7e7f14aa3..1b7714398 100644--- a/fincept-qt/src/screens/economics/panels/CftcPanel.cpp+++ b/fincept-qt/src/screens/economics/panels/CftcPanel.cpp@@ -194,8 +194,7 @@ void CftcPanel::build_sentiment_widget() {ttl->setStyleSheet(lbl_ss);bias_out = new QLabel("—");- bias_out->setStyleSheet(- QString("color:%1; font-size:18px; font-weight:700; background:transparent;").arg(TEXT_PRIMARY()));+ bias_out->setObjectName("econStatVal");net_out = new QLabel("Net: —");net_out->setStyleSheet(QString("color:%1; font-size:10px; background:transparent;").arg(TEXT_TERTIARY()));@@ -232,8 +231,7 @@ void CftcPanel::build_sentiment_widget() {auto* trend_lbl = new QLabel("OI TREND");trend_lbl->setStyleSheet(lbl_ss);sent_oi_trend_ = new QLabel("—");- sent_oi_trend_->setStyleSheet(- QString("color:%1; font-size:13px; font-weight:700; background:transparent;").arg(TEXT_PRIMARY()));+ sent_oi_trend_->setObjectName("econStatVal");oi_hl->addWidget(oi_lbl);oi_hl->addWidget(sent_oi_lbl_);@@ -348,21 +346,23 @@ 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" ? POSITIVE() : NEGATIVE()));+ sent_oi_trend_->setObjectName(oi_trend == "increasing" ? "econStatPos" : "econStatNeg");+ sent_oi_trend_->style()->unpolish(sent_oi_trend_);+ sent_oi_trend_->style()->polish(sent_oi_trend_);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" ? POSITIVE() : NEGATIVE()));+ sent_comm_bias_->setObjectName(comm_bias == "bullish" ? "econStatPos" : "econStatNeg");+ sent_comm_bias_->style()->unpolish(sent_comm_bias_);+ sent_comm_bias_->style()->polish(sent_comm_bias_);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" ? POSITIVE() : NEGATIVE()));+ sent_noncomm_bias_->setObjectName(noncomm_bias == "bullish" ? "econStatPos" : "econStatNeg");+ sent_noncomm_bias_->style()->unpolish(sent_noncomm_bias_);+ sent_noncomm_bias_->style()->polish(sent_noncomm_bias_);const QJsonObject comm = s["commercial_positions"].toObject();const double comm_net = comm["net"].toDouble();diff --git a/fincept-qt/src/screens/economics/panels/EconPanelBase.cpp b/fincept-qt/src/screens/economics/panels/EconPanelBase.cppindex ef207e3d2..437315531 100644--- a/fincept-qt/src/screens/economics/panels/EconPanelBase.cpp+++ b/fincept-qt/src/screens/economics/panels/EconPanelBase.cpp@@ -9,6 +9,7 @@#include <QFileDialog>#include <QHBoxLayout>#include <QHeaderView>+#include <QListWidget>#include <QTextStream>#include <QVBoxLayout>@@ -42,15 +43,20 @@ QString EconPanelBase::panel_style() const {"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; }"+ "#econCardsRow { background:%7; border-bottom:1px solid %6; }"+ "#econTitleBar { background:%12; border-bottom:1px solid %6; }""#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:%14; font-size:9px; background:transparent; }"+ "#econStatVal { color:%1; font-size:15px; font-weight:700; background:transparent; }"+ "#econStatPos { color:%16; font-size:15px; font-weight:700; background:transparent; }"+ "#econStatNeg { color:%15; font-size:15px; font-weight:700; background:transparent; }"+ "#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; }"+ "#econEmptyMsg { color:%9; font-size:13px; background:transparent; }"+ "#econLoadingMsg { color:%1; 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:%14; font-size:9px; background:transparent; }"@@ -74,7 +80,8 @@ QString EconPanelBase::panel_style() const {.arg(BG_SURFACE()) // %12.arg(BORDER_BRIGHT()) // %13.arg(TEXT_TERTIARY()) // %14- .arg(NEGATIVE()); // %15+ .arg(NEGATIVE()) // %15+ .arg(POSITIVE()); // %16}// ── Reusable token-based style helpers ────────────────────────────────────────@@ -170,6 +177,7 @@ void EconPanelBase::build_base_ui(QWidget* container) {// Stat cards rowcards_row_ = new QWidget(this);+ cards_row_->setObjectName("econCardsRow");auto* crhl = new QHBoxLayout(cards_row_);crhl->setContentsMargins(10, 6, 10, 6);crhl->setSpacing(6);@@ -200,6 +208,7 @@ void EconPanelBase::build_base_ui(QWidget* container) {// Title bartitle_bar_ = new QWidget(this);+ title_bar_->setObjectName("econTitleBar");auto* tbhl = new QHBoxLayout(title_bar_);tbhl->setContentsMargins(12, 4, 12, 4);title_lbl_ = new QLabel;@@ -242,14 +251,8 @@ void EconPanelBase::build_base_ui(QWidget* container) {// ── 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 ─────────────────────────────────────────────────────────────────────@@ -257,7 +260,9 @@ void EconPanelBase::refresh_panel_theme() {void EconPanelBase::show_loading(const QString& msg) {if (!empty_lbl_)return;- empty_lbl_->setStyleSheet(QString("color:%1; font-size:13px; background:transparent;").arg(color_));+ empty_lbl_->setObjectName("econLoadingMsg");+ empty_lbl_->style()->unpolish(empty_lbl_);+ empty_lbl_->style()->polish(empty_lbl_);empty_lbl_->setText(msg);stack_->setCurrentIndex(0);if (fetch_btn_)@@ -265,10 +270,11 @@ 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(QString("color:%1; font-size:12px; background:transparent;").arg(NEGATIVE()));+ empty_lbl_->setObjectName("econErrMsg");+ empty_lbl_->style()->unpolish(empty_lbl_);+ empty_lbl_->style()->polish(empty_lbl_);empty_lbl_->setText("Error: " + msg);stack_->setCurrentIndex(0);if (fetch_btn_)@@ -276,10 +282,11 @@ void EconPanelBase::show_error(const QString& msg) {}void EconPanelBase::show_empty(const QString& msg) {- using namespace ui::colors;if (!empty_lbl_)return;- empty_lbl_->setStyleSheet(QString("color:%1; font-size:13px; background:transparent;").arg(TEXT_SECONDARY()));+ empty_lbl_->setObjectName("econEmptyMsg");+ empty_lbl_->style()->unpolish(empty_lbl_);+ empty_lbl_->style()->polish(empty_lbl_);empty_lbl_->setText(msg);stack_->setCurrentIndex(0);if (fetch_btn_)@@ -413,8 +420,9 @@ void EconPanelBase::update_stats(const QJsonArray& rows) {stat_latest_->setText(fmt(latest));if (stat_change_) {stat_change_->setText((change >= 0 ? "+" : "") + QString::number(change, 'f', 2) + "%");- stat_change_->setStyleSheet(QString("color:%1; font-size:15px; font-weight:700; background:transparent;")- .arg(change >= 0 ? ui::colors::POSITIVE() : ui::colors::NEGATIVE()));+ stat_change_->setObjectName(change >= 0 ? "econStatPos" : "econStatNeg");+ stat_change_->style()->unpolish(stat_change_);+ stat_change_->style()->polish(stat_change_);}if (stat_min_)stat_min_->setText(fmt(mn));@@ -461,4 +469,15 @@ void EconPanelBase::export_csv() {}}+// ── Shared utilities ──────────────────────────────────────────────────────────++void EconPanelBase::filter_list(QListWidget* list, const QString& text) {+ if (!list)+ return;+ for (int i = 0; i < list->count(); ++i) {+ auto* item = list->item(i);+ item->setHidden(!item->text().contains(text, Qt::CaseInsensitive));+ }+}+} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/economics/panels/EconPanelBase.h b/fincept-qt/src/screens/economics/panels/EconPanelBase.hindex 3a89604a4..367de35b0 100644--- a/fincept-qt/src/screens/economics/panels/EconPanelBase.h+++ b/fincept-qt/src/screens/economics/panels/EconPanelBase.h@@ -11,6 +11,7 @@#include <QDate>#include <QJsonArray>#include <QLabel>+#include <QListWidget>#include <QPushButton>#include <QStackedWidget>#include <QTableWidget>@@ -54,6 +55,10 @@ class EconPanelBase : public QWidget {/// Called when theme changes — re-applies panel_style(). Override for extra widgets.virtual void refresh_panel_theme();+ // ── Shared utilities ──────────────────────────────────────────────────────+ /// Filter a QListWidget by hiding items that don't contain text (case-insensitive).+ static void filter_list(QListWidget* list, const QString& text);+// ── Reusable token-based style helpers for sidebar panels ─────────────────static QString sidebar_style(); // left panel background + borderstatic QString section_hdr_style(); // section header bar (e.g. "COUNTRY")diff --git a/fincept-qt/src/screens/economics/panels/ImfPanel.cpp b/fincept-qt/src/screens/economics/panels/ImfPanel.cppindex d7666714e..402a59c1a 100644--- a/fincept-qt/src/screens/economics/panels/ImfPanel.cpp+++ b/fincept-qt/src/screens/economics/panels/ImfPanel.cpp@@ -209,14 +209,7 @@ QJsonArray ImfPanel::flatten_pivot(const QJsonObject& values, const QString& ind}void ImfPanel::on_indicator_filter(const QString& text) {- for (int i = 0; i < indicator_list_->count(); ++i) {- auto* item = indicator_list_->item(i);- item->setHidden(!item->text().contains(text, Qt::CaseInsensitive));- }-}--void ImfPanel::load_indicators() {- indicators_loaded_ = true;+ filter_list(indicator_list_, text);}} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/economics/panels/ImfPanel.h b/fincept-qt/src/screens/economics/panels/ImfPanel.hindex 00d823379..26475e384 100644--- a/fincept-qt/src/screens/economics/panels/ImfPanel.h+++ b/fincept-qt/src/screens/economics/panels/ImfPanel.h@@ -23,7 +23,6 @@ class ImfPanel : public EconPanelBase {void on_result(const QString& request_id, const services::EconomicsResult& result) override;private:- void load_indicators();void on_indicator_filter(const QString& text);// Flatten nested pivot: values.INDICATOR.COUNTRY.YEAR -> rowsQJsonArray flatten_pivot(const QJsonObject& values, const QString& indicator_code,@@ -32,8 +31,6 @@ class ImfPanel : public EconPanelBase {QLineEdit* indicator_search_ = nullptr;QListWidget* indicator_list_ = nullptr;QComboBox* country_combo_ = nullptr;-- bool indicators_loaded_ = false;};} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/economics/panels/WorldBankPanel.cpp b/fincept-qt/src/screens/economics/panels/WorldBankPanel.cppindex fab313319..2ee92027b 100644--- a/fincept-qt/src/screens/economics/panels/WorldBankPanel.cpp+++ b/fincept-qt/src/screens/economics/panels/WorldBankPanel.cpp@@ -217,17 +217,11 @@ void WorldBankPanel::on_result(const QString& request_id, const services::Econom// ── Filters ───────────────────────────────────────────────────────────────────void WorldBankPanel::on_country_filter(const QString& text) {- for (int i = 0; i < country_list_->count(); ++i) {- auto* item = country_list_->item(i);- item->setHidden(!item->text().contains(text, Qt::CaseInsensitive));- }+ filter_list(country_list_, text);}void WorldBankPanel::on_indicator_filter(const QString& text) {- for (int i = 0; i < indicator_list_->count(); ++i) {- auto* item = indicator_list_->item(i);- item->setHidden(!item->text().contains(text, Qt::CaseInsensitive));- }+ filter_list(indicator_list_, text);}} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataAustraliaPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataAustraliaPanel.cppindex 58a29e80f..fd2e2ccec 100644--- a/fincept-qt/src/screens/gov_data/GovDataAustraliaPanel.cpp+++ b/fincept-qt/src/screens/gov_data/GovDataAustraliaPanel.cpp@@ -1,18 +1,17 @@// src/screens/gov_data/GovDataAustraliaPanel.cpp#include "screens/gov_data/GovDataAustraliaPanel.h"+#include "screens/gov_data/GovDataProviderPanel.h"#include "core/logging/Logger.h"#include "services/gov_data/GovDataService.h"#include "ui/theme/Theme.h"#include <QDesktopServices>-#include <QFileDialog>#include <QHBoxLayout>#include <QHeaderView>#include <QJsonArray>#include <QJsonObject>#include <QScrollArea>-#include <QTextStream>#include <QUrl>#include <QVBoxLayout>@@ -24,80 +23,15 @@ static constexpr const char* kGovDataAustraliaColor = "#0EA5E9";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(build_australia_style());+ setStyleSheet(make_gov_panel_style(kGovDataAustraliaColor));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()); });+ [this]() { setStyleSheet(make_gov_panel_style(kGovDataAustraliaColor)); });}// ── UI Construction ──────────────────────────────────────────────────────────@@ -137,12 +71,7 @@ void GovDataAustraliaPanel::build_ui() {agencies_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);agencies_table_->setColumnWidth(0, 220);agencies_table_->setColumnWidth(2, 100);- agencies_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- agencies_table_->setSelectionMode(QAbstractItemView::SingleSelection);- agencies_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- agencies_table_->verticalHeader()->setVisible(false);- agencies_table_->setAlternatingRowColors(true);- agencies_table_->setShowGrid(true);+ configure_table(agencies_table_);connect(agencies_table_, &QTableWidget::cellDoubleClicked, this, &GovDataAustraliaPanel::on_agency_doubleclicked);content_stack_->addWidget(agencies_table_); // index 0@@ -159,12 +88,7 @@ void GovDataAustraliaPanel::build_ui() {datasets_table_->setColumnWidth(2, 140);datasets_table_->setColumnWidth(3, 75);datasets_table_->setColumnWidth(4, 100);- datasets_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- datasets_table_->setSelectionMode(QAbstractItemView::SingleSelection);- datasets_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- datasets_table_->verticalHeader()->setVisible(false);- datasets_table_->setAlternatingRowColors(true);- datasets_table_->setShowGrid(true);+ configure_table(datasets_table_);connect(datasets_table_, &QTableWidget::cellDoubleClicked, this, &GovDataAustraliaPanel::on_dataset_doubleclicked);content_stack_->addWidget(datasets_table_); // index 1@@ -179,12 +103,7 @@ void GovDataAustraliaPanel::build_ui() {resources_table_->setColumnWidth(1, 80);resources_table_->setColumnWidth(2, 90);resources_table_->setColumnWidth(3, 60);- resources_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- resources_table_->setSelectionMode(QAbstractItemView::SingleSelection);- resources_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- resources_table_->verticalHeader()->setVisible(false);- resources_table_->setAlternatingRowColors(true);- resources_table_->setShowGrid(true);+ configure_table(resources_table_);connect(resources_table_, &QTableWidget::cellClicked, this,[this](int row, int col) {@@ -218,7 +137,7 @@ void GovDataAustraliaPanel::build_ui() {QWidget* GovDataAustraliaPanel::build_toolbar() {auto* bar = new QWidget(this);bar->setObjectName("govPanelToolbar");- bar->setFixedHeight(40);+ bar->setFixedHeight(36);auto* hl = new QHBoxLayout(bar);hl->setContentsMargins(10, 0, 10, 0);@@ -724,37 +643,7 @@ void GovDataAustraliaPanel::on_export_csv() {}if (!table)return;- export_table_csv(table, def_name);-}--void GovDataAustraliaPanel::export_table_csv(QTableWidget* table, const QString& default_name) {- const QString path = QFileDialog::getSaveFileName(this, "Export CSV", default_name, "CSV Files (*.csv)");- if (path.isEmpty())- return;-- QFile file(path);- if (!file.open(QIODevice::WriteOnly | QIODevice::Text))- return;- QTextStream out(&file);-- QStringList headers;- for (int c = 0; c < table->columnCount(); ++c) {- auto* h = table->horizontalHeaderItem(c);- headers << (h ? h->text() : QString::number(c));- }- out << headers.join(",") << "\n";-- for (int r = 0; r < table->rowCount(); ++r) {- QStringList row;- for (int c = 0; c < table->columnCount(); ++c) {- auto* item = table->item(r, c);- QString val = item ? item->text() : "";- if (val.contains(',') || val.contains('"'))- val = "\"" + val.replace("\"", "\"\"") + "\"";- row << val;- }- out << row.join(",") << "\n";- }+ export_table_to_csv(table, def_name, this);}} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataAustraliaPanel.h b/fincept-qt/src/screens/gov_data/GovDataAustraliaPanel.hindex ebfa42e5c..6f3be5597 100644--- a/fincept-qt/src/screens/gov_data/GovDataAustraliaPanel.h+++ b/fincept-qt/src/screens/gov_data/GovDataAustraliaPanel.h@@ -54,9 +54,6 @@ class GovDataAustraliaPanel : public QWidget {void update_toolbar_state();void update_breadcrumb();- // CSV export helper- void export_table_csv(QTableWidget* table, const QString& default_name);-// ── Constants ────────────────────────────────────────────────────────────static constexpr const char* kScript = "datagov_au_api.py";static constexpr const char* kColor = "#0EA5E9";diff --git a/fincept-qt/src/screens/gov_data/GovDataCKANPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataCKANPanel.cppdeleted file mode 100644index edcc274da..000000000--- a/fincept-qt/src/screens/gov_data/GovDataCKANPanel.cpp+++ /dev/null@@ -1,725 +0,0 @@-// src/screens/gov_data/GovDataCKANPanel.cpp-// Universal CKAN portal browser using datagovuk_api.py.-// Portal combobox is display-only — the script always queries data.gov.uk.-// Navigation: Publishers → Datasets → Resources | Search (independent).-#include "screens/gov_data/GovDataCKANPanel.h"--#include "core/logging/Logger.h"-#include "services/gov_data/GovDataService.h"-#include "ui/theme/Theme.h"--#include <QDesktopServices>-#include <QFileDialog>-#include <QHBoxLayout>-#include <QHeaderView>-#include <QJsonArray>-#include <QJsonObject>-#include <QScrollArea>-#include <QTextStream>-#include <QUrl>-#include <QVBoxLayout>--namespace fincept::screens {-namespace {-static constexpr const char* kGovDataCKANScript = "datagovuk_api.py";-static constexpr const char* kGovDataCKANColor = "#10B981";-} // namespace--// ── 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(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 ──────────────────────────────────────────────────────────────────--void GovDataCKANPanel::build_ui() {- auto* root = new QVBoxLayout(this);- root->setContentsMargins(0, 0, 0, 0);- root->setSpacing(0);-- root->addWidget(build_portal_bar());- root->addWidget(build_toolbar());-- // Breadcrumb bar- breadcrumb_ = new QWidget(this);- breadcrumb_->setObjectName("ckanBreadcrumb");- breadcrumb_->setFixedHeight(24);- auto* bcl = new QHBoxLayout(breadcrumb_);- bcl->setContentsMargins(14, 0, 14, 0);- bcl->setSpacing(4);- breadcrumb_label_ = new QLabel("Publishers");- breadcrumb_label_->setObjectName("ckanBreadText");- bcl->addWidget(breadcrumb_label_);- bcl->addStretch(1);- row_count_label_ = new QLabel;- row_count_label_->setObjectName("ckanBreadCount");- bcl->addWidget(row_count_label_);- root->addWidget(breadcrumb_);-- // Content stack- content_stack_ = new QStackedWidget;-- // Page 0 — Publishers table (1 col, full-stretch, colored)- publishers_table_ = new QTableWidget;- publishers_table_->setColumnCount(1);- publishers_table_->setHorizontalHeaderLabels({"NAME"});- publishers_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);- publishers_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- publishers_table_->setSelectionMode(QAbstractItemView::SingleSelection);- publishers_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- publishers_table_->verticalHeader()->setVisible(false);- publishers_table_->setAlternatingRowColors(true);- publishers_table_->setShowGrid(true);- connect(publishers_table_, &QTableWidget::cellDoubleClicked, this, &GovDataCKANPanel::on_publisher_clicked);- content_stack_->addWidget(publishers_table_); // index 0-- // Page 1 — Datasets table- datasets_table_ = new QTableWidget;- datasets_table_->setColumnCount(4);- datasets_table_->setHorizontalHeaderLabels({"TITLE", "FILES", "MODIFIED", "TAGS"});- datasets_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);- datasets_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);- datasets_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);- datasets_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);- datasets_table_->setColumnWidth(1, 60);- datasets_table_->setColumnWidth(2, 100);- datasets_table_->setColumnWidth(3, 200);- datasets_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- datasets_table_->setSelectionMode(QAbstractItemView::SingleSelection);- datasets_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- datasets_table_->verticalHeader()->setVisible(false);- datasets_table_->setAlternatingRowColors(true);- datasets_table_->setShowGrid(true);- connect(datasets_table_, &QTableWidget::cellDoubleClicked, this, &GovDataCKANPanel::on_dataset_clicked);- content_stack_->addWidget(datasets_table_); // index 1-- // Page 2 — Resources table- resources_table_ = new QTableWidget;- resources_table_->setColumnCount(5);- resources_table_->setHorizontalHeaderLabels({"NAME", "FORMAT", "SIZE", "MODIFIED", "OPEN"});- resources_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);- resources_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);- resources_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);- resources_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);- resources_table_->horizontalHeader()->setSectionResizeMode(4, QHeaderView::Fixed);- resources_table_->setColumnWidth(1, 70);- resources_table_->setColumnWidth(2, 80);- resources_table_->setColumnWidth(3, 100);- resources_table_->setColumnWidth(4, 60);- resources_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- resources_table_->setSelectionMode(QAbstractItemView::SingleSelection);- resources_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- resources_table_->verticalHeader()->setVisible(false);- resources_table_->setAlternatingRowColors(true);- resources_table_->setShowGrid(true);-- connect(- resources_table_, &QTableWidget::cellClicked, this,- [this](int row, int col) {- if (col != 4)- return;- auto* item = resources_table_->item(row, 4);- if (!item)- return;- QString url = item->data(Qt::UserRole).toString();- if (!url.isEmpty())- QDesktopServices::openUrl(QUrl(url));- },- Qt::UniqueConnection);-- content_stack_->addWidget(resources_table_); // index 2-- // Page 3 — Status / loading / error- auto* status_page = new QWidget(this);- status_page->setObjectName("ckanStatusPage");- auto* svl = new QVBoxLayout(status_page);- svl->setAlignment(Qt::AlignCenter);- status_label_ = new QLabel;- status_label_->setObjectName("ckanStatusMsg");- status_label_->setAlignment(Qt::AlignCenter);- status_label_->setWordWrap(true);- svl->addWidget(status_label_);- content_stack_->addWidget(status_page); // index 3-- root->addWidget(content_stack_, 1);-}--QWidget* GovDataCKANPanel::build_portal_bar() {- auto* bar = new QWidget(this);- bar->setObjectName("ckanPortalBar");- bar->setFixedHeight(32);-- auto* hl = new QHBoxLayout(bar);- hl->setContentsMargins(14, 0, 14, 0);- hl->setSpacing(8);-- auto* lbl = new QLabel("CKAN PORTAL:");- lbl->setObjectName("ckanPortalLabel");- hl->addWidget(lbl);-- portal_combo_ = new QComboBox;- portal_combo_->setObjectName("ckanPortalCombo");- portal_combo_->addItems({"data.gov.uk", "open.canada.ca", "data.gov.au", "data.gov.hk", "opendata.swiss",- "data.gouv.fr", "data.gov", "openafrica.net"});- // Display-only — the underlying script always queries data.gov.uk- portal_combo_->setToolTip("This panel uses datagovuk_api.py which queries data.gov.uk.\n"- "The selector shows all CKAN portals covered by the universal provider.");- portal_combo_->setEnabled(true); // allow selection for visual context- hl->addWidget(portal_combo_);-- hl->addStretch(1);-- return bar;-}--QWidget* GovDataCKANPanel::build_toolbar() {- auto* bar = new QWidget(this);- bar->setObjectName("ckanPanelToolbar");- bar->setFixedHeight(40);-- auto* hl = new QHBoxLayout(bar);- hl->setContentsMargins(10, 0, 10, 0);- hl->setSpacing(5);-- back_btn_ = new QPushButton("← BACK");- back_btn_->setObjectName("ckanBackBtn");- back_btn_->setVisible(false);- back_btn_->setCursor(Qt::PointingHandCursor);- connect(back_btn_, &QPushButton::clicked, this, &GovDataCKANPanel::on_back);- hl->addWidget(back_btn_);-- hl->addSpacing(4);-- publishers_btn_ = new QPushButton("PUBLISHERS");- publishers_btn_->setObjectName("ckanTabBtn");- publishers_btn_->setCheckable(true);- publishers_btn_->setChecked(true);- publishers_btn_->setCursor(Qt::PointingHandCursor);- connect(publishers_btn_, &QPushButton::clicked, this, [this]() { on_tab_changed(Publishers); });- hl->addWidget(publishers_btn_);-- datasets_btn_ = new QPushButton("DATASETS");- datasets_btn_->setObjectName("ckanTabBtn");- datasets_btn_->setCheckable(true);- datasets_btn_->setCursor(Qt::PointingHandCursor);- connect(datasets_btn_, &QPushButton::clicked, this, [this]() { on_tab_changed(Datasets); });- hl->addWidget(datasets_btn_);-- search_btn_ = new QPushButton("SEARCH");- search_btn_->setObjectName("ckanTabBtn");- search_btn_->setCheckable(true);- search_btn_->setCursor(Qt::PointingHandCursor);- connect(search_btn_, &QPushButton::clicked, this, [this]() { on_tab_changed(Search); });- hl->addWidget(search_btn_);-- hl->addSpacing(10);-- search_input_ = new QLineEdit;- search_input_->setObjectName("ckanSearch");- search_input_->setPlaceholderText("Search datasets…");- search_input_->setFixedWidth(210);- search_input_->setFixedHeight(26);- connect(search_input_, &QLineEdit::returnPressed, this, &GovDataCKANPanel::on_search);- hl->addWidget(search_input_);-- fetch_btn_ = new QPushButton("FETCH");- fetch_btn_->setObjectName("ckanFetchBtn");- fetch_btn_->setCursor(Qt::PointingHandCursor);- connect(fetch_btn_, &QPushButton::clicked, this, &GovDataCKANPanel::on_search);- hl->addWidget(fetch_btn_);-- hl->addStretch(1);-- export_btn_ = new QPushButton("CSV");- export_btn_->setObjectName("ckanCsvBtn");- export_btn_->setCursor(Qt::PointingHandCursor);- connect(export_btn_, &QPushButton::clicked, this, &GovDataCKANPanel::on_export_csv);- hl->addWidget(export_btn_);-- return bar;-}--// ── Public slot ───────────────────────────────────────────────────────────────--void GovDataCKANPanel::load_initial_data() {- show_loading("Loading publishers from data.gov.uk…");- services::GovDataService::instance().execute(kGovDataCKANScript, "publishers", {}, "ckan_publishers");-}--// ── Toolbar actions ───────────────────────────────────────────────────────────--void GovDataCKANPanel::on_tab_changed(int tab_index) {- auto view = static_cast<View>(tab_index);- publishers_btn_->setChecked(view == Publishers);- datasets_btn_->setChecked(view == Datasets);- search_btn_->setChecked(view == Search);-- current_view_ = view;-- if (view == Publishers) {- if (current_publishers_.isEmpty())- load_initial_data();- else {- content_stack_->setCurrentIndex(Publishers);- row_count_label_->setText(QString::number(current_publishers_.size()) + " publishers");- }- update_breadcrumb();- } else if (view == Datasets) {- if (current_datasets_.isEmpty())- show_status("Double-click a publisher to load their datasets.");- else {- content_stack_->setCurrentIndex(Datasets);- row_count_label_->setText(QString::number(current_datasets_.size()) + " datasets");- }- update_breadcrumb();- } else if (view == Search) {- update_breadcrumb();- search_input_->setFocus();- }-- update_toolbar_state();-}--void GovDataCKANPanel::on_search() {- QString query = search_input_->text().trimmed();- if (query.isEmpty())- return;-- show_loading("Searching for "- " + query + "- "…");- services::GovDataService::instance().execute(kGovDataCKANScript, "search", {query, "50"}, "ckan_search");-}--void GovDataCKANPanel::on_publisher_clicked(int row) {- auto* item = publishers_table_->item(row, 0);- if (!item)- return;- selected_publisher_ = item->data(Qt::UserRole).toString();- selected_publisher_name_ = item->text();-- show_loading("Loading datasets for "- " + selected_publisher_name_ + "- "…");- services::GovDataService::instance().execute(kGovDataCKANScript, "datasets", {selected_publisher_, "100"},- "ckan_datasets");-}--void GovDataCKANPanel::on_dataset_clicked(int row) {- auto* item = datasets_table_->item(row, 0);- if (!item)- return;- selected_dataset_ = item->data(Qt::UserRole).toString();- if (selected_dataset_.isEmpty())- return;-- show_loading("Loading resources…");- services::GovDataService::instance().execute(kGovDataCKANScript, "resources", {selected_dataset_},- "ckan_resources");-}--void GovDataCKANPanel::on_back() {- if (current_view_ == Resources) {- content_stack_->setCurrentIndex(Datasets);- current_view_ = Datasets;- row_count_label_->setText(QString::number(current_datasets_.size()) + " datasets");- } else if (current_view_ == Datasets) {- content_stack_->setCurrentIndex(Publishers);- current_view_ = Publishers;- publishers_btn_->setChecked(true);- datasets_btn_->setChecked(false);- selected_publisher_.clear();- selected_publisher_name_.clear();- row_count_label_->setText(QString::number(current_publishers_.size()) + " publishers");- }- update_toolbar_state();- update_breadcrumb();-}--void GovDataCKANPanel::update_toolbar_state() {- back_btn_->setVisible(current_view_ == Datasets || current_view_ == Resources);-}--void GovDataCKANPanel::update_breadcrumb() {- QString text;- switch (current_view_) {- case Publishers:- text = "Publishers";- break;- case Datasets:- text = selected_publisher_name_.isEmpty() ? "Datasets"- : "Publishers › " + selected_publisher_name_ + " › Datasets";- break;- case Resources:- text = "Publishers › Datasets › Resources";- break;- case Search:- text = "Search Results";- break;- }- breadcrumb_label_->setText(text);-}--// ── Result handler ────────────────────────────────────────────────────────────--void GovDataCKANPanel::on_result(const QString& request_id, const services::GovDataResult& result) {- if (!request_id.startsWith("ckan_"))- return;-- if (!result.success) {- show_error(result.error);- return;- }-- // Unwrap data — handle flat array or wrapped object- QJsonArray data;- QJsonValue raw = result.data["data"];- if (raw.isArray()) {- data = raw.toArray();- } else if (raw.isObject()) {- QJsonObject obj = raw.toObject();- if (obj.contains("datasets"))- data = obj["datasets"].toArray();- else if (obj.contains("result"))- data = obj["result"].toArray();- }-- if (request_id == "ckan_publishers") {- current_publishers_ = data;- populate_publishers(data);- current_view_ = Publishers;- publishers_btn_->setChecked(true);- datasets_btn_->setChecked(false);- search_btn_->setChecked(false);- content_stack_->setCurrentIndex(Publishers);- row_count_label_->setText(QString::number(data.size()) + " publishers");- update_breadcrumb();-- } else if (request_id == "ckan_datasets") {- int total = result.data["metadata"].toObject()["total_count"].toInt(0);- if (total == 0)- total = data.size();- current_datasets_ = data;- populate_datasets(data, total);- current_view_ = Datasets;- publishers_btn_->setChecked(false);- datasets_btn_->setChecked(true);- search_btn_->setChecked(false);- content_stack_->setCurrentIndex(Datasets);- row_count_label_->setText(QString("Showing %1 of %2").arg(data.size()).arg(total));- update_breadcrumb();-- } else if (request_id == "ckan_search") {- int total = result.data["metadata"].toObject()["total_count"].toInt(0);- if (total == 0)- total = data.size();- current_datasets_ = data;- populate_datasets(data, total);- current_view_ = Search;- publishers_btn_->setChecked(false);- datasets_btn_->setChecked(false);- search_btn_->setChecked(true);- content_stack_->setCurrentIndex(Datasets);- row_count_label_->setText(QString("Showing %1 of %2").arg(data.size()).arg(total));- update_breadcrumb();-- } else if (request_id == "ckan_resources") {- current_resources_ = data;- populate_resources(data);- current_view_ = Resources;- content_stack_->setCurrentIndex(Resources);- row_count_label_->setText(QString::number(data.size()) + " files");- update_breadcrumb();- }-- update_toolbar_state();-}--// ── Populate tables ───────────────────────────────────────────────────────────--void GovDataCKANPanel::populate_publishers(const QJsonArray& data) {- publishers_table_->setRowCount(0);- publishers_table_->setRowCount(data.size());-- for (int i = 0; i < data.size(); ++i) {- const auto obj = data[i].toObject();-- QString name = obj["display_name"].toString();- if (name.isEmpty())- name = obj["title"].toString();- if (name.isEmpty())- name = obj["name"].toString();- if (name.isEmpty())- name = obj["id"].toString();-- auto* name_item = new QTableWidgetItem(name);- name_item->setForeground(QColor(kGovDataCKANColor));- name_item->setData(Qt::UserRole,- obj["id"].toString().isEmpty() ? obj["name"].toString() : obj["id"].toString());- publishers_table_->setItem(i, 0, name_item);- }-- LOG_INFO("GovCKAN", QString("Populated %1 publishers").arg(data.size()));-}--void GovDataCKANPanel::populate_datasets(const QJsonArray& data, int total_count) {- datasets_table_->setRowCount(0);- datasets_table_->setRowCount(data.size());-- for (int i = 0; i < data.size(); ++i) {- const auto obj = data[i].toObject();-- QString title = obj["title"].toString();- if (title.isEmpty())- title = obj["name"].toString();-- auto* title_item = new QTableWidgetItem(title);- title_item->setData(Qt::UserRole,- obj["id"].toString().isEmpty() ? obj["name"].toString() : obj["id"].toString());- datasets_table_->setItem(i, 0, title_item);-- int num_res = obj["num_resources"].toInt(0);- auto* res_item = new QTableWidgetItem(QString::number(num_res));- res_item->setTextAlignment(Qt::AlignCenter);- res_item->setForeground(QColor(kGovDataCKANColor));- datasets_table_->setItem(i, 1, res_item);-- QString modified = obj["metadata_modified"].toString();- if (modified.length() > 10)- modified = modified.left(10);- datasets_table_->setItem(i, 2, new QTableWidgetItem(modified));-- QStringList tags;- for (const auto& t : obj["tags"].toArray()) {- if (t.isString())- tags << t.toString();- else if (t.isObject())- tags << t.toObject()["name"].toString();- }- 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(ui::colors::TEXT_SECONDARY()));- datasets_table_->setItem(i, 3, tag_item);- }-- LOG_INFO("GovCKAN", QString("Populated %1 datasets (total: %2)").arg(data.size()).arg(total_count));-}--void GovDataCKANPanel::populate_resources(const QJsonArray& data) {- resources_table_->setRowCount(0);- resources_table_->setRowCount(data.size());-- for (int i = 0; i < data.size(); ++i) {- const auto obj = data[i].toObject();-- QString name = obj["name"].toString();- if (name.isEmpty())- name = obj["id"].toString();- resources_table_->setItem(i, 0, new QTableWidgetItem(name));-- QString format = obj["format"].toString().toUpper();- auto* fmt_item = new QTableWidgetItem(format.isEmpty() ? "—" : format);- fmt_item->setForeground(QColor(kGovDataCKANColor));- fmt_item->setTextAlignment(Qt::AlignCenter);- resources_table_->setItem(i, 1, fmt_item);-- double size_bytes = obj["size"].toDouble(0);- QString size_str = "—";- if (size_bytes > 0) {- if (size_bytes < 1024)- size_str = QString::number(size_bytes, 'f', 0) + " B";- else if (size_bytes < 1024 * 1024)- size_str = QString::number(size_bytes / 1024.0, 'f', 1) + " KB";- else- size_str = QString::number(size_bytes / (1024.0 * 1024.0), 'f', 1) + " MB";- }- auto* sz = new QTableWidgetItem(size_str);- sz->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);- resources_table_->setItem(i, 2, sz);-- QString modified = obj["last_modified"].toString();- if (modified.length() > 10)- modified = modified.left(10);- resources_table_->setItem(i, 3, new QTableWidgetItem(modified));-- QString url = obj["url"].toString();- auto* url_item = new QTableWidgetItem(url.isEmpty() ? "—" : "↗ OPEN");- url_item->setData(Qt::UserRole, url);- if (!url.isEmpty())- url_item->setForeground(QColor(kGovDataCKANColor));- url_item->setTextAlignment(Qt::AlignCenter);- resources_table_->setItem(i, 4, url_item);- }-- LOG_INFO("GovCKAN", QString("Populated %1 resources").arg(data.size()));-}--// ── Status helpers ────────────────────────────────────────────────────────────--void GovDataCKANPanel::show_loading(const QString& message) {- status_label_->setStyleSheet(QString("color:%1; font-size:13px; background:transparent;").arg(kGovDataCKANColor));- status_label_->setText(message);- content_stack_->setCurrentIndex(3);-}--void GovDataCKANPanel::show_error(const QString& message) {- status_label_->setStyleSheet(- 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(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);-}--// ── CSV export ────────────────────────────────────────────────────────────────--void GovDataCKANPanel::on_export_csv() {- QTableWidget* table = nullptr;- QString def_name;-- if (current_view_ == Publishers && publishers_table_->rowCount() > 0) {- table = publishers_table_;- def_name = "ckan_publishers.csv";- } else if ((current_view_ == Datasets || current_view_ == Search) && datasets_table_->rowCount() > 0) {- table = datasets_table_;- def_name = "ckan_datasets.csv";- } else if (current_view_ == Resources && resources_table_->rowCount() > 0) {- table = resources_table_;- def_name = "ckan_resources.csv";- }- if (!table)- return;-- QString path = QFileDialog::getSaveFileName(this, "Export CSV", def_name, "CSV Files (*.csv)");- if (path.isEmpty())- return;-- QFile file(path);- if (!file.open(QIODevice::WriteOnly | QIODevice::Text))- return;- QTextStream out(&file);-- QStringList headers;- for (int c = 0; c < table->columnCount(); ++c) {- auto* h = table->horizontalHeaderItem(c);- headers << (h ? h->text() : QString::number(c));- }- out << headers.join(",") << "\n";-- for (int r = 0; r < table->rowCount(); ++r) {- QStringList row;- for (int c = 0; c < table->columnCount(); ++c) {- auto* item = table->item(r, c);- QString val = item ? item->text() : "";- if (val.contains(',') || val.contains('"'))- val = "\"" + val.replace("\"", "\"\"") + "\"";- row << val;- }- out << row.join(",") << "\n";- }-- LOG_INFO("GovCKAN", "Exported CSV: " + path);-}--} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataCKANPanel.h b/fincept-qt/src/screens/gov_data/GovDataCKANPanel.hdeleted file mode 100644index 7a4df187f..000000000--- a/fincept-qt/src/screens/gov_data/GovDataCKANPanel.h+++ /dev/null@@ -1,93 +0,0 @@-// src/screens/gov_data/GovDataCKANPanel.h-// Universal CKAN portal browser — covers 8 portals, script: datagovuk_api.py-// Color: #10B981-// Includes a display-only portal selector combobox at the top.-#pragma once--#include "services/gov_data/GovDataService.h"--#include <QComboBox>-#include <QJsonArray>-#include <QLabel>-#include <QLineEdit>-#include <QPushButton>-#include <QStackedWidget>-#include <QTableWidget>-#include <QWidget>--namespace fincept::screens {--class GovDataCKANPanel : public QWidget {- Q_OBJECT- public:- explicit GovDataCKANPanel(QWidget* parent = nullptr);-- public slots:- void load_initial_data();-- private slots:- void on_result(const QString& request_id, const services::GovDataResult& result);- void on_publisher_clicked(int row);- void on_dataset_clicked(int row);- void on_tab_changed(int tab_index);- void on_search();- void on_back();- void on_export_csv();-- private:- enum View { Publishers = 0, Datasets, Resources, Search };-- void build_ui();- QWidget* build_portal_bar();- QWidget* build_toolbar();-- void populate_publishers(const QJsonArray& data);- void populate_datasets(const QJsonArray& data, int total_count);- void populate_resources(const QJsonArray& data);-- void show_loading(const QString& message);- void show_error(const QString& message);- void show_status(const QString& message, bool is_error = false);-- void update_toolbar_state();- void update_breadcrumb();-- static constexpr const char* kScript = "datagovuk_api.py";- static constexpr const char* kColor = "#10B981";-- View current_view_ = Publishers;- QString selected_publisher_;- QString selected_publisher_name_;- QString selected_dataset_;-- // Toolbar widgets- QPushButton* back_btn_ = nullptr;- QPushButton* publishers_btn_ = nullptr;- QPushButton* datasets_btn_ = nullptr;- QPushButton* search_btn_ = nullptr;- QLineEdit* search_input_ = nullptr;- QPushButton* fetch_btn_ = nullptr;- QPushButton* export_btn_ = nullptr;-- // Portal selector (display-only)- QComboBox* portal_combo_ = nullptr;-- // Breadcrumb- QWidget* breadcrumb_ = nullptr;- QLabel* breadcrumb_label_ = nullptr;- QLabel* row_count_label_ = nullptr;-- // Content pages (stack indices match View enum + 1 for status)- QStackedWidget* content_stack_ = nullptr;- QTableWidget* publishers_table_ = nullptr; // page 0- QTableWidget* datasets_table_ = nullptr; // page 1- QTableWidget* resources_table_ = nullptr; // page 2- QLabel* status_label_ = nullptr; // page 3-- // Cached data- QJsonArray current_publishers_;- QJsonArray current_datasets_;- QJsonArray current_resources_;-};--} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataCanadaPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataCanadaPanel.cppdeleted file mode 100644index 0ae40cbd0..000000000--- a/fincept-qt/src/screens/gov_data/GovDataCanadaPanel.cpp+++ /dev/null@@ -1,662 +0,0 @@-// src/screens/gov_data/GovDataCanadaPanel.cpp-#include "screens/gov_data/GovDataCanadaPanel.h"--#include "core/logging/Logger.h"-#include "services/gov_data/GovDataService.h"-#include "ui/theme/Theme.h"--#include <QDesktopServices>-#include <QFileDialog>-#include <QHBoxLayout>-#include <QHeaderView>-#include <QJsonArray>-#include <QJsonObject>-#include <QLabel>-#include <QScrollArea>-#include <QTextStream>-#include <QUrl>-#include <QVBoxLayout>--namespace fincept::screens {-namespace {-static constexpr const char* kGovDataCanadaScript = "canada_gov_api.py";-static constexpr const char* kGovDataCanadaColor = "#EF4444";-} // namespace--using namespace fincept::ui;--// ── 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(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 ─────────────────────────────────────────────────────────────────--void GovDataCanadaPanel::build_ui() {- auto* root = new QVBoxLayout(this);- root->setContentsMargins(0, 0, 0, 0);- root->setSpacing(0);-- root->addWidget(build_toolbar());-- // Breadcrumb bar- breadcrumb_ = new QWidget(this);- breadcrumb_->setObjectName("govBreadcrumb");- breadcrumb_->setFixedHeight(24);- auto* bcl = new QHBoxLayout(breadcrumb_);- bcl->setContentsMargins(14, 0, 14, 0);- bcl->setSpacing(4);-- breadcrumb_label_ = new QLabel("All Publishers");- breadcrumb_label_->setObjectName("govBreadcrumbText");- bcl->addWidget(breadcrumb_label_);- bcl->addStretch(1);-- row_count_label_ = new QLabel;- row_count_label_->setObjectName("govBreadcrumbText");- bcl->addWidget(row_count_label_);-- root->addWidget(breadcrumb_);-- // Content stack- content_stack_ = new QStackedWidget;-- // Page 0 — Publishers table (NAME | DATASETS)- publishers_table_ = new QTableWidget;- publishers_table_->setColumnCount(2);- publishers_table_->setHorizontalHeaderLabels({"PUBLISHER", "DATASETS"});- publishers_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);- publishers_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);- publishers_table_->setColumnWidth(1, 80);- publishers_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- publishers_table_->setSelectionMode(QAbstractItemView::SingleSelection);- publishers_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- publishers_table_->verticalHeader()->setVisible(false);- publishers_table_->setAlternatingRowColors(true);- publishers_table_->setShowGrid(true);- connect(publishers_table_, &QTableWidget::cellDoubleClicked, this, &GovDataCanadaPanel::on_publisher_clicked);- content_stack_->addWidget(publishers_table_);-- // Page 1 — Datasets table (TITLE | FILES | MODIFIED | PUBLISHER)- datasets_table_ = new QTableWidget;- datasets_table_->setColumnCount(4);- datasets_table_->setHorizontalHeaderLabels({"TITLE", "FILES", "MODIFIED", "PUBLISHER"});- datasets_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);- datasets_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);- datasets_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);- datasets_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);- datasets_table_->setColumnWidth(1, 55);- datasets_table_->setColumnWidth(2, 100);- datasets_table_->setColumnWidth(3, 180);- datasets_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- datasets_table_->setSelectionMode(QAbstractItemView::SingleSelection);- datasets_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- datasets_table_->verticalHeader()->setVisible(false);- datasets_table_->setAlternatingRowColors(true);- datasets_table_->setShowGrid(true);- connect(datasets_table_, &QTableWidget::cellDoubleClicked, this, &GovDataCanadaPanel::on_dataset_clicked);- content_stack_->addWidget(datasets_table_);-- // Page 2 — Resources table (NAME | FORMAT | SIZE | MODIFIED | OPEN)- resources_table_ = new QTableWidget;- resources_table_->setColumnCount(5);- resources_table_->setHorizontalHeaderLabels({"NAME", "FORMAT", "SIZE", "MODIFIED", "OPEN"});- resources_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);- resources_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);- resources_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);- resources_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);- resources_table_->horizontalHeader()->setSectionResizeMode(4, QHeaderView::Fixed);- resources_table_->setColumnWidth(1, 70);- resources_table_->setColumnWidth(2, 80);- resources_table_->setColumnWidth(3, 100);- resources_table_->setColumnWidth(4, 60);- resources_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- resources_table_->setSelectionMode(QAbstractItemView::SingleSelection);- resources_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- resources_table_->verticalHeader()->setVisible(false);- resources_table_->setAlternatingRowColors(true);- resources_table_->setShowGrid(true);- content_stack_->addWidget(resources_table_);-- // Page 3 — Status / loading / error- auto* status_page = new QWidget(this);- status_page->setObjectName("govStatusPage");- auto* svl = new QVBoxLayout(status_page);- svl->setAlignment(Qt::AlignCenter);- status_label_ = new QLabel;- status_label_->setObjectName("govStatusMsg");- status_label_->setAlignment(Qt::AlignCenter);- status_label_->setWordWrap(true);- svl->addWidget(status_label_);- content_stack_->addWidget(status_page);-- root->addWidget(content_stack_, 1);-}--QWidget* GovDataCanadaPanel::build_toolbar() {- auto* bar = new QWidget(this);- bar->setObjectName("govPanelToolbar");- bar->setFixedHeight(40);-- auto* hl = new QHBoxLayout(bar);- hl->setContentsMargins(10, 0, 10, 0);- hl->setSpacing(5);-- back_btn_ = new QPushButton("← BACK");- back_btn_->setObjectName("govBackBtn");- back_btn_->setVisible(false);- back_btn_->setCursor(Qt::PointingHandCursor);- connect(back_btn_, &QPushButton::clicked, this, &GovDataCanadaPanel::on_back);- hl->addWidget(back_btn_);-- hl->addSpacing(4);-- publishers_btn_ = new QPushButton("PUBLISHERS");- publishers_btn_->setObjectName("govTabBtn");- publishers_btn_->setCheckable(true);- publishers_btn_->setChecked(true);- publishers_btn_->setCursor(Qt::PointingHandCursor);- connect(publishers_btn_, &QPushButton::clicked, this, [this]() { on_view_changed(Publishers); });- hl->addWidget(publishers_btn_);-- datasets_btn_ = new QPushButton("DATASETS");- datasets_btn_->setObjectName("govTabBtn");- datasets_btn_->setCheckable(true);- datasets_btn_->setCursor(Qt::PointingHandCursor);- connect(datasets_btn_, &QPushButton::clicked, this, [this]() { on_view_changed(Datasets); });- hl->addWidget(datasets_btn_);-- search_btn_ = new QPushButton("SEARCH");- search_btn_->setObjectName("govTabBtn");- search_btn_->setCheckable(true);- search_btn_->setCursor(Qt::PointingHandCursor);- connect(search_btn_, &QPushButton::clicked, this, [this]() { on_view_changed(Search); });- hl->addWidget(search_btn_);-- hl->addSpacing(10);-- search_input_ = new QLineEdit;- search_input_->setObjectName("govSearch");- search_input_->setPlaceholderText("Search datasets…");- search_input_->setFixedWidth(210);- search_input_->setFixedHeight(26);- connect(search_input_, &QLineEdit::returnPressed, this, &GovDataCanadaPanel::on_search);- hl->addWidget(search_input_);-- fetch_btn_ = new QPushButton("FETCH");- fetch_btn_->setObjectName("govFetchBtn");- fetch_btn_->setCursor(Qt::PointingHandCursor);- connect(fetch_btn_, &QPushButton::clicked, this, &GovDataCanadaPanel::on_search);- hl->addWidget(fetch_btn_);-- hl->addStretch(1);-- export_btn_ = new QPushButton("CSV");- export_btn_->setObjectName("govCsvBtn");- export_btn_->setCursor(Qt::PointingHandCursor);- connect(export_btn_, &QPushButton::clicked, this, &GovDataCanadaPanel::on_export_csv);- hl->addWidget(export_btn_);-- return bar;-}--// ── Data loading ─────────────────────────────────────────────────────────────--void GovDataCanadaPanel::load_initial_data() {- show_loading("Loading publishers…");- services::GovDataService::instance().execute(kGovDataCanadaScript, "publishers", {}, "gov_orgs_canada_gov_api.py");-}--void GovDataCanadaPanel::on_result(const QString& request_id, const services::GovDataResult& result) {- // Only handle requests belonging to this script- if (!request_id.contains("canada_gov_api.py"))- return;-- if (!result.success) {- show_error(result.error);- return;- }-- // Unwrap data array — CKAN responses always use {"data":[...], "metadata":{...}}- QJsonArray data;- const QJsonValue raw = result.data["data"];- if (raw.isArray()) {- data = raw.toArray();- } else if (raw.isObject()) {- const QJsonObject obj = raw.toObject();- if (obj.contains("datasets"))- data = obj["datasets"].toArray();- else if (obj.contains("result"))- data = obj["result"].toArray();- }-- if (request_id.startsWith("gov_orgs_")) {- current_publishers_ = data;- populate_publishers(data);- content_stack_->setCurrentIndex(Publishers);- current_view_ = Publishers;- update_breadcrumb();- LOG_INFO("GovDataCanada", QString("Loaded %1 publishers").arg(data.size()));- } else if (request_id.startsWith("gov_datasets_") || request_id.startsWith("gov_search_")) {- int total = result.data["metadata"].toObject()["total_count"].toInt(0);- if (total == 0)- total = data.size();- current_datasets_ = data;- populate_datasets(data, total);- content_stack_->setCurrentIndex(Datasets);- current_view_ = Datasets;- update_breadcrumb();- LOG_INFO("GovDataCanada", QString("Loaded %1 datasets (total %2)").arg(data.size()).arg(total));- } else if (request_id.startsWith("gov_resources_")) {- current_resources_ = data;- populate_resources(data);- content_stack_->setCurrentIndex(Resources);- current_view_ = Resources;- update_breadcrumb();- LOG_INFO("GovDataCanada", QString("Loaded %1 resources").arg(data.size()));- }-- update_toolbar_state();-}--// ── Populate tables ──────────────────────────────────────────────────────────--void GovDataCanadaPanel::populate_publishers(const QJsonArray& data) {- publishers_table_->setRowCount(0);- publishers_table_->setRowCount(data.size());-- for (int i = 0; i < data.size(); ++i) {- const auto obj = data[i].toObject();-- // Resolve display name — prefer display_name, fall back to name, then id- QString name = obj["display_name"].toString();- if (name.isEmpty())- name = obj["name"].toString();- if (name.isEmpty())- name = obj["id"].toString();-- // Store id for dataset queries- const QString id = obj["id"].toString().isEmpty() ? obj["name"].toString() : obj["id"].toString();-- auto* name_item = new QTableWidgetItem(name);- name_item->setData(Qt::UserRole, id);- name_item->setForeground(QColor(kGovDataCanadaColor));- publishers_table_->setItem(i, 0, name_item);-- // dataset_count may not be present in Canada API — show "—" when absent- int count = obj["dataset_count"].toInt(-1);- auto* cnt = new QTableWidgetItem(count >= 0 ? QString::number(count) : "—");- cnt->setTextAlignment(Qt::AlignCenter);- publishers_table_->setItem(i, 1, cnt);- }-- row_count_label_->setText(QString::number(data.size()) + " publishers");-}--void GovDataCanadaPanel::populate_datasets(const QJsonArray& data, int total_count) {- datasets_table_->setRowCount(0);- datasets_table_->setRowCount(data.size());-- for (int i = 0; i < data.size(); ++i) {- const auto obj = data[i].toObject();-- // Title — fall back to name- QString title = obj["title"].toString();- if (title.isEmpty())- title = obj["name"].toString();-- const QString id = obj["id"].toString().isEmpty() ? obj["name"].toString() : obj["id"].toString();-- // Long notes → tooltip truncated to 100 chars- QString notes = obj["notes"].toString().trimmed();- QString tooltip = notes.isEmpty() ? title : (notes.length() > 100 ? notes.left(100) + "…" : notes);-- auto* title_item = new QTableWidgetItem(title);- title_item->setData(Qt::UserRole, id);- title_item->setToolTip(tooltip);- datasets_table_->setItem(i, 0, title_item);-- int num_res = obj["num_resources"].toInt(0);- auto* res_item = new QTableWidgetItem(QString::number(num_res));- res_item->setTextAlignment(Qt::AlignCenter);- res_item->setForeground(QColor(kGovDataCanadaColor));- datasets_table_->setItem(i, 1, res_item);-- QString modified = obj["metadata_modified"].toString();- if (modified.length() > 10)- modified = modified.left(10);- datasets_table_->setItem(i, 2, new QTableWidgetItem(modified));-- // Publisher name from publisher_id or nested publisher object- QString publisher = obj["publisher_id"].toString();- if (publisher.isEmpty()) {- const auto pub_obj = obj["publisher"].toObject();- publisher = pub_obj["display_name"].toString();- if (publisher.isEmpty())- publisher = pub_obj["name"].toString();- }- auto* pub_item = new QTableWidgetItem(publisher);- pub_item->setForeground(QColor(ui::colors::TEXT_SECONDARY()));- datasets_table_->setItem(i, 3, pub_item);- }-- row_count_label_->setText(QString("Showing %1 of %2").arg(data.size()).arg(total_count));-}--void GovDataCanadaPanel::populate_resources(const QJsonArray& data) {- resources_table_->setRowCount(0);- resources_table_->setRowCount(data.size());-- for (int i = 0; i < data.size(); ++i) {- const auto obj = data[i].toObject();-- QString name = obj["name"].toString();- if (name.isEmpty())- name = obj["id"].toString();-- auto* name_item = new QTableWidgetItem(name);- // description as tooltip- const QString desc = obj["description"].toString().trimmed();- if (!desc.isEmpty())- name_item->setToolTip(desc);- resources_table_->setItem(i, 0, name_item);-- QString format = obj["format"].toString().toUpper();- auto* fmt_item = new QTableWidgetItem(format.isEmpty() ? "—" : format);- fmt_item->setForeground(QColor(kGovDataCanadaColor));- fmt_item->setTextAlignment(Qt::AlignCenter);- resources_table_->setItem(i, 1, fmt_item);-- // size is often null — show "—" when null/zero- QString size_str = "—";- if (!obj["size"].isNull() && obj["size"].toDouble(0) > 0) {- const double size_bytes = obj["size"].toDouble(0);- if (size_bytes < 1024)- size_str = QString::number(size_bytes, 'f', 0) + " B";- else if (size_bytes < 1024 * 1024)- size_str = QString::number(size_bytes / 1024.0, 'f', 1) + " KB";- else- size_str = QString::number(size_bytes / (1024.0 * 1024.0), 'f', 1) + " MB";- }- auto* sz = new QTableWidgetItem(size_str);- sz->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);- resources_table_->setItem(i, 2, sz);-- QString modified = obj["last_modified"].toString();- if (modified.length() > 10)- modified = modified.left(10);- if (modified.isEmpty())- modified = obj["created"].toString().left(10);- resources_table_->setItem(i, 3, new QTableWidgetItem(modified));-- const QString url = obj["url"].toString();- auto* url_item = new QTableWidgetItem(url.isEmpty() ? "—" : "↗ OPEN");- url_item->setData(Qt::UserRole, url);- if (!url.isEmpty())- url_item->setForeground(QColor(kGovDataCanadaColor));- url_item->setTextAlignment(Qt::AlignCenter);- resources_table_->setItem(i, 4, url_item);- }-- // Connect open-URL click — UniqueConnection prevents double-connecting on reload- connect(- resources_table_, &QTableWidget::cellClicked, this,- [this](int row, int col) {- if (col != 4)- return;- auto* item = resources_table_->item(row, 4);- if (!item)- return;- const QString url = item->data(Qt::UserRole).toString();- if (!url.isEmpty())- QDesktopServices::openUrl(QUrl(url));- },- Qt::UniqueConnection);-- row_count_label_->setText(QString::number(data.size()) + " files");-}--// ── View navigation ──────────────────────────────────────────────────────────--void GovDataCanadaPanel::on_view_changed(int index) {- const auto view = static_cast<View>(index);- publishers_btn_->setChecked(view == Publishers);- datasets_btn_->setChecked(view == Datasets);- search_btn_->setChecked(view == Search);-- if (view == Publishers) {- if (current_publishers_.isEmpty())- load_initial_data();- else- content_stack_->setCurrentIndex(Publishers);- current_view_ = Publishers;- } else if (view == Datasets) {- if (!current_datasets_.isEmpty()) {- content_stack_->setCurrentIndex(Datasets);- current_view_ = Datasets;- }- // If no datasets loaded yet, stay on current view — user needs to pick a publisher- } else if (view == Search) {- current_view_ = Search;- search_input_->setFocus();- }-- update_toolbar_state();- update_breadcrumb();-}--void GovDataCanadaPanel::on_publisher_clicked(int row) {- auto* item = publishers_table_->item(row, 0);- if (!item)- return;- selected_publisher_ = item->data(Qt::UserRole).toString();- selected_publisher_name_ = item->text();- show_loading("Loading datasets for "- " + selected_publisher_name_ + "- "…");- services::GovDataService::instance().execute(kGovDataCanadaScript, "datasets", {selected_publisher_, "100"},- "gov_datasets_canada_gov_api.py");-}--void GovDataCanadaPanel::on_dataset_clicked(int row) {- auto* item = datasets_table_->item(row, 0);- if (!item)- return;- selected_dataset_ = item->data(Qt::UserRole).toString();- show_loading("Loading resources…");- services::GovDataService::instance().execute(kGovDataCanadaScript, "resources", {selected_dataset_},- "gov_resources_canada_gov_api.py");-}--void GovDataCanadaPanel::on_search() {- const QString query = search_input_->text().trimmed();- if (query.isEmpty())- return;- show_loading("Searching for "- " + query + "- "…");- services::GovDataService::instance().execute(kGovDataCanadaScript, "search", {query, "50"},- "gov_search_canada_gov_api.py");-}--void GovDataCanadaPanel::on_back() {- if (current_view_ == Resources) {- content_stack_->setCurrentIndex(Datasets);- current_view_ = Datasets;- } else if (current_view_ == Datasets) {- content_stack_->setCurrentIndex(Publishers);- current_view_ = Publishers;- selected_publisher_.clear();- selected_publisher_name_.clear();- }- update_toolbar_state();- update_breadcrumb();-}--void GovDataCanadaPanel::update_toolbar_state() {- back_btn_->setVisible(current_view_ == Datasets || current_view_ == Resources);-}--void GovDataCanadaPanel::update_breadcrumb() {- QString text;- switch (current_view_) {- case Publishers:- text = "All Publishers";- break;- case Datasets:- text = "All Publishers › " + selected_publisher_name_ + " › Datasets";- break;- case Resources:- text = "All Publishers › Datasets › Resources";- break;- case Search:- text = "Search Results";- break;- }- breadcrumb_label_->setText(text);-}--// ── Status helpers ───────────────────────────────────────────────────────────--void GovDataCanadaPanel::show_loading(const QString& message) {- status_label_->setStyleSheet(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(- 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);-}--void GovDataCanadaPanel::show_empty(const QString& message) {- status_label_->setStyleSheet(- QString("color:%1; font-size:12px; background:transparent;").arg(ui::colors::TEXT_SECONDARY()));- status_label_->setText(message);- content_stack_->setCurrentIndex(3);-}--// ── CSV export ───────────────────────────────────────────────────────────────--void GovDataCanadaPanel::on_export_csv() {- QTableWidget* table = nullptr;- QString def_name;-- if (current_view_ == Publishers && publishers_table_->rowCount() > 0) {- table = publishers_table_;- def_name = "canada_publishers.csv";- } else if ((current_view_ == Datasets || current_view_ == Search) && datasets_table_->rowCount() > 0) {- table = datasets_table_;- def_name = "canada_datasets.csv";- } else if (current_view_ == Resources && resources_table_->rowCount() > 0) {- table = resources_table_;- def_name = "canada_resources.csv";- }- if (!table)- return;-- const QString path = QFileDialog::getSaveFileName(this, "Export CSV", def_name, "CSV Files (*.csv)");- if (path.isEmpty())- return;-- QFile file(path);- if (!file.open(QIODevice::WriteOnly | QIODevice::Text))- return;- QTextStream out(&file);-- QStringList headers;- for (int c = 0; c < table->columnCount(); ++c) {- auto* h = table->horizontalHeaderItem(c);- headers << (h ? h->text() : QString::number(c));- }- out << headers.join(",") << "\n";-- for (int r = 0; r < table->rowCount(); ++r) {- QStringList row;- for (int c = 0; c < table->columnCount(); ++c) {- auto* item = table->item(r, c);- QString val = item ? item->text() : "";- if (val.contains(',') || val.contains('"'))- val = "\"" + val.replace("\"", "\"\"") + "\"";- row << val;- }- out << row.join(",") << "\n";- }-}--} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataCanadaPanel.h b/fincept-qt/src/screens/gov_data/GovDataCanadaPanel.hdeleted file mode 100644index 91d7242c9..000000000--- a/fincept-qt/src/screens/gov_data/GovDataCanadaPanel.h+++ /dev/null@@ -1,83 +0,0 @@-// src/screens/gov_data/GovDataCanadaPanel.h-// Canada Open Government Data panel (open.canada.ca / CKAN).-// 3-view hierarchy: Publishers → Datasets → Resources + Search.-#pragma once--#include "services/gov_data/GovDataService.h"--#include <QJsonArray>-#include <QLabel>-#include <QLineEdit>-#include <QPushButton>-#include <QStackedWidget>-#include <QTableWidget>-#include <QWidget>--namespace fincept::screens {--class GovDataCanadaPanel : public QWidget {- Q_OBJECT- public:- explicit GovDataCanadaPanel(QWidget* parent = nullptr);-- public slots:- void load_initial_data();-- private slots:- void on_result(const QString& request_id, const services::GovDataResult& result);- void on_publisher_clicked(int row);- void on_dataset_clicked(int row);- void on_view_changed(int index);- void on_search();- void on_back();- void on_export_csv();-- private:- void build_ui();- QWidget* build_toolbar();- void show_loading(const QString& message);- void show_error(const QString& message);- void show_empty(const QString& message);- void populate_publishers(const QJsonArray& data);- void populate_datasets(const QJsonArray& data, int total_count);- void populate_resources(const QJsonArray& data);- void update_toolbar_state();- void update_breadcrumb();-- static constexpr const char* kScript = "canada_gov_api.py";- static constexpr const char* kColor = "#EF4444";-- enum View { Publishers = 0, Datasets, Resources, Search };- View current_view_ = Publishers;-- // Toolbar- QPushButton* back_btn_ = nullptr;- QPushButton* publishers_btn_ = nullptr;- QPushButton* datasets_btn_ = nullptr;- QPushButton* search_btn_ = nullptr;- QLineEdit* search_input_ = nullptr;- QPushButton* fetch_btn_ = nullptr;- QPushButton* export_btn_ = nullptr;-- // Breadcrumb- QWidget* breadcrumb_ = nullptr;- QLabel* breadcrumb_label_ = nullptr;- QLabel* row_count_label_ = nullptr;-- // Content- QStackedWidget* content_stack_ = nullptr;- QTableWidget* publishers_table_ = nullptr;- QTableWidget* datasets_table_ = nullptr;- QTableWidget* resources_table_ = nullptr;- QLabel* status_label_ = nullptr;-- // Navigation state- QString selected_publisher_;- QString selected_publisher_name_;- QString selected_dataset_;- QJsonArray current_publishers_;- QJsonArray current_datasets_;- QJsonArray current_resources_;-};--} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataCongressPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataCongressPanel.cppindex 4605e75a4..fff070c25 100644--- a/fincept-qt/src/screens/gov_data/GovDataCongressPanel.cpp+++ b/fincept-qt/src/screens/gov_data/GovDataCongressPanel.cpp@@ -1,17 +1,16 @@// src/screens/gov_data/GovDataCongressPanel.cpp#include "screens/gov_data/GovDataCongressPanel.h"+#include "screens/gov_data/GovDataProviderPanel.h"#include "core/logging/Logger.h"#include "services/gov_data/GovDataService.h"#include "ui/theme/Theme.h"-#include <QFileDialog>#include <QHBoxLayout>#include <QHeaderView>#include <QJsonArray>#include <QJsonObject>#include <QRegularExpression>-#include <QTextStream>#include <QVBoxLayout>namespace fincept::screens {@@ -21,42 +20,11 @@ using namespace fincept::ui;static const QString kGovDataCongressColor = "#8B5CF6";static const QString kGovDataCongressScript = "congress_gov_data.py";-// ── Dynamic stylesheet ──────────────────────────────────────────────────────+// ── Congress-specific extra styles (QSpinBox, QComboBox, QTextBrowser) ──────-static QString build_congress_style() {+static QString congress_extra_qss() {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);@@ -67,39 +35,20 @@ static QString build_congress_style() {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(build_congress_style());+ setStyleSheet(make_gov_panel_style(kGovDataCongressColor, congress_extra_qss()));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()); });+ [this]() { setStyleSheet(make_gov_panel_style(kGovDataCongressColor, congress_extra_qss())); });}// ── Build UI ─────────────────────────────────────────────────────────────────@@ -125,11 +74,7 @@ void GovDataCongressPanel::build_ui() {bills_table_->setColumnWidth(1, 60);bills_table_->setColumnWidth(2, 70);bills_table_->setColumnWidth(5, 100);- bills_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- bills_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- bills_table_->verticalHeader()->setVisible(false);- bills_table_->setAlternatingRowColors(true);- bills_table_->setShowGrid(true);+ configure_table(bills_table_);connect(bills_table_, &QTableWidget::cellDoubleClicked, this, &GovDataCongressPanel::on_bill_clicked);content_stack_->addWidget(bills_table_);@@ -166,8 +111,8 @@ void GovDataCongressPanel::build_ui() {QWidget* GovDataCongressPanel::build_toolbar() {auto* bar = new QWidget(this);- bar->setObjectName("govCongressToolbar");- bar->setFixedHeight(40);+ bar->setObjectName("govPanelToolbar");+ bar->setFixedHeight(36);auto* hl = new QHBoxLayout(bar);hl->setContentsMargins(10, 0, 10, 0);@@ -185,14 +130,14 @@ QWidget* GovDataCongressPanel::build_toolbar() {// View tabsbills_btn_ = new QPushButton("BILLS");- bills_btn_->setObjectName("govCongressTab");+ bills_btn_->setObjectName("govTabBtn");bills_btn_->setCheckable(true);bills_btn_->setChecked(true);bills_btn_->setCursor(Qt::PointingHandCursor);connect(bills_btn_, &QPushButton::clicked, this, [this]() { on_view_changed(Bills); });summary_btn_ = new QPushButton("SUMMARY");- summary_btn_->setObjectName("govCongressTab");+ summary_btn_->setObjectName("govTabBtn");summary_btn_->setCheckable(true);summary_btn_->setCursor(Qt::PointingHandCursor);connect(summary_btn_, &QPushButton::clicked, this, [this]() { on_view_changed(SummaryView); });@@ -424,36 +369,7 @@ void GovDataCongressPanel::show_error(const QString& message) {void GovDataCongressPanel::on_export_csv() {QTableWidget* table = (current_view_ == SummaryView) ? summary_table_ : bills_table_;- if (!table || table->rowCount() == 0)- return;-- QString path = QFileDialog::getSaveFileName(this, "Export CSV", "congress_data.csv", "CSV Files (*.csv)");- if (path.isEmpty())- return;-- QFile file(path);- if (!file.open(QIODevice::WriteOnly | QIODevice::Text))- return;- QTextStream out(&file);-- QStringList headers;- for (int c = 0; c < table->columnCount(); ++c) {- auto* h = table->horizontalHeaderItem(c);- headers << (h ? h->text() : "");- }- out << headers.join(",") << "\n";-- for (int r = 0; r < table->rowCount(); ++r) {- QStringList row;- for (int c = 0; c < table->columnCount(); ++c) {- auto* item = table->item(r, c);- QString val = item ? item->text() : "";- if (val.contains(',') || val.contains('"'))- val = "\"" + val.replace("\"", "\"\"") + "\"";- row << val;- }- out << row.join(",") << "\n";- }+ export_table_to_csv(table, "congress_data.csv", this);}} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataFrancePanel.cpp b/fincept-qt/src/screens/gov_data/GovDataFrancePanel.cppindex 30211bfcb..ad1f4b856 100644--- a/fincept-qt/src/screens/gov_data/GovDataFrancePanel.cpp+++ b/fincept-qt/src/screens/gov_data/GovDataFrancePanel.cpp@@ -1,20 +1,17 @@// src/screens/gov_data/GovDataFrancePanel.cpp// France data.gouv.fr panel — Data Services | Datasets (search) | Geo Search#include "screens/gov_data/GovDataFrancePanel.h"+#include "screens/gov_data/GovDataProviderPanel.h"#include "core/logging/Logger.h"#include "services/gov_data/GovDataService.h"#include "ui/theme/Theme.h"-#include <QDesktopServices>-#include <QFileDialog>#include <QHBoxLayout>#include <QHeaderView>#include <QJsonArray>#include <QJsonObject>#include <QScrollArea>-#include <QTextStream>-#include <QUrl>#include <QVBoxLayout>namespace fincept::screens {@@ -25,81 +22,15 @@ static constexpr const char* kGovDataFranceColor = "#2563EB";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(build_france_style());+ setStyleSheet(make_gov_panel_style(kGovDataFranceColor));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()); });+ [this]() { setStyleSheet(make_gov_panel_style(kGovDataFranceColor)); });}// ── Build UI ──────────────────────────────────────────────────────────────────@@ -113,17 +44,17 @@ void GovDataFrancePanel::build_ui() {// Breadcrumb barbreadcrumb_ = new QWidget(this);- breadcrumb_->setObjectName("frBreadcrumb");+ breadcrumb_->setObjectName("govBreadcrumb");breadcrumb_->setFixedHeight(24);auto* bcl = new QHBoxLayout(breadcrumb_);bcl->setContentsMargins(14, 0, 14, 0);bcl->setSpacing(4);breadcrumb_label_ = new QLabel("Data Services");- breadcrumb_label_->setObjectName("frBreadText");+ breadcrumb_label_->setObjectName("govBreadcrumbText");bcl->addWidget(breadcrumb_label_);bcl->addStretch(1);row_count_label_ = new QLabel;- row_count_label_->setObjectName("frBreadCount");+ row_count_label_->setObjectName("govBreadcrumbActive");bcl->addWidget(row_count_label_);root->addWidget(breadcrumb_);@@ -141,12 +72,7 @@ void GovDataFrancePanel::build_ui() {services_table_->setColumnWidth(1, 80);services_table_->setColumnWidth(2, 90);services_table_->setColumnWidth(3, 100);- services_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- services_table_->setSelectionMode(QAbstractItemView::SingleSelection);- services_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- services_table_->verticalHeader()->setVisible(false);- services_table_->setAlternatingRowColors(true);- services_table_->setShowGrid(true);+ configure_table(services_table_);content_stack_->addWidget(services_table_); // index 0// Page 1 — Datasets table (search results)@@ -162,12 +88,7 @@ void GovDataFrancePanel::build_ui() {datasets_table_->setColumnWidth(2, 130);datasets_table_->setColumnWidth(3, 55);datasets_table_->setColumnWidth(4, 100);- datasets_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- datasets_table_->setSelectionMode(QAbstractItemView::SingleSelection);- datasets_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- datasets_table_->verticalHeader()->setVisible(false);- datasets_table_->setAlternatingRowColors(true);- datasets_table_->setShowGrid(true);+ configure_table(datasets_table_);connect(datasets_table_, &QTableWidget::cellDoubleClicked, this,&GovDataFrancePanel::on_dataset_row_double_clicked);content_stack_->addWidget(datasets_table_); // index 1@@ -187,12 +108,7 @@ void GovDataFrancePanel::build_ui() {geo_table_->setColumnWidth(3, 55);geo_table_->setColumnWidth(4, 65);geo_table_->setColumnWidth(5, 95);- geo_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- geo_table_->setSelectionMode(QAbstractItemView::SingleSelection);- geo_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- geo_table_->verticalHeader()->setVisible(false);- geo_table_->setAlternatingRowColors(true);- geo_table_->setShowGrid(true);+ configure_table(geo_table_);content_stack_->addWidget(geo_table_); // index 2// Page 3 — Resources / Column schema table@@ -202,21 +118,16 @@ void GovDataFrancePanel::build_ui() {resources_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);resources_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);resources_table_->setColumnWidth(1, 120);- resources_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- resources_table_->setSelectionMode(QAbstractItemView::SingleSelection);- resources_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- resources_table_->verticalHeader()->setVisible(false);- resources_table_->setAlternatingRowColors(true);- resources_table_->setShowGrid(true);+ configure_table(resources_table_);content_stack_->addWidget(resources_table_); // index 3// Page 4 — Status / loading / errorauto* status_page = new QWidget(this);- status_page->setObjectName("frStatusPage");+ status_page->setObjectName("govStatusPage");auto* svl = new QVBoxLayout(status_page);svl->setAlignment(Qt::AlignCenter);status_label_ = new QLabel;- status_label_->setObjectName("frStatusMsg");+ status_label_->setObjectName("govStatusMsg");status_label_->setAlignment(Qt::AlignCenter);status_label_->setWordWrap(true);svl->addWidget(status_label_);@@ -227,15 +138,15 @@ void GovDataFrancePanel::build_ui() {QWidget* GovDataFrancePanel::build_toolbar() {auto* bar = new QWidget(this);- bar->setObjectName("frPanelToolbar");- bar->setFixedHeight(40);+ bar->setObjectName("govPanelToolbar");+ bar->setFixedHeight(36);auto* hl = new QHBoxLayout(bar);hl->setContentsMargins(10, 0, 10, 0);hl->setSpacing(5);back_btn_ = new QPushButton("← BACK");- back_btn_->setObjectName("frBackBtn");+ back_btn_->setObjectName("govBackBtn");back_btn_->setVisible(false);back_btn_->setCursor(Qt::PointingHandCursor);connect(back_btn_, &QPushButton::clicked, this, &GovDataFrancePanel::on_back);@@ -244,7 +155,7 @@ QWidget* GovDataFrancePanel::build_toolbar() {hl->addSpacing(4);services_btn_ = new QPushButton("DATA SERVICES");- services_btn_->setObjectName("frTabBtn");+ services_btn_->setObjectName("govTabBtn");services_btn_->setCheckable(true);services_btn_->setChecked(true);services_btn_->setCursor(Qt::PointingHandCursor);@@ -252,14 +163,14 @@ QWidget* GovDataFrancePanel::build_toolbar() {hl->addWidget(services_btn_);datasets_btn_ = new QPushButton("DATASETS");- datasets_btn_->setObjectName("frTabBtn");+ datasets_btn_->setObjectName("govTabBtn");datasets_btn_->setCheckable(true);datasets_btn_->setCursor(Qt::PointingHandCursor);connect(datasets_btn_, &QPushButton::clicked, this, [this]() { on_tab_changed(Datasets); });hl->addWidget(datasets_btn_);geo_btn_ = new QPushButton("GEO SEARCH");- geo_btn_->setObjectName("frTabBtn");+ geo_btn_->setObjectName("govTabBtn");geo_btn_->setCheckable(true);geo_btn_->setCursor(Qt::PointingHandCursor);connect(geo_btn_, &QPushButton::clicked, this, [this]() { on_tab_changed(Geo); });@@ -268,7 +179,7 @@ QWidget* GovDataFrancePanel::build_toolbar() {hl->addSpacing(10);search_input_ = new QLineEdit;- search_input_->setObjectName("frSearch");+ search_input_->setObjectName("govSearch");search_input_->setPlaceholderText("Search…");search_input_->setFixedWidth(210);search_input_->setFixedHeight(26);@@ -276,7 +187,7 @@ QWidget* GovDataFrancePanel::build_toolbar() {hl->addWidget(search_input_);fetch_btn_ = new QPushButton("FETCH");- fetch_btn_->setObjectName("frFetchBtn");+ fetch_btn_->setObjectName("govFetchBtn");fetch_btn_->setCursor(Qt::PointingHandCursor);connect(fetch_btn_, &QPushButton::clicked, this, &GovDataFrancePanel::on_fetch);hl->addWidget(fetch_btn_);@@ -284,7 +195,7 @@ QWidget* GovDataFrancePanel::build_toolbar() {hl->addStretch(1);export_btn_ = new QPushButton("CSV");- export_btn_->setObjectName("frCsvBtn");+ export_btn_->setObjectName("govCsvBtn");export_btn_->setCursor(Qt::PointingHandCursor);connect(export_btn_, &QPushButton::clicked, this, &GovDataFrancePanel::on_export_csv);hl->addWidget(export_btn_);@@ -673,35 +584,7 @@ void GovDataFrancePanel::on_export_csv() {if (!table)return;- QString path = QFileDialog::getSaveFileName(this, "Export CSV", def_name, "CSV Files (*.csv)");- if (path.isEmpty())- return;-- QFile file(path);- if (!file.open(QIODevice::WriteOnly | QIODevice::Text))- return;- QTextStream out(&file);-- QStringList headers;- for (int c = 0; c < table->columnCount(); ++c) {- auto* h = table->horizontalHeaderItem(c);- headers << (h ? h->text() : QString::number(c));- }- out << headers.join(",") << "\n";-- for (int r = 0; r < table->rowCount(); ++r) {- QStringList row;- for (int c = 0; c < table->columnCount(); ++c) {- auto* item = table->item(r, c);- QString val = item ? item->text() : "";- if (val.contains(',') || val.contains('"'))- val = "\"" + val.replace("\"", "\"\"") + "\"";- row << val;- }- out << row.join(",") << "\n";- }-- LOG_INFO("GovFrance", "Exported CSV: " + path);+ export_table_to_csv(table, def_name, this);}} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataHKPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataHKPanel.cppindex f7686f8ea..f4c1a8d7f 100644--- a/fincept-qt/src/screens/gov_data/GovDataHKPanel.cpp+++ b/fincept-qt/src/screens/gov_data/GovDataHKPanel.cpp@@ -3,19 +3,18 @@// Categories use publishers command (normalized string array).// HK category_datasets may return empty — fall back to datasets_list + client-side filter.#include "screens/gov_data/GovDataHKPanel.h"+#include "screens/gov_data/GovDataProviderPanel.h"#include "core/logging/Logger.h"#include "services/gov_data/GovDataService.h"#include "ui/theme/Theme.h"#include <QDesktopServices>-#include <QFileDialog>#include <QHBoxLayout>#include <QHeaderView>#include <QJsonArray>#include <QJsonObject>#include <QScrollArea>-#include <QTextStream>#include <QUrl>#include <QVBoxLayout>@@ -27,81 +26,15 @@ static constexpr const char* kGovDataHKColor = "#F43F5E";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(build_hk_style());+ setStyleSheet(make_gov_panel_style(kGovDataHKColor));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()); });+ [this]() { setStyleSheet(make_gov_panel_style(kGovDataHKColor)); });}// ── Build UI ──────────────────────────────────────────────────────────────────@@ -115,17 +48,17 @@ void GovDataHKPanel::build_ui() {// Breadcrumb barbreadcrumb_ = new QWidget(this);- breadcrumb_->setObjectName("hkBreadcrumb");+ breadcrumb_->setObjectName("govBreadcrumb");breadcrumb_->setFixedHeight(24);auto* bcl = new QHBoxLayout(breadcrumb_);bcl->setContentsMargins(14, 0, 14, 0);bcl->setSpacing(4);breadcrumb_label_ = new QLabel("Categories");- breadcrumb_label_->setObjectName("hkBreadText");+ breadcrumb_label_->setObjectName("govBreadcrumbText");bcl->addWidget(breadcrumb_label_);bcl->addStretch(1);row_count_label_ = new QLabel;- row_count_label_->setObjectName("hkBreadCount");+ row_count_label_->setObjectName("govBreadcrumbActive");bcl->addWidget(row_count_label_);root->addWidget(breadcrumb_);@@ -137,12 +70,7 @@ void GovDataHKPanel::build_ui() {categories_table_->setColumnCount(1);categories_table_->setHorizontalHeaderLabels({"CATEGORY"});categories_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);- categories_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- categories_table_->setSelectionMode(QAbstractItemView::SingleSelection);- categories_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- categories_table_->verticalHeader()->setVisible(false);- categories_table_->setAlternatingRowColors(true);- categories_table_->setShowGrid(true);+ configure_table(categories_table_);connect(categories_table_, &QTableWidget::cellDoubleClicked, this, &GovDataHKPanel::on_category_clicked);content_stack_->addWidget(categories_table_); // index 0@@ -155,12 +83,7 @@ void GovDataHKPanel::build_ui() {datasets_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);datasets_table_->setColumnWidth(1, 90);datasets_table_->setColumnWidth(2, 110);- datasets_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- datasets_table_->setSelectionMode(QAbstractItemView::SingleSelection);- datasets_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- datasets_table_->verticalHeader()->setVisible(false);- datasets_table_->setAlternatingRowColors(true);- datasets_table_->setShowGrid(true);+ configure_table(datasets_table_);connect(datasets_table_, &QTableWidget::cellDoubleClicked, this, &GovDataHKPanel::on_dataset_clicked);content_stack_->addWidget(datasets_table_); // index 1@@ -173,12 +96,7 @@ void GovDataHKPanel::build_ui() {resources_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);resources_table_->setColumnWidth(1, 80);resources_table_->setColumnWidth(2, 110);- resources_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- resources_table_->setSelectionMode(QAbstractItemView::SingleSelection);- resources_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- resources_table_->verticalHeader()->setVisible(false);- resources_table_->setAlternatingRowColors(true);- resources_table_->setShowGrid(true);+ configure_table(resources_table_);// OPEN button columnconnect(@@ -199,11 +117,11 @@ void GovDataHKPanel::build_ui() {// Page 3 — Statusauto* status_page = new QWidget(this);- status_page->setObjectName("hkStatusPage");+ status_page->setObjectName("govStatusPage");auto* svl = new QVBoxLayout(status_page);svl->setAlignment(Qt::AlignCenter);status_label_ = new QLabel;- status_label_->setObjectName("hkStatusMsg");+ status_label_->setObjectName("govStatusMsg");status_label_->setAlignment(Qt::AlignCenter);status_label_->setWordWrap(true);svl->addWidget(status_label_);@@ -214,15 +132,15 @@ void GovDataHKPanel::build_ui() {QWidget* GovDataHKPanel::build_toolbar() {auto* bar = new QWidget(this);- bar->setObjectName("hkPanelToolbar");- bar->setFixedHeight(40);+ bar->setObjectName("govPanelToolbar");+ bar->setFixedHeight(36);auto* hl = new QHBoxLayout(bar);hl->setContentsMargins(10, 0, 10, 0);hl->setSpacing(5);back_btn_ = new QPushButton("← BACK");- back_btn_->setObjectName("hkBackBtn");+ back_btn_->setObjectName("govBackBtn");back_btn_->setVisible(false);back_btn_->setCursor(Qt::PointingHandCursor);connect(back_btn_, &QPushButton::clicked, this, &GovDataHKPanel::on_back);@@ -231,7 +149,7 @@ QWidget* GovDataHKPanel::build_toolbar() {hl->addSpacing(4);categories_btn_ = new QPushButton("CATEGORIES");- categories_btn_->setObjectName("hkTabBtn");+ categories_btn_->setObjectName("govTabBtn");categories_btn_->setCheckable(true);categories_btn_->setChecked(true);categories_btn_->setCursor(Qt::PointingHandCursor);@@ -239,7 +157,7 @@ QWidget* GovDataHKPanel::build_toolbar() {hl->addWidget(categories_btn_);datasets_btn_ = new QPushButton("DATASETS");- datasets_btn_->setObjectName("hkTabBtn");+ datasets_btn_->setObjectName("govTabBtn");datasets_btn_->setCheckable(true);datasets_btn_->setCursor(Qt::PointingHandCursor);connect(datasets_btn_, &QPushButton::clicked, this, [this]() { on_tab_changed(Datasets); });@@ -248,7 +166,7 @@ QWidget* GovDataHKPanel::build_toolbar() {hl->addSpacing(10);search_input_ = new QLineEdit;- search_input_->setObjectName("hkSearch");+ search_input_->setObjectName("govSearch");search_input_->setPlaceholderText("Filter datasets…");search_input_->setFixedWidth(210);search_input_->setFixedHeight(26);@@ -256,7 +174,7 @@ QWidget* GovDataHKPanel::build_toolbar() {hl->addWidget(search_input_);fetch_btn_ = new QPushButton("FETCH");- fetch_btn_->setObjectName("hkFetchBtn");+ fetch_btn_->setObjectName("govFetchBtn");fetch_btn_->setCursor(Qt::PointingHandCursor);connect(fetch_btn_, &QPushButton::clicked, this, &GovDataHKPanel::on_fetch);hl->addWidget(fetch_btn_);@@ -264,7 +182,7 @@ QWidget* GovDataHKPanel::build_toolbar() {hl->addStretch(1);export_btn_ = new QPushButton("CSV");- export_btn_->setObjectName("hkCsvBtn");+ export_btn_->setObjectName("govCsvBtn");export_btn_->setCursor(Qt::PointingHandCursor);connect(export_btn_, &QPushButton::clicked, this, &GovDataHKPanel::on_export_csv);hl->addWidget(export_btn_);@@ -648,35 +566,7 @@ void GovDataHKPanel::on_export_csv() {if (!table)return;- QString path = QFileDialog::getSaveFileName(this, "Export CSV", def_name, "CSV Files (*.csv)");- if (path.isEmpty())- return;-- QFile file(path);- if (!file.open(QIODevice::WriteOnly | QIODevice::Text))- return;- QTextStream out(&file);-- QStringList headers;- for (int c = 0; c < table->columnCount(); ++c) {- auto* h = table->horizontalHeaderItem(c);- headers << (h ? h->text() : QString::number(c));- }- out << headers.join(",") << "\n";-- for (int r = 0; r < table->rowCount(); ++r) {- QStringList row;- for (int c = 0; c < table->columnCount(); ++c) {- auto* item = table->item(r, c);- QString val = item ? item->text() : "";- if (val.contains(',') || val.contains('"'))- val = "\"" + val.replace("\"", "\"\"") + "\"";- row << val;- }- out << row.join(",") << "\n";- }-- LOG_INFO("GovHK", "Exported CSV: " + path);+ export_table_to_csv(table, def_name, this);}} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataProviderPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataProviderPanel.cppindex fe9f7773c..35322ee0f 100644--- a/fincept-qt/src/screens/gov_data/GovDataProviderPanel.cpp+++ b/fincept-qt/src/screens/gov_data/GovDataProviderPanel.cpp@@ -5,8 +5,11 @@#include "services/gov_data/GovDataService.h"#include "ui/theme/Theme.h"+#include <QComboBox>#include <QDesktopServices>+#include <QFile>#include <QFileDialog>+#include <QFrame>#include <QHBoxLayout>#include <QHeaderView>#include <QJsonArray>@@ -14,6 +17,7 @@#include <QLabel>#include <QScrollArea>#include <QTextStream>+#include <QTimer>#include <QUrl>#include <QVBoxLayout>@@ -23,7 +27,7 @@ using namespace fincept::ui;// ── Shared panel stylesheet ──────────────────────────────────────────────────-static QString make_panel_style(const QString& color) {+QString make_gov_panel_style(const QString& color, const QString& extra_qss) {const auto& t = ThemeManager::instance().tokens();const auto cc = QColor(color);const QString cr = QString::number(cc.red());@@ -92,20 +96,33 @@ static QString make_panel_style(const QString& color) {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; }";+ if (!extra_qss.isEmpty())+ s += extra_qss;return s;}// ── Constructor ──────────────────────────────────────────────────────────────GovDataProviderPanel::GovDataProviderPanel(const QString& script, const QString& provider_color,- const QString& org_label, QWidget* parent)- : QWidget(parent), script_(script), color_(provider_color), org_label_(org_label) {- setStyleSheet(make_panel_style(color_));+ const QString& org_label, const GovProviderOptions& options,+ QWidget* parent)+ : QWidget(parent), script_(script), color_(provider_color), org_label_(org_label), options_(options) {+ setStyleSheet(make_gov_panel_style(color_));build_ui();++ // Animated loading dots timer (500ms tick)+ loading_timer_ = new QTimer(this);+ loading_timer_->setInterval(500);+ connect(loading_timer_, &QTimer::timeout, this, [this]() {+ loading_dots_ = (loading_dots_ + 1) % 4;+ QString dots(loading_dots_, '.');+ status_label_->setText(loading_base_msg_ + dots);+ });+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_)); });+ [this]() { setStyleSheet(make_gov_panel_style(color_)); });}// ── Build UI ─────────────────────────────────────────────────────────────────@@ -115,23 +132,64 @@ void GovDataProviderPanel::build_ui() {root->setContentsMargins(0, 0, 0, 0);root->setSpacing(0);+ // Optional portal selector bar (e.g. CKAN universal panel)+ if (!options_.portal_combo_items.isEmpty()) {+ const auto& t = ThemeManager::instance().tokens();+ const QString bg_surface = QString::fromLatin1(t.bg_surface);+ const QString bg_raised = QString::fromLatin1(t.bg_raised);+ const QString border_dim = QString::fromLatin1(t.border_dim);+ const QString text_sec = QString::fromLatin1(t.text_secondary);+ const QString text_pri = QString::fromLatin1(t.text_primary);+ const auto cc = QColor(color_);++ auto* portal_bar = new QWidget(this);+ portal_bar->setObjectName("govPortalBar");+ portal_bar->setFixedHeight(32);+ portal_bar->setStyleSheet(+ QString("#govPortalBar { background:%1; border-bottom:1px solid %2; }").arg(bg_surface, border_dim));+ auto* phl = new QHBoxLayout(portal_bar);+ phl->setContentsMargins(14, 0, 14, 0);+ phl->setSpacing(8);+ auto* plbl = new QLabel("CKAN PORTAL:");+ plbl->setStyleSheet(QString("color:%1; font-size:9px; font-weight:700;"+ " letter-spacing:0.5px; background:transparent;").arg(text_sec));+ phl->addWidget(plbl);+ auto* combo = new QComboBox;+ combo->setObjectName("govPortalCombo");+ combo->addItems(options_.portal_combo_items);+ if (!options_.portal_combo_tooltip.isEmpty())+ combo->setToolTip(options_.portal_combo_tooltip);+ combo->setStyleSheet(+ QString("QComboBox { background:%1; color:%2; border:1px solid %3;"+ " font-size:10px; font-weight:700; padding:2px 8px; min-width:160px; }"+ "QComboBox::drop-down { border:none; width:18px; }"+ "QComboBox QAbstractItemView { background:%1; color:%4;"+ " selection-background-color:rgba(%5,%6,%7,0.12); border:1px solid %3; }")+ .arg(bg_raised, color_, border_dim, text_pri)+ .arg(cc.red()).arg(cc.green()).arg(cc.blue()));+ phl->addWidget(combo);+ phl->addStretch(1);+ root->addWidget(portal_bar);+ }+root->addWidget(build_toolbar());- // Breadcrumb bar+ // Breadcrumb bar — clickable segments rebuilt on every navigationbreadcrumb_ = new QWidget(this);breadcrumb_->setObjectName("govBreadcrumb");breadcrumb_->setFixedHeight(24);auto* bcl = new QHBoxLayout(breadcrumb_);bcl->setContentsMargins(14, 0, 14, 0);- bcl->setSpacing(4);- breadcrumb_label_ = new QLabel("All " + org_label_);- breadcrumb_label_->setObjectName("govBreadcrumbText");- bcl->addWidget(breadcrumb_label_);+ bcl->setSpacing(0);+ breadcrumb_layout_ = bcl;+ // Row count on the right (permanent)bcl->addStretch(1);row_count_label_ = new QLabel;row_count_label_->setObjectName("govBreadcrumbText");bcl->addWidget(row_count_label_);root->addWidget(breadcrumb_);+ // Populate initial state+ update_breadcrumb();// Content stackcontent_stack_ = new QStackedWidget;@@ -143,12 +201,7 @@ void GovDataProviderPanel::build_ui() {orgs_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);orgs_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);orgs_table_->setColumnWidth(1, 80);- orgs_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- orgs_table_->setSelectionMode(QAbstractItemView::SingleSelection);- orgs_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- orgs_table_->verticalHeader()->setVisible(false);- orgs_table_->setAlternatingRowColors(true);- orgs_table_->setShowGrid(true);+ configure_table(orgs_table_);connect(orgs_table_, &QTableWidget::cellDoubleClicked, this, &GovDataProviderPanel::on_org_clicked);content_stack_->addWidget(orgs_table_);@@ -163,12 +216,7 @@ void GovDataProviderPanel::build_ui() {datasets_table_->setColumnWidth(1, 60);datasets_table_->setColumnWidth(2, 100);datasets_table_->setColumnWidth(3, 200);- datasets_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- datasets_table_->setSelectionMode(QAbstractItemView::SingleSelection);- datasets_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- datasets_table_->verticalHeader()->setVisible(false);- datasets_table_->setAlternatingRowColors(true);- datasets_table_->setShowGrid(true);+ configure_table(datasets_table_);connect(datasets_table_, &QTableWidget::cellDoubleClicked, this, &GovDataProviderPanel::on_dataset_clicked);content_stack_->addWidget(datasets_table_);@@ -185,12 +233,7 @@ void GovDataProviderPanel::build_ui() {resources_table_->setColumnWidth(2, 80);resources_table_->setColumnWidth(3, 100);resources_table_->setColumnWidth(4, 60);- resources_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- resources_table_->setSelectionMode(QAbstractItemView::SingleSelection);- resources_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- resources_table_->verticalHeader()->setVisible(false);- resources_table_->setAlternatingRowColors(true);- resources_table_->setShowGrid(true);+ configure_table(resources_table_);content_stack_->addWidget(resources_table_);// Page 3 — Status / empty / loading@@ -206,12 +249,34 @@ void GovDataProviderPanel::build_ui() {content_stack_->addWidget(status_page);root->addWidget(content_stack_, 1);++ // Optional watermark bar at the bottom (e.g. Swiss "opendata.swiss")+ if (!options_.watermark_text.isEmpty()) {+ const auto& t = ThemeManager::instance().tokens();+ const QString bg_raised = QString::fromLatin1(t.bg_raised);+ const QString border_dim = QString::fromLatin1(t.border_dim);+ const QString text_dim = QString::fromLatin1(t.text_dim);+ auto* wm_bar = new QWidget(this);+ wm_bar->setObjectName("govWatermarkBar");+ wm_bar->setFixedHeight(20);+ wm_bar->setStyleSheet(+ QString("#govWatermarkBar { background:%1; border-top:1px solid %2; }").arg(bg_raised, border_dim));+ auto* whl = new QHBoxLayout(wm_bar);+ whl->setContentsMargins(14, 0, 14, 0);+ whl->addStretch(1);+ auto* wm_lbl = new QLabel(options_.watermark_text);+ wm_lbl->setObjectName("govWatermark");+ wm_lbl->setStyleSheet(+ QString("color:%1; font-size:9px; background:transparent;").arg(text_dim));+ whl->addWidget(wm_lbl);+ root->addWidget(wm_bar);+ }}QWidget* GovDataProviderPanel::build_toolbar() {auto* bar = new QWidget(this);bar->setObjectName("govPanelToolbar");- bar->setFixedHeight(40);+ bar->setFixedHeight(36);auto* hl = new QHBoxLayout(bar);hl->setContentsMargins(10, 0, 10, 0);@@ -227,7 +292,7 @@ QWidget* GovDataProviderPanel::build_toolbar() {hl->addSpacing(4);- // View tabs+ // View tabs (no SEARCH tab — search is always available via the input)orgs_btn_ = new QPushButton(org_label_.toUpper());orgs_btn_->setObjectName("govTabBtn");orgs_btn_->setCheckable(true);@@ -243,28 +308,34 @@ QWidget* GovDataProviderPanel::build_toolbar() {connect(datasets_btn_, &QPushButton::clicked, this, [this]() { on_view_changed(Datasets); });hl->addWidget(datasets_btn_);- search_btn_ = new QPushButton("SEARCH");- search_btn_->setObjectName("govTabBtn");- search_btn_->setCheckable(true);- search_btn_->setCursor(Qt::PointingHandCursor);- connect(search_btn_, &QPushButton::clicked, this, [this]() { on_view_changed(Search); });- hl->addWidget(search_btn_);-- hl->addSpacing(10);-- // Search input+ // Separator between tab group and search/action group+ auto* sep = new QFrame;+ sep->setFrameShape(QFrame::VLine);+ sep->setFixedWidth(1);+ sep->setFixedHeight(20);+ sep->setStyleSheet(QString("background:%1;").arg(ThemeManager::instance().tokens().border_dim));+ hl->addSpacing(6);+ hl->addWidget(sep);+ hl->addSpacing(6);++ // Search input — always visible and active, press Enter to searchsearch_input_ = new QLineEdit;search_input_->setObjectName("govSearch");- search_input_->setPlaceholderText("Search datasets…");+ search_input_->setPlaceholderText("Search datasets… ↵");search_input_->setFixedWidth(210);- search_input_->setFixedHeight(26);+ search_input_->setFixedHeight(24);connect(search_input_, &QLineEdit::returnPressed, this, &GovDataProviderPanel::on_search);hl->addWidget(search_input_);fetch_btn_ = new QPushButton("FETCH");fetch_btn_->setObjectName("govFetchBtn");fetch_btn_->setCursor(Qt::PointingHandCursor);- connect(fetch_btn_, &QPushButton::clicked, this, &GovDataProviderPanel::on_search);+ connect(fetch_btn_, &QPushButton::clicked, this, [this]() {+ if (!search_input_->text().trimmed().isEmpty())+ on_search();+ else+ load_initial_data();+ });hl->addWidget(fetch_btn_);hl->addStretch(1);@@ -295,6 +366,10 @@ void GovDataProviderPanel::on_result(const QString& request_id, const services::return;}+ // Data arrived — stop loading animation+ if (loading_timer_)+ loading_timer_->stop();+// Some scripts (Australia search/org-datasets) return data as {"datasets":[...], "count":...}// instead of a flat array. Unwrap if needed.QJsonArray data;@@ -407,6 +482,7 @@ void GovDataProviderPanel::populate_datasets(const QJsonArray& data, int total_ctags_str += QString(" +%1").arg(tags.size() - 3);auto* tag_item = new QTableWidgetItem(tags_str);tag_item->setForeground(QColor(colors::TEXT_SECONDARY()));+ tag_item->setToolTip(tags.join(", "));datasets_table_->setItem(i, 3, tag_item);}@@ -450,27 +526,25 @@ void GovDataProviderPanel::populate_resources(const QJsonArray& data) {resources_table_->setItem(i, 3, new QTableWidgetItem(modified));QString url = obj["url"].toString();- auto* url_item = new QTableWidgetItem(url.isEmpty() ? "—" : "↗ OPEN");- url_item->setData(Qt::UserRole, url);- if (!url.isEmpty())- url_item->setForeground(QColor(color_));- url_item->setTextAlignment(Qt::AlignCenter);- resources_table_->setItem(i, 4, url_item);- }-- connect(- resources_table_, &QTableWidget::cellClicked, this,- [this](int row, int col) {- if (col != 4)- return;- auto* item = resources_table_->item(row, 4);- if (!item)- return;- QString url = item->data(Qt::UserRole).toString();- if (!url.isEmpty())+ if (url.isEmpty()) {+ auto* no_url = new QTableWidgetItem("—");+ no_url->setTextAlignment(Qt::AlignCenter);+ resources_table_->setItem(i, 4, no_url);+ } else {+ auto* open_btn = new QPushButton("↗ OPEN");+ open_btn->setCursor(Qt::PointingHandCursor);+ open_btn->setFlat(true);+ open_btn->setStyleSheet(+ QString("QPushButton { color:%1; font-size:10px; font-weight:700;"+ " background:transparent; border:none; padding:2px 6px; }"+ "QPushButton:hover { color:%1; text-decoration:underline; }")+ .arg(color_));+ connect(open_btn, &QPushButton::clicked, this, [url]() {QDesktopServices::openUrl(QUrl(url));- },- Qt::UniqueConnection);+ });+ resources_table_->setCellWidget(i, 4, open_btn);+ }+ }row_count_label_->setText(QString::number(data.size()) + " files");}@@ -481,7 +555,6 @@ void GovDataProviderPanel::on_view_changed(int index) {auto view = static_cast<View>(index);orgs_btn_->setChecked(view == Orgs);datasets_btn_->setChecked(view == Datasets);- search_btn_->setChecked(view == Search);if (view == Orgs) {if (current_orgs_.isEmpty())@@ -489,9 +562,6 @@ void GovDataProviderPanel::on_view_changed(int index) {elsecontent_stack_->setCurrentIndex(Orgs);current_view_ = Orgs;- } else if (view == Search) {- current_view_ = Search;- search_input_->setFocus();}update_toolbar_state();update_breadcrumb();@@ -502,9 +572,8 @@ void GovDataProviderPanel::on_org_clicked(int row) {if (!item)return;selected_org_ = item->data(Qt::UserRole).toString();- show_loading("Loading datasets for "- " + item->text() + "- "…");+ selected_org_name_ = item->text();+ show_loading("Loading datasets for " + item->text() + "…");services::GovDataService::instance().execute(script_, "datasets", {selected_org_, "100"},"gov_datasets_" + script_);}@@ -522,9 +591,11 @@ void GovDataProviderPanel::on_search() {QString query = search_input_->text().trimmed();if (query.isEmpty())return;- show_loading("Searching for "- " + query + "- "…");+ // Switch to search view automatically — no mode switching required+ current_view_ = Search;+ orgs_btn_->setChecked(false);+ datasets_btn_->setChecked(false);+ show_loading("Searching for "" + query + ""…");services::GovDataService::instance().execute(script_, "search", {query, "50"}, "gov_search_" + script_);}@@ -536,6 +607,7 @@ void GovDataProviderPanel::on_back() {content_stack_->setCurrentIndex(Orgs);current_view_ = Orgs;selected_org_.clear();+ selected_org_name_.clear();}update_toolbar_state();update_breadcrumb();@@ -546,45 +618,121 @@ void GovDataProviderPanel::update_toolbar_state() {}void GovDataProviderPanel::update_breadcrumb() {- QString text;+ const auto& t = ThemeManager::instance().tokens();+ const QString sec = QString::fromLatin1(t.text_secondary);+ const QString dim = QString::fromLatin1(t.text_dim);++ // Helper to make a styled breadcrumb text button+ auto make_seg = [&](const QString& label, bool active, auto nav_fn) -> QPushButton* {+ auto* btn = new QPushButton(label);+ btn->setFlat(true);+ btn->setCursor(active ? Qt::ArrowCursor : Qt::PointingHandCursor);+ btn->setStyleSheet(active+ ? QString("QPushButton { color:%1; font-size:9px; font-weight:700;"+ " background:transparent; border:none; padding:0 2px; }").arg(color_)+ : QString("QPushButton { color:%1; font-size:9px; background:transparent;"+ " border:none; padding:0 2px; }"+ "QPushButton:hover { color:%2; text-decoration:underline; }").arg(dim, sec));+ if (!active)+ connect(btn, &QPushButton::clicked, this, nav_fn);+ return btn;+ };++ auto make_sep = [&]() -> QLabel* {+ auto* l = new QLabel("›");+ l->setStyleSheet(QString("color:%1; font-size:9px; background:transparent;"+ " padding:0 3px;").arg(dim));+ return l;+ };++ // Remove all breadcrumb segment widgets (everything before the stretch)+ // The stretch is at index (count-2), row_count_label_ at (count-1)+ while (breadcrumb_layout_->count() > 2) {+ auto* item = breadcrumb_layout_->takeAt(0);+ if (item->widget())+ item->widget()->deleteLater();+ delete item;+ }++ // Insert segments at the front based on current view+ int insert_at = 0;++ auto insert = [&](QWidget* w) {+ breadcrumb_layout_->insertWidget(insert_at++, w);+ };+switch (current_view_) {case Orgs:- text = "All " + org_label_;+ insert(make_seg("All " + org_label_, /*active=*/true, [](){}));break;case Datasets:- text = "All " + org_label_ + " › " + selected_org_ + " › Datasets";+ insert(make_seg("All " + org_label_, false, [this]() {+ current_view_ = Orgs;+ selected_org_.clear();+ selected_org_name_.clear();+ content_stack_->setCurrentIndex(Orgs);+ update_toolbar_state();+ update_breadcrumb();+ }));+ insert(make_sep());+ insert(make_seg(selected_org_name_, /*active=*/true, [](){}));break;case Resources:- text = "All " + org_label_ + " › Datasets › Resources";+ insert(make_seg("All " + org_label_, false, [this]() {+ current_view_ = Orgs;+ selected_org_.clear();+ selected_org_name_.clear();+ selected_dataset_.clear();+ content_stack_->setCurrentIndex(Orgs);+ update_toolbar_state();+ update_breadcrumb();+ }));+ insert(make_sep());+ insert(make_seg(selected_org_name_, false, [this]() {+ current_view_ = Datasets;+ selected_dataset_.clear();+ content_stack_->setCurrentIndex(Datasets);+ update_toolbar_state();+ update_breadcrumb();+ }));+ insert(make_sep());+ insert(make_seg("Resources", /*active=*/true, [](){}));break;case Search:- text = "Search Results";+ insert(make_seg("Search Results", /*active=*/true, [](){}));break;}- breadcrumb_label_->setText(text);}// ── Status helpers ───────────────────────────────────────────────────────────void GovDataProviderPanel::show_loading(const QString& message) {- status_label_->setObjectName("govStatusMsg");+ loading_base_msg_ = message;+ loading_dots_ = 0;status_label_->setStyleSheet(QString("color:%1; font-size:13px; background:transparent;").arg(color_));status_label_->setText(message);content_stack_->setCurrentIndex(3);+ if (loading_timer_)+ loading_timer_->start();}-void GovDataProviderPanel::show_error(const QString& message) {- status_label_->setObjectName("govStatusErr");- status_label_->setStyleSheet(QString("color:%1; font-size:12px; background:transparent;").arg(colors::NEGATIVE()));- status_label_->setText("Error: " + message);+void GovDataProviderPanel::show_empty(const QString& message) {+ // Distinct from loading — static, dimmer, no animation+ if (loading_timer_)+ loading_timer_->stop();+ const auto& t = ThemeManager::instance().tokens();+ status_label_->setStyleSheet(+ QString("color:%1; font-size:12px; background:transparent;").arg(t.text_dim));+ status_label_->setText(message);content_stack_->setCurrentIndex(3);}-void GovDataProviderPanel::show_empty(const QString& message) {- status_label_->setObjectName("govStatusMsg");+void GovDataProviderPanel::show_error(const QString& message) {+ if (loading_timer_)+ loading_timer_->stop();status_label_->setStyleSheet(- QString("color:%1; font-size:12px; background:transparent;").arg(colors::TEXT_SECONDARY()));- status_label_->setText(message);+ QString("color:%1; font-size:12px; background:transparent;").arg(colors::NEGATIVE()));+ status_label_->setText("Error: " + message);content_stack_->setCurrentIndex(3);}@@ -611,6 +759,47 @@ void GovDataProviderPanel::on_export_csv() {if (path.isEmpty())return;+ QFile file(path);+ if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {+ export_btn_->setText("✗ FAILED");+ QTimer::singleShot(2000, this, [this]() { export_btn_->setText("CSV"); });+ return;+ }+ QTextStream out(&file);++ QStringList headers;+ for (int c = 0; c < table->columnCount(); ++c) {+ auto* h = table->horizontalHeaderItem(c);+ headers << (h ? h->text() : QString::number(c));+ }+ out << headers.join(",") << "\n";++ for (int r = 0; r < table->rowCount(); ++r) {+ QStringList row;+ for (int c = 0; c < table->columnCount(); ++c) {+ auto* item = table->item(r, c);+ QString val = item ? item->text() : "";+ if (val.contains(',') || val.contains('"'))+ val = "\"" + val.replace("\"", "\"\"") + "\"";+ row << val;+ }+ out << row.join(",") << "\n";+ }++ export_btn_->setText("✓ SAVED");+ QTimer::singleShot(1500, this, [this]() { export_btn_->setText("CSV"); });+}++// ── Shared CSV export utility (used by all gov_data panels) ─────────────────++void export_table_to_csv(QTableWidget* table, const QString& default_name, QWidget* parent) {+ if (!table || table->rowCount() == 0)+ return;++ const QString path = QFileDialog::getSaveFileName(parent, "Export CSV", default_name, "CSV Files (*.csv)");+ if (path.isEmpty())+ return;+QFile file(path);if (!file.open(QIODevice::WriteOnly | QIODevice::Text))return;@@ -636,4 +825,16 @@ void GovDataProviderPanel::on_export_csv() {}}+void configure_table(QTableWidget* table) {+ table->setSelectionBehavior(QAbstractItemView::SelectRows);+ table->setSelectionMode(QAbstractItemView::SingleSelection);+ table->setEditTriggers(QAbstractItemView::NoEditTriggers);+ table->verticalHeader()->setVisible(false);+ table->verticalHeader()->setDefaultSectionSize(34);+ table->verticalHeader()->setMinimumSectionSize(30);+ table->setAlternatingRowColors(true);+ table->setShowGrid(false);+ table->viewport()->setCursor(Qt::PointingHandCursor);+}+} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataProviderPanel.h b/fincept-qt/src/screens/gov_data/GovDataProviderPanel.hindex 1115736cf..ee4854058 100644--- a/fincept-qt/src/screens/gov_data/GovDataProviderPanel.h+++ b/fincept-qt/src/screens/gov_data/GovDataProviderPanel.h@@ -5,21 +5,32 @@#include "services/gov_data/GovDataService.h"+#include <QComboBox>+#include <QHBoxLayout>#include <QJsonArray>#include <QLabel>#include <QLineEdit>#include <QPushButton>#include <QStackedWidget>#include <QTableWidget>+#include <QTimer>#include <QWidget>namespace fincept::screens {+struct GovProviderOptions {+ QString watermark_text; // if non-empty, show a bottom status bar with this text+ QStringList portal_combo_items; // if non-empty, show a portal selector bar at top+ QString portal_combo_tooltip; // tooltip for the portal combobox+};+class GovDataProviderPanel : public QWidget {Q_OBJECTpublic:explicit GovDataProviderPanel(const QString& script, const QString& provider_color,- const QString& org_label = "Publishers", QWidget* parent = nullptr);+ const QString& org_label = "Publishers",+ const GovProviderOptions& options = {},+ QWidget* parent = nullptr);public slots:void load_initial_data();@@ -37,8 +48,8 @@ class GovDataProviderPanel : public QWidget {void build_ui();QWidget* build_toolbar();void show_loading(const QString& message);- void show_error(const QString& message);void show_empty(const QString& message);+ void show_error(const QString& message);void populate_orgs(const QJsonArray& data);void populate_datasets(const QJsonArray& data, int total_count);void populate_resources(const QJsonArray& data);@@ -48,6 +59,7 @@ class GovDataProviderPanel : public QWidget {QString script_;QString color_;QString org_label_;+ GovProviderOptions options_;enum View { Orgs = 0, Datasets, Resources, Search };View current_view_ = Orgs;@@ -56,14 +68,13 @@ class GovDataProviderPanel : public QWidget {QPushButton* back_btn_ = nullptr;QPushButton* orgs_btn_ = nullptr;QPushButton* datasets_btn_ = nullptr;- QPushButton* search_btn_ = nullptr;QLineEdit* search_input_ = nullptr;QPushButton* fetch_btn_ = nullptr;QPushButton* export_btn_ = nullptr;// BreadcrumbQWidget* breadcrumb_ = nullptr;- QLabel* breadcrumb_label_ = nullptr;+ QHBoxLayout* breadcrumb_layout_ = nullptr; // rebuilt on every navigationQLabel* row_count_label_ = nullptr;// Content@@ -73,12 +84,28 @@ class GovDataProviderPanel : public QWidget {QTableWidget* resources_table_ = nullptr;QLabel* status_label_ = nullptr;+ // Loading animation+ QTimer* loading_timer_ = nullptr;+ QString loading_base_msg_;+ int loading_dots_ = 0;+// Navigation state- QString selected_org_;+ QString selected_org_; // API id used for requests+ QString selected_org_name_; // display name used in breadcrumbQString selected_dataset_;QJsonArray current_orgs_;QJsonArray current_datasets_;QJsonArray current_resources_;};+// Shared utilities — available to all gov_data panels+void configure_table(QTableWidget* table);+void export_table_to_csv(QTableWidget* table, const QString& default_name, QWidget* parent);++// Shared panel stylesheet builder.+// Pass the provider accent color (hex string, e.g. "#2563EB").+// Optional extra_qss is appended verbatim — use it for panel-specific widgets+// (QSpinBox, QComboBox, QTextBrowser, etc.) that are not in the shared set.+QString make_gov_panel_style(const QString& provider_color, const QString& extra_qss = {});+} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataScreen.cpp b/fincept-qt/src/screens/gov_data/GovDataScreen.cppindex 6010d0437..a57cd3462 100644--- a/fincept-qt/src/screens/gov_data/GovDataScreen.cpp+++ b/fincept-qt/src/screens/gov_data/GovDataScreen.cpp@@ -4,13 +4,10 @@#include "core/logging/Logger.h"#include "core/session/ScreenStateManager.h"#include "screens/gov_data/GovDataAustraliaPanel.h"-#include "screens/gov_data/GovDataCKANPanel.h"-#include "screens/gov_data/GovDataCanadaPanel.h"#include "screens/gov_data/GovDataCongressPanel.h"#include "screens/gov_data/GovDataFrancePanel.h"#include "screens/gov_data/GovDataHKPanel.h"#include "screens/gov_data/GovDataProviderPanel.h"-#include "screens/gov_data/GovDataSwissPanel.h"#include "screens/gov_data/GovDataTreasuryPanel.h"#include "screens/gov_data/GovDataUKPanel.h"#include "services/gov_data/GovDataService.h"@@ -50,7 +47,7 @@ static QString build_screen_style() {// Toolbars += QString("#govToolbar { background:%1; border-bottom:1px solid %2; }").arg(raised, bdim);- s += QString("#govToolbarTitle { color:%1; font-size:13px; font-weight:700;"+ s += QString("#govToolbarTitle { color:%1; font-size:12px; font-weight:700;"" letter-spacing:1px; background:transparent; }").arg(text);s += QString("#govToolbarSub { color:%1; font-size:10px; background:transparent; }").arg(sec);@@ -62,7 +59,7 @@ static QString build_screen_style() {" letter-spacing:1px; background:transparent; }").arg(sec);s += "#govProviderList { background:transparent; border:none; outline:none; }";- s += QString("#govProviderList::item { color:%1; padding:10px 14px;"+ s += QString("#govProviderList::item { color:%1; padding:7px 14px;"" border-bottom:1px solid %2; font-size:11px; }").arg(sec, bdim);s += QString("#govProviderList::item:hover { color:%1; background:%2; }").arg(text, hover);@@ -88,11 +85,10 @@ static QString build_screen_style() {GovDataScreen::GovDataScreen(QWidget* parent) : QWidget(parent) {setObjectName("govScreen");- setStyleSheet(build_screen_style());build_ui();- connect(&ThemeManager::instance(), &ThemeManager::theme_changed, this,- [this]() { setStyleSheet(build_screen_style()); });+ connect(&ThemeManager::instance(), &ThemeManager::theme_changed, this, &GovDataScreen::refresh_theme);+ refresh_theme();}// ── Show / Hide ──────────────────────────────────────────────────────────────@@ -141,20 +137,29 @@ void GovDataScreen::build_ui() {} else if (prov.id == "us-congress") {panel = new GovDataCongressPanel(panel_stack_);} else if (prov.id == "canada-gov") {- panel = new GovDataCanadaPanel(panel_stack_);+ panel = new GovDataProviderPanel(prov.script, prov.color, "Publishers", {}, panel_stack_);} else if (prov.id == "swiss") {- panel = new GovDataSwissPanel(panel_stack_);+ GovProviderOptions swiss_opts;+ swiss_opts.watermark_text = "\xF0\x9F\x87\xA8\xF0\x9F\x87\xAD opendata.swiss";+ panel = new GovDataProviderPanel(prov.script, prov.color, "Publishers", swiss_opts, panel_stack_);} else if (prov.id == "france") {panel = new GovDataFrancePanel(panel_stack_);} else if (prov.id == "hk") {panel = new GovDataHKPanel(panel_stack_);} else if (prov.id == "universal-ckan") {- panel = new GovDataCKANPanel(panel_stack_);+ GovProviderOptions ckan_opts;+ ckan_opts.portal_combo_items = {"data.gov.uk", "open.canada.ca", "data.gov.au",+ "data.gov.hk", "opendata.swiss", "data.gouv.fr",+ "data.gov", "openafrica.net"};+ ckan_opts.portal_combo_tooltip =+ "This panel uses datagovuk_api.py which queries data.gov.uk.\n"+ "The selector shows all CKAN portals covered by the universal provider.";+ panel = new GovDataProviderPanel(prov.script, prov.color, "Publishers", ckan_opts, panel_stack_);} else if (prov.id == "australia") {panel = new GovDataAustraliaPanel(panel_stack_);} else {// openafrica, spain — still use generic until dedicated scripts exist- panel = new GovDataProviderPanel(prov.script, prov.color, "Organizations", panel_stack_);+ panel = new GovDataProviderPanel(prov.script, prov.color, "Organizations", {}, panel_stack_);}panel_stack_->addWidget(panel);}@@ -169,43 +174,37 @@ void GovDataScreen::build_ui() {QWidget* GovDataScreen::build_toolbar() {header_bar_ = new QWidget(this);header_bar_->setObjectName("govToolbar");- header_bar_->setFixedHeight(46);+ header_bar_->setFixedHeight(38);auto* hl = new QHBoxLayout(header_bar_);- hl->setContentsMargins(16, 0, 16, 0);- hl->setSpacing(10);-- // Title block- auto* col = new QWidget(this);- auto* cvl = new QVBoxLayout(col);- cvl->setContentsMargins(0, 0, 0, 0);- cvl->setSpacing(0);+ hl->setContentsMargins(14, 0, 14, 0);+ hl->setSpacing(8);header_title_ = new QLabel("GOVERNMENT DATA EXPLORER");header_title_->setObjectName("govToolbarTitle");+ header_title_->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);+ hl->addWidget(header_title_);++ // Separator dot+ auto* sep = new QLabel("·");+ sep->setObjectName("govToolbarSub");+ sep->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);+ hl->addWidget(sep);header_subtitle_ = new QLabel(QString("Open government portals · %1 sovereign sources").arg(services::GovDataService::providers().size()));header_subtitle_->setObjectName("govToolbarSub");-- cvl->addWidget(header_title_);- cvl->addWidget(header_subtitle_);- hl->addWidget(col);+ header_subtitle_->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);+ hl->addWidget(header_subtitle_);hl->addStretch(1);- // Source count badge+ // Source count badge — compact pill, stored as member for refresh_theme()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(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);+ provider_badge_ = new QLabel(QString::number(providers.size()) + " PORTALS");+ provider_badge_->setFixedHeight(20);+ provider_badge_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);+ hl->addWidget(provider_badge_);return header_bar_;}@@ -224,26 +223,19 @@ QWidget* GovDataScreen::build_sidebar() {// Section headerauto* hdr = new QWidget(this);hdr->setObjectName("govSidebarHeader");- hdr->setFixedHeight(30);+ hdr->setFixedHeight(26);auto* hhl = new QHBoxLayout(hdr);- hhl->setContentsMargins(14, 0, 10, 0);+ hhl->setContentsMargins(12, 0, 8, 0);+ hhl->setSpacing(6);auto* htitle = new QLabel("SOVEREIGN PORTALS");htitle->setObjectName("govSidebarTitle");const auto& providers = services::GovDataService::providers();- auto* hcount = new QLabel(QString::number(providers.size()));- {- 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()));- }+ sidebar_count_ = new QLabel(QString::number(providers.size()));+ sidebar_count_->setFixedHeight(16);+ sidebar_count_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);hhl->addWidget(htitle);hhl->addStretch(1);- hhl->addWidget(hcount);+ hhl->addWidget(sidebar_count_);vl->addWidget(hdr);// Provider list@@ -317,6 +309,47 @@ QWidget* GovDataScreen::build_status_bar() {return bar;}+// ── Theme refresh ────────────────────────────────────────────────────────────++void GovDataScreen::refresh_theme() {+ setStyleSheet(build_screen_style());++ const auto& t = ThemeManager::instance().tokens();+ const QString accent_color = active_provider_color_.isEmpty()+ ? QString::fromLatin1(t.accent)+ : active_provider_color_;+ const auto ac = QColor(accent_color);+ const QString ar = QString("%1,%2,%3").arg(ac.red()).arg(ac.green()).arg(ac.blue());++ // Re-style provider count badge (top-right pill)+ if (provider_badge_) {+ provider_badge_->setStyleSheet(+ QString("color:%1; background:rgba(%2,0.1); border:1px solid rgba(%2,0.3);"+ " font-size:9px; font-weight:700; padding:2px 8px; letter-spacing:0.5px;")+ .arg(accent_color, ar));+ }++ // Re-style sidebar count pill+ if (sidebar_count_) {+ const auto& tk = ThemeManager::instance().tokens();+ const auto ac2 = QColor(tk.accent);+ const QString ar2 = QString("%1,%2,%3").arg(ac2.red()).arg(ac2.green()).arg(ac2.blue());+ sidebar_count_->setStyleSheet(+ QString("color:%1; background:rgba(%2,0.12); font-size:9px;"+ " font-weight:700; padding:1px 5px;")+ .arg(tk.accent, ar2));+ }++ // Re-apply provider-color accent on toolbar border + subtitle+ if (!active_provider_color_.isEmpty() && header_bar_ && header_subtitle_) {+ header_bar_->setStyleSheet(+ QString("#govToolbar { background:%1; border-bottom:2px solid %2; }")+ .arg(t.bg_raised, active_provider_color_));+ header_subtitle_->setStyleSheet(+ QString("color:%1; font-size:10px; background:transparent;").arg(active_provider_color_));+ }+}+// ── Provider activation ──────────────────────────────────────────────────────void GovDataScreen::on_provider_selected(int row) {@@ -334,12 +367,11 @@ void GovDataScreen::activate_provider(int index) {active_index_ = index;const auto& prov = providers[index];- // Update toolbar title/subtitle with provider color+ // Store provider accent color so refresh_theme() can apply it+ active_provider_color_ = prov.color;++ // Update toolbar subtitle textheader_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:%1; border-bottom:2px solid %2; }").arg(tk.bg_raised, prov.color));// Status barif (status_portal_)@@ -350,14 +382,11 @@ void GovDataScreen::activate_provider(int index) {// Switch panelpanel_stack_->setCurrentIndex(index);- // Trigger initial load- auto* widget = panel_stack_->currentWidget();- if (auto* ckan = qobject_cast<GovDataProviderPanel*>(widget))- ckan->load_initial_data();- else if (auto* treasury = qobject_cast<GovDataTreasuryPanel*>(widget))- treasury->load_initial_data();- else if (auto* congress = qobject_cast<GovDataCongressPanel*>(widget))- congress->load_initial_data();+ // Re-apply theme so provider-color accents on toolbar/badge reflect new selection+ refresh_theme();++ // Trigger initial load — all panel types expose load_initial_data() as a public slot+ QMetaObject::invokeMethod(panel_stack_->currentWidget(), "load_initial_data");LOG_INFO("GovDataScreen", "Activated: " + prov.id);}diff --git a/fincept-qt/src/screens/gov_data/GovDataScreen.h b/fincept-qt/src/screens/gov_data/GovDataScreen.hindex f5a05cbf7..3b70c41f9 100644--- a/fincept-qt/src/screens/gov_data/GovDataScreen.h+++ b/fincept-qt/src/screens/gov_data/GovDataScreen.h@@ -29,6 +29,7 @@ class GovDataScreen : public QWidget, public IStatefulScreen {private slots:void on_provider_selected(int row);+ void refresh_theme();private:void build_ui();@@ -45,7 +46,10 @@ class GovDataScreen : public QWidget, public IStatefulScreen {QLabel* status_portal_ = nullptr;QLabel* status_country_ = nullptr;QLabel* status_datasets_ = nullptr;+ QLabel* provider_badge_ = nullptr;+ QLabel* sidebar_count_ = nullptr;+ QString active_provider_color_;int active_index_ = -1;bool initial_load_done_ = false;};diff --git a/fincept-qt/src/screens/gov_data/GovDataSwissPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataSwissPanel.cppdeleted file mode 100644index c8bb1acc7..000000000--- a/fincept-qt/src/screens/gov_data/GovDataSwissPanel.cpp+++ /dev/null@@ -1,688 +0,0 @@-// src/screens/gov_data/GovDataSwissPanel.cpp-#include "screens/gov_data/GovDataSwissPanel.h"--#include "core/logging/Logger.h"-#include "services/gov_data/GovDataService.h"-#include "ui/theme/Theme.h"--#include <QDesktopServices>-#include <QFileDialog>-#include <QHBoxLayout>-#include <QHeaderView>-#include <QJsonArray>-#include <QJsonObject>-#include <QLabel>-#include <QScrollArea>-#include <QTextStream>-#include <QUrl>-#include <QVBoxLayout>--namespace fincept::screens {-namespace {-static constexpr const char* kGovDataSwissScript = "swiss_gov_api.py";-static constexpr const char* kGovDataSwissColor = "#E11D48";-} // namespace--using namespace fincept::ui;--// ── 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(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 ─────────────────────────────────────────────────────────────────--void GovDataSwissPanel::build_ui() {- auto* root = new QVBoxLayout(this);- root->setContentsMargins(0, 0, 0, 0);- root->setSpacing(0);-- root->addWidget(build_toolbar());-- // Breadcrumb bar- breadcrumb_ = new QWidget(this);- breadcrumb_->setObjectName("govBreadcrumb");- breadcrumb_->setFixedHeight(24);- auto* bcl = new QHBoxLayout(breadcrumb_);- bcl->setContentsMargins(14, 0, 14, 0);- bcl->setSpacing(4);-- breadcrumb_label_ = new QLabel("All Publishers");- breadcrumb_label_->setObjectName("govBreadcrumbText");- bcl->addWidget(breadcrumb_label_);- bcl->addStretch(1);-- row_count_label_ = new QLabel;- row_count_label_->setObjectName("govBreadcrumbText");- bcl->addWidget(row_count_label_);-- root->addWidget(breadcrumb_);-- // Content stack- content_stack_ = new QStackedWidget;-- // Page 0 — Publishers table (PUBLISHER | DATASETS)- publishers_table_ = new QTableWidget;- publishers_table_->setColumnCount(2);- publishers_table_->setHorizontalHeaderLabels({"PUBLISHER", "DATASETS"});- publishers_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);- publishers_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);- publishers_table_->setColumnWidth(1, 80);- publishers_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- publishers_table_->setSelectionMode(QAbstractItemView::SingleSelection);- publishers_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- publishers_table_->verticalHeader()->setVisible(false);- publishers_table_->setAlternatingRowColors(true);- publishers_table_->setShowGrid(true);- connect(publishers_table_, &QTableWidget::cellDoubleClicked, this, &GovDataSwissPanel::on_publisher_clicked);- content_stack_->addWidget(publishers_table_);-- // Page 1 — Datasets table (TITLE | FILES | MODIFIED | PUBLISHER)- datasets_table_ = new QTableWidget;- datasets_table_->setColumnCount(4);- datasets_table_->setHorizontalHeaderLabels({"TITLE", "FILES", "MODIFIED", "PUBLISHER"});- datasets_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);- datasets_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);- datasets_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);- datasets_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);- datasets_table_->setColumnWidth(1, 55);- datasets_table_->setColumnWidth(2, 100);- datasets_table_->setColumnWidth(3, 180);- datasets_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- datasets_table_->setSelectionMode(QAbstractItemView::SingleSelection);- datasets_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- datasets_table_->verticalHeader()->setVisible(false);- datasets_table_->setAlternatingRowColors(true);- datasets_table_->setShowGrid(true);- connect(datasets_table_, &QTableWidget::cellDoubleClicked, this, &GovDataSwissPanel::on_dataset_clicked);- content_stack_->addWidget(datasets_table_);-- // Page 2 — Resources table (NAME | FORMAT | SIZE | MODIFIED | OPEN)- resources_table_ = new QTableWidget;- resources_table_->setColumnCount(5);- resources_table_->setHorizontalHeaderLabels({"NAME", "FORMAT", "SIZE", "MODIFIED", "OPEN"});- resources_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);- resources_table_->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Fixed);- resources_table_->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);- resources_table_->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Fixed);- resources_table_->horizontalHeader()->setSectionResizeMode(4, QHeaderView::Fixed);- resources_table_->setColumnWidth(1, 70);- resources_table_->setColumnWidth(2, 80);- resources_table_->setColumnWidth(3, 100);- resources_table_->setColumnWidth(4, 60);- resources_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- resources_table_->setSelectionMode(QAbstractItemView::SingleSelection);- resources_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- resources_table_->verticalHeader()->setVisible(false);- resources_table_->setAlternatingRowColors(true);- resources_table_->setShowGrid(true);- content_stack_->addWidget(resources_table_);-- // Page 3 — Status / loading / error- auto* status_page = new QWidget(this);- status_page->setObjectName("govStatusPage");- auto* svl = new QVBoxLayout(status_page);- svl->setAlignment(Qt::AlignCenter);- status_label_ = new QLabel;- status_label_->setObjectName("govStatusMsg");- status_label_->setAlignment(Qt::AlignCenter);- status_label_->setWordWrap(true);- svl->addWidget(status_label_);- content_stack_->addWidget(status_page);-- root->addWidget(content_stack_, 1);-- // Bottom status bar with watermark- root->addWidget(build_status_bar());-}--QWidget* GovDataSwissPanel::build_toolbar() {- auto* bar = new QWidget(this);- bar->setObjectName("govPanelToolbar");- bar->setFixedHeight(40);-- auto* hl = new QHBoxLayout(bar);- hl->setContentsMargins(10, 0, 10, 0);- hl->setSpacing(5);-- back_btn_ = new QPushButton("← BACK");- back_btn_->setObjectName("govBackBtn");- back_btn_->setVisible(false);- back_btn_->setCursor(Qt::PointingHandCursor);- connect(back_btn_, &QPushButton::clicked, this, &GovDataSwissPanel::on_back);- hl->addWidget(back_btn_);-- hl->addSpacing(4);-- publishers_btn_ = new QPushButton("PUBLISHERS");- publishers_btn_->setObjectName("govTabBtn");- publishers_btn_->setCheckable(true);- publishers_btn_->setChecked(true);- publishers_btn_->setCursor(Qt::PointingHandCursor);- connect(publishers_btn_, &QPushButton::clicked, this, [this]() { on_view_changed(Publishers); });- hl->addWidget(publishers_btn_);-- datasets_btn_ = new QPushButton("DATASETS");- datasets_btn_->setObjectName("govTabBtn");- datasets_btn_->setCheckable(true);- datasets_btn_->setCursor(Qt::PointingHandCursor);- connect(datasets_btn_, &QPushButton::clicked, this, [this]() { on_view_changed(Datasets); });- hl->addWidget(datasets_btn_);-- search_btn_ = new QPushButton("SEARCH");- search_btn_->setObjectName("govTabBtn");- search_btn_->setCheckable(true);- search_btn_->setCursor(Qt::PointingHandCursor);- connect(search_btn_, &QPushButton::clicked, this, [this]() { on_view_changed(Search); });- hl->addWidget(search_btn_);-- hl->addSpacing(10);-- search_input_ = new QLineEdit;- search_input_->setObjectName("govSearch");- search_input_->setPlaceholderText("Search datasets…");- search_input_->setFixedWidth(210);- search_input_->setFixedHeight(26);- connect(search_input_, &QLineEdit::returnPressed, this, &GovDataSwissPanel::on_search);- hl->addWidget(search_input_);-- fetch_btn_ = new QPushButton("FETCH");- fetch_btn_->setObjectName("govFetchBtn");- fetch_btn_->setCursor(Qt::PointingHandCursor);- connect(fetch_btn_, &QPushButton::clicked, this, &GovDataSwissPanel::on_search);- hl->addWidget(fetch_btn_);-- hl->addStretch(1);-- export_btn_ = new QPushButton("CSV");- export_btn_->setObjectName("govCsvBtn");- export_btn_->setCursor(Qt::PointingHandCursor);- connect(export_btn_, &QPushButton::clicked, this, &GovDataSwissPanel::on_export_csv);- hl->addWidget(export_btn_);-- return bar;-}--QWidget* GovDataSwissPanel::build_status_bar() {- auto* bar = new QWidget(this);- bar->setObjectName("govStatusBar");- bar->setFixedHeight(20);-- auto* hl = new QHBoxLayout(bar);- hl->setContentsMargins(14, 0, 14, 0);- hl->setSpacing(0);-- hl->addStretch(1);-- watermark_label_ = new QLabel("🇨🇭 opendata.swiss");- watermark_label_->setObjectName("govWatermark");- hl->addWidget(watermark_label_);-- return bar;-}--// ── Data loading ─────────────────────────────────────────────────────────────--void GovDataSwissPanel::load_initial_data() {- show_loading("Loading publishers…");- services::GovDataService::instance().execute(kGovDataSwissScript, "publishers", {}, "gov_orgs_swiss_gov_api.py");-}--void GovDataSwissPanel::on_result(const QString& request_id, const services::GovDataResult& result) {- // Only handle requests belonging to this script- if (!request_id.contains("swiss_gov_api.py"))- return;-- if (!result.success) {- show_error(result.error);- return;- }-- // Unwrap data array — CKAN standard {"data":[...], "metadata":{...}}- QJsonArray data;- const QJsonValue raw = result.data["data"];- if (raw.isArray()) {- data = raw.toArray();- } else if (raw.isObject()) {- const QJsonObject obj = raw.toObject();- if (obj.contains("datasets"))- data = obj["datasets"].toArray();- else if (obj.contains("result"))- data = obj["result"].toArray();- }-- if (request_id.startsWith("gov_orgs_")) {- current_publishers_ = data;- populate_publishers(data);- content_stack_->setCurrentIndex(Publishers);- current_view_ = Publishers;- update_breadcrumb();- LOG_INFO("GovDataSwiss", QString("Loaded %1 publishers").arg(data.size()));- } else if (request_id.startsWith("gov_datasets_") || request_id.startsWith("gov_search_")) {- int total = result.data["metadata"].toObject()["total_count"].toInt(0);- if (total == 0)- total = data.size();- current_datasets_ = data;- populate_datasets(data, total);- content_stack_->setCurrentIndex(Datasets);- current_view_ = Datasets;- update_breadcrumb();- LOG_INFO("GovDataSwiss", QString("Loaded %1 datasets (total %2)").arg(data.size()).arg(total));- } else if (request_id.startsWith("gov_resources_")) {- current_resources_ = data;- populate_resources(data);- content_stack_->setCurrentIndex(Resources);- current_view_ = Resources;- update_breadcrumb();- LOG_INFO("GovDataSwiss", QString("Loaded %1 resources").arg(data.size()));- }-- update_toolbar_state();-}--// ── Populate tables ──────────────────────────────────────────────────────────--void GovDataSwissPanel::populate_publishers(const QJsonArray& data) {- publishers_table_->setRowCount(0);- publishers_table_->setRowCount(data.size());-- for (int i = 0; i < data.size(); ++i) {- const auto obj = data[i].toObject();-- // Resolve display name — prefer display_name, fall back to name, then id- QString name = obj["display_name"].toString();- if (name.isEmpty())- name = obj["name"].toString();- if (name.isEmpty())- name = obj["id"].toString();-- // original_name is Swiss-specific — store as tooltip- const QString original_name = obj["original_name"].toString();-- const QString id = obj["id"].toString().isEmpty() ? obj["name"].toString() : obj["id"].toString();-- auto* name_item = new QTableWidgetItem(name);- name_item->setData(Qt::UserRole, id);- name_item->setForeground(QColor(kGovDataSwissColor));- // Show original_name (e.g. German/French/Italian) as tooltip when available- if (!original_name.isEmpty() && original_name != name)- name_item->setToolTip(original_name);- publishers_table_->setItem(i, 0, name_item);-- int count = obj["dataset_count"].toInt(-1);- auto* cnt = new QTableWidgetItem(count >= 0 ? QString::number(count) : "—");- cnt->setTextAlignment(Qt::AlignCenter);- publishers_table_->setItem(i, 1, cnt);- }-- row_count_label_->setText(QString::number(data.size()) + " publishers");-}--void GovDataSwissPanel::populate_datasets(const QJsonArray& data, int total_count) {- datasets_table_->setRowCount(0);- datasets_table_->setRowCount(data.size());-- for (int i = 0; i < data.size(); ++i) {- const auto obj = data[i].toObject();-- QString title = obj["title"].toString();- if (title.isEmpty())- title = obj["name"].toString();-- const QString id = obj["id"].toString().isEmpty() ? obj["name"].toString() : obj["id"].toString();-- // Long notes → tooltip truncated to 100 chars- QString notes = obj["notes"].toString().trimmed();- QString tooltip = notes.isEmpty() ? title : (notes.length() > 100 ? notes.left(100) + "…" : notes);-- auto* title_item = new QTableWidgetItem(title);- title_item->setData(Qt::UserRole, id);- title_item->setToolTip(tooltip);- datasets_table_->setItem(i, 0, title_item);-- int num_res = obj["num_resources"].toInt(0);- auto* res_item = new QTableWidgetItem(QString::number(num_res));- res_item->setTextAlignment(Qt::AlignCenter);- res_item->setForeground(QColor(kGovDataSwissColor));- datasets_table_->setItem(i, 1, res_item);-- QString modified = obj["metadata_modified"].toString();- if (modified.length() > 10)- modified = modified.left(10);- datasets_table_->setItem(i, 2, new QTableWidgetItem(modified));-- // Publisher name from publisher_id or nested publisher object- QString publisher = obj["publisher_id"].toString();- if (publisher.isEmpty()) {- const auto pub_obj = obj["publisher"].toObject();- publisher = pub_obj["display_name"].toString();- if (publisher.isEmpty())- publisher = pub_obj["name"].toString();- }- auto* pub_item = new QTableWidgetItem(publisher);- pub_item->setForeground(QColor(ui::colors::TEXT_SECONDARY()));- datasets_table_->setItem(i, 3, pub_item);- }-- row_count_label_->setText(QString("Showing %1 of %2").arg(data.size()).arg(total_count));-}--void GovDataSwissPanel::populate_resources(const QJsonArray& data) {- resources_table_->setRowCount(0);- resources_table_->setRowCount(data.size());-- for (int i = 0; i < data.size(); ++i) {- const auto obj = data[i].toObject();-- QString name = obj["name"].toString();- if (name.isEmpty())- name = obj["id"].toString();-- auto* name_item = new QTableWidgetItem(name);- const QString desc = obj["description"].toString().trimmed();- if (!desc.isEmpty())- name_item->setToolTip(desc);- resources_table_->setItem(i, 0, name_item);-- QString format = obj["format"].toString().toUpper();- auto* fmt_item = new QTableWidgetItem(format.isEmpty() ? "—" : format);- fmt_item->setForeground(QColor(kGovDataSwissColor));- fmt_item->setTextAlignment(Qt::AlignCenter);- resources_table_->setItem(i, 1, fmt_item);-- // size is often null in Swiss data — show "—" when null/zero- QString size_str = "—";- if (!obj["size"].isNull() && obj["size"].toDouble(0) > 0) {- const double size_bytes = obj["size"].toDouble(0);- if (size_bytes < 1024)- size_str = QString::number(size_bytes, 'f', 0) + " B";- else if (size_bytes < 1024 * 1024)- size_str = QString::number(size_bytes / 1024.0, 'f', 1) + " KB";- else- size_str = QString::number(size_bytes / (1024.0 * 1024.0), 'f', 1) + " MB";- }- auto* sz = new QTableWidgetItem(size_str);- sz->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);- resources_table_->setItem(i, 2, sz);-- QString modified = obj["last_modified"].toString();- if (modified.length() > 10)- modified = modified.left(10);- if (modified.isEmpty())- modified = obj["created"].toString().left(10);- resources_table_->setItem(i, 3, new QTableWidgetItem(modified));-- const QString url = obj["url"].toString();- auto* url_item = new QTableWidgetItem(url.isEmpty() ? "—" : "↗ OPEN");- url_item->setData(Qt::UserRole, url);- if (!url.isEmpty())- url_item->setForeground(QColor(kGovDataSwissColor));- url_item->setTextAlignment(Qt::AlignCenter);- resources_table_->setItem(i, 4, url_item);- }-- // Connect open-URL click — UniqueConnection prevents double-connecting on reload- connect(- resources_table_, &QTableWidget::cellClicked, this,- [this](int row, int col) {- if (col != 4)- return;- auto* item = resources_table_->item(row, 4);- if (!item)- return;- const QString url = item->data(Qt::UserRole).toString();- if (!url.isEmpty())- QDesktopServices::openUrl(QUrl(url));- },- Qt::UniqueConnection);-- row_count_label_->setText(QString::number(data.size()) + " files");-}--// ── View navigation ──────────────────────────────────────────────────────────--void GovDataSwissPanel::on_view_changed(int index) {- const auto view = static_cast<View>(index);- publishers_btn_->setChecked(view == Publishers);- datasets_btn_->setChecked(view == Datasets);- search_btn_->setChecked(view == Search);-- if (view == Publishers) {- if (current_publishers_.isEmpty())- load_initial_data();- else- content_stack_->setCurrentIndex(Publishers);- current_view_ = Publishers;- } else if (view == Datasets) {- if (!current_datasets_.isEmpty()) {- content_stack_->setCurrentIndex(Datasets);- current_view_ = Datasets;- }- // If no datasets loaded yet, stay on current view — user must pick a publisher first- } else if (view == Search) {- current_view_ = Search;- search_input_->setFocus();- }-- update_toolbar_state();- update_breadcrumb();-}--void GovDataSwissPanel::on_publisher_clicked(int row) {- auto* item = publishers_table_->item(row, 0);- if (!item)- return;- selected_publisher_ = item->data(Qt::UserRole).toString();- selected_publisher_name_ = item->text();- show_loading("Loading datasets for "- " + selected_publisher_name_ + "- "…");- services::GovDataService::instance().execute(kGovDataSwissScript, "datasets", {selected_publisher_, "100"},- "gov_datasets_swiss_gov_api.py");-}--void GovDataSwissPanel::on_dataset_clicked(int row) {- auto* item = datasets_table_->item(row, 0);- if (!item)- return;- selected_dataset_ = item->data(Qt::UserRole).toString();- show_loading("Loading resources…");- services::GovDataService::instance().execute(kGovDataSwissScript, "resources", {selected_dataset_},- "gov_resources_swiss_gov_api.py");-}--void GovDataSwissPanel::on_search() {- const QString query = search_input_->text().trimmed();- if (query.isEmpty())- return;- show_loading("Searching for "- " + query + "- "…");- services::GovDataService::instance().execute(kGovDataSwissScript, "search", {query, "50"},- "gov_search_swiss_gov_api.py");-}--void GovDataSwissPanel::on_back() {- if (current_view_ == Resources) {- content_stack_->setCurrentIndex(Datasets);- current_view_ = Datasets;- } else if (current_view_ == Datasets) {- content_stack_->setCurrentIndex(Publishers);- current_view_ = Publishers;- selected_publisher_.clear();- selected_publisher_name_.clear();- }- update_toolbar_state();- update_breadcrumb();-}--void GovDataSwissPanel::update_toolbar_state() {- back_btn_->setVisible(current_view_ == Datasets || current_view_ == Resources);-}--void GovDataSwissPanel::update_breadcrumb() {- QString text;- switch (current_view_) {- case Publishers:- text = "All Publishers";- break;- case Datasets:- text = "All Publishers › " + selected_publisher_name_ + " › Datasets";- break;- case Resources:- text = "All Publishers › Datasets › Resources";- break;- case Search:- text = "Search Results";- break;- }- breadcrumb_label_->setText(text);-}--// ── Status helpers ───────────────────────────────────────────────────────────--void GovDataSwissPanel::show_loading(const QString& message) {- status_label_->setStyleSheet(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(- 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);-}--void GovDataSwissPanel::show_empty(const QString& message) {- status_label_->setStyleSheet(- QString("color:%1; font-size:12px; background:transparent;").arg(ui::colors::TEXT_SECONDARY()));- status_label_->setText(message);- content_stack_->setCurrentIndex(3);-}--// ── CSV export ───────────────────────────────────────────────────────────────--void GovDataSwissPanel::on_export_csv() {- QTableWidget* table = nullptr;- QString def_name;-- if (current_view_ == Publishers && publishers_table_->rowCount() > 0) {- table = publishers_table_;- def_name = "swiss_publishers.csv";- } else if ((current_view_ == Datasets || current_view_ == Search) && datasets_table_->rowCount() > 0) {- table = datasets_table_;- def_name = "swiss_datasets.csv";- } else if (current_view_ == Resources && resources_table_->rowCount() > 0) {- table = resources_table_;- def_name = "swiss_resources.csv";- }- if (!table)- return;-- const QString path = QFileDialog::getSaveFileName(this, "Export CSV", def_name, "CSV Files (*.csv)");- if (path.isEmpty())- return;-- QFile file(path);- if (!file.open(QIODevice::WriteOnly | QIODevice::Text))- return;- QTextStream out(&file);-- QStringList headers;- for (int c = 0; c < table->columnCount(); ++c) {- auto* h = table->horizontalHeaderItem(c);- headers << (h ? h->text() : QString::number(c));- }- out << headers.join(",") << "\n";-- for (int r = 0; r < table->rowCount(); ++r) {- QStringList row;- for (int c = 0; c < table->columnCount(); ++c) {- auto* item = table->item(r, c);- QString val = item ? item->text() : "";- if (val.contains(',') || val.contains('"'))- val = "\"" + val.replace("\"", "\"\"") + "\"";- row << val;- }- out << row.join(",") << "\n";- }-}--} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataSwissPanel.h b/fincept-qt/src/screens/gov_data/GovDataSwissPanel.hdeleted file mode 100644index d17f2a6c2..000000000--- a/fincept-qt/src/screens/gov_data/GovDataSwissPanel.h+++ /dev/null@@ -1,88 +0,0 @@-// src/screens/gov_data/GovDataSwissPanel.h-// Switzerland Open Government Data panel (opendata.swiss / CKAN).-// 3-view hierarchy: Publishers → Datasets → Resources + Search.-// Adds original_name tooltip on publisher rows and a "opendata.swiss" watermark.-#pragma once--#include "services/gov_data/GovDataService.h"--#include <QJsonArray>-#include <QLabel>-#include <QLineEdit>-#include <QPushButton>-#include <QStackedWidget>-#include <QTableWidget>-#include <QWidget>--namespace fincept::screens {--class GovDataSwissPanel : public QWidget {- Q_OBJECT- public:- explicit GovDataSwissPanel(QWidget* parent = nullptr);-- public slots:- void load_initial_data();-- private slots:- void on_result(const QString& request_id, const services::GovDataResult& result);- void on_publisher_clicked(int row);- void on_dataset_clicked(int row);- void on_view_changed(int index);- void on_search();- void on_back();- void on_export_csv();-- private:- void build_ui();- QWidget* build_toolbar();- QWidget* build_status_bar();- void show_loading(const QString& message);- void show_error(const QString& message);- void show_empty(const QString& message);- void populate_publishers(const QJsonArray& data);- void populate_datasets(const QJsonArray& data, int total_count);- void populate_resources(const QJsonArray& data);- void update_toolbar_state();- void update_breadcrumb();-- static constexpr const char* kScript = "swiss_gov_api.py";- static constexpr const char* kColor = "#E11D48";-- enum View { Publishers = 0, Datasets, Resources, Search };- View current_view_ = Publishers;-- // Toolbar- QPushButton* back_btn_ = nullptr;- QPushButton* publishers_btn_ = nullptr;- QPushButton* datasets_btn_ = nullptr;- QPushButton* search_btn_ = nullptr;- QLineEdit* search_input_ = nullptr;- QPushButton* fetch_btn_ = nullptr;- QPushButton* export_btn_ = nullptr;-- // Breadcrumb- QWidget* breadcrumb_ = nullptr;- QLabel* breadcrumb_label_ = nullptr;- QLabel* row_count_label_ = nullptr;-- // Content- QStackedWidget* content_stack_ = nullptr;- QTableWidget* publishers_table_ = nullptr;- QTableWidget* datasets_table_ = nullptr;- QTableWidget* resources_table_ = nullptr;- QLabel* status_label_ = nullptr;-- // Status bar watermark label- QLabel* watermark_label_ = nullptr;-- // Navigation state- QString selected_publisher_;- QString selected_publisher_name_;- QString selected_dataset_;- QJsonArray current_publishers_;- QJsonArray current_datasets_;- QJsonArray current_resources_;-};--} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataTreasuryPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataTreasuryPanel.cppindex 0f88ebb3b..0d4cd2db6 100644--- a/fincept-qt/src/screens/gov_data/GovDataTreasuryPanel.cpp+++ b/fincept-qt/src/screens/gov_data/GovDataTreasuryPanel.cpp@@ -1,18 +1,17 @@// src/screens/gov_data/GovDataTreasuryPanel.cpp#include "screens/gov_data/GovDataTreasuryPanel.h"+#include "screens/gov_data/GovDataProviderPanel.h"#include "core/logging/Logger.h"#include "services/gov_data/GovDataService.h"#include "ui/theme/Theme.h"#include <QDate>-#include <QFileDialog>#include <QGridLayout>#include <QHBoxLayout>#include <QHeaderView>#include <QJsonArray>#include <QJsonObject>-#include <QTextStream>#include <QVBoxLayout>namespace fincept::screens {@@ -53,6 +52,12 @@ static QString build_treasury_style() {.arg(t.text_secondary, t.border_dim);s += QString("#govCsvBtn:hover { color:%1; background:%2; }").arg(t.text_primary, t.bg_hover);+ // Filter bar+ s += QString("#govTreasuryFilterBar { background:%1; border-bottom:1px solid %2; }").arg(t.bg_surface, t.border_dim);+ s += QString("#govTreasuryFilterLabel { color:%1; font-size:9px; font-weight:700;"+ " letter-spacing:0.5px; background:transparent; }")+ .arg(t.text_secondary);+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);@@ -115,6 +120,7 @@ void GovDataTreasuryPanel::build_ui() {root->setSpacing(0);root->addWidget(build_toolbar());+ root->addWidget(build_filter_bar());content_stack_ = new QStackedWidget;@@ -123,11 +129,7 @@ void GovDataTreasuryPanel::build_ui() {prices_table_->setColumnCount(7);prices_table_->setHorizontalHeaderLabels({"CUSIP", "TYPE", "RATE %", "MATURITY", "BID", "OFFER", "EOD PRICE"});prices_table_->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);- prices_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- prices_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- prices_table_->verticalHeader()->setVisible(false);- prices_table_->setAlternatingRowColors(true);- prices_table_->setShowGrid(true);+ configure_table(prices_table_);content_stack_->addWidget(prices_table_);// ── Page 1: Auctions table ──@@ -136,11 +138,7 @@ void GovDataTreasuryPanel::build_ui() {auctions_table_->setHorizontalHeaderLabels({"CUSIP", "TYPE", "TERM", "AUCTION DATE", "HIGH RATE", "HIGH PRICE", "BID/COVER", "OFFERING"});auctions_table_->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);- auctions_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- auctions_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- auctions_table_->verticalHeader()->setVisible(false);- auctions_table_->setAlternatingRowColors(true);- auctions_table_->setShowGrid(true);+ configure_table(auctions_table_);content_stack_->addWidget(auctions_table_);// ── Page 2: Summary ──@@ -224,7 +222,7 @@ void GovDataTreasuryPanel::build_ui() {QWidget* GovDataTreasuryPanel::build_toolbar() {auto* bar = new QWidget(this);bar->setObjectName("govTreasuryToolbar");- bar->setFixedHeight(40);+ bar->setFixedHeight(36);auto* hl = new QHBoxLayout(bar);hl->setContentsMargins(10, 0, 10, 0);@@ -253,24 +251,47 @@ QWidget* GovDataTreasuryPanel::build_toolbar() {hl->addWidget(prices_btn_);hl->addWidget(auctions_btn_);hl->addWidget(summary_btn_);- hl->addSpacing(14);+ hl->addStretch(1);++ fetch_btn_ = new QPushButton("FETCH");+ fetch_btn_->setObjectName("govFetchBtn");+ fetch_btn_->setCursor(Qt::PointingHandCursor);+ connect(fetch_btn_, &QPushButton::clicked, this, &GovDataTreasuryPanel::on_fetch);+ hl->addWidget(fetch_btn_);++ export_btn_ = new QPushButton("CSV");+ export_btn_->setObjectName("govCsvBtn");+ export_btn_->setCursor(Qt::PointingHandCursor);+ connect(export_btn_, &QPushButton::clicked, this, &GovDataTreasuryPanel::on_export_csv);+ hl->addWidget(export_btn_);++ return bar;+}++QWidget* GovDataTreasuryPanel::build_filter_bar() {+ auto* bar = new QWidget(this);+ bar->setObjectName("govTreasuryFilterBar");+ bar->setFixedHeight(34);++ auto* hl = new QHBoxLayout(bar);+ hl->setContentsMargins(14, 0, 14, 0);+ hl->setSpacing(8);++ auto make_lbl = [&](const QString& text) -> QLabel* {+ auto* l = new QLabel(text);+ l->setObjectName("govTreasuryFilterLabel");+ return l;+ };- // Date labels- 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);+ hl->addWidget(make_lbl("FROM"));start_date_ = new QDateEdit(QDate::currentDate().addMonths(-1));start_date_->setCalendarPopup(true);start_date_->setDisplayFormat("yyyy-MM-dd");- start_date_->setFixedHeight(26);+ start_date_->setFixedHeight(24);hl->addWidget(start_date_);- auto* to_lbl = new QLabel("TO");- to_lbl->setStyleSheet(lbl_style);- hl->addWidget(to_lbl);+ hl->addWidget(make_lbl("TO"));QDate end = QDate::currentDate().addDays(-1);if (end.dayOfWeek() == 6)@@ -280,15 +301,11 @@ QWidget* GovDataTreasuryPanel::build_toolbar() {end_date_ = new QDateEdit(end);end_date_->setCalendarPopup(true);end_date_->setDisplayFormat("yyyy-MM-dd");- end_date_->setFixedHeight(26);+ end_date_->setFixedHeight(24);hl->addWidget(end_date_);- hl->addSpacing(10);-- // Security type- auto* type_lbl = new QLabel("TYPE");- type_lbl->setStyleSheet(lbl_style);- hl->addWidget(type_lbl);+ hl->addSpacing(16);+ hl->addWidget(make_lbl("TYPE"));security_type_ = new QComboBox;security_type_->addItem("All", "all");@@ -297,23 +314,11 @@ QWidget* GovDataTreasuryPanel::build_toolbar() {security_type_->addItem("Bonds", "bond");security_type_->addItem("TIPS", "tips");security_type_->addItem("FRN", "frn");- security_type_->setFixedHeight(26);+ security_type_->setFixedHeight(24);hl->addWidget(security_type_);hl->addStretch(1);- fetch_btn_ = new QPushButton("FETCH");- fetch_btn_->setObjectName("govFetchBtn");- fetch_btn_->setCursor(Qt::PointingHandCursor);- connect(fetch_btn_, &QPushButton::clicked, this, &GovDataTreasuryPanel::on_fetch);- hl->addWidget(fetch_btn_);-- export_btn_ = new QPushButton("CSV");- export_btn_->setObjectName("govCsvBtn");- export_btn_->setCursor(Qt::PointingHandCursor);- connect(export_btn_, &QPushButton::clicked, this, &GovDataTreasuryPanel::on_export_csv);- hl->addWidget(export_btn_);-return bar;}@@ -501,36 +506,7 @@ void GovDataTreasuryPanel::on_export_csv() {table = auctions_table_;elsetable = type_breakdown_table_;- if (!table || table->rowCount() == 0)- return;-- QString path = QFileDialog::getSaveFileName(this, "Export CSV", "treasury_data.csv", "CSV Files (*.csv)");- if (path.isEmpty())- return;-- QFile file(path);- if (!file.open(QIODevice::WriteOnly | QIODevice::Text))- return;- QTextStream out(&file);-- QStringList headers;- for (int c = 0; c < table->columnCount(); ++c) {- auto* h = table->horizontalHeaderItem(c);- headers << (h ? h->text() : "");- }- out << headers.join(",") << "\n";-- for (int r = 0; r < table->rowCount(); ++r) {- QStringList row;- for (int c = 0; c < table->columnCount(); ++c) {- auto* item = table->item(r, c);- QString val = item ? item->text() : "";- if (val.contains(',') || val.contains('"'))- val = "\"" + val.replace("\"", "\"\"") + "\"";- row << val;- }- out << row.join(",") << "\n";- }+ export_table_to_csv(table, "treasury_data.csv", this);}} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataTreasuryPanel.h b/fincept-qt/src/screens/gov_data/GovDataTreasuryPanel.hindex 4a4be813b..5d43f8d2a 100644--- a/fincept-qt/src/screens/gov_data/GovDataTreasuryPanel.h+++ b/fincept-qt/src/screens/gov_data/GovDataTreasuryPanel.h@@ -32,6 +32,7 @@ class GovDataTreasuryPanel : public QWidget {private:void build_ui();QWidget* build_toolbar();+ QWidget* build_filter_bar();void show_loading(const QString& message);void show_error(const QString& message);void populate_prices(const QJsonObject& data);diff --git a/fincept-qt/src/screens/gov_data/GovDataUKPanel.cpp b/fincept-qt/src/screens/gov_data/GovDataUKPanel.cppindex bd6d232a4..cc8a26462 100644--- a/fincept-qt/src/screens/gov_data/GovDataUKPanel.cpp+++ b/fincept-qt/src/screens/gov_data/GovDataUKPanel.cpp@@ -1,18 +1,17 @@// src/screens/gov_data/GovDataUKPanel.cpp#include "screens/gov_data/GovDataUKPanel.h"+#include "screens/gov_data/GovDataProviderPanel.h"#include "core/logging/Logger.h"#include "services/gov_data/GovDataService.h"#include "ui/theme/Theme.h"#include <QDesktopServices>-#include <QFileDialog>#include <QHBoxLayout>#include <QHeaderView>#include <QJsonArray>#include <QJsonObject>#include <QScrollArea>-#include <QTextStream>#include <QUrl>#include <QVBoxLayout>@@ -22,87 +21,32 @@ static constexpr const char* kGovDataUKScript = "datagovuk_api.py";static constexpr const char* kGovDataUKColor = "#10B981";} // namespace-// ── 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(build_uk_style());+ // UK has a unique #govPopularBtn — pass its style as extra_qss+ auto uk_extra = [&]() -> QString {+ const auto& t = ThemeManager::instance().tokens();+ const auto cc = QColor(kGovDataUKColor);+ const QString c = kGovDataUKColor;+ const QString cr = QString::number(cc.red());+ const QString cg = QString::number(cc.green());+ const QString cb = QString::number(cc.blue());+ QString s;+ 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);+ return s;+ };+ setStyleSheet(make_gov_panel_style(kGovDataUKColor, uk_extra()));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()); });+ [this, uk_extra]() { setStyleSheet(make_gov_panel_style(kGovDataUKColor, uk_extra())); });}// ── UI Construction ──────────────────────────────────────────────────────────@@ -138,12 +82,7 @@ void GovDataUKPanel::build_ui() {publishers_table_->setColumnCount(1);publishers_table_->setHorizontalHeaderLabels({"NAME"});publishers_table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);- publishers_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- publishers_table_->setSelectionMode(QAbstractItemView::SingleSelection);- publishers_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- publishers_table_->verticalHeader()->setVisible(false);- publishers_table_->setAlternatingRowColors(true);- publishers_table_->setShowGrid(true);+ configure_table(publishers_table_);connect(publishers_table_, &QTableWidget::cellDoubleClicked, this, &GovDataUKPanel::on_publisher_doubleclicked);content_stack_->addWidget(publishers_table_); // index 0@@ -158,12 +97,7 @@ void GovDataUKPanel::build_ui() {datasets_table_->setColumnWidth(1, 55);datasets_table_->setColumnWidth(2, 100);datasets_table_->setColumnWidth(3, 200);- datasets_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- datasets_table_->setSelectionMode(QAbstractItemView::SingleSelection);- datasets_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- datasets_table_->verticalHeader()->setVisible(false);- datasets_table_->setAlternatingRowColors(true);- datasets_table_->setShowGrid(true);+ configure_table(datasets_table_);connect(datasets_table_, &QTableWidget::cellDoubleClicked, this, &GovDataUKPanel::on_dataset_doubleclicked);content_stack_->addWidget(datasets_table_); // index 1@@ -180,12 +114,7 @@ void GovDataUKPanel::build_ui() {resources_table_->setColumnWidth(2, 80);resources_table_->setColumnWidth(3, 100);resources_table_->setColumnWidth(4, 60);- resources_table_->setSelectionBehavior(QAbstractItemView::SelectRows);- resources_table_->setSelectionMode(QAbstractItemView::SingleSelection);- resources_table_->setEditTriggers(QAbstractItemView::NoEditTriggers);- resources_table_->verticalHeader()->setVisible(false);- resources_table_->setAlternatingRowColors(true);- resources_table_->setShowGrid(true);+ configure_table(resources_table_);connect(resources_table_, &QTableWidget::cellClicked, this,[this](int row, int col) {@@ -219,7 +148,7 @@ void GovDataUKPanel::build_ui() {QWidget* GovDataUKPanel::build_toolbar() {auto* bar = new QWidget(this);bar->setObjectName("govPanelToolbar");- bar->setFixedHeight(40);+ bar->setFixedHeight(36);auto* hl = new QHBoxLayout(bar);hl->setContentsMargins(10, 0, 10, 0);@@ -651,37 +580,7 @@ void GovDataUKPanel::on_export_csv() {}if (!table)return;- export_table_csv(table, def_name);-}--void GovDataUKPanel::export_table_csv(QTableWidget* table, const QString& default_name) {- const QString path = QFileDialog::getSaveFileName(this, "Export CSV", default_name, "CSV Files (*.csv)");- if (path.isEmpty())- return;-- QFile file(path);- if (!file.open(QIODevice::WriteOnly | QIODevice::Text))- return;- QTextStream out(&file);-- QStringList headers;- for (int c = 0; c < table->columnCount(); ++c) {- auto* h = table->horizontalHeaderItem(c);- headers << (h ? h->text() : QString::number(c));- }- out << headers.join(",") << "\n";-- for (int r = 0; r < table->rowCount(); ++r) {- QStringList row;- for (int c = 0; c < table->columnCount(); ++c) {- auto* item = table->item(r, c);- QString val = item ? item->text() : "";- if (val.contains(',') || val.contains('"'))- val = "\"" + val.replace("\"", "\"\"") + "\"";- row << val;- }- out << row.join(",") << "\n";- }+ export_table_to_csv(table, def_name, this);}} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/gov_data/GovDataUKPanel.h b/fincept-qt/src/screens/gov_data/GovDataUKPanel.hindex e44607076..b4ab66f30 100644--- a/fincept-qt/src/screens/gov_data/GovDataUKPanel.h+++ b/fincept-qt/src/screens/gov_data/GovDataUKPanel.h@@ -49,9 +49,6 @@ class GovDataUKPanel : public QWidget {void update_toolbar_state();void update_breadcrumb();- // CSV export helper- void export_table_csv(QTableWidget* table, const QString& default_name);-// ── Constants ────────────────────────────────────────────────────────────static constexpr const char* kScript = "datagovuk_api.py";static constexpr const char* kColor = "#10B981";diff --git a/fincept-qt/src/screens/markets/MarketPanel.cpp b/fincept-qt/src/screens/markets/MarketPanel.cppindex 185896455..5aab2a584 100644--- a/fincept-qt/src/screens/markets/MarketPanel.cpp+++ b/fincept-qt/src/screens/markets/MarketPanel.cpp@@ -3,6 +3,7 @@#include "ui/theme/Theme.h"#include "ui/theme/ThemeManager.h"+#include <QEnterEvent>#include <QHBoxLayout>#include <QHeaderView>#include <QPointer>@@ -11,8 +12,8 @@namespace fincept::screens {-MarketPanel::MarketPanel(const QString& title, const QStringList& symbols, bool show_name, QWidget* parent)- : QWidget(parent), title_(title), symbols_(symbols), show_name_(show_name) {+MarketPanel::MarketPanel(const MarketPanelConfig& config, QWidget* parent)+ : QWidget(parent), config_(config) {setMinimumWidth(280);setMaximumWidth(520);setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);@@ -26,9 +27,10 @@ MarketPanel::MarketPanel(const QString& title, const QStringList& symbols, boolauto* header = new QWidget(this);header->setFixedHeight(32);auto* hhl = new QHBoxLayout(header);- hhl->setContentsMargins(10, 0, 8, 0);+ hhl->setContentsMargins(10, 0, 6, 0);+ hhl->setSpacing(4);- title_label_ = new QLabel(title.toUpper());+ title_label_ = new QLabel(config_.title.toUpper());title_label_->setStyleSheet(QString("color:%1;font-weight:700;letter-spacing:1.2px;background:transparent;").arg(ui::colors::AMBER()));hhl->addWidget(title_label_);@@ -37,6 +39,36 @@ MarketPanel::MarketPanel(const QString& title, const QStringList& symbols, boolstatus_label_ = new QLabel;status_label_->setStyleSheet(QString("color:%1;background:transparent;").arg(ui::colors::TEXT_DIM()));hhl->addWidget(status_label_);++ // Edit / delete buttons — hidden until hover+ edit_btn_ = new QPushButton("✎");+ edit_btn_->setFixedSize(20, 20);+ edit_btn_->setCursor(Qt::PointingHandCursor);+ edit_btn_->setToolTip("Edit panel");+ edit_btn_->setVisible(false);+ edit_btn_->setStyleSheet(+ QString("QPushButton{background:transparent;color:%1;border:none;font-size:13px;}"+ "QPushButton:hover{color:%2;}")+ .arg(ui::colors::TEXT_TERTIARY(), ui::colors::AMBER()));+ connect(edit_btn_, &QPushButton::clicked, this, [this]() {+ emit edit_requested(config_.id);+ });+ hhl->addWidget(edit_btn_);++ delete_btn_ = new QPushButton("✕");+ delete_btn_->setFixedSize(20, 20);+ delete_btn_->setCursor(Qt::PointingHandCursor);+ delete_btn_->setToolTip("Remove panel");+ delete_btn_->setVisible(false);+ delete_btn_->setStyleSheet(+ QString("QPushButton{background:transparent;color:%1;border:none;font-size:11px;font-weight:bold;}"+ "QPushButton:hover{color:%2;}")+ .arg(ui::colors::TEXT_TERTIARY(), ui::colors::NEGATIVE()));+ connect(delete_btn_, &QPushButton::clicked, this, [this]() {+ emit delete_requested(config_.id);+ });+ hhl->addWidget(delete_btn_);+vl->addWidget(header);// Table@@ -52,7 +84,7 @@ MarketPanel::MarketPanel(const QString& title, const QStringList& symbols, booltable_->horizontalHeader()->setHighlightSections(false);table_->horizontalHeader()->setFixedHeight(18);- if (show_name_) {+ if (config_.show_name) {table_->setColumnCount(6);table_->setHorizontalHeaderLabels({"SYM", "NAME", "LAST", "CHG", "CHG%", "VOL"});table_->horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents);@@ -79,7 +111,6 @@ void MarketPanel::refresh_theme() {setStyleSheet(QString("background:%1;border:1px solid %2;").arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));- // Headerif (title_label_) {title_label_->parentWidget()->setStyleSheet(QString("background:%1;border-bottom:1px solid %2;border-left:2px solid %3;")@@ -89,7 +120,6 @@ void MarketPanel::refresh_theme() {status_label_->setStyleSheet(QString("color:%1;background:transparent;").arg(ui::colors::TEXT_DIM()));}- // Tableif (table_)table_->setStyleSheet(QString("QTableWidget{background:%1;alternate-background-color:%2;border:none;}""QTableWidget::item{padding:0 6px;border-bottom:1px solid %3;}"@@ -100,9 +130,16 @@ void MarketPanel::refresh_theme() {ui::colors::BG_HOVER(), ui::colors::BG_RAISED(), ui::colors::TEXT_DIM()));}-void MarketPanel::set_symbols(const QStringList& s) {- symbols_ = s;- refresh();+void MarketPanel::enterEvent(QEnterEvent* event) {+ QWidget::enterEvent(event);+ if (edit_btn_) edit_btn_->setVisible(true);+ if (delete_btn_) delete_btn_->setVisible(true);+}++void MarketPanel::leaveEvent(QEvent* event) {+ QWidget::leaveEvent(event);+ if (edit_btn_) edit_btn_->setVisible(false);+ if (delete_btn_) delete_btn_->setVisible(false);}void MarketPanel::refresh() {@@ -111,7 +148,7 @@ void MarketPanel::refresh() {loading_overlay_->show_loading("LOADING\xe2\x80\xa6");QPointer<MarketPanel> self = this;- services::MarketDataService::instance().fetch_quotes(symbols_, [self](bool ok, QVector<services::QuoteData> q) {+ services::MarketDataService::instance().fetch_quotes(config_.symbols, [self](bool ok, QVector<services::QuoteData> q) {if (!self)return;self->loading_overlay_->hide_loading();@@ -146,19 +183,19 @@ void MarketPanel::populate(const QVector<services::QuoteData>& quotes) {return i;};bool pos = q.change >= 0;- const QString cc = pos ? ui::colors::POSITIVE() : ui::colors::NEGATIVE();+ const QString cc = pos ? ui::colors::POSITIVE() : ui::colors::NEGATIVE();const QString arr = pos ? "▲" : "▼";- int prec = q.price > 100 ? 2 : (q.price > 1 ? 2 : 4);- int col = 0;+ int prec = q.price > 1 ? 2 : 4;+ int col = 0;table_->setItem(row, col++, mk(q.symbol, ui::colors::TEXT_PRIMARY(), Qt::AlignLeft | Qt::AlignVCenter));- if (show_name_)+ if (config_.show_name)table_->setItem(row, col++, mk(q.name, ui::colors::TEXT_TERTIARY(), Qt::AlignLeft | Qt::AlignVCenter));table_->setItem(row, col++, mk(QString::number(q.price, 'f', prec), ui::colors::AMBER()));table_->setItem(row, col++, mk(QString("%1 %2").arg(arr).arg(std::abs(q.change), 0, 'f', 2), cc));table_->setItem(row, col++, mk(QString("%1%2%").arg(arr).arg(std::abs(q.change_pct), 0, 'f', 2), cc));- if (!show_name_) {+ if (!config_.show_name) {table_->setItem(row, col++, mk(QString::number(q.high, 'f', 2), ui::colors::TEXT_SECONDARY()));- table_->setItem(row, col++, mk(QString::number(q.low, 'f', 2), ui::colors::TEXT_SECONDARY()));+ table_->setItem(row, col++, mk(QString::number(q.low, 'f', 2), ui::colors::TEXT_SECONDARY()));}table_->setItem(row, col++, mk("--", ui::colors::TEXT_DIM()));table_->setRowHeight(row, 26);diff --git a/fincept-qt/src/screens/markets/MarketPanel.h b/fincept-qt/src/screens/markets/MarketPanel.hindex f85f3f210..019d5b20d 100644--- a/fincept-qt/src/screens/markets/MarketPanel.h+++ b/fincept-qt/src/screens/markets/MarketPanel.h@@ -1,8 +1,10 @@#pragma once+#include "screens/markets/MarketPanelConfig.h"#include "services/markets/MarketDataService.h"#include "ui/widgets/LoadingOverlay.h"#include <QLabel>+#include <QPushButton>#include <QTableWidget>#include <QWidget>@@ -10,31 +12,36 @@ namespace fincept::screens {/// Single market category panel — header + data table./// Fetches quotes and displays symbol/price/change/high/low.+/// Emits edit_requested / delete_requested for the parent screen to handle.class MarketPanel : public QWidget {Q_OBJECTpublic:- MarketPanel(const QString& title, const QStringList& symbols, bool show_name = false, QWidget* parent = nullptr);+ explicit MarketPanel(const MarketPanelConfig& config, QWidget* parent = nullptr);- void set_symbols(const QStringList& symbols);void refresh();+ const QString& panel_id() const { return config_.id; }signals:void refresh_finished();+ void edit_requested(const QString& panel_id);+ void delete_requested(const QString& panel_id);protected:void resizeEvent(QResizeEvent* event) override;+ void enterEvent(QEnterEvent* event) override;+ void leaveEvent(QEvent* event) override;private:void populate(const QVector<services::QuoteData>& quotes);void refresh_theme();- QString title_;- QStringList symbols_;- bool show_name_;+ MarketPanelConfig config_;- QLabel* title_label_ = nullptr;- QLabel* status_label_ = nullptr;- QTableWidget* table_ = nullptr;+ QLabel* title_label_ = nullptr;+ QLabel* status_label_ = nullptr;+ QPushButton* edit_btn_ = nullptr;+ QPushButton* delete_btn_ = nullptr;+ QTableWidget* table_ = nullptr;ui::LoadingOverlay* loading_overlay_ = nullptr;};diff --git a/fincept-qt/src/screens/markets/MarketPanelConfig.h b/fincept-qt/src/screens/markets/MarketPanelConfig.hnew file mode 100644index 000000000..2b4df95a0--- /dev/null+++ b/fincept-qt/src/screens/markets/MarketPanelConfig.h@@ -0,0 +1,19 @@+#pragma once+#include <QStringList>+#include <QString>+#include <QUuid>++namespace fincept::screens {++struct MarketPanelConfig {+ QString id; // stable UUID+ QString title;+ QStringList symbols;+ bool show_name = false; // show company name column++ static MarketPanelConfig make(const QString& title, const QStringList& symbols, bool show_name = false) {+ return { QUuid::createUuid().toString(QUuid::WithoutBraces), title, symbols, show_name };+ }+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/markets/MarketPanelEditor.cpp b/fincept-qt/src/screens/markets/MarketPanelEditor.cppnew file mode 100644index 000000000..968d0e0f1--- /dev/null+++ b/fincept-qt/src/screens/markets/MarketPanelEditor.cpp@@ -0,0 +1,308 @@+#include "screens/markets/MarketPanelEditor.h"++#include "network/http/HttpClient.h"+#include "ui/theme/Theme.h"++#include <QDialogButtonBox>+#include <QEvent>+#include <QFrame>+#include <QHBoxLayout>+#include <QJsonArray>+#include <QJsonDocument>+#include <QJsonObject>+#include <QKeyEvent>+#include <QLabel>+#include <QListWidgetItem>+#include <QMoveEvent>+#include <QPushButton>+#include <QResizeEvent>+#include <QTimer>+#include <QUuid>+#include <QVBoxLayout>++namespace fincept::screens {++static constexpr int kDebounceMs = 300;+static constexpr int kMaxResults = 15;++static QString input_ss() {+ return QString("QLineEdit{background:%1;color:%2;border:1px solid %3;"+ "padding:4px 8px;selection-background-color:%4;}"+ "QLineEdit:focus{border-color:%5;}")+ .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_PRIMARY(), ui::colors::BORDER_MED(),+ ui::colors::BG_HOVER(), ui::colors::AMBER());+}++static QString list_ss() {+ return QString("QListWidget{background:%1;border:1px solid %2;outline:none;}"+ "QListWidget::item{padding:5px 10px;border-bottom:1px solid %3;color:%4;}"+ "QListWidget::item:hover{background:%5;color:%6;}"+ "QListWidget::item:selected{background:%5;color:%6;}")+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_MED(), ui::colors::BORDER_DIM(),+ ui::colors::TEXT_PRIMARY(), ui::colors::BG_HOVER(), ui::colors::AMBER());+}++static QString section_lbl_ss() {+ return QString("color:%1;font-weight:700;letter-spacing:1px;background:transparent;font-size:11px;")+ .arg(ui::colors::TEXT_TERTIARY());+}++MarketPanelEditor::MarketPanelEditor(const MarketPanelConfig& config, QWidget* parent)+ : QDialog(parent), config_(config) {+ build_ui();+}++void MarketPanelEditor::build_ui() {+ setWindowTitle(config_.id.isEmpty() ? "New Panel" : "Edit Panel — " + config_.title);+ setModal(true);+ setMinimumSize(440, 520);+ setStyleSheet(QString("QDialog{background:%1;color:%2;}")+ .arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY()));++ auto* root = new QVBoxLayout(this);+ root->setContentsMargins(18, 18, 18, 18);+ root->setSpacing(10);++ // Title+ auto* title_lbl = new QLabel("PANEL TITLE");+ title_lbl->setStyleSheet(section_lbl_ss());+ root->addWidget(title_lbl);++ title_edit_ = new QLineEdit(config_.title);+ title_edit_->setPlaceholderText("e.g. My Tech Stocks");+ title_edit_->setStyleSheet(input_ss());+ root->addWidget(title_edit_);++ auto make_sep = [&]() {+ auto* s = new QFrame; s->setFixedHeight(1);+ s->setStyleSheet(QString("background:%1;border:none;").arg(ui::colors::BORDER_DIM()));+ return s;+ };+ root->addWidget(make_sep());++ // Ticker list header+ auto* tickers_hdr = new QWidget;+ auto* tickers_hl = new QHBoxLayout(tickers_hdr);+ tickers_hl->setContentsMargins(0, 0, 0, 0);+ auto* tickers_lbl = new QLabel("TICKERS");+ tickers_lbl->setStyleSheet(section_lbl_ss());+ tickers_hl->addWidget(tickers_lbl);+ tickers_hl->addStretch();+ auto* remove_btn = new QPushButton("✕ REMOVE");+ remove_btn->setFixedHeight(20);+ remove_btn->setCursor(Qt::PointingHandCursor);+ remove_btn->setStyleSheet(+ QString("QPushButton{background:transparent;color:%1;border:1px solid %1;"+ "padding:0 8px;font-size:11px;font-weight:bold;}"+ "QPushButton:hover{color:%2;border-color:%2;}")+ .arg(ui::colors::BORDER_MED(), ui::colors::NEGATIVE()));+ connect(remove_btn, &QPushButton::clicked, this, &MarketPanelEditor::on_remove_selected);+ tickers_hl->addWidget(remove_btn);+ root->addWidget(tickers_hdr);++ ticker_list_ = new QListWidget;+ ticker_list_->setStyleSheet(list_ss());+ ticker_list_->setFixedHeight(150);+ connect(ticker_list_, &QListWidget::itemDoubleClicked, this, [this](QListWidgetItem*) {+ on_remove_selected();+ });+ root->addWidget(ticker_list_);++ root->addWidget(make_sep());++ // Search / add+ auto* search_lbl = new QLabel("ADD TICKER · type to search, click or Enter to add");+ search_lbl->setStyleSheet(section_lbl_ss());+ root->addWidget(search_lbl);++ search_edit_ = new QLineEdit;+ search_edit_->setPlaceholderText("Search symbol or name: AAPL, Reliance, Bitcoin ...");+ search_edit_->setStyleSheet(input_ss());+ search_edit_->installEventFilter(this);+ root->addWidget(search_edit_);++ // Debounce timer+ search_debounce_ = new QTimer(this);+ search_debounce_->setSingleShot(true);+ search_debounce_->setInterval(kDebounceMs);+ connect(search_debounce_, &QTimer::timeout, this, [this]() {+ fire_search(pending_query_);+ });++ connect(search_edit_, &QLineEdit::textChanged, this, &MarketPanelEditor::on_search_text_changed);+ connect(search_edit_, &QLineEdit::returnPressed, this, [this]() {+ if (dropdown_->isVisible() && dropdown_->currentItem())+ on_add_symbol(dropdown_->currentItem()->data(Qt::UserRole).toString());+ else if (!search_edit_->text().trimmed().isEmpty())+ on_add_symbol(search_edit_->text().trimmed().toUpper());+ });++ // Floating dropdown — parented to dialog, floats above layout+ dropdown_ = new QListWidget(this);+ dropdown_->setStyleSheet(list_ss());+ dropdown_->setFixedHeight(160);+ dropdown_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);+ dropdown_->hide();+ connect(dropdown_, &QListWidget::itemClicked, this, [this](QListWidgetItem* item) {+ on_add_symbol(item->data(Qt::UserRole).toString());+ });++ // Dialog buttons+ auto* btns = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);+ btns->setStyleSheet(+ QString("QPushButton{background:%1;color:%2;border:1px solid %3;padding:4px 16px;font-weight:bold;}"+ "QPushButton:hover{border-color:%4;color:%4;}")+ .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_SECONDARY(),+ ui::colors::BORDER_MED(), ui::colors::AMBER()));+ connect(btns, &QDialogButtonBox::accepted, this, [this]() {+ config_.title = title_edit_->text().trimmed();+ config_.symbols.clear();+ for (int i = 0; i < ticker_list_->count(); ++i)+ config_.symbols << ticker_list_->item(i)->text();+ if (config_.id.isEmpty())+ config_.id = QUuid::createUuid().toString(QUuid::WithoutBraces);+ hide_dropdown();+ accept();+ });+ connect(btns, &QDialogButtonBox::rejected, this, [this]() {+ hide_dropdown();+ reject();+ });+ root->addWidget(btns);++ refresh_ticker_list();+}++void MarketPanelEditor::reposition_dropdown() {+ if (!search_edit_ || !dropdown_) return;+ QPoint pos = search_edit_->mapTo(this, QPoint(0, search_edit_->height()));+ dropdown_->setGeometry(pos.x(), pos.y(), search_edit_->width(), 160);+ dropdown_->raise();+}++void MarketPanelEditor::hide_dropdown() {+ search_debounce_->stop();+ if (dropdown_) dropdown_->hide();+}++void MarketPanelEditor::resizeEvent(QResizeEvent* event) {+ QDialog::resizeEvent(event);+ reposition_dropdown();+}++void MarketPanelEditor::moveEvent(QMoveEvent* event) {+ QDialog::moveEvent(event);+ reposition_dropdown();+}++bool MarketPanelEditor::eventFilter(QObject* obj, QEvent* event) {+ if (obj == search_edit_) {+ if (event->type() == QEvent::KeyPress) {+ auto* ke = static_cast<QKeyEvent*>(event);+ if (ke->key() == Qt::Key_Down && dropdown_->isVisible()) {+ dropdown_->setFocus();+ dropdown_->setCurrentRow(0);+ return true;+ }+ if (ke->key() == Qt::Key_Escape) {+ hide_dropdown();+ return true;+ }+ }+ if (event->type() == QEvent::FocusOut) {+ // Delay hide so click on dropdown item registers first+ QTimer::singleShot(150, this, [this]() { hide_dropdown(); });+ }+ }+ return QDialog::eventFilter(obj, event);+}++void MarketPanelEditor::on_search_text_changed(const QString& text) {+ const QString q = text.trimmed();+ if (q.isEmpty()) {+ hide_dropdown();+ return;+ }+ pending_query_ = q;+ search_debounce_->start();+}++void MarketPanelEditor::fire_search(const QString& query) {+ if (query.isEmpty()) return;++ const QString url = QString("/market/search?q=%1&limit=%2").arg(query).arg(kMaxResults);++ QPointer<MarketPanelEditor> self = this;+ HttpClient::instance().get(url, [self, query](Result<QJsonDocument> result) {+ if (!self) return;+ if (self->pending_query_ != query) return; // stale response+ if (!result.is_ok()) return;++ const auto doc = result.value();+ QJsonArray arr;+ if (doc.isArray()) {+ arr = doc.array();+ } else if (doc.isObject()) {+ const auto obj = doc.object();+ if (obj.contains("results")) arr = obj["results"].toArray();+ else if (obj.contains("data")) arr = obj["data"].toArray();+ }+ self->on_search_results(arr);+ });+}++void MarketPanelEditor::on_search_results(const QJsonArray& results) {+ dropdown_->clear();++ for (const auto& v : results) {+ const auto obj = v.toObject();+ const QString sym = obj["symbol"].toString();+ const QString name = obj["name"].toString();+ if (sym.isEmpty()) continue;++ const QString display = name.isEmpty() ? sym : QString("%1 · %2").arg(sym, name);+ auto* item = new QListWidgetItem(display);+ item->setData(Qt::UserRole, sym); // store raw symbol for adding+ dropdown_->addItem(item);+ }++ if (dropdown_->count() > 0) {+ reposition_dropdown();+ dropdown_->show();+ dropdown_->raise();+ } else {+ hide_dropdown();+ }+}++void MarketPanelEditor::refresh_ticker_list() {+ ticker_list_->clear();+ for (const auto& s : config_.symbols) {+ auto* item = new QListWidgetItem(s);+ item->setForeground(QColor(ui::colors::TEXT_PRIMARY()));+ ticker_list_->addItem(item);+ }+}++void MarketPanelEditor::on_add_symbol(const QString& symbol) {+ const QString sym = symbol.trimmed().toUpper();+ if (sym.isEmpty() || config_.symbols.contains(sym)) return;+ config_.symbols << sym;+ refresh_ticker_list();+ search_edit_->clear();+ hide_dropdown();+ search_edit_->setFocus();+}++void MarketPanelEditor::on_remove_selected() {+ auto* item = ticker_list_->currentItem();+ if (!item) return;+ config_.symbols.removeAll(item->text());+ refresh_ticker_list();+}++MarketPanelConfig MarketPanelEditor::result_config() const {+ return config_;+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/markets/MarketPanelEditor.h b/fincept-qt/src/screens/markets/MarketPanelEditor.hnew file mode 100644index 000000000..85e851198--- /dev/null+++ b/fincept-qt/src/screens/markets/MarketPanelEditor.h@@ -0,0 +1,50 @@+#pragma once+#include "screens/markets/MarketPanelConfig.h"++#include <QDialog>+#include <QJsonArray>+#include <QLineEdit>+#include <QListWidget>+#include <QString>+#include <QTimer>++namespace fincept::screens {++/// Modal dialog for creating or editing a market panel.+/// Symbol search uses the same /market/search API as the command bar.+class MarketPanelEditor : public QDialog {+ Q_OBJECT+ public:+ explicit MarketPanelEditor(const MarketPanelConfig& config, QWidget* parent = nullptr);++ MarketPanelConfig result_config() const;++ protected:+ bool eventFilter(QObject* obj, QEvent* event) override;+ void resizeEvent(QResizeEvent* event) override;+ void moveEvent(QMoveEvent* event) override;++ private slots:+ void on_search_text_changed(const QString& text);+ void on_add_symbol(const QString& symbol);+ void on_remove_selected();++ private:+ void build_ui();+ void fire_search(const QString& query);+ void on_search_results(const QJsonArray& results);+ void refresh_ticker_list();+ void reposition_dropdown();+ void hide_dropdown();++ MarketPanelConfig config_;++ QLineEdit* title_edit_ = nullptr;+ QLineEdit* search_edit_ = nullptr;+ QListWidget* ticker_list_ = nullptr;+ QListWidget* dropdown_ = nullptr;+ QTimer* search_debounce_ = nullptr;+ QString pending_query_;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/markets/MarketPanelStore.cpp b/fincept-qt/src/screens/markets/MarketPanelStore.cppnew file mode 100644index 000000000..7b7581f6e--- /dev/null+++ b/fincept-qt/src/screens/markets/MarketPanelStore.cpp@@ -0,0 +1,81 @@+#include "screens/markets/MarketPanelStore.h"++#include "services/markets/MarketDataService.h"+#include "storage/repositories/SettingsRepository.h"++#include <QJsonArray>+#include <QJsonDocument>+#include <QJsonObject>++namespace fincept::screens {++MarketPanelStore& MarketPanelStore::instance() {+ static MarketPanelStore inst;+ return inst;+}++QVector<MarketPanelConfig> MarketPanelStore::load() {+ auto result = SettingsRepository::instance().get(kSettingsKey);+ if (!result.is_ok() || result.value().isEmpty())+ return build_defaults();++ auto doc = QJsonDocument::fromJson(result.value().toUtf8());+ if (!doc.isArray())+ return build_defaults();++ QVector<MarketPanelConfig> panels;+ for (const auto& v : doc.array()) {+ QJsonObject obj = v.toObject();+ MarketPanelConfig cfg;+ cfg.id = obj["id"].toString();+ cfg.title = obj["title"].toString();+ cfg.show_name = obj["show_name"].toBool(false);+ for (const auto& s : obj["symbols"].toArray())+ cfg.symbols << s.toString();+ if (!cfg.id.isEmpty() && !cfg.title.isEmpty())+ panels.append(cfg);+ }+ return panels.isEmpty() ? build_defaults() : panels;+}++void MarketPanelStore::save(const QVector<MarketPanelConfig>& panels) {+ QJsonArray arr;+ for (const auto& cfg : panels) {+ QJsonObject obj;+ obj["id"] = cfg.id;+ obj["title"] = cfg.title;+ obj["show_name"] = cfg.show_name;+ QJsonArray syms;+ for (const auto& s : cfg.symbols)+ syms.append(s);+ obj["symbols"] = syms;+ arr.append(obj);+ }+ SettingsRepository::instance().set(kSettingsKey,+ QString::fromUtf8(QJsonDocument(arr).toJson(QJsonDocument::Compact)),+ kCategory);+}++void MarketPanelStore::reset_to_defaults() {+ save(build_defaults());+}++QVector<MarketPanelConfig> MarketPanelStore::build_defaults() {+ QVector<MarketPanelConfig> panels;++ // Global markets+ for (const auto& cat : services::MarketDataService::default_global_markets())+ panels.append(MarketPanelConfig::make(cat.category, cat.tickers, false));++ // Regional markets — flatten TickerDef → symbol strings+ for (const auto& reg : services::MarketDataService::default_regional_markets()) {+ QStringList syms;+ for (const auto& t : reg.tickers)+ syms << t.symbol;+ panels.append(MarketPanelConfig::make(reg.region, syms, true));+ }++ return panels;+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/markets/MarketPanelStore.h b/fincept-qt/src/screens/markets/MarketPanelStore.hnew file mode 100644index 000000000..26a309922--- /dev/null+++ b/fincept-qt/src/screens/markets/MarketPanelStore.h@@ -0,0 +1,31 @@+#pragma once+#include "screens/markets/MarketPanelConfig.h"++#include <QVector>++namespace fincept::screens {++/// Persists user-configured market panels via SettingsRepository.+/// Falls back to the 9 built-in defaults on first run.+class MarketPanelStore {+ public:+ static MarketPanelStore& instance();++ /// Load all panels (from DB or defaults).+ QVector<MarketPanelConfig> load();++ /// Persist the full panel list.+ void save(const QVector<MarketPanelConfig>& panels);++ /// Reset to factory defaults and persist.+ void reset_to_defaults();++ private:+ MarketPanelStore() = default;+ static QVector<MarketPanelConfig> build_defaults();++ static constexpr const char* kSettingsKey = "markets_panel_configs";+ static constexpr const char* kCategory = "markets_panels";+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/markets/MarketsScreen.cpp b/fincept-qt/src/screens/markets/MarketsScreen.cppindex af344e6f0..fabcaab0e 100644--- a/fincept-qt/src/screens/markets/MarketsScreen.cpp+++ b/fincept-qt/src/screens/markets/MarketsScreen.cpp@@ -1,16 +1,20 @@#include "screens/markets/MarketsScreen.h"+#include "screens/markets/MarketPanelEditor.h"+#include "screens/markets/MarketPanelStore.h"#include "services/markets/MarketDataService.h"#include "ui/theme/Theme.h"#include "ui/theme/ThemeManager.h"#include <QComboBox>#include <QDateTime>+#include <QLineEdit>#include <QFrame>#include <QGridLayout>#include <QHBoxLayout>#include <QHideEvent>#include <QLabel>+#include <QMessageBox>#include <QPushButton>#include <QScrollArea>#include <QShowEvent>@@ -27,7 +31,7 @@ MarketsScreen::MarketsScreen(QWidget* parent) : QWidget(parent) {root->setContentsMargins(0, 0, 0, 0);root->setSpacing(0);- header_widget_ = build_header();+ header_widget_ = build_header();controls_widget_ = build_controls();root->addWidget(header_widget_);root->addWidget(controls_widget_);@@ -40,72 +44,24 @@ MarketsScreen::MarketsScreen(QWidget* parent) : QWidget(parent) {"QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical{height:0;}").arg(ui::colors::BG_BASE(), ui::colors::BORDER_MED()));- auto* content = new QWidget(this);- auto* cvl = new QVBoxLayout(content);+ grid_content_ = new QWidget;+ auto* cvl = new QVBoxLayout(grid_content_);cvl->setContentsMargins(6, 6, 6, 6);- cvl->setSpacing(2);-- auto make_section_hdr = [&](const QString& title, const QString& count_text) {- auto* row = new QWidget(this);- row->setFixedHeight(28);- row->setStyleSheet("background:transparent;");- auto* hl = new QHBoxLayout(row);- hl->setContentsMargins(0, 4, 0, 0);- hl->setSpacing(10);- auto* lbl = new QLabel(title);- lbl->setStyleSheet(lbl_ss(ui::colors::AMBER(), true) + "letter-spacing:1.5px;");- hl->addWidget(lbl);- auto* cnt = new QLabel(count_text);- cnt->setStyleSheet(lbl_ss(ui::colors::TEXT_DIM()));- hl->addWidget(cnt);- hl->addStretch();- return row;- };-- auto make_sep = [&]() {- auto* s = new QFrame;- s->setFixedHeight(1);- s->setStyleSheet(QString("background:%1;border:none;").arg(ui::colors::BORDER_DIM()));- return s;- };+ cvl->setSpacing(8);- int g_count = services::MarketDataService::default_global_markets().size();- cvl->addWidget(make_section_hdr("GLOBAL MARKETS", QString("· %1 instruments").arg(g_count)));- cvl->addWidget(make_sep());-- auto* gg = new QGridLayout;- gg->setSpacing(6);- gg->setContentsMargins(0, 6, 0, 4);- auto globals = services::MarketDataService::default_global_markets();- for (int i = 0; i < globals.size(); i++) {- auto* p = new MarketPanel(globals[i].category, globals[i].tickers, false);- global_panels_.append(p);- gg->addWidget(p, i / 3, i % 3);- }- cvl->addLayout(gg);-- int r_count = services::MarketDataService::default_regional_markets().size();- cvl->addWidget(make_section_hdr("REGIONAL MARKETS", QString("· %1 regions").arg(r_count)));- cvl->addWidget(make_sep());-- auto* rg = new QGridLayout;- rg->setSpacing(4);- rg->setContentsMargins(0, 4, 0, 4);- auto regionals = services::MarketDataService::default_regional_markets();- for (int i = 0; i < regionals.size(); i++) {- QStringList syms;- for (const auto& t : regionals[i].tickers)- syms << t.symbol;- auto* p = new MarketPanel(regionals[i].region, syms, true);- regional_panels_.append(p);- rg->addWidget(p, 0, i);- }- cvl->addLayout(rg);+ panel_grid_ = new QGridLayout;+ panel_grid_->setSpacing(6);+ panel_grid_->setContentsMargins(0, 0, 0, 0);+ cvl->addLayout(panel_grid_);cvl->addStretch();- scroll->setWidget(content);+ scroll->setWidget(grid_content_);root->addWidget(scroll, 1);+ // Load configs and build initial grid+ configs_ = MarketPanelStore::instance().load();+ build_panel_grid();+auto_refresh_timer_ = new QTimer(this);auto_refresh_timer_->setInterval(update_interval_ms_);connect(auto_refresh_timer_, &QTimer::timeout, this, &MarketsScreen::refresh_all);@@ -115,21 +71,95 @@ MarketsScreen::MarketsScreen(QWidget* parent) : QWidget(parent) {refresh_theme();}-void MarketsScreen::refresh_theme() {- setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));- if (header_widget_)- header_widget_->setStyleSheet(QString("background:%1;border-bottom:1px solid %2;")- .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));- if (controls_widget_)- controls_widget_->setStyleSheet(QString("background:%1;border-bottom:1px solid %2;")- .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));+// ---------------------------------------------------------------------------+// Panel grid management+// ---------------------------------------------------------------------------++void MarketsScreen::clear_panel_grid() {+ for (auto* p : panels_)+ p->deleteLater();+ panels_.clear();++ // Remove all items from the grid layout+ QLayoutItem* item;+ while ((item = panel_grid_->takeAt(0)) != nullptr) {+ delete item;+ }}+void MarketsScreen::build_panel_grid() {+ clear_panel_grid();++ constexpr int kCols = 3;+ for (int i = 0; i < configs_.size(); ++i) {+ auto* p = new MarketPanel(configs_[i], grid_content_);+ panels_.append(p);+ panel_grid_->addWidget(p, i / kCols, i % kCols);++ connect(p, &MarketPanel::edit_requested, this, &MarketsScreen::open_editor);+ connect(p, &MarketPanel::delete_requested, this, &MarketsScreen::on_panel_delete);+ }+}++void MarketsScreen::open_editor(const QString& panel_id) {+ MarketPanelConfig cfg;+ if (!panel_id.isEmpty()) {+ for (const auto& c : configs_) {+ if (c.id == panel_id) { cfg = c; break; }+ }+ }++ auto* dlg = new MarketPanelEditor(cfg, this);+ if (dlg->exec() != QDialog::Accepted) {+ dlg->deleteLater();+ return;+ }+ const MarketPanelConfig updated = dlg->result_config();+ dlg->deleteLater();++ if (panel_id.isEmpty()) {+ // New panel+ configs_.append(updated);+ } else {+ for (auto& c : configs_) {+ if (c.id == panel_id) { c = updated; break; }+ }+ }++ MarketPanelStore::instance().save(configs_);+ build_panel_grid();+ refresh_all();+}++void MarketsScreen::on_panel_delete(const QString& panel_id) {+ QMessageBox mb(this);+ mb.setWindowTitle("Remove Panel");+ mb.setText("Remove this panel?");+ mb.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);+ mb.setDefaultButton(QMessageBox::Cancel);+ mb.setStyleSheet(QString("background:%1;color:%2;").arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY()));+ if (mb.exec() != QMessageBox::Yes)+ return;++ configs_.erase(std::remove_if(configs_.begin(), configs_.end(),+ [&](const MarketPanelConfig& c) { return c.id == panel_id; }),+ configs_.end());+ MarketPanelStore::instance().save(configs_);+ build_panel_grid();+}++// ---------------------------------------------------------------------------+// Show / hide — timer lifecycle (P3)+// ---------------------------------------------------------------------------+void MarketsScreen::showEvent(QShowEvent* event) {QWidget::showEvent(event);if (auto_update_ && auto_refresh_timer_)auto_refresh_timer_->start();- // Only refresh if no data yet or data is stale (> 5 min old)+ if (session_timer_)+ session_timer_->start();+ if (clock_timer_)+ clock_timer_->start();bool needs_refresh = !last_refresh_time_.isValid() ||last_refresh_time_.secsTo(QDateTime::currentDateTime()) >= kMinRefreshIntervalSec;if (needs_refresh)@@ -138,10 +168,15 @@ void MarketsScreen::showEvent(QShowEvent* event) {void MarketsScreen::hideEvent(QHideEvent* event) {QWidget::hideEvent(event);- if (auto_refresh_timer_)- auto_refresh_timer_->stop();+ if (auto_refresh_timer_) auto_refresh_timer_->stop();+ if (session_timer_) session_timer_->stop();+ if (clock_timer_) clock_timer_->stop();}+// ---------------------------------------------------------------------------+// Header+// ---------------------------------------------------------------------------+QWidget* MarketsScreen::build_header() {auto* w = new QWidget(this);w->setFixedHeight(40);@@ -172,41 +207,36 @@ QWidget* MarketsScreen::build_header() {auto update_session = [session_dot, session_lbl]() {QDateTime utc = QDateTime::currentDateTimeUtc();- int day = utc.date().dayOfWeek();+ int day = utc.date().dayOfWeek();QDateTime et = utc.addSecs(-4 * 3600);int hhmm = et.time().hour() * 100 + et.time().minute();bool weekday = (day >= 1 && day <= 5);QString label, color;if (!weekday || hhmm < 400 || hhmm >= 2000) {- label = "NYSE CLOSED";- color = ui::colors::TEXT_TERTIARY();+ label = "NYSE CLOSED"; color = ui::colors::TEXT_TERTIARY();} else if (hhmm < 930) {- label = "NYSE PRE-MKT";- color = ui::colors::AMBER();+ label = "NYSE PRE-MKT"; color = ui::colors::AMBER();} else if (hhmm < 1600) {- label = "NYSE OPEN";- color = ui::colors::POSITIVE();+ label = "NYSE OPEN"; color = ui::colors::POSITIVE();} else {- label = "NYSE AFTER-HRS";- color = ui::colors::INFO();+ label = "NYSE AFTER-HRS"; color = ui::colors::INFO();}session_dot->setStyleSheet(lbl_ss(color));session_lbl->setStyleSheet(lbl_ss(color, true));session_lbl->setText(label);};update_session();- auto* session_timer = new QTimer(w);- session_timer->setInterval(60000);- connect(session_timer, &QTimer::timeout, w, update_session);- session_timer->start();+ session_timer_ = new QTimer(this);+ session_timer_->setInterval(60000);+ connect(session_timer_, &QTimer::timeout, this, update_session);h->addStretch();- auto* ny_lbl = new QLabel;- ny_lbl->setStyleSheet(lbl_ss(ui::colors::TEXT_SECONDARY()));+ auto* ny_lbl = new QLabel;auto* lon_lbl = new QLabel;- lon_lbl->setStyleSheet(lbl_ss(ui::colors::TEXT_SECONDARY()));auto* tok_lbl = new QLabel;+ ny_lbl ->setStyleSheet(lbl_ss(ui::colors::TEXT_SECONDARY()));+ lon_lbl->setStyleSheet(lbl_ss(ui::colors::TEXT_SECONDARY()));tok_lbl->setStyleSheet(lbl_ss(ui::colors::TEXT_SECONDARY()));auto update_clocks = [ny_lbl, lon_lbl, tok_lbl]() {@@ -214,19 +244,18 @@ QWidget* MarketsScreen::build_header() {auto fmt = [](const QDateTime& dt, const QString& name) {return QString("%1 %2").arg(name, dt.toString("HH:mm"));};- ny_lbl->setText(fmt(utc.addSecs(-4 * 3600), "NY"));- lon_lbl->setText(fmt(utc.addSecs(1 * 3600), "LON"));- tok_lbl->setText(fmt(utc.addSecs(9 * 3600), "TOK"));+ ny_lbl ->setText(fmt(utc.addSecs(-4 * 3600), "NY"));+ lon_lbl->setText(fmt(utc.addSecs( 1 * 3600), "LON"));+ tok_lbl->setText(fmt(utc.addSecs( 9 * 3600), "TOK"));};update_clocks();- auto* clock_timer = new QTimer(w);- clock_timer->setInterval(1000);- connect(clock_timer, &QTimer::timeout, w, update_clocks);- clock_timer->start();+ clock_timer_ = new QTimer(this);+ clock_timer_->setInterval(1000);+ connect(clock_timer_, &QTimer::timeout, this, update_clocks);auto* dot1 = new QLabel(" · ");- dot1->setStyleSheet(lbl_ss(ui::colors::BORDER_MED()));auto* dot2 = new QLabel(" · ");+ dot1->setStyleSheet(lbl_ss(ui::colors::BORDER_MED()));dot2->setStyleSheet(lbl_ss(ui::colors::BORDER_MED()));h->addWidget(ny_lbl);h->addWidget(dot1);@@ -237,6 +266,10 @@ QWidget* MarketsScreen::build_header() {return w;}+// ---------------------------------------------------------------------------+// Controls bar+// ---------------------------------------------------------------------------+QWidget* MarketsScreen::build_controls() {auto* w = new QWidget(this);w->setFixedHeight(32);@@ -266,38 +299,124 @@ QWidget* MarketsScreen::build_controls() {auto_btn->setStyleSheet(QString("QPushButton{background:%1;color:%2;border:1px solid %3;padding:0 8px;font-weight:bold;}""QPushButton:hover{background:%4;border-color:%5;color:%5;}")- .arg(ui::colors::BG_RAISED(), auto_update_ ? ui::colors::POSITIVE() : ui::colors::TEXT_TERTIARY(),- auto_update_ ? ui::colors::POSITIVE() : ui::colors::BORDER_DIM(), ui::colors::BG_HOVER(),- ui::colors::AMBER()));+ .arg(ui::colors::BG_RAISED(),+ auto_update_ ? ui::colors::POSITIVE() : ui::colors::TEXT_TERTIARY(),+ auto_update_ ? ui::colors::POSITIVE() : ui::colors::BORDER_DIM(),+ ui::colors::BG_HOVER(), ui::colors::AMBER()));};update_auto_style();connect(auto_btn, &QPushButton::clicked, this, [this, update_auto_style]() {auto_update_ = !auto_update_;update_auto_style();- if (auto_update_)- auto_refresh_timer_->start();- else- auto_refresh_timer_->stop();+ // Only touch the timer if the screen is currently visible (P3)+ if (!isVisible()) return;+ if (auto_update_) auto_refresh_timer_->start();+ else auto_refresh_timer_->stop();});h->addWidget(auto_btn);+ // Interval preset combo (non-editable, fixed presets)auto* iv = new QComboBox;iv->setFixedHeight(22);- iv->addItem("10m", 600000);- iv->addItem("15m", 900000);- iv->addItem("30m", 1800000);- iv->addItem("1h", 3600000);+ iv->setFixedWidth(60);+ iv->addItem("5m", 300000);+ iv->addItem("10m", 600000);+ iv->addItem("15m", 900000);+ iv->addItem("30m", 1800000);+ iv->addItem("1h", 3600000);+ iv->addItem("4h", 14400000);+ iv->addItem("1d", 86400000);+ iv->addItem("custom", -1);+ iv->setCurrentIndex(1); // default 10miv->setStyleSheet(QString("QComboBox{background:%1;color:%2;border:1px solid %3;padding:0 6px;}""QComboBox::drop-down{border:none;width:14px;}""QComboBox QAbstractItemView{background:%1;color:%2;border:1px solid %3;""selection-background-color:%4;}")- .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_SECONDARY(), ui::colors::BORDER_MED(),- ui::colors::BG_HOVER()));- connect(iv, &QComboBox::currentIndexChanged, this, [this, iv](int i) {- update_interval_ms_ = iv->itemData(i).toInt();- auto_refresh_timer_->setInterval(update_interval_ms_);+ .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_SECONDARY(),+ ui::colors::BORDER_MED(), ui::colors::BG_HOVER()));++ // Custom interval input — shown only when "custom" is selected+ auto* custom_iv = new QLineEdit;+ custom_iv->setFixedHeight(22);+ custom_iv->setFixedWidth(60);+ custom_iv->setPlaceholderText("e.g. 45m");+ custom_iv->setVisible(false);+ custom_iv->setStyleSheet(+ QString("QLineEdit{background:%1;color:%2;border:1px solid %3;padding:0 6px;}"+ "QLineEdit:focus{border-color:%4;}")+ .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_SECONDARY(),+ ui::colors::BORDER_MED(), ui::colors::AMBER()));++ auto apply_custom = [this, custom_iv]() {+ QString txt = custom_iv->text().trimmed().toLower();+ if (txt.isEmpty()) return;+ bool ok = false; int ms = 0;+ if (txt.endsWith('h')) {+ int hh = txt.chopped(1).toInt(&ok);+ if (ok) ms = hh * 3600000;+ } else {+ QString num = txt.endsWith('m') ? txt.chopped(1) : txt;+ int m = num.toInt(&ok);+ if (ok) ms = m * 60000;+ }+ ms = qBound(60000, ms, 86400000);+ if (ms > 0) {+ update_interval_ms_ = ms;+ auto_refresh_timer_->setInterval(ms);+ }+ };++ connect(iv, &QComboBox::currentIndexChanged, this, [this, iv, custom_iv](int i) {+ int ms = iv->itemData(i).toInt();+ if (ms == -1) {+ custom_iv->setVisible(true);+ custom_iv->setFocus();+ } else {+ custom_iv->setVisible(false);+ update_interval_ms_ = ms;+ auto_refresh_timer_->setInterval(ms);+ }});+ connect(custom_iv, &QLineEdit::editingFinished, this, [apply_custom]() { apply_custom(); });+h->addWidget(iv);+ h->addWidget(custom_iv);++ // Add panel button+ auto* add_btn = new QPushButton("[+] ADD PANEL");+ add_btn->setFixedHeight(22);+ add_btn->setCursor(Qt::PointingHandCursor);+ add_btn->setStyleSheet(+ QString("QPushButton{background:%1;color:%2;border:1px solid %3;padding:0 8px;font-weight:bold;}"+ "QPushButton:hover{background:%4;color:%5;border-color:%5;}")+ .arg(ui::colors::BG_RAISED(), ui::colors::POSITIVE(), ui::colors::POSITIVE(),+ ui::colors::BG_HOVER(), ui::colors::AMBER()));+ connect(add_btn, &QPushButton::clicked, this, [this]() { open_editor({}); });+ h->addWidget(add_btn);++ // Reset to defaults button+ auto* reset_btn = new QPushButton("RESET");+ reset_btn->setFixedHeight(22);+ reset_btn->setCursor(Qt::PointingHandCursor);+ reset_btn->setStyleSheet(+ QString("QPushButton{background:%1;color:%2;border:1px solid %3;padding:0 8px;font-weight:bold;}"+ "QPushButton:hover{background:%4;color:%5;border-color:%5;}")+ .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_TERTIARY(), ui::colors::BORDER_DIM(),+ ui::colors::BG_HOVER(), ui::colors::AMBER()));+ connect(reset_btn, &QPushButton::clicked, this, [this]() {+ QMessageBox mb(this);+ mb.setWindowTitle("Reset Panels");+ mb.setText("Reset all panels to defaults?");+ mb.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);+ mb.setStyleSheet(QString("background:%1;color:%2;").arg(ui::colors::BG_BASE(), ui::colors::TEXT_PRIMARY()));+ if (mb.exec() != QMessageBox::Yes) return;+ MarketPanelStore::instance().reset_to_defaults();+ configs_ = MarketPanelStore::instance().load();+ build_panel_grid();+ refresh_all();+ });+ h->addWidget(reset_btn);+h->addStretch();last_update_label_ = new QLabel("LAST UPDATE --:--:--");@@ -313,6 +432,10 @@ QWidget* MarketsScreen::build_controls() {return w;}+// ---------------------------------------------------------------------------+// Refresh+// ---------------------------------------------------------------------------+void MarketsScreen::refresh_all() {if (refresh_in_progress_)return;@@ -323,24 +446,22 @@ void MarketsScreen::refresh_all() {status_label_->setStyleSheet(lbl_ss(ui::colors::AMBER(), true));}- for (auto* p : global_panels_)- p->refresh();- for (auto* p : regional_panels_)+ for (auto* p : panels_)p->refresh();- const int total = global_panels_.size() + regional_panels_.size();+ const int total = panels_.size();if (total == 0) {refresh_in_progress_ = false;return;}- auto* counter = new QObject(this);+ auto* counter = new QObject(this);auto* remaining = new int(total);auto finish = [this, counter, remaining]() {if (--(*remaining) > 0)return;refresh_in_progress_ = false;- last_refresh_time_ = QDateTime::currentDateTime();+ last_refresh_time_ = QDateTime::currentDateTime();delete remaining;counter->deleteLater();if (status_label_) {@@ -353,10 +474,22 @@ void MarketsScreen::refresh_all() {last_update_label_->setStyleSheet(lbl_ss(ui::colors::TEXT_SECONDARY()));}};- for (auto* p : global_panels_)- connect(p, &MarketPanel::refresh_finished, counter, finish, Qt::SingleShotConnection);- for (auto* p : regional_panels_)+ for (auto* p : panels_)connect(p, &MarketPanel::refresh_finished, counter, finish, Qt::SingleShotConnection);}+// ---------------------------------------------------------------------------+// Theme+// ---------------------------------------------------------------------------++void MarketsScreen::refresh_theme() {+ setStyleSheet(QString("background:%1;").arg(ui::colors::BG_BASE()));+ if (header_widget_)+ header_widget_->setStyleSheet(QString("background:%1;border-bottom:1px solid %2;")+ .arg(ui::colors::BG_RAISED(), ui::colors::BORDER_DIM()));+ if (controls_widget_)+ controls_widget_->setStyleSheet(QString("background:%1;border-bottom:1px solid %2;")+ .arg(ui::colors::BG_SURFACE(), ui::colors::BORDER_DIM()));+}+} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/markets/MarketsScreen.h b/fincept-qt/src/screens/markets/MarketsScreen.hindex 224100980..2a65e568b 100644--- a/fincept-qt/src/screens/markets/MarketsScreen.h+++ b/fincept-qt/src/screens/markets/MarketsScreen.h@@ -1,7 +1,9 @@#pragma once#include "screens/markets/MarketPanel.h"+#include "screens/markets/MarketPanelConfig.h"#include <QDateTime>+#include <QGridLayout>#include <QHideEvent>#include <QLabel>#include <QShowEvent>@@ -12,7 +14,7 @@namespace fincept::screens {/// Markets terminal — global + regional market panels with auto-refresh.-/// Mirrors Tauri's MarketsTab layout.+/// Panels are user-configurable: add, edit, delete, reorder.class MarketsScreen : public QWidget {Q_OBJECTpublic:@@ -23,25 +25,38 @@ class MarketsScreen : public QWidget {void hideEvent(QHideEvent* event) override;private:- QVector<MarketPanel*> global_panels_;- QVector<MarketPanel*> regional_panels_;- QTimer* auto_refresh_timer_ = nullptr;- QLabel* status_label_ = nullptr;- bool refresh_in_progress_ = false;- bool auto_update_ = true;- int update_interval_ms_ = 600000; // 10 min default- QDateTime last_refresh_time_;- static constexpr int kMinRefreshIntervalSec = 300; // 5 min+ void build_panel_grid();+ void clear_panel_grid();+ void open_editor(const QString& panel_id); // empty id = new panel+ void on_panel_delete(const QString& panel_id);QWidget* build_header();QWidget* build_controls();void refresh_all();void refresh_theme();- QWidget* header_widget_ = nullptr;- QWidget* controls_widget_ = nullptr;+ QVector<MarketPanelConfig> configs_;+ QVector<MarketPanel*> panels_;++ QGridLayout* panel_grid_ = nullptr;+ QWidget* grid_content_ = nullptr;++ QTimer* auto_refresh_timer_ = nullptr;+ QTimer* session_timer_ = nullptr;+ QTimer* clock_timer_ = nullptr;+ QLabel* status_label_ = nullptr;QLabel* last_update_label_ = nullptr;++ bool refresh_in_progress_ = false;+ bool auto_update_ = true;+ int update_interval_ms_ = 600000;+ QDateTime last_refresh_time_;++ QWidget* header_widget_ = nullptr;+ QWidget* controls_widget_ = nullptr;++ static constexpr int kMinRefreshIntervalSec = 300;};} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/news/NewsScreen.cpp b/fincept-qt/src/screens/news/NewsScreen.cppindex b13582b78..797d75814 100644--- a/fincept-qt/src/screens/news/NewsScreen.cpp+++ b/fincept-qt/src/screens/news/NewsScreen.cpp@@ -1,5 +1,6 @@#include "screens/news/NewsScreen.h"+#include "core/keys/KeyConfigManager.h"#include "core/logging/Logger.h"#include "core/session/ScreenStateManager.h"#include "screens/news/NewsCommandBar.h"@@ -216,15 +217,20 @@ void NewsScreen::connect_signals() {apply_filters_async();});- // Keyboard shortcuts- auto* shortcut_j = new QShortcut(QKeySequence("J"), this);- connect(shortcut_j, &QShortcut::activated, this, [this]() { feed_panel_->select_next(); });+ // Keyboard shortcuts via KeyConfigManager+ auto& km = KeyConfigManager::instance();- auto* shortcut_k = new QShortcut(QKeySequence("K"), this);- connect(shortcut_k, &QShortcut::activated, this, [this]() { feed_panel_->select_previous(); });+ auto* act_next = km.action(KeyAction::NewsNext);+ act_next->setParent(this);+ connect(act_next, &QAction::triggered, this, [this]() { feed_panel_->select_next(); });- auto* shortcut_enter = new QShortcut(QKeySequence(Qt::Key_Return), this);- connect(shortcut_enter, &QShortcut::activated, this, [this]() {+ auto* act_prev = km.action(KeyAction::NewsPrev);+ act_prev->setParent(this);+ connect(act_prev, &QAction::triggered, this, [this]() { feed_panel_->select_previous(); });++ auto* act_open = km.action(KeyAction::NewsOpen);+ act_open->setParent(this);+ connect(act_open, &QAction::triggered, this, [this]() {auto idx = feed_panel_->list_view()->currentIndex();if (idx.isValid()) {auto article = feed_panel_->model()->article_at(idx.row());@@ -233,9 +239,9 @@ void NewsScreen::connect_signals() {}});- // Escape closes detail panel- auto* shortcut_esc = new QShortcut(QKeySequence(Qt::Key_Escape), this);- connect(shortcut_esc, &QShortcut::activated, this, [this]() {+ auto* act_close = km.action(KeyAction::NewsClose);+ act_close->setParent(this);+ connect(act_close, &QAction::triggered, this, [this]() {if (detail_panel_->is_panel_open())detail_panel_->close_panel();else if (side_panel_->is_drawer_open())diff --git a/fincept-qt/src/screens/relationship_map/RelationshipGraphScene.cpp b/fincept-qt/src/screens/relationship_map/RelationshipGraphScene.cppindex 035d63b01..ce4b1ef8d 100644--- a/fincept-qt/src/screens/relationship_map/RelationshipGraphScene.cpp+++ b/fincept-qt/src/screens/relationship_map/RelationshipGraphScene.cpp@@ -1,448 +1,667 @@// src/screens/relationship_map/RelationshipGraphScene.cpp+// Banded left/right tree layout — zero trig, zero collisions.+// Right side: Peers, Holders, Funds, Analysts+// Left side: Board, Insiders, Metrics, Events, Supply+// Each cluster owns an exclusive vertical band. No angle math.#include "screens/relationship_map/RelationshipGraphScene.h"#include "ui/theme/Theme.h"#include <QFont>-#include <QGraphicsEllipseItem>#include <QGraphicsPathItem>-#include <QGraphicsRectItem>#include <QGraphicsSceneMouseEvent>-#include <QGraphicsTextItem>+#include <QMouseEvent>+#include <QPainter>#include <QPainterPath>#include <QPen>+#include <QScrollBar>+#include <QStyleOptionGraphicsItem>#include <QWheelEvent>#include <QtMath>+#include <cmath>+namespace fincept::relmap {-// ── Node sizes by category ───────────────────────────────────────────────────--static QSizeF node_size(NodeCategory cat) {- switch (cat) {- case NodeCategory::Company:- return {220, 120};- case NodeCategory::Peer:- return {160, 80};- case NodeCategory::Institutional:- return {150, 60};- case NodeCategory::FundFamily:- return {170, 80};- case NodeCategory::Insider:- return {150, 65};- case NodeCategory::Event:- return {150, 55};- case NodeCategory::SupplyChain:- return {160, 65};- case NodeCategory::Metrics:- return {160, 80};+// ── Layout constants ──────────────────────────────────────────────────────────+static constexpr qreal kCenterW = 220.0;+static constexpr qreal kCenterH = 110.0;+static constexpr qreal kHubW = 158.0;+static constexpr qreal kHubH = 34.0;+static constexpr qreal kLeafW = 162.0;+static constexpr qreal kLeafH = 46.0;+static constexpr qreal kLeafGap = 8.0; // gap between leaves in same cluster+static constexpr qreal kClusterGap = 28.0; // gap between clusters on same side+// Fixed horizontal positions — no trig+static constexpr qreal kHubX_R = 310.0; // hub center X, right side+static constexpr qreal kLeafX_R = 500.0; // leaf center X, right side+static constexpr qreal kHubX_L = -310.0; // hub center X, left side+static constexpr qreal kLeafX_L = -500.0; // leaf center X, left side+// Kept for ABI compat with header declarations+static constexpr qreal kHubRadius = 310.0;+static constexpr qreal kLeafRadius = 500.0;+static constexpr qreal kClusterArcGap = 0.0;+static constexpr qreal kLeafColumnOffset = 20.0;++// ── Forward declarations ──────────────────────────────────────────────────────+class RelNode;+class RelEdge;++// ── Edge item ─────────────────────────────────────────────────────────────────+class RelEdge : public QGraphicsItem {+ public:+ RelEdge(RelNode* source, RelNode* dest, const QColor& color, bool thin = false)+ : source_(source), dest_(dest), color_(color), thin_(thin) {+ setZValue(-1);+ setAcceptedMouseButtons(Qt::NoButton);}- return {150, 60};-}--// ── Custom node graphics item ────────────────────────────────────────────────+ RelNode* source() const { return source_; }+ RelNode* dest() const { return dest_; }+ void adjust();+ QRectF boundingRect() const override;+ void paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*) override;+ private:+ RelNode* source_;+ RelNode* dest_;+ QColor color_;+ bool thin_;+ QPointF source_pt_;+ QPointF dest_pt_;+};-class GraphNodeItem : public QGraphicsRectItem {+// ── Node item ─────────────────────────────────────────────────────────────────+class RelNode : public QGraphicsItem {public:- GraphNodeItem(const GraphNode& data, QGraphicsItem* parent = nullptr)- : QGraphicsRectItem(parent), node_data_(data) {- auto sz = node_size(data.category);- setRect(-sz.width() / 2, -sz.height() / 2, sz.width(), sz.height());-- auto col = category_color(data.category);- auto bg = category_bg(data.category);-- setPen(QPen(col, data.category == NodeCategory::Company ? 2.0 : 1.0));- setBrush(QBrush(bg));-- setFlag(QGraphicsItem::ItemIsSelectable, true);- setCursor(Qt::PointingHandCursor);- setAcceptHoverEvents(true);-- QFont mono("Consolas", 9);- QFont mono_bold("Consolas", 9, QFont::Bold);- QFont mono_small("Consolas", 7);-- // Category badge- auto* badge = new QGraphicsTextItem(this);- badge->setPlainText(category_label(data.category));- badge->setFont(mono_small);- badge->setDefaultTextColor(col);- badge->setPos(-sz.width() / 2 + 8, -sz.height() / 2 + 4);-- // Label (main text)- 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(ui::colors::TEXT_PRIMARY()));- label->setPos(-sz.width() / 2 + 8, -sz.height() / 2 + 18);-- // Sublabel- if (!data.sublabel.isEmpty()) {- auto* sub = new QGraphicsTextItem(this);- sub->setPlainText(data.sublabel);- sub->setFont(mono_small);- sub->setDefaultTextColor(QColor(ui::colors::TEXT_SECONDARY()));- sub->setPos(-sz.width() / 2 + 8, -sz.height() / 2 + 38);- }+ enum class Role { Center, Hub, Leaf };++ RelNode(RelationshipGraphScene* graph, const QString& label, const QString& sub,+ const QColor& accent, qreal w, qreal h, Role role)+ : graph_(graph), label_(label), sub_(sub), accent_(accent)+ , w_(w), h_(h), role_(role) {+ setFlag(QGraphicsItem::ItemIsMovable, role != Role::Center);+ setFlag(QGraphicsItem::ItemSendsGeometryChanges);+ setCacheMode(QGraphicsItem::DeviceCoordinateCache);+ setZValue(role == Role::Center ? 5 : (role == Role::Hub ? 3 : 1));+ if (role == Role::Center) setCursor(Qt::PointingHandCursor);+ else setCursor(Qt::OpenHandCursor);+ }- // Key metric in bottom-right- if (data.value != 0) {- auto* val = new QGraphicsTextItem(this);- QString formatted;- double v = data.value;- if (v >= 1e12)- formatted = QString("$%1T").arg(v / 1e12, 0, 'f', 1);- else if (v >= 1e9)- formatted = QString("$%1B").arg(v / 1e9, 0, 'f', 1);- else if (v >= 1e6)- formatted = QString("$%1M").arg(v / 1e6, 0, 'f', 1);- else if (v > 100)- formatted = QString("$%1").arg(v, 0, 'f', 0);- else if (v > 0 && v <= 100)- formatted = QString("%1%").arg(v, 0, 'f', 1);- else- formatted = QString::number(v, 'f', 2);-- val->setPlainText(formatted);- val->setFont(mono_bold);- val->setDefaultTextColor(col);- val->setPos(sz.width() / 2 - 70, sz.height() / 2 - 20);- }+ void add_edge(RelEdge* edge) { edges_.append(edge); }+ Role role() const { return role_; }++ QRectF boundingRect() const override {+ return QRectF(-w_ / 2 - 2, -h_ / 2 - 2, w_ + 4, h_ + 4);+ }++ QPainterPath shape() const override {+ QPainterPath path;+ path.addRect(-w_ / 2, -h_ / 2, w_, h_);+ return path;}- const GraphNode& node_data() const { return node_data_; }+ void paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*) override {+ painter->setRenderHint(QPainter::Antialiasing);+ painter->setRenderHint(QPainter::TextAntialiasing);++ QRectF r(-w_ / 2, -h_ / 2, w_, h_);++ if (role_ == Role::Center) {+ // Outer glow+ QColor glow = accent_; glow.setAlpha(30);+ painter->setPen(QPen(glow, 6.0));+ painter->setBrush(Qt::NoBrush);+ painter->drawRect(r.adjusted(-3, -3, 3, 3));++ // Background gradient+ QLinearGradient bg(r.topLeft(), r.bottomLeft());+ bg.setColorAt(0.0, QColor(28, 16, 4, 252));+ bg.setColorAt(1.0, QColor(14, 8, 2, 252));+ painter->setPen(Qt::NoPen);+ painter->setBrush(QBrush(bg));+ painter->drawRect(r);++ // Top stripe+ QColor stripe = accent_; stripe.setAlpha(220);+ painter->setBrush(QBrush(stripe));+ painter->drawRect(QRectF(r.left(), r.top(), r.width(), 3));++ // Border+ painter->setPen(QPen(accent_, 1.5));+ painter->setBrush(Qt::NoBrush);+ painter->drawRect(r);++ // Divider+ qreal divY = r.top() + h_ * 0.42;+ QColor div_col = accent_; div_col.setAlpha(50);+ painter->setPen(QPen(div_col, 1.0));+ painter->drawLine(QPointF(r.left() + 10, divY), QPointF(r.right() - 10, divY));++ // Ticker+ QFont tf("Consolas", 15, QFont::Bold);+ painter->setFont(tf);+ painter->setPen(accent_);+ painter->drawText(QRectF(r.left()+12, r.top()+8, r.width()-24, h_*0.38),+ Qt::AlignLeft | Qt::AlignVCenter, label_);++ // Sub lines+ if (!sub_.isEmpty()) {+ QStringList lines = sub_.split('\n');+ QFont sf("Consolas", 8);+ painter->setFont(sf);+ qreal line_h = (h_ * 0.54) / qMax(lines.size(), 1);+ for (int i = 0; i < lines.size(); ++i) {+ QColor col = (i == 0) ? QColor(220,220,220,230) : QColor(160,160,160,190);+ painter->setPen(col);+ painter->drawText(QRectF(r.left()+12, divY+5+i*line_h, r.width()-24, line_h),+ Qt::AlignLeft | Qt::AlignVCenter, lines[i]);+ }+ }++ } else if (role_ == Role::Hub) {+ // Gradient background+ QLinearGradient bg(r.topLeft(), r.bottomLeft());+ QColor c1 = accent_.darker(130); c1.setAlpha(240);+ QColor c2 = accent_.darker(110); c2.setAlpha(240);+ bg.setColorAt(0.0, c1);+ bg.setColorAt(1.0, c2);+ painter->setPen(Qt::NoPen);+ painter->setBrush(QBrush(bg));+ painter->drawRect(r);++ // Shimmer line+ QColor shimmer = accent_.lighter(180); shimmer.setAlpha(70);+ painter->setPen(QPen(shimmer, 1.0));+ painter->drawLine(QPointF(r.left(), r.top()+1), QPointF(r.right(), r.top()+1));++ // Border+ QColor border = accent_.lighter(140); border.setAlpha(160);+ painter->setPen(QPen(border, 1.0));+ painter->setBrush(Qt::NoBrush);+ painter->drawRect(r);++ // Label+ QFont lf("Consolas", 9, QFont::Bold);+ painter->setFont(lf);+ painter->setPen(QColor(255, 255, 255, 235));+ painter->drawText(r.adjusted(8, 0, -8, 0), Qt::AlignCenter, label_);++ } else {+ // Dark gradient background+ QLinearGradient bg(r.topLeft(), r.bottomLeft());+ bg.setColorAt(0.0, QColor(32, 32, 40, 235));+ bg.setColorAt(1.0, QColor(20, 20, 26, 235));+ painter->setPen(Qt::NoPen);+ painter->setBrush(QBrush(bg));+ painter->drawRect(r);++ // Left accent bar+ QColor bar = accent_; bar.setAlpha(255);+ painter->setBrush(QBrush(bar));+ painter->drawRect(QRectF(r.left(), r.top(), 3, r.height()));++ // Top tint+ QLinearGradient tint_g(r.topLeft(), QPointF(r.left(), r.top()+12));+ QColor tint = accent_; tint.setAlpha(25);+ tint_g.setColorAt(0.0, tint);+ tint_g.setColorAt(1.0, Qt::transparent);+ painter->setBrush(QBrush(tint_g));+ painter->drawRect(r);++ // Border+ QColor border = accent_; border.setAlpha(70);+ painter->setPen(QPen(border, 1.0));+ painter->setBrush(Qt::NoBrush);+ painter->drawRect(r);++ // Divider+ if (!sub_.isEmpty()) {+ qreal divY = r.top() + r.height() * 0.52;+ painter->setPen(QPen(QColor(255,255,255,12), 1.0));+ painter->drawLine(QPointF(r.left()+10, divY), QPointF(r.right()-4, divY));+ }++ // Label+ QFont lf("Consolas", 8, QFont::Bold);+ painter->setFont(lf);+ painter->setPen(QColor(238, 238, 238, 245));+ QRectF top_r(r.left()+10, r.top()+4, r.width()-16,+ sub_.isEmpty() ? r.height()-8 : r.height()*0.48);+ painter->drawText(top_r, Qt::AlignLeft | Qt::AlignVCenter, label_);++ // Sub label+ if (!sub_.isEmpty()) {+ QFont sf("Consolas", 7);+ painter->setFont(sf);+ QColor sub_col = accent_.lighter(160); sub_col.setAlpha(180);+ painter->setPen(sub_col);+ QRectF bot_r(r.left()+10, r.top()+r.height()*0.52, r.width()-16, r.height()*0.44);+ painter->drawText(bot_r, Qt::AlignLeft | Qt::AlignVCenter, sub_);+ }+ }+ }protected:- void hoverEnterEvent(QGraphicsSceneHoverEvent*) override {- auto col = category_color(node_data_.category);- setPen(QPen(col, 2.5));- setZValue(10);+ QVariant itemChange(GraphicsItemChange change, const QVariant& value) override {+ if (change == ItemPositionHasChanged)+ for (RelEdge* e : std::as_const(edges_)) e->adjust();+ return QGraphicsItem::itemChange(change, value);+ }+ void mousePressEvent(QGraphicsSceneMouseEvent* event) override {+ if (role_ == Role::Center && event->button() == Qt::LeftButton) {+ auto* rms = qobject_cast<RelationshipGraphScene*>(scene());+ if (rms) emit rms->center_card_clicked(label_.split(" ").first());+ }update();+ QGraphicsItem::mousePressEvent(event);}-- void hoverLeaveEvent(QGraphicsSceneHoverEvent*) override {- auto col = category_color(node_data_.category);- setPen(QPen(col, node_data_.category == NodeCategory::Company ? 2.0 : 1.0));- setZValue(0);+ void mouseReleaseEvent(QGraphicsSceneMouseEvent* event) override {update();+ QGraphicsItem::mouseReleaseEvent(event);}-private:- GraphNode node_data_;+ RelationshipGraphScene* graph_;+ QVector<RelEdge*> edges_;+ QString label_, sub_;+ QColor accent_;+ qreal w_, h_;+ Role role_;};-// ── Scene ────────────────────────────────────────────────────────────────────+// ── Edge implementation ───────────────────────────────────────────────────────+void RelEdge::adjust() {+ if (!source_ || !dest_) return;+ QLineF line(mapFromItem(source_, 0, 0), mapFromItem(dest_, 0, 0));+ prepareGeometryChange();+ source_pt_ = line.p1();+ dest_pt_ = line.p2();+}-RelationshipGraphScene::RelationshipGraphScene(QObject* parent) : QGraphicsScene(parent) {+QRectF RelEdge::boundingRect() const {+ qreal extra = 4.0;+ return QRectF(source_pt_, QSizeF(dest_pt_.x()-source_pt_.x(),+ dest_pt_.y()-source_pt_.y()))+ .normalized().adjusted(-extra,-extra,extra,extra);+}++void RelEdge::paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*) {+ if (!source_ || !dest_) return;+ QLineF line(source_pt_, dest_pt_);+ if (qFuzzyCompare(line.length(), qreal(0.))) return;++ painter->setRenderHint(QPainter::Antialiasing);++ QLinearGradient grad(source_pt_, dest_pt_);+ QColor c_near = color_; c_near.setAlpha(thin_ ? 90 : 140);+ QColor c_far = color_; c_far.setAlpha(thin_ ? 30 : 55);+ grad.setColorAt(0.0, c_near);+ grad.setColorAt(1.0, c_far);++ QPen pen;+ pen.setBrush(QBrush(grad));+ pen.setWidthF(thin_ ? 1.0 : 1.8);+ pen.setCapStyle(Qt::RoundCap);+ painter->setPen(pen);+ painter->drawLine(source_pt_, dest_pt_);+}++// ── Scene ─────────────────────────────────────────────────────────────────────+RelationshipGraphScene::RelationshipGraphScene(QObject* parent)+ : QGraphicsScene(parent) {setBackgroundBrush(QBrush(QColor(ui::colors::BG_BASE())));+ setSceneRect(-1400, -1100, 2800, 2200);}void RelationshipGraphScene::clear_graph() {+ if (sim_timer_) sim_timer_->stop();clear();node_positions_.clear();+ nodes_.clear();+ timer_ticks_ = 0;}-void RelationshipGraphScene::build_graph(const RelationshipData& data, const FilterState& filters, LayoutMode layout) {+// ── build_graph ───────────────────────────────────────────────────────────────+//+// Banded left/right layout — pure rectangle arithmetic, guaranteed no collisions:+//+// RIGHT side (Peers, Holders, Funds, Analysts):+// Hub center X = kHubX_R, Leaf center X = kLeafX_R+//+// LEFT side (Board, Insiders, Metrics, Events, Supply):+// Hub center X = kHubX_L, Leaf center X = kLeafX_L+//+// Each cluster owns an exclusive vertical band:+// band_height = max(kHubH, n_leaves*(kLeafH+kLeafGap)-kLeafGap)+// Clusters stack top-to-bottom with kClusterGap between them.+// Hub and leaf column are both vertically centered inside their band.+// Center node sits at Y=0 (visual midpoint).++void RelationshipGraphScene::build_graph(+ const RelationshipData& data, const FilterState& filters, LayoutMode /*layout*/)+{clear_graph();- QVector<GraphNode> nodes;- QVector<GraphEdge> edges;- const QString company_id = "company-" + data.company.ticker;-- // 1. Company node (always)- {- GraphNode n;- n.id = company_id;- n.category = NodeCategory::Company;- n.label = data.company.ticker;- n.sublabel = data.company.name;- n.value = data.company.market_cap;- n.properties["Sector"] = data.company.sector;- n.properties["Industry"] = data.company.industry;- n.properties["Price"] = QString("$%1").arg(data.company.current_price, 0, 'f', 2);- n.properties["Mkt Cap"] = QString("$%1B").arg(data.company.market_cap / 1e9, 0, 'f', 1);- n.properties["P/E"] = QString::number(data.company.pe_ratio, 'f', 1);- n.properties["Signal"] = data.valuation.action;- nodes.append(n);- }-- // 2. Peers- if (filters.show_peers) {+ const QColor cAmber("#d97706");+ const QColor cPeer ("#2563eb");+ const QColor cInst ("#16a34a");+ const QColor cMF ("#059669");+ const QColor cIns ("#0891b2");+ const QColor cOff ("#0e7490");+ const QColor cAnal ("#7c3aed");+ const QColor cEvt ("#b45309");+ const QColor cSC ("#ca8a04");+ const QColor cMet ("#6b7280");++ // ── Center node ──────────────────────────────────────────────────────────+ bool up = data.company.day_change_pct >= 0;+ QString center_sub = QString("%1\n$%2 %3%4%\nMktCap $%5B")+ .arg(data.company.name.left(24))+ .arg(data.company.current_price, 0, 'f', 2)+ .arg(up ? "+" : "")+ .arg(data.company.day_change_pct, 0, 'f', 2)+ .arg(data.company.market_cap / 1e9, 0, 'f', 0);++ auto* center_node = new RelNode(this, data.company.ticker, center_sub,+ cAmber, kCenterW, kCenterH, RelNode::Role::Center);+ center_node->setPos(0, 0);+ addItem(center_node);+ nodes_.append(center_node);++ // ── Cluster data ─────────────────────────────────────────────────────────+ struct LeafInfo { QString label, sub; QColor accent; };+ struct ClusterDef {+ QString label;+ QColor color;+ QVector<LeafInfo> leaves;+ bool right; // true = right side+ };++ QVector<ClusterDef> right_side, left_side;++ auto push_right = [&](const QString& lbl, const QColor& col, QVector<LeafInfo>&& lv) {+ if (!lv.isEmpty()) right_side.push_back({lbl, col, std::move(lv), true});+ };+ auto push_left = [&](const QString& lbl, const QColor& col, QVector<LeafInfo>&& lv) {+ if (!lv.isEmpty()) left_side.push_back({lbl, col, std::move(lv), false});+ };++ // PEERS → right+ if (filters.show_peers && !data.peers.isEmpty()) {+ QVector<LeafInfo> lv;for (const auto& p : data.peers) {- QString pid = "peer-" + p.ticker;- GraphNode n;- n.id = pid;- n.category = NodeCategory::Peer;- n.label = p.ticker;- n.sublabel = p.name;- n.value = p.market_cap;- n.properties["Price"] = QString("$%1").arg(p.current_price, 0, 'f', 2);- n.properties["P/E"] = QString::number(p.pe_ratio, 'f', 1);- n.properties["ROE"] = QString("%1%").arg(p.roe * 100, 0, 'f', 1);- nodes.append(n);- edges.append({company_id, pid, EdgeCategory::Peer, "peer"});+ if (lv.size() >= 12) break;+ QColor acc = (p.week52_change >= 0) ? cPeer : QColor("#dc2626");+ lv.append({p.ticker, QString("$%1").arg(p.current_price, 0, 'f', 2), acc});}+ push_right(QString("Peers (%1/%2)").arg(lv.size()).arg(data.peers.size()),+ cPeer, std::move(lv));}- // 3. Institutional holders- if (filters.show_institutional) {+ // INSTITUTIONAL → right+ if (filters.show_institutional && !data.institutional_holders.isEmpty()) {+ QVector<LeafInfo> lv;for (const auto& h : data.institutional_holders) {- if (h.percentage < filters.min_ownership)- continue;- QString hid = "inst-" + h.name.left(20).replace(' ', '-');- GraphNode n;- n.id = hid;- n.category = NodeCategory::Institutional;- n.label = h.name.left(25);- n.sublabel = QString("%1%").arg(h.percentage, 0, 'f', 2);- n.value = h.percentage;- n.properties["Shares"] = QString::number(h.shares, 'f', 0);- n.properties["Value"] = QString("$%1M").arg(h.value / 1e6, 0, 'f', 1);- nodes.append(n);- edges.append({hid, company_id, EdgeCategory::Ownership, QString("%1%").arg(h.percentage, 0, 'f', 1),- h.percentage / 10.0});+ if (lv.size() >= 8) break;+ if (h.percentage < filters.min_ownership) continue;+ lv.append({h.name.left(14), QString("%1%").arg(h.percentage, 0, 'f', 2), cInst});}+ push_right(QString("Holders (%1/%2)").arg(lv.size()).arg(data.institutional_holders.size()),+ cInst, std::move(lv));}- // 4. Insiders- if (filters.show_insiders) {- for (const auto& ins : data.insider_holders) {- QString iid = "insider-" + ins.name.left(20).replace(' ', '-');- GraphNode n;- n.id = iid;- n.category = NodeCategory::Insider;- n.label = ins.name.left(25);- n.sublabel = ins.title.left(30);- n.properties["Title"] = ins.title;- if (!ins.last_transaction.isEmpty())- n.properties["Last Tx"] = ins.last_transaction.toUpper();- nodes.append(n);- edges.append({iid, company_id, EdgeCategory::Internal, ""});+ // MUTUAL FUNDS → right+ if (filters.show_institutional && !data.mutualfund_holders.isEmpty()) {+ QVector<LeafInfo> lv;+ for (const auto& h : data.mutualfund_holders) {+ if (lv.size() >= 8) break;+ lv.append({h.name.left(14), QString("%1%").arg(h.percentage, 0, 'f', 2), cMF});}+ push_right(QString("Funds (%1/%2)").arg(lv.size()).arg(data.mutualfund_holders.size()),+ cMF, std::move(lv));}- // 5. Metrics clusters- if (filters.show_metrics) {- // Financials- if (data.company.revenue > 0) {- GraphNode n;- n.id = "metrics-financials";- n.category = NodeCategory::Metrics;- n.label = "FINANCIALS";- n.properties["Revenue"] = QString("$%1B").arg(data.company.revenue / 1e9, 0, 'f', 1);- n.properties["EBITDA"] = QString("$%1B").arg(data.company.ebitda / 1e9, 0, 'f', 1);- n.properties["FCF"] = QString("$%1B").arg(data.company.free_cashflow / 1e9, 0, 'f', 1);- n.properties["Margins"] = QString("%1%").arg(data.company.profit_margins * 100, 0, 'f', 1);- nodes.append(n);- edges.append({company_id, "metrics-financials", EdgeCategory::Internal, ""});- }-- // Balance sheet- if (data.company.total_cash > 0 || data.company.total_debt > 0) {- GraphNode n;- n.id = "metrics-balance";- n.category = NodeCategory::Metrics;- n.label = "BALANCE SHEET";- n.properties["Cash"] = QString("$%1B").arg(data.company.total_cash / 1e9, 0, 'f', 1);- n.properties["Debt"] = QString("$%1B").arg(data.company.total_debt / 1e9, 0, 'f', 1);- double net = data.company.total_cash - data.company.total_debt;- n.properties["Net"] = QString("$%1B").arg(net / 1e9, 0, 'f', 1);- nodes.append(n);- edges.append({company_id, "metrics-balance", EdgeCategory::Internal, ""});+ // ANALYSTS → right+ if (filters.show_analysts) {+ QVector<LeafInfo> lv;+ if (data.company.analyst_count > 0) {+ QString rec = data.company.recommendation.toUpper();+ bool bull = rec.contains("BUY") || rec.contains("OUTPERFORM");+ lv.append({rec, QString("PT $%1").arg(data.company.target_mean, 0, 'f', 0),+ bull ? QColor("#16a34a") : QColor("#dc2626")});}-- // Valuation- if (data.company.pe_ratio > 0) {- GraphNode n;- n.id = "metrics-valuation";- n.category = NodeCategory::Metrics;- n.label = "VALUATION";- n.properties["P/E"] = QString::number(data.company.pe_ratio, 'f', 1);- n.properties["Fwd P/E"] = QString::number(data.company.forward_pe, 'f', 1);- n.properties["P/B"] = QString::number(data.company.price_to_book, 'f', 2);- n.properties["Signal"] = data.valuation.status;- nodes.append(n);- edges.append({company_id, "metrics-valuation", EdgeCategory::Internal, ""});+ for (const auto& ud : data.upgrades_downgrades) {+ if (lv.size() >= 8) break;+ QColor acc = (ud.action == "up") ? QColor("#16a34a")+ : (ud.action == "down") ? QColor("#dc2626") : cAnal;+ lv.append({ud.firm.left(14), ud.to_grade.left(12), acc});}+ push_right(QString("Analysts (%1)").arg(data.company.analyst_count),+ cAnal, std::move(lv));}- // Apply layout- apply_layout(nodes, edges, layout);-- // Add edge items first (under nodes)- for (const auto& edge : edges) {- if (node_positions_.contains(edge.source_id) && node_positions_.contains(edge.target_id)) {- add_edge_item(node_positions_[edge.source_id], node_positions_[edge.target_id], edge.category, edge.label);+ // BOARD → left+ if (filters.show_officers && !data.officers.isEmpty()) {+ QVector<LeafInfo> lv;+ for (const auto& off : data.officers) {+ if (lv.size() >= 10) break;+ lv.append({off.name.left(14), off.title.left(14), cOff});}+ push_left(QString("Board (%1/%2)").arg(lv.size()).arg(data.officers.size()),+ cOff, std::move(lv));}- // Add node items- for (const auto& node : nodes) {- if (node_positions_.contains(node.id)) {- add_node_item(node, node_positions_[node.id]);+ // INSIDERS → left+ if (filters.show_insiders && !data.insider_holders.isEmpty()) {+ QVector<LeafInfo> lv;+ for (const auto& ins : data.insider_holders) {+ if (lv.size() >= 8) break;+ bool buy = ins.last_transaction.toLower() == "buy";+ QString sub = ins.last_transaction.isEmpty() ? ins.title.left(12)+ : ins.last_transaction.toUpper();+ lv.append({ins.name.left(14), sub, buy ? QColor("#16a34a") : cIns});}+ push_left(QString("Insiders (%1/%2)").arg(lv.size()).arg(data.insider_holders.size()),+ cIns, std::move(lv));}- // Set scene rect with padding- QRectF bounds = itemsBoundingRect();- setSceneRect(bounds.adjusted(-100, -100, 100, 100));-}--// ── Layout ───────────────────────────────────────────────────────────────────--void RelationshipGraphScene::apply_layout(QVector<GraphNode>& nodes, const QVector<GraphEdge>&, LayoutMode mode) {- node_positions_.clear();- QPointF center(0, 0);-- // Group indices by category- QVector<int> company_idx, peer_idx, inst_idx, insider_idx, metrics_idx, event_idx, sc_idx;- for (int i = 0; i < nodes.size(); ++i) {- switch (nodes[i].category) {- case NodeCategory::Company:- company_idx.append(i);- break;- case NodeCategory::Peer:- peer_idx.append(i);- break;- case NodeCategory::Institutional:- inst_idx.append(i);- break;- case NodeCategory::Insider:- insider_idx.append(i);- break;- case NodeCategory::Metrics:- metrics_idx.append(i);- break;- case NodeCategory::Event:- event_idx.append(i);- break;- case NodeCategory::SupplyChain:- sc_idx.append(i);- break;- case NodeCategory::FundFamily:- inst_idx.append(i);- break; // group with institutional- }+ // METRICS → left+ if (filters.show_metrics) {+ QVector<LeafInfo> lv;+ if (data.company.pe_ratio > 0)+ lv.append({"P/E", QString("%1 fwd %2")+ .arg(data.company.pe_ratio, 0, 'f', 1)+ .arg(data.company.forward_pe, 0, 'f', 1), cMet});+ if (data.margins.gross > 0)+ lv.append({"Margins", QString("Gr %1% Net %2%")+ .arg(data.margins.gross * 100, 0, 'f', 1)+ .arg(data.margins.net * 100, 0, 'f', 1), cMet});+ if (data.technicals.beta > 0)+ lv.append({"Beta", QString("%1 52W $%2")+ .arg(data.technicals.beta, 0, 'f', 2)+ .arg(data.technicals.fifty_two_week_high, 0, 'f', 0), cMet});+ if (data.short_interest.short_pct_float > 0)+ lv.append({"Short Int", QString("%1% %2d cvr")+ .arg(data.short_interest.short_pct_float * 100, 0, 'f', 1)+ .arg(data.short_interest.short_ratio, 0, 'f', 1),+ data.short_interest.short_pct_float > 0.05 ? QColor("#dc2626") : cMet});+ if (data.governance.overall_risk > 0)+ lv.append({"Governance", QString("Risk %1/10 Audit %2")+ .arg(data.governance.overall_risk).arg(data.governance.audit_risk),+ data.governance.overall_risk > 6 ? QColor("#dc2626") : cMet});+ push_left("Metrics", cMet, std::move(lv));}- QVector<QPointF> positions(nodes.size());-- // Company at center- for (int i : company_idx)- positions[i] = center;-- if (mode == LayoutMode::Layered || mode == LayoutMode::Radial) {- // Concentric rings- place_in_ring(metrics_idx, positions, 280, -M_PI / 4, center);- place_in_ring(insider_idx, positions, 380, 0, center);- place_in_ring(inst_idx, positions, 550, M_PI / 6, center);- place_in_ring(peer_idx, positions, 720, 0, center);- place_in_ring(event_idx, positions, 850, M_PI / 4, center);- place_in_ring(sc_idx, positions, 650, -M_PI / 3, center);- } else {- // Force-like: spread randomly then iterate- double spread = 200.0;- for (int i = 0; i < nodes.size(); ++i) {- if (nodes[i].category == NodeCategory::Company)- continue;- double angle = (double)i / nodes.size() * 2 * M_PI;- double r = spread + (i % 3) * 150;- positions[i] = QPointF(r * qCos(angle), r * qSin(angle));+ // EVENTS → left+ if (filters.show_events && !data.events.isEmpty()) {+ QVector<LeafInfo> lv;+ for (const auto& ev : data.events) {+ if (lv.size() >= 6) break;+ lv.append({ev.description.left(14), ev.date.left(10), cEvt});}+ push_left(QString("Events (%1/%2)").arg(lv.size()).arg(data.events.size()),+ cEvt, std::move(lv));}- for (int i = 0; i < nodes.size(); ++i) {- node_positions_[nodes[i].id] = positions[i];+ // SUPPLY CHAIN → left+ if (filters.show_supply_chain && !data.supply_chain.isEmpty()) {+ QVector<LeafInfo> lv;+ for (const auto& sc : data.supply_chain) {+ if (lv.size() >= 6) break;+ lv.append({sc.name.left(14), sc.relationship.left(10), cSC});+ }+ push_left(QString("Supply (%1)").arg(lv.size()), cSC, std::move(lv));}-}-void RelationshipGraphScene::place_in_ring(const QVector<int>& indices, QVector<QPointF>& positions, double radius,- double start_angle, const QPointF& center) {- if (indices.isEmpty())- return;- double step = 2 * M_PI / std::max((int)indices.size(), 1);- // Limit arc to avoid overlapping with other rings- double arc = std::min(2 * M_PI, step * indices.size());- double actual_step = arc / std::max((int)indices.size(), 1);-- for (int i = 0; i < indices.size(); ++i) {- double angle = start_angle + i * actual_step;- double x = center.x() + radius * qCos(angle);- double y = center.y() + radius * qSin(angle);- positions[indices[i]] = QPointF(x, y);- }-}+ // ── Banded placement ──────────────────────────────────────────────────────+ // band_height: the vertical space this cluster needs (hub + leaves, whichever taller)+ auto band_h = [&](const ClusterDef& c) -> qreal {+ int n = c.leaves.size();+ qreal col_h = n * kLeafH + (n - 1) * kLeafGap;+ return qMax(col_h, static_cast<qreal>(kHubH)) + kClusterGap;+ };++ // Total height of each side (subtract one trailing gap)+ auto total_h = [&](const QVector<ClusterDef>& side) -> qreal {+ qreal h = 0;+ for (const auto& c : side) h += band_h(c);+ if (!side.isEmpty()) h -= kClusterGap;+ return h;+ };++ // Place one side: hub at hub_cx, leaves at leaf_cx, stacked vertically+ auto place_side = [&](const QVector<ClusterDef>& side, qreal hub_cx, qreal leaf_cx) {+ qreal tot = total_h(side);+ qreal y = -tot / 2.0; // top of first band++ for (const auto& c : side) {+ int n = c.leaves.size();+ qreal bh = band_h(c);+ qreal bcy = y + (bh - kClusterGap) / 2.0; // band vertical center++ // Hub+ auto* hub = new RelNode(this, c.label, QString(), c.color,+ kHubW, kHubH, RelNode::Role::Hub);+ hub->setPos(hub_cx, bcy);+ addItem(hub);+ nodes_.append(hub);++ // Edge: center → hub+ auto* ce = new RelEdge(center_node, hub, c.color, false);+ addItem(ce);+ ce->adjust();+ center_node->add_edge(ce);+ hub->add_edge(ce);++ // Leaves — vertical column centered on bcy+ qreal col_h = n * kLeafH + (n - 1) * kLeafGap;+ qreal ly0 = bcy - col_h / 2.0; // top-left Y of first leaf++ for (int i = 0; i < n; ++i) {+ qreal lcy = ly0 + i * (kLeafH + kLeafGap) + kLeafH / 2.0;+ auto* leaf = new RelNode(this, c.leaves[i].label, c.leaves[i].sub,+ c.leaves[i].accent, kLeafW, kLeafH,+ RelNode::Role::Leaf);+ leaf->setPos(leaf_cx, lcy);+ addItem(leaf);+ nodes_.append(leaf);++ auto* le = new RelEdge(hub, leaf, c.color, true);+ addItem(le);+ le->adjust();+ hub->add_edge(le);+ leaf->add_edge(le);+ }++ y += bh; // advance to next band+ }+ };-// ── Item creation ────────────────────────────────────────────────────────────+ place_side(right_side, kHubX_R, kLeafX_R);+ place_side(left_side, kHubX_L, kLeafX_L);-void RelationshipGraphScene::add_node_item(const GraphNode& node, const QPointF& pos) {- auto* item = new GraphNodeItem(node);- item->setPos(pos);- addItem(item);+ // Fit scene rect tightly around content+ QRectF bounds = itemsBoundingRect().adjusted(-80, -80, 80, 80);+ setSceneRect(bounds);}-void RelationshipGraphScene::add_edge_item(const QPointF& from, const QPointF& to, EdgeCategory cat,- const QString& label) {- QPainterPath path;- path.moveTo(from);-- // Bezier curve for visual appeal- QPointF mid = (from + to) / 2;- double dx = to.x() - from.x();- double dy = to.y() - from.y();- QPointF ctrl1(mid.x() - dy * 0.15, mid.y() + dx * 0.15);-- path.quadTo(ctrl1, to);-- auto* line = new QGraphicsPathItem(path);- QColor col = edge_color(cat);- QPen pen(col, cat == EdgeCategory::Ownership ? 2.0 : 1.0);- if (cat == EdgeCategory::Peer || cat == EdgeCategory::Event) {- pen.setStyle(Qt::DashLine);- }- line->setPen(pen);- line->setZValue(-1);- addItem(line);-- // Edge label- if (!label.isEmpty()) {- auto* text = new QGraphicsTextItem(label);- text->setFont(QFont("Consolas", 7));- text->setDefaultTextColor(col);- text->setPos(mid - QPointF(15, 8));- text->setZValue(-1);- addItem(text);- }-}--// ── Mouse handling ───────────────────────────────────────────────────────────--// Override scene mouse press to detect node clicks vs background-// (handled in the main screen via item selection signals)--// ── View ─────────────────────────────────────────────────────────────────────--RelationshipGraphView::RelationshipGraphView(QGraphicsScene* scene, QWidget* parent) : QGraphicsView(scene, parent) {- setRenderHint(QPainter::Antialiasing);+// ── No-op stubs ───────────────────────────────────────────────────────────────+void RelationshipGraphScene::start_simulation() {}+void RelationshipGraphScene::simulation_step() {}+void RelationshipGraphScene::apply_layout(QVector<GraphNode>&, const QVector<GraphEdge>&, LayoutMode) {}+void RelationshipGraphScene::place_in_ring(const QVector<int>&, QVector<QPointF>&, double, double, const QPointF&) {}+void RelationshipGraphScene::add_node_item(const GraphNode&, const QPointF&) {}+void RelationshipGraphScene::add_edge_item(const QPointF&, const QPointF&, EdgeCategory, const QString&) {}++// ── View ──────────────────────────────────────────────────────────────────────+RelationshipGraphView::RelationshipGraphView(QGraphicsScene* scene, QWidget* parent)+ : QGraphicsView(scene, parent) {+ setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);setDragMode(QGraphicsView::ScrollHandDrag);setTransformationAnchor(QGraphicsView::AnchorUnderMouse);- setViewportUpdateMode(QGraphicsView::SmartViewportUpdate);+ setResizeAnchor(QGraphicsView::AnchorViewCenter);+ setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);setStyleSheet(QString("QGraphicsView { border: none; background: %1; }").arg(ui::colors::BG_BASE));- setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);- setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);+ setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);+ setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);+ horizontalScrollBar()->setStyleSheet(+ "QScrollBar:horizontal { height: 6px; background: #0a0a0a; }"+ "QScrollBar::handle:horizontal { background: #2a2a2a; min-width: 40px; }"+ "QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { width: 0; }");+ verticalScrollBar()->setStyleSheet(+ "QScrollBar:vertical { width: 6px; background: #0a0a0a; }"+ "QScrollBar::handle:vertical { background: #2a2a2a; min-height: 40px; }"+ "QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }");+}++void RelationshipGraphView::fit_to_content() {+ if (!scene() || scene()->items().isEmpty()) return;+ fitInView(scene()->itemsBoundingRect().adjusted(-60,-60,60,60), Qt::KeepAspectRatio);+ current_zoom_ = transform().m11();+}- // Initial zoom to fit- scale(0.6, 0.6);+void RelationshipGraphView::reset_zoom() {+ resetTransform();+ current_zoom_ = 1.0;+ fit_to_content();}void RelationshipGraphView::wheelEvent(QWheelEvent* event) {- double factor = event->angleDelta().y() > 0 ? 1.15 : 1.0 / 1.15;+ double delta = event->pixelDelta().isNull()+ ? event->angleDelta().y() / 120.0+ : event->pixelDelta().y() / 120.0;+ if (qFuzzyIsNull(delta)) { event->ignore(); return; }+ double factor = std::pow(1.10, delta);+ double new_zoom = current_zoom_ * factor;+ if (new_zoom < kMinZoom) factor = kMinZoom / current_zoom_;+ if (new_zoom > kMaxZoom) factor = kMaxZoom / current_zoom_;scale(factor, factor);+ current_zoom_ *= factor;+ event->accept();}void RelationshipGraphView::mousePressEvent(QMouseEvent* event) {- QGraphicsView::mousePressEvent(event);+ if (event->button() == Qt::MiddleButton) {+ setDragMode(QGraphicsView::ScrollHandDrag);+ QMouseEvent fake(event->type(), event->pos(), Qt::LeftButton,+ Qt::LeftButton, event->modifiers());+ QGraphicsView::mousePressEvent(&fake);+ } else {+ QGraphicsView::mousePressEvent(event);+ }+}++void RelationshipGraphView::mouseReleaseEvent(QMouseEvent* event) {+ if (event->button() == Qt::MiddleButton) {+ QMouseEvent fake(event->type(), event->pos(), Qt::LeftButton,+ Qt::LeftButton, event->modifiers());+ QGraphicsView::mouseReleaseEvent(&fake);+ setDragMode(QGraphicsView::ScrollHandDrag);+ } else {+ QGraphicsView::mouseReleaseEvent(event);+ }+}++void RelationshipGraphView::mouseMoveEvent(QMouseEvent* event) {+ QGraphicsView::mouseMoveEvent(event);}} // namespace fincept::relmapdiff --git a/fincept-qt/src/screens/relationship_map/RelationshipGraphScene.h b/fincept-qt/src/screens/relationship_map/RelationshipGraphScene.hindex 5349617ab..af85f5fe9 100644--- a/fincept-qt/src/screens/relationship_map/RelationshipGraphScene.h+++ b/fincept-qt/src/screens/relationship_map/RelationshipGraphScene.h@@ -5,13 +5,15 @@#include <QGraphicsScene>#include <QGraphicsView>+#include <QTimer>namespace fincept::relmap {class GraphNodeItem;+class RelNode;/// Interactive graph scene for relationship map visualization.-/// Custom painted nodes with category colors, bezier edges, radial layout.+/// Force-directed layout with elastic nodes (Bloomberg-style).class RelationshipGraphScene : public QGraphicsScene {Q_OBJECTpublic:@@ -24,10 +26,14 @@ class RelationshipGraphScene : public QGraphicsScene {void clear_graph();signals:- void node_clicked(const GraphNode& node);+ void center_card_clicked(const QString& ticker);void background_clicked();private:+ // kept as no-ops for ABI stability — layout is now pure radial/deterministic+ void start_simulation();+ void simulation_step();+void apply_layout(QVector<GraphNode>& nodes, const QVector<GraphEdge>& edges, LayoutMode mode);void place_in_ring(const QVector<int>& indices, QVector<QPointF>& positions, double radius, double start_angle,const QPointF& center);@@ -35,7 +41,10 @@ class RelationshipGraphScene : public QGraphicsScene {void add_node_item(const GraphNode& node, const QPointF& pos);void add_edge_item(const QPointF& from, const QPointF& to, EdgeCategory cat, const QString& label);- QMap<QString, QPointF> node_positions_; // id → center position+ QMap<QString, QPointF> node_positions_;+ QVector<RelNode*> nodes_;+ QTimer* sim_timer_ = nullptr;+ int timer_ticks_ = 0;};/// Zooming/panning view for the graph.@@ -44,9 +53,22 @@ class RelationshipGraphView : public QGraphicsView {public:explicit RelationshipGraphView(QGraphicsScene* scene, QWidget* parent = nullptr);+ void fit_to_content();+ void reset_zoom();++ signals:+ void zoom_changed(double factor);+protected:void wheelEvent(QWheelEvent* event) override;void mousePressEvent(QMouseEvent* event) override;+ void mouseReleaseEvent(QMouseEvent* event) override;+ void mouseMoveEvent(QMouseEvent* event) override;++ private:+ double current_zoom_{1.0};+ static constexpr double kMinZoom = 0.15;+ static constexpr double kMaxZoom = 4.0;};} // namespace fincept::relmapdiff --git a/fincept-qt/src/screens/relationship_map/RelationshipMapScreen.cpp b/fincept-qt/src/screens/relationship_map/RelationshipMapScreen.cppindex 987bd1abd..03857a239 100644--- a/fincept-qt/src/screens/relationship_map/RelationshipMapScreen.cpp+++ b/fincept-qt/src/screens/relationship_map/RelationshipMapScreen.cpp@@ -1,7 +1,9 @@// src/screens/relationship_map/RelationshipMapScreen.cpp#include "screens/relationship_map/RelationshipMapScreen.h"+#include "core/events/EventBus.h"#include "core/session/ScreenStateManager.h"+#include "network/http/HttpClient.h"#include "screens/relationship_map/RelationshipGraphScene.h"#include "services/relationship_map/RelationshipMapService.h"#include "ui/theme/Theme.h"@@ -9,6 +11,10 @@#include <QCheckBox>#include <QGraphicsItem>#include <QHBoxLayout>+#include <QJsonArray>+#include <QJsonDocument>+#include <QJsonObject>+#include <QPointer>#include <QScrollArea>#include <QShowEvent>#include <QVBoxLayout>@@ -22,6 +28,29 @@ static inline QString MF() {return QStringLiteral("font-family:'Consolas','Courier New',monospace;");}+static constexpr int kSearchDebounceMs = 300;+static constexpr int kMaxSearchResults = 10;++/// Convert exchange + symbol to yfinance-compatible ticker.+static QString to_yfinance_symbol(const QString& symbol, const QString& exchange, const QString& country = {}) {+ if (exchange.toUpper() == "EURONEXT") {+ static const QHash<QString, QString> m = {+ {"FR", ".PA"}, {"NL", ".AS"}, {"BE", ".BR"}, {"PT", ".LS"}, {"IE", ".IR"},+ };+ auto it = m.find(country.toUpper());+ return symbol + (it != m.end() ? it.value() : ".PA");+ }+ static const QHash<QString, QString> s = {+ {"NSE", ".NS"}, {"BSE", ".BO"}, {"HKEX", ".HK"}, {"TSE", ".T"},+ {"KRX", ".KS"}, {"SGX", ".SI"}, {"ASX", ".AX"}, {"IDX", ".JK"},+ {"XETR", ".DE"}, {"FWB", ".F"}, {"LSE", ".L"}, {"BME", ".MC"},+ {"MIL", ".MI"}, {"SIX", ".SW"}, {"VIE", ".VI"}, {"TSX", ".TO"},+ {"TSXV", ".V"}, {"BMFBOVESPA", ".SA"}, {"BMV", ".MX"}, {"BIST", ".IS"},+ };+ auto it = s.find(exchange.toUpper());+ return it != s.end() ? symbol + it.value() : symbol;+}+// ── Constructor ──────────────────────────────────────────────────────────────RelationshipMapScreen::RelationshipMapScreen(QWidget* parent) : QWidget(parent) {@@ -35,10 +64,25 @@ RelationshipMapScreen::RelationshipMapScreen(QWidget* parent) : QWidget(parent)void RelationshipMapScreen::showEvent(QShowEvent* e) {QWidget::showEvent(e);+ hide_dropdown();}void RelationshipMapScreen::hideEvent(QHideEvent* e) {QWidget::hideEvent(e);+ hide_dropdown();+}++bool RelationshipMapScreen::eventFilter(QObject* obj, QEvent* event) {+ if (obj == search_input_) {+ if (event->type() == QEvent::FocusIn) {+ search_input_focused_ = true;+ } else if (event->type() == QEvent::FocusOut) {+ search_input_focused_ = false;+ // Small delay so a click on a dropdown item is registered first.+ QTimer::singleShot(150, this, [this]() { hide_dropdown(); });+ }+ }+ return QWidget::eventFilter(obj, event);}// ── Build UI ─────────────────────────────────────────────────────────────────@@ -66,18 +110,58 @@ void RelationshipMapScreen::build_ui() {.arg(colors::AMBER, MF()));hhl->addWidget(title);- // Search+ // Search with autocompletesearch_input_ = new QLineEdit;- search_input_->setPlaceholderText("Enter ticker (AAPL, MSFT, TSLA...)");- search_input_->setFixedWidth(280);+ search_input_->setPlaceholderText("Search assets (AAPL, Tesla, RELIANCE...)");+ search_input_->setFixedWidth(320);search_input_->setStyleSheet(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));connect(search_input_, &QLineEdit::returnPressed, this, &RelationshipMapScreen::on_search);+ connect(search_input_, &QLineEdit::textChanged, this, &RelationshipMapScreen::on_search_text_changed);+ // Track focus via eventFilter — dropdown only appears when user is actively typing.+ search_input_->installEventFilter(this);hhl->addWidget(search_input_);+ // Autocomplete dropdown — child widget, no window flags that steal focus+ search_dropdown_ = new QListWidget(this);+ search_dropdown_->setFocusPolicy(Qt::NoFocus);+ search_dropdown_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);+ search_dropdown_->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);+ search_dropdown_->setStyleSheet(+ QString("QListWidget { background: %1; border: 1px solid %2; font-size: 11px; %3 }"+ "QListWidget::item { padding: 4px 8px; border-bottom: 1px solid %4; }"+ "QListWidget::item:selected { background: %5; }"+ "QListWidget::item:hover { background: %5; }")+ .arg(colors::BG_SURFACE, colors::AMBER_DIM, MF(), colors::BORDER_DIM, colors::BG_RAISED));+ search_dropdown_->setFixedWidth(420);+ search_dropdown_->setMaximumHeight(320);+ search_dropdown_->hide();+ search_dropdown_->raise();+ auto select_dropdown_item = [this](QListWidgetItem* item) {+ if (!item) return;+ QString symbol = item->data(Qt::UserRole).toString();+ if (symbol.isEmpty()) return;+ search_input_focused_ = false;+ search_input_->blockSignals(true);+ search_input_->setText(symbol);+ search_input_->blockSignals(false);+ hide_dropdown();+ on_search();+ };+ connect(search_dropdown_, &QListWidget::itemClicked, this, select_dropdown_item);+ connect(search_dropdown_, &QListWidget::itemActivated, this, select_dropdown_item);++ // Debounce timer+ search_debounce_ = new QTimer(this);+ search_debounce_->setSingleShot(true);+ connect(search_debounce_, &QTimer::timeout, this, [this]() {+ if (!pending_query_.isEmpty())+ fire_asset_search(pending_query_);+ });+auto* search_btn = new QPushButton("ANALYZE");search_btn->setCursor(Qt::PointingHandCursor);search_btn->setFixedHeight(28);@@ -91,6 +175,21 @@ void RelationshipMapScreen::build_ui() {hhl->addStretch();+ // Fit / reset zoom button+ auto* fit_btn = new QPushButton("FIT");+ fit_btn->setCursor(Qt::PointingHandCursor);+ fit_btn->setFixedHeight(28);+ fit_btn->setToolTip("Fit graph to view (or press Home)");+ fit_btn->setStyleSheet(+ QString("QPushButton { background: transparent; color: %1; border: 1px solid %2; "+ "padding: 0 10px; font-size: 10px; %3 }"+ "QPushButton:hover { color: %4; border-color: %4; }")+ .arg(colors::TEXT_SECONDARY, colors::BORDER_DIM, MF(), colors::TEXT_PRIMARY));+ connect(fit_btn, &QPushButton::clicked, this, [this]() {+ if (view_) view_->fit_to_content();+ });+ hhl->addWidget(fit_btn);+// Layout selectorlayout_combo_ = new QComboBox;layout_combo_->addItem("LAYERED", (int)LayoutMode::Layered);@@ -203,8 +302,12 @@ void RelationshipMapScreen::build_ui() {root->addWidget(status);- // Connect scene selection- connect(scene_, &QGraphicsScene::selectionChanged, this, &RelationshipMapScreen::on_node_selected);+ // Center card click → navigate to equity research+ connect(scene_, &relmap::RelationshipGraphScene::center_card_clicked,+ this, [this](const QString& ticker) {+ fincept::EventBus::instance().publish("equity_research.load_symbol",+ {{"symbol", ticker}, {"type", "equity"}});+ });}// ── Filter Panel ─────────────────────────────────────────────────────────────@@ -241,12 +344,15 @@ QWidget* RelationshipMapScreen::build_filter_panel() {vl->addWidget(cb);};- make_check("Peers", filters_.show_peers, NodeCategory::Peer);- make_check("Institutional", filters_.show_institutional, NodeCategory::Institutional);- make_check("Insiders", filters_.show_insiders, NodeCategory::Insider);- make_check("Events", filters_.show_events, NodeCategory::Event);- make_check("Metrics", filters_.show_metrics, NodeCategory::Metrics);- make_check("Supply Chain", filters_.show_supply_chain, NodeCategory::SupplyChain);+ make_check("Peers", filters_.show_peers, NodeCategory::Peer);+ make_check("Institutional",filters_.show_institutional, NodeCategory::Institutional);+ make_check("Mutual Funds", filters_.show_institutional, NodeCategory::MutualFund);+ make_check("Insiders", filters_.show_insiders, NodeCategory::Insider);+ make_check("Officers", filters_.show_officers, NodeCategory::Officer);+ make_check("Analysts", filters_.show_analysts, NodeCategory::Analyst);+ make_check("Metrics", filters_.show_metrics, NodeCategory::Metrics);+ make_check("Events", filters_.show_events, NodeCategory::Event);+ make_check("Supply Chain", filters_.show_supply_chain, NodeCategory::SupplyChain);vl->addStretch();return panel;@@ -344,7 +450,14 @@ QWidget* RelationshipMapScreen::build_legend() {add_entry(NodeCategory::Company);add_entry(NodeCategory::Peer);add_entry(NodeCategory::Institutional);+ add_entry(NodeCategory::MutualFund);add_entry(NodeCategory::Insider);+ add_entry(NodeCategory::Officer);+ add_entry(NodeCategory::Analyst);+ add_entry(NodeCategory::Governance);+ add_entry(NodeCategory::Technicals);+ add_entry(NodeCategory::ShortInterest);+ add_entry(NodeCategory::Earnings);add_entry(NodeCategory::Metrics);add_entry(NodeCategory::Event);add_entry(NodeCategory::SupplyChain);@@ -355,11 +468,29 @@ QWidget* RelationshipMapScreen::build_legend() {// ── Actions ──────────────────────────────────────────────────────────────────void RelationshipMapScreen::on_search() {+ // If the autocomplete dropdown is open, prefer the selected/first result.+ if (!search_dropdown_->isHidden() && search_dropdown_->count() > 0) {+ QListWidgetItem* chosen = search_dropdown_->currentItem();+ if (!chosen) chosen = search_dropdown_->item(0);+ if (chosen) {+ QString symbol = chosen->data(Qt::UserRole).toString();+ if (!symbol.isEmpty()) {+ search_input_->blockSignals(true);+ search_input_->setText(symbol);+ search_input_->blockSignals(false);+ }+ }+ }+ hide_dropdown();+ search_input_focused_ = false;+QString ticker = search_input_->text().trimmed().toUpper();if (ticker.isEmpty())return;+ search_input_->blockSignals(true);search_input_->setText(ticker);+ search_input_->blockSignals(false);progress_bar_->show();progress_bar_->setValue(0);detail_panel_->hide();@@ -370,6 +501,143 @@ void RelationshipMapScreen::on_search() {ScreenStateManager::instance().notify_changed(this);}+// ── Autocomplete search ─────────────────────────────────────────────────────++void RelationshipMapScreen::on_search_text_changed(const QString& text) {+ // Only show suggestions when the user is actively typing in the focused field.+ // Never show suggestions if the text matches what's already loaded in the graph.+ if (!search_input_focused_) {+ hide_dropdown();+ return;+ }+ QString query = text.trimmed();+ if (query.length() < 2) {+ hide_dropdown();+ return;+ }+ // If the typed text exactly matches the currently loaded ticker, don't re-suggest.+ if (!loaded_ticker_.isEmpty() && query.toUpper() == loaded_ticker_.toUpper()) {+ hide_dropdown();+ return;+ }+ pending_query_ = query;+ search_debounce_->start(kSearchDebounceMs);+}++void RelationshipMapScreen::fire_asset_search(const QString& query) {+ const QString url = QString("/market/search?q=%1&type=stock&limit=%2").arg(query).arg(kMaxSearchResults);++ QPointer<RelationshipMapScreen> self = this;+ fincept::HttpClient::instance().get(url, [self, query](Result<QJsonDocument> result) {+ if (!self) return;+ if (self->pending_query_ != query) return;+ if (!result.is_ok()) return;++ const auto doc = result.value();+ QJsonArray arr;+ if (doc.isArray()) {+ arr = doc.array();+ } else if (doc.isObject()) {+ const auto obj = doc.object();+ if (obj.contains("results")) arr = obj["results"].toArray();+ else if (obj.contains("data")) arr = obj["data"].toArray();+ }+ self->on_asset_results(arr);+ });+}++void RelationshipMapScreen::on_asset_results(const QJsonArray& results) {+ search_dropdown_->clear();++ if (results.isEmpty()) {+ auto* item = new QListWidgetItem(search_dropdown_);+ item->setFlags(item->flags() & ~Qt::ItemIsSelectable);+ auto* row = new QWidget;+ row->setStyleSheet("background:transparent;");+ auto* rl = new QHBoxLayout(row);+ rl->setContentsMargins(8, 4, 8, 4);+ auto* lbl = new QLabel("No results found");+ lbl->setStyleSheet(QString("color:%1;font-size:11px;%2;background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY.get(), MF()));+ rl->addWidget(lbl);+ item->setSizeHint(QSize(0, 28));+ search_dropdown_->setItemWidget(item, row);+ show_dropdown();+ return;+ }++ for (const auto& val : results) {+ auto obj = val.toObject();+ QString symbol = obj["symbol"].toString();+ QString name = obj["name"].toString();+ QString exchange = obj["exchange"].toString();+ QString country = obj["country"].toString();+ QString type = obj["type"].toString("stock");++ if (symbol.isEmpty()) continue;++ QString yf_symbol = to_yfinance_symbol(symbol, exchange, country);++ auto* item = new QListWidgetItem(search_dropdown_);+ item->setData(Qt::UserRole, yf_symbol);++ auto* row = new QWidget;+ row->setStyleSheet("background:transparent;");+ auto* hl = new QHBoxLayout(row);+ hl->setContentsMargins(8, 3, 8, 3);+ hl->setSpacing(8);++ auto* sym_lbl = new QLabel(yf_symbol);+ sym_lbl->setStyleSheet(QString("color:%1;font-size:12px;font-weight:700;%2;background:transparent;")+ .arg(ui::colors::AMBER.get(), MF()));+ sym_lbl->setFixedWidth(100);+ hl->addWidget(sym_lbl);++ auto* name_lbl = new QLabel(name);+ name_lbl->setStyleSheet(QString("color:%1;font-size:11px;%2;background:transparent;")+ .arg(ui::colors::TEXT_SECONDARY.get(), MF()));+ name_lbl->setMaximumWidth(180);+ hl->addWidget(name_lbl, 1);++ if (!exchange.isEmpty()) {+ auto* exch_lbl = new QLabel(exchange);+ exch_lbl->setStyleSheet(QString("color:%1;font-size:9px;%2;background:transparent;")+ .arg(ui::colors::TEXT_TERTIARY.get(), MF()));+ hl->addWidget(exch_lbl);+ }++ auto* type_lbl = new QLabel(type.toUpper());+ type_lbl->setStyleSheet(QString("color:%1;font-size:8px;font-weight:700;%2;"+ "background:%3;padding:1px 4px;border-radius:2px;")+ .arg(ui::colors::AMBER.get(), MF(), ui::colors::BG_RAISED.get()));+ hl->addWidget(type_lbl);++ item->setSizeHint(QSize(0, 30));+ search_dropdown_->setItemWidget(item, row);+ }++ if (search_dropdown_->count() > 0)+ search_dropdown_->setCurrentRow(0);+ show_dropdown();+}++void RelationshipMapScreen::show_dropdown() {+ if (search_dropdown_->count() == 0) { hide_dropdown(); return; }+ // Position below the search input, as a child of this widget+ QPoint pos = search_input_->mapTo(this, QPoint(0, search_input_->height()));+ search_dropdown_->move(pos);+ int h = 0;+ for (int i = 0; i < search_dropdown_->count(); ++i)+ h += search_dropdown_->sizeHintForRow(i);+ search_dropdown_->setFixedHeight(qMin(h + 4, 320));+ search_dropdown_->show();+ search_dropdown_->raise();+}++void RelationshipMapScreen::hide_dropdown() {+ search_dropdown_->hide();+}+void RelationshipMapScreen::on_progress(int percent, const QString& message) {progress_bar_->setValue(percent);progress_label_->setText(message);@@ -382,14 +650,21 @@ void RelationshipMapScreen::on_progress(int percent, const QString& message) {void RelationshipMapScreen::on_data_ready(const RelationshipData& data) {current_data_ = data;has_data_ = true;+ loaded_ticker_ = data.company.ticker;progress_bar_->hide();progress_label_->setText("Complete");legend_widget_->show();rebuild_graph();update_status_bar();- // Fit view to content- view_->fitInView(scene_->sceneRect(), Qt::KeepAspectRatio);+ // Update search field to show the loaded ticker without triggering autocomplete.+ // Block signals so on_search_text_changed doesn't fire.+ search_input_->blockSignals(true);+ search_input_->setText(loaded_ticker_);+ search_input_->blockSignals(false);+ hide_dropdown();++ view_->fit_to_content();}void RelationshipMapScreen::on_fetch_failed(const QString& error) {diff --git a/fincept-qt/src/screens/relationship_map/RelationshipMapScreen.h b/fincept-qt/src/screens/relationship_map/RelationshipMapScreen.hindex 4068c5e27..239e71812 100644--- a/fincept-qt/src/screens/relationship_map/RelationshipMapScreen.h+++ b/fincept-qt/src/screens/relationship_map/RelationshipMapScreen.h@@ -7,8 +7,10 @@#include <QComboBox>#include <QLabel>#include <QLineEdit>+#include <QListWidget>#include <QProgressBar>#include <QPushButton>+#include <QTimer>#include <QWidget>namespace fincept::relmap {@@ -33,10 +35,16 @@ class RelationshipMapScreen : public QWidget, public IStatefulScreen {protected:void showEvent(QShowEvent* event) override;void hideEvent(QHideEvent* event) override;+ bool eventFilter(QObject* obj, QEvent* event) override;private:void build_ui();void on_search();+ void on_search_text_changed(const QString& text);+ void fire_asset_search(const QString& query);+ void on_asset_results(const QJsonArray& results);+ void show_dropdown();+ void hide_dropdown();void on_data_ready(const fincept::relmap::RelationshipData& data);void on_fetch_failed(const QString& error);void on_progress(int percent, const QString& message);@@ -53,6 +61,9 @@ class RelationshipMapScreen : public QWidget, public IStatefulScreen {// HeaderQLineEdit* search_input_ = nullptr;+ QListWidget* search_dropdown_ = nullptr;+ QTimer* search_debounce_ = nullptr;+ QString pending_query_;QComboBox* layout_combo_ = nullptr;QPushButton* filter_btn_ = nullptr;QProgressBar* progress_bar_ = nullptr;@@ -78,6 +89,8 @@ class RelationshipMapScreen : public QWidget, public IStatefulScreen {relmap::LayoutMode layout_mode_ = relmap::LayoutMode::Layered;relmap::RelationshipData current_data_;bool has_data_ = false;+ QString loaded_ticker_; // ticker currently shown in the graph+ bool search_input_focused_ = false; // only show dropdown when user is actively typing};} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/relationship_map/RelationshipMapTypes.h b/fincept-qt/src/screens/relationship_map/RelationshipMapTypes.hindex b179ed07b..eebe14b6c 100644--- a/fincept-qt/src/screens/relationship_map/RelationshipMapTypes.h+++ b/fincept-qt/src/screens/relationship_map/RelationshipMapTypes.h@@ -15,8 +15,14 @@ enum class NodeCategory {Company,Peer,Institutional,- FundFamily,+ MutualFund,Insider,+ Officer,+ Analyst,+ Governance,+ Technicals,+ ShortInterest,+ Earnings,Event,SupplyChain,Metrics,@@ -24,46 +30,42 @@ enum class NodeCategory {inline QString category_label(NodeCategory c) {switch (c) {- case NodeCategory::Company:- return "COMPANY";- case NodeCategory::Peer:- return "PEER";- case NodeCategory::Institutional:- return "INSTITUTIONAL";- case NodeCategory::FundFamily:- return "FUND FAMILY";- case NodeCategory::Insider:- return "INSIDER";- case NodeCategory::Event:- return "EVENT";- case NodeCategory::SupplyChain:- return "SUPPLY CHAIN";- case NodeCategory::Metrics:- return "METRICS";+ case NodeCategory::Company: return "COMPANY";+ case NodeCategory::Peer: return "PEER";+ case NodeCategory::Institutional:return "INSTITUTIONAL";+ case NodeCategory::MutualFund: return "MUTUAL FUND";+ case NodeCategory::Insider: return "INSIDER";+ case NodeCategory::Officer: return "OFFICER";+ case NodeCategory::Analyst: return "ANALYST";+ case NodeCategory::Governance: return "GOVERNANCE";+ case NodeCategory::Technicals: return "TECHNICALS";+ case NodeCategory::ShortInterest:return "SHORT INTEREST";+ case NodeCategory::Earnings: return "EARNINGS";+ case NodeCategory::Event: return "EVENT";+ case NodeCategory::SupplyChain: return "SUPPLY CHAIN";+ case NodeCategory::Metrics: return "METRICS";}return "UNKNOWN";}inline QColor category_color(NodeCategory c) {switch (c) {- case NodeCategory::Company:- return QColor("#d97706"); // amber- case NodeCategory::Peer:- return QColor("#2563eb"); // blue- case NodeCategory::Institutional:- return QColor("#16a34a"); // green- case NodeCategory::FundFamily:- return QColor("#9333ea"); // purple- case NodeCategory::Insider:- return QColor("#0891b2"); // cyan- case NodeCategory::Event:- return QColor("#dc2626"); // red- case NodeCategory::SupplyChain:- return QColor("#ca8a04"); // yellow- case NodeCategory::Metrics:- return QColor("#808080"); // gray+ case NodeCategory::Company: return QColor("#d97706"); // amber+ case NodeCategory::Peer: return QColor("#2563eb"); // blue+ case NodeCategory::Institutional:return QColor("#16a34a"); // green+ case NodeCategory::MutualFund: return QColor("#059669"); // emerald+ case NodeCategory::Insider: return QColor("#0891b2"); // cyan+ case NodeCategory::Officer: return QColor("#0e7490"); // dark cyan+ case NodeCategory::Analyst: return QColor("#7c3aed"); // violet+ case NodeCategory::Governance: return QColor("#be123c"); // rose+ case NodeCategory::Technicals: return QColor("#0369a1"); // sky+ case NodeCategory::ShortInterest:return QColor("#dc2626"); // red+ case NodeCategory::Earnings: return QColor("#ea580c"); // orange+ case NodeCategory::Event: return QColor("#b45309"); // amber-dark+ case NodeCategory::SupplyChain: return QColor("#ca8a04"); // yellow+ case NodeCategory::Metrics: return QColor("#525252"); // neutral}- return QColor("#808080");+ return QColor("#525252");}inline QColor category_bg(NodeCategory c) {@@ -99,25 +101,144 @@ struct CompanyInfo {QString name;QString sector;QString industry;+ QString website;+ QString description;+ QString country;+ QString exchange;+ QString currency;+ int employees = 0;+ // Pricedouble market_cap = 0;double current_price = 0;+ double previous_close = 0;+ double day_change_pct = 0;+ // Valuation ratiosdouble pe_ratio = 0;double forward_pe = 0;double price_to_book = 0;+ double price_to_sales = 0;+ // Growth & returnsdouble roe = 0;+ double roa = 0;double revenue_growth = 0;+ double earnings_growth = 0;double profit_margins = 0;+ // Financialsdouble revenue = 0;double ebitda = 0;double free_cashflow = 0;+ double operating_cashflow = 0;double total_cash = 0;double total_debt = 0;+ // Ownershipdouble insider_percent = 0;double institutional_percent = 0;- int employees = 0;+ // AnalystQString recommendation;- double target_price = 0;+ double recommendation_mean = 0;+ double target_high = 0;+ double target_low = 0;+ double target_mean = 0;+ double target_median = 0;int analyst_count = 0;+ // Dividend & EPS+ double dividend_yield = 0;+ double payout_ratio = 0;+ double trailing_eps = 0;+ double forward_eps = 0;+ double shares_outstanding = 0;+};++struct GovernanceRisk {+ int audit_risk = 0; // 1-10+ int board_risk = 0;+ int compensation_risk = 0;+ int shareholder_rights_risk = 0;+ int overall_risk = 0;+};++struct Technicals {+ double fifty_two_week_high = 0;+ double fifty_two_week_low = 0;+ double fifty_day_avg = 0;+ double two_hundred_day_avg = 0;+ double beta = 0;+ double week52_change_pct = 0;+ double sp500_52wk_change = 0;+ int avg_volume = 0;+ int avg_volume_10d = 0;+};++struct ShortInterest {+ double shares_short = 0;+ double short_ratio = 0; // days to cover+ double short_pct_float = 0; // 0-1+ double float_shares = 0;+};++struct EnterpriseMetrics {+ double enterprise_value = 0;+ double ev_to_revenue = 0;+ double ev_to_ebitda = 0;+ double peg_ratio = 0;+ double price_to_sales = 0;+ double book_value = 0;+};++struct MarginsDebt {+ double gross = 0;+ double operating = 0;+ double ebitda = 0;+ double net = 0;+ double debt_to_equity = 0;+ double current_ratio = 0;+ double quick_ratio = 0;+};++struct AnalystTargets {+ double current = 0;+ double high = 0;+ double low = 0;+ double mean = 0;+ double median = 0;+};++struct RecommendationSnapshot {+ QString period; // "0m", "-1m", "-2m", "-3m"+ int strong_buy = 0;+ int buy = 0;+ int hold = 0;+ int sell = 0;+ int strong_sell = 0;+};++struct AnalystUpgrade {+ QString date;+ QString firm;+ QString to_grade;+ QString from_grade;+ QString action; // "up", "down", "main", "reit"+ double price_target = 0;+ double prior_target = 0;+};++struct CompanyOfficer {+ QString name;+ QString title;+ int total_pay = 0;+ int year_born = 0;+};++struct EarningsCalendar {+ QString earnings_date;+ double earnings_avg = 0;+ double earnings_low = 0;+ double earnings_high = 0;+ double revenue_avg = 0;+ double revenue_low = 0;+ double revenue_high = 0;+ QString ex_dividend_date;+ QString dividend_date;};struct InstitutionalHolder {@@ -127,6 +248,7 @@ struct InstitutionalHolder {double percentage = 0;double change_percent = 0;QString fund_family;+ QString type; // "institutional" or "mutualfund"};struct InsiderHolder {@@ -142,29 +264,36 @@ struct PeerCompany {QString name;double market_cap = 0;double pe_ratio = 0;+ double forward_pe = 0;double roe = 0;double revenue_growth = 0;double profit_margins = 0;+ double gross_margins = 0;double current_price = 0;QString sector;+ double beta = 0;+ double ev_to_ebitda = 0;+ double price_to_book = 0;+ double week52_change = 0;+ QString recommendation;};struct CorporateEvent {QString date;QString form;QString description;- QString category; // earnings, management, merger, etc.+ QString category;};struct SupplyChainEntity {QString name;- QString relationship; // "customer", "supplier", "partner"+ QString relationship;double revenue_pct = 0;};struct ValuationSignal {- QString status; // UNDERVALUED, FAIRLY_VALUED, OVERVALUED- QString action; // BUY, HOLD, SELL+ QString status;+ QString action;double score = 0; // -3 to +3};@@ -191,24 +320,37 @@ struct GraphEdge {struct RelationshipData {CompanyInfo company;+ GovernanceRisk governance;+ Technicals technicals;+ ShortInterest short_interest;+ EnterpriseMetrics enterprise;+ MarginsDebt margins;+ AnalystTargets analyst_targets;+ QVector<RecommendationSnapshot> recommendations;+ QVector<AnalystUpgrade> upgrades_downgrades;+ QVector<CompanyOfficer> officers;+ EarningsCalendar calendar;ValuationSignal valuation;QVector<InstitutionalHolder> institutional_holders;+ QVector<InstitutionalHolder> mutualfund_holders;QVector<InsiderHolder> insider_holders;QVector<PeerCompany> peers;QVector<CorporateEvent> events;QVector<SupplyChainEntity> supply_chain;- int data_quality = 0; // 0-100+ int data_quality = 0;QString timestamp;};// ── Filter State ─────────────────────────────────────────────────────────────struct FilterState {+ bool show_peers = true;bool show_institutional = true;bool show_insiders = true;- bool show_peers = true;- bool show_events = true;+ bool show_officers = true;+ bool show_analysts = true;bool show_metrics = true;+ bool show_events = true;bool show_supply_chain = true;double min_ownership = 0; // 0-100%};diff --git a/fincept-qt/src/screens/settings/KeybindingsSection.cpp b/fincept-qt/src/screens/settings/KeybindingsSection.cppnew file mode 100644index 000000000..d10cb24b7--- /dev/null+++ b/fincept-qt/src/screens/settings/KeybindingsSection.cpp@@ -0,0 +1,244 @@+// src/screens/settings/KeybindingsSection.cpp+#include "screens/settings/KeybindingsSection.h"++#include "core/keys/KeyConfigManager.h"+#include "ui/theme/Theme.h"++#include <QDialogButtonBox>+#include <QEvent>+#include <QFrame>+#include <QHBoxLayout>+#include <QKeyEvent>+#include <QLabel>+#include <QMap>+#include <QMouseEvent>+#include <QPushButton>+#include <QScrollArea>+#include <QVBoxLayout>++namespace fincept::screens {++// ── KeyCaptureDialog ──────────────────────────────────────────────────────────++KeyCaptureDialog::KeyCaptureDialog(KeyAction action, const QKeySequence& current, QWidget* parent)+ : QDialog(parent), action_(action) {+ setWindowTitle("Rebind: " + KeyConfigManager::instance().display_name(action));+ setFixedSize(360, 200);+ setModal(true);++ auto* layout = new QVBoxLayout(this);+ layout->setSpacing(12);+ layout->setContentsMargins(20, 20, 20, 20);++ auto* current_lbl = new QLabel("Current: " + current.toString(QKeySequence::NativeText));+ current_lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_SECONDARY()));++ hint_label_ = new QLabel("Press new key combination...");+ hint_label_->setStyleSheet(QString("color:%1;font-weight:bold;").arg(ui::colors::TEXT_PRIMARY()));++ captured_label_ = new QLabel;+ captured_label_->setStyleSheet(+ QString("color:%1;font-size:16px;font-weight:700;").arg(ui::colors::AMBER()));+ captured_label_->setAlignment(Qt::AlignCenter);++ conflict_label_ = new QLabel;+ conflict_label_->setStyleSheet(QString("color:%1;").arg(ui::colors::NEGATIVE()));+ conflict_label_->hide();++ auto* btn_box = new QDialogButtonBox(Qt::Horizontal);+ apply_btn_ = btn_box->addButton("Apply", QDialogButtonBox::AcceptRole);+ btn_box->addButton("Cancel", QDialogButtonBox::RejectRole);+ apply_btn_->setEnabled(false);++ connect(btn_box, &QDialogButtonBox::accepted, this, &QDialog::accept);+ connect(btn_box, &QDialogButtonBox::rejected, this, &QDialog::reject);++ layout->addWidget(current_lbl);+ layout->addWidget(hint_label_);+ layout->addWidget(captured_label_);+ layout->addWidget(conflict_label_);+ layout->addStretch();+ layout->addWidget(btn_box);++ setFocusPolicy(Qt::StrongFocus);+ setFocus();+}++void KeyCaptureDialog::keyPressEvent(QKeyEvent* event) {+ // Ignore lone modifier keys+ const int key = event->key();+ if (key == Qt::Key_Control || key == Qt::Key_Shift ||+ key == Qt::Key_Alt || key == Qt::Key_Meta)+ return;++ captured_ = QKeySequence(event->keyCombination());+ captured_label_->setText(captured_.toString(QKeySequence::NativeText));+ apply_btn_->setEnabled(true);++ // Conflict check+ auto conflict = KeyConfigManager::instance().find_conflict(captured_, action_);+ if (conflict.has_value()) {+ const QString name = KeyConfigManager::instance().display_name(conflict.value());+ conflict_label_->setText("Warning: already used by \"" + name + "\"");+ conflict_label_->show();+ } else {+ conflict_label_->hide();+ }+}++// ── KeybindingsSection ────────────────────────────────────────────────────────++KeybindingsSection::KeybindingsSection(QWidget* parent) : QWidget(parent) {+ build_ui();++ // Rebuild rows whenever any key changes (live update)+ connect(&KeyConfigManager::instance(), &KeyConfigManager::key_changed,+ this, [this](KeyAction, QKeySequence) { rebuild_rows(); });+}++void KeybindingsSection::build_ui() {+ auto* root = new QVBoxLayout(this);+ root->setContentsMargins(16, 16, 16, 16);+ root->setSpacing(12);++ // Search bar+ search_input_ = new QLineEdit;+ search_input_->setPlaceholderText("Search actions...");+ search_input_->setStyleSheet(+ QString("QLineEdit{background:%1;color:%2;border:1px solid %3;padding:6px;}"+ "QLineEdit:focus{border:1px solid %4;}")+ .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_PRIMARY(),+ ui::colors::BORDER_MED(), ui::colors::AMBER()));+ connect(search_input_, &QLineEdit::textChanged, this, [this](const QString&) { rebuild_rows(); });++ // Scrollable groups area+ auto* scroll = new QScrollArea;+ scroll->setWidgetResizable(true);+ scroll->setFrameShape(QFrame::NoFrame);++ auto* container = new QWidget;+ groups_layout_ = new QVBoxLayout(container);+ groups_layout_->setContentsMargins(0, 0, 0, 0);+ groups_layout_->setSpacing(16);+ scroll->setWidget(container);++ rebuild_rows();++ // Reset All button+ auto* reset_all_btn = new QPushButton("Reset All to Defaults");+ reset_all_btn->setStyleSheet(+ QString("QPushButton{background:%1;color:%2;border:1px solid %3;padding:0 12px;height:32px;}"+ "QPushButton:hover{background:%4;}")+ .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_PRIMARY(),+ ui::colors::BORDER_MED(), ui::colors::BG_HOVER()));+ connect(reset_all_btn, &QPushButton::clicked, this, []() {+ KeyConfigManager::instance().reset_all();+ });++ root->addWidget(search_input_);+ root->addWidget(scroll, 1);+ root->addWidget(reset_all_btn);+}++void KeybindingsSection::rebuild_rows() {+ // Clear existing group widgets+ while (QLayoutItem* item = groups_layout_->takeAt(0)) {+ if (QWidget* w = item->widget())+ w->deleteLater();+ delete item;+ }++ const QString filter = search_input_ ? search_input_->text().toLower() : QString{};++ // Collect actions by group, preserving order+ QMap<QString, QList<KeyAction>> groups;+ for (KeyAction a : KeyConfigManager::instance().all_actions()) {+ const QString name = KeyConfigManager::instance().display_name(a);+ if (!filter.isEmpty() && !name.toLower().contains(filter))+ continue;+ groups[KeyConfigManager::instance().group_name(a)].append(a);+ }++ const QStringList group_order = {"Global", "Navigation", "News", "Code Editor"};+ for (const QString& group : group_order) {+ if (!groups.contains(group))+ continue;+ groups_layout_->addWidget(build_group(group, groups[group]));+ }+ groups_layout_->addStretch();+}++QWidget* KeybindingsSection::build_group(const QString& group_name, const QList<KeyAction>& actions) {+ auto* group_widget = new QWidget;+ auto* vbox = new QVBoxLayout(group_widget);+ vbox->setContentsMargins(0, 0, 0, 0);+ vbox->setSpacing(2);++ auto* title = new QLabel(group_name.toUpper());+ title->setStyleSheet(+ QString("color:%1;font-weight:bold;letter-spacing:0.5px;padding:4px 0;")+ .arg(ui::colors::AMBER()));+ vbox->addWidget(title);++ auto* sep = new QFrame;+ sep->setFrameShape(QFrame::HLine);+ sep->setStyleSheet(QString("color:%1;").arg(ui::colors::BORDER_DIM()));+ vbox->addWidget(sep);++ auto& km = KeyConfigManager::instance();+ for (KeyAction a : actions) {+ auto* row = new QWidget;+ row->setProperty("key_action_set", true);+ row->setProperty("key_action", static_cast<int>(a));+ row->setCursor(Qt::PointingHandCursor);+ row->installEventFilter(this);++ auto* hl = new QHBoxLayout(row);+ hl->setContentsMargins(4, 4, 4, 4);++ auto* name_lbl = new QLabel(km.display_name(a));+ name_lbl->setStyleSheet(QString("color:%1;").arg(ui::colors::TEXT_PRIMARY()));++ auto* key_lbl = new QLabel(km.key(a).toString(QKeySequence::NativeText));+ key_lbl->setStyleSheet(+ QString("color:%1;font-family:monospace;min-width:120px;").arg(ui::colors::TEXT_SECONDARY()));+ key_lbl->setAlignment(Qt::AlignRight | Qt::AlignVCenter);++ auto* reset_btn = new QPushButton("Reset");+ reset_btn->setFixedSize(56, 24);+ reset_btn->setStyleSheet(+ QString("QPushButton{background:%1;color:%2;border:1px solid %3;}"+ "QPushButton:hover{background:%4;}")+ .arg(ui::colors::BG_RAISED(), ui::colors::TEXT_SECONDARY(),+ ui::colors::BORDER_DIM(), ui::colors::BG_HOVER()));+ // Use a captured copy of a for the lambda+ connect(reset_btn, &QPushButton::clicked, this, [a]() {+ KeyConfigManager::instance().reset_key(a);+ });++ hl->addWidget(name_lbl, 1);+ hl->addWidget(key_lbl);+ hl->addWidget(reset_btn);++ vbox->addWidget(row);+ }++ return group_widget;+}++bool KeybindingsSection::eventFilter(QObject* obj, QEvent* event) {+ if (event->type() == QEvent::MouseButtonPress) {+ auto* w = qobject_cast<QWidget*>(obj);+ if (w && w->property("key_action_set").toBool()) {+ const KeyAction a = static_cast<KeyAction>(w->property("key_action").toInt());+ auto& km = KeyConfigManager::instance();+ KeyCaptureDialog dlg(a, km.key(a), this);+ if (dlg.exec() == QDialog::Accepted && !dlg.captured().isEmpty())+ km.set_key(a, dlg.captured());+ return true;+ }+ }+ return QWidget::eventFilter(obj, event);+}++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/settings/KeybindingsSection.h b/fincept-qt/src/screens/settings/KeybindingsSection.hnew file mode 100644index 000000000..001f08381--- /dev/null+++ b/fincept-qt/src/screens/settings/KeybindingsSection.h@@ -0,0 +1,55 @@+// src/screens/settings/KeybindingsSection.h+#pragma once+#include "core/keys/KeyActions.h"++#include <QDialog>+#include <QKeySequence>+#include <QLabel>+#include <QLineEdit>+#include <QPushButton>+#include <QVBoxLayout>+#include <QWidget>++namespace fincept::screens {++/// Modal dialog that captures a single key combination from the user.+class KeyCaptureDialog : public QDialog {+ Q_OBJECT+ public:+ explicit KeyCaptureDialog(KeyAction action, const QKeySequence& current, QWidget* parent = nullptr);++ /// Returns the captured sequence, or empty if cancelled.+ QKeySequence captured() const { return captured_; }++ protected:+ void keyPressEvent(QKeyEvent* event) override;++ private:+ QLabel* hint_label_ = nullptr;+ QLabel* captured_label_ = nullptr;+ QLabel* conflict_label_ = nullptr;+ QPushButton* apply_btn_ = nullptr;++ KeyAction action_;+ QKeySequence captured_;+};++/// Keybindings settings panel — grouped table of action→key with per-row Reset and Reset All.+class KeybindingsSection : public QWidget {+ Q_OBJECT+ public:+ explicit KeybindingsSection(QWidget* parent = nullptr);++ protected:+ bool eventFilter(QObject* obj, QEvent* event) override;++ private:+ void build_ui();+ void rebuild_rows();+ QWidget* build_group(const QString& group_name, const QList<KeyAction>& actions);++ QVBoxLayout* groups_layout_ = nullptr;+ QLineEdit* search_input_ = nullptr;+};++} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/settings/SettingsScreen.cpp b/fincept-qt/src/screens/settings/SettingsScreen.cppindex a3b66f207..a87b31b4d 100644--- a/fincept-qt/src/screens/settings/SettingsScreen.cpp+++ b/fincept-qt/src/screens/settings/SettingsScreen.cpp@@ -11,6 +11,7 @@#include "core/events/EventBus.h"#include "core/logging/Logger.h"#include "core/session/ScreenStateManager.h"+#include "screens/settings/KeybindingsSection.h"#include "screens/settings/LlmConfigSection.h"#include "screens/settings/McpServersSection.h"#include "services/notifications/NotificationService.h"@@ -158,6 +159,7 @@ SettingsScreen::SettingsScreen(QWidget* parent) : QWidget(parent) {sections_->addWidget(build_logging()); // 7sections_->addWidget(build_security()); // 8sections_->addWidget(build_profiles()); // 9+ sections_->addWidget(build_keybindings()); // 10QList<QPushButton*> nav_btns;auto make_btn = [&](const QString& text, int idx) {@@ -191,6 +193,7 @@ SettingsScreen::SettingsScreen(QWidget* parent) : QWidget(parent) {make_btn("Logging", 7);make_btn("Security", 8);make_btn("Profiles", 9);+ make_btn("Keybindings", 10);first->setChecked(true);@@ -2855,4 +2858,8 @@ void SettingsScreen::restore_state(const QVariantMap& state) {sections_->setCurrentIndex(idx);}+QWidget* SettingsScreen::build_keybindings() {+ return new KeybindingsSection(this);+}+} // namespace fincept::screensdiff --git a/fincept-qt/src/screens/settings/SettingsScreen.h b/fincept-qt/src/screens/settings/SettingsScreen.hindex 4c52a7a33..0ff1c7608 100644--- a/fincept-qt/src/screens/settings/SettingsScreen.h+++ b/fincept-qt/src/screens/settings/SettingsScreen.h@@ -45,6 +45,7 @@ class SettingsScreen : public QWidget, public IStatefulScreen {QWidget* build_logging();QWidget* build_security();QWidget* build_profiles();+ QWidget* build_keybindings();// ── Shared layout helper ──────────────────────────────────────────────────static QWidget* make_row(const QString& label, QWidget* control, const QString& description = {});diff --git a/fincept-qt/src/services/ai_quant_lab/AIQuantLabService.cpp b/fincept-qt/src/services/ai_quant_lab/AIQuantLabService.cppindex f8ad42dc7..b4dc13c62 100644--- a/fincept-qt/src/services/ai_quant_lab/AIQuantLabService.cpp+++ b/fincept-qt/src/services/ai_quant_lab/AIQuantLabService.cpp@@ -250,19 +250,19 @@ void AIQuantLabService::signals_get_feature_importance(const QJsonObject& params// ── HFT ──────────────────────────────────────────────────────────────────────void AIQuantLabService::hft_create_orderbook(const QJsonObject& params) {- run_module("hft", "create_orderbook", params);+ run_module("hft", "fetch_orderbook", params); // live CCXT fetch}void AIQuantLabService::hft_snapshot(const QJsonObject& params) {- run_module("hft", "snapshot", params);+ run_module("hft", "analyze", params); // full analysis: book + trades + all metrics}void AIQuantLabService::hft_market_making_quotes(const QJsonObject& params) {- run_module("hft", "market_making_quotes", params);+ run_module("hft", "market_making", params); // live book → A-S quotes}void AIQuantLabService::hft_detect_toxic(const QJsonObject& params) {- run_module("hft", "detect_toxic", params);+ run_module("hft", "toxic_flow", params); // live trades → PIN score}void AIQuantLabService::hft_execute_order(const QJsonObject& params) {- run_module("hft", "execute_order", params);+ run_module("hft", "slippage", params); // order book walk → slippage estimate}// ── Meta Learning ────────────────────────────────────────────────────────────diff --git a/fincept-qt/src/services/relationship_map/RelationshipMapService.cpp b/fincept-qt/src/services/relationship_map/RelationshipMapService.cppindex 9a2b03a5e..29456f870 100644--- a/fincept-qt/src/services/relationship_map/RelationshipMapService.cpp+++ b/fincept-qt/src/services/relationship_map/RelationshipMapService.cpp@@ -84,78 +84,222 @@ void RelationshipMapService::parse_result(const QString& json_output) {// ── Company ──────────────────────────────────────────────────────────QJsonObject co = root["company"].toObject();- data_.company.ticker = co["ticker"].toString();- data_.company.name = co["name"].toString();- data_.company.sector = co["sector"].toString();- data_.company.industry = co["industry"].toString();- data_.company.market_cap = co["market_cap"].toDouble();- data_.company.current_price = co["current_price"].toDouble();- data_.company.pe_ratio = co["pe_ratio"].toDouble();- data_.company.forward_pe = co["forward_pe"].toDouble();- data_.company.price_to_book = co["price_to_book"].toDouble();- data_.company.roe = co["roe"].toDouble();- data_.company.revenue_growth = co["revenue_growth"].toDouble();- data_.company.profit_margins = co["profit_margins"].toDouble();- data_.company.revenue = co["revenue"].toDouble();- data_.company.ebitda = co["ebitda"].toDouble();- data_.company.free_cashflow = co["free_cashflow"].toDouble();- data_.company.total_cash = co["total_cash"].toDouble();- data_.company.total_debt = co["total_debt"].toDouble();- data_.company.insider_percent = co["insider_percent"].toDouble();- data_.company.institutional_percent = co["institutional_percent"].toDouble();- data_.company.employees = co["employees"].toInt();- data_.company.recommendation = co["recommendation"].toString();- data_.company.target_price = co["target_price"].toDouble();- data_.company.analyst_count = co["analyst_count"].toInt();-- // ── Institutional Holders ────────────────────────────────────────────- QJsonArray inst_arr = root["institutional_holders"].toArray();- for (const auto& v : inst_arr) {+ data_.company.ticker = co["ticker"].toString();+ data_.company.name = co["name"].toString();+ data_.company.sector = co["sector"].toString();+ data_.company.industry = co["industry"].toString();+ data_.company.website = co["website"].toString();+ data_.company.description = co["description"].toString();+ data_.company.country = co["country"].toString();+ data_.company.exchange = co["exchange"].toString();+ data_.company.currency = co["currency"].toString();+ data_.company.employees = co["employees"].toInt();+ data_.company.market_cap = co["market_cap"].toDouble();+ data_.company.current_price = co["current_price"].toDouble();+ data_.company.previous_close = co["previous_close"].toDouble();+ data_.company.day_change_pct = co["day_change_pct"].toDouble();+ data_.company.pe_ratio = co["pe_ratio"].toDouble();+ data_.company.forward_pe = co["forward_pe"].toDouble();+ data_.company.price_to_book = co["price_to_book"].toDouble();+ data_.company.roe = co["roe"].toDouble();+ data_.company.roa = co["roa"].toDouble();+ data_.company.revenue_growth = co["revenue_growth"].toDouble();+ data_.company.earnings_growth = co["earnings_growth"].toDouble();+ data_.company.profit_margins = co["profit_margins"].toDouble();+ data_.company.revenue = co["revenue"].toDouble();+ data_.company.ebitda = co["ebitda"].toDouble();+ data_.company.free_cashflow = co["free_cashflow"].toDouble();+ data_.company.operating_cashflow = co["operating_cashflow"].toDouble();+ data_.company.total_cash = co["total_cash"].toDouble();+ data_.company.total_debt = co["total_debt"].toDouble();+ data_.company.insider_percent = co["insider_percent"].toDouble();+ data_.company.institutional_percent= co["institutional_percent"].toDouble();+ data_.company.recommendation = co["recommendation"].toString();+ data_.company.recommendation_mean = co["recommendation_mean"].toDouble();+ data_.company.target_high = co["target_high"].toDouble();+ data_.company.target_low = co["target_low"].toDouble();+ data_.company.target_mean = co["target_mean"].toDouble();+ data_.company.target_median = co["target_median"].toDouble();+ data_.company.analyst_count = co["analyst_count"].toInt();+ data_.company.dividend_yield = co["dividend_yield"].toDouble();+ data_.company.payout_ratio = co["payout_ratio"].toDouble();+ data_.company.trailing_eps = co["trailing_eps"].toDouble();+ data_.company.forward_eps = co["forward_eps"].toDouble();+ data_.company.shares_outstanding = co["shares_outstanding"].toDouble();++ // ── Governance ───────────────────────────────────────────────────────+ QJsonObject gov = root["governance"].toObject();+ data_.governance.audit_risk = gov["audit_risk"].toInt();+ data_.governance.board_risk = gov["board_risk"].toInt();+ data_.governance.compensation_risk = gov["compensation_risk"].toInt();+ data_.governance.shareholder_rights_risk = gov["shareholder_rights_risk"].toInt();+ data_.governance.overall_risk = gov["overall_risk"].toInt();++ // ── Technicals ───────────────────────────────────────────────────────+ QJsonObject tech = root["technicals"].toObject();+ data_.technicals.fifty_two_week_high = tech["fifty_two_week_high"].toDouble();+ data_.technicals.fifty_two_week_low = tech["fifty_two_week_low"].toDouble();+ data_.technicals.fifty_day_avg = tech["fifty_day_avg"].toDouble();+ data_.technicals.two_hundred_day_avg = tech["two_hundred_day_avg"].toDouble();+ data_.technicals.beta = tech["beta"].toDouble();+ data_.technicals.week52_change_pct = tech["week52_change_pct"].toDouble();+ data_.technicals.sp500_52wk_change = tech["sp500_52wk_change"].toDouble();+ data_.technicals.avg_volume = tech["avg_volume"].toInt();+ data_.technicals.avg_volume_10d = tech["avg_volume_10d"].toInt();++ // ── Short Interest ────────────────────────────────────────────────────+ QJsonObject si = root["short_interest"].toObject();+ data_.short_interest.shares_short = si["shares_short"].toDouble();+ data_.short_interest.short_ratio = si["short_ratio"].toDouble();+ data_.short_interest.short_pct_float = si["short_pct_float"].toDouble();+ data_.short_interest.float_shares = si["float_shares"].toDouble();++ // ── Enterprise ────────────────────────────────────────────────────────+ QJsonObject ent = root["enterprise"].toObject();+ data_.enterprise.enterprise_value = ent["enterprise_value"].toDouble();+ data_.enterprise.ev_to_revenue = ent["ev_to_revenue"].toDouble();+ data_.enterprise.ev_to_ebitda = ent["ev_to_ebitda"].toDouble();+ data_.enterprise.peg_ratio = ent["peg_ratio"].toDouble();+ data_.enterprise.price_to_sales = ent["price_to_sales"].toDouble();+ data_.enterprise.book_value = ent["book_value"].toDouble();++ // ── Margins & Debt ────────────────────────────────────────────────────+ QJsonObject mg = root["margins"].toObject();+ data_.margins.gross = mg["gross"].toDouble();+ data_.margins.operating = mg["operating"].toDouble();+ data_.margins.ebitda = mg["ebitda"].toDouble();+ data_.margins.net = mg["net"].toDouble();+ data_.margins.debt_to_equity = mg["debt_to_equity"].toDouble();+ data_.margins.current_ratio = mg["current_ratio"].toDouble();+ data_.margins.quick_ratio = mg["quick_ratio"].toDouble();++ // ── Analyst Targets ───────────────────────────────────────────────────+ QJsonObject at = root["analyst_targets"].toObject();+ data_.analyst_targets.current = at["current"].toDouble();+ data_.analyst_targets.high = at["high"].toDouble();+ data_.analyst_targets.low = at["low"].toDouble();+ data_.analyst_targets.mean = at["mean"].toDouble();+ data_.analyst_targets.median = at["median"].toDouble();++ // ── Recommendations Summary ───────────────────────────────────────────+ for (const auto& v : root["recommendations_summary"].toArray()) {+ QJsonObject r = v.toObject();+ RecommendationSnapshot snap;+ snap.period = r["period"].toString();+ snap.strong_buy = r["strong_buy"].toInt();+ snap.buy = r["buy"].toInt();+ snap.hold = r["hold"].toInt();+ snap.sell = r["sell"].toInt();+ snap.strong_sell = r["strong_sell"].toInt();+ data_.recommendations.append(snap);+ }++ // ── Upgrades / Downgrades ─────────────────────────────────────────────+ for (const auto& v : root["upgrades_downgrades"].toArray()) {+ QJsonObject u = v.toObject();+ AnalystUpgrade upg;+ upg.date = u["date"].toString();+ upg.firm = u["firm"].toString();+ upg.to_grade = u["to_grade"].toString();+ upg.from_grade = u["from_grade"].toString();+ upg.action = u["action"].toString();+ upg.price_target = u["price_target"].toDouble();+ upg.prior_target = u["prior_target"].toDouble();+ data_.upgrades_downgrades.append(upg);+ }++ // ── Officers ──────────────────────────────────────────────────────────+ for (const auto& v : root["officers"].toArray()) {+ QJsonObject o = v.toObject();+ CompanyOfficer off;+ off.name = o["name"].toString();+ off.title = o["title"].toString();+ off.total_pay = o["total_pay"].toInt();+ off.year_born = o["year_born"].toInt();+ if (!off.name.isEmpty())+ data_.officers.append(off);+ }++ // ── Calendar ──────────────────────────────────────────────────────────+ QJsonObject cal = root["calendar"].toObject();+ data_.calendar.earnings_date = cal["earnings_date"].toString();+ data_.calendar.earnings_avg = cal["earnings_avg"].toDouble();+ data_.calendar.earnings_low = cal["earnings_low"].toDouble();+ data_.calendar.earnings_high = cal["earnings_high"].toDouble();+ data_.calendar.revenue_avg = cal["revenue_avg"].toDouble();+ data_.calendar.revenue_low = cal["revenue_low"].toDouble();+ data_.calendar.revenue_high = cal["revenue_high"].toDouble();+ data_.calendar.ex_dividend_date = cal["ex_dividend_date"].toString();+ data_.calendar.dividend_date = cal["dividend_date"].toString();++ // ── Institutional Holders ─────────────────────────────────────────────+ for (const auto& v : root["institutional_holders"].toArray()) {QJsonObject h = v.toObject();InstitutionalHolder holder;- holder.name = h["name"].toString();- holder.shares = h["shares"].toDouble();- holder.value = h["value"].toDouble();- holder.percentage = h["percentage"].toDouble();+ holder.name = h["name"].toString();+ holder.shares = h["shares"].toDouble();+ holder.value = h["value"].toDouble();+ holder.percentage = h["percentage"].toDouble();holder.change_percent = h["change_percent"].toDouble();- holder.fund_family = h["fund_family"].toString();+ holder.fund_family = h["fund_family"].toString();+ holder.type = "institutional";if (!holder.name.isEmpty())data_.institutional_holders.append(holder);}- // ── Insider Holders ──────────────────────────────────────────────────- QJsonArray ins_arr = root["insider_holders"].toArray();- for (const auto& v : ins_arr) {+ // ── Mutual Fund Holders ───────────────────────────────────────────────+ for (const auto& v : root["mutualfund_holders"].toArray()) {+ QJsonObject h = v.toObject();+ InstitutionalHolder holder;+ holder.name = h["name"].toString();+ holder.shares = h["shares"].toDouble();+ holder.value = h["value"].toDouble();+ holder.percentage = h["percentage"].toDouble();+ holder.change_percent = h["change_percent"].toDouble();+ holder.fund_family = h["fund_family"].toString();+ holder.type = "mutualfund";+ if (!holder.name.isEmpty())+ data_.mutualfund_holders.append(holder);+ }++ // ── Insider Holders ───────────────────────────────────────────────────+ for (const auto& v : root["insider_holders"].toArray()) {QJsonObject h = v.toObject();InsiderHolder insider;- insider.name = h["name"].toString();- insider.title = h["title"].toString();- insider.shares = h["shares"].toDouble();- insider.percentage = h["percentage"].toDouble();+ insider.name = h["name"].toString();+ insider.title = h["title"].toString();+ insider.shares = h["shares"].toDouble();+ insider.percentage = h["percentage"].toDouble();insider.last_transaction = h["last_transaction"].toString();if (!insider.name.isEmpty())data_.insider_holders.append(insider);}- // ── Peers ────────────────────────────────────────────────────────────- QJsonArray peers_arr = root["peers"].toArray();- for (const auto& v : peers_arr) {+ // ── Peers ─────────────────────────────────────────────────────────────+ for (const auto& v : root["peers"].toArray()) {QJsonObject p = v.toObject();PeerCompany peer;- peer.ticker = p["ticker"].toString();- peer.name = p["name"].toString();- peer.market_cap = p["market_cap"].toDouble();- peer.pe_ratio = p["pe_ratio"].toDouble();- peer.roe = p["roe"].toDouble();- peer.revenue_growth = p["revenue_growth"].toDouble();- peer.profit_margins = p["profit_margins"].toDouble();- peer.current_price = p["current_price"].toDouble();- peer.sector = p["sector"].toString();+ peer.ticker = p["ticker"].toString();+ peer.name = p["name"].toString();+ peer.market_cap = p["market_cap"].toDouble();+ peer.pe_ratio = p["pe_ratio"].toDouble();+ peer.forward_pe = p["forward_pe"].toDouble();+ peer.roe = p["roe"].toDouble();+ peer.revenue_growth = p["revenue_growth"].toDouble();+ peer.profit_margins = p["profit_margins"].toDouble();+ peer.gross_margins = p["gross_margins"].toDouble();+ peer.current_price = p["current_price"].toDouble();+ peer.sector = p["sector"].toString();+ peer.beta = p["beta"].toDouble();+ peer.ev_to_ebitda = p["ev_to_ebitda"].toDouble();+ peer.price_to_book = p["price_to_book"].toDouble();+ peer.week52_change = p["week52_change"].toDouble();+ peer.recommendation = p["recommendation"].toString();if (!peer.ticker.isEmpty())data_.peers.append(peer);}- // ── Valuation Signal ─────────────────────────────────────────────────+ // ── Valuation Signal ──────────────────────────────────────────────────data_.valuation = compute_valuation(data_.company, data_.peers);data_.data_quality = root["data_quality"].toInt();diff --git a/fincept-qt/src/ui/navigation/CommandBar.cpp b/fincept-qt/src/ui/navigation/CommandBar.cppindex 1c29b7a93..abdc7950d 100644--- a/fincept-qt/src/ui/navigation/CommandBar.cpp+++ b/fincept-qt/src/ui/navigation/CommandBar.cpp@@ -1,6 +1,7 @@#include "ui/navigation/CommandBar.h"#include "core/events/EventBus.h"+#include "core/keys/KeyConfigManager.h"#include "network/http/HttpClient.h"#include "ui/theme/Theme.h"#include "ui/theme/ThemeManager.h"@@ -525,6 +526,75 @@ CommandBar::CommandBar(QWidget* parent) : QWidget(parent) {connect(&ThemeManager::instance(), &ThemeManager::theme_changed, this,[this](const ThemeTokens&) { refresh_theme(); });++ setup_key_actions();+}++void CommandBar::setup_key_actions() {+ auto& km = KeyConfigManager::instance();++ auto* act_down = km.action(KeyAction::NavNext);+ connect(act_down, &QAction::triggered, this, [this]() {+ const int count = list_->count();+ if (count > 0)+ list_->setCurrentRow((list_->currentRow() + 1) % count);+ });++ auto* act_up = km.action(KeyAction::NavPrev);+ connect(act_up, &QAction::triggered, this, [this]() {+ const int count = list_->count();+ if (count > 0)+ list_->setCurrentRow((list_->currentRow() - 1 + count) % count);+ });++ auto* act_tab = km.action(KeyAction::NavAccept);+ connect(act_tab, &QAction::triggered, this, [this]() {+ if (!list_->currentItem())+ return;+ const QString autocomplete = list_->currentItem()->data(Qt::UserRole + 1).toString();+ if (mode_ == Mode::SlashPicker) {+ input_->setText(autocomplete);+ for (const auto& at : asset_types_) {+ if (at.slash == autocomplete) {+ activate_asset_mode(at.api_type);+ input_->setText(autocomplete + " ");+ input_->setCursorPosition(input_->text().length());+ break;+ }+ }+ } else if (mode_ == Mode::DockSecondary && !dock_primary_id_.isEmpty() && !dock_verb_.isEmpty()) {+ 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()) {+ 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 {+ input_->setText(autocomplete);+ hide_dropdown();+ }+ });++ auto* act_esc = km.action(KeyAction::NavEscape);+ connect(act_esc, &QAction::triggered, this, [this]() {+ input_->clear();+ mode_ = Mode::Screen;+ active_asset_type_.clear();+ dock_primary_id_.clear();+ dock_verb_.clear();+ search_debounce_->stop();+ hide_dropdown();+ input_->clearFocus();+ });}void CommandBar::refresh_theme() {@@ -545,75 +615,7 @@ bool CommandBar::eventFilter(QObject* obj, QEvent* event) {auto* ke = static_cast<QKeyEvent*>(event);const int count = list_->count();- switch (ke->key()) {- case Qt::Key_Down:- if (count > 0) {- int next = (list_->currentRow() + 1) % count;- list_->setCurrentRow(next);- }- return true;-- case Qt::Key_Up:- if (count > 0) {- int prev = (list_->currentRow() - 1 + count) % count;- list_->setCurrentRow(prev);- }- return true;-- case Qt::Key_Tab:- if (list_->currentItem()) {- const QString autocomplete = list_->currentItem()->data(Qt::UserRole + 1).toString();- 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);- 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();- }- }- return true;-- case Qt::Key_Escape:- input_->clear();- mode_ = Mode::Screen;- active_asset_type_.clear();- dock_primary_id_.clear();- dock_verb_.clear();- search_debounce_->stop();- hide_dropdown();- input_->clearFocus();- return true;-- default:- break;- }+ // Navigation keys are handled via KeyConfigManager QActions (connected in setup_key_actions)return QWidget::eventFilter(obj, event);}diff --git a/fincept-qt/src/ui/navigation/CommandBar.h b/fincept-qt/src/ui/navigation/CommandBar.hindex 0a5c293d2..d32c78e9a 100644--- a/fincept-qt/src/ui/navigation/CommandBar.h+++ b/fincept-qt/src/ui/navigation/CommandBar.h@@ -93,6 +93,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+ // ── Key actions ───────────────────────────────────────────────────────────+ void setup_key_actions();+// ── Theme ─────────────────────────────────────────────────────────────────void refresh_theme();diff --git a/fincept-qt/tests/MarketSentimentSupportTest.cpp b/fincept-qt/tests/MarketSentimentSupportTest.cppdeleted file mode 100644index 9839aa1ba..000000000--- a/fincept-qt/tests/MarketSentimentSupportTest.cpp+++ /dev/null@@ -1,138 +0,0 @@-#include "services/equity/MarketSentimentSupport.h"--#include <QJsonArray>-#include <QJsonObject>--#include <iostream>--using fincept::services::equity::MarketSentimentSnapshot;-using fincept::services::equity::SentimentSourceSnapshot;-using fincept::services::equity::sentiment::compute_source_alignment;-using fincept::services::equity::sentiment::parse_compare_payload;-using fincept::services::equity::sentiment::source_has_signal;-using fincept::services::equity::sentiment::snapshot_from_json;-using fincept::services::equity::sentiment::snapshot_to_json;--namespace {--bool expect(bool condition, const char* message) {- if (!condition) {- std::cerr << "FAILED: " << message << '\n';- return false;- }- return true;-}--bool test_parse_compare_payload() {- QJsonObject stock;- stock["ticker"] = "AAPL";- stock["buzz_score"] = 63.5;- stock["bullish_pct"] = 68.0;- stock["sentiment_score"] = 0.42;- stock["mentions"] = 123;-- QJsonObject payload;- payload["stocks"] = QJsonArray{stock};-- const auto snapshot = parse_compare_payload("reddit", payload);- return expect(snapshot.available, "reddit source should be available") &&- expect(snapshot.source_id == "reddit", "reddit source id should round-trip") &&- expect(snapshot.label == "Reddit", "reddit label should be humanized") &&- expect(snapshot.buzz_score == 63.5, "buzz score should be parsed") &&- expect(snapshot.bullish_pct == 68.0, "bullish pct should be parsed") &&- expect(snapshot.sentiment_score == 0.42, "sentiment score should be parsed") &&- expect(snapshot.activity_count == 123.0, "mentions should backfill activity count");-}--bool test_polymarket_activity_fallback() {- QJsonObject stock;- stock["ticker"] = "TSLA";- stock["buzz_score"] = 58.0;- stock["bullish_pct"] = 55.0;- stock["trade_count"] = 87;-- QJsonObject payload;- payload["stocks"] = QJsonArray{stock};-- const auto snapshot = parse_compare_payload("polymarket", payload);- return expect(snapshot.available, "polymarket source should be available") &&- expect(snapshot.activity_count == 87.0, "trade_count should backfill activity count");-}--bool test_placeholder_payload_is_not_available() {- QJsonObject stock;- stock["ticker"] = "MSFT";- stock["buzz_score"] = 0.0;- stock["bullish_pct"] = 0.0;- stock["sentiment_score"] = 0.0;- stock["mentions"] = 0;-- QJsonObject payload;- payload["stocks"] = QJsonArray{stock};-- const auto snapshot = parse_compare_payload("news", payload);- return expect(!snapshot.available, "placeholder payload should not count as available coverage") &&- expect(!source_has_signal(snapshot), "placeholder payload should not be treated as signal");-}--bool test_alignment_and_roundtrip() {- SentimentSourceSnapshot reddit;- reddit.source_id = "reddit";- reddit.label = "Reddit";- reddit.available = true;- reddit.bullish_pct = 70.0;-- SentimentSourceSnapshot news;- news.source_id = "news";- news.label = "News";- news.available = true;- news.bullish_pct = 66.0;-- SentimentSourceSnapshot x;- x.source_id = "x";- x.label = "X";- x.available = true;- x.bullish_pct = 48.0;-- const auto alignment = compute_source_alignment({reddit, news, x});- if (!expect(alignment == "mixed", "alignment should detect moderate source dispersion")) {- return false;- }-- MarketSentimentSnapshot snapshot;- snapshot.symbol = "AAPL";- snapshot.configured = true;- snapshot.available = true;- snapshot.status = "ok";- snapshot.message = "";- snapshot.average_buzz = 61.2;- snapshot.average_bullish_pct = 61.3;- snapshot.coverage = 3;- snapshot.source_alignment = alignment;- snapshot.sources = {reddit, news, x};- snapshot.fetched_at = "2026-04-09T12:00:00Z";-- const auto restored = snapshot_from_json(snapshot_to_json(snapshot));- return expect(restored.symbol == "AAPL", "symbol should survive serialization") &&- expect(restored.coverage == 3, "coverage should survive serialization") &&- expect(restored.sources.size() == 3, "sources should survive serialization") &&- expect(restored.source_alignment == "mixed", "alignment should survive serialization");-}--} // namespace--int main() {- if (!test_parse_compare_payload()) {- return 1;- }- if (!test_polymarket_activity_fallback()) {- return 1;- }- if (!test_placeholder_payload_is_not_available()) {- return 1;- }- if (!test_alignment_and_roundtrip()) {- return 1;- }- return 0;-}