convert new lib dialog to .ui

and a drive-by on some no .src InfoBox and ErrorBoxes to MessageDialog

Change-Id: Ideb58a0042ed45a49bff9b336622dfe11bb363ab

6 files changed, 140 insertions, 83 deletions

diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index 053f77b35b2f..ec1e99f35db3 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/BasicIDE,\
 $(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
 	basctl/uiconfig/basicide/ui/basicmacrodialog \
 	basctl/uiconfig/basicide/ui/gotolinedialog \
+	basctl/uiconfig/basicide/ui/newlibdialog \
 	basctl/uiconfig/basicide/ui/organizedialog \
 ))
 
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index b5077b8b0193..4c58e73cc5a1 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -34,7 +34,6 @@
 #define RID_TP_LIBS                     ( RID_BASICIDE_START + 38 )
 #define RID_TP_DLGS                     ( RID_BASICIDE_START + 39 )
 #define RID_DLG_LIBS                    ( RID_BASICIDE_START + 40 )
-#define RID_DLG_NEWLIB                  ( RID_BASICIDE_START + 42 )
 #define RID_DLG_EXPORT                  ( RID_BASICIDE_START + 43 )
 #define RID_POPUP_DLGED                 ( RID_BASICIDE_START + 62 )
 #define RID_PRINTDLG_STRLIST            ( RID_BASICIDE_START + 78 )
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 315479d182c2..956f17018f40 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
 #include <sot/storinfo.hxx>
 
 #include <moduldlg.hrc>
@@ -291,7 +291,7 @@ sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, Selection& )
     OUString aLibName = GetEntryText( pEntry, 0 );
     if ( aLibName.equalsIgnoreAsciiCase( "Standard" ) )
     {
-        ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_CANNOTCHANGENAMESTDLIB) ).Execute();
+        MessageDialog(this, IDE_RESSTR(RID_STR_CANNOTCHANGENAMESTDLIB)).Execute();
         return false;
     }
 
@@ -301,7 +301,7 @@ sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, Selection& )
     if ( ( xModLibContainer.is() && xModLibContainer->hasByName( aLibName ) && xModLibContainer->isLibraryReadOnly( aLibName ) && !xModLibContainer->isLibraryLink( aLibName ) ) ||
          ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aLibName ) && xDlgLibContainer->isLibraryReadOnly( aLibName ) && !xDlgLibContainer->isLibraryLink( aLibName ) ) )
     {
-        ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_LIBISREADONLY) ).Execute();
+        MessageDialog(this, IDE_RESSTR(RID_STR_LIBISREADONLY)).Execute();
         return false;
     }
 
@@ -353,7 +353,7 @@ sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewNam
         }
         catch (const container::ElementExistException& )
         {
-            ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED) ).Execute();
+            MessageDialog(this, IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED)).Execute();
             return false;
         }
         catch (const container::NoSuchElementException& )
@@ -366,9 +366,9 @@ sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewNam
     if ( !bValid )
     {
         if ( rNewName.getLength() > 30 )
-            ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_LIBNAMETOLONG) ).Execute();
+            MessageDialog(this, IDE_RESSTR(RID_STR_LIBNAMETOLONG)).Execute();
         else
-            ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_BADSBXNAME) ).Execute();
+            MessageDialog(this, IDE_RESSTR(RID_STR_BADSBXNAME)).Execute();
     }
 
     return bValid;
@@ -380,27 +380,24 @@ sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewNam
 
 IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler)
 {
-    if (IsValidSbxName(aEdit.GetText()))
+    if (IsValidSbxName(m_pEdit->GetText()))
         EndDialog(1);
     else
     {
-        ErrorBox(this, WB_OK | WB_DEF_OK,
-                 IDE_RESSTR(RID_STR_BADSBXNAME)).Execute();
-        aEdit.GrabFocus();
+        MessageDialog(this, IDE_RESSTR(RID_STR_BADSBXNAME)).Execute();
+        m_pEdit->GrabFocus();
     }
     return 0;
 }
 
 NewObjectDialog::NewObjectDialog(Window * pParent, ObjectMode::Mode eMode,
-                                 bool bCheckName)
-    : ModalDialog( pParent, IDEResId( RID_DLG_NEWLIB ) ),
-        aText( this, IDEResId( RID_FT_NEWLIB ) ),
-        aEdit( this, IDEResId( RID_ED_LIBNAME ) ),
-        aOKButton( this, IDEResId( RID_PB_OK ) ),
-        aCancelButton( this, IDEResId( RID_PB_CANCEL ) )
+    bool bCheckName)
+    : ModalDialog(pParent, "NewLibDialog", "modules/BasicIDE/ui/newlibdialog.ui")
 {
-    FreeResource();
-    aEdit.GrabFocus();
+    get(m_pOKButton, "ok");
+    get(m_pEdit, "entry");
+
+    m_pEdit->GrabFocus();
 
     switch (eMode)
     {
@@ -421,17 +418,10 @@ NewObjectDialog::NewObjectDialog(Window * pParent, ObjectMode::Mode eMode,
     }
 
     if (bCheckName)
-        aOKButton.SetClickHdl(LINK(this, NewObjectDialog, OkButtonHandler));
+        m_pOKButton->SetClickHdl(LINK(this, NewObjectDialog, OkButtonHandler));
 }
 
 //----------------------------------------------------------------------------
-
-NewObjectDialog::~NewObjectDialog()
-{
-}
-
-
-//----------------------------------------------------------------------------
 // GotoLineDialog
 //----------------------------------------------------------------------------
 
@@ -878,7 +868,7 @@ void LibPage::InsertLib()
             }
 
             if ( !pLibDlg )
-                InfoBox( this, IDE_RESSTR(RID_STR_NOLIBINSTORAGE) ).Execute();
+                MessageDialog(this, IDE_RESSTR(RID_STR_NOLIBINSTORAGE), VCL_MESSAGE_INFO).Execute();
             else
             {
                 bool bChanges = false;
@@ -915,7 +905,7 @@ void LibPage::InsertLib()
                                     // check, if the library is the Standard library
                                     if ( aLibName == "Standard" )
                                     {
-                                        ErrorBox( this, WB_OK | WB_DEF_OK, IDE_RESSTR(RID_STR_REPLACESTDLIB) ).Execute();
+                                        MessageDialog(this, IDE_RESSTR(RID_STR_REPLACESTDLIB)).Execute();
                                         continue;
                                     }
 
@@ -927,7 +917,7 @@ void LibPage::InsertLib()
                                         aErrStr = aErrStr.replaceAll("XX", aLibName);
                                         aErrStr += "\n";
                                         aErrStr += IDE_RESSTR(RID_STR_LIBISREADONLY);
-                                        ErrorBox( this, WB_OK | WB_DEF_OK, aErrStr ).Execute();
+                                        MessageDialog(this, aErrStr).Execute();
                                         continue;
                                     }
 
@@ -944,7 +934,7 @@ void LibPage::InsertLib()
                                     aErrStr = aErrStr.replaceAll("XX", aLibName);
                                     aErrStr += "\n" ;
                                     aErrStr += IDE_RESSTR(RID_STR_SBXNAMEALLREADYUSED);
-                                    ErrorBox( this, WB_OK | WB_DEF_OK, aErrStr ).Execute();
+                                    MessageDialog(this, aErrStr).Execute();
                                     continue;
                                 }
                             }
@@ -963,7 +953,7 @@ void LibPage::InsertLib()
                                     {
                                         OUString aErrStr( IDE_RESSTR(RID_STR_NOIMPORT) );
                                         aErrStr = aErrStr.replaceAll("XX", aLibName);
-                                        ErrorBox( this, WB_OK | WB_DEF_OK, aErrStr ).Execute();
+                                        MessageDialog(this, aErrStr).Execute();
                                         continue;
                                     }
                                 }
@@ -1555,17 +1545,15 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
 
         if ( aLibName.getLength() > 30 )
         {
-            ErrorBox( pWin, WB_OK | WB_DEF_OK, IDEResId(RID_STR_LIBNAMETOLONG).toString() ).Execute();
+            MessageDialog(pWin, IDEResId(RID_STR_LIBNAMETOLONG).toString()).Execute();
         }
         else if ( !IsValidSbxName( aLibName ) )
         {
-            ErrorBox( pWin, WB_OK | WB_DEF_OK,
-                        IDEResId(RID_STR_BADSBXNAME).toString() ).Execute();
+            MessageDialog(pWin, IDEResId(RID_STR_BADSBXNAME).toString()).Execute();
         }
         else if ( rDocument.hasLibrary( E_SCRIPTS, aLibName ) || rDocument.hasLibrary( E_DIALOGS, aLibName ) )
         {
-            ErrorBox( pWin, WB_OK | WB_DEF_OK,
-                        IDEResId(RID_STR_SBXNAMEALLREADYUSED2).toString() ).Execute();
+            MessageDialog(pWin, IDEResId(RID_STR_SBXNAMEALLREADYUSED2).toString()).Execute();
         }
         else
         {
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index 921aa7df31d9..a341a96a0901 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -54,19 +54,18 @@ namespace ObjectMode
 class NewObjectDialog : public ModalDialog
 {
 private:
-    FixedText       aText;
-    Edit            aEdit;
-    OKButton        aOKButton;
-    CancelButton    aCancelButton;
+    Edit*           m_pEdit;
+    OKButton*       m_pOKButton;
 
     DECL_LINK(OkButtonHandler, void *);
-
 public:
     NewObjectDialog (Window* pParent, ObjectMode::Mode, bool bCheckName = false);
-    virtual ~NewObjectDialog ();
-
-    OUString    GetObjectName() const { return aEdit.GetText(); }
-    void        SetObjectName( const OUString& rName ) { aEdit.SetText( rName ); aEdit.SetSelection( Selection( 0, rName.getLength() ) );}
+    OUString GetObjectName() const { return m_pEdit->GetText(); }
+    void SetObjectName( const OUString& rName )
+    {
+        m_pEdit->SetText( rName );
+        m_pEdit->SetSelection(Selection( 0, rName.getLength()));
+    }
 };
 
 class GotoLineDialog : public ModalDialog
diff --git a/basctl/source/basicide/moduldlg.src b/basctl/source/basicide/moduldlg.src
index 20fd38106958..7f5a8025d5a6 100644
--- a/basctl/source/basicide/moduldlg.src
+++ b/basctl/source/basicide/moduldlg.src
@@ -272,43 +272,6 @@ ModalDialog RID_DLG_LIBS
     };
 };
 
-ModalDialog RID_DLG_NEWLIB
-{
-    HelpID = "basctl:ModalDialog:RID_DLG_NEWLIB";
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 160 , 55 ) ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    OKButton RID_PB_OK
-    {
-        Pos = MAP_APPFONT ( 104 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton RID_PB_CANCEL
-    {
-        Pos = MAP_APPFONT ( 104 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    FixedText RID_FT_NEWLIB
-    {
-        Pos = MAP_APPFONT ( 6 , 6 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-        Text [ en-US ] = "~Name:" ;
-    };
-    Edit RID_ED_LIBNAME
-    {
-        HelpID = "basctl:Edit:RID_DLG_NEWLIB:RID_ED_LIBNAME";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 19 ) ;
-        Size = MAP_APPFONT ( 92 , 12 ) ;
-        TabStop = TRUE ;
-    };
-};
-
 ModalDialog RID_DLG_EXPORT
 {
     HelpID = "basctl:ModalDialog:RID_DLG_EXPORT";
diff --git a/basctl/uiconfig/basicide/ui/newlibdialog.ui b/basctl/uiconfig/basicide/ui/newlibdialog.ui
new file mode 100644
index 000000000000..f8396eac12bd
--- /dev/null
+++ b/basctl/uiconfig/basicide/ui/newlibdialog.ui
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Tue Dec 31 20:57:07 2013 -->
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkDialog" id="NewLibDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <child>
+          <object class="GtkGrid" id="grid3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">12</property>
+            <property name="row_homogeneous">True</property>
+            <child>
+              <object class="GtkLabel" id="area">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">_Name:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">entry</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="ok">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">ok</action-widget>
+      <action-widget response="0">cancel</action-widget>
+    </action-widgets>
+  </object>
+</interface>