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

Commit 86203b0

Browse files
maxijabasemaxijabase
committed
options and search window UI improvements
1 parent 4ccf373 commit 86203b0

File tree

5 files changed

+88
-75
lines changed

5 files changed

+88
-75
lines changed

‎UI/Windows/FindReplaceWindow.xaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,12 @@
7474
<ComboBoxItem x:Name="MenuFR_CurrDoc" />
7575
<ComboBoxItem x:Name="MenuFR_AllDoc" />
7676
</ComboBox>
77-
<CheckBox x:Name="CCBox" Foreground="{DynamicResource BlackBrush}" Margin="0,3,0,0" Checked="CaseSensitiveChanged" Unchecked="CaseSensitiveChanged"/>
78-
<CheckBox x:Name="MLRBox" Foreground="{DynamicResource BlackBrush}" Margin="0,5,0,0" Checked="MultilineRegexChanged" Unchecked="MultilineRegexChanged" />
77+
<CheckBox x:Name="CCBox" Foreground="{DynamicResource BlackBrush}" Margin="0,3,0,0" Checked="CaseSensitiveChanged" Unchecked="CaseSensitiveChanged">
78+
<TextBlock x:Name="CCBoxText" TextWrapping="Wrap"/>
79+
</CheckBox>
80+
<CheckBox x:Name="MLRBox" Foreground="{DynamicResource BlackBrush}" Margin="0,5,0,0" Checked="MultilineRegexChanged" Unchecked="MultilineRegexChanged">
81+
<TextBlock x:Name="MLRBoxText" TextWrapping="Wrap"/>
82+
</CheckBox>
7983
</StackPanel>
8084
</Grid>
8185

‎UI/Windows/FindReplaceWindow.xaml.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -544,8 +544,8 @@ public void Language_Translate()
544544

545545
Find_Button.Content = Translate("Find");
546546
Count_Button.Content = Translate("Count");
547-
CCBox.Content = Translate("CaseSen");
548-
MLRBox.Content = Translate("MultilineRegex");
547+
CCBoxText.Text = Translate("CaseSen");
548+
MLRBoxText.Text = Translate("MultilineRegex");
549549
}
550550

551551
private void EvaluateRTL()

‎UI/Windows/OptionsWindow.xaml‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@
4949
</Style>
5050

5151
<Style x:Key="ColorChangeControlStyle" TargetType="{x:Type components:ColorChangeControl}">
52-
<Setter Property="Margin" Value="0,10,0,0"/>
53-
<Setter Property="HorizontalAlignment" Value="Center"/>
52+
<Setter Property="Margin" Value="5,10,5,0"/>
53+
<Setter Property="VerticalAlignment" Value="Top"/>
54+
<Setter Property="Height" Value="105"/>
55+
<Setter Property="Width" Value="320"/>
5456
</Style>
5557

5658
<ResourceDictionary.MergedDictionaries>
@@ -229,43 +231,47 @@
229231

230232
<CheckBox Name="HighlightDeprecateds" Margin="5,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Checked="HighlightDeprecateds_Changed" Unchecked="HighlightDeprecateds_Changed" />
231233

232-
<StackPanel Grid.Column="0" Margin="0,30,0,0">
234+
<StackPanel Grid.Column="0" Margin="0,30,0,10">
233235

234236
<StackPanel.Resources>
235-
<Style BasedOn="{StaticResource ColorChangeControlStyle}" TargetType="{x:Type components:ColorChangeControl}"/>
237+
<Style BasedOn="{StaticResource ColorChangeControlStyle}" TargetType="{x:Type components:ColorChangeControl}">
238+
<Setter Property="HorizontalAlignment" Value="Left"/>
239+
</Style>
236240
</StackPanel.Resources>
237241

238-
<components:ColorChangeControl x:Name="SH_Comments" VerticalAlignment="Top" Height="105" Width="300" ColorChanged="Comments_Changed" />
239-
<components:ColorChangeControl x:Name="SH_PreProcessor" VerticalAlignment="Top" Height="105" Width="300" ColorChanged="PreProcessor_Changed" />
240-
<components:ColorChangeControl x:Name="SH_Types" VerticalAlignment="Top" Height="105" Width="300" ColorChanged="Types_Changed" />
241-
<components:ColorChangeControl x:Name="SH_Keywords" VerticalAlignment="Top" Height="105" Width="300" ColorChanged="Keywords_Changed" />
242-
<components:ColorChangeControl x:Name="SH_Chars" VerticalAlignment="Top" Height="105" Width="300" ColorChanged="Chars_Changed" />
243-
<components:ColorChangeControl x:Name="SH_Numbers" VerticalAlignment="Top" Height="105" Width="300" ColorChanged="Numbers_Changed" />
244-
<components:ColorChangeControl x:Name="SH_Deprecated" VerticalAlignment="Top" Height="105" Width="300" ColorChanged="Deprecated_Changed" />
245-
<components:ColorChangeControl x:Name="SH_Functions" VerticalAlignment="Top" Height="105" Width="300" ColorChanged="Functions_Changed" />
242+
<components:ColorChangeControl x:Name="SH_Comments" ColorChanged="Comments_Changed" />
243+
<components:ColorChangeControl x:Name="SH_PreProcessor" ColorChanged="PreProcessor_Changed" />
244+
<components:ColorChangeControl x:Name="SH_Types" ColorChanged="Types_Changed" />
245+
<components:ColorChangeControl x:Name="SH_Keywords" ColorChanged="Keywords_Changed" />
246+
<components:ColorChangeControl x:Name="SH_Chars" ColorChanged="Chars_Changed" />
247+
<components:ColorChangeControl x:Name="SH_Numbers" ColorChanged="Numbers_Changed" />
248+
<components:ColorChangeControl x:Name="SH_Deprecated" ColorChanged="Deprecated_Changed" />
249+
<components:ColorChangeControl x:Name="SH_Functions" ColorChanged="Functions_Changed" />
246250

247251
</StackPanel>
248252

249253
<Button Grid.Column="1" Margin="0,0,5,0"
250-
Width="150" Height="30" VerticalContentAlignment="Center"
254+
Height="30" VerticalContentAlignment="Center"
251255
HorizontalContentAlignment="Center" HorizontalAlignment="Right"
252256
VerticalAlignment="Top" x:Name="DefaultButton" Click="DefaultButton_Click"
253257
FontWeight="Bold"/>
254258

255259
<StackPanel Grid.Column="1" Margin="0,30,0,0">
256260

257261
<StackPanel.Resources>
258-
<Style BasedOn="{StaticResource ColorChangeControlStyle}" TargetType="{x:Type components:ColorChangeControl}"/>
262+
<Style BasedOn="{StaticResource ColorChangeControlStyle}" TargetType="{x:Type components:ColorChangeControl}">
263+
<Setter Property="HorizontalAlignment" Value="Right"/>
264+
</Style>
259265
</StackPanel.Resources>
260266

261-
<components:ColorChangeControl x:Name="SH_CommentMarkers" VerticalAlignment="Top" Height="105" Width="300" ColorChanged="CommentMarker_Changed" />
262-
<components:ColorChangeControl x:Name="SH_Strings" VerticalAlignment="Top" Height="105" Width="300" ColorChanged="String_Changed" />
263-
<components:ColorChangeControl x:Name="SH_TypesValues" VerticalAlignment="Top" Height="105" Width="300" ColorChanged="TypeValues_Changed" />
264-
<components:ColorChangeControl x:Name="SH_ContextKeywords" VerticalAlignment="Top" Height="105" Width="300" ColorChanged="ContextKeywords_Changed" />
265-
<components:ColorChangeControl x:Name="SH_UnknownFunctions" VerticalAlignment="Top" Height="105" Width="300" ColorChanged="UFunctions_Changed" />
266-
<components:ColorChangeControl x:Name="SH_SpecialCharacters" VerticalAlignment="Top" Height="105" Width="300" ColorChanged="SpecialCharacters_Changed" />
267-
<components:ColorChangeControl x:Name="SH_Constants" VerticalAlignment="Top" Height="105" Width="300" ColorChanged="Constants_Changed" />
268-
<components:ColorChangeControl x:Name="SH_Methods" VerticalAlignment="Top" Height="105" Width="300" ColorChanged="Methods_Changed" />
267+
<components:ColorChangeControl x:Name="SH_CommentMarkers" ColorChanged="CommentMarker_Changed" />
268+
<components:ColorChangeControl x:Name="SH_Strings" ColorChanged="String_Changed" />
269+
<components:ColorChangeControl x:Name="SH_TypesValues" ColorChanged="TypeValues_Changed" />
270+
<components:ColorChangeControl x:Name="SH_ContextKeywords" ColorChanged="ContextKeywords_Changed" />
271+
<components:ColorChangeControl x:Name="SH_UnknownFunctions" ColorChanged="UFunctions_Changed" />
272+
<components:ColorChangeControl x:Name="SH_SpecialCharacters" ColorChanged="SpecialCharacters_Changed" />
273+
<components:ColorChangeControl x:Name="SH_Constants" ColorChanged="Constants_Changed" />
274+
<components:ColorChangeControl x:Name="SH_Methods" ColorChanged="Methods_Changed" />
269275

270276
</StackPanel>
271277

‎UI/Windows/OptionsWindow.xaml.cs‎

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -698,55 +698,6 @@ private void LoadSettings()
698698
DiscordPresenceFile.IsEnabled = Program.OptionsObject.Program_DiscordPresence;
699699
}
700700

701-
private void LoadHotkeysSection()
702-
{
703-
var txtMargin = 54;
704-
var hkMargin = 48;
705-
var sepMargin = 61;
706-
foreach (var hkInfo in Program.HotkeysList)
707-
{
708-
var textBlock = new TextBlock()
709-
{
710-
Name = $"Txt{hkInfo.Command}",
711-
HorizontalAlignment = HorizontalAlignment.Left,
712-
VerticalAlignment = VerticalAlignment.Top,
713-
Margin = new Thickness(161, txtMargin, 0, 0),
714-
TextWrapping = TextWrapping.Wrap,
715-
Text = Translate(hkInfo.Command)
716-
};
717-
var hotkeyEditor = new HotkeyEditorControl()
718-
{
719-
Name = $"Hk{hkInfo.Command}",
720-
HorizontalAlignment = HorizontalAlignment.Left,
721-
VerticalAlignment = VerticalAlignment.Top,
722-
Height = 28,
723-
Width = 140,
724-
Margin = new Thickness(85, hkMargin, 0, 0),
725-
Hotkey = hkInfo.Hotkey,
726-
FontStyle = hkInfo.Hotkey == null || hkInfo.Hotkey.ToString() == "None" ? FontStyles.Italic : FontStyles.Normal
727-
};
728-
hotkeyEditor.PreviewKeyDown += Hotkey_PreviewKeyDown;
729-
hotkeyEditor.PreviewMouseDown += Hotkey_PreviewMouseDown;
730-
Grid.SetColumn(hotkeyEditor, 1);
731-
var separator = new Separator()
732-
{
733-
Margin = new Thickness(30, sepMargin, 0, 0),
734-
Height = 41,
735-
VerticalAlignment = VerticalAlignment.Top,
736-
Background = (SolidColorBrush)new BrushConverter().ConvertFrom("#408B8B8B")
737-
};
738-
Grid.SetColumnSpan(separator, 2);
739-
740-
HotkeysGrid.Children.Add(textBlock);
741-
HotkeysGrid.Children.Add(hotkeyEditor);
742-
HotkeysGrid.Children.Add(separator);
743-
744-
txtMargin += 40;
745-
hkMargin += 40;
746-
sepMargin += 40;
747-
}
748-
}
749-
750701
private void SetupActionOnCloseBox()
751702
{
752703
AllowChanging = false;

‎UI/Windows/OptionsWindow/OptionsWindowHotkeys.cs‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,58 @@ private void OnTimerTick(object sender, EventArgs e)
8888
#endregion
8989

9090
#region Methods
91+
/// <summary>
92+
/// Loads the hotkeys into the Options Window UI.
93+
/// </summary>
94+
private void LoadHotkeysSection()
95+
{
96+
var txtMargin = 54;
97+
var hkMargin = 48;
98+
var sepMargin = 61;
99+
foreach (var hkInfo in Program.HotkeysList)
100+
{
101+
var textBlock = new TextBlock()
102+
{
103+
Name = $"Txt{hkInfo.Command}",
104+
HorizontalAlignment = HorizontalAlignment.Left,
105+
VerticalAlignment = VerticalAlignment.Top,
106+
Margin = new Thickness(161, txtMargin, 0, 0),
107+
TextWrapping = TextWrapping.Wrap,
108+
Text = Translate(hkInfo.Command)
109+
};
110+
var hotkeyEditor = new HotkeyEditorControl()
111+
{
112+
Name = $"Hk{hkInfo.Command}",
113+
HorizontalAlignment = HorizontalAlignment.Left,
114+
VerticalAlignment = VerticalAlignment.Top,
115+
Height = 28,
116+
Width = 140,
117+
Margin = new Thickness(85, hkMargin, 0, 0),
118+
Hotkey = hkInfo.Hotkey,
119+
FontStyle = hkInfo.Hotkey == null || hkInfo.Hotkey.ToString() == "None" ? FontStyles.Italic : FontStyles.Normal
120+
};
121+
hotkeyEditor.PreviewKeyDown += Hotkey_PreviewKeyDown;
122+
hotkeyEditor.PreviewMouseDown += Hotkey_PreviewMouseDown;
123+
Grid.SetColumn(hotkeyEditor, 1);
124+
var separator = new Separator()
125+
{
126+
Margin = new Thickness(30, sepMargin, 0, 0),
127+
Height = 41,
128+
VerticalAlignment = VerticalAlignment.Top,
129+
Background = (SolidColorBrush)new BrushConverter().ConvertFrom("#408B8B8B")
130+
};
131+
Grid.SetColumnSpan(separator, 2);
132+
133+
HotkeysGrid.Children.Add(textBlock);
134+
HotkeysGrid.Children.Add(hotkeyEditor);
135+
HotkeysGrid.Children.Add(separator);
136+
137+
txtMargin += 40;
138+
hkMargin += 40;
139+
sepMargin += 40;
140+
}
141+
}
142+
91143
/// <summary>
92144
/// Saves the input hotkey to the Hotkeys file, and caches it.
93145
/// </summary>

0 commit comments

Comments
 (0)