diff options
| -rw-r--r-- | include/sfx2/weldutils.hxx | 16 | ||||
| -rw-r--r-- | sfx2/source/toolbox/weldutils.cxx | 11 | ||||
| -rw-r--r-- | solenv/sanitizers/ui/svx.suppr | 1 | ||||
| -rw-r--r-- | svx/UIConfig_svx.mk | 1 | ||||
| -rw-r--r-- | svx/source/sidebar/lists/ListsPropertyPanel.cxx | 14 | ||||
| -rw-r--r-- | svx/source/sidebar/lists/ListsPropertyPanel.hxx | 9 | ||||
| -rw-r--r-- | svx/source/tbxctrls/bulletsnumbering.cxx | 145 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 25 | ||||
| -rw-r--r-- | svx/uiconfig/ui/numberingwindow.ui | 70 | ||||
| -rw-r--r-- | svx/uiconfig/ui/sidebarlists.ui | 47 |
10 files changed, 282 insertions, 57 deletions
diff --git a/include/sfx2/weldutils.hxx b/include/sfx2/weldutils.hxx index e87295c23abc..8ea999675ad1 100644 --- a/include/sfx2/weldutils.hxx +++ b/include/sfx2/weldutils.hxx @@ -16,6 +16,9 @@ #include <com/sun/star/uno/Reference.hxx> #include <tools/link.hxx> #include <sfx2/dllapi.h> +#include <svtools/toolbarmenu.hxx> +#include <vcl/svapp.hxx> +#include <vcl/weld.hxx> #include <map> @@ -50,6 +53,19 @@ public: ~ToolbarUnoDispatcher(); }; +class SFX2_DLLPUBLIC WeldToolbarPopup : public svtools::ToolbarPopupBase +{ +protected: + std::unique_ptr<weld::Builder> m_xBuilder; + std::unique_ptr<weld::Container> m_xTopLevel; + +public: + WeldToolbarPopup(const css::uno::Reference<css::frame::XFrame>& rFrame, weld::Widget* pParent, + const OUString& rUIFile, const OString& rId); + virtual ~WeldToolbarPopup() override; + weld::Container* getTopLevel() { return m_xTopLevel.get(); } +}; + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/toolbox/weldutils.cxx b/sfx2/source/toolbox/weldutils.cxx index 52cf254d7b9a..434f6c479d6a 100644 --- a/sfx2/source/toolbox/weldutils.cxx +++ b/sfx2/source/toolbox/weldutils.cxx @@ -132,4 +132,15 @@ void ToolbarUnoDispatcher::dispose() ToolbarUnoDispatcher::~ToolbarUnoDispatcher() { dispose(); } +WeldToolbarPopup::WeldToolbarPopup(const css::uno::Reference<css::frame::XFrame>& rFrame, + weld::Widget* pParent, const OUString& rUIFile, + const OString& rId) + : ToolbarPopupBase(rFrame) + , m_xBuilder(Application::CreateBuilder(pParent, rUIFile)) + , m_xTopLevel(m_xBuilder->weld_container(rId)) +{ +} + +WeldToolbarPopup::~WeldToolbarPopup() {} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr index 9779f86780a9..04829fc63161 100644 --- a/solenv/sanitizers/ui/svx.suppr +++ b/solenv/sanitizers/ui/svx.suppr @@ -43,6 +43,7 @@ svx/uiconfig/ui/mediaplayback.ui://GtkLabel[@id='label3'] orphan-label svx/uiconfig/ui/mediaplayback.ui://GtkScale[@id='timeslider'] no-labelled-by svx/uiconfig/ui/mediaplayback.ui://GtkEntry[@id='timeedit:border'] no-labelled-by svx/uiconfig/ui/mediaplayback.ui://GtkScale[@id='volumeslider'] no-labelled-by +svx/uiconfig/ui/numberingwindow.ui://GtkButton[@id='more'] button-no-label svx/uiconfig/ui/oldcolorwindow.ui://GtkButton[@id='auto_color_button'] button-no-label svx/uiconfig/ui/oldcolorwindow.ui://GtkComboBox[@id='palette_listbox'] no-labelled-by svx/uiconfig/ui/oldcolorwindow.ui://GtkLabel[@id='label1'] orphan-label diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk index 689e59fa9ec1..529ab820c4c1 100644 --- a/svx/UIConfig_svx.mk +++ b/svx/UIConfig_svx.mk @@ -65,6 +65,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\ svx/uiconfig/ui/linkwarndialog \ svx/uiconfig/ui/mediaplayback \ svx/uiconfig/ui/namespacedialog \ + svx/uiconfig/ui/numberingwindow \ svx/uiconfig/ui/oldcolorwindow \ svx/uiconfig/ui/optgridpage \ svx/uiconfig/ui/paralinespacingcontrol \ diff --git a/svx/source/sidebar/lists/ListsPropertyPanel.cxx b/svx/source/sidebar/lists/ListsPropertyPanel.cxx index f739a066b711..7e871222042f 100644 --- a/svx/source/sidebar/lists/ListsPropertyPanel.cxx +++ b/svx/source/sidebar/lists/ListsPropertyPanel.cxx @@ -43,18 +43,22 @@ ListsPropertyPanel::Create(vcl::Window* pParent, ListsPropertyPanel::ListsPropertyPanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame) - : PanelLayout(pParent, "ListsPropertyPanel", "svx/ui/sidebarlists.ui", rxFrame) + : PanelLayout(pParent, "ListsPropertyPanel", "svx/ui/sidebarlists.ui", rxFrame, true) + , mxTBxNumBullet(m_xBuilder->weld_toolbar("numberbullet")) + , mxNumBulletDispatcher(new ToolbarUnoDispatcher(*mxTBxNumBullet, rxFrame)) + , mxTBxOutline(m_xBuilder->weld_toolbar("outline")) + , mxOutlineDispatcher(new ToolbarUnoDispatcher(*mxTBxOutline, rxFrame)) { - get(mpTBxNumBullet, "numberbullet"); - get(mpTBxOutline, "outline"); } ListsPropertyPanel::~ListsPropertyPanel() { disposeOnce(); } void ListsPropertyPanel::dispose() { - mpTBxOutline.clear(); - mpTBxNumBullet.clear(); + mxOutlineDispatcher.reset(); + mxTBxOutline.reset(); + mxNumBulletDispatcher.reset(); + mxTBxNumBullet.reset(); PanelLayout::dispose(); } diff --git a/svx/source/sidebar/lists/ListsPropertyPanel.hxx b/svx/source/sidebar/lists/ListsPropertyPanel.hxx index dc51cf9b7dae..ec8fc2817799 100644 --- a/svx/source/sidebar/lists/ListsPropertyPanel.hxx +++ b/svx/source/sidebar/lists/ListsPropertyPanel.hxx @@ -19,11 +19,10 @@ #ifndef INCLUDED_SVX_SOURCE_SIDEBAR_LISTS_LISTSPROPERTYPANEL_HXX #define INCLUDED_SVX_SOURCE_SIDEBAR_LISTS_LISTSPROPERTYPANEL_HXX +#include <sfx2/weldutils.hxx> #include <svx/sidebar/PanelLayout.hxx> #include <com/sun/star/frame/XFrame.hpp> -class ToolBox; - namespace svx { namespace sidebar @@ -41,8 +40,10 @@ public: const css::uno::Reference<css::frame::XFrame>& rxFrame); private: - VclPtr<ToolBox> mpTBxNumBullet; - VclPtr<ToolBox> mpTBxOutline; + std::unique_ptr<weld::Toolbar> mxTBxNumBullet; + std::unique_ptr<ToolbarUnoDispatcher> mxNumBulletDispatcher; + std::unique_ptr<weld::Toolbar> mxTBxOutline; + std::unique_ptr<ToolbarUnoDispatcher> mxOutlineDispatcher; }; } } // end of namespace svx::sidebar diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx index ddb1529f9f52..157d01ad3b14 100644 --- a/svx/source/tbxctrls/bulletsnumbering.cxx +++ b/svx/source/tbxctrls/bulletsnumbering.cxx @@ -15,6 +15,7 @@ #include <i18nlangtag/mslangid.hxx> #include <svtools/popupwindowcontroller.hxx> #include <svtools/toolbarmenu.hxx> +#include <sfx2/weldutils.hxx> #include <svx/strings.hrc> #include <svx/dialmgr.hxx> #include <svx/numvset.hxx> @@ -43,6 +44,23 @@ public: virtual void statusChanged( const css::frame::FeatureStateEvent& rEvent ) override; }; +class SvxNumberingPopup : public WeldToolbarPopup +{ + NumberingPageType const mePageType; + NumberingToolBoxControl& mrController; + std::unique_ptr<NumValueSet> mxValueSet; + std::unique_ptr<weld::CustomWeld> mxValueSetWin; + std::unique_ptr<weld::Button> mxMoreButton; + DECL_LINK(VSSelectValueSetHdl, SvtValueSet*, void); + DECL_LINK(VSButtonClickSetHdl, weld::Button&, void); + DECL_LINK(FocusHdl, weld::Widget&, void); + +public: + SvxNumberingPopup(NumberingToolBoxControl& rController, weld::Toolbar* pParent, NumberingPageType ePageType); + + virtual void statusChanged( const css::frame::FeatureStateEvent& rEvent ) override; +}; + class NumberingToolBoxControl : public svt::PopupWindowController { NumberingPageType mePageType; @@ -129,6 +147,77 @@ NumberingPopup::NumberingPopup( NumberingToolBoxControl& rController, SetSelectHdl( LINK( this, NumberingPopup, VSSelectToolbarMenuHdl ) ); } +SvxNumberingPopup::SvxNumberingPopup(NumberingToolBoxControl& rController, + weld::Toolbar* pParent, NumberingPageType ePageType) + : WeldToolbarPopup(rController.getFrameInterface(), pParent, "svx/ui/numberingwindow.ui", "NumberingWindow") + , mePageType(ePageType) + , mrController(rController) + , mxValueSet(new NumValueSet(nullptr)) + , mxValueSetWin(new weld::CustomWeld(*m_xBuilder, "valueset", *mxValueSet)) + , mxMoreButton(m_xBuilder->weld_button("more")) +{ + m_xTopLevel->connect_focus_in(LINK(this, SvxNumberingPopup, FocusHdl)); + + mxValueSet->SetStyle(WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NO_DIRECTSELECT); + mxValueSet->init(mePageType); + + if ( mePageType != NumberingPageType::BULLET ) + { + css::uno::Reference< css::text::XDefaultNumberingProvider > xDefNum = css::text::DefaultNumberingProvider::create( mrController.getContext() ); + if ( xDefNum.is() ) + { + css::lang::Locale aLocale = Application::GetSettings().GetLanguageTag().getLocale(); + css::uno::Reference< css::text::XNumberingFormatter > xFormat( xDefNum, css::uno::UNO_QUERY ); + + if ( mePageType == NumberingPageType::SINGLENUM ) + { + css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aNumberings( + xDefNum->getDefaultContinuousNumberingLevels( aLocale ) ); + mxValueSet->SetNumberingSettings( aNumberings, xFormat, aLocale ); + } + else if ( mePageType == NumberingPageType::OUTLINE ) + { + css::uno::Sequence< css::uno::Reference< css::container::XIndexAccess > > aOutline( + xDefNum->getDefaultOutlineNumberings( aLocale ) ); + mxValueSet->SetOutlineNumberingSettings( aOutline, xFormat, aLocale ); + } + } + } + + weld::DrawingArea* pDrawingArea = mxValueSet->GetDrawingArea(); + OutputDevice& rRefDevice = pDrawingArea->get_ref_device(); + Size aItemSize(rRefDevice.LogicToPixel(Size(30, 42), MapMode(MapUnit::MapAppFont))); + mxValueSet->SetExtraSpacing( 2 ); + Size aSize(mxValueSet->CalcWindowSizePixel(aItemSize)); + pDrawingArea->set_size_request(aSize.Width(), aSize.Height()); + mxValueSet->SetOutputSizePixel(aSize); + mxValueSet->SetColor(Application::GetSettings().GetStyleSettings().GetFieldColor()); + + OUString aMoreItemText; + if ( mePageType == NumberingPageType::BULLET ) + { + aMoreItemText = SvxResId( RID_SVXSTR_MOREBULLETS ); + AddStatusListener( ".uno:CurrentBulletListType" ); + } + else if ( mePageType == NumberingPageType::SINGLENUM ) + { + aMoreItemText = SvxResId( RID_SVXSTR_MORENUMBERING ); + AddStatusListener( ".uno:CurrentNumListType" ); + } + else + { + aMoreItemText = SvxResId( RID_SVXSTR_MORE ); + AddStatusListener( ".uno:CurrentOutlineType" ); + } + + auto xImage = vcl::CommandInfoProvider::GetXGraphicForCommand(".uno:OutlineBullet", mrController.getFrameInterface()); + mxMoreButton->set_image(xImage); + mxMoreButton->set_label(aMoreItemText); + mxMoreButton->connect_clicked(LINK(this, SvxNumberingPopup, VSButtonClickSetHdl)); + + mxValueSet->SetSelectHdl(LINK(this, SvxNumberingPopup, VSSelectValueSetHdl)); +} + NumberingPopup::~NumberingPopup() { disposeOnce(); @@ -149,10 +238,55 @@ void NumberingPopup::statusChanged( const css::frame::FeatureStateEvent& rEvent mpValueSet->SelectItem( nSelItem ); } +void SvxNumberingPopup::statusChanged( const css::frame::FeatureStateEvent& rEvent ) +{ + mxValueSet->SetNoSelection(); + + sal_Int32 nSelItem; + if ( rEvent.State >>= nSelItem ) + mxValueSet->SelectItem( nSelItem ); +} + IMPL_LINK( NumberingPopup, VSSelectValueSetHdl, ValueSet*, pControl, void ) { VSSelectHdl(pControl); } + +IMPL_LINK_NOARG(SvxNumberingPopup, VSSelectValueSetHdl, SvtValueSet*, void) +{ + mrController.EndPopupMode(); + + sal_uInt16 nSelItem = mxValueSet->GetSelectedItemId(); + if ( mePageType == NumberingPageType::BULLET ) + { + auto aArgs( comphelper::InitPropertySequence( { { "SetBullet", css::uno::makeAny( nSelItem ) } } ) ); + mrController.dispatchCommand( ".uno:SetBullet", aArgs ); + } + else if ( mePageType == NumberingPageType::SINGLENUM ) + { + auto aArgs( comphelper::InitPropertySequence( { { "SetNumber", css::uno::makeAny( nSelItem ) } } ) ); + mrController.dispatchCommand( ".uno:SetNumber", aArgs ); + } + else + { + auto aArgs( comphelper::InitPropertySequence( { { "SetOutline", css::uno::makeAny( nSelItem ) } } ) ); + mrController.dispatchCommand( ".uno:SetOutline", aArgs ); + } +} + +IMPL_LINK_NOARG(SvxNumberingPopup, FocusHdl, weld::Widget&, void) +{ + mxValueSet->GrabFocus(); +} + +IMPL_LINK_NOARG(SvxNumberingPopup, VSButtonClickSetHdl, weld::Button&, void) +{ + mrController.EndPopupMode(); + + auto aArgs( comphelper::InitPropertySequence( { { "Page", css::uno::makeAny( OUString("customize") ) } } ) ); + mrController.dispatchCommand( ".uno:OutlineBullet", aArgs ); +} + IMPL_LINK( NumberingPopup, VSSelectToolbarMenuHdl, ToolbarMenu*, pControl, void ) { VSSelectHdl(pControl); @@ -210,6 +344,17 @@ void SAL_CALL NumberingToolBoxControl::initialize( const css::uno::Sequence< css else if ( m_aCommandURL == ".uno:SetOutline" ) mePageType = NumberingPageType::OUTLINE; + if (m_pToolbar) + { + const OString aId(m_aCommandURL.toUtf8()); + + auto xPopover = std::make_unique<SvxNumberingPopup>(*this, m_pToolbar, mePageType); + + m_pToolbar->set_item_popover(aId, xPopover->getTopLevel()); + mxPopover = std::move(xPopover); + return; + } + ToolBoxItemBits nBits = ( mePageType == NumberingPageType::OUTLINE ) ? ToolBoxItemBits::DROPDOWNONLY : ToolBoxItemBits::DROPDOWN; ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 10ad6779c234..a63b13b3021a 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -49,6 +49,7 @@ #include <tools/urlobj.hxx> #include <sfx2/childwin.hxx> #include <sfx2/viewfrm.hxx> +#include <sfx2/weldutils.hxx> #include <unotools/fontoptions.hxx> #include <vcl/builderfactory.hxx> #include <vcl/mnemonic.hxx> @@ -3797,26 +3798,7 @@ SvxCurrencyToolBoxControl::~SvxCurrencyToolBoxControl() {} namespace { - - class ToolbarPopup : public svtools::ToolbarPopupBase - { - protected: - std::unique_ptr<weld::Builder> m_xBuilder; - std::unique_ptr<weld::Container> m_xTopLevel; - public: - ToolbarPopup(const css::uno::Reference<css::frame::XFrame>& rFrame, weld::Widget* pParent, const OUString& rUIFile, const OString& rId) - : ToolbarPopupBase(rFrame) - , m_xBuilder(Application::CreateBuilder(pParent, rUIFile)) - , m_xTopLevel(m_xBuilder->weld_container(rId)) - { - } - weld::Container* getTopLevel() - { - return m_xTopLevel.get(); - } - }; - - class CurrencyList_Impl : public ToolbarPopup + class CurrencyList_Impl : public WeldToolbarPopup { private: rtl::Reference<SvxCurrencyToolBoxControl> m_xControl; @@ -3834,7 +3816,7 @@ namespace public: CurrencyList_Impl(SvxCurrencyToolBoxControl* pControl, weld::Widget* pParent, OUString& rSelectedFormat, LanguageType& eSelectedLanguage) - : ToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/currencywindow.ui", "CurrencyWindow") + : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/currencywindow.ui", "CurrencyWindow") , m_xControl(pControl) , m_xLabel(m_xBuilder->weld_label("label")) , m_xCurrencyLb(m_xBuilder->weld_tree_view("currency")) @@ -3887,7 +3869,6 @@ namespace m_xCurrencyLb->select( nSelectedPos ); m_xOkBtn->connect_clicked(LINK(this, CurrencyList_Impl, OKHdl)); } - }; IMPL_LINK_NOARG(CurrencyList_Impl, FocusHdl, weld::Widget&, void) diff --git a/svx/uiconfig/ui/numberingwindow.ui b/svx/uiconfig/ui/numberingwindow.ui new file mode 100644 index 000000000000..60abdc3777e8 --- /dev/null +++ b/svx/uiconfig/ui/numberingwindow.ui @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.22.1 --> +<interface domain="svx"> + <requires lib="gtk+" version="3.18"/> + <object class="GtkPopover" id="NumberingWindow"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="border_width">4</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkScrolledWindow" id="valuesetwin"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkDrawingArea" id="valueset"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="more"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="always_show_image">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + <object class="GtkTreeStore" id="liststore1"> + <columns> + <!-- column-name text --> + <column type="gchararray"/> + <!-- column-name id --> + <column type="gchararray"/> + </columns> + </object> +</interface> diff --git a/svx/uiconfig/ui/sidebarlists.ui b/svx/uiconfig/ui/sidebarlists.ui index 277dcc91c677..103120c9d20e 100644 --- a/svx/uiconfig/ui/sidebarlists.ui +++ b/svx/uiconfig/ui/sidebarlists.ui @@ -2,7 +2,6 @@ <!-- Generated with glade 3.22.1 --> <interface domain="svx"> <requires lib="gtk+" version="3.18"/> - <requires lib="LibreOffice" version="1.0"/> <object class="GtkGrid" id="ListsPropertyPanel"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -15,41 +14,41 @@ <property name="column_spacing">6</property> <property name="column_homogeneous">True</property> <child> - <object class="sfxlo-SidebarToolBox" id="numberbullet"> + <object class="GtkToolbar" id="numberbullet"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="tooltip_text" translatable="yes" context="sidebarlists|numberbullet|tooltip_text">Bullets and Numbering</property> + <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> + <property name="icon_size">2</property> <child> - <object class="GtkMenuToolButton" id="bullet"> + <object class="GtkMenuToolButton" id=".uno:DefaultBullet"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="is_important">True</property> - <property name="action_name">.uno:DefaultBullet</property> <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="GtkMenuToolButton" id="number"> + <object class="GtkMenuToolButton" id=".uno:DefaultNumbering"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="is_important">True</property> - <property name="action_name">.uno:DefaultNumbering</property> <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> @@ -57,58 +56,54 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <placeholder/> - </child> - <child> - <object class="sfxlo-SidebarToolBox" id="outline"> + <object class="GtkToolbar" id="outline"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <property name="icon_size">2</property> <child> - <object class="GtkToolButton" id="demote"> + <object class="GtkToolButton" id=".uno:OutlineRight"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:OutlineRight</property> <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="GtkToolButton" id="promote"> + <object class="GtkToolButton" id=".uno:OutlineLeft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:OutlineLeft</property> <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="GtkToolButton" id="movedown"> + <object class="GtkToolButton" id=".uno:OutlineDown"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:OutlineDown</property> <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="GtkToolButton" id="moveup"> + <object class="GtkToolButton" id=".uno:OutlineUp"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:OutlineUp</property> <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="homogeneous">False</property> </packing> </child> </object> @@ -122,7 +117,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="top_attach">0</property> </packing> </child> </object> |