[Xfce4-commits] [apps/xfce4-terminal] 01/01: Remove emulation setting as it's not supported by vte
noreply at xfce.org
noreply at xfce.org
Mon Jul 18 15:35:16 CEST 2016
This is an automated email from the git hooks/post-receive script.
f2404 pushed a commit to branch master
in repository apps/xfce4-terminal.
commit fa9d95c99d3c73c80fc42fbc23b73a5a8d5bae79
Author: Igor <f2404 at yandex.ru>
Date: Mon Jul 18 16:35:09 2016 +0300
Remove emulation setting as it's not supported by vte
---
terminal/terminal-preferences-dialog.c | 3 +--
terminal/terminal-preferences.c | 11 ---------
terminal/terminal-preferences.glade | 42 ++++------------------------------
terminal/terminal-screen.c | 25 --------------------
terminal/terminal-window.c | 2 --
5 files changed, 6 insertions(+), 77 deletions(-)
diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
index d655a67..a7b3b9c 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -227,7 +227,6 @@ error:
/* other properties */
BIND_PROPERTIES ("font-name", "font-name");
BIND_PROPERTIES ("title-initial", "text");
- BIND_PROPERTIES ("emulation", "text");
BIND_PROPERTIES ("word-chars", "text");
BIND_PROPERTIES ("scrolling-lines", "value");
BIND_PROPERTIES ("tab-activity-timeout", "value");
@@ -778,7 +777,7 @@ terminal_preferences_dialog_reset_compat (GtkWidget *button,
{
GParamSpec *spec;
GValue value = { 0, };
- const gchar *properties[] = { "binding-backspace", "binding-delete", "emulation" };
+ const gchar *properties[] = { "binding-backspace", "binding-delete" };
guint i;
for (i = 0; i < G_N_ELEMENTS (properties); i++)
diff --git a/terminal/terminal-preferences.c b/terminal/terminal-preferences.c
index 8b671ec..dd8fc2f 100644
--- a/terminal/terminal-preferences.c
+++ b/terminal/terminal-preferences.c
@@ -100,7 +100,6 @@ enum
PROP_SHORTCUTS_NO_MNEMONICS,
PROP_TITLE_INITIAL,
PROP_TITLE_MODE,
- PROP_EMULATION,
PROP_WORD_CHARS,
PROP_TAB_ACTIVITY_COLOR,
PROP_TAB_ACTIVITY_TIMEOUT,
@@ -902,16 +901,6 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
G_PARAM_READWRITE| G_PARAM_STATIC_STRINGS);
/**
- * TerminalPreferences:emulation:
- **/
- preferences_props[PROP_EMULATION] =
- g_param_spec_string ("emulation",
- NULL,
- "Emulation",
- "xterm",
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-
- /**
* TerminalPreferences:word-chars:
**/
preferences_props[PROP_WORD_CHARS] =
diff --git a/terminal/terminal-preferences.glade b/terminal/terminal-preferences.glade
index 745bb62..0ee5001 100644
--- a/terminal/terminal-preferences.glade
+++ b/terminal/terminal-preferences.glade
@@ -2588,7 +2588,7 @@ different terminal behavior.</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -2605,7 +2605,7 @@ different terminal behavior.</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -2618,7 +2618,7 @@ different terminal behavior.</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
@@ -2635,33 +2635,7 @@ different terminal behavior.</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label33">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Emulation s_etting:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="emulation">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
@@ -2674,16 +2648,10 @@ different terminal behavior.</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="top_attach">2</property>
<property name="width">2</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 9671012..3d620a5 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -111,7 +111,6 @@ static void terminal_screen_update_encoding (TerminalScreen
static void terminal_screen_update_colors (TerminalScreen *screen);
static void terminal_screen_update_font (TerminalScreen *screen);
static void terminal_screen_update_misc_bell (TerminalScreen *screen);
-static void terminal_screen_update_emulation (TerminalScreen *screen);
static void terminal_screen_update_misc_cursor_blinks (TerminalScreen *screen);
static void terminal_screen_update_misc_cursor_shape (TerminalScreen *screen);
static void terminal_screen_update_misc_mouse_autohide (TerminalScreen *screen);
@@ -288,7 +287,6 @@ terminal_screen_init (TerminalScreen *screen)
terminal_screen_update_encoding (screen);
terminal_screen_update_font (screen);
terminal_screen_update_misc_bell (screen);
- terminal_screen_update_emulation (screen);
terminal_screen_update_misc_cursor_blinks (screen);
terminal_screen_update_misc_cursor_shape (screen);
terminal_screen_update_misc_mouse_autohide (screen);
@@ -481,8 +479,6 @@ terminal_screen_preferences_changed (TerminalPreferences *preferences,
terminal_screen_update_font (screen);
else if (strcmp ("misc-bell", name) == 0)
terminal_screen_update_misc_bell (screen);
- else if (strcmp ("emulation", name) == 0)
- terminal_screen_update_emulation (screen);
else if (strcmp ("misc-cursor-blinks", name) == 0)
terminal_screen_update_misc_cursor_blinks (screen);
else if (strcmp ("misc-cursor-shape", name) == 0)
@@ -937,9 +933,6 @@ terminal_screen_update_colors (TerminalScreen *screen)
"The default palette has been applied.");
}
- // TODO: removed functionality? remove if sure
- //vte_terminal_set_background_tint_color (VTE_TERMINAL (screen->terminal), has_bg ? &bg : NULL);
-
/* cursor color */
has_cursor = terminal_preferences_get_color (screen->preferences, "color-cursor", &cursor);
vte_terminal_set_color_cursor (VTE_TERMINAL (screen->terminal), has_cursor ? &cursor : NULL);
@@ -1013,19 +1006,6 @@ terminal_screen_update_misc_bell (TerminalScreen *screen)
static void
-terminal_screen_update_emulation (TerminalScreen *screen)
-{
- // FIXME: Commented out because I have no idea what happened to this function in VTE
-/* gchar *emulation;
- g_object_get (G_OBJECT (screen->preferences), "emulation", &emulation, NULL);
- if (g_strcmp0 (emulation, vte_terminal_get_emulation (VTE_TERMINAL (screen->terminal))) != 0)
- vte_terminal_set_emulation (VTE_TERMINAL (screen->terminal), emulation);
- g_free (emulation);*/
-}
-
-
-
-static void
terminal_screen_update_misc_cursor_blinks (TerminalScreen *screen)
{
gboolean bval;
@@ -1424,11 +1404,6 @@ terminal_screen_timer_background (gpointer user_data)
else
background_darkness = 1.0;
- //vte_terminal_set_background_saturation (VTE_TERMINAL (screen->terminal), saturation);
- //vte_terminal_set_opacity (VTE_TERMINAL (screen->terminal), opacity);
- //vte_terminal_set_background_transparent (VTE_TERMINAL (screen->terminal),
- // background_mode == TERMINAL_BACKGROUND_TRANSPARENT
- // && !gtk_widget_is_composited (GTK_WIDGET (screen)));
screen->background_color.alpha = background_darkness;
vte_terminal_set_color_background (VTE_TERMINAL (screen->terminal), &screen->background_color);
diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index ffbf03a..7254a99 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -1863,8 +1863,6 @@ terminal_window_add (TerminalWindow *window,
label = terminal_screen_get_tab_label (screen);
page = gtk_notebook_append_page (GTK_NOTEBOOK (window->notebook), GTK_WIDGET (screen), label);
- // TODO: should not be used anymore according to Gtk docs, remove if sure
- //gtk_notebook_set_tab_label_packing (GTK_NOTEBOOK (window->notebook), GTK_WIDGET (screen), TRUE, TRUE, GTK_PACK_START);
gtk_container_child_set (GTK_CONTAINER (window->notebook), GTK_WIDGET (screen), "tab-expand", TRUE, NULL);
gtk_container_child_set (GTK_CONTAINER (window->notebook), GTK_WIDGET (screen), "tab-fill", TRUE, NULL);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list