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

add context

Browse Source 
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=879206
This commit is contained in:
Albert Astals Cid 2008-11-02 17:38:52 +00:00
parent 870e710307
commit 45edd84dfc
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applet.cpp
View File

@ -791,7 +791,7 @@ void Applet::flushPendingConstraintsEvents()
closeApplet->setEnabled(unlocked); closeApplet->setEnabled(unlocked);
closeApplet->setVisible(unlocked); closeApplet->setVisible(unlocked);
closeApplet->setShortcutContext(Qt::WidgetShortcut); //don't clash with other views closeApplet->setShortcutContext(Qt::WidgetShortcut); //don't clash with other views
closeApplet->setText(i18n("Remove this %1", name())); closeApplet->setText(i18nc("%1 is the name of the applet", "Remove this %1", name()));
if (isContainment()) { if (isContainment()) {
closeApplet->setShortcut(QKeySequence("ctrl+shift+r")); closeApplet->setShortcut(QKeySequence("ctrl+shift+r"));
} else { } else {

8
containment.cpp
View File

@ -511,7 +511,7 @@ bool ContainmentPrivate::showContextMenu(const QPointF &point,
QMenu *containmentActionMenu = &desktopMenu; QMenu *containmentActionMenu = &desktopMenu;
if (!actions.isEmpty() && containmentActions.count() > 2) { if (!actions.isEmpty() && containmentActions.count() > 2) {
containmentActionMenu = new KMenu(i18n("%1 Options", q->name()), &desktopMenu); containmentActionMenu = new KMenu(i18nc("%1 is the name of the containment", "%1 Options", q->name()), &desktopMenu);
desktopMenu.addMenu(containmentActionMenu); desktopMenu.addMenu(containmentActionMenu);
} }
@ -530,7 +530,7 @@ bool ContainmentPrivate::showContextMenu(const QPointF &point,
QAction *closeApplet = applet->d->actions.action("remove"); QAction *closeApplet = applet->d->actions.action("remove");
if (!closeApplet) { //unlikely but not impossible if (!closeApplet) { //unlikely but not impossible
kDebug() << "no remove action!!!!!!!!"; kDebug() << "no remove action!!!!!!!!";
closeApplet = new QAction(i18n("Remove this %1", applet->name()), &desktopMenu); closeApplet = new QAction(i18nc("%1 is the name of the applet", "Remove this %1", applet->name()), &desktopMenu);
closeApplet->setIcon(KIcon("edit-delete")); closeApplet->setIcon(KIcon("edit-delete"));
QObject::connect(closeApplet, SIGNAL(triggered(bool)), applet, SLOT(destroy())); QObject::connect(closeApplet, SIGNAL(triggered(bool)), applet, SLOT(destroy()));
} }
@ -1377,8 +1377,8 @@ void Containment::destroy(bool confirm)
if (!confirm || if (!confirm ||
KMessageBox::warningContinueCancel( KMessageBox::warningContinueCancel(
view(), view(),
i18n("Do you really want to remove this %1?", name()), i18nc("%1 is the name of the containment", "Do you really want to remove this %1?", name()),
i18n("Remove %1", name()), KStandardGuiItem::remove()) == KMessageBox::Continue) { i18nc("@title:window %1 is the name of the containment", "Remove %1", name()), KStandardGuiItem::remove()) == KMessageBox::Continue) {
//clearApplets(); //clearApplets();
Applet::destroy(); Applet::destroy();
} }

2
private/service_p.h
View File

@ -44,7 +44,7 @@ public:
void start() void start()
{ {
setErrorText(i18n("Invalid (null) service, can not perform any operations.")); setErrorText(i18nc("Error message, tried to start an invalid service", "Invalid (null) service, can not perform any operations."));
emitResult(); emitResult();
} }
}; };