yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure main.qml presence

Browse source 
BUG: 304881
REVIEW: 106062
FIXED-IN: 4.9.1
This commit is contained in:
Thomas Lübking 2012-08-17 13:19:21 +02:00
parent f82fffdd71
commit 4f3b3ee154
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kcmkwin/kwindecoration/kwindecoration.cpp
View file

@ -47,6 +47,7 @@
#include <KAboutData> #include <KAboutData>
#include <KDialog> #include <KDialog>
#include <KLocale> #include <KLocale>
#include <KMessageBox>
#include <KNS3/DownloadDialog> #include <KNS3/DownloadDialog>
#include <KDE/KStandardDirs> #include <KDE/KStandardDirs>
#include <KPluginFactory> #include <KPluginFactory>
@ -78,6 +79,15 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const QVariantList &
, m_lastPreviewWidth(-1) , m_lastPreviewWidth(-1)
, m_previewUpdateTimer(NULL) , m_previewUpdateTimer(NULL)
{ {
const QString mainQmlPath = KStandardDirs::locate("data", "kwin/kcm_kwindecoration/main.qml");
if (mainQmlPath.isNull()) {
// TODO 4.10 i18n this
KMessageBox::error(this, "<h1>Installation error</h1>"
"The resource<h2>kwin/kcm_kwindecoration/main.qml</h2>could not be located in any application data path."
"<h2>Please contact your distribution</h2>"
"The application will now abort", "Installation Error");
abort();
}
qmlRegisterType<Aurorae::AuroraeTheme>("org.kde.kwin.aurorae", 0, 1, "AuroraeTheme"); qmlRegisterType<Aurorae::AuroraeTheme>("org.kde.kwin.aurorae", 0, 1, "AuroraeTheme");
m_ui = new KWinDecorationForm(this); m_ui = new KWinDecorationForm(this);
m_ui->configureDecorationButton->setIcon(KIcon("configure")); m_ui->configureDecorationButton->setIcon(KIcon("configure"));
@ -102,7 +112,7 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const QVariantList &
m_ui->decorationList->rootContext()->setContextProperty("highlightColor", m_ui->decorationList->palette().color(QPalette::Highlight)); m_ui->decorationList->rootContext()->setContextProperty("highlightColor", m_ui->decorationList->palette().color(QPalette::Highlight));
m_ui->decorationList->rootContext()->setContextProperty("sliderWidth", m_ui->decorationList->verticalScrollBar()->width()); m_ui->decorationList->rootContext()->setContextProperty("sliderWidth", m_ui->decorationList->verticalScrollBar()->width());
m_ui->decorationList->rootContext()->setContextProperty("auroraeSource", KStandardDirs::locate("data", "kwin/aurorae/aurorae.qml")); m_ui->decorationList->rootContext()->setContextProperty("auroraeSource", KStandardDirs::locate("data", "kwin/aurorae/aurorae.qml"));
m_ui->decorationList->setSource(KStandardDirs::locate("data", "kwin/kcm_kwindecoration/main.qml")); m_ui->decorationList->setSource(mainQmlPath);
readConfig(style); readConfig(style);