Merge pull request #126 from Settlers4Modding/bug/tools-group-and-reg…

…roups New Category: Tools
Settlers4Modding · Feb 10, 2021 · 8988ecd · 8988ecd
2 parents 9f10844 + a873775
commit 8988ecd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/docs/en-EN/Changelog.md b/docs/en-EN/Changelog.md
@@ -34,6 +34,7 @@
 
 ### Main Window
 
+* Added Tools group and regrouped some buttons
 * Changelog button is working now
 * About button is working now
 * Disclaimer button is working now

diff --git a/src/CommunityPatchLauncher/Windows/MainWindow.xaml b/src/CommunityPatchLauncher/Windows/MainWindow.xaml
@@ -100,6 +100,20 @@
                                     <TextBlock Style="{StaticResource SubCategoryString}" Text="{x:Static p:Resources.MainWindow_Chat}"></TextBlock>
                                 </ItemsControl>
                             </Button>
+                            <Button Style="{StaticResource CategoryButton}" Command="{Binding ComingSoonCommand}">
+                                <ItemsControl Style="{StaticResource SubCategoryGrid}">
+                                    <fa:FontAwesome Icon="MapMarker" Style="{StaticResource SubCategoryFontAwesome}" />
+                                    <TextBlock Style="{StaticResource SubCategoryString}" Text="{x:Static p:Resources.MainWindow_Maps}"></TextBlock>
+                                </ItemsControl>
+                            </Button>
+                        </StackPanel>
+                        <Button Style="{StaticResource CategoryButton}" Command="{Binding ChangeGroupVisiblity}" CommandParameter="Tools_Group">
+                            <ItemsControl Style="{StaticResource MainCategoryGrid}">
+                                <fa:FontAwesome Icon="Wrench" Style="{StaticResource MainCategoryFontAwesome}" />
+                                <TextBlock Style="{StaticResource MainCategoryString}" Text="{x:Static p:Resources.MainWindow_Tools}"></TextBlock>
+                            </ItemsControl>
+                        </Button>
+                        <StackPanel Visibility="Collapsed" Tag="SubGroup" x:Name="Tools_Group">
                             <Button Style="{StaticResource CategoryButton}" Command="{Binding OpenTextureChangerCommand}">
                                 <ItemsControl Style="{StaticResource SubCategoryGrid}">
                                     <fa:FontAwesome Icon="Exchange" Style="{StaticResource SubCategoryFontAwesome}" />
@@ -118,12 +132,6 @@
                                     <TextBlock Style="{StaticResource SubCategoryString}" Text="{x:Static p:Resources.MainWindow_SettlersConfig}"></TextBlock>
                                 </ItemsControl>
                             </Button>
-                            <Button Style="{StaticResource CategoryButton}" Command="{Binding ComingSoonCommand}">
-                                <ItemsControl Style="{StaticResource SubCategoryGrid}">
-                                    <fa:FontAwesome Icon="MapMarker" Style="{StaticResource SubCategoryFontAwesome}" />
-                                    <TextBlock Style="{StaticResource SubCategoryString}" Text="{x:Static p:Resources.MainWindow_Maps}"></TextBlock>
-                                </ItemsControl>
-                            </Button>
                         </StackPanel>
                         <Button Style="{StaticResource CategoryButton}" Command="{Binding ChangeGroupVisiblity}" CommandParameter="Help_Group">
                             <ItemsControl Style="{StaticResource MainCategoryGrid}">
@@ -150,12 +158,6 @@
                                     <TextBlock Style="{StaticResource SubCategoryString}" Text="{x:Static p:Resources.MainWindow_Mods}"></TextBlock>
                                 </ItemsControl>
                             </Button>
-                            <Button Style="{StaticResource CategoryButton}" Command="{Binding ComingSoonCommand}">
-                                <ItemsControl Style="{StaticResource SubCategoryGrid}">
-                                    <fa:FontAwesome Icon="Wrench" Style="{StaticResource SubCategoryFontAwesome}" />
-                                    <TextBlock Style="{StaticResource SubCategoryString}" Text="{x:Static p:Resources.MainWindow_Tools}"></TextBlock>
-                                </ItemsControl>
-                            </Button>
                             <Button Style="{StaticResource CategoryButton}" Command="{Binding OpenAboutCommand}" CommandParameter="About.md">
                                 <ItemsControl Style="{StaticResource SubCategoryGrid}">
                                     <fa:FontAwesome Icon="Question" Style="{StaticResource SubCategoryFontAwesome}" />