diff --git a/applet.cpp b/applet.cpp index 702f01418..78d974244 100644 --- a/applet.cpp +++ b/applet.cpp @@ -142,6 +142,11 @@ void Applet::constraintsUpdated() kDebug() << "Applet::constraintsUpdate(): constraints are FormFactor: " << formFactor() << ", Location: " << location() << endl; } +QString Applet::name() +{ + return d->appletDescription->name(); +} + FormFactor Applet::formFactor() const { if (!scene()) { diff --git a/applet.h b/applet.h index 9dc99576e..8e058c3bf 100644 --- a/applet.h +++ b/applet.h @@ -166,6 +166,13 @@ class PLASMA_EXPORT Applet : public QObject, public QGraphicsItemGroup **/ static Applet* loadApplet(const KPluginInfo* info, uint appletId = 0); + /** + * Returns the user-visible name for the applet, as specified in the + * .desktop file. + * @return the user-visible name for the applet. + **/ + QString name(); + Q_SIGNALS: /** * Emit this signal when your applet needs to take (or lose) keyboard diff --git a/corona.cpp b/corona.cpp index 2f23b3728..e5150888c 100644 --- a/corona.cpp +++ b/corona.cpp @@ -257,7 +257,6 @@ void Corona::contextMenuEvent(QGraphicsSceneContextMenuEvent *contextMenuEvent) } } */ - contextMenuEvent->accept(); Applet* applet = qgraphicsitem_cast(itemAt(point)); KMenu desktopMenu; @@ -268,17 +267,18 @@ void Corona::contextMenuEvent(QGraphicsSceneContextMenuEvent *contextMenuEvent) desktopMenu.addAction("menu"); desktopMenu.addAction(d->engineExplorerAction); } else { - //desktopMenu.setTitle( applet->name() ); //This isn't implemented in Applet yet... + desktopMenu.addTitle(applet->name()); +// desktopMenu.setTitle(applet->name()); desktopMenu.addAction("Widget"); desktopMenu.addAction("settings"); - desktopMenu.addAction("like"); - desktopMenu.addAction("opacity"); +// desktopMenu.addAction("like"); +// desktopMenu.addAction("opacity"); desktopMenu.addSeparator(); - QAction* configureApplet = new QAction(i18n("Configure Applet..."), this); + QAction* configureApplet = new QAction(i18n("Configure Plasmoid..."), this); connect(configureApplet, SIGNAL(triggered(bool)), applet, SLOT(configureDialog())); //This isn't implemented in Applet yet... desktopMenu.addAction(configureApplet); - QAction* closeApplet = new QAction(i18n("Close Applet"), this); + QAction* closeApplet = new QAction(i18n("Close Plasmoid"), this); connect(closeApplet, SIGNAL(triggered(bool)), applet, SLOT(deleteLater())); desktopMenu.addAction(closeApplet);