Skip to content

fix: dark theme for MigrationStatusWindow and firmware upload overlay #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tylerkron merged 3 commits into from
Apr 26, 2026
Merged

fix: dark theme for MigrationStatusWindow and firmware upload overlay #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d00460
fix: dark theme for MigrationStatusWindow and firmware upload overlay
tylerkron Apr 26, 2026
8067ad4
Merge branch 'main' into fix/dark-theme-migration-and-firmware-dialogs
tylerkron Apr 26, 2026
1be4c7f
fix: address Qodo feedback on dark theme PR
tylerkron Apr 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Daqifi.Desktop/Resources/DesignTokens.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,7 @@
<SolidColorBrush x:Key="StatusAmber" Color="#F59E0B"/>
<SolidColorBrush x:Key="StatusRed" Color="#F43F5E"/>

<!-- Overlays -->
<SolidColorBrush x:Key="Scrim" Color="#CC000000"/>

</ResourceDictionary>
12 changes: 9 additions & 3 deletions Daqifi.Desktop/View/FirmwareDialog.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,22 @@
<Button DockPanel.Dock="Bottom" Content="Upload" Width="100" Height="30" HorizontalAlignment="Right" Style="{StaticResource MahApps.Styles.Button.Square.Accent }" controls:ControlsHelper.ContentCharacterCasing="Normal" Command="{Binding UploadFirmwareCommand}"/>
</DockPanel>

<Grid Grid.RowSpan="4" Background="#ccffffff" Visibility="{Binding IsFirmwareUploading, Converter={StaticResource BoolToVis}}" >
<Grid Grid.RowSpan="4" Background="{StaticResource Scrim}" Visibility="{Binding IsFirmwareUploading, Converter={StaticResource BoolToVis}}" >
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<controls:MetroProgressBar Grid.Row="1" Height="25" Minimum="0" Maximum="100" Value="{Binding UploadFirmwareProgress}" />
<Label Grid.Row="2" Content="Loading Firmware... (this may take several minutes)." HorizontalAlignment="Center" />
<Label Grid.Row="3" Content="{Binding UploadFirmwareProgressText}" HorizontalAlignment="Center" />
<Label Grid.Row="2"
Content="Loading Firmware... (this may take several minutes)."
HorizontalAlignment="Center"
Foreground="{StaticResource TextPrimary}" />
<Label Grid.Row="3"
Content="{Binding UploadFirmwareProgressText}"
HorizontalAlignment="Center"
Foreground="{StaticResource TextPrimary}" />
</Grid>
</Grid>

Expand Down
12 changes: 8 additions & 4 deletions Daqifi.Desktop/View/MigrationStatusWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,28 @@
WindowStyle="None"
ResizeMode="NoResize"
SizeToContent="WidthAndHeight"
Background="White"
Background="{StaticResource Surface}"
Topmost="True"
AllowsTransparency="True">
<Border BorderBrush="#E0E0E0" BorderThickness="1" CornerRadius="4" Padding="32,24">
<Border Background="{StaticResource Surface}"
BorderBrush="{StaticResource BorderDim}"
BorderThickness="1"
CornerRadius="4"
Padding="32,24">
<StackPanel HorizontalAlignment="Center">
<Image Source="/Images/DAQiFi.png"
Width="200"
Margin="0,0,0,16"
RenderOptions.BitmapScalingMode="HighQuality" />
<TextBlock Text="Upgrading database, please wait..."
FontSize="14"
Foreground="#555555"
Foreground="{StaticResource TextSecondary}"
HorizontalAlignment="Center"
Margin="0,0,0,12" />
<ProgressBar IsIndeterminate="True"
Height="4"
Width="200"
Foreground="#3498db" />
Foreground="{StaticResource Accent}" />
</StackPanel>
</Border>
</Window>
Loading