Commit c4f1aa9d authored by Vincent Pinon's avatar Vincent Pinon
Browse files

Load KIconTheme after DBus start (fix Windows icons)

parent 10b08d57
......@@ -68,10 +68,6 @@ int main(int argc, char *argv[])
}
}
bool forceBreeze = grp.readEntry("force_breeze", QVariant(false)).toBool();
if (forceBreeze) {
QIcon::setThemeName("breeze");
}
// Create KAboutData
KAboutData aboutData(QByteArray("kdenlive"),
i18n("Kdenlive"), KDENLIVE_VERSION,
......@@ -100,12 +96,6 @@ int main(int argc, char *argv[])
// Register about data
KAboutData::setApplicationData(aboutData);
#ifndef __MINGW32__
// Add rcc stored icons to the search path so that we always find our icons
KIconLoader *loader = KIconLoader::global();
loader->reconfigure("kdenlive", QStringList() << QStringLiteral(":/pics"));
#endif
// Set app stuff from about data
app.setApplicationDisplayName(aboutData.displayName());
app.setOrganizationDomain(aboutData.organizationDomain());
......@@ -134,6 +124,15 @@ int main(int argc, char *argv[])
KCrash::setCrashHandler(KCrash::defaultCrashHandler);
#endif
// Add rcc stored icons to the search path so that we always find our icons
KIconLoader *loader = KIconLoader::global();
loader->reconfigure("kdenlive", QStringList() << QStringLiteral(":/pics"));
bool forceBreeze = grp.readEntry("force_breeze", QVariant(false)).toBool();
if (forceBreeze) {
QIcon::setThemeName("breeze");
}
// see if we are starting with session management
if (qApp->isSessionRestored()){
int n = 1;
......
......@@ -38,7 +38,7 @@ void MltConnection::locateMeltAndProfilesPath(const QString& mltPath)
if (basePath.isEmpty() || !QFile::exists(basePath)) basePath = QStringLiteral(MLT_DATADIR) + "/profiles/"; // build-time definition
KdenliveSettings::setMltpath(basePath);
QString meltPath = basePath.section('/', 0, -3) + "/bin/melt";
QString meltPath = QDir::cleanPath(basePath).section('/', 0, -3) + "/bin/melt";
if (!QFile::exists(meltPath)) meltPath = qgetenv("MLT_PREFIX") + "/bin/melt";
if (!QFile::exists(meltPath)) meltPath = KdenliveSettings::rendererpath();
if (!QFile::exists(meltPath)) meltPath = QStringLiteral(MLT_MELTBIN);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment