cws tl79: merge

4 files changed, 188 insertions, 205 deletions

diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index 4bfa2147ec..3d23ef3c7d 100644..100755
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -47,6 +47,14 @@
 //............................................................................
 //............................................................................
 
+static void lcl_Move( Window &rWin, long nOffset )
+{
+    Point aTmp( rWin.GetPosPixel() );
+    aTmp.Y() -= nOffset;
+    rWin.SetPosPixel( aTmp );
+}
+
+
 void LoginDialog::HideControls_Impl( USHORT nFlags )
 {
     FASTBOOL bPathHide = FALSE;
@@ -91,7 +99,8 @@ void LoginDialog::HideControls_Impl( USHORT nFlags )
     if ( ( nFlags & LF_NO_ERRORTEXT ) == LF_NO_ERRORTEXT )
     {
         aErrorInfo.Hide();
-        aErrorGB.Hide();
+        aErrorFT.Hide();
+        aLogin1FL.Hide();
         bErrorHide = TRUE;
     }
 
@@ -110,53 +119,28 @@ void LoginDialog::HideControls_Impl( USHORT nFlags )
 
     if ( bErrorHide )
     {
-        long nOffset = aLoginGB.GetPosPixel().Y() -
-                       aErrorGB.GetPosPixel().Y();
-        Point aNewPnt = aRequestInfo.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aRequestInfo.SetPosPixel( aNewPnt );
-        aNewPnt = aPathFT.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aPathFT.SetPosPixel( aNewPnt );
-        aNewPnt = aPathED.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aPathED.SetPosPixel( aNewPnt );
-        aNewPnt = aPathInfo.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aPathInfo.SetPosPixel( aNewPnt );
-        aNewPnt = aPathBtn.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aPathBtn.SetPosPixel( aNewPnt );
-        aNewPnt = aNameFT.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aNameFT.SetPosPixel( aNewPnt );
-        aNewPnt = aNameED.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aNameED.SetPosPixel( aNewPnt );
-        aNewPnt = aNameInfo.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aNameInfo.SetPosPixel( aNewPnt );
-        aNewPnt = aPasswordFT.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aPasswordFT.SetPosPixel( aNewPnt );
-        aNewPnt = aPasswordED.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aPasswordED.SetPosPixel( aNewPnt );
-        aNewPnt = aAccountFT.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aAccountFT.SetPosPixel( aNewPnt );
-        aNewPnt = aAccountED.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aAccountED.SetPosPixel( aNewPnt );
-        aNewPnt = aSavePasswdBtn.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aSavePasswdBtn.SetPosPixel( aNewPnt );
-        aNewPnt = aUseSysCredsCB.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aUseSysCredsCB.SetPosPixel( aNewPnt );
-        aNewPnt = aLoginGB.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aLoginGB.SetPosPixel( aNewPnt );
+        long nOffset = aRequestInfo.GetPosPixel().Y() -
+                       aErrorFT.GetPosPixel().Y();
+        lcl_Move( aRequestInfo, nOffset );
+        lcl_Move( aLogin2FL, nOffset );
+        lcl_Move( aPathFT, nOffset );
+        lcl_Move( aPathED, nOffset );
+        lcl_Move( aPathInfo, nOffset );
+        lcl_Move( aPathBtn, nOffset );
+        lcl_Move( aNameFT, nOffset );
+        lcl_Move( aNameED, nOffset );
+        lcl_Move( aNameInfo, nOffset );
+        lcl_Move( aPasswordFT, nOffset );
+        lcl_Move( aPasswordED, nOffset );
+        lcl_Move( aAccountFT, nOffset );
+        lcl_Move( aAccountED, nOffset );
+        lcl_Move( aSavePasswdBtn, nOffset );
+        lcl_Move( aUseSysCredsCB, nOffset );
+        lcl_Move( aButtonsFL, nOffset );
+        lcl_Move( aOKBtn, nOffset );
+        lcl_Move( aCancelBtn, nOffset );
+        lcl_Move( aHelpBtn, nOffset );
+
         Size aNewSiz = GetSizePixel();
         aNewSiz.Height() -= nOffset;
         SetSizePixel( aNewSiz );
@@ -166,24 +150,20 @@ void LoginDialog::HideControls_Impl( USHORT nFlags )
     {
         long nOffset = aNameED.GetPosPixel().Y() -
                        aPathED.GetPosPixel().Y();
+        lcl_Move( aNameFT, nOffset );
+        lcl_Move( aNameED, nOffset );
+        lcl_Move( aNameInfo, nOffset );
+        lcl_Move( aPasswordFT, nOffset );
+        lcl_Move( aPasswordED, nOffset );
+        lcl_Move( aAccountFT, nOffset );
+        lcl_Move( aAccountED, nOffset );
+        lcl_Move( aSavePasswdBtn, nOffset );
+        lcl_Move( aUseSysCredsCB, nOffset );
+        lcl_Move( aButtonsFL, nOffset );
+        lcl_Move( aOKBtn, nOffset );
+        lcl_Move( aCancelBtn, nOffset );
+        lcl_Move( aHelpBtn, nOffset );
 
-        Point aTmpPnt1 = aNameFT.GetPosPixel();
-        Point aTmpPnt2 = aPasswordFT.GetPosPixel();
-        aNameFT.SetPosPixel( aPathFT.GetPosPixel() );
-        aPasswordFT.SetPosPixel( aTmpPnt1 );
-        aAccountFT.SetPosPixel( aTmpPnt2 );
-        aTmpPnt1 = aNameED.GetPosPixel();
-        aTmpPnt2 = aPasswordED.GetPosPixel();
-        aNameED.SetPosPixel( aPathED.GetPosPixel() );
-        aPasswordED.SetPosPixel( aTmpPnt1 );
-        aAccountED.SetPosPixel( aTmpPnt2 );
-        aNameInfo.SetPosPixel( aPathInfo.GetPosPixel() );
-        aTmpPnt1 = aSavePasswdBtn.GetPosPixel();
-        aTmpPnt1.Y() -= nOffset;
-        aSavePasswdBtn.SetPosPixel( aTmpPnt1 );
-        aTmpPnt1 = aUseSysCredsCB.GetPosPixel();
-        aTmpPnt1.Y() -= nOffset;
-        aUseSysCredsCB.SetPosPixel( aTmpPnt1 );
         Size aNewSz = GetSizePixel();
         aNewSz.Height() -= nOffset;
         SetSizePixel( aNewSz );
@@ -191,14 +171,15 @@ void LoginDialog::HideControls_Impl( USHORT nFlags )
 
     if ( bAccountHide )
     {
-        long nOffset = aAccountED.GetPosPixel().Y() - aPasswordED.GetPosPixel().Y();
-
-        Point aTmpPnt = aSavePasswdBtn.GetPosPixel();
-        aTmpPnt.Y() -= nOffset;
-        aSavePasswdBtn.SetPosPixel( aTmpPnt );
-        aTmpPnt = aUseSysCredsCB.GetPosPixel();
-        aTmpPnt.Y() -= nOffset;
-        aUseSysCredsCB.SetPosPixel( aTmpPnt );
+        long nOffset = aAccountED.GetPosPixel().Y() - 
+                       aPasswordED.GetPosPixel().Y();
+        lcl_Move( aSavePasswdBtn, nOffset );
+        lcl_Move( aUseSysCredsCB, nOffset );
+        lcl_Move( aButtonsFL, nOffset );
+        lcl_Move( aOKBtn, nOffset );
+        lcl_Move( aCancelBtn, nOffset );
+        lcl_Move( aHelpBtn, nOffset );
+
         Size aNewSz = GetSizePixel();
         aNewSz.Height() -= nOffset;
         SetSizePixel( aNewSz );
@@ -208,6 +189,10 @@ void LoginDialog::HideControls_Impl( USHORT nFlags )
     {
         long nOffset = aUseSysCredsCB.GetPosPixel().Y() - 
                        aSavePasswdBtn.GetPosPixel().Y();
+        lcl_Move( aButtonsFL, nOffset );
+        lcl_Move( aOKBtn, nOffset );
+        lcl_Move( aCancelBtn, nOffset );
+        lcl_Move( aHelpBtn, nOffset );
 
         Size aNewSz = GetSizePixel();
         aNewSz.Height() -= nOffset;
@@ -219,7 +204,7 @@ void LoginDialog::HideControls_Impl( USHORT nFlags )
 void LoginDialog::EnableUseSysCredsControls_Impl( BOOL bUseSysCredsEnabled )
 {
     aErrorInfo.Enable( !bUseSysCredsEnabled );
-    aErrorGB.Enable( !bUseSysCredsEnabled );
+    aErrorFT.Enable( !bUseSysCredsEnabled );
     aRequestInfo.Enable( !bUseSysCredsEnabled );
     aPathFT.Enable( !bUseSysCredsEnabled );
     aPathED.Enable( !bUseSysCredsEnabled );
@@ -282,23 +267,25 @@ LoginDialog::LoginDialog
 
     ModalDialog( pParent, ResId( DLG_UUI_LOGIN, *pResMgr ) ),
 
-    aErrorInfo 		( this, ResId( INFO_LOGIN_ERROR, *pResMgr ) ),
-    aErrorGB		( this, ResId( GB_LOGIN_ERROR, *pResMgr ) ),
-    aRequestInfo	( this, ResId( INFO_LOGIN_REQUEST, *pResMgr ) ),
+    aErrorFT        ( this, ResId( FT_LOGIN_ERROR, *pResMgr ) ),
+    aErrorInfo      ( this, ResId( FT_INFO_LOGIN_ERROR, *pResMgr ) ),
+    aLogin1FL       ( this, ResId( FL_LOGIN_1, *pResMgr ) ),
+    aRequestInfo    ( this, ResId( FT_INFO_LOGIN_REQUEST, *pResMgr ) ),
+    aLogin2FL       ( this, ResId( FL_LOGIN_2, *pResMgr ) ),
     aPathFT			( this, ResId( FT_LOGIN_PATH, *pResMgr ) ),
     aPathED			( this, ResId( ED_LOGIN_PATH, *pResMgr ) ),
-    aPathInfo		( this, ResId( INFO_LOGIN_PATH, *pResMgr ) ),
+    aPathInfo       ( this, ResId( FT_INFO_LOGIN_PATH, *pResMgr ) ),
     aPathBtn		( this, ResId( BTN_LOGIN_PATH, *pResMgr ) ),
     aNameFT			( this, ResId( FT_LOGIN_USERNAME, *pResMgr ) ),
     aNameED			( this, ResId( ED_LOGIN_USERNAME, *pResMgr ) ),
-    aNameInfo		( this, ResId( INFO_LOGIN_USERNAME, *pResMgr ) ),
+    aNameInfo       ( this, ResId( FT_INFO_LOGIN_USERNAME, *pResMgr ) ),
     aPasswordFT		( this, ResId( FT_LOGIN_PASSWORD, *pResMgr ) ),
     aPasswordED		( this, ResId( ED_LOGIN_PASSWORD, *pResMgr ) ),
     aAccountFT		( this, ResId( FT_LOGIN_ACCOUNT, *pResMgr ) ),
     aAccountED		( this, ResId( ED_LOGIN_ACCOUNT, *pResMgr ) ),
     aSavePasswdBtn	( this, ResId( CB_LOGIN_SAVEPASSWORD, *pResMgr ) ),
     aUseSysCredsCB	( this, ResId( CB_LOGIN_USESYSCREDS, *pResMgr ) ),
-    aLoginGB		( this, ResId( GB_LOGIN_LOGIN, *pResMgr ) ),
+    aButtonsFL      ( this, ResId( FL_BUTTONS, *pResMgr ) ),
     aOKBtn			( this, ResId( BTN_LOGIN_OK, *pResMgr ) ),
     aCancelBtn		( this, ResId( BTN_LOGIN_CANCEL, *pResMgr ) ),
     aHelpBtn		( this, ResId( BTN_LOGIN_HELP, *pResMgr ) )
@@ -333,6 +320,12 @@ LoginDialog::LoginDialog
 
 // -----------------------------------------------------------------------
 
+LoginDialog::~LoginDialog()
+{
+}    
+
+// -----------------------------------------------------------------------
+
 void LoginDialog::SetName( const String& rNewName )
 {
     aNameED.SetText( rNewName );
diff --git a/uui/source/logindlg.hrc b/uui/source/logindlg.hrc
index 13848e694a..2e6a42886b 100644..100755
--- a/uui/source/logindlg.hrc
+++ b/uui/source/logindlg.hrc
@@ -30,24 +30,26 @@
 
 
 //============================================================================
-#define INFO_LOGIN_ERROR		10
-#define GB_LOGIN_ERROR			11
+#define FT_INFO_LOGIN_ERROR     10
+#define FT_LOGIN_ERROR          11
 
-#define INFO_LOGIN_REQUEST		20
+#define FT_INFO_LOGIN_REQUEST   20
 #define FT_LOGIN_PATH			21
 #define ED_LOGIN_PATH			22
-#define INFO_LOGIN_PATH			23
+#define FT_INFO_LOGIN_PATH      23
 #define BTN_LOGIN_PATH			24
 #define FT_LOGIN_USERNAME		25
 #define ED_LOGIN_USERNAME		26
-#define INFO_LOGIN_USERNAME		27
+#define FT_INFO_LOGIN_USERNAME  27
 #define FT_LOGIN_PASSWORD		28
 #define ED_LOGIN_PASSWORD		29
 #define FT_LOGIN_ACCOUNT		30
 #define ED_LOGIN_ACCOUNT		31
 #define CB_LOGIN_SAVEPASSWORD	32
-#define GB_LOGIN_LOGIN			33
-#define CB_LOGIN_USESYSCREDS    34
+#define CB_LOGIN_USESYSCREDS    33
+#define FL_LOGIN_1              34
+#define FL_LOGIN_2              35
+#define FL_BUTTONS              36
 
 #define BTN_LOGIN_OK			50
 #define BTN_LOGIN_CANCEL		51
diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx
index a8b2fa9c60..05b2cb38a5 100644..100755
--- a/uui/source/logindlg.hxx
+++ b/uui/source/logindlg.hxx
@@ -53,9 +53,11 @@
 //============================================================================
 class LoginDialog : public ModalDialog
 {
+    FixedText       aErrorFT;
     FixedInfo		aErrorInfo;
-    FixedLine		aErrorGB;
+    FixedLine		aLogin1FL;
     FixedInfo		aRequestInfo;
+    FixedLine		aLogin2FL;
     FixedText		aPathFT;
     Edit			aPathED;
     FixedInfo		aPathInfo;
@@ -69,7 +71,7 @@ class LoginDialog : public ModalDialog
     Edit			aAccountED;
     CheckBox		aSavePasswdBtn;
     CheckBox        aUseSysCredsCB;
-    FixedLine		aLoginGB;
+    FixedLine		aButtonsFL;
     OKButton		aOKBtn;
     CancelButton	aCancelBtn;
     HelpButton		aHelpBtn;
@@ -85,32 +87,23 @@ public:
     LoginDialog( Window* pParent, USHORT nFlags,
                  const String& rServer, const String* pRealm,
                  ResMgr * pResMgr );
+    virtual ~LoginDialog();
 
-    String			GetPath() const { return aPathED.GetText(); }
-    void			SetPath( const String& rNewPath )
-                        { aPathED.SetText( rNewPath );
-                          aPathInfo.SetText( rNewPath );}
-    String			GetName() const { return aNameED.GetText(); }
+    String          GetPath() const                             { return aPathED.GetText(); }
+    void            SetPath( const String& rNewPath )           { aPathED.SetText( rNewPath ); aPathInfo.SetText( rNewPath ); }
+    String          GetName() const                             { return aNameED.GetText(); }
     void			SetName( const String& rNewName );
-    String			GetPassword() const { return aPasswordED.GetText(); }
-    void			SetPassword( const String& rNew )
-                        { aPasswordED.SetText( rNew ); }
-    String			GetAccount() const { return aAccountED.GetText(); }
-    void			SetAccount( const String& rNew )
-                        { aAccountED.SetText( rNew ); }
-    BOOL			IsSavePassword() const
-                        { return aSavePasswdBtn.IsChecked(); }
-    void			SetSavePassword( BOOL bSave )
-                        { aSavePasswdBtn.Check( bSave ); }
-    void			SetSavePasswordText( const String& rTxt )
-                        { aSavePasswdBtn.SetText( rTxt ); }
-    BOOL            IsUseSystemCredentials() const
-                        { return aUseSysCredsCB.IsChecked(); }
+    String          GetPassword() const                         { return aPasswordED.GetText(); }
+    void            SetPassword( const String& rNew )           { aPasswordED.SetText( rNew ); }
+    String          GetAccount() const                          { return aAccountED.GetText(); }
+    void            SetAccount( const String& rNew )            { aAccountED.SetText( rNew ); }
+    BOOL            IsSavePassword() const                      { return aSavePasswdBtn.IsChecked(); }
+    void            SetSavePassword( BOOL bSave )               { aSavePasswdBtn.Check( bSave ); }
+    void            SetSavePasswordText( const String& rTxt )   { aSavePasswdBtn.SetText( rTxt ); }
+    BOOL            IsUseSystemCredentials() const              { return aUseSysCredsCB.IsChecked(); }
     void            SetUseSystemCredentials( BOOL bUse );
-    void			SetErrorText( const String& rTxt )
-                        { aErrorInfo.SetText( rTxt ); }
-    void			SetLoginRequestText( const String& rTxt )
-                        { aRequestInfo.SetText( rTxt ); }
+    void            SetErrorText( const String& rTxt )          { aErrorInfo.SetText( rTxt ); }
+    void            SetLoginRequestText( const String& rTxt )   { aRequestInfo.SetText( rTxt ); }
     void			ClearPassword();
     void			ClearAccount();
 };
diff --git a/uui/source/logindlg.src b/uui/source/logindlg.src
index ced176d10a..4c19c0c952 100644..100755
--- a/uui/source/logindlg.src
+++ b/uui/source/logindlg.src
@@ -16,7 +16,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
+ *(a copy is included in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU Lesser General Public License
  * version 3 along with OpenOffice.org.  If not, see
@@ -42,166 +42,161 @@ ModalDialog DLG_UUI_LOGIN
     Moveable = TRUE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 265 , 170 ) ;
-    FixedText INFO_LOGIN_ERROR
+    Size = MAP_APPFONT( 177 , 247 ) ;
+    Text [ en-US ] = "Authentication Required" ;
+
+    FixedText FT_LOGIN_ERROR
+    {
+        Pos = MAP_APPFONT( 6 , 6 ) ;
+        Size = MAP_APPFONT( 165 , 8 ) ;
+        Text [ en-US ] = "Message from server:" ;
+    };
+
+    FixedText FT_INFO_LOGIN_ERROR
     {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 185 , 18 ) ;
+        Pos = MAP_APPFONT( 6 , 14 ) ;
+        Size = MAP_APPFONT( 185 , 3*8 ) ;
         WordBreak = TRUE ;
     };
-    FixedLine GB_LOGIN_ERROR
+    
+    FixedLine FL_LOGIN_1
     {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 197 , 8 ) ;
-        Text [ en-US ] = "Message from server" ;
+        Pos = MAP_APPFONT( 6 , 41 ) ;
+        Size = MAP_APPFONT( 165 , 8 ) ;
     };
-    FixedText INFO_LOGIN_REQUEST
+    
+    FixedText FT_INFO_LOGIN_REQUEST
     {
-        Pos = MAP_APPFONT ( 12 , 55 ) ;
-        Size = MAP_APPFONT ( 185 , 18 ) ;
+        Pos = MAP_APPFONT( 6 , 52 ) ;
+        Size = MAP_APPFONT( 185 , 2*8 ) ;
         WordBreak = TRUE ;
-        Text [ en-US ] = "Enter the user name and password for %1 here." ;
+        Text [ en-US ] = "Enter user name and password for: \n%1" ;
+    };
+    
+    String STR_LOGIN_REALM
+    {
+        Text [ en-US ] = "Enter user name and password for: \n\"%2\" on %1" ;
+    };
+    
+    FixedLine FL_LOGIN_2
+    {
+        Pos = MAP_APPFONT( 6 , 71 ) ;
+        Size = MAP_APPFONT( 165 , 8 ) ;
     };
+    
     FixedText FT_LOGIN_PATH
     {
-        Pos = MAP_APPFONT ( 12 , 77 ) ;
-        Size = MAP_APPFONT ( 57 , 10 ) ;
+        Pos = MAP_APPFONT( 6 , 84 ) ;
+        Size = MAP_APPFONT( 112 , 8 ) ;
         Text [ en-US ] = "~Path" ;
     };
+    
     Edit ED_LOGIN_PATH
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 76 ) ;
-        Size = MAP_APPFONT ( 108 , 12 ) ;
+        Pos = MAP_APPFONT( 6 , 95 ) ;
+        Size = MAP_APPFONT( 112 , 12 ) ;
     };
-    FixedText INFO_LOGIN_PATH
+    FixedText FT_INFO_LOGIN_PATH        // used instead of ED_LOGIN_PATH when LF_PATH_READONLY is set
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 77 ) ;
-        Size = MAP_APPFONT ( 125 , 10 ) ;
+        Pos = MAP_APPFONT( 6 , 97 ) ;
+        Size = MAP_APPFONT( 112 , 8 ) ;
     };
     PushButton BTN_LOGIN_PATH
     {
-        Pos = MAP_APPFONT ( 183 , 75 ) ;
-        Size = MAP_APPFONT ( 14 , 14 ) ;
-        Text = "~..." ;
+        Pos = MAP_APPFONT( 121 , 94 ) ;
+        Size = MAP_APPFONT( 50 , 14 ) ;
+        Text = "~Browse..." ;
     };
+    
     FixedText FT_LOGIN_USERNAME
     {
-        Pos = MAP_APPFONT ( 12 , 92 ) ;
-        Size = MAP_APPFONT ( 57 , 10 ) ;
+        Pos = MAP_APPFONT( 6 , 110 ) ;
+        Size = MAP_APPFONT( 106 , 8 ) ;
         Text [ en-US ] = "~User name" ;
     };
+    
     Edit ED_LOGIN_USERNAME
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 91 ) ;
-        Size = MAP_APPFONT ( 125 , 12 ) ;
+        Pos = MAP_APPFONT( 6 , 121 ) ;
+        Size = MAP_APPFONT( 165 , 12 ) ;
     };
-    FixedText INFO_LOGIN_USERNAME
+    FixedText FT_INFO_LOGIN_USERNAME    // used instead of ED_LOGIN_USERNAME when LF_USERNAME_READONLY is set
     {
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 92 ) ;
-        Size = MAP_APPFONT ( 125 , 10 ) ;
+        Pos = MAP_APPFONT( 6 , 123 ) ;
+        Size = MAP_APPFONT( 165 , 8 ) ;
     };
+    
     FixedText FT_LOGIN_PASSWORD
     {
-        Pos = MAP_APPFONT ( 12 , 107 ) ;
-        Size = MAP_APPFONT ( 57 , 10 ) ;
+        Pos = MAP_APPFONT( 6 , 136 ) ;
+        Size = MAP_APPFONT( 165 , 8 ) ;
         Text [ en-US ] = "Pass~word" ;
     };
+    
     Edit ED_LOGIN_PASSWORD
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 106 ) ;
-        Size = MAP_APPFONT ( 125 , 12 ) ;
+        Pos = MAP_APPFONT( 6 , 147 ) ;
+        Size = MAP_APPFONT( 165 , 12 ) ;
         PassWord = TRUE ;
     };
+    
     FixedText FT_LOGIN_ACCOUNT
     {
-        Pos = MAP_APPFONT ( 12 , 122 ) ;
-        Size = MAP_APPFONT ( 57 , 10 ) ;
+        Pos = MAP_APPFONT( 6 , 162 ) ;
+        Size = MAP_APPFONT( 165 , 8 ) ;
         Text [ en-US ] = "A~ccount";
     };
+    
     Edit ED_LOGIN_ACCOUNT
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 121 ) ;
-        Size = MAP_APPFONT ( 125 , 12 ) ;
+        Pos = MAP_APPFONT( 6 , 173 ) ;
+        Size = MAP_APPFONT( 165 , 12 ) ;
         PassWord = TRUE ;
     };
+    
     CheckBox CB_LOGIN_SAVEPASSWORD
     {
-        Pos = MAP_APPFONT ( 12 , 136 ) ;
-        Size = MAP_APPFONT ( 185 , 10 ) ;
-        Text [ en-US ] = "~Save password" ;
+        Pos = MAP_APPFONT( 6 , 190 ) ;
+        Size = MAP_APPFONT( 165 , 10 ) ;
+        Text [ en-US ] = "~Remember password" ;
     };
+    
     CheckBox CB_LOGIN_USESYSCREDS
     {
-        Pos = MAP_APPFONT ( 12 , 148 ) ;
-        Size = MAP_APPFONT ( 185 , 10 ) ;
-        Text [ en-US ] = "~Use System Credentials" ;
+        Pos = MAP_APPFONT( 6 , 203 ) ;
+        Size = MAP_APPFONT( 165 , 10 ) ;
+        Text [ en-US ] = "~Use system credentials" ;
     };
-    FixedLine GB_LOGIN_LOGIN
+    
+    FixedLine FL_BUTTONS
     {
-        Pos = MAP_APPFONT ( 7 , 44 ) ;
-        Size = MAP_APPFONT ( 197 , 8 ) ;
-        Text [ en-US ] = "Log in" ;
+        Pos = MAP_APPFONT( 0 , 216 ) ;
+        Size = MAP_APPFONT( 177 , 8 ) ;
     };
+    
     OKButton BTN_LOGIN_OK
     {
-        Pos = MAP_APPFONT ( 209 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT( 6 , 227 ) ;
+        Size = MAP_APPFONT( 50 , 14 ) ;
         DefButton = TRUE ;
     };
+    
     CancelButton BTN_LOGIN_CANCEL
     {
-        Pos = MAP_APPFONT ( 209 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT( 66 , 227 ) ;
+        Size = MAP_APPFONT( 50 , 14 ) ;
     };
+    
     HelpButton BTN_LOGIN_HELP
     {
-        Pos = MAP_APPFONT ( 209 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    String STR_LOGIN_REALM
-    {
-        Text [ en-US ] = "Please enter user name and password for \"%2\" on %1 here." ;
+        Pos = MAP_APPFONT( 121 , 227 ) ;
+        Size = MAP_APPFONT( 50 , 14 ) ;
     };
-    Text [ en-US ] = "User Name and Password Required" ;
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-