diff options
author | Szymon Kłos <eszkadev@gmail.com> | 2016-09-21 15:28:26 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-09-22 09:02:48 +0000 |
commit | af3df5340d5d1a26b0d031b03c85cf715ef6ad57 (patch) | |
tree | bb44ed5e13fe5a75b3377e1fe83d15193387feeb /officecfg | |
parent | Fix sh quoting of ; and \ (the latter in the cygpath -w output) (diff) | |
download | core-af3df5340d5d1a26b0d031b03c85cf715ef6ad57.tar.gz core-af3df5340d5d1a26b0d031b03c85cf715ef6ad57.zip |
Notebookbar: separate .ui files settings for each module
* each module have own list of implementations
* deleted placeholder .ui files from Calc and Impress
Change-Id: Ib7d4cafbb332447e769ca753003d31e9f3025f0a
Reviewed-on: https://gerrit.libreoffice.org/29143
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'officecfg')
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu | 104 | ||||
-rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/UI/Notebookbar.xcs | 44 |
2 files changed, 104 insertions, 44 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu index 4b3c45ace659..e339abb4fcd1 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu @@ -1,42 +1,82 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE oor:component-data SYSTEM "../../../../../component-update.dtd"> <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:install="http://openoffice.org/2004/installation" oor:name="Notebookbar" oor:package="org.openoffice.Office.UI"> - <prop oor:name="Active"> + <prop oor:name="ActiveWriter"> <value>notebookbar.ui</value> </prop> - <node oor:name="Implementations"> - <node oor:name="Tabbed" oor:op="replace"> - <prop oor:name="Label"> - <value xml:lang="en-US">Tabbed</value> - </prop> - <prop oor:name="File"> - <value>notebookbar.ui</value> - </prop> - <prop oor:name="HasMenubar"> - <value>false</value> - </prop> + <prop oor:name="ActiveCalc"> + <value>notebookbar.ui</value> + </prop> + <prop oor:name="ActiveImpress"> + <value>notebookbar.ui</value> + </prop> + <node oor:name="Applications"> + <node oor:name="Writer" oor:op="replace"> + <node oor:name="Implementations"> + <node oor:name="Tabbed" oor:op="replace"> + <prop oor:name="Label"> + <value xml:lang="en-US">Tabbed</value> + </prop> + <prop oor:name="File"> + <value>notebookbar.ui</value> + </prop> + <prop oor:name="HasMenubar"> + <value>false</value> + </prop> + </node> + <node oor:name="Groups" oor:op="replace"> + <prop oor:name="Label"> + <value xml:lang="en-US">Contextual groups</value> + </prop> + <prop oor:name="File"> + <value>notebookbar_groups.ui</value> + </prop> + <prop oor:name="HasMenubar"> + <value>true</value> + </prop> + </node> + <node oor:name="Single" oor:op="replace"> + <prop oor:name="Label"> + <value xml:lang="en-US">Contextual single</value> + </prop> + <prop oor:name="File"> + <value>notebookbar_single.ui</value> + </prop> + <prop oor:name="HasMenubar"> + <value>true</value> + </prop> + </node> + </node> </node> - <node oor:name="Groups" oor:op="replace"> - <prop oor:name="Label"> - <value xml:lang="en-US">Contextual groups</value> - </prop> - <prop oor:name="File"> - <value>notebookbar_groups.ui</value> - </prop> - <prop oor:name="HasMenubar"> - <value>true</value> - </prop> + <node oor:name="Calc" oor:op="replace"> + <node oor:name="Implementations"> + <node oor:name="Tabbed" oor:op="replace"> + <prop oor:name="Label"> + <value xml:lang="en-US">Tabbed</value> + </prop> + <prop oor:name="File"> + <value>notebookbar.ui</value> + </prop> + <prop oor:name="HasMenubar"> + <value>false</value> + </prop> + </node> + </node> </node> - <node oor:name="Single" oor:op="replace"> - <prop oor:name="Label"> - <value xml:lang="en-US">Contextual single</value> - </prop> - <prop oor:name="File"> - <value>notebookbar_single.ui</value> - </prop> - <prop oor:name="HasMenubar"> - <value>true</value> - </prop> + <node oor:name="Impress" oor:op="replace"> + <node oor:name="Implementations"> + <node oor:name="Tabbed" oor:op="replace"> + <prop oor:name="Label"> + <value xml:lang="en-US">Tabbed</value> + </prop> + <prop oor:name="File"> + <value>notebookbar.ui</value> + </prop> + <prop oor:name="HasMenubar"> + <value>false</value> + </prop> + </node> + </node> </node> </node> </oor:component-data> diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Notebookbar.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Notebookbar.xcs index ace1d508aefb..658df995b3de 100644 --- a/officecfg/registry/schema/org/openoffice/Office/UI/Notebookbar.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/UI/Notebookbar.xcs @@ -27,29 +27,49 @@ <desc>The implementation description container.</desc> </info> <prop oor:name="Label" oor:type="xs:string" oor:nillable="false" oor:localized="true"> + <info> + <desc>The implementation name.</desc> + </info> + </prop> + <prop oor:name="File" oor:type="xs:string" oor:nillable="false"> + <info> + <desc>The .ui file name.</desc> + </info> + </prop> + <prop oor:name="HasMenubar" oor:type="xs:boolean" oor:nillable="false"> + <info> + <desc>Determines if menubar is visible.</desc> + </info> + </prop> + </group> + <group oor:name="Application"> <info> - <desc>The implementation name.</desc> + <desc>Describes notebookbar settings for one application.</desc> </info> - </prop> - <prop oor:name="File" oor:type="xs:string" oor:nillable="false"> + <set oor:name="Implementations" oor:node-type="Implementation"> + <info> + <desc>List of implementations.</desc> + </info> + </set> + </group> + </templates> + <component> + <prop oor:name="ActiveWriter" oor:type="xs:string" oor:nillable="false"> <info> - <desc>The .ui file name.</desc> + <desc>Contains name of currently used implementation in the Writer module.</desc> </info> </prop> - <prop oor:name="HasMenubar" oor:type="xs:boolean" oor:nillable="false"> + <prop oor:name="ActiveCalc" oor:type="xs:string" oor:nillable="false"> <info> - <desc>Determines if menubar is visible.</desc> + <desc>Contains name of currently used implementation in the Calc module.</desc> </info> </prop> - </group> - </templates> - <component> - <prop oor:name="Active" oor:type="xs:string" oor:nillable="false"> + <prop oor:name="ActiveImpress" oor:type="xs:string" oor:nillable="false"> <info> - <desc>Contains name of currently used implementation.</desc> + <desc>Contains name of currently used implementation in the Impress module.</desc> </info> </prop> - <set oor:name="Implementations" oor:node-type="Implementation"> + <set oor:name="Applications" oor:node-type="Application"> <info> <desc>List of implementations.</desc> </info> |