[gnome-commander/GSettings] Renames conbuttons_visibility variables and functions to show_devbuttons



commit d8ab04ea05f971cb4f39e359c944bafc894c0ebb
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Fri Jun 3 22:45:30 2016 +0200

    Renames conbuttons_visibility variables and functions to show_devbuttons

 src/gnome-cmd-data.cc          |    6 +++---
 src/gnome-cmd-data.h           |    2 +-
 src/gnome-cmd-file-selector.cc |    8 ++++----
 src/gnome-cmd-file-selector.h  |    2 +-
 src/gnome-cmd-main-menu.cc     |    2 +-
 src/gnome-cmd-user-actions.cc  |    6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index bd53252..28aba06 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -1606,7 +1606,7 @@ GnomeCmdData::GnomeCmdData(): search_defaults(selections)
     list_orientation = FALSE;
 
     toolbar_visibility = TRUE;
-    conbuttons_visibility = TRUE;
+    show_devbuttons = TRUE;
     concombo_visibility = TRUE;
     cmdline_visibility = TRUE;
     buttonbar_visibility = TRUE;
@@ -1958,7 +1958,7 @@ void GnomeCmdData::load()
     priv->main_win_pos[1] = gnome_cmd_data_get_int ("/options/main_win_pos_y", -1);
 
     toolbar_visibility = gnome_cmd_data_get_bool ("/programs/toolbar_visibility", TRUE);
-    conbuttons_visibility = g_settings_get_boolean (options.gcmd_settings->general, 
GCMD_SETTINGS_SHOW_DEVBUTTONS);
+    show_devbuttons = g_settings_get_boolean (options.gcmd_settings->general, GCMD_SETTINGS_SHOW_DEVBUTTONS);
     concombo_visibility = gnome_cmd_data_get_bool ("/options/con_list_visibility", TRUE);
     cmdline_visibility = gnome_cmd_data_get_bool ("/options/cmdline_visibility", TRUE);
     buttonbar_visibility = gnome_cmd_data_get_bool ("/programs/buttonbar_visibility", TRUE);
@@ -2494,7 +2494,7 @@ void GnomeCmdData::save()
     gnome_cmd_data_set_bool   ("/programs/skip_mounting", options.skip_mounting);
 
     gnome_cmd_data_set_bool   ("/programs/toolbar_visibility", toolbar_visibility);
-    set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_SHOW_DEVBUTTONS, 
&(conbuttons_visibility));
+    set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_SHOW_DEVBUTTONS, 
&(show_devbuttons));
     gnome_cmd_data_set_bool   ("/options/con_list_visibility", concombo_visibility);
     gnome_cmd_data_set_bool   ("/options/cmdline_visibility", cmdline_visibility);
     gnome_cmd_data_set_bool   ("/programs/buttonbar_visibility", buttonbar_visibility);
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index 55fd26b..7c98963 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -500,7 +500,7 @@ struct GnomeCmdData
     gboolean                     list_orientation;
 
     gboolean                     toolbar_visibility;
-    gboolean                     conbuttons_visibility;
+    gboolean                     show_devbuttons;
     gboolean                     concombo_visibility;
     gboolean                     cmdline_visibility;
     gboolean                     buttonbar_visibility;
diff --git a/src/gnome-cmd-file-selector.cc b/src/gnome-cmd-file-selector.cc
index fc49d19..8aa8edb 100644
--- a/src/gnome-cmd-file-selector.cc
+++ b/src/gnome-cmd-file-selector.cc
@@ -362,7 +362,7 @@ static void create_con_buttons (GnomeCmdFileSelector *fs)
 {
     static GtkTooltips *tooltips = NULL;
 
-    if (!gnome_cmd_data.conbuttons_visibility)
+    if (!gnome_cmd_data.show_devbuttons)
         return;
 
     for (GList *l = fs->priv->old_btns; l; l=l->next)
@@ -772,7 +772,7 @@ static void init (GnomeCmdFileSelector *fs)
     GtkVBox *vbox = GTK_VBOX (fs);
 
     // create the box used for packing the dir_combo and buttons
-    fs->update_conbuttons_visibility();
+    fs->update_show_devbuttons();
 
     // create the box used for packing the con_combo and information
     fs->con_hbox = create_hbox (*fs, FALSE, 2);
@@ -1331,9 +1331,9 @@ void gnome_cmd_file_selector_create_symlinks (GnomeCmdFileSelector *fs, GList *f
 }
 
 
-void GnomeCmdFileSelector::update_conbuttons_visibility()
+void GnomeCmdFileSelector::update_show_devbuttons()
 {
-    if (!gnome_cmd_data.conbuttons_visibility)
+    if (!gnome_cmd_data.show_devbuttons)
     {
         if (con_btns_hbox)
         {
diff --git a/src/gnome-cmd-file-selector.h b/src/gnome-cmd-file-selector.h
index 68b94c0..bccd67c 100644
--- a/src/gnome-cmd-file-selector.h
+++ b/src/gnome-cmd-file-selector.h
@@ -103,7 +103,7 @@ struct GnomeCmdFileSelector
     void update_selected_files_label();
     void update_style();
     void update_connections();
-    void update_conbuttons_visibility();
+    void update_show_devbuttons();
     void update_concombo_visibility();
 
     void do_file_specific_action (GnomeCmdFileList *fl, GnomeCmdFile *f);
diff --git a/src/gnome-cmd-main-menu.cc b/src/gnome-cmd-main-menu.cc
index bd75691..18e2f4e 100644
--- a/src/gnome-cmd-main-menu.cc
+++ b/src/gnome-cmd-main-menu.cc
@@ -854,7 +854,7 @@ static void init (GnomeCmdMainMenu *main_menu)
     main_menu->priv->menu_view_forward = view_menu_uiinfo[1].widget;
 
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view_menu_uiinfo[8].widget), 
gnome_cmd_data.toolbar_visibility);
-    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view_menu_uiinfo[9].widget), 
gnome_cmd_data.conbuttons_visibility);
+    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view_menu_uiinfo[9].widget), 
gnome_cmd_data.show_devbuttons);
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view_menu_uiinfo[10].widget), 
gnome_cmd_data.concombo_visibility);
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view_menu_uiinfo[11].widget), 
gnome_cmd_data.cmdline_visibility);
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view_menu_uiinfo[12].widget), 
gnome_cmd_data.buttonbar_visibility);
diff --git a/src/gnome-cmd-user-actions.cc b/src/gnome-cmd-user-actions.cc
index 0617efe..125ec0e 100644
--- a/src/gnome-cmd-user-actions.cc
+++ b/src/gnome-cmd-user-actions.cc
@@ -1486,9 +1486,9 @@ void view_conbuttons (GtkMenuItem *menuitem, gpointer not_used)
     if (!GTK_WIDGET_REALIZED (main_win)) return;
 
     GtkCheckMenuItem *checkitem = (GtkCheckMenuItem *) menuitem;
-    gnome_cmd_data.conbuttons_visibility = checkitem->active;
-    get_fs (ACTIVE)->update_conbuttons_visibility();
-    get_fs (INACTIVE)->update_conbuttons_visibility();
+    gnome_cmd_data.show_devbuttons = checkitem->active;
+    get_fs (ACTIVE)->update_show_devbuttons();
+    get_fs (INACTIVE)->update_show_devbuttons();
 }
 
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]