mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GSoC notebookbar: multiple .ui implementations

Browse Source 
+ 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>
This commit is contained in:
Szymon Kłos 2016-08-11 13:53:20 +02:00 committed by Samuel Mehrbrodt
parent 5b1095fc03
commit af97c18098
26 changed files with 938 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/Library_fwl.mk
View File

@ -24,6 +24,7 @@ $(eval $(call gb_Library_set_componentfile,fwl,framework/util/fwl))
$(eval $(call gb_Library_set_include,fwl,\
-I$(SRCDIR)/framework/inc \
-I$(SRCDIR)/framework/source/inc \
-I$(WORKDIR)/CustomTarget/officecfg/registry \
$$(INCLUDE) \
))
@ -70,6 +71,7 @@ $(eval $(call gb_Library_add_exception_objects,fwl,\
framework/source/uielement/macrosmenucontroller \
framework/source/uielement/newmenucontroller \
framework/source/uielement/toolbarsmenucontroller \
framework/source/uielement/notebookbarmenucontroller \
))
# vim: set noet sw=4 ts=4:

1
framework/inc/services.h
View File

@ -52,6 +52,7 @@ namespace framework{
#define IMPLEMENTATIONNAME_FOOTERMENUCONTROLLER "com.sun.star.comp.framework.FooterMenuController"
#define IMPLEMENTATIONNAME_NEWMENUCONTROLLER "com.sun.star.comp.framework.NewMenuController"
#define IMPLEMENTATIONNAME_TOOLBARSMENUCONTROLLER "com.sun.star.comp.framework.ToolBarsMenuController"
#define IMPLEMENTATIONNAME_NOTEBOOKBARMENUCONTROLLER "com.sun.star.comp.framework.NotebookbarMenuController"
#define IMPLEMENTATIONNAME_HELPONSTARTUP "com.sun.star.comp.framework.HelpOnStartup"
#define IMPLEMENTATIONNAME_SHELLJOB "com.sun.star.comp.framework.ShellJob"
#define IMPLEMENTATIONNAME_FWK_TASKCREATOR "com.sun.star.comp.framework.TaskCreator"

86
framework/inc/uielement/notebookbarmenucontroller.hxx Normal file
View File

@ -0,0 +1,86 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* 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 .
*/
#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_NOTEBOOKBARMENUCONTROLLER_HXX
#define INCLUDED_FRAMEWORK_INC_UIELEMENT_NOTEBOOKBARMENUCONTROLLER_HXX
#include <macros/xserviceinfo.hxx>
#include <stdtypes.h>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
#include <com/sun/star/frame/XPopupMenuController.hpp>
#include <svtools/popupmenucontrollerbase.hxx>
#include <toolkit/awt/vclxmenu.hxx>
#include <cppuhelper/weak.hxx>
#include <rtl/ustring.hxx>
#include <vector>
namespace framework
{
class NotebookbarMenuController : public svt::PopupMenuControllerBase
{
using svt::PopupMenuControllerBase::disposing;
public:
NotebookbarMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext );
virtual ~NotebookbarMenuController();
// XServiceInfo
DECLARE_XSERVICEINFO
// XPopupMenuController
virtual void SAL_CALL setPopupMenu( const css::uno::Reference< css::awt::XPopupMenu >& PopupMenu ) throw (css::uno::RuntimeException, std::exception) override;
// XStatusListener
virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
// XMenuListener
virtual void SAL_CALL itemSelected( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL itemActivated( const css::awt::MenuEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override;
// XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) override;
struct ExecuteInfo
{
css::uno::Reference< css::frame::XDispatch > xDispatch;
css::util::URL aTargetURL;
css::uno::Sequence< css::beans::PropertyValue > aArgs;
};
DECL_STATIC_LINK_TYPED( NotebookbarMenuController, ExecuteHdl_Impl, void*, void );
private:
void fillPopupMenu( css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
css::uno::Reference< css::uno::XComponentContext > m_xContext;
};
}
#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_NOTEBOOKBARMENUCONTROLLER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
framework/source/register/registertemp.cxx
View File

@ -50,6 +50,7 @@
#include <uielement/macrosmenucontroller.hxx>
#include <uielement/newmenucontroller.hxx>
#include <uielement/toolbarsmenucontroller.hxx>
#include <uielement/notebookbarmenucontroller.hxx>
COMPONENTGETFACTORY ( fwl,
IFFACTORY( ::framework::MediaTypeDetectionHelper )
@ -61,6 +62,7 @@ COMPONENTGETFACTORY ( fwl,
IFFACTORY( ::framework::DispatchRecorder ) else
IFFACTORY( ::framework::DispatchRecorderSupplier ) else
IFFACTORY( ::framework::ToolbarsMenuController ) else
IFFACTORY( ::framework::NotebookbarMenuController ) else
IFFACTORY( ::framework::FontMenuController ) else
IFFACTORY( ::framework::MacrosMenuController ) else
IFFACTORY( ::framework::NewMenuController ) else

270
framework/source/uielement/notebookbarmenucontroller.cxx Normal file
View File

@ -0,0 +1,270 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* 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 .
*/
#include <uielement/notebookbarmenucontroller.hxx>
#include "services.h"
#include <framework/sfxhelperfunctions.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/awt/MenuItemStyle.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/ui/UIElementType.hpp>
#include <officecfg/Office/UI/Notebookbar.hxx>
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <rtl/ustrbuf.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/window.hxx>
#include <svtools/menuoptions.hxx>
#include <svtools/miscopt.hxx>
#include <unotools/confignode.hxx>
// Defines
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::ui;
namespace framework
{
DEFINE_XSERVICEINFO_MULTISERVICE_2 ( NotebookbarMenuController ,
OWeakObject ,
SERVICENAME_POPUPMENUCONTROLLER ,
IMPLEMENTATIONNAME_NOTEBOOKBARMENUCONTROLLER
)
DEFINE_INIT_SERVICE ( NotebookbarMenuController, {} )
NotebookbarMenuController::NotebookbarMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) :
svt::PopupMenuControllerBase( xContext ),
m_xContext( xContext )
{
}
NotebookbarMenuController::~NotebookbarMenuController()
{
}
void NotebookbarMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu )
{
if ( SvtMiscOptions().DisableUICustomization() )
return;
SolarMutexGuard aSolarMutexGuard;
resetPopupMenu( rPopupMenu );
const utl::OConfigurationTreeRoot aImplementationsNode(
m_xContext,
OUString("org.openoffice.Office.UI.Notebookbar/Implementations"),
false);
if ( !aImplementationsNode.isValid() )
return;
const Sequence<OUString> aImplNodeNames (aImplementationsNode.getNodeNames());
const sal_Int32 nCount(aImplNodeNames.getLength());
for ( sal_Int32 nReadIndex = 0; nReadIndex < nCount; ++nReadIndex )
{
const utl::OConfigurationNode aImplNode(aImplementationsNode.openNode(aImplNodeNames[nReadIndex]));
if ( !aImplNode.isValid() )
continue;
OUString aLabel = comphelper::getString( aImplNode.getNodeValue( "Label" ) );
OUString aFile = comphelper::getString( aImplNode.getNodeValue( "File" ) );
m_xPopupMenu->insertItem( nReadIndex+1, aLabel, css::awt::MenuItemStyle::RADIOCHECK, m_xPopupMenu->getItemCount() );
rPopupMenu->setCommand( nReadIndex+1, aFile );
}
}
// XEventListener
void SAL_CALL NotebookbarMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception )
{
Reference< css::awt::XMenuListener > xHolder(static_cast<OWeakObject *>(this), UNO_QUERY );
osl::MutexGuard aLock( m_aMutex );
m_xFrame.clear();
m_xDispatch.clear();
if ( m_xPopupMenu.is() )
m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(static_cast<OWeakObject *>(this), UNO_QUERY ));
m_xPopupMenu.clear();
}
// XStatusListener
void SAL_CALL NotebookbarMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception )
{
OUString aFeatureURL( Event.FeatureURL.Complete );
// All other status events will be processed here
osl::ClearableMutexGuard aLock( m_aMutex );
Reference< css::awt::XPopupMenu > xPopupMenu( m_xPopupMenu );
aLock.clear();
if ( xPopupMenu.is() )
{
SolarMutexGuard aGuard;
VCLXPopupMenu* pXPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( xPopupMenu ));
PopupMenu* pVCLPopupMenu = pXPopupMenu ? static_cast<PopupMenu *>(pXPopupMenu->GetMenu()) : nullptr;
SAL_WARN_IF(!pVCLPopupMenu, "fwk.uielement", "worrying lack of popup menu");
if (!pVCLPopupMenu)
return;
bool bSetCheckmark = false;
bool bCheckmark = false;
for ( sal_uInt16 i = 0; i < pVCLPopupMenu->GetItemCount(); i++ )
{
sal_uInt16 nId = pVCLPopupMenu->GetItemId( i );
if ( nId == 0 )
continue;
OUString aCmd = pVCLPopupMenu->GetItemCommand( nId );
if ( aCmd == aFeatureURL )
{
// Enable/disable item
pVCLPopupMenu->EnableItem( nId, Event.IsEnabled );
// Checkmark
if ( Event.State >>= bCheckmark )
bSetCheckmark = true;
if ( bSetCheckmark )
pVCLPopupMenu->CheckItem( nId, bCheckmark );
else
{
OUString aItemText;
if ( Event.State >>= aItemText )
pVCLPopupMenu->SetItemText( nId, aItemText );
}
}
}
}
}
// XMenuListener
void SAL_CALL NotebookbarMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception)
{
Reference< css::awt::XPopupMenu > xPopupMenu;
Reference< XURLTransformer > xURLTransformer;
Reference< XFrame > xFrame;
Reference< XNameAccess > xPersistentWindowState;
osl::ClearableMutexGuard aLock( m_aMutex );
xPopupMenu = m_xPopupMenu;
xURLTransformer = m_xURLTransformer;
xFrame = m_xFrame;
aLock.clear();
if ( xPopupMenu.is() )
{
VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(VCLXPopupMenu::GetImplementation( xPopupMenu ));
if ( pPopupMenu )
{
SolarMutexGuard aSolarMutexGuard;
PopupMenu* pVCLPopupMenu = static_cast<PopupMenu *>(pPopupMenu->GetMenu());
OUString aCmd( pVCLPopupMenu->GetItemCommand( rEvent.MenuId ));
URL aTargetURL;
Sequence<PropertyValue> aArgs;
OUStringBuffer aBuf(".uno:Notebookbar?File:string=");
aBuf.append( aCmd );
aTargetURL.Complete = aBuf.makeStringAndClear();
std::shared_ptr<comphelper::ConfigurationChanges> batch( comphelper::ConfigurationChanges::create( m_xContext ) );
officecfg::Office::UI::Notebookbar::Active::set( aCmd, batch );
batch->commit();
xURLTransformer->parseStrict( aTargetURL );
Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
if ( xDispatchProvider.is() )
{
Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch(
aTargetURL, OUString(), 0 );
ExecuteInfo* pExecuteInfo = new ExecuteInfo;
pExecuteInfo->xDispatch = xDispatch;
pExecuteInfo->aTargetURL = aTargetURL;
pExecuteInfo->aArgs = aArgs;
Application::PostUserEvent( LINK(nullptr, NotebookbarMenuController, ExecuteHdl_Impl), pExecuteInfo );
}
}
}
}
void SAL_CALL NotebookbarMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception)
{
OUString aActive = officecfg::Office::UI::Notebookbar::Active::get( m_xContext );
for ( int i = 0; i < m_xPopupMenu->getItemCount(); ++i )
m_xPopupMenu->checkItem( i+1, ( aActive.compareTo( m_xPopupMenu->getCommand( i+1 ) ) == 0 ) );
}
// XPopupMenuController
void SAL_CALL NotebookbarMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException, std::exception )
{
osl::MutexGuard aLock( m_aMutex );
throwIfDisposed();
if ( m_xFrame.is() && !m_xPopupMenu.is() )
{
// Create popup menu on demand
SolarMutexGuard aSolarMutexGuard;
m_xPopupMenu = xPopupMenu;
m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >( static_cast<OWeakObject*>(this), UNO_QUERY ));
fillPopupMenu( m_xPopupMenu );
}
}
IMPL_STATIC_LINK_TYPED( NotebookbarMenuController, ExecuteHdl_Impl, void*, p, void )
{
ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p);
try
{
// Asynchronous execution as this can lead to our own destruction!
// Framework can recycle our current frame and the layout manager disposes all user interface
// elements if a component gets detached from its frame!
if ( pExecuteInfo->xDispatch.is() )
{
pExecuteInfo->xDispatch->dispatch( pExecuteInfo->aTargetURL, pExecuteInfo->aArgs );
}
}
catch ( const Exception& )
{
}
delete pExecuteInfo;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

3
framework/util/fwl.component
View File

@ -64,6 +64,9 @@
<implementation name="com.sun.star.comp.framework.ToolBarsMenuController">
<service name="com.sun.star.frame.PopupMenuController"/>
</implementation>
<implementation name="com.sun.star.comp.framework.NotebookbarMenuController">
<service name="com.sun.star.frame.PopupMenuController"/>
</implementation>
<implementation name="com.sun.star.comp.framework.UriAbbreviation">
<service name="com.sun.star.util.UriAbbreviation"/>
</implementation>

2
include/sfx2/notebookbar/SfxNotebookBar.hxx
View File

@ -26,6 +26,8 @@ public:
static void CloseMethod(SfxBindings& rBindings);
static void CloseMethod(SystemWindow* pSysWindow);
static bool IsActive();
/// Function to be called from the sdi's ExecMethod.
static void ExecMethod(SfxBindings& rBindings);

1
officecfg/Configuration_officecfg.mk
View File

@ -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 \

1
officecfg/files.mk
View File

@ -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 \

11
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
View File

@ -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">

33
officecfg/registry/data/org/openoffice/Office/UI/Notebookbar.xcu Normal file
View File

@ -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>

53
officecfg/registry/schema/org/openoffice/Office/UI/Notebookbar.xcs Normal file
View File

@ -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>

2
postprocess/CustomTarget_registry.mk
View File

@ -184,6 +184,7 @@ postprocess_FILES_main := \
$(postprocess_XCS)/Office/UI/GenericCategories.xcs \
$(postprocess_XCS)/Office/UI/GenericCommands.xcs \
$(postprocess_XCS)/Office/UI/GlobalSettings.xcs \
$(postprocess_XCS)/Office/UI/Notebookbar.xcs \
$(postprocess_XCS)/Office/UI/Sidebar.xcs \
$(postprocess_XCS)/Office/UI/StartModuleCommands.xcs \
$(postprocess_XCS)/Office/UI/StartModuleWindowState.xcs \
@ -247,6 +248,7 @@ postprocess_FILES_main := \
$(postprocess_XCU)/Office/UI/Factories.xcu \
$(postprocess_XCU)/Office/UI/GenericCategories.xcu \
$(postprocess_XCU)/Office/UI/GenericCommands.xcu \
$(postprocess_XCU)/Office/UI/Notebookbar.xcu \
$(postprocess_XCU)/Office/UI/Sidebar.xcu \
$(postprocess_XCU)/Office/UI/StartModuleCommands.xcu \
$(postprocess_XCU)/Office/UI/StartModuleWindowState.xcu \

1
sc/UIConfig_scalc.mk
View File

@ -139,6 +139,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/leftheaderdialog \
sc/uiconfig/scalc/ui/namerangesdialog \
sc/uiconfig/scalc/ui/notebookbar \
sc/uiconfig/scalc/ui/notebookbar_groups \
sc/uiconfig/scalc/ui/managenamesdialog \
sc/uiconfig/scalc/ui/movecopysheet \
sc/uiconfig/scalc/ui/movingaveragedialog \

12
sc/source/ui/docshell/docsh4.cxx
View File

@ -1097,8 +1097,16 @@ void ScDocShell::Execute( SfxRequest& rReq )
break;
case SID_NOTEBOOKBAR:
{
if (pBindings)
const SfxStringItem* pFile = rReq.GetArg<SfxStringItem>( SID_NOTEBOOKBAR );
if ( pBindings && ( !pFile || ( pFile && !sfx2::SfxNotebookBar::IsActive() ) ) )
sfx2::SfxNotebookBar::ExecMethod(*pBindings);
else if ( pBindings && pFile && pFile->GetValue().isEmpty() )
{
sfx2::SfxNotebookBar::CloseMethod(*pBindings);
if ( sfx2::SfxNotebookBar::IsActive() )
sfx2::SfxNotebookBar::ExecMethod(*pBindings);
}
}
break;
default:
@ -1858,7 +1866,7 @@ void ScDocShell::GetState( SfxItemSet &rSet )
case SID_NOTEBOOKBAR:
{
if (GetViewBindings())
sfx2::SfxNotebookBar::StateMethod(*GetViewBindings(), "modules/scalc/ui/notebookbar.ui");
sfx2::SfxNotebookBar::StateMethod(*GetViewBindings(), "modules/scalc/ui/");
}
break;

133
sc/uiconfig/scalc/ui/notebookbar_groups.ui Normal file
View File

@ -0,0 +1,133 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.12"/>
<requires lib="LibreOffice" version="1.0"/>
<!-- interface-local-resource-path ../../../icon-themes/galaxy/cmd/ -->
<object class="GtkGrid" id="NotebookBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="vcllo-NotebookbarTabControl" id="notebook1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child>
<object class="sfxlo-PriorityHBox" id="FileBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="sfxlo-DropdownBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
<style>
<class name="priority-1"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">7</property>
</packing>
</child>
</object>
</child>
<child type="tab">
<object class="GtkLabel" id="FileLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">File</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
</interface>

1
sd/UIConfig_simpress.mk
View File

@ -120,6 +120,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/interactionpage \
sd/uiconfig/simpress/ui/masterlayoutdlg \
sd/uiconfig/simpress/ui/notebookbar \
sd/uiconfig/simpress/ui/notebookbar_groups \
sd/uiconfig/simpress/ui/optimpressgeneralpage \
sd/uiconfig/simpress/ui/photoalbum \
sd/uiconfig/simpress/ui/presentationdialog \

17
sd/source/ui/docshell/docshel3.cxx
View File

@ -320,8 +320,21 @@ void DrawDocShell::Execute( SfxRequest& rReq )
case SID_NOTEBOOKBAR:
{
if (mpViewShell)
sfx2::SfxNotebookBar::ExecMethod(mpViewShell->GetFrame()->GetBindings());
const SfxStringItem* pFile = rReq.GetArg<SfxStringItem>( SID_NOTEBOOKBAR );
if ( mpViewShell )
{
SfxBindings& rBindings( mpViewShell->GetFrame()->GetBindings() );
if ( !pFile || ( pFile && !sfx2::SfxNotebookBar::IsActive() ) )
sfx2::SfxNotebookBar::ExecMethod( rBindings );
else if ( pFile && pFile->GetValue().isEmpty() )
{
sfx2::SfxNotebookBar::CloseMethod( rBindings );
if ( sfx2::SfxNotebookBar::IsActive() )
sfx2::SfxNotebookBar::ExecMethod( rBindings );
}
}
}
break;

2
sd/source/ui/docshell/docshell.cxx
View File

@ -274,7 +274,7 @@ void DrawDocShell::GetState(SfxItemSet &rSet)
case SID_NOTEBOOKBAR:
{
sfx2::SfxNotebookBar::StateMethod(mpViewShell->GetFrame()->GetBindings(), "modules/simpress/ui/notebookbar.ui");
sfx2::SfxNotebookBar::StateMethod(mpViewShell->GetFrame()->GetBindings(), "modules/simpress/ui/");
}
break;

133
sd/uiconfig/simpress/ui/notebookbar_groups.ui Normal file
View File

@ -0,0 +1,133 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.12"/>
<requires lib="LibreOffice" version="1.0"/>
<!-- interface-local-resource-path ../../../icon-themes/galaxy/cmd/ -->
<object class="GtkGrid" id="NotebookBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="vcllo-NotebookbarTabControl" id="notebook1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child>
<object class="sfxlo-PriorityHBox" id="FileBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="sfxlo-DropdownBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
<style>
<class name="priority-1"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">7</property>
</packing>
</child>
</object>
</child>
<child type="tab">
<object class="GtkLabel" id="FileLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">File</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
</interface>

1
sfx2/sdi/sfx.sdi
View File

@ -2625,6 +2625,7 @@ SfxBoolItem Sidebar SID_SIDEBAR
SfxBoolItem Notebookbar SID_NOTEBOOKBAR
(SfxStringItem File SID_NOTEBOOKBAR)
[
AutoUpdate = TRUE,
FastCall = FALSE,

46
sfx2/source/notebookbar/SfxNotebookBar.cxx
View File

@ -21,6 +21,7 @@
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
#include "NotebookBarPopupMenu.hxx"
#include <officecfg/Office/UI/Notebookbar.hxx>
using namespace sfx2;
using namespace css::uno;
@ -46,6 +47,12 @@ void SfxNotebookBar::CloseMethod(SystemWindow* pSysWindow)
m_xFrame.clear();
}
bool SfxNotebookBar::IsActive()
{
SvtViewOptions aViewOpt(E_WINDOW, "notebookbar");
return aViewOpt.IsVisible();
}
void SfxNotebookBar::ExecMethod(SfxBindings& rBindings)
{
SvtViewOptions aViewOpt(E_WINDOW, "notebookbar");
@ -87,25 +94,32 @@ void SfxNotebookBar::StateMethod(SystemWindow* pSysWindow,
{
RemoveListeners(pSysWindow);
// setup if necessary
pSysWindow->SetNotebookBar(rUIFile, xFrame);
pSysWindow->GetNotebookBar()->Show();
pSysWindow->GetNotebookBar()->SetIconClickHdl(LINK(nullptr, SfxNotebookBar, ToggleMenubar));
SfxViewFrame* pView = SfxViewFrame::Current();
if(pView)
OUString sFile = officecfg::Office::UI::Notebookbar::Active::get();
if ( !sFile.isEmpty() )
{
Reference<XContextChangeEventMultiplexer> xMultiplexer
= ContextChangeEventMultiplexer::get(
::comphelper::getProcessComponentContext());
OUStringBuffer aBuf(rUIFile);
aBuf.append( sFile );
if(xFrame.is() && xMultiplexer.is())
// setup if necessary
pSysWindow->SetNotebookBar(aBuf.makeStringAndClear(), xFrame);
pSysWindow->GetNotebookBar()->Show();
pSysWindow->GetNotebookBar()->SetIconClickHdl(LINK(nullptr, SfxNotebookBar, ToggleMenubar));
SfxViewFrame* pView = SfxViewFrame::Current();
if(pView)
{
xMultiplexer->addContextChangeEventListener(
pSysWindow->GetNotebookBar()->getContextChangeEventListener(),
xFrame->getController());
Reference<XContextChangeEventMultiplexer> xMultiplexer
= ContextChangeEventMultiplexer::get(
::comphelper::getProcessComponentContext());
if(xFrame.is() && xMultiplexer.is())
{
xMultiplexer->addContextChangeEventListener(
pSysWindow->GetNotebookBar()->getContextChangeEventListener(),
xFrame->getController());
}
}
}
}

1
sw/UIConfig_swriter.mk
View File

@ -204,6 +204,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/mmsendmails \
sw/uiconfig/swriter/ui/mmsalutationpage \
sw/uiconfig/swriter/ui/notebookbar \
sw/uiconfig/swriter/ui/notebookbar_groups \
sw/uiconfig/swriter/ui/paradialog \
sw/uiconfig/swriter/ui/picturedialog \
sw/uiconfig/swriter/ui/picturepage \

2
sw/source/uibase/app/docsh.cxx
View File

@ -1073,7 +1073,7 @@ void SwDocShell::GetState(SfxItemSet& rSet)
case SID_NOTEBOOKBAR:
{
SfxViewShell* pViewShell = GetView()? GetView(): SfxViewShell::Current();
sfx2::SfxNotebookBar::StateMethod(pViewShell->GetViewFrame()->GetBindings(), "modules/swriter/ui/notebookbar.ui");
sfx2::SfxNotebookBar::StateMethod(pViewShell->GetViewFrame()->GetBindings(), "modules/swriter/ui/");
}
break;

12
sw/source/uibase/app/docsh2.cxx
View File

@ -1160,8 +1160,18 @@ void SwDocShell::Execute(SfxRequest& rReq)
break;
case SID_NOTEBOOKBAR:
{
const SfxStringItem* pFile = rReq.GetArg<SfxStringItem>( SID_NOTEBOOKBAR );
SfxViewShell* pViewShell = GetView()? GetView(): SfxViewShell::Current();
sfx2::SfxNotebookBar::ExecMethod(pViewShell->GetViewFrame()->GetBindings());
SfxBindings& rBindings( pViewShell->GetViewFrame()->GetBindings() );
if ( !pFile || ( pFile && !SfxNotebookBar::IsActive() ) )
sfx2::SfxNotebookBar::ExecMethod( rBindings );
else if ( pFile && pFile->GetValue().isEmpty() )
{
sfx2::SfxNotebookBar::CloseMethod( rBindings );
if ( sfx2::SfxNotebookBar::IsActive() )
sfx2::SfxNotebookBar::ExecMethod( rBindings );
}
}
break;

133
sw/uiconfig/swriter/ui/notebookbar_groups.ui Normal file
View File

@ -0,0 +1,133 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.12"/>
<requires lib="LibreOffice" version="1.0"/>
<!-- interface-local-resource-path ../../../icon-themes/galaxy/cmd/ -->
<object class="GtkGrid" id="NotebookBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="vcllo-NotebookbarTabControl" id="notebook1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child>
<object class="sfxlo-PriorityHBox" id="FileBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="sfxlo-DropdownBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
<style>
<class name="priority-1"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">7</property>
</packing>
</child>
</object>
</child>
<child type="tab">
<object class="GtkLabel" id="FileLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">File</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
</interface>