Fix bulleting images

errortek · Jan 8, 2024 · 7a159b9 · 7a159b9
1 parent 4c43045
commit 7a159b9
Show file tree

Hide file tree

Showing 18 changed files with 43 additions and 9 deletions.
diff --git a/App.xaml b/App.xaml
@@ -29,6 +29,27 @@
  <Setter Property="Background" Value="Transparent" />
  <Setter Property="BorderThickness" Value="0" />
  </Style>
+ <ResourceDictionary.ThemeDictionaries>
+
+ <ResourceDictionary x:Key="Light">
+ <x:String x:Key="abc">ms-appx:///Assets/listnumbersimages/abc.png</x:String>
+ <x:String x:Key="ABCB">ms-appx:///Assets/listnumbersimages/ABCB.png</x:String>
+ <x:String x:Key="dot">ms-appx:///Assets/listnumbersimages/dot.png</x:String>
+ <x:String x:Key="iii">ms-appx:///Assets/listnumbersimages/iii.png</x:String>
+ <x:String x:Key="IIII">ms-appx:///Assets/listnumbersimages/IIII.png</x:String>
+ <x:String x:Key="none">ms-appx:///Assets/listnumberismages/none.png</x:String>
+ <x:String x:Key="number">ms-appx:///Assets/listnumbersimages/number.png</x:String>
+ </ResourceDictionary>
+ <ResourceDictionary x:Key="Dark">
+ <x:String x:Key="abc">ms-appx:///Assets/listnumbersimages/Dark/abc.png</x:String>
+ <x:String x:Key="ABCB">ms-appx:///Assets/listnumbersimages/Dark/ABCB.png</x:String>
+ <x:String x:Key="dot">ms-appx:///Assets/listnumbersimages/Dark/dot.png</x:String>
+ <x:String x:Key="iii">ms-appx:///Assets/listnumbersimages/Dark/iii.png</x:String>
+ <x:String x:Key="IIII">ms-appx:///Assets/listnumbersimages/Dark/IIII.png</x:String>
+ <x:String x:Key="none">ms-appx:///Assets/listnumbersimages/Dark/none.png</x:String>
+ <x:String x:Key="number">ms-appx:///Assets/listnumbersimages/Dark/number.png</x:String>
+ </ResourceDictionary>
+ </ResourceDictionary.ThemeDictionaries>
  </ResourceDictionary>
  </Application.Resources>
 </Application>
diff --git a/Assets/listnumbersimages/ABCB.png b/Assets/listnumbersimages/ABCB.png
diff --git a/Assets/listnumbersimages/IIII.png b/Assets/listnumbersimages/IIII.png
diff --git a/Assets/listnumbersimages/abc.png b/Assets/listnumbersimages/abc.png
diff --git a/Assets/listnumbersimages/dark/ABCB.png b/Assets/listnumbersimages/dark/ABCB.png
diff --git a/Assets/listnumbersimages/dark/IIII.png b/Assets/listnumbersimages/dark/IIII.png
diff --git a/Assets/listnumbersimages/dark/abc.png b/Assets/listnumbersimages/dark/abc.png
diff --git a/Assets/listnumbersimages/dark/dot.png b/Assets/listnumbersimages/dark/dot.png
diff --git a/Assets/listnumbersimages/dark/iii.png b/Assets/listnumbersimages/dark/iii.png
diff --git a/Assets/listnumbersimages/dark/none.png b/Assets/listnumbersimages/dark/none.png
diff --git a/Assets/listnumbersimages/dark/number.png b/Assets/listnumbersimages/dark/number.png
diff --git a/Assets/listnumbersimages/dot.png b/Assets/listnumbersimages/dot.png
diff --git a/Assets/listnumbersimages/iii.png b/Assets/listnumbersimages/iii.png
diff --git a/Assets/listnumbersimages/none.png b/Assets/listnumbersimages/none.png
diff --git a/Assets/listnumbersimages/number.png b/Assets/listnumbersimages/number.png
diff --git a/UltraTextEdit UWP.csproj b/UltraTextEdit UWP.csproj
@@ -296,6 +296,20 @@
  <Content Include="Assets\LargeTile.scale-150.png" />
  <Content Include="Assets\LargeTile.scale-200.png" />
  <Content Include="Assets\LargeTile.scale-400.png" />
+ <Content Include="Assets\listnumbersimages\abc.png" />
+ <Content Include="Assets\listnumbersimages\ABCB.png" />
+ <Content Include="Assets\listnumbersimages\dark\abc.png" />
+ <Content Include="Assets\listnumbersimages\dark\ABCB.png" />
+ <Content Include="Assets\listnumbersimages\dark\dot.png" />
+ <Content Include="Assets\listnumbersimages\dark\iii.png" />
+ <Content Include="Assets\listnumbersimages\dark\IIII.png" />
+ <Content Include="Assets\listnumbersimages\dark\none.png" />
+ <Content Include="Assets\listnumbersimages\dark\number.png" />
+ <Content Include="Assets\listnumbersimages\dot.png" />
+ <Content Include="Assets\listnumbersimages\iii.png" />
+ <Content Include="Assets\listnumbersimages\IIII.png" />
+ <Content Include="Assets\listnumbersimages\none.png" />
+ <Content Include="Assets\listnumbersimages\number.png" />
  <Content Include="Assets\rtf-icon.png" />
  <Content Include="Assets\SmallTile.scale-100.png" />
  <Content Include="Assets\SmallTile.scale-125.png" />

diff --git a/Views/MainPage.xaml b/Views/MainPage.xaml
@@ -768,7 +768,6 @@ ToolTipService.ToolTip="Save">
  <Setter Property="MinHeight" Value="0"/>
  <Setter Property="Margin" Value="6"/>
  <Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}"/>
- <Setter Property="Background" Value="White"/>
  </Style>
  </Grid.Resources>
  <Grid.RowDefinitions>
@@ -783,25 +782,25 @@ ToolTipService.ToolTip="Save">
  <ColumnDefinition Width="Auto"/>
  </Grid.ColumnDefinitions>
  <Button x:Name="NoneNumeral" Grid.Row="0" Grid.Column="0" Click="NoneNumeral_Click" Width="64" Height="64">
- <Image x:Name="NoneNumeralImg" Source="/Assets/listnumbersimages/none.png" Width="60" Height="60" />
+ <Image x:Name="NoneNumeralImg" Source="{ThemeResource ResourceKey=none}" Width="60" Height="60" />
  </Button>
  <Button x:Name="DottedNumeral" Grid.Row="0" Grid.Column="1" Click="DottedNumeral_Click" Width="64" Height="64">
- <Image x:Name="DottedNumeralImg" Source="/Assets/listnumbersimages/dot.bmp" Width="60" Height="60" />
+ <Image x:Name="DottedNumeralImg" Source="{ThemeResource ResourceKey=dot}" Width="60" Height="60" />
  </Button>
  <Button x:Name="NumberNumeral" Grid.Row="0" Grid.Column="2" Click="NumberNumeral_Click" Height="64" Width="64">
- <Image x:Name="NumberNumeralImg" Source="/Assets/listnumbersimages/number.png" Width="60" Height="60" />
+ <Image x:Name="NumberNumeralImg" Source="{ThemeResource ResourceKey=number}" Width="60" Height="60" />
  </Button>
  <Button x:Name="LetterSmallNumeral" Grid.Row="1" Grid.Column="0" Click="LetterSmallNumeral_Click" Height="64" Width="64">
- <Image x:Name="LetterSmallNumeralImg" Source="/Assets/listnumbersimages/abc.png" Width="60" Height="60" />
+ <Image x:Name="LetterSmallNumeralImg" Source="{ThemeResource ResourceKey=abc}" Width="60" Height="60" />
  </Button>
  <Button x:Name="LetterBigNumeral" Grid.Row="1" Grid.Column="1" Click="LetterBigNumeral_Click" Height="64" Width="64">
- <Image x:Name="LetterBigNumeralImg" Source="/Assets/listnumbersimages/ABCB.png" Width="60" Height="60" />
+ <Image x:Name="LetterBigNumeralImg" Source="{ThemeResource ResourceKey=ABCB}" Width="60" Height="60" />
  </Button>
  <Button x:Name="SmalliNumeral" Grid.Row="1" Grid.Column="2" Click="SmalliNumeral_Click" Height="64" Width="64">
- <Image x:Name="SmalliNumeralImg" Source="/Assets/listnumbersimages/iii.png" Width="64" Height="64" />
+ <Image x:Name="SmalliNumeralImg" Source="{ThemeResource ResourceKey=iii}" Width="64" Height="64" />
  </Button>
  <Button x:Name="BigINumeral" Grid.Row="2" Grid.Column="0" Click="BigINumeral_Click" Height="64" Width="64">
- <Image x:Name="BigINumeralImg" Source="/Assets/listnumbersimages/IIII.png" Width="64" Height="64" />
+ <Image x:Name="BigINumeralImg" Source="{ThemeResource ResourceKey=IIII}" Width="64" Height="64" />
  </Button>
  </Grid>
  </Flyout>

diff --git a/Views/utever.xaml b/Views/utever.xaml
@@ -73,7 +73,7 @@
  Grid.Column="1"
  Foreground="{ThemeResource SystemControlDisabledBaseMediumLowBrush}"
  Grid.Row="3"
- Text="07/01/2024"/>
+ Text="08/01/2024"/>
  <TextBlock Margin="0,0,20,5" Grid.Row="4" x:Uid="OSBuild" Text="Build"/>
  <TextBlock 
  Name="Build"