[gnome-documents] preview: move go-prev/go-next to actions
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-documents] preview: move go-prev/go-next to actions
- Date: Mon, 31 Oct 2016 05:39:19 +0000 (UTC)
commit e7bb593da5c68a220bf2d012b613d4863af90ffa
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Sun Oct 30 21:50:30 2016 -0700
preview: move go-prev/go-next to actions
We can avoid specifying keybindings manually this way.
src/mainWindow.js | 16 ----------------
src/preview.js | 8 +++++++-
2 files changed, 7 insertions(+), 17 deletions(-)
---
diff --git a/src/mainWindow.js b/src/mainWindow.js
index 9435209..90db648 100644
--- a/src/mainWindow.js
+++ b/src/mainWindow.js
@@ -218,8 +218,6 @@ const MainWindow = new Lang.Class({
_handleKeyPreview: function(event) {
let keyval = event.get_keyval()[1];
let preview = this._embed.getPreview();
- let def_mod_mask = Gtk.accelerator_get_default_mod_mask();
- let state = event.get_state()[1];
let windowMode = Application.modeController.getWindowMode();
if (keyval == Gdk.KEY_Escape &&
@@ -236,20 +234,6 @@ const MainWindow = new Lang.Class({
return false;
}
- if (((keyval == Gdk.KEY_Page_Up) &&
- ((state & Gdk.ModifierType.CONTROL_MASK) != 0)) ||
- ((keyval == Gdk.KEY_Left) && ((state & def_mod_mask) == 0))) {
- preview.goPrev();
- return true;
- }
-
- if (((keyval == Gdk.KEY_Page_Down) &&
- ((state & Gdk.ModifierType.CONTROL_MASK) != 0)) ||
- ((keyval == Gdk.KEY_Right) && ((state & def_mod_mask) == 0))) {
- preview.goNext();
- return true;
- }
-
if (keyval == Gdk.KEY_Page_Up) {
try {
preview.scroll(Gtk.ScrollType.PAGE_BACKWARD);
diff --git a/src/preview.js b/src/preview.js
index a387dea..08e7fe1 100644
--- a/src/preview.js
+++ b/src/preview.js
@@ -79,7 +79,13 @@ const Preview = new Lang.Class({
{ name: 'properties',
callback: Lang.bind(this, this._properties) },
{ name: 'open-current',
- callback: Lang.bind(this, this._openCurrent) }
+ callback: Lang.bind(this, this._openCurrent) },
+ { name: 'prev-page',
+ callback: Lang.bind(this, this.goPrev),
+ accels: ['<Primary>Page_Up', 'Left'] },
+ { name: 'next-page',
+ callback: Lang.bind(this, this.goNext),
+ accels: ['<Primary>Page_Down', 'Right'] }
];
},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]