gnome-commander r2061 - in branches/gcmd-1-3: . src
- From: epiotr svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-commander r2061 - in branches/gcmd-1-3: . src
- Date: Mon, 8 Sep 2008 16:49:46 +0000 (UTC)
Author: epiotr
Date: Mon Sep 8 16:49:45 2008
New Revision: 2061
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2061&view=rev
Log:
GnomeCmdData: more C++ rework
Modified:
branches/gcmd-1-3/ChangeLog
branches/gcmd-1-3/src/gnome-cmd-advrename-dialog.cc
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-file-list.cc
branches/gcmd-1-3/src/gnome-cmd-file-selector.cc
branches/gcmd-1-3/src/gnome-cmd-main-menu.cc
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/gnome-cmd-patternsel-dialog.cc
branches/gcmd-1-3/src/gnome-cmd-search-dialog.cc
branches/gcmd-1-3/src/gnome-cmd-user-actions.cc
Modified: branches/gcmd-1-3/src/gnome-cmd-advrename-dialog.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-advrename-dialog.cc (original)
+++ branches/gcmd-1-3/src/gnome-cmd-advrename-dialog.cc Mon Sep 8 16:49:45 2008
@@ -53,7 +53,7 @@
GList *files;
GList *entries;
PatternEntry *sel_entry;
- AdvrenameDefaults *defaults;
+ GnomeCmdData::AdvrenameDefaults *defaults;
GtkWidget *pat_list;
GtkWidget *res_list;
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 Sep 8 16:49:45 2008
@@ -54,14 +54,12 @@
GnomeCmdDateFormat date_format;
GnomeCmdLayout layout;
GnomeCmdColorTheme color_themes[GNOME_CMD_NUM_COLOR_MODES];
- GnomeCmdColorMode color_mode;
GnomeCmdExtDispMode ext_disp_mode;
FilterSettings filter_settings;
gint main_win_width, main_win_height;
gboolean case_sens_sort;
gint list_row_height;
gchar *list_font;
- GnomeCmdRightMouseButtonMode right_mouse_button_mode;
guint icon_size;
guint dev_icon_size;
GdkInterpType icon_scale_quality;
@@ -78,16 +76,10 @@
gboolean use_ls_colors;
gboolean honor_expect_uris;
gboolean use_internal_viewer;
- gboolean alt_quick_search;
gboolean skip_mounting;
- gboolean toolbar_visibility;
- gboolean buttonbar_visibility;
SearchDefaults *search_defaults;
AdvrenameDefaults *advrename_defaults;
gboolean list_orientation;
- gboolean conbuttons_visibility;
- gboolean concombo_visibility;
- gboolean cmdline_visibility;
gchar *start_dirs[2];
gchar *last_pattern;
GList *auto_load_plugins;
@@ -829,7 +821,7 @@
inline void save_cmdline_history ()
{
- if (!gnome_cmd_data.priv->cmdline_visibility)
+ if (!gnome_cmd_data.cmdline_visibility)
return;
gnome_cmd_data.priv->cmdline_history = gnome_cmd_cmdline_get_history (gnome_cmd_main_win_get_cmdline (main_win));
@@ -984,7 +976,7 @@
inline void load_search_defaults ()
{
- gnome_cmd_data.priv->search_defaults = g_new0 (SearchDefaults, 1);
+ gnome_cmd_data.priv->search_defaults = g_new0 (GnomeCmdData::SearchDefaults, 1);
gnome_cmd_data.priv->search_defaults->width = gnome_cmd_data_get_int ("/search-history/width", 450);
gnome_cmd_data.priv->search_defaults->height = gnome_cmd_data_get_int ("/search-history/height", 400);
@@ -1003,7 +995,7 @@
GList *from=NULL, *to=NULL, *csens=NULL;
GList *tmp_from, *tmp_to, *tmp_csens;
- gnome_cmd_data.priv->advrename_defaults = g_new0 (AdvrenameDefaults, 1);
+ gnome_cmd_data.priv->advrename_defaults = g_new0 (GnomeCmdData::AdvrenameDefaults, 1);
gnome_cmd_data.priv->advrename_defaults->auto_update = gnome_cmd_data_get_int ("/advrename/template_auto_update", TRUE);
gnome_cmd_data.priv->advrename_defaults->width = gnome_cmd_data_get_int ("/advrename/width", 450);
@@ -1117,42 +1109,51 @@
confirm_delete = TRUE;
confirm_copy_overwrite = GNOME_CMD_CONFIRM_OVERWRITE_QUERY;
confirm_move_overwrite = GNOME_CMD_CONFIRM_OVERWRITE_QUERY;
+ right_mouse_button_mode = RIGHT_BUTTON_POPUPS_MENU;
+ color_mode = GNOME_CMD_COLOR_DEEP_BLUE;
+ alt_quick_search = FALSE;
+
+ toolbar_visibility = TRUE;
+ conbuttons_visibility = TRUE;
+ concombo_visibility = TRUE;
+ cmdline_visibility = TRUE;
+ buttonbar_visibility = TRUE;
}
-void gnome_cmd_data_free ()
+void GnomeCmdData::free()
{
- if (gnome_cmd_data.priv)
+ if (priv)
{
// free the connections
- // gtk_object_unref (GTK_OBJECT (gnome_cmd_data.priv->con_list));
+ // gtk_object_unref (GTK_OBJECT (priv->con_list));
// close quick connect
- if (gnome_cmd_data.priv->quick_connect)
+ if (priv->quick_connect)
{
- gnome_cmd_con_close (GNOME_CMD_CON (gnome_cmd_data.priv->quick_connect));
- // gtk_object_destroy (GTK_OBJECT (gnome_cmd_data.priv->quick_connect));
+ gnome_cmd_con_close (GNOME_CMD_CON (priv->quick_connect));
+ // gtk_object_destroy (GTK_OBJECT (priv->quick_connect));
}
// free the anonymous password string
- g_free (gnome_cmd_data.priv->ftp_anonymous_password);
+ g_free (priv->ftp_anonymous_password);
- // free the dateformat string
- g_free (gnome_cmd_data.priv->date_format);
+ // free the date_format string
+ g_free (priv->date_format);
// free the font name strings
- g_free (gnome_cmd_data.priv->list_font);
+ g_free (priv->list_font);
// free the external programs strings
- g_free (gnome_cmd_data.priv->viewer);
- g_free (gnome_cmd_data.priv->editor);
- g_free (gnome_cmd_data.priv->differ);
- g_free (gnome_cmd_data.priv->term);
- g_free (gnome_cmd_data.priv->mime_editor);
+ g_free (priv->viewer);
+ g_free (priv->editor);
+ g_free (priv->differ);
+ g_free (priv->term);
+ g_free (mime_editor);
- delete gnome_cmd_data.priv->advrename_defaults->templates;
+ delete priv->advrename_defaults->templates;
- g_free (gnome_cmd_data.priv);
+ g_free (priv);
}
}
@@ -1190,7 +1191,7 @@
gnome_cmd_data_set_bool ("/sort/case_sensitive", gnome_cmd_data.priv->case_sens_sort);
- gnome_cmd_data_set_int ("/colors/mode", gnome_cmd_data.priv->color_mode);
+ gnome_cmd_data_set_int ("/colors/mode", gnome_cmd_data.color_mode);
gnome_cmd_data_set_color ("/colors/norm_fg", gnome_cmd_data.priv->color_themes[GNOME_CMD_COLOR_CUSTOM].norm_fg);
gnome_cmd_data_set_color ("/colors/norm_bg", gnome_cmd_data.priv->color_themes[GNOME_CMD_COLOR_CUSTOM].norm_bg);
@@ -1202,7 +1203,7 @@
gnome_cmd_data_set_string ("/options/list_font", gnome_cmd_data.priv->list_font);
gnome_cmd_data_set_int ("/options/ext_disp_mode", gnome_cmd_data.priv->ext_disp_mode);
- gnome_cmd_data_set_int ("/options/right_mouse_button_mode", gnome_cmd_data.priv->right_mouse_button_mode);
+ gnome_cmd_data_set_int ("/options/right_mouse_button_mode", gnome_cmd_data.right_mouse_button_mode);
gnome_cmd_data_set_int ("/options/icon_size", gnome_cmd_data.priv->icon_size);
gnome_cmd_data_set_int ("/options/dev_icon_size", gnome_cmd_data.priv->dev_icon_size);
gnome_cmd_data_set_int ("/options/icon_scale_quality", gnome_cmd_data.priv->icon_scale_quality);
@@ -1212,16 +1213,17 @@
gnome_cmd_data_set_int ("/options/btn_relief", gnome_cmd_data.priv->btn_relief);
gnome_cmd_data_set_int ("/options/filter_type", gnome_cmd_data.priv->filter_type);
gnome_cmd_data_set_bool ("/options/list_orientation", gnome_cmd_data.priv->list_orientation);
- gnome_cmd_data_set_bool ("/options/conbuttons_visibility", gnome_cmd_data.priv->conbuttons_visibility);
- gnome_cmd_data_set_bool ("/options/con_list_visibility", gnome_cmd_data.priv->concombo_visibility);
- gnome_cmd_data_set_bool ("/options/cmdline_visibility", gnome_cmd_data.priv->cmdline_visibility);
gnome_cmd_data_set_bool ("/programs/honor_expect_uris", gnome_cmd_data.priv->honor_expect_uris);
gnome_cmd_data_set_bool ("/programs/use_internal_viewer", gnome_cmd_data.priv->use_internal_viewer);
- gnome_cmd_data_set_bool ("/programs/alt_quick_search", gnome_cmd_data.priv->alt_quick_search);
+ gnome_cmd_data_set_bool ("/programs/alt_quick_search", gnome_cmd_data.alt_quick_search);
gnome_cmd_data_set_bool ("/programs/skip_mounting", gnome_cmd_data.priv->skip_mounting);
- gnome_cmd_data_set_bool ("/programs/toolbar_visibility", gnome_cmd_data.priv->toolbar_visibility);
- gnome_cmd_data_set_bool ("/programs/buttonbar_visibility", gnome_cmd_data.priv->buttonbar_visibility);
+
+ gnome_cmd_data_set_bool ("/programs/toolbar_visibility", gnome_cmd_data.toolbar_visibility);
+ gnome_cmd_data_set_bool ("/options/conbuttons_visibility", gnome_cmd_data.conbuttons_visibility);
+ gnome_cmd_data_set_bool ("/options/con_list_visibility", gnome_cmd_data.concombo_visibility);
+ gnome_cmd_data_set_bool ("/options/cmdline_visibility", gnome_cmd_data.cmdline_visibility);
+ gnome_cmd_data_set_bool ("/programs/buttonbar_visibility", gnome_cmd_data.buttonbar_visibility);
if (gnome_cmd_data.priv->symlink_prefix && *gnome_cmd_data.priv->symlink_prefix && strcmp(gnome_cmd_data.priv->symlink_prefix, _("link to %s"))!=0)
gnome_cmd_data_set_string ("/options/symlink_prefix", gnome_cmd_data.priv->symlink_prefix);
@@ -1236,17 +1238,17 @@
gnome_cmd_data_set_int ("/options/sort_column_right", gnome_cmd_data.priv->sort_column[RIGHT]);
gnome_cmd_data_set_bool ("/options/sort_direction_right", gnome_cmd_data.priv->sort_direction[RIGHT]);
- gnome_cmd_data_set_string ("/programs/viewer",gnome_cmd_data.priv->viewer);
- gnome_cmd_data_set_string ("/programs/editor",gnome_cmd_data.priv->editor);
- gnome_cmd_data_set_string ("/programs/differ",gnome_cmd_data.priv->differ);
- gnome_cmd_data_set_string ("/programs/terminal",gnome_cmd_data.priv->term);
+ gnome_cmd_data_set_string ("/programs/viewer", gnome_cmd_data.priv->viewer);
+ gnome_cmd_data_set_string ("/programs/editor", gnome_cmd_data.priv->editor);
+ gnome_cmd_data_set_string ("/programs/differ", gnome_cmd_data.priv->differ);
+ gnome_cmd_data_set_string ("/programs/terminal", gnome_cmd_data.priv->term);
gnome_cmd_data_set_string ("/programs/mime_editor",gnome_cmd_data.priv->mime_editor);
- gnome_cmd_data_set_bool ("/programs/use_gcmd_block",gnome_cmd_data.priv->use_gcmd_block);
+ gnome_cmd_data_set_bool ("/programs/use_gcmd_block", gnome_cmd_data.priv->use_gcmd_block);
- gnome_cmd_data_set_bool ("/devices/only_icon",gnome_cmd_data.priv->device_only_icon);
- gnome_cmd_data_set_int ("/options/dir_cache_size",gnome_cmd_data.priv->dir_cache_size);
- gnome_cmd_data_set_bool ("/colors/use_ls_colors",gnome_cmd_data.priv->use_ls_colors);
+ gnome_cmd_data_set_bool ("/devices/only_icon", gnome_cmd_data.priv->device_only_icon);
+ gnome_cmd_data_set_int ("/options/dir_cache_size", gnome_cmd_data.priv->dir_cache_size);
+ gnome_cmd_data_set_bool ("/colors/use_ls_colors", gnome_cmd_data.priv->use_ls_colors);
const gchar *quick_connect_uri = gnome_cmd_con_get_uri (GNOME_CMD_CON (gnome_cmd_data.priv->quick_connect));
@@ -1412,7 +1414,7 @@
g_free (tmp);
}
- gnome_cmd_data.priv->color_mode = (GnomeCmdColorMode) gnome_cmd_data_get_int ("/colors/mode", GNOME_CMD_COLOR_DEEP_BLUE);
+ gnome_cmd_data.color_mode = (GnomeCmdColorMode) gnome_cmd_data_get_int ("/colors/mode", GNOME_CMD_COLOR_DEEP_BLUE);
gnome_cmd_data_get_color ("/colors/norm_fg", gnome_cmd_data.priv->color_themes[GNOME_CMD_COLOR_CUSTOM].norm_fg);
gnome_cmd_data_get_color ("/colors/norm_bg", gnome_cmd_data.priv->color_themes[GNOME_CMD_COLOR_CUSTOM].norm_bg);
@@ -1424,7 +1426,7 @@
gnome_cmd_data.priv->list_font = gnome_cmd_data_get_string ("/options/list_font", "-misc-fixed-medium-r-normal-*-10-*-*-*-c-*-iso8859-1");
gnome_cmd_data.priv->ext_disp_mode = (GnomeCmdExtDispMode) gnome_cmd_data_get_int ("/options/ext_disp_mode", GNOME_CMD_EXT_DISP_BOTH);
- gnome_cmd_data.priv->right_mouse_button_mode = (GnomeCmdRightMouseButtonMode) gnome_cmd_data_get_int ("/options/right_mouse_button_mode", RIGHT_BUTTON_POPUPS_MENU);
+ gnome_cmd_data.right_mouse_button_mode = (GnomeCmdData::RightMouseButtonMode) gnome_cmd_data_get_int ("/options/right_mouse_button_mode", GnomeCmdData::RIGHT_BUTTON_POPUPS_MENU);
gnome_cmd_data.priv->icon_size = gnome_cmd_data_get_int ("/options/icon_size", 16);
gnome_cmd_data.priv->dev_icon_size = gnome_cmd_data_get_int ("/options/dev_icon_size", 16);
gnome_cmd_data.priv->icon_scale_quality = (GdkInterpType) gnome_cmd_data_get_int ("/options/icon_scale_quality", GDK_INTERP_HYPER);
@@ -1436,13 +1438,16 @@
gnome_cmd_data.priv->btn_relief = (GtkReliefStyle) gnome_cmd_data_get_int ("/options/btn_relief", GTK_RELIEF_NONE);
gnome_cmd_data.priv->filter_type = (Filter::Type) gnome_cmd_data_get_int ("/options/filter_type", Filter::TYPE_FNMATCH);
gnome_cmd_data.priv->list_orientation = gnome_cmd_data_get_bool ("/options/list_orientation", FALSE);
- gnome_cmd_data.priv->conbuttons_visibility = gnome_cmd_data_get_bool ("/options/conbuttons_visibility", TRUE);
- gnome_cmd_data.priv->concombo_visibility = gnome_cmd_data_get_bool ("/options/con_list_visibility", TRUE);
- gnome_cmd_data.priv->cmdline_visibility = gnome_cmd_data_get_bool ("/options/cmdline_visibility", TRUE);
gnome_cmd_data.priv->gui_update_rate = gnome_cmd_data_get_int ("/options/gui_update_rate", DEFAULT_GUI_UPDATE_RATE);
gnome_cmd_data.priv->main_win_pos[0] = gnome_cmd_data_get_int ("/options/main_win_pos_x", -1);
gnome_cmd_data.priv->main_win_pos[1] = gnome_cmd_data_get_int ("/options/main_win_pos_y", -1);
+ gnome_cmd_data.toolbar_visibility = gnome_cmd_data_get_bool ("/programs/toolbar_visibility", TRUE);
+ gnome_cmd_data.conbuttons_visibility = gnome_cmd_data_get_bool ("/options/conbuttons_visibility", TRUE);
+ gnome_cmd_data.concombo_visibility = gnome_cmd_data_get_bool ("/options/con_list_visibility", TRUE);
+ gnome_cmd_data.cmdline_visibility = gnome_cmd_data_get_bool ("/options/cmdline_visibility", TRUE);
+ gnome_cmd_data.buttonbar_visibility = gnome_cmd_data_get_bool ("/programs/buttonbar_visibility", TRUE);
+
if (gnome_cmd_data.priv->gui_update_rate < MIN_GUI_UPDATE_RATE)
gnome_cmd_data.priv->gui_update_rate = MIN_GUI_UPDATE_RATE;
if (gnome_cmd_data.priv->gui_update_rate > MAX_GUI_UPDATE_RATE)
@@ -1450,10 +1455,8 @@
gnome_cmd_data.priv->honor_expect_uris = gnome_cmd_data_get_bool ("/programs/honor_expect_uris", FALSE);
gnome_cmd_data.priv->use_internal_viewer = gnome_cmd_data_get_bool ("/programs/use_internal_viewer", TRUE);
- gnome_cmd_data.priv->alt_quick_search = gnome_cmd_data_get_bool ("/programs/alt_quick_search", FALSE);
+ gnome_cmd_data.alt_quick_search = gnome_cmd_data_get_bool ("/programs/alt_quick_search", FALSE);
gnome_cmd_data.priv->skip_mounting = gnome_cmd_data_get_bool ("/programs/skip_mounting", FALSE);
- gnome_cmd_data.priv->toolbar_visibility = gnome_cmd_data_get_bool ("/programs/toolbar_visibility", TRUE);
- gnome_cmd_data.priv->buttonbar_visibility = gnome_cmd_data_get_bool ("/programs/buttonbar_visibility", TRUE);
gnome_cmd_data.priv->symlink_prefix = gnome_cmd_data_get_string ("/options/symlink_prefix", _("link to %s"));
if (!*gnome_cmd_data.priv->symlink_prefix || strcmp(gnome_cmd_data.priv->symlink_prefix, _("link to %s"))==0)
@@ -1467,10 +1470,10 @@
gnome_cmd_data.priv->sort_column[RIGHT] = gnome_cmd_data_get_int ("/options/sort_column_right", GnomeCmdFileList::COLUMN_NAME);
gnome_cmd_data.priv->sort_direction[RIGHT] = gnome_cmd_data_get_bool ("/options/sort_direction_right", GTK_SORT_ASCENDING);
- gnome_cmd_data.priv->viewer = gnome_cmd_data_get_string ("/programs/viewer", "gedit %s");
- gnome_cmd_data.priv->editor = gnome_cmd_data_get_string ("/programs/editor", "gedit %s");
- gnome_cmd_data.priv->differ = gnome_cmd_data_get_string ("/programs/differ", "meld %s");
- gnome_cmd_data.priv->term = gnome_cmd_data_get_string ("/programs/terminal", "xterm -hold -e %s");
+ gnome_cmd_data.priv->viewer = gnome_cmd_data_get_string ("/programs/viewer", "gedit %s");
+ gnome_cmd_data.priv->editor = gnome_cmd_data_get_string ("/programs/editor", "gedit %s");
+ gnome_cmd_data.priv->differ = gnome_cmd_data_get_string ("/programs/differ", "meld %s");
+ gnome_cmd_data.priv->term = gnome_cmd_data_get_string ("/programs/terminal", "xterm -hold -e %s");
gnome_cmd_data.priv->mime_editor = gnome_cmd_data_get_string ("/programs/mime_editor", "gnome-file-types-properties");
gnome_cmd_data.priv->use_gcmd_block = gnome_cmd_data_get_bool ("/programs/use_gcmd_block", FALSE);
@@ -1839,21 +1842,9 @@
}
-GnomeCmdColorMode gnome_cmd_data_get_color_mode ()
-{
- return gnome_cmd_data.priv->color_mode;
-}
-
-
-void gnome_cmd_data_set_color_mode (GnomeCmdColorMode mode)
-{
- gnome_cmd_data.priv->color_mode = mode;
-}
-
-
GnomeCmdColorTheme *gnome_cmd_data_get_current_color_theme ()
{
- return &gnome_cmd_data.priv->color_themes[gnome_cmd_data.priv->color_mode];
+ return &gnome_cmd_data.priv->color_themes[gnome_cmd_data.color_mode];
}
@@ -1997,18 +1988,6 @@
}
-void gnome_cmd_data_set_right_mouse_button_mode (GnomeCmdRightMouseButtonMode mode)
-{
- gnome_cmd_data.priv->right_mouse_button_mode = mode;
-}
-
-
-GnomeCmdRightMouseButtonMode gnome_cmd_data_get_right_mouse_button_mode ()
-{
- return gnome_cmd_data.priv->right_mouse_button_mode;
-}
-
-
guint gnome_cmd_data_get_icon_size ()
{
return gnome_cmd_data.priv->icon_size;
@@ -2140,7 +2119,7 @@
}
-FilterSettings *gnome_cmd_data_get_filter_settings ()
+GnomeCmdData::FilterSettings *gnome_cmd_data_get_filter_settings ()
{
return &gnome_cmd_data.priv->filter_settings;
}
@@ -2212,7 +2191,7 @@
}
-SearchDefaults *gnome_cmd_data_get_search_defaults ()
+GnomeCmdData::SearchDefaults *gnome_cmd_data_get_search_defaults ()
{
return gnome_cmd_data.priv->search_defaults;
}
@@ -2254,18 +2233,6 @@
}
-gboolean gnome_cmd_data_get_alt_quick_search ()
-{
- return gnome_cmd_data.priv->alt_quick_search;
-}
-
-
-void gnome_cmd_data_set_alt_quick_search (gboolean value)
-{
- gnome_cmd_data.priv->alt_quick_search = value;
-}
-
-
gboolean gnome_cmd_data_get_skip_mounting ()
{
return gnome_cmd_data.priv->skip_mounting;
@@ -2278,31 +2245,7 @@
}
-gboolean gnome_cmd_data_get_toolbar_visibility ()
-{
- return gnome_cmd_data.priv->toolbar_visibility;
-}
-
-
-gboolean gnome_cmd_data_get_buttonbar_visibility ()
-{
- return gnome_cmd_data.priv->buttonbar_visibility;
-}
-
-
-void gnome_cmd_data_set_toolbar_visibility (gboolean value)
-{
- gnome_cmd_data.priv->toolbar_visibility = value;
-}
-
-
-void gnome_cmd_data_set_buttonbar_visibility (gboolean value)
-{
- gnome_cmd_data.priv->buttonbar_visibility = value;
-}
-
-
-AdvrenameDefaults *gnome_cmd_data_get_advrename_defaults ()
+GnomeCmdData::AdvrenameDefaults *gnome_cmd_data_get_advrename_defaults ()
{
return gnome_cmd_data.priv->advrename_defaults;
}
@@ -2320,42 +2263,6 @@
}
-gboolean gnome_cmd_data_get_conbuttons_visibility ()
-{
- return gnome_cmd_data.priv->conbuttons_visibility;
-}
-
-
-void gnome_cmd_data_set_conbuttons_visibility (gboolean value)
-{
- gnome_cmd_data.priv->conbuttons_visibility = value;
-}
-
-
-gboolean gnome_cmd_data_get_concombo_visibility ()
-{
- return gnome_cmd_data.priv->concombo_visibility;
-}
-
-
-void gnome_cmd_data_set_concombo_visibility (gboolean value)
-{
- gnome_cmd_data.priv->concombo_visibility = value;
-}
-
-
-gboolean gnome_cmd_data_get_cmdline_visibility ()
-{
- return gnome_cmd_data.priv->cmdline_visibility;
-}
-
-
-void gnome_cmd_data_set_cmdline_visibility (gboolean value)
-{
- gnome_cmd_data.priv->cmdline_visibility = 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 Sep 8 16:49:45 2008
@@ -29,6 +29,46 @@
struct GnomeCmdData
{
+ enum RightMouseButtonMode
+ {
+ RIGHT_BUTTON_POPUPS_MENU,
+ RIGHT_BUTTON_SELECTS
+ };
+
+ struct SearchDefaults
+ {
+ GList *name_patterns;
+ GList *content_patterns;
+ GList *directories;
+ gboolean recursive;
+ gboolean case_sens;
+ gint width, height;
+ };
+
+ struct AdvrenameDefaults
+ {
+ GList *patterns;
+ History *templates;
+ guint counter_start;
+ guint counter_precision;
+ guint counter_increment;
+ gboolean auto_update;
+ gint width, height;
+ gint pat_col_widths;
+ gint res_col_widths;
+ gint sep_value;
+ };
+
+ struct FilterSettings
+ {
+ gboolean file_types[8];
+
+ gboolean hidden;
+ gboolean backup;
+ gboolean other;
+ gchar *other_value;
+ };
+
struct Private;
Private *priv;
@@ -36,58 +76,25 @@
gboolean confirm_delete;
GnomeCmdConfirmOverwriteMode confirm_copy_overwrite;
GnomeCmdConfirmOverwriteMode confirm_move_overwrite;
+ RightMouseButtonMode right_mouse_button_mode;
+ GnomeCmdColorMode color_mode;
+ gboolean alt_quick_search;
+
+ gboolean toolbar_visibility;
+ gboolean conbuttons_visibility;
+ gboolean concombo_visibility;
+ gboolean cmdline_visibility;
+ gboolean buttonbar_visibility;
GnomeCmdData();
+
+ void free(); // FIXME: free() -> ~GnomeCmdData()
};
typedef struct _GnomeCmdConFtp GnomeCmdConFtp;
-enum GnomeCmdRightMouseButtonMode
-{
- RIGHT_BUTTON_POPUPS_MENU,
- RIGHT_BUTTON_SELECTS
-};
-
#define PATTERN_HISTORY_SIZE 10
-struct SearchDefaults
-{
- GList *name_patterns;
- GList *content_patterns;
- GList *directories;
- gboolean recursive;
- gboolean case_sens;
- gint width, height;
-};
-
-struct AdvrenameDefaults
-{
- GList *patterns;
- History *templates;
- guint counter_start;
- guint counter_precision;
- guint counter_increment;
- gboolean auto_update;
- gint width, height;
- gint pat_col_widths;
- gint res_col_widths;
- gint sep_value;
-};
-
-struct FilterSettings
-{
- gboolean file_types[8];
-
- gboolean hidden;
- gboolean backup;
- gboolean other;
- gchar *other_value;
-};
-
-
-GnomeCmdData *gnome_cmd_data_new ();
-void gnome_cmd_data_free ();
-
void gnome_cmd_data_save ();
void gnome_cmd_data_load ();
void gnome_cmd_data_load_more ();
@@ -117,9 +124,6 @@
GnomeCmdLayout gnome_cmd_data_get_layout ();
void gnome_cmd_data_set_layout (GnomeCmdLayout layout);
-GnomeCmdColorMode gnome_cmd_data_get_color_mode ();
-void gnome_cmd_data_set_color_mode (GnomeCmdColorMode mode);
-
GnomeCmdColorTheme *gnome_cmd_data_get_custom_color_theme ();
GnomeCmdColorTheme *gnome_cmd_data_get_current_color_theme ();
@@ -129,7 +133,7 @@
GnomeCmdExtDispMode gnome_cmd_data_get_ext_disp_mode ();
void gnome_cmd_data_set_ext_disp_mode (GnomeCmdExtDispMode mode);
-FilterSettings *gnome_cmd_data_get_filter_settings ();
+GnomeCmdData::FilterSettings *gnome_cmd_data_get_filter_settings ();
gboolean gnome_cmd_data_get_type_filter (GnomeVFSFileType type);
void gnome_cmd_data_set_hidden_filter (gboolean hide);
gboolean gnome_cmd_data_get_hidden_filter ();
@@ -156,9 +160,6 @@
const gchar *gnome_cmd_data_get_list_font ();
void gnome_cmd_data_set_list_font (const gchar *list_font);
-GnomeCmdRightMouseButtonMode gnome_cmd_data_get_right_mouse_button_mode ();
-void gnome_cmd_data_set_right_mouse_button_mode (GnomeCmdRightMouseButtonMode mode);
-
const gchar *gnome_cmd_data_get_term ();
void gnome_cmd_data_set_term (const gchar *shell);
@@ -205,7 +206,7 @@
gboolean gnome_cmd_data_get_use_ls_colors ();
void gnome_cmd_data_set_use_ls_colors (gboolean value);
-SearchDefaults *gnome_cmd_data_get_search_defaults ();
+GnomeCmdData::SearchDefaults *gnome_cmd_data_get_search_defaults ();
GnomeCmdConFtp *gnome_cmd_data_get_quick_connect ();
@@ -218,32 +219,14 @@
gboolean gnome_cmd_data_get_use_internal_viewer ();
void gnome_cmd_data_set_use_internal_viewer (gboolean value);
-gboolean gnome_cmd_data_get_alt_quick_search ();
-void gnome_cmd_data_set_alt_quick_search (gboolean value);
-
gboolean gnome_cmd_data_get_skip_mounting ();
void gnome_cmd_data_set_skip_mounting (gboolean value);
-gboolean gnome_cmd_data_get_toolbar_visibility ();
-void gnome_cmd_data_set_toolbar_visibility (gboolean value);
-
-gboolean gnome_cmd_data_get_buttonbar_visibility ();
-void gnome_cmd_data_set_buttonbar_visibility (gboolean value);
-
-AdvrenameDefaults *gnome_cmd_data_get_advrename_defaults ();
+GnomeCmdData::AdvrenameDefaults *gnome_cmd_data_get_advrename_defaults ();
gboolean gnome_cmd_data_get_list_orientation ();
void gnome_cmd_data_set_list_orientation (gboolean vertical);
-gboolean gnome_cmd_data_get_conbuttons_visibility ();
-void gnome_cmd_data_set_conbuttons_visibility (gboolean value);
-
-gboolean gnome_cmd_data_get_concombo_visibility ();
-void gnome_cmd_data_set_concombo_visibility (gboolean value);
-
-gboolean gnome_cmd_data_get_cmdline_visibility ();
-void gnome_cmd_data_set_cmdline_visibility (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-file-list.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-file-list.cc (original)
+++ branches/gcmd-1-3/src/gnome-cmd-file-list.cc Mon Sep 8 16:49:45 2008
@@ -1140,7 +1140,7 @@
if (event->button == 3)
if (strcmp (finfo->info->name, "..") != 0)
{
- if (gnome_cmd_data_get_right_mouse_button_mode () == RIGHT_BUTTON_SELECTS)
+ if (gnome_cmd_data.right_mouse_button_mode == GnomeCmdData::RIGHT_BUTTON_SELECTS)
{
if (g_list_index (fl->priv->selected_files, finfo) == -1)
{
Modified: branches/gcmd-1-3/src/gnome-cmd-file-selector.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-file-selector.cc (original)
+++ branches/gcmd-1-3/src/gnome-cmd-file-selector.cc Mon Sep 8 16:49:45 2008
@@ -835,7 +835,7 @@
GnomeCmdFile *f = fs->file_list()->get_selected_file();
- if (f && gnome_cmd_data_get_cmdline_visibility ())
+ if (f && gnome_cmd_data.cmdline_visibility)
{
gchar *text = fullpath ? gnome_cmd_file_get_quoted_real_path (f) :
gnome_cmd_file_get_quoted_name (f);
@@ -851,7 +851,7 @@
{
g_return_if_fail (GNOME_CMD_IS_FILE_SELECTOR (fs));
- if (gnome_cmd_data_get_cmdline_visibility ())
+ if (gnome_cmd_data.cmdline_visibility)
{
gchar *dpath = gnome_cmd_file_get_real_path (GNOME_CMD_FILE (fs->priv->cwd));
gnome_cmd_cmdline_append_text (gnome_cmd_main_win_get_cmdline (main_win), dpath);
@@ -971,7 +971,7 @@
{
static GtkTooltips *tooltips = NULL;
- if (!gnome_cmd_data_get_conbuttons_visibility ())
+ if (!gnome_cmd_data.conbuttons_visibility)
return;
for (GList *l = fs->priv->old_btns; l; l=l->next)
@@ -1228,7 +1228,7 @@
{
static gchar text[2];
- if (!gnome_cmd_data_get_cmdline_visibility ())
+ if (!gnome_cmd_data.cmdline_visibility)
gnome_cmd_file_list_show_quicksearch (fs->file_list(), (gchar) event->keyval);
else
{
@@ -2024,7 +2024,7 @@
case GDK_Return:
case GDK_KP_Enter:
- if (gnome_cmd_data_get_cmdline_visibility ()
+ if (gnome_cmd_data.cmdline_visibility
&& gnome_cmd_cmdline_is_empty (gnome_cmd_main_win_get_cmdline (main_win)))
gnome_cmd_cmdline_exec (gnome_cmd_main_win_get_cmdline (main_win));
else
@@ -2032,7 +2032,7 @@
return TRUE;
case GDK_Escape:
- if (gnome_cmd_data_get_cmdline_visibility ())
+ if (gnome_cmd_data.cmdline_visibility)
gnome_cmd_cmdline_set_text (gnome_cmd_main_win_get_cmdline (main_win), "");
return TRUE;
}
@@ -2111,7 +2111,7 @@
void GnomeCmdFileSelector::update_conbuttons_visibility()
{
- if (!gnome_cmd_data_get_conbuttons_visibility ())
+ if (!gnome_cmd_data.conbuttons_visibility)
{
if (con_btns_hbox)
{
@@ -2135,7 +2135,7 @@
void GnomeCmdFileSelector::update_concombo_visibility()
{
- if (gnome_cmd_data_get_concombo_visibility ())
+ if (gnome_cmd_data.concombo_visibility)
gtk_widget_show (con_hbox);
else
gtk_widget_hide (con_hbox);
Modified: branches/gcmd-1-3/src/gnome-cmd-main-menu.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-main-menu.cc (original)
+++ branches/gcmd-1-3/src/gnome-cmd-main-menu.cc Mon Sep 8 16:49:45 2008
@@ -840,19 +840,19 @@
gtk_check_menu_item_set_active (
GTK_CHECK_MENU_ITEM (main_menu->priv->menu_view_toolbar),
- gnome_cmd_data_get_toolbar_visibility ());
+ gnome_cmd_data.toolbar_visibility);
gtk_check_menu_item_set_active (
GTK_CHECK_MENU_ITEM (main_menu->priv->menu_view_conbuttons),
- gnome_cmd_data_get_conbuttons_visibility ());
+ gnome_cmd_data.conbuttons_visibility);
gtk_check_menu_item_set_active (
GTK_CHECK_MENU_ITEM (main_menu->priv->menu_view_concombo),
- gnome_cmd_data_get_concombo_visibility ());
+ gnome_cmd_data.concombo_visibility);
gtk_check_menu_item_set_active (
GTK_CHECK_MENU_ITEM (main_menu->priv->menu_view_buttonbar),
- gnome_cmd_data_get_buttonbar_visibility ());
+ gnome_cmd_data.buttonbar_visibility);
gtk_check_menu_item_set_active (
GTK_CHECK_MENU_ITEM (main_menu->priv->menu_view_cmdline),
- gnome_cmd_data_get_cmdline_visibility ());
+ gnome_cmd_data.cmdline_visibility);
gtk_check_menu_item_set_active (
GTK_CHECK_MENU_ITEM (main_menu->priv->menu_view_hidden_files),
!gnome_cmd_data_get_hidden_filter ());
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 Sep 8 16:49:45 2008
@@ -134,7 +134,7 @@
(event->keyval == GDK_period)))
return FALSE;
- if (!gnome_cmd_data_get_alt_quick_search ())
+ if (!gnome_cmd_data.alt_quick_search)
return FALSE;
if (!state_is_alt (event->state) && !state_is_alt_shift (event->state))
@@ -474,7 +474,7 @@
gnome_cmd_main_win_get_fs (mw, LEFT)->set_active(TRUE);
gnome_cmd_main_win_get_fs (mw, RIGHT)->set_active(FALSE);
/*
- if (gnome_cmd_data_get_cmdline_visibility ())
+ if (gnome_cmd_data.cmdline_visibility)
{
gchar *dpath = gnome_cmd_file_get_path (GNOME_CMD_FILE (gnome_cmd_main_win_get_fs (mw, LEFT)->get_directory()));
gnome_cmd_cmdline_set_dir (GNOME_CMD_CMDLINE (mw->priv->cmdline), dpath);
@@ -547,7 +547,7 @@
if (fs == gnome_cmd_main_win_get_fs (mw, ACTIVE))
{
- if (gnome_cmd_data_get_toolbar_visibility ())
+ if (gnome_cmd_data.toolbar_visibility)
{
gtk_widget_set_sensitive (mw->priv->tb_first_btn, fs->can_back());
gtk_widget_set_sensitive (mw->priv->tb_back_btn, fs->can_back());
@@ -572,7 +572,7 @@
if (!con)
return;
- if (!gnome_cmd_data_get_toolbar_visibility ()
+ if (!gnome_cmd_data.toolbar_visibility
|| (gnome_cmd_data_get_skip_mounting () && GNOME_CMD_IS_CON_DEVICE (con)))
return;
@@ -915,14 +915,14 @@
gnome_cmd_main_win_get_fs (mw, LEFT)->update_style();
gnome_cmd_main_win_get_fs (mw, RIGHT)->update_style();
- if (gnome_cmd_data_get_cmdline_visibility ())
+ if (gnome_cmd_data.cmdline_visibility)
gnome_cmd_cmdline_update_style (GNOME_CMD_CMDLINE (mw->priv->cmdline));
}
void gnome_cmd_main_win_focus_cmdline (GnomeCmdMainWin *mw)
{
- if (gnome_cmd_data_get_cmdline_visibility ())
+ if (gnome_cmd_data.cmdline_visibility)
{
gnome_cmd_cmdline_focus (GNOME_CMD_CMDLINE (mw->priv->cmdline));
mw->priv->focused_widget = mw->priv->cmdline;
@@ -969,7 +969,7 @@
return TRUE;
case GDK_F8:
- if (gnome_cmd_data_get_cmdline_visibility ())
+ if (gnome_cmd_data.cmdline_visibility)
gnome_cmd_cmdline_show_history (GNOME_CMD_CMDLINE (mw->priv->cmdline));
return TRUE;
}
@@ -992,7 +992,7 @@
switch (event->keyval)
{
case GDK_Down:
- if (gnome_cmd_data_get_cmdline_visibility ())
+ if (gnome_cmd_data.cmdline_visibility)
gnome_cmd_cmdline_show_history (GNOME_CMD_CMDLINE (mw->priv->cmdline));
return TRUE;
@@ -1168,7 +1168,7 @@
GNOMEUIINFO_END
};
- if (gnome_cmd_data_get_toolbar_visibility ())
+ if (gnome_cmd_data.toolbar_visibility)
{
create_toolbar (mw, toolbar_uiinfo);
gtk_box_pack_start (GTK_BOX (mw->priv->vbox), mw->priv->toolbar, FALSE, TRUE, 0);
@@ -1194,7 +1194,7 @@
{
g_return_if_fail (GNOME_CMD_IS_MAIN_WIN (mw));
- if (gnome_cmd_data_get_buttonbar_visibility ())
+ if (gnome_cmd_data.buttonbar_visibility)
{
create_buttonbar (mw);
gtk_box_pack_start (GTK_BOX (mw->priv->vbox), mw->priv->buttonbar_sep, FALSE, TRUE, 0);
@@ -1216,7 +1216,7 @@
{
g_return_if_fail (GNOME_CMD_IS_MAIN_WIN (mw));
- if (gnome_cmd_data_get_cmdline_visibility ())
+ if (gnome_cmd_data.cmdline_visibility)
{
gint pos = 3;
mw->priv->cmdline_sep = create_separator (FALSE);
@@ -1225,7 +1225,7 @@
gtk_object_set_data_full (GTK_OBJECT (main_win), "cmdline", mw->priv->cmdline,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (mw->priv->cmdline);
- if (gnome_cmd_data_get_toolbar_visibility ())
+ if (gnome_cmd_data.toolbar_visibility)
pos += 2;
gtk_box_pack_start (GTK_BOX (mw->priv->vbox), mw->priv->cmdline_sep, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (mw->priv->vbox), mw->priv->cmdline, FALSE, TRUE, 1);
@@ -1276,7 +1276,7 @@
gtk_paned_pack1 (GTK_PANED (mw->priv->paned), mw->priv->file_selector[LEFT], TRUE, TRUE);
gtk_paned_pack2 (GTK_PANED (mw->priv->paned), mw->priv->file_selector[RIGHT], TRUE, TRUE);
- if (gnome_cmd_data_get_toolbar_visibility ())
+ if (gnome_cmd_data.toolbar_visibility)
pos += 2;
gtk_box_pack_start (GTK_BOX (mw->priv->vbox), mw->priv->paned, TRUE, TRUE, 0);
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 Sep 8 16:49:45 2008
@@ -77,11 +77,11 @@
radio = create_radio (parent, NULL, _("Show popup menu"), "rmb_popup_radio");
gtk_box_pack_start (GTK_BOX (cat_box), radio, FALSE, TRUE, 0);
- if (gnome_cmd_data_get_right_mouse_button_mode() == RIGHT_BUTTON_POPUPS_MENU)
+ if (gnome_cmd_data.right_mouse_button_mode == GnomeCmdData::RIGHT_BUTTON_POPUPS_MENU)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE);
radio = create_radio (parent, get_radio_group(radio), _("Select files"), "rmb_sel_radio");
gtk_container_add (GTK_CONTAINER (cat_box), radio);
- if (gnome_cmd_data_get_right_mouse_button_mode() == RIGHT_BUTTON_SELECTS)
+ if (gnome_cmd_data.right_mouse_button_mode == GnomeCmdData::RIGHT_BUTTON_SELECTS)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), TRUE);
@@ -117,10 +117,10 @@
radio = create_radio (parent, NULL, _("CTRL+ALT+letters"), "ctrl_alt_quick_search");
gtk_box_pack_start (GTK_BOX (cat_box), radio, FALSE, TRUE, 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), !gnome_cmd_data_get_alt_quick_search ());
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), !gnome_cmd_data.alt_quick_search);
radio = create_radio (parent, get_radio_group(radio), _("ALT+letters (menu access with F10)"), "alt_quick_search");
gtk_container_add (GTK_CONTAINER (cat_box), radio);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), gnome_cmd_data_get_alt_quick_search ());
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), gnome_cmd_data.alt_quick_search);
// Directory options
@@ -146,10 +146,8 @@
GtkWidget *dir_cache_size = lookup_widget (GTK_WIDGET (dialog), "dir_cache_size");
GtkWidget *alt_quick_search = lookup_widget (GTK_WIDGET (dialog), "alt_quick_search");
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rmb_popup_radio)))
- gnome_cmd_data_set_right_mouse_button_mode (RIGHT_BUTTON_POPUPS_MENU);
- else
- gnome_cmd_data_set_right_mouse_button_mode (RIGHT_BUTTON_SELECTS);
+ gnome_cmd_data.right_mouse_button_mode = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rmb_popup_radio)) ? GnomeCmdData::RIGHT_BUTTON_POPUPS_MENU
+ : GnomeCmdData::RIGHT_BUTTON_SELECTS;
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ft_regex_radio)))
gnome_cmd_data_set_filter_type (Filter::TYPE_REGEX);
@@ -158,7 +156,7 @@
gnome_cmd_data_set_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_set_alt_quick_search (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (alt_quick_search)));
+ gnome_cmd_data.alt_quick_search = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (alt_quick_search));
}
@@ -515,7 +513,7 @@
btn = create_button_with_data (parent, _("Edit..."), GTK_SIGNAL_FUNC (on_colors_edit), parent);
gtk_object_set_data (GTK_OBJECT (parent), "color_btn", btn);
gtk_box_pack_start (GTK_BOX (hbox), btn, FALSE, TRUE, 0);
- gtk_widget_set_sensitive (btn, gnome_cmd_data_get_color_mode () == GNOME_CMD_COLOR_CUSTOM);
+ gtk_widget_set_sensitive (btn, gnome_cmd_data.color_mode == GNOME_CMD_COLOR_CUSTOM);
// LS_COLORS
@@ -551,7 +549,7 @@
gtk_option_menu_set_history (GTK_OPTION_MENU (fe_optmenu), (gint) gnome_cmd_data_get_ext_disp_mode ());
gtk_option_menu_set_history (GTK_OPTION_MENU (lm_optmenu), (gint) gnome_cmd_data_get_layout ());
- gtk_option_menu_set_history (GTK_OPTION_MENU (cm_optmenu), (gint) gnome_cmd_data_get_color_mode ());
+ gtk_option_menu_set_history (GTK_OPTION_MENU (cm_optmenu), (gint) gnome_cmd_data.color_mode);
return frame;
}
@@ -576,8 +574,7 @@
(GnomeCmdExtDispMode) gtk_option_menu_get_history (GTK_OPTION_MENU (fe_optmenu)));
gnome_cmd_data_set_layout (
(GnomeCmdLayout) gtk_option_menu_get_history (GTK_OPTION_MENU (lm_optmenu)));
- gnome_cmd_data_set_color_mode (
- (GnomeCmdColorMode) gtk_option_menu_get_history (GTK_OPTION_MENU (cm_optmenu)));
+ gnome_cmd_data.color_mode = (GnomeCmdColorMode) gtk_option_menu_get_history (GTK_OPTION_MENU (cm_optmenu));
gnome_cmd_data_set_use_ls_colors (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (use_ls)));
@@ -816,7 +813,7 @@
GtkWidget *hide_backup_check;
GtkWidget *hide_symlink_check;
GtkWidget *backup_pattern_entry;
- FilterSettings *f = gnome_cmd_data_get_filter_settings ();
+ GnomeCmdData::FilterSettings *f = gnome_cmd_data_get_filter_settings ();
hide_unknown_check = lookup_widget (GTK_WIDGET (dialog), "hide_unknown_check");
hide_regular_check = lookup_widget (GTK_WIDGET (dialog), "hide_regular_check");
Modified: branches/gcmd-1-3/src/gnome-cmd-patternsel-dialog.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-patternsel-dialog.cc (original)
+++ branches/gcmd-1-3/src/gnome-cmd-patternsel-dialog.cc Mon Sep 8 16:49:45 2008
@@ -46,7 +46,7 @@
{
g_return_if_fail (GNOME_CMD_IS_PATTERNSEL_DIALOG (dialog));
- SearchDefaults *defaults = gnome_cmd_data_get_search_defaults ();
+ GnomeCmdData::SearchDefaults *defaults = gnome_cmd_data_get_search_defaults ();
const gchar *s = gtk_entry_get_text (GTK_ENTRY (dialog->priv->pattern_entry));
gboolean case_sens = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->priv->case_check));
@@ -114,7 +114,7 @@
GtkWidget *gnome_cmd_patternsel_dialog_new (GnomeCmdFileList *fl, gboolean mode)
{
GtkWidget *hbox, *vbox, *label;
- SearchDefaults *defaults = gnome_cmd_data_get_search_defaults ();
+ GnomeCmdData::SearchDefaults *defaults = gnome_cmd_data_get_search_defaults ();
GnomeCmdPatternselDialog *dialog = (GnomeCmdPatternselDialog *) gtk_type_new (gnome_cmd_patternsel_dialog_get_type ());
dialog->priv->mode = mode;
dialog->priv->fl = fl;
Modified: branches/gcmd-1-3/src/gnome-cmd-search-dialog.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-search-dialog.cc (original)
+++ branches/gcmd-1-3/src/gnome-cmd-search-dialog.cc Mon Sep 8 16:49:45 2008
@@ -494,7 +494,7 @@
static void on_dialog_size_allocate (GtkWidget *widget, GtkAllocation *allocation, GnomeCmdSearchDialog *dialog)
{
- SearchDefaults *defaults = gnome_cmd_data_get_search_defaults ();
+ GnomeCmdData::SearchDefaults *defaults = gnome_cmd_data_get_search_defaults ();
defaults->width = allocation->width;
defaults->height = allocation->height;
}
@@ -525,7 +525,7 @@
data->case_sens = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->priv->case_check));
// Save default settings
- SearchDefaults *defaults = gnome_cmd_data_get_search_defaults ();
+ GnomeCmdData::SearchDefaults *defaults = gnome_cmd_data_get_search_defaults ();
defaults->case_sens = data->case_sens;
defaults->recursive = data->recurse;
@@ -802,7 +802,7 @@
static void init (GnomeCmdSearchDialog *dialog)
{
- SearchDefaults *defaults = gnome_cmd_data_get_search_defaults ();
+ GnomeCmdData::SearchDefaults *defaults = gnome_cmd_data_get_search_defaults ();
GtkWidget *window;
GtkWidget *vbox;
Modified: branches/gcmd-1-3/src/gnome-cmd-user-actions.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-user-actions.cc (original)
+++ branches/gcmd-1-3/src/gnome-cmd-user-actions.cc Mon Sep 8 16:49:45 2008
@@ -1182,7 +1182,7 @@
if (!GTK_WIDGET_REALIZED (main_win)) return;
GtkCheckMenuItem *checkitem = (GtkCheckMenuItem *) menuitem;
- gnome_cmd_data_set_conbuttons_visibility (checkitem->active);
+ gnome_cmd_data.conbuttons_visibility = checkitem->active;
get_fs (ACTIVE)->update_conbuttons_visibility();
get_fs (INACTIVE)->update_conbuttons_visibility();
}
@@ -1193,7 +1193,7 @@
if (!GTK_WIDGET_REALIZED (main_win)) return;
GtkCheckMenuItem *checkitem = (GtkCheckMenuItem *) menuitem;
- gnome_cmd_data_set_concombo_visibility (checkitem->active);
+ gnome_cmd_data.concombo_visibility = checkitem->active;
get_fs (ACTIVE)->update_concombo_visibility();
get_fs (INACTIVE)->update_concombo_visibility();
}
@@ -1204,7 +1204,7 @@
if (!GTK_WIDGET_REALIZED (main_win)) return;
GtkCheckMenuItem *checkitem = (GtkCheckMenuItem *) menuitem;
- gnome_cmd_data_set_toolbar_visibility (checkitem->active);
+ gnome_cmd_data.toolbar_visibility = checkitem->active;
gnome_cmd_main_win_update_toolbar_visibility (main_win);
}
@@ -1214,7 +1214,7 @@
if (!GTK_WIDGET_REALIZED (main_win)) return;
GtkCheckMenuItem *checkitem = (GtkCheckMenuItem *) menuitem;
- gnome_cmd_data_set_buttonbar_visibility (checkitem->active);
+ gnome_cmd_data.buttonbar_visibility = checkitem->active;
gnome_cmd_main_win_update_buttonbar_visibility (main_win);
}
@@ -1224,7 +1224,7 @@
if (!GTK_WIDGET_REALIZED (main_win)) return;
GtkCheckMenuItem *checkitem = (GtkCheckMenuItem *) menuitem;
- gnome_cmd_data_set_cmdline_visibility (checkitem->active);
+ gnome_cmd_data.cmdline_visibility = checkitem->active;
gnome_cmd_main_win_update_cmdline_visibility (main_win);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
