From d638f84c9dfbbb8cca2625cd431921f52e603c02 Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Sat, 27 Jul 2019 11:48:41 +0800 Subject: use show icons option in views tab --- libcaja-private/caja-global-preferences.h | 2 +- libcaja-private/org.mate.caja.gschema.xml | 8 ++-- 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 - 6 files changed, 24 insertions(+), 59 deletions(-) diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h index a7df4928..2eec02b4 100644 --- a/libcaja-private/caja-global-preferences.h +++ b/libcaja-private/caja-global-preferences.h @@ -68,7 +68,7 @@ G_BEGIN_DECLS #define CAJA_PREFERENCES_SHOW_ADVANCED_PERMISSIONS "show-advanced-permissions" #define CAJA_PREFERENCES_DATE_FORMAT "date-format" #define CAJA_PREFERENCES_USE_IEC_UNITS "use-iec-units" -#define CAJA_PREFERENCES_HIDE_ICON_IN_LIST_VIEW "hide-icons-in-list-view" +#define CAJA_PREFERENCES_SHOW_ICONS_IN_LIST_VIEW "show-icons-in-list-view" /* Mouse */ #define CAJA_PREFERENCES_MOUSE_USE_EXTRA_BUTTONS "mouse-use-extra-buttons" diff --git a/libcaja-private/org.mate.caja.gschema.xml b/libcaja-private/org.mate.caja.gschema.xml index 481372ee..9d9a473c 100644 --- a/libcaja-private/org.mate.caja.gschema.xml +++ b/libcaja-private/org.mate.caja.gschema.xml @@ -259,10 +259,10 @@ Whether to show file sizes with IEC units If set to true, file sizes are shown using IEC (base 1024) units with "KiB" style suffixes, instead of default with SI units. - - false - Whether to hide icons in list view - If set to true, hide file icons in list view. + + true + Whether to show icons in list view + If set to true, show file icons in list view. true 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 @@ 0 + + + _Show icons + True + True + False + True + True + + + False + True + 1 + + @@ -1519,55 +1534,6 @@ 2 - - - True - False - vertical - 6 - - - True - False - <b>List View</b> - True - 0 - - - False - False - 0 - - - - - True - False - 12 - - - _Hide icons in list view - True - True - False - True - True - - - - - False - False - 1 - - - - - False - False - 3 - - 2 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