gnome-commander r2441 - in branches/gcmd-1-3: . src

[epiotr svn gnome org]

Author: epiotr
Date: Mon Jan 19 18:37:56 2009
New Revision: 2441
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2441&view=rev

Log:
GnomeCmdData: more C++ rework

Modified:
   branches/gcmd-1-3/ChangeLog
   branches/gcmd-1-3/src/gnome-cmd-data.cc
   branches/gcmd-1-3/src/gnome-cmd-data.h
   branches/gcmd-1-3/src/gnome-cmd-main-win.cc
   branches/gcmd-1-3/src/gnome-cmd-options-dialog.cc
   branches/gcmd-1-3/src/utils.cc

Modified: branches/gcmd-1-3/src/gnome-cmd-data.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-data.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-data.cc	Mon Jan 19 18:37:56 2009
@@ -57,10 +57,6 @@
     gchar                *theme_icon_dir;
     gchar                *document_icon_dir;
     guint                bookmark_dialog_col_width[BOOKMARK_DIALOG_NUM_COLUMNS];
-    gint                 dir_cache_size;
-    gboolean             honor_expect_uris;
-    gboolean             use_internal_viewer;
-    gboolean             skip_mounting;
     gchar                *start_dirs[2];
     gchar                *last_pattern;
     GList                *auto_load_plugins;
@@ -1126,10 +1122,14 @@
     cmdline_history = NULL;
     cmdline_history_length = 0;
 
+    use_internal_viewer = TRUE;
     use_gcmd_block = FALSE;
-
     use_gnome_auth_manager = FALSE;
 
+    honor_expect_uris = FALSE;
+    skip_mounting = FALSE;
+    dir_cache_size = 10;
+
     main_win_width = 600;
     main_win_height = 400;
 
@@ -1341,10 +1341,10 @@
     if (gui_update_rate > MAX_GUI_UPDATE_RATE)
         gui_update_rate = MAX_GUI_UPDATE_RATE;
 
-    priv->honor_expect_uris = gnome_cmd_data_get_bool ("/programs/honor_expect_uris", FALSE);
-    priv->use_internal_viewer = gnome_cmd_data_get_bool ("/programs/use_internal_viewer", TRUE);
+    honor_expect_uris = gnome_cmd_data_get_bool ("/programs/honor_expect_uris", FALSE);
+    use_internal_viewer = gnome_cmd_data_get_bool ("/programs/use_internal_viewer", TRUE);
     alt_quick_search = gnome_cmd_data_get_bool ("/programs/alt_quick_search", FALSE);
-    priv->skip_mounting = gnome_cmd_data_get_bool ("/programs/skip_mounting", FALSE);
+    skip_mounting = gnome_cmd_data_get_bool ("/programs/skip_mounting", FALSE);
 
     priv->symlink_prefix = gnome_cmd_data_get_string ("/options/symlink_prefix", _("link to %s"));
     if (!*priv->symlink_prefix || strcmp(priv->symlink_prefix, _("link to %s"))==0)
@@ -1367,7 +1367,7 @@
     use_gcmd_block = gnome_cmd_data_get_bool ("/programs/use_gcmd_block", FALSE);
 
     device_only_icon = gnome_cmd_data_get_bool ("/devices/only_icon", FALSE);
-    priv->dir_cache_size = gnome_cmd_data_get_int ("/options/dir_cache_size", 10);
+    dir_cache_size = gnome_cmd_data_get_int ("/options/dir_cache_size", 10);
     use_ls_colors = gnome_cmd_data_get_bool ("/colors/use_ls_colors", FALSE);
 
     priv->start_dirs[LEFT] = gnome_cmd_data_get_string ("/options/start_dir_left", g_get_home_dir ());
@@ -1713,10 +1713,10 @@
     gnome_cmd_data_set_bool   ("/options/list_orientation", list_orientation);
     gnome_cmd_data_set_int    ("/options/gui_update_rate", gui_update_rate);
 
-    gnome_cmd_data_set_bool   ("/programs/honor_expect_uris", priv->honor_expect_uris);
-    gnome_cmd_data_set_bool   ("/programs/use_internal_viewer", priv->use_internal_viewer);
+    gnome_cmd_data_set_bool   ("/programs/honor_expect_uris", honor_expect_uris);
+    gnome_cmd_data_set_bool   ("/programs/use_internal_viewer", use_internal_viewer);
     gnome_cmd_data_set_bool   ("/programs/alt_quick_search", alt_quick_search);
-    gnome_cmd_data_set_bool   ("/programs/skip_mounting", priv->skip_mounting);
+    gnome_cmd_data_set_bool   ("/programs/skip_mounting", skip_mounting);
 
     gnome_cmd_data_set_bool   ("/programs/toolbar_visibility", toolbar_visibility);
     gnome_cmd_data_set_bool   ("/options/conbuttons_visibility", conbuttons_visibility);
@@ -1746,7 +1746,7 @@
     gnome_cmd_data_set_bool   ("/programs/use_gcmd_block", use_gcmd_block);
 
     gnome_cmd_data_set_bool   ("/devices/only_icon", device_only_icon);
-    gnome_cmd_data_set_int    ("/options/dir_cache_size", priv->dir_cache_size);
+    gnome_cmd_data_set_int    ("/options/dir_cache_size", dir_cache_size);
     gnome_cmd_data_set_bool   ("/colors/use_ls_colors", use_ls_colors);
 
     const gchar *quick_connect_uri = gnome_cmd_con_get_uri (GNOME_CMD_CON (quick_connect));
@@ -1992,60 +1992,12 @@
 }
 
 
-gint gnome_cmd_data_get_dir_cache_size ()
-{
-    return gnome_cmd_data.priv->dir_cache_size;
-}
-
-
-void gnome_cmd_data_set_dir_cache_size (gint size)
-{
-    gnome_cmd_data.priv->dir_cache_size = size;
-}
-
-
 GnomeCmdBookmarkGroup *gnome_cmd_data_get_local_bookmarks ()
 {
     return gnome_cmd_con_get_bookmarks (gnome_cmd_con_list_get_home (gnome_cmd_data.priv->con_list));
 }
 
 
-gboolean gnome_cmd_data_get_honor_expect_uris ()
-{
-    return gnome_cmd_data.priv->honor_expect_uris;
-}
-
-
-void gnome_cmd_data_set_honor_expect_uris (gboolean value)
-{
-    gnome_cmd_data.priv->honor_expect_uris = value;
-}
-
-
-gboolean gnome_cmd_data_get_use_internal_viewer ()
-{
-    return gnome_cmd_data.priv->use_internal_viewer;
-}
-
-
-void gnome_cmd_data_set_use_internal_viewer (gboolean value)
-{
-    gnome_cmd_data.priv->use_internal_viewer = value;
-}
-
-
-gboolean gnome_cmd_data_get_skip_mounting ()
-{
-    return gnome_cmd_data.priv->skip_mounting;
-}
-
-
-void gnome_cmd_data_set_skip_mounting (gboolean value)
-{
-    gnome_cmd_data.priv->skip_mounting = value;
-}
-
-
 void gnome_cmd_data_set_start_dir (gboolean fs, const gchar *start_dir)
 {
     if (gnome_cmd_data.priv->start_dirs[fs])

Modified: branches/gcmd-1-3/src/gnome-cmd-data.h
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-data.h	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-data.h	Mon Jan 19 18:37:56 2009
@@ -183,10 +183,14 @@
     GList                       *cmdline_history;
     gint                         cmdline_history_length;
 
+    gboolean                     use_internal_viewer;
     gboolean                     use_gcmd_block;
-
     gboolean                     use_gnome_auth_manager;
 
+    gboolean                     honor_expect_uris;
+    gboolean                     skip_mounting;
+    gint                         dir_cache_size;
+
     gint                         main_win_width;
     gint                         main_win_height;
     GdkWindowState               main_win_state;
@@ -248,21 +252,9 @@
 gint gnome_cmd_data_get_bookmark_dialog_col_width (guint column);
 void gnome_cmd_data_set_bookmark_dialog_col_width (guint column, gint width);
 
-gint gnome_cmd_data_get_dir_cache_size ();
-void gnome_cmd_data_set_dir_cache_size (gint size);
-
 GnomeCmdBookmarkGroup *gnome_cmd_data_get_local_bookmarks ();
 GList *gnome_cmd_data_get_bookmark_groups ();
 
-gboolean gnome_cmd_data_get_honor_expect_uris ();
-void gnome_cmd_data_set_honor_expect_uris (gboolean value);
-
-gboolean gnome_cmd_data_get_use_internal_viewer ();
-void gnome_cmd_data_set_use_internal_viewer (gboolean value);
-
-gboolean gnome_cmd_data_get_skip_mounting ();
-void gnome_cmd_data_set_skip_mounting (gboolean value);
-
 const gchar *gnome_cmd_data_get_start_dir (gboolean fs);
 void gnome_cmd_data_set_start_dir (gboolean fs, const gchar *start_dir);
 

Modified: branches/gcmd-1-3/src/gnome-cmd-main-win.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-main-win.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-main-win.cc	Mon Jan 19 18:37:56 2009
@@ -579,7 +579,7 @@
         return;
 
     if (!gnome_cmd_data.toolbar_visibility
-        || (gnome_cmd_data_get_skip_mounting () && GNOME_CMD_IS_CON_DEVICE (con)))
+        || (gnome_cmd_data.skip_mounting && GNOME_CMD_IS_CON_DEVICE (con)))
         return;
 
     GtkWidget *btn = mw->priv->tb_con_drop_btn;

Modified: branches/gcmd-1-3/src/gnome-cmd-options-dialog.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-options-dialog.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-options-dialog.cc	Mon Jan 19 18:37:56 2009
@@ -131,7 +131,7 @@
 
     label = create_label (parent, _("Directory cache size"));
     table_add (table, label, 0, 1, (GtkAttachOptions) 0);
-    spin = create_spin (parent, "dir_cache_size", 5, 50, gnome_cmd_data_get_dir_cache_size());
+    spin = create_spin (parent, "dir_cache_size", 5, 50, gnome_cmd_data.dir_cache_size);
     table_add (table, spin, 1, 1, GTK_FILL);
 
 
@@ -156,7 +156,7 @@
         gnome_cmd_data.filter_type = Filter::TYPE_FNMATCH;
 
     gnome_cmd_data.case_sens_sort = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (case_sens_check));
-    gnome_cmd_data_set_dir_cache_size (gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (dir_cache_size)));
+    gnome_cmd_data.dir_cache_size = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (dir_cache_size));
     gnome_cmd_data.alt_quick_search = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (alt_quick_search));
 }
 
@@ -1297,7 +1297,7 @@
 
 
     check = create_check (parent, _("Always download remote files before opening in external programs"), "honor_expect_uris");
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), !gnome_cmd_data_get_honor_expect_uris ());
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), !gnome_cmd_data.honor_expect_uris);
     cat = create_category (parent, check, _("MIME applications"));
     gtk_box_pack_start (GTK_BOX (vbox), cat, FALSE, FALSE, 0);
 
@@ -1320,7 +1320,7 @@
     table_add (table, entry, 1, 0, (GtkAttachOptions) (GTK_EXPAND|GTK_FILL));
 
     check = create_check (parent, _("Use Internal Viewer"), "use_internal_viewer");
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), gnome_cmd_data_get_use_internal_viewer ());
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), gnome_cmd_data.use_internal_viewer);
     table_add (table, check, 1, 1, (GtkAttachOptions) (GTK_EXPAND|GTK_FILL));
     entry = create_entry (parent, "editor", gnome_cmd_data_get_editor());
     table_add (table, entry, 1, 2, (GtkAttachOptions) (GTK_EXPAND|GTK_FILL));
@@ -1397,8 +1397,8 @@
     gnome_cmd_data_set_term (gtk_entry_get_text (GTK_ENTRY (entry5)));
     gnome_cmd_data_set_mime_editor (gtk_entry_get_text (GTK_ENTRY (entry6)));
 
-    gnome_cmd_data_set_honor_expect_uris (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_uris)));
-    gnome_cmd_data_set_use_internal_viewer (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_iv)));
+    gnome_cmd_data.honor_expect_uris = !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_uris));
+    gnome_cmd_data.use_internal_viewer = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_iv));
 }
 
 
@@ -1710,7 +1710,7 @@
 
     check = create_check (parent, _("Skip mounting (useful when using super-mount)"), "skip_mounting");
     gtk_container_add (GTK_CONTAINER (cat_box), check);
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), gnome_cmd_data_get_skip_mounting());
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), gnome_cmd_data.skip_mounting);
 
 
     clist = (GtkWidget *) gtk_object_get_data (GTK_OBJECT (parent), "device_clist");
@@ -1728,7 +1728,7 @@
     GtkWidget *skip_mounting = lookup_widget (dialog, "skip_mounting");
 
     gnome_cmd_data.device_only_icon = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (device_only_icon));
-    gnome_cmd_data_set_skip_mounting (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (skip_mounting)));
+    gnome_cmd_data.skip_mounting = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (skip_mounting));
 }
 
 

Modified: branches/gcmd-1-3/src/utils.cc
==============================================================================
--- branches/gcmd-1-3/src/utils.cc	(original)
+++ branches/gcmd-1-3/src/utils.cc	Mon Jan 19 18:37:56 2009
@@ -589,7 +589,7 @@
     }
     else
     {
-        if (gnome_cmd_app_get_handles_uris (app) && gnome_cmd_data_get_honor_expect_uris())
+        if (gnome_cmd_app_get_handles_uris (app) && gnome_cmd_data.honor_expect_uris)
         {
             args[0] = (gpointer) app;
             args[1] = (gpointer) g_strdup (gnome_cmd_file_get_uri_str (finfo));
@@ -672,7 +672,7 @@
         else
         {
             ++no_of_remote_files;
-            if (gnome_cmd_app_get_handles_uris (app) && gnome_cmd_data_get_honor_expect_uris())
+            if (gnome_cmd_app_get_handles_uris (app) && gnome_cmd_data.honor_expect_uris)
             {
                 local_files = g_list_append (local_files,  g_strdup (gnome_cmd_file_get_uri_str (finfo)));
             }