alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add accelerators to keys, also bind esc with the message overlay destruction

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1164893
This commit is contained in:
Marco Martin 2010-08-17 21:46:00 +00:00
parent 0d6a38b954
commit c53542ca7d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
applet.cpp
View File

@ -1073,7 +1073,7 @@ void Applet::showMessage(const QIcon &icon, const QString &message, const Messag
if (buttons & ButtonOk) { if (buttons & ButtonOk) {
PushButton *ok = new PushButton(mainWidget); PushButton *ok = new PushButton(mainWidget);
ok->setText(i18n("OK")); ok->setText(i18n("&OK"));
ok->setIcon(KIcon("dialog-ok")); ok->setIcon(KIcon("dialog-ok"));
buttonLayout->addItem(ok); buttonLayout->addItem(ok);
connect(ok, SIGNAL(clicked()), this, SLOT(destroyMessageOverlay())); connect(ok, SIGNAL(clicked()), this, SLOT(destroyMessageOverlay()));
@ -1081,26 +1081,31 @@ void Applet::showMessage(const QIcon &icon, const QString &message, const Messag
if (buttons & ButtonYes) { if (buttons & ButtonYes) {
PushButton *yes = new PushButton(mainWidget); PushButton *yes = new PushButton(mainWidget);
yes->setText(i18n("Yes")); yes->setText(i18n("&Yes"));
buttonLayout->addItem(yes); buttonLayout->addItem(yes);
connect(yes, SIGNAL(clicked()), this, SLOT(destroyMessageOverlay())); connect(yes, SIGNAL(clicked()), this, SLOT(destroyMessageOverlay()));
} }
if (buttons & ButtonNo) { if (buttons & ButtonNo) {
PushButton *no = new PushButton(mainWidget); PushButton *no = new PushButton(mainWidget);
no->setText(i18n("No")); no->setText(i18n("&No"));
buttonLayout->addItem(no); buttonLayout->addItem(no);
connect(no, SIGNAL(clicked()), this, SLOT(destroyMessageOverlay())); connect(no, SIGNAL(clicked()), this, SLOT(destroyMessageOverlay()));
} }
if (buttons & ButtonCancel) { if (buttons & ButtonCancel) {
PushButton *cancel = new PushButton(mainWidget); PushButton *cancel = new PushButton(mainWidget);
cancel->setText(i18n("Cancel")); cancel->setText(i18n("&Cancel"));
cancel->setIcon(KIcon("dialog-cancel")); cancel->setIcon(KIcon("dialog-cancel"));
buttonLayout->addItem(cancel); buttonLayout->addItem(cancel);
connect(cancel, SIGNAL(clicked()), this, SLOT(destroyMessageOverlay())); connect(cancel, SIGNAL(clicked()), this, SLOT(destroyMessageOverlay()));
} }
QAction *action = new QAction(this);
action->setShortcut(Qt::Key_Escape);
mainWidget->addAction(action);
connect(action, SIGNAL(triggered()), this, SLOT(destroyMessageOverlay()));
buttonLayout->addStretch(); buttonLayout->addStretch();
mainWidget->adjustSize(); mainWidget->adjustSize();