summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Soriano <csoriano@gnome.org>2016-02-10 13:45:50 +0100
committerCarlos Soriano <csoriano@gnome.org>2016-02-12 18:21:52 +0100
commite201d665c059fec7a8c11d8a65737059a7afeac1 (patch)
treef0f8226052c19c942e3bb34a280cc785ced8eb7a
parent6ce8af1d994911f441b328f26979eacee9cb5c71 (diff)
downloadnautilus-e201d665c059fec7a8c11d8a65737059a7afeac1.tar.gz
preferences: remove sorting
Since 3.18 is done in the menu directly.
-rw-r--r--src/nautilus-preferences-dialog.c8
-rw-r--r--src/resources/ui/nautilus-preferences-dialog.ui45
2 files changed, 0 insertions, 53 deletions
diff --git a/src/nautilus-preferences-dialog.c b/src/nautilus-preferences-dialog.c
index 614507a59..e216315ce 100644
--- a/src/nautilus-preferences-dialog.c
+++ b/src/nautilus-preferences-dialog.c
@@ -42,7 +42,6 @@
/* string enum preferences */
#define NAUTILUS_PREFERENCES_DIALOG_DEFAULT_VIEW_WIDGET "default_view_combobox"
-#define NAUTILUS_PREFERENCES_DIALOG_SORT_ORDER_WIDGET "sort_order_combobox"
#define NAUTILUS_PREFERENCES_DIALOG_PREVIEW_FILES_WIDGET \
"preview_image_combobox"
#define NAUTILUS_PREFERENCES_DIALOG_PREVIEW_FOLDER_WIDGET \
@@ -68,9 +67,6 @@
#define NAUTILUS_PREFERENCES_DIALOG_THUMBNAIL_LIMIT_WIDGET \
"preview_image_size_combobox"
-static const char *const sort_order_values[] = {
- "name", "size", "type", "mtime", "atime", "trash-time", NULL};
-
static const char *const preview_values[] = {"always", "local-only", "never",
NULL};
@@ -505,10 +501,6 @@ static void nautilus_preferences_dialog_setup(GtkBuilder *builder,
NAUTILUS_PREFERENCES_REMOTE_RECURSIVE_SEARCH);
bind_builder_enum(builder, nautilus_preferences,
- NAUTILUS_PREFERENCES_DIALOG_SORT_ORDER_WIDGET,
- NAUTILUS_PREFERENCES_DEFAULT_SORT_ORDER,
- (const char **)sort_order_values);
- bind_builder_enum(builder, nautilus_preferences,
NAUTILUS_PREFERENCES_DIALOG_PREVIEW_FILES_WIDGET,
NAUTILUS_PREFERENCES_SHOW_FILE_THUMBNAILS,
(const char **)preview_values);
diff --git a/src/resources/ui/nautilus-preferences-dialog.ui b/src/resources/ui/nautilus-preferences-dialog.ui
index 4ecb86e9d..3d15242ff 100644
--- a/src/resources/ui/nautilus-preferences-dialog.ui
+++ b/src/resources/ui/nautilus-preferences-dialog.ui
@@ -237,51 +237,6 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkBox" id="hbox11">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="views_label_1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Arrange items:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">sort_order_combobox</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="GtkComboBox" id="sort_order_combobox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="model">model2</property>
- <child>
- <object class="GtkCellRendererText" id="renderer2"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<object class="GtkCheckButton" id="sort_folders_first_checkbutton">
<property name="label" translatable="yes">Sort _folders before files</property>
<property name="use_action_appearance">False</property>