GUI improvements for CompressGraphicDialog.

In CompressGraphicDialog it is possible to set the target image width
and height besides resolution. Better lossless / JPEG compression
selection. Added Compression / Quality settings.

Change-Id: Ic8a6bfbe9dfbcd4acdfda4c0a856c3ea813a2702

1 files changed, 148 insertions, 41 deletions

diff --git a/svx/source/dialog/compressgraphicdialog.src b/svx/source/dialog/compressgraphicdialog.src
index a336fd1906fe..3ec2e645e741 100644
--- a/svx/source/dialog/compressgraphicdialog.src
+++ b/svx/source/dialog/compressgraphicdialog.src
@@ -25,102 +25,209 @@ ModalDialog RID_SVXDLG_COMPRESSGRAPHICS
     HelpID = "svx:ModalDialog:RID_SVXDLG_COMPRESSGRAPHICS";
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 226 , 200 ) ;
+    Size = MAP_APPFONT ( 242 , 200 ) ;
     Moveable = TRUE ;
     Sizeable = TRUE ;
     Closeable = TRUE ;
     Hide = TRUE ;
     Text [ en-US ] = "Compress Graphics" ;
 
+    FixedLine FL_IMAGE_DETAILS
+    {
+        Pos = MAP_APPFONT ( 6 , 0 ) ;
+        Size = MAP_APPFONT ( 164 , 12 ) ;
+        Text[ en-US ] = "Image Details";
+    };
+
     FixedText FT_CG_2_X
     {
-        Pos = MAP_APPFONT ( 6 , 8 ) ;
+        Pos = MAP_APPFONT ( 6 , 12 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text [ en-US ] = "Original Size:" ;
     };
 
     FixedText FT_CG_2
     {
-        Pos = MAP_APPFONT ( 56 , 8 ) ;
+        Pos = MAP_APPFONT ( 56 , 12 ) ;
         Size = MAP_APPFONT ( 124 , 10 ) ;
     };
 
     FixedText FT_CG_3_X
     {
-        Pos = MAP_APPFONT ( 6 , 20 ) ;
+        Pos = MAP_APPFONT ( 6 , 24 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text [ en-US ] = "View Size:" ;
     };
 
     FixedText FT_CG_3
     {
-        Pos = MAP_APPFONT ( 56 , 20 ) ;
-        Size = MAP_APPFONT ( 124 , 10 ) ;
-    };
-
-    FixedText FT_CG_4_X
-    {
-        Pos = MAP_APPFONT ( 6 , 32 ) ;
-        Size = MAP_APPFONT ( 50 , 10 ) ;
-        Text [ en-US ] = "Compressed Size:" ;
-    };
-
-    FixedText FT_CG_4
-    {
-        Pos = MAP_APPFONT ( 56 , 32 ) ;
+        Pos = MAP_APPFONT ( 56 , 24 ) ;
         Size = MAP_APPFONT ( 124 , 10 ) ;
     };
 
     FixedText FT_CG_5_X
     {
-        Pos = MAP_APPFONT ( 6 , 44 ) ;
+        Pos = MAP_APPFONT ( 6 , 36 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text [ en-US ] = "Image Capacity:" ;
     };
 
     FixedText FT_CG_5
     {
-        Pos = MAP_APPFONT ( 56 , 44 ) ;
+        Pos = MAP_APPFONT ( 56 , 36 ) ;
         Size = MAP_APPFONT ( 124 , 10 ) ;
     };
 
     FixedText FT_CG_6_X
     {
-        Pos = MAP_APPFONT ( 6 , 56 ) ;
+        Pos = MAP_APPFONT ( 6 , 48 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text [ en-US ] = "New Capacity:" ;
     };
 
     FixedText FT_CG_6
     {
-        Pos = MAP_APPFONT ( 56 , 56 ) ;
+        Pos = MAP_APPFONT ( 56 , 48 ) ;
         Size = MAP_APPFONT ( 124 , 10 ) ;
     };
 
-    ComboBox LB_CG_RESOLUTION
+     FixedLine FL_SETTINGS
+    {
+        Pos = MAP_APPFONT ( 6 , 60 ) ;
+        Size = MAP_APPFONT ( 164 , 12 ) ;
+        Text[ en-US ] = "Settings";
+    };
+
+    CheckBox CB_REDUCE_IMAGE_RESOLUTION
+    {
+        Pos = MAP_APPFONT ( 6 , 72 ) ;
+        Size = MAP_APPFONT ( 118 , 10 ) ;
+        Text [ en-US ] = "Reduce Image Resolution";
+    };
+
+    FixedText FT_NEW_WIDTH
+    {
+        Pos = MAP_APPFONT ( 16 , 85 ) ;
+        Size = MAP_APPFONT ( 20 , 12 ) ;
+        Text [ en-US ] = "Width:" ;
+    };
+
+    MetricField MF_NEW_WIDTH
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 36, 84 ) ;
+        Size = MAP_APPFONT ( 30 , 12 ) ;
+        TabStop = TRUE ;
+        Repeat = TRUE ;
+        Spin = TRUE ;
+        Maximum = 9999 ;
+        Last = 9999 ;
+        SpinSize = 1 ;
+        Unit = FUNIT_CUSTOM ;
+    };
+
+    FixedText FT_NEW_HEIGHT
+    {
+        Pos = MAP_APPFONT ( 72 , 85 ) ;
+        Size = MAP_APPFONT ( 20 , 12 ) ;
+        Text [ en-US ] = "Height:" ;
+    };
+
+    MetricField MF_NEW_HEIGHT
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 98, 84 ) ;
+        Size = MAP_APPFONT ( 30 , 12 ) ;
+        TabStop = TRUE ;
+        Repeat = TRUE ;
+        Spin = TRUE ;
+        Maximum = 9999 ;
+        Last = 9999 ;
+        SpinSize = 1 ;
+        Unit = FUNIT_CUSTOM ;
+    };
+
+    FixedText FT_RESOLUTION
+    {
+        Pos = MAP_APPFONT ( 16 , 97 ) ;
+        Size = MAP_APPFONT ( 34 , 12 ) ;
+        Text [ en-US ] = "Resolution:" ;
+    };
+
+    ComboBox LB_RESOLUTION
     {
         HelpID = "sfx2:ListBox:TP_COMMONPRINTOPTIONS:LB_REDUCEBITMAPS_RESOLUTION";
         TabStop = TRUE;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 6, 68 ) ;
-        Size = MAP_APPFONT ( 60, 100 ) ;
+        Pos = MAP_APPFONT ( 50, 96 ) ;
+        Size = MAP_APPFONT ( 30, 50 ) ;
         DropDown = TRUE;
         StringList [ en-US ] =
         {
-            "75 DPI";
-            "96 DPI";
-            "150 DPI";
-            "200 DPI";
-            "300 DPI";
-            "600 DPI";
+            "75";
+            "96";
+            "150";
+            "200";
+            "300";
+            "600";
         };
     };
+    FixedText FT_DPI
+    {
+        Pos = MAP_APPFONT ( 81 , 97 ) ;
+        Size = MAP_APPFONT ( 20 , 12 ) ;
+        Text [ en-US ] = "DPI" ;
+    };
+
+    RadioButton RB_LOSSLESS_COMPRESSION
+    {
+        HelpID = "filter:RadioButton:RID_SVXDLG_COMPRESSGRAPHICS:RB_LOSSLESS_COMPRESSION";
+        Pos = MAP_APPFONT ( 6, 108 ) ;
+        Size = MAP_APPFONT ( 158 , 10 ) ;
+        Text[ en-US ] = "~Lossless compression";
+    };
+
+    FixedText FT_COMPRESSION
+    {
+        Pos = MAP_APPFONT ( 16 , 120 ) ;
+        Size = MAP_APPFONT ( 40 , 12 ) ;
+        Text [ en-US ] = "Compression:" ;
+    };
+
+    MetricField MF_COMPRESSION_FACTOR
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 56, 120 ) ;
+        Size = MAP_APPFONT ( 30 , 12 ) ;
+        TabStop = TRUE ;
+        Repeat = TRUE ;
+        Spin = TRUE ;
+        Maximum = 9 ;
+        Last = 9 ;
+        SpinSize = 1 ;
+        Unit = FUNIT_CUSTOM ;
+    };
+
+    RadioButton RB_JPEG_COMPRESSION
+    {
+        HelpID = "filter:RadioButton:RID_SVXDLG_COMPRESSGRAPHICS:RB_JPEG_COMPRESSION";
+        Pos = MAP_APPFONT ( 6, 132 ) ;
+        Size = MAP_APPFONT ( 158 , 10 ) ;
+        Text[ en-US ] = "~JPEG compression";
+    };
+
+    FixedText FT_QUALITY
+    {
+        Pos = MAP_APPFONT ( 16 , 144 ) ;
+        Size = MAP_APPFONT ( 40 , 12 ) ;
+        Text [ en-US ] = "Quality:" ;
+    };
 
-    MetricField MF_CG_QUALITY
+    MetricField MF_QUALITY_FACTOR
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 70, 68 ) ;
-        Size = MAP_APPFONT ( 29 , 12 ) ;
+        Pos = MAP_APPFONT ( 56, 144 ) ;
+        Size = MAP_APPFONT ( 30 , 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
@@ -130,35 +237,35 @@ ModalDialog RID_SVXDLG_COMPRESSGRAPHICS
         Unit = FUNIT_PERCENT ;
     };
 
-    CheckBox CB_CG_LOSSLESS
+    CheckBox CB_CROP
     {
-        Pos = MAP_APPFONT ( 6 , 80 ) ;
+        Pos = MAP_APPFONT ( 6 , 156 ) ;
         Size = MAP_APPFONT ( 118 , 10 ) ;
-        Text [ en-US ] = "Lossless";
+        Text [ en-US ] = "Crop";
     };
 
     OKButton BUTTON_CG_OK
     {
-        Pos = MAP_APPFONT ( 170 , 6 ) ;
+        Pos = MAP_APPFONT ( 186 , 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         DefButton = TRUE ;
     };
 
     CancelButton BUTTON_CG_CANCEL
     {
-        Pos = MAP_APPFONT ( 170 , 23 ) ;
+        Pos = MAP_APPFONT ( 186 , 23 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
     };
 
     HelpButton BUTTON_CG_HELP
     {
-        Pos = MAP_APPFONT ( 170 , 43 ) ;
+        Pos = MAP_APPFONT ( 186 , 43 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
     };
 
     PushButton BUTTON_CG_CALCULATE
     {
-        Pos = MAP_APPFONT ( 170 , 63 ) ;
+        Pos = MAP_APPFONT ( 186 , 63 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "Calculate";
     };