From d638f84c9dfbbb8cca2625cd431921f52e603c02 Mon Sep 17 00:00:00 2001
From: Wu Xiaotian <yetist@gmail.com>
Date: Sat, 27 Jul 2019 11:48:41 +0800
Subject: use show icons option in views tab

---
 src/caja-file-management-properties.c  |  6 ++--
 src/caja-file-management-properties.ui | 64 ++++++++--------------------------
 src/file-manager/fm-list-model.c       |  2 +-
 src/ui-a11y.suppr                      |  1 -
 4 files changed, 19 insertions(+), 54 deletions(-)

(limited to 'src')

diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c
index 9596461e..1cdc7b1d 100644
--- a/src/caja-file-management-properties.c
+++ b/src/caja-file-management-properties.c
@@ -73,7 +73,7 @@
 #define CAJA_FILE_MANAGEMENT_PROPERTIES_MEDIA_AUTOMOUNT_OPEN "media_automount_open_checkbutton"
 #define CAJA_FILE_MANAGEMENT_PROPERTIES_MEDIA_AUTORUN_NEVER "media_autorun_never_checkbutton"
 #define CAJA_FILE_MANAGEMENT_PROPERTIES_USE_IEC_UNITS_WIDGET "use_iec_units"
-#define CAJA_FILE_MANAGEMENT_PROPERTIES_HIDE_ICON_IN_LIST_VIEW "hide_icons_in_list_view"
+#define CAJA_FILE_MANAGEMENT_PROPERTIES_SHOW_ICONS_IN_LIST_VIEW "show_icons_in_list_view"
 
 /* int enums */
 #define CAJA_FILE_MANAGEMENT_PROPERTIES_THUMBNAIL_LIMIT_WIDGET "preview_image_size_combobox"
@@ -1194,8 +1194,8 @@ caja_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow *wi
                        CAJA_PREFERENCES_USE_IEC_UNITS);
 
     bind_builder_bool (builder, caja_preferences,
-                       CAJA_FILE_MANAGEMENT_PROPERTIES_HIDE_ICON_IN_LIST_VIEW,
-                       CAJA_PREFERENCES_HIDE_ICON_IN_LIST_VIEW);
+                       CAJA_FILE_MANAGEMENT_PROPERTIES_SHOW_ICONS_IN_LIST_VIEW,
+                       CAJA_PREFERENCES_SHOW_ICONS_IN_LIST_VIEW);
 
     bind_builder_enum (builder, caja_preferences,
                        CAJA_FILE_MANAGEMENT_PROPERTIES_DEFAULT_VIEW_WIDGET,
diff --git a/src/caja-file-management-properties.ui b/src/caja-file-management-properties.ui
index 903301e7..452ba466 100644
--- a/src/caja-file-management-properties.ui
+++ b/src/caja-file-management-properties.ui
@@ -839,6 +839,21 @@
                                 <property name="position">0</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkCheckButton" id="show_icons_in_list_view">
+                                <property name="label" translatable="yes">_Show icons</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</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>
                           </object>
                         </child>
                       </object>
@@ -1519,55 +1534,6 @@
                     <property name="position">2</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkBox" id="vbox33">
-                    <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="label8">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">&lt;b&gt;List View&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="alignment15">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkCheckButton" id="hide_icons_in_list_view">
-                            <property name="label" translatable="yes">_Hide icons in list view</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="position">2</property>
diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c
index 3b7f03b0..a7b8ce86 100644
--- a/src/file-manager/fm-list-model.c
+++ b/src/file-manager/fm-list-model.c
@@ -322,7 +322,7 @@ fm_list_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, int column
     case FM_LIST_MODEL_LARGE_ICON_COLUMN:
     case FM_LIST_MODEL_LARGER_ICON_COLUMN:
     case FM_LIST_MODEL_LARGEST_ICON_COLUMN:
-        if (g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_HIDE_ICON_IN_LIST_VIEW)) {
+        if (!g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_SHOW_ICONS_IN_LIST_VIEW)) {
             cairo_surface_t *surface;
             int icon_size;
 
diff --git a/src/ui-a11y.suppr b/src/ui-a11y.suppr
index cc6decc2..c257b3c7 100644
--- a/src/ui-a11y.suppr
+++ b/src/ui-a11y.suppr
@@ -32,5 +32,4 @@ caja-file-management-properties.ui://GtkLabel[@id='label60'] orphan-label
 caja-file-management-properties.ui://GtkLabel[@id='label61'] orphan-label
 caja-file-management-properties.ui://GtkLabel[@id='label65'] orphan-label
 caja-file-management-properties.ui://GtkLabel[@id='label7'] orphan-label
-caja-file-management-properties.ui://GtkLabel[@id='label8'] orphan-label
 caja-file-management-properties.ui://GtkTreeView[@id='extension_view'] no-labelled-by
-- 
cgit v1.2.1