convert about dialog to .ui format

Change-Id: I7a4636c212e19702b94f5c42491c9785f1eccc00

cui/AllLangResTarget_cui.mk

@@ -53,7 +53,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
     cui/source/customize/cfg.src \
     cui/source/customize/eventdlg.src \
     cui/source/customize/macropg.src \
-    cui/source/dialogs/about.src \
     cui/source/dialogs/colorpicker.src \
     cui/source/dialogs/commonlingui.src \
     cui/source/dialogs/cuiimapdlg.src \

cui/UI_cui.mk

@@ -10,6 +10,7 @@
 $(eval $(call gb_UI_UI,cui))
 
 $(eval $(call gb_UI_add_uifiles,cui,\
+	cui/uiconfig/ui/aboutdialog \
 	cui/uiconfig/ui/asiantypography \
 	cui/uiconfig/ui/backgroundpage \
 	cui/uiconfig/ui/borderpage \

cui/source/dialogs/about.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 ABOUT_STR_BUILD             1
-#define ABOUT_STR_VERSION           2
-#define ABOUT_STR_VENDOR            3
-#define ABOUT_STR_COPYRIGHT         4
-#define ABOUT_STR_BASED             5
-#define ABOUT_STR_BASED_DERIVED     6
-#define ABOUT_STR_LINK_CREDITS      8
-#define ABOUT_LOGO_REPLACEMENT      9
-#define ABOUT_BTN_CREDITS           10
-#define ABOUT_DESCRIPTION_TEXT      11
-#define ABOUT_COPYRIGHT_TEXT        12
-#define ABOUT_COPYRIGHT_TEXT_SHADOW 13
-#define ABOUT_IMAGE_LOGO            14
-#define ABOUT_BTN_WEBSITE           15
-#define ABOUT_BTN_LICENSE           16
-#define ABOUT_VERSION_TEXT          17
-#define ABOUT_STR_DESCRIPTION       18
-#define ABOUT_BTN_CANCEL            19
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/dialogs/about.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 "about.hrc"
-
-ModalDialog RID_DEFAULTABOUT
-{
-    OutputSize = TRUE ;
-    Moveable = TRUE ;
-    SVLook = TRUE ;
-    MultiLineEdit ABOUT_LOGO_REPLACEMENT
-    {
-        Border = FALSE ;
-        IgnoreTab = TRUE ;
-        ReadOnly = TRUE ;
-        AutoVScroll = TRUE ;
-        LEFT = FALSE ;
-        CENTER = TRUE ;
-        RIGHT = FALSE ;
-    };
-    MultiLineEdit ABOUT_DESCRIPTION_TEXT
-    {
-        Border = FALSE ;
-        IgnoreTab = TRUE ;
-        ReadOnly = TRUE ;
-        AutoVScroll = TRUE ;
-        LEFT = FALSE ;
-        CENTER = TRUE ;
-        RIGHT = FALSE ;
-    };
-    MultiLineEdit ABOUT_COPYRIGHT_TEXT
-    {
-        Border = FALSE ;
-        IgnoreTab = TRUE ;
-        ReadOnly = TRUE ;
-        LEFT = FALSE ;
-        CENTER = TRUE ;
-        RIGHT = FALSE ;
-    };
-    MultiLineEdit ABOUT_VERSION_TEXT
-    {
-        Border = FALSE ;
-        IgnoreTab = TRUE ;
-        ReadOnly = TRUE ;
-        LEFT = FALSE ;
-        CENTER = TRUE ;
-        RIGHT = FALSE ;
-    };
-    String ABOUT_STR_VERSION
-    {
-        Text [ en-US ] = "Version %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX";
-    };
-    String ABOUT_STR_DESCRIPTION
-    {
-        Text [ en-US ] = "%PRODUCTNAME is a modern, easy-to-use, open source productivity suite for word processing, spreadsheets, presentations and more.";
-    };
-    String ABOUT_STR_VENDOR
-    {
-        Text[ en-US ] = "This release was supplied by %OOOVENDOR";
-    };
-    String ABOUT_STR_COPYRIGHT
-    {
-        Text[ en-US ] = "Copyright © 2000 - 2013 LibreOffice contributors and/or their affiliates";
-    };
-    String ABOUT_STR_BASED
-    {
-        Text[ en-US ] = "LibreOffice was based on OpenOffice.org";
-    };
-    String ABOUT_STR_BASED_DERIVED
-    {
-        Text[ en-US ] = "%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org";
-    };
-    String ABOUT_STR_BUILD
-    {
-        Text[ en-US ] = "(Build ID: $BUILDID)";
-    };
-    String ABOUT_STR_LINK_CREDITS
-    {
-        Text[ en-US ] = "http://www.libreoffice.org/about-us/credits/";
-    };
-    PushButton ABOUT_BTN_CREDITS
-    {
-        Text [ en-US ] = "Credits";
-    };
-    PushButton ABOUT_BTN_WEBSITE
-    {
-        Text [ en-US ] = "Website";
-    };
-    CancelButton ABOUT_BTN_CANCEL
-    {
-        DefButton = TRUE ;
-        Text [ en-US ] = "~Close";
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/factory/dlgfact.cxx

@@ -1010,7 +1010,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( Window* pParent,
     {
         case RID_DEFAULTABOUT:
         {
-            pDlg = new AboutDialog( pParent, CUI_RES( (sal_uInt16) nResId ) );
+            pDlg = new AboutDialog(pParent);
             break;
         }
         case SID_OPTIONS_TREEDIALOG :

cui/source/inc/about.hxx

@@ -19,10 +19,10 @@
 #ifndef _ABOUT_HXX
 #define _ABOUT_HXX
 
-#include <vcl/button.hxx>
 #include <vcl/accel.hxx>
-#include <svtools/svmedit.hxx>
-#include <svtools/stdctrl.hxx>
+#include <vcl/button.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/vclmedit.hxx>
 #include <sfx2/basedlgs.hxx>        ///< for SfxModalDialog
 #include <vector>
 
@@ -34,43 +34,38 @@ private:
     BitmapEx           aBackgroundBitmap;
     BitmapEx           aLogoBitmap;
 
+    VclMultiLineEdit*    m_pVersion;
+    FixedText*           m_pDescriptionText;
+    FixedText*           m_pCopyrightText;
+    FixedImage*          m_pLogoImage;
+    FixedText*           m_pLogoReplacement;
+    PushButton*          m_pCreditsButton;
+    PushButton*          m_pWebsiteButton;
 
-    MultiLineEdit       aVersionText;
-    MultiLineEdit       aDescriptionText;
-    MultiLineEdit       aCopyrightText;
-    FixedImage          aLogoImage;
-    MultiLineEdit       aLogoReplacement;
-    PushButton          aCreditsButton;
-    PushButton          aWebsiteButton;
-    CancelButton        aCancelButton;
-
-    String aVersionData;
-    rtl::OUString m_aVersionTextStr;
-    String m_aVendorTextStr;
-    String m_aCopyrightTextStr;
-    String m_aBasedTextStr;
-    String m_aBasedDerivedTextStr;
-    String m_aCreditsLinkStr;
-    rtl::OUString m_sBuildStr;
-    String m_aDescriptionTextStr;
+    OUString aVersionData;
+    OUString m_aVersionTextStr;
+    OUString m_aVendorTextStr;
+    OUString m_aCopyrightTextStr;
+    OUString m_aBasedTextStr;
+    OUString m_aBasedDerivedTextStr;
+    OUString m_aCreditsLinkStr;
+    OUString m_sBuildStr;
 
     void StyleControls();
-    void LayoutControls();
-    void LayoutButtons(sal_Int32 aContentWidth, sal_Int32 aDialogBorder,
-                       Point& aButtonPos, Size& aButtonSize, sal_Int32& aButtonsWidth );
-    void MoveControl(Control& rControl, sal_Int32 X, sal_Int32 Y);
-    rtl::OUString GetBuildId();
-    rtl::OUString GetVersionString();
-    rtl::OUString GetCopyrightString();
+    void SetLogo();
+
+    OUString GetBuildId();
+    OUString GetVersionString();
+    OUString GetCopyrightString();
 
 protected:
     virtual sal_Bool Close();
-    virtual void     Paint( const Rectangle& rRect );
+    virtual void Paint( const Rectangle& rRect );
+    virtual void Resize();
 
 public:
-    AboutDialog( Window* pParent, const ResId& rId);
+    AboutDialog(Window* pParent);
 
-    DECL_LINK( CancelHdl, void * );
     DECL_LINK( HandleClick, PushButton* );
 };