Convert DLG_PUBLISHING to .ui

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

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

@@ -278,6 +278,9 @@
     <glade-widget-class title="Graphic Preview" name="cuilo-GraphicPreviewWindow"
                         generic-name="Graphic Preview Window" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>
+    <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="Writer Number Preview" name="swuilo-NumberingPreview"
                         generic-name="Writer Number Preview Window" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>

sd/AllLangResTarget_sd.mk

@@ -32,7 +32,6 @@ $(eval $(call gb_SrsTarget_set_include,sd/res,\
 
 $(eval $(call gb_SrsTarget_add_files,sd/res,\
     sd/source/core/glob.src \
-    sd/source/filter/html/pubdlg.src \
     sd/source/ui/accessibility/accessibility.src \
     sd/source/ui/animations/CustomAnimation.src \
     sd/source/ui/annotations/annotations.src \

sd/UIConfig_simpress.mk

@@ -91,6 +91,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
 	sd/uiconfig/simpress/ui/presentationdialog \
 	sd/uiconfig/simpress/ui/printeroptions \
 	sd/uiconfig/simpress/ui/prntopts \
+	sd/uiconfig/simpress/ui/publishingdialog \
 	sd/uiconfig/simpress/ui/remotedialog \
 	sd/uiconfig/simpress/ui/sdviewpage \
 	sd/uiconfig/simpress/ui/slidedesigndialog \

sd/source/filter/html/htmlattr.cxx

@@ -20,15 +20,26 @@
 #include "htmlattr.hxx"
 #include "htmlex.hxx"
 #include <vcl/decoview.hxx>
+#include <vcl/builder.hxx>
 
 
 
 
-SdHtmlAttrPreview::SdHtmlAttrPreview( Window* pParent, const ResId& rResId )
-:Control( pParent, rResId )
+SdHtmlAttrPreview::SdHtmlAttrPreview( Window* pParent, WinBits nStyle )
+:Control( pParent, nStyle )
 {
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSdHtmlAttrPreview(Window *pParent, VclBuilder::stringmap &rMap)
+{
+    WinBits nWinStyle = 0;
+
+    OString sBorder = VclBuilder::extractCustomProperty(rMap);
+    if (!sBorder.isEmpty())
+        nWinStyle |= WB_BORDER;
+
+    return new SdHtmlAttrPreview(pParent, nWinStyle);
+}
 
 
 SdHtmlAttrPreview::~SdHtmlAttrPreview()

sd/source/filter/html/htmlattr.hxx

@@ -31,7 +31,7 @@ protected:
     Color   m_aVLinkColor, m_aALinkColor;
 
 public:
-    SdHtmlAttrPreview( Window* pParent, const ResId& rResId );
+    SdHtmlAttrPreview( Window* pParent, WinBits nStyle );
     virtual ~SdHtmlAttrPreview();
 
     virtual void    Paint( const Rectangle& rRect ) SAL_OVERRIDE;

sd/source/ui/dlg/assclass.cxx

@@ -35,7 +35,7 @@ Assistent::Assistent(int nNoOfPages)
         mpPageStatus[i] = true;
 }
 
-bool Assistent::InsertControl(int nDestPage,Control* pUsedControl)
+bool Assistent::InsertControl(int nDestPage,Window* pUsedControl)
 {
     DBG_ASSERT( (nDestPage > 0) && (nDestPage <= mnPages), "Page not aviable!");
 
@@ -89,8 +89,8 @@ bool Assistent::GotoPage(const int nPageToGo)
     {
         int nIndex=mnCurrentPage-1;
 
-        std::vector<Control*>::iterator iter = maPages[nIndex].begin();
-        std::vector<Control*>::iterator iterEnd = maPages[nIndex].end();
+        std::vector<Window*>::iterator iter = maPages[nIndex].begin();
+        std::vector<Window*>::iterator iterEnd = maPages[nIndex].end();
 
         for(; iter != iterEnd; ++iter)
         {

sd/source/ui/inc/assclass.hxx

@@ -27,13 +27,13 @@
 
 #define MAX_PAGES 10
 
-class Control;
+class Window;
 
 class SD_DLLPUBLIC Assistent
 {
     /** contains for every page the controls, which have to be
         connected? correctly */
-    std::vector<Control*> maPages[MAX_PAGES];
+    std::vector<Window*> maPages[MAX_PAGES];
 
     /// number of pages
     int mnPages;
@@ -51,7 +51,7 @@ public:
     void DisablePage( int nPage );
 
     /// adds a control to the specified page
-    bool InsertControl(int nDestPage,Control* pUsedControl);
+    bool InsertControl(int nDestPage,Window* pUsedControl);
 
     bool NextPage();
 

sd/source/ui/inc/pubdlg.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 PAGE1_TITEL         2
-#define PAGE1_NEW_DESIGN    3
-#define PAGE1_OLD_DESIGN    4
-#define PAGE1_DESIGNS       5
-#define PAGE1_DEL_DESIGN    6
-#define PAGE1_DESC          7
-
-#define PAGE2_TITEL         21
-#define PAGE2_STANDARD      22
-#define PAGE2_FRAMES        23
-#define PAGE2_KIOSK         24
-#define PAGE2_WEBCAST       25
-#define PAGE2_SINGLE_DOCUMENT 26
-
-#define PAGE2_NOFRAMES_FB   27
-#define PAGE2_FRAMES_FB     28
-#define PAGE2_KIOSK_FB      29
-#define PAGE2_WEBCAST_FB    30
-
-#define PAGE2_TITEL_HTML    31
-#define PAGE2_CONTENT       32
-#define PAGE2_NOTES         33
-
-#define PAGE2_TITEL_KIOSK   34
-#define PAGE2_CHG_DEFAULT   35
-#define PAGE2_CHG_AUTO      36
-#define PAGE2_DURATION_TXT  37
-#define PAGE2_DURATION_TMF  38
-#define PAGE2_ENDLESS       39
-
-#define PAGE2_TITEL_WEBCAST 40
-#define PAGE2_ASP           41
-#define PAGE2_PERL          42
-#define PAGE2_INDEX_TXT     43
-#define PAGE2_INDEX         44
-#define PAGE2_URL_TXT       45
-#define PAGE2_URL           46
-#define PAGE2_CGI_TXT       47
-#define PAGE2_CGI           48
-#define PAGE2_VERT          49
-
-#define PAGE3_TITEL_1       51
-#define PAGE3_PNG           51
-#define PAGE3_GIF           52
-#define PAGE3_JPG           53
-#define PAGE3_QUALITY_TXT   54
-#define PAGE3_QUALITY       55
-#define PAGE3_TITEL_2       56
-#define PAGE3_RESOLUTION_1  57
-#define PAGE3_RESOLUTION_2  58
-#define PAGE3_RESOLUTION_3  59
-#define PAGE3_TITEL_3       60
-#define PAGE3_SLD_SOUND     61
-#define PAGE3_VERT          62
-#define PAGE3_HIDDEN_SLIDES 63
-
-#define PAGE4_TITEL_1       66
-#define PAGE4_AUTHOR_TXT    67
-#define PAGE4_AUTHOR        68
-#define PAGE4_EMAIL_TXT     69
-#define PAGE4_EMAIL_EDIT    70
-#define PAGE4_WWW_TXT       71
-#define PAGE4_WWW_EDIT      72
-#define PAGE4_TITEL_2       73
-#define PAGE4_MISC          74
-#define PAGE4_DOWNLOAD      75
-#define PAGE4_CREATED       76
-
-#define PAGE5_TITEL         81
-#define PAGE5_TEXTONLY      82
-#define PAGE5_BUTTONS       83
-
-#define PAGE6_TITEL         101
-#define PAGE6_DEFAULT       102
-#define PAGE6_USER          103
-#define PAGE6_BACK          104
-#define PAGE6_TEXT          105
-#define PAGE6_LINK          106
-#define PAGE6_VLINK         107
-#define PAGE6_ALINK         108
-#define PAGE6_DOCCOLORS     109
-#define PAGE6_PREVIEW       111
-
-#define BUT_LAST 200
-#define BUT_NEXT 201
-#define BUT_FINISH 202
-#define BUT_CANCEL 203
-#define BUT_HELP 204
-#define BOTTOM_LINE 205
-
-#define DLG_PUBLISHING 739
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sd/source/ui/inc/pubdlg.hxx

@@ -26,6 +26,7 @@
 #include <vcl/button.hxx>
 #include <vcl/field.hxx>
 #include <vcl/dialog.hxx>
+#include <vcl/layout.hxx>
 #include "resltn.hxx"
 #include "pres.hxx"
 #include "assclass.hxx"
@@ -52,7 +53,8 @@ class SdPublishingDlg : public ModalDialog
 {
 private:
     // page 1 controls
-    FixedLine*      pPage1_Titel;
+    VclContainer*   pPage1;
+    FixedText*      pPage1_Titel;
     RadioButton*    pPage1_NewDesign;
     RadioButton*    pPage1_OldDesign;
     ListBox*        pPage1_Designs;
@@ -60,22 +62,26 @@ private:
     FixedText*      pPage1_Desc;
 
     // page 2 controls
-    FixedLine*      pPage2_Titel;
+    VclContainer*   pPage2;
+    VclContainer*   pPage2Frame2;
+    VclContainer*   pPage2Frame3;
+    VclContainer*   pPage2Frame4;
+    FixedText*      pPage2_Titel;
     RadioButton*    pPage2_Standard;
     RadioButton*    pPage2_Frames;
     RadioButton*    pPage2_SingleDocument;
     RadioButton*    pPage2_Kiosk;
     RadioButton*    pPage2_WebCast;
-    FixedBitmap*    pPage2_Standard_FB;
-    FixedBitmap*    pPage2_Frames_FB;
-    FixedBitmap*    pPage2_Kiosk_FB;
-    FixedBitmap*    pPage2_WebCast_FB;
+    FixedImage*    pPage2_Standard_FB;
+    FixedImage*    pPage2_Frames_FB;
+    FixedImage*    pPage2_Kiosk_FB;
+    FixedImage*    pPage2_WebCast_FB;
 
-    FixedLine*      pPage2_Titel_Html;
+    FixedText*      pPage2_Titel_Html;
     CheckBox*       pPage2_Content;
     CheckBox*       pPage2_Notes;
 
-    FixedLine*      pPage2_Titel_WebCast;
+    FixedText*      pPage2_Titel_WebCast;
     RadioButton*    pPage2_ASP;
     RadioButton*    pPage2_PERL;
     FixedText*      pPage2_URL_txt;
@@ -84,8 +90,7 @@ private:
     Edit*           pPage2_CGI;
     FixedText*      pPage2_Index_txt;
     Edit*           pPage2_Index;
-    FixedLine*      pPage2_Vert;
-    FixedLine*      pPage2_Titel_Kiosk;
+    FixedText*      pPage2_Titel_Kiosk;
     RadioButton*    pPage2_ChgDefault;
     RadioButton*    pPage2_ChgAuto;
     FixedText*      pPage2_Duration_txt;
@@ -93,23 +98,24 @@ private:
     CheckBox*       pPage2_Endless;
 
     // page 3 controls
-    FixedLine*      pPage3_Titel1;
+    VclContainer*   pPage3;
+    FixedText*      pPage3_Titel1;
     RadioButton*    pPage3_Png;
     RadioButton*    pPage3_Gif;
     RadioButton*    pPage3_Jpg;
     FixedText*      pPage3_Quality_txt;
     ComboBox*       pPage3_Quality;
-    FixedLine*      pPage3_Vert;
-    FixedLine*      pPage3_Titel2;
+    FixedText*      pPage3_Titel2;
     RadioButton*    pPage3_Resolution_1;
     RadioButton*    pPage3_Resolution_2;
     RadioButton*    pPage3_Resolution_3;
-    FixedLine*      pPage3_Titel3;
+    FixedText*      pPage3_Titel3;
     CheckBox*       pPage3_SldSound;
     CheckBox*       pPage3_HiddenSlides;
-    // page 4 controls
 
-    FixedLine*      pPage4_Titel1;
+    // page 4 controls
+    VclContainer*   pPage4;
+    FixedText*      pPage4_Titel1;
     FixedText*      pPage4_Author_txt;
     Edit*           pPage4_Author;
     FixedText*      pPage4_Email_txt;
@@ -117,18 +123,18 @@ private:
     FixedText*      pPage4_WWW_txt;
     Edit*           pPage4_WWW;
     FixedText*      pPage4_Titel2;
-    MultiLineEdit*  pPage4_Misc;
+    VclMultiLineEdit*  pPage4_Misc;
     CheckBox*       pPage4_Download;
 
     // page 5 controls
-
-    FixedLine*      pPage5_Titel;
+    VclContainer*   pPage5;
+    FixedText*      pPage5_Titel;
     CheckBox*       pPage5_TextOnly;
     ValueSet*       pPage5_Buttons;
 
     // page 6 controls
-
-    FixedLine*      pPage6_Titel;
+    VclContainer*   pPage6;
+    FixedText*      pPage6_Titel;
     RadioButton*    pPage6_Default;
     RadioButton*    pPage6_User;
     PushButton*     pPage6_Back;
@@ -142,12 +148,9 @@ private:
     boost::scoped_ptr< ButtonSet > mpButtonSet;
 
     // standard controls
-    FixedLine       aBottomLine;
-    HelpButton      aHelpButton;
-    CancelButton    aCancelButton;
-    PushButton      aLastPageButton;
-    PushButton      aNextPageButton;
-    OKButton        aFinishButton;
+    PushButton*     pLastPageButton;
+    PushButton*     pNextPageButton;
+    PushButton*     pFinishButton;
 
     Assistent       aAssistentFunc;
 
@@ -156,7 +159,6 @@ private:
 
     void SetDefaults();
     void CreatePages();
-    void RemovePages();
 
     Color m_aBackColor, m_aTextColor, m_aLinkColor;
     Color m_aVLinkColor, m_aALinkColor;