Skip to content

Use dynamic menu items #1004

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
dremin merged 1 commit into from
Jan 8, 2025
+66 −132
Merged

Use dynamic menu items #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 21 additions & 21 deletions RetroBar/PropertiesWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
<AccessText Text="{DynamicResource language_text}"
ToolTip="{DynamicResource language_tip}" />
</Label>
<ComboBox Name="cboLanguageSelect"
<ComboBox x:Name="cboLanguageSelect"
SelectedValue="{Binding Source={x:Static Settings:Settings.Instance}, Path=Language, UpdateSourceTrigger=PropertyChanged}" />
</DockPanel>
<DockPanel>
Expand All @@ -190,7 +190,7 @@
<AccessText Text="{DynamicResource theme_text}"
ToolTip="{DynamicResource theme_tip}" />
</Label>
<ComboBox Name="cboThemeSelect"
<ComboBox x:Name="cboThemeSelect"
SelectedValue="{Binding Source={x:Static Settings:Settings.Instance}, Path=Theme, UpdateSourceTrigger=PropertyChanged}" />
</DockPanel>
<DockPanel>
Expand All @@ -199,10 +199,10 @@
<AccessText Text="{DynamicResource location_text}"
ToolTip="{DynamicResource location_tip}" />
</Label>
<ComboBox Name="cboEdgeSelect"
<ComboBox x:Name="cboEdgeSelect"
ItemsSource="{DynamicResource location_values}"
SelectedIndex="{Binding Source={x:Static Settings:Settings.Instance}, Path=Edge, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource enumConverter}}"
SelectionChanged="cboEdgeSelect_SelectionChanged" />
SelectionChanged="CboEdgeSelect_SelectionChanged" />
</DockPanel>
<DockPanel Visibility="{Binding Source={x:Static Settings:Settings.Instance}, Path=Edge, Converter={StaticResource edgeOrientationVisibilityConverter}, ConverterParameter='horizontal'}">
<Label VerticalAlignment="Center"
Expand All @@ -212,14 +212,14 @@
</Label>
<ComboBox x:Name="cboRowCount"
SelectedIndex="{Binding Source={x:Static Settings:Settings.Instance}, Path=RowCount, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource countToIndexConverter}}"
SelectionChanged="cboRowCount_SelectionChanged" />
SelectionChanged="CboRowCount_SelectionChanged" />
</DockPanel>
<DockPanel Visibility="{Binding Source={x:Static Settings:Settings.Instance}, Path=Edge, Converter={StaticResource edgeOrientationVisibilityConverter}, ConverterParameter='vertical'}">
<Label VerticalAlignment="Center"
Target="{Binding ElementName=sldTaskbarWidth}">
<AccessText Text="{DynamicResource taskbar_width}" />
</Label>
<Slider Name="sldTaskbarWidth"
<Slider x:Name="sldTaskbarWidth"
Orientation="Horizontal"
IsSnapToTickEnabled="True"
Value="{Binding Source={x:Static Settings:Settings.Instance}, Path=TaskbarWidth, UpdateSourceTrigger=PropertyChanged}"
Expand Down Expand Up @@ -277,7 +277,7 @@
DockPanel.Dock="Right">
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Horizontal">
<ToggleButton Name="NotifyIconToggleButton"
<ToggleButton x:Name="NotifyIconToggleButton"
Focusable="False"
Visibility="{Binding Source={x:Static Settings:Settings.Instance}, Path=CollapseNotifyIcons, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource boolToVisibilityConverter}}"
Style="{DynamicResource TrayToggleButton}"/>
Expand Down Expand Up @@ -334,9 +334,9 @@
Margin="10">
<StackPanel Orientation="Vertical"
Margin="0,0,0,10">
<CheckBox Checked="AutoStartCheckBox_OnChecked"
Unchecked="AutoStartCheckBox_OnChecked"
Name="AutoStartCheckBox">
<CheckBox x:Name="cbAutoStart"
Checked="CbAutoStart_OnChecked"
Unchecked="CbAutoStart_OnChecked">
<Label Content="{DynamicResource autostart}" />
</CheckBox>
<CheckBox x:Name="cbUseSoftwareRendering"
Expand All @@ -363,7 +363,7 @@
<ComboBox x:Name="cboMiddleMouseAction"
ItemsSource="{DynamicResource middle_mouse_task_action_values}"
SelectedIndex="{Binding Source={x:Static Settings:Settings.Instance}, Path=TaskMiddleClickAction, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource enumConverter}}"
SelectionChanged="cboMiddleMouseAction_SelectionChanged" />
SelectionChanged="CboMiddleMouseAction_SelectionChanged" />
</DockPanel>
<DockPanel>
<Label VerticalAlignment="Center"
Expand All @@ -373,21 +373,21 @@
<ComboBox x:Name="cboClockAction"
ItemsSource="{DynamicResource clock_click_action_values}"
SelectedIndex="{Binding Source={x:Static Settings:Settings.Instance}, Path=ClockClickAction, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource enumConverter}}"
SelectionChanged="cboClockAction_SelectionChanged" />
SelectionChanged="CboClockAction_SelectionChanged" />
</DockPanel>
<DockPanel>
<Label VerticalAlignment="Center"
Target="{Binding ElementName=cboInvertIconsMode}">
<AccessText Text="{DynamicResource invert_system_icons}" />
</Label>
<ComboBox Name="cboInvertIconsMode"
<ComboBox x:Name="cboInvertIconsMode"
ItemsSource="{DynamicResource invert_system_icons_values}"
SelectedIndex="{Binding Source={x:Static Settings:Settings.Instance}, Path=InvertIconsMode, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource enumConverter}}"
SelectionChanged="cboInvertIconsMode_SelectionChanged" />
SelectionChanged="CboInvertIconsMode_SelectionChanged" />
</DockPanel>
<Button HorizontalAlignment="Right"
Content="{DynamicResource customize}"
Click="CustomizeNotifications_OnClick" />
Content="{DynamicResource customize}"
Click="CustomizeNotifications_OnClick" />
</StackPanel>
<GroupBox Header="{DynamicResource multiple_displays}"
Margin="0,0,0,10">
Expand All @@ -406,11 +406,11 @@
Target="{Binding ElementName=cboMultiMonMode}">
<AccessText Text="{DynamicResource show_tasks_on}" />
</Label>
<ComboBox Name="cboMultiMonMode"
<ComboBox x:Name="cboMultiMonMode"
IsEnabled="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowMultiMon, UpdateSourceTrigger=PropertyChanged}"
ItemsSource="{DynamicResource show_tasks_on_values}"
SelectedIndex="{Binding Source={x:Static Settings:Settings.Instance}, Path=MultiMonMode, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource enumConverter}}"
SelectionChanged="cboMultiMonMode_SelectionChanged" />
SelectionChanged="CboMultiMonMode_SelectionChanged" />
</DockPanel>
</StackPanel>
</GroupBox>
Expand All @@ -419,7 +419,7 @@
<DockPanel Margin="20,0">
<Label DockPanel.Dock="Left" Content="{DynamicResource taskbar_scale_1x}" />
<Label DockPanel.Dock="Right" Content="{DynamicResource taskbar_scale_2x}" />
<Slider Name="sldTaskbarScale"
<Slider x:Name="sldTaskbarScale"
Orientation="Horizontal"
IsSnapToTickEnabled="True"
Value="{Binding Source={x:Static Settings:Settings.Instance}, Path=TaskbarScale, UpdateSourceTrigger=PropertyChanged}"
Expand All @@ -428,7 +428,7 @@
TickFrequency="0.05"
TickPlacement="BottomRight" />
</DockPanel>
<TextBlock Name="txtCurrentScale"
<TextBlock x:Name="txtCurrentScale"
HorizontalAlignment="Center">
<TextBlock.Text>
<MultiBinding Converter="{StaticResource doubleToPercentConverter}" UpdateSourceTrigger="PropertyChanged">
Expand All @@ -440,7 +440,7 @@
</StackPanel>
</GroupBox>
<DockPanel Margin="0,10,0,0">
<TextBlock Name="txtVersion"
<TextBlock x:Name="txtVersion"
DockPanel.Dock="Left"
Margin="0,0,10,0" />
<TextBlock DockPanel.Dock="Right"
Expand Down
18 changes: 9 additions & 9 deletions RetroBar/PropertiesWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,11 @@ private void LoadAutoStart()
{
if (rKeyValueNames.Contains("RetroBar"))
{
AutoStartCheckBox.IsChecked = true;
cbAutoStart.IsChecked = true;
}
else
{
AutoStartCheckBox.IsChecked = false;
cbAutoStart.IsChecked = false;
}
}
}
Expand Down Expand Up @@ -267,7 +267,7 @@ private void PropertiesWindow_OnContentRendered(object sender, EventArgs e)
UpdateWindowPosition();
}

private void AutoStartCheckBox_OnChecked(object sender, RoutedEventArgs e)
private void CbAutoStart_OnChecked(object sender, RoutedEventArgs e)
{
try
{
Expand Down Expand Up @@ -308,47 +308,47 @@ private void LoadClockActions()
cboClockAction.ItemsSource = availableClockActions;
}

private void cboEdgeSelect_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
private void CboEdgeSelect_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
{
if (cboEdgeSelect.SelectedItem == null)
{
cboEdgeSelect.SelectedValue = cboEdgeSelect.Items[(int)Settings.Instance.Edge];
}
}

private void cboMultiMonMode_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
private void CboMultiMonMode_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
{
if (cboMultiMonMode.SelectedItem == null)
{
cboMultiMonMode.SelectedValue = cboMultiMonMode.Items[(int)Settings.Instance.MultiMonMode];
}
}

private void cboInvertIconsMode_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
private void CboInvertIconsMode_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
{
if (cboInvertIconsMode.SelectedItem == null)
{
cboInvertIconsMode.SelectedValue = cboInvertIconsMode.Items[(int)Settings.Instance.InvertIconsMode];
}
}

private void cboMiddleMouseAction_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
private void CboMiddleMouseAction_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
{
if (cboMiddleMouseAction.SelectedItem == null)
{
cboMiddleMouseAction.SelectedValue = cboMiddleMouseAction.Items[(int)Settings.Instance.TaskMiddleClickAction];
}
}

private void cboClockAction_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
private void CboClockAction_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
{
if (cboClockAction.SelectedItem == null)
{
cboClockAction.SelectedValue = cboClockAction.Items[(int)Settings.Instance.ClockClickAction];
}
}

private void cboRowCount_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
private void CboRowCount_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
{
if (cboRowCount.SelectedItem == null)
{
Expand Down
Loading