[gnome-books/wip/hadess/remove-docs-references: 3/4] all: Remove references to Documents in resource paths




commit 7b2e0e63ff50d52e866fd719d111b850c3a1b4ae
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Mar 4 16:20:05 2020 +0100

    all: Remove references to Documents in resource paths

 data/org.gnome.Books.data.gresource.xml | 5 +----
 src/application.js                      | 2 +-
 src/documents.js                        | 2 +-
 src/mainToolbar.js                      | 2 +-
 src/overview.js                         | 4 ++--
 src/preview.js                          | 4 ++--
 src/selections.js                       | 4 ++--
 7 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/data/org.gnome.Books.data.gresource.xml b/data/org.gnome.Books.data.gresource.xml
index b8100a03..1c56bca9 100644
--- a/data/org.gnome.Books.data.gresource.xml
+++ b/data/org.gnome.Books.data.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/Documents">
+  <gresource prefix="/org/gnome/Books">
     <file>application.css</file>
     <file preprocess="xml-stripblanks">ui/books-app-menu.ui</file>
     <file preprocess="xml-stripblanks">ui/organize-collection-dialog.ui</file>
@@ -12,9 +12,6 @@
     <file alias="ui/dnd-counter.svg" preprocess="to-pixdata">media/dnd-counter.svg</file>
     <file alias="ui/thumbnail-frame.png" preprocess="to-pixdata">media/thumbnail-frame.png</file>
   </gresource>
-  <gresource prefix="/org/gnome/Documents/gtk">
-    <file alias="help-overlay.ui" preprocess="xml-stripblanks">ui/help-overlay.ui</file>
-  </gresource>
   <gresource prefix="/org/gnome/Books/gtk">
     <file alias="help-overlay.ui" preprocess="xml-stripblanks">ui/help-overlay.ui</file>
   </gresource>
diff --git a/src/application.js b/src/application.js
index f087a2e3..16d66018 100644
--- a/src/application.js
+++ b/src/application.js
@@ -158,7 +158,7 @@ var Application = new Lang.Class({
         if (gtkSettings.gtk_theme_name == 'Adwaita') {
             if (cssProvider == null) {
                 cssProvider = new Gtk.CssProvider();
-                let file = Gio.File.new_for_uri("resource:///org/gnome/Documents/application.css");
+                let file = Gio.File.new_for_uri("resource:///org/gnome/Books/application.css");
                 cssProvider.load_from_file(file);
             }
 
diff --git a/src/documents.js b/src/documents.js
index a2f15c6b..2ad9d1f5 100644
--- a/src/documents.js
+++ b/src/documents.js
@@ -680,7 +680,7 @@ const DocCommon = new Lang.Class({
         if (this._thumbPath) {
             let [ slice, border ] = Utils.getThumbnailFrameBorder();
             thumbnailedPixbuf = Gd.embed_image_in_frame(emblemedPixbuf,
-                'resource:///org/gnome/Documents/ui/thumbnail-frame.png',
+                'resource:///org/gnome/Books/ui/thumbnail-frame.png',
                 slice, border);
         } else {
             thumbnailedPixbuf = emblemedPixbuf;
diff --git a/src/mainToolbar.js b/src/mainToolbar.js
index c14d2e32..a818c6c6 100644
--- a/src/mainToolbar.js
+++ b/src/mainToolbar.js
@@ -89,7 +89,7 @@ var MainToolbar = new Lang.Class({
     addMenuButton: function() {
       let model_name = null;
 
-      let builder = Gtk.Builder.new_from_resource("/org/gnome/Documents/ui/books-app-menu.ui");
+      let builder = Gtk.Builder.new_from_resource("/org/gnome/Books/ui/books-app-menu.ui");
       let model = builder.get_object('app-menu');
       let menuButton = new Gtk.MenuButton({ image: new Gtk.Image ({ icon_name: 'open-menu-symbolic' }),
                                             tooltip_text: Gettext.pgettext("menu button tooltip", "Menu"),
diff --git a/src/overview.js b/src/overview.js
index a1b0d246..3ff5e8ea 100644
--- a/src/overview.js
+++ b/src/overview.js
@@ -508,7 +508,7 @@ const OverviewToolbar = new Lang.Class({
         this.parent();
 
         let builder = new Gtk.Builder();
-        builder.add_from_resource('/org/gnome/Documents/ui/selection-menu.ui');
+        builder.add_from_resource('/org/gnome/Books/ui/selection-menu.ui');
         let selectionMenu = builder.get_object('selection-menu');
         this._selectionMenu = new Gtk.MenuButton({ menu_model: selectionMenu });
         this._selectionMenu.get_style_context().add_class('selection-menu');
@@ -539,7 +539,7 @@ const OverviewToolbar = new Lang.Class({
 
     _addViewMenuButton: function() {
         let builder = new Gtk.Builder();
-        builder.add_from_resource('/org/gnome/Documents/ui/view-menu.ui');
+        builder.add_from_resource('/org/gnome/Books/ui/view-menu.ui');
         let viewMenu = builder.get_object('viewMenu');
 
         // Translators: this is the menu to change view settings
diff --git a/src/preview.js b/src/preview.js
index dbbc3a52..11c843e0 100644
--- a/src/preview.js
+++ b/src/preview.js
@@ -285,7 +285,7 @@ var Preview = new Lang.Class({
 
     createContextMenu: function() {
         let builder = new Gtk.Builder();
-        builder.add_from_resource('/org/gnome/Documents/ui/preview-context-menu.ui');
+        builder.add_from_resource('/org/gnome/Books/ui/preview-context-menu.ui');
         let model = builder.get_object('preview-context-menu');
         return Gtk.Menu.new_from_model(model);
     },
@@ -434,7 +434,7 @@ var PreviewToolbar = new Lang.Class({
 
     _getPreviewMenu: function() {
         let builder = new Gtk.Builder();
-        builder.add_from_resource('/org/gnome/Documents/ui/preview-menu.ui');
+        builder.add_from_resource('/org/gnome/Books/ui/preview-menu.ui');
         let menu = builder.get_object('preview-menu');
 
         let doc = Application.documentManager.getActiveItem();
diff --git a/src/selections.js b/src/selections.js
index 396d5c6b..d54e5f4b 100644
--- a/src/selections.js
+++ b/src/selections.js
@@ -597,7 +597,7 @@ const CollectionList = new Lang.Class({
 const OrganizeCollectionDialog = new Lang.Class({
     Name: 'OrganizeCollectionDialog',
     Extends: Gtk.Window,
-    Template: 'resource:///org/gnome/Documents/ui/organize-collection-dialog.ui',
+    Template: 'resource:///org/gnome/Books/ui/organize-collection-dialog.ui',
     InternalChildren: [ 'content',
                         'viewEmpty',
                         'addEntryEmpty',
@@ -845,7 +845,7 @@ const _SELECTION_TOOLBAR_DEFAULT_WIDTH = 500;
 var SelectionToolbar = new Lang.Class({
     Name: 'SelectionToolbar',
     Extends: Gtk.ActionBar,
-    Template: 'resource:///org/gnome/Documents/ui/selection-toolbar.ui',
+    Template: 'resource:///org/gnome/Books/ui/selection-toolbar.ui',
     InternalChildren: [ 'toolbarOpen',
                         'toolbarPrint',
                         'toolbarTrash',


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