Skip to content

Commit c02fa4b

Browse files
jjw24jjw24
committed
rename ui elements
1 parent 324ee62 commit c02fa4b

File tree

3 files changed

+36
-36
lines changed

3 files changed

+36
-36
lines changed

‎Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<system:String x:Key="plugin_explorer_edit">Edit</system:String>
1717
<system:String x:Key="plugin_explorer_add">Add</system:String>
1818
<system:String x:Key="plugin_explorer_manageactionkeywords_header">Customise Action Keywords</system:String>
19-
<system:String x:Key="plugin_explorer_quickfolderaccess_header">Quick Folder Access Paths</system:String>
19+
<system:String x:Key="plugin_explorer_quickaccesslinks_header">Quick Access Link Paths</system:String>
2020
<system:String x:Key="plugin_explorer_indexsearchexcludedpaths_header">Index Search Excluded Paths</system:String>
2121
<system:String x:Key="plugin_explorer_manageindexoptions">Indexing Options</system:String>
2222
<system:String x:Key="plugin_explorer_actionkeywordview_search">Search Activation:</system:String>

‎Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
mc:Ignorable="d"
88
d:DesignHeight="450" d:DesignWidth="800">
99
<UserControl.Resources>
10-
<DataTemplate x:Key="ListViewTemplateFolderLinks">
10+
<DataTemplate x:Key="ListViewTemplateAccessLinks">
1111
<TextBlock
1212
Text="{Binding Nickname, Mode=OneTime}"
1313
Margin="0,5,0,5" />
@@ -40,22 +40,22 @@
4040
<ListView x:Name="lbxActionKeywords"
4141
ItemTemplate="{StaticResource ListViewActionKeywords}"/>
4242
</Expander>
43-
<Expander Name="expFolderLinks" Header="{DynamicResource plugin_explorer_quickfolderaccess_header}"
44-
Expanded="expFolderLinks_Click" Collapsed="expFolderLinks_Collapsed"
43+
<Expander Name="expAccessLinks" Header="{DynamicResource plugin_explorer_quickaccesslinks_header}"
44+
Expanded="expAccessLinks_Click" Collapsed="expAccessLinks_Collapsed"
4545
Margin="0 10 0 0">
4646
<ListView
47-
x:Name="lbxFolderLinks" AllowDrop="True"
48-
Drop="lbxFolders_Drop"
49-
DragEnter="lbxFolders_DragEnter"
50-
ItemTemplate="{StaticResource ListViewTemplateFolderLinks}"/>
47+
x:Name="lbxAccessLinks" AllowDrop="True"
48+
Drop="lbxAccessLinks_Drop"
49+
DragEnter="lbxAccessLinks_DragEnter"
50+
ItemTemplate="{StaticResource ListViewTemplateAccessLinks}"/>
5151
</Expander>
5252
<Expander x:Name="expExcludedPaths" Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}"
5353
Expanded="expExcludedPaths_Click"
5454
Margin="0 10 0 0">
5555
<ListView
5656
x:Name="lbxExcludedPaths" AllowDrop="True"
57-
Drop="lbxFolders_Drop"
58-
DragEnter="lbxFolders_DragEnter"
57+
Drop="lbxAccessLinks_Drop"
58+
DragEnter="lbxAccessLinks_DragEnter"
5959
ItemTemplate="{StaticResource ListViewTemplateExcludedPaths}"/>
6060
</Expander>
6161
</StackPanel>

‎Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public ExplorerSettings(SettingsViewModel viewModel)
2929

3030
this.viewModel = viewModel;
3131

32-
lbxFolderLinks.ItemsSource = this.viewModel.Settings.QuickAccessLinks;
32+
lbxAccessLinks.ItemsSource = this.viewModel.Settings.QuickAccessLinks;
3333

3434
lbxExcludedPaths.ItemsSource = this.viewModel.Settings.IndexSearchExcludedSubdirectoryPaths;
3535

@@ -54,15 +54,15 @@ public ExplorerSettings(SettingsViewModel viewModel)
5454

5555
public void RefreshView()
5656
{
57-
lbxFolderLinks.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
57+
lbxAccessLinks.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
5858

5959
lbxExcludedPaths.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
6060

6161
btnDelete.Visibility = Visibility.Hidden;
6262
btnEdit.Visibility = Visibility.Hidden;
6363
btnAdd.Visibility = Visibility.Hidden;
6464

65-
if (expFolderLinks.IsExpanded || expExcludedPaths.IsExpanded || expActionKeywords.IsExpanded)
65+
if (expAccessLinks.IsExpanded || expExcludedPaths.IsExpanded || expActionKeywords.IsExpanded)
6666
{
6767
if (!expActionKeywords.IsExpanded)
6868
btnAdd.Visibility = Visibility.Visible;
@@ -71,16 +71,16 @@ public void RefreshView()
7171
&& btnEdit.Visibility == Visibility.Hidden)
7272
btnEdit.Visibility = Visibility.Visible;
7373

74-
if ((lbxFolderLinks.Items.Count == 0 && lbxExcludedPaths.Items.Count == 0)
74+
if ((lbxAccessLinks.Items.Count == 0 && lbxExcludedPaths.Items.Count == 0)
7575
&& btnDelete.Visibility == Visibility.Visible
7676
&& btnEdit.Visibility == Visibility.Visible)
7777
{
7878
btnDelete.Visibility = Visibility.Hidden;
7979
btnEdit.Visibility = Visibility.Hidden;
8080
}
8181

82-
if (expFolderLinks.IsExpanded
83-
&& lbxFolderLinks.Items.Count > 0
82+
if (expAccessLinks.IsExpanded
83+
&& lbxAccessLinks.Items.Count > 0
8484
&& btnDelete.Visibility == Visibility.Hidden
8585
&& btnEdit.Visibility == Visibility.Hidden)
8686
{
@@ -98,7 +98,7 @@ public void RefreshView()
9898
}
9999
}
100100

101-
lbxFolderLinks.Items.Refresh();
101+
lbxAccessLinks.Items.Refresh();
102102

103103
lbxExcludedPaths.Items.Refresh();
104104

@@ -113,8 +113,8 @@ private void expActionKeywords_Click(object sender, RoutedEventArgs e)
113113
if (expExcludedPaths.IsExpanded)
114114
expExcludedPaths.IsExpanded = false;
115115

116-
if (expFolderLinks.IsExpanded)
117-
expFolderLinks.IsExpanded = false;
116+
if (expAccessLinks.IsExpanded)
117+
expAccessLinks.IsExpanded = false;
118118

119119
RefreshView();
120120
}
@@ -125,10 +125,10 @@ private void expActionKeywords_Collapsed(object sender, RoutedEventArgs e)
125125
expActionKeywords.Height = Double.NaN;
126126
}
127127

128-
private void expFolderLinks_Click(object sender, RoutedEventArgs e)
128+
private void expAccessLinks_Click(object sender, RoutedEventArgs e)
129129
{
130-
if (expFolderLinks.IsExpanded)
131-
expFolderLinks.Height = 215;
130+
if (expAccessLinks.IsExpanded)
131+
expAccessLinks.Height = 215;
132132

133133
if (expExcludedPaths.IsExpanded)
134134
expExcludedPaths.IsExpanded = false;
@@ -139,19 +139,19 @@ private void expFolderLinks_Click(object sender, RoutedEventArgs e)
139139
RefreshView();
140140
}
141141

142-
private void expFolderLinks_Collapsed(object sender, RoutedEventArgs e)
142+
private void expAccessLinks_Collapsed(object sender, RoutedEventArgs e)
143143
{
144-
if (!expFolderLinks.IsExpanded)
145-
expFolderLinks.Height = Double.NaN;
144+
if (!expAccessLinks.IsExpanded)
145+
expAccessLinks.Height = Double.NaN;
146146
}
147147

148148
private void expExcludedPaths_Click(object sender, RoutedEventArgs e)
149149
{
150150
if (expExcludedPaths.IsExpanded)
151-
expFolderLinks.Height = Double.NaN;
151+
expAccessLinks.Height = Double.NaN;
152152

153-
if (expFolderLinks.IsExpanded)
154-
expFolderLinks.IsExpanded = false;
153+
if (expAccessLinks.IsExpanded)
154+
expAccessLinks.IsExpanded = false;
155155

156156
if (expActionKeywords.IsExpanded)
157157
expActionKeywords.IsExpanded = false;
@@ -161,15 +161,15 @@ private void expExcludedPaths_Click(object sender, RoutedEventArgs e)
161161

162162
private void btnDelete_Click(object sender, RoutedEventArgs e)
163163
{
164-
var selectedRow = lbxFolderLinks.SelectedItem as AccessLink?? lbxExcludedPaths.SelectedItem as AccessLink;
164+
var selectedRow = lbxAccessLinks.SelectedItem as AccessLink?? lbxExcludedPaths.SelectedItem as AccessLink;
165165

166166
if (selectedRow != null)
167167
{
168168
string msg = string.Format(viewModel.Context.API.GetTranslation("plugin_explorer_delete_folder_link"), selectedRow.Path);
169169

170170
if (MessageBox.Show(msg, string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.Yes)
171171
{
172-
if (expFolderLinks.IsExpanded)
172+
if (expAccessLinks.IsExpanded)
173173
viewModel.RemoveFolderLinkFromQuickFolders(selectedRow);
174174

175175
if (expExcludedPaths.IsExpanded)
@@ -199,15 +199,15 @@ private void btnEdit_Click(object sender, RoutedEventArgs e)
199199
}
200200
else
201201
{
202-
var selectedRow = lbxFolderLinks.SelectedItem as AccessLink ?? lbxExcludedPaths.SelectedItem as AccessLink;
202+
var selectedRow = lbxAccessLinks.SelectedItem as AccessLink ?? lbxExcludedPaths.SelectedItem as AccessLink;
203203

204204
if (selectedRow != null)
205205
{
206206
var folderBrowserDialog = new FolderBrowserDialog();
207207
folderBrowserDialog.SelectedPath = selectedRow.Path;
208208
if (folderBrowserDialog.ShowDialog() == DialogResult.OK)
209209
{
210-
if (expFolderLinks.IsExpanded)
210+
if (expAccessLinks.IsExpanded)
211211
{
212212
var link = viewModel.Settings.QuickAccessLinks.First(x => x.Path == selectedRow.Path);
213213
link.Path = folderBrowserDialog.SelectedPath;
@@ -246,13 +246,13 @@ private void btnAdd_Click(object sender, RoutedEventArgs e)
246246
RefreshView();
247247
}
248248

249-
private void lbxFolders_Drop(object sender, DragEventArgs e)
249+
private void lbxAccessLinks_Drop(object sender, DragEventArgs e)
250250
{
251251
string[] files = (string[])e.Data.GetData(DataFormats.FileDrop);
252252

253253
if (files != null && files.Count() > 0)
254254
{
255-
if (expFolderLinks.IsExpanded && viewModel.Settings.QuickAccessLinks == null)
255+
if (expAccessLinks.IsExpanded && viewModel.Settings.QuickAccessLinks == null)
256256
viewModel.Settings.QuickAccessLinks = new List<AccessLink>();
257257

258258
foreach (string s in files)
@@ -274,7 +274,7 @@ private void lbxFolders_Drop(object sender, DragEventArgs e)
274274

275275
private void AddFolderLink(AccessLink newFolderLink)
276276
{
277-
if (expFolderLinks.IsExpanded
277+
if (expAccessLinks.IsExpanded
278278
&& !viewModel.Settings.QuickAccessLinks.Any(x => x.Path == newFolderLink.Path))
279279
{
280280
if (viewModel.Settings.QuickAccessLinks == null)
@@ -293,7 +293,7 @@ private void AddFolderLink(AccessLink newFolderLink)
293293
}
294294
}
295295

296-
private void lbxFolders_DragEnter(object sender, DragEventArgs e)
296+
private void lbxAccessLinks_DragEnter(object sender, DragEventArgs e)
297297
{
298298
if (e.Data.GetDataPresent(DataFormats.FileDrop))
299299
{

0 commit comments

Comments
 (0)