Attachment #1654 for bug #985

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 985
Collapse All | Expand All




#include "sudlg.h"

KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton, int timeout)
     : KPasswordDialog(Password, enableKeep, (withIgnoreButton ? User1:NoDefault), icon)
{
    TDEConfig* config = TDEGlobal::config();
    config->setGroup("super-user-command");

    if (superUserCommand == "sudo" && m_User == "root") {
	    prompt = i18n("Please enter your password." );
    } else {
	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);

Lines 64-70 Link Here

(-)tdebase/tdesu/tdesu/tdesu.cpp (-1 / +1 lines)
64	{ "r", I18N_NOOP("Use realtime scheduling"), 0 },	64	{ "r", I18N_NOOP("Use realtime scheduling"), 0 },
65	{ "nonewdcop", I18N_NOOP("Let command use existing dcopserver"), 0 },	65	{ "nonewdcop", I18N_NOOP("Let command use existing dcopserver"), 0 },
66	{ "comment <comment>", I18N_NOOP("Ignored"), "" },	66	{ "comment <comment>", I18N_NOOP("Ignored"), "" },
67	{ "noignorebutton", I18N_NOOP("Do not display ignore button"), 0 },	67	{ "ignorebutton", I18N_NOOP("Display the ignore button"), 0 },
68	{ "i <icon name>", I18N_NOOP("Specify icon to use in the password dialog"), 0},	68	{ "i <icon name>", I18N_NOOP("Specify icon to use in the password dialog"), 0},
69	{ "d", I18N_NOOP("Do not show the command to be run in the dialog"), 0},	69	{ "d", I18N_NOOP("Do not show the command to be run in the dialog"), 0},
70	TDECmdLineLastOption	70	TDECmdLineLastOption

Return to bug 985

Lines 15-21 Link Here

(-)tdebase/tdesu/tdesu/sudlg.cpp (-7 / +20 lines)
15	#include "sudlg.h"	15	#include "sudlg.h"
16		16
17	KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton, int timeout)	17	KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton, int timeout)
18	: KPasswordDialog(Password, enableKeep, 0, icon)	18	: KPasswordDialog(Password, enableKeep, (withIgnoreButton ? User1:NoDefault), icon)
19	{	19	{
20	TDEConfig* config = TDEGlobal::config();	20	TDEConfig* config = TDEGlobal::config();
21	config->setGroup("super-user-command");	21	config->setGroup("super-user-command");
Lines 32-43 Link Here
32	if (superUserCommand == "sudo" && m_User == "root") {	32	if (superUserCommand == "sudo" && m_User == "root") {
33	prompt = i18n("Please enter your password." );	33	prompt = i18n("Please enter your password." );
34	} else {	34	} else {
35	if (m_User == "root") {	35	if (withIgnoreButton) {
36	prompt = i18n("The action you requested needs root privileges. "	36	if (m_User == "root") {
37	"Please enter root's password below.");	37	prompt = i18n("The action you requested needs root privileges. "
38	} else {	38	"Please enter root's password below or click "
39	prompt = i18n("The action you requested needs additional privileges. "	39	"Ignore to continue with your current privileges.");
40	"Please enter the password for \"%1\" below.").arg(static_cast<const char *>(m_User));	40	} else {
		41	prompt = i18n("The action you requested needs additional privileges. "
		42	"Please enter the password for \"%1\" below or click "
		43	"Ignore to continue with your current privileges.").arg(static_cast<const char *>(m_User));
		44	}
		45	}
		46	else {
		47	if (m_User == "root") {
		48	prompt = i18n("The action you requested needs root privileges. "
		49	"Please enter root's password below.");
		50	} else {
		51	prompt = i18n("The action you requested needs additional privileges. "
		52	"Please enter the password for \"%1\" below.").arg(static_cast<const char *>(m_User));
		53	}
41	}	54	}
42	}	55	}
43	setPrompt(prompt);	56	setPrompt(prompt);