Re-order advanced options

Improve rate button Improve labels
ErikEJ · Oct 26, 2023 · 29077e9 · 29077e9
1 parent f33e408
commit 29077e9
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 42 deletions.
diff --git a/src/GUI/EFCorePowerTools/Dialogs/AdvancedModelingOptionsDialog.xaml b/src/GUI/EFCorePowerTools/Dialogs/AdvancedModelingOptionsDialog.xaml
@@ -54,71 +54,77 @@
                     Orientation="Vertical">
             <GroupBox Header="{x:Static locale:ReverseEngineerLocale.CodeGeneration}" >
                 <StackPanel>
-                    <CheckBox Content="{x:Static locale:ReverseEngineerLocale.RemoveDefaultConstructor}"
-                      IsChecked="{Binding Model.UseNoDefaultConstructor}"
-                      Style="{StaticResource MarginCheckBlockStyle}"
-                      TabIndex="0" />
 
-                    <CheckBox Content="{x:Static locale:ReverseEngineerLocale.RemoveSQLDefaultFromBoolColumns}"
-                      IsChecked="{Binding Model.UseBoolPropertiesWithoutDefaultSql}"
+                    <CheckBox Content="{x:Static locale:ReverseEngineerLocale.UseManyToManyEntity }"
+                      IsChecked="{Binding Model.UseManyToManyEntity}"
                       Style="{StaticResource MarginCheckBlockStyle}"
-                      TabIndex="1" />
+                      TabIndex="0" />
 
                     <CheckBox Content="{x:Static locale:ReverseEngineerLocale.UseNullableReferenceTypes}"
                       IsChecked="{Binding Model.UseNullableReferences}"
                       Style="{StaticResource MarginCheckBlockStyle}"
-                      TabIndex="2" />
+                      TabIndex="1" />
+
+                    <CheckBox Content="{x:Static locale:ReverseEngineerLocale.RemoveSQLDefaultFromBoolColumns}"
+                        IsChecked="{Binding Model.UseBoolPropertiesWithoutDefaultSql}"
+                        Style="{StaticResource MarginCheckBlockStyle}"
+                        TabIndex="2" />
 
                     <CheckBox Content="{x:Static locale:ReverseEngineerLocale.RemoveNavigationsFromEntities}"
-                      IsChecked="{Binding Model.UseNoNavigations}"
-                      Style="{StaticResource MarginCheckBlockStyle}"
-                      TabIndex="3" />
+                        IsChecked="{Binding Model.UseNoNavigations}"
+                        Style="{StaticResource MarginCheckBlockStyle}"
+                        TabIndex="3" />
 
-                    <CheckBox Content="{x:Static locale:ReverseEngineerLocale.UseManyToManyEntity }"
-                      IsChecked="{Binding Model.UseManyToManyEntity}"
-                      Style="{StaticResource MarginCheckBlockStyle}"
-                      TabIndex="4" />
+                    <CheckBox Content="{x:Static locale:ReverseEngineerLocale.RemoveDefaultConstructor}"
+                        IsChecked="{Binding Model.UseNoDefaultConstructor}"
+                        Style="{StaticResource MarginCheckBlockStyle}"
+                        TabIndex="4" />
 
                     <CheckBox Content="{x:Static locale:ReverseEngineerLocale.AlwaysIncludeAllDatabaseObjects}"
-                          IsChecked="{Binding Model.UseNoObjectFilter}"
-                          Style="{StaticResource MarginCheckBlockStyle}"
-                          TabIndex="5" />
+                        IsChecked="{Binding Model.UseNoObjectFilter}"
+                        Style="{StaticResource MarginCheckBlockStyle}"
+                        TabIndex="5" />
+
                 </StackPanel>
             </GroupBox>
 
             <GroupBox Header="{x:Static locale:ReverseEngineerLocale.FileLayout}">
                 <StackPanel>
-                    <CheckBox Content="{x:Static locale:ReverseEngineerLocale.SplitDbContextIntoConfigurationClasses}"
-                          IsChecked="{Binding Model.UseDbContextSplitting}"
-                          Style="{StaticResource MarginCheckBlockStyle}"
-                          TabIndex="10" />
-                    <CheckBox Content="{x:Static locale:ReverseEngineerLocale.UseSchemaFolders}"
-                      IsChecked="{Binding Model.UseSchemaFolders}"
-                      Style="{StaticResource MarginCheckBlockStyle}"
-                      TabIndex="11" />
-                    <CheckBox Content="{x:Static locale:ReverseEngineerLocale.UseSchemaNamespaces}"
-                        IsChecked="{Binding Model.UseSchemaNamespaces}"
-                        Style="{StaticResource MarginCheckBlockStyle}"
-                        TabIndex="11" />
                     <dw:LiveTextBlock 
                           Text="{x:Static locale:ReverseEngineerLocale.EntityTypesSubNamespace}"/>
                     <TextBox Grid.Row="7"
-                         TabIndex="12"
+                         TabIndex="10"
                          Style="{StaticResource TextInputStyle}"
                          Text="{Binding Model.ModelNamespace, Mode=TwoWay}"/>
+
                     <dw:LiveTextBlock Grid.Row="8"
                           Text="{x:Static locale:ReverseEngineerLocale.DbContextPath}"/>
                     <TextBox 
-                 TabIndex="13"
-                 Style="{StaticResource TextInputStyle}"
-                 Text="{Binding Model.OutputContextPath, Mode=TwoWay}"/>
+                         TabIndex="11"
+                         Style="{StaticResource TextInputStyle}"
+                         Text="{Binding Model.OutputContextPath, Mode=TwoWay}"/>
 
                     <dw:LiveTextBlock 
                           Text="{x:Static locale:ReverseEngineerLocale.DbContextSubNamespace}"/>
                     <TextBox 
-                 TabIndex="14"
-                 Style="{StaticResource TextInputStyle}"
-                 Text="{Binding Model.ContextNamespace, Mode=TwoWay}"/>
+                     TabIndex="12"
+                     Style="{StaticResource TextInputStyle}"
+                     Text="{Binding Model.ContextNamespace, Mode=TwoWay}"/>
+
+                    <CheckBox Content="{x:Static locale:ReverseEngineerLocale.SplitDbContextIntoConfigurationClasses}"
+                          IsChecked="{Binding Model.UseDbContextSplitting}"
+                          Style="{StaticResource MarginCheckBlockStyle}"
+                          TabIndex="13" />
+
+                    <CheckBox Content="{x:Static locale:ReverseEngineerLocale.UseSchemaFolders}"
+                      IsChecked="{Binding Model.UseSchemaFolders}"
+                      Style="{StaticResource MarginCheckBlockStyle}"
+                      TabIndex="14" />
+
+                    <CheckBox Content="{x:Static locale:ReverseEngineerLocale.UseSchemaNamespaces}"
+                        IsChecked="{Binding Model.UseSchemaNamespaces}"
+                        Style="{StaticResource MarginCheckBlockStyle}"
+                        TabIndex="15" />
                 </StackPanel>
 
             </GroupBox>

diff --git a/src/GUI/EFCorePowerTools/Dialogs/EfCoreModelDialog.xaml b/src/GUI/EFCorePowerTools/Dialogs/EfCoreModelDialog.xaml
@@ -189,7 +189,7 @@
                     <Hyperlink.Style>
                         <Style TargetType="{x:Type Hyperlink}"
                             BasedOn="{StaticResource {x:Type Hyperlink}}">
-                            <Setter Property="Foreground" Value="LawnGreen"/>
+                            <Setter Property="Foreground" Value="ForestGreen"/>
                         </Style>
                     </Hyperlink.Style>
                     <Run Text="{x:Static locale:ReverseEngineerLocale.Rate}"/>

diff --git a/src/GUI/EFCorePowerTools/Locales/ReverseEngineerLocale.en.resx b/src/GUI/EFCorePowerTools/Locales/ReverseEngineerLocale.en.resx
@@ -313,7 +313,7 @@
     <value>Remove constructor from entity classes (experimental)</value>
   </data>
   <data name="RemoveDefaultConstructor" xml:space="preserve">
-    <value>Remove default DbContext constructor</value>
+    <value>Remove default DbContext constructor (EF Core 6 only)</value>
   </data>
   <data name="RemoveNavigationsFromEntities" xml:space="preserve">
     <value>Remove navigations from entity classes (experimental)</value>
@@ -385,16 +385,16 @@
     <value>Use DataAnnotation attributes to configure the model</value>
   </data>
   <data name="UseEF6Pluralizer" xml:space="preserve">
-    <value>Use EF6 pluralizer</value>
+    <value>Use EF6 "Classic" pluralizer</value>
   </data>
   <data name="UseManyToManyEntity" xml:space="preserve">
-    <value>Use many to many entity (EF Core 6 and later)</value>
+    <value>Use many to many entity</value>
   </data>
   <data name="UseNamesFromDatabase" xml:space="preserve">
     <value>Use table and column names directly from the database</value>
   </data>
   <data name="UseNullableReferenceTypes" xml:space="preserve">
-    <value>Use nullable reference types (experimental)</value>
+    <value>Use nullable reference types</value>
   </data>
   <data name="UseRegularExpression" xml:space="preserve">
     <value>Use regular expression</value>