[Libreoffice-commits] core.git: 5 commits - accessibility/source dbaccess/source include/sfx2 include/svtools sfx2/source svtools/source svx/AllLangResTarget_svx.mk svx/source svx/uiconfig svx/UIConfig_svx.mk
Jan Holesovsky
kendy at suse.cz
Wed Jul 17 04:28:30 PDT 2013
accessibility/source/standard/vclxaccessibletoolbox.cxx | 31 +
dbaccess/source/ui/control/toolboxcontroller.cxx | 4
include/sfx2/tbxctrl.hxx | 1
include/svtools/toolboxcontroller.hxx | 1
sfx2/source/toolbox/tbxitem.cxx | 5
svtools/source/uno/toolboxcontroller.cxx | 5
svx/AllLangResTarget_svx.mk | 1
svx/UIConfig_svx.mk | 1
svx/source/customshapes/tbxcustomshapes.cxx | 15
svx/source/sidebar/insert/InsertPropertyPanel.cxx | 36 --
svx/source/sidebar/insert/InsertPropertyPanel.hrc | 38 --
svx/source/sidebar/insert/InsertPropertyPanel.hxx | 12
svx/source/sidebar/insert/InsertPropertyPanel.src | 142 --------
svx/source/tbxctrls/tbxalign.cxx | 19 -
svx/uiconfig/ui/sidebarinsert.ui | 256 ++++++++++++++++
15 files changed, 308 insertions(+), 259 deletions(-)
New commits:
commit 6f10ddfafc68df3f3458a6ba10bfc649074680b3
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Jul 17 12:16:27 2013 +0200
sidebar: A FIXME comment; I don't want to spend any more time on this.
Change-Id: I91af1e9d053f3d27074ec0d20c8f2517f71849cc
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
index 0d4860f..7ca7816 100644
--- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
@@ -57,6 +57,14 @@ InsertPropertyPanel::InsertPropertyPanel (
mpCustomShapesToolBox->Show();
// Listen to all tool box selection events.
+ // FIXME: This is an incredibly ugly hack that we should kill at some
+ // stage. It is needed because the mpCustomShapesToolBox somehow does not
+ // get the right controller, and so the images there are not updated when
+ // the user selects eg. a callout. But using the help id's to get/update
+ // it (that is what functionSelected() does) is not the way to go in
+ // general ;-)
+ // In other words, we should find the underlying problem, and remove the
+ // WindowEventListener for good.
Window* pTopWindow = pParent;
while (pTopWindow->GetParent() != NULL)
pTopWindow = pTopWindow->GetParent();
commit a6d3bf989b7f02fa665877e4a785400c869a5afd
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Jul 17 12:12:02 2013 +0200
sidebar: InsertPropertyPanel needs to use SidebarToolBox.
Change-Id: I8e93a91aa7f93c7ca21068d56796c80096711801
diff --git a/svx/uiconfig/ui/sidebarinsert.ui b/svx/uiconfig/ui/sidebarinsert.ui
index c58bb59..909b75a 100644
--- a/svx/uiconfig/ui/sidebarinsert.ui
+++ b/svx/uiconfig/ui/sidebarinsert.ui
@@ -19,7 +19,7 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkToolbar" id="standardshapes">
+ <object class="sfxlo-SidebarToolBox" id="standardshapes">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -142,7 +142,7 @@
</packing>
</child>
<child>
- <object class="GtkToolbar" id="customshapes">
+ <object class="sfxlo-SidebarToolBox" id="customshapes">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">6</property>
commit 8c69fcd6ebe514a3b10f929059f0c676913374f3
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Jul 16 16:12:48 2013 +0200
Move hasBigImages() from ToolboxController to SfxToolBoxController.
We want to decide whether the images are big or not based on the real
(underlying) ToolBox, not on the global setting, because we can have both
toolbars with large as well as small icons visible at the same time (small in
sidebar, large in toolbars).
Change-Id: I046a12a495f2038df9a571f5779794a639bae6dc
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index 57e3b00..b833483 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -200,8 +200,6 @@ namespace dbaui
Reference<XUIConfigurationManager> xUIConfigMgr = xModuleCfgMgrSupplier->getUIConfigurationManager( OUString("com.sun.star.sdb.OfficeDatabaseDocument") );
Reference<XImageManager> xImageMgr(xUIConfigMgr->getImageManager(),UNO_QUERY);
- short nImageType = hasBigImages() ? ImageType::SIZE_LARGE : ImageType::SIZE_DEFAULT;
-
Sequence< OUString> aSeq(1);
sal_uInt16 nCount = pMenu->GetItemCount();
for (sal_uInt16 nPos = 0; nPos < nCount; ++nPos)
@@ -211,7 +209,7 @@ namespace dbaui
sal_uInt16 nItemId = pMenu->GetItemId(nPos);
aSeq[0] = pMenu->GetItemCommand(nItemId);
- Sequence< Reference<XGraphic> > aImages = xImageMgr->getImages(nImageType,aSeq);
+ Sequence< Reference<XGraphic> > aImages = xImageMgr->getImages(ImageType::SIZE_DEFAULT, aSeq);
Image aImage(aImages[0]);
pMenu->SetItemImage(nItemId,aImage);
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index e7b6e69..af1b1a6 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -252,6 +252,7 @@ protected:
// helper methods
void createAndPositionSubToolBar( const OUString& rSubToolBarResName );
::Size getPersistentFloatingSize( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const OUString& rSubToolBarResName );
+ bool hasBigImages() const;
public:
SFX_DECL_TOOLBOX_CONTROL();
diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx
index 217d6cd..5293130 100644
--- a/include/svtools/toolboxcontroller.hxx
+++ b/include/svtools/toolboxcontroller.hxx
@@ -158,7 +158,6 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL
void bindListener();
void unbindListener();
sal_Bool isBound() const;
- sal_Bool hasBigImages() const;
// TODO remove
::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > getURLTransformer() const;
// TODO remove
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 34c4b18..b535d0c 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -773,6 +773,11 @@ throw (::com::sun::star::uno::RuntimeException)
return aToolboxSize;
}
+bool SfxToolBoxControl::hasBigImages() const
+{
+ return (GetToolBox().GetToolboxButtonSize() == TOOLBOX_BUTTONSIZE_LARGE);
+}
+
void SfxToolBoxControl::createAndPositionSubToolBar( const OUString& rSubToolBarResName )
{
SolarMutexGuard aGuard;
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index 7b675a9..b9364c4 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -634,11 +634,6 @@ sal_Bool ToolboxController::isBound() const
return sal_False;
}
-sal_Bool ToolboxController::hasBigImages() const
-{
- return SvtMiscOptions().AreCurrentSymbolsLarge();
-}
-
void ToolboxController::updateStatus()
{
bindListener();
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index 87dab72..836a314 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -153,21 +153,12 @@ OUString SAL_CALL SvxTbxCtlCustomShapes::getSubToolbarName() throw (::com::sun::
void SAL_CALL SvxTbxCtlCustomShapes::functionSelected( const OUString& rCommand ) throw (::com::sun::star::uno::RuntimeException)
{
- // remind the new command
+ // remember the new command
m_aCommand = rCommand;
+
// Our sub-toolbar wants to execute a function.
// We have to change the image of our toolbar button to reflect the new function.
- SolarMutexGuard aGuard;
- if ( !m_bDisposed )
- {
- if ( !m_aCommand.isEmpty() )
- {
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface());
- Image aImage = GetImage( xFrame, m_aCommand, hasBigImages() );
- if ( !!aImage )
- GetToolBox().SetItemImage( GetId(), aImage );
- }
- }
+ updateImage();
}
void SAL_CALL SvxTbxCtlCustomShapes::updateImage( ) throw (::com::sun::star::uno::RuntimeException)
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index b566c1f..13eff22 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -98,19 +98,12 @@ OUString SAL_CALL SvxTbxCtlAlign::getSubToolbarName() throw (::com::sun::star::u
void SAL_CALL SvxTbxCtlAlign::functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException)
{
- // Our sub-toolbar wants to executes a function. We have to change
- // the image of our toolbar button to reflect the new function.
- SolarMutexGuard aGuard;
- if ( !m_bDisposed )
- {
- if ( !aCommand.isEmpty() )
- {
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( getFrameInterface());
- Image aImage = GetImage( xFrame, aCommand, hasBigImages() );
- if ( !!aImage )
- GetToolBox().SetItemImage( GetId(), aImage );
- }
- }
+ // remember the new command
+ m_aCommand = aCommand;
+
+ // Our sub-toolbar wants to execute a function.
+ // We have to change the image of our toolbar button to reflect the new function.
+ updateImage();
}
void SAL_CALL SvxTbxCtlAlign::updateImage() throw (::com::sun::star::uno::RuntimeException)
commit 7cfd340e92835c43788031ef184095f0f61a61a9
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Jul 16 11:51:37 2013 +0200
Fix crash & reduce nesting.
Change-Id: Ifbfe401cd69678c278394d190a37cc41a28d5c56
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 205c08b..452083e 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -484,21 +484,24 @@ void VCLXAccessibleToolBox::HandleSubToolBarEvent( const VclWindowEvent& rVclWin
void VCLXAccessibleToolBox::ReleaseSubToolBox( ToolBox* _pSubToolBox )
{
ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
- if ( pToolBox )
+ if ( !pToolBox )
+ return;
+
+ sal_Int32 nIndex = pToolBox->GetItemPos( pToolBox->GetCurItemId() );
+ if ( nIndex == SAL_MAX_UINT16 )
+ return; // not found
+
+ Reference< XAccessible > xItem = getAccessibleChild( nIndex );
+ if ( !xItem.is() )
+ return;
+
+ Reference< XAccessible > xChild = _pSubToolBox->GetAccessible();
+ VCLXAccessibleToolBoxItem* pItem =
+ static_cast< VCLXAccessibleToolBoxItem* >( xItem.get() );
+ if ( pItem->GetChild() == xChild )
{
- sal_Int32 nIndex = pToolBox->GetItemPos( pToolBox->GetCurItemId() );
- Reference< XAccessible > xItem = getAccessibleChild( nIndex );
- if ( xItem.is() )
- {
- Reference< XAccessible > xChild = _pSubToolBox->GetAccessible();
- VCLXAccessibleToolBoxItem* pItem =
- static_cast< VCLXAccessibleToolBoxItem* >( xItem.get() );
- if ( pItem->GetChild() == xChild )
- {
- pItem->SetChild( Reference< XAccessible >() );
- pItem->NotifyChildEvent( xChild, false );
- }
- }
+ pItem->SetChild( Reference< XAccessible >() );
+ pItem->NotifyChildEvent( xChild, false );
}
}
// -----------------------------------------------------------------------------
commit 3183f794bf6d9d3da214b25a67240f67cfbee16d
Author: Prashant Pandey <prashant3.yishu at gmail.com>
Date: Fri Jul 12 23:22:45 2013 +0530
sidebar: InsertPropertyPanel conversion to .ui
Change-Id: I51df7ade7b5f83124a2a103db3028fbb0b5ea8cc
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index 4bd851f..2adb6dc 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -74,7 +74,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
svx/source/sidebar/line/LinePropertyPanel.src \
svx/source/sidebar/text/TextPropertyPanel.src \
svx/source/sidebar/paragraph/ParaPropertyPanel.src \
- svx/source/sidebar/insert/InsertPropertyPanel.src \
svx/source/stbctrls/stbctrls.src \
svx/source/svdraw/svdstr.src \
svx/source/table/table.src \
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index a041697..99feed8 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/redlinefilterpage \
svx/uiconfig/ui/redlineviewpage \
svx/uiconfig/ui/sidebararea \
+ svx/uiconfig/ui/sidebarinsert \
svx/uiconfig/ui/sidebarline \
svx/uiconfig/ui/sidebarparagraph \
svx/uiconfig/ui/sidebarpossize \
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
index cbaca02..0d4860f 100644
--- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
@@ -16,7 +16,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "InsertPropertyPanel.hxx"
-#include "InsertPropertyPanel.hrc"
#include "sfx2/sidebar/CommandInfoProvider.hxx"
#include <sfx2/sidebar/Theme.hxx>
@@ -42,27 +41,17 @@ using namespace cssu;
using ::rtl::OUString;
using ::sfx2::sidebar::SidebarToolBox;
-
namespace svx { namespace sidebar {
InsertPropertyPanel::InsertPropertyPanel (
Window* pParent,
const cssu::Reference<css::frame::XFrame>& rxFrame)
- : Control(pParent, SVX_RES(RID_SIDEBAR_INSERT_PANEL)),
- mpStandardShapesBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
- mpStandardShapesToolBox(sfx2::sidebar::ControlFactory::CreateToolBox(
- mpStandardShapesBackground.get(),
- SVX_RES(TB_INSERT_STANDARD),
- rxFrame)),
- mpCustomShapesBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
- mpCustomShapesToolBox(sfx2::sidebar::ControlFactory::CreateToolBox(
- mpCustomShapesBackground.get(),
- SVX_RES(TB_INSERT_CUSTOM),
- rxFrame)),
+ : PanelLayout(pParent, "InsertPropertyPanel", "svx/ui/sidebarinsert.ui", rxFrame),
mxFrame(rxFrame)
{
- FreeResource();
+ get(mpStandardShapesToolBox, "standardshapes");
+ get(mpCustomShapesToolBox, "customshapes");
mpStandardShapesToolBox->Show();
mpCustomShapesToolBox->Show();
@@ -84,11 +73,6 @@ InsertPropertyPanel::~InsertPropertyPanel (void)
while (pTopWindow->GetParent() != NULL)
pTopWindow = pTopWindow->GetParent();
pTopWindow->RemoveChildEventListener(LINK(this, InsertPropertyPanel, WindowEventListener));
-
- mpStandardShapesToolBox.reset();
- mpCustomShapesToolBox.reset();
- mpStandardShapesBackground.reset();
- mpCustomShapesBackground.reset();
}
@@ -124,13 +108,13 @@ IMPL_LINK(InsertPropertyPanel, WindowEventListener, VclSimpleEvent*, pEvent)
if (nId == 0)
return 1;
- SidebarToolBox* pSidebarToolBox = dynamic_cast<SidebarToolBox*>(mpStandardShapesToolBox.get());
+ SidebarToolBox* pSidebarToolBox = dynamic_cast<SidebarToolBox*>(mpStandardShapesToolBox);
if (pSidebarToolBox == NULL)
return 1;
sal_uInt16 nItemId (pSidebarToolBox->GetItemIdForSubToolbarName(aURL.Path));
if (nItemId == 0)
{
- pSidebarToolBox = dynamic_cast<SidebarToolBox*>(mpCustomShapesToolBox.get());
+ pSidebarToolBox = dynamic_cast<SidebarToolBox*>(mpCustomShapesToolBox);
if (pSidebarToolBox == NULL)
return 1;
nItemId = pSidebarToolBox->GetItemIdForSubToolbarName(aURL.Path);
@@ -139,7 +123,7 @@ IMPL_LINK(InsertPropertyPanel, WindowEventListener, VclSimpleEvent*, pEvent)
}
Reference<frame::XSubToolbarController> xController (pSidebarToolBox->GetControllerForItemId(nItemId), UNO_QUERY);
- if ( ! xController.is())
+ if ( ! xController.is() )
return 1;
const OUString sCommand (pToolBox->GetItemCommand(nId));
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.hrc b/svx/source/sidebar/insert/InsertPropertyPanel.hrc
deleted file mode 100644
index 55425e2..0000000
--- a/svx/source/sidebar/insert/InsertPropertyPanel.hrc
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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 "svx/dialogs.hrc"
-
-#define TB_INSERT_STANDARD 1
-#define TB_INSERT_CUSTOM 2
-
-
-#define TBI_STANDARD_LINE 10
-#define TBI_STANDARD_ARROW 11
-#define TBI_STANDARD_RECTANGLE 12
-#define TBI_STANDARD_ELLIPSE 13
-#define TBI_STANDARD_TEXT 14
-#define TBI_STANDARD_LINES 15
-#define TBI_STANDARD_CONNECTORS 16
-#define TBI_STANDARD_ARROWS 17
-
-#define TBI_CUSTOM_BASICS 20
-#define TBI_CUSTOM_SYMBOLS 21
-#define TBI_CUSTOM_ARROWS 22
-#define TBI_CUSTOM_FLOWCHARTS 23
-#define TBI_CUSTOM_CALLOUTS 24
-#define TBI_CUSTOM_STARS 25
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.hxx b/svx/source/sidebar/insert/InsertPropertyPanel.hxx
index bd58a3a..f5b971a 100644
--- a/svx/source/sidebar/insert/InsertPropertyPanel.hxx
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.hxx
@@ -18,15 +18,13 @@
#ifndef SVX_SIDEBAR_INSERT_PROPERTY_PAGE_HXX
#define SVX_SIDEBAR_INSERT_PROPERTY_PAGE_HXX
-#include <boost/scoped_ptr.hpp>
-
#include <vcl/ctrl.hxx>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XToolbarController.hpp>
#include <map>
-
+#include <svx/sidebar/PanelLayout.hxx>
namespace css = ::com::sun::star;
namespace cssu = ::com::sun::star::uno;
@@ -38,7 +36,7 @@ namespace svx { namespace sidebar {
/** This panel provides buttons for inserting shapes into a document.
*/
class InsertPropertyPanel
- : public Control
+ : public PanelLayout
{
public:
InsertPropertyPanel (
@@ -47,10 +45,8 @@ public:
virtual ~InsertPropertyPanel (void);
private:
- ::boost::scoped_ptr<Window> mpStandardShapesBackground;
- ::boost::scoped_ptr<ToolBox> mpStandardShapesToolBox;
- ::boost::scoped_ptr<Window> mpCustomShapesBackground;
- ::boost::scoped_ptr<ToolBox> mpCustomShapesToolBox;
+ ToolBox* mpStandardShapesToolBox;
+ ToolBox* mpCustomShapesToolBox;
const cssu::Reference<css::frame::XFrame> mxFrame;
DECL_LINK(WindowEventListener, VclSimpleEvent*);
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.src b/svx/source/sidebar/insert/InsertPropertyPanel.src
deleted file mode 100644
index 5219eed..0000000
--- a/svx/source/sidebar/insert/InsertPropertyPanel.src
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * 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 "InsertPropertyPanel.hrc"
-#include <sfx2/sidebar/ResourceDefinitions.hrc>
-#include "helpid.hrc"
-
-#define FIRST_LINE_Y SECTIONPAGE_MARGIN_VERTICAL_TOP
-#define SECOND_LINE_Y FIRST_LINE_Y + TOOLBOX_ITEM_HEIGHT + CONTROL_SPACING_VERTICAL + 1
-
-Control RID_SIDEBAR_INSERT_PANEL
-{
- OutputSize = TRUE;
- DialogControl = TRUE;
- Border = FALSE;
-
- Size = MAP_APPFONT(
- PROPERTYPAGE_WIDTH,
- SECTIONPAGE_MARGIN_VERTICAL_TOP
- + TOOLBOX_ITEM_HEIGHT * 2
- + CONTROL_SPACING_VERTICAL
- + SECTIONPAGE_MARGIN_VERTICAL_BOT);
- HelpID = HID_SIDEBAR_INSERT_PANEL;
- Text = "Insert";
-
- ToolBox TB_INSERT_STANDARD
- {
- SVLook = TRUE ;
- Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL, FIRST_LINE_Y);
- Size = MAP_APPFONT (TOOLBOX_ITEM_WIDTH * 6 + TOOLBOX_ITEM_DD_WIDTH, TOOLBOX_ITEM_HEIGHT) ;
- TabStop = TRUE ;
- HelpID = HID_SIDEBAR_INSERT_TOOLBOX;
- Text = "Insert Shapes";
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = TBI_STANDARD_LINE;
- Command = ".uno:Line";
- };
- ToolBoxItem
- {
- Identifier = TBI_STANDARD_ARROW;
- Command = ".uno:LineArrowEnd";
- };
- ToolBoxItem
- {
- Identifier = TBI_STANDARD_RECTANGLE;
- Command = ".uno:Rect";
- };
- ToolBoxItem
- {
- Identifier = TBI_STANDARD_ELLIPSE;
- Command = ".uno:Ellipse";
- };
- ToolBoxItem
- {
- Identifier = TBI_STANDARD_TEXT;
- Command = ".uno:Text";
- };
- ToolBoxItem
- {
- Identifier = TBI_STANDARD_LINES;
- Command = ".uno:LineToolbox";
- };
- ToolBoxItem
- {
- Identifier = TBI_STANDARD_CONNECTORS;
- Command = ".uno:ConnectorToolbox";
- };
- ToolBoxItem
- {
- Identifier = TBI_STANDARD_ARROWS;
- Command = ".uno:ArrowsToolbox";
- DropDown = TRUE;
- };
- };
- };
-
- ToolBox TB_INSERT_CUSTOM
- {
- SVLook = TRUE ;
- Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL, SECOND_LINE_Y);
- Size = MAP_APPFONT (TOOLBOX_ITEM_DD_WIDTH * 6, TOOLBOX_ITEM_HEIGHT) ;
- TabStop = TRUE ;
- HelpID = HID_SIDEBAR_INSERT_TOOLBOX;
- Text = "Insert";
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = TBI_CUSTOM_BASICS;
- Command = ".uno:BasicShapes";
- DropDown = TRUE;
- };
- ToolBoxItem
- {
- Identifier = TBI_CUSTOM_SYMBOLS;
- Command = ".uno:SymbolShapes";
- DropDown = TRUE;
- };
- ToolBoxItem
- {
- Identifier = TBI_CUSTOM_ARROWS;
- Command = ".uno:ArrowShapes";
- DropDown = TRUE;
- };
- ToolBoxItem
- {
- Identifier = TBI_CUSTOM_FLOWCHARTS;
- Command = ".uno:FlowChartShapes";
- DropDown = TRUE;
- };
- ToolBoxItem
- {
- Identifier = TBI_CUSTOM_CALLOUTS;
- Command = ".uno:CalloutShapes";
- DropDown = TRUE;
- };
- ToolBoxItem
- {
- Identifier = TBI_CUSTOM_STARS;
- Command = ".uno:StarShapes";
- DropDown = TRUE;
- };
- };
- };
-};
diff --git a/svx/uiconfig/ui/sidebarinsert.ui b/svx/uiconfig/ui/sidebarinsert.ui
new file mode 100644
index 0000000..c58bb59
--- /dev/null
+++ b/svx/uiconfig/ui/sidebarinsert.ui
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkGrid" id="InsertPropertyPanel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_homogeneous">True</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkToolbar" id="standardshapes">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkToolButton" id="line">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_markup" translatable="yes">Line</property>
+ <property name="tooltip_text" translatable="yes">Line</property>
+ <property name="action_name">.uno:Line</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="arrow">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_markup" translatable="yes">Line ends with Arrow</property>
+ <property name="tooltip_text" translatable="yes">Line ends with Arrow</property>
+ <property name="action_name">.uno:LineArrowEnd</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="rectangle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_markup" translatable="yes">Rectangle</property>
+ <property name="tooltip_text" translatable="yes">Rectangle</property>
+ <property name="action_name">.uno:Rect</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="ellipse">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_markup" translatable="yes">Ellipse</property>
+ <property name="tooltip_text" translatable="yes">Ellipse</property>
+ <property name="action_name">.uno:Ellipse</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="text">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_markup" translatable="yes">Text (F2)</property>
+ <property name="tooltip_text" translatable="yes">Text (F2)</property>
+ <property name="action_name">.uno:Text</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton" id="curve">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_markup" translatable="yes">Curve</property>
+ <property name="tooltip_text" translatable="yes">Curve</property>
+ <property name="action_name">.uno:LineToolbox</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton" id="connector">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_markup" translatable="yes">Connector</property>
+ <property name="tooltip_text" translatable="yes">Connector</property>
+ <property name="action_name">.uno:ConnectorToolbox</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton" id="linearrow">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_markup" translatable="yes">Lines and Arrows</property>
+ <property name="tooltip_text" translatable="yes">Lines and Arrows</property>
+ <property name="action_name">.uno:ArrowsToolbox</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolbar" id="customshapes">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">6</property>
+ <child>
+ <object class="GtkMenuToolButton" id="basicshapes">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_markup" translatable="yes">Basic Shapes</property>
+ <property name="tooltip_text" translatable="yes">Basic Shapes</property>
+ <property name="action_name">.uno:BasicShapes</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton" id="symbolshapes">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_markup" translatable="yes">Symbol Shapes</property>
+ <property name="tooltip_text" translatable="yes">Symbol Shapes</property>
+ <property name="action_name">.uno:SymbolShapes</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton" id="blockarrows">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_markup" translatable="yes">Block Arrows</property>
+ <property name="tooltip_text" translatable="yes">Block Arrows</property>
+ <property name="action_name">.uno:ArrowShapes</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton" id="flowcharts">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_markup" translatable="yes">Flowcharts</property>
+ <property name="tooltip_text" translatable="yes">Flowcharts</property>
+ <property name="action_name">.uno:FlowChartShapes</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton" id="callouts">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_markup" translatable="yes">Callouts</property>
+ <property name="tooltip_text" translatable="yes">Callouts</property>
+ <property name="action_name">.uno:CalloutShapes</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkMenuToolButton" id="stars">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_markup" translatable="yes">Stars</property>
+ <property name="tooltip_text" translatable="yes">Stars</property>
+ <property name="action_name">.uno:StarShapes</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </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>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list