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

Merge branch 'master' into sebas/kplugins

Browse Source 
Conflicts:
	CMakeLists.txt
This commit is contained in:
Sebastian Kügler 2013-07-09 02:34:36 +02:00
commit 21c04fd3d3
11 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -27,7 +27,6 @@ find_package(Qt5Core REQUIRED NO_MODULE)
find_package(Qt5Transitional MODULE) find_package(Qt5Transitional MODULE)
find_package(Qt5Quick REQUIRED NO_MODULE) find_package(Qt5Quick REQUIRED NO_MODULE)
find_package(Qt5X11Extras REQUIRED NO_MODULE) find_package(Qt5X11Extras REQUIRED NO_MODULE)
find_package(kde4support REQUIRED NO_MODULE)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
@ -58,11 +57,13 @@ find_package(kdeqt5staging REQUIRED NO_MODULE)
# Load CMake, Compiler and InstallDirs settings from KF5 and the following are already somewhat "done" tier1/tier2 libs from kdelibs: # Load CMake, Compiler and InstallDirs settings from KF5 and the following are already somewhat "done" tier1/tier2 libs from kdelibs:
find_package(KF5 MODULE REQUIRED COMPONENTS CMake Compiler InstallDirs find_package(KF5 MODULE REQUIRED COMPONENTS CMake Compiler InstallDirs
XmlGui KIdleTime ItemModels KWidgetsAddons KWindowSystem KCodecs KArchive KCoreAddons Solid ThreadWeaver XmlGui KIdleTime ItemModels KWidgetsAddons KWindowSystem KCodecs KArchive KCoreAddons Solid ThreadWeaver
KConfig KAuth kjs KWallet KConfig KAuth kjs KWallet KDBusAddons
ki18n kguiaddons kservice kwidgets ItemViews KNotifications KIconThemes KCompletion KJobWidgets KConfigWidgets) ki18n kguiaddons kservice kwidgets ItemViews KNotifications KIconThemes KCompletion KJobWidgets KConfigWidgets Sonnet)
#find_package(KF5Transitional REQUIRED) #find_package(KF5Transitional REQUIRED)
# those are not "done" yet: # those are not "done" yet:
find_package(kde4support REQUIRED NO_MODULE)
find_package(ktextwidgets REQUIRED NO_MODULE)
find_package(ki18n REQUIRED NO_MODULE) find_package(ki18n REQUIRED NO_MODULE)
find_package(kio REQUIRED NO_MODULE) find_package(kio REQUIRED NO_MODULE)
find_package(kdeclarative REQUIRED NO_MODULE) find_package(kdeclarative REQUIRED NO_MODULE)

2
src/declarativeimports/plasmacomponents/qml/Dialog.qml
View File

@ -293,7 +293,7 @@ Item {
Item { Item {
id: dialogLayout id: dialogLayout
width: Math.max(buttonItem.childrenRect.width, Math.min(contentItem.childrenRect.width, theme.mSize(theme.defaultFont).width * 30)) width: Math.max(buttonItem.childrenRect.width, contentItem.childrenRect.width)
height: titleBar.height + contentItem.childrenRect.height + buttonItem.childrenRect.height + 10 height: titleBar.height + contentItem.childrenRect.height + buttonItem.childrenRect.height + 10
parent: internalLoader.dialog ? internalLoader.dialog : internalLoader.inlineDialog parent: internalLoader.dialog ? internalLoader.dialog : internalLoader.inlineDialog

2
src/plasma/abstractrunner.cpp
View File

@ -19,7 +19,7 @@
#include "abstractrunner.h" #include "abstractrunner.h"
#include <QAction> #include <QtWidgets/QAction>
#include <QHash> #include <QHash>
#include <QMenu> #include <QMenu>
#include <QMimeData> #include <QMimeData>

2
src/plasma/containment.h
View File

@ -23,7 +23,7 @@
#define PLASMA_CONTAINMENT_H #define PLASMA_CONTAINMENT_H
#include <QObject> #include <QObject>
#include <QWidget> #include <QtWidgets/QWidget>
#include <kplugininfo.h> #include <kplugininfo.h>
#include <ksharedconfig.h> #include <ksharedconfig.h>

2
src/plasma/plasma.cpp
View File

@ -19,7 +19,7 @@
#include <plasma/plasma.h> #include <plasma/plasma.h>
#include <QAction> #include <QtWidgets/QAction>
#include <QMenu> #include <QMenu>
#include "containment.h" #include "containment.h"

2
src/plasma/querymatch.cpp
View File

@ -19,7 +19,7 @@
#include "querymatch.h" #include "querymatch.h"
#include <QAction> #include <QtWidgets/QAction>
#include <QIcon> #include <QIcon>
#include <QReadWriteLock> #include <QReadWriteLock>
#include <QSharedData> #include <QSharedData>

4
src/plasma/tests/testcontainmentactionsplugin/test.cpp
View File

@ -23,7 +23,7 @@
#include <QGraphicsSceneWheelEvent> #include <QGraphicsSceneWheelEvent>
#include <KDebug> #include <KDebug>
#include <KMenu> #include <QMenu>
#include <Plasma/Containment> #include <Plasma/Containment>
@ -60,7 +60,7 @@ void ContextTest::contextEvent(QGraphicsSceneMouseEvent *event)
return; return;
} }
KMenu desktopMenu; QMenu desktopMenu;
desktopMenu.addTitle(m_text); desktopMenu.addTitle(m_text);
desktopMenu.addAction(c->action("configure")); desktopMenu.addAction(c->action("configure"));
desktopMenu.exec(event->screenPos()); desktopMenu.exec(event->screenPos());

30
src/plasmapkg/main.cpp
View File

@ -26,30 +26,30 @@
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
QCommandLineParser *parser = new QCommandLineParser; QCommandLineParser parser;
Plasma::PlasmaPkg app(argc, argv, parser); Plasma::PlasmaPkg app(argc, argv, &parser);
const QString description = i18n("Plasma Package Manager"); const QString description = i18n("Plasma Package Manager");
const char version[] = "2.0"; const char version[] = "2.0";
app.setApplicationVersion(version); app.setApplicationVersion(version);
parser->addVersionOption(); parser.addVersionOption();
parser->addHelpOption(description); parser.addHelpOption(description);
parser->addOption(QCommandLineOption(QStringList() << "h" << "hash", i18nc("Do not translate <path>", "Generate a SHA1 hash for the package at <path>"), "path")); parser.addOption(QCommandLineOption(QStringList() << "h" << "hash", i18nc("Do not translate <path>", "Generate a SHA1 hash for the package at <path>"), "path"));
parser->addOption(QCommandLineOption(QStringList() << "g" << "global", i18n("For install or remove, operates on packages installed for all users."))); parser.addOption(QCommandLineOption(QStringList() << "g" << "global", i18n("For install or remove, operates on packages installed for all users.")));
parser->addOption(QCommandLineOption(QStringList() << "type", parser.addOption(QCommandLineOption(QStringList() << "type",
i18nc("theme, wallpaper, etc. are keywords, but they may be translated, as both versions " i18nc("theme, wallpaper, etc. are keywords, but they may be translated, as both versions "
"are recognized by the application " "are recognized by the application "
"(if translated, should be same as messages with 'package type' context below)", "(if translated, should be same as messages with 'package type' context below)",
"The type of package, e.g. theme, wallpaper, plasmoid, dataengine, runner, layout-template, etc."), "The type of package, e.g. theme, wallpaper, plasmoid, dataengine, runner, layout-template, etc."),
"type", false, QStringList() << "plasmoid")); "type", "plasmoid"));
parser->addOption(QCommandLineOption(QStringList() << "i" << "install", i18nc("Do not translate <path>", "Install the package at <path>"), "path")); parser.addOption(QCommandLineOption(QStringList() << "i" << "install", i18nc("Do not translate <path>", "Install the package at <path>"), "path"));
parser->addOption(QCommandLineOption(QStringList() << "s" << "show", i18nc("Do not translate <name>", "Show information of package <name>"), "name")); parser.addOption(QCommandLineOption(QStringList() << "s" << "show", i18nc("Do not translate <name>", "Show information of package <name>"), "name"));
parser->addOption(QCommandLineOption(QStringList() << "u" << "upgrade", i18nc("Do not translate <path>", "Upgrade the package at <path>"), "path")); parser.addOption(QCommandLineOption(QStringList() << "u" << "upgrade", i18nc("Do not translate <path>", "Upgrade the package at <path>"), "path"));
parser->addOption(QCommandLineOption(QStringList() << "l" << "list", i18n("List installed packages"))); parser.addOption(QCommandLineOption(QStringList() << "l" << "list", i18n("List installed packages")));
parser->addOption(QCommandLineOption(QStringList() << "list-types", i18n("lists all known Package types that can be installed"))); parser.addOption(QCommandLineOption(QStringList() << "list-types", i18n("lists all known Package types that can be installed")));
parser->addOption(QCommandLineOption(QStringList() << "r" << "remove", i18nc("Do not translate <name>", "Remove the package named <name>"), "name")); parser.addOption(QCommandLineOption(QStringList() << "r" << "remove", i18nc("Do not translate <name>", "Remove the package named <name>"), "name"));
parser->addOption(QCommandLineOption(QStringList() << "p" << "packageroot", i18n("Absolute path to the package root. If not supplied, then the standard data directories for this KDE session will be searched instead."), "path")); parser.addOption(QCommandLineOption(QStringList() << "p" << "packageroot", i18n("Absolute path to the package root. If not supplied, then the standard data directories for this KDE session will be searched instead."), "path"));
return app.exec(); return app.exec();
} }

16
src/plasmapkg/plasmapkg.cpp
View File

@ -87,7 +87,7 @@ void PlasmaPkg::runMain()
{ {
Plasma::PackageStructure* structure = new Plasma::PackageStructure; Plasma::PackageStructure* structure = new Plasma::PackageStructure;
if (d->parser->isSet("hash")) { if (d->parser->isSet("hash")) {
const QString path = d->parser->argument("hash"); const QString path = d->parser->value("hash");
Plasma::Package package(structure); Plasma::Package package(structure);
package.setPath(path); package.setPath(path);
const QString hash = package.contentsHash(); const QString hash = package.contentsHash();
@ -107,19 +107,19 @@ void PlasmaPkg::runMain()
return; return;
} }
QString type = d->parser->argument("type"); QString type = d->parser->value("type");
QString packageRoot = type; QString packageRoot = type;
d->pluginTypes.clear(); d->pluginTypes.clear();
d->installer = 0; d->installer = 0;
if (d->parser->isSet("remove")) { if (d->parser->isSet("remove")) {
d->package = d->parser->argument("remove"); d->package = d->parser->value("remove");
} else if (d->parser->isSet("upgrade")) { } else if (d->parser->isSet("upgrade")) {
d->package = d->parser->argument("upgrade"); d->package = d->parser->value("upgrade");
} else if (d->parser->isSet("install")) { } else if (d->parser->isSet("install")) {
d->package = d->parser->argument("install"); d->package = d->parser->value("install");
} else if (d->parser->isSet("show")) { } else if (d->parser->isSet("show")) {
d->package = d->parser->argument("show"); d->package = d->parser->value("show");
} }
if (!QDir::isAbsolutePath(d->package)) { if (!QDir::isAbsolutePath(d->package)) {
@ -269,7 +269,7 @@ void PlasmaPkg::runMain()
if (!d->installer) { if (!d->installer) {
d->coutput(i18n("Could not load installer for package of type %1. Error reported was: %2", d->coutput(i18n("Could not load installer for package of type %1. Error reported was: %2",
d->parser->argument("type"), error)); d->parser->value("type"), error));
return; return;
} }
@ -442,7 +442,7 @@ QString PlasmaPkg::findPackageRoot(const QString& pluginName, const QString& pre
qWarning() << i18nc("The user entered conflicting options packageroot and global, this is the error message telling the user he can use only one", "The packageroot and global options conflict each other, please select only one."); qWarning() << i18nc("The user entered conflicting options packageroot and global, this is the error message telling the user he can use only one", "The packageroot and global options conflict each other, please select only one.");
::exit(1); ::exit(1);
} else if (d->parser->isSet("packageroot")) { } else if (d->parser->isSet("packageroot")) {
packageRoot = d->parser->argument("packageroot"); packageRoot = d->parser->value("packageroot");
//qDebug() << "(set via arg) d->packageRoot is: " << d->packageRoot; //qDebug() << "(set via arg) d->packageRoot is: " << d->packageRoot;
} else if (d->parser->isSet("global")) { } else if (d->parser->isSet("global")) {
packageRoot = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, d->packageRoot, QStandardPaths::LocateDirectory).last(); packageRoot = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, d->packageRoot, QStandardPaths::LocateDirectory).last();

8
src/scriptengines/qml/plasmoid/containmentinterface.cpp
View File

@ -207,7 +207,7 @@ void ContainmentInterface::mousePressEvent(QMouseEvent *event)
void ContainmentInterface::mouseReleaseEvent(QMouseEvent *event) void ContainmentInterface::mouseReleaseEvent(QMouseEvent *event)
{ {
KMenu desktopMenu; QMenu desktopMenu;
//FIXME: very inefficient appletAt() implementation //FIXME: very inefficient appletAt() implementation
Plasma::Applet *applet = 0; Plasma::Applet *applet = 0;
@ -234,7 +234,7 @@ void ContainmentInterface::mouseReleaseEvent(QMouseEvent *event)
void ContainmentInterface::addAppletActions(KMenu &desktopMenu, Plasma::Applet *applet, QEvent *event) void ContainmentInterface::addAppletActions(QMenu &desktopMenu, Plasma::Applet *applet, QEvent *event)
{ {
foreach (QAction *action, applet->contextualActions()) { foreach (QAction *action, applet->contextualActions()) {
if (action) { if (action) {
@ -254,7 +254,7 @@ void ContainmentInterface::addAppletActions(KMenu &desktopMenu, Plasma::Applet *
} }
} }
KMenu *containmentMenu = new KMenu(i18nc("%1 is the name of the containment", "%1 Options", containment()->title()), &desktopMenu); QMenu *containmentMenu = new QMenu(i18nc("%1 is the name of the containment", "%1 Options", containment()->title()), &desktopMenu);
addContainmentActions(*containmentMenu, event); addContainmentActions(*containmentMenu, event);
if (!containmentMenu->isEmpty()) { if (!containmentMenu->isEmpty()) {
@ -296,7 +296,7 @@ void ContainmentInterface::addAppletActions(KMenu &desktopMenu, Plasma::Applet *
} }
} }
void ContainmentInterface::addContainmentActions(KMenu &desktopMenu, QEvent *event) void ContainmentInterface::addContainmentActions(QMenu &desktopMenu, QEvent *event)
{ {
if (containment()->corona()->immutability() != Plasma::Types::Mutable && if (containment()->corona()->immutability() != Plasma::Types::Mutable &&
!KAuthorized::authorizeKAction("plasma/containment_actions")) { !KAuthorized::authorizeKAction("plasma/containment_actions")) {

6
src/scriptengines/qml/plasmoid/containmentinterface.h
View File

@ -21,7 +21,7 @@
#ifndef CONTAINMENTINTERFACE_H #ifndef CONTAINMENTINTERFACE_H
#define CONTAINMENTINTERFACE_H #define CONTAINMENTINTERFACE_H
#include <KMenu> #include <QMenu>
#include <Plasma/Containment> #include <Plasma/Containment>
@ -74,8 +74,8 @@ protected:
void mousePressEvent(QMouseEvent *event); void mousePressEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event); void mouseReleaseEvent(QMouseEvent *event);
void addAppletActions(KMenu &desktopMenu, Plasma::Applet *applet, QEvent *event); void addAppletActions(QMenu &desktopMenu, Plasma::Applet *applet, QEvent *event);
void addContainmentActions(KMenu &desktopMenu, QEvent *event); void addContainmentActions(QMenu &desktopMenu, QEvent *event);
Q_SIGNALS: Q_SIGNALS:
void appletAdded(QObject *applet); void appletAdded(QObject *applet);