Skip to content

Commit a9476b1

Browse files
onesoundsonesounds
committed
Adjust Plugin List template
1 parent 1d746c2 commit a9476b1

File tree

3 files changed

+48
-22
lines changed

3 files changed

+48
-22
lines changed

‎Flow.Launcher/Languages/en.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<system:String x:Key="newActionKeyword">New action keyword:</system:String>
5252
<system:String x:Key="currentPriority">Current Priority:</system:String>
5353
<system:String x:Key="newPriority">New Priority:</system:String>
54-
<system:String x:Key="priority">Priority:</system:String>
54+
<system:String x:Key="priority">Priority</system:String>
5555
<system:String x:Key="pluginDirectory">Plugin Directory</system:String>
5656
<system:String x:Key="author">Author</system:String>
5757
<system:String x:Key="plugin_init_time">Init time:</system:String>

‎Flow.Launcher/SettingWindow.xaml

Lines changed: 39 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -418,8 +418,7 @@
418418
</TabItem.Header>
419419
<Grid>
420420
<Grid.ColumnDefinitions>
421-
<ColumnDefinition Width="180"></ColumnDefinition>
422-
<ColumnDefinition Width="*"></ColumnDefinition>
421+
<ColumnDefinition></ColumnDefinition>
423422
</Grid.ColumnDefinitions>
424423
<Grid.RowDefinitions>
425424
<RowDefinition Height="74"></RowDefinition>
@@ -429,33 +428,55 @@
429428
<TextBlock Text="{DynamicResource plugin}" TextAlignment="left" FontSize="30" Margin="0 5 0 5"/>
430429
</Border>
431430
<Border Grid.Column="0" Grid.Row="1" Background="#f3f3f3">
432-
<ListBox SelectedIndex="0" SelectedItem="{Binding SelectedPlugin}"
431+
<ListBox SelectedItem="{Binding SelectedPlugin}"
433432
ItemsSource="{Binding PluginViewModels}"
434433
Margin="0, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}" ItemContainerStyle="{StaticResource PluginList}" ScrollViewer.IsDeferredScrollingEnabled="True">
435-
436434
<ListBox.ItemTemplate>
437435
<DataTemplate>
438436
<DockPanel Margin="0">
439-
<Grid>
440-
<Grid.ColumnDefinitions>
441-
<ColumnDefinition Width="50"/>
442-
<ColumnDefinition />
443-
</Grid.ColumnDefinitions>
444-
<Image Source="{Binding Image, IsAsync=True}"
437+
438+
<Expander Grid.Column="4" x:Name="expanderHeader" IsExpanded="{Binding Mode=TwoWay, Path=IsSelected, RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}">
439+
<Expander.Header>
440+
<Grid>
441+
<Grid.ColumnDefinitions>
442+
<ColumnDefinition Width="50"/>
443+
<ColumnDefinition Width="470"/>
444+
<ColumnDefinition Width="130" />
445+
<ColumnDefinition />
446+
<ColumnDefinition Width="Auto"/>
447+
</Grid.ColumnDefinitions>
448+
<Image Source="{Binding Image, IsAsync=True}"
445449
Width="32" Height="32" Margin="12 0 0 0" Grid.Column="0"/>
446-
<StackPanel Grid.Column="1" Margin="12 0 0 0">
447-
<TextBlock Text="{Binding PluginPair.Metadata.Name}" TextWrapping="Wrap" ToolTip="{Binding PluginPair.Metadata.Version}" />
448-
<TextBlock Opacity="0.5" TextWrapping="Wrap" Margin="0 2 0 0">
449-
<Run Text="{Binding PluginPair.Metadata.Version}"/>
450-
</TextBlock>
451-
</StackPanel>
452-
</Grid>
450+
<StackPanel Grid.Column="1" Margin="12 0 14 0">
451+
<TextBlock Text="{Binding PluginPair.Metadata.Name}" TextWrapping="Wrap" ToolTip="{Binding PluginPair.Metadata.Version}" />
452+
<TextBlock Opacity="0.5" TextWrapping="Wrap" Margin="0 2 0 0">
453+
<Run Text="{Binding PluginPair.Metadata.Description}" FontSize="12"/>
454+
</TextBlock>
455+
</StackPanel>
456+
<StackPanel Orientation="Horizontal" Grid.Column="2">
457+
<TextBlock Text="{DynamicResource priority}" VerticalAlignment="Center" Margin="0 0 10 0" MaxWidth="100" FontSize="12"/>
458+
<Button Content="{Binding Priority}"
459+
ToolTip="Change Plugin Results Priority"
460+
Cursor="Hand" Foreground="Black" Width="50"
461+
Click="OnPluginPriorityClick" VerticalAlignment="Center"/>
462+
</StackPanel>
463+
<ui:ToggleSwitch Grid.Column="3" OffContent="{DynamicResource disable}" OnContent="{DynamicResource enable}"
464+
MaxWidth="110" HorizontalAlignment="Right"
465+
IsOn="{Binding PluginState}"/>
466+
</Grid>
467+
</Expander.Header>
468+
<Border Width="500" Height="500" BorderThickness="1" BorderBrush="Black">
469+
<ContentControl ContentTemplateSelector="{StaticResource PluginViewModels}" Content="{Binding SettingProvider}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
470+
</Border>
471+
</Expander>
472+
453473
</DockPanel>
454474
</DataTemplate>
455475
</ListBox.ItemTemplate>
456476
</ListBox>
457477
</Border>
458478

479+
<!--
459480
<Border BorderThickness="1 2 0 0" BorderBrush="#f3f3f3" Grid.Column="2" Grid.RowSpan="2" Padding="12 12 12 12">
460481
<Grid Grid.Column="1" Grid.RowSpan="2">
461482
<Grid.RowDefinitions>
@@ -531,6 +552,7 @@
531552
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
532553
</Grid>
533554
</Border>
555+
-->
534556
</Grid>
535557
</TabItem>
536558
<TabItem>

‎Flow.Launcher/SettingWindow.xaml.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,13 @@ private void OnPluginToggled(object sender, RoutedEventArgs e)
184184
settings.PluginSettings.Plugins[id].Disabled = viewModel.SelectedPlugin.PluginPair.Metadata.Disabled;
185185
}
186186

187-
private void OnPluginPriorityClick(object sender, MouseButtonEventArgs e)
187+
private void OnPluginPriorityClick(object sender, RoutedEventArgs e)
188188
{
189-
if (e.ChangedButton == MouseButton.Left)
190-
{
189+
190+
191191
PriorityChangeWindow priorityChangeWindow = new PriorityChangeWindow(viewModel.SelectedPlugin.PluginPair.Metadata.ID, settings, viewModel.SelectedPlugin);
192192
priorityChangeWindow.ShowDialog();
193-
}
193+
194194
}
195195

196196
private void OnPluginActionKeywordsClick(object sender, MouseButtonEventArgs e)
@@ -266,5 +266,9 @@ private void OpenPluginFolder(object sender, RoutedEventArgs e)
266266
FilesFolders.OpenPath(Path.Combine(DataLocation.DataDirectory(), Constant.Themes));
267267
}
268268

269+
/*private void OnPluginPriorityClick(object sender, RoutedEventArgs e)
270+
{
271+
272+
}*/
269273
}
270274
}

0 commit comments

Comments
 (0)