Skip to content
This repository was archived by the owner on Sep 11, 2023. It is now read-only.

Commit c15772d

Browse files
maxijabasemaxijabase
committed
progress in improving UI
1 parent dad5088 commit c15772d

File tree

4 files changed

+69
-62
lines changed

4 files changed

+69
-62
lines changed

‎UI/MainWindow/MainWindowTranslations.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public void Language_Translate(bool Initial = false)
3030
MenuI_New.Header = Translate("New");
3131
MenuI_NewTemplate.Header = Translate("NewTemplate");
3232
MenuI_Open.Header = Translate("Open");
33+
MenuI_ReopenLastClosedTab.Header = Translate("ReopenLastClosedTab");
3334
MenuI_Save.Header = Translate("Save");
3435
MenuI_SaveAll.Header = Translate("SaveAll");
3536
MenuI_SaveAs.Header = Translate("SaveAs");

‎UI/Windows/OptionsWindow.xaml‎

Lines changed: 68 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,53 +9,95 @@
99
WindowStartupLocation="CenterOwner"
1010
GlowBrush="{DynamicResource AccentColorBrush}"
1111
Background="{DynamicResource WhiteBrush}"
12-
Title="Options"
13-
ShowTitleBar="False"
12+
ShowTitleBar="False"
1413
KeyDown="MetroWindow_KeyDown">
1514

1615
<controls:MetroWindow.Resources>
1716
<ResourceDictionary>
17+
18+
<Style BasedOn="{StaticResource {x:Type CheckBox}}" x:Key="IndentedCheckBox" TargetType="{x:Type CheckBox}">
19+
<Setter Property="Margin" Value="25,7,0,0"/>
20+
</Style>
21+
22+
<Style BasedOn="{StaticResource {x:Type CheckBox}}" x:Key="ParentCheckBox" TargetType="{x:Type CheckBox}">
23+
<Setter Property="Margin" Value="5,7,0,0"/>
24+
</Style>
25+
1826
<ResourceDictionary.MergedDictionaries>
1927
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
2028
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
2129
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
2230
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
2331
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Red.xaml" />
2432
</ResourceDictionary.MergedDictionaries>
33+
2534
</ResourceDictionary>
2635
</controls:MetroWindow.Resources>
27-
<controls:MetroWindow.RightWindowCommands>
28-
<controls:WindowCommands>
29-
<Button Name="ResetButton" Content="Reset options" Click="RestoreButton_Clicked" />
30-
<Label Name="StatusTextBlock" Foreground="LightGray" FontSize="15" />
31-
</controls:WindowCommands>
32-
</controls:MetroWindow.RightWindowCommands>
36+
3337
<Grid>
38+
3439
<controls:MetroAnimatedSingleRowTabControl HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0,15,0,0" controls:TabControlHelper.IsUnderlined="True">
40+
41+
<!-- Program Tab -->
3542
<controls:MetroTabItem Name="ProgramHeader" Header=" Program ">
3643
<ScrollViewer HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Visible">
44+
3745
<Grid>
38-
<CheckBox Name="HardwareAcc" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,5,0,0" Content="Use Hardware Acceleration (if available)" Checked="HardwareAcc_Changed" Unchecked="HardwareAcc_Changed" />
39-
<CheckBox Name="UIAnimation" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,30,0,0" Content="UI Animations" Checked="UIAnimation_Changed" Unchecked="UIAnimation_Changed" />
40-
<CheckBox Name="OpenIncludes" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,55,0,0" Content="Auto Open Includes" Checked="AutoOpenInclude_Changed" Unchecked="AutoOpenInclude_Changed" />
41-
<CheckBox Name="OpenIncludesRecursive" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="25,80,0,0" Content="Open Includes Recursively" Checked="OpenIncludeRecursively_Changed" Unchecked="OpenIncludeRecursively_Changed" />
42-
<CheckBox Name="AutoUpdate" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,105,0,0" Content="Search automatically for Updates" Checked="AutoUpdate_Changed" Unchecked="AutoUpdate_Changed" />
43-
<CheckBox Name="ShowToolBar" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,130,0,0" Content="Show Toolbar" Checked="ShowToolbar_Changed" Unchecked="ShowToolbar_Changed" />
44-
<CheckBox Name="DynamicISAC" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,155,0,0" Content="Dynamic Autocomplete/Intellisense" Checked="DynamicISAC_Changed" Unchecked="DynamicISAC_Changed" />
45-
<CheckBox Name="DarkTheme" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,180,0,0" Content="Dark Theme" Checked="DarkTheme_Changed" Unchecked="DarkTheme_Changed" />
46-
<CheckBox Name="HardwareSalts" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,205,0,0" Content="Hardware Encryption" Checked="HardwareSalts_Changed" Unchecked="HardwareSalts_Changed" />
47-
<CheckBox Name="DiscordPresence" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,230,0,0" Content="Enable Discord Rich Presence" Checked="DiscordPresence_Changed" Unchecked="DiscordPresence_Changed" />
48-
<CheckBox Name="DiscordPresenceTime" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="25,255,0,0" Content="Show elapsed time" Checked="DiscordPresenceTime_Changed" Unchecked="DiscordPresenceTime_Changed" />
49-
<CheckBox Name="DiscordPresenceFile" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="25,280,0,0" Content="Show current file" Checked="DiscordPresenceFile_Changed" Unchecked="DiscordPresenceFile_Changed" />
50-
<Label Name="ThemeColorLabel" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="333,5,0,0" Content="Theme Color:" />
51-
<ComboBox Name="AccentColor" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="425,5,0,0" Width="200" SelectionChanged="AccentColor_Changed" />
52-
<Label Name="LanguageLabel" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="333,37,0,0" Content="Language:" />
53-
<ComboBox Name="LanguageBox" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="425,37,0,0" Width="200" SelectionChanged="LanguageBox_Changed" />
54-
<Label Name="ActionOnCloseLabel" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="333,69,0,0" Content="On close:" />
55-
<ComboBox Name="ActionOnCloseBox" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="425,69,0,0" Width="200" SelectionChanged="ActionOnCloseBox_Changed" />
46+
47+
<Grid.ColumnDefinitions>
48+
<ColumnDefinition Width="340"/>
49+
<ColumnDefinition Width="340"/>
50+
<ColumnDefinition/>
51+
</Grid.ColumnDefinitions>
52+
53+
<!-- Left side checkboxes -->
54+
<StackPanel Grid.Column="0">
55+
56+
<StackPanel.Resources>
57+
<Style BasedOn="{StaticResource ParentCheckBox}" TargetType="{x:Type CheckBox}"/>
58+
</StackPanel.Resources>
59+
60+
<CheckBox Name="HardwareAcc" Content="Use Hardware Acceleration (if available)" Checked="HardwareAcc_Changed" Unchecked="HardwareAcc_Changed" />
61+
<CheckBox Name="UIAnimation" Content="UI Animations" Checked="UIAnimation_Changed" Unchecked="UIAnimation_Changed" />
62+
<CheckBox Name="OpenIncludes" Content="Auto Open Includes" Checked="AutoOpenInclude_Changed" Unchecked="AutoOpenInclude_Changed" />
63+
<CheckBox Name="OpenIncludesRecursive" Style="{StaticResource IndentedCheckBox}" Content="Open Includes Recursively" Checked="OpenIncludeRecursively_Changed" Unchecked="OpenIncludeRecursively_Changed" />
64+
<CheckBox Name="AutoUpdate" Content="Search automatically for Updates" Checked="AutoUpdate_Changed" Unchecked="AutoUpdate_Changed" />
65+
<CheckBox Name="ShowToolBar" Content="Show Toolbar" Checked="ShowToolbar_Changed" Unchecked="ShowToolbar_Changed" />
66+
<CheckBox Name="DynamicISAC" Content="Dynamic Autocomplete/Intellisense" Checked="DynamicISAC_Changed" Unchecked="DynamicISAC_Changed" />
67+
<CheckBox Name="DarkTheme" Content="Dark Theme" Checked="DarkTheme_Changed" Unchecked="DarkTheme_Changed" />
68+
<CheckBox Name="HardwareSalts" Content="Hardware Encryption" Checked="HardwareSalts_Changed" Unchecked="HardwareSalts_Changed" />
69+
<CheckBox Name="DiscordPresence" Content="Enable Discord Rich Presence" Checked="DiscordPresence_Changed" Unchecked="DiscordPresence_Changed" />
70+
<CheckBox Name="DiscordPresenceTime" Style="{StaticResource IndentedCheckBox}" Content="Show elapsed time" Checked="DiscordPresenceTime_Changed" Unchecked="DiscordPresenceTime_Changed" />
71+
<CheckBox Name="DiscordPresenceFile" Style="{StaticResource IndentedCheckBox}" Content="Show current file" Checked="DiscordPresenceFile_Changed" Unchecked="DiscordPresenceFile_Changed" />
72+
73+
</StackPanel>
74+
75+
<!-- Right side comboboxes -->
76+
<StackPanel Grid.Column="1">
77+
78+
<StackPanel Orientation="Horizontal">
79+
<Label Name="ThemeColorLabel" HorizontalAlignment="Left" VerticalAlignment="Top" Content="Theme Color:" Margin="0,0,10,0"/>
80+
<ComboBox Name="AccentColor" HorizontalAlignment="Left" VerticalAlignment="Top" Width="100" SelectionChanged="AccentColor_Changed" />
81+
</StackPanel>
82+
83+
<StackPanel Orientation="Horizontal" Margin="0,10,0,0">
84+
<Label Name="LanguageLabel" Content="Language:" Margin="0,0,10,0" />
85+
<ComboBox Name="LanguageBox" Width="120" SelectionChanged="LanguageBox_Changed" />
86+
</StackPanel>
87+
88+
<StackPanel Orientation="Horizontal" Margin="0,10,0,0">
89+
<Label Name="ActionOnCloseLabel" HorizontalAlignment="Left" VerticalAlignment="Top" Content="On close:" Margin="0,0,10,0"/>
90+
<ComboBox Name="ActionOnCloseBox" HorizontalAlignment="Left" VerticalAlignment="Top" Width="180" SelectionChanged="ActionOnCloseBox_Changed" />
91+
</StackPanel>
92+
93+
</StackPanel>
94+
5695
</Grid>
96+
5797
</ScrollViewer>
5898
</controls:MetroTabItem>
99+
100+
<!-- Editor Tab -->
59101
<controls:MetroTabItem Name="EditorHeader" Header=" Editor ">
60102
<ScrollViewer>
61103
<Grid>

‎UI/Windows/OptionsWindow.xaml.cs‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public partial class OptionsWindow
3333
{ ActionOnClose.Save, Translate("Save") },
3434
{ ActionOnClose.DontSave, Translate("DontSave") }
3535
};
36-
private bool RestartTextIsShown;
3736
private readonly bool AllowChanging;
3837
#endregion
3938

@@ -100,7 +99,6 @@ private void HardwareAcc_Changed(object sender, RoutedEventArgs e)
10099

101100
Debug.Assert(HardwareAcc.IsChecked != null, "HardwareAcc.IsChecked != null");
102101
Program.OptionsObject.Program_UseHardwareAcceleration = HardwareAcc.IsChecked.Value;
103-
ToggleRestartText();
104102
}
105103

106104
private void UIAnimation_Changed(object sender, RoutedEventArgs e)
@@ -112,7 +110,6 @@ private void UIAnimation_Changed(object sender, RoutedEventArgs e)
112110

113111
Debug.Assert(UIAnimation.IsChecked != null, "UIAnimation.IsChecked != null");
114112
Program.OptionsObject.UI_Animations = UIAnimation.IsChecked.Value;
115-
ToggleRestartText();
116113
}
117114

118115
private void AutoOpenInclude_Changed(object sender, RoutedEventArgs e)
@@ -188,7 +185,6 @@ private void DarkTheme_Changed(object sender, RoutedEventArgs e)
188185
ThemeManager.ChangeAppStyle(Program.MainWindow,
189186
ThemeManager.GetAccent(Program.OptionsObject.Program_AccentColor),
190187
ThemeManager.GetAppTheme(Program.OptionsObject.Program_Theme));
191-
ToggleRestartText(true);
192188
}
193189

194190
private void AccentColor_Changed(object sender, RoutedEventArgs e)
@@ -407,7 +403,6 @@ private void HighlightDeprecateds_Changed(object sender, RoutedEventArgs e)
407403

408404
Debug.Assert(HighlightDeprecateds.IsChecked != null, "HighlightDeprecateds.IsChecked != null");
409405
Program.OptionsObject.SH_HighlightDeprecateds = HighlightDeprecateds.IsChecked.Value;
410-
ToggleRestartText();
411406
}
412407

413408
private void LanguageBox_Changed(object sender, RoutedEventArgs e)
@@ -426,7 +421,6 @@ private void LanguageBox_Changed(object sender, RoutedEventArgs e)
426421
Program.OptionsObject.Language = lang;
427422
Program.MainWindow.Language_Translate();
428423
Language_Translate();
429-
ToggleRestartText(true);
430424
}
431425
catch (Exception ex)
432426
{
@@ -704,20 +698,6 @@ private void LoadSettings()
704698
DiscordPresenceFile.IsEnabled = Program.OptionsObject.Program_DiscordPresence;
705699
}
706700

707-
private void ToggleRestartText(bool FullEffect = false)
708-
{
709-
if (AllowChanging)
710-
{
711-
if (!RestartTextIsShown)
712-
{
713-
StatusTextBlock.Content = FullEffect
714-
? Translate("RestartEdiFullEff")
715-
: Translate("RestartEdiEff");
716-
RestartTextIsShown = true;
717-
}
718-
}
719-
}
720-
721701
private void LoadHotkeysSection()
722702
{
723703
var txtMargin = 54;

‎UI/Windows/OptionsWindow/OptionsWindowHighlighting.cs‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,105 +28,89 @@ private void Comments_Changed(object sender, RoutedEventArgs e)
2828
{
2929
if (!AllowChanging) { return; }
3030
Program.OptionsObject.SH_Comments = SH_Comments.GetColor();
31-
ToggleRestartText();
3231
}
3332

3433
private void CommentMarker_Changed(object sender, RoutedEventArgs e)
3534
{
3635
if (!AllowChanging) { return; }
3736
Program.OptionsObject.SH_CommentsMarker = SH_CommentMarkers.GetColor();
38-
ToggleRestartText();
3937
}
4038

4139
private void PreProcessor_Changed(object sender, RoutedEventArgs e)
4240
{
4341
if (!AllowChanging) { return; }
4442
Program.OptionsObject.SH_PreProcessor = SH_PreProcessor.GetColor();
45-
ToggleRestartText();
4643
}
4744

4845
private void String_Changed(object sender, RoutedEventArgs e)
4946
{
5047
if (!AllowChanging) { return; }
5148
Program.OptionsObject.SH_Strings = SH_Strings.GetColor();
52-
ToggleRestartText();
5349
}
5450

5551
private void Types_Changed(object sender, RoutedEventArgs e)
5652
{
5753
if (!AllowChanging) { return; }
5854
Program.OptionsObject.SH_Types = SH_Types.GetColor();
59-
ToggleRestartText();
6055
}
6156

6257
private void TypeValues_Changed(object sender, RoutedEventArgs e)
6358
{
6459
if (!AllowChanging) { return; }
6560
Program.OptionsObject.SH_TypesValues = SH_TypesValues.GetColor();
66-
ToggleRestartText();
6761
}
6862

6963
private void Keywords_Changed(object sender, RoutedEventArgs e)
7064
{
7165
if (!AllowChanging) { return; }
7266
Program.OptionsObject.SH_Keywords = SH_Keywords.GetColor();
73-
ToggleRestartText();
7467
}
7568

7669
private void ContextKeywords_Changed(object sender, RoutedEventArgs e)
7770
{
7871
if (!AllowChanging) { return; }
7972
Program.OptionsObject.SH_ContextKeywords = SH_ContextKeywords.GetColor();
80-
ToggleRestartText();
8173
}
8274

8375
private void Chars_Changed(object sender, RoutedEventArgs e)
8476
{
8577
if (!AllowChanging) { return; }
8678
Program.OptionsObject.SH_Chars = SH_Chars.GetColor();
87-
ToggleRestartText();
8879
}
8980
private void UFunctions_Changed(object sender, RoutedEventArgs e)
9081
{
9182
if (!AllowChanging) { return; }
9283
Program.OptionsObject.SH_UnkownFunctions = SH_UnknownFunctions.GetColor();
93-
ToggleRestartText();
9484
}
9585
private void Numbers_Changed(object sender, RoutedEventArgs e)
9686
{
9787
if (!AllowChanging) { return; }
9888
Program.OptionsObject.SH_Numbers = SH_Numbers.GetColor();
99-
ToggleRestartText();
10089
}
10190
private void SpecialCharacters_Changed(object sender, RoutedEventArgs e)
10291
{
10392
if (!AllowChanging) { return; }
10493
Program.OptionsObject.SH_SpecialCharacters = SH_SpecialCharacters.GetColor();
105-
ToggleRestartText();
10694
}
10795
private void Deprecated_Changed(object sender, RoutedEventArgs e)
10896
{
10997
if (!AllowChanging) { return; }
11098
Program.OptionsObject.SH_Deprecated = SH_Deprecated.GetColor();
111-
ToggleRestartText();
11299
}
113100
private void Constants_Changed(object sender, RoutedEventArgs e)
114101
{
115102
if (!AllowChanging) { return; }
116103
Program.OptionsObject.SH_Constants = SH_Constants.GetColor();
117-
ToggleRestartText();
118104
}
119105
private void Functions_Changed(object sender, RoutedEventArgs e)
120106
{
121107
if (!AllowChanging) { return; }
122108
Program.OptionsObject.SH_Functions = SH_Functions.GetColor();
123-
ToggleRestartText();
124109
}
125110
private void Methods_Changed(object sender, RoutedEventArgs e)
126111
{
127112
if (!AllowChanging) { return; }
128113
Program.OptionsObject.SH_Methods = SH_Methods.GetColor();
129-
ToggleRestartText();
130114
}
131115
}
132116
}

0 commit comments

Comments
 (0)