[Libreoffice-commits] core.git: 2 commits - officecfg/registry sfx2/sdi sw/uiconfig
Szymon Kłos
eszkadev at gmail.com
Wed Aug 10 21:54:14 UTC 2016
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 30 +++++++++-
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 14 ++++
sfx2/sdi/sfx.sdi | 4 -
sw/uiconfig/swriter/ui/notebookbar.ui | 14 ----
4 files changed, 42 insertions(+), 20 deletions(-)
New commits:
commit 554dc4c33e8e967ef78a8ef3d637102cc9f73ce4
Author: Szymon Kłos <eszkadev at gmail.com>
Date: Wed Aug 10 23:24:35 2016 +0200
GSoC notebookbar: changed labels
Change-Id: I824e7b871edb9506a25ca7918431bf917e237709
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index a77d95c..6bb9f21 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1870,6 +1870,9 @@
</node>
<node oor:name=".uno:ZoomOptimal" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Optimal</value>
+ </prop>
+ <prop oor:name="ContextLabel" oor:type="xs:string">
<value xml:lang="en-US">Optimal view</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -2743,9 +2746,12 @@
</prop>
</node>
<node oor:name=".uno:StyleNewByExample" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
+ <prop oor:name="ContextLabel" oor:type="xs:string">
<value xml:lang="en-US">~New Style...</value>
</prop>
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">New</value>
+ </prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
@@ -2767,9 +2773,12 @@
</prop>
</node>
<node oor:name=".uno:StyleUpdateByExample" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
+ <prop oor:name="ContextLabel" oor:type="xs:string">
<value xml:lang="en-US">~Update Style</value>
</prop>
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Update</value>
+ </prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
@@ -4173,6 +4182,9 @@
</node>
<node oor:name=".uno:GridVisible" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Grid</value>
+ </prop>
+ <prop oor:name="ContextLabel" oor:type="xs:string">
<value xml:lang="en-US">~Display Grid</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -4499,6 +4511,9 @@
</node>
<node oor:name=".uno:SpellOnline" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Auto Spellcheck</value>
+ </prop>
+ <prop oor:name="ContextLabel" oor:type="xs:string">
<value xml:lang="en-US">~Automatic Spell Checking</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -4525,6 +4540,9 @@
</node>
<node oor:name=".uno:InsertSymbol" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Symbol</value>
+ </prop>
+ <prop oor:name="ContextLabel" oor:type="xs:string">
<value xml:lang="en-US">S~pecial Character...</value>
</prop>
<prop oor:name="TooltipLabel" oor:type="xs:string">
@@ -4764,11 +4782,14 @@
</node>
<node oor:name=".uno:Gallery" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Media ~Gallery</value>
+ <value xml:lang="en-US">Gallery</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
<value xml:lang="en-US">~Gallery</value>
</prop>
+ <prop oor:name="TooltipLabel" oor:type="xs:string">
+ <value xml:lang="en-US">Open Clip Art and Media Gallery</value>
+ </prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>9</value>
</prop>
@@ -5939,6 +5960,9 @@
</node>
<node oor:name=".uno:InsertAVMedia" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Media</value>
+ </prop>
+ <prop oor:name="ContextLabel" oor:type="xs:string">
<value xml:lang="en-US">Audio or ~Video...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index aac3b05..a5b7fcb 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -134,6 +134,9 @@
</node>
<node oor:name=".uno:InsertMultiIndex" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Table of Contents</value>
+ </prop>
+ <prop oor:name="TooltipLabel" oor:type="xs:string">
<value xml:lang="en-US">Insert Table of Contents, Index or Bibliography</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
@@ -177,11 +180,17 @@
</node>
<node oor:name=".uno:UpdateAllIndexes" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Update All</value>
+ </prop>
+ <prop oor:name="ContextLabel" oor:type="xs:string">
<value xml:lang="en-US">Indexes and ~Tables</value>
</prop>
</node>
<node oor:name=".uno:UpdateCurIndex" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Update Index</value>
+ </prop>
+ <prop oor:name="ContextLabel" oor:type="xs:string">
<value xml:lang="en-US">Current ~Index</value>
</prop>
<prop oor:name="PopupLabel" oor:type="xs:string">
@@ -484,11 +493,14 @@
</node>
<node oor:name=".uno:InsertFrame" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Insert Frame</value>
+ <value xml:lang="en-US">Frame</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
<value xml:lang="en-US">F~rame...</value>
</prop>
+ <prop oor:name="TooltipLabel" oor:type="xs:string">
+ <value xml:lang="en-US">Insert Frame</value>
+ </prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
</prop>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index 1327d69..6f31f51 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -1554,7 +1554,6 @@
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="StyleUpdateByExample">
- <property name="label" translatable="yes">Update</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1570,7 +1569,6 @@
</child>
<child>
<object class="GtkButton" id="StyleNewByExample">
- <property name="label" translatable="yes">New</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1586,7 +1584,6 @@
</child>
<child>
<object class="GtkButton" id="EditStyle">
- <property name="label" translatable="yes">Edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1922,7 +1919,6 @@
<property name="tooltip_text" translatable="yes">Gallery</property>
<child>
<object class="vcllo-SmallButton" id="Gallery">
- <property name="label" translatable="yes">Gallery</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1973,11 +1969,9 @@
<property name="tooltip_text" translatable="yes">Symbol</property>
<child>
<object class="vcllo-SmallButton" id="InsertSymbol">
- <property name="label" translatable="yes">Symbol</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Insert Audio or Video</property>
<property name="action_name">.uno:InsertSymbol</property>
<property name="image">InsertSymbolImg</property>
<property name="relief">none</property>
@@ -2028,7 +2022,6 @@
</child>
<child>
<object class="GtkButton" id="InsertAVMedia">
- <property name="label" translatable="yes">Media</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -2480,7 +2473,6 @@
<property name="orientation">vertical</property>
<child>
<object class="GtkButton" id="InsertFrame">
- <property name="label" translatable="yes">Frame</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -2848,7 +2840,6 @@
<property name="spacing">6</property>
<child>
<object class="vcllo-SmallButton" id="InsertMultiIndex">
- <property name="label" translatable="yes">Table of Contents</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -2888,7 +2879,6 @@
<property name="orientation">vertical</property>
<child>
<object class="GtkButton" id="UpdateCurIndex">
- <property name="label" translatable="yes">Update Index</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -2905,7 +2895,6 @@
</child>
<child>
<object class="GtkButton" id="UpdateAllIndexes">
- <property name="label" translatable="yes">Update All</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -3235,7 +3224,6 @@
<property name="can_focus">False</property>
<child>
<object class="vcllo-SmallButton" id="SpellOnline">
- <property name="label" translatable="yes">Auto Spellcheck</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -3826,7 +3814,6 @@
</child>
<child>
<object class="GtkButton" id="GridVisible">
- <property name="label" translatable="yes">Grid</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -3958,7 +3945,6 @@
</child>
<child>
<object class="vcllo-SmallButton" id="ZoomOptimal">
- <property name="label" translatable="yes">Optimal</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
commit d409aeaa23525e1494ef50c0453c4e7335f01945
Author: Szymon Kłos <eszkadev at gmail.com>
Date: Wed Aug 10 22:22:09 2016 +0200
GSoC notebookbar: slot available only in the menubar
Change-Id: Ifaded8c158515e9d21229f91502a3873f17fc60b
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 5275aef..3edca8d 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -2635,9 +2635,9 @@ SfxBoolItem Notebookbar SID_NOTEBOOKBAR
RecordPerSet;
Asynchron;
- AccelConfig = TRUE,
+ AccelConfig = FALSE,
MenuConfig = TRUE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_VIEW;
]
More information about the Libreoffice-commits
mailing list