Allow to choose to show parent folder

[geeqie.git] / src / preferences.c

diff --git a/src/preferences.c b/src/preferences.c
index 7881572..c647d0f 100644 (file)
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -197,6 +197,7 @@ static void config_window_apply(void)
        config_entry_to_option(safe_delete_path_entry, &options->file_ops.safe_delete_path, remove_trailing_slash);
 
        if (options->file_filter.show_hidden_files != c_options->file_filter.show_hidden_files) refresh = TRUE;
+       if (options->file_filter.show_parent_directory != c_options->file_filter.show_parent_directory) refresh = TRUE;
        if (options->file_filter.show_dot_directory != c_options->file_filter.show_dot_directory) refresh = TRUE;
        if (options->file_sort.case_sensitive != c_options->file_sort.case_sensitive) refresh = TRUE;
        if (options->file_filter.disable != c_options->file_filter.disable) refresh = TRUE;
@@ -234,6 +235,7 @@ static void config_window_apply(void)
        options->thumbnails.spec_standard = c_options->thumbnails.spec_standard;
        options->metadata.enable_metadata_dirs = c_options->metadata.enable_metadata_dirs;
        options->file_filter.show_hidden_files = c_options->file_filter.show_hidden_files;
+       options->file_filter.show_parent_directory = c_options->file_filter.show_parent_directory;
        options->file_filter.show_dot_directory = c_options->file_filter.show_dot_directory;
 
        options->file_sort.case_sensitive = c_options->file_sort.case_sensitive;
@@ -528,24 +530,42 @@ static void stereo_mode_menu_cb(GtkWidget *combo, gpointer data)
                        *option = PR_STEREO_ANAGLYPH_RC;
                        break;
                case 2:
-                       *option = PR_STEREO_ANAGLYPH_GRAY;
+                       *option = PR_STEREO_ANAGLYPH_GM;
                        break;
                case 3:
-                       *option = PR_STEREO_ANAGLYPH_DB;
+                       *option = PR_STEREO_ANAGLYPH_YB;
                        break;
                case 4:
-                       *option = PR_STEREO_HORIZ;
+                       *option = PR_STEREO_ANAGLYPH_GRAY_RC;
                        break;
                case 5:
-                       *option = PR_STEREO_HORIZ | PR_STEREO_HALF;
+                       *option = PR_STEREO_ANAGLYPH_GRAY_GM;
                        break;
                case 6:
-                       *option = PR_STEREO_VERT;
+                       *option = PR_STEREO_ANAGLYPH_GRAY_YB;
                        break;
                case 7:
-                       *option = PR_STEREO_VERT | PR_STEREO_HALF;
+                       *option = PR_STEREO_ANAGLYPH_DB_RC;
                        break;
                case 8:
+                       *option = PR_STEREO_ANAGLYPH_DB_GM;
+                       break;
+               case 9:
+                       *option = PR_STEREO_ANAGLYPH_DB_YB;
+                       break;
+               case 10:
+                       *option = PR_STEREO_HORIZ;
+                       break;
+               case 11:
+                       *option = PR_STEREO_HORIZ | PR_STEREO_HALF;
+                       break;
+               case 12:
+                       *option = PR_STEREO_VERT;
+                       break;
+               case 13:
+                       *option = PR_STEREO_VERT | PR_STEREO_HALF;
+                       break;
+               case 14:
                        *option = PR_STEREO_FIXED;
                        break;
                }
@@ -567,31 +587,43 @@ static void add_stereo_mode_menu(GtkWidget *table, gint column, gint row, const
 
        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Anaglyph Red-Cyan"));
        if (option & PR_STEREO_ANAGLYPH_RC) current = 1;
+       gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Anaglyph Green-Magenta"));
+       if (option & PR_STEREO_ANAGLYPH_GM) current = 2;
+       gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Anaglyph Yellow-Blue"));
+       if (option & PR_STEREO_ANAGLYPH_YB) current = 3;
        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Anaglyph Gray Red-Cyan"));
-       if (option & PR_STEREO_ANAGLYPH_GRAY) current = 2;
-       gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Anaglyph Dubois"));
-       if (option & PR_STEREO_ANAGLYPH_DB) current = 3;
+       if (option & PR_STEREO_ANAGLYPH_GRAY_RC) current = 4;
+       gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Anaglyph Gray Green-Magenta"));
+       if (option & PR_STEREO_ANAGLYPH_GRAY_GM) current = 5;
+       gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Anaglyph Gray Yellow-Blue"));
+       if (option & PR_STEREO_ANAGLYPH_GRAY_YB) current = 6;
+       gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Anaglyph Dubois Red-Cyan"));
+       if (option & PR_STEREO_ANAGLYPH_DB_RC) current = 7;
+       gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Anaglyph Dubois Green-Magenta"));
+       if (option & PR_STEREO_ANAGLYPH_DB_GM) current = 8;
+       gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Anaglyph Dubois Yellow-Blue"));
+       if (option & PR_STEREO_ANAGLYPH_DB_YB) current = 9;
 
        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Side by Side"));
        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Side by Side Half size"));
        if (option & PR_STEREO_HORIZ)
                {
-               current = 4;
-               if (option & PR_STEREO_HALF) current = 5;
+               current = 10;
+               if (option & PR_STEREO_HALF) current = 11;
                }
 
        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Top - Bottom"));
        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Top - Bottom Half size"));
        if (option & PR_STEREO_VERT)
                {
-               current = 6;
-               if (option & PR_STEREO_HALF) current = 7;
+               current = 12;
+               if (option & PR_STEREO_HALF) current = 13;
                }
 
        if (add_fixed)
                {
                gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), _("Fixed position"));
-               if (option & PR_STEREO_FIXED) current = 8;
+               if (option & PR_STEREO_FIXED) current = 14;
                }
 
        gtk_combo_box_set_active(GTK_COMBO_BOX(combo), current);
@@ -1472,6 +1504,8 @@ static void config_tab_files(GtkWidget *notebook)
 
        pref_checkbox_new_int(group, _("Show hidden files or folders"),
                              options->file_filter.show_hidden_files, &c_options->file_filter.show_hidden_files);
+       pref_checkbox_new_int(group, _("Show parent folder (..)"),
+                             options->file_filter.show_parent_directory, &c_options->file_filter.show_parent_directory);
        pref_checkbox_new_int(group, _("Case sensitive sort"),
                              options->file_sort.case_sensitive, &c_options->file_sort.case_sensitive);