Skip to content

Commit e4b8f12

Browse files
Jack251970Jack251970
committed
Fix namespace style
1 parent 0fbfad0 commit e4b8f12

File tree

2 files changed

+109
-107
lines changed

2 files changed

+109
-107
lines changed

‎Plugins/Flow.Launcher.Plugin.ProcessKiller/ViewModels/SettingsViewModel.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
namespace Flow.Launcher.Plugin.ProcessKiller.ViewModels;
2-
3-
public class SettingsViewModel(Settings settings)
1+
namespace Flow.Launcher.Plugin.ProcessKiller.ViewModels
42
{
5-
public Settings Settings { get; set; } = settings;
3+
public class SettingsViewModel(Settings settings)
4+
{
5+
public Settings Settings { get; set; } = settings;
6+
}
67
}

‎Plugins/Flow.Launcher.Plugin.Shell/ShellSetting.xaml.cs‎

Lines changed: 104 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -2,140 +2,141 @@
22
using System.Windows;
33
using System.Windows.Controls;
44

5-
namespace Flow.Launcher.Plugin.Shell;
6-
7-
public partial class CMDSetting : UserControl
5+
namespace Flow.Launcher.Plugin.Shell
86
{
9-
private readonly Settings _settings;
10-
11-
public CMDSetting(Settings settings)
7+
public partial class CMDSetting : UserControl
128
{
13-
InitializeComponent();
14-
_settings = settings;
15-
}
9+
private readonly Settings _settings;
1610

17-
private void CMDSetting_OnLoaded(object sender, RoutedEventArgs re)
18-
{
19-
ReplaceWinR.IsChecked = _settings.ReplaceWinR;
11+
public CMDSetting(Settings settings)
12+
{
13+
InitializeComponent();
14+
_settings = settings;
15+
}
2016

21-
CloseShellAfterPress.IsChecked = _settings.CloseShellAfterPress;
17+
private void CMDSetting_OnLoaded(object sender, RoutedEventArgs re)
18+
{
19+
ReplaceWinR.IsChecked = _settings.ReplaceWinR;
2220

23-
LeaveShellOpen.IsChecked = _settings.LeaveShellOpen;
21+
CloseShellAfterPress.IsChecked = _settings.CloseShellAfterPress;
2422

25-
AlwaysRunAsAdministrator.IsChecked = _settings.RunAsAdministrator;
23+
LeaveShellOpen.IsChecked = _settings.LeaveShellOpen;
2624

27-
UseWindowsTerminal.IsChecked = _settings.UseWindowsTerminal;
25+
AlwaysRunAsAdministrator.IsChecked = _settings.RunAsAdministrator;
2826

29-
LeaveShellOpen.IsEnabled = _settings.Shell != Shell.RunCommand;
27+
UseWindowsTerminal.IsChecked = _settings.UseWindowsTerminal;
3028

31-
ShowOnlyMostUsedCMDs.IsChecked = _settings.ShowOnlyMostUsedCMDs;
29+
LeaveShellOpen.IsEnabled = _settings.Shell != Shell.RunCommand;
3230

33-
if (ShowOnlyMostUsedCMDs.IsChecked != true)
34-
ShowOnlyMostUsedCMDsNumber.IsEnabled = false;
31+
ShowOnlyMostUsedCMDs.IsChecked = _settings.ShowOnlyMostUsedCMDs;
3532

36-
ShowOnlyMostUsedCMDsNumber.ItemsSource = new List<int>() { 5, 10, 20 };
33+
if (ShowOnlyMostUsedCMDs.IsChecked != true)
34+
ShowOnlyMostUsedCMDsNumber.IsEnabled = false;
3735

38-
if (_settings.ShowOnlyMostUsedCMDsNumber == 0)
39-
{
40-
ShowOnlyMostUsedCMDsNumber.SelectedIndex = 0;
36+
ShowOnlyMostUsedCMDsNumber.ItemsSource = new List<int>() { 5, 10, 20 };
4137

42-
_settings.ShowOnlyMostUsedCMDsNumber = (int)ShowOnlyMostUsedCMDsNumber.SelectedItem;
43-
}
38+
if (_settings.ShowOnlyMostUsedCMDsNumber == 0)
39+
{
40+
ShowOnlyMostUsedCMDsNumber.SelectedIndex = 0;
4441

45-
CloseShellAfterPress.Checked += (o, e) =>
46-
{
47-
_settings.CloseShellAfterPress = true;
48-
LeaveShellOpen.IsChecked = false;
49-
LeaveShellOpen.IsEnabled = false;
50-
};
42+
_settings.ShowOnlyMostUsedCMDsNumber = (int)ShowOnlyMostUsedCMDsNumber.SelectedItem;
43+
}
5144

52-
CloseShellAfterPress.Unchecked += (o, e) =>
53-
{
54-
_settings.CloseShellAfterPress = false;
55-
LeaveShellOpen.IsEnabled = true;
56-
};
45+
CloseShellAfterPress.Checked += (o, e) =>
46+
{
47+
_settings.CloseShellAfterPress = true;
48+
LeaveShellOpen.IsChecked = false;
49+
LeaveShellOpen.IsEnabled = false;
50+
};
5751

58-
LeaveShellOpen.Checked += (o, e) =>
59-
{
60-
_settings.LeaveShellOpen = true;
61-
CloseShellAfterPress.IsChecked = false;
62-
CloseShellAfterPress.IsEnabled = false;
63-
};
52+
CloseShellAfterPress.Unchecked += (o, e) =>
53+
{
54+
_settings.CloseShellAfterPress = false;
55+
LeaveShellOpen.IsEnabled = true;
56+
};
6457

65-
LeaveShellOpen.Unchecked += (o, e) =>
66-
{
67-
_settings.LeaveShellOpen = false;
68-
CloseShellAfterPress.IsEnabled = true;
69-
};
58+
LeaveShellOpen.Checked += (o, e) =>
59+
{
60+
_settings.LeaveShellOpen = true;
61+
CloseShellAfterPress.IsChecked = false;
62+
CloseShellAfterPress.IsEnabled = false;
63+
};
7064

71-
AlwaysRunAsAdministrator.Checked += (o, e) =>
72-
{
73-
_settings.RunAsAdministrator = true;
74-
};
65+
LeaveShellOpen.Unchecked += (o, e) =>
66+
{
67+
_settings.LeaveShellOpen = false;
68+
CloseShellAfterPress.IsEnabled = true;
69+
};
7570

76-
AlwaysRunAsAdministrator.Unchecked += (o, e) =>
77-
{
78-
_settings.RunAsAdministrator = false;
79-
};
71+
AlwaysRunAsAdministrator.Checked += (o, e) =>
72+
{
73+
_settings.RunAsAdministrator = true;
74+
};
8075

81-
UseWindowsTerminal.Checked += (o, e) =>
82-
{
83-
_settings.UseWindowsTerminal = true;
84-
};
76+
AlwaysRunAsAdministrator.Unchecked += (o, e) =>
77+
{
78+
_settings.RunAsAdministrator = false;
79+
};
8580

86-
UseWindowsTerminal.Unchecked += (o, e) =>
87-
{
88-
_settings.UseWindowsTerminal = false;
89-
};
81+
UseWindowsTerminal.Checked += (o, e) =>
82+
{
83+
_settings.UseWindowsTerminal = true;
84+
};
9085

91-
ReplaceWinR.Checked += (o, e) =>
92-
{
93-
_settings.ReplaceWinR = true;
94-
};
86+
UseWindowsTerminal.Unchecked += (o, e) =>
87+
{
88+
_settings.UseWindowsTerminal = false;
89+
};
9590

96-
ReplaceWinR.Unchecked += (o, e) =>
97-
{
98-
_settings.ReplaceWinR = false;
99-
};
91+
ReplaceWinR.Checked += (o, e) =>
92+
{
93+
_settings.ReplaceWinR = true;
94+
};
10095

101-
ShellComboBox.SelectedIndex = _settings.Shell switch
102-
{
103-
Shell.Cmd => 0,
104-
Shell.Powershell => 1,
105-
Shell.Pwsh => 2,
106-
_ => ShellComboBox.Items.Count - 1
107-
};
96+
ReplaceWinR.Unchecked += (o, e) =>
97+
{
98+
_settings.ReplaceWinR = false;
99+
};
108100

109-
ShellComboBox.SelectionChanged += (o, e) =>
110-
{
111-
_settings.Shell = ShellComboBox.SelectedIndex switch
101+
ShellComboBox.SelectedIndex = _settings.Shell switch
112102
{
113-
0 => Shell.Cmd,
114-
1 => Shell.Powershell,
115-
2 => Shell.Pwsh,
116-
_ => Shell.RunCommand
103+
Shell.Cmd => 0,
104+
Shell.Powershell => 1,
105+
Shell.Pwsh => 2,
106+
_ => ShellComboBox.Items.Count - 1
117107
};
118-
LeaveShellOpen.IsEnabled = _settings.Shell != Shell.RunCommand;
119-
};
120108

121-
ShowOnlyMostUsedCMDs.Checked += (o, e) =>
122-
{
123-
_settings.ShowOnlyMostUsedCMDs = true;
109+
ShellComboBox.SelectionChanged += (o, e) =>
110+
{
111+
_settings.Shell = ShellComboBox.SelectedIndex switch
112+
{
113+
0 => Shell.Cmd,
114+
1 => Shell.Powershell,
115+
2 => Shell.Pwsh,
116+
_ => Shell.RunCommand
117+
};
118+
LeaveShellOpen.IsEnabled = _settings.Shell != Shell.RunCommand;
119+
};
124120

125-
ShowOnlyMostUsedCMDsNumber.IsEnabled = true;
126-
};
121+
ShowOnlyMostUsedCMDs.Checked += (o, e) =>
122+
{
123+
_settings.ShowOnlyMostUsedCMDs = true;
127124

128-
ShowOnlyMostUsedCMDs.Unchecked += (o, e) =>
129-
{
130-
_settings.ShowOnlyMostUsedCMDs = false;
125+
ShowOnlyMostUsedCMDsNumber.IsEnabled = true;
126+
};
131127

132-
ShowOnlyMostUsedCMDsNumber.IsEnabled = false;
133-
};
128+
ShowOnlyMostUsedCMDs.Unchecked += (o, e) =>
129+
{
130+
_settings.ShowOnlyMostUsedCMDs = false;
134131

135-
ShowOnlyMostUsedCMDsNumber.SelectedItem = _settings.ShowOnlyMostUsedCMDsNumber;
136-
ShowOnlyMostUsedCMDsNumber.SelectionChanged += (o, e) =>
137-
{
138-
_settings.ShowOnlyMostUsedCMDsNumber = (int)ShowOnlyMostUsedCMDsNumber.SelectedItem;
139-
};
132+
ShowOnlyMostUsedCMDsNumber.IsEnabled = false;
133+
};
134+
135+
ShowOnlyMostUsedCMDsNumber.SelectedItem = _settings.ShowOnlyMostUsedCMDsNumber;
136+
ShowOnlyMostUsedCMDsNumber.SelectionChanged += (o, e) =>
137+
{
138+
_settings.ShowOnlyMostUsedCMDsNumber = (int)ShowOnlyMostUsedCMDsNumber.SelectedItem;
139+
};
140+
}
140141
}
141142
}

0 commit comments

Comments
 (0)