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 4cf4d385b952e770d2e353941dc14934d9bb8d8c
Author: Igor <f2...@yandex.ru>
Date: Thu Sep 22 19:11:58 2016 +0300
Remove "Scrolling single line" option
The functionality is built-in into vte and available via Ctrl+Shift+Up/Down.
Fixes https://bugzilla.xfce.org/show_bug.cgi?id=12816
---
terminal/terminal-preferences-dialog.c | 1 -
terminal/terminal-preferences.c | 13 -------------
terminal/terminal-preferences.glade | 17 -----------------
terminal/terminal-widget.c | 20 --------------------
4 files changed, 51 deletions(-)
diff --git a/terminal/terminal-preferences-dialog.c
b/terminal/terminal-preferences-dialog.c
index 8b0e868..0349d15 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -138,7 +138,6 @@ terminal_preferences_dialog_init (TerminalPreferencesDialog
*dialog)
gchar *current;
GtkTreeIter current_iter;
const gchar *props_active[] = { "title-mode", "command-login-shell",
- "scrolling-single-line",
"scrolling-on-output",
"scrolling-on-keystroke",
"scrolling-bar", "scrolling-unlimited",
"misc-cursor-shape",
"misc-cursor-blinks",
diff --git a/terminal/terminal-preferences.c b/terminal/terminal-preferences.c
index 9cb73d4..77374ed 100644
--- a/terminal/terminal-preferences.c
+++ b/terminal/terminal-preferences.c
@@ -96,7 +96,6 @@ enum
PROP_SCROLLING_LINES,
PROP_SCROLLING_ON_OUTPUT,
PROP_SCROLLING_ON_KEYSTROKE,
- PROP_SCROLLING_SINGLE_LINE,
PROP_SCROLLING_UNLIMITED,
PROP_SHORTCUTS_NO_HELPKEY,
PROP_SHORTCUTS_NO_MENUKEY,
@@ -874,18 +873,6 @@ terminal_preferences_class_init (TerminalPreferencesClass
*klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
/**
- * TerminalPreferences:scrolling-single-line:
- *
- * Whether to enable scrolling single lines using Shift-Up/-Down.
- **/
- preferences_props[PROP_SCROLLING_SINGLE_LINE] =
- g_param_spec_boolean ("scrolling-single-line",
- NULL,
- "ScrollingSingleLine",
- TRUE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-
- /**
* TerminalPreferences:shortcuts-no-helpkey:
*
* Disable help shortcut key (F1).
diff --git a/terminal/terminal-preferences.glade
b/terminal/terminal-preferences.glade
index 212df57..8cf3015 100644
--- a/terminal/terminal-preferences.glade
+++ b/terminal/terminal-preferences.glade
@@ -433,23 +433,6 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkCheckButton"
id="scrolling-single-line">
- <property name="label"
translatable="yes">Scroll single _line using Shift-Up/-Down keys</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="tooltip_text"
translatable="yes">Enable this option to be able to scroll by a single line
using the up/down arrow keys together with the Shift key.</property>
- <property name="halign">start</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/terminal/terminal-widget.c b/terminal/terminal-widget.c
index 044b3db..c8b9f2b 100644
--- a/terminal/terminal-widget.c
+++ b/terminal/terminal-widget.c
@@ -596,14 +596,10 @@ static gboolean
terminal_widget_key_press_event (GtkWidget *widget,
GdkEventKey *event)
{
- GtkAdjustment *adjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE
(widget));
- gboolean scrolling_single_line;
gboolean shortcuts_no_menukey;
- gdouble value;
/* determine current settings */
g_object_get (G_OBJECT (TERMINAL_WIDGET (widget)->preferences),
- "scrolling-single-line", &scrolling_single_line,
"shortcuts-no-menukey", &shortcuts_no_menukey,
NULL);
@@ -614,22 +610,6 @@ terminal_widget_key_press_event (GtkWidget *widget,
terminal_widget_context_menu (TERMINAL_WIDGET (widget), 0, event->time,
(GdkEvent *) event);
return TRUE;
}
- else if (G_LIKELY (scrolling_single_line))
- {
- /* scroll up one line with "<Shift>Up" */
- if ((event->state & GDK_SHIFT_MASK) != 0 && (event->keyval == GDK_KEY_Up
|| event->keyval == GDK_KEY_KP_Up))
- {
- gtk_adjustment_set_value (adjustment, gtk_adjustment_get_value
(adjustment) - 1);
- return TRUE;
- }
- /* scroll down one line with "<Shift>Down" */
- else if ((event->state & GDK_SHIFT_MASK) != 0 && (event->keyval ==
GDK_KEY_Down || event->keyval == GDK_KEY_KP_Down))
- {
- value = MIN (gtk_adjustment_get_value (adjustment) + 1,
gtk_adjustment_get_upper (adjustment) - gtk_adjustment_get_page_size
(adjustment));
- gtk_adjustment_set_value (adjustment, value);
- return TRUE;
- }
- }
return (*GTK_WIDGET_CLASS (terminal_widget_parent_class)->key_press_event)
(widget, event);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
