← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kde4libs/oneiric-security

« back to all changes in this revision

Viewing changes to plasma/applet.cpp

  • Committer: Package Import Robot
  • Author(s): Michał Zając, Michał Zając, Jonathan Riddell
  • Date: 2011-02-27 14:10:59 UTC
  • mfrom: (1.14.3 upstream)
  • Revision ID: package-import@ubuntu.com-20110227141059-asgzcw48ao08rvkp
Tags: 4:4.6.1-0ubuntu1
[ Michał Zając ]
* New upstream release
* Refreshed kubuntu_06_user_disk_mounting.diff
* Refreshed kubuntu_77_ksambashare.diff
* Refreshed *.install files

[ Jonathan Riddell ]
* Add back kubuntu_77_no_kbookmark_write_error.diff workaround for LP:
  #627815

Show diffs side-by-side

added added

removed removed

Lines of Context:
plasma/applet.cpp
645
645
    //find out if we're disappearing because of a button press
646
646
    PushButton *button = qobject_cast<PushButton *>(q->sender());
647
647
    if (button) {
648
 
        if (button->text() == i18n("Ok")) {
 
648
        if (button->text() == i18n("&Ok")) {
649
649
            buttonCode = ButtonOk;
650
650
        }
651
 
        if (button->text() == i18n("Yes")) {
 
651
        if (button->text() == i18n("&Yes")) {
652
652
            buttonCode = ButtonYes;
653
653
        }
654
 
        if (button->text() == i18n("No")) {
 
654
        if (button->text() == i18n("&No")) {
655
655
            buttonCode = ButtonNo;
656
656
        }
657
 
        if (button->text() == i18n("Cancel")) {
 
657
        if (button->text() == i18n("&Cancel")) {
 
658
            buttonCode = ButtonCancel;
658
659
        }
659
660
 
660
661
        emit q->messageButtonPressed(buttonCode);
 
662
    } else if (q->sender() == messageOverlay) {
 
663
        emit q->messageButtonPressed(ButtonCancel);
661
664
    }
662
665
}
663
666
 
1116
1119
        connect(cancel, SIGNAL(clicked()), this, SLOT(destroyMessageOverlay()));
1117
1120
    }
1118
1121
 
1119
 
    QAction *action = new QAction(this);
1120
 
    action->setShortcut(Qt::Key_Escape);
1121
 
    mainWidget->addAction(action);
1122
 
    connect(action, SIGNAL(triggered()), this, SLOT(destroyMessageOverlay()));
 
1122
    d->messageCloseAction = new QAction(d->messageOverlay);
 
1123
    d->messageCloseAction.data()->setShortcut(Qt::Key_Escape);
 
1124
    mainWidget->addAction(d->messageCloseAction.data());
 
1125
    connect(d->messageCloseAction.data(), SIGNAL(triggered()), this, SLOT(destroyMessageOverlay()));
1123
1126
 
1124
1127
    buttonLayout->addStretch();
1125
1128