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

get rid of internal ShellPackage

Browse Source 
ShellPackage is a plugin in plasma-workspace now, don't duplicate

Change-Id: I77edf63acf6c99314f6062d7ef2f55a129727013
This commit is contained in:
Marco Martin 2014-09-15 18:20:34 +02:00
parent 37b34711d8
commit 919694a1de
3 changed files with 0 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plasma/pluginloader.cpp
View File

@ -432,8 +432,6 @@ Package PluginLoader::loadPackage(const QString &packageFormat, const QString &s
structure = new ThemePackage();
} else if (packageFormat.endsWith("/ContainmentActions")) {
structure = new ContainmentActionsPackage();
} else if (packageFormat.endsWith("/Shell")) {
structure = new ShellPackage();
} else if (packageFormat.endsWith("/Generic")) {
structure = new GenericPackage();
}

41
src/plasma/private/packages.cpp
View File

@ -240,46 +240,5 @@ void ContainmentActionsPackage::initPackage(Package *package)
package->setDefaultPackageRoot(PLASMA_RELATIVE_DATA_INSTALL_DIR "/containmentactions/");
}
void ShellPackage::initPackage(Plasma::Package *package)
{
package->setDefaultPackageRoot(PLASMA_RELATIVE_DATA_INSTALL_DIR "/shells/");
//Directories
package->addDirectoryDefinition("applet", "applet", i18n("Applets furniture"));
package->addDirectoryDefinition("configuration", "configuration", i18n("Applets furniture"));
package->addDirectoryDefinition("explorer", "explorer", i18n("Explorer UI for adding widgets"));
package->addDirectoryDefinition("views", "views", i18n("User interface for the views that will show containments"));
package->setMimeTypes("applet", QStringList() << "text/x-qml");
package->setMimeTypes("configuration", QStringList() << "text/x-qml");
package->setMimeTypes("views", QStringList() << "text/x-qml");
//Files
//Default layout
package->addFileDefinition("defaultlayout", "layout.js", i18n("Default layout file"));
package->addFileDefinition("defaults", "defaults", i18n("Default plugins for containments, containmentActions, etc."));
package->setMimeTypes("defaultlayout", QStringList() << "application/javascript");
package->setMimeTypes("defaults", QStringList() << "text/plain");
//Applet furniture
package->addFileDefinition("appleterror", "applet/AppletError.qml", i18n("Error message shown when an applet fails to load"));
package->addFileDefinition("compactapplet", "applet/CompactApplet.qml", i18n("QML component that shows an applet in a popup"));
package->addFileDefinition("defaultcompactrepresentation", "applet/DefaultCompactRepresentation.qml", i18n("Compact representation of an applet when collapsed in a popup, for instance as an icon. Applets can override this component."));
//Configuration
package->addFileDefinition("appletconfigurationui", "configuration/AppletConfiguration.qml", i18n("QML component for the configuration dialog for applets"));
package->addFileDefinition("containmentconfigurationui", "configuration/ContainmentConfiguration.qml", i18n("QML component for the configuration dialog for containments"));
package->addFileDefinition("panelconfigurationui", "configuration/PanelConfiguration.qml", i18n("Panel configuration UI"));
package->addFileDefinition("appletalternativesui", "explorer/AppletAlternatives.qml", i18n("QML component for choosing an alternate applet"));
//Widget explorer
package->addFileDefinition("widgetexplorer", "explorer/WidgetExplorer.qml", i18n("Widgets explorer UI"));
package->addFileDefinition("interactiveconsole", "InteractiveConsole.qml",
i18n("A UI for writing, loading and running desktop scripts in the current live session"));
//package->setRequired("mainscript", true);
}
} // namespace Plasma

6
src/plasma/private/packages_p.h
View File

@ -66,12 +66,6 @@ public:
void initPackage(Package *package);
};
class ShellPackage: public Plasma::PackageStructure
{
public:
void initPackage(Plasma::Package *package);
};
} // namespace Plasma
#endif // LIBS_PLASMA_PACKAGES_P_H