convert graphic export dialog to .ui

Change-Id: I3bd078e569c5cb1a55cfb44de7b1e569908e1698

svtools/AllLangResTarget_svt.mk

@@ -66,12 +66,12 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\
     svtools/source/dialogs/prnsetup.src \
     svtools/source/dialogs/so3res.src \
     svtools/source/dialogs/wizardmachine.src \
-    svtools/source/filter/exportdialog.src \
     svtools/source/java/javaerror.src \
     svtools/source/misc/ehdl.src \
     svtools/source/misc/helpagent.src \
     svtools/source/misc/imagemgr.src \
     svtools/source/misc/langtab.src \
+    svtools/source/misc/svtools.src \
     svtools/source/misc/undo.src \
     svtools/source/toolpanel/toolpanel.src \
 ))

svtools/Module_svtools.mk

@@ -33,6 +33,7 @@ $(eval $(call gb_Module_add_targets,svtools,\
     Library_hatchwindowfactory \
     Library_svt \
     Package_inc \
+    UI_svt \
 ))
 
 ifneq ($(CROSS_COMPILING),YES)

svtools/UI_svt.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_UI_UI,svt))
+
+$(eval $(call gb_UI_add_uifiles,svt,\
+	svtools/uiconfig/ui/graphicexport \
+))
+
+# vim: set noet sw=4 ts=4:

svtools/inc/svtools/svtools.hrc

@@ -50,6 +50,16 @@
 #define STR_SVT_FILEVIEW_COLUMN_TYPE    (RID_SVTOOLS_START + 29)
 #define STR_FILTERNAME_ALL              (RID_SVTOOLS_START + 30)
 #define RID_FILEVIEW_CONTEXTMENU        (RID_SVTOOLS_START + 31)
+#define STR_1BIT_THRESHOLD              (RID_SVTOOLS_START + 32)
+#define STR_1BIT_DITHERED               (RID_SVTOOLS_START + 33)
+#define STR_4BIT_GRAYSCALE              (RID_SVTOOLS_START + 34)
+#define STR_4BIT_COLOR_PALETTE          (RID_SVTOOLS_START + 35)
+#define STR_8BIT_GRAYSCALE              (RID_SVTOOLS_START + 36)
+#define STR_8BIT_COLOR_PALETTE          (RID_SVTOOLS_START + 37)
+#define STR_24BIT_TRUE_COLOR            (RID_SVTOOLS_START + 38)
+#define STR_ESTIMATED_SIZE_PIX_1        (RID_SVTOOLS_START + 39)
+#define STR_ESTIMATED_SIZE_PIX_2        (RID_SVTOOLS_START + 40)
+#define STR_ESTIMATED_SIZE_VEC          (RID_SVTOOLS_START + 41)
 
 // doc template dialog
 #define DLG_DOCTEMPLATE                 (RID_SVTOOLS_START+50)
@@ -216,9 +226,6 @@
 
 //.............................................................................
 // dialogs
-#define DLG_EXPORT_START                (STR_ARR_SVT_LANGUAGE_TABLE_END + 1)
-#define DLG_EXPORT                      (DLG_EXPORT_START)
-#define DLG_EXPORT_TITLE                (DLG_EXPORT_START+1)
 
 #define DLG_LOGIN                       (RID_SVTOOLS_START+113)
 #define DLG_ADDRESSBOOKSOURCE           (RID_SVTOOLS_START+114)
@@ -262,7 +269,7 @@
 #define IMG_TRIANGLE_RIGHT              (RID_SVTOOLS_START + 18)
 #define IMG_TRIANGLE_DOWN               (RID_SVTOOLS_START + 20)
 
-#define IMG_SVT_FOLDER                  (RID_SVTOOLS_START + 40)
+#define IMG_SVT_FOLDER                  (RID_SVTOOLS_START + 42)
 
 #define IMG_SVT_NEWDOC                  (RID_SVTOOLS_START + 52)
 #define IMG_SVT_MYDOCS                  (RID_SVTOOLS_START + 53)

svtools/source/filter/exportdialog.hrc

-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include <svtools/svtools.hrc>
-
-#define BTN_OK                  1
-#define BTN_CANCEL              1
-#define BTN_HELP                1
-
-#define FL_EXPORT_SIZE          1
-#define FL_COLOR_DEPTH          2
-#define FL_JPG_QUALITY          3
-#define FL_COMPRESSION          4
-#define FL_MODE                 5
-#define FL_GIF_DRAWING_OBJECTS  6
-#define FL_EPS_PREVIEW          8
-#define FL_EPS_VERSION          9
-#define FL_EPS_COLOR_FORMAT     10
-#define FL_ESTIMATED_SIZE       11
-#define FL_BUTTONS              12
-
-#define FT_SIZEX                1
-#define FT_SIZEY                2
-#define FT_RESOLUTION           3
-#define FT_JPG_MIN              4
-#define FT_JPG_MAX              5
-#define FT_PNG_MIN              6
-#define FT_PNG_MAX              7
-#define FT_ESTIMATED_SIZE       8
-
-#define NF_RESOLUTION           1
-#define NF_COMPRESSION          2
-
-#define MF_SIZEX                1
-#define MF_SIZEY                2
-
-#define LB_SIZEX                1
-#define LB_SIZEY                2
-#define LB_RESOLUTION           3
-#define LB_COLOR_DEPTH          4
-
-#define RB_BINARY               1
-#define RB_TEXT                 2
-#define RB_EPS_LEVEL1           3
-#define RB_EPS_LEVEL2           4
-#define RB_EPS_COLOR_FORMAT1    5
-#define RB_EPS_COLOR_FORMAT2    6
-#define RB_EPS_COMPRESSION_LZW  7
-#define RB_EPS_COMPRESSION_NONE 8
-
-#define CB_INTERLACED           2
-#define CB_RLE_ENCODING         3
-#define CB_SAVE_TRANSPARENCY    4
-#define CB_EPS_PREVIEW_TIFF     5
-#define CB_EPS_PREVIEW_EPSI     6
-
-#define SB_COMPRESSION          1
-
-#define STR_1BIT_THRESHOLD      1
-#define STR_1BIT_DITHERED       2
-#define STR_4BIT_GRAYSCALE      3
-#define STR_4BIT_COLOR_PALETTE  4
-#define STR_8BIT_GRAYSCALE      5
-#define STR_8BIT_COLOR_PALETTE  6
-#define STR_24BIT_TRUE_COLOR    7
-#define STR_ESTIMATED_SIZE_PIX_1 8
-#define STR_ESTIMATED_SIZE_PIX_2 9
-#define STR_ESTIMATED_SIZE_VEC   10

svtools/source/filter/exportdialog.hxx

@@ -26,9 +26,9 @@
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/msgbox.hxx>
-#include <vcl/arrange.hxx>
 #include <vcl/scrbar.hxx>
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
@@ -46,63 +46,60 @@ class ExportDialog : public ModalDialog
 {
 private:
 
-    FltCallDialogParameter&
-        mrFltCallPara;
-
-    ResMgr*             mpMgr;
+    FltCallDialogParameter& mrFltCallPara;
 
     const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
         mxMgr;
     const com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >&
         mxSourceDocument;
 
-    FixedLine           maFlExportSize;
-    FixedText           maFtSizeX;
-    MetricField         maMfSizeX;
-    ListBox             maLbSizeX;
-    FixedText           maFtSizeY;
-    MetricField         maMfSizeY;
-    ListBox             maLbSizeY;
-    FixedText           maFtResolution;
-    NumericField        maNfResolution;
-    ListBox             maLbResolution;
-    FixedLine           maFlColorDepth;
-    ListBox             maLbColorDepth;
-    FixedLine           maFlJPGQuality;
-    FixedLine           maFlMode;
-    ScrollBar           maSbCompression;
-    NumericField        maNfCompression;
-    FixedText           maFtJPGMin;
-    FixedText           maFtJPGMax;
-    FixedText           maFtPNGMin;
-    FixedText           maFtPNGMax;
-    CheckBox            maCbInterlaced;
-    CheckBox            maCbRLEEncoding;
-    FixedLine           maFlGIFDrawingObjects;
-    CheckBox            maCbSaveTransparency;
-    RadioButton         maRbBinary;
-    RadioButton         maRbText;
-    FixedLine           maFlEPSPreview;
-    CheckBox            maCbEPSPreviewTIFF;
-    CheckBox            maCbEPSPreviewEPSI;
-    FixedLine           maFlEPSVersion;
-    RadioButton         maRbEPSLevel1;
-    RadioButton         maRbEPSLevel2;
-    FixedLine           maFlEPSColorFormat;
-    RadioButton         maRbEPSColorFormat1;
-    RadioButton         maRbEPSColorFormat2;
-    FixedLine           maFlCompression;
-    RadioButton         maRbEPSCompressionLZW;
-    RadioButton         maRbEPSCompressionNone;
-    FixedLine           maFlEstimatedSize;
-    FixedText           maFtEstimatedSize;
+    NumericField*       mpMfSizeX;
+    ListBox*            mpLbSizeX;
+    NumericField*       mpMfSizeY;
+    FixedText*          mpFtResolution;
+    NumericField*       mpNfResolution;
+    ListBox*            mpLbResolution;
+
+    VclContainer*       mpColorDepth;
+    ListBox*            mpLbColorDepth;
+
+    VclContainer*       mpJPGQuality;
+    VclContainer*       mpPNGCompression;
+
+    ScrollBar*          mpSbCompression;
+    NumericField*       mpNfCompression;
+
+    VclContainer*       mpMode;
+    CheckBox*           mpCbInterlaced;
+
+    VclContainer*       mpBMPCompression;
+    CheckBox*           mpCbRLEEncoding;
+
+    VclContainer*       mpDrawingObjects;
+    CheckBox*           mpCbSaveTransparency;
+
+    VclContainer*       mpEncoding;
+    RadioButton*        mpRbBinary;
+    RadioButton*        mpRbText;
+
+    VclContainer*       mpEPSGrid;
+    CheckBox*           mpCbEPSPreviewTIFF;
+    CheckBox*           mpCbEPSPreviewEPSI;
+    RadioButton*        mpRbEPSLevel1;
+    RadioButton*        mpRbEPSLevel2;
+    RadioButton*        mpRbEPSColorFormat1;
+    RadioButton*        mpRbEPSColorFormat2;
+    RadioButton*        mpRbEPSCompressionLZW;
+    RadioButton*        mpRbEPSCompressionNone;
+
+    VclContainer*       mpInfo;
+    FixedText*          mpFtEstimatedSize;
+
+    OKButton*           mpBtnOK;
+
     String              msEstimatedSizePix1;
     String              msEstimatedSizePix2;
     String              msEstimatedSizeVec;
-    FixedLine           maFlButtons;
-    OKButton            maBtnOK;
-    CancelButton        maBtnCancel;
-    HelpButton          maBtnHelp;
 
     String              ms1BitTreshold;
     String              ms1BitDithered;
@@ -112,7 +109,6 @@ private:
     String              ms8BitColorPalette;
     String              ms24BitColor;
 
-    vcl::RowOrColumn    maLayout;
     Size                maDialogSize;
 
     FilterConfigItem*   mpOptionsItem;
@@ -123,11 +119,6 @@ private:
     sal_Int16           mnFormat;
     sal_Int32           mnMaxFilesizeForRealtimePreview;
 
-    Rectangle           maRectFlButtons;
-    Rectangle           maRectBtnHelp;
-    Rectangle           maRectBtnOK;
-    Rectangle           maRectBtnCancel;
-
     SvStream*           mpTempStream;
     Bitmap              maBitmap;
 
@@ -163,13 +154,9 @@ private:
 
                         DECL_LINK( OK, void* p );
 
-                        void createSizeControls( vcl::RowOrColumn& );
-                        void createColorDepthControls( vcl::RowOrColumn& );
-                        void createFilterOptions( vcl::RowOrColumn& );
-                        void createButtons( vcl::RowOrColumn& );
-                        void createScrollBar( vcl::RowOrColumn& );
-                        void setupLayout();
-                        void updatePreview();
+                        void setupSizeControls();
+                        void createFilterOptions();
+                        void setupControls();
                         void updateControls();
 
                         void GetGraphicSource();

svtools/source/misc/svtools.src

+/* -*- 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/.
+ */
+
+#include "svtools/svtools.hrc"
+
+String STR_1BIT_THRESHOLD
+{
+    Text [ en-US ] = "1 bit threshold";
+};
+String STR_1BIT_DITHERED
+{
+    Text [ en-US ] = "1 bit dithered";
+};
+String STR_4BIT_GRAYSCALE
+{
+    Text [ en-US ] = "4 bit grayscale";
+};
+String STR_4BIT_COLOR_PALETTE
+{
+    Text [ en-US ] = "4 bit color";
+};
+String STR_8BIT_GRAYSCALE
+{
+    Text [ en-US ] = "8 bit grayscale";
+};
+String STR_8BIT_COLOR_PALETTE
+{
+    Text [ en-US ] = "8 bit color";
+};
+String STR_24BIT_TRUE_COLOR
+{
+    Text [ en-US ] = "24 bit true color";
+};
+String STR_ESTIMATED_SIZE_PIX_1
+{
+    Text [ en-US ] = "The picture needs about %1 KB of memory.";
+};
+String STR_ESTIMATED_SIZE_PIX_2
+{
+    Text [ en-US ] = "The picture needs about %1 KB of memory, the file size is %2 KB.";
+};
+String STR_ESTIMATED_SIZE_VEC
+{
+    Text [ en-US ] = "The file size is %1 KB.";
+};
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */