CWS-TOOLING: integrate CWS mav43

2008-12-17 14:42:56 +0100 tbo  r265602 : #i97269# changed hid.lst and etab.win
2008-12-15 15:36:04 +0100 mav  r265508 : #i95809# remove the stream as well
2008-12-12 13:20:09 +0100 mav  r265411 : #i95809# small fixes
2008-12-12 13:12:07 +0100 mav  r265410 : #i95809# fix streams handling
2008-12-12 10:45:29 +0100 mav  r265397 : #i95809# close the stream if there is no storage
2008-12-12 10:24:38 +0100 mav  r265396 : #i95809# close the stream if there is no temporary file
2008-12-12 00:56:13 +0100 mav  r265383 : #i95809# adopt for linux
2008-12-12 00:51:25 +0100 mav  r265382 : #i95809# adopt for linux
2008-12-12 00:38:31 +0100 mav  r265381 : #i95809# check timestamp only if fs locking not active
2008-12-12 00:35:32 +0100 mav  r265380 : #i95809# small fixes
2008-12-12 00:29:33 +0100 mav  r265379 : #i95809# small fixes
2008-12-11 22:30:15 +0100 mav  r265374 : #i97092# allow to use default master password
2008-12-11 22:20:56 +0100 mav  r265372 : #i95809# avoid storage closing
2008-12-11 21:11:37 +0100 mav  r265368 : #i97092# do not publish for now
2008-12-11 21:08:22 +0100 mav  r265366 : #i95809# fix typo
2008-12-11 21:06:49 +0100 mav  r265364 : #i95809# small fixes
2008-12-11 21:05:13 +0100 mav  r265363 : #i95809# small fixes
2008-12-11 20:40:05 +0100 mav  r265360 : #i95809# show warning if the document was touched
2008-12-11 20:39:44 +0100 mav  r265359 : #i95809# show warning if the document was touched
2008-12-11 19:54:45 +0100 mav  r265355 : #i95809# small fixes
2008-12-11 19:42:52 +0100 mav  r265353 : #i95809# small fixes
2008-12-11 19:30:30 +0100 mav  r265351 : #i95809# small fixes
2008-12-11 19:16:40 +0100 mav  r265349 : #i95809# small fixes
2008-12-11 19:05:56 +0100 mav  r265348 : #i95809# small fixes
2008-12-11 18:26:03 +0100 mav  r265346 : #i95809# ignore the exception
2008-12-11 18:19:28 +0100 mav  r265345 : #i95809# pure imput stream in case of local file URL means opening of document readonly
2008-12-11 17:41:56 +0100 mav  r265341 : #i95809# unfortunately SfxMedium can not take the decision
2008-12-11 17:37:07 +0100 mav  r265340 : #i95809# fix typo
2008-12-11 17:33:47 +0100 mav  r265339 : #i95809# pure imput stream in case of local file URL means opening of document readonly
2008-12-11 16:12:26 +0100 mav  r265330 : #i95809# let dialogs look better
2008-12-11 15:50:43 +0100 mav  r265322 : #i97092# allow to use default master password
2008-12-11 13:35:39 +0100 mav  r265295 : #i97092# allow to use default master password
2008-12-11 13:04:28 +0100 mav  r265290 : #i97092# allow to use default master password
2008-12-11 12:34:52 +0100 mav  r265284 : #i97092# allow to use default master password
2008-12-11 11:21:33 +0100 mav  r265267 : #i95809# adopt for linux
2008-12-11 10:25:22 +0100 mav  r265255 : #i97092# allow to use default master password
2008-12-11 10:24:35 +0100 mav  r265254 : #i97092# allow to use default master password
2008-12-10 17:02:32 +0100 pb  r265207 : fix: #i97092# more info text
2008-12-10 16:40:53 +0100 mav  r265205 : #i95809# integrate new file locking UI in sfx workflow
2008-12-10 16:38:55 +0100 mav  r265204 : #i95809# allow to ignore own lock on saving
2008-12-10 14:52:12 +0100 pb  r265192 : fix: #i97092# new master password behavior
2008-12-10 14:51:22 +0100 pb  r265191 : fix: #i97092# new master password bahavior
2008-12-10 14:49:46 +0100 pb  r265189 : fix: #i97092# new master password bahavior
2008-12-10 10:55:19 +0100 mav  r265155 : #i95809# allow to ignore own lock on saving
2008-12-09 17:47:51 +0100 mav  r265124 : #i95809# allow to ignore own lock on saving
2008-12-07 11:24:57 +0100 mav  r264949 : #i95809# let the request be derived from IOException
2008-12-05 18:31:35 +0100 mav  r264915 : #i95809# use the locking related dialogs from InteractionHandler
2008-12-04 18:33:36 +0100 mav  r264867 : #i95809# the requests for the new locking UI
2008-12-04 10:26:52 +0100 pb  r264822 : fix: #i95809# new message boxes for locking
2008-12-04 10:23:51 +0100 pb  r264821 : fix: #i95809# STR_OPENLOCKED_UNKNOWNUSER replaced by STR_UNKNOWNUSER
2008-12-04 10:18:23 +0100 pb  r264820 : fix: #i95809# new message boxes for locking
2008-12-04 10:15:56 +0100 pb  r264819 : fix: #i95809# new message boxes for locking
2008-12-03 16:06:46 +0100 mav  r264796 : #i95809# system file locking support
2008-12-02 16:19:30 +0100 mav  r264717 : #i95809# system file locking support
2008-12-02 16:07:10 +0100 mav  r264716 : #i95809# system file locking support
2008-12-02 15:58:53 +0100 mav  r264714 : #i95809# change the name
2008-12-02 15:58:06 +0100 mav  r264713 : #i95809# do not allow to change ReadOnly flag in TypeDetection
2008-12-02 15:56:00 +0100 mav  r264712 : #i95809# system file locking support
2008-12-02 15:43:20 +0100 mav  r264708 : #i95809# change the name
2008-12-02 15:38:08 +0100 mav  r264706 : #i95809# an options to control system file locking usage

1 files changed, 41 insertions, 31 deletions

diff --git a/uui/source/masterpasscrtdlg.src b/uui/source/masterpasscrtdlg.src
index cc16800feadd..e11d9abd166d 100644
--- a/uui/source/masterpasscrtdlg.src
+++ b/uui/source/masterpasscrtdlg.src
@@ -44,64 +44,74 @@ ModalDialog DLG_UUI_MASTERPASSWORD_CRT
     Moveable = TRUE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 175 ,135  ) ;
+    Size = MAP_APPFONT ( DLG_WIDTH , DLG_HEIGHT ) ;
+    Text [ en-US ] = "Set Master Password";
+    FixedText FT_INFOTEXT
+    {
+        Pos = MAP_APPFONT ( COL_0 , ROW_0 ) ;
+        Size = MAP_APPFONT ( CTRL_WIDTH , 7*RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        WordBreak = TRUE ;
+        Text [ en-US ] = "Passwords for web connections are protected by a master password. You will be asked to enter it once per session, if %PRODUCTNAME retrieves a password from the protected password list.";
+    };
+    FixedLine FL_INFOTEXT
+    {
+        Pos = MAP_APPFONT ( 0 , ROW_1 ) ;
+        Size = MAP_APPFONT ( DLG_WIDTH , RSC_CD_FIXEDLINE_HEIGHT ) ;
+    };
     FixedText FT_MASTERPASSWORD_CRT
     {
-        Pos = MAP_APPFONT ( 3 , 4 ) ;
-        Size = MAP_APPFONT ( 169 , 9 ) ;
-        Text [ en-US ] = "Enter new password";
+        Pos = MAP_APPFONT ( COL_0 , ROW_2 ) ;
+        Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_FIXEDLINE_HEIGHT ) ;
+        Text [ en-US ] = "~Enter password";
     };
     Edit ED_MASTERPASSWORD_CRT
     {
+        Pos = MAP_APPFONT ( COL_0 , ROW_3 ) ;
+        Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 3 , 17 ) ;
-        Size = MAP_APPFONT ( 169 , 13 ) ;
         PassWord = TRUE ;
     };
     FixedText FT_MASTERPASSWORD_REPEAT
     {
-        Pos = MAP_APPFONT ( 3 , 33 ) ;
-        Size = MAP_APPFONT ( 169 , 9 ) ;
+        Pos = MAP_APPFONT ( COL_0 , ROW_4 ) ;
+        Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_FIXEDLINE_HEIGHT ) ;
         Text [ en-US ] = "~Reenter password";
     };
     Edit ED_MASTERPASSWORD_REPEAT
     {
+        Pos = MAP_APPFONT ( COL_0 , ROW_5 ) ;
+        Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 3 , 46 ) ;
-        Size = MAP_APPFONT ( 169 , 13 ) ;
         PassWord = TRUE ;
     };
-    FixedText FT_MASTERPASSWORD_WARNING
+    FixedText FT_CAUTIONTEXT
     {
-        Pos = MAP_APPFONT ( 3 , 62 ) ;
-        Size = MAP_APPFONT ( 169 , 42 ) ;
-        Text [ en-US ] = "~Caution: Make sure you remember the Master Password you have set. If you forget your Master Password, you will be unable to access any of the information protected by it. Passwords are case-sensitive and at least five characters long.";
-        WordBreak = TRUE;
+        Pos = MAP_APPFONT ( COL_0 , ROW_6 ) ;
+        Size = MAP_APPFONT ( CTRL_WIDTH , 8*RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        WordBreak = TRUE ;
+        Text [ en-US ] = "Caution: Make sure you remember the Master Password you have set. If you forget your Master Password, you will be unable to access any of the information protected by it. Passwords are case-sensitive and at least five characters long.";
     };
-    FixedLine FL_FIXED_LINE

-    {

-        Pos = MAP_APPFONT( 0, 105 );

-        Size = MAP_APPFONT( 175, 6 );

+    FixedLine FL_CAUTIONTEXT
+    {
+        Pos = MAP_APPFONT ( 0 , ROW_7 ) ;
+        Size = MAP_APPFONT ( DLG_WIDTH , RSC_CD_FIXEDLINE_HEIGHT ) ;
+    };
+    HelpButton BTN_MASTERPASSCRT_HELP
+    {
+        Pos = MAP_APPFONT ( COL_0 , ROW_8 ) ;
+        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
     };
-
-
     OKButton BTN_MASTERPASSCRT_OK
     {
-        Pos = MAP_APPFONT ( 65 , 115 ) ;
-        Size = MAP_APPFONT ( 51 , 13 ) ;
+        Pos = MAP_APPFONT ( COL_1 , ROW_8 ) ;
+        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         DefButton = TRUE ;
     };
     CancelButton BTN_MASTERPASSCRT_CANCEL
     {
-        Pos = MAP_APPFONT ( 120 , 115 ) ;
-        Size = MAP_APPFONT ( 51 , 13 ) ;
-    };
-    HelpButton BTN_MASTERPASSCRT_HELP
-    {
-        Pos = MAP_APPFONT ( 5 , 115 ) ;
-        Size = MAP_APPFONT ( 51 , 13 ) ;
+        Pos = MAP_APPFONT ( COL_2 , ROW_8 ) ;
+        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
     };
-    Text [ en-US ] = "Change Master Password";
 };