diff options
author | Szymon Kłos <eszkadev@gmail.com> | 2016-08-11 13:53:20 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2016-08-16 07:11:25 +0000 |
commit | af97c180983e5a8ac147b97f7773d483bba8cfef (patch) | |
tree | dc16d54bdb452b7ce2a18aa83bd1585ed6ea76e4 /officecfg | |
parent | 5b1095fc03e90506cb8ed956fafb528d4f6b0044 (diff) |
GSoC notebookbar: multiple .ui implementations
+ added menu controller for .uno:Notebookbar showing
all implementations
+ switching between .ui files
+ officecfg stores implementation description
+ added second implementation file notebookbar_groups.ui
Change-Id: I9f406daced7a111793f61a2e9f939cba27d92184
Reviewed-on: https://gerrit.libreoffice.org/28067
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Diffstat (limited to 'officecfg')
-rw-r--r-- | officecfg/Configuration_officecfg.mk | 1 | ||||
-rw-r--r-- | officecfg/files.mk | 1 | ||||
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 11 | ||||
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu | 33 | ||||
-rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/UI/Notebookbar.xcs | 53 |
5 files changed, 99 insertions, 0 deletions
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index 01741a5efdb7..388bf54fa393 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -165,6 +165,7 @@ $(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/d org/openoffice/Office/UI/DrawWindowState.xcu \ org/openoffice/Office/UI/ImpressWindowState.xcu \ org/openoffice/Office/UI/MathWindowState.xcu \ + org/openoffice/Office/UI/Notebookbar.xcu \ org/openoffice/Office/UI/ReportCommands.xcu \ org/openoffice/Office/UI/Sidebar.xcu \ org/openoffice/Office/UI/StartModuleWindowState.xcu \ diff --git a/officecfg/files.mk b/officecfg/files.mk index 69d0cf1e0a9f..ed3f460cfe64 100644 --- a/officecfg/files.mk +++ b/officecfg/files.mk @@ -81,6 +81,7 @@ officecfg_XCSFILES := \ Office/UI/ImpressWindowState \ Office/UI/MathCommands \ Office/UI/MathWindowState \ + Office/UI/Notebookbar \ Office/UI/ReportCommands \ Office/UI/Sidebar \ Office/UI/StartModuleCommands \ diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index 0f7d229ed4d0..14f6fc649293 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -347,6 +347,17 @@ <value>anchor</value> </prop> </node> + <node oor:name="c29" oor:op="replace"> + <prop oor:name="Command"> + <value>.uno:Notebookbar</value> + </prop> + <prop oor:name="Module"> + <value/> + </prop> + <prop oor:name="Controller"> + <value>com.sun.star.comp.framework.NotebookbarMenuController</value> + </prop> + </node> </node> <node oor:name="ToolBar"> <node oor:name="ZoomToolBox" oor:op="replace"> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu new file mode 100644 index 000000000000..776dd9fdf545 --- /dev/null +++ b/officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu @@ -0,0 +1,33 @@ +<?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"> + <value></value> + </prop> + <node oor:name="Implementations"> + <node oor:name="Off" oor:op="replace"> + <prop oor:name="Label"> + <value xml:lang="en-US">Off</value> + </prop> + <prop oor:name="File"> + <value></value> + </prop> + </node> + <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> + </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> + </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 new file mode 100644 index 000000000000..51dbeed451f6 --- /dev/null +++ b/officecfg/registry/schema/org/openoffice/Office/UI/Notebookbar.xcs @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + --> +<!DOCTYPE oor:component-schema SYSTEM "../../../../../component-schema.dtd"> +<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Notebookbar" oor:package="org.openoffice.Office.UI" xml:lang="en-US"> + <info> + <desc>Contains information about Notebookbar.</desc> + </info> + <templates> + <group oor:name="Implementation"> + <info> + <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> + </group> + </templates> + <component> + <prop oor:name="Active" oor:type="xs:string" oor:nillable="false"> + <info> + <desc>Contains name of currently used implementation.</desc> + </info> + </prop> + <set oor:name="Implementations" oor:node-type="Implementation"> + <info> + <desc>List of implementations.</desc> + </info> + </set> + </component> +</oor:component-schema> |