Skip to content

Commit 60b6ef0

Browse files
United600United600
committed
remove unnecessary names and backgrounds
1 parent 9aafcb9 commit 60b6ef0

5 files changed

Lines changed: 61 additions & 67 deletions

File tree

‎src/Notepads/Views/Settings/AboutPage.xaml‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
Background="{ThemeResource SystemControlForegroundTransparentBrush}"
87
mc:Ignorable="d">
98

109
<Grid>
@@ -26,8 +25,8 @@
2625
VerticalScrollMode="Auto">
2726
<StackPanel Margin="{StaticResource SettingsPageFooterMargin}" HorizontalAlignment="Left">
2827

29-
<!-- About -->
30-
<StackPanel Orientation="Horizontal" Style="{StaticResource SettingsSectionStyle}">
28+
<!-- About -->
29+
<StackPanel Style="{StaticResource SettingsSectionStyle}" Orientation="Horizontal">
3130
<Image x:Name="AppIconImage" Width="90" Margin="-6,0,12,0" Source="/Assets/appicon_ws.png" />
3231
<StackPanel>
3332
<TextBlock
@@ -42,50 +41,50 @@
4241
</StackPanel>
4342
</StackPanel>
4443

45-
<!-- Description & Related Links -->
44+
<!-- Description & Related Links -->
4645
<StackPanel Style="{StaticResource SettingsSectionStyle}" Spacing="8">
4746
<TextBlock x:Uid="/Settings/AboutPage_NotepadsShortDescription" Margin="0,0,0,8" TextWrapping="Wrap" />
4847
<StackPanel Spacing="-4">
4948
<TextBlock x:Uid="/Settings/AboutPage_Notepads_SourceCodeTitle" TextWrapping="Wrap" />
50-
<HyperlinkButton Content="https://github.com/0x7c13/Notepads" NavigateUri="https://github.com/0x7c13/Notepads" Style="{StaticResource TextBlockButtonStyle}" />
49+
<HyperlinkButton Content="https://github.com/0x7c13/Notepads" NavigateUri="https://github.com/0x7c13/Notepads" />
5150
</StackPanel>
5251
<StackPanel Spacing="-4">
5352
<TextBlock x:Uid="/Settings/AboutPage_Notepads_WebsiteTitle" TextWrapping="Wrap" />
54-
<HyperlinkButton Content="https://www.NotepadsApp.com" NavigateUri="https://www.NotepadsApp.com" Style="{StaticResource TextBlockButtonStyle}" />
53+
<HyperlinkButton Content="https://www.NotepadsApp.com" NavigateUri="https://www.NotepadsApp.com" />
5554
</StackPanel>
5655
<StackPanel Spacing="-4">
5756
<TextBlock x:Uid="/Settings/AboutPage_Notepads_AuthorContactsTitle" TextWrapping="Wrap" />
58-
<HyperlinkButton Content="NotepadsApp@outlook.com" NavigateUri="mailto:NotepadsApp@outlook.com" Style="{StaticResource TextBlockButtonStyle}" />
59-
<HyperlinkButton Content="Discord" NavigateUri="https://discord.gg/VqetCub" Style="{StaticResource TextBlockButtonStyle}" />
57+
<HyperlinkButton Content="NotepadsApp@outlook.com" NavigateUri="mailto:NotepadsApp@outlook.com" />
58+
<HyperlinkButton Content="Discord" NavigateUri="https://discord.gg/VqetCub" />
6059
</StackPanel>
6160
<StackPanel Spacing="-4">
6261
<TextBlock x:Uid="/Settings/AboutPage_Notepads_IssueAndFeatureRequestsTitle" TextWrapping="Wrap" />
63-
<HyperlinkButton Content="https://github.com/0x7c13/Notepads/issues" NavigateUri="https://github.com/0x7c13/Notepads/issues" Style="{StaticResource TextBlockButtonStyle}" />
62+
<HyperlinkButton Content="https://github.com/0x7c13/Notepads/issues" NavigateUri="https://github.com/0x7c13/Notepads/issues" />
6463
</StackPanel>
6564
</StackPanel>
6665

67-
<!-- Changelog -->
68-
<StackPanel x:Name="ChangelogPanel" Style="{StaticResource SettingsSectionStyle}">
66+
<!-- Changelog -->
67+
<StackPanel Style="{StaticResource SettingsSectionStyle}">
6968
<TextBlock x:Uid="/Settings/AboutPage_ChangelogUrl_Title" Margin="0,0,0,4" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
70-
<HyperlinkButton Content="Notepads Releases" NavigateUri="https://github.com/0x7c13/Notepads/releases" Style="{StaticResource TextBlockButtonStyle}" />
69+
<HyperlinkButton Content="Notepads Releases" NavigateUri="https://github.com/0x7c13/Notepads/releases" />
7170
</StackPanel>
7271

73-
<!-- Dependencies & References -->
74-
<StackPanel x:Name="DependenciesAndReferencesPanel" Style="{StaticResource SettingsSectionStyle}">
72+
<!-- Dependencies & References -->
73+
<StackPanel Style="{StaticResource SettingsSectionStyle}">
7574
<TextBlock x:Uid="/Settings/AboutPage_DependenciesAndReferences_Title" Margin="0,0,0,4" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
7675
<StackPanel Spacing="-4">
77-
<HyperlinkButton Content="Windows UI Library" NavigateUri="https://github.com/Microsoft/microsoft-ui-xaml" Style="{StaticResource TextBlockButtonStyle}" />
78-
<HyperlinkButton Content="Windows Community Toolkit" NavigateUri="https://github.com/windows-toolkit/WindowsCommunityToolkit" Style="{StaticResource TextBlockButtonStyle}" />
79-
<HyperlinkButton Content="XAML Controls Gallery" NavigateUri="https://github.com/microsoft/Xaml-Controls-Gallery" Style="{StaticResource TextBlockButtonStyle}" />
80-
<HyperlinkButton Content="ColorCode Universal" NavigateUri="https://github.com/WilliamABradley/ColorCode-Universal" Style="{StaticResource TextBlockButtonStyle}" />
81-
<HyperlinkButton Content="UTF Unknown" NavigateUri="https://github.com/CharsetDetector/UTF-unknown" Style="{StaticResource TextBlockButtonStyle}" />
82-
<HyperlinkButton Content="DiffPlex" NavigateUri="https://github.com/mmanela/diffplex" Style="{StaticResource TextBlockButtonStyle}" />
83-
<HyperlinkButton Content="Win2D" NavigateUri="https://github.com/microsoft/Win2D" Style="{StaticResource TextBlockButtonStyle}" />
76+
<HyperlinkButton Content="Windows UI Library" NavigateUri="https://github.com/Microsoft/microsoft-ui-xaml" />
77+
<HyperlinkButton Content="Windows Community Toolkit" NavigateUri="https://github.com/windows-toolkit/WindowsCommunityToolkit" />
78+
<HyperlinkButton Content="XAML Controls Gallery" NavigateUri="https://github.com/microsoft/Xaml-Controls-Gallery" />
79+
<HyperlinkButton Content="ColorCode Universal" NavigateUri="https://github.com/WilliamABradley/ColorCode-Universal" />
80+
<HyperlinkButton Content="UTF Unknown" NavigateUri="https://github.com/CharsetDetector/UTF-unknown" />
81+
<HyperlinkButton Content="DiffPlex" NavigateUri="https://github.com/mmanela/diffplex" />
82+
<HyperlinkButton Content="Win2D" NavigateUri="https://github.com/microsoft/Win2D" />
8483
</StackPanel>
8584
</StackPanel>
8685

87-
<!-- Disclamer -->
88-
<StackPanel x:Name="DisclaimerPanel" Style="{StaticResource SettingsSectionStyle}">
86+
<!-- Disclamer -->
87+
<StackPanel Style="{StaticResource SettingsSectionStyle}">
8988
<TextBlock x:Uid="/Settings/AboutPage_Disclaimer_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
9089
<RichTextBlock MaxWidth="600" IsTextSelectionEnabled="False">
9190
<Paragraph>

‎src/Notepads/Views/Settings/AdvancedSettingsPage.xaml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
77
xmlns:utilities="using:Notepads.Utilities"
8-
Background="{ThemeResource SystemControlForegroundTransparentBrush}"
98
mc:Ignorable="d">
109

1110
<Grid>
@@ -27,24 +26,24 @@
2726
VerticalScrollMode="Auto">
2827
<StackPanel Margin="{StaticResource SettingsPageFooterMargin}" HorizontalAlignment="Left">
2928

30-
<!-- Status Bar -->
31-
<StackPanel x:Name="StatusBarSettingsPanel" Style="{StaticResource SettingsSectionStyle}">
29+
<!-- Status Bar -->
30+
<StackPanel Style="{StaticResource SettingsSectionStyle}">
3231
<TextBlock x:Uid="/Settings/AdvancedPage_StatusBarSettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
3332
<StackPanel>
3433
<ToggleSwitch x:Name="ShowStatusBarToggleSwitch" x:Uid="/Settings/AdvancedPage_StatusBarSettings_ShowHideStatusBarToggleSwitch" Style="{StaticResource CustomToggleSwitchStyle}" />
3534
</StackPanel>
3635
</StackPanel>
3736

38-
<!-- Smart Copy -->
39-
<StackPanel x:Name="SmartCopySettingsPanel" Style="{StaticResource SettingsSectionStyle}">
37+
<!-- Smart Copy -->
38+
<StackPanel Style="{StaticResource SettingsSectionStyle}">
4039
<TextBlock x:Uid="/Settings/AdvancedPage_SmartCopySettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
4140
<StackPanel>
4241
<ToggleSwitch x:Name="EnableSmartCopyToggleSwitch" x:Uid="/Settings/AdvancedPage_SmartCopySettings_EnableSmartCopyToggleSwitch" Style="{StaticResource CustomToggleSwitchStyle}" />
4342
<TextBlock x:Uid="/Settings/AdvancedPage_SmartCopySettings_Description" Style="{ThemeResource DescriptionTextBlockStyle}" />
4443
</StackPanel>
4544
</StackPanel>
4645

47-
<!-- Session Snapshot -->
46+
<!-- Session Snapshot -->
4847
<StackPanel x:Name="SessionSnapshotSettingsPanel" Style="{StaticResource SettingsSectionStyle}">
4948
<TextBlock x:Name="SessionSnapshotSettingsTitle" x:Uid="/Settings/AdvancedPage_SessionSnapshotSettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
5049
<StackPanel x:Name="SessionSnapshotSettingsControls">
@@ -53,7 +52,7 @@
5352
</StackPanel>
5453
</StackPanel>
5554

56-
<!-- Launch -->
55+
<!-- Launch -->
5756
<StackPanel x:Name="LaunchPreferenceSettingsPanel" Style="{StaticResource SettingsSectionStyle}">
5857
<TextBlock x:Name="LaunchPreferenceSettingsTitle" x:Uid="/Settings/AdvancedPage_LaunchPreferenceSettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
5958
<StackPanel x:Name="LaunchPreferenceSettingsControls">
@@ -66,8 +65,8 @@
6665
</StackPanel>
6766
</StackPanel>
6867

69-
<!-- Language -->
70-
<StackPanel x:Name="LanguagePreferenceSettingsPanel" Style="{StaticResource SettingsSectionStyle}">
68+
<!-- Language -->
69+
<StackPanel Style="{StaticResource SettingsSectionStyle}">
7170
<TextBlock x:Name="LanguagePreferenceSettingsTitle" x:Uid="/Settings/AdvancedPage_LanguagePreferenceSettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
7271
<StackPanel x:Name="LanguagePreferenceSettingsControls" Margin="0,6,0,0">
7372
<ComboBox

‎src/Notepads/Views/Settings/PersonalizationSettingsPage.xaml‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
Background="{ThemeResource SystemControlForegroundTransparentBrush}"
87
mc:Ignorable="d">
98

109
<Grid>
@@ -26,8 +25,8 @@
2625
VerticalScrollMode="Auto">
2726
<StackPanel Margin="{StaticResource SettingsPageFooterMargin}" HorizontalAlignment="Left">
2827

29-
<!-- Theme -->
30-
<StackPanel x:Name="ThemeModeSettingsPanel" Style="{StaticResource SettingsSectionStyle}">
28+
<!-- Theme -->
29+
<StackPanel Style="{StaticResource SettingsSectionStyle}">
3130
<TextBlock x:Uid="/Settings/PersonalizationPage_ThemeModeSettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
3231
<StackPanel x:Name="ThemePanel">
3332
<RadioButton x:Name="ThemeModeLightButton" x:Uid="/Settings/PersonalizationPage_ThemeModeSettings_LightModeRadioButton" Style="{StaticResource CustomRadioButtonStyle}" Tag="Light" />
@@ -36,42 +35,41 @@
3635
</StackPanel>
3736
</StackPanel>
3837

39-
<!-- Acrylic Opacity -->
40-
<StackPanel x:Name="BackgroundTintOpacitySettingsPanel" Style="{StaticResource SettingsSectionStyle}">
38+
<!-- Acrylic Opacity -->
39+
<StackPanel Style="{StaticResource SettingsSectionStyle}">
4140
<TextBlock x:Name="BackgroundTintOpacityTitle" x:Uid="/Settings/PersonalizationPage_BackgroundTintOpacitySettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
4241
<StackPanel x:Name="BackgroundTintOpacityControls">
4342
<StackPanel Orientation="Horizontal">
44-
<FontIcon VerticalAlignment="Center" FontSize="16" Glyph="&#xE727;" />
43+
<FontIcon VerticalAlignment="Center" FontSize="20" Glyph="&#xE727;" />
4544
<Slider
4645
x:Name="BackgroundTintOpacitySlider"
4746
Width="200"
48-
Margin="8,0"
49-
Maximum="100"
47+
Margin="12,0,8,0"
5048
StepFrequency="1"
51-
Style="{StaticResource CustomSliderStyle}" />
49+
Maximum="100" />
5250
<TextBlock
51+
Style="{StaticResource SubtitleTextBlockStyle}"
5352
Height="{x:Bind BackgroundTintOpacitySlider.Height, Mode=OneWay}"
5453
Padding="0,0,0,2"
5554
VerticalAlignment="Center"
56-
FontSize="18"
5755
Text="{x:Bind BackgroundTintOpacitySlider.Value, Mode=OneWay}" />
5856
<TextBlock
57+
Style="{StaticResource SubtitleTextBlockStyle}"
5958
Height="{x:Bind BackgroundTintOpacitySlider.Height, Mode=OneWay}"
6059
Padding="0,0,0,2"
6160
VerticalAlignment="Center"
62-
FontSize="18"
6361
Text="%" />
6462
</StackPanel>
6563
<TextBlock x:Uid="/Settings/PersonalizationPage_BackgroundTintOpacitySettings_Description" Style="{ThemeResource DescriptionTextBlockStyle}" />
6664
</StackPanel>
6765
</StackPanel>
6866

69-
<!-- Accent Color -->
70-
<StackPanel x:Name="AccentColorSettingsPanel" Style="{StaticResource SettingsSectionStyle}">
67+
<!-- Accent Color -->
68+
<StackPanel Style="{StaticResource SettingsSectionStyle}">
7169
<TextBlock x:Uid="/Settings/PersonalizationPage_AccentColorSettings_Title" Style="{StaticResource CompactSubtitleTextBlockStyle}" />
7270
<StackPanel Spacing="12">
7371
<ToggleSwitch x:Name="AccentColorToggle" x:Uid="/Settings/PersonalizationPage_AccentColorSettings_UseWindowsAccentColorToggleSwitch" Style="{StaticResource CustomToggleSwitchStyle}" />
74-
<Viewbox MaxWidth="300" Stretch="Fill">
72+
<Viewbox MaxWidth="292" Stretch="Fill">
7573
<ColorPicker
7674
x:Name="AccentColorPicker"
7775
ColorSpectrumShape="Ring"

‎src/Notepads/Views/Settings/SettingsPage.xaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
77
xmlns:settings="using:Notepads.Views.Settings"
8-
Background="{ThemeResource SystemControlForegroundTransparentBrush}"
98
mc:Ignorable="d">
109

1110
<NavigationView

0 commit comments

Comments
 (0)