converted sd/source/ui/dlg/present.src to .ui

Change-Id: I92ab3ab57146524c1c70e6503261989df86dc22d
Reviewed-on: https://gerrit.libreoffice.org/2732Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

sd/AllLangResTarget_sd.mk

@@ -88,7 +88,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
     sd/source/ui/dlg/navigatr.src \
     sd/source/ui/dlg/PaneDockingWindow.src \
     sd/source/ui/dlg/paragr.src \
-    sd/source/ui/dlg/present.src \
     sd/source/ui/dlg/prltempl.src \
     sd/source/ui/dlg/prntopts.src \
     sd/source/ui/dlg/RemoteDialog.src \

sd/UI_simpress.mk

@@ -10,6 +10,7 @@
 $(eval $(call gb_UI_UI,modules/simpress))
 
 $(eval $(call gb_UI_add_uifiles,modules/simpress,\
+	sd/uiconfig/simpress/ui/presentationdialog \
 	sd/uiconfig/simpress/ui/printeroptions \
 ))
 

sd/source/ui/dlg/present.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/.
- *
- * 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 "helpids.h"
-#include <svx/svxids.hrc>
-#include "present.hrc"
-
-#define DISTANCE    23
-
-ModalDialog DLG_START_PRESENTATION
-{
-    HelpID = CMD_SID_PRESENTATION ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 256, 205 ) ;
-    Text [ en-US ] = "Slide Show" ;
-    Moveable = TRUE ;
-
-    OKButton BTN_OK
-    {
-        Pos = MAP_APPFONT ( 200, 6 ) ;
-        Size = MAP_APPFONT ( 50, 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 200, 23 ) ;
-        Size = MAP_APPFONT ( 50, 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 200, 43 ) ;
-        Size = MAP_APPFONT ( 50, 14 ) ;
-        TabStop = TRUE ;
-    };
-
-    FixedLine GRP_RANGE
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 187, 8 ) ;
-        Text [ en-US ] = "Range" ;
-    };
-    RadioButton RBT_ALL
-    {
-        HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_ALL";
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 80 , 12 ) ;
-        Text [ en-US ] = "All ~slides" ;
-        TabStop = TRUE ;
-    };
-    RadioButton RBT_AT_DIA
-    {
-        HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_AT_DIA";
-        Pos = MAP_APPFONT ( 12 , 26 ) ;
-        Size = MAP_APPFONT ( 60 , 12 ) ;
-        Text [ en-US ] = "~From:" ;
-        TabStop = TRUE ;
-    };
-    ListBox LB_DIAS
-    {
-        HelpID = "sd:ListBox:DLG_START_PRESENTATION:LB_DIAS";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 96, 24 ) ;
-        Size = MAP_APPFONT ( 97, 80 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-         //DDExtraWidth = TRUE;
-    };
-    RadioButton RBT_CUSTOMSHOW
-    {
-        HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_CUSTOMSHOW";
-        Pos = MAP_APPFONT ( 12 , 38 ) ;
-        Size = MAP_APPFONT ( 130 , 12 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Custom Slide Show" ;
-    };
-    ListBox LB_CUSTOMSHOW
-    {
-        HelpID = "sd:ListBox:DLG_START_PRESENTATION:LB_CUSTOMSHOW";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 32, 53 ) ;
-        Size = MAP_APPFONT ( 161, 80 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-
-    FixedLine GRP_KIND
-    {
-        Pos = MAP_APPFONT ( 6, 73 ) ;
-        Size = MAP_APPFONT ( 90, 8 );
-        Text [ en-US ] = "Type" ;
-    };
-    RadioButton RBT_STANDARD
-    {
-        HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_STANDARD";
-        Pos = MAP_APPFONT ( 12, 84 ) ;
-        Size = MAP_APPFONT ( 81, 12 ) ;
-        Text [ en-US ] = "~Default" ;
-        TabStop = TRUE ;
-    };
-    RadioButton RBT_WINDOW
-    {
-        HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_WINDOW";
-        Pos = MAP_APPFONT ( 12 , 96 ) ;
-        Size = MAP_APPFONT ( 81 , 12 ) ;
-        Text [ en-US ] = "~Window" ;
-        TabStop = TRUE ;
-    };
-    RadioButton RBT_AUTO
-    {
-        HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_AUTO";
-        Pos = MAP_APPFONT ( 12 , 108 ) ;
-        Size = MAP_APPFONT ( 81 , 12 ) ;
-        Text [ en-US ] = "A~uto" ;
-        TabStop = TRUE ;
-    };
-    TimeField TMF_PAUSE
-    {
-        HelpID = "sd:TimeField:DLG_START_PRESENTATION:TMF_PAUSE";
-        Pos = MAP_APPFONT ( 32, 120 ) ;
-        Size = MAP_APPFONT ( 50, 12 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Duration = TRUE ;
-        StrictFormat = TRUE ;
-        Maximum = Time
-        {
-            Hour = 23 ;
-            Minute = 59 ;
-            Second = 59 ;
-        };
-        Last = Time
-        {
-            Hour = 23 ;
-            Minute = 59 ;
-            Second = 59 ;
-        };
-        QuickHelpText [ en-US ] = "Duration of pause" ;
-    };
-    CheckBox CBX_AUTOLOGO
-    {
-        HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_AUTOLOGO";
-        Pos = MAP_APPFONT ( 32 , 138 ) ;
-        Size = MAP_APPFONT ( 61 , 12 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Show ~logo" ;
-    };
-
-    FixedLine GRP_OPTIONS
-    {
-        Pos = MAP_APPFONT ( 102 , 73 ) ;
-        Size = MAP_APPFONT ( 148, 8 );
-        Text [ en-US ] = "Options" ;
-    };
-    CheckBox CBX_MANUEL
-    {
-        HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_MANUEL";
-        Pos = MAP_APPFONT ( 108 , 84 ) ;
-        Size = MAP_APPFONT ( 139 , 12 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Change slides ~manually" ;
-    };
-    CheckBox CBX_MOUSEPOINTER
-    {
-        HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_MOUSEPOINTER";
-        Pos = MAP_APPFONT ( 108, 96 ) ;
-        Size = MAP_APPFONT ( 139, 12 ) ;
-        Text [ en-US ] = "Mouse pointer ~visible" ;
-        TabStop = TRUE ;
-    };
-    CheckBox CBX_PEN
-    {
-        HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_PEN";
-        Pos = MAP_APPFONT ( 108, 108 ) ;
-        Size = MAP_APPFONT ( 139, 12 ) ;
-        Text [ en-US ] = "Mouse pointer as ~pen" ;
-        TabStop = TRUE ;
-    };
-    CheckBox CBX_NAVIGATOR
-    {
-        HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_NAVIGATOR";
-        Pos = MAP_APPFONT ( 108, 120 ) ;
-        Size = MAP_APPFONT ( 139, 12 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Navigator visible" ;
-    };
-    CheckBox CBX_ANIMATION_ALLOWED
-    {
-        HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_ANIMATION_ALLOWED";
-        Pos = MAP_APPFONT ( 108, 132 ) ;
-        Size = MAP_APPFONT ( 139, 12 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Animations allowed" ;
-    };
-    CheckBox CBX_CHANGE_PAGE
-    {
-        HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_CHANGE_PAGE";
-        Pos = MAP_APPFONT ( 108, 144 ) ;
-        Size = MAP_APPFONT ( 139, 12 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Change slides by clic~king on background" ;
-    };
-    CheckBox CBX_ALWAYS_ON_TOP
-    {
-        HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_ALWAYS_ON_TOP";
-        Pos = MAP_APPFONT ( 108, 156 ) ;
-        Size = MAP_APPFONT ( 145, 12 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Presentation always ~on top" ;
-    };
-
-    FixedLine GRP_MONITOR
-    {
-        Pos = MAP_APPFONT ( 6, 174 ) ;
-        Size = MAP_APPFONT ( 244, 8 );
-        Hide = TRUE;
-        Text [ en-US ] = "Multiple displays" ;
-    };
-
-    FixedText FT_MONITOR
-    {
-        OutputSize = TRUE;
-        Pos = MAP_APPFONT ( 12 , 185 + 2  ) ;
-        Size = MAP_APPFONT( 70, 8 );
-        Hide = TRUE;
-        Text [ en-US ] = "P~resentation display" ;
-    };
-
-    ListBox LB_MONITOR
-    {
-        Pos = MAP_APPFONT ( 82 , 185 ) ;
-        Size = MAP_APPFONT ( 111, 100 );
-        HelpId = HID_SD_SLIDESHOW_DISPLAY;
-        Hide = TRUE;
-        TabStop = TRUE ;
-        Border = TRUE ;
-        DropDown = TRUE ;
-        ClipChildren = TRUE;
-    };
-
-    String STR_EXTERNAL_MONITOR
-    {
-        Text [ en-US ] = "Display %1 (external)";
-    };
-
-    String STR_MONITOR
-    {
-        Text [ en-US ] = "Display %1";
-    };
-
-    String STR_ALL_MONITORS
-    {
-        Text [ en-US ] = "All displays";
-    };
-
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sd/source/ui/inc/present.hrc

-/* -*- 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/.
- *
- * 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 <sfx2/sfx.hrc>
-
-#define DLG_START_PRESENTATION  RID_APP_START+3
-#define BTN_OK 1
-#define BTN_CANCEL 1
-#define BTN_HELP 1
-
-#define GRP_RANGE 1
-#define RBT_ALL 1
-#define RBT_AT_DIA 2
-#define RBT_CUSTOMSHOW 3
-#define LB_DIAS 1
-#define LB_CUSTOMSHOW 2
-
-#define GRP_KIND 2
-#define RBT_STANDARD 4
-#define RBT_WINDOW 5
-#define RBT_AUTO 6
-#define TMF_PAUSE 1
-#define CBX_AUTOLOGO 1
-
-#define GRP_OPTIONS 3
-#define CBX_MANUEL 2
-#define CBX_MOUSEPOINTER 3
-#define CBX_PEN 4
-#define CBX_NAVIGATOR 5
-#define CBX_ANIMATION_ALLOWED 6
-#define CBX_CHANGE_PAGE 7
-#define CBX_ALWAYS_ON_TOP 8
-
-#define GRP_MONITOR 9
-#define FT_MONITOR 10
-#define LB_MONITOR 11
-
-#define STR_EXTERNAL_MONITOR 1
-#define STR_MONITOR 2
-#define STR_ALL_MONITORS 3
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sd/source/ui/inc/present.hxx

@@ -38,44 +38,36 @@ class SdStartPresentationDlg : public ModalDialog
 {
 private:
 
-    FixedLine           aGrpRange;
-    RadioButton         aRbtAll;
-    RadioButton         aRbtAtDia;
-    RadioButton         aRbtCustomshow;
-    ListBox             aLbDias;
-    ListBox             aLbCustomshow;
-
-    FixedLine           aGrpKind;
-    RadioButton         aRbtStandard;
-    RadioButton         aRbtWindow;
-    RadioButton         aRbtAuto;
-    TimeField           aTmfPause;
-    CheckBox            aCbxAutoLogo;
-
-    FixedLine           aGrpOptions;
-    CheckBox            aCbxManuel;
-    CheckBox            aCbxMousepointer;
-    CheckBox            aCbxPen;
-    CheckBox            aCbxNavigator;
-    CheckBox            aCbxAnimationAllowed;
-    CheckBox            aCbxChangePage;
-    CheckBox            aCbxAlwaysOnTop;
-
-    FixedLine           maGrpMonitor;
-    FixedText           maFtMonitor;
-    ListBox             maLBMonitor;
-
-    OKButton            aBtnOK;
-    CancelButton        aBtnCancel;
-    HelpButton          aBtnHelp;
+    RadioButton*        aRbtAll;
+    RadioButton*        aRbtAtDia;
+    RadioButton*        aRbtCustomshow;
+    ListBox*            aLbDias;
+    ListBox*            aLbCustomshow;
+
+    RadioButton*        aRbtStandard;
+    RadioButton*        aRbtWindow;
+    RadioButton*        aRbtAuto;
+    TimeField*          aTmfPause;
+    CheckBox*           aCbxAutoLogo;
+
+    CheckBox*           aCbxManuel;
+    CheckBox*           aCbxMousepointer;
+    CheckBox*           aCbxPen;
+    CheckBox*           aCbxNavigator;
+    CheckBox*           aCbxAnimationAllowed;
+    CheckBox*           aCbxChangePage;
+    CheckBox*           aCbxAlwaysOnTop;
+
+    FixedText*          maFtMonitor;
+    ListBox*            maLBMonitor;
 
     SdCustomShowList*   pCustomShowList;
     const SfxItemSet&   rOutAttrs;
     sal_Int32           mnMonitors;
 
-    String              msExternalMonitor;
-    String              msMonitor;
-    String              msAllMonitors;
+    FixedText*          msExternalMonitor;
+    FixedText*          msMonitor;
+    FixedText*          msAllMonitors;
 
                         DECL_LINK( ChangeRangeHdl, void * );
                         DECL_LINK( ClickWindowPresentationHdl, void * );