convert mosaic dialog to .ui

Change-Id: Ibc723ca79fba89f24e04440fdbf4140a4e0655ad

8 files changed, 292 insertions, 174 deletions

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 6b068abd6c77..3796244482ab 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/macroassignpage \
 	cui/uiconfig/ui/macroselectordialog \
 	cui/uiconfig/ui/messbox \
+	cui/uiconfig/ui/mosaicdialog \
 	cui/uiconfig/ui/movemenu \
 	cui/uiconfig/ui/namedialog \
 	cui/uiconfig/ui/newlibdialog \
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 304db3a45c3c..d3420139a728 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -298,40 +298,26 @@ IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl)
 // ----------------
 
 GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic,
-                                          sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges ) :
-    oldGraphicFilterDialog( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_MOSAIC ), rGraphic ),
-    maFtWidth   ( this, CUI_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ),
-    maMtrWidth  ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ),
-    maFtHeight  ( this, CUI_RES( DLG_FILTERMOSAIC_FT_HEIGHT ) ),
-    maMtrHeight ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_HEIGHT ) ),
-    maCbxEdges  ( this, CUI_RES( DLG_FILTERMOSAIC_CBX_EDGES ) )
+                                          sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges )
+    : GraphicFilterDialog(pParent, "MosaicDialog",
+        "cui/ui/mosaicdialog.ui", rGraphic)
 {
-    FreeResource();
-
-    maMtrWidth.SetValue( nTileWidth );
-    maMtrWidth.SetLast( GetGraphicSizePixel().Width() );
-    maMtrWidth.SetModifyHdl( GetModifyHdl() );
+    get(mpMtrWidth, "width");
+    get(mpMtrHeight, "height");
+    get(mpCbxEdges, "edges");
 
-    maMtrHeight.SetValue( nTileHeight );
-    maMtrHeight.SetLast( GetGraphicSizePixel().Height() );
-    maMtrHeight.SetModifyHdl( GetModifyHdl() );
+    mpMtrWidth->SetValue( nTileWidth );
+    mpMtrWidth->SetLast( GetGraphicSizePixel().Width() );
+    mpMtrWidth->SetModifyHdl( GetModifyHdl() );
 
-    maCbxEdges.Check( bEnhanceEdges );
-    maCbxEdges.SetToggleHdl( GetModifyHdl() );
+    mpMtrHeight->SetValue( nTileHeight );
+    mpMtrHeight->SetLast( GetGraphicSizePixel().Height() );
+    mpMtrHeight->SetModifyHdl( GetModifyHdl() );
 
-    maMtrWidth.GrabFocus();
-
-    maFtWidth.SetAccessibleRelationMemberOf(&maFlParameter);
-    maMtrWidth.SetAccessibleRelationMemberOf(&maFlParameter);
-    maFtHeight.SetAccessibleRelationMemberOf(&maFlParameter);
-    maMtrHeight.SetAccessibleRelationMemberOf(&maFlParameter);
-    maCbxEdges.SetAccessibleRelationMemberOf(&maFlParameter);
-}
+    mpCbxEdges->Check( bEnhanceEdges );
+    mpCbxEdges->SetToggleHdl( GetModifyHdl() );
 
-// -----------------------------------------------------------------------------
-
-GraphicFilterMosaic::~GraphicFilterMosaic()
-{
+    mpMtrWidth->GrabFocus();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/cui/source/dialogs/grfflt.hrc b/cui/source/dialogs/grfflt.hrc
index 8e6e17127039..df4a92983076 100644
--- a/cui/source/dialogs/grfflt.hrc
+++ b/cui/source/dialogs/grfflt.hrc
@@ -31,16 +31,6 @@
 #define FL_PARAMETER                        106
 
 // --------------------
-// - DLG_FILTERMOSAIC -
-// --------------------
-
-#define DLG_FILTERMOSAIC_FT_WIDTH           1
-#define DLG_FILTERMOSAIC_MTR_WIDTH          2
-#define DLG_FILTERMOSAIC_FT_HEIGHT          3
-#define DLG_FILTERMOSAIC_MTR_HEIGHT         4
-#define DLG_FILTERMOSAIC_CBX_EDGES          5
-
-// --------------------
 // - DLG_FILTEREMBOSS -
 // --------------------
 
diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src
index 276f7e012793..275f5b6863a0 100644
--- a/cui/source/dialogs/grfflt.src
+++ b/cui/source/dialogs/grfflt.src
@@ -24,113 +24,6 @@
 #include <svx/dialogs.hrc>
 
 // --------------------
-// - DLG_FILTERMOSAIC -
-// --------------------
-
-ModalDialog RID_SVX_GRFFILTER_DLG_MOSAIC
-{
-    HelpID = CMD_SID_GRFFILTER_MOSAIC;
-    OutputSize = TRUE ;
-    Moveable = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 250, 100 ) ;
-
-    Text [ en-US ] = "Mosaic" ;
-
-    FixedLine FL_PARAMETER
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 182, RSC_CD_FIXEDLINE_HEIGHT ) ;
-        Text [ en-US ] = "Parameters";
-    };
-    Control CTL_PREVIEW
-    {
-        Pos = MAP_APPFONT ( 104 , 3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP ) ;
-        Size = MAP_APPFONT ( 81, 73 ) ;
-    };
-#define MA_Y0   3 + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_INNERBORDER_TOP
-    FixedText DLG_FILTERMOSAIC_FT_WIDTH
-    {
-        Pos = MAP_APPFONT ( 12, MA_Y0 ) ;
-        Size = MAP_APPFONT ( 77, 10 ) ;
-        Text [ en-US ] = "~Width" ;
-    };
-#define MA_Y1   MA_Y0 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
-    MetricField DLG_FILTERMOSAIC_MTR_WIDTH
-    {
-        HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_WIDTH";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , MA_Y1 ) ;
-        Size = MAP_APPFONT ( 35 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 1 ;
-        Maximum = 999 ;
-        StrictFormat = TRUE ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText [ en-US ] = " Pixel" ;
-        First = 1 ;
-        Last = 999 ;
-        SpinSize = 1 ;
-    };
-#define MA_Y2   MA_Y1 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y
-    FixedText DLG_FILTERMOSAIC_FT_HEIGHT
-    {
-        Pos = MAP_APPFONT ( 12, MA_Y2 ) ;
-        Size = MAP_APPFONT ( 77, 10 ) ;
-        Text [ en-US ] = "H~eight" ;
-    };
-#define MA_Y3   MA_Y2 + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y
-    MetricField DLG_FILTERMOSAIC_MTR_HEIGHT
-    {
-        HelpID = "cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_HEIGHT";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12, MA_Y3 ) ;
-        Size = MAP_APPFONT ( 35, 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 1 ;
-        Maximum = 999 ;
-        StrictFormat = TRUE ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText [ en-US ] = " Pixel" ;
-        First = 1 ;
-        Last = 999 ;
-        SpinSize = 1 ;
-    };
-#define MA_Y4   MA_Y3 + RSC_CD_TEXTBOX_HEIGHT + RSC_SP_CTRL_Y
-    CheckBox DLG_FILTERMOSAIC_CBX_EDGES
-    {
-        HelpID = "cui:CheckBox:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_CBX_EDGES";
-        Pos = MAP_APPFONT ( 12, MA_Y4 ) ;
-        Size = MAP_APPFONT ( 91, 12 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "E~nhance edges" ;
-    };
-    OKButton BTN_OK
-    {
-        Pos = MAP_APPFONT ( 194, 6 ) ;
-        Size = MAP_APPFONT ( 50, 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 194, 23 ) ;
-        Size = MAP_APPFONT ( 50, 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 194, 43 ) ;
-        Size = MAP_APPFONT ( 50, 14 ) ;
-        TabStop = TRUE ;
-    };
-};
-
-// --------------------
 // - DLG_FILTEREMBOSS -
 // --------------------
 
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 0dd0932e52fe..11fc55c685cf 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1544,21 +1544,10 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSol
 
 AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (Window* pParent,
                                             const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight,
-                                            sal_Bool bEnhanceEdges, sal_uInt32 nResId)
+                                            sal_Bool bEnhanceEdges)
 {
-    oldGraphicFilterDialog* pDlg=NULL;
-    switch ( nResId )
-    {
-        case RID_SVX_GRFFILTER_DLG_MOSAIC :
-            pDlg = new GraphicFilterMosaic( pParent, rGraphic, nTileWidth, nTileHeight, bEnhanceEdges );
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new oldAbstractGraphicFilterDialog_Impl( pDlg );
-    return 0;
+    GraphicFilterDialog* pDlg = new GraphicFilterMosaic(pParent, rGraphic, nTileWidth, nTileHeight, bEnhanceEdges);
+    return new AbstractGraphicFilterDialog_Impl( pDlg );
 }
 
 AbstractSvxAreaTabDialog* AbstractDialogFactory_Impl::CreateSvxAreaTabDialog( Window* pParent,
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index a83aac2fb095..58e921a680d1 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -674,7 +674,7 @@ public:
                                                 sal_Bool bInvert);
     virtual AbstractGraphicFilterDialog *   CreateGraphicFilterMosaic (Window* pParent,
                                                 const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight,
-                                                sal_Bool bEnhanceEdges, sal_uInt32 nResId);
+                                                sal_Bool bEnhanceEdges);
     virtual AbstractSvxAreaTabDialog*       CreateSvxAreaTabDialog( Window* pParent,
                                                             const SfxItemSet* pAttr,
                                                             SdrModel* pModel,
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index adbecbb04d98..60304b714a08 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -159,26 +159,22 @@ public:
 // - GraphicFilterMosaic -
 // -----------------------
 
-class GraphicFilterMosaic : public oldGraphicFilterDialog
+class GraphicFilterMosaic : public GraphicFilterDialog
 {
 private:
-
-    FixedText       maFtWidth;
-    MetricField     maMtrWidth;
-    FixedText       maFtHeight;
-    MetricField     maMtrHeight;
-    CheckBox        maCbxEdges;
+    MetricField*    mpMtrWidth;
+    MetricField*    mpMtrHeight;
+    CheckBox*       mpCbxEdges;
 
 public:
 
-                    GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic,
-                                         sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges );
-                    ~GraphicFilterMosaic();
+    GraphicFilterMosaic(Window* pParent, const Graphic& rGraphic,
+        sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges);
 
     virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
-    long            GetTileWidth() const { return static_cast<long>(maMtrWidth.GetValue()); }
-    long            GetTileHeight() const { return static_cast<long>(maMtrHeight.GetValue()); }
-    sal_Bool            IsEnhanceEdges() const { return maCbxEdges.IsChecked(); }
+    long            GetTileWidth() const { return static_cast<long>(mpMtrWidth->GetValue()); }
+    long            GetTileHeight() const { return static_cast<long>(mpMtrHeight->GetValue()); }
+    sal_Bool        IsEnhanceEdges() const { return mpCbxEdges->IsChecked(); }
 };
 
 // -------------------------
diff --git a/cui/uiconfig/ui/mosaicdialog.ui b/cui/uiconfig/ui/mosaicdialog.ui
new file mode 100644
index 000000000000..e00626d3510b
--- /dev/null
+++ b/cui/uiconfig/ui/mosaicdialog.ui
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+  <requires lib="gtk+" version="3.0"/>
+  <!-- interface-requires LibreOffice 1.0 -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="lower">1</property>
+    <property name="upper">999</property>
+    <property name="value">2</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkDialog" id="MosaicDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">Mosaic</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="ok">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="help">
+                <property name="label">gtk-help</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFrame" id="frame1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkAlignment" id="alignment1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="top_padding">6</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkGrid" id="grid1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="column_spacing">24</property>
+                    <child>
+                      <object class="cuilo-GraphicPreviewWindow" id="preview">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkGrid" id="grid2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="row_spacing">12</property>
+                        <child>
+                          <object class="GtkGrid" id="grid3">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="row_spacing">6</property>
+                            <child>
+                              <object class="GtkSpinButton" id="width:px">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="text" translatable="yes">2</property>
+                                <property name="adjustment">adjustment1</property>
+                                <property name="value">2</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">1</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">_Width</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">width:px</property>
+                              </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>
+                          <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>
+                        <child>
+                          <object class="GtkGrid" id="grid4">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="row_spacing">6</property>
+                            <child>
+                              <object class="GtkSpinButton" id="height:px">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="text" translatable="yes">2</property>
+                                <property name="adjustment">adjustment1</property>
+                                <property name="value">2</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">1</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label3">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">_Height</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">height:px</property>
+                              </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>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="edges">
+                            <property name="label" translatable="yes">E_nhance edges</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">2</property>
+                            <property name="width">1</property>
+                            <property name="height">1</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>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Parameters</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">ok</action-widget>
+      <action-widget response="0">cancel</action-widget>
+      <action-widget response="0">help</action-widget>
+    </action-widgets>
+  </object>
+</interface>