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

Matthias Seidel mseidel at apache.org
Tue Jun 26 08:11:00 UTC 2018


 default_images/sd/res/pubdes.png                |binary
 default_images/sd/res/pubdes2.png               |binary
 default_images/sd/res/pubdes3.png               |binary
 default_images/sd/res/pubdes4.png               |binary
 default_images/sd/res/pubdlg1.png               |binary
 default_images/sd/res/pubdlg2.png               |binary
 default_images/sd/res/pubdlg3.png               |binary
 default_images/sd/res/pubdlg4.png               |binary
 default_images/sd/res/pubdlg5.png               |binary
 ooo_custom_images/classic/classic_images.tar.gz |binary
 sd/source/ui/dlg/dlgass.src                     |  269 ++++++++++--------------
 11 files changed, 118 insertions(+), 151 deletions(-)

New commits:
commit bac3d319aeeaaf6faaec6dc6fb1152d26da49c78
Author: Matthias Seidel <mseidel at apache.org>
Date:   Tue Jun 26 07:32:37 2018 +0000

    Cleaned up dialog for Presentation Wizard

diff --git a/sd/source/ui/dlg/dlgass.src b/sd/source/ui/dlg/dlgass.src
index d479173ec00f..d835237bf062 100644
--- a/sd/source/ui/dlg/dlgass.src
+++ b/sd/source/ui/dlg/dlgass.src
@@ -27,7 +27,7 @@ ModalDialog DLG_ASS
 {
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 272 , 190 ) ;
+    Size = MAP_APPFONT ( 272, 190 ) ;
     Text[ en-US ] = "Presentation Wizard";
 
     HelpId = HID_SD_AUTOPILOT_PAGE1 ;
@@ -37,16 +37,16 @@ ModalDialog DLG_ASS
     Control CT_PREVIEW
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 144 , 40  ) ;
-        Size = MAP_APPFONT ( 122 , 96 ) ;
+        Pos = MAP_APPFONT ( 144, 40 ) ;
+        Size = MAP_APPFONT ( 122, 96 ) ;
         SVLook = FALSE ;
     };
 
     CheckBox CB_PREVIEW
     {
         HelpID = "sd:CheckBox:DLG_ASS:CB_PREVIEW";
-        Pos = MAP_APPFONT ( 144 , 140  );
-        Size = MAP_APPFONT ( 122 , 10 );
+        Pos = MAP_APPFONT ( 144, 140 );
+        Size = MAP_APPFONT ( 122, 10 );
         TabStop = TRUE;
         Text [ en-US ] = "Previe~w";
     };
@@ -54,37 +54,35 @@ ModalDialog DLG_ASS
     CheckBox CB_STARTWITH
     {
         HelpID = "sd:CheckBox:DLG_ASS:CB_STARTWITH";
-        Pos = MAP_APPFONT ( 144 , 154  );
-        Size = MAP_APPFONT ( 122 , 10 );
+        Pos = MAP_APPFONT ( 144, 154 );
+        Size = MAP_APPFONT ( 122, 10 );
         TabStop = TRUE;
         Text [ en-US ] = "~Do not show this wizard again" ;
     };
 
-    // Seite 1
-
+    // Page 1
     FixedBitmap FB_PAGE1
     {
         OutputSize = TRUE ;
         Scale = TRUE;
-        Border = TRUE;
-        Pos = MAP_APPFONT ( 6 , 4  ) ;
-        Size = MAP_APPFONT ( 258 , 29 ) ;
-        Fixed = Bitmap { File = "dlgass1.bmp" ; };
+        Pos = MAP_APPFONT ( 6, 5 ) ;
+        Size = MAP_APPFONT ( 260, 29 ) ;
+        Fixed = Bitmap { File = "dlgass1.png" ; };
     };
 
     FixedLine FL_PAGE1_ARTGROUP
     {
         OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 6 , 37  );
-        Size =MAP_APPFONT ( 132 , 8 );
+        Pos = MAP_APPFONT ( 6, 37 );
+        Size =MAP_APPFONT ( 132, 8 );
         Text [ en-US ] = "Type";
     };
 
     RadioButton RB_PAGE1_EMPTY
     {
         HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_EMPTY";
-        Pos = MAP_APPFONT ( 12 , 48  );
-        Size = MAP_APPFONT ( 130 , 10 );
+        Pos = MAP_APPFONT ( 12, 48 );
+        Size = MAP_APPFONT ( 130, 10 );
         TabStop = TRUE;
         Text [ en-US ] = "~Empty presentation";
     };
@@ -92,16 +90,16 @@ ModalDialog DLG_ASS
     RadioButton RB_PAGE1_TEMPLATE
     {
         HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_TEMPLATE";
-        Pos = MAP_APPFONT ( 12 , 62  );
-        Size = MAP_APPFONT ( 130 , 10 );
+        Pos = MAP_APPFONT ( 12, 62 );
+        Size = MAP_APPFONT ( 130, 10 );
         Text [ en-US ] = "~From template";
     };
 
     RadioButton RB_PAGE1_OPEN
     {
         HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_OPEN";
-        Pos = MAP_APPFONT ( 12 , 76  );
-        Size = MAP_APPFONT ( 130 , 10 );
+        Pos = MAP_APPFONT ( 12, 76 );
+        Size = MAP_APPFONT ( 130, 10 );
         Text [ en-US ] = "O~pen existing presentation";
     };
 
@@ -109,15 +107,15 @@ ModalDialog DLG_ASS
     {
         HelpID = "sd:PushButton:DLG_ASS:PB_PAGE1_OPEN";
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 18 , 89 ) ;
-        Size = MAP_APPFONT ( 50 , 18 ) ;
+        Pos = MAP_APPFONT ( 18, 89 ) ;
+        Size = MAP_APPFONT ( 50, 18 ) ;
         TabStop = TRUE ;
     };
 
     ListBox LB_PAGE1_REGION
     {
-        Pos = MAP_APPFONT ( 12 , 90  );
-        Size = MAP_APPFONT ( 120 , 12 );
+        Pos = MAP_APPFONT ( 12, 90 );
+        Size = MAP_APPFONT ( 120, 12 );
         TabStop = TRUE ;
         Border = TRUE ;
         DropDown = TRUE ;
@@ -127,44 +125,43 @@ ModalDialog DLG_ASS
     ListBox LB_PAGE1_TEMPLATES
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 106  ) ;
-        Size = MAP_APPFONT ( 120 , 59 ) ;
+        Pos = MAP_APPFONT ( 12, 106 ) ;
+        Size = MAP_APPFONT ( 120, 59 ) ;
         HelpId = HID_SD_AUTOPILOT_TEMPLATES ;
     };
 
     ListBox LB_PAGE1_OPEN
     {
-        Pos = MAP_APPFONT ( 18 , 110  );
-        Size = MAP_APPFONT ( 120 , 55 );
+        Pos = MAP_APPFONT ( 18, 110 );
+        Size = MAP_APPFONT ( 120, 55 );
         TabStop = TRUE;
         Border = TRUE;
         HelpId = HID_SD_AUTOPILOT_OPEN ;
         AutoHScroll = TRUE;
     };
 
-    // Seite 2
+    // Page 2
     FixedBitmap FB_PAGE2
     {
         OutputSize = TRUE ;
         Scale = TRUE;
-        Border = TRUE;
-        Pos = MAP_APPFONT ( 6 , 4  ) ;
-        Size = MAP_APPFONT ( 258 , 29 ) ;
-        Fixed = Bitmap { File = "dlgass2.bmp" ; };
+        Pos = MAP_APPFONT ( 6, 5 ) ;
+        Size = MAP_APPFONT ( 260, 29 ) ;
+        Fixed = Bitmap { File = "dlgass2.png" ; };
     };
 
     FixedLine FL_PAGE2_LAYOUT
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 37  ) ;
-        Size = MAP_APPFONT ( 132 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 37 ) ;
+        Size = MAP_APPFONT ( 132, 8 ) ;
         Text [ en-US ] = "~Select a slide design" ;
     };
 
     ListBox LB_PAGE2_REGION
     {
-        Pos = MAP_APPFONT ( 12 , 48  );
-        Size = MAP_APPFONT ( 120 , 12 );
+        Pos = MAP_APPFONT ( 12, 48 );
+        Size = MAP_APPFONT ( 120, 12 );
         TabStop = TRUE ;
         Border = TRUE ;
         DropDown = TRUE ;
@@ -175,15 +172,15 @@ ModalDialog DLG_ASS
     {
         HelpID = "sd:ListBox:DLG_ASS:LB_PAGE2_LAYOUT";
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 64  ) ;
-        Size = MAP_APPFONT ( 120 , 40 ) ;
+        Pos = MAP_APPFONT ( 12, 64 ) ;
+        Size = MAP_APPFONT ( 120, 40 ) ;
     };
 
     FixedLine FL_PAGE2_OUTPUTTYPES
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 110  ) ;
-        Size = MAP_APPFONT ( 132 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 110 ) ;
+        Size = MAP_APPFONT ( 132, 8 ) ;
         Text [ en-US ] = "Select an output medium" ;
     };
 
@@ -191,8 +188,8 @@ ModalDialog DLG_ASS
     {
         HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM5";
         OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 12 , 121  );
-        Size = MAP_APPFONT ( 59 , 10 );
+        Pos = MAP_APPFONT ( 12, 121 );
+        Size = MAP_APPFONT ( 59, 10 );
         Text [ en-US ] = "~Original";
     };
 
@@ -200,8 +197,8 @@ ModalDialog DLG_ASS
     {
         HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM1";
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 75 , 121  ) ;
-        Size = MAP_APPFONT ( 59 , 10 ) ;
+        Pos = MAP_APPFONT ( 75, 121 ) ;
+        Size = MAP_APPFONT ( 59, 10 ) ;
         Text [ en-US ] = "Sc~reen";
     };
 
@@ -209,8 +206,8 @@ ModalDialog DLG_ASS
     {
         HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM2";
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 75 , 135  ) ;
-        Size = MAP_APPFONT ( 59 , 10 ) ;
+        Pos = MAP_APPFONT ( 75, 135 ) ;
+        Size = MAP_APPFONT ( 59, 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Sli~de" ;
     };
@@ -219,8 +216,8 @@ ModalDialog DLG_ASS
     {
         HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM3";
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 135  ) ;
-        Size = MAP_APPFONT ( 59 , 10 ) ;
+        Pos = MAP_APPFONT ( 12, 135 ) ;
+        Size = MAP_APPFONT ( 59, 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "O~verhead sheet" ;
     };
@@ -229,36 +226,35 @@ ModalDialog DLG_ASS
     {
         HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM4";
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 149  ) ;
-        Size = MAP_APPFONT ( 59 , 10 ) ;
+        Pos = MAP_APPFONT ( 12, 149 ) ;
+        Size = MAP_APPFONT ( 59, 10 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "P~aper" ;
     };
 
-    // Seite 3
+    // Page 3
     FixedBitmap FB_PAGE3
     {
         OutputSize = TRUE ;
         Scale = TRUE;
-        Border = TRUE;
-        Pos = MAP_APPFONT ( 6 , 4  ) ;
-        Size = MAP_APPFONT ( 258 , 29 ) ;
-        Fixed = Bitmap { File = "dlgass3.bmp" ; };
+        Pos = MAP_APPFONT ( 6, 5 ) ;
+        Size = MAP_APPFONT ( 260, 29 ) ;
+        Fixed = Bitmap { File = "dlgass3.png" ; };
     };
 
     FixedLine FL_PAGE3_EFFECT
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 37  );
-        Size = MAP_APPFONT ( 132 , 8 );
+        Pos = MAP_APPFONT ( 6, 37 );
+        Size = MAP_APPFONT ( 132, 8 );
         Text [ en-US ] = "Select a slide transition";
     };
 
     FixedText FT_PAGE3_EFFECT
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 49  );
-        Size = MAP_APPFONT ( 60 , 10 );
+        Pos = MAP_APPFONT ( 12, 49 );
+        Size = MAP_APPFONT ( 60, 10 );
         Text [ en-US ] = "~Effect";
     };
 
@@ -266,8 +262,8 @@ ModalDialog DLG_ASS
     {
         HelpID = "sd:ListBox:DLG_ASS:LB_PAGE3_EFFECT";
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 48  );
-        Size = MAP_APPFONT ( 60 , 12 );
+        Pos = MAP_APPFONT ( 72, 48 );
+        Size = MAP_APPFONT ( 60, 12 );
         TabStop = TRUE;
         Border = TRUE;
         DropDown = TRUE;
@@ -276,8 +272,8 @@ ModalDialog DLG_ASS
     FixedText FT_PAGE3_SPEED
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 65  );
-        Size = MAP_APPFONT ( 60 , 10 );
+        Pos = MAP_APPFONT ( 12, 65 );
+        Size = MAP_APPFONT ( 60, 10 );
         Text [ en-US ] = "~Speed";
     };
 
@@ -285,8 +281,8 @@ ModalDialog DLG_ASS
     {
         HelpID = "sd:ListBox:DLG_ASS:LB_PAGE3_SPEED";
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 64  );
-        Size = MAP_APPFONT ( 60 , 12 );
+        Pos = MAP_APPFONT ( 72, 64 );
+        Size = MAP_APPFONT ( 60, 12 );
         TabStop = TRUE;
         Border = TRUE;
         DropDown = TRUE;
@@ -295,8 +291,8 @@ ModalDialog DLG_ASS
     FixedLine FL_PAGE3_PRESTYPE
     {
         OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 6 , 83  );
-        Size = MAP_APPFONT ( 132 , 8 );
+        Pos = MAP_APPFONT ( 6, 83 );
+        Size = MAP_APPFONT ( 132, 8 );
         Text [ en-US ] = "Select the presentation type";
     };
 
@@ -304,8 +300,8 @@ ModalDialog DLG_ASS
     {
         HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE3_LIVE";
         OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 12 , 94  );
-        Size = MAP_APPFONT ( 120 , 10 );
+        Pos = MAP_APPFONT ( 12, 94 );
+        Size = MAP_APPFONT ( 120, 10 );
         Text [ en-US ] = "~Default";
     };
 
@@ -313,16 +309,16 @@ ModalDialog DLG_ASS
     {
         HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE3_KIOSK";
         OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 12 , 108  );
-        Size = MAP_APPFONT ( 120 , 10 );
+        Pos = MAP_APPFONT ( 12, 108 );
+        Size = MAP_APPFONT ( 120, 10 );
         Text [ en-US ] = "~Automatic";
     };
 
     FixedText FT_PAGE3_TIME
     {
         OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 21 , 123  );
-        Size = MAP_APPFONT ( 55 , 10 );
+        Pos = MAP_APPFONT ( 21, 123 );
+        Size = MAP_APPFONT ( 55, 10 );
         Text [ en-US ] = "D~uration of page";
     };
 
@@ -330,8 +326,8 @@ ModalDialog DLG_ASS
     {
         HelpID = "sd:TimeField:DLG_ASS:TMF_PAGE3_TIME";
         OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 77 , 122  ) ;
-        Size = MAP_APPFONT ( 55 , 12 ) ;
+        Pos = MAP_APPFONT ( 77, 122 ) ;
+        Size = MAP_APPFONT ( 55, 12 ) ;
         Border = TRUE ;
         TabStop = TRUE ;
         Repeat = TRUE ;
@@ -355,8 +351,8 @@ ModalDialog DLG_ASS
     FixedText FT_PAGE3_BREAK
     {
         OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 21 , 139  );
-        Size = MAP_APPFONT ( 55 , 10 );
+        Pos = MAP_APPFONT ( 21, 139 );
+        Size = MAP_APPFONT ( 55, 10 );
         Text [ en-US ] = "Du~ration of pause";
     };
 
@@ -364,8 +360,8 @@ ModalDialog DLG_ASS
     {
         HelpID = "sd:TimeField:DLG_ASS:TMF_PAGE3_BREAK";
         OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 77 , 138  ) ;
-        Size = MAP_APPFONT ( 55 , 12 ) ;
+        Pos = MAP_APPFONT ( 77, 138 ) ;
+        Size = MAP_APPFONT ( 55, 12 ) ;
         Border = TRUE ;
         TabStop = TRUE ;
         Repeat = TRUE ;
@@ -390,36 +386,35 @@ ModalDialog DLG_ASS
     {
         HelpID = "sd:CheckBox:DLG_ASS:CB_PAGE3_LOGO";
         OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 21 , 154  );
-        Size = MAP_APPFONT ( 111 , 10 );
+        Pos = MAP_APPFONT ( 21, 154 );
+        Size = MAP_APPFONT ( 111, 10 );
         TabStop = TRUE;
         Text [ en-US ] = "Sh~ow logo";
     };
 
-    // Seite 4
+    // Page 4
     FixedBitmap FB_PAGE4
     {
         OutputSize = TRUE ;
         Scale = TRUE;
-        Border = TRUE;
-        Pos = MAP_APPFONT ( 6 , 4  ) ;
-        Size = MAP_APPFONT ( 258 , 29 ) ;
-        Fixed = Bitmap { File = "dlgass4.bmp" ; };
+        Pos = MAP_APPFONT ( 6, 5 ) ;
+        Size = MAP_APPFONT ( 260, 29 ) ;
+        Fixed = Bitmap { File = "dlgass4.png" ; };
     };
 
     FixedLine FL_PAGE4_PERSONAL
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 37  );
-        Size = MAP_APPFONT ( 260 , 8 );
+        Pos = MAP_APPFONT ( 6, 37 );
+        Size = MAP_APPFONT ( 260, 8 );
         Text [ en-US ] = "Describe your basic ideas" ;
     };
 
     FixedText FT_PAGE4_ASKNAME
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 48 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
+        Pos = MAP_APPFONT ( 12, 48 ) ;
+        Size = MAP_APPFONT ( 248, 8 ) ;
         Text [ en-US ] = "What is your name or the name of your company?" ;
 
     };
@@ -428,15 +423,15 @@ ModalDialog DLG_ASS
         HelpID = "sd:Edit:DLG_ASS:EDT_PAGE4_ASKNAME";
         OutputSize = TRUE ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 59 ) ;
-        Size = MAP_APPFONT ( 248 , 12 ) ;
+        Pos = MAP_APPFONT ( 12, 59 ) ;
+        Size = MAP_APPFONT ( 248, 12 ) ;
         TabStop = TRUE ;
     };
     FixedText FT_PAGE4_ASKTOPIC
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 77 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
+        Pos = MAP_APPFONT ( 12, 77 ) ;
+        Size = MAP_APPFONT ( 248, 8 ) ;
         Text [ en-US ] = "What is the subject of your presentation?" ;
     };
     Edit EDT_PAGE4_ASKTOPIC
@@ -444,15 +439,15 @@ ModalDialog DLG_ASS
         HelpID = "sd:Edit:DLG_ASS:EDT_PAGE4_ASKTOPIC";
         OutputSize = TRUE ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 88 ) ;
-        Size = MAP_APPFONT ( 248 , 12 ) ;
+        Pos = MAP_APPFONT ( 12, 88 ) ;
+        Size = MAP_APPFONT ( 248, 12 ) ;
         TabStop = TRUE ;
     };
     FixedText FT_PAGE4_ASKINFORMATION
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 106 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
+        Pos = MAP_APPFONT ( 12, 106 ) ;
+        Size = MAP_APPFONT ( 248, 8 ) ;
         Text [ en-US ] = "Further ideas to be presented?" ;
     };
     MultiLineEdit EDT_PAGE4_ASKINFORMATION
@@ -460,37 +455,36 @@ ModalDialog DLG_ASS
         HelpID = "sd:MultiLineEdit:DLG_ASS:EDT_PAGE4_ASKINFORMATION";
         OutputSize = TRUE ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 117  ) ;
-        Size = MAP_APPFONT ( 248 , 47 ) ;
+        Pos = MAP_APPFONT ( 12, 117 ) ;
+        Size = MAP_APPFONT ( 248, 47 ) ;
         TabStop = TRUE ;
         IgnoreTab = TRUE ;
         VSCROLL = TRUE ;
     };
 
-    // Seite 5
+    // Page 5
     FixedBitmap FB_PAGE5
     {
         OutputSize = TRUE ;
         Scale = TRUE;
-        Border = TRUE;
-        Pos = MAP_APPFONT ( 6 , 4  ) ;
-        Size = MAP_APPFONT ( 258 , 29 ) ;
-        Fixed = Bitmap { File = "dlgass5.bmp" ; };
+        Pos = MAP_APPFONT ( 6, 5 ) ;
+        Size = MAP_APPFONT ( 260, 29 ) ;
+        Fixed = Bitmap { File = "dlgass5.png" ; };
     };
 
     FixedText FT_PAGE5_PAGELIST
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 39 );
-        Size = MAP_APPFONT ( 132 , 8 );
+        Pos = MAP_APPFONT ( 6, 39 );
+        Size = MAP_APPFONT ( 132, 8 );
         Text [ en-US ] = "Ch~oose your pages";
     };
 
     Control CT_PAGE5_PAGELIST
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 50 );
-        Size = MAP_APPFONT ( 132 , 100 );
+        Pos = MAP_APPFONT ( 6, 50 );
+        Size = MAP_APPFONT ( 132, 100 );
         Border = TRUE;
         TabStop = TRUE ;
     };
@@ -499,26 +493,26 @@ ModalDialog DLG_ASS
     {
         HelpID = "sd:CheckBox:DLG_ASS:CB_PAGE5_SUMMARY";
         OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 6 , 154  );
-        Size = MAP_APPFONT ( 132 , 10 );
+        Pos = MAP_APPFONT ( 6, 154 );
+        Size = MAP_APPFONT ( 132, 10 );
         TabStop = TRUE ;
         Text [ en-US ] = "C~reate summary";
     };
 
-    // generell
+    // General
     HelpButton BUT_HELP
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 170 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 6, 170 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE ;
     };
 
     CancelButton BUT_CANCEL
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 59 , 170 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 59, 170 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE ;
     };
 
@@ -526,8 +520,8 @@ ModalDialog DLG_ASS
     {
         HelpID = "sd:PushButton:DLG_ASS:BUT_LAST";
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 112 , 170 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 112, 170 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "<< ~Back" ;
     };
@@ -537,8 +531,8 @@ ModalDialog DLG_ASS
         HelpID = "sd:PushButton:DLG_ASS:BUT_NEXT";
         DefButton = TRUE ;
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 165 , 170 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 165, 170 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "~Next >>" ;
     };
@@ -546,8 +540,8 @@ ModalDialog DLG_ASS
     OKButton BUT_FINISH
     {
         OutputSize = TRUE ;
-        Pos = MAP_APPFONT ( 218 , 170 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 218, 170 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "~Create" ;
     };
@@ -562,30 +556,3 @@ ModalDialog DLG_ASS
         Text [ en-US ] = "~Create" ;
     };
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
commit 8951dc9589c2c278c846c2161d8168bf9fa5ebc6
Author: Matthias Seidel <mseidel at apache.org>
Date:   Tue Jun 26 06:53:05 2018 +0000

    Switched graphics from indexed colors to RGB for better scaling

diff --git a/default_images/sd/res/pubdes.png b/default_images/sd/res/pubdes.png
index 1e44a1efed2d..4b3e63257ebe 100644
Binary files a/default_images/sd/res/pubdes.png and b/default_images/sd/res/pubdes.png differ
diff --git a/default_images/sd/res/pubdes2.png b/default_images/sd/res/pubdes2.png
index 3f03ba512cc2..dc53fc0d1da4 100644
Binary files a/default_images/sd/res/pubdes2.png and b/default_images/sd/res/pubdes2.png differ
diff --git a/default_images/sd/res/pubdes3.png b/default_images/sd/res/pubdes3.png
index 551abe77a0df..6f0a03983fe9 100644
Binary files a/default_images/sd/res/pubdes3.png and b/default_images/sd/res/pubdes3.png differ
diff --git a/default_images/sd/res/pubdes4.png b/default_images/sd/res/pubdes4.png
index 37a69110439f..e71bc9c77d81 100644
Binary files a/default_images/sd/res/pubdes4.png and b/default_images/sd/res/pubdes4.png differ
diff --git a/default_images/sd/res/pubdlg1.png b/default_images/sd/res/pubdlg1.png
index 9300db21a6d1..5a2b6680c9b1 100644
Binary files a/default_images/sd/res/pubdlg1.png and b/default_images/sd/res/pubdlg1.png differ
diff --git a/default_images/sd/res/pubdlg2.png b/default_images/sd/res/pubdlg2.png
index 3d5544ad8500..f2361508b363 100644
Binary files a/default_images/sd/res/pubdlg2.png and b/default_images/sd/res/pubdlg2.png differ
diff --git a/default_images/sd/res/pubdlg3.png b/default_images/sd/res/pubdlg3.png
index 8d560fef39bb..2c5cf9a2e752 100644
Binary files a/default_images/sd/res/pubdlg3.png and b/default_images/sd/res/pubdlg3.png differ
diff --git a/default_images/sd/res/pubdlg4.png b/default_images/sd/res/pubdlg4.png
index 566a44ab176c..e2cadd065878 100644
Binary files a/default_images/sd/res/pubdlg4.png and b/default_images/sd/res/pubdlg4.png differ
diff --git a/default_images/sd/res/pubdlg5.png b/default_images/sd/res/pubdlg5.png
index c43729ff2f15..0fc195f8eea2 100644
Binary files a/default_images/sd/res/pubdlg5.png and b/default_images/sd/res/pubdlg5.png differ
diff --git a/ooo_custom_images/classic/classic_images.tar.gz b/ooo_custom_images/classic/classic_images.tar.gz
index a50626787e97..c9b12bed1f53 100644
Binary files a/ooo_custom_images/classic/classic_images.tar.gz and b/ooo_custom_images/classic/classic_images.tar.gz differ


More information about the Libreoffice-commits mailing list