summaryrefslogtreecommitdiff
path: root/cui/source/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-02-01 12:29:27 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-02-01 13:14:55 +0000
commit44f85f3804d69cd437a5baeae2d1aeadf1873f74 (patch)
tree8eeefee3faf2ba14c6eb366a33de21ea37244e03 /cui/source/inc
parentb26f6cdbd0de34cceb1dd8fc382490860f45a66f (diff)
convert emboss dialog to .ui
Change-Id: I16883023ba7386437ff1cc9cd7d3393db8fb4654
Diffstat (limited to 'cui/source/inc')
-rw-r--r--cui/source/inc/cuigrfflt.hxx88
-rw-r--r--cui/source/inc/helpid.hrc1
2 files changed, 15 insertions, 74 deletions
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 60304b714a08..60912c0c5e7e 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -32,54 +32,6 @@
#include <svx/dlgctrl.hxx>
#include <svx/rectenum.hxx>
-class oldGraphicFilterDialog : public ModalDialog
-{
-private:
-
- class PreviewWindow : public Control
- {
- private:
-
- Graphic maGraphic;
-
- virtual void Paint( const Rectangle& rRect );
-
- public:
-
- PreviewWindow( Window* pParent, const ResId& rResId );
-
- void SetGraphic( const Graphic& rGraphic );
- };
-
-private:
-
- Timer maTimer;
- Link maModifyHdl;
- Graphic maGraphic;
- double mfScaleX;
- double mfScaleY;
- Size maSizePixel;
-
- DECL_LINK(ImplPreviewTimeoutHdl, void *);
- DECL_LINK( ImplModifyHdl, void* p );
-
-protected:
- PreviewWindow maPreview;
- OKButton maBtnOK;
- CancelButton maBtnCancel;
- HelpButton maBtnHelp;
- FixedLine maFlParameter;
-
- const Link& GetModifyHdl() const { return maModifyHdl; }
- const Size& GetGraphicSizePixel() const { return maSizePixel; }
-
-public:
-
- oldGraphicFilterDialog( Window* pParent, const ResId& rResId, const Graphic& rGraphic );
-
- virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) = 0;
-};
-
class GraphicPreviewWindow : public Control
{
private:
@@ -235,39 +187,29 @@ public:
// - GraphicFilterEmboss -
// -----------------------
-class GraphicFilterEmboss : public oldGraphicFilterDialog
+class EmbossControl : public SvxRectCtl
{
private:
+ Link maModifyHdl;
+ virtual void MouseButtonDown( const MouseEvent& rEvt );
+ virtual Size GetOptimalSize() const;
+public:
+ EmbossControl(Window* pParent)
+ : SvxRectCtl(pParent) {}
- class EmbossControl : public SvxRectCtl
- {
- private:
-
- Link maModifyHdl;
-
- virtual void MouseButtonDown( const MouseEvent& rEvt );
-
- public:
-
- EmbossControl( Window* pParent, const ResId& rResId, RECT_POINT eRectPoint ) :
- SvxRectCtl( pParent, rResId ) { SetActualRP( eRectPoint ); }
-
- void SetModifyHdl( const Link& rHdl ) { maModifyHdl = rHdl; }
- };
+ void SetModifyHdl( const Link& rHdl ) { maModifyHdl = rHdl; }
+};
+class GraphicFilterEmboss : public GraphicFilterDialog
+{
private:
-
- FixedText maFtLight;
- EmbossControl maCtlLight;
-
+ EmbossControl* mpCtlLight;
public:
-
- GraphicFilterEmboss( Window* pParent, const Graphic& rGraphic,
- RECT_POINT eLightSource );
- ~GraphicFilterEmboss();
+ GraphicFilterEmboss( Window* pParent, const Graphic& rGraphic,
+ RECT_POINT eLightSource );
virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
- RECT_POINT GetLightSource() const { return maCtlLight.GetActualRP(); }
+ RECT_POINT GetLightSource() const { return mpCtlLight->GetActualRP(); }
};
#endif
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 50e7475a7d4b..df92b8a170ed 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -224,7 +224,6 @@
#define HID_HYPERLINK_MARKWND_APPLY "CUI_HID_HYPERLINK_MARKWND_APPLY"
#define HID_HYPERLINK_MARKWND_CLOSE "CUI_HID_HYPERLINK_MARKWND_CLOSE"
#define HID_HYPERLINK_MARKWND_TREE "CUI_HID_HYPERLINK_MARKWND_TREE"
-#define HID_GRFFILTER_EMBOSS_LIGHT "CUI_HID_GRFFILTER_EMBOSS_LIGHT"
#define HID_LINKDLG_TABLB "CUI_HID_LINKDLG_TABLB"
#define HID_MACRO_HEADERTABLISTBOX "CUI_HID_MACRO_HEADERTABLISTBOX"