Michael Goffioul wrote: > CVS commit by goffioul: > > [Backport] Improved login management in add print wizard: use separate > [option for "guest" account, leaving anonymous access as "no login"; show > [current login in SMB selection page (bug #75746) > > > M +62 -32 kmwpassword.cpp 1.6.2.1 > M +5 -5 kmwpassword.h 1.3.2.1 > M +5 -1 kmwsmb.cpp 1.6.2.1 > M +2 -0 kmwsmb.h 1.2.8.1 > M +6 -0 smbview.cpp 1.13.2.1 Index: kmwpassword.cpp =================================================================== RCS file: /home/kde/kdelibs/kdeprint/management/kmwpassword.cpp,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -U2 -r1.6 -r1.6.2.1 --- kmwpassword.cpp 4 Jan 2004 17:52:30 -0000 1.6 +++ kmwpassword.cpp 10 Mar 2004 14:59:01 -0000 1.6.2.1 @@ -24,5 +24,6 @@ #include #include -#include +#include +#include #include #include @@ -41,6 +42,5 @@ QLabel *infotext_ = new QLabel(this); infotext_->setText(i18n("

This backend may require a login password to work properly. " - "Fill in the required entries or enable Guest account to " - "use anonymous access.

")); + "Select the type of access to use and fill in the login and password entries if needed.

")); m_login = new QLineEdit(this); m_login->setText(QString::fromLocal8Bit(getenv("USER"))); @@ -49,38 +49,61 @@ QLabel *loginlabel_ = new QLabel(i18n("&Login:"),this); QLabel *passwdlabel_ = new QLabel(i18n("&Password:"),this); - m_guest = new QCheckBox(i18n("&Guest account"),this); - m_guest->setCursor(KCursor::handCursor()); + m_btngroup = new QVButtonGroup( this ); + m_btngroup->setFrameStyle( QFrame::NoFrame ); + QRadioButton *btn1 = new QRadioButton( i18n( "&Anonymous (no login password)" ), m_btngroup ); + QRadioButton *btn2 = new QRadioButton( i18n( "&Guest account (login \"guest\")" ), m_btngroup ); + QRadioButton *btn3 = new QRadioButton( i18n( "Nor&mal account" ), m_btngroup ); + btn1->setCursor( KCursor::handCursor() ); + btn2->setCursor( KCursor::handCursor() ); + btn3->setCursor( KCursor::handCursor() ); + m_btngroup->setButton( 0 ); loginlabel_->setBuddy(m_login); passwdlabel_->setBuddy(m_password); - m_guest->setChecked(true); m_login->setEnabled(false); m_password->setEnabled(false); - connect(m_guest,SIGNAL(toggled(bool)),m_login,SLOT(setDisabled(bool))); - connect(m_guest,SIGNAL(toggled(bool)),m_password,SLOT(setDisabled(bool))); + connect(btn3,SIGNAL(toggled(bool)),m_login,SLOT(setEnabled(bool))); + connect(btn3,SIGNAL(toggled(bool)),m_password,SLOT(setEnabled(bool))); Is that rather a lot of new strings in a frozen branch? Regards, Malcolm -- KDE Proof Reading Team KDE British English Translation Team http://i18n.kde.org/teams/info/en_GB