icon-themes/colibre/links.txt | 2
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 3
sc/uiconfig/scalc/ui/notebookbar.ui | 54
+++-------
sd/uiconfig/sdraw/ui/notebookbar.ui | 54
+++-------
sd/uiconfig/simpress/ui/notebookbar.ui | 54
+++-------
sw/uiconfig/swriter/ui/notebookbar.ui | 4
6 files changed, 64 insertions(+), 107 deletions(-)
New commits:
commit 1173358e599f9dc3ea086300e935a43ac3c3bb67
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Tue Dec 11 22:04:23 2018 +0100
Commit: andreas_kainz <kain...@gmail.com>
CommitDate: Mon Dec 17 15:59:03 2018 +0100
tdf#121581 update Tools tabb in NB
Change-Id: I788e97ce1f6422ba95a478fb1618773c850764f5
Reviewed-on: https://gerrit.libreoffice.org/65264
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 7d498f287ab0..eef9e8db1b75 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -919,6 +919,8 @@ cmd/sc_browseforward.png cmd/sc_nextrecord.png
# Macro
cmd/sc_macrosmenu.png res/im30821.png
+cmd/sc_macrodialog.png cmd/sc_scriptorganizer.png
+cmd/lc_macrodialog.png cmd/lc_scriptorganizer.png
# Help
cmd/sc_about.png res/mainapp_16.png
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index e13acb9d192f..f4613e2aa533 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5176,6 +5176,9 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">%PRODUCTNAME ~Basic...</value>
</prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
</node>
<node oor:name=".uno:MacroOrganizer?TabId:short=1" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui
b/sc/uiconfig/scalc/ui/notebookbar.ui
index f4efe6df47f9..fb3e5adbc753 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -1554,52 +1554,45 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="MenuTools-MacroOrganizer">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuTools-MacroSignature">
+ <object class="GtkMenuItem" id="MenuTools-MacroRecorder">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:MacroSignature</property>
+ <property name="action_name">.uno:MacroRecorder</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-ScriptOrganizer">
+ <object class="GtkMenuItem" id="MenuTools-RunMacro">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ScriptOrganizer</property>
+ <property name="action_name">.uno:RunMacro</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-ViewDataSourceBrowser">
+ <object class="GtkMenuItem" id="MenuTools-BasicIDEAppear">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ViewDataSourceBrowser</property>
+ <property name="action_name">.uno:BasicIDEAppear</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-BasicIDEAppear">
+ <object class="GtkMenuItem" id="MenuTools-MacroOrganizer">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BasicIDEAppear</property>
+ <property
name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-RunMacro">
+ <object class="GtkMenuItem" id="MenuTools-ScriptOrganizer">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:RunMacro</property>
+ <property name="action_name">.uno:ScriptOrganizer</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-MacroRecorder">
+ <object class="GtkMenuItem" id="MenuTools-MacroSignature">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:MacroRecorder</property>
+ <property name="action_name">.uno:MacroSignature</property>
</object>
</child>
<child>
@@ -1656,32 +1649,23 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-OpenXMLFilterSettings">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:OpenXMLFilterSettings</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuTools-PackageManagerDialog">
+ <object class="GtkMenuItem" id="MenuTools-ViewDataSourceBrowser">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property>
+ <property name="action_name">.uno:ViewDataSourceBrowser</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-UpdateMenu">
+ <object class="GtkSeparatorMenuItem" id="MenuTools-separator4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
- <property name="label" translatable="yes"
context="CalcNotebookbar|Tools">_Check for Updates...</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-OptionsTreeDialog">
+ <object class="GtkMenuItem" id="MenuTools-OpenXMLFilterSettings">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:OptionsTreeDialog</property>
+ <property name="action_name">.uno:OpenXMLFilterSettings</property>
</object>
</child>
</object>
@@ -13320,10 +13304,10 @@
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Tools-ScriptOrganizer">
+ <object class="GtkToolButton"
id="Tools-MacroDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:ScriptOrganizer</property>
+ <property
name="action_name">.uno:MacroDialog</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index bf497332dac1..fc6508027afd 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -1694,52 +1694,45 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="MenuTools-MacroOrganizer">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuTools-MacroSignature">
+ <object class="GtkMenuItem" id="MenuTools-MacroRecorder">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:MacroSignature</property>
+ <property name="action_name">.uno:MacroRecorder</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-ScriptOrganizer">
+ <object class="GtkMenuItem" id="MenuTools-RunMacro">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ScriptOrganizer</property>
+ <property name="action_name">.uno:RunMacro</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-ViewDataSourceBrowser">
+ <object class="GtkMenuItem" id="MenuTools-BasicIDEAppear">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ViewDataSourceBrowser</property>
+ <property name="action_name">.uno:BasicIDEAppear</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-BasicIDEAppear">
+ <object class="GtkMenuItem" id="MenuTools-MacroOrganizer">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BasicIDEAppear</property>
+ <property
name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-RunMacro">
+ <object class="GtkMenuItem" id="MenuTools-ScriptOrganizer">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:RunMacro</property>
+ <property name="action_name">.uno:ScriptOrganizer</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-MacroRecorder">
+ <object class="GtkMenuItem" id="MenuTools-MacroSignature">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:MacroRecorder</property>
+ <property name="action_name">.uno:MacroSignature</property>
</object>
</child>
<child>
@@ -1776,32 +1769,23 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-OpenXMLFilterSettings">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:OpenXMLFilterSettings</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuTools-PackageManagerDialog">
+ <object class="GtkMenuItem" id="MenuTools-ViewDataSourceBrowser">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property>
+ <property name="action_name">.uno:ViewDataSourceBrowser</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-UpdateMenu">
+ <object class="GtkSeparatorMenuItem" id="MenuTools-separator3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
- <property name="label" translatable="yes"
context="drawnotebookbar|Tools">_Check for Updates...</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-OptionsTreeDialog">
+ <object class="GtkMenuItem" id="MenuTools-OpenXMLFilterSettings">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:OptionsTreeDialog</property>
+ <property name="action_name">.uno:OpenXMLFilterSettings</property>
</object>
</child>
</object>
@@ -13676,10 +13660,10 @@
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Tools-ScriptOrganizer">
+ <object class="GtkToolButton"
id="Tools-MacroDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:ScriptOrganizer</property>
+ <property
name="action_name">.uno:MacroDialog</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui
b/sd/uiconfig/simpress/ui/notebookbar.ui
index 07f3136682ec..f7cf49d2d304 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -1812,52 +1812,45 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="MenuTools-MacroOrganizer">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuTools-MacroSignature">
+ <object class="GtkMenuItem" id="MenuTools-MacroRecorder">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:MacroSignature</property>
+ <property name="action_name">.uno:MacroRecorder</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-ScriptOrganizer">
+ <object class="GtkMenuItem" id="MenuTools-RunMacro">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ScriptOrganizer</property>
+ <property name="action_name">.uno:RunMacro</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-ViewDataSourceBrowser">
+ <object class="GtkMenuItem" id="MenuTools-BasicIDEAppear">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:ViewDataSourceBrowser</property>
+ <property name="action_name">.uno:BasicIDEAppear</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-BasicIDEAppear">
+ <object class="GtkMenuItem" id="MenuTools-MacroOrganizer">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:BasicIDEAppear</property>
+ <property
name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-RunMacro">
+ <object class="GtkMenuItem" id="MenuTools-ScriptOrganizer">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:RunMacro</property>
+ <property name="action_name">.uno:ScriptOrganizer</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-MacroRecorder">
+ <object class="GtkMenuItem" id="MenuTools-MacroSignature">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:MacroRecorder</property>
+ <property name="action_name">.uno:MacroSignature</property>
</object>
</child>
<child>
@@ -1894,32 +1887,23 @@
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-OpenXMLFilterSettings">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:OpenXMLFilterSettings</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="MenuTools-PackageManagerDialog">
+ <object class="GtkMenuItem" id="MenuTools-ViewDataSourceBrowser">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property>
+ <property name="action_name">.uno:ViewDataSourceBrowser</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-UpdateMenu">
+ <object class="GtkSeparatorMenuItem" id="MenuTools-separator3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
- <property name="label" translatable="yes"
context="impressnotebookbar|Tools">_Check for Updates...</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="MenuTools-OptionsTreeDialog">
+ <object class="GtkMenuItem" id="MenuTools-OpenXMLFilterSettings">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:OptionsTreeDialog</property>
+ <property name="action_name">.uno:OpenXMLFilterSettings</property>
</object>
</child>
</object>
@@ -13367,10 +13351,10 @@
<property
name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Tools-ScriptOrganizer">
+ <object class="GtkToolButton"
id="Tools-MacroDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:ScriptOrganizer</property>
+ <property
name="action_name">.uno:MacroDialog</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui
b/sw/uiconfig/swriter/ui/notebookbar.ui
index fb64b7fbe871..746b0996236a 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -14620,10 +14620,10 @@
<property name="can_focus">True</property>
<property
name="toolbar_style">both-horiz</property>
<child>
- <object class="GtkToolButton"
id="Tools-ScriptOrganizer">
+ <object class="GtkToolButton"
id="Tools-MacroDialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:ScriptOrganizer</property>
+ <property
name="action_name">.uno:MacroDialog</property>
</object>
<packing>
<property name="expand">False</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
