[gnome-commander/GSettings: 26/27] Merge branch 'master' into GSettings
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander/GSettings: 26/27] Merge branch 'master' into GSettings
- Date: Sun, 17 Jul 2016 11:59:33 +0000 (UTC)
commit f24e967281530e5f3e8ccb331fe886aeabe27842
Merge: fff280c e3ec773
Author: Uwe Scholz <uwescholz src gnome org>
Date: Sun Jul 17 12:02:22 2016 +0200
Merge branch 'master' into GSettings
AUTHORS | 1 +
NEWS | 7 +
doc/C/releases.xml | 23 +
doc/es/es.po | 1035 +++++++++++-----------
gcmd-scripts/duplicate.sh | 11 +
gcmd-scripts/filelist.sh | 15 +
gcmd-scripts/tar.sh | 8 +
gcmd-scripts/trash.sh | 11 +
pixmaps/Makefile.am | 2 -
pixmaps/nautilus.svg | 275 ------
pixmaps/python.svg | 122 ---
po/cs.po | 206 +++---
po/de.po | 210 +++---
po/es.po | 220 +++---
po/id.po | 1471 ++++++++++++++++---------------
po/pl.po | 302 ++++---
po/sv.po | 497 ++++++------
src/dialogs/gnome-cmd-options-dialog.cc | 9 +-
src/gnome-cmd-app.cc | 58 ++-
src/gnome-cmd-data.cc | 13 +
src/gnome-cmd-data.h | 1 +
src/gnome-cmd-dir-indicator.cc | 16 +
src/gnome-cmd-file-popmenu.cc | 152 +++-
src/gnome-cmd-list-popmenu.cc | 1 -
src/gnome-cmd-main-win.cc | 16 +-
src/gnome-cmd-main-win.h | 1 +
src/gnome-cmd-types.h | 3 +-
src/gnome-cmd-user-actions.cc | 46 +-
src/gnome-cmd-user-actions.h | 3 +-
29 files changed, 2353 insertions(+), 2382 deletions(-)
---
diff --cc src/gnome-cmd-data.cc
index 66ff5fe,8e3c762..97d634c
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@@ -2494,15 -1282,15 +2494,16 @@@ GnomeCmdData::GnomeCmdData(): search_de
XML_cfg_has_connections = FALSE;
XML_cfg_has_bookmarks = FALSE;
- list_orientation = FALSE;
+ horizontal_orientation = FALSE;
- toolbar_visibility = TRUE;
- conbuttons_visibility = TRUE;
- concombo_visibility = TRUE;
+ show_toolbar = TRUE;
+ show_devbuttons = TRUE;
+ show_devlist = TRUE;
cmdline_visibility = TRUE;
buttonbar_visibility = TRUE;
+ mainmenu_visibility = TRUE;
+ //TODO: Include into GnomeCmdData::Options
dev_icon_size = 16;
memset(fs_col_width, 0, sizeof(fs_col_width));
gui_update_rate = DEFAULT_GUI_UPDATE_RATE;
@@@ -3217,85 -1477,124 +3228,86 @@@ void GnomeCmdData::load(
g_free (tmp);
}
- options.color_mode = (GnomeCmdColorMode) gnome_cmd_data_get_int ("/colors/mode", gcmd_owner.is_root() ?
GNOME_CMD_COLOR_GREEN_TIGER :
-
GNOME_CMD_COLOR_DEEP_BLUE);
-
- gnome_cmd_data_get_color ("/colors/norm_fg", options.color_themes[GNOME_CMD_COLOR_CUSTOM].norm_fg);
- gnome_cmd_data_get_color ("/colors/norm_bg", options.color_themes[GNOME_CMD_COLOR_CUSTOM].norm_bg);
- gnome_cmd_data_get_color ("/colors/alt_fg", options.color_themes[GNOME_CMD_COLOR_CUSTOM].alt_fg);
- gnome_cmd_data_get_color ("/colors/alt_bg", options.color_themes[GNOME_CMD_COLOR_CUSTOM].alt_bg);
- gnome_cmd_data_get_color ("/colors/sel_fg", options.color_themes[GNOME_CMD_COLOR_CUSTOM].sel_fg);
- gnome_cmd_data_get_color ("/colors/sel_bg", options.color_themes[GNOME_CMD_COLOR_CUSTOM].sel_bg);
- gnome_cmd_data_get_color ("/colors/curs_fg", options.color_themes[GNOME_CMD_COLOR_CUSTOM].curs_fg);
- gnome_cmd_data_get_color ("/colors/curs_bg", options.color_themes[GNOME_CMD_COLOR_CUSTOM].curs_bg);
-
- options.use_ls_colors = gnome_cmd_data_get_bool ("/colors/use_ls_colors", FALSE);
+ options.color_mode = gcmd_owner.is_root() ? (GnomeCmdColorMode) g_settings_get_enum
(options.gcmd_settings->colors, GCMD_SETTINGS_COLORS_THEME)
+ : (GnomeCmdColorMode) GNOME_CMD_COLOR_DEEP_BLUE;
+
+ options.list_font = g_settings_get_string (options.gcmd_settings->general, GCMD_SETTINGS_LIST_FONT);
+
+ options.ext_disp_mode = (GnomeCmdExtDispMode) g_settings_get_enum (options.gcmd_settings->general,
GCMD_SETTINGS_EXT_DISP_MODE);
+ options.left_mouse_button_mode = (LeftMouseButtonMode) g_settings_get_enum
(options.gcmd_settings->general, GCMD_SETTINGS_CLICKS_TO_OPEN_ITEM);
+ options.left_mouse_button_unselects = g_settings_get_boolean (options.gcmd_settings->general,
GCMD_SETTINGS_LEFT_MOUSE_BUTTON_UNSELECTS);
+ options.middle_mouse_button_mode = (MiddleMouseButtonMode) g_settings_get_enum
(options.gcmd_settings->general, GCMD_SETTINGS_MIDDLE_MOUSE_BUTTON_MODE);
+ options.right_mouse_button_mode = (RightMouseButtonMode) g_settings_get_enum
(options.gcmd_settings->general, GCMD_SETTINGS_RIGHT_MOUSE_BUTTON_MODE);
+ options.icon_size = g_settings_get_uint (options.gcmd_settings->general, GCMD_SETTINGS_ICON_SIZE);
+ dev_icon_size = g_settings_get_uint (options.gcmd_settings->general, GCMD_SETTINGS_DEV_ICON_SIZE);
+ options.icon_scale_quality = (GdkInterpType) g_settings_get_enum (options.gcmd_settings->general,
GCMD_SETTINGS_ICON_SCALE_QUALITY);
+ options.theme_icon_dir = g_settings_get_string(options.gcmd_settings->general,
GCMD_SETTINGS_MIME_ICON_DIR);
+ cmdline_history_length = g_settings_get_uint (options.gcmd_settings->general,
GCMD_SETTINGS_CMDLINE_HISTORY_LENGTH);
+ horizontal_orientation = g_settings_get_boolean (options.gcmd_settings->general,
GCMD_SETTINGS_HORIZONTAL_ORIENTATION);
+ gui_update_rate = g_settings_get_uint (options.gcmd_settings->general, GCMD_SETTINGS_GUI_UPDATE_RATE);
+ options.main_win_pos[0] = g_settings_get_int (options.gcmd_settings->general,
GCMD_SETTINGS_MAIN_WIN_POS_X);
+ options.main_win_pos[1] = g_settings_get_int (options.gcmd_settings->general,
GCMD_SETTINGS_MAIN_WIN_POS_Y);
+
+ show_toolbar = g_settings_get_boolean (options.gcmd_settings->general, GCMD_SETTINGS_SHOW_TOOLBAR);
+ show_devbuttons = g_settings_get_boolean (options.gcmd_settings->general,
GCMD_SETTINGS_SHOW_DEVBUTTONS);
+ show_devlist = g_settings_get_boolean (options.gcmd_settings->general, GCMD_SETTINGS_SHOW_DEVLIST);
+ cmdline_visibility = g_settings_get_boolean (options.gcmd_settings->general,
GCMD_SETTINGS_SHOW_CMDLINE);
+ buttonbar_visibility = g_settings_get_boolean (options.gcmd_settings->general,
GCMD_SETTINGS_SHOW_BUTTONBAR);
++ mainmenu_visibility = gnome_cmd_data_get_bool ("/programs/mainmenu_visibility", TRUE);
+
+ options.honor_expect_uris = g_settings_get_boolean (options.gcmd_settings->programs,
GCMD_SETTINGS_DONT_DOWNLOAD);
+ options.allow_multiple_instances = g_settings_get_boolean (options.gcmd_settings->general,
GCMD_SETTINGS_MULTIPLE_INSTANCES);
+ options.use_internal_viewer = g_settings_get_boolean (options.gcmd_settings->programs,
GCMD_SETTINGS_USE_INTERNAL_VIEWER);
+ options.quick_search = (GnomeCmdQuickSearchShortcut) g_settings_get_enum
(options.gcmd_settings->keybindings, GCMD_SETTINGS_QUICK_SEARCH_SHORTCUT);
+ options.quick_search_exact_match_begin = g_settings_get_boolean (options.gcmd_settings->general,
GCMD_SETTINGS_QUICK_SEARCH_EXACT_MATCH_BEGIN);
+ options.quick_search_exact_match_end = g_settings_get_boolean (options.gcmd_settings->general,
GCMD_SETTINGS_QUICK_SEARCH_EXACT_MATCH_END);
+
+ options.skip_mounting = g_settings_get_boolean (options.gcmd_settings->general,
GCMD_SETTINGS_DEV_SKIP_MOUNTING);
+ options.device_only_icon = g_settings_get_boolean(options.gcmd_settings->general,
GCMD_SETTINGS_DEV_ONLY_ICON);
+
+ options.symlink_prefix = g_settings_get_string(options.gcmd_settings->general,
GCMD_SETTINGS_SYMLINK_PREFIX);
+ if (!*options.symlink_prefix || strcmp(options.symlink_prefix, _("link to %s"))==0)
+ {
+ g_free (options.symlink_prefix);
+ options.symlink_prefix = NULL;
+ }
- options.ls_colors_palette.black_fg = gdk_color_new (0, 0, 0);
- options.ls_colors_palette.black_bg = gdk_color_new (0, 0, 0);
- options.ls_colors_palette.red_fg = gdk_color_new (0xffff, 0, 0);
- options.ls_colors_palette.red_bg = gdk_color_new (0xffff, 0, 0);
- options.ls_colors_palette.green_fg = gdk_color_new (0, 0xffff, 0);
- options.ls_colors_palette.green_bg = gdk_color_new (0, 0xffff, 0);
- options.ls_colors_palette.yellow_fg = gdk_color_new (0xffff, 0xffff, 0);
- options.ls_colors_palette.yellow_bg = gdk_color_new (0xffff, 0xffff, 0);
- options.ls_colors_palette.blue_fg = gdk_color_new (0, 0, 0xffff);
- options.ls_colors_palette.blue_bg = gdk_color_new (0, 0, 0xffff);
- options.ls_colors_palette.magenta_fg = gdk_color_new (0xffff, 0, 0xffff);
- options.ls_colors_palette.magenta_bg = gdk_color_new (0xffff, 0, 0xffff);
- options.ls_colors_palette.cyan_fg = gdk_color_new (0, 0xffff, 0xffff);
- options.ls_colors_palette.cyan_bg = gdk_color_new (0, 0xffff, 0xffff);
- options.ls_colors_palette.white_fg = gdk_color_new (0xffff, 0xffff, 0xffff);
- options.ls_colors_palette.white_bg = gdk_color_new (0xffff, 0xffff, 0xffff);
-
- options.list_font = gnome_cmd_data_get_string ("/options/list_font",
"-misc-fixed-medium-r-normal-*-10-*-*-*-c-*-iso8859-1");
-
- options.ext_disp_mode = (GnomeCmdExtDispMode) gnome_cmd_data_get_int ("/options/ext_disp_mode",
GNOME_CMD_EXT_DISP_BOTH);
- options.left_mouse_button_mode = (LeftMouseButtonMode) gnome_cmd_data_get_int
("/options/left_mouse_button_mode", LEFT_BUTTON_OPENS_WITH_DOUBLE_CLICK);
- options.left_mouse_button_unselects = gnome_cmd_data_get_bool ("/options/left_mouse_button_unselects",
TRUE);
- options.middle_mouse_button_mode = (MiddleMouseButtonMode) gnome_cmd_data_get_int
("/options/middle_mouse_button_mode", MIDDLE_BUTTON_GOES_UP_DIR);
- options.right_mouse_button_mode = (RightMouseButtonMode) gnome_cmd_data_get_int
("/options/right_mouse_button_mode", RIGHT_BUTTON_POPUPS_MENU);
- options.icon_size = gnome_cmd_data_get_int ("/options/icon_size", 16);
- dev_icon_size = gnome_cmd_data_get_int ("/options/dev_icon_size", 16);
- options.icon_scale_quality = (GdkInterpType) gnome_cmd_data_get_int ("/options/icon_scale_quality",
GDK_INTERP_HYPER);
- options.theme_icon_dir = gnome_cmd_data_get_string ("/options/theme_icon_dir", theme_icon_dir);
- g_free (theme_icon_dir);
- options.document_icon_dir = gnome_cmd_data_get_string ("/options/document_icon_dir", document_icon_dir);
- g_free (document_icon_dir);
- cmdline_history_length = gnome_cmd_data_get_int ("/options/cmdline_history_length", 16);
- button_relief = (GtkReliefStyle) gnome_cmd_data_get_int ("/options/btn_relief", GTK_RELIEF_NONE);
- list_orientation = gnome_cmd_data_get_bool ("/options/list_orientation", FALSE);
- gui_update_rate = gnome_cmd_data_get_int ("/options/gui_update_rate", DEFAULT_GUI_UPDATE_RATE);
- priv->main_win_pos[0] = gnome_cmd_data_get_int ("/options/main_win_pos_x", -1);
- 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 = gnome_cmd_data_get_bool ("/options/conbuttons_visibility", TRUE);
- 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);
- mainmenu_visibility = gnome_cmd_data_get_bool ("/programs/mainmenu_visibility", TRUE);
-
- if (gui_update_rate < MIN_GUI_UPDATE_RATE)
- gui_update_rate = MIN_GUI_UPDATE_RATE;
- if (gui_update_rate > MAX_GUI_UPDATE_RATE)
- gui_update_rate = MAX_GUI_UPDATE_RATE;
-
- options.honor_expect_uris = gnome_cmd_data_get_bool ("/programs/honor_expect_uris", FALSE);
- options.allow_multiple_instances = gnome_cmd_data_get_bool ("/programs/allow_multiple_instances",
FALSE);
- options.use_internal_viewer = gnome_cmd_data_get_bool ("/programs/use_internal_viewer", TRUE);
- options.alt_quick_search = gnome_cmd_data_get_bool ("/programs/alt_quick_search", FALSE);
- options.quick_search_exact_match_begin = gnome_cmd_data_get_bool
("/programs/quick_search_exact_match_begin", TRUE);
- options.quick_search_exact_match_end = gnome_cmd_data_get_bool
("/programs/quick_search_exact_match_end", FALSE);
- options.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)
- {
- g_free (priv->symlink_prefix);
- priv->symlink_prefix = NULL;
- }
-
- options.viewer = gnome_cmd_data_get_string ("/programs/viewer", "gedit %s");
- options.editor = gnome_cmd_data_get_string ("/programs/editor", "gedit %s");
- options.differ = gnome_cmd_data_get_string ("/programs/differ", "meld %s");
- options.sendto = gnome_cmd_data_get_string ("/programs/sendto", "nautilus-sendto %s");
- options.termopen = gnome_cmd_data_get_string ("/programs/terminal_open", "gnome-terminal");
- options.termexec = gnome_cmd_data_get_string ("/programs/terminal_exec", "gnome-terminal -e %s");
-
- use_gcmd_block = gnome_cmd_data_get_bool ("/programs/use_gcmd_block", FALSE);
-
- options.device_only_icon = gnome_cmd_data_get_bool ("/devices/only_icon", FALSE);
-
- gnome_cmd_data_get_color ("/colors/ls_colors_black_fg", options.ls_colors_palette.black_fg);
- gnome_cmd_data_get_color ("/colors/ls_colors_black_bg", options.ls_colors_palette.black_bg);
- gnome_cmd_data_get_color ("/colors/ls_colors_red_fg", options.ls_colors_palette.red_fg);
- gnome_cmd_data_get_color ("/colors/ls_colors_red_bg", options.ls_colors_palette.red_bg);
- gnome_cmd_data_get_color ("/colors/ls_colors_green_fg", options.ls_colors_palette.green_fg);
- gnome_cmd_data_get_color ("/colors/ls_colors_green_bg", options.ls_colors_palette.green_bg);
- gnome_cmd_data_get_color ("/colors/ls_colors_yellow_fg", options.ls_colors_palette.yellow_fg);
- gnome_cmd_data_get_color ("/colors/ls_colors_yellow_bg", options.ls_colors_palette.yellow_bg);
- gnome_cmd_data_get_color ("/colors/ls_colors_blue_fg", options.ls_colors_palette.blue_fg);
- gnome_cmd_data_get_color ("/colors/ls_colors_blue_bg", options.ls_colors_palette.blue_bg);
- gnome_cmd_data_get_color ("/colors/ls_colors_magenta_fg", options.ls_colors_palette.magenta_fg);
- gnome_cmd_data_get_color ("/colors/ls_colors_magenta_bg", options.ls_colors_palette.magenta_bg);
- gnome_cmd_data_get_color ("/colors/ls_colors_cyan_fg", options.ls_colors_palette.cyan_fg);
- gnome_cmd_data_get_color ("/colors/ls_colors_cyan_bg", options.ls_colors_palette.cyan_bg);
- gnome_cmd_data_get_color ("/colors/ls_colors_white_fg", options.ls_colors_palette.white_fg);
- gnome_cmd_data_get_color ("/colors/ls_colors_white_bg", options.ls_colors_palette.white_bg);
-
- options.save_dirs_on_exit = gnome_cmd_data_get_bool ("/options/save_dirs_on_exit", TRUE);
- 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);
-
- 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);
-
- options.backup_pattern = gnome_cmd_data_get_string ("/defaults/backup_pattern", "*~;*.bak");
+ options.viewer = g_settings_get_string(options.gcmd_settings->programs, GCMD_SETTINGS_VIEWER_CMD);
+ options.editor = g_settings_get_string(options.gcmd_settings->programs, GCMD_SETTINGS_EDITOR_CMD);
+ options.differ = g_settings_get_string(options.gcmd_settings->programs, GCMD_SETTINGS_DIFFER_CMD);
+ options.sendto = g_settings_get_string(options.gcmd_settings->programs, GCMD_SETTINGS_SENDTO_CMD);
+ options.termopen = g_settings_get_string(options.gcmd_settings->programs, GCMD_SETTINGS_TERMINAL_CMD);
+ options.termexec = g_settings_get_string(options.gcmd_settings->programs,
GCMD_SETTINGS_TERMINAL_EXEC_CMD);
+ use_gcmd_block = g_settings_get_boolean(options.gcmd_settings->programs, GCMD_SETTINGS_USE_GCMD_BLOCK);
+
+ gnome_cmd_data_get_color_gnome_config ("/colors/ls_colors_black_fg",
options.ls_colors_palette.black_fg);
+ gnome_cmd_data_get_color_gnome_config ("/colors/ls_colors_black_bg",
options.ls_colors_palette.black_bg);
+ gnome_cmd_data_get_color_gnome_config ("/colors/ls_colors_red_fg", options.ls_colors_palette.red_fg);
+ gnome_cmd_data_get_color_gnome_config ("/colors/ls_colors_red_bg", options.ls_colors_palette.red_bg);
+ gnome_cmd_data_get_color_gnome_config ("/colors/ls_colors_green_fg",
options.ls_colors_palette.green_fg);
+ gnome_cmd_data_get_color_gnome_config ("/colors/ls_colors_green_bg",
options.ls_colors_palette.green_bg);
+ gnome_cmd_data_get_color_gnome_config ("/colors/ls_colors_yellow_fg",
options.ls_colors_palette.yellow_fg);
+ gnome_cmd_data_get_color_gnome_config ("/colors/ls_colors_yellow_bg",
options.ls_colors_palette.yellow_bg);
+ gnome_cmd_data_get_color_gnome_config ("/colors/ls_colors_blue_fg", options.ls_colors_palette.blue_fg);
+ gnome_cmd_data_get_color_gnome_config ("/colors/ls_colors_blue_bg", options.ls_colors_palette.blue_bg);
+ gnome_cmd_data_get_color_gnome_config ("/colors/ls_colors_magenta_fg",
options.ls_colors_palette.magenta_fg);
+ gnome_cmd_data_get_color_gnome_config ("/colors/ls_colors_magenta_bg",
options.ls_colors_palette.magenta_bg);
+ gnome_cmd_data_get_color_gnome_config ("/colors/ls_colors_cyan_fg", options.ls_colors_palette.cyan_fg);
+ gnome_cmd_data_get_color_gnome_config ("/colors/ls_colors_cyan_bg", options.ls_colors_palette.cyan_bg);
+ gnome_cmd_data_get_color_gnome_config ("/colors/ls_colors_white_fg",
options.ls_colors_palette.white_fg);
+ gnome_cmd_data_get_color_gnome_config ("/colors/ls_colors_white_bg",
options.ls_colors_palette.white_bg);
+
+ options.save_dirs_on_exit = g_settings_get_boolean (options.gcmd_settings->general,
GCMD_SETTINGS_SAVE_DIRS_ON_EXIT);
+ options.save_tabs_on_exit = g_settings_get_boolean (options.gcmd_settings->general,
GCMD_SETTINGS_SAVE_TABS_ON_EXIT);
+ options.save_dir_history_on_exit = g_settings_get_boolean (options.gcmd_settings->general,
GCMD_SETTINGS_SAVE_DIR_HISTORY_ON_EXIT);
+
+ options.always_show_tabs = g_settings_get_boolean (options.gcmd_settings->general,
GCMD_SETTINGS_ALWAYS_SHOW_TABS);
+ options.tab_lock_indicator = (TabLockIndicator) g_settings_get_enum (options.gcmd_settings->general,
GCMD_SETTINGS_TAB_LOCK_INDICATOR);
+
+ options.backup_pattern = g_settings_get_string (options.gcmd_settings->filter,
GCMD_SETTINGS_FILTER_BACKUP_PATTERN);
options.backup_pattern_list = patlist_new (options.backup_pattern);
- main_win_state = (GdkWindowState) gnome_cmd_data_get_int ("/options/main_win_state", (gint)
GDK_WINDOW_STATE_MAXIMIZED);
+ main_win_state = (GdkWindowState) g_settings_get_uint (options.gcmd_settings->general,
GCMD_SETTINGS_MAIN_WIN_STATE);
priv->ftp_anonymous_password = gnome_cmd_data_get_string ("/network/ftp_anonymous_password", "you
provider com");
@@@ -3696,106 -1883,116 +3708,107 @@@ void GnomeCmdData::load_more(
void GnomeCmdData::save()
{
- gnome_cmd_data_set_int ("/options/size_disp_mode", options.size_disp_mode);
- gnome_cmd_data_set_int ("/options/perm_disp_mode", options.perm_disp_mode);
- gnome_cmd_data_set_int ("/options/layout", options.layout);
- gnome_cmd_data_set_int ("/options/list_row_height", options.list_row_height);
+ set_gsettings_enum_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_SIZE_DISP_MODE,
options.size_disp_mode);
+ set_gsettings_enum_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_PERM_DISP_MODE,
options.perm_disp_mode);
+ set_gsettings_enum_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_GRAPHICAL_LAYOUT_MODE,
options.layout);
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_LIST_ROW_HEIGHT,
&(options.list_row_height));
gchar *utf8_date_format = g_locale_to_utf8 (options.date_format, -1, NULL, NULL, NULL);
- gnome_cmd_data_set_string ("/options/date_disp_mode", utf8_date_format);
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_DATE_DISP_FORMAT,
utf8_date_format);
g_free (utf8_date_format);
- gnome_cmd_data_set_bool ("/confirm/delete", options.confirm_delete);
- gnome_cmd_data_set_int ("/confirm/delete_default", options.confirm_delete_default);
- gnome_cmd_data_set_int ("/confirm/copy_overwrite", options.confirm_copy_overwrite);
- gnome_cmd_data_set_int ("/confirm/move_overwrite", options.confirm_move_overwrite);
- gnome_cmd_data_set_bool ("/confirm/confirm_mouse_dnd", options.confirm_mouse_dnd);
-
- gnome_cmd_data_set_bool ("/options/show_unknown",
options.filter.file_types[GNOME_VFS_FILE_TYPE_UNKNOWN]);
- gnome_cmd_data_set_bool ("/options/show_regular",
options.filter.file_types[GNOME_VFS_FILE_TYPE_REGULAR]);
- gnome_cmd_data_set_bool ("/options/show_directory",
options.filter.file_types[GNOME_VFS_FILE_TYPE_DIRECTORY]);
- gnome_cmd_data_set_bool ("/options/show_fifo", options.filter.file_types[GNOME_VFS_FILE_TYPE_FIFO]);
- gnome_cmd_data_set_bool ("/options/show_socket",
options.filter.file_types[GNOME_VFS_FILE_TYPE_SOCKET]);
- gnome_cmd_data_set_bool ("/options/show_char_device",
options.filter.file_types[GNOME_VFS_FILE_TYPE_CHARACTER_DEVICE]);
- gnome_cmd_data_set_bool ("/options/show_block_device",
options.filter.file_types[GNOME_VFS_FILE_TYPE_BLOCK_DEVICE]);
- gnome_cmd_data_set_bool ("/options/show_symbolic_link",
options.filter.file_types[GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK]);
-
- gnome_cmd_data_set_bool ("/options/hidden_filter", options.filter.hidden);
- gnome_cmd_data_set_bool ("/options/backup_filter", options.filter.backup);
-
- gnome_cmd_data_set_bool ("/sort/select_dirs", options.select_dirs);
- gnome_cmd_data_set_bool ("/sort/case_sensitive", options.case_sens_sort);
-
- gnome_cmd_data_set_int ("/colors/mode", options.color_mode);
-
- gnome_cmd_data_set_color ("/colors/norm_fg", options.color_themes[GNOME_CMD_COLOR_CUSTOM].norm_fg);
- gnome_cmd_data_set_color ("/colors/norm_bg", options.color_themes[GNOME_CMD_COLOR_CUSTOM].norm_bg);
- gnome_cmd_data_set_color ("/colors/alt_fg", options.color_themes[GNOME_CMD_COLOR_CUSTOM].alt_fg);
- gnome_cmd_data_set_color ("/colors/alt_bg", options.color_themes[GNOME_CMD_COLOR_CUSTOM].alt_bg);
- gnome_cmd_data_set_color ("/colors/sel_fg", options.color_themes[GNOME_CMD_COLOR_CUSTOM].sel_fg);
- gnome_cmd_data_set_color ("/colors/sel_bg", options.color_themes[GNOME_CMD_COLOR_CUSTOM].sel_bg);
- gnome_cmd_data_set_color ("/colors/curs_fg", options.color_themes[GNOME_CMD_COLOR_CUSTOM].curs_fg);
- gnome_cmd_data_set_color ("/colors/curs_bg", options.color_themes[GNOME_CMD_COLOR_CUSTOM].curs_bg);
-
- gnome_cmd_data_set_bool ("/colors/use_ls_colors", options.use_ls_colors);
-
- gnome_cmd_data_set_color ("/colors/ls_colors_black_fg", options.ls_colors_palette.black_fg);
- gnome_cmd_data_set_color ("/colors/ls_colors_black_bg", options.ls_colors_palette.black_bg);
- gnome_cmd_data_set_color ("/colors/ls_colors_red_fg", options.ls_colors_palette.red_fg);
- gnome_cmd_data_set_color ("/colors/ls_colors_red_bg", options.ls_colors_palette.red_bg);
- gnome_cmd_data_set_color ("/colors/ls_colors_green_fg", options.ls_colors_palette.green_fg);
- gnome_cmd_data_set_color ("/colors/ls_colors_green_bg", options.ls_colors_palette.green_bg);
- gnome_cmd_data_set_color ("/colors/ls_colors_yellow_fg", options.ls_colors_palette.yellow_fg);
- gnome_cmd_data_set_color ("/colors/ls_colors_yellow_bg", options.ls_colors_palette.yellow_bg);
- gnome_cmd_data_set_color ("/colors/ls_colors_blue_fg", options.ls_colors_palette.blue_fg);
- gnome_cmd_data_set_color ("/colors/ls_colors_blue_bg", options.ls_colors_palette.blue_bg);
- gnome_cmd_data_set_color ("/colors/ls_colors_magenta_fg", options.ls_colors_palette.magenta_fg);
- gnome_cmd_data_set_color ("/colors/ls_colors_magenta_bg", options.ls_colors_palette.magenta_bg);
- gnome_cmd_data_set_color ("/colors/ls_colors_cyan_fg", options.ls_colors_palette.cyan_fg);
- gnome_cmd_data_set_color ("/colors/ls_colors_cyan_bg", options.ls_colors_palette.cyan_bg);
- gnome_cmd_data_set_color ("/colors/ls_colors_white_fg", options.ls_colors_palette.white_fg);
- gnome_cmd_data_set_color ("/colors/ls_colors_white_bg", options.ls_colors_palette.white_bg);
-
- gnome_cmd_data_set_string ("/options/list_font", options.list_font);
-
- gnome_cmd_data_set_int ("/options/ext_disp_mode", options.ext_disp_mode);
- gnome_cmd_data_set_int ("/options/left_mouse_button_mode", options.left_mouse_button_mode);
- gnome_cmd_data_set_bool ("/options/left_mouse_button_unselects", options.left_mouse_button_unselects);
- gnome_cmd_data_set_int ("/options/middle_mouse_button_mode", options.middle_mouse_button_mode);
- gnome_cmd_data_set_int ("/options/right_mouse_button_mode", options.right_mouse_button_mode);
- gnome_cmd_data_set_int ("/options/icon_size", options.icon_size);
- gnome_cmd_data_set_int ("/options/dev_icon_size", dev_icon_size);
- gnome_cmd_data_set_int ("/options/icon_scale_quality", options.icon_scale_quality);
- gnome_cmd_data_set_string ("/options/theme_icon_dir", options.theme_icon_dir);
- gnome_cmd_data_set_string ("/options/document_icon_dir", options.document_icon_dir);
- gnome_cmd_data_set_int ("/options/cmdline_history_length", cmdline_history_length);
- gnome_cmd_data_set_int ("/options/btn_relief", button_relief);
- 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", options.honor_expect_uris);
- gnome_cmd_data_set_bool ("/programs/allow_multiple_instances", options.allow_multiple_instances);
- gnome_cmd_data_set_bool ("/programs/use_internal_viewer", options.use_internal_viewer);
- gnome_cmd_data_set_bool ("/programs/alt_quick_search", options.alt_quick_search);
- gnome_cmd_data_set_bool ("/programs/quick_search_exact_match_begin",
options.quick_search_exact_match_begin);
- gnome_cmd_data_set_bool ("/programs/quick_search_exact_match_end",
options.quick_search_exact_match_end);
- gnome_cmd_data_set_bool ("/programs/skip_mounting", options.skip_mounting);
-
- gnome_cmd_data_set_bool ("/programs/toolbar_visibility", toolbar_visibility);
- gnome_cmd_data_set_bool ("/options/conbuttons_visibility", conbuttons_visibility);
- 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);
+ set_gsettings_when_changed (options.gcmd_settings->confirm, GCMD_SETTINGS_CONFIRM_DELETE,
&(options.confirm_delete));
+ set_gsettings_enum_when_changed (options.gcmd_settings->confirm, GCMD_SETTINGS_CONFIRM_DELETE_DEFAULT,
options.confirm_delete_default);
+ set_gsettings_enum_when_changed (options.gcmd_settings->confirm, GCMD_SETTINGS_CONFIRM_COPY_OVERWRITE,
options.confirm_copy_overwrite);
+ set_gsettings_enum_when_changed (options.gcmd_settings->confirm, GCMD_SETTINGS_CONFIRM_MOVE_OVERWRITE,
options.confirm_move_overwrite);
+ set_gsettings_when_changed (options.gcmd_settings->confirm,
GCMD_SETTINGS_CONFIRM_MOUSE_DRAG_AND_DROP, &(options.confirm_mouse_dnd));
+
+ set_gsettings_when_changed (options.gcmd_settings->filter, GCMD_SETTINGS_FILTER_HIDE_UNKNOWN,
&(options.filter.file_types[GNOME_VFS_FILE_TYPE_UNKNOWN]));
+ set_gsettings_when_changed (options.gcmd_settings->filter, GCMD_SETTINGS_FILTER_HIDE_REGULAR,
&(options.filter.file_types[GNOME_VFS_FILE_TYPE_REGULAR]));
+ set_gsettings_when_changed (options.gcmd_settings->filter, GCMD_SETTINGS_FILTER_HIDE_DIRECTORY,
&(options.filter.file_types[GNOME_VFS_FILE_TYPE_DIRECTORY]));
+ set_gsettings_when_changed (options.gcmd_settings->filter, GCMD_SETTINGS_FILTER_HIDE_FIFO,
&(options.filter.file_types[GNOME_VFS_FILE_TYPE_FIFO]));
+ set_gsettings_when_changed (options.gcmd_settings->filter, GCMD_SETTINGS_FILTER_HIDE_SOCKET,
&(options.filter.file_types[GNOME_VFS_FILE_TYPE_SOCKET]));
+ set_gsettings_when_changed (options.gcmd_settings->filter,
GCMD_SETTINGS_FILTER_HIDE_CHARACTER_DEVICE,
&(options.filter.file_types[GNOME_VFS_FILE_TYPE_CHARACTER_DEVICE]));
+ set_gsettings_when_changed (options.gcmd_settings->filter, GCMD_SETTINGS_FILTER_HIDE_BLOCK_DEVICE,
&(options.filter.file_types[GNOME_VFS_FILE_TYPE_BLOCK_DEVICE]));
+ set_gsettings_when_changed (options.gcmd_settings->filter,
GCMD_SETTINGS_FILTER_HIDE_SYMBOLIC_LINK, &(options.filter.file_types[GNOME_VFS_FILE_TYPE_SYMBOLIC_LINK]));
+ set_gsettings_when_changed (options.gcmd_settings->filter, GCMD_SETTINGS_FILTER_DOTFILE,
&(options.filter.hidden));
+ set_gsettings_when_changed (options.gcmd_settings->filter, GCMD_SETTINGS_FILTER_BACKUP,
&(options.filter.backup));
+
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_SELECT_DIRS,
&(options.select_dirs));
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_CASE_SENSITIVE,
&(options.case_sens_sort));
+
+ set_gsettings_enum_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_COLORS_THEME,
options.color_mode);
+
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_COLORS_NORM_FG,
options.color_themes[GNOME_CMD_COLOR_CUSTOM].norm_fg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_COLORS_NORM_BG,
options.color_themes[GNOME_CMD_COLOR_CUSTOM].norm_bg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_COLORS_ALT_FG,
options.color_themes[GNOME_CMD_COLOR_CUSTOM].alt_fg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_COLORS_ALT_BG,
options.color_themes[GNOME_CMD_COLOR_CUSTOM].alt_bg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_COLORS_SEL_FG,
options.color_themes[GNOME_CMD_COLOR_CUSTOM].sel_fg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_COLORS_SEL_BG,
options.color_themes[GNOME_CMD_COLOR_CUSTOM].sel_bg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_COLORS_CURS_FG,
options.color_themes[GNOME_CMD_COLOR_CUSTOM].curs_fg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_COLORS_CURS_BG,
options.color_themes[GNOME_CMD_COLOR_CUSTOM].curs_bg);
+
+ set_gsettings_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_COLORS_USE_LS_COLORS,
&(options.use_ls_colors));
+
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_LS_COLORS_BLACK_FG,
options.ls_colors_palette.black_fg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_LS_COLORS_BLACK_BG,
options.ls_colors_palette.black_bg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_LS_COLORS_RED_FG,
options.ls_colors_palette.red_fg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_LS_COLORS_RED_BG,
options.ls_colors_palette.red_bg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_LS_COLORS_GREEN_FG,
options.ls_colors_palette.green_fg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_LS_COLORS_GREEN_BG,
options.ls_colors_palette.green_bg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_LS_COLORS_YELLOW_FG,
options.ls_colors_palette.yellow_fg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_LS_COLORS_YELLOW_BG,
options.ls_colors_palette.yellow_bg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_LS_COLORS_BLUE_FG,
options.ls_colors_palette.blue_fg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_LS_COLORS_BLUE_BG,
options.ls_colors_palette.blue_bg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_LS_COLORS_MAGENTA_FG,
options.ls_colors_palette.magenta_fg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_LS_COLORS_MAGENTA_BG,
options.ls_colors_palette.magenta_bg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_LS_COLORS_CYAN_FG,
options.ls_colors_palette.cyan_fg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_LS_COLORS_CYAN_BG,
options.ls_colors_palette.cyan_bg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_LS_COLORS_WHITE_FG,
options.ls_colors_palette.white_fg);
+ set_gsettings_color_when_changed (options.gcmd_settings->colors, GCMD_SETTINGS_LS_COLORS_WHITE_BG,
options.ls_colors_palette.white_bg);
+
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_LIST_FONT,
options.list_font);
+
+ set_gsettings_enum_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_EXT_DISP_MODE,
options.ext_disp_mode);
+ set_gsettings_enum_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_CLICKS_TO_OPEN_ITEM,
options.left_mouse_button_mode);
+ set_gsettings_when_changed (options.gcmd_settings->general,
GCMD_SETTINGS_LEFT_MOUSE_BUTTON_UNSELECTS, &(options.left_mouse_button_unselects));
+ set_gsettings_enum_when_changed (options.gcmd_settings->general,
GCMD_SETTINGS_MIDDLE_MOUSE_BUTTON_MODE, options.middle_mouse_button_mode);
+ set_gsettings_enum_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_RIGHT_MOUSE_BUTTON_MODE,
options.right_mouse_button_mode);
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_ICON_SIZE,
&(options.icon_size));
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_DEV_ICON_SIZE,
&(dev_icon_size));
+ set_gsettings_enum_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_ICON_SCALE_QUALITY,
options.icon_scale_quality);
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_MIME_ICON_DIR,
options.theme_icon_dir);
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_CMDLINE_HISTORY_LENGTH,
&(cmdline_history_length));
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_HORIZONTAL_ORIENTATION,
&(horizontal_orientation));
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_GUI_UPDATE_RATE,
&(gui_update_rate));
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_MULTIPLE_INSTANCES,
&(options.allow_multiple_instances));
+ set_gsettings_enum_when_changed (options.gcmd_settings->keybindings,
GCMD_SETTINGS_QUICK_SEARCH_SHORTCUT, options.quick_search);
+
+ set_gsettings_when_changed (options.gcmd_settings->programs, GCMD_SETTINGS_DONT_DOWNLOAD,
&(options.honor_expect_uris));
+ set_gsettings_when_changed (options.gcmd_settings->programs, GCMD_SETTINGS_USE_INTERNAL_VIEWER,
&(options.use_internal_viewer));
+ set_gsettings_when_changed (options.gcmd_settings->general,
GCMD_SETTINGS_QUICK_SEARCH_EXACT_MATCH_BEGIN, &(options.quick_search_exact_match_begin));
+ set_gsettings_when_changed (options.gcmd_settings->general,
GCMD_SETTINGS_QUICK_SEARCH_EXACT_MATCH_END, &(options.quick_search_exact_match_end));
+
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_DEV_SKIP_MOUNTING,
&(options.skip_mounting));
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_DEV_ONLY_ICON,
&(options.device_only_icon));
+
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_SHOW_TOOLBAR,
&(show_toolbar));
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_SHOW_DEVBUTTONS,
&(show_devbuttons));
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_SHOW_DEVLIST,
&(show_devlist));
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_SHOW_CMDLINE,
&(cmdline_visibility));
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_SHOW_BUTTONBAR,
&(buttonbar_visibility));
+ gnome_cmd_data_set_bool ("/programs/mainmenu_visibility", mainmenu_visibility);
- if (priv->symlink_prefix && *priv->symlink_prefix && strcmp(priv->symlink_prefix, _("link to %s"))!=0)
- gnome_cmd_data_set_string ("/options/symlink_prefix", priv->symlink_prefix);
- else
- gnome_cmd_data_set_string ("/options/symlink_prefix", "");
-
- gnome_cmd_data_set_int ("/options/main_win_pos_x", priv->main_win_pos[0]);
- gnome_cmd_data_set_int ("/options/main_win_pos_y", priv->main_win_pos[1]);
-
- gnome_cmd_data_set_string ("/programs/viewer", options.viewer);
- gnome_cmd_data_set_string ("/programs/editor", options.editor);
- gnome_cmd_data_set_string ("/programs/differ", options.differ);
- gnome_cmd_data_set_string ("/programs/sendto", options.sendto);
- gnome_cmd_data_set_string ("/programs/terminal_open", options.termopen);
- gnome_cmd_data_set_string ("/programs/terminal_exec", options.termexec);
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_MAIN_WIN_POS_X,
&(options.main_win_pos[0]));
+ set_gsettings_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_MAIN_WIN_POS_Y,
&(options.main_win_pos[1]));
- gnome_cmd_data_set_bool ("/programs/use_gcmd_block", use_gcmd_block);
-
- gnome_cmd_data_set_bool ("/devices/only_icon", options.device_only_icon);
+ set_gsettings_when_changed (options.gcmd_settings->programs, GCMD_SETTINGS_VIEWER_CMD,
options.viewer);
+ set_gsettings_when_changed (options.gcmd_settings->programs, GCMD_SETTINGS_EDITOR_CMD,
options.editor);
+ set_gsettings_when_changed (options.gcmd_settings->programs, GCMD_SETTINGS_DIFFER_CMD,
options.differ);
+ set_gsettings_when_changed (options.gcmd_settings->programs, GCMD_SETTINGS_SENDTO_CMD,
options.sendto);
+ set_gsettings_when_changed (options.gcmd_settings->programs, GCMD_SETTINGS_TERMINAL_CMD,
options.termopen);
+ set_gsettings_when_changed (options.gcmd_settings->programs, GCMD_SETTINGS_TERMINAL_EXEC_CMD,
options.termexec);
+ set_gsettings_when_changed (options.gcmd_settings->programs, GCMD_SETTINGS_USE_GCMD_BLOCK,
&(use_gcmd_block));
const gchar *quick_connect_uri = gnome_cmd_con_get_uri (GNOME_CMD_CON (quick_connect));
diff --cc src/gnome-cmd-data.h
index c6f07b7,5c4e5e5..f7394f3
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@@ -571,13 -440,14 +571,14 @@@ struct GnomeCmdDat
IntViewerConfig intviewer_defaults;
BookmarksConfig bookmarks_defaults;
- gboolean list_orientation;
+ gboolean horizontal_orientation;
- gboolean toolbar_visibility;
- gboolean conbuttons_visibility;
- gboolean concombo_visibility;
+ gboolean show_toolbar;
+ gboolean show_devbuttons;
+ gboolean show_devlist;
gboolean cmdline_visibility;
gboolean buttonbar_visibility;
+ gboolean mainmenu_visibility;
guint dev_icon_size;
guint fs_col_width[GnomeCmdFileList::NUM_COLUMNS];
diff --cc src/gnome-cmd-main-win.h
index e79debc,bf2c93e..4094908
--- a/src/gnome-cmd-main-win.h
+++ b/src/gnome-cmd-main-win.h
@@@ -89,13 -89,13 +89,14 @@@ struct GnomeCmdMainWi
void focus_file_lists();
void refocus();
+ void update_view();
void update_style();
void update_bookmarks();
- void update_toolbar_visibility();
+ void update_show_toolbar();
void update_cmdline_visibility();
void update_buttonbar_visibility();
- void update_list_orientation();
+ void update_horizontal_orientation();
+ void update_mainmenu_visibility();
void add_plugin_menu(PluginData *data);
diff --cc src/gnome-cmd-user-actions.h
index 5293f13,51251b0..afd11cc
--- a/src/gnome-cmd-user-actions.h
+++ b/src/gnome-cmd-user-actions.h
@@@ -316,7 -309,7 +314,8 @@@ GNOME_CMD_USER_ACTION(view_next_tab)
GNOME_CMD_USER_ACTION(view_in_new_tab);
GNOME_CMD_USER_ACTION(view_in_inactive_tab);
GNOME_CMD_USER_ACTION(view_toggle_tab_lock);
+GNOME_CMD_USER_ACTION(view_horizontal_orientation);
+ GNOME_CMD_USER_ACTION(view_main_menu);
/************** Bookmarks Menu **************/
GNOME_CMD_USER_ACTION(bookmarks_add_current);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
