[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

2020-06-25 Thread Caolán McNamara (via logerrit) 
 include/svx/strings.hrc   |1 
 svx/UIConfig_svx.mk   |1 
 svx/inc/formnavi.hrc  |   53 ++
 svx/source/form/filtnav.cxx   |6 
 svx/source/form/fmexch.cxx|  106 +---
 svx/source/form/fmexpl.cxx|   93 +--
 svx/source/form/fmshimp.cxx   |   16 
 svx/source/form/navigatortree.cxx |  901 +-
 svx/source/inc/filtnav.hxx|2 
 svx/source/inc/fmexch.hxx |   33 -
 svx/source/inc/fmexpl.hxx |  101 ++--
 svx/source/inc/fmshimp.hxx|   12 
 svx/uiconfig/ui/formnavigator.ui  |   78 +++
 svx/uiconfig/ui/formnavimenu.ui   |   26 -
 14 files changed, 708 insertions(+), 721 deletions(-)

New commits:
commit 82cb3eb7389b4ff9b3254f8370379cf6fd81322f
Author: Caolán McNamara 
AuthorDate: Tue Jun 23 11:51:32 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jun 25 20:26:38 2020 +0200

weld NavigatorTree

Change-Id: I019021fa5a522b1238d74702c9222afdfd7540c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96961
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 114cbd17bd6e..93f3b016f6df 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1132,6 +1132,7 @@
 #define RID_STR_PROPERTIES_FORM 
NC_("RID_STR_PROPERTIES_FORM", "Form Properties")
 #define RID_STR_FMEXPLORER  
NC_("RID_STR_FMEXPLORER", "Form Navigator")
 #define RID_STR_FORM
NC_("RID_STR_FORM", "Form")
+#define RID_STR_HIDDEN  
NC_("RID_STR_HIDDEN", "Hidden")
 #define RID_STR_STDFORMNAME 
NC_("RID_STR_STDFORMNAME", "Form")
 #define RID_STR_PROPTITLE_HIDDEN
NC_("RID_STR_PROPTITLE_HIDDEN", "Hidden Control")
 #define RID_STR_CONTROL 
NC_("RID_STR_CONTROL", "Control")
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index f7f02ad2f126..0658ede63727 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/formdatamenu \
svx/uiconfig/ui/formfielddialog \
svx/uiconfig/ui/formlinkwarndialog \
+   svx/uiconfig/ui/formnavigator \
svx/uiconfig/ui/formnavimenu \
svx/uiconfig/ui/formpropertydialog \
svx/uiconfig/ui/functionmenu \
diff --git a/svx/inc/formnavi.hrc b/svx/inc/formnavi.hrc
new file mode 100644
index ..78271e2f05c4
--- /dev/null
+++ b/svx/inc/formnavi.hrc
@@ -0,0 +1,53 @@
+/* -*- 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_SVX_INC_FRMSEL_HRC
+#define INCLUDED_SVX_INC_FRMSEL_HRC
+
+#include 
+
+#define NC_(Context, String) reinterpret_cast(Context "\004" 
u8##String)
+
+const char* RID_SVXSW_CONVERTMENU[] =
+{
+NC_("RID_SVXSW_CONVERTMENU|ConvertToEdit", "~Text Box"),
+NC_("RID_SVXSW_CONVERTMENU|ConvertToButton", "~Button"),
+NC_("RID_SVXSW_CONVERTMENU|ConvertToFixed", "La~bel field"),
+NC_("RID_SVXSW_CONVERTMENU|ConvertToList", "L~ist Box"),
+NC_("RID_SVXSW_CONVERTMENU|ConvertToCheckBox", "~Check Box"),
+NC_("RID_SVXSW_CONVERTMENU|ConvertToRadio", "~Radio Button"),
+NC_("RID_SVXSW_CONVERTMENU|ConvertToGroup", "G~roup Box"),
+NC_("RID_SVXSW_CONVERTMENU|ConvertToCombo", "Combo Bo~x"),
+NC_("RID_SVXSW_CONVERTMENU|ConvertToImageBtn", "I~mage Button"),
+NC_("RID_SVXSW_CONVERTMENU|ConvertToFileControl", "~File Selection"),
+NC_("RID_SVXSW_CONVERTMENU|ConvertToDate", "~Date Field"),
+NC_("RID_SVXSW_CONVERTMENU|ConvertToTime", "Tim~e Field"),
+NC_("RID_SVXSW_CONVERTMENU|ConvertToNumeric", "~Numerical Field"),
+NC_("RID_SVXSW_CONVERTMENU|ConvertToCurrency", "C~urrency Field"),
+NC_("RID_SVXSW_CONVERTMENU|ConvertToPattern", "~Pattern Field"),
+NC_("RID_SVXSW_CONVERTMENU|ConvertToImageControl", "Ima~ge Control"),
+NC_("RID_SVXSW_CONVERTMENU|ConvertToFormatted", "Fo~rmatted Field"),
+

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

2020-02-11 Thread Caolán McNamara (via logerrit) 
 include/svx/fillctrl.hxx|   43 +--
 include/svx/itemwin.hxx |   54 ---
 svx/UIConfig_svx.mk |1 
 svx/inc/pch/precompiled_svxcore.hxx |3 
 svx/source/tbxctrls/fillctrl.cxx|  497 
 svx/source/tbxctrls/itemwin.cxx |  241 -
 svx/uiconfig/ui/fillctrlbox.ui  |  110 +++
 7 files changed, 435 insertions(+), 514 deletions(-)

New commits:
commit 6c01bbab45eb16356d345ae2f6bfd6a864dd59e1
Author: Caolán McNamara 
AuthorDate: Mon Feb 10 11:36:53 2020 +
Commit: Caolán McNamara 
CommitDate: Tue Feb 11 12:28:19 2020 +0100

weld FillControl item window

Change-Id: I5f943a9cf881494fe8a9fecea6a957a7085a5582
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88378
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx
index 5278fc31e718..e7a77692b129 100644
--- a/include/svx/fillctrl.hxx
+++ b/include/svx/fillctrl.hxx
@@ -21,7 +21,9 @@
 #define INCLUDED_SVX_FILLCTRL_HXX
 
 #include 
+#include 
 #include 
+#include 
 #include 
 #include 
 
@@ -31,9 +33,6 @@ class XFillGradientItem;
 class XFillHatchItem;
 class XFillBitmapItem;
 class FillControl;
-class SvxFillTypeBox;
-class SvxFillAttrBox;
-class ListBox;
 
 /*
 |*
@@ -50,18 +49,18 @@ private:
 std::unique_ptr< XFillHatchItem >mpHatchItem;
 std::unique_ptr< XFillBitmapItem >   mpBitmapItem;
 
-VclPtrmpFillControl;
-VclPtr mpLbFillType;
-VclPtrmpToolBoxColor;
-VclPtr mpLbFillAttr;
+VclPtr mxFillControl;
+weld::ComboBox* mpLbFillType;
+weld::Toolbar* mpToolBoxColor;
+weld::ComboBox* mpLbFillAttr;
 
 css::drawing::FillStylemeLastXFS;
 sal_Int32   mnLastPosGradient;
 sal_Int32   mnLastPosHatch;
 sal_Int32   mnLastPosBitmap;
 
-DECL_LINK(SelectFillTypeHdl, ListBox&, void);
-DECL_LINK(SelectFillAttrHdl, ListBox&, void);
+DECL_LINK(SelectFillTypeHdl, weld::ComboBox&, void);
+DECL_LINK(SelectFillAttrHdl, weld::ComboBox&, void);
 
 public:
 SFX_DECL_TOOLBOX_CONTROL();
@@ -74,25 +73,37 @@ public:
 virtual VclPtr CreateItemWindow(vcl::Window* pParent) 
override;
 };
 
-class SAL_WARN_UNUSED FillControl : public vcl::Window
+class SAL_WARN_UNUSED FillControl final : public InterimItemWindow
 {
 private:
 friend class SvxFillToolBoxControl;
 
-VclPtr mpLbFillType;
-VclPtrmpToolBoxColor;
-VclPtr mpLbFillAttr;
+std::unique_ptr mxLbFillType;
+std::unique_ptr mxToolBoxColor;
+std::unique_ptr mxColorDispatch;
+std::unique_ptr mxLbFillAttr;
+int mnTypeCurPos;
+int mnAttrCurPos;
+
+DECL_LINK(AttrKeyInputHdl, const KeyEvent&, bool);
+DECL_LINK(TypeKeyInputHdl, const KeyEvent&, bool);
+DECL_LINK(ColorKeyInputHdl, const KeyEvent&, bool);
+DECL_STATIC_LINK(FillControl, DumpAsPropertyTreeHdl, 
boost::property_tree::ptree&, void);
+DECL_LINK(AttrFocusHdl, weld::Widget&, void);
+DECL_LINK(TypeFocusHdl, weld::Widget&, void);
 
 void SetOptimalSize();
 
 virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
 
+static void ReleaseFocus_Impl();
+
 public:
-FillControl(vcl::Window* pParent);
-virtual ~FillControl() override;
+FillControl(vcl::Window* pParent, const 
css::uno::Reference& rFrame);
 virtual void dispose() override;
+virtual ~FillControl() override;
 
-virtual void Resize() override;
+virtual void GetFocus() override;
 };
 
 #endif // INCLUDED_SVX_FILLCTRL_HXX
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index 964d80f1a2e2..570a6cdbb4bd 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SVX_ITEMWIN_HXX
 #define INCLUDED_SVX_ITEMWIN_HXX
 
-#include 
-#include 
 #include 
 #include 
 #include 
@@ -81,52 +79,18 @@ public:
 voidset_sensitive(bool bSensitive);
 };
 
-class SVX_DLLPUBLIC SvxFillTypeBox final : public ListBox
+namespace SvxFillTypeBox
 {
-public:
-SvxFillTypeBox( vcl::Window* pParent );
-
-void Fill();
-
-static void Fill(weld::ComboBox& rListBox);
-
-voidSelected() { bSelect = true; }
-virtual boost::property_tree::ptree DumpAsPropertyTree() override;
-
-private:
-virtual boolPreNotify( NotifyEvent& rNEvt ) override;
-virtual boolEventNotify( NotifyEvent& rNEvt ) override;
-
-sal_uInt16  nCurPos;
-boolbSelect;
-
-static void ReleaseFocus_Impl();
-};
+SVX_DLLPUBLIC void Fill(weld::ComboBox& rListBox);
+}
 
-class SVX_DLLPUBLIC SvxFillAttrBox final : public ListBox
+namespace SvxFillAttrBox
 {
-public:
-SvxFillAttrBox( vcl::Window* pParent );
-
-void Fill( const XHatchListRef );
-void Fill( const XGradientListRef  );
-void Fill( const

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

2020-01-27 Thread Caolán McNamara (via logerrit) 
 include/svx/strings.hrc   |4 -
 svx/UIConfig_svx.mk   |1 
 svx/inc/bitmaps.hlst  |4 -
 svx/source/tbxctrls/extrusioncontrols.cxx |   89 +--
 svx/source/tbxctrls/extrusioncontrols.hxx |   14 ++-
 svx/uiconfig/ui/surfacewindow.ui  |  114 ++
 6 files changed, 177 insertions(+), 49 deletions(-)

New commits:
commit 28f660a61d82f518391ef2ad5f99129a2ea542ee
Author: Caolán McNamara 
AuthorDate: Mon Jan 27 13:45:44 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 27 20:27:51 2020 +0100

weld ExtrusionSurfaceWindow

Change-Id: I13b61c8e4ef0a251472b02061fa150451a7b03a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87530
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 171eb4053659..e9d79ff25f89 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1032,10 +1032,6 @@
 #define RID_SVXSTR_DIRECTION_SW 
NC_("RID_SVXSTR_DIRECTION_SW", "Extrusion South-West")
 #define RID_SVXSTR_DIRECTION_S  
NC_("RID_SVXSTR_DIRECTION_S", "Extrusion South")
 #define RID_SVXSTR_DIRECTION_SE 
NC_("RID_SVXSTR_DIRECTION_SE", "Extrusion South-East")
-#define RID_SVXSTR_WIREFRAME
NC_("RID_SVXSTR_WIREFRAME", "~Wire Frame")
-#define RID_SVXSTR_MATTE
NC_("RID_SVXSTR_MATTE", "~Matt")
-#define RID_SVXSTR_PLASTIC  
NC_("RID_SVXSTR_PLASTIC", "~Plastic")
-#define RID_SVXSTR_METAL
NC_("RID_SVXSTR_METAL", "Me~tal")
 #define RID_SVXSTR_DEPTH_0  
NC_("RID_SVXSTR_DEPTH_0", "~0 cm")
 #define RID_SVXSTR_DEPTH_1  
NC_("RID_SVXSTR_DEPTH_1", "~1 cm")
 #define RID_SVXSTR_DEPTH_2  
NC_("RID_SVXSTR_DEPTH_2", "~2.5 cm")
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index a7f943c2548c..e1f1783607c5 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -111,6 +111,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/sidebarstylespanel \
svx/uiconfig/ui/sidebartextpanel \
svx/uiconfig/ui/stylemenu \
+   svx/uiconfig/ui/surfacewindow \
svx/uiconfig/ui/tablewindow \
svx/uiconfig/ui/textcharacterspacingcontrol \
svx/uiconfig/ui/textcontrolchardialog \
diff --git a/svx/inc/bitmaps.hlst b/svx/inc/bitmaps.hlst
index 648d86d356ff..9cbe6e66405e 100644
--- a/svx/inc/bitmaps.hlst
+++ b/svx/inc/bitmaps.hlst
@@ -74,10 +74,6 @@
 #define RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_LEFT   
"svx/res/lightfrombottomleft_22.png"
 #define RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM
"svx/res/lightfrombottom_22.png"
 #define RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_RIGHT  
"svx/res/lightfrombottomright_22.png"
-#define RID_SVXBMP_WIRE_FRAME   "svx/res/wireframe_16.png"
-#define RID_SVXBMP_MATTE"svx/res/matte_16.png"
-#define RID_SVXBMP_PLASTIC  "svx/res/plastic_16.png"
-#define RID_SVXBMP_METAL"svx/res/metal_16.png"
 #define RID_SVXBMP_DEPTH_0  
"svx/res/extrusion0inch_16.png"
 #define RID_SVXBMP_DEPTH_1  
"svx/res/extrusion05inch_16.png"
 #define RID_SVXBMP_DEPTH_2  
"svx/res/extrusion1inch_16.png"
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx 
b/svx/source/tbxctrls/extrusioncontrols.cxx
index 76fcb3a5e048..18201c948d58 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -794,36 +794,37 @@ 
com_sun_star_comp_svx_ExtrusionLightingControl_get_implementation(
 
 static const char g_sExtrusionSurface[] = ".uno:ExtrusionSurface";
 
-ExtrusionSurfaceWindow::ExtrusionSurfaceWindow(
-svt::ToolboxController& rController,
-vcl::Window* pParentWindow)
-: ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP)
-, mrController(rController)
+ExtrusionSurfaceWindow::ExtrusionSurfaceWindow(svt::PopupWindowController* 
pControl, weld::Widget* pParent)
+: WeldToolbarPopup(pControl->getFrameInterface(), pParent, 
"svx/ui/surfacewindow.ui", "SurfaceWindow")
+, mxControl(pControl)
+, mxWireFrame(m_xBuilder->weld_radio_button("wireframe"))
+, mxMatt(m_xBuilder->weld_radio_button("matt"))
+, mxPlastic(m_xBuilder->weld_radio_button("plastic"))
+, mxMetal(m_xBuilder->weld_radio_button("metal"))
 {
-SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) );
-
-Image aImgSurface1(StockImage::Yes, RID_SVXBMP_WIRE_FRAME);
-Image aImgSurface2(StockImage::Yes, RID_SVXBMP_MATTE);
-Image aImgSurface3(StockImage::Yes, RID_SVXBMP_PLASTIC);
-Image aImgSurface4(StockImage::Yes,

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

2020-01-27 Thread Caolán McNamara (via logerrit) 
 include/svx/strings.hrc   |3 
 svx/UIConfig_svx.mk   |1 
 svx/inc/bitmaps.hlst  |3 
 svx/source/tbxctrls/extrusioncontrols.cxx |  161 +-
 svx/source/tbxctrls/extrusioncontrols.hxx |   25 ++--
 svx/uiconfig/ui/lightingwindow.ui |  121 ++
 6 files changed, 208 insertions(+), 106 deletions(-)

New commits:
commit 4c1a8f233f1a496a8401fd255d954745baef33c0
Author: Caolán McNamara 
AuthorDate: Mon Jan 27 13:22:01 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 27 20:27:18 2020 +0100

weld ExtrusionLightingWindow

Change-Id: I3078ca8315f84f03431a07630987687144857818
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87527
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 2d5812626993..171eb4053659 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1032,9 +1032,6 @@
 #define RID_SVXSTR_DIRECTION_SW 
NC_("RID_SVXSTR_DIRECTION_SW", "Extrusion South-West")
 #define RID_SVXSTR_DIRECTION_S  
NC_("RID_SVXSTR_DIRECTION_S", "Extrusion South")
 #define RID_SVXSTR_DIRECTION_SE 
NC_("RID_SVXSTR_DIRECTION_SE", "Extrusion South-East")
-#define RID_SVXSTR_BRIGHT   
NC_("RID_SVXSTR_BRIGHT", "~Bright")
-#define RID_SVXSTR_NORMAL   
NC_("RID_SVXSTR_NORMAL", "~Normal")
-#define RID_SVXSTR_DIM  
NC_("RID_SVXSTR_DIM", "~Dim")
 #define RID_SVXSTR_WIREFRAME
NC_("RID_SVXSTR_WIREFRAME", "~Wire Frame")
 #define RID_SVXSTR_MATTE
NC_("RID_SVXSTR_MATTE", "~Matt")
 #define RID_SVXSTR_PLASTIC  
NC_("RID_SVXSTR_PLASTIC", "~Plastic")
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index afad7bb8f9ba..a7f943c2548c 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/imapmenu \
svx/uiconfig/ui/interimdockparent \
svx/uiconfig/ui/interimparent \
+   svx/uiconfig/ui/lightingwindow \
svx/uiconfig/ui/linkwarndialog \
svx/uiconfig/ui/measurewidthbar \
svx/uiconfig/ui/mediaplayback \
diff --git a/svx/inc/bitmaps.hlst b/svx/inc/bitmaps.hlst
index 94bd0d116b17..648d86d356ff 100644
--- a/svx/inc/bitmaps.hlst
+++ b/svx/inc/bitmaps.hlst
@@ -74,9 +74,6 @@
 #define RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_LEFT   
"svx/res/lightfrombottomleft_22.png"
 #define RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM
"svx/res/lightfrombottom_22.png"
 #define RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_RIGHT  
"svx/res/lightfrombottomright_22.png"
-#define RID_SVXBMP_LIGHTING_BRIGHT  "svx/res/brightlit_16.png"
-#define RID_SVXBMP_LIGHTING_NORMAL  "svx/res/normallit_16.png"
-#define RID_SVXBMP_LIGHTING_DIM "svx/res/dimlit_16.png"
 #define RID_SVXBMP_WIRE_FRAME   "svx/res/wireframe_16.png"
 #define RID_SVXBMP_MATTE"svx/res/matte_16.png"
 #define RID_SVXBMP_PLASTIC  "svx/res/plastic_16.png"
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx 
b/svx/source/tbxctrls/extrusioncontrols.cxx
index 3bdfba02bd63..76fcb3a5e048 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -557,16 +557,20 @@ 
com_sun_star_comp_svx_ExtrusionDepthController_get_implementation(
 static const char g_sExtrusionLightingDirection[] = 
".uno:ExtrusionLightingDirection";
 static const char g_sExtrusionLightingIntensity[] = 
".uno:ExtrusionLightingIntensity";
 
-ExtrusionLightingWindow::ExtrusionLightingWindow(svt::ToolboxController& 
rController,
- vcl::Window* pParentWindow)
-: ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP)
-, mrController(rController)
-, maImgBright(StockImage::Yes, RID_SVXBMP_LIGHTING_BRIGHT)
-, maImgNormal(StockImage::Yes, RID_SVXBMP_LIGHTING_NORMAL)
-, maImgDim(StockImage::Yes, RID_SVXBMP_LIGHTING_DIM)
+ExtrusionLightingWindow::ExtrusionLightingWindow(svt::PopupWindowController* 
pControl,
+ weld::Widget* pParent)
+: WeldToolbarPopup(pControl->getFrameInterface(), pParent, 
"svx/ui/lightingwindow.ui", "LightingWindow")
+, mxControl(pControl)
+, mxLightingSet(new SvtValueSet(nullptr))
+, mxLightingSetWin(new weld::CustomWeld(*m_xBuilder, "valueset", 
*mxLightingSet))
+, mxBright(m_xBuilder->weld_radio_button("bright"))
+, mxNormal(m_xBuilder->weld_radio_button("normal"))
+, mxDim(m_xBuilder->weld_radio_button("dim"))
 , mnDirection(FROM_FRONT)
 , mbDirectionEnabled(false)
 {
+

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

2020-01-27 Thread Caolán McNamara (via logerrit) 
 include/svx/strings.hrc   |2 
 svx/UIConfig_svx.mk   |1 
 svx/inc/bitmaps.hlst  |2 
 svx/source/tbxctrls/extrusioncontrols.cxx |  163 --
 svx/source/tbxctrls/extrusioncontrols.hxx |   22 ++--
 svx/uiconfig/ui/directionwindow.ui|   97 +
 6 files changed, 178 insertions(+), 109 deletions(-)

New commits:
commit 41e024578469d9c452300447610a3e9c6e50e211
Author: Caolán McNamara 
AuthorDate: Mon Jan 27 12:10:51 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 27 20:26:51 2020 +0100

weld ExtrusionDirectionWindow

Change-Id: I94f6d602f489d34f9b35ee2ec20e7fdf62e50adf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87519
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index dc7122a40a9a..2d5812626993 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1023,8 +1023,6 @@
 #define RID_SVXSTR_QRY_PRINT_ALL
NC_("RID_SVXSTR_QRY_PRINT_ALL", "~All")
 #define RID_SVXSTR_QRY_PRINT_SELECTION  
NC_("RID_SVXSTR_QRY_PRINT_SELECTION", "~Selection")
 
-#define RID_SVXSTR_PERSPECTIVE  
NC_("RID_SVXSTR_PERSPECTIVE", "~Perspective")
-#define RID_SVXSTR_PARALLEL 
NC_("RID_SVXSTR_PARALLEL", "P~arallel")
 #define RID_SVXSTR_DIRECTION_NW 
NC_("RID_SVXSTR_DIRECTION_NW", "Extrusion North-West")
 #define RID_SVXSTR_DIRECTION_N  
NC_("RID_SVXSTR_DIRECTION_N", "Extrusion North")
 #define RID_SVXSTR_DIRECTION_NE 
NC_("RID_SVXSTR_DIRECTION_NE", "Extrusion North-East")
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 56192ca71601..afad7bb8f9ba 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/defaultshapespanel \
svx/uiconfig/ui/deleteheaderdialog \
svx/uiconfig/ui/deletefooterdialog \
+   svx/uiconfig/ui/directionwindow \
svx/uiconfig/ui/docking3deffects \
svx/uiconfig/ui/dockingcolorreplace \
svx/uiconfig/ui/dockingfontwork \
diff --git a/svx/inc/bitmaps.hlst b/svx/inc/bitmaps.hlst
index 7316b88f7fec..94bd0d116b17 100644
--- a/svx/inc/bitmaps.hlst
+++ b/svx/inc/bitmaps.hlst
@@ -49,8 +49,6 @@
 #define RID_SVXBMP_DIRECTION_DIRECTION_SW   
"svx/res/directionsouthwest_22.png"
 #define RID_SVXBMP_DIRECTION_DIRECTION_S
"svx/res/directionsouth_22.png"
 #define RID_SVXBMP_DIRECTION_DIRECTION_SE   
"svx/res/directionsoutheast_22.png"
-#define RID_SVXBMP_PERSPECTIVE  
"svx/res/perspective_16.png"
-#define RID_SVXBMP_PARALLEL "svx/res/parallel_16.png"
 #define RID_SVXBMP_LIGHT_OFF_FROM_TOP_LEFT  
"svx/res/lightofffromtopleft_22.png"
 #define RID_SVXBMP_LIGHT_OFF_FROM_TOP   
"svx/res/lightofffromtop_22.png"
 #define RID_SVXBMP_LIGHT_OFF_FROM_TOP_RIGHT 
"svx/res/lightofffromtopright_22.png"
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx 
b/svx/source/tbxctrls/extrusioncontrols.cxx
index d81e40d26a53..3bdfba02bd63 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -122,105 +122,83 @@ static const char* aDirectionStrs[] =
 };
 
 ExtrusionDirectionWindow::ExtrusionDirectionWindow(
-svt::ToolboxController& rController,
-vcl::Window* pParentWindow
-)
-: ToolbarMenu(rController.getFrameInterface(), pParentWindow, WB_STDPOPUP)
-, mrController(rController)
-, maImgPerspective(StockImage::Yes, RID_SVXBMP_PERSPECTIVE)
-, maImgParallel(StockImage::Yes, RID_SVXBMP_PARALLEL)
+svt::PopupWindowController* pControl,
+weld::Widget* pParent)
+: WeldToolbarPopup(pControl->getFrameInterface(), pParent, 
"svx/ui/directionwindow.ui", "DirectionWindow")
+, mxControl(pControl)
+, mxDirectionSet(new SvtValueSet(nullptr))
+, mxDirectionSetWin(new weld::CustomWeld(*m_xBuilder, "valueset", 
*mxDirectionSet))
+, mxPerspective(m_xBuilder->weld_radio_button("perspective"))
+, mxParallel(m_xBuilder->weld_radio_button("parallel"))
 {
+mxDirectionSet->SetStyle(WB_TABSTOP | WB_MENUSTYLEVALUESET | 
WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT);
+
 for (sal_uInt16 i = DIRECTION_NW; i <= DIRECTION_SE; ++i)
 {
 maImgDirection[i] = Image(StockImage::Yes, aDirectionBmps[i]);
 }
 
-SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectToolbarMenuHdl ) 
);
-mpDirectionSet = createEmptyValueSetControl();
-
-mpDirectionSet->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, 
SelectValueSetHdl ) );
-mpDirectionSet->SetColCount( 3 );
-mpDirectionSet->EnableFullItemMode( false );
+mxDirectionSet->SetSelectHdl( LINK( this,

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

2017-04-15 Thread Caolán McNamara 
 include/svx/fmresids.hrc  |1 
 include/svx/svxids.hrc|8 -
 svx/UIConfig_svx.mk   |1 
 svx/inc/fmhelp.hrc|4 
 svx/source/form/fmexpl.src|   88 
 svx/source/form/navigatortree.cxx |  205 +-
 svx/uiconfig/ui/formnavimenu.ui   |  119 ++
 7 files changed, 219 insertions(+), 207 deletions(-)

New commits:
commit e0950f61ee37468e5e12d7625eb584637120592d
Author: Caolán McNamara 
Date:   Sat Apr 15 19:00:30 2017 +0100

convert form navigator menu to .ui

Change-Id: Ic6de06c2b17bb65ef326d6debeff9490eec91c9e

diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index 66e9b70741b9..c33dbe73ff9e 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -62,7 +62,6 @@
 #define RID_SVXTBX_FORMDESIGN   (RID_FORMS_START +  6)
 
 // Menu-Id's ---
-#define RID_FMEXPLORER_POPUPMENU(RID_FORMS_START + 0)
 #define RID_FMSHELL_CONVERSIONMENU  (RID_FORMS_START + 4)
 #define RID_FM_FILTER_MENU  (RID_FORMS_START + 5)
 #define RID_MENU_DATANAVIGATOR  (RID_FORMS_START + 10)
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 18ddd6436a84..64decd7a10b8 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -564,8 +564,8 @@
 #define SID_FM_FILECONTROL  ( SID_SVX_START + 605 )
 //FREE
 #define SID_FM_NAVIGATIONBAR( SID_SVX_START + 607 )
-#define SID_FM_NEW_HIDDEN   ( SID_SVX_START + 608 )
-#define SID_FM_RENAME_OBJECT( SID_SVX_START + 609 )
+//FREE
+//FREE
 #define SID_FM_DELETEROWS   ( SID_SVX_START + 610 )
 //FREE
 //FREE
@@ -594,9 +594,9 @@
 #define SID_FM_SHOW_PROPERTIES  ( SID_SVX_START + 635 )
 #define SID_FM_PROPERTY_CONTROL ( SID_SVX_START + 636 )
 #define SID_FM_FMEXPLORER_CONTROL   ( SID_SVX_START + 637 )
-#define SID_FM_NEW  ( SID_SVX_START + 638 )
+//FREE
 #define SID_FM_DELETE   ( SID_SVX_START + 639 )
-#define SID_FM_NEW_FORM ( SID_SVX_START + 640 )
+//FREE
 #define SID_3D_WIN  ( SID_SVX_START + 644 )
 #define SID_3D_STATE( SID_SVX_START + 645 )
 #define SID_3D_INIT ( SID_SVX_START + 646 )
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 98af04cd8aef..032a64019d36 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/fontworkgallerydialog \
svx/uiconfig/ui/fontworkspacingdialog \
svx/uiconfig/ui/formlinkwarndialog \
+   svx/uiconfig/ui/formnavimenu \
svx/uiconfig/ui/functionmenu \
svx/uiconfig/ui/gallerymenu1 \
svx/uiconfig/ui/gallerymenu2 \
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index 7cea12f7c35f..b0f5365c5372 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -42,10 +42,6 @@
 #define HID_FM_FILTER_EDIT"SVX_HID_FM_EDIT"
 #define HID_FM_FILTER_IS_NULL 
"SVX_HID_FM_FILTER_IS_NULL"
 #define HID_FM_FILTER_IS_NOT_NULL 
"SVX_HID_FM_IS_NOT_NULL"
-#define HID_FM_NEW"SVX_HID_FM_NEW"
-#define HID_FM_NEW_FORM   
"SVX_HID_FM_NEW_FORM"
-#define HID_FM_NEW_HIDDEN 
"SVX_HID_FM_NEW_HIDDEN"
-#define HID_FM_RENAME_OBJECT  
"SVX_HID_FM_RENAME_OBJECT"
 
 #endif
 
diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src
index 2e6afb5eb0e2..3b0994616bcc 100644
--- a/svx/source/form/fmexpl.src
+++ b/svx/source/form/fmexpl.src
@@ -22,94 +22,6 @@
 #include 
 #include "fmhelp.hrc"
 
-Menu RID_FMEXPLORER_POPUPMENU
-{
-ItemList =
-{
-MenuItem
-{
-Identifier = SID_FM_NEW ;
-HelpId = HID_FM_NEW ;
-Text [ en-US ] = "~New" ;
-SubMenu = Menu
-{
-ItemList =
-{
-MenuItem
-{
-Identifier = SID_FM_NEW_FORM ;
-HelpId = HID_FM_NEW_FORM ;
-Text [ en-US ] = "Form" ;
-};
-MenuItem
-{
-Identifier = SID_FM_NEW_HIDDEN ;
-HelpId = HID_FM_NEW_HIDDEN ;
-Text [ en-US ] = "Hidden Control" ;
-

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

2017-04-14 Thread Caolán McNamara 
 include/svx/fmresids.hrc   |1 -
 svx/UIConfig_svx.mk|1 +
 svx/inc/fmhelp.hrc |1 -
 svx/source/fmcomp/gridctrl.cxx |   39 ---
 svx/source/fmcomp/gridctrl.src |   24 
 svx/uiconfig/ui/rowsmenu.ui|   30 ++
 6 files changed, 47 insertions(+), 49 deletions(-)

New commits:
commit 7a01268f3fccd9cb43097f27696fec563f21b336
Author: Caolán McNamara 
Date:   Fri Apr 14 16:32:02 2017 +0100

convert rows menu to .ui

Change-Id: If81b5e23c1699822899c929b486850ac06776c76

diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index 320920e29e87..318cdd6d85c3 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -63,7 +63,6 @@
 
 // Menu-Id's ---
 #define RID_FMEXPLORER_POPUPMENU(RID_FORMS_START + 0)
-#define RID_SVXMNU_ROWS (RID_FORMS_START + 1)
 #define RID_SVXMNU_COLS (RID_FORMS_START + 2)
 #define RID_SVXMNU_CELL (RID_FORMS_START + 3)
 #define RID_FMSHELL_CONVERSIONMENU  (RID_FORMS_START + 4)
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 6223380663a1..278100146ffe 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/redlinecontrol \
svx/uiconfig/ui/redlinefilterpage \
svx/uiconfig/ui/redlineviewpage \
+   svx/uiconfig/ui/rowsmenu \
svx/uiconfig/ui/rulermenu \
svx/uiconfig/ui/safemodedialog \
svx/uiconfig/ui/savemodifieddialog \
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index 8cc34fcb29f0..5a1f072407ce 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -39,7 +39,6 @@
 #define HID_XFORMS_TOOLBOX_ITEM_EDIT  
"SVX_HID_XFORMS_TOOLBOX_ITEM_EDIT"
 #define HID_XFORMS_TOOLBOX_ITEM_REMOVE
"SVX_HID_XFORMS_TOOLBOX_ITEM_REMOVE"
 #define HID_XFORMS_MID_INSERT_CONTROL 
"SVX_HID_XFORMS_MID_INSERT_CONTROL"
-#define HID_FM_DELETEROWS 
"SVX_HID_FM_DELETEROWS"
 #define HID_FM_INSERTCOL  
"SVX_HID_FM_INSERTCOL"
 #define HID_FM_CHANGECOL  
"SVX_HID_FM_CHANGECOL"
 #define HID_FM_DELETECOL  
"SVX_HID_FM_DELETECOL"
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 275b19b96910..c4ee149afe30 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -44,6 +44,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -2698,8 +2699,8 @@ void DbGridControl::PreExecuteRowContextMenu(sal_uInt16 
/*nRow*/, PopupMenu& rMe
 // if only a blank row is selected than do not delete
 bDelete = bDelete && !((m_nOptions & DbGridControlOptions::Insert) && 
GetSelectRowCount() == 1 && IsRowSelected(GetRowCount() - 1));
 
-rMenu.EnableItem(SID_FM_DELETEROWS, bDelete);
-rMenu.EnableItem(SID_FM_RECORD_SAVE, IsModified());
+rMenu.EnableItem(rMenu.GetItemId("delete"), bDelete);
+rMenu.EnableItem(rMenu.GetItemId("save"), IsModified());
 
 // the undo is more difficult
 bool bCanUndo = IsModified();
@@ -2708,28 +2709,22 @@ void DbGridControl::PreExecuteRowContextMenu(sal_uInt16 
/*nRow*/, PopupMenu& rMe
 nState = 
m_aMasterStateProvider.Call(DbGridControlNavigationBarState::Undo);
 bCanUndo &= ( 0 != nState );
 
-rMenu.EnableItem(SID_FM_RECORD_UNDO, bCanUndo);
+rMenu.EnableItem(rMenu.GetItemId("undo"), bCanUndo);
 }
 
-void DbGridControl::PostExecuteRowContextMenu(sal_uInt16 /*nRow*/, const 
PopupMenu& /*rMenu*/, sal_uInt16 nExecutionResult)
+void DbGridControl::PostExecuteRowContextMenu(sal_uInt16 /*nRow*/, const 
PopupMenu& rMenu, sal_uInt16 nExecutionResult)
 {
-switch (nExecutionResult)
+if (nExecutionResult == rMenu.GetItemId("delete"))
 {
-case SID_FM_DELETEROWS:
-// delete asynchronously
-if (m_nDeleteEvent)
-Application::RemoveUserEvent(m_nDeleteEvent);
-m_nDeleteEvent = 
Application::PostUserEvent(LINK(this,DbGridControl,OnDelete), nullptr, true);
-break;
-case SID_FM_RECORD_UNDO:
-Undo();
-break;
-case SID_FM_RECORD_SAVE:
-SaveRow();
-break;
-default:
-break;
+// delete asynchronously
+if (m_nDeleteEvent)
+Application::RemoveUserEvent(m_nDeleteEvent);
+m_nDeleteEvent = 
Application::PostUserEvent(LINK(this,DbGridControl,OnDelete), nullptr, true);
 }
+else if (nExecutionResult == rMenu.GetItemId("undo"))
+Undo();
+else if (nExecutionResult == rMenu.GetItemId("save"))
+

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

2017-04-14 Thread Caolán McNamara 
 include/svx/dialogs.hrc  |3 -
 svx/UIConfig_svx.mk  |1 
 svx/inc/helpid.hrc   |8 ---
 svx/source/stbctrls/pszctrl.cxx  |   84 ++-
 svx/source/stbctrls/stbctrls.src |   56 --
 svx/uiconfig/ui/functionmenu.ui  |   66 ++
 6 files changed, 132 insertions(+), 86 deletions(-)

New commits:
commit aca25d6123da5e6da9b3f25ac0347a479b1d5526
Author: Caolán McNamara 
Date:   Fri Apr 14 15:27:27 2017 +0100

convert function menu to .ui

Change-Id: I6ff1ccc0fb20c638c7bdb587c8fe81a710a49d21

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 2a23a2164ccb..349a2145e0c4 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -140,9 +140,6 @@
 #define RID_SVXFLOAT3D_FIX_G(RID_SVX_START + 78)
 #define RID_SVXFLOAT3D_FIX_B(RID_SVX_START + 84)
 
-// ResId for funktion popup menue
-#define RID_SVXMNU_PSZ_FUNC (RID_SVX_START +  83)
-
 #define RID_SVXBMP_SLIDERBUTTON (RID_SVX_START +  66)
 #define RID_SVXBMP_SLIDERDECREASE   (RID_SVX_START +  67)
 #define RID_SVXBMP_SLIDERINCREASE   (RID_SVX_START +  68)
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index f68a66650128..6223380663a1 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/fontworkgallerydialog \
svx/uiconfig/ui/fontworkspacingdialog \
svx/uiconfig/ui/formlinkwarndialog \
+   svx/uiconfig/ui/functionmenu \
svx/uiconfig/ui/gallerymenu1 \
svx/uiconfig/ui/gallerymenu2 \
svx/uiconfig/ui/headfootformatpage \
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 75e7079434ea..8312e935d7fe 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -41,14 +41,6 @@
 #define HID_GALLERY_RENAME
"SVX_HID_GALLERY_RENAME"
 #define HID_GALLERY_THEMELIST 
"SVX_HID_GALLERY_THEMELIST"
 #define HID_GALLERY_WINDOW
"SVX_HID_GALLERY_WINDOW"
-#define HID_MNU_FUNC_AVG  
"SVX_HID_MNU_FUNC_AVG"
-#define HID_MNU_FUNC_COUNT
"SVX_HID_MNU_FUNC_COUNT"
-#define HID_MNU_FUNC_COUNT2   
"SVX_HID_MNU_FUNC_COUNT2"
-#define HID_MNU_FUNC_MAX  
"SVX_HID_MNU_FUNC_MAX"
-#define HID_MNU_FUNC_MIN  
"SVX_HID_MNU_FUNC_MIN"
-#define HID_MNU_FUNC_NONE 
"SVX_HID_MNU_FUNC_NONE"
-#define HID_MNU_FUNC_SUM  
"SVX_HID_MNU_FUNC_SUM"
-#define HID_MNU_FUNC_SELECTION_COUNT  
"SVX_HID_MNU_FUNC_SELECTION_COUNT"
 #define HID_POPUP_COLOR   
"SVX_HID_POPUP_COLOR"
 #define HID_POPUP_COLOR_CTRL  
"SVX_HID_POPUP_COLOR_CTRL"
 #define HID_POPUP_FRAME   
"SVX_HID_POPUP_FRAME"
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index a6cc6bb0aec0..c19f02cb3114 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -89,33 +90,78 @@ OUString SvxPosSizeStatusBarControl::GetMetricStr_Impl( 
long nVal )
 
 SFX_IMPL_STATUSBAR_CONTROL(SvxPosSizeStatusBarControl, SvxSizeItem);
 
-class FunctionPopup_Impl : public PopupMenu
+class FunctionPopup_Impl
 {
+VclBuilderm_aBuilder;
+VclPtr m_xMenu;
+sal_uInt32m_nSelected;
+static sal_uInt16 id_to_function(const OString& rIdent);
+sal_uInt16 function_to_id(sal_uInt16 nFunc) const;
 public:
 explicit FunctionPopup_Impl( sal_uInt32 nCheckEncoded );
-
-sal_uInt32  GetSelected() const { return nSelected; }
-
-private:
-sal_uInt32  nSelected;
-
-virtual voidSelect() override;
+sal_uInt16 Execute(vcl::Window* pWindow, const Point& rPopupPos) { return 
m_xMenu->Execute(pWindow, rPopupPos); }
+sal_uInt32 GetSelected() const;
 };
 
+sal_uInt16 FunctionPopup_Impl::id_to_function(const OString& rIdent)
+{
+if (rIdent == "avg")
+return PSZ_FUNC_AVG;
+else if (rIdent == "counta")
+return PSZ_FUNC_COUNT2;
+else if (rIdent == "count")
+return PSZ_FUNC_COUNT;
+else if (rIdent == "max")
+return PSZ_FUNC_MAX;
+else if (rIdent == "min")
+return PSZ_FUNC_MIN;
+else if (rIdent == "sum")
+return PSZ_FUNC_SUM;
+else if (rIdent == "selection")
+return PSZ_FUNC_SELECTION_COUNT;
+else if (rIdent == "none")
+return PSZ_FUNC_NONE;
+return 0;
+}
 
-FunctionPopup_Impl::FunctionPopup_Impl( sal_uInt32 nCheckEncoded ) :
-PopupMenu(

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

2017-04-05 Thread Caolán McNamara 
 include/svx/dialogs.hrc|1 -
 svx/UIConfig_svx.mk|1 +
 svx/inc/helpid.hrc |1 -
 svx/source/stbctrls/stbctrls.h |2 --
 svx/source/stbctrls/stbctrls.src   |   12 
 svx/source/stbctrls/xmlsecctrl.cxx |6 --
 svx/uiconfig/ui/xmlsecstatmenu.ui  |   17 +
 7 files changed, 22 insertions(+), 18 deletions(-)

New commits:
commit 6b6d642fe56868114669bab73f00df88afeab7fb
Author: Caolán McNamara 
Date:   Wed Apr 5 15:02:12 2017 +0100

convert RID_SVXMNU_XMLSECSTATBAR menu to .ui

Change-Id: I16ca1543baa14cdc14dbcebd5e6093e6f3029a61

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index f92402b9446b..af5ee763eeab 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -145,7 +145,6 @@
 
 // ResId for funktion popup menue
 #define RID_SVXMNU_PSZ_FUNC (RID_SVX_START +  83)
-#define RID_SVXMNU_XMLSECSTATBAR(RID_SVX_START +  84)
 
 #define RID_SVXBMP_SLIDERBUTTON (RID_SVX_START +  66)
 #define RID_SVXBMP_SLIDERDECREASE   (RID_SVX_START +  67)
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 5c71dc2240de..ae2f419b73b1 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -79,6 +79,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/textcontrolchardialog \
svx/uiconfig/ui/textcontrolparadialog \
svx/uiconfig/ui/textunderlinecontrol \
+   svx/uiconfig/ui/xmlsecstatmenu \
svx/uiconfig/ui/xformspage \
 ))
 
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 7c9f9838f098..6ebd60d993ce 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -69,7 +69,6 @@
 #define HID_POPUP_LINEEND_CTRL
"SVX_HID_POPUP_LINEEND_CTRL"
 #define HID_STYLE_LISTBOX 
"SVX_HID_STYLE_LISTBOX"
 #define HID_VALUESET_EXTRUSION_LIGHTING   
"SVX_HID_VALUESET_EXTRUSION_LIGHTING"
-#define HID_XMLSEC_CALL   
"SVX_HID_XMLSEC_CALL"
 
 #endif
 
diff --git a/svx/source/stbctrls/stbctrls.h b/svx/source/stbctrls/stbctrls.h
index 91d4fa9987b5..316cab0eb458 100644
--- a/svx/source/stbctrls/stbctrls.h
+++ b/svx/source/stbctrls/stbctrls.h
@@ -40,8 +40,6 @@
 #define PSZ_FUNC_SELECTION_COUNT13
 #define PSZ_FUNC_NONE   16
 
-#define XMLSEC_CALL 1
-
 #define SELECTION_STANDARD  1
 #define SELECTION_EXTENDED  2
 #define SELECTION_ADDED 3
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 033cfbac6277..e8f9c072e1b4 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -298,18 +298,6 @@ Menu RID_SVXMNU_PSZ_FUNC
 };
 };
 };
-Menu RID_SVXMNU_XMLSECSTATBAR
-{
-ItemList =
-{
-MenuItem
-{
-Identifier = XMLSEC_CALL ;
-HelpId = HID_XMLSEC_CALL ;
-Text [ en-US ] = "Digital Signatures..." ;
-};
-};
-};
 
 Bitmap RID_SVXBMP_POSITION
 {
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx 
b/svx/source/stbctrls/xmlsecctrl.cxx
index ba706e8e506e..42f94aeeefba 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -19,6 +19,7 @@
 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -101,8 +102,9 @@ void XmlSecStatusBarControl::Command( const CommandEvent& 
rCEvt )
 {
 if( rCEvt.GetCommand() == CommandEventId::ContextMenu )
 {
-ScopedVclPtrInstance aPopupMenu( ResId( 
RID_SVXMNU_XMLSECSTATBAR, DIALOG_MGR() ) );
-if( aPopupMenu->Execute( (), rCEvt.GetMousePosPixel() ) )
+VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), 
"svx/ui/xmlsecstatmenu.ui", "");
+VclPtr aPopupMenu(aBuilder.get_menu("menu"));
+if (aPopupMenu->Execute((), rCEvt.GetMousePosPixel()))
 {
 css::uno::Any a;
 SfxUInt16Item aState( GetSlotId(), 0 );
diff --git a/svx/uiconfig/ui/xmlsecstatmenu.ui 
b/svx/uiconfig/ui/xmlsecstatmenu.ui
new file mode 100644
index ..c8b31350f431
--- /dev/null
+++ b/svx/uiconfig/ui/xmlsecstatmenu.ui
@@ -0,0 +1,17 @@
+
+
+
+  
+  
+True
+False
+
+  
+True
+False
+Digital 
Signatures...
+True
+  
+
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

2014-08-15 Thread Caolán McNamara 
 include/svx/dialogs.hrc  |1 
 include/svx/fmresids.hrc |2 
 svx/UIConfig_svx.mk  |1 
 svx/inc/fmhelp.hrc   |   12 
 svx/source/form/datanavi.cxx |  646 +--
 svx/source/form/datanavi.src |  141 
 svx/source/inc/datanavi.hrc  |   24 -
 svx/source/inc/datanavi.hxx  |   23 -
 svx/uiconfig/ui/datanavigator.ui |  204 
 9 files changed, 527 insertions(+), 527 deletions(-)

New commits:
commit 38cbb4c7176d85973c4945a10a262bb487388246
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Aug 15 15:09:57 2014 +0100

convert datanavigator sport to .ui

Change-Id: I14f9f8d8df9fc8246e7fc8c0b6762ca51dad67d9

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index ce486d9..bd2fbe1 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -138,6 +138,7 @@
 #define RID_SVXSW_FRAMEPOSITIONS(RID_SVX_START + 289)
 
 #define RID_SVXIL_FRAME (RID_SVX_START +  65)
+#define RID_SVXIL_DATANAVI  (RID_SVX_START +  66)
 
 #define RID_SVXFLOAT_3D (RID_SVX_START + 209)
 
diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index 5299c1c..82a792b 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -63,8 +63,6 @@
 // Dialog-Id's ---
 #define RID_SVX_FMEXPLORER  (RID_FORMS_START + 6)
 
-#define RID_SVXWIN_DATANAVIGATOR(RID_FORMS_START + 19)
-
 // Toolbars 
 #define RID_SVXTBX_FORM_NAVIGATION  (RID_FORMS_START +  1)
 #define RID_SVXTBX_FORM_FILTER  (RID_FORMS_START +  2)
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 9545379..76e7f12 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/chineseconversiondialog \
svx/uiconfig/ui/chinesedictionary \
svx/uiconfig/ui/compressgraphicdialog \
+   svx/uiconfig/ui/datanavigator \
svx/uiconfig/ui/deleteheaderdialog \
svx/uiconfig/ui/deletefooterdialog \
svx/uiconfig/ui/docrecoverybrokendialog \
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index 2334002..35eb10d 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -36,24 +36,12 @@
 #define UID_SEARCH_RECORDSTATUS   
SVX_UID_SEARCH_RECORDSTATUS
 #define UID_FORMPROPBROWSER_FRAME 
SVX_UID_FORMPROPBROWSER_FRAME
 #define UID_ABSOLUTE_RECORD_WINDOW
SVX_UID_ABSOLUTE_RECORD_WINDOW
-#define HID_DATA_NAVIGATOR_WIN
SVX_HID_DATA_NAVIGATOR_WIN
-#define HID_MN_XFORMS_MODELS_ADD  
SVX_HID_MN_XFORMS_MODELS_ADD
-#define HID_MN_XFORMS_MODELS_EDIT 
SVX_HID_MN_XFORMS_MODELS_EDIT
-#define HID_MN_XFORMS_MODELS_REMOVE   
SVX_HID_MN_XFORMS_MODELS_REMOVE
-#define HID_MN_XFORMS_INSTANCES_ADD   
SVX_HID_MN_XFORMS_INSTANCES_ADD
-#define HID_MN_XFORMS_INSTANCES_EDIT  
SVX_HID_MN_XFORMS_INSTANCES_EDIT
-#define HID_MN_XFORMS_INSTANCES_REMOVE
SVX_HID_MN_XFORMS_INSTANCES_REMOVE
-#define HID_MN_XFORMS_SHOW_DETAILS
SVX_HID_MN_XFORMS_SHOW_DETAILS
 #define HID_XFORMS_TOOLBOX_ITEM_ADD   
SVX_HID_XFORMS_TOOLBOX_ITEM_ADD
 #define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT   
SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT
 #define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE 
SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE
 #define HID_XFORMS_TOOLBOX_ITEM_EDIT  
SVX_HID_XFORMS_TOOLBOX_ITEM_EDIT
 #define HID_XFORMS_TOOLBOX_ITEM_REMOVE
SVX_HID_XFORMS_TOOLBOX_ITEM_REMOVE
-#define HID_XFORMS_MODELS_LIST
SVX_HID_XFORMS_MODELS_LIST
-#define HID_XFORMS_MODELS_MENUBTN 
SVX_HID_XFORMS_MODELS_MENUBTN
-#define HID_XFORMS_INSTANCES_MENUBTN  
SVX_HID_XFORMS_INSTANCES_MENUBTN
 #define HID_XFORMS_MID_INSERT_CONTROL 
SVX_HID_XFORMS_MID_INSERT_CONTROL
-#define HID_XFORMS_TAB_CONTROL
SVX_HID_XFORMS_TAB_CONTROL
 #define HID_FM_DELETEROWS 
SVX_HID_FM_DELETEROWS
 #define HID_FM_INSERTCOL  
SVX_HID_FM_INSERTCOL
 #define HID_FM_CHANGECOL  
SVX_HID_FM_CHANGECOL
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 7a40de4..a0a2890 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -41,6 +41,7 @@
 #include sfx2/objsh.hxx
 #include

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

2014-06-16 Thread Caolán McNamara 
 include/svx/dialogs.hrc  |1 
 svx/UIConfig_svx.mk  |1 
 svx/inc/helpid.hrc   |1 
 svx/source/dialog/docrecovery.cxx|   24 ++
 svx/source/dialog/docrecovery.hrc|   21 -
 svx/source/dialog/docrecovery.src|   30 
 svx/source/inc/docrecovery.hxx   |   17 
 svx/uiconfig/ui/docrecoveryprogressdialog.ui |  101 +++
 8 files changed, 114 insertions(+), 82 deletions(-)

New commits:
commit dd00b2311a6d4dd381512e95ffe00dc5845dcaed
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Jun 16 13:31:53 2014 +0100

convert Save Progress Dialog to .ui

Change-Id: I833e6e9c78620443325b5ef9efa403a5eef497cc

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 3bcbc40..3542e99 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -1049,7 +1049,6 @@
 
 // document recovery and error report
 // recycling ids from DBManager
-#define RID_SVX_MDLG_DOCRECOVERY_PROGR  ( RID_SVX_START +  11 )
 #define RID_SVX_MDLG_DOCRECOVERY_BROKEN ( RID_SVX_START +  12 )
 
 //  double defined ID's (see below) !!!
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 746dc32..30eda49 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/compressgraphicdialog \
svx/uiconfig/ui/deleteheaderdialog \
svx/uiconfig/ui/deletefooterdialog \
+   svx/uiconfig/ui/docrecoveryprogressdialog \
svx/uiconfig/ui/docrecoveryrecoverdialog \
svx/uiconfig/ui/docrecoverysavedialog \
svx/uiconfig/ui/extrustiondepthdialog \
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 62ca445..acb9fb3 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -133,7 +133,6 @@
 #define HID_STYLE_LISTBOX 
SVX_HID_STYLE_LISTBOX
 #define HID_SVXTBX_UNDO_REDO_CTRL 
SVX_HID_SVXTBX_UNDO_REDO_CTRL
 #define HID_SVX_MDLG_DOCRECOVERY_BROKEN   
SVX_HID_SVX_MDLG_DOCRECOVERY_BROKEN
-#define HID_SVX_MDLG_DOCRECOVERY_PROGR
SVX_HID_SVX_MDLG_DOCRECOVERY_PROGR
 #define HID_SVX_TP_DOCRECOVERY_RECOVER
SVX_HID_SVX_TP_DOCRECOVERY_RECOVER
 #define HID_VALUESET_EXTRUSION_DIRECTION  
SVX_HID_VALUESET_EXTRUSION_DIRECTION
 #define HID_VALUESET_EXTRUSION_LIGHTING   
SVX_HID_VALUESET_EXTRUSION_LIGHTING
diff --git a/svx/source/dialog/docrecovery.cxx 
b/svx/source/dialog/docrecovery.cxx
index d9d41d0..f20ab7b 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -668,22 +668,18 @@ IMPL_LINK_NOARG(SaveDialog, OKButtonHdl)
 return 0;
 }
 
-SaveProgressDialog::SaveProgressDialog(Window*   pParent,
-   RecoveryCore* pCore  )
-: ModalDialog   ( pParent, SVX_RES( RID_SVX_MDLG_DOCRECOVERY_PROGR 
) )
-, m_aHintFT ( this   , SVX_RES  ( FT_SAVEPROGR_HINT
  ) )
-, m_aProgrFT( this   , SVX_RES  ( FT_SAVEPROGR_PROGR   
  ) )
-, m_aProgrParent( this   , SVX_RES  ( WIN_SAVEPROGR_PROGR  
  ) )
-, m_pCore   ( pCore
  )
+SaveProgressDialog::SaveProgressDialog(Window* pParent, RecoveryCore* pCore)
+: ModalDialog(pParent, DocRecoveryProgressDialog,
+svx/ui/docrecoveryprogressdialog.ui)
+, m_pCore(pCore)
 {
-FreeResource();
-PluginProgress* pProgress   = new PluginProgress( m_aProgrParent, 
pCore-getComponentContext() );
-m_xProgress = css::uno::Reference css::task::XStatusIndicator 
(static_cast css::task::XStatusIndicator* (pProgress), 
css::uno::UNO_QUERY_THROW);
-}
-
+get(m_pProgrParent, progress);
+Size aSize(LogicToPixel(Size(SAVEPROGR_CONTROLWIDTH, PROGR_HEIGHT)));
+m_pProgrParent-set_width_request(aSize.Width());
+m_pProgrParent-set_height_request(aSize.Height());
 
-SaveProgressDialog::~SaveProgressDialog()
-{
+PluginProgress* pProgress   = new PluginProgress(m_pProgrParent, 
pCore-getComponentContext());
+m_xProgress = css::uno::Reference css::task::XStatusIndicator 
(static_cast css::task::XStatusIndicator* (pProgress), 
css::uno::UNO_QUERY_THROW);
 }
 
 short SaveProgressDialog::Execute()
diff --git a/svx/source/dialog/docrecovery.hrc 
b/svx/source/dialog/docrecovery.hrc
index 2d65d24..36781a9 100644
--- a/svx/source/dialog/docrecovery.hrc
+++ b/svx/source/dialog/docrecovery.hrc
@@ -26,35 +26,14 @@
 
 #define PROGR_HEIGHT(RSC_CD_PUSHBUTTON_HEIGHT)
 
-// TabDialog
-#define TABDLG_WIDTH290
-#define TABDLG_HEIGHT   238
-
 #define SAVE_WIDTH  290
 #define SAVE_HEIGHT 238
 #define SAVE_TITLEWINHEIGHT 36
 #define SAVE_COL0

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

2014-05-24 Thread Caolán McNamara 
 include/svx/dialogs.hrc  |1 
 svx/UIConfig_svx.mk  |1 
 svx/inc/helpid.hrc   |2 
 svx/source/dialog/docrecovery.cxx|   82 ---
 svx/source/dialog/docrecovery.hrc|   11 --
 svx/source/dialog/docrecovery.src|   57 ---
 svx/source/inc/docrecovery.hxx   |   35 --
 svx/source/unodraw/recoveryui.cxx|   18 ---
 svx/uiconfig/ui/docrecoverysavedialog.ui |  159 +++
 9 files changed, 192 insertions(+), 174 deletions(-)

New commits:
commit 1413d6bc9902a536c0c67f42d2cb16ea45174fe4
Author: Caolán McNamara caol...@redhat.com
Date:   Sat May 24 17:11:09 2014 +0100

convert doc recovery save page to .ui

and a wizard with one page is just a dialog, so make
that simplification and conversion too

Change-Id: I9f6335007609893308d57d693a18a313bcbb9244

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 2756267..aaec27c 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -1008,7 +1008,6 @@
 
 #define RID_SVX_TABDLG_DOCRECOVERY  ( RID_SVX_START +   0 )
 
-#define RID_SVXPAGE_DOCRECOVERY_SAVE( RID_SVX_START +   8 )
 #define RID_SVXPAGE_DOCRECOVERY_RECOVER ( RID_SVX_START +   9 )
 
 //  double defined ID's (see below) !!!
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 8f30b32..5388669 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/compressgraphicdialog \
svx/uiconfig/ui/deleteheaderdialog \
svx/uiconfig/ui/deletefooterdialog \
+   svx/uiconfig/ui/docrecoverysavedialog \
svx/uiconfig/ui/extrustiondepthdialog \
svx/uiconfig/ui/findreplacedialog \
svx/uiconfig/ui/fontworkgallerydialog \
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index bc6d484..c32f8be 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -136,8 +136,6 @@
 #define HID_SVX_MDLG_DOCRECOVERY_PROGR
SVX_HID_SVX_MDLG_DOCRECOVERY_PROGR
 #define HID_SVX_TABDLG_DOCRECOVERY
SVX_HID_SVX_TABDLG_DOCRECOVERY
 #define HID_SVX_TP_DOCRECOVERY_RECOVER
SVX_HID_SVX_TP_DOCRECOVERY_RECOVER
-#define HID_SVX_TP_DOCRECOVERY_SAVE   
SVX_HID_SVX_TP_DOCRECOVERY_SAVE
-
 #define HID_VALUESET_EXTRUSION_DIRECTION  
SVX_HID_VALUESET_EXTRUSION_DIRECTION
 #define HID_VALUESET_EXTRUSION_LIGHTING   
SVX_HID_VALUESET_EXTRUSION_LIGHTING
 #define HID_XMLSEC_CALL   
SVX_HID_XMLSEC_CALL
diff --git a/svx/source/dialog/docrecovery.cxx 
b/svx/source/dialog/docrecovery.cxx
index 10ff3a7..e2c9b40 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -678,20 +678,15 @@ void SAL_CALL PluginProgress::reset()
 }
 
 
-SaveDialog::SaveDialog(Window*   pParent,
-   RecoveryCore* pCore  )
-: IExtendedTabPage( pParent, SVX_RES( RID_SVXPAGE_DOCRECOVERY_SAVE ) )
-, m_aTitleFT ( this   , SVX_RES  ( FT_SAVE_TITLE   ) )
-, m_aTitleWin( this   , SVX_RES  ( WIN_SAVE_TITLE  ) )
-, m_aTitleFL ( this   , SVX_RES  ( FL_SAVE_TITLE   ) )
-, m_aDescrFT ( this   , SVX_RES  ( FT_SAVE_DESCR   ) )
-, m_aFileListFT  ( this   , SVX_RES  ( FT_SAVE_FILELIST) )
-, m_aFileListLB  ( this   , SVX_RES  ( LB_SAVE_FILELIST) )
-, m_aBottomFL( this   , SVX_RES  ( FL_SAVE_BOTTOM  ) )
-, m_aOkBtn   ( this   , SVX_RES  ( BT_SAVE_OK  ) )
-, m_pCore( pCore   )
+SaveDialog::SaveDialog(Window* pParent, RecoveryCore* pCore)
+: Dialog(pParent, DocRecoverySaveDialog, 
svx/ui/docrecoverysavedialog.ui)
+, m_pCore(pCore)
 {
-FreeResource();
+get(m_pTitleFT, title);
+get(m_pFileListLB, filelist);
+m_pFileListLB-set_height_request(m_pFileListLB-GetTextHeight() * 10);
+m_pFileListLB-set_width_request(m_pFileListLB-approximate_char_width() * 
72);
+get(m_pOkBtn, ok);
 
 // Prepare the office for the following crash save step.
 // E.g. hide all open widows so the user can't influence our
@@ -699,19 +694,14 @@ SaveDialog::SaveDialog(Window*   pParent,
 m_pCore-doEmergencySavePrepare();
 
 const StyleSettings rStyleSettings = GetSettings().GetStyleSettings();
-Wallpaper aBackground(rStyleSettings.GetWindowColor());
-m_aTitleWin.SetBackground(aBackground);
-m_aTitleFT.SetBackground (aBackground);
-
-Font aFont(m_aTitleFT.GetFont());
-aFont.SetWeight(WEIGHT_BOLD);
-m_aTitleFT.SetFont(aFont);
+m_pTitleFT-SetBackground(rStyleSettings.GetWindowColor());
+m_pTitleFT-set_height_request(m_pTitleFT-get_preferred_size().Height() + 
48);
 
-

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

2014-02-01 Thread Caolán McNamara 
 include/svx/fmresids.hrc   |1 
 svx/UIConfig_svx.mk|1 
 svx/inc/fmhelp.hrc |2 
 svx/source/form/datanavi.cxx   |  100 +++---
 svx/source/form/datanavi.src   |   81 ---
 svx/source/inc/datanavi.hrc|   13 -
 svx/source/inc/datanavi.hxx|   15 --
 svx/uiconfig/ui/namespacedialog.ui |  252 +
 8 files changed, 308 insertions(+), 157 deletions(-)

New commits:
commit ae7880ea4957a6c1d7e5045842a864d8bdced39f
Author: Caolán McNamara caol...@redhat.com
Date:   Sat Feb 1 13:52:11 2014 +

convert namespace dialog to .ui

Change-Id: I9d45cdf16d81bfda21fb38bef87e91131683ad06

diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index e877802..bc040ae 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -61,7 +61,6 @@
 
 // Dialog-Id's ---
 #define RID_SVX_FMEXPLORER  (RID_FORMS_START + 6)
-#define RID_SVXDLG_NAMESPACE_ITEM   (RID_FORMS_START + 14)
 
 #define RID_SVXWIN_DATANAVIGATOR(RID_FORMS_START + 19)
 #define RID_SVX_XFORMS_TABPAGES (RID_FORMS_START + 20)
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 9cb6a18..a59c252 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/fontworkspacingdialog \
svx/uiconfig/ui/headfootformatpage \
svx/uiconfig/ui/linkwarndialog \
+   svx/uiconfig/ui/namespacedialog \
svx/uiconfig/ui/optgridpage \
svx/uiconfig/ui/passwd \
svx/uiconfig/ui/querydeletecontourdialog \
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index 5238b07..71e5b07 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -53,8 +53,6 @@
 #define UID_FORMPROPBROWSER_FRAME 
SVX_UID_FORMPROPBROWSER_FRAME
 #define UID_ABSOLUTE_RECORD_WINDOW
SVX_UID_ABSOLUTE_RECORD_WINDOW
 #define HID_DATA_NAVIGATOR_WIN
SVX_HID_DATA_NAVIGATOR_WIN
-#define HID_XFORMS_NAMESPACEITEM_DLG  
SVX_HID_XFORMS_NAMESPACEITEM_DLG
-#define HID_XFORMS_NAMESPACEITEM_LIST 
SVX_HID_XFORMS_NAMESPACEITEM_LIST
 #define HID_MN_XFORMS_MODELS_ADD  
SVX_HID_MN_XFORMS_MODELS_ADD
 #define HID_MN_XFORMS_MODELS_EDIT 
SVX_HID_MN_XFORMS_MODELS_EDIT
 #define HID_MN_XFORMS_MODELS_REMOVE   
SVX_HID_MN_XFORMS_MODELS_REMOVE
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index a2b26ef..f2a8b7e 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -2893,57 +2893,57 @@ namespace svxform
 //
 
 NamespaceItemDialog::NamespaceItemDialog(
-AddConditionDialog* _pCondDlg, Reference XNameContainer  
_rContainer ) :
-
-ModalDialog( _pCondDlg, SVX_RES( RID_SVXDLG_NAMESPACE_ITEM ) ),
-
-m_aNamespacesFT ( this, SVX_RES( FT_NAMESPACES ) ),
-m_aNamespacesListContainer  ( this, SVX_RES( LB_NAMESPACES ) ),
-m_aNamespacesList   ( m_aNamespacesListContainer ),
-m_aAddNamespaceBtn  ( this, SVX_RES( PB_ADD_NAMESPACE ) ),
-m_aEditNamespaceBtn ( this, SVX_RES( PB_EDIT_NAMESPACE ) ),
-m_aDeleteNamespaceBtn   ( this, SVX_RES( PB_DELETE_NAMESPACE ) ),
-m_aButtonsFL( this, SVX_RES( FL_DATANAV_BTN ) ),
-m_aOKBtn( this, SVX_RES( BTN_DATANAV_OK ) ),
-m_aEscBtn   ( this, SVX_RES( BTN_DATANAV_ESC ) ),
-m_aHelpBtn  ( this, SVX_RES( BTN_DATANAV_HELP ) ),
+AddConditionDialog* _pCondDlg,
+Reference XNameContainer  _rContainer )
+: ModalDialog( _pCondDlg, NamespaceDialog,
+svx/ui/namespacedialog.ui )
+, m_pConditionDlg(_pCondDlg)
+, m_rNamespaces(_rContainer)
+{
+get(m_pAddNamespaceBtn, add);
+get(m_pEditNamespaceBtn, edit);
+get(m_pDeleteNamespaceBtn, delete);
+get(m_pOKBtn, ok);
 
-m_pConditionDlg ( _pCondDlg ),
-m_rNamespaces   ( _rContainer )
+SvSimpleTableContainer* pNamespacesListContainer =
+getSvSimpleTableContainer(namespaces);
+Size aControlSize(175, 72);
+aControlSize = LogicToPixel(aControlSize, MAP_APPFONT);
+pNamespacesListContainer-set_width_request(aControlSize.Width());
+pNamespacesListContainer-set_height_request(aControlSize.Height());
+m_pNamespacesList = new SvSimpleTable(*pNamespacesListContainer, 0);
 
-{
 static long aStaticTabs[]= { 3, 0, 35, 200 };
-m_aNamespacesList.SvSimpleTable::SetTabs( aStaticTabs );
-

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

2013-12-16 Thread Caolán McNamara 
 include/svx/fontworkgallery.hxx  |7 -
 svx/UIConfig_svx.mk  |3 
 svx/inc/fontworkgallery.hrc  |2 
 svx/source/tbxctrls/fontworkgallery.cxx  |   21 +
 svx/source/tbxctrls/fontworkgallery.src  |   54 --
 svx/uiconfig/ui/fontworkspacingdialog.ui |  112 +++
 6 files changed, 119 insertions(+), 80 deletions(-)

New commits:
commit fc946896bae5091b539db8929706dd3971129139
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 16 15:51:40 2013 +

convert fontwork spacing dialog to .ui

Change-Id: I0cf7fb84974741a162addb6c1fc393d3328f21cb

diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
index 3e1f7bf..1105bd6 100644
--- a/include/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
@@ -66,15 +66,10 @@ public:
 
 class FontworkCharacterSpacingDialog : public ModalDialog
 {
-FixedText   maFLScale;
-MetricField maMtrScale;
-OKButtonmaOKButton;
-CancelButtonmaCancelButton;
-HelpButton  maHelpButton;
+MetricField* m_pMtrScale;
 
 public:
 FontworkCharacterSpacingDialog( Window* pParent, sal_Int32 nScale );
-~FontworkCharacterSpacingDialog();
 
 sal_Int32 getScale() const;
 };
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index a031a2d..004cae2 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -19,8 +19,9 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/deleteheaderdialog \
svx/uiconfig/ui/deletefooterdialog \
svx/uiconfig/ui/extrustiondepthdialog \
-   svx/uiconfig/ui/headfootformatpage \
svx/uiconfig/ui/findreplacedialog \
+   svx/uiconfig/ui/fontworkspacingdialog \
+   svx/uiconfig/ui/headfootformatpage \
svx/uiconfig/ui/linkwarndialog \
svx/uiconfig/ui/optgridpage \
svx/uiconfig/ui/passwd \
diff --git a/svx/inc/fontworkgallery.hrc b/svx/inc/fontworkgallery.hrc
index de2665d..4946a8c 100644
--- a/svx/inc/fontworkgallery.hrc
+++ b/svx/inc/fontworkgallery.hrc
@@ -22,8 +22,6 @@
 #define CTL_FAVORITES   2
 #define BTN_OK  3
 #define BTN_CANCEL  4
-#define MF_VALUE7
-#define FT_VALUE8
 #define BTN_HELP9
 
 #define STR_CLICK_TO_ADD_TEXT   1
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx 
b/svx/source/tbxctrls/fontworkgallery.cxx
index db5131b..db81609 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -726,29 +726,16 @@ Sequence OUString  SAL_CALL 
FontworkCharacterSpacingControl::getSupportedServi
 return FontworkCharacterSpacingControl_getSupportedServiceNames();
 }
 
-// 
-// FontworkCharacterSpacingDialog
-// 
-
 FontworkCharacterSpacingDialog::FontworkCharacterSpacingDialog( Window* 
pParent, sal_Int32 nScale )
-:   ModalDialog( pParent, SVX_RES( RID_SVX_MDLG_FONTWORK_CHARSPACING ) ),
-maFLScale( this, SVX_RES( FT_VALUE ) ),
-maMtrScale( this, SVX_RES( MF_VALUE ) ),
-maOKButton( this, SVX_RES( BTN_OK ) ),
-maCancelButton( this, SVX_RES( BTN_CANCEL ) ),
-maHelpButton( this, SVX_RES( BTN_HELP ) )
-{
-maMtrScale.SetValue( nScale );
-FreeResource();
-}
-
-FontworkCharacterSpacingDialog::~FontworkCharacterSpacingDialog()
+:   ModalDialog( pParent, FontworkSpacingDialog , 
svx/ui/fontworkspacingdialog.ui )
 {
+get(m_pMtrScale, entry);
+m_pMtrScale-SetValue( nScale );
 }
 
 sal_Int32 FontworkCharacterSpacingDialog::getScale() const
 {
-return (sal_Int32)maMtrScale.GetValue();
+return (sal_Int32)m_pMtrScale-GetValue();
 }
 
 }
diff --git a/svx/source/tbxctrls/fontworkgallery.src 
b/svx/source/tbxctrls/fontworkgallery.src
index 2e5f179..9e049a9 100644
--- a/svx/source/tbxctrls/fontworkgallery.src
+++ b/svx/source/tbxctrls/fontworkgallery.src
@@ -214,58 +214,4 @@ DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING
 };
 };
 
-ModalDialog RID_SVX_MDLG_FONTWORK_CHARSPACING
-{
-HelpID = svx:ModalDialog:RID_SVX_MDLG_FONTWORK_CHARSPACING;
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 139 , 64 ) ;
-Moveable = TRUE ;
-Closeable = TRUE ;
-
-Text [ en-US ] = Fontwork Character Spacing ;
-
-OKButton BTN_OK
-{
-Pos = MAP_APPFONT ( 83 , 6 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-DefButton = TRUE ;
-};
-CancelButton BTN_CANCEL
-{
-Pos = MAP_APPFONT ( 83 , 23 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-};
-HelpButton BTN_HELP
-{
-Pos = MAP_APPFONT ( 83 , 43 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-};
-FixedText FT_VALUE
-{
-Pos = MAP_APPFONT ( 6 , 6 ) ;
-Size = MAP_APPFONT ( 76 , 8 ) ;
-Text[

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

2013-12-05 Thread Caolán McNamara 
 include/svx/dialogs.hrc   |1 
 svx/UIConfig_svx.mk   |1 
 svx/inc/extrusiondepthdialog.hxx  |7 -
 svx/source/tbxctrls/extrusioncontrols.cxx |   20 ---
 svx/source/tbxctrls/extrusioncontrols.hrc |2 
 svx/source/tbxctrls/extrusioncontrols.src |   57 --
 svx/uiconfig/ui/extrustiondepthdialog.ui  |  156 ++
 7 files changed, 163 insertions(+), 81 deletions(-)

New commits:
commit ab80ea279bea37f4dd919417433cfd72ca28e8bd
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 11:21:02 2013 +

Related: fdo#34396 convert extrusion dialog to .ui

Change-Id: Iea6e42fb7b65e148dcf6b566a7595b9e18f2e2eb

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 4c3d681..7c89bb7 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -1020,7 +1020,6 @@
 // ModalDialog resource ids
 
 #define RID_SVX_MDLG_FONTWORK_GALLERY   ( RID_SVX_START +  2 )
-#define RID_SVX_MDLG_EXTRUSION_DEPTH( RID_SVX_START +  3 )
 
 // 
 // Menu resource ids
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index fb29eb1..7662784 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/compressgraphicdialog \
svx/uiconfig/ui/deleteheaderdialog \
svx/uiconfig/ui/deletefooterdialog \
+   svx/uiconfig/ui/extrustiondepthdialog \
svx/uiconfig/ui/headfootformatpage \
svx/uiconfig/ui/findreplacedialog \
svx/uiconfig/ui/linkwarndialog \
diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx
index 30765b9..43bafe5 100644
--- a/svx/inc/extrusiondepthdialog.hxx
+++ b/svx/inc/extrusiondepthdialog.hxx
@@ -31,15 +31,10 @@ namespace svx {
 
 class ExtrusionDepthDialog : public ModalDialog
 {
-FixedText   maFLDepth;
-MetricField maMtrDepth;
-OKButtonmaOKButton;
-CancelButtonmaCancelButton;
-HelpButton  maHelpButton;
+MetricField* m_pMtrDepth;
 
 public:
 ExtrusionDepthDialog( Window* pParent, double fDepth, FieldUnit 
eDefaultUnit );
-~ExtrusionDepthDialog();
 
 double getDepth() const;
 };
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx 
b/svx/source/tbxctrls/extrusioncontrols.cxx
index 9a98163..8ebf54e 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -297,27 +297,17 @@ Sequence OUString  SAL_CALL 
ExtrusionDirectionControl::getSupportedServiceName
 // 
 
 ExtrusionDepthDialog::ExtrusionDepthDialog( Window* pParent, double fDepth, 
FieldUnit eDefaultUnit )
-:   ModalDialog( pParent, SVX_RES( RID_SVX_MDLG_EXTRUSION_DEPTH ) ),
-maFLDepth( this, SVX_RES( FL_DEPTH ) ),
-maMtrDepth( this, SVX_RES( MTR_DEPTH ) ),
-maOKButton( this, SVX_RES( BTN_OK ) ),
-maCancelButton( this, SVX_RES( BTN_CANCEL ) ),
-maHelpButton( this, SVX_RES( BTN_HELP ) )
+: ModalDialog( pParent, ExtrustionDepthDialog, 
svx/ui/extrustiondepthdialog.ui )
 {
+get(m_pMtrDepth, depth);
 bool bMetric = IsMetric( eDefaultUnit );
-maMtrDepth.SetUnit( bMetric ? FUNIT_CM : FUNIT_INCH );
-maMtrDepth.SetValue( (int) fDepth * 100, FUNIT_100TH_MM );
-
-FreeResource();
-}
-
-ExtrusionDepthDialog::~ExtrusionDepthDialog()
-{
+m_pMtrDepth-SetUnit( bMetric ? FUNIT_CM : FUNIT_INCH );
+m_pMtrDepth-SetValue( (int) fDepth * 100, FUNIT_100TH_MM );
 }
 
 double ExtrusionDepthDialog::getDepth() const
 {
-return (double)( maMtrDepth.GetValue( FUNIT_100TH_MM ) ) / 100.0;
+return (double)( m_pMtrDepth-GetValue( FUNIT_100TH_MM ) ) / 100.0;
 }
 
 // 
diff --git a/svx/source/tbxctrls/extrusioncontrols.hrc 
b/svx/source/tbxctrls/extrusioncontrols.hrc
index f878df2..6193cca 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hrc
+++ b/svx/source/tbxctrls/extrusioncontrols.hrc
@@ -80,8 +80,6 @@
 #define IMG_LIGHTING_NORMAL 111
 #define IMG_LIGHTING_DIM112
 
-#define FL_DEPTH1
-#define MTR_DEPTH   2
 #define BTN_OK  3
 #define BTN_CANCEL  4
 #define BTN_HELP5
diff --git a/svx/source/tbxctrls/extrusioncontrols.src 
b/svx/source/tbxctrls/extrusioncontrols.src
index 5277076..3600a28 100644
--- a/svx/source/tbxctrls/extrusioncontrols.src
+++ b/svx/source/tbxctrls/extrusioncontrols.src
@@ -430,63 +430,6 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE
 };
 };
 
-#define WIDTH   140
-#define HEIGHT  (4 * 3 + 3 * 14)
-
-ModalDialog RID_SVX_MDLG_EXTRUSION_DEPTH
-{
-HelpID = svx:ModalDialog:RID_SVX_MDLG_EXTRUSION_DEPTH;
-OutputSize = TRUE;
-SVLook = TRUE ;
-Moveable = TRUE;
-

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

2013-12-05 Thread Caolán McNamara 
 include/svx/fmresids.hrc  |2 
 svx/UIConfig_svx.mk   |1 
 svx/inc/fmhelp.hrc|1 
 svx/source/form/datanavi.cxx  |   36 ++-
 svx/source/form/datanavi.src  |   66 -
 svx/source/inc/datanavi.hrc   |6 -
 svx/source/inc/datanavi.hxx   |   32 ++
 svx/uiconfig/ui/addnamespacedialog.ui |  167 ++
 8 files changed, 191 insertions(+), 120 deletions(-)

New commits:
commit 2b04cfa242436b2227600224450eb6fd75a2db1a
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 14:47:17 2013 +

convert add namespace dialog to .ui

Change-Id: I3636da91d39b2759dca72f30cc7b086b6f9cbb16

diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index f6281e1..2b17bbd 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -64,7 +64,7 @@
 #define RID_SVXDLG_ADD_DATAITEM (RID_FORMS_START + 12)
 #define RID_SVXDLG_ADD_CONDITION(RID_FORMS_START + 13)
 #define RID_SVXDLG_NAMESPACE_ITEM   (RID_FORMS_START + 14)
-#define RID_SVXDLG_MANAGE_NAMESPACE (RID_FORMS_START + 15)
+
 #define RID_SVXDLG_ADD_SUBMISSION   (RID_FORMS_START + 16)
 #define RID_SVXDLG_ADD_MODEL(RID_FORMS_START + 17)
 #define RID_SVXDLG_ADD_INSTANCE (RID_FORMS_START + 18)
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 7662784..2cd3889 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,svx))
 
 $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/acceptrejectchangesdialog \
+   svx/uiconfig/ui/addnamespacedialog \
svx/uiconfig/ui/asianphoneticguidedialog \
svx/uiconfig/ui/chineseconversiondialog \
svx/uiconfig/ui/compressgraphicdialog \
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index 17f663a..4a95afb 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -57,7 +57,6 @@
 #define HID_XFORMS_ADDCONDITION_DLG   
SVX_HID_XFORMS_ADDCONDITION_DLG
 #define HID_XFORMS_NAMESPACEITEM_DLG  
SVX_HID_XFORMS_NAMESPACEITEM_DLG
 #define HID_XFORMS_NAMESPACEITEM_LIST 
SVX_HID_XFORMS_NAMESPACEITEM_LIST
-#define HID_XFORMS_MANAGENAMESPACE_DLG
SVX_HID_XFORMS_MANAGENAMESPACE_DLG
 #define HID_MN_XFORMS_MODELS_ADD  
SVX_HID_MN_XFORMS_MODELS_ADD
 #define HID_MN_XFORMS_MODELS_EDIT 
SVX_HID_MN_XFORMS_MODELS_EDIT
 #define HID_MN_XFORMS_MODELS_REMOVE   
SVX_HID_MN_XFORMS_MODELS_REMOVE
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 58f74cbb..bd2e530 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -3300,40 +3300,24 @@ namespace svxform
 // class ManageNamespaceDialog
 //
 
-ManageNamespaceDialog::ManageNamespaceDialog(
-Window* pParent, AddConditionDialog* _pCondDlg, bool _bIsEdit ) :
-
-ModalDialog( pParent, SVX_RES( RID_SVXDLG_MANAGE_NAMESPACE ) ),
-
-m_aPrefixFT ( this, SVX_RES( FT_PREFIX ) ),
-m_aPrefixED ( this, SVX_RES( ED_PREFIX ) ),
-m_aUrlFT( this, SVX_RES( FT_URL ) ),
-m_aUrlED( this, SVX_RES( ED_URL ) ),
-m_aButtonsFL( this, SVX_RES( FL_DATANAV_BTN ) ),
-m_aOKBtn( this, SVX_RES( BTN_DATANAV_OK ) ),
-m_aEscBtn   ( this, SVX_RES( BTN_DATANAV_ESC ) ),
-m_aHelpBtn  ( this, SVX_RES( BTN_DATANAV_HELP ) ),
-
-m_pConditionDlg ( _pCondDlg )
-
+ManageNamespaceDialog::ManageNamespaceDialog(Window* pParent, 
AddConditionDialog* _pCondDlg, bool bIsEdit)
+: ModalDialog(pParent, AddNamespaceDialog, 
svx/ui/addnamespacedialog.ui)
+, m_pConditionDlg ( _pCondDlg )
 {
-if ( _bIsEdit )
-SetText(SVX_RESSTR(STR_EDIT_TEXT));
+get(m_pOKBtn, ok);
+get(m_pPrefixED, prefix);
+get(m_pUrlED, url);
 
-FreeResource();
+if (bIsEdit)
+SetText(getFixedText(alttitle)-GetText());
 
-m_aOKBtn.SetClickHdl( LINK( this, ManageNamespaceDialog, OKHdl ) );
-}
-
-//
-ManageNamespaceDialog::~ManageNamespaceDialog()
-{
+m_pOKBtn-SetClickHdl( LINK( this, ManageNamespaceDialog, OKHdl ) );
 }
 
 //
 IMPL_LINK_NOARG(ManageNamespaceDialog, OKHdl)
 {
-OUString sPrefix = m_aPrefixED.GetText();
+OUString sPrefix = m_pPrefixED-GetText();
 
 try
 {
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

2013-12-05 Thread Caolán McNamara 
 include/svx/fmresids.hrc  |2 
 svx/UIConfig_svx.mk   |1 
 svx/inc/fmhelp.hrc|1 
 svx/source/form/datanavi.cxx  |   26 +
 svx/source/form/datanavi.src  |   69 --
 svx/source/inc/datanavi.hxx   |   19 +---
 svx/uiconfig/ui/addmodeldialog.ui |  178 ++
 7 files changed, 192 insertions(+), 104 deletions(-)

New commits:
commit e5d35be267c4f4c7dd745fc8864df805e6675126
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 5 16:45:46 2013 +

convert add model dialog to .ui

Change-Id: I20d10d0e9c311bcfb1386d481ae4832f463b931a

diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index 2b17bbd..fdeed41 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -66,7 +66,7 @@
 #define RID_SVXDLG_NAMESPACE_ITEM   (RID_FORMS_START + 14)
 
 #define RID_SVXDLG_ADD_SUBMISSION   (RID_FORMS_START + 16)
-#define RID_SVXDLG_ADD_MODEL(RID_FORMS_START + 17)
+
 #define RID_SVXDLG_ADD_INSTANCE (RID_FORMS_START + 18)
 #define RID_SVXWIN_DATANAVIGATOR(RID_FORMS_START + 19)
 #define RID_SVX_XFORMS_TABPAGES (RID_FORMS_START + 20)
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 2cd3889..a031a2d 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,svx))
 
 $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/acceptrejectchangesdialog \
+   svx/uiconfig/ui/addmodeldialog \
svx/uiconfig/ui/addnamespacedialog \
svx/uiconfig/ui/asianphoneticguidedialog \
svx/uiconfig/ui/chineseconversiondialog \
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index 4a95afb..4245769 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -75,7 +75,6 @@
 #define HID_XFORMS_MODELS_MENUBTN 
SVX_HID_XFORMS_MODELS_MENUBTN
 #define HID_XFORMS_INSTANCES_MENUBTN  
SVX_HID_XFORMS_INSTANCES_MENUBTN
 #define HID_XFORMS_ADDSUBMISSION_DLG  
SVX_HID_XFORMS_ADDSUBMISSION_DLG
-#define HID_XFORMS_ADDMODEL_DLG   
SVX_HID_XFORMS_ADDMODEL_DLG
 #define HID_XFORMS_ADDINSTANCE_DLG
SVX_HID_XFORMS_ADDINSTANCE_DLG
 #define HID_XFORMS_MID_INSERT_CONTROL 
SVX_HID_XFORMS_MID_INSERT_CONTROL
 #define HID_XFORMS_TAB_CONTROL
SVX_HID_XFORMS_TAB_CONTROL
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index bd2e530..9820a0b 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -3583,28 +3583,14 @@ namespace svxform
 // class AddModelDialog
 //
 
-AddModelDialog::AddModelDialog( Window* pParent, bool _bEdit ) :
-
-ModalDialog( pParent, SVX_RES( RID_SVXDLG_ADD_MODEL ) ),
-
-m_aModelFL  ( this, SVX_RES( FL_MODEL ) ),
-m_aNameFT   ( this, SVX_RES( FT_MODEL_NAME ) ),
-m_aNameED   ( this, SVX_RES( ED_MODEL_NAME ) ),
-m_aModifyCB ( this, SVX_RES( CB_MODIFIES_DOCUMENT ) ),
-m_aButtonsFL( this, SVX_RES( FL_DATANAV_BTN ) ),
-m_aOKBtn( this, SVX_RES( BTN_DATANAV_OK ) ),
-m_aEscBtn   ( this, SVX_RES( BTN_DATANAV_ESC ) ),
-m_aHelpBtn  ( this, SVX_RES( BTN_DATANAV_HELP ) )
-
+AddModelDialog::AddModelDialog(Window* pParent, bool bIsEdit)
+: ModalDialog(pParent, AddModelDialog, svx/ui/addmodeldialog.ui)
 {
-if ( _bEdit )
-SetText(SVX_RESSTR(STR_EDIT_TEXT));
-
-FreeResource();
-}
+get(m_pNameED, name);
+get(m_pModifyCB, modify);
 
-AddModelDialog::~AddModelDialog()
-{
+if (bIsEdit)
+SetText(getFixedText(alttitle)-GetText());
 }
 
 //
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 974924d..882b93a 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -868,75 +868,6 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
 };
 };
 
-ModalDialog RID_SVXDLG_ADD_MODEL
-{
-HelpID = HID_XFORMS_ADDMODEL_DLG ;
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 180 , 82 ) ;
-Text [ en-US ] = Add Model ;
-Moveable = TRUE ;
-FixedLine FL_INSTANCE
-{
-Pos = MAP_APPFONT ( 4 , 3 ) ;
-Size = MAP_APPFONT ( 172 , 8 ) ;
-Text [ en-US ] = Model ;
-};
-FixedText FT_INST_NAME
-{
-Pos = MAP_APPFONT ( 6 , 14 ) ;
-Size = MAP_APPFONT ( 51 , 12 ) ;
-LeftLabel = TRUE ;
-VCenter = TRUE;
-Text [ en-US ] = ~Name ;
-};
-Edit ED_INST_NAME
-{
-HelpID =

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

2013-10-01 Thread Manal Alhassoun 
 include/svx/dialogs.hrc  |3 
 include/svx/passwd.hxx   |   21 +--
 svx/UIConfig_svx.mk  |1 
 svx/inc/helpid.hrc   |1 
 svx/source/dialog/passwd.cxx |   69 --
 svx/source/dialog/passwd.hrc |   44 ---
 svx/source/dialog/passwd.src |   97 +--
 svx/uiconfig/ui/passwd.ui|  270 +++
 8 files changed, 319 insertions(+), 187 deletions(-)

New commits:
commit ff3203c5c567ed14a8ff2e80408c304d3cdd84e0
Author: Manal Alhassoun malhass...@kacst.edu.sa
Date:   Mon Sep 30 11:22:50 2013 +0300

Convert change password dialog to widget UI

Change-Id: I0ff0eda77b849927fe6cffe5cf203c46ba9ef340
Reviewed-on: https://gerrit.libreoffice.org/6089
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 4c1ba17..4c3d681 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -200,7 +200,6 @@
 // for Toolbox-Control style
 #define RID_SVXTBX_STYLE(RID_SVX_START + 120)
 
-#define RID_SVXDLG_PASSWORD (RID_SVX_START + 141)
 #define RID_SVXDLG_COMPRESSGRAPHICS (RID_SVX_START + 142)
 
 // Dialog for functions
@@ -995,6 +994,8 @@
 #define RID_SVXSTR_DOC_MODIFIED_YES  (SVX_OOO_BUILD_START + 4) // 1234
 #define RID_SVXSTR_DOC_MODIFIED_NO   (SVX_OOO_BUILD_START + 5) // 1235
 #define RID_SVXSTR_DOC_LOAD  (SVX_OOO_BUILD_START + 6) // 1236
+#define RID_SVXSTR_ERR_OLD_PASSWD(SVX_OOO_BUILD_START + 7) // 1237
+#define RID_SVXSTR_ERR_REPEAT_PASSWD (SVX_OOO_BUILD_START + 8) // 1238
 
 // sidebar-related resources (defined in the appropriate .hrc's)
 #define RID_SVX_SIDEBAR_BEGIN(RID_SVX_START + 1240)
diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx
index 532ee6e0..1009597 100644
--- a/include/svx/passwd.hxx
+++ b/include/svx/passwd.hxx
@@ -33,17 +33,12 @@
 class SVX_DLLPUBLIC SvxPasswordDialog : public SfxModalDialog
 {
 private:
-FixedLine   aOldFL;
-FixedText   aOldPasswdFT;
-EditaOldPasswdED;
-FixedLine   aNewFL;
-FixedText   aNewPasswdFT;
-EditaNewPasswdED;
-FixedText   aRepeatPasswdFT;
-EditaRepeatPasswdED;
-OKButtonaOKBtn;
-CancelButtonaEscBtn;
-HelpButton  aHelpBtn;
+FixedText* m_pOldFL;
+FixedText* m_pOldPasswdFT;
+Edit* m_pOldPasswdED;
+Edit* m_pNewPasswdED;
+Edit* m_pRepeatPasswdED;
+OKButton* m_pOKBtn;
 
 OUStringaOldPasswdErrStr;
 OUStringaRepeatPasswdErrStr;
@@ -59,8 +54,8 @@ public:
 SvxPasswordDialog( Window* pParent, sal_Bool 
bAllowEmptyPasswords = sal_False, sal_Bool bDisableOldPassword = sal_False );
 ~SvxPasswordDialog();
 
-OUStringGetOldPassword() const { return aOldPasswdED.GetText(); }
-OUStringGetNewPassword() const { return aNewPasswdED.GetText(); }
+OUStringGetOldPassword() const { return m_pOldPasswdED-GetText(); 
}
+OUStringGetNewPassword() const { return m_pNewPasswdED-GetText(); 
}
 
 voidSetCheckPasswordHdl( const Link rLink ) { 
aCheckPasswordHdl = rLink; }
 };
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 7b98a08..cb4c759 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/headfootformatpage \
svx/uiconfig/ui/findreplacedialog \
svx/uiconfig/ui/optgridpage \
+   svx/uiconfig/ui/passwd \
svx/uiconfig/ui/redlinecontrol \
svx/uiconfig/ui/redlinefilterpage \
svx/uiconfig/ui/redlineviewpage \
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index e9e1666..2e41991 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -143,7 +143,6 @@
 #define HID_MNU_ZOOM_OPTIMAL  
SVX_HID_MNU_ZOOM_OPTIMAL
 #define HID_MNU_ZOOM_PAGE_WIDTH   
SVX_HID_MNU_ZOOM_PAGE_WIDTH
 #define HID_MNU_ZOOM_WHOLE_PAGE   
SVX_HID_MNU_ZOOM_WHOLE_PAGE
-#define HID_PASSWORD  
SVX_HID_PASSWORD
 #define HID_POPUP_COLOR   
SVX_HID_POPUP_COLOR
 #define HID_POPUP_COLOR_CTRL  
SVX_HID_POPUP_COLOR_CTRL
 #define HID_POPUP_FONTWORK_ALIGN  
SVX_HID_POPUP_FONTWORK_ALIGN
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index 2e80408..25b2314 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -23,7 +23,6 @@
 #include svx/passwd.hxx
 #include svx/dialmgr.hxx
 #include svx/dialogs.hrc
-#include passwd.hrc
 
 // class SvxPasswordDialog ---
 
@@ -33,20 +32,20 @@