Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv10676/src/gui
Modified Files:
wxMFolderDialogs.cpp
Log Message:
don't let the user to disable login/password validation msg box on 'No' trapping
himself inside the dialog (bug 829)
Index: wxMFolderDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMFolderDialogs.cpp,v
retrieving revision 1.183
retrieving revision 1.184
diff -b -u -2 -r1.183 -r1.184
--- wxMFolderDialogs.cpp 19 Sep 2003 13:31:21 -0000 1.183
+++ wxMFolderDialogs.cpp 1 Oct 2003 23:43:33 -0000 1.184
@@ -2409,10 +2409,10 @@
if ( !loginName )
{
- what = _("a login name");
+ what = _("login name");
msgbox = M_MSGBOX_ASK_LOGIN;
}
else if ( !password )
{
- what = _("a password");
+ what = _("password");
msgbox = M_MSGBOX_ASK_PWD;
}
@@ -2423,7 +2423,11 @@
msg.Printf
(
- _("You have not specified %s for this folder, although it
requires one.\n"
- "Alternatively, you might want to select anonymous access.\n"
- "Would you like to change this now?"),
+ _("You have not specified a %s for this folder, although "
+ "it requires one.\n"
+ "If you leave it empty, Mahogany asks you for it every "
+ "time when opening this folder and\n"
+ "if you don't want this to happen you should fill "
+ "it in here or,\n"
+ "alternatively, select anonymous access.\n"),
what.c_str()
);
@@ -2431,12 +2435,22 @@
if ( msgbox == M_MSGBOX_ASK_PWD )
{
- msg << _("\n\n"
- "Notice that the password will be stored in your
configuration with\n"
- "very weak encryption. If you are concerned about security,
leave it\n"
- "empty and Mahogany will prompt you for it whenever needed.");
+ msg << _("\n"
+ "Please do notice however that the passwords are "
+ "stored using weak encryption.\n"
+ "So if you are concerned about security, it is "
+ "indeed better to leave it empty\n"
+ "and let Mahogany will prompt you for it "
+ "whenever needed.\n");
}
- if ( MDialog_YesNoDialog(msg, this, MDIALOG_YESNOTITLE,
- M_DLG_YES_DEFAULT,
+ msg << _T('\n')
+ << wxString::Format
+ (
+ _("So would you like to leave the %s empty?"),
+ what.c_str()
+ );
+
+ if ( !MDialog_YesNoDialog(msg, this, MDIALOG_YESNOTITLE,
+ M_DLG_YES_DEFAULT | M_DLG_NOT_ON_NO,
msgbox) )
{
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
