Add tabs to Publish dialog

leosac · Feb 9, 2024 · f56b246 · f56b246
1 parent 82431f4
commit f56b246
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 21 deletions.
diff --git a/KeyManager.Library.UI/Domain/PublishKeyStoreDialogViewModel.cs b/KeyManager.Library.UI/Domain/PublishKeyStoreDialogViewModel.cs
@@ -1,7 +1,5 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Leosac.KeyManager.Library.KeyStore;
-using Leosac.KeyManager.Library.Plugin.UI.Domain;
-using Leosac.WpfApp.Domain;
 
 namespace Leosac.KeyManager.Library.UI.Domain
 {

diff --git a/KeyManager.Library.UI/Properties/Resources.Designer.cs b/KeyManager.Library.UI/Properties/Resources.Designer.cs
diff --git a/KeyManager.Library.UI/Properties/Resources.fr.resx b/KeyManager.Library.UI/Properties/Resources.fr.resx
@@ -120,6 +120,9 @@
  <data name="AddDivInputFragment" xml:space="preserve">
  <value>Ajouter un fragment</value>
  </data>
+ <data name="Attributes" xml:space="preserve">
+ <value>Attributs</value>
+ </data>
  <data name="Browse" xml:space="preserve">
  <value>Parcourir</value>
  </data>

diff --git a/KeyManager.Library.UI/Properties/Resources.resx b/KeyManager.Library.UI/Properties/Resources.resx
@@ -120,6 +120,9 @@
  <data name="AddDivInputFragment" xml:space="preserve">
  <value>Add div input fragment</value>
  </data>
+ <data name="Attributes" xml:space="preserve">
+ <value>Attributes</value>
+ </data>
  <data name="Browse" xml:space="preserve">
  <value>Browse</value>
  </data>

diff --git a/KeyManager.Library.UI/PublishKeyStoreDialog.xaml b/KeyManager.Library.UI/PublishKeyStoreDialog.xaml
@@ -17,28 +17,26 @@
  <Button Width="100" IsDefault="True" Content="{x:Static properties:Resources.OK}" Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}" CommandParameter="{Binding Favorite}"/>
  <Button Width="100" IsCancel="True" Content="{x:Static properties:Resources.Cancel}" Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}" Margin="15,0,0,0"/>
  </WrapPanel>
- <StackPanel>
- <local:FavoriteKeyStoreSelectionControl SelectedKeyStoreFavorite="{Binding Favorite, Mode=TwoWay}" />
- <materialDesign:Card Margin="5,20,5,5">
+ <TabControl>
+ <TabItem Header="{x:Static properties:Resources.General}">
+ <local:FavoriteKeyStoreSelectionControl SelectedKeyStoreFavorite="{Binding Favorite, Mode=TwoWay}" />
+ </TabItem>
+ <TabItem Header="{x:Static properties:Resources.Options}">
  <StackPanel>
- <Expander HorizontalAlignment="Stretch" Header="{x:Static properties:Resources.Options}">
- <StackPanel>
- <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="5">
- <ToggleButton IsChecked="{Binding Properties.Options.GenerateKeys}" Style="{StaticResource MaterialDesignSwitchLightToggleButton}" />
- <TextBlock Text="{x:Static properties:Resources.GenerateKeyEntries}" Padding="3" />
- </StackPanel>
- <Expander HorizontalAlignment="Stretch" Header="{x:Static properties:Resources.WrappingKey}" Margin="5">
- <StackPanel Orientation="Vertical" TextBlock.Foreground="{DynamicResource MaterialDesignBody}" Margin="24,8,24,16">
- <local:KeyEntryIdControl KeyEntryId="{Binding Options.WrappingKey.KeyId, Mode=TwoWay}" />
- <TextBox Text="{Binding Options.WrappingKey.ContainerSelector, Mode=TwoWay}" Margin="5"
- materialDesign:HintAssist.HelperText="{x:Static properties:Resources.KeyVersionHelper}"
- materialDesign:HintAssist.Hint="{x:Static properties:Resources.KeyVersion}"/>
- </StackPanel>
- </Expander>
+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="5">
+ <ToggleButton IsChecked="{Binding Properties.Options.GenerateKeys}" Style="{StaticResource MaterialDesignSwitchLightToggleButton}" />
+ <TextBlock Text="{x:Static properties:Resources.GenerateKeyEntries}" Padding="3" />
+ </StackPanel>
+ <Expander HorizontalAlignment="Stretch" Header="{x:Static properties:Resources.WrappingKey}" Margin="5">
+ <StackPanel Orientation="Vertical" TextBlock.Foreground="{DynamicResource MaterialDesignBody}" Margin="24,8,24,16">
+ <local:KeyEntryIdControl KeyEntryId="{Binding Options.WrappingKey.KeyId, Mode=TwoWay}" />
+ <TextBox Text="{Binding Options.WrappingKey.ContainerSelector, Mode=TwoWay}" Margin="5"
+ materialDesign:HintAssist.HelperText="{x:Static properties:Resources.KeyVersionHelper}"
+ materialDesign:HintAssist.Hint="{x:Static properties:Resources.KeyVersion}"/>
  </StackPanel>
  </Expander>
  </StackPanel>
- </materialDesign:Card>
- </StackPanel>
+ </TabItem>
+ </TabControl>
  </DockPanel>
 </UserControl>