[geany/geany] 5002f9: Merge pull request #651 from b4n/vte-in-various-prefs
Colomban Wendling
git-noreply at xxxxx
Fri Aug 19 23:48:43 UTC 2016
Branch: refs/heads/master
Author: Colomban Wendling <ban at herbesfolles.org>
Committer: Colomban Wendling <ban at herbesfolles.org>
Date: Fri, 19 Aug 2016 23:48:43 UTC
Commit: 5002f92dc6418849e7f88ab9ae809f64721ff6b0
https://github.com/geany/geany/commit/5002f92dc6418849e7f88ab9ae809f64721ff6b0
Log Message:
-----------
Merge pull request #651 from b4n/vte-in-various-prefs
Show some hidden VTE preferences in the Various preferences page
Modified Paths:
--------------
src/keyfile.c
src/libmain.c
Modified: src/keyfile.c
39 lines changed, 21 insertions(+), 18 deletions(-)
===================================================================
@@ -524,11 +524,6 @@ static void save_dialog_prefs(GKeyFile *config)
if (!g_key_file_has_key(config, "VTE", "emulation", NULL)) /* hidden */
g_key_file_set_string(config, "VTE", "emulation", vc->emulation);
- if (!g_key_file_has_key(config, "VTE", "send_selection_unsafe", NULL)) /* hidden */
- g_key_file_set_boolean(config, "VTE", "send_selection_unsafe",
- vc->send_selection_unsafe);
- if (!g_key_file_has_key(config, "VTE", "send_cmd_prefix", NULL)) /* hidden */
- g_key_file_set_string(config, "VTE", "send_cmd_prefix", vc->send_cmd_prefix);
g_key_file_set_string(config, "VTE", "font", vc->font);
g_key_file_set_boolean(config, "VTE", "scroll_on_key", vc->scroll_on_key);
g_key_file_set_boolean(config, "VTE", "scroll_on_out", vc->scroll_on_out);
@@ -754,9 +749,6 @@ static void load_dialog_prefs(GKeyFile *config)
g_key_file_set_boolean(config, "search", "pref_search_hide_find_dialog", suppress_search_dialogs);
}
- /* read stash prefs */
- settings_action(config, SETTING_READ);
-
/* general */
prefs.confirm_exit = utils_get_setting_boolean(config, PACKAGE, "pref_main_confirm_exit", FALSE);
prefs.suppress_status_messages = utils_get_setting_boolean(config, PACKAGE, "pref_main_suppress_status_messages", FALSE);
@@ -865,8 +857,9 @@ static void load_dialog_prefs(GKeyFile *config)
/* VTE */
#ifdef HAVE_VTE
vte_info.load_vte = utils_get_setting_boolean(config, "VTE", "load_vte", TRUE);
- if (vte_info.load_vte)
+ if (vte_info.load_vte && vte_info.have_vte /* not disabled on the cmdline */)
{
+ StashGroup *group;
struct passwd *pw = getpwuid(getuid());
const gchar *shell = (pw != NULL) ? pw->pw_shell : "/bin/sh";
@@ -887,8 +880,6 @@ static void load_dialog_prefs(GKeyFile *config)
vte_info.dir = g_strdup("/");
vc->emulation = utils_get_setting_string(config, "VTE", "emulation", "xterm");
- vc->send_selection_unsafe = utils_get_setting_boolean(config, "VTE",
- "send_selection_unsafe", FALSE);
vc->image = utils_get_setting_string(config, "VTE", "image", "");
vc->shell = utils_get_setting_string(config, "VTE", "shell", shell);
vc->font = utils_get_setting_string(config, "VTE", "font", GEANY_DEFAULT_FONT_EDITOR);
@@ -897,13 +888,21 @@ static void load_dialog_prefs(GKeyFile *config)
vc->enable_bash_keys = utils_get_setting_boolean(config, "VTE", "enable_bash_keys", TRUE);
vc->ignore_menu_bar_accel = utils_get_setting_boolean(config, "VTE", "ignore_menu_bar_accel", FALSE);
vc->follow_path = utils_get_setting_boolean(config, "VTE", "follow_path", FALSE);
- vc->send_cmd_prefix = utils_get_setting_string(config, "VTE", "send_cmd_prefix", "");
vc->run_in_vte = utils_get_setting_boolean(config, "VTE", "run_in_vte", FALSE);
vc->skip_run_script = utils_get_setting_boolean(config, "VTE", "skip_run_script", FALSE);
vc->cursor_blinks = utils_get_setting_boolean(config, "VTE", "cursor_blinks", FALSE);
vc->scrollback_lines = utils_get_setting_integer(config, "VTE", "scrollback_lines", 500);
get_setting_color(config, "VTE", "colour_fore", &vc->colour_fore, "#ffffff");
get_setting_color(config, "VTE", "colour_back", &vc->colour_back, "#000000");
+
+ /* various VTE prefs.
+ * this can't be done in init_pref_groups() because we need to know the value of
+ * vte_info.load_vte, and `vc` to be initialized */
+ group = stash_group_new("VTE");
+ configuration_add_various_pref_group(group);
+
+ stash_group_add_string(group, &vc->send_cmd_prefix, "send_cmd_prefix", "");
+ stash_group_add_boolean(group, &vc->send_selection_unsafe, "send_selection_unsafe", FALSE);
}
#endif
/* templates */
@@ -949,12 +948,6 @@ static void load_dialog_prefs(GKeyFile *config)
tool_prefs.context_action_cmd = utils_get_setting_string(config, PACKAGE, "context_action_cmd", "");
- /* build menu */
- build_set_group_count(GEANY_GBG_FT, build_menu_prefs.number_ft_menu_items);
- build_set_group_count(GEANY_GBG_NON_FT, build_menu_prefs.number_non_ft_menu_items);
- build_set_group_count(GEANY_GBG_EXEC, build_menu_prefs.number_exec_menu_items);
- build_load_menu(config, GEANY_BCS_PREF, NULL);
-
/* printing */
tmp_string2 = g_find_program_in_path(GEANY_DEFAULT_TOOLS_PRINTCMD);
@@ -981,6 +974,16 @@ static void load_dialog_prefs(GKeyFile *config)
printing_prefs.print_page_header = utils_get_setting_boolean(config, "printing", "print_page_header", TRUE);
printing_prefs.page_header_basename = utils_get_setting_boolean(config, "printing", "page_header_basename", FALSE);
printing_prefs.page_header_datefmt = utils_get_setting_string(config, "printing", "page_header_datefmt", "%c");
+
+ /* read stash prefs */
+ settings_action(config, SETTING_READ);
+
+ /* build menu
+ * after stash prefs as it uses some of them */
+ build_set_group_count(GEANY_GBG_FT, build_menu_prefs.number_ft_menu_items);
+ build_set_group_count(GEANY_GBG_NON_FT, build_menu_prefs.number_non_ft_menu_items);
+ build_set_group_count(GEANY_GBG_EXEC, build_menu_prefs.number_exec_menu_items);
+ build_load_menu(config, GEANY_BCS_PREF, NULL);
}
Modified: src/libmain.c
5 lines changed, 5 insertions(+), 0 deletions(-)
===================================================================
@@ -876,6 +876,11 @@ static void load_session_project_file(void)
static void load_settings(void)
{
+#ifdef HAVE_VTE
+ /* initially assume we'll have VTE unless it's disabled by cmdline, to allow configuration
+ * loading to be notified about disabled VTE on the cmdline */
+ vte_info.have_vte = !no_vte;
+#endif
configuration_load();
/* let cmdline options overwrite configuration settings */
#ifdef HAVE_VTE
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
More information about the Commits
mailing list