i119418 - Some Improvements in the About Dialog

cui/source/dialogs/about.hrc

@@ -21,10 +21,11 @@
 
 
 
-#include <sfx2/sfx.hrc>
-
-#define ABOUT_BTN_OK                        1
-#define ABOUT_FTXT_VERSION                  1
-#define ABOUT_STR_ACCEL                     3
-#define ABOUT_FTXT_COPYRIGHT                    4
+#include <cuires.hrc>
 
+#define RID_CUI_ABOUT_BTN_OK                        1
+#define RID_CUI_ABOUT_FTXT_VERSION                  2
+#define RID_CUI_ABOUT_FTXT_COPYRIGHT                3
+#define RID_CUI_ABOUT_FTXT_BUILDDATA                4
+#define RID_CUI_ABOUT_STR_COPYRIGHT                 5
+#define RID_CUI_ABOUT_FTXT_WELCOME_LINK             6

cui/source/dialogs/about.src

@@ -27,37 +27,43 @@ ModalDialog RID_DEFAULTABOUT
 {
     HelpID = "cui:ModalDialog:RID_DEFAULTABOUT";
     OutputSize = TRUE ;
-    Size = MAP_APPFONT ( 245 , 260 ) ;
     Moveable = TRUE ;
     SVLook = TRUE ;
-    Text [ x-comment ] = "PB: ; PB: only %PRODUCTNAME";
     Text [ en-US ] = "About %PRODUCTNAME" ;
-    OKButton ABOUT_BTN_OK
+    OKButton RID_CUI_ABOUT_BTN_OK
     {
         DefButton = TRUE ;
-        Pos = MAP_APPFONT ( 174 , 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
     };
-    FixedText ABOUT_FTXT_VERSION
+    FixedText RID_CUI_ABOUT_FTXT_VERSION
     {
-        Pos = MAP_APPFONT ( 54 , 6 ) ;
-        Size = MAP_APPFONT ( 118 , 16 ) ;
         WordBreak = TRUE ;
         Text = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION" ;
     };
-    MultiLineEdit ABOUT_FTXT_COPYRIGHT
+    MultiLineEdit RID_CUI_ABOUT_FTXT_BUILDDATA
+   {
+        //HelpID = "cui:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_BUILDDATA";
+        Border = FALSE ;
+        IgnoreTab = TRUE ;
+        ReadOnly = TRUE ;
+        AutoVScroll = FALSE ;
+    };
+    MultiLineEdit RID_CUI_ABOUT_FTXT_COPYRIGHT
     {
         HelpID = "cui:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_COPYRIGHT";
         Border = FALSE ;
-        Pos = MAP_APPFONT ( 54 , 25 ) ;
-        Size = MAP_APPFONT ( 168 , 51 ) ;
         IgnoreTab = TRUE ;
         ReadOnly = TRUE ;
-        AutoVScroll = TRUE ;
+        AutoVScroll = FALSE ;
+    };
+    FixedText RID_CUI_ABOUT_FTXT_WELCOME_LINK
+    {
+        Left = TRUE ;
+        Text = "http://www.openoffice.org/welcome/credits.html";
     };
-    String ABOUT_STR_ACCEL
+    String RID_CUI_ABOUT_STR_COPYRIGHT
     {
-        Text = "SDT" ;
+        Text[ en-US ] = "Copyright © 2012 Apache Software Foundation.\nAll rights reserved.\n\nThis product was created by %OOOVENDOR, based on Apache OpenOffice.\nApache OpenOffice acknowledges all community members, especially those mentioned at";
     };
 };
 

cui/source/inc/about.hxx

@@ -25,42 +25,37 @@
 
 // include ---------------------------------------------------------------
 
-#include <tools/resary.hxx>
 #include <vcl/button.hxx>
-#include <vcl/accel.hxx>
 #include <svtools/svmedit.hxx>
+#include <svtools/fixedhyper.hxx>
 #include <tools/list.hxx>
 #include <svtools/stdctrl.hxx>
 #include <sfx2/basedlgs.hxx>        // SfxModalDialog
 
-DECLARE_LIST( AccelList, Accelerator* )
-
 // class AboutDialog -----------------------------------------------------
 
 class AboutDialog : public SfxModalDialog
 {
 private:
-    OKButton        aOKButton;
-    Image           aAppLogo;
+    OKButton            maOKButton;
+    FixedInfo           maVersionText;
+    MultiLineEdit       maBuildInfoEdit;
+    MultiLineEdit       maCopyrightEdit;
+    svt::FixedHyperlink maCreditsLink;
 
-    FixedInfo       aVersionText;
-    MultiLineEdit   aCopyrightText;
-    FixedInfo       aBuildData;
+    Image               maAppLogo;
 
-    ResStringArray* pDeveloperAry;
-    String          aDevVersionStr;
-    String          aAccelStr;
-    String          aVersionData;
-    String          aCopyrightTextStr;
+    String              maCopyrightTextStr;
+    rtl::OUString       maVersionData;
 
-    AccelList       aAccelList;
+    void                InitControls();
+    void                ApplyStyleSettings();
+    void                LayoutControls( Size& aDlgSize );
 
-    AutoTimer       aTimer;
-    long            nOff;
-    long            m_nDeltaWidth;
-    int             m_nPendingScrolls;
+    const rtl::OUString GetBuildId() const;
+    const rtl::OUString GetBuildVersionString() const;
 
-    sal_Bool            bNormal;
+    DECL_DLLPRIVATE_LINK(OpenLinkHdl_Impl, svt::FixedHyperlink* );
 
 protected:
     virtual sal_Bool    Close();
@@ -70,8 +65,6 @@ public:
     AboutDialog( Window* pParent, const ResId& nId );
     ~AboutDialog();
 
-    DECL_LINK( TimerHdl, Timer * );
-    DECL_LINK( AccelSelectHdl, Accelerator * );
 };
 
 #endif // #ifndef _ABOUT_HXX

scp2/source/ooo/common_brand.scp

@@ -110,8 +110,7 @@ Module gid_Module_Langpack_Brand_Template
             gid_Brand_Dir_Readme,
             gid_Brand_Dir_Share,
             gid_Brand_Dir_Share_Readme);
-    Files = (gid_Brand_File_Res_About,
-             gid_Brand_File_Res_Oirm,
+    Files = (gid_Brand_File_Res_Oirm,
              gid_Brand_File_Readme_Readme,
              gid_Brand_File_Readme_Readme_Html,
              gid_Brand_File_Share_Registry_Cjk_Xcd,
@@ -1325,6 +1324,3 @@ File gid_Brand_File_Bin_Python
     Styles = (PACKED);
 End
 #endif
-
-BRAND_RES_FILE( gid_Brand_File_Res_About, about )
-

svtools/inc/svtools/svtools.hrc

@@ -28,9 +28,6 @@
 #define RID_SVTOOLS_BITMAP_START        (RID_SVTOOLS_START + 0)
 #define RID_SVTOOLS_IMAGELIST_START     (RID_SVTOOLS_START + 0)
 
-#define ABOUT_STR_COPYRIGHT             (RID_SVTOOLS_START + 1)
-#define ABOUT_STR_DEVELOPER_ARY         (RID_SVTOOLS_START + 2)
-
 //.............................................................................
 // various unsorted stuff
 

svx/AllLangResTarget_about.mk

-#**************************************************************
-#  
-#  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
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-#**************************************************************
-
-
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,about))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,about,svx))
-
-$(eval $(call gb_AllLangResTarget_add_srs,about,svx/about))
-
-$(eval $(call gb_SrsTarget_SrsTarget,svx/about))
-
-$(eval $(call gb_SrsTarget_set_include,svx/about,\
-    $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
-    -I$(SRCDIR)/svx/inc/ \
-))
-
-$(eval $(call gb_SrsTarget_add_files,svx/about,\
-    svx/source/intro/about_ooo.src \
-))
-

svx/Module_svx.mk

@@ -30,7 +30,6 @@ $(eval $(call gb_Module_add_targets,svx,\
     AllLangResTarget_svx \
     AllLangResTarget_ofa \
     AllLangResTarget_gal \
-    AllLangResTarget_about \
     AllLangResTarget_textconversiondlgs \
     Package_inc \
     Package_sdi \

svx/source/intro/about_ooo.src

-/**************************************************************
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-
-#include <svtools/svtools.hrc>
-#include "about_ooo.hrc"
-
-String ABOUT_STR_COPYRIGHT
-{
-    Text[ en-US ] = "Copyright © 2012 Apache Software Foundation. All rights reserved.\nThis product was created by %OOOVENDOR, based on Apache OpenOffice.\nApache OpenOffice acknowledges all community members, especially those mentioned at\n http://www.openoffice.org/welcome/credits.html.";
-};
-
-StringArray ABOUT_STR_DEVELOPER_ARY
-{
-    OOO_CONTRIBUTOR_LIST
-};
-