From 08f6b8fa8e36cf373c5ae8b48802cc8c71e4164c Mon Sep 17 00:00:00 2001 From: Alexander Schwinn Date: Wed, 18 Jul 2018 21:33:36 +0200 Subject: [PATCH 3/3] - renamed iso, iso_eu and iso_us - use yyyymmdd as default for custom --- thunar/thunar-enum-types.c | 18 ++++++++++-------- thunar/thunar-enum-types.h | 6 +++--- thunar/thunar-list-model.c | 2 +- thunar/thunar-preferences-dialog.c | 2 +- thunar/thunar-preferences.c | 2 +- thunar/thunar-util.c | 9 +++------ 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/thunar/thunar-enum-types.c b/thunar/thunar-enum-types.c index 151882e3..5d93f917 100644 --- a/thunar/thunar-enum-types.c +++ b/thunar/thunar-enum-types.c @@ -65,14 +65,16 @@ thunar_date_style_get_type (void) { static const GEnumValue values[] = { - { THUNAR_DATE_STYLE_SIMPLE, "THUNAR_DATE_STYLE_SIMPLE", "simple", }, - { THUNAR_DATE_STYLE_SHORT, "THUNAR_DATE_STYLE_SHORT", "short", }, - { THUNAR_DATE_STYLE_LONG, "THUNAR_DATE_STYLE_LONG", "long", }, - { THUNAR_DATE_STYLE_ISO, "THUNAR_DATE_STYLE_ISO", "iso", }, /* asian(china?) style */ - { THUNAR_DATE_STYLE_ISO_US, "THUNAR_DATE_STYLE_ISO_US", "iso_us", }, - { THUNAR_DATE_STYLE_ISO_EU, "THUNAR_DATE_STYLE_ISO_EU", "iso_eu", }, - { THUNAR_DATE_STYLE_CUSTOM, "THUNAR_DATE_STYLE_CUSTOM", "custom", }, - { 0, NULL, NULL, }, + { THUNAR_DATE_STYLE_SIMPLE, "THUNAR_DATE_STYLE_SIMPLE", "simple", }, + { THUNAR_DATE_STYLE_SHORT, "THUNAR_DATE_STYLE_SHORT", "short", }, + { THUNAR_DATE_STYLE_LONG, "THUNAR_DATE_STYLE_LONG", "long", }, + { THUNAR_DATE_STYLE_YYYYMMDD, "THUNAR_DATE_STYLE_YYYYMMDD", "yyyymmdd", }, + { THUNAR_DATE_STYLE_MMDDYYYY, "THUNAR_DATE_STYLE_MMDDYYYY", "mmddyyyy", }, + { THUNAR_DATE_STYLE_DDMMYYYY, "THUNAR_DATE_STYLE_DDMMYYYY", "ddmmyyyy", }, + { THUNAR_DATE_STYLE_CUSTOM, "THUNAR_DATE_STYLE_CUSTOM", "custom", }, + /* to stay backward compartible*/ + { THUNAR_DATE_STYLE_YYYYMMDD, "THUNAR_DATE_STYLE_ISO", "iso", }, + { 0, NULL, NULL, }, }; type = g_enum_register_static (I_("ThunarDateStyle"), values); diff --git a/thunar/thunar-enum-types.h b/thunar/thunar-enum-types.h index 1e167487..71d66953 100644 --- a/thunar/thunar-enum-types.h +++ b/thunar/thunar-enum-types.h @@ -62,9 +62,9 @@ typedef enum THUNAR_DATE_STYLE_SIMPLE, THUNAR_DATE_STYLE_SHORT, THUNAR_DATE_STYLE_LONG, - THUNAR_DATE_STYLE_ISO, - THUNAR_DATE_STYLE_ISO_US, - THUNAR_DATE_STYLE_ISO_EU, + THUNAR_DATE_STYLE_YYYYMMDD, + THUNAR_DATE_STYLE_MMDDYYYY, + THUNAR_DATE_STYLE_DDMMYYYY, THUNAR_DATE_STYLE_CUSTOM, } ThunarDateStyle; diff --git a/thunar/thunar-list-model.c b/thunar/thunar-list-model.c index 90cfd721..713aa515 100644 --- a/thunar/thunar-list-model.c +++ b/thunar/thunar-list-model.c @@ -300,7 +300,7 @@ thunar_list_model_class_init (ThunarListModelClass *klass) g_param_spec_string ("date-custom-style", "DateCustomStyle", NULL, - "%d.%m.%Y - %H:%M:%S", + "%Y-%m-%d %H:%M:%S", EXO_PARAM_READWRITE); /** diff --git a/thunar/thunar-preferences-dialog.c b/thunar/thunar-preferences-dialog.c index 6054c1ca..0f57f1bf 100644 --- a/thunar/thunar-preferences-dialog.c +++ b/thunar/thunar-preferences-dialog.c @@ -380,7 +380,7 @@ thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog) gtk_widget_show (label); combo = gtk_combo_box_text_new (); - for (date_style = THUNAR_DATE_STYLE_SIMPLE; date_style <= THUNAR_DATE_STYLE_ISO_EU; ++date_style) + for (date_style = THUNAR_DATE_STYLE_SIMPLE; date_style <= THUNAR_DATE_STYLE_DDMMYYYY; ++date_style) { date = thunar_util_humanize_file_time (time (NULL), date_style, NULL); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), date); diff --git a/thunar/thunar-preferences.c b/thunar/thunar-preferences.c index f2216dfc..4991e897 100644 --- a/thunar/thunar-preferences.c +++ b/thunar/thunar-preferences.c @@ -503,7 +503,7 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass) g_param_spec_string ("misc-date-custom-style", "MiscDateCustomStyle", NULL, - "%d.%m.%Y - %H:%M:%S", + "%Y-%m-%d %H:%M:%S", EXO_PARAM_READWRITE); /** diff --git a/thunar/thunar-util.c b/thunar/thunar-util.c index 9b4de8c5..c3c864a7 100644 --- a/thunar/thunar-util.c +++ b/thunar/thunar-util.c @@ -445,19 +445,16 @@ thunar_util_humanize_file_time (guint64 file_time, /* use long, date(1)-like format string */ return exo_strdup_strftime ("%c", tfile); } - else if (date_style == THUNAR_DATE_STYLE_ISO) + else if (date_style == THUNAR_DATE_STYLE_YYYYMMDD) { - /* use ISO Asia date formatting */ return exo_strdup_strftime ("%Y-%m-%d %H:%M:%S", tfile); } - else if (date_style == THUNAR_DATE_STYLE_ISO_US) + else if (date_style == THUNAR_DATE_STYLE_MMDDYYYY) { - /* use ISO US date formatting */ return exo_strdup_strftime ("%m-%d-%Y %H:%M:%S", tfile); } - else if (date_style == THUNAR_DATE_STYLE_ISO_EU) + else if (date_style == THUNAR_DATE_STYLE_DDMMYYYY) { - /* use ISO Europe date formatting */ return exo_strdup_strftime ("%d-%m-%Y %H:%M:%S", tfile); } else /* if (date_style == THUNAR_DATE_STYLE_CUSTOM) */ -- 2.11.0