Restore Ignore button in tdesu, but set default to not showing

This relates to Bug 985
pull/2/head
Darrell Anderson 11 years ago committed by Slávek Banko
parent 66eb955042
commit 266a2501df

@ -15,7 +15,7 @@
#include "sudlg.h"
KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton, int timeout)
: KPasswordDialog(Password, enableKeep, 0, icon)
: KPasswordDialog(Password, enableKeep, (withIgnoreButton ? User1:NoDefault), icon)
{
TDEConfig* config = TDEGlobal::config();
config->setGroup("super-user-command");
@ -32,12 +32,27 @@ KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,co
if (superUserCommand == "sudo" && m_User == "root") {
prompt = i18n("Please enter your password." );
} else {
if (m_User == "root") {
prompt = i18n("The action you requested needs root privileges. "
"Please enter root's password below.");
} else {
prompt = i18n("The action you requested needs additional privileges. "
"Please enter the password for \"%1\" below.").arg(static_cast<const char *>(m_User));
if (withIgnoreButton) {
if (m_User == "root") {
prompt = i18n("The action you requested needs root privileges. "
"Please enter root's password below or click "
"Ignore to continue with your current privileges.");
}
else {
prompt = i18n("The action you requested needs additional privileges. "
"Please enter the password for \"%1\" below or click "
"Ignore to continue with your current privileges.").arg(static_cast<const char *>(m_User));
}
}
else {
if (m_User == "root") {
prompt = i18n("The action you requested needs root privileges. "
"Please enter root's password below.");
}
else {
prompt = i18n("The action you requested needs additional privileges. "
"Please enter the password for \"%1\" below.").arg(static_cast<const char *>(m_User));
}
}
}
setPrompt(prompt);

@ -64,7 +64,7 @@ static TDECmdLineOptions options[] = {
{ "r", I18N_NOOP("Use realtime scheduling"), 0 },
{ "nonewdcop", I18N_NOOP("Let command use existing dcopserver"), 0 },
{ "comment <comment>", I18N_NOOP("Ignored"), "" },
{ "noignorebutton", I18N_NOOP("Do not display ignore button"), 0 },
{ "ignorebutton", I18N_NOOP("Display the ignore button"), 0 },
{ "i <icon name>", I18N_NOOP("Specify icon to use in the password dialog"), 0},
{ "d", I18N_NOOP("Do not show the command to be run in the dialog"), 0},
TDECmdLineLastOption

Loading…
Cancel
Save