[gnome-commander] Options: use cfg for referencing to GnomeCmdData in create_filter_tab()
- From: Piotr Eljasiak <epiotr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] Options: use cfg for referencing to GnomeCmdData in create_filter_tab()
- Date: Sun, 6 Nov 2011 13:15:16 +0000 (UTC)
commit 4ea13b2a7b1e1d001fe7b7e3f5e91d8cfddd1658
Author: Piotr Eljasiak <epiotr src gnome org>
Date: Sun Nov 6 13:55:15 2011 +0100
Options: use cfg for referencing to GnomeCmdData in create_filter_tab()
src/gnome-cmd-options-dialog.cc | 35 +++++++++++++----------------------
1 files changed, 13 insertions(+), 22 deletions(-)
---
diff --git a/src/gnome-cmd-options-dialog.cc b/src/gnome-cmd-options-dialog.cc
index 575c3c7..d08b60b 100644
--- a/src/gnome-cmd-options-dialog.cc
+++ b/src/gnome-cmd-options-dialog.cc
@@ -1018,7 +1018,7 @@ static void on_filter_backup_files_toggled (GtkToggleButton *btn, GtkWidget *dia
}
-static GtkWidget *create_filter_tab (GtkWidget *parent)
+static GtkWidget *create_filter_tab (GtkWidget *parent, GnomeCmdData &cfg)
{
GtkWidget *frame;
GtkWidget *hbox;
@@ -1041,32 +1041,25 @@ static GtkWidget *create_filter_tab (GtkWidget *parent)
check = create_check (parent, _("Unknown"), "hide_unknown_check");
gtk_container_add (GTK_CONTAINER (cat_box), check);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),
- gnome_cmd_data.hide_type(GNOME_VFS_FILE_TYPE_UNKNOWN));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.hide_type(GNOME_VFS_FILE_TYPE_UNKNOWN));
check = create_check (parent, _("Regular files"), "hide_regular_check");
gtk_container_add (GTK_CONTAINER (cat_box), check);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),
- gnome_cmd_data.hide_type(GNOME_VFS_FILE_TYPE_REGULAR));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.hide_type(GNOME_VFS_FILE_TYPE_REGULAR));
check = create_check (parent, _("Directories"), "hide_directory_check");
gtk_container_add (GTK_CONTAINER (cat_box), check);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),
- gnome_cmd_data.hide_type(GNOME_VFS_FILE_TYPE_DIRECTORY));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.hide_type(GNOME_VFS_FILE_TYPE_DIRECTORY));
check = create_check (parent, _("Fifo files"), "hide_fifo_check");
gtk_container_add (GTK_CONTAINER (cat_box), check);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),
- gnome_cmd_data.hide_type(GNOME_VFS_FILE_TYPE_FIFO));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.hide_type(GNOME_VFS_FILE_TYPE_FIFO));
check = create_check (parent, _("Socket files"), "hide_socket_check");
gtk_container_add (GTK_CONTAINER (cat_box), check);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),
- gnome_cmd_data.hide_type(GNOME_VFS_FILE_TYPE_SOCKET));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.hide_type(GNOME_VFS_FILE_TYPE_SOCKET));
check = create_check (parent, _("Character devices"), "hide_char_check");
gtk_container_add (GTK_CONTAINER (cat_box), check);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),
- gnome_cmd_data.hide_type(GNOME_VFS_FILE_TYPE_CHARACTER_DEVICE));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.hide_type(GNOME_VFS_FILE_TYPE_CHARACTER_DEVICE));
check = create_check (parent, _("Block devices"), "hide_block_check");
gtk_container_add (GTK_CONTAINER (cat_box), check);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),
- gnome_cmd_data.hide_type(GNOME_VFS_FILE_TYPE_BLOCK_DEVICE));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.hide_type(GNOME_VFS_FILE_TYPE_BLOCK_DEVICE));
cat_box = create_vbox (parent, FALSE, 0);
@@ -1075,15 +1068,13 @@ static GtkWidget *create_filter_tab (GtkWidget *parent)
check = create_check (parent, _("Hidden files"), "hide_hidden_check");
gtk_container_add (GTK_CONTAINER (cat_box), check);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), gnome_cmd_data.filter_settings.hidden);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.filter_settings.hidden);
backup_check = create_check (parent, _("Backup files"), "hide_backup_check");
gtk_container_add (GTK_CONTAINER (cat_box), backup_check);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (backup_check),
- gnome_cmd_data.filter_settings.backup);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (backup_check), cfg.filter_settings.backup);
check = create_check (parent, _("Symlinks"), "hide_symlink_check");
gtk_container_add (GTK_CONTAINER (cat_box), check);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),
- gnome_cmd_data.hide_type(GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), cfg.hide_type(GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK));
cat_box = create_vbox (parent, FALSE, 0);
@@ -1092,7 +1083,7 @@ static GtkWidget *create_filter_tab (GtkWidget *parent)
entry = create_entry (parent, "backup_pattern_entry", gnome_cmd_data_get_backup_pattern ());
gtk_box_pack_start (GTK_BOX (cat_box), entry, TRUE, FALSE, 0);
- gtk_widget_set_sensitive (entry, gnome_cmd_data.filter_settings.backup);
+ gtk_widget_set_sensitive (entry, cfg.filter_settings.backup);
g_signal_connect (backup_check, "toggled", G_CALLBACK (on_filter_backup_files_toggled), frame);
@@ -2013,7 +2004,7 @@ gboolean gnome_cmd_options_dialog (GtkWindow *parent, GnomeCmdData &cfg)
notebook->append_page(create_layout_tab (dialog, cfg), _("Layout"));
notebook->append_page(create_tabs_tab (dialog, cfg), _("Tabs"));
notebook->append_page(create_confirmation_tab (dialog, cfg), _("Confirmation"));
- notebook->append_page(create_filter_tab (dialog), _("Filters"));
+ notebook->append_page(create_filter_tab (dialog, cfg), _("Filters"));
notebook->append_page(create_programs_tab (dialog), _("Programs"));
notebook->append_page(create_devices_tab (dialog), _("Devices"));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]