[Xfce4-commits] [apps/xfce4-terminal] 01/01: Fix internal properties names (debug code)
noreply at xfce.org
noreply at xfce.org
Tue Jul 18 22:21:08 CEST 2017
This is an automated email from the git hooks/post-receive script.
f 2 4 0 4 p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/xfce4-terminal.
commit 8fc7dde69a19494fdffc64aba55cfbf8572fc511
Author: Igor <f2404 at yandex.ru>
Date: Tue Jul 18 16:21:02 2017 -0400
Fix internal properties names (debug code)
---
terminal/terminal-preferences-dialog.c | 8 ++++----
terminal/terminal-preferences.c | 26 +++++++++++++-------------
terminal/terminal-preferences.glade | 8 ++++----
terminal/terminal-screen.c | 4 ++--
terminal/terminal-widget.c | 2 +-
5 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
index 55d21d1..b7aae23 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -160,9 +160,9 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog *dialog)
"dropdown-show-borders"
};
const gchar *props_color[] = { "color-foreground", "color-background",
- "tab-activity-color", "color-cursor-fg",
+ "tab-activity-color", "color-cursor-foreground",
"color-cursor", "color-selection",
- "color-selection-bg", "color-bold"
+ "color-selection-background", "color-bold"
};
const gchar *props_value[] = { "dropdown-height", "dropdown-width",
"dropdown-position", "dropdown-position-vertical",
@@ -304,7 +304,7 @@ error:
g_object_bind_property (G_OBJECT (dialog->preferences), "color-cursor-use-default",
object, "active",
G_BINDING_INVERT_BOOLEAN | G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
- object2 = gtk_builder_get_object (GTK_BUILDER (dialog), "color-cursor-fg");
+ object2 = gtk_builder_get_object (GTK_BUILDER (dialog), "color-cursor-foreground");
terminal_return_if_fail (G_IS_OBJECT (object2));
g_object_bind_property (object, "active",
object2, "sensitive",
@@ -325,7 +325,7 @@ error:
g_object_bind_property (object, "active",
object2, "sensitive",
G_BINDING_SYNC_CREATE);
- object2 = gtk_builder_get_object (GTK_BUILDER (dialog), "color-selection-bg");
+ object2 = gtk_builder_get_object (GTK_BUILDER (dialog), "color-selection-background");
terminal_return_if_fail (G_IS_OBJECT (object2));
g_object_bind_property (object, "active",
object2, "sensitive",
diff --git a/terminal/terminal-preferences.c b/terminal/terminal-preferences.c
index 4ae44c8..89ef935 100644
--- a/terminal/terminal-preferences.c
+++ b/terminal/terminal-preferences.c
@@ -54,11 +54,11 @@ enum
PROP_COLOR_FOREGROUND,
PROP_COLOR_BACKGROUND,
PROP_COLOR_BACKGROUND_VARY,
- PROP_COLOR_CURSOR_FG,
+ PROP_COLOR_CURSOR_FOREGROUND,
PROP_COLOR_CURSOR,
PROP_COLOR_CURSOR_USE_DEFAULT,
PROP_COLOR_SELECTION,
- PROP_COLOR_SELECTION_BG,
+ PROP_COLOR_SELECTION_BACKGROUND,
PROP_COLOR_SELECTION_USE_DEFAULT,
PROP_COLOR_BOLD,
PROP_COLOR_BOLD_USE_DEFAULT,
@@ -105,7 +105,7 @@ enum
PROP_MISC_COPY_ON_SELECT,
PROP_MISC_DEFAULT_WORKING_DIR,
PROP_MISC_REWRAP_ON_RESIZE,
- PROP_MISC_SHIFT_ARROWS_SCROLL,
+ PROP_MISC_USE_SHIFT_ARROWS_TO_SCROLL,
PROP_MISC_SLIM_TABS,
PROP_SCROLLING_BAR,
PROP_SCROLLING_LINES,
@@ -420,10 +420,10 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
- * TerminalPreferences:color-cursor-fg:
+ * TerminalPreferences:color-cursor-foreground:
**/
- preferences_props[PROP_COLOR_CURSOR_FG] =
- g_param_spec_string ("color-cursor-fg",
+ preferences_props[PROP_COLOR_CURSOR_FOREGROUND] =
+ g_param_spec_string ("color-cursor-foreground",
NULL,
"ColorCursorForeground",
"",
@@ -460,10 +460,10 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
- * TerminalPreferences:color-selection-bg:
+ * TerminalPreferences:color-selection-background:
**/
- preferences_props[PROP_COLOR_SELECTION_BG] =
- g_param_spec_string ("color-selection-bg",
+ preferences_props[PROP_COLOR_SELECTION_BACKGROUND] =
+ g_param_spec_string ("color-selection-background",
NULL,
"ColorSelectionBackground",
"",
@@ -970,17 +970,17 @@ terminal_preferences_class_init (TerminalPreferencesClass *klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
- * TerminalPreferences:misc-shift-arrows-scroll:
+ * TerminalPreferences:misc-use-shift-arrows-to-scroll:
**/
- preferences_props[PROP_MISC_SHIFT_ARROWS_SCROLL] =
- g_param_spec_boolean ("misc-shift-arrows-scroll",
+ preferences_props[PROP_MISC_USE_SHIFT_ARROWS_TO_SCROLL] =
+ g_param_spec_boolean ("misc-use-shift-arrows-to-scroll",
NULL,
"MiscUseShiftArrowsToScroll",
FALSE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
- * TerminalPreferences:misc-shift-arrows-scroll:
+ * TerminalPreferences:misc-slim-tabs:
**/
preferences_props[PROP_MISC_SLIM_TABS] =
g_param_spec_boolean ("misc-slim-tabs",
diff --git a/terminal/terminal-preferences.glade b/terminal/terminal-preferences.glade
index 7bd65b1..9ad2ecf 100644
--- a/terminal/terminal-preferences.glade
+++ b/terminal/terminal-preferences.glade
@@ -2218,7 +2218,7 @@ Opacity setting is not available.</property>
</packing>
</child>
<child>
- <object class="GtkColorButton" id="color-selection-bg">
+ <object class="GtkColorButton" id="color-selection-background">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2226,7 +2226,7 @@ Opacity setting is not available.</property>
<property name="title" translatable="yes">Choose text selection background color</property>
<property name="rgba">rgb(0,0,0)</property>
<child internal-child="accessible">
- <object class="AtkObject" id="color-selection-bg-atkobject">
+ <object class="AtkObject" id="color-selection-background-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
<property name="AtkObject::accessible-description" translatable="yes">Open a dialog to specify the color</property>
</object>
@@ -2274,7 +2274,7 @@ Opacity setting is not available.</property>
</packing>
</child>
<child>
- <object class="GtkColorButton" id="color-cursor-fg">
+ <object class="GtkColorButton" id="color-cursor-foreground">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2282,7 +2282,7 @@ Opacity setting is not available.</property>
<property name="title" translatable="yes">Choose cursor foreground color</property>
<property name="rgba">rgb(0,0,0)</property>
<child internal-child="accessible">
- <object class="AtkObject" id="color-cursor-fg-atkobject">
+ <object class="AtkObject" id="color-cursor-foreground-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Color Selector</property>
<property name="AtkObject::accessible-description" translatable="yes">Open a dialog to specify the color</property>
</object>
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 910158d..d09830d 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -1051,7 +1051,7 @@ terminal_screen_update_colors (TerminalScreen *screen)
/* cursor color */
if (!cursor_use_default)
{
- cursor_use_default = !terminal_preferences_get_color (screen->preferences, "color-cursor-fg", &cursor);
+ cursor_use_default = !terminal_preferences_get_color (screen->preferences, "color-cursor-foreground", &cursor);
#if VTE_CHECK_VERSION (0, 44, 0)
vte_terminal_set_color_cursor_foreground (VTE_TERMINAL (screen->terminal), cursor_use_default ? NULL : &cursor);
#endif
@@ -1064,7 +1064,7 @@ terminal_screen_update_colors (TerminalScreen *screen)
{
selection_use_default = !terminal_preferences_get_color (screen->preferences, "color-selection", &selection);
vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen->terminal), selection_use_default ? NULL : &selection);
- selection_use_default = !terminal_preferences_get_color (screen->preferences, "color-selection-bg", &selection);
+ selection_use_default = !terminal_preferences_get_color (screen->preferences, "color-selection-background", &selection);
vte_terminal_set_color_highlight (VTE_TERMINAL (screen->terminal), selection_use_default ? NULL : &selection);
}
diff --git a/terminal/terminal-widget.c b/terminal/terminal-widget.c
index 7a17287..be93321 100644
--- a/terminal/terminal-widget.c
+++ b/terminal/terminal-widget.c
@@ -609,7 +609,7 @@ terminal_widget_key_press_event (GtkWidget *widget,
/* determine current settings */
g_object_get (G_OBJECT (TERMINAL_WIDGET (widget)->preferences),
"shortcuts-no-menukey", &shortcuts_no_menukey,
- "misc-shift-arrows-scroll", &shift_arrows_scroll,
+ "misc-use-shift-arrows-to-scroll", &shift_arrows_scroll,
NULL);
/* popup context menu if "Menu" or "<Shift>F10" is pressed */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list