summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/AuthDialog.cpp67
-rw-r--r--src/AuthDialogWidget.ui23
-rw-r--r--src/polkit-listener.cpp2
3 files changed, 43 insertions, 49 deletions
diff --git a/src/AuthDialog.cpp b/src/AuthDialog.cpp
index 2079bca..03872af 100644
--- a/src/AuthDialog.cpp
+++ b/src/AuthDialog.cpp
@@ -112,6 +112,7 @@ AuthDialog::AuthDialog(const TQString &actionId, const TQString &message,
m_userData.append(identities[0].toString());
m_authWidget->userCB->setCurrentItem(0);
}
+ on_userCB_currentIndexChanged(-1);
}
AuthDialog::~AuthDialog()
@@ -131,41 +132,41 @@ void AuthDialog::setRequest(const TQString &request, bool requiresAdmin)
Identity identity = adminUserSelected();
if (request.startsWith("password:", false))
{
- if (requiresAdmin)
- {
- if (!identity.isValid())
- {
- m_authWidget->lblPassword->setText(i18n("Password for root:"));
- }
- else
- {
- TQString username = identity.toString().remove("unix-user:");
- m_authWidget->lblPassword->setText(i18n("Password for %1:").arg(username));
- }
- }
- else
- {
- m_authWidget->lblPassword->setText(i18n("Password:"));
- }
+ if (!identity.isValid())
+ {
+ m_authWidget->lblPassword->setText(i18n("Password for root:"));
+ }
+ else
+ {
+ if (!m_authWidget->userCB->isVisible())
+ {
+ TQString username = identity.toString().remove("unix-user:");
+ m_authWidget->lblPassword->setText(i18n("Password for %1:").arg(username));
+ }
+ else
+ {
+ m_authWidget->lblPassword->setText(i18n("Password:"));
+ }
+ }
}
else if (request.startsWith("password or swipe finger:"), false)
{
- if (requiresAdmin)
- {
- if (!identity.isValid())
- {
- m_authWidget->lblPassword->setText(i18n("Password or swipe finger for root:"));
- }
- else
- {
- TQString username = identity.toString().remove("unix-user:");
- m_authWidget->lblPassword->setText(i18n("Password or swipe finger for %1:").arg(username));
- }
- }
- else
- {
- m_authWidget->lblPassword->setText(i18n("Password or swipe finger:"));
- }
+ if (!identity.isValid())
+ {
+ m_authWidget->lblPassword->setText(i18n("Password or swipe finger for root:"));
+ }
+ else
+ {
+ if (!m_authWidget->userCB->isVisible())
+ {
+ TQString username = identity.toString().remove("unix-user:");
+ m_authWidget->lblPassword->setText(i18n("Password or swipe finger for %1:").arg(username));
+ }
+ else
+ {
+ m_authWidget->lblPassword->setText(i18n("Password or swipe finger:"));
+ }
+ }
}
else
{
@@ -261,6 +262,7 @@ void AuthDialog::on_userCB_currentIndexChanged(int /*index*/)
if (!identity.isValid())
{
m_authWidget->lePassword->setEnabled(false);
+ m_authWidget->lblPassword->setText(i18n("Password:"));
m_authWidget->lblPassword->setEnabled(false);
enableButtonOK(false);
}
@@ -283,7 +285,6 @@ TQString AuthDialog::password() const
void AuthDialog::authenticationFailure()
{
- // TODO errorMessageKTW->setText(i18n("Authentication failure, please try again."), KTitleWidget::ErrorMessage);
TQFont bold = font();
bold.setBold(true);
m_authWidget->errorMessageKTW->setText(i18n("Authentication failure, please try again."));
diff --git a/src/AuthDialogWidget.ui b/src/AuthDialogWidget.ui
index 0425eb1..daf4cb2 100644
--- a/src/AuthDialogWidget.ui
+++ b/src/AuthDialogWidget.ui
@@ -8,8 +8,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>335</width>
- <height>193</height>
+ <width>300</width>
+ <height>200</height>
</rect>
</property>
<property name="sizePolicy">
@@ -115,7 +115,7 @@
</widget>
</vbox>
</widget>
- <widget class="TQLabel" row="2" column="1" colspan="3">
+ <widget class="TQLabel" row="1" column="1" colspan="3">
<property name="name">
<cstring>errorMessageKTW</cstring>
</property>
@@ -128,6 +128,11 @@
</sizepolicy>
</property>
</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">
<property name="name">
<cstring>lblPassword</cstring>
@@ -147,20 +152,8 @@
<enum>Password</enum>
</property>
</widget>
- <widget class="KComboBox" row="1" column="1" colspan="3">
- <property name="name">
- <cstring>userCB</cstring>
- </property>
- </widget>
</grid>
</widget>
- <!--customwidgets>
- <customwidget>
- <class>KTitleWidget</class>
- <extends>TQWidget</extends>
- <header>ktitlewidget.h</header>
- </customwidget>
- </customwidgets-->
<tabstops>
<tabstop>userCB</tabstop>
<tabstop>lePassword</tabstop>
diff --git a/src/polkit-listener.cpp b/src/polkit-listener.cpp
index efd5261..f58a6c6 100644
--- a/src/polkit-listener.cpp
+++ b/src/polkit-listener.cpp
@@ -178,7 +178,7 @@ void PolkitListener::request(const TQString &request, bool _)
if (m_dialog)
{
m_dialog->setRequest(request, m_selectedUser.isValid() &&
- m_selectedUser.toString() == "unix-user:root");
+ m_selectedUser.toString() == "unix-user:root");
}
}