[gnome-commander] GnomeCmdData: move Tabs options to GnomeCmdData::Options

[Piotr Eljasiak <epiotr src gnome org>]

commit bdae1a013409a56dae70132167f376e8898f84bd
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Thu Nov 10 22:55:43 2011 +0100

    GnomeCmdData: move Tabs options to GnomeCmdData::Options

 src/gnome-cmd-data.cc           |   11 ++++-------
 src/gnome-cmd-data.h            |   10 ++++++----
 src/gnome-cmd-file-selector.cc  |    8 ++++----
 src/gnome-cmd-options-dialog.cc |   16 ++++++++--------
 4 files changed, 22 insertions(+), 23 deletions(-)
---
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index 2cf3b00..eea5736 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -856,9 +856,6 @@ GnomeCmdData::GnomeCmdData(): search_defaults(selections)
     cmdline_history = NULL;
     cmdline_history_length = 0;
 
-    always_show_tabs = FALSE;
-    tab_lock_indicator = TAB_LOCK_ICON;
-
     use_internal_viewer = TRUE;
     use_gcmd_block = FALSE;
 
@@ -1148,8 +1145,8 @@ void GnomeCmdData::load()
     options.save_tabs_on_exit = gnome_cmd_data_get_bool ("/options/save_tabs_on_exit", TRUE);
     options.save_dir_history_on_exit = gnome_cmd_data_get_bool ("/options/save_dir_history_on_exit", TRUE);
 
-    always_show_tabs = gnome_cmd_data_get_bool ("/options/always_show_tabs", FALSE);
-    tab_lock_indicator = (TabLockIndicator) gnome_cmd_data_get_int ("/options/tab_lock_indicator", TAB_LOCK_ICON);
+    options.always_show_tabs = gnome_cmd_data_get_bool ("/options/always_show_tabs", FALSE);
+    options.tab_lock_indicator = (TabLockIndicator) gnome_cmd_data_get_int ("/options/tab_lock_indicator", TAB_LOCK_ICON);
 
     priv->backup_pattern = gnome_cmd_data_get_string ("/defaults/backup_pattern", "*~;*.bak");
     priv->backup_pattern_list = patlist_new (priv->backup_pattern);
@@ -1568,8 +1565,8 @@ void GnomeCmdData::save()
     gnome_cmd_data_set_bool ("/options/save_tabs_on_exit", options.save_tabs_on_exit);
     gnome_cmd_data_set_bool ("/options/save_dir_history_on_exit", options.save_dir_history_on_exit);
 
-    gnome_cmd_data_set_bool ("/options/always_show_tabs", always_show_tabs);
-    gnome_cmd_data_set_int ("/options/tab_lock_indicator", (int) tab_lock_indicator);
+    gnome_cmd_data_set_bool ("/options/always_show_tabs", options.always_show_tabs);
+    gnome_cmd_data_set_int ("/options/tab_lock_indicator", (int) options.tab_lock_indicator);
 
     gnome_cmd_data_set_string ("/defaults/backup_pattern", priv->backup_pattern);
 
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index 11b80f7..e33a1d6 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -96,6 +96,9 @@ struct GnomeCmdData
         GdkInterpType           icon_scale_quality;
         gchar                  *theme_icon_dir;
         gchar                  *document_icon_dir;
+        //  Tabs
+        gboolean                always_show_tabs;
+        int                     tab_lock_indicator;
 
         Options(): left_mouse_button_mode(LEFT_BUTTON_OPENS_WITH_DOUBLE_CLICK),
                    left_mouse_button_unselects(TRUE),
@@ -121,7 +124,9 @@ struct GnomeCmdData
                    icon_size(16),
                    icon_scale_quality(GDK_INTERP_HYPER),
                    theme_icon_dir(NULL),
-                   document_icon_dir(NULL)
+                   document_icon_dir(NULL),
+                   always_show_tabs(FALSE),
+                   tab_lock_indicator(TAB_LOCK_ICON)
         {
             memset(&ls_colors_palette, 0, sizeof(ls_colors_palette));
         }
@@ -322,9 +327,6 @@ struct GnomeCmdData
     GList                       *cmdline_history;
     gint                         cmdline_history_length;
 
-    gboolean                     always_show_tabs;
-    int                          tab_lock_indicator;
-
     gboolean                     use_internal_viewer;
     gboolean                     use_gcmd_block;
 
diff --git a/src/gnome-cmd-file-selector.cc b/src/gnome-cmd-file-selector.cc
index 17ee91d..02aaf34 100644
--- a/src/gnome-cmd-file-selector.cc
+++ b/src/gnome-cmd-file-selector.cc
@@ -1023,7 +1023,7 @@ static void update_style_notebook_tab (GtkWidget *widget, GnomeCmdFileSelector *
 
     g_return_if_fail (GNOME_CMD_IS_FILE_LIST (fl));
 
-    if (gnome_cmd_data.tab_lock_indicator!=GnomeCmdData::TAB_LOCK_ICON)
+    if (gnome_cmd_data.options.tab_lock_indicator!=GnomeCmdData::TAB_LOCK_ICON)
         gtk_widget_hide (fl->tab_label_pin);
 
     if (fl->locked)
@@ -1041,7 +1041,7 @@ void GnomeCmdFileSelector::update_style()
     if (priv->realized)
         update_files();
 
-    notebook->show_tabs(gnome_cmd_data.always_show_tabs ? GnomeCmdNotebook::SHOW_TABS : GnomeCmdNotebook::HIDE_TABS_IF_ONE);
+    notebook->show_tabs(gnome_cmd_data.options.always_show_tabs ? GnomeCmdNotebook::SHOW_TABS : GnomeCmdNotebook::HIDE_TABS_IF_ONE);
 
     gtk_container_foreach (*notebook, (GtkCallback) update_style_notebook_tab, this);
 
@@ -1428,7 +1428,7 @@ GtkWidget *GnomeCmdFileSelector::new_tab(GnomeCmdDir *dir, GnomeCmdFileList::Col
     gtk_box_pack_start (GTK_BOX (hbox), list->tab_label_pin, FALSE, FALSE, 3);
     gtk_box_pack_start (GTK_BOX (hbox), list->tab_label_text, FALSE, FALSE, 0);
 
-    if (locked && gnome_cmd_data.tab_lock_indicator==GnomeCmdData::TAB_LOCK_ICON)
+    if (locked && gnome_cmd_data.options.tab_lock_indicator==GnomeCmdData::TAB_LOCK_ICON)
         gtk_widget_show (list->tab_label_pin);
     gtk_widget_show (list->tab_label_text);
 
@@ -1468,7 +1468,7 @@ void GnomeCmdFileSelector::update_tab_label(GnomeCmdFileList *fl)
 {
     const gchar *name = GNOME_CMD_FILE (fl->cwd)->get_name();
 
-    switch (gnome_cmd_data.tab_lock_indicator)
+    switch (gnome_cmd_data.options.tab_lock_indicator)
     {
         case GnomeCmdData::TAB_LOCK_ICON:
             if (fl->locked)
diff --git a/src/gnome-cmd-options-dialog.cc b/src/gnome-cmd-options-dialog.cc
index 747932b..2f18ccb 100644
--- a/src/gnome-cmd-options-dialog.cc
+++ b/src/gnome-cmd-options-dialog.cc
@@ -839,7 +839,7 @@ inline GtkWidget *create_tabs_tab (GtkWidget *parent, GnomeCmdData &cfg)
 
     check = create_check (parent, _("Always show the tab bar"), "always_show_tabs");
     gtk_box_pack_start (GTK_BOX (cat_box), check, FALSE, TRUE, 0);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.always_show_tabs);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.options.always_show_tabs);
 
 
     // Size display mode
@@ -849,17 +849,17 @@ inline GtkWidget *create_tabs_tab (GtkWidget *parent, GnomeCmdData &cfg)
 
     radio = create_radio (parent, NULL, _("Lock icon"), "tab_lock_icon_radio");
     gtk_container_add (GTK_CONTAINER (cat_box), radio);
-    if (cfg.tab_lock_indicator == GnomeCmdData::TAB_LOCK_ICON)
+    if (cfg.options.tab_lock_indicator == GnomeCmdData::TAB_LOCK_ICON)
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE);
 
     radio = create_radio (parent, get_radio_group (radio), _("* (asterisk)"), "tab_lock_asterisk_radio");
     gtk_container_add (GTK_CONTAINER (cat_box), radio);
-    if (cfg.tab_lock_indicator == GnomeCmdData::TAB_LOCK_ASTERISK)
+    if (cfg.options.tab_lock_indicator == GnomeCmdData::TAB_LOCK_ASTERISK)
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE);
 
     radio = create_radio (parent, get_radio_group (radio), _("Styled text"), "tab_lock_style_radio");
     gtk_container_add (GTK_CONTAINER (cat_box), radio);
-    if (cfg.tab_lock_indicator == GnomeCmdData::TAB_LOCK_STYLED_TEXT)
+    if (cfg.options.tab_lock_indicator == GnomeCmdData::TAB_LOCK_STYLED_TEXT)
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE);
 
     return frame;
@@ -872,14 +872,14 @@ inline void store_tabs_options (GtkWidget *dialog, GnomeCmdData &cfg)
     GtkWidget *tab_lock_icon_radio = lookup_widget (dialog, "tab_lock_icon_radio");
     GtkWidget *tab_lock_asterisk_radio = lookup_widget (dialog, "tab_lock_asterisk_radio");
 
-    cfg.always_show_tabs = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (always_show_tabs));
+    cfg.options.always_show_tabs = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (always_show_tabs));
 
     if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (tab_lock_icon_radio)))
-        cfg.tab_lock_indicator = GnomeCmdData::TAB_LOCK_ICON;
+        cfg.options.tab_lock_indicator = GnomeCmdData::TAB_LOCK_ICON;
     else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (tab_lock_asterisk_radio)))
-        cfg.tab_lock_indicator = GnomeCmdData::TAB_LOCK_ASTERISK;
+        cfg.options.tab_lock_indicator = GnomeCmdData::TAB_LOCK_ASTERISK;
     else
-        cfg.tab_lock_indicator = GnomeCmdData::TAB_LOCK_STYLED_TEXT;
+        cfg.options.tab_lock_indicator = GnomeCmdData::TAB_LOCK_STYLED_TEXT;
 }