cws tl79: merge

4 files changed, 27 insertions, 57 deletions

diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index 941c6c2558c8..d7ded58b5dde 100755
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -57,10 +57,10 @@ static void lcl_Move( Window &rWin, long nOffset )
 
 void LoginDialog::HideControls_Impl( USHORT nFlags )
 {
-    FASTBOOL bPathHide = FALSE;
-    FASTBOOL bErrorHide = FALSE;
-    FASTBOOL bAccountHide = FALSE;
-    FASTBOOL bUseSysCredsHide = FALSE;
+    bool bPathHide = FALSE;
+    bool bErrorHide = FALSE;
+    bool bAccountHide = FALSE;
+    bool bUseSysCredsHide = FALSE;
 
     if ( ( nFlags & LF_NO_PATH ) == LF_NO_PATH )
     {
@@ -71,9 +71,8 @@ void LoginDialog::HideControls_Impl( USHORT nFlags )
     }
     else if ( ( nFlags & LF_PATH_READONLY ) == LF_PATH_READONLY )
     {
-        aPathED.Hide();
-        aPathInfo.Show();
-        aPathBtn.Hide();
+        aPathED.Enable( FALSE );
+        aPathBtn.Enable( FALSE );
     }
 
     if ( ( nFlags & LF_NO_USERNAME ) == LF_NO_USERNAME )
@@ -83,8 +82,7 @@ void LoginDialog::HideControls_Impl( USHORT nFlags )
     }
     else if ( ( nFlags & LF_USERNAME_READONLY ) == LF_USERNAME_READONLY )
     {
-        aNameED.Hide();
-        aNameInfo.Show();
+        aNameED.Enable( FALSE );
     }
 
     if ( ( nFlags & LF_NO_PASSWORD ) == LF_NO_PASSWORD )
@@ -125,11 +123,9 @@ void LoginDialog::HideControls_Impl( USHORT nFlags )
         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 );
@@ -152,7 +148,6 @@ void LoginDialog::HideControls_Impl( USHORT nFlags )
                        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 );
@@ -208,11 +203,9 @@ void LoginDialog::EnableUseSysCredsControls_Impl( BOOL bUseSysCredsEnabled )
     aRequestInfo.Enable( !bUseSysCredsEnabled );
     aPathFT.Enable( !bUseSysCredsEnabled );
     aPathED.Enable( !bUseSysCredsEnabled );
-    aPathInfo.Enable( !bUseSysCredsEnabled );
     aPathBtn.Enable( !bUseSysCredsEnabled );
     aNameFT.Enable( !bUseSysCredsEnabled );
     aNameED.Enable( !bUseSysCredsEnabled );
-    aNameInfo.Enable( !bUseSysCredsEnabled );
     aPasswordFT.Enable( !bUseSysCredsEnabled );
     aPasswordED.Enable( !bUseSysCredsEnabled );
     aAccountFT.Enable( !bUseSysCredsEnabled );
@@ -274,11 +267,9 @@ LoginDialog::LoginDialog
     aLogin2FL       ( this, ResId( FL_LOGIN_2, *pResMgr ) ),
     aPathFT         ( this, ResId( FT_LOGIN_PATH, *pResMgr ) ),
     aPathED         ( this, ResId( ED_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( 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 ) ),
@@ -326,14 +317,6 @@ LoginDialog::~LoginDialog()
 
 // -----------------------------------------------------------------------
 
-void LoginDialog::SetName( const String& rNewName )
-{
-    aNameED.SetText( rNewName );
-    aNameInfo.SetText( rNewName );
-}
-
-// -----------------------------------------------------------------------
-
 void LoginDialog::SetUseSystemCredentials( BOOL bUse )
 {
     if ( aUseSysCredsCB.IsVisible() )
diff --git a/uui/source/logindlg.hrc b/uui/source/logindlg.hrc
index b6e1f52444fd..b541740bd768 100755
--- a/uui/source/logindlg.hrc
+++ b/uui/source/logindlg.hrc
@@ -36,20 +36,18 @@
 #define FT_INFO_LOGIN_REQUEST   20
 #define FT_LOGIN_PATH           21
 #define ED_LOGIN_PATH           22
-#define FT_INFO_LOGIN_PATH      23
-#define BTN_LOGIN_PATH          24
-#define FT_LOGIN_USERNAME       25
-#define ED_LOGIN_USERNAME       26
-#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 CB_LOGIN_USESYSCREDS    33
-#define FL_LOGIN_1              34
-#define FL_LOGIN_2              35
-#define FL_BUTTONS              36
+#define BTN_LOGIN_PATH          23
+#define FT_LOGIN_USERNAME       24
+#define ED_LOGIN_USERNAME       25
+#define FT_LOGIN_PASSWORD       26
+#define ED_LOGIN_PASSWORD       27
+#define FT_LOGIN_ACCOUNT        28
+#define ED_LOGIN_ACCOUNT        29
+#define CB_LOGIN_SAVEPASSWORD   30
+#define CB_LOGIN_USESYSCREDS    31
+#define FL_LOGIN_1              32
+#define FL_LOGIN_2              33
+#define FL_BUTTONS              34
 
 #define BTN_LOGIN_OK            50
 #define BTN_LOGIN_CANCEL        51
diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx
index 04ea8eb7523d..05ba8e8d55d4 100755
--- a/uui/source/logindlg.hxx
+++ b/uui/source/logindlg.hxx
@@ -60,11 +60,9 @@ class LoginDialog : public ModalDialog
     FixedLine       aLogin2FL;
     FixedText       aPathFT;
     Edit            aPathED;
-    FixedInfo       aPathInfo;
     PushButton      aPathBtn;
     FixedText       aNameFT;
     Edit            aNameED;
-    FixedInfo       aNameInfo;
     FixedText       aPasswordFT;
     Edit            aPasswordED;
     FixedText       aAccountFT;
@@ -90,9 +88,9 @@ public:
     virtual ~LoginDialog();
 
     String          GetPath() const                             { return aPathED.GetText(); }
-    void            SetPath( const String& rNewPath )           { aPathED.SetText( rNewPath ); aPathInfo.SetText( rNewPath ); }
+    void            SetPath( const String& rNewPath )           { aPathED.SetText( rNewPath ); }
     String          GetName() const                             { return aNameED.GetText(); }
-    void            SetName( const String& rNewName );
+    void            SetName( const String& rNewName )           { aNameED.SetText( rNewName ); }
     String          GetPassword() const                         { return aPasswordED.GetText(); }
     void            SetPassword( const String& rNew )           { aPasswordED.SetText( rNew ); }
     String          GetAccount() const                          { return aAccountED.GetText(); }
@@ -108,6 +106,9 @@ public:
     void            ClearAccount();
 };
 
+// -----------------------------------------------------------------------
+
+
 //............................................................................
 //............................................................................
 
diff --git a/uui/source/logindlg.src b/uui/source/logindlg.src
index f997fb7b7f34..c2683ea3d94c 100755
--- a/uui/source/logindlg.src
+++ b/uui/source/logindlg.src
@@ -55,7 +55,7 @@ ModalDialog DLG_UUI_LOGIN
     FixedText FT_INFO_LOGIN_ERROR
     {
         Pos = MAP_APPFONT( 6 , 14 ) ;
-        Size = MAP_APPFONT( 185 , 3*8 ) ;
+        Size = MAP_APPFONT( 165 , 3*8 ) ;
         WordBreak = TRUE ;
     };
 
@@ -68,7 +68,7 @@ ModalDialog DLG_UUI_LOGIN
     FixedText FT_INFO_LOGIN_REQUEST
     {
         Pos = MAP_APPFONT( 6 , 52 ) ;
-        Size = MAP_APPFONT( 185 , 2*8 ) ;
+        Size = MAP_APPFONT( 165 , 2*8 ) ;
         WordBreak = TRUE ;
         Text [ en-US ] = "Enter user name and password for: \n%1" ;
     };
@@ -97,12 +97,6 @@ ModalDialog DLG_UUI_LOGIN
         Pos = MAP_APPFONT( 6 , 95 ) ;
         Size = MAP_APPFONT( 112 , 12 ) ;
     };
-    FixedText FT_INFO_LOGIN_PATH        // used instead of ED_LOGIN_PATH when LF_PATH_READONLY is set
-    {
-        Hide = TRUE ;
-        Pos = MAP_APPFONT( 6 , 97 ) ;
-        Size = MAP_APPFONT( 112 , 8 ) ;
-    };
     PushButton BTN_LOGIN_PATH
     {
         Pos = MAP_APPFONT( 121 , 94 ) ;
@@ -113,7 +107,7 @@ ModalDialog DLG_UUI_LOGIN
     FixedText FT_LOGIN_USERNAME
     {
         Pos = MAP_APPFONT( 6 , 110 ) ;
-        Size = MAP_APPFONT( 106 , 8 ) ;
+        Size = MAP_APPFONT( 165 , 8 ) ;
         Text [ en-US ] = "~User name" ;
     };
 
@@ -123,12 +117,6 @@ ModalDialog DLG_UUI_LOGIN
         Pos = MAP_APPFONT( 6 , 121 ) ;
         Size = MAP_APPFONT( 165 , 12 ) ;
     };
-    FixedText FT_INFO_LOGIN_USERNAME    // used instead of ED_LOGIN_USERNAME when LF_USERNAME_READONLY is set
-    {
-        Hide = TRUE ;
-        Pos = MAP_APPFONT( 6 , 123 ) ;
-        Size = MAP_APPFONT( 165 , 8 ) ;
-    };
 
     FixedText FT_LOGIN_PASSWORD
     {