Merge branch 'development'

klemmchr · Nov 21, 2016 · 81e2c1f · 81e2c1f
2 parents 30916eb + 3e505af
commit 81e2c1f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/YTMusicDownloader.sln b/src/YTMusicDownloader.sln
@@ -91,9 +91,9 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		RESX_AutoCreateNewLanguageFiles = False
-		RESX_ResXSortingComparison = OrdinalIgnoreCase
-		RESX_SortFileContentOnSave = True
 		RESX_SaveFilesImmediatelyUponChange = True
+		RESX_SortFileContentOnSave = True
+		RESX_ResXSortingComparison = OrdinalIgnoreCase
+		RESX_AutoCreateNewLanguageFiles = False
 	EndGlobalSection
 EndGlobal
diff --git a/src/YTMusicDownloader/Views/MainWindow.xaml b/src/YTMusicDownloader/Views/MainWindow.xaml
@@ -32,8 +32,8 @@
                     <TextBox Grid.Column="0" FontSize="14" VerticalAlignment="Stretch"
                              HorizontalAlignment="Stretch" controls:TextBoxHelper.ClearTextButton="True"
                              controls:TextBoxHelper.Watermark="Path to folder" Text="{Binding Path=AddWorkspacePath}" />
-                    <Button Grid.Column="2" Content="{icons:PackIconMaterial Folder}" Width="120"
-                            VerticalAlignment="Center" HorizontalAlignment="Stretch"
+                    <Button Grid.Column="2" Content="{icons:PackIconMaterial Folder}"
+                            VerticalAlignment="Center" HorizontalAlignment="Left"
                             Command="{Binding Path=SelectFolderCommand}" Style="{DynamicResource ButtonIcon}"/>
                     <Button Grid.Column="4" Content="Add" FontSize="14" VerticalAlignment="Stretch"
                             HorizontalAlignment="Stretch" Command="{Binding Path=AddWorkspaceCommand}" />