[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sd/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Aug 2 00:08:59 UTC 2018


 sd/source/ui/dlg/dlgsnap.src |  113 ++++++++++++++-----------------------------
 1 file changed, 39 insertions(+), 74 deletions(-)

New commits:
commit 7223961287c78f848bc3f702a3c1b6340365e098
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Wed Aug 1 23:34:07 2018 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Wed Aug 1 23:34:07 2018 +0000

    Cleaned up resource file for snap dialog.
    
    Removed entries for MASKCOLOR.

diff --git a/sd/source/ui/dlg/dlgsnap.src b/sd/source/ui/dlg/dlgsnap.src
index c0f4e7676c16..e92a09c64292 100644
--- a/sd/source/ui/dlg/dlgsnap.src
+++ b/sd/source/ui/dlg/dlgsnap.src
@@ -31,55 +31,54 @@ ModalDialog DLG_SNAPLINE
     HelpID = CMD_SID_CAPTUREPOINT ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 140 , 125 ) ;
+    Size = MAP_APPFONT ( 140, 125 ) ;
     Text [ en-US ] = "New Snap Object" ;
     Moveable = TRUE ;
     OKButton BTN_OK
     {
-        Pos = MAP_APPFONT ( 88 , 6  ) ;
-        Size = MAP_APPFONT ( 46 , 14 ) ;
+        Pos = MAP_APPFONT ( 88, 6 ) ;
+        Size = MAP_APPFONT ( 46, 14 ) ;
         TabStop = TRUE ;
         DefButton = TRUE ;
     };
     CancelButton BTN_CANCEL
     {
-        Pos = MAP_APPFONT ( 88 , 23  ) ;
-        Size = MAP_APPFONT ( 46 , 14 ) ;
+        Pos = MAP_APPFONT ( 88, 23 ) ;
+        Size = MAP_APPFONT ( 46, 14 ) ;
         TabStop = TRUE ;
     };
     HelpButton BTN_HELP
     {
-        Pos = MAP_APPFONT ( 88 , 43  ) ;
-        Size = MAP_APPFONT ( 46 , 14 ) ;
+        Pos = MAP_APPFONT ( 88, 43 ) ;
+        Size = MAP_APPFONT ( 46, 14 ) ;
         TabStop = TRUE ;
     };
     PushButton BTN_DELETE
     {
-        HelpID = "sd:PushButton:DLG_SNAPLINE:BTN_DELETE";
-        Pos = MAP_APPFONT ( 88 , 63  ) ;
-        Size = MAP_APPFONT ( 46 , 14 ) ;
-        /* ### ACHTUNG: Neuer Text in Resource? ~Löschen : ~L÷schen */
+        HelpID = "sd:PushButton:DLG_SNAPLINE:BTN_DELETE" ;
+        Pos = MAP_APPFONT ( 88, 63 ) ;
+        Size = MAP_APPFONT ( 46, 14 ) ;
         Text [ en-US ] = "~Delete" ;
         TabStop = TRUE ;
     };
     FixedLine FL_POSITION
     {
-        Pos = MAP_APPFONT ( 6 , 3  ) ;
-        Size = MAP_APPFONT ( 76 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 3 ) ;
+        Size = MAP_APPFONT ( 76, 8 ) ;
         Text [ en-US ] = "Position" ;
     };
     FixedText FT_X
     {
-        Pos = MAP_APPFONT ( 12 , 16  ) ;
-        Size = MAP_APPFONT ( 7 , 10 ) ;
+        Pos = MAP_APPFONT ( 12, 16 ) ;
+        Size = MAP_APPFONT ( 7, 10 ) ;
         Text = "~X" ;
     };
     MetricField MTR_FLD_X
     {
-        HelpID = "sd:MetricField:DLG_SNAPLINE:MTR_FLD_X";
+        HelpID = "sd:MetricField:DLG_SNAPLINE:MTR_FLD_X" ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 22 , 14  ) ;
-        Size = MAP_APPFONT ( 54 , 12 ) ;
+        Pos = MAP_APPFONT ( 22, 14 ) ;
+        Size = MAP_APPFONT ( 54, 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
@@ -94,16 +93,16 @@ ModalDialog DLG_SNAPLINE
     };
     FixedText FT_Y
     {
-        Pos = MAP_APPFONT ( 12 , 32 ) ;
-        Size = MAP_APPFONT ( 7 , 10 ) ;
+        Pos = MAP_APPFONT ( 12, 32 ) ;
+        Size = MAP_APPFONT ( 7, 10 ) ;
         Text = "~Y" ;
     };
     MetricField MTR_FLD_Y
     {
-        HelpID = "sd:MetricField:DLG_SNAPLINE:MTR_FLD_Y";
+        HelpID = "sd:MetricField:DLG_SNAPLINE:MTR_FLD_Y" ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 22 , 30  ) ;
-        Size = MAP_APPFONT ( 54 , 12 ) ;
+        Pos = MAP_APPFONT ( 22, 30 ) ;
+        Size = MAP_APPFONT ( 54, 12 ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
@@ -118,93 +117,59 @@ ModalDialog DLG_SNAPLINE
     };
     FixedLine FL_DIRECTION
     {
-        Pos = MAP_APPFONT ( 6 , 50  ) ;
-        Size = MAP_APPFONT ( 76 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 50 ) ;
+        Size = MAP_APPFONT ( 76, 8 ) ;
         Text [ en-US ] = "Type" ;
     };
     ImageRadioButton RB_POINT
     {
-        HelpID = "sd:ImageRadioButton:DLG_SNAPLINE:RB_POINT";
-        Pos = MAP_APPFONT ( 12 , 61  ) ;
-        Size = MAP_APPFONT ( 64 , 16 ) ;
+        HelpID = "sd:ImageRadioButton:DLG_SNAPLINE:RB_POINT" ;
+        Pos = MAP_APPFONT ( 12, 61 ) ;
+        Size = MAP_APPFONT ( 64, 16 ) ;
         Text [ en-US ] = "~Point" ;
         TabStop = TRUE ;
         RadioButtonImage = Image
         {
-            MaskColor = IMAGE_MASK_STDCOLOR;
-            ImageBitmap = Bitmap { File = "hlppoint.bmp" ; };
+            ImageBitmap = Bitmap { File = "hlppoint.png" ; };
         };
     };
     ImageRadioButton RB_VERTICAL
     {
-        HelpID = "sd:ImageRadioButton:DLG_SNAPLINE:RB_VERTICAL";
-        Pos = MAP_APPFONT ( 12 , 81  ) ;
-        Size = MAP_APPFONT ( 64 , 16 ) ;
+        HelpID = "sd:ImageRadioButton:DLG_SNAPLINE:RB_VERTICAL" ;
+        Pos = MAP_APPFONT ( 12, 81 ) ;
+        Size = MAP_APPFONT ( 64, 16 ) ;
         Text [ en-US ] = "~Vertical" ;
         TabStop = TRUE ;
         RadioButtonImage = Image
         {
-            MaskColor = IMAGE_MASK_STDCOLOR;
-            ImageBitmap = Bitmap { File = "hlplvert.bmp" ; };
+            ImageBitmap = Bitmap { File = "hlplvert.png" ; };
         };
     };
     ImageRadioButton RB_HORIZONTAL
     {
-        HelpID = "sd:ImageRadioButton:DLG_SNAPLINE:RB_HORIZONTAL";
-        Pos = MAP_APPFONT ( 12 , 101  ) ;
-        Size = MAP_APPFONT ( 65 , 16 ) ;
+        HelpID = "sd:ImageRadioButton:DLG_SNAPLINE:RB_HORIZONTAL" ;
+        Pos = MAP_APPFONT ( 12, 101 ) ;
+        Size = MAP_APPFONT ( 65, 16 ) ;
         Text [ en-US ] = "Hori~zontal" ;
         TabStop = TRUE ;
         RadioButtonImage = Image
         {
-            MaskColor = IMAGE_MASK_STDCOLOR;
-            ImageBitmap = Bitmap { File = "hlplhorz.bmp" ; };
+            ImageBitmap = Bitmap { File = "hlplhorz.png" ; };
         };
     };
 
     Image BMP_POINT_H
     {
-        MaskColor = IMAGE_MASK_STDCOLOR_HC;
-        ImageBitmap = Bitmap { File = "hlppoint_h.bmp" ; };
+        ImageBitmap = Bitmap { File = "hlppoint_h.png" ; };
     };
 
     Image BMP_VERTICAL_H
     {
-        MaskColor = IMAGE_MASK_STDCOLOR_HC;
-        ImageBitmap = Bitmap { File = "hlplvert_h.bmp" ; };
+        ImageBitmap = Bitmap { File = "hlplvert_h.png" ; };
     };
 
     Image BMP_HORIZONTAL_H
     {
-        MaskColor = IMAGE_MASK_STDCOLOR_HC;
-        ImageBitmap = Bitmap { File = "hlplhorz_h.bmp" ; };
+        ImageBitmap = Bitmap { File = "hlplhorz_h.png" ; };
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-


More information about the Libreoffice-commits mailing list