convert password dialog to .ui

Change-Id: I29e58d3992f43c5ee469484d0587843b06663bf1

6 files changed, 215 insertions, 210 deletions

diff --git a/uui/UIConfig_uui.mk b/uui/UIConfig_uui.mk
index df6d3e8cfd9a..6c0ca42c18ba 100644
--- a/uui/UIConfig_uui.mk
+++ b/uui/UIConfig_uui.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UIConfig_UIConfig,uui))
 $(eval $(call gb_UIConfig_add_uifiles,uui,\
 	uui/uiconfig/ui/logindialog \
 	uui/uiconfig/ui/masterpassworddlg \
+	uui/uiconfig/ui/password \
 	uui/uiconfig/ui/setmasterpassworddlg \
 	uui/uiconfig/ui/sslwarndialog \
 	uui/uiconfig/ui/unknownauthdialog \
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index c40067b6f250..06653b9a43b3 100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -34,7 +34,6 @@
 
 #define RID_UUI_ERRHDL                                  (RID_UUI_START + 20)
 #define DLG_UUI_MASTERPASSWORD_CRT                      (RID_UUI_START + 21)
-#define DLG_UUI_PASSWORD                                (RID_UUI_START + 22)
 #define STR_ERROR_SIMPLE_PASSWORD_WRONG                 (RID_UUI_START + 23)
 #define STR_ERROR_PASSWORD_TO_OPEN_WRONG                (RID_UUI_START + 24)
 #define STR_ERROR_PASSWORD_TO_MODIFY_WRONG              (RID_UUI_START + 25)
@@ -154,7 +153,6 @@
 #define TITLE_UUI_SSLWARN_INVALID (ERRCODE_AREA_UUI_UNKNOWNAUTH + SSLWARN_TYPE_INVALID + 3)
 
 #define HID_DLG_FILTER_SELECT                                  "UUI_HID_DLG_FILTER_SELECT"
-#define HID_DLG_PASSWORD_UUI                                   "UUI_HID_DLG_PASSWORD_UUI"
 #define HID_XMLSECDLG_MACROWARN                                "UUI_HID_XMLSECDLG_MACROWARN"
 #define HID_DLG_NEWERVERSIONWARNING                            "UUI_HID_DLG_NEWERVERSIONWARNING"
 
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index 83dd4cb5238b..6d6bc023071d 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -23,43 +23,23 @@
 
 #include <vcl/msgbox.hxx>
 
-
 using namespace ::com::sun::star;
 
-
-
-
-static void lcl_Move( Window &rWin, long nOffset )
+PasswordDialog::PasswordDialog(Window* _pParent,
+    task::PasswordRequestMode nDlgMode, ResMgr * pResMgr,
+    OUString& aDocURL, bool bOpenToModify, bool bIsSimplePasswordRequest)
+    : ModalDialog(_pParent, "PasswordDialog", "uui/ui/password.ui")
+    , nMinLen(1)
+    , aPasswdMismatch(ResId(STR_PASSWORD_MISMATCH, *pResMgr))
+    , nDialogMode(nDlgMode)
+    , pResourceMgr(pResMgr)
 {
-    Point aTmp( rWin.GetPosPixel() );
-    aTmp.Y() += nOffset;
-    rWin.SetPosPixel( aTmp );
-}
-
-
+    get(m_pFTPassword, "newpassFT");
+    get(m_pEDPassword, "newpassEntry");
+    get(m_pFTConfirmPassword, "confirmpassFT");
+    get(m_pEDConfirmPassword, "confirmpassEntry");
+    get(m_pOKBtn, "ok");
 
-PasswordDialog::PasswordDialog(
-    Window* _pParent,
-    task::PasswordRequestMode nDlgMode,
-    ResMgr * pResMgr,
-    OUString& aDocURL,
-    bool bOpenToModify,
-    bool bIsSimplePasswordRequest )
-
-    :ModalDialog( _pParent, ResId( DLG_UUI_PASSWORD, *pResMgr ) )
-    ,aFTPassword( this, ResId( FT_PASSWORD, *pResMgr ))
-    ,aEDPassword( this, ResId( ED_PASSWORD, *pResMgr ))
-    ,aFTConfirmPassword( this, ResId( FT_CONFIRM_PASSWORD, *pResMgr ))
-    ,aEDConfirmPassword( this, ResId( ED_CONFIRM_PASSWORD, *pResMgr ))
-    ,aOKBtn ( this, ResId( BTN_PASSWORD_OK, *pResMgr ))
-    ,aCancelBtn ( this, ResId( BTN_PASSWORD_CANCEL, *pResMgr ))
-    ,aHelpBtn ( this, ResId( BTN_PASSWORD_HELP, *pResMgr ))
-    ,aFixedLine1( this, ResId( FL_FIXED_LINE_1, *pResMgr ))
-    ,nMinLen(1)
-    ,aPasswdMismatch( ResId( STR_PASSWORD_MISMATCH, *pResMgr ))
-    ,nDialogMode( nDlgMode )
-    ,pResourceMgr ( pResMgr )
-{
     if( nDialogMode == task::PasswordRequestMode_PASSWORD_REENTER )
     {
         const sal_uInt16 nOpenToModifyErrStrId = bOpenToModify ? STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG;
@@ -71,101 +51,46 @@ PasswordDialog::PasswordDialog(
 
     // default settings for enter password or reenter passwd...
     OUString aTitle(ResId(STR_TITLE_ENTER_PASSWORD, *pResourceMgr).toString());
-    aFTConfirmPassword.Hide();
-    aEDConfirmPassword.Hide();
-    aFTConfirmPassword.Enable( false );
-    aEDConfirmPassword.Enable( false );
+    m_pFTConfirmPassword->Hide();
+    m_pEDConfirmPassword->Hide();
+    m_pFTConfirmPassword->Enable( false );
+    m_pEDConfirmPassword->Enable( false );
 
     // settings for create password
     if (nDialogMode == task::PasswordRequestMode_PASSWORD_CREATE)
     {
         aTitle = ResId(STR_TITLE_CREATE_PASSWORD, *pResourceMgr).toString();
 
-        aFTConfirmPassword.SetText(ResId(STR_CONFIRM_SIMPLE_PASSWORD, *pResourceMgr).toString());
-
-        aFTConfirmPassword.Show();
-        aEDConfirmPassword.Show();
-        aFTConfirmPassword.Enable( true );
-        aEDConfirmPassword.Enable( true );
-    }
-    else
-    {
-        // shrink dialog by size of hidden controls and move rest up accordingly
-
-        long nDelta = aFixedLine1.GetPosPixel().Y() - aFTConfirmPassword.GetPosPixel().Y();
-
-        lcl_Move( aFixedLine1, -nDelta );
-        lcl_Move( aOKBtn, -nDelta );
-        lcl_Move( aCancelBtn, -nDelta );
-        lcl_Move( aHelpBtn, -nDelta );
+        m_pFTConfirmPassword->SetText(ResId(STR_CONFIRM_SIMPLE_PASSWORD, *pResourceMgr).toString());
 
-        Size aNewDlgSize = GetSizePixel();
-        aNewDlgSize.Height() -= nDelta;
-        SetSizePixel( aNewDlgSize );
+        m_pFTConfirmPassword->Show();
+        m_pEDConfirmPassword->Show();
+        m_pFTConfirmPassword->Enable( true );
+        m_pEDConfirmPassword->Enable( true );
     }
 
     SetText( aTitle );
 
     sal_uInt16 nStrId = bOpenToModify ? STR_ENTER_PASSWORD_TO_MODIFY : STR_ENTER_PASSWORD_TO_OPEN;
-    aFTPassword.SetText(ResId(nStrId, *pResourceMgr).toString());
-    aFTPassword.SetText( aFTPassword.GetText() + aDocURL );
+    m_pFTPassword->SetText(ResId(nStrId, *pResourceMgr).toString());
+    m_pFTPassword->SetText( m_pFTPassword->GetText() + aDocURL );
     if (bIsSimplePasswordRequest)
     {
         DBG_ASSERT( aDocURL.isEmpty(), "A simple password request should not have a document URL! Use document password request instead." );
-        aFTPassword.SetText(ResId(STR_ENTER_SIMPLE_PASSWORD, *pResourceMgr).toString());
+        m_pFTPassword->SetText(ResId(STR_ENTER_SIMPLE_PASSWORD, *pResourceMgr).toString());
     }
 
-    FreeResource();
-
-    aOKBtn.SetClickHdl( LINK( this, PasswordDialog, OKHdl_Impl ) );
-
-
-
-    // move controls down by extra height needed for aFTPassword
-    // (usually only needed if a URL was provided)
-
-
-    long nLabelWidth    = aFTPassword.GetSizePixel().Width();
-    long nLabelHeight   = aFTPassword.GetSizePixel().Height();
-    long nTextWidth     = aFTPassword.GetCtrlTextWidth( aFTPassword.GetText() );
-    long nTextHeight    = aFTPassword.GetTextHeight();
-
-    Rectangle aLabelRect( aFTPassword.GetPosPixel(), aFTPassword.GetSizePixel() );
-    Rectangle aRect = aFTPassword.GetTextRect( aLabelRect, aFTPassword.GetText() );
-
-    long nNewLabelHeight = 0;
-    for( nNewLabelHeight = ( nTextWidth / nLabelWidth + 1 ) * nTextHeight;
-        nNewLabelHeight < aRect.GetHeight();
-        nNewLabelHeight += nTextHeight ) {} ;
-
-    long nDelta = nNewLabelHeight - nLabelHeight;
-
-    Size aNewDlgSize = GetSizePixel();
-    aNewDlgSize.Height() += nDelta;
-    SetSizePixel( aNewDlgSize );
-
-    Size aNewLabelSize = aFTPassword.GetSizePixel();
-    aNewLabelSize.Height() = nNewLabelHeight;
-    aFTPassword.SetPosSizePixel( aFTPassword.GetPosPixel(), aNewLabelSize );
-
-    lcl_Move( aEDPassword, nDelta );
-    lcl_Move( aFTConfirmPassword, nDelta );
-    lcl_Move( aEDConfirmPassword, nDelta );
-    lcl_Move( aFixedLine1, nDelta );
-    lcl_Move( aOKBtn, nDelta );
-    lcl_Move( aCancelBtn, nDelta );
-    lcl_Move( aHelpBtn, nDelta );
+    m_pOKBtn->SetClickHdl( LINK( this, PasswordDialog, OKHdl_Impl ) );
 }
 
-
 IMPL_LINK_NOARG(PasswordDialog, OKHdl_Impl)
 {
-    bool bEDPasswdValid = aEDPassword.GetText().getLength() >= nMinLen;
-    bool bPasswdMismatch = aEDConfirmPassword.GetText() != aEDPassword.GetText();
-    bool bValid = (!aEDConfirmPassword.IsVisible() && bEDPasswdValid) ||
-            (aEDConfirmPassword.IsVisible() && bEDPasswdValid && !bPasswdMismatch);
+    bool bEDPasswdValid = m_pEDPassword->GetText().getLength() >= nMinLen;
+    bool bPasswdMismatch = m_pEDConfirmPassword->GetText() != m_pEDPassword->GetText();
+    bool bValid = (!m_pEDConfirmPassword->IsVisible() && bEDPasswdValid) ||
+            (m_pEDConfirmPassword->IsVisible() && bEDPasswdValid && !bPasswdMismatch);
 
-    if (aEDConfirmPassword.IsVisible() && bPasswdMismatch)
+    if (m_pEDConfirmPassword->IsVisible() && bPasswdMismatch)
     {
         ErrorBox aErrorBox( this, WB_OK, aPasswdMismatch );
         aErrorBox.Execute();
diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx
index 933c7130c951..bb5a592165b2 100644
--- a/uui/source/passworddlg.hxx
+++ b/uui/source/passworddlg.hxx
@@ -32,14 +32,11 @@
 
 class PasswordDialog : public ModalDialog
 {
-    FixedText       aFTPassword;
-    Edit            aEDPassword;
-    FixedText       aFTConfirmPassword;
-    Edit            aEDConfirmPassword;
-    OKButton        aOKBtn;
-    CancelButton    aCancelBtn;
-    HelpButton      aHelpBtn;
-    FixedLine       aFixedLine1;
+    FixedText*      m_pFTPassword;
+    Edit*           m_pEDPassword;
+    FixedText*      m_pFTConfirmPassword;
+    Edit*           m_pEDConfirmPassword;
+    OKButton*       m_pOKBtn;
     sal_uInt16      nMinLen;
     OUString        aPasswdMismatch;
 
@@ -51,7 +48,7 @@ public:
             bool bOpenToModify = false, bool bIsSimplePasswordRequest = false );
 
     void            SetMinLen( sal_uInt16 nMin ) { nMinLen = nMin; }
-    OUString        GetPassword() const { return aEDPassword.GetText(); }
+    OUString        GetPassword() const { return m_pEDPassword->GetText(); }
 
 private:
     ::com::sun::star::task::PasswordRequestMode     nDialogMode;
diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src
index e7a4aaaacede..bbbb87439d76 100644
--- a/uui/source/passworddlg.src
+++ b/uui/source/passworddlg.src
@@ -22,106 +22,39 @@
 #include <ids.hrc>
 #include <passworddlg.hrc>
 
-ModalDialog DLG_UUI_PASSWORD
+String STR_ENTER_PASSWORD_TO_OPEN
 {
-    HelpId = HID_DLG_PASSWORD_UUI;
-    Border = TRUE ;
-    Moveable = TRUE ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT( 165, 95 );
-
-    FixedText FT_PASSWORD
-    {
-        Pos = MAP_APPFONT( 3, 6 );
-        Size = MAP_APPFONT( 159, 8 );
-        WordBreak = TRUE;
-    };
-
-    Edit ED_PASSWORD
-    {
-        HelpID = "uui:Edit:DLG_UUI_PASSWORD:ED_PASSWORD";
-        Pos = MAP_APPFONT( 3, 17 );
-        Size = MAP_APPFONT( 159, 12 );
-        Border = TRUE ;
-        PassWord = TRUE ;
-    };
-
-    FixedText FT_CONFIRM_PASSWORD
-    {
-        Pos = MAP_APPFONT( 3, 34 );
-        Size = MAP_APPFONT( 159, 8 );
-        WordBreak = TRUE;
-    };
-
-    Edit ED_CONFIRM_PASSWORD
-    {
-        HelpID = "uui:Edit:DLG_UUI_PASSWORD:ED_CONFIRM_PASSWORD";
-        Pos = MAP_APPFONT( 3, 45 );
-        Size = MAP_APPFONT( 159, 12 );
-        Border = TRUE ;
-        PassWord = TRUE ;
-    };
-
-    FixedLine FL_FIXED_LINE_1
-    {
-        Pos = MAP_APPFONT( 0, 63 );
-        Size = MAP_APPFONT( 165, 8 );
-    };
-
-    HelpButton BTN_PASSWORD_HELP
-    {
-        Pos = MAP_APPFONT( 3, 76 );
-        Size = MAP_APPFONT( 50, 14 );
-    };
-
-    OKButton BTN_PASSWORD_OK
-    {
-        Pos = MAP_APPFONT( 59, 76 );
-        Size = MAP_APPFONT( 50, 14 );
-        DefButton = TRUE ;
-    };
-
-    CancelButton BTN_PASSWORD_CANCEL
-    {
-        Pos = MAP_APPFONT( 112, 76 );
-        Size = MAP_APPFONT( 50, 14 );
-    };
-
-    String STR_ENTER_PASSWORD_TO_OPEN
-    {
-        Text [ en-US ] = "Enter password to open file: \n";
-    };
+    Text [ en-US ] = "Enter password to open file: \n";
+};
 
-    String STR_ENTER_PASSWORD_TO_MODIFY
-    {
-        Text [ en-US ] = "Enter password to modify file: \n";
-    };
+String STR_ENTER_PASSWORD_TO_MODIFY
+{
+    Text [ en-US ] = "Enter password to modify file: \n";
+};
 
-    String STR_ENTER_SIMPLE_PASSWORD
-    {
-        Text [ en-US ] = "Enter password: ";
-    };
+String STR_ENTER_SIMPLE_PASSWORD
+{
+    Text [ en-US ] = "Enter password: ";
+};
 
-    String STR_CONFIRM_SIMPLE_PASSWORD
-    {
-        Text [ en-US ] = "Confirm password: ";
-    };
+String STR_CONFIRM_SIMPLE_PASSWORD
+{
+    Text [ en-US ] = "Confirm password: ";
+};
 
-    String STR_TITLE_CREATE_PASSWORD
-    {
-        Text [ en-US ] = "Set Password";
-    };
+String STR_TITLE_CREATE_PASSWORD
+{
+    Text [ en-US ] = "Set Password";
+};
 
-    String STR_TITLE_ENTER_PASSWORD
-    {
-        Text [ en-US ] = "Enter Password";
-    };
+String STR_TITLE_ENTER_PASSWORD
+{
+    Text [ en-US ] = "Enter Password";
+};
 
-    String STR_PASSWORD_MISMATCH
-    {
-        Text [ en-US ] = "The confirmation password did not match the password. Set the password again by entering the same password in both boxes." ;
-    };
+String STR_PASSWORD_MISMATCH
+{
+    Text [ en-US ] = "The confirmation password did not match the password. Set the password again by entering the same password in both boxes." ;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/uiconfig/ui/password.ui b/uui/uiconfig/ui/password.ui
new file mode 100644
index 000000000000..f3b7c9bb136f
--- /dev/null
+++ b/uui/uiconfig/ui/password.ui
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkDialog" id="PasswordDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">Set Password</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 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>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="label">gtk-help</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">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkGrid" id="grid1">
+            <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>
+            <child>
+              <object class="GtkLabel" id="confirmpassFT">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">confirmpassEntry</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="newpassFT">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">newpassEntry</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="newpassEntry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="visibility">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="confirmpassEntry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="visibility">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">3</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">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">ok</action-widget>
+      <action-widget response="0">cancel</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkSizeGroup" id="sizegroup1"/>
+</interface>