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

Merge branch 'master' of git://anongit.kde.org/kde-runtime

Browse Source
This commit is contained in:
Sebastian Kügler 2011-04-27 03:43:08 +02:00
commit 9dab5df492
3 changed files with 84 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
declarativeimports/core/theme.cpp
View File

@ -31,7 +31,7 @@ ThemeProxy::~ThemeProxy()
{
}
QString ThemeProxy::name() const
QString ThemeProxy::themeName() const
{
return Plasma::Theme::defaultTheme()->themeName();
}
@ -46,11 +46,26 @@ bool ThemeProxy::windowTranslucencyEnabled() const
return Plasma::Theme::defaultTheme()->windowTranslucencyEnabled();
}
QUrl ThemeProxy::homepage() const
KUrl ThemeProxy::homepage() const
{
return Plasma::Theme::defaultTheme()->homepage();
}
bool ThemeProxy::useGlobalSettings() const
{
return Plasma::Theme::defaultTheme()->useGlobalSettings();
}
QString ThemeProxy::styleSheet() const
{
return Plasma::Theme::defaultTheme()->styleSheet();
}
QString ThemeProxy::wallpaperPath() const
{
return Plasma::Theme::defaultTheme()->wallpaperPath();
}
QColor ThemeProxy::textColor() const
{
return Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor);

18
declarativeimports/core/theme_p.h
View File

@ -21,7 +21,7 @@
#include <QObject>
#include <QUrl>
#include <KUrl>
#include <QFont>
#include <QColor>
@ -29,10 +29,13 @@ class ThemeProxy : public QObject
{
Q_OBJECT
Q_PROPERTY(QString name READ name NOTIFY themeChanged)
Q_PROPERTY(QString themeName READ themeName NOTIFY themeChanged)
Q_PROPERTY(QFont font READ font NOTIFY themeChanged)
Q_PROPERTY(bool translucent READ windowTranslucencyEnabled NOTIFY themeChanged)
Q_PROPERTY(QUrl homepage READ homepage NOTIFY themeChanged)
Q_PROPERTY(bool windowTranslucentEnabled READ windowTranslucencyEnabled NOTIFY themeChanged)
Q_PROPERTY(KUrl homepage READ homepage NOTIFY themeChanged)
Q_PROPERTY(bool useGlobalSettings READ useGlobalSettings NOTIFY themeChanged)
Q_PROPERTY(QString styleSheet READ styleSheet NOTIFY themeChanged)
Q_PROPERTY(QString wallpaperPath READ wallpaperPath NOTIFY themeChanged)
// colors
Q_PROPERTY(QColor textColor READ textColor NOTIFY themeChanged)
@ -55,10 +58,13 @@ public:
ThemeProxy(QObject *parent = 0);
~ThemeProxy();
QString name() const;
QString themeName() const;
QFont font() const;
bool windowTranslucencyEnabled() const;
QUrl homepage() const;
KUrl homepage() const;
bool useGlobalSettings() const;
QString styleSheet() const;
QString wallpaperPath() const;
QColor textColor() const;
QColor highlightColor() const;

90
tools/plasmapkg/main.cpp
View File

@ -75,61 +75,40 @@ void listPackages(const QStringList& types)
}
}
void listTypes()
void renderTypeTable(const QMap<QString, QStringList> &plugins)
{
output(i18n("Package types that are installable with this tool:"));
output(i18n("Built in:"));
output(i18n(" dataengine: Plasma DataEngine plugin"));
output(i18n(" layout-template: Plasma containment and widget layout script"));
output(i18n(" plasmoid: Plasma widget"));
output(i18n(" runner: Search plugin (KRunner, etc)"));
output(i18n(" theme: Plasma SVG theme"));
output(i18n(" wallpaper: Image pack for use with wallpaper backgrounds"));
output(i18n(" wallpaperplugin: Wallpaper plugin"));
KService::List offers = KServiceTypeTrader::self()->query("Plasma/PackageStructure");
if (!offers.isEmpty()) {
std::cout << std::endl;
output(i18n("Provided by plugins:"));
const QString pluginHeader = i18n("Plugin Name");
const QString nameHeader = i18n("Type");
const QString pathHeader = i18n("Install Root");
int pluginWidth = pluginHeader.length();
const QString nameHeader = i18n("Addon Name");
const QString pluginHeader = i18n("Service Type");
const QString pathHeader = i18n("Path");
int nameWidth = nameHeader.length();
int pluginWidth = pluginHeader.length();
int pathWidth = pathHeader.length();
QMap<QString, QStringList> plugins;
foreach (const KService::Ptr service, offers) {
KPluginInfo info(service);
Plasma::PackageStructure::Ptr structure = Plasma::PackageStructure::load(info.pluginName());
QString name = info.name();
QString plugin = info.pluginName();
QString path = structure->defaultPackageRoot();
if (name.length() > nameWidth) {
nameWidth = name.length();
QMapIterator<QString, QStringList> pluginIt(plugins);
while (pluginIt.hasNext()) {
pluginIt.next();
if (pluginIt.key().length() > nameWidth) {
nameWidth = pluginIt.key().length();
}
if (plugin.length() > pluginWidth) {
pluginWidth = plugin.length();
if (pluginIt.value()[0].length() > pluginWidth) {
pluginWidth = pluginIt.value()[0].length();
}
if (path.length() > pathWidth) {
pathWidth = path.length();
if (pluginIt.value()[1].length() > pathWidth) {
pathWidth = pluginIt.value()[1].length();
}
plugins.insert(name, QStringList() << plugin << path);
}
std::cout << nameHeader.toLocal8Bit().constData() << std::setw(nameWidth - nameHeader.length() + 2) << ' '
<< pluginHeader.toLocal8Bit().constData() << std::setw(pluginWidth - pluginHeader.length() + 2) << ' '
<< pathHeader.toLocal8Bit().constData() << std::endl;
std::cout << std::setfill('-') << std::setw(nameWidth) << '-' << " "
<< std::setw(pluginWidth) << '-' << " "
<< std::setw(pathWidth) << '-' << std::endl;
QMapIterator<QString, QStringList> pluginIt(plugins);
std::cout << std::setfill(' ');
pluginIt.toFront();
while (pluginIt.hasNext()) {
pluginIt.next();
std::cout << pluginIt.key().toLocal8Bit().constData() << std::setw(nameWidth - pluginIt.key().length() + 2) << ' '
@ -138,18 +117,51 @@ void listTypes()
}
}
void listTypes()
{
output(i18n("Package types that are installable with this tool:"));
output(i18n("Built in:"));
QMap<QString, QStringList> builtIns;
builtIns.insert(i18n("DataEngine"), QStringList() << "Plasma/DataEngine" << "plasma/dataengines/");
builtIns.insert(i18n("Layout Template"), QStringList() << "Plasma/LayoutTemplate" << "plasma/layout-templates/");
builtIns.insert(i18n("Plasmoid"), QStringList() << "Plasma/Applet" << "plasma/plasmoids/");
builtIns.insert(i18n("Runner"), QStringList() << "Plasma/Runner" << "plasma/runners/");
builtIns.insert(i18n("Theme"), QStringList() << "" << "desktoptheme/");
builtIns.insert(i18n("Wallpaper Images"), QStringList() << "" << "wallpapers/");
builtIns.insert(i18n("Wallpaper Plugin"), QStringList() << "Plasma/Wallpaper" << "plasma/wallpapers/");
renderTypeTable(builtIns);
KService::List offers = KServiceTypeTrader::self()->query("Plasma/PackageStructure");
if (!offers.isEmpty()) {
std::cout << std::endl;
output(i18n("Provided by plugins:"));
QMap<QString, QStringList> plugins;
foreach (const KService::Ptr service, offers) {
KPluginInfo info(service);
Plasma::PackageStructure::Ptr structure = Plasma::PackageStructure::load(info.pluginName());
QString name = info.name();
QString plugin = info.pluginName();
QString path = structure->defaultPackageRoot();
plugins.insert(name, QStringList() << plugin << path);
}
renderTypeTable(plugins);
}
QStringList desktopFiles = KGlobal::dirs()->findAllResources("data", "plasma/packageformats/*rc", KStandardDirs::NoDuplicates);
if (!desktopFiles.isEmpty()) {
output(i18n("Provided by .desktop files:"));
Plasma::PackageStructure structure;
QMap<QString, QStringList> plugins;
foreach (const QString &file, desktopFiles) {
// extract the type
KConfig config(file, KConfig::SimpleConfig);
structure.read(&config);
// get the name based on the rc file name, just as Plasma::PackageStructure does
const QString name = file.left(file.length() - 2);
output(i18nc("Plugin name and the kind of Plasma related content it provides, both from the plugin's desktop file",
" %1: %2", name, structure.type()));
plugins.insert(name, QStringList() << structure.type() << structure.defaultPackageRoot());
}
}
}