Updated the sidebar styles (#2209)

yaira2 · web-flow · commit 4c19781eb0a8 · 2020-11-02T18:38:33.000-05:00
diff --git a/Files/MultilingualResources/Files.de-DE.xlf b/Files/MultilingualResources/Files.de-DE.xlf
@@ -1393,10 +1393,6 @@
           <source>Move here</source>
           <target state="new">Move here</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalSortPinnedFiItemsByDragging.Header" translate="yes" xml:space="preserve">
-          <source>Enable reordering items on the sidebar</source>
-          <target state="new">Enable reordering items on the sidebar</target>
-        </trans-unit>
         <trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
           <source>Drives</source>
           <target state="new">Drives</target>
diff --git a/Files/MultilingualResources/Files.es-ES.xlf b/Files/MultilingualResources/Files.es-ES.xlf
@@ -1390,10 +1390,6 @@
           <source>Move here</source>
           <target state="new">Move here</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalSortPinnedFiItemsByDragging.Header" translate="yes" xml:space="preserve">
-          <source>Enable reordering items on the sidebar</source>
-          <target state="new">Enable reordering items on the sidebar</target>
-        </trans-unit>
         <trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
           <source>Drives</source>
           <target state="new">Drives</target>
diff --git a/Files/MultilingualResources/Files.fr-FR.xlf b/Files/MultilingualResources/Files.fr-FR.xlf
@@ -1391,10 +1391,6 @@
           <source>Move here</source>
           <target state="new">Move here</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalSortPinnedFiItemsByDragging.Header" translate="yes" xml:space="preserve">
-          <source>Enable reordering items on the sidebar</source>
-          <target state="new">Enable reordering items on the sidebar</target>
-        </trans-unit>
         <trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
           <source>Drives</source>
           <target state="new">Drives</target>
diff --git a/Files/MultilingualResources/Files.he-IL.xlf b/Files/MultilingualResources/Files.he-IL.xlf
@@ -1390,10 +1390,6 @@
           <source>Move here</source>
           <target state="new">Move here</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalSortPinnedFiItemsByDragging.Header" translate="yes" xml:space="preserve">
-          <source>Enable reordering items on the sidebar</source>
-          <target state="new">Enable reordering items on the sidebar</target>
-        </trans-unit>
         <trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
           <source>Drives</source>
           <target state="new">Drives</target>
diff --git a/Files/MultilingualResources/Files.hi-IN.xlf b/Files/MultilingualResources/Files.hi-IN.xlf
@@ -1402,10 +1402,6 @@
           <source>Move here</source>
           <target state="new">Move here</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalSortPinnedFiItemsByDragging.Header" translate="yes" xml:space="preserve">
-          <source>Enable reordering items on the sidebar</source>
-          <target state="new">Enable reordering items on the sidebar</target>
-        </trans-unit>
         <trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
           <source>Drives</source>
           <target state="new">Drives</target>
diff --git a/Files/MultilingualResources/Files.hu-HU.xlf b/Files/MultilingualResources/Files.hu-HU.xlf
@@ -1390,10 +1390,6 @@
           <source>Move here</source>
           <target state="translated">Ide</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalSortPinnedFiItemsByDragging.Header" translate="yes" xml:space="preserve">
-          <source>Enable reordering items on the sidebar</source>
-          <target state="translated">Az oldalsáv elemeinek áthelyezésének engedélyezése</target>
-        </trans-unit>
         <trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
           <source>Drives</source>
           <target state="new">Drives</target>
@@ -1433,4 +1429,4 @@
       </group>
     </body>
   </file>
-</xliff>
+</xliff>
diff --git a/Files/MultilingualResources/Files.it-IT.xlf b/Files/MultilingualResources/Files.it-IT.xlf
@@ -1391,10 +1391,6 @@
           <source>Move here</source>
           <target state="new">Move here</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalSortPinnedFiItemsByDragging.Header" translate="yes" xml:space="preserve">
-          <source>Enable reordering items on the sidebar</source>
-          <target state="new">Enable reordering items on the sidebar</target>
-        </trans-unit>
         <trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
           <source>Drives</source>
           <target state="new">Drives</target>
diff --git a/Files/MultilingualResources/Files.ja-JP.xlf b/Files/MultilingualResources/Files.ja-JP.xlf
@@ -1390,10 +1390,6 @@
           <source>Move here</source>
           <target state="new">Move here</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalSortPinnedFiItemsByDragging.Header" translate="yes" xml:space="preserve">
-          <source>Enable reordering items on the sidebar</source>
-          <target state="new">Enable reordering items on the sidebar</target>
-        </trans-unit>
         <trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
           <source>Drives</source>
           <target state="new">Drives</target>
diff --git a/Files/MultilingualResources/Files.nl-NL.xlf b/Files/MultilingualResources/Files.nl-NL.xlf
@@ -1404,10 +1404,6 @@
           <source>Move here</source>
           <target state="new">Move here</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalSortPinnedFiItemsByDragging.Header" translate="yes" xml:space="preserve">
-          <source>Enable reordering items on the sidebar</source>
-          <target state="new">Enable reordering items on the sidebar</target>
-        </trans-unit>
         <trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
           <source>Drives</source>
           <target state="new">Drives</target>
diff --git a/Files/MultilingualResources/Files.or-IN.xlf b/Files/MultilingualResources/Files.or-IN.xlf
@@ -1402,10 +1402,6 @@
           <source>Move here</source>
           <target state="new">Move here</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalSortPinnedFiItemsByDragging.Header" translate="yes" xml:space="preserve">
-          <source>Enable reordering items on the sidebar</source>
-          <target state="new">Enable reordering items on the sidebar</target>
-        </trans-unit>
         <trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
           <source>Drives</source>
           <target state="new">Drives</target>
diff --git a/Files/MultilingualResources/Files.pl-PL.xlf b/Files/MultilingualResources/Files.pl-PL.xlf
@@ -1403,10 +1403,6 @@
           <source>Move here</source>
           <target state="new">Move here</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalSortPinnedFiItemsByDragging.Header" translate="yes" xml:space="preserve">
-          <source>Enable reordering items on the sidebar</source>
-          <target state="new">Enable reordering items on the sidebar</target>
-        </trans-unit>
         <trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
           <source>Drives</source>
           <target state="new">Drives</target>
diff --git a/Files/MultilingualResources/Files.pt-BR.xlf b/Files/MultilingualResources/Files.pt-BR.xlf
@@ -1390,10 +1390,6 @@
           <source>Move here</source>
           <target state="new">Move here</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalSortPinnedFiItemsByDragging.Header" translate="yes" xml:space="preserve">
-          <source>Enable reordering items on the sidebar</source>
-          <target state="new">Enable reordering items on the sidebar</target>
-        </trans-unit>
         <trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
           <source>Drives</source>
           <target state="new">Drives</target>
diff --git a/Files/MultilingualResources/Files.ru-RU.xlf b/Files/MultilingualResources/Files.ru-RU.xlf
@@ -1391,10 +1391,6 @@
           <source>Move here</source>
           <target state="new">Move here</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalSortPinnedFiItemsByDragging.Header" translate="yes" xml:space="preserve">
-          <source>Enable reordering items on the sidebar</source>
-          <target state="new">Enable reordering items on the sidebar</target>
-        </trans-unit>
         <trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
           <source>Drives</source>
           <target state="new">Drives</target>
diff --git a/Files/MultilingualResources/Files.ta.xlf b/Files/MultilingualResources/Files.ta.xlf
@@ -1396,10 +1396,6 @@
           <source>Move here</source>
           <target state="new">Move here</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalSortPinnedFiItemsByDragging.Header" translate="yes" xml:space="preserve">
-          <source>Enable reordering items on the sidebar</source>
-          <target state="new">Enable reordering items on the sidebar</target>
-        </trans-unit>
         <trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
           <source>Drives</source>
           <target state="new">Drives</target>
diff --git a/Files/MultilingualResources/Files.tr-TR.xlf b/Files/MultilingualResources/Files.tr-TR.xlf
@@ -1399,10 +1399,6 @@
           <source>Move here</source>
           <target state="new">Move here</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalSortPinnedFiItemsByDragging.Header" translate="yes" xml:space="preserve">
-          <source>Enable reordering items on the sidebar</source>
-          <target state="new">Enable reordering items on the sidebar</target>
-        </trans-unit>
         <trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
           <source>Drives</source>
           <target state="new">Drives</target>
diff --git a/Files/MultilingualResources/Files.uk-UA.xlf b/Files/MultilingualResources/Files.uk-UA.xlf
@@ -1391,10 +1391,6 @@
           <source>Move here</source>
           <target state="new">Move here</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalSortPinnedFiItemsByDragging.Header" translate="yes" xml:space="preserve">
-          <source>Enable reordering items on the sidebar</source>
-          <target state="new">Enable reordering items on the sidebar</target>
-        </trans-unit>
         <trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
           <source>Drives</source>
           <target state="new">Drives</target>
diff --git a/Files/MultilingualResources/Files.zh-Hans.xlf b/Files/MultilingualResources/Files.zh-Hans.xlf
@@ -1395,10 +1395,6 @@
           <source>Move here</source>
           <target state="new">Move here</target>
         </trans-unit>
-        <trans-unit id="SettingsExperimentalSortPinnedFiItemsByDragging.Header" translate="yes" xml:space="preserve">
-          <source>Enable reordering items on the sidebar</source>
-          <target state="new">Enable reordering items on the sidebar</target>
-        </trans-unit>
         <trans-unit id="DrivesWidgetDescription.Text" translate="yes" xml:space="preserve">
           <source>Drives</source>
           <target state="new">Drives</target>
diff --git a/Files/Strings/en-US/Resources.resw b/Files/Strings/en-US/Resources.resw
@@ -1158,9 +1158,6 @@
   <data name="PinToSidebarByDraggingCaptionText" xml:space="preserve">
     <value>Move here</value>
   </data>
-  <data name="SettingsExperimentalSortPinnedFiItemsByDragging.Header" xml:space="preserve">
-    <value>Enable reordering items on the sidebar</value>
-  </data>
   <data name="SettingsWidgets.Content" xml:space="preserve">
     <value>Widgets</value>
   </data>
diff --git a/Files/Strings/hu-HU/Resources.resw b/Files/Strings/hu-HU/Resources.resw
@@ -511,7 +511,7 @@
     <value>OK</value>
   </data>
   <data name="StatusBarControlLayoutMode.ToolTipService.ToolTip" xml:space="preserve">
-    <value>Elrendezés</value>
+    <value>Rendezés</value>
   </data>
   <data name="StatusBarControlSelectionOptions.ToolTipService.ToolTip" xml:space="preserve">
     <value>Kijelölési lehetőségek</value>
@@ -1032,4 +1032,22 @@
   <data name="SettingsPreferencesTerminalApplications.Text" xml:space="preserve">
     <value>Parancssor Programok</value>
   </data>
+  <data name="NavMoreButton.AutomationProperties.Name" xml:space="preserve">
+    <value>Több lehetőség</value>
+  </data>
+  <data name="StatusBarControlLayoutMode.AutomationProperties.Name" xml:space="preserve">
+    <value>Rendezés</value>
+  </data>
+  <data name="StatusBarControlSelectionOptions.AutomationProperties.Name" xml:space="preserve">
+    <value>Kijelölési lehetőségek</value>
+  </data>
+  <data name="StatusCenter.AutomationProperties.Name" xml:space="preserve">
+    <value>Állapot központ</value>
+  </data>
+  <data name="SettingsOpenItemsWithOneclick.Header" xml:space="preserve">
+    <value>Fájlok megnyitása egy kattintással</value>
+  </data>
+  <data name="PinToSidebarByDraggingCaptionText" xml:space="preserve">
+    <value>Ide</value>
+  </data>
 </root>
diff --git a/Files/UserControls/SidebarControl.xaml b/Files/UserControls/SidebarControl.xaml
@@ -40,18 +40,18 @@
                     <SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="{ThemeResource SystemColorWindowColor}" />
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
-          
+
             <DataTemplate x:Key="LocationNavItem" x:DataType="local2:LocationItem">
                 <muxc:NavigationViewItem
                     AllowDrop="True"
-                    CanDrag="True"                                         
                     BorderThickness="0.8"
+                    CanDrag="False"
                     Content="{x:Bind Text}"
                     DataContext="{x:Bind}"
-                    DragStarting="NavigationViewItem_DragStarting"
                     DragEnter="NavigationViewItem_DragEnter"
                     DragLeave="NavigationViewItem_DragLeave"
                     DragOver="NavigationViewLocationItem_DragOver"
+                    DragStarting="NavigationViewItem_DragStarting"
                     Drop="NavigationViewLocationItem_Drop"
                     IsRightTapEnabled="True"
                     RightTapped="NavigationViewLocationItem_RightTapped"
@@ -64,7 +64,7 @@
                     </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
             </DataTemplate>
-          
+
             <DataTemplate x:Key="DriveNavItem" x:DataType="local2:DriveItem">
                 <muxc:NavigationViewItem
                     Padding="0"
diff --git a/Files/UserControls/SidebarControl.xaml.cs b/Files/UserControls/SidebarControl.xaml.cs
@@ -283,12 +283,6 @@ private void NavigationViewItem_DragStarting(UIElement sender, DragStartingEvent
                 return;
             }
 
-            if(AppSettings.SortPinnedItemsByDragging == false)
-            {
-                args.Cancel = true;
-                return;
-            }
-
             // Adding the original Location item dragged to the DragEvents data view
             var navItem = (sender as Microsoft.UI.Xaml.Controls.NavigationViewItem);
             args.Data.Properties.Add("sourceLocationItem", navItem);
diff --git a/Files/UserControls/Widgets/DrivesWidget.xaml b/Files/UserControls/Widgets/DrivesWidget.xaml
@@ -28,7 +28,7 @@
             <muxc:ItemsRepeater.Layout>
                 <muxc:UniformGridLayout
                     ItemsStretch="Fill"
-                    MaximumRowsOrColumns="5"
+                    MaximumRowsOrColumns="4"
                     MinColumnSpacing="8"
                     MinItemHeight="90"
                     MinItemWidth="160"
diff --git a/Files/View Models/SettingsViewModel.cs b/Files/View Models/SettingsViewModel.cs
@@ -276,12 +276,6 @@ public bool ShowFileOwner
             get => Get(false);
             set => Set(value);
         }
-
-        public bool SortPinnedItemsByDragging
-        {
-            get => Get(false);
-            set => Set(value);
-        }
         
         public bool OpenItemsWithOneclick
         {
diff --git a/Files/Views/SettingsPages/Experimental.xaml b/Files/Views/SettingsPages/Experimental.xaml
@@ -38,11 +38,6 @@
                     Header="Show Owner in properties"
                     HeaderTemplate="{StaticResource CustomHeaderStyle}"
                     IsOn="{x:Bind AppSettings.ShowFileOwner, Mode=TwoWay}" />
-                <ToggleSwitch
-                    x:Uid="SettingsExperimentalSortPinnedFiItemsByDragging"
-                    Header="Sort pinned items by dragging"
-                    HeaderTemplate="{StaticResource CustomHeaderStyle}"
-                    IsOn="{x:Bind AppSettings.SortPinnedItemsByDragging, Mode=TwoWay}" />
             </StackPanel>
         </ScrollViewer>
     </Grid>
