RID_DLG_UPDATE conversion to .ui

Conflicts:
	desktop/source/deployment/gui/descedit.hxx

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

desktop/UIConfig_deployment.mk

@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_uifiles,desktop,\
     desktop/uiconfig/ui/extensionmanager \
     desktop/uiconfig/ui/licensedialog \
     desktop/uiconfig/ui/showlicensedialog \
+    desktop/uiconfig/ui/updatedialog \
 ))
 
 # vim: set noet sw=4 ts=4:

desktop/source/deployment/gui/descedit.cxx

@@ -18,6 +18,7 @@
  */
 
 
+#include <vcl/builder.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/txtattr.hxx>
 #include <vcl/xtextedt.hxx>
@@ -30,9 +31,9 @@ using dp_gui::DescriptionEdit;
 
 // DescriptionEdit -------------------------------------------------------
 
-DescriptionEdit::DescriptionEdit( Window* pParent, const ResId& rResId ) :
+DescriptionEdit::DescriptionEdit( Window* pParent) :
 
-    ExtMultiLineEdit( pParent, rResId ),
+    ExtMultiLineEdit( pParent),
 
     m_bIsVerticalScrollBarHidden( true )
 
@@ -41,6 +42,11 @@ DescriptionEdit::DescriptionEdit( Window* pParent, const ResId& rResId ) :
 }
 
 
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDescriptionEdit(Window* pParent, VclBuilder::stringmap &)
+{
+    return new DescriptionEdit(pParent);
+}
+
 
 void DescriptionEdit::Init()
 {

desktop/source/deployment/gui/descedit.hxx

@@ -35,7 +35,7 @@ namespace dp_gui
         void                Init();
 
     public:
-        DescriptionEdit( Window* pParent, const ResId& rResId );
+        DescriptionEdit( Window* pParent);
         virtual inline ~DescriptionEdit() {}
 
         void                Clear();

desktop/source/deployment/gui/dp_gui.hrc

@@ -67,41 +67,24 @@
 #define RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES        (RID_DEPLOYMENT_GUI_START + 8)
 #define RID_WARNINGBOX_INSTALL_EXTENSION                          (RID_DEPLOYMENT_GUI_START + 9)
 
-#define RID_DLG_UPDATE                      (RID_DEPLOYMENT_GUI_START + 10)
-
-#define RID_DLG_UPDATE_CHECKING             1
-#define RID_DLG_UPDATE_THROBBER             2
-#define RID_DLG_UPDATE_UPDATE               3
-#define RID_DLG_UPDATE_UPDATES              4
-#define RID_DLG_UPDATE_ALL                  5
-#define RID_DLG_UPDATE_DESCRIPTION          6
-#define RID_DLG_UPDATE_DESCRIPTIONS         7
-#define RID_DLG_UPDATE_LINE                 8
-#define RID_DLG_UPDATE_HELP                 9
-#define RID_DLG_UPDATE_OK                   10
-#define RID_DLG_UPDATE_CLOSE                11
-#define RID_DLG_UPDATE_NORMALALERT          12
-#define RID_DLG_UPDATE_ERROR                14
-#define RID_DLG_UPDATE_NONE                 15
-#define RID_DLG_UPDATE_NOINSTALLABLE        16
-#define RID_DLG_UPDATE_FAILURE              17
-#define RID_DLG_UPDATE_UNKNOWNERROR         18
-#define RID_DLG_UPDATE_NODESCRIPTION        19
-#define RID_DLG_UPDATE_NOINSTALL            20
-#define RID_DLG_UPDATE_NODEPENDENCY         21
-#define RID_DLG_UPDATE_NODEPENDENCY_CUR_VER 22
-#define RID_DLG_UPDATE_BROWSERBASED         25
-#define RID_DLG_UPDATE_PUBLISHER_LABEL      26
-#define RID_DLG_UPDATE_PUBLISHER_LINK       27
-#define RID_DLG_UPDATE_RELEASENOTES_LABEL   28
-#define RID_DLG_UPDATE_RELEASENOTES_LINK    29
-#define RID_DLG_UPDATE_VERSION              31
-#define RID_DLG_UPDATE_IGNORE               32
-#define RID_DLG_UPDATE_ENABLE               33
-#define RID_DLG_UPDATE_IGNORE_ALL           34
-#define RID_DLG_UPDATE_IGNORED_UPDATE       35
-
-#define RID_DLG_UPDATEINSTALL                  (RID_DEPLOYMENT_GUI_START + 20)
+#define RID_DLG_UPDATE_NORMALALERT          (RID_DEPLOYMENT_GUI_START + 11)
+#define RID_DLG_UPDATE_ERROR                (RID_DEPLOYMENT_GUI_START + 12)
+#define RID_DLG_UPDATE_NONE                 (RID_DEPLOYMENT_GUI_START + 13)
+#define RID_DLG_UPDATE_NOINSTALLABLE        (RID_DEPLOYMENT_GUI_START + 14)
+#define RID_DLG_UPDATE_FAILURE              (RID_DEPLOYMENT_GUI_START + 15)
+#define RID_DLG_UPDATE_UNKNOWNERROR         (RID_DEPLOYMENT_GUI_START + 16)
+#define RID_DLG_UPDATE_NODESCRIPTION        (RID_DEPLOYMENT_GUI_START + 17)
+#define RID_DLG_UPDATE_NOINSTALL            (RID_DEPLOYMENT_GUI_START + 18)
+#define RID_DLG_UPDATE_NODEPENDENCY         (RID_DEPLOYMENT_GUI_START + 19)
+#define RID_DLG_UPDATE_NODEPENDENCY_CUR_VER (RID_DEPLOYMENT_GUI_START + 20)
+#define RID_DLG_UPDATE_BROWSERBASED         (RID_DEPLOYMENT_GUI_START + 21)
+#define RID_DLG_UPDATE_VERSION              (RID_DEPLOYMENT_GUI_START + 22)
+#define RID_DLG_UPDATE_IGNORE               (RID_DEPLOYMENT_GUI_START + 23)
+#define RID_DLG_UPDATE_ENABLE               (RID_DEPLOYMENT_GUI_START + 24)
+#define RID_DLG_UPDATE_IGNORE_ALL           (RID_DEPLOYMENT_GUI_START + 25)
+#define RID_DLG_UPDATE_IGNORED_UPDATE       (RID_DEPLOYMENT_GUI_START + 36)
+
+#define RID_DLG_UPDATEINSTALL                  (RID_DEPLOYMENT_GUI_START + 37)
 
 #define RID_IMG_WARNING                        (RID_DEPLOYMENT_GUI_START+56)
 #define RID_IMG_LOCKED                         (RID_DEPLOYMENT_GUI_START+58)

desktop/source/deployment/gui/dp_gui_updatedialog.hxx

@@ -30,6 +30,7 @@
 #include "svtools/svlbitm.hxx"
 #include "svx/checklbx.hxx"
 #include "tools/link.hxx"
+#include <vcl/layout.hxx>
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
@@ -109,8 +110,7 @@ private:
     class CheckListBox: public SvxCheckListBox {
     public:
         CheckListBox(
-            UpdateDialog & dialog, ResId const & resource,
-            Image const & normalStaticImage);
+            Window* pParent, UpdateDialog & dialog);
 
         virtual ~CheckListBox();
 
@@ -159,7 +159,7 @@ private:
                          OUString const & sReleaseNotes);
     bool showDescription( ::com::sun::star::uno::Reference<
         ::com::sun::star::xml::dom::XNode > const & aUpdateInfo);
-    bool showDescription( const OUString& rDescription, bool bWithPublisher );
+    bool showDescription( const OUString& rDescription);
     bool isReadOnly( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ) const;
 
     DECL_LINK(selectionHandler, void *);
@@ -170,21 +170,21 @@ private:
 
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
         m_context;
-    FixedText m_checking;
-    Throbber m_throbber;
-    FixedText m_update;
-    UpdateDialog::CheckListBox m_updates;
-    CheckBox m_all;
-    FixedLine m_description;
-    FixedText m_PublisherLabel;
-    FixedHyperlink m_PublisherLink;
-    FixedText m_ReleaseNotesLabel;
-    FixedHyperlink m_ReleaseNotesLink;
-    dp_gui::DescriptionEdit m_descriptions;
-    FixedLine m_line;
-    HelpButton m_help;
-    PushButton m_ok;
-    PushButton m_close;
+    FixedText* m_pchecking;
+    Throbber* m_pthrobber;
+    FixedText* m_pUpdate;
+    VclScrolledWindow* m_pContainer;
+    UpdateDialog::CheckListBox* m_pUpdates;
+    CheckBox* m_pAll;
+    FixedText* m_pDescription;
+    FixedText* m_pPublisherLabel;
+    FixedHyperlink* m_pPublisherLink;
+    FixedText* m_pReleaseNotesLabel;
+    FixedHyperlink* m_pReleaseNotesLink;
+    dp_gui::DescriptionEdit* m_pDescriptions;
+    HelpButton* m_pHelp;
+    PushButton* m_pOk;
+    PushButton* m_pClose;
     OUString m_error;
     OUString m_none;
     OUString m_noInstallable;

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

@@ -326,6 +326,9 @@
     <glade-widget-class title="LicenseView" name="deploymentgui-LicenseView"
                         generic-name="LicenseView" parent="GtkTextView"
                         icon-name="widget-gtk-textview"/>
+    <glade-widget-class title="DescriptionEdit" name="deploymentgui-DescriptionEdit"
+                        generic-name="DescriptionEdit" parent="GtkTextView"
+                        icon-name="widget-gtk-textview"/>
     <glade-widget-class title="SvtValueSet" name="svtlo-ValueSet"
                         generic-name="Set of Value Options" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>

include/svx/checklbx.hxx

@@ -46,6 +46,7 @@ public:
     SvxCheckListBox( Window* pParent, WinBits nWinStyle = 0 );
     SvxCheckListBox( Window* pParent, const ResId& rResId,
                      const Image& rNormalStaticImage );
+    void SetNormalStaticImage(const Image& rNormalStaticImage);
     virtual ~SvxCheckListBox();
 
     void            InsertEntry         ( const OUString& rStr,

svx/source/dialog/checklbx.cxx

@@ -50,9 +50,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxCheckListBox(Window *pPa
 SvxCheckListBox::SvxCheckListBox( Window* pParent, const ResId& rResId,
                                   const Image& rNormalStaticImage )
     : SvTreeListBox( pParent, rResId )
-
 {
     Init_Impl();
+    SetNormalStaticImage(rNormalStaticImage);
+}
+
+void SvxCheckListBox::SetNormalStaticImage(const Image& rNormalStaticImage)
+{
     pCheckButton->aBmps[SV_BMP_STATICIMAGE] = rNormalStaticImage;
 }
 
@@ -61,16 +65,12 @@ SvxCheckListBox::~SvxCheckListBox()
     delete pCheckButton;
 }
 
-
-
 void SvxCheckListBox::Init_Impl()
 {
     pCheckButton = new SvLBoxButtonData( this );
     EnableCheckButton( pCheckButton );
 }
 
-
-
 void SvxCheckListBox::InsertEntry( const OUString& rStr, sal_uLong nPos,
                                    void* pUserData,
                                    SvLBoxButtonKind eButtonKind )