Improved GUI dialog presentation.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
r14.0.x
Michele Calgaro 3 years ago
parent a1aaa8e376
commit fa8c5e1b82
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -112,6 +112,7 @@ AuthDialog::AuthDialog(const TQString &actionId, const TQString &message,
m_userData.append(identities[0].toString()); m_userData.append(identities[0].toString());
m_authWidget->userCB->setCurrentItem(0); m_authWidget->userCB->setCurrentItem(0);
} }
on_userCB_currentIndexChanged(-1);
} }
AuthDialog::~AuthDialog() AuthDialog::~AuthDialog()
@ -131,41 +132,41 @@ void AuthDialog::setRequest(const TQString &request, bool requiresAdmin)
Identity identity = adminUserSelected(); Identity identity = adminUserSelected();
if (request.startsWith("password:", false)) if (request.startsWith("password:", false))
{ {
if (requiresAdmin) if (!identity.isValid())
{ {
if (!identity.isValid()) m_authWidget->lblPassword->setText(i18n("Password for root:"));
{ }
m_authWidget->lblPassword->setText(i18n("Password for root:")); else
} {
else if (!m_authWidget->userCB->isVisible())
{ {
TQString username = identity.toString().remove("unix-user:"); TQString username = identity.toString().remove("unix-user:");
m_authWidget->lblPassword->setText(i18n("Password for %1:").arg(username)); m_authWidget->lblPassword->setText(i18n("Password for %1:").arg(username));
} }
} else
else {
{ m_authWidget->lblPassword->setText(i18n("Password:"));
m_authWidget->lblPassword->setText(i18n("Password:")); }
} }
} }
else if (request.startsWith("password or swipe finger:"), false) else if (request.startsWith("password or swipe finger:"), false)
{ {
if (requiresAdmin) if (!identity.isValid())
{ {
if (!identity.isValid()) m_authWidget->lblPassword->setText(i18n("Password or swipe finger for root:"));
{ }
m_authWidget->lblPassword->setText(i18n("Password or swipe finger for root:")); else
} {
else if (!m_authWidget->userCB->isVisible())
{ {
TQString username = identity.toString().remove("unix-user:"); TQString username = identity.toString().remove("unix-user:");
m_authWidget->lblPassword->setText(i18n("Password or swipe finger for %1:").arg(username)); m_authWidget->lblPassword->setText(i18n("Password or swipe finger for %1:").arg(username));
} }
} else
else {
{ m_authWidget->lblPassword->setText(i18n("Password or swipe finger:"));
m_authWidget->lblPassword->setText(i18n("Password or swipe finger:")); }
} }
} }
else else
{ {
@ -261,6 +262,7 @@ void AuthDialog::on_userCB_currentIndexChanged(int /*index*/)
if (!identity.isValid()) if (!identity.isValid())
{ {
m_authWidget->lePassword->setEnabled(false); m_authWidget->lePassword->setEnabled(false);
m_authWidget->lblPassword->setText(i18n("Password:"));
m_authWidget->lblPassword->setEnabled(false); m_authWidget->lblPassword->setEnabled(false);
enableButtonOK(false); enableButtonOK(false);
} }
@ -283,7 +285,6 @@ TQString AuthDialog::password() const
void AuthDialog::authenticationFailure() void AuthDialog::authenticationFailure()
{ {
// TODO errorMessageKTW->setText(i18n("Authentication failure, please try again."), KTitleWidget::ErrorMessage);
TQFont bold = font(); TQFont bold = font();
bold.setBold(true); bold.setBold(true);
m_authWidget->errorMessageKTW->setText(i18n("Authentication failure, please try again.")); m_authWidget->errorMessageKTW->setText(i18n("Authentication failure, please try again."));

@ -8,8 +8,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>335</width> <width>300</width>
<height>193</height> <height>200</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -115,7 +115,7 @@
</widget> </widget>
</vbox> </vbox>
</widget> </widget>
<widget class="TQLabel" row="2" column="1" colspan="3"> <widget class="TQLabel" row="1" column="1" colspan="3">
<property name="name"> <property name="name">
<cstring>errorMessageKTW</cstring> <cstring>errorMessageKTW</cstring>
</property> </property>
@ -128,6 +128,11 @@
</sizepolicy> </sizepolicy>
</property> </property>
</widget> </widget>
<widget class="KComboBox" row="2" column="1" colspan="3">
<property name="name">
<cstring>userCB</cstring>
</property>
</widget>
<widget class="TQLabel" row="3" column="1" colspan="2"> <widget class="TQLabel" row="3" column="1" colspan="2">
<property name="name"> <property name="name">
<cstring>lblPassword</cstring> <cstring>lblPassword</cstring>
@ -147,20 +152,8 @@
<enum>Password</enum> <enum>Password</enum>
</property> </property>
</widget> </widget>
<widget class="KComboBox" row="1" column="1" colspan="3">
<property name="name">
<cstring>userCB</cstring>
</property>
</widget>
</grid> </grid>
</widget> </widget>
<!--customwidgets>
<customwidget>
<class>KTitleWidget</class>
<extends>TQWidget</extends>
<header>ktitlewidget.h</header>
</customwidget>
</customwidgets-->
<tabstops> <tabstops>
<tabstop>userCB</tabstop> <tabstop>userCB</tabstop>
<tabstop>lePassword</tabstop> <tabstop>lePassword</tabstop>

@ -178,7 +178,7 @@ void PolkitListener::request(const TQString &request, bool _)
if (m_dialog) if (m_dialog)
{ {
m_dialog->setRequest(request, m_selectedUser.isValid() && m_dialog->setRequest(request, m_selectedUser.isValid() &&
m_selectedUser.toString() == "unix-user:root"); m_selectedUser.toString() == "unix-user:root");
} }
} }

Loading…
Cancel
Save