Make VTE emulation pref hidden, because libvte only comes with an

xterm termcaps file and the GUI pref can be confusing.



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3300 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

+2008-12-01  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/keyfile.c, src/vte.c, doc/geany.txt, doc/geany.html:
+   Make VTE emulation pref hidden, because libvte only comes with an
+   xterm termcaps file and the GUI pref can be confusing.
+
+
 2008-11-29  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/treeviews.c:

doc/geany.txt

@@ -3431,6 +3431,10 @@ complete_snippets_whilst_editing  Whether to allow completion of snippets      f
 show_symbol_list_expanders        Whether to show or hide the small expander   true
                                   icons on the symbol list treeview (only
                                   available with GTK 2.12 or above).
+**[VTE]**
+emulation                         Terminal emulation mode. Only change this    xterm
+                                  if you have VTE termcap files other than
+                                  ``vte/termcap/xterm``.
 ================================  ===========================================  ==================
 
 

src/keyfile.c

@@ -400,7 +400,8 @@ static void save_dialog_prefs(GKeyFile *config)
 	{
 		gchar *tmp_string;
 
-		g_key_file_set_string(config, "VTE", "emulation", vc->emulation);
+		if (!g_key_file_has_key(config, "VTE", "emulation", NULL))	/* hidden */
+			g_key_file_set_string(config, "VTE", "emulation", vc->emulation);
 		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);

src/vte.c

@@ -676,7 +676,7 @@ void vte_append_preferences_tab(void)
 	if (vte_info.have_vte)
 	{
 		GtkWidget *notebook, *vbox, *label, *alignment, *table, *frame, *box;
-		GtkWidget *font_term, *color_fore, *color_back, *spin_scrollback, *entry_emulation;
+		GtkWidget *font_term, *color_fore, *color_back, *spin_scrollback;
 		GtkWidget *check_scroll_key, *check_scroll_out, *check_follow_path;
 		GtkWidget *check_enable_bash_keys, *check_ignore_menu_key;
 		GtkWidget *check_run_in_vte, *check_skip_script, *entry_shell, *button_shell, *image_shell;
@@ -756,18 +756,6 @@ void vte_append_preferences_tab(void)
 		gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(spin_scrollback), TRUE);
 		gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(spin_scrollback), TRUE);
 
-		label = gtk_label_new(_("Terminal emulation:"));
-		gtk_table_attach(GTK_TABLE(table), label, 0, 1, 4, 5,
-					(GtkAttachOptions) (GTK_FILL),
-					(GtkAttachOptions) (0), 0, 0);
-		gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-
-		entry_emulation = gtk_entry_new();
-		gtk_table_attach(GTK_TABLE(table), entry_emulation, 1, 2, 4, 5,
-					(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-					(GtkAttachOptions) (0), 0, 0);
-		ui_widget_set_tooltip_text(entry_emulation, _("Controls how the terminal emulator should behave. Do not change this value unless you know exactly what you are doing."));
-
 		label = gtk_label_new(_("Shell:"));
 		gtk_table_attach(GTK_TABLE(table), label, 0, 1, 5, 6,
 					(GtkAttachOptions) (GTK_FILL),
@@ -838,8 +826,6 @@ void vte_append_preferences_tab(void)
 				g_object_ref(color_back),	(GDestroyNotify) g_object_unref);
 		g_object_set_data_full(G_OBJECT(ui_widgets.prefs_dialog), "spin_scrollback",
 				g_object_ref(spin_scrollback),	(GDestroyNotify) g_object_unref);
-		g_object_set_data_full(G_OBJECT(ui_widgets.prefs_dialog), "entry_emulation",
-				g_object_ref(entry_emulation),	(GDestroyNotify) g_object_unref);
 		g_object_set_data_full(G_OBJECT(ui_widgets.prefs_dialog), "entry_shell",
 				g_object_ref(entry_shell),	(GDestroyNotify) g_object_unref);
 		g_object_set_data_full(G_OBJECT(ui_widgets.prefs_dialog), "check_scroll_key",