summaryrefslogtreecommitdiff
path: root/sfx2/source/notebookbar
diff options
context:
space:
mode:
authorSzymon Kłos <eszkadev@gmail.com>2016-08-06 23:31:18 +0200
committerSamuel Mehrbrodt <s.mehrbrodt@gmail.com>2016-08-22 19:38:25 +0000
commitdabb20ebd5fa3b0d4bdb063b32f6ffbe2f59c3a2 (patch)
treeabea74259c8b66cb30037401e2718add4b32cb44 /sfx2/source/notebookbar
parentfc185fd35360a84136dd834bfdcd2e522350999a (diff)
GSoC: tdf#101249 Toolbar Mode switching
+ added registry entry for storing current toolbar mode for each application + registry entries to store toolbar mode configuration, remember additional visible toolbars activated by user + changing toolbar mode hides and shows suitable toolbars + added menu controller for toolbar mode + notebookbar implementation entries are disabled when notebookbar mode is not active + each mode can open/collapse the sidebar Change-Id: I2b03f87c6dce53190d12102892d9ad30fbfd3bf6 Reviewed-on: https://gerrit.libreoffice.org/27991 Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com> Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Diffstat (limited to 'sfx2/source/notebookbar')
-rw-r--r--sfx2/source/notebookbar/SfxNotebookBar.cxx92
1 files changed, 79 insertions, 13 deletions
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index c20e35e865a8..64be63f50da0 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -22,10 +22,15 @@
#include <com/sun/star/frame/XLayoutManager.hpp>
#include "NotebookBarPopupMenu.hxx"
#include <officecfg/Office/UI/Notebookbar.hxx>
+#include <com/sun/star/frame/XModuleManager.hpp>
+#include <com/sun/star/frame/ModuleManager.hpp>
+#include <unotools/confignode.hxx>
+#include <comphelper/types.hxx>
using namespace sfx2;
using namespace css::uno;
using namespace css::ui;
+using namespace css;
#define MENUBAR_STR "private:resource/menubar/menubar"
@@ -41,35 +46,94 @@ void SfxNotebookBar::CloseMethod(SfxBindings& rBindings)
void SfxNotebookBar::CloseMethod(SystemWindow* pSysWindow)
{
- if (pSysWindow && pSysWindow->GetNotebookBar())
- pSysWindow->CloseNotebookBar();
+ if (pSysWindow)
+ {
+ RemoveListeners(pSysWindow);
+ if(pSysWindow->GetNotebookBar())
+ pSysWindow->CloseNotebookBar();
+ }
m_xLayoutManager.clear();
m_xFrame.clear();
}
bool SfxNotebookBar::IsActive()
{
- SvtViewOptions aViewOpt(E_WINDOW, "notebookbar");
- return aViewOpt.IsVisible();
+ const Reference<frame::XModuleManager> xModuleManager = frame::ModuleManager::create( ::comphelper::getProcessComponentContext() );
+ vcl::EnumContext::Application eApp = vcl::EnumContext::GetApplicationEnum(xModuleManager->identify(m_xFrame));
+
+ OUStringBuffer aPath("org.openoffice.Office.UI.ToolbarMode/Applications/");
+ switch ( eApp )
+ {
+ case vcl::EnumContext::Application::Application_Writer:
+ aPath.append("Writer");
+ break;
+ case vcl::EnumContext::Application::Application_Calc:
+ aPath.append("Calc");
+ break;
+ case vcl::EnumContext::Application::Application_Impress:
+ aPath.append("Impress");
+ break;
+ case vcl::EnumContext::Application::Application_Draw:
+ aPath.append("Draw");
+ break;
+ default:
+ break;
+ }
+
+ const utl::OConfigurationTreeRoot aAppNode(
+ ::comphelper::getProcessComponentContext(),
+ aPath.makeStringAndClear(),
+ false);
+ if ( !aAppNode.isValid() )
+ return false;
+
+ OUString aActive = comphelper::getString( aAppNode.getNodeValue( "Active" ) );
+
+ const utl::OConfigurationNode aModesNode = aAppNode.openNode("Modes");
+ const Sequence<OUString> aModeNodeNames( aModesNode.getNodeNames() );
+ const sal_Int32 nCount( aModeNodeNames.getLength() );
+ bool bNotebookbarVisible = false;
+
+ for ( sal_Int32 nReadIndex = 0; nReadIndex < nCount; ++nReadIndex )
+ {
+ const utl::OConfigurationNode aModeNode( aModesNode.openNode( aModeNodeNames[nReadIndex] ) );
+ if ( !aModeNode.isValid() )
+ continue;
+
+ OUString aCommandArg = comphelper::getString( aModeNode.getNodeValue( "CommandArg" ) );
+
+ if ( aCommandArg.compareTo( aActive ) == 0 )
+ {
+ bNotebookbarVisible = comphelper::getBOOL( aModeNode.getNodeValue( "HasNotebookbar" ) );
+ break;
+ }
+ }
+ return bNotebookbarVisible;
}
-void SfxNotebookBar::ExecMethod(SfxBindings& rBindings)
+void SfxNotebookBar::ExecMethod(SfxBindings& rBindings, const OUString& rUIName)
{
- SvtViewOptions aViewOpt(E_WINDOW, "notebookbar");
- aViewOpt.SetVisible(!aViewOpt.IsVisible());
+ // Save active UI file name
+ if ( !rUIName.isEmpty() )
+ {
+ std::shared_ptr<comphelper::ConfigurationChanges> batch(
+ comphelper::ConfigurationChanges::create( ::comphelper::getProcessComponentContext() ) );
+ officecfg::Office::UI::Notebookbar::Active::set( rUIName, batch );
+ batch->commit();
+ }
// trigger the StateMethod
rBindings.Invalidate(SID_NOTEBOOKBAR);
rBindings.Update();
}
-void SfxNotebookBar::StateMethod(SfxBindings& rBindings, const OUString& rUIFile)
+bool SfxNotebookBar::StateMethod(SfxBindings& rBindings, const OUString& rUIFile)
{
SfxFrame& rFrame = rBindings.GetDispatcher_Impl()->GetFrame()->GetFrame();
- StateMethod(rFrame.GetSystemWindow(), rFrame.GetFrameInterface(), rUIFile);
+ return StateMethod(rFrame.GetSystemWindow(), rFrame.GetFrameInterface(), rUIFile);
}
-void SfxNotebookBar::StateMethod(SystemWindow* pSysWindow,
+bool SfxNotebookBar::StateMethod(SystemWindow* pSysWindow,
const Reference<css::frame::XFrame> & xFrame,
const OUString& rUIFile)
{
@@ -88,9 +152,7 @@ void SfxNotebookBar::StateMethod(SystemWindow* pSysWindow,
}
}
- SvtViewOptions aViewOpt(E_WINDOW, "notebookbar");
-
- if (aViewOpt.IsVisible())
+ if (IsActive())
{
RemoveListeners(pSysWindow);
@@ -122,9 +184,13 @@ void SfxNotebookBar::StateMethod(SystemWindow* pSysWindow,
}
}
}
+
+ return true;
}
else if (auto pNotebookBar = pSysWindow->GetNotebookBar())
pNotebookBar->Hide();
+
+ return false;
}
void SfxNotebookBar::RemoveListeners(SystemWindow* pSysWindow)