[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - extensions/inc extensions/uiconfig icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg icon-themes/colibre icon-themes/colibre_svg icon-themes/elementary icon-themes/elementary_svg icon-themes/karasa_jaga icon-themes/tango

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Jan 11 16:14:01 UTC 2019 

 extensions/inc/bitmaps.hlst                  |    4 ++--
 extensions/uiconfig/scanner/ui/griddialog.ui |    2 +-
 extensions/uiconfig/scanner/ui/sanedialog.ui |    4 ++--
 icon-themes/breeze/links.txt                 |    4 ++--
 icon-themes/breeze_dark/links.txt            |    4 ++--
 icon-themes/breeze_svg/links.txt             |    4 ++--
 icon-themes/colibre/links.txt                |    4 ++--
 icon-themes/elementary/links.txt             |    4 ++--
 icon-themes/karasa_jaga/links.txt            |    4 ++--
 icon-themes/tango/links.txt                  |    4 ++--
 10 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit f90139b70faf19beac1c4e812d67087502e27abf
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 9 21:41:52 2019 +0000
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Fri Jan 11 17:13:36 2019 +0100

    Resolves tdf#113205: move extension 'source' resources to 'res'
    
    so they get picked up by the usual postprocess packaging
    machinery
    
    Change-Id: Ia677f74229a86fdb72da294d42335341fb773ab9
    Reviewed-on: https://gerrit.libreoffice.org/66068
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-on: https://gerrit.libreoffice.org/66165
    Tested-by: Jenkins

diff --git a/extensions/inc/bitmaps.hlst b/extensions/inc/bitmaps.hlst
index 336e1b75359e..c8b48c245ab7 100644
--- a/extensions/inc/bitmaps.hlst
+++ b/extensions/inc/bitmaps.hlst
@@ -38,8 +38,8 @@
 #define RID_EXTBMP_SCROLLBAR                "res/sx10768.png"
 #define RID_EXTBMP_SPINBUTTON               "res/sx10769.png"
 #define RID_EXTBMP_NAVIGATIONBAR            "res/sx10607.png"
-#define RID_UPDATE_AVAILABLE_16             "extensions/source/update/ui/onlineupdate_16.png"
-#define RID_UPDATE_AVAILABLE_26             "extensions/source/update/ui/onlineupdate_26.png"
+#define RID_UPDATE_AVAILABLE_16             "extensions/res/update/ui/onlineupdate_16.png"
+#define RID_UPDATE_AVAILABLE_26             "extensions/res/update/ui/onlineupdate_26.png"
 #define BMP_TABLE                           "res/sx03188.png"
 #define BMP_QUERY                           "res/sx03202.png"
 #define RID_EXTBMP_AUTOFILTER_SC            "res/sc10716.png"
diff --git a/extensions/uiconfig/scanner/ui/griddialog.ui b/extensions/uiconfig/scanner/ui/griddialog.ui
index 01afa62ce523..1d55eec652c7 100644
--- a/extensions/uiconfig/scanner/ui/griddialog.ui
+++ b/extensions/uiconfig/scanner/ui/griddialog.ui
@@ -84,7 +84,7 @@
               <object class="GtkImage" id="handle">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
-                <property name="pixbuf">extensions/source/scanner/handle.png</property>
+                <property name="pixbuf">extensions/res/scanner/handle.png</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/extensions/uiconfig/scanner/ui/sanedialog.ui b/extensions/uiconfig/scanner/ui/sanedialog.ui
index eb7c1fa10a44..8561a037cfc8 100644
--- a/extensions/uiconfig/scanner/ui/sanedialog.ui
+++ b/extensions/uiconfig/scanner/ui/sanedialog.ui
@@ -530,7 +530,7 @@
                               <object class="GtkImage" id="plus">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="pixbuf">extensions/source/scanner/plus.png</property>
+                                <property name="pixbuf">extensions/res/scanner/plus.png</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -543,7 +543,7 @@
                               <object class="GtkImage" id="minus">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="pixbuf">extensions/source/scanner/minus.png</property>
+                                <property name="pixbuf">extensions/res/scanner/minus.png</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
diff --git a/icon-themes/breeze/extensions/source/scanner/minus.png b/icon-themes/breeze/extensions/res/scanner/minus.png
similarity index 100%
rename from icon-themes/breeze/extensions/source/scanner/minus.png
rename to icon-themes/breeze/extensions/res/scanner/minus.png
diff --git a/icon-themes/breeze/extensions/source/scanner/plus.png b/icon-themes/breeze/extensions/res/scanner/plus.png
similarity index 100%
rename from icon-themes/breeze/extensions/source/scanner/plus.png
rename to icon-themes/breeze/extensions/res/scanner/plus.png
diff --git a/icon-themes/breeze/extensions/source/update/ui/onlineupdate_16.png b/icon-themes/breeze/extensions/res/update/ui/onlineupdate_16.png
similarity index 100%
rename from icon-themes/breeze/extensions/source/update/ui/onlineupdate_16.png
rename to icon-themes/breeze/extensions/res/update/ui/onlineupdate_16.png
diff --git a/icon-themes/breeze/extensions/source/update/ui/onlineupdate_26.png b/icon-themes/breeze/extensions/res/update/ui/onlineupdate_26.png
similarity index 100%
rename from icon-themes/breeze/extensions/source/update/ui/onlineupdate_26.png
rename to icon-themes/breeze/extensions/res/update/ui/onlineupdate_26.png
diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index eccc3d50c02c..5e2f67007629 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -1133,8 +1133,8 @@ desktop/res/lock_16.png cmd/sc_protect.png
 # extensions
 # ==============================================
 extensions/res/arrow.png cmd/sc_nextrecord.png
-extensions/res/buttonminus.png extensions/source/scanner/minus.png
-extensions/res/buttonplus.png extensions/source/scanner/plus.png
+extensions/res/buttonminus.png extensions/res/scanner/minus.png
+extensions/res/buttonplus.png extensions/res/scanner/plus.png
 
 # formula
 # ==============================================
diff --git a/icon-themes/breeze_dark/extensions/source/scanner/minus.png b/icon-themes/breeze_dark/extensions/res/scanner/minus.png
similarity index 100%
rename from icon-themes/breeze_dark/extensions/source/scanner/minus.png
rename to icon-themes/breeze_dark/extensions/res/scanner/minus.png
diff --git a/icon-themes/breeze_dark/extensions/source/scanner/plus.png b/icon-themes/breeze_dark/extensions/res/scanner/plus.png
similarity index 100%
rename from icon-themes/breeze_dark/extensions/source/scanner/plus.png
rename to icon-themes/breeze_dark/extensions/res/scanner/plus.png
diff --git a/icon-themes/breeze_dark/extensions/source/update/ui/onlineupdate_16.png b/icon-themes/breeze_dark/extensions/res/update/ui/onlineupdate_16.png
similarity index 100%
rename from icon-themes/breeze_dark/extensions/source/update/ui/onlineupdate_16.png
rename to icon-themes/breeze_dark/extensions/res/update/ui/onlineupdate_16.png
diff --git a/icon-themes/breeze_dark/extensions/source/update/ui/onlineupdate_26.png b/icon-themes/breeze_dark/extensions/res/update/ui/onlineupdate_26.png
similarity index 100%
rename from icon-themes/breeze_dark/extensions/source/update/ui/onlineupdate_26.png
rename to icon-themes/breeze_dark/extensions/res/update/ui/onlineupdate_26.png
diff --git a/icon-themes/breeze_dark/links.txt b/icon-themes/breeze_dark/links.txt
index eccc3d50c02c..5e2f67007629 100644
--- a/icon-themes/breeze_dark/links.txt
+++ b/icon-themes/breeze_dark/links.txt
@@ -1133,8 +1133,8 @@ desktop/res/lock_16.png cmd/sc_protect.png
 # extensions
 # ==============================================
 extensions/res/arrow.png cmd/sc_nextrecord.png
-extensions/res/buttonminus.png extensions/source/scanner/minus.png
-extensions/res/buttonplus.png extensions/source/scanner/plus.png
+extensions/res/buttonminus.png extensions/res/scanner/minus.png
+extensions/res/buttonplus.png extensions/res/scanner/plus.png
 
 # formula
 # ==============================================
diff --git a/icon-themes/breeze_svg/extensions/source/scanner/minus.svg b/icon-themes/breeze_svg/extensions/res/scanner/minus.svg
similarity index 100%
rename from icon-themes/breeze_svg/extensions/source/scanner/minus.svg
rename to icon-themes/breeze_svg/extensions/res/scanner/minus.svg
diff --git a/icon-themes/breeze_svg/extensions/source/scanner/plus.svg b/icon-themes/breeze_svg/extensions/res/scanner/plus.svg
similarity index 100%
rename from icon-themes/breeze_svg/extensions/source/scanner/plus.svg
rename to icon-themes/breeze_svg/extensions/res/scanner/plus.svg
diff --git a/icon-themes/breeze_svg/extensions/source/update/ui/onlineupdate_16.svg b/icon-themes/breeze_svg/extensions/res/update/ui/onlineupdate_16.svg
similarity index 100%
rename from icon-themes/breeze_svg/extensions/source/update/ui/onlineupdate_16.svg
rename to icon-themes/breeze_svg/extensions/res/update/ui/onlineupdate_16.svg
diff --git a/icon-themes/breeze_svg/extensions/source/update/ui/onlineupdate_26.svg b/icon-themes/breeze_svg/extensions/res/update/ui/onlineupdate_26.svg
similarity index 100%
rename from icon-themes/breeze_svg/extensions/source/update/ui/onlineupdate_26.svg
rename to icon-themes/breeze_svg/extensions/res/update/ui/onlineupdate_26.svg
diff --git a/icon-themes/breeze_svg/links.txt b/icon-themes/breeze_svg/links.txt
index b4dededcf2b9..5e0c2a02ba21 100644
--- a/icon-themes/breeze_svg/links.txt
+++ b/icon-themes/breeze_svg/links.txt
@@ -1133,8 +1133,8 @@ desktop/res/lock_16.png cmd/sc_protect.png
 # extensions
 # ==============================================
 extensions/res/arrow.png cmd/sc_nextrecord.png
-extensions/res/buttonminus.png extensions/source/scanner/minus.png
-extensions/res/buttonplus.png extensions/source/scanner/plus.png
+extensions/res/buttonminus.png extensions/res/scanner/minus.png
+extensions/res/buttonplus.png extensions/res/scanner/plus.png
 
 # formula
 # ==============================================
diff --git a/icon-themes/colibre/extensions/source/scanner/handle.png b/icon-themes/colibre/extensions/res/scanner/handle.png
similarity index 100%
rename from icon-themes/colibre/extensions/source/scanner/handle.png
rename to icon-themes/colibre/extensions/res/scanner/handle.png
diff --git a/icon-themes/colibre/extensions/source/scanner/minus.png b/icon-themes/colibre/extensions/res/scanner/minus.png
similarity index 100%
rename from icon-themes/colibre/extensions/source/scanner/minus.png
rename to icon-themes/colibre/extensions/res/scanner/minus.png
diff --git a/icon-themes/colibre/extensions/source/scanner/plus.png b/icon-themes/colibre/extensions/res/scanner/plus.png
similarity index 100%
rename from icon-themes/colibre/extensions/source/scanner/plus.png
rename to icon-themes/colibre/extensions/res/scanner/plus.png
diff --git a/icon-themes/colibre/extensions/source/update/ui/onlineupdate_16.png b/icon-themes/colibre/extensions/res/update/ui/onlineupdate_16.png
similarity index 100%
rename from icon-themes/colibre/extensions/source/update/ui/onlineupdate_16.png
rename to icon-themes/colibre/extensions/res/update/ui/onlineupdate_16.png
diff --git a/icon-themes/colibre/extensions/source/update/ui/onlineupdate_26.png b/icon-themes/colibre/extensions/res/update/ui/onlineupdate_26.png
similarity index 100%
rename from icon-themes/colibre/extensions/source/update/ui/onlineupdate_26.png
rename to icon-themes/colibre/extensions/res/update/ui/onlineupdate_26.png
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 4e4402930113..a0c7df3ae64c 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -1114,8 +1114,8 @@ desktop/res/lock_16.png cmd/sc_protect.png
 # extensions
 # ==============================================
 extensions/res/arrow.png cmd/sc_nextrecord.png
-extensions/res/buttonminus.png extensions/source/scanner/minus.png
-extensions/res/buttonplus.png extensions/source/scanner/plus.png
+extensions/res/buttonminus.png extensions/res/scanner/minus.png
+extensions/res/buttonplus.png extensions/res/scanner/plus.png
 
 # formula
 # ==============================================
diff --git a/icon-themes/colibre_svg/extensions/source/scanner/handle.svg b/icon-themes/colibre_svg/extensions/res/scanner/handle.svg
similarity index 100%
rename from icon-themes/colibre_svg/extensions/source/scanner/handle.svg
rename to icon-themes/colibre_svg/extensions/res/scanner/handle.svg
diff --git a/icon-themes/colibre_svg/extensions/source/scanner/minus.svg b/icon-themes/colibre_svg/extensions/res/scanner/minus.svg
similarity index 100%
rename from icon-themes/colibre_svg/extensions/source/scanner/minus.svg
rename to icon-themes/colibre_svg/extensions/res/scanner/minus.svg
diff --git a/icon-themes/colibre_svg/extensions/source/scanner/plus.svg b/icon-themes/colibre_svg/extensions/res/scanner/plus.svg
similarity index 100%
rename from icon-themes/colibre_svg/extensions/source/scanner/plus.svg
rename to icon-themes/colibre_svg/extensions/res/scanner/plus.svg
diff --git a/icon-themes/colibre_svg/extensions/source/update/ui/onlineupdate_16.svg b/icon-themes/colibre_svg/extensions/res/update/ui/onlineupdate_16.svg
similarity index 100%
rename from icon-themes/colibre_svg/extensions/source/update/ui/onlineupdate_16.svg
rename to icon-themes/colibre_svg/extensions/res/update/ui/onlineupdate_16.svg
diff --git a/icon-themes/colibre_svg/extensions/source/update/ui/onlineupdate_26.svg b/icon-themes/colibre_svg/extensions/res/update/ui/onlineupdate_26.svg
similarity index 100%
rename from icon-themes/colibre_svg/extensions/source/update/ui/onlineupdate_26.svg
rename to icon-themes/colibre_svg/extensions/res/update/ui/onlineupdate_26.svg
diff --git a/icon-themes/elementary/extensions/source/scanner/minus.png b/icon-themes/elementary/extensions/res/scanner/minus.png
similarity index 100%
rename from icon-themes/elementary/extensions/source/scanner/minus.png
rename to icon-themes/elementary/extensions/res/scanner/minus.png
diff --git a/icon-themes/elementary/extensions/source/scanner/plus.png b/icon-themes/elementary/extensions/res/scanner/plus.png
similarity index 100%
rename from icon-themes/elementary/extensions/source/scanner/plus.png
rename to icon-themes/elementary/extensions/res/scanner/plus.png
diff --git a/icon-themes/elementary/extensions/source/update/ui/onlineupdate_16.png b/icon-themes/elementary/extensions/res/update/ui/onlineupdate_16.png
similarity index 100%
rename from icon-themes/elementary/extensions/source/update/ui/onlineupdate_16.png
rename to icon-themes/elementary/extensions/res/update/ui/onlineupdate_16.png
diff --git a/icon-themes/elementary/extensions/source/update/ui/onlineupdate_26.png b/icon-themes/elementary/extensions/res/update/ui/onlineupdate_26.png
similarity index 100%
rename from icon-themes/elementary/extensions/source/update/ui/onlineupdate_26.png
rename to icon-themes/elementary/extensions/res/update/ui/onlineupdate_26.png
diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index 1d838680e1a0..b94cb45deebe 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -949,8 +949,8 @@ desktop/res/lock_16.png cmd/sc_protect.png
 # extensions
 # ==============================================
 extensions/res/arrow.png cmd/sc_nextrecord.png
-extensions/res/buttonminus.png extensions/source/scanner/minus.png
-extensions/res/buttonplus.png extensions/source/scanner/plus.png
+extensions/res/buttonminus.png extensions/res/scanner/minus.png
+extensions/res/buttonplus.png extensions/res/scanner/plus.png
 
 # formula
 # ==============================================
diff --git a/icon-themes/elementary_svg/extensions/source/scanner/minus.svg b/icon-themes/elementary_svg/extensions/res/scanner/minus.svg
similarity index 100%
rename from icon-themes/elementary_svg/extensions/source/scanner/minus.svg
rename to icon-themes/elementary_svg/extensions/res/scanner/minus.svg
diff --git a/icon-themes/elementary_svg/extensions/source/scanner/plus.svg b/icon-themes/elementary_svg/extensions/res/scanner/plus.svg
similarity index 100%
rename from icon-themes/elementary_svg/extensions/source/scanner/plus.svg
rename to icon-themes/elementary_svg/extensions/res/scanner/plus.svg
diff --git a/icon-themes/elementary_svg/extensions/source/update/ui/onlineupdate_16.svg b/icon-themes/elementary_svg/extensions/res/update/ui/onlineupdate_16.svg
similarity index 100%
rename from icon-themes/elementary_svg/extensions/source/update/ui/onlineupdate_16.svg
rename to icon-themes/elementary_svg/extensions/res/update/ui/onlineupdate_16.svg
diff --git a/icon-themes/elementary_svg/extensions/source/update/ui/onlineupdate_26.svg b/icon-themes/elementary_svg/extensions/res/update/ui/onlineupdate_26.svg
similarity index 100%
rename from icon-themes/elementary_svg/extensions/source/update/ui/onlineupdate_26.svg
rename to icon-themes/elementary_svg/extensions/res/update/ui/onlineupdate_26.svg
diff --git a/icon-themes/karasa_jaga/extensions/source/scanner/handle.png b/icon-themes/karasa_jaga/extensions/res/scanner/handle.png
similarity index 100%
rename from icon-themes/karasa_jaga/extensions/source/scanner/handle.png
rename to icon-themes/karasa_jaga/extensions/res/scanner/handle.png
diff --git a/icon-themes/karasa_jaga/extensions/source/scanner/minus.png b/icon-themes/karasa_jaga/extensions/res/scanner/minus.png
similarity index 100%
rename from icon-themes/karasa_jaga/extensions/source/scanner/minus.png
rename to icon-themes/karasa_jaga/extensions/res/scanner/minus.png
diff --git a/icon-themes/karasa_jaga/extensions/source/scanner/plus.png b/icon-themes/karasa_jaga/extensions/res/scanner/plus.png
similarity index 100%
rename from icon-themes/karasa_jaga/extensions/source/scanner/plus.png
rename to icon-themes/karasa_jaga/extensions/res/scanner/plus.png
diff --git a/icon-themes/karasa_jaga/extensions/source/update/ui/onlineupdate_16.png b/icon-themes/karasa_jaga/extensions/res/update/ui/onlineupdate_16.png
similarity index 100%
rename from icon-themes/karasa_jaga/extensions/source/update/ui/onlineupdate_16.png
rename to icon-themes/karasa_jaga/extensions/res/update/ui/onlineupdate_16.png
diff --git a/icon-themes/karasa_jaga/extensions/source/update/ui/onlineupdate_26.png b/icon-themes/karasa_jaga/extensions/res/update/ui/onlineupdate_26.png
similarity index 100%
rename from icon-themes/karasa_jaga/extensions/source/update/ui/onlineupdate_26.png
rename to icon-themes/karasa_jaga/extensions/res/update/ui/onlineupdate_26.png
diff --git a/icon-themes/karasa_jaga/links.txt b/icon-themes/karasa_jaga/links.txt
index bd78ba018910..07a0a8fffc06 100755
--- a/icon-themes/karasa_jaga/links.txt
+++ b/icon-themes/karasa_jaga/links.txt
@@ -850,8 +850,8 @@ cmd/sc_zoomplus.png cmd/sc_zoomin.png
 cmd/sc_zoomtoolbox.png cmd/sc_zoom.png
 desktop/res/extension_16.png cmd/sc_addons.png
 desktop/res/extension_32.png cmd/32/addons.png
-extensions/source/scanner/minus.png res/minus.png
-extensions/source/scanner/plus.png res/plus.png
+extensions/res/scanner/minus.png res/minus.png
+extensions/res/scanner/plus.png res/plus.png
 formula/res/fx.png cmd/sc_insertformula.png
 framework/res/addtemplate_32.png cmd/32/newdoc.png
 framework/res/arrow.png cmd/sc_nextrecord.png
diff --git a/icon-themes/tango/extensions/source/scanner/handle.png b/icon-themes/tango/extensions/res/scanner/handle.png
similarity index 100%
rename from icon-themes/tango/extensions/source/scanner/handle.png
rename to icon-themes/tango/extensions/res/scanner/handle.png
diff --git a/icon-themes/tango/extensions/source/update/ui/onlineupdate_16.png b/icon-themes/tango/extensions/res/update/ui/onlineupdate_16.png
similarity index 100%
rename from icon-themes/tango/extensions/source/update/ui/onlineupdate_16.png
rename to icon-themes/tango/extensions/res/update/ui/onlineupdate_16.png
diff --git a/icon-themes/tango/extensions/source/update/ui/onlineupdate_26.png b/icon-themes/tango/extensions/res/update/ui/onlineupdate_26.png
similarity index 100%
rename from icon-themes/tango/extensions/source/update/ui/onlineupdate_26.png
rename to icon-themes/tango/extensions/res/update/ui/onlineupdate_26.png
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index b483e5fa819d..c22aff6e6988 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -360,8 +360,8 @@ fpicker/res/fp011.png res/sc06303.png
 sfx2/res/styfam1.png sw/res/sf01.png
 sfx2/res/styfam2.png sw/res/sf02.png
 sfx2/res/styfam4.png sw/res/sf04.png
-extensions/source/scanner/minus.png sfx2/res/minus.png
-extensions/source/scanner/plus.png sfx2/res/plus.png
+extensions/res/scanner/minus.png sfx2/res/minus.png
+extensions/res/scanner/plus.png sfx2/res/plus.png
 res/minus.png sfx2/res/minus.png
 res/plus.png sfx2/res/plus.png
 sc/res/sf02.png sw/res/sf04.png

More information about the Libreoffice-commits mailing list