From bcde3d560198a834bce8f1f129f1d3c665baa3df Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 2 Mar 2021 16:18:43 +0000 Subject: merge panel and panel title MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit so one combined InterimItemWindow instead of two separate ones for each panel Change-Id: Ie8e1b6a28f124ef23cf88ec47442ccf15ab51d3e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111903 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- sfx2/UIConfig_sfx.mk | 2 +- sfx2/inc/sidebar/PanelTitleBar.hxx | 14 ++-- sfx2/inc/sidebar/TitleBar.hxx | 28 +++++-- sfx2/source/sidebar/Deck.cxx | 3 - sfx2/source/sidebar/DeckLayouter.cxx | 62 +++++++-------- sfx2/source/sidebar/FocusManager.cxx | 15 ++-- sfx2/source/sidebar/Panel.cxx | 49 ++++++------ sfx2/source/sidebar/PanelTitleBar.cxx | 31 ++++---- sfx2/source/sidebar/SidebarController.cxx | 5 +- sfx2/source/sidebar/TitleBar.cxx | 50 +++++++----- sfx2/source/sidebar/UnoPanel.cxx | 4 +- sfx2/uiconfig/ui/panel.ui | 122 ++++++++++++++++++++++++++++++ sfx2/uiconfig/ui/paneltitlebar.ui | 89 ---------------------- 13 files changed, 262 insertions(+), 212 deletions(-) create mode 100644 sfx2/uiconfig/ui/panel.ui delete mode 100644 sfx2/uiconfig/ui/paneltitlebar.ui (limited to 'sfx2') diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk index 635b77324998..0fb763daa756 100644 --- a/sfx2/UIConfig_sfx.mk +++ b/sfx2/UIConfig_sfx.mk @@ -51,7 +51,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\ sfx2/uiconfig/ui/newstyle \ sfx2/uiconfig/ui/notebookbar \ sfx2/uiconfig/ui/optprintpage \ - sfx2/uiconfig/ui/paneltitlebar \ + sfx2/uiconfig/ui/panel \ sfx2/uiconfig/ui/password \ sfx2/uiconfig/ui/notebookbarpopup \ sfx2/uiconfig/ui/printeroptionsdialog \ diff --git a/sfx2/inc/sidebar/PanelTitleBar.hxx b/sfx2/inc/sidebar/PanelTitleBar.hxx index 745fc8cd3030..08133be6cf10 100644 --- a/sfx2/inc/sidebar/PanelTitleBar.hxx +++ b/sfx2/inc/sidebar/PanelTitleBar.hxx @@ -29,35 +29,39 @@ namespace sfx2::sidebar { class Panel; class PanelTitleBar final - : public TitleBar + : public TitleBarBase { public: - PanelTitleBar(const OUString& rsTitle, vcl::Window* pParentWindow, Panel* pPanel); - virtual void dispose() override; + PanelTitleBar(const OUString& rsTitle, weld::Builder& rBuilder, Panel* pPanel); virtual ~PanelTitleBar() override; virtual void SetTitle (const OUString& rsTitle) override; virtual OUString GetTitle() const override; + virtual bool GetVisible() const override; void SetMoreOptionsCommand(const OUString& rsCommandName, const css::uno::Reference& rxFrame, const css::uno::Reference& rxController); void UpdateExpandedState(); + void Show(bool bShow) + { + mxTitlebar->set_visible(bShow); + } weld::Expander& GetExpander() { return *mxExpander; } - virtual void DataChanged(const DataChangedEvent& rEvent) override; - private: virtual void HandleToolBoxItemClick() override; DECL_LINK(ExpandHdl, weld::Expander&, void); + std::unique_ptr mxTitlebar; std::unique_ptr mxExpander; + css::uno::Reference mxController; VclPtr mpPanel; diff --git a/sfx2/inc/sidebar/TitleBar.hxx b/sfx2/inc/sidebar/TitleBar.hxx index 772b349b6a2c..425e859cc690 100644 --- a/sfx2/inc/sidebar/TitleBar.hxx +++ b/sfx2/inc/sidebar/TitleBar.hxx @@ -25,22 +25,19 @@ namespace sfx2::sidebar { -class TitleBar : public InterimItemWindow +class TitleBarBase { public: - TitleBar(vcl::Window* pParentWindow, - const OUString& rUIXMLDescription, const OString& rID, - Theme::ThemeItem eThemeItem); - virtual void dispose() override; - virtual ~TitleBar() override; + TitleBarBase(weld::Builder& rBuilder, Theme::ThemeItem eThemeItem); + void reset(); + virtual ~TitleBarBase(); virtual void SetTitle (const OUString& rsTitle) = 0; virtual OUString GetTitle() const = 0; + virtual bool GetVisible() const = 0; void SetIcon(const css::uno::Reference& rIcon); - virtual void DataChanged (const DataChangedEvent& rEvent) override; - weld::Toolbar& GetToolBox() { return *mxToolBox; @@ -51,6 +48,7 @@ public: } protected: + weld::Builder& mrBuilder; std::unique_ptr mxAddonImage; std::unique_ptr mxToolBox; std::unique_ptr mxToolBoxController; @@ -61,6 +59,20 @@ protected: DECL_LINK(SelectionHandler, const OString&, void); }; +class TitleBar : public InterimItemWindow + , public TitleBarBase +{ +public: + TitleBar(vcl::Window* pParentWindow, + const OUString& rUIXMLDescription, const OString& rID, + Theme::ThemeItem eThemeItem); + virtual void dispose() override; + virtual bool GetVisible() const override { return IsVisible(); } + virtual ~TitleBar() override; + + virtual void DataChanged (const DataChangedEvent& rEvent) override; +}; + } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index f8bb54a8ef73..ca988521d184 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -349,9 +349,6 @@ void Deck::ShowPanel(const Panel& rPanel) // Get vertical extent of the panel. sal_Int32 nPanelTop (rPanel.GetPosPixel().Y()); const sal_Int32 nPanelBottom (nPanelTop + rPanel.GetSizePixel().Height() - 1); - // Add the title bar into the extent. - if (rPanel.GetTitleBar() && rPanel.GetTitleBar()->IsVisible()) - nPanelTop = rPanel.GetTitleBar()->GetPosPixel().Y(); // Determine what the new thumb position should be like. // When the whole panel does not fit then make its top visible diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index bebc75e726ad..05098986b826 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -297,46 +297,39 @@ sal_Int32 PlacePanels ( nY += nDeckSeparatorHeight; } - // Place the title bar. - VclPtr pTitleBar = rPanel.GetTitleBar(); - if (pTitleBar) - { - const sal_Int32 nPanelTitleBarHeight (Theme::GetInteger(Theme::Int_PanelTitleBarHeight) * rPanel.GetDPIScaleFactor()); + const sal_Int32 nPanelTitleBarHeight(Theme::GetInteger(Theme::Int_PanelTitleBarHeight) * rPanel.GetDPIScaleFactor()); - if (iItem->mbShowTitleBar) - { - pTitleBar->setPosSizePixel(0, nY, nWidth, nPanelTitleBarHeight); - pTitleBar->Show(); - nY += nPanelTitleBarHeight; - } - else - { - pTitleBar->Hide(); - } - } + bool bShowTitlebar = iItem->mbShowTitleBar; + rPanel.ShowTitlebar(bShowTitlebar); - if (rPanel.IsExpanded() && !rPanel.IsLurking()) + bool bExpanded = rPanel.IsExpanded() && !rPanel.IsLurking(); + if (bShowTitlebar || bExpanded) { rPanel.Show(); - // Determine the height of the panel depending on layout - // mode and distributed heights. - sal_Int32 nPanelHeight (0); - switch(eMode) + sal_Int32 nPanelHeight(0); + if (bExpanded) { - case MinimumOrLarger: - nPanelHeight = iItem->maLayoutSize.Minimum + iItem->mnDistributedHeight; - break; - case PreferredOrLarger: - nPanelHeight = iItem->maLayoutSize.Preferred + iItem->mnDistributedHeight; - break; - case Preferred: - nPanelHeight = iItem->maLayoutSize.Preferred; - break; - default: - OSL_ASSERT(false); - break; + // Determine the height of the panel depending on layout + // mode and distributed heights. + switch(eMode) + { + case MinimumOrLarger: + nPanelHeight = iItem->maLayoutSize.Minimum + iItem->mnDistributedHeight; + break; + case PreferredOrLarger: + nPanelHeight = iItem->maLayoutSize.Preferred + iItem->mnDistributedHeight; + break; + case Preferred: + nPanelHeight = iItem->maLayoutSize.Preferred; + break; + default: + OSL_ASSERT(false); + break; + } } + if (bShowTitlebar) + nPanelHeight += nPanelTitleBarHeight; // Place the panel. Point aNewPos(0, nY); @@ -354,7 +347,10 @@ sal_Int32 PlacePanels ( else { rPanel.Hide(); + } + if (!bExpanded) + { // Add a separator below the collapsed panel, if it is the // last panel in the deck. if (iItem == rLayoutItems.end()-1) diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx index 967256a46875..2f05308e5ce5 100644 --- a/sfx2/source/sidebar/FocusManager.cxx +++ b/sfx2/source/sidebar/FocusManager.cxx @@ -146,9 +146,6 @@ FocusManager::FocusLocation FocusManager::GetFocusLocation (const vcl::Window& r { if (maPanels[nIndex] == &rWindow) return FocusLocation(PC_PanelContent, nIndex); - VclPtr pTitleBar = maPanels[nIndex]->GetTitleBar(); - if (pTitleBar == &rWindow) - return FocusLocation(PC_PanelTitle, nIndex); } return FocusLocation(PC_None, -1); @@ -163,7 +160,7 @@ FocusManager::FocusLocation FocusManager::GetFocusLocation() const // Search the panels. for (size_t nIndex = 0; nIndex < maPanels.size(); ++nIndex) { - VclPtr pTitleBar = maPanels[nIndex]->GetTitleBar(); + PanelTitleBar* pTitleBar = maPanels[nIndex]->GetTitleBar(); if (!pTitleBar) continue; if (pTitleBar->GetExpander().has_focus()) @@ -199,7 +196,7 @@ void FocusManager::FocusDeckTitle() bool FocusManager::IsDeckTitleVisible() const { - return mpDeckTitleBar != nullptr && mpDeckTitleBar->IsVisible(); + return mpDeckTitleBar != nullptr && mpDeckTitleBar->GetVisible(); } bool FocusManager::IsPanelTitleVisible (const sal_Int32 nPanelIndex) const @@ -207,10 +204,10 @@ bool FocusManager::IsPanelTitleVisible (const sal_Int32 nPanelIndex) const if (nPanelIndex<0 || nPanelIndex>=static_cast(maPanels.size())) return false; - VclPtr pTitleBar = maPanels[nPanelIndex]->GetTitleBar(); + TitleBarBase* pTitleBar = maPanels[nPanelIndex]->GetTitleBar(); if (!pTitleBar) return false; - return pTitleBar->IsVisible(); + return pTitleBar->GetVisible(); } void FocusManager::FocusPanel ( @@ -225,8 +222,8 @@ void FocusManager::FocusPanel ( } Panel& rPanel (*maPanels[nPanelIndex]); - VclPtr pTitleBar = rPanel.GetTitleBar(); - if (pTitleBar && pTitleBar->IsVisible()) + PanelTitleBar* pTitleBar = rPanel.GetTitleBar(); + if (pTitleBar && pTitleBar->GetVisible()) { rPanel.SetExpanded(true); pTitleBar->GetExpander().grab_focus(); diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx index c45a1e5efd42..3f6775ca6133 100644 --- a/sfx2/source/sidebar/Panel.cxx +++ b/sfx2/source/sidebar/Panel.cxx @@ -47,9 +47,8 @@ Panel::Panel(const PanelDescriptor& rPanelDescriptor, const bool bIsInitiallyExpanded, const std::function& rDeckLayoutTrigger, const std::function& rContextAccess, - const css::uno::Reference& rxFrame - ) - : Window(pParentWindow) + const css::uno::Reference& rxFrame) + : InterimItemWindow(pParentWindow, "sfx/ui/panel.ui", "Panel") , msPanelId(rPanelDescriptor.msId) , mbIsTitleBarOptional(rPanelDescriptor.mbIsTitleBarOptional) , mxElement() @@ -59,15 +58,18 @@ Panel::Panel(const PanelDescriptor& rPanelDescriptor, , maDeckLayoutTrigger(rDeckLayoutTrigger) , maContextAccess(rContextAccess) , mxFrame(rxFrame) - , mpTitleBar(VclPtr::Create(rPanelDescriptor.msTitle, pParentWindow, this)) + , mxTitleBar(new PanelTitleBar(rPanelDescriptor.msTitle, *m_xBuilder, this)) + , mxContents(m_xBuilder->weld_container("contents")) + , mxXWindow(mxContents->CreateChildFrame()) { SetText(rPanelDescriptor.msTitle); + mxContents->set_visible(mbIsExpanded); } Panel::~Panel() { disposeOnce(); - assert(!mpTitleBar); + assert(!mxTitleBar); } void Panel::SetLurkMode(bool bLurk) @@ -85,7 +87,7 @@ void Panel::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter) { if (!IsLurking()) { - vcl::Window::DumpAsPropertyTree(rJsonWriter); + InterimItemWindow::DumpAsPropertyTree(rJsonWriter); rJsonWriter.put("type", "panel"); } } @@ -107,14 +109,23 @@ void Panel::dispose() xComponent->dispose(); } - mpTitleBar.disposeAndClear(); + mxTitleBar.reset(); - vcl::Window::dispose(); + mxXWindow->dispose(); + mxXWindow.clear(); + mxContents.reset(); + + InterimItemWindow::dispose(); +} + +PanelTitleBar* Panel::GetTitleBar() const +{ + return mxTitleBar.get(); } -VclPtr const & Panel::GetTitleBar() const +void Panel::ShowTitlebar(bool bShowTitlebar) { - return mpTitleBar; + mxTitleBar->Show(bShowTitlebar); } void Panel::SetUIElement (const Reference& rxElement) @@ -134,7 +145,7 @@ void Panel::SetExpanded (const bool bIsExpanded) return; mbIsExpanded = bIsExpanded; - mpTitleBar->UpdateExpandedState(); + mxTitleBar->UpdateExpandedState(); maDeckLayoutTrigger(); if (maContextAccess && pSidebarController) @@ -144,6 +155,8 @@ void Panel::SetExpanded (const bool bIsExpanded) bIsExpanded, maContextAccess()); } + + mxContents->set_visible(mbIsExpanded); } bool Panel::HasIdPredicate (const OUString& rsId) const @@ -151,20 +164,6 @@ bool Panel::HasIdPredicate (const OUString& rsId) const return msPanelId == rsId; } -void Panel::Resize() -{ - Window::Resize(); - - // Forward new size to window of XUIElement. - Reference xElementWindow (GetElementWindow()); - if(xElementWindow.is()) - { - const Size aSize(GetSizePixel()); - xElementWindow->setPosSize(0, 0, aSize.Width(), aSize.Height(), - awt::PosSize::POSSIZE); - } -} - void Panel::DataChanged (const DataChangedEvent&) { Invalidate(); diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index 1de76008befd..54adda78aa29 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -37,16 +37,18 @@ using namespace css::uno; namespace sfx2::sidebar { PanelTitleBar::PanelTitleBar(const OUString& rsTitle, - vcl::Window* pParentWindow, + weld::Builder& rBuilder, Panel* pPanel) - : TitleBar(pParentWindow, "sfx/ui/paneltitlebar.ui", "PanelTitleBar", - Theme::Color_PanelTitleBarBackground), - mxExpander(m_xBuilder->weld_expander("expander")), + : TitleBarBase(rBuilder, Theme::Color_PanelTitleBarBackground), + mxTitlebar(rBuilder.weld_container("titlebar")), + mxExpander(rBuilder.weld_expander("expander")), mpPanel(pPanel), mxFrame(), msIdent("button"), msMoreOptionsCommand() { + mxTitlebar->set_background(Theme::GetColor(meThemeItem)); + mxExpander->set_label(rsTitle); mxExpander->connect_expanded(LINK(this, PanelTitleBar, ExpandHdl)); @@ -59,6 +61,11 @@ PanelTitleBar::PanelTitleBar(const OUString& rsTitle, #endif } +bool PanelTitleBar::GetVisible() const +{ + return mxTitlebar->get_visible(); +} + void PanelTitleBar::SetTitle(const OUString& rsTitle) { mxExpander->set_label(rsTitle); @@ -75,11 +82,6 @@ void PanelTitleBar::UpdateExpandedState() } PanelTitleBar::~PanelTitleBar() -{ - disposeOnce(); -} - -void PanelTitleBar::dispose() { Reference xComponent(mxController, UNO_QUERY); if (xComponent.is()) @@ -87,7 +89,8 @@ void PanelTitleBar::dispose() mxController.clear(); mpPanel.clear(); mxExpander.reset(); - TitleBar::dispose(); + mxTitlebar.reset(); + reset(); } void PanelTitleBar::SetMoreOptionsCommand(const OUString& rsCommandName, @@ -114,7 +117,7 @@ void PanelTitleBar::SetMoreOptionsCommand(const OUString& rsCommandName, xComponent->dispose(); mxController = ControllerFactory::CreateToolBoxController( - *mxToolBox, *m_xBuilder, msMoreOptionsCommand, rxFrame, rxController, true); + *mxToolBox, mrBuilder, msMoreOptionsCommand, rxFrame, rxController, true); mxToolBox->show(); mxToolBox->set_item_icon_name(msIdent, "sfx2/res/symphony/morebutton.png"); @@ -136,12 +139,6 @@ IMPL_LINK(PanelTitleBar, ExpandHdl, weld::Expander&, rExpander, void) mpPanel->SetExpanded(rExpander.get_expanded()); } -void PanelTitleBar::DataChanged (const DataChangedEvent& rEvent) -{ - mxToolBox->set_item_icon_name(msIdent, "sfx2/res/symphony/morebutton.png"); - TitleBar::DataChanged(rEvent); -} - } // end of namespace sfx2::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index c154b0e4d51b..df6d1c4761f1 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -754,7 +754,7 @@ void SidebarController::CreatePanels(const OUString& rDeckId, const Context& rCo // Depending on the context we have to change the command // for the "more options" dialog. - VclPtr pTitleBar = aNewPanels[nWriteIndex]->GetTitleBar(); + PanelTitleBar* pTitleBar = aNewPanels[nWriteIndex]->GetTitleBar(); if (pTitleBar) { pTitleBar->SetMoreOptionsCommand( @@ -934,8 +934,9 @@ VclPtr SidebarController::CreatePanel ( mxFrame); // Create the XUIElement. + Reference xPeer(pPanel->GetElementParentWindow(), UNO_QUERY); Reference xUIElement (CreateUIElement( - pPanel->GetComponentInterface(), + xPeer, xPanelDescriptor->msImplementationURL, xPanelDescriptor->mbWantsCanvas, rContext)); diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx index 615cb6de3b7b..b88b4e92e1db 100644 --- a/sfx2/source/sidebar/TitleBar.cxx +++ b/sfx2/source/sidebar/TitleBar.cxx @@ -21,47 +21,61 @@ namespace sfx2::sidebar { -TitleBar::TitleBar(vcl::Window* pParentWindow, - const OUString& rUIXMLDescription, const OString& rID, - Theme::ThemeItem eThemeItem) - : InterimItemWindow(pParentWindow, rUIXMLDescription, rID) - , mxAddonImage(m_xBuilder->weld_image("addonimage")) - , mxToolBox(m_xBuilder->weld_toolbar("toolbar")) +TitleBarBase::TitleBarBase(weld::Builder& rBuilder, Theme::ThemeItem eThemeItem) + : mrBuilder(rBuilder) + , mxAddonImage(rBuilder.weld_image("addonimage")) + , mxToolBox(rBuilder.weld_toolbar("toolbar")) , meThemeItem(eThemeItem) { - Color aBgColor = Theme::GetColor(meThemeItem); - m_xContainer->set_background(aBgColor); - mxToolBox->set_background(aBgColor); + mxToolBox->set_background(Theme::GetColor(meThemeItem)); - mxToolBox->connect_clicked(LINK(this, TitleBar, SelectionHandler)); + mxToolBox->connect_clicked(LINK(this, TitleBarBase, SelectionHandler)); } -TitleBar::~TitleBar() +TitleBarBase::~TitleBarBase() { - disposeOnce(); } -void TitleBar::dispose() +void TitleBarBase::reset() { mxToolBox.reset(); mxAddonImage.reset(); - InterimItemWindow::dispose(); } -void TitleBar::SetIcon(const css::uno::Reference& rIcon) +void TitleBarBase::SetIcon(const css::uno::Reference& rIcon) { mxAddonImage->set_image(rIcon); mxAddonImage->set_visible(rIcon.is()); } -void TitleBar::DataChanged (const DataChangedEvent& /*rEvent*/) +IMPL_LINK_NOARG(TitleBarBase, SelectionHandler, const OString&, void) +{ + HandleToolBoxItemClick(); +} + +TitleBar::TitleBar(vcl::Window* pParentWindow, + const OUString& rUIXMLDescription, const OString& rID, + Theme::ThemeItem eThemeItem) + : InterimItemWindow(pParentWindow, rUIXMLDescription, rID) + , TitleBarBase(*m_xBuilder, eThemeItem) { m_xContainer->set_background(Theme::GetColor(meThemeItem)); } -IMPL_LINK_NOARG(TitleBar, SelectionHandler, const OString&, void) +TitleBar::~TitleBar() { - HandleToolBoxItemClick(); + disposeOnce(); +} + +void TitleBar::dispose() +{ + reset(); + InterimItemWindow::dispose(); +} + +void TitleBar::DataChanged (const DataChangedEvent& /*rEvent*/) +{ + m_xContainer->set_background(Theme::GetColor(meThemeItem)); } } // end of namespace sfx2::sidebar diff --git a/sfx2/source/sidebar/UnoPanel.cxx b/sfx2/source/sidebar/UnoPanel.cxx index eee70429aa30..1170cbce1674 100644 --- a/sfx2/source/sidebar/UnoPanel.cxx +++ b/sfx2/source/sidebar/UnoPanel.cxx @@ -54,7 +54,7 @@ OUString SAL_CALL SfxUnoPanel::getTitle() { SolarMutexGuard aGuard; - VclPtr pTitleBar = mpPanel->GetTitleBar(); + PanelTitleBar* pTitleBar = mpPanel->GetTitleBar(); if (pTitleBar) return pTitleBar->GetTitle(); else @@ -71,7 +71,7 @@ void SAL_CALL SfxUnoPanel::setTitle( const OUString& newTitle ) if (xPanelDescriptor) { xPanelDescriptor->msTitle = newTitle; - VclPtr pTitleBar = mpPanel->GetTitleBar(); + PanelTitleBar* pTitleBar = mpPanel->GetTitleBar(); if (pTitleBar) pTitleBar->SetTitle(newTitle); } diff --git a/sfx2/uiconfig/ui/panel.ui b/sfx2/uiconfig/ui/panel.ui new file mode 100644 index 000000000000..689236e2eb28 --- /dev/null +++ b/sfx2/uiconfig/ui/panel.ui @@ -0,0 +1,122 @@ + + + + + + + True + False + True + + + True + False + True + 6 + + + True + False + center + missing-image + + + False + True + 0 + + + + + True + True + center + True + True + + + True + False + vertical + + + + + + + + True + False + True + True + + + + + + + + False + True + 2 + + + + + False + True + icons + False + 2 + + + True + False + More Options + True + sfx2/res/symphony/morebutton.png + + + More Options + + + + + False + False + + + + + + False + True + 3 + + + + + 0 + 0 + + + + + True + False + True + True + vertical + + + + + + 0 + 1 + + + + diff --git a/sfx2/uiconfig/ui/paneltitlebar.ui b/sfx2/uiconfig/ui/paneltitlebar.ui deleted file mode 100644 index 8664dfa88fc4..000000000000 --- a/sfx2/uiconfig/ui/paneltitlebar.ui +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - True - False - True - True - 6 - - - True - False - center - gtk-missing-image - - - False - True - 0 - - - - - True - True - center - True - True - - - True - False - True - vertical - - - - - - - - True - False - True - True - - - - - - - - False - True - 2 - - - - - False - True - icons - False - 2 - - - True - False - True - - - False - False - - - - - - False - True - 3 - - - - -- cgit