[gnome-documents] preview: move fullscreen button logic to preview main class
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-documents] preview: move fullscreen button logic to preview main class
- Date: Sat, 1 Apr 2017 21:52:53 +0000 (UTC)
commit dfc28613830f63a811d9b67a64a324523d9191ba
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Sat Apr 1 13:32:31 2017 -0700
preview: move fullscreen button logic to preview main class
So that we can extend it also to other backends, such as the epub one.
src/embed.js | 10 +--
src/evinceview.js | 196 ++++-----------------------------------------------
src/preview.js | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 217 insertions(+), 191 deletions(-)
---
diff --git a/src/embed.js b/src/embed.js
index 74f355a..6203f69 100644
--- a/src/embed.js
+++ b/src/embed.js
@@ -214,13 +214,9 @@ const Embed = new Lang.Class({
},
getMainToolbar: function() {
- let windowMode = Application.modeController.getWindowMode();
-
- if (windowMode == WindowMode.WindowMode.PREVIEW_EV) {
- let fullscreen = this._view.view.fullscreen;
- if (fullscreen)
- return this._view.view.getFullscreenToolbar();
- }
+ if (this._view.view.canFullscreen &&
+ this._view.view.fullscreen)
+ return this._view.view.getFullscreenToolbar();
return this._view.toolbar;
},
diff --git a/src/evinceview.js b/src/evinceview.js
index b440511..0d6d100 100644
--- a/src/evinceview.js
+++ b/src/evinceview.js
@@ -32,7 +32,6 @@ const Mainloop = imports.mainloop;
const Application = imports.application;
const Documents = imports.documents;
-const FullscreenAction = imports.fullscreenAction;
const Places = imports.places;
const Presentation = imports.presentation;
const Preview = imports.preview;
@@ -46,12 +45,9 @@ const EvinceView = new Lang.Class({
_init: function(overlay, mainWindow) {
this._model = null;
this._jobFind = null;
- this._controlsFlipId = 0;
- this._controlsVisible = false;
this._pageChanged = false;
this._hasSelection = false;
this._viewSelectionChanged = false;
- this._fsToolbar = null;
this.parent(overlay, mainWindow);
@@ -63,7 +59,6 @@ const EvinceView = new Lang.Class({
this.connect('destroy', Lang.bind(this,
function() {
Application.application.disconnect(nightModeId);
- this._fullscreenAction.change_state(new GLib.Variant('b', false));
}));
},
@@ -113,7 +108,7 @@ const EvinceView = new Lang.Class({
_findStateChanged: function(action) {
let toolbar = this.toolbar;
if (this.fullscreen)
- toolbar = this._fsToolbar.toolbar;
+ toolbar = this.getFullscreenToolbar().toolbar;
if (action.state.get_boolean()) {
toolbar.searchbar.reveal();
@@ -221,17 +216,6 @@ const EvinceView = new Lang.Class({
return actions;
},
- createActionGroup: function() {
- let actionGroup = this.parent();
-
- this._fullscreenAction = new FullscreenAction.FullscreenAction({ window: this.mainWindow });
- this._fullscreenAction.connect('notify::state', Lang.bind(this, this._onFullscreenChanged));
- actionGroup.add_action(this._fullscreenAction);
- Application.application.set_accels_for_action('view.fullscreen', ['F11']);
-
- return actionGroup;
- },
-
createNavControls: function() {
return new EvinceViewNavControls(this, this.overlay);
},
@@ -240,6 +224,12 @@ const EvinceView = new Lang.Class({
return new EvinceViewToolbar(this);
},
+ createFullscreenToolbar: function() {
+ let toolbar = new EvinceViewFullscreenToolbar(this);
+ toolbar.setModel(this._model);
+ return toolbar;
+ },
+
createView: function() {
let sw = new Gtk.ScrolledWindow({ hexpand: true,
vexpand: true });
@@ -410,7 +400,7 @@ const EvinceView = new Lang.Class({
this._hasSelection = hasSelection;
this._viewSelectionChanged = true;
if (!hasSelection)
- this._cancelControlsFlip();
+ this.cancelControlsFlip();
},
_uriRewrite: function(uri) {
@@ -477,70 +467,6 @@ const EvinceView = new Lang.Class({
this.getAction('zoom-out').enabled = this._evView.can_zoom_out;
},
- _syncControlsVisible: function() {
- if (this._controlsVisible) {
- if (this._fsToolbar)
- this._fsToolbar.reveal();
- } else {
- if (this._fsToolbar)
- this._fsToolbar.conceal();
- }
- },
-
- _onFullscreenChanged: function(action) {
- let fullscreen = action.state.get_boolean();
-
- this.toolbar.visible = !fullscreen;
- this.getAction('gear-menu').change_state(GLib.Variant.new('b', false));
-
- if (fullscreen) {
- // create fullscreen toolbar (hidden by default)
- this._fsToolbar = new EvinceViewFullscreenToolbar(this);
- this._fsToolbar.setModel(this._model);
- this.overlay.add_overlay(this._fsToolbar);
-
- this._fsToolbar.connectJS('show-controls', Lang.bind(this,
- function() {
- this.controlsVisible = true;
- }));
-
- Application.application.set_accels_for_action('view.fullscreen',
- ['F11', 'Escape']);
- } else {
- this._fsToolbar.destroy();
- this._fsToolbar = null;
-
- Application.application.set_accels_for_action('view.fullscreen', ['F11']);
- }
-
- this._syncControlsVisible();
- },
-
- _flipControlsTimeout: function() {
- this._controlsFlipId = 0;
- let visible = this.controlsVisible;
- this.controlsVisible = !visible;
-
- return false;
- },
-
- _cancelControlsFlip: function() {
- if (this._controlsFlipId != 0) {
- Mainloop.source_remove(this._controlsFlipId);
- this._controlsFlipId = 0;
- }
- },
-
- _queueControlsFlip: function() {
- if (this._controlsFlipId)
- return;
-
- let settings = Gtk.Settings.get_default();
- let doubleClick = settings.gtk_double_click_time;
-
- this._controlsFlipId = Mainloop.timeout_add(doubleClick, Lang.bind(this,
this._flipControlsTimeout));
- },
-
_onButtonPressEvent: function(widget, event) {
let button = event.get_button()[1];
@@ -561,9 +487,9 @@ const EvinceView = new Lang.Class({
if (button == 1
&& clickCount == 1
&& !this._viewSelectionChanged)
- this._queueControlsFlip();
+ this.queueControlsFlip();
else
- this._cancelControlsFlip();
+ this.cancelControlsFlip();
this._viewSelectionChanged = false;
@@ -581,21 +507,6 @@ const EvinceView = new Lang.Class({
this._pageChanged = false;
},
- get controlsVisible() {
- return this._controlsVisible;
- },
-
- set controlsVisible(visible) {
- // reset any pending timeout, as we're about to change controls state
- this._cancelControlsFlip();
-
- if (this._controlsVisible == visible)
- return;
-
- this._controlsVisible = visible;
- this._syncControlsVisible();
- },
-
search: function(str) {
this._evView.find_search_changed();
@@ -659,10 +570,6 @@ const EvinceView = new Lang.Class({
return this._model;
},
- getFullscreenToolbar: function() {
- return this._fsToolbar;
- },
-
goPrev: function() {
this._evView.previous_page();
},
@@ -683,8 +590,8 @@ const EvinceView = new Lang.Class({
return this._model ? this._model.document.get_n_pages() : 0;
},
- get fullscreen() {
- return this.getAction('fullscreen').state.get_boolean();
+ get canFullscreen() {
+ return true;
}
});
@@ -731,42 +638,12 @@ const EvinceViewToolbar = new Lang.Class({
_init: function(preview) {
this.parent(preview);
- this._fsStateId = 0;
this._handleEvent = false;
this.addSearchButton('view.find');
- if (Application.application.isBooks) {
- this._addFullscreenButton();
+ if (Application.application.isBooks)
this.addNightmodeButton();
- }
-
- this.connect('destroy', Lang.bind(this, function() {
- if (this._fsStateId > 0)
- this.preview.getAction('fullscreen').disconnect(this._fsStateId);
- }));
- },
-
- _addFullscreenButton: function() {
- this._fullscreenButton = new Gtk.Button({ image: new Gtk.Image ({ icon_name:
'view-fullscreen-symbolic' }),
- tooltip_text: _("Fullscreen"),
- action_name: 'view.fullscreen',
- visible: true });
- this.toolbar.pack_end(this._fullscreenButton);
-
- let action = this.preview.getAction('fullscreen');
- this._fsStateId = action.connect('notify::state', Lang.bind(this, this._fullscreenStateChanged));
- this._fullscreenStateChanged();
- },
-
- _fullscreenStateChanged: function() {
- let action = this.preview.getAction('fullscreen');
- let fullscreen = action.state.get_boolean();
-
- if (fullscreen)
- this._fullscreenButton.image.icon_name = 'view-restore-symbolic';
- else
- this._fullscreenButton.image.icon_name ='view-fullscreen-symbolic';
},
setModel: function() {
@@ -776,54 +653,9 @@ const EvinceViewToolbar = new Lang.Class({
const EvinceViewFullscreenToolbar = new Lang.Class({
Name: 'EvinceViewFullscreenToolbar',
- Extends: Gtk.Revealer,
-
- _init: function(previewView) {
- this.parent({ valign: Gtk.Align.START });
-
- this.toolbar = new EvinceViewToolbar(previewView);
-
- this.add(this.toolbar);
- this.show();
-
- // make controls show when a toolbar action is activated in fullscreen
- let actionNames = ['gear-menu', 'find'];
- let signalIds = [];
-
- actionNames.forEach(Lang.bind(this, function(actionName) {
- let signalName = 'action-state-changed::' + actionName;
- let signalId = previewView.actionGroup.connect(signalName, Lang.bind(this,
- function(actionGroup, actionName, value) {
- let state = value.get_boolean();
- if (state)
- this.emitJS('show-controls');
- }));
-
- signalIds.push(signalId);
- }));
-
- this.toolbar.connect('destroy', Lang.bind(this, function() {
- signalIds.forEach(function(signalId) {
- previewView.actionGroup.disconnect(signalId);
- });
- }));
- },
-
- handleEvent: function(event) {
- this.toolbar.handleEvent(event);
- },
+ Extends: Preview.PreviewFullscreenToolbar,
setModel: function(model) {
this.toolbar.setModel(model);
- },
-
- reveal: function() {
- this.set_reveal_child(true);
- },
-
- conceal: function() {
- this.set_reveal_child(false);
- this.toolbar.preview.getAction('find').change_state(GLib.Variant.new('b', false));
}
});
-Utils.addJSSignalMethods(EvinceViewFullscreenToolbar.prototype);
diff --git a/src/preview.js b/src/preview.js
index b2a0de1..1702d71 100644
--- a/src/preview.js
+++ b/src/preview.js
@@ -10,6 +10,7 @@ const Tweener = imports.tweener.tweener;
const Application = imports.application;
const ErrorBox = imports.errorBox;
+const FullscreenAction = imports.fullscreenAction;
const MainToolbar = imports.mainToolbar;
const Password = imports.password;
const Properties = imports.properties;
@@ -26,13 +27,17 @@ const Preview = new Lang.Class({
_init: function(overlay, mainWindow) {
this._lastSearch = '';
this._loadShowId = 0;
+ this._controlsFlipId = 0;
+ this._controlsVisible = false;
+ this._fsStateId = 0;
+ this._fsToolbar = null;
this.overlay = overlay;
this.mainWindow = mainWindow;
this.parent({ homogeneous: true,
transition_type: Gtk.StackTransitionType.CROSSFADE });
- this.actionGroup = this.createActionGroup();
+ this.actionGroup = this._createActionGroup();
this._errorBox = new ErrorBox.ErrorBox();
this.add_named(this._errorBox, 'error');
@@ -113,6 +118,87 @@ const Preview = new Lang.Class({
doc.open(this.mainWindow, Gtk.get_current_event_time());
},
+ _onFullscreenChanged: function(action) {
+ let fullscreen = action.state.get_boolean();
+
+ this.toolbar.visible = !fullscreen;
+ this.getAction('gear-menu').change_state(GLib.Variant.new('b', false));
+
+ if (fullscreen) {
+ // create fullscreen toolbar (hidden by default)
+ this._fsToolbar = this.createFullscreenToolbar();
+ this.overlay.add_overlay(this._fsToolbar);
+
+ this._fsToolbar.connect('show-controls', Lang.bind(this, function() {
+ this.controlsVisible = true;
+ }));
+
+ Application.application.set_accels_for_action('view.fullscreen',
+ ['F11', 'Escape']);
+ } else {
+ this._fsToolbar.destroy();
+ this._fsToolbar = null;
+
+ Application.application.set_accels_for_action('view.fullscreen', ['F11']);
+ }
+
+ this._syncControlsVisible();
+ },
+
+ getFullscreenToolbar: function() {
+ return this._fsToolbar;
+ },
+
+ get controlsVisible() {
+ return this._controlsVisible;
+ },
+
+ set controlsVisible(visible) {
+ // reset any pending timeout, as we're about to change controls state
+ this.cancelControlsFlip();
+
+ if (this._controlsVisible == visible)
+ return;
+
+ this._controlsVisible = visible;
+ this._syncControlsVisible();
+ },
+
+ _flipControlsTimeout: function() {
+ this._controlsFlipId = 0;
+ let visible = this.controlsVisible;
+ this.controlsVisible = !visible;
+
+ return false;
+ },
+
+ queueControlsFlip: function() {
+ if (this._controlsFlipId)
+ return;
+
+ let settings = Gtk.Settings.get_default();
+ let doubleClick = settings.gtk_double_click_time;
+
+ this._controlsFlipId = Mainloop.timeout_add(doubleClick, Lang.bind(this,
this._flipControlsTimeout));
+ },
+
+ cancelControlsFlip: function() {
+ if (this._controlsFlipId != 0) {
+ Mainloop.source_remove(this._controlsFlipId);
+ this._controlsFlipId = 0;
+ }
+ },
+
+ _syncControlsVisible: function() {
+ if (this._controlsVisible) {
+ if (this._fsToolbar)
+ this._fsToolbar.reveal();
+ } else {
+ if (this._fsToolbar)
+ this._fsToolbar.conceal();
+ }
+ },
+
vfunc_destroy: function() {
if (this._loadStartedId > 0) {
Application.documentManager.disconnect(this._loadStartedId);
@@ -135,13 +221,31 @@ const Preview = new Lang.Class({
this.navControls = null;
}
+ if (this._fsToolbar) {
+ this._fsToolbar.destroy();
+ this._fsToolbar = null;
+ }
+
+ if (this._fullscreenAction) {
+ this._fullscreenAction.change_state(new GLib.Variant('b', false));
+ this._fullscreenAction.disconnect(this._fsStateId);
+ }
+
this.parent();
},
- createActionGroup: function() {
+ _createActionGroup: function() {
let actions = this.createActions().concat(this._getDefaultActions());
let actionGroup = new Gio.SimpleActionGroup();
Utils.populateActionGroup(actionGroup, actions, 'view');
+
+ if (this.canFullscreen) {
+ this._fullscreenAction = new FullscreenAction.FullscreenAction({ window: this.mainWindow });
+ this._fsStateId = this._fullscreenAction.connect('notify::state', Lang.bind(this,
this._onFullscreenChanged));
+ actionGroup.add_action(this._fullscreenAction);
+ Application.application.set_accels_for_action('view.fullscreen', ['F11']);
+ }
+
return actionGroup;
},
@@ -157,6 +261,10 @@ const Preview = new Lang.Class({
this.findNext();
},
+ createFullscreenToolbar: function() {
+ return new PreviewFullscreenToolbar(this);
+ },
+
createToolbar: function() {
return new PreviewToolbar(this);
},
@@ -256,6 +364,13 @@ const Preview = new Lang.Class({
},
get fullscreen() {
+ if (!this.canFullscreen)
+ return false;
+
+ return this.getAction('fullscreen').state.get_boolean();
+ },
+
+ get canFullscreen() {
return false;
},
@@ -273,6 +388,7 @@ const PreviewToolbar = new Lang.Class({
Extends: MainToolbar.MainToolbar,
_init: function(preview) {
+ this._fsStateId = 0;
this.preview = preview;
this.parent();
@@ -287,8 +403,16 @@ const PreviewToolbar = new Lang.Class({
action_name: 'view.gear-menu' });
this.toolbar.pack_end(menuButton);
+ if (this.preview.canFullscreen && Application.application.isBooks)
+ this._addFullscreenButton();
+
this.updateTitle();
this.toolbar.show_all();
+
+ this.connect('destroy', Lang.bind(this, function() {
+ if (this._fsStateId > 0)
+ this.preview.getAction('fullscreen').disconnect(this._fsStateId);
+ }));
},
_getPreviewMenu: function() {
@@ -306,6 +430,28 @@ const PreviewToolbar = new Lang.Class({
return menu;
},
+ _addFullscreenButton: function() {
+ this._fullscreenButton = new Gtk.Button({ image: new Gtk.Image ({ icon_name:
'view-fullscreen-symbolic' }),
+ tooltip_text: _("Fullscreen"),
+ action_name: 'view.fullscreen',
+ visible: true });
+ this.toolbar.pack_end(this._fullscreenButton);
+
+ let action = this.preview.getAction('fullscreen');
+ this._fsStateId = action.connect('notify::state', Lang.bind(this, this._fullscreenStateChanged));
+ this._fullscreenStateChanged();
+ },
+
+ _fullscreenStateChanged: function() {
+ let action = this.preview.getAction('fullscreen');
+ let fullscreen = action.state.get_boolean();
+
+ if (fullscreen)
+ this._fullscreenButton.image.icon_name = 'view-restore-symbolic';
+ else
+ this._fullscreenButton.image.icon_name = 'view-fullscreen-symbolic';
+ },
+
createSearchbar: function() {
return new PreviewSearchbar(this.preview);
},
@@ -321,6 +467,58 @@ const PreviewToolbar = new Lang.Class({
}
});
+const PreviewFullscreenToolbar = new Lang.Class({
+ Name: 'PreviewFullscreenToolbar',
+ Extends: Gtk.Revealer,
+ Signals: {
+ 'show-controls': {}
+ },
+
+ _init: function(preview) {
+ this.parent({ valign: Gtk.Align.START });
+
+ this.toolbar = preview.createToolbar();
+
+ this.add(this.toolbar);
+ this.show();
+
+ // make controls show when a toolbar action is activated in fullscreen
+ let actionNames = ['gear-menu', 'find'];
+ let signalIds = [];
+
+ actionNames.forEach(Lang.bind(this, function(actionName) {
+ let signalName = 'action-state-changed::' + actionName;
+ let signalId = preview.actionGroup.connect(signalName, Lang.bind(this,
+ function(actionGroup, actionName, value) {
+ let state = value.get_boolean();
+ if (state)
+ this.emit('show-controls');
+ }));
+
+ signalIds.push(signalId);
+ }));
+
+ this.toolbar.connect('destroy', Lang.bind(this, function() {
+ signalIds.forEach(function(signalId) {
+ preview.actionGroup.disconnect(signalId);
+ });
+ }));
+ },
+
+ handleEvent: function(event) {
+ this.toolbar.handleEvent(event);
+ },
+
+ reveal: function() {
+ this.set_reveal_child(true);
+ },
+
+ conceal: function() {
+ this.set_reveal_child(false);
+ this.toolbar.preview.getAction('find').change_state(GLib.Variant.new('b', false));
+ }
+});
+
const _AUTO_HIDE_TIMEOUT = 2;
const PREVIEW_NAVBAR_MARGIN = 30;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
