[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig sw/uiconfig
andreas kainz
kainz.a at gmail.com
Wed Nov 15 12:44:47 UTC 2017
sc/uiconfig/scalc/ui/notebookbar.ui | 40 ++++++++++++++++++------
sd/uiconfig/simpress/ui/notebookbar.ui | 31 +++++++++++++++---
sw/uiconfig/swriter/ui/notebookbar.ui | 54 +++++++++++++++++++++++++++++----
3 files changed, 104 insertions(+), 21 deletions(-)
New commits:
commit 8aa381f8a15a37017ce8b3d01387214125e35b93
Author: andreas kainz <kainz.a at gmail.com>
Date: Wed Nov 15 12:05:06 2017 +0100
tdf#108144: tabbed notebookbar add margins to seperators
Change-Id: I374873eed5e89c0788869150187219078d22f986
Reviewed-on: https://gerrit.libreoffice.org/44757
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index 5eddae38f8a9..283b9fc6d3d8 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -128,11 +128,6 @@
<property name="can_focus">False</property>
<property name="pixbuf">sfx2/res/placeholder.png</property>
</object>
- <object class="GtkImage" id="SignatureImg">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">cmd/lc_signature.png</property>
- </object>
<object class="GtkImage" id="PrintImg">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -158,6 +153,11 @@
<property name="can_focus">False</property>
<property name="pixbuf">cmd/lc_sendtoback.png</property>
</object>
+ <object class="GtkImage" id="SignatureImg">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">cmd/lc_signature.png</property>
+ </object>
<object class="GtkImage" id="SpellDialogImg">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -499,6 +499,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">3</property>
</packing>
</child>
@@ -667,7 +668,7 @@
<property name="tooltip_text" translatable="yes" context="notebookbar|bordertype|tooltip_text">Specify the borders of the selected cells.</property>
<property name="halign">start</property>
<property name="action_name">.uno:SetBorderStyle</property>
- <property name="label" translatable="no">toolbutton1</property>
+ <property name="label">toolbutton1</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -884,6 +885,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -1214,8 +1216,8 @@
<child>
<object class="sfxlo-DropdownBox" id="box7">
<property name="visible">True</property>
- <property name="valign">center</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<child>
<object class="GtkBox" id="box50">
<property name="visible">True</property>
@@ -1229,6 +1231,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -1380,14 +1383,15 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box40">
<property name="visible">True</property>
- <property name="valign">center</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
<object class="svtlo-ManagedMenuButton" id="ConditionalFormatMenu">
@@ -1446,8 +1450,8 @@
<child>
<object class="sfxlo-DropdownBox" id="box12">
<property name="visible">True</property>
- <property name="valign">center</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<child>
<object class="GtkBox" id="box41">
<property name="visible">True</property>
@@ -1461,6 +1465,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -1596,14 +1601,15 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box42">
<property name="visible">True</property>
- <property name="valign">center</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkButton" id="SearchDialog">
@@ -1720,6 +1726,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
@@ -1822,6 +1829,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">5</property>
</packing>
</child>
@@ -1965,6 +1973,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -2133,6 +2142,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">2</property>
</packing>
</child>
@@ -2295,6 +2305,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">2</property>
</packing>
</child>
@@ -2340,6 +2351,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">3</property>
</packing>
</child>
@@ -2485,6 +2497,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">8</property>
</packing>
</child>
@@ -2794,6 +2807,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">3</property>
</packing>
</child>
@@ -2938,6 +2952,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">7</property>
</packing>
</child>
@@ -3087,6 +3102,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
@@ -3173,6 +3189,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">3</property>
</packing>
</child>
@@ -3255,6 +3272,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">5</property>
</packing>
</child>
@@ -3504,6 +3522,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">2</property>
</packing>
</child>
@@ -3672,6 +3691,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">5</property>
</packing>
</child>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui
index 0864001c29a5..292b7aa1383c 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -2,6 +2,7 @@
<!-- Generated with glade 3.18.3 -->
<interface domain="sd">
<requires lib="gtk+" version="3.12"/>
+ <requires lib="" version="3.12"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkImage" id="BringToFrontImg">
<property name="visible">True</property>
@@ -93,11 +94,6 @@
<property name="can_focus">False</property>
<property name="pixbuf">cmd/lc_paste.png</property>
</object>
- <object class="GtkImage" id="SignatureImg">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">cmd/lc_signature.png</property>
- </object>
<object class="GtkImage" id="PlaceholderImg">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -148,6 +144,11 @@
<property name="can_focus">False</property>
<property name="pixbuf">cmd/lc_showannotations.png</property>
</object>
+ <object class="GtkImage" id="SignatureImg">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">cmd/lc_signature.png</property>
+ </object>
<object class="GtkImage" id="SpellDialogImg">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -448,6 +449,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
@@ -544,6 +546,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">3</property>
</packing>
</child>
@@ -853,6 +856,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">5</property>
</packing>
</child>
@@ -1156,6 +1160,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">7</property>
</packing>
</child>
@@ -1308,6 +1313,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">9</property>
</packing>
</child>
@@ -1382,6 +1388,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">11</property>
</packing>
</child>
@@ -1529,6 +1536,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
@@ -1557,6 +1565,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">3</property>
</packing>
</child>
@@ -1656,6 +1665,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">5</property>
</packing>
</child>
@@ -1808,6 +1818,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">7</property>
</packing>
</child>
@@ -1911,6 +1922,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">9</property>
</packing>
</child>
@@ -1967,6 +1979,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">11</property>
</packing>
</child>
@@ -2101,6 +2114,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
@@ -2172,6 +2186,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">3</property>
</packing>
</child>
@@ -2281,6 +2296,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
@@ -2501,6 +2517,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
@@ -2573,6 +2590,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">4</property>
</packing>
</child>
@@ -2644,6 +2662,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">6</property>
</packing>
</child>
@@ -2918,6 +2937,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">2</property>
</packing>
</child>
@@ -3086,6 +3106,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">5</property>
</packing>
</child>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index e2d8b1f36adc..a65a4c806b21 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -544,6 +544,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
@@ -645,6 +646,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">4</property>
</packing>
</child>
@@ -787,6 +789,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">7</property>
</packing>
</child>
@@ -927,6 +930,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">12</property>
</packing>
</child>
@@ -1096,6 +1100,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">16</property>
</packing>
</child>
@@ -1330,6 +1335,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
@@ -1485,6 +1491,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
@@ -1539,6 +1546,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="pack_type">end</property>
<property name="position">3</property>
</packing>
@@ -1554,6 +1562,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">4</property>
</packing>
</child>
@@ -1747,6 +1756,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -1914,6 +1924,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -2131,6 +2142,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -2317,6 +2329,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -2447,6 +2460,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -2668,6 +2682,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
@@ -2709,6 +2724,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">4</property>
</packing>
</child>
@@ -2889,6 +2905,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -2958,6 +2975,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
@@ -3075,6 +3093,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
@@ -3162,6 +3181,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">11</property>
</packing>
</child>
@@ -3257,6 +3277,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -3376,6 +3397,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -3929,6 +3951,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
@@ -4037,6 +4060,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -4091,6 +4115,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -4332,6 +4357,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -4378,6 +4404,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">5</property>
</packing>
</child>
@@ -4625,6 +4652,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -4813,6 +4841,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -4912,6 +4941,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -5050,6 +5080,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
@@ -5196,6 +5227,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">3</property>
</packing>
</child>
@@ -5418,6 +5450,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">6</property>
</packing>
</child>
@@ -5572,6 +5605,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">0</property>
</packing>
</child>
@@ -5644,6 +5678,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">12</property>
</packing>
</child>
@@ -6025,6 +6060,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">4</property>
</packing>
</child>
@@ -6201,6 +6237,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">7</property>
</packing>
</child>
@@ -6322,17 +6359,17 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="rotate1">
+ <object class="sfxlo-NotebookbarToolBox" id="rotate2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="RotateRight">
+ <object class="GtkToolButton" id="RotateReset">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="is_important">True</property>
- <property name="action_name">.uno:RotateRight</property>
+ <property name="action_name">.uno:RotateReset</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -6348,17 +6385,17 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox" id="rotate2">
+ <object class="sfxlo-NotebookbarToolBox" id="rotate1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="RotateReset">
+ <object class="GtkToolButton" id="RotateRight">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="is_important">True</property>
- <property name="action_name">.uno:RotateReset</property>
+ <property name="action_name">.uno:RotateRight</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -6540,6 +6577,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">2</property>
</packing>
</child>
@@ -6614,6 +6652,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">5</property>
</packing>
</child>
@@ -6699,6 +6738,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
@@ -6896,6 +6936,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">9</property>
</packing>
</child>
@@ -7031,6 +7072,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="padding">6</property>
<property name="position">11</property>
</packing>
</child>
More information about the Libreoffice-commits
mailing list