[nautilus] Remove date format settings
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] Remove date format settings
- Date: Sat, 30 Jun 2012 16:35:49 +0000 (UTC)
commit 73465be3671ae572ba744d36b055fda3cb210db7
Author: William Jon McCann <jmccann redhat com>
Date: Mon May 28 07:47:24 2012 -0400
Remove date format settings
https://bugzilla.gnome.org/show_bug.cgi?id=676898
libnautilus-private/nautilus-directory.c | 4 -
libnautilus-private/nautilus-global-preferences.h | 8 --
libnautilus-private/nautilus.convert | 1 -
.../org.gnome.nautilus.gschema.xml.in | 11 ---
src/nautilus-file-management-properties.c | 35 ---------
src/nautilus-file-management-properties.ui | 74 --------------------
6 files changed, 0 insertions(+), 133 deletions(-)
---
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index 516a7d1..6bc84b5 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -312,10 +312,6 @@ add_preferences_callbacks (void)
"changed::" NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS,
G_CALLBACK (async_data_preference_changed_callback),
NULL);
- g_signal_connect_swapped (nautilus_preferences,
- "changed::" NAUTILUS_PREFERENCES_DATE_FORMAT,
- G_CALLBACK(async_data_preference_changed_callback),
- NULL);
}
/**
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index 0de5f85..a9099a4 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -38,7 +38,6 @@ G_BEGIN_DECLS
/* Display */
#define NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES "show-hidden-files"
#define NAUTILUS_PREFERENCES_SHOW_ADVANCED_PERMISSIONS "show-advanced-permissions"
-#define NAUTILUS_PREFERENCES_DATE_FORMAT "date-format"
/* Mouse */
#define NAUTILUS_PREFERENCES_MOUSE_USE_EXTRA_BUTTONS "mouse-use-extra-buttons"
@@ -47,13 +46,6 @@ G_BEGIN_DECLS
typedef enum
{
- NAUTILUS_DATE_FORMAT_LOCALE,
- NAUTILUS_DATE_FORMAT_ISO,
- NAUTILUS_DATE_FORMAT_INFORMAL
-} NautilusDateFormat;
-
-typedef enum
-{
NAUTILUS_NEW_TAB_POSITION_AFTER_CURRENT_TAB,
NAUTILUS_NEW_TAB_POSITION_END,
} NautilusNewTabPosition;
diff --git a/libnautilus-private/nautilus.convert b/libnautilus-private/nautilus.convert
index bca7d37..5246551 100644
--- a/libnautilus-private/nautilus.convert
+++ b/libnautilus-private/nautilus.convert
@@ -19,7 +19,6 @@ sort-directories-first = /apps/nautilus/preferences/sort_directories_first
default-sort-order = /apps/nautilus/icon_view/default_sort_order
default-sort-in-reverse-order = /apps/nautilus/icon_view/default_sort_in_reverse_order
default-folder-viewer = /apps/nautilus/preferences/default_folder_viewer
-date-format = /apps/nautilus/preferences/date_format
show-hidden-files = /desktop/gnome/file_views/show_hidden_files
[org.gnome.nautilus.icon-view]
diff --git a/libnautilus-private/org.gnome.nautilus.gschema.xml.in b/libnautilus-private/org.gnome.nautilus.gschema.xml.in
index 1365207..8c6eae5 100644
--- a/libnautilus-private/org.gnome.nautilus.gschema.xml.in
+++ b/libnautilus-private/org.gnome.nautilus.gschema.xml.in
@@ -21,12 +21,6 @@
<value nick="list-view" value="1"/>
</enum>
- <enum id="org.gnome.nautilus.DateFormat">
- <value nick="locale" value="0"/>
- <value nick="iso" value="1"/>
- <value nick="informal" value="2"/>
- </enum>
-
<enum id="org.gnome.nautilus.SortOrder">
<value nick="manually" value="0"/>
<value nick="name" value="1"/>
@@ -176,11 +170,6 @@
<_summary>Default folder viewer</_summary>
<_description>When a folder is visited this viewer is used unless you have selected another view for that particular folder. Possible values are "list-view", and "icon-view".</_description>
</key>
- <key name="date-format" enum="org.gnome.nautilus.DateFormat">
- <default>'locale'</default>
- <_summary>Date Format</_summary>
- <_description>The format of file dates. Possible values are "locale", "iso", and "informal".</_description>
- </key>
<key name="show-hidden-files" type="b">
<default>false</default>
<_summary>Whether to show hidden files</_summary>
diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c
index 7f693f6..e212912 100644
--- a/src/nautilus-file-management-properties.c
+++ b/src/nautilus-file-management-properties.c
@@ -45,7 +45,6 @@
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ICON_VIEW_ZOOM_WIDGET "icon_view_zoom_combobox"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_LIST_VIEW_ZOOM_WIDGET "list_view_zoom_combobox"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SORT_ORDER_WIDGET "sort_order_combobox"
-#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DATE_FORMAT_WIDGET "date_format_combobox"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_TEXT_WIDGET "preview_text_combobox"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_IMAGE_WIDGET "preview_image_combobox"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_FOLDER_WIDGET "preview_folder_combobox"
@@ -442,34 +441,6 @@ nautilus_file_management_properties_dialog_setup_icon_caption_page (GtkBuilder *
}
static void
-create_date_format_menu (GtkBuilder *builder)
-{
- GtkComboBoxText *combo_box;
- gchar *date_string;
- GDateTime *now;
-
- combo_box = GTK_COMBO_BOX_TEXT
- (gtk_builder_get_object (builder,
- NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DATE_FORMAT_WIDGET));
-
- now = g_date_time_new_now_local ();
-
- date_string = g_date_time_format (now, "%c");
- gtk_combo_box_text_append_text (combo_box, date_string);
- g_free (date_string);
-
- date_string = g_date_time_format (now, "%Y-%m-%d %H:%M:%S");
- gtk_combo_box_text_append_text (combo_box, date_string);
- g_free (date_string);
-
- date_string = g_date_time_format (now, _("today at %-I:%M:%S %p"));
- gtk_combo_box_text_append_text (combo_box, date_string);
- g_free (date_string);
-
- g_date_time_unref (now);
-}
-
-static void
set_columns_from_settings (NautilusColumnChooser *chooser)
{
char **visible_columns;
@@ -715,7 +686,6 @@ nautilus_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow
nautilus_file_management_properties_size_group_create (builder,
"preview_label",
4);
- create_date_format_menu (builder);
/* setup preferences */
bind_builder_bool (builder, nautilus_icon_view_preferences,
@@ -766,11 +736,6 @@ nautilus_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow
NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_FOLDER_WIDGET,
NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS,
(const char **) preview_values);
- bind_builder_enum (builder, nautilus_preferences,
- NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DATE_FORMAT_WIDGET,
- NAUTILUS_PREFERENCES_DATE_FORMAT,
- (const char **) date_format_values);
-
bind_builder_radio (builder, nautilus_preferences,
(const char **) click_behavior_components,
diff --git a/src/nautilus-file-management-properties.ui b/src/nautilus-file-management-properties.ui
index a59ca19..3a0335e 100644
--- a/src/nautilus-file-management-properties.ui
+++ b/src/nautilus-file-management-properties.ui
@@ -932,80 +932,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkBox" id="vbox31">
- <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="label34">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Date</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkBox" id="hbox33">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label36">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Format:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">date_format_combobox</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="date_format_combobox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </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">1</property>
- </packing>
- </child>
</object>
<packing>
<property name="position">2</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]