[gnome-documents/wip/lokdocview-rebase: 4/22] Use the same context menu in the main view and the LOK view



commit cc25f07977cea08bb59569bee49774b8e9df660a
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Dec 4 17:52:53 2015 +0100

    Use the same context menu in the main view and the LOK view

 data/org.gnome.Documents.data.gresource.xml |    1 -
 data/ui/lokview-menu.ui                     |   16 ----------------
 src/lokview.js                              |    4 ++--
 3 files changed, 2 insertions(+), 19 deletions(-)
---
diff --git a/data/org.gnome.Documents.data.gresource.xml b/data/org.gnome.Documents.data.gresource.xml
index 3a6be94..e374424 100644
--- a/data/org.gnome.Documents.data.gresource.xml
+++ b/data/org.gnome.Documents.data.gresource.xml
@@ -6,7 +6,6 @@
     <file preprocess="xml-stripblanks">ui/organize-collection-dialog.ui</file>
     <file preprocess="xml-stripblanks">ui/preview-context-menu.ui</file>
     <file preprocess="xml-stripblanks">ui/preview-menu.ui</file>
-    <file preprocess="xml-stripblanks">ui/lokview-menu.ui</file>
     <file preprocess="xml-stripblanks">ui/selection-menu.ui</file>
     <file preprocess="xml-stripblanks">ui/selection-toolbar.ui</file>
     <file preprocess="xml-stripblanks">ui/view-menu.ui</file>
diff --git a/src/lokview.js b/src/lokview.js
index 895338c..a6a7601 100644
--- a/src/lokview.js
+++ b/src/lokview.js
@@ -182,8 +182,8 @@ const LOKViewToolbar = new Lang.Class({
 
     _getLOKViewMenu: function() {
         let builder = new Gtk.Builder();
-        builder.add_from_resource('/org/gnome/Documents/ui/lokview-menu.ui');
-        let menu = builder.get_object('lokview-menu');
+        builder.add_from_resource('/org/gnome/Documents/ui/preview-context-menu.ui');
+        let menu = builder.get_object('preview-context-menu');
 
         return menu;
     },


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]