From 20b432fad1a2b71be52bca0af92d14c5e6f7b4f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
Date: Sun, 7 Feb 2021 00:06:21 +0000
Subject: preferences-window: Drop sidebar visibility checkbox

When preparing to drop the Application Menu, this was added to the
Preferences window.[1]

Later when actually dropping the Application Menu, the action was
added to the primary window menu.[2]

So, it ended up in 2 places, which it not necessary.

The sidebar is essential for navigation, so hiding is only tempoary,
not a long-lasting preference. So, it doesn't make sense to have here.

[1] commit f2061e94093a33072e792181433b0618bf68d1b2
[2] commit 99324771868ca7fad75889418ecd08765d8b4629
---
 src/nautilus-preferences-window.c               |  5 ---
 src/resources/ui/nautilus-preferences-window.ui | 51 -------------------------
 2 files changed, 56 deletions(-)

diff --git a/src/nautilus-preferences-window.c b/src/nautilus-preferences-window.c
index 156d994b2..cbcf2aca6 100644
--- a/src/nautilus-preferences-window.c
+++ b/src/nautilus-preferences-window.c
@@ -51,8 +51,6 @@
 /* bool preferences */
 #define NAUTILUS_PREFERENCES_DIALOG_FOLDERS_FIRST_WIDGET                       \
     "sort_folders_first_checkbutton"
-#define NAUTILUS_PREFERENCS_DIALOG_START_WITH_SIDEBAR                          \
-    "show_sidebar_checkbutton"
 #define NAUTILUS_PREFERENCES_DIALOG_DELETE_PERMANENTLY_WIDGET                  \
     "show_delete_permanently_checkbutton"
 #define NAUTILUS_PREFERENCES_DIALOG_CREATE_LINK_WIDGET                         \
@@ -413,9 +411,6 @@ static void nautilus_preferences_window_setup(GtkBuilder *builder,
     bind_builder_bool (builder, gtk_filechooser_preferences,
                        NAUTILUS_PREFERENCES_DIALOG_FOLDERS_FIRST_WIDGET,
                        NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST);
-    bind_builder_bool (builder, nautilus_window_state,
-                       NAUTILUS_PREFERENCS_DIALOG_START_WITH_SIDEBAR,
-                       NAUTILUS_WINDOW_STATE_START_WITH_SIDEBAR);
     bind_builder_bool (builder, nautilus_list_view_preferences,
                        NAUTILUS_PREFERENCES_DIALOG_LIST_VIEW_USE_TREE_WIDGET,
                        NAUTILUS_PREFERENCES_LIST_VIEW_USE_TREE);
diff --git a/src/resources/ui/nautilus-preferences-window.ui b/src/resources/ui/nautilus-preferences-window.ui
index a85408d8f..c1ba7b603 100644
--- a/src/resources/ui/nautilus-preferences-window.ui
+++ b/src/resources/ui/nautilus-preferences-window.ui
@@ -35,57 +35,6 @@
                 <property name="border_width">12</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">18</property>
-                <child>
-                  <object class="GtkBox" id="vbox2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label_general">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">General</property>
-                        <property name="xalign">0</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                        <accessibility>
-                          <relation type="label-for" target="vbox2"/>
-                        </accessibility>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="show_sidebar_checkbutton">
-                        <property name="label" translatable="yes">_Show sidebar</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="halign">start</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <accessibility>
-                      <relation type="labelled-by" target="label_general"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkBox" id="vbox12">
                     <property name="visible">True</property>
-- 
cgit v1.2.1