Convert DLG_ASS to .ui

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

extras/source/glade/libreoffice-catalog.xml.in

@@ -289,6 +289,9 @@
     <glade-widget-class title="Html Attribute Preview" name="sduilo-SdHtmlAttrPreview"
                         generic-name="Html Attribute Preview" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>
+    <glade-widget-class title="Document Preview Window" name="sdlo-SdDocPreviewWin"
+                        generic-name="Document Preview Window" parent="GtkDrawingArea"
+                        icon-name="widget-gtk-drawingarea"/>
     <glade-widget-class title="Writer Number Preview" name="swuilo-NumberingPreview"
                         generic-name="Writer Number Preview Window" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>
@@ -540,6 +543,9 @@
     <glade-widget-class title="Page Objs ListBox" name="sdlo-SdPageObjsTLB"
                         generic-name="SdPageObjsTLB" parent="svtlo-SvTreeListBox"
                         icon-name="widget-gtk-treeview"/>
+    <glade-widget-class title="Page List Control" name="sduilo-SdPageListControl"
+                        generic-name="Page List Control" parent="svtlo-SvTreeListBox"
+                        icon-name="widget-gtk-treeview"/>
     <glade-widget-class title="Checked Tree List" name="svxlo-SvxCheckListBox"
                         generic-name="Checked Tree List" parent="GtkTreeView"
                         icon-name="widget-gtk-treeview"/>
@@ -657,6 +663,10 @@
     <glade-widget-class title="Open Document ListBox" name="dbulo-OpenDocumentListBox"
                         generic-name="Open Document ListBox" parent="GtkComboBox"
                         icon-name="widget-gtk-combobox"/>
+                        
+    <glade-widget-class title="Fade Effect ListBox" name="sdlo-FadeEffectLB"
+                        generic-name="Fade Effect ListBox" parent="GtkComboBox"
+                        icon-name="widget-gtk-combobox"/>
 
     <glade-widget-class title="Open Document Button" name="dbulo-OpenDocumentButton"
                         generic-name="Open Document Button" parent="GtkButton"

sd/AllLangResTarget_sd.mk

@@ -41,7 +41,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
     sd/source/ui/app/strings.src \
     sd/source/ui/app/toolbox.src \
     sd/source/ui/dlg/animobjs.src \
-    sd/source/ui/dlg/dlgass.src \
     sd/source/ui/dlg/navigatr.src \
     sd/source/ui/dlg/PaneDockingWindow.src \
     sd/source/ui/slideshow/slideshow.src \

sd/UIConfig_simpress.mk

@@ -70,6 +70,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/simpress,\
 ))
 
 $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
+	sd/uiconfig/simpress/ui/assistentdialog \
 	sd/uiconfig/simpress/ui/customanimationcreatedialog \
 	sd/uiconfig/simpress/ui/customanimationcreatetab \
 	sd/uiconfig/simpress/ui/customanimationspanel \

sd/source/ui/dlg/dlgassim.cxx

@@ -25,6 +25,7 @@
 #include "res_bmp.hrc"
 
 #include <vcl/svapp.hxx>
+#include <vcl/builder.hxx>
 #include "svtools/svlbitm.hxx"
 #include "svtools/treelistentry.hxx"
 
@@ -32,8 +33,8 @@
 
 SdPageListControl::SdPageListControl(
     ::Window* pParent,
-    const ResId& rResId )
-    : SvTreeListBox(pParent, rResId)
+    const WinBits nStyle )
+    : SvTreeListBox(pParent, nStyle)
 {
     // add lines to tree listbox
     SetStyle( GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES |
@@ -48,6 +49,15 @@ SdPageListControl::SdPageListControl(
     SetCheckButtonHdl( LINK(this,SdPageListControl,CheckButtonClickHdl) );
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT ::Window* SAL_CALL makeSdPageListControl(::Window *pParent, VclBuilder::stringmap &rMap)
+{
+    WinBits nWinStyle = WB_TABSTOP;
+    OString sBorder = VclBuilder::extractCustomProperty(rMap);
+    if (!sBorder.isEmpty())
+        nWinStyle |= WB_BORDER;
+    return new SdPageListControl(pParent, nWinStyle);
+}
+
 IMPL_LINK_NOARG(SdPageListControl, CheckButtonClickHdl)
 {
     SvTreeList* pTreeModel = GetModel();

sd/source/ui/dlg/dlgassim.hxx

@@ -35,7 +35,7 @@ private:
     void InsertTitle( SvTreeListEntry* pEntry, const OUString& rTitle );
 
 public:
-    SdPageListControl( Window* pParent, const ResId& rResId );
+    SdPageListControl( Window* pParent, const WinBits nStyle );
     virtual ~SdPageListControl();
 
     void Fill( SdDrawDocument* pDoc );

sd/source/ui/dlg/dlgctrls.cxx

@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <vcl/builder.hxx>
 
 #include "strings.hrc"
 #include "dlgctrls.hxx"
@@ -32,9 +33,9 @@ struct FadeEffectLBImpl
     std::vector< TransitionPresetPtr > maPresets;
 };
 
-FadeEffectLB::FadeEffectLB( Window* pParent, SdResId Id )
-:   ListBox( pParent, Id ),
-    mpImpl( new FadeEffectLBImpl )
+FadeEffectLB::FadeEffectLB(Window* pParent, WinBits nStyle)
+    : ListBox(pParent, nStyle)
+    , mpImpl(new FadeEffectLBImpl)
 {
 }
 
@@ -66,8 +67,17 @@ void FadeEffectLB::Fill()
     SelectEntryPos(0);
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFadeEffectLB(Window* pParent, VclBuilder::stringmap &rMap)
+{
+    WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK;
+
+    bool bDropdown = VclBuilder::extractDropdown(rMap);
 
+    if (bDropdown)
+        nBits |= WB_DROPDOWN;
 
+    return new FadeEffectLB(pParent, nBits);
+}
 
 void FadeEffectLB::applySelected( SdPage* pSlide ) const
 {

sd/source/ui/dlg/docprev.cxx

@@ -26,6 +26,7 @@
 #include <com/sun/star/presentation/FadeEffect.hpp>
 #include <fadedef.h>
 #include <vcl/ctrl.hxx>
+#include <vcl/builder.hxx>
 #include <vcl/settings.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/svdpagv.hxx>
@@ -60,8 +61,19 @@ void SdDocPreviewWin::SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage
     updateViewSettings();
 }
 
-SdDocPreviewWin::SdDocPreviewWin( Window* pParent, const ResId& rResId )
-: Control(pParent, rResId), pMetaFile( 0 ), bInEffect(false), mpObj(NULL), mnShowPage(0)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSdDocPreviewWin(Window *pParent, VclBuilder::stringmap &rMap)
+{
+    WinBits nWinStyle = 0;
+
+    OString sBorder = VclBuilder::extractCustomProperty(rMap);
+    if (!sBorder.isEmpty())
+        nWinStyle |= WB_BORDER;
+
+    return new SdDocPreviewWin(pParent, nWinStyle);
+}
+
+SdDocPreviewWin::SdDocPreviewWin( Window* pParent, const WinBits nStyle )
+: Control(pParent, nStyle), pMetaFile( 0 ), bInEffect(false), mpObj(NULL), mnShowPage(0)
 {
     SetBorderStyle( WINDOW_BORDER_MONO );
     svtools::ColorConfig aColorConfig;
@@ -74,6 +86,11 @@ SdDocPreviewWin::~SdDocPreviewWin()
     delete pMetaFile;
 }
 
+Size SdDocPreviewWin::GetOptimalSize() const
+{
+    return LogicToPixel(Size(122, 96), MAP_APPFONT);
+}
+
 void SdDocPreviewWin::Resize()
 {
     Invalidate();

sd/source/ui/inc/dlgass.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 .
- */
-#define BUT_FINISH 1
-#define BUT_CANCEL 2
-#define BUT_LAST 3
-#define BUT_NEXT 4
-#define BUT_HELP 5
-#define CT_PREVIEW 6
-#define CB_PREVIEW 7
-#define CB_STARTWITH 8
-
-#define FB_PAGE1            9
-#define FL_PAGE1_ARTGROUP   10
-#define RB_PAGE1_EMPTY      11
-#define RB_PAGE1_TEMPLATE   12
-#define LB_PAGE1_REGION     13
-#define LB_PAGE1_TEMPLATES  14
-#define RB_PAGE1_OPEN       15
-#define LB_PAGE1_OPEN       16
-#define PB_PAGE1_OPEN       17
-
-#define FB_PAGE2                    30
-#define FL_PAGE2_LAYOUT         31
-#define LB_PAGE2_REGION             32
-#define LB_PAGE2_LAYOUT             33
-#define FL_PAGE2_OUTPUTTYPES        34
-#define RB_PAGE2_MEDIUM1            35
-#define RB_PAGE2_MEDIUM2            36
-#define RB_PAGE2_MEDIUM3            37
-#define RB_PAGE2_MEDIUM4            38
-#define RB_PAGE2_MEDIUM5            39
-#define RB_PAGE2_MEDIUM6            66
-
-#define FB_PAGE3                    40
-#define FL_PAGE3_EFFECT         41
-#define FT_PAGE3_EFFECT             42
-#define LB_PAGE3_EFFECT             43
-#define FT_PAGE3_SPEED              44
-#define LB_PAGE3_SPEED              45
-#define FL_PAGE3_PRESTYPE           46
-#define RB_PAGE3_LIVE               47
-#define RB_PAGE3_KIOSK              48
-#define FT_PAGE3_TIME               49
-#define TMF_PAGE3_TIME              50
-#define FT_PAGE3_BREAK              51
-#define TMF_PAGE3_BREAK             52
-#define CB_PAGE3_LOGO               53
-
-#define FB_PAGE4                    20
-#define FL_PAGE4_PERSONAL           21
-#define FT_PAGE4_ASKNAME            22
-#define EDT_PAGE4_ASKNAME           23
-#define FT_PAGE4_ASKTOPIC           24
-#define EDT_PAGE4_ASKTOPIC          25
-#define FT_PAGE4_ASKINFORMATION     26
-#define EDT_PAGE4_ASKINFORMATION    27
-
-#define FB_PAGE5                    60
-#define FT_PAGE5_PAGELIST           61
-#define CT_PAGE5_PAGELIST           62
-#define CB_PAGE5_SUMMARY            63
-
-#define STR_CREATE                  64
-#define STR_OPEN                    65
-#define DLG_ASS 900
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sd/source/ui/inc/dlgctrls.hxx

@@ -36,8 +36,8 @@ struct FadeEffectLBImpl;
 class SD_DLLPUBLIC FadeEffectLB : public ListBox
 {
 public:
-                                FadeEffectLB( Window* pParent, SdResId Id );
-                                virtual ~FadeEffectLB();
+    FadeEffectLB(Window* pParent, WinBits nStyle);
+    virtual ~FadeEffectLB();
     virtual void                Fill();
 
 /*  void                        selectEffectFromPage( SdPage* pPage ); */

sd/source/ui/inc/docprev.hxx

@@ -23,6 +23,7 @@
 #include <com/sun/star/presentation/FadeEffect.hpp>
 #include <vcl/window.hxx>
 #include <tools/gen.hxx>
+#include <tools/wintypes.hxx>
 
 #include <rtl/ref.hxx>
 
@@ -49,6 +50,7 @@ protected:
     rtl::Reference< sd::SlideShow > mxSlideShow;
 
     virtual void    Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+    virtual Size    GetOptimalSize() const SAL_OVERRIDE;
     static void     CalcSizeAndPos( GDIMetaFile* pFile, Size& rSize, Point& rPoint );
     void            ImpPaint( GDIMetaFile* pFile, OutputDevice* pVDev );
 
@@ -61,7 +63,7 @@ protected:
     void updateViewSettings();
 
 public:
-                    SdDocPreviewWin( Window* pParent, const ResId& rResId );
+                    SdDocPreviewWin( Window* pParent, const WinBits nStyle );
                     virtual ~SdDocPreviewWin();
     void            SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage = 0 );
     virtual void    Resize() SAL_OVERRIDE;