Merge pull request #73 from OpenAstroTech/remove-metro

Remove MahApps.Metro, add custom theme engine (V1.2.0)

Author: ClutchplateDude

.claude/settings.json

@@ -0,0 +1,8 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(powershell -ExecutionPolicy Bypass -File \"c:\\\\Users\\\\Lutz.KRETZSCHMAR\\\\Source\\\\OpenAstroTracker-Desktop\\\\fix_novas.ps1\")",
+      "Bash(powershell -ExecutionPolicy Bypass -File \"c:\\\\Users\\\\Lutz.KRETZSCHMAR\\\\Source\\\\OpenAstroTracker-Desktop\\\\fix_connect2.ps1\")"
+    ]
+  }
+}

CLAUDE.md

@@ -22,7 +22,7 @@ Requires .NET Framework 4.0 targeting pack and ASCOM Platform 6.5+. Output: `ASC
 nuget restore OATControl/OATControl.sln
 msbuild OATControl/OATControl.sln /p:Configuration=Debug /p:Platform="Any CPU"
 ```
-Requires .NET Framework 4.7.2. Includes OATCommunications, OATCommunications.WPF, OATCommunications.ASCOM, and OATTest projects.
+Requires .NET Framework 4.7.2. Includes OATCommunications, OATCommunications.WPF, OATCommunications.ASCOM, and OATTest projects. Current version is 1.2.0.0. Must be built in Visual Studio on Windows (not available in WSL).
 
 ### OATSimulation (`OATSimulation/OATSimulation.sln`)
 ```bash
@@ -42,7 +42,7 @@ No unit test projects. Validation uses:
 
 ```
 Client Applications
-├── OATControl (WPF)        — Main mount control UI, MahApps.Metro
+├── OATControl (WPF)        — Main mount control UI, custom theming
 ├── OATTest (WPF)           — Protocol test harness
 ├── OATSimulation (WPF)     — 3D mount visualization (SharpDX)
 └── ASCOM.Driver (WinForms) — ASCOM telescope/focuser driver
@@ -87,6 +87,36 @@ Response types: `NoResponse`, `DigitResponse` (single char), `FullResponse` (`#`
 - `ASCOM.Driver/OpenAstroTracker/SharedResources.cs` — Profile management, logging, connection init
 - `OATControl/ViewModels/MountVM.cs` — Main OATControl application logic
 
+## Theming System
+
+Custom theme engine (MahApps.Metro fully removed). Supports runtime switching, user themes, hot-reload, and a built-in theme editor. The `AppPrimaryColor`/`AppPrimaryBrush` keys have been removed — all references migrated to semantic keys (`AppForegroundBrush`, `AppButtonBorderBrush`, `AppButtonHoverBrush`, etc.).
+
+### Theme file structure
+- Theme XAML files contain **only `Color` resources** (no brushes)
+- `SolidColorBrush` resources are generated at runtime by `ThemeManager.GenerateBrushes`
+- `ThemeColorDefinitions.cs` defines all color keys, display names, groups, and defaults
+- Brush key naming: `AppXxxColor` → `AppXxxBrush` (via `BrushKeyFromColorKey`)
+
+### Key files
+- `OATControl/Theming/ThemeManager.cs` — Runtime theme loading, brush generation, user theme CRUD
+- `OATControl/Theming/ThemeColorDefinitions.cs` — Color key registry (used by editor, validation, import/export)
+- `OATControl/Resources/Themes/Base.xaml` — Implicit control styles (templates, triggers using DynamicResource)
+- `OATControl/Resources/Themes/DarkAstronomy.xaml` — Dark theme (colors only)
+- `OATControl/Resources/Themes/Daylight.xaml` — Light theme (colors only)
+- `OATControl/DlgThemeEditor.xaml/.cs` — Theme editor dialog (color picker, live preview, save/export)
+
+### User themes
+- Stored as XAML in `%AppData%\OpenAstroTracker\Themes\`
+- Filename is file-safe (non-alphanumeric → `_`), metadata `ThemeName` stores display name
+- ThemeManager scans user folder on startup; validates files contain at least one known color key
+
+### DlgThemeEditor notes
+- Editor chrome pinned to Daylight via local ResourceDictionary + GenerateBrushes in Window_Loaded
+- `_editingTheme` = file-safe identifier for ThemeManager; `EditingThemeName` = display name only
+- `_suppressSelectionChanged` prevents SelectionChanged handler during programmatic selection (e.g., "New Theme")
+- ListBox uses `ThemeListEntry` objects with `DisplayMemberPath="DisplayName"` / `SelectedValuePath="Id"`
+- `_updatingPicker` guards against re-entrant picker updates when color changes originate from the picker itself. `OnSelectedColorChanged` must still update `HexColorBox.Text` even when `_updatingPicker` is true, since the hex display is not bound to the model
+
 ## CI/CD
 
 Azure Pipelines (`ASCOM.Driver/azure-pipelines.yml`) triggers on `master`. Builds ASCOM driver in Release, generates InnoSetup installer, publishes artifacts.

OATControl/.claude/settings.local.json

@@ -0,0 +1,8 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(git diff *)",
+      "Bash(grep -v \"Designer\\\\.cs$\")"
+    ]
+  }
+}

OATControl/.editorconfig

@@ -8,7 +8,7 @@ root = true
 
 # Indentation and spacing
 indent_size = 4
-indent_style = tab
+indent_style = space
 tab_width = 4
 
 # New line preferences

OATControl/App.xaml

@@ -6,16 +6,12 @@
     <Application.Resources>
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries>
-				<!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->
-				<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
-				<!-- Accent and AppTheme setting -->
-				<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Red.xaml" />
-				<ResourceDictionary Source="pack://application:,,,/;component/Resources/RedControls.xaml" />
+				<ResourceDictionary Source="pack://application:,,,/OATControl;component/Resources/Themes/Base.xaml" />
+				<ResourceDictionary Source="pack://application:,,,/OATControl;component/Controls/IconButton.xaml" />
 			</ResourceDictionary.MergedDictionaries>
 			<DrawingImage x:Key="WaitingIcon">
 				<DrawingImage.Drawing>
-					<GeometryDrawing Brush="Red">
+					<GeometryDrawing Brush="{DynamicResource AppForegroundBrush}">
 						<GeometryDrawing.Geometry>
 							<Geometry>M0.60101273,29.959071C0.60101268,29.959071,0.60726115,29.959071,0.6150718,29.959071L0.6297169,29.959071 0.63850358,29.959071 0.64318994,29.959071 0.64494708,29.959071 17.834004,29.959071C18.334981,29.959071,18.536,29.959071,18.536,30.259074L18.536,31.562087C18.536,31.962081,18.334981,31.962081,17.834004,31.962081L0.70098832,31.962081C0.20001191,32.063081,-1.7566754E-07,31.962081,1.1368684E-13,31.662078L1.1368684E-13,30.359081C-1.7566754E-07,29.959071,0.20001191,29.959071,0.60101273,29.959071z M9.2179812,17.634044L8.5159864,17.935056C8.4160108,17.935056,6.4119834,18.837051,6.3120078,21.642049L9.2179812,21.642049 12.122978,21.642049C12.023003,18.837051,10.219995,18.035047,10.019007,17.935056z M3.5060097,5.8110187C3.4060036,6.9140179 3.5060097,8.3160298 4.006986,9.6190264 4.6090058,11.322033 6.0109824,12.62503 8.0150098,13.526034L9.4179935,14.12804 10.821008,13.526034C12.825004,12.62503 14.127005,11.322033 14.829001,9.6190264 15.329977,8.3160298 15.329977,6.9140179 15.329977,5.8110187L9.5179996,5.8110187z M1.302001,3.407006L9.2179812,3.407006 17.132985,3.407006C17.132985,3.4070058,20.138995,11.422039,11.42199,14.428044L11.321984,17.434047C11.321984,17.434047,18.134999,19.438051,17.43398,26.652072L17.232991,28.055074 9.1169986,28.055074 1.0020132,28.055074 0.80099442,26.652072C0.10000587,19.438051,6.91299,17.434047,6.91299,17.434047L6.8129839,14.428044C-1.7040091,11.422039,1.302001,3.4070058,1.302001,3.407006z M0.70098832,0L17.834004,0C18.334981,0,18.536,0.10000634,18.536,0.40100195L18.536,1.8040053C18.536,2.2040152,18.334981,2.1040089,17.834004,2.1040087L0.70098832,2.1040087C0.20001191,2.1040089,-1.7566754E-07,2.2040152,1.1368684E-13,1.8040053L1.1368684E-13,0.40100195C-1.7566754E-07,0.10000634,0.20001191,0,0.70098832,0z</Geometry>
 						</GeometryDrawing.Geometry>
@@ -24,7 +20,7 @@
 			</DrawingImage>
 			<DrawingImage x:Key="CompleteIcon">
 				<DrawingImage.Drawing>
-					<GeometryDrawing Brush="Red">
+					<GeometryDrawing Brush="{DynamicResource AppForegroundBrush}">
 						<GeometryDrawing.Geometry>
 							<Geometry>M29.403992,0L32,3.5860286 8.3720093,21.479001 5.7740173,17.895017 5.776001,17.893002 0,9.9110087 3.5079956,7.2570179 9.2829895,15.23602z</Geometry>
 						</GeometryDrawing.Geometry>
@@ -33,7 +29,7 @@
 			</DrawingImage>
 			<DrawingImage x:Key="InProgressIcon">
 				<DrawingImage.Drawing>
-					<GeometryDrawing Brush="Red">
+					<GeometryDrawing Brush="{DynamicResource AppForegroundBrush}">
 						<GeometryDrawing.Geometry>
 							<Geometry>M2,3.8790137L2,26.424095 17.708,15.066054z M12.441894,1.1261289L31.999938,15.054149 12.447936,29.192131 11.275939,27.571153 28.569945,15.066112 11.281921,2.75504z M0,0L21.138,15.054054 0,30.33811z</Geometry>
 						</GeometryDrawing.Geometry>

OATControl/App.xaml.cs

@@ -1,4 +1,4 @@
-using MahApps.Metro;
+using OATControl.Theming;
 using System;
 using System.Windows;
 using System.Threading;
@@ -47,18 +47,13 @@ protected override void OnStartup(StartupEventArgs e)
 				Log.EnableLogging();
 			}
 
-			ThemeManager.AddAccent("RedAccent", new Uri("pack://application:,,,/OATControl;component/Resources/RedAccent.xaml"));
-			ThemeManager.AddAppTheme("RedTheme", new Uri("pack://application:,,,/OATControl;component/Resources/RedTheme.xaml"));
-			ThemeManager.AddAccent("RedControls", new Uri("pack://application:,,,/OATControl;component/Resources/RedControls.xaml"));
-
-			// get the current app style (theme and accent) from the application
-			// you can then use the current theme and custom accent instead set a new theme
-			Tuple<AppTheme, Accent> appStyle = ThemeManager.DetectAppStyle(Application.Current);
-
-			// now set the Green accent and dark theme
-			ThemeManager.ChangeAppStyle(Application.Current,
-										ThemeManager.GetAccent("RedAccent"),
-											ThemeManager.GetAppTheme("RedTheme"));
+			AppSettings.Instance.Load();
+				var savedTheme = AppSettings.Instance.ThemeName;
+				#if DEBUG
+				ThemeManager.Instance.HotReloadEnabled = true;
+				#endif
+				ThemeManager.Instance.ScanUserThemes();
+				ThemeManager.Instance.ApplyTheme(savedTheme);
 
 			base.OnStartup(e);
 

OATControl/CHANGELOG.md

@@ -0,0 +1,105 @@
+# Changelog
+
+## V1.2.0.0
+
+### MahApps.Metro Removal
+
+- Removed MahApps.Metro (v1.6.5) and ControlzEx (v3.0.2.4) NuGet dependencies
+- Removed MahApps.Metro, ControlzEx, and System.Windows.Interactivity assembly references from .csproj
+- Removed MahApps.Metro DLLs from InnoSetup installer (`OATControl Setup.iss`)
+- Deleted legacy theme resource files: `RedAccent.xaml`, `RedControls.xaml`, `RedTheme.xaml`, `GreyControls.xaml`
+
+### Custom Theme Engine
+
+- Created `ThemeManager` singleton (`Theming/ThemeManager.cs`, +377 lines) for runtime theme loading, brush generation, and theme switching
+- Created `ThemeColorDefinitions.cs` — centralized registry of all color keys with display names, groups, and default values
+- `ThemeManager.GenerateBrushes` creates `SolidColorBrush` resources at runtime from theme `Color` resources; also generates `SystemColors` override brushes (`HighlightTextBrushKey`, `ControlTextBrushKey`, `InactiveSelectionHighlightBrushKey`)
+- Brush key naming convention: `AppXxxColor` (Color resource) → `AppXxxBrush` (generated SolidColorBrush)
+- User themes stored as XAML in `%AppData%\OpenAstroTracker\Themes\`; scanned and validated on startup
+- Theme selection persisted in `AppSettings.ThemeName` (defaults to DarkAstronomy)
+- Theme picker added to `DlgAppSettings` General tab with live switching
+- Added `ThemeManager.ImportTheme`/`ExportTheme`/`DeleteTheme` for user theme file management
+
+### Theme Files
+
+- `Resources/Themes/Base.xaml` (+652 lines) — implicit styles for all standard WPF controls: TextBlock, TextBox, Button, CheckBox, RadioButton, ComboBox, TabControl, TabItem, ScrollBar, ProgressBar, ListViewItem, ToggleButton. All use `DynamicResource` for theme-aware binding.
+- `Resources/Themes/DarkAstronomy.xaml` — dark theme with red accent palette (49 color definitions)
+- `Resources/Themes/Daylight.xaml` — light theme with blue accent palette (49 color definitions)
+- Bundled user themes: Blue Planet, Dark Observatory, Deep Space, NINA (`Theming/*.xaml`)
+- Theme XAML files contain only `Color` resources; brushes generated at runtime
+
+### Custom Controls
+
+- **ThemedWindow** (`Controls/ThemedWindow.cs`) — `Window` subclass with `WindowChrome` (`CaptionHeight=30`, `ResizeBorderThickness=4`, `GlassFrameThickness=0`). Replaces `MetroWindow`. Provides borderless window with custom chrome.
+  - `ShowTitleBar` property controls title bar visibility
+  - `TitleBarButtons` collection for custom title bar buttons
+  - `ControlTemplate` in Base.xaml with `WindowCommands` (minimize, maximize, close)
+- **ToggleSwitch** (`Controls/ToggleSwitch.xaml/.cs`) — replaces `MahApps.Metro.Controls.ToggleSwitchButton`. Pill-shaped toggle with sliding thumb. `IsChecked` DP with `ThumbIndicatorBrush` for theme integration.
+- **IconButton** (`Controls/IconButton.xaml/.cs`) — icon-only button control using `ResourceDictionary` style pattern. Replaces MahApps icon button usage.
+- **LabeledToggleSwitch** (`Controls/LabeledToggleSwitch.xaml/.cs`) — ToggleSwitch with label text, used in settings and theme editor.
+- **SlewProgressBar** (`Controls/SlewProgressBar.xaml/.cs`) — reusable progress bar for slew/drift align. Three DPs: `Progress` (double 0-1), `IsActive` (bool), `BarThickness` (double, default 6). Renders as `Border` with `LinearGradientBrush` using theme accent/disabled colors. Replaces 3 inline progress bar implementations in MainWindow.
+
+### Window/Dialog Migration
+
+All 14 windows/dialogs migrated from `MetroWindow` to `ThemedWindow`:
+- MainWindow, DlgAppSettings, DlgAxisCalibration, DlgChecklist, DlgChecklistEditor, DlgChooseOat, DlgCustomActionSetup, DlgEditPoint, DlgMessageBox, DlgNinaPolarAlignment, DlgRunPolarAlignment, DlgRunPolarAlignmentStep1, DlgSharpCapPolarAlignment, DlgWaitForGXState, MiniController, SettingsDialog, SlewPointsWindow, TargetChooser
+
+Each dialog:
+- Replaced `MetroWindow` base with `ThemedWindow`
+- Removed MahApps namespace declarations
+- Replaced `ToggleSwitchButton` instances with `ToggleSwitch`
+
+### Color Migration
+
+- Converted all `StaticResource` brush references to `DynamicResource` across 12+ XAML files for runtime theme switching
+- Replaced all MahApps brush key references (`AccentBaseColorBrush`, `AccentColorBrush2/3/4`, `TextBrush`, `WhiteBrush`, `WindowBackgroundBrush`, `ControlBackgroundBrush`, `HighlightBrush`) with semantic theme keys (`AppForegroundBrush`, `AppPrimaryBrush`, `AppBackgroundBrush`, etc.)
+- Replaced ~287 hardcoded hex color values across 22+ XAML files with `DynamicResource` semantic key bindings
+- Removed `AppPrimaryColor`/`AppPrimaryBrush` — all references migrated to specific semantic keys (`AppForegroundBrush`, `AppButtonBorderBrush`, `AppButtonHoverBrush`, etc.)
+- `ScopeCircles` and `ScopePointer` — converted `Foreground` from CLR property to `DependencyProperty` for `DynamicResource` binding support
+- `MotorIndicator` — refactored to use theme brushes
+
+### Theme Editor (DlgThemeEditor)
+
+- New dialog (`DlgThemeEditor.xaml` 594 lines, `DlgThemeEditor.xaml.cs` 1048 lines) with:
+  - Live preview as mini app window with real themed controls
+  - HSL color picker with interactive saturation/lightness square and hue bar
+  - RGB and HSL slider inputs with bidirectional sync
+  - Hex color textbox (RRGGBB) with bidirectional sync to RGB/HSL sliders
+  - Color key selection grouped by category (Text, Background, Buttons, etc.)
+  - New Theme: clones current theme into editable user theme
+  - Save/Save As: prompts for theme name + author, saves as user theme XAML
+  - Import/Export: file dialogs for sharing theme files
+  - Editor chrome pinned to Daylight theme (doesn't change when editing other themes)
+  - `_updatingPicker` guard prevents re-entrant picker updates; `HexColorBox.Text` still updated during picker-driven changes
+  - `_suppressSelectionChanged` prevents handler during programmatic list selection
+
+### Style Consolidation
+
+- Added semantic `TextBlock` styles to Base.xaml: header, subheader, body, caption styles
+- Unified `ListViewItem` template with consistent selection/hover behavior
+- Consolidated `ToggleButton` and `Button` styles into Base.xaml
+- Renamed button styles to semantic names
+- Added `MetroListBoxItem` named style for `ListBoxItem`
+- Added implicit `ToggleButton` style with themed hover/pressed/checked/disabled states
+
+### Other Changes
+
+- Removed `System.Windows.Forms` dependency; replaced with WPF-native `Microsoft.Win32` file dialogs
+- Removed `DlgStepCalibration.xaml/.cs` (789 lines) — unused dialog
+- Removed unused style resources
+- Fixed `MiniController` layout and styling
+- Cleaned up dialog chrome and removed unused files
+- Version bumped from 1.1.24.0 to 1.2.0.0 (`AssemblyInfo.cs`, `OATControl Setup.iss`)
+- `MountVM.cs` — replaced MahApps `DialogManager.ShowMessageAsync()` with `MessageBox.Show()` for DEC limits dialog
+- `PushButton.xaml`/`StopButton.xaml` — removed MahApps converter imports, migrated all brush references to DynamicResource
+- `RangeSlider.xaml/.cs` — tick color properties (`MajorTickColor`, `MinorTickColor`, `TickLabelColor`) converted from CLR properties to `DependencyProperty`s for `DynamicResource` binding
+- `RangeSlider.xaml` — replaced ~12 hardcoded `SolidColorBrush` resources with theme-derived bindings
+- `MotorIndicator.cs` — added `DisabledForeground` DP; control visually dims when mount is disconnected
+- `ThemedWindow.cs` — automatic `Background`/`Foreground` binding via `SetResourceReference`; tinted icon support in title bar; `OnShowTitleBarChanged` dynamically toggles `WindowChrome.CaptionHeight`
+- `DlgChecklist.xaml` — replaced `BoolToBrushConverter` with `DataTrigger`-based Foreground bindings for correct `DynamicResource` resolution
+- `App.xaml` status icons (`WaitingIcon`, `CompleteIcon`, `InProgressIcon`) changed from hardcoded `Brush="Red"` to `DynamicResource AppForegroundBrush`
+- `TargetChooser.xaml` — fixed out-of-theme cyan hover border by inheriting implicit `ListViewItem` style
+- Dialogs set `TitleBarButtons="Close"` where minimize/maximize are inappropriate (DlgAppSettings, DlgAxisCalibration, DlgChooseOat, DlgChecklistEditor, DlgMessageBox)
+- Chromeless windows (`ShowTitleBar=False`): DlgChecklist, MiniController, SlewPointsWindow
+- ThemeManager hot-reload: `FileSystemWatcher` monitors theme XAML in DEBUG builds for instant preview during development
+- Installer: ships bundled user themes to `%AppData%\OpenAstroTracker\Themes\` with `onlyifdoesntexist` flag