mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Reorder code in main.cpp ("cluster definitions and setters")
This commit is contained in:
parent
5acfb27760
commit
06f2cd58b8
22
src/main.cpp
22
src/main.cpp
|
@ -23,6 +23,7 @@
|
||||||
#include "dolphin_generalsettings.h"
|
#include "dolphin_generalsettings.h"
|
||||||
#include "dbusinterface.h"
|
#include "dbusinterface.h"
|
||||||
#include "global.h"
|
#include "global.h"
|
||||||
|
#include "dolphindebug.h"
|
||||||
|
|
||||||
#include <KDBusService>
|
#include <KDBusService>
|
||||||
#include <KAboutData>
|
#include <KAboutData>
|
||||||
|
@ -30,20 +31,19 @@
|
||||||
#include <QCommandLineOption>
|
#include <QCommandLineOption>
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <KLocalizedString>
|
#include <KLocalizedString>
|
||||||
#include "dolphindebug.h"
|
#include <Kdelibs4ConfigMigrator>
|
||||||
#include <kdelibs4configmigrator.h>
|
|
||||||
|
|
||||||
extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
|
extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
|
||||||
{
|
{
|
||||||
QApplication app(argc, argv);
|
QApplication app(argc, argv);
|
||||||
app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
|
app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
|
||||||
|
app.setWindowIcon(QIcon::fromTheme("system-file-manager"));
|
||||||
|
|
||||||
Kdelibs4ConfigMigrator migrate(QStringLiteral("dolphin"));
|
Kdelibs4ConfigMigrator migrate(QStringLiteral("dolphin"));
|
||||||
migrate.setConfigFiles(QStringList() << QStringLiteral("dolphinrc"));
|
migrate.setConfigFiles(QStringList() << QStringLiteral("dolphinrc"));
|
||||||
migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc"));
|
migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc"));
|
||||||
migrate.migrate();
|
migrate.migrate();
|
||||||
|
|
||||||
app.setWindowIcon(QIcon::fromTheme("system-file-manager"));
|
|
||||||
|
|
||||||
KAboutData aboutData("dolphin", i18n("Dolphin"), "14.12.95",
|
KAboutData aboutData("dolphin", i18n("Dolphin"), "14.12.95",
|
||||||
i18nc("@title", "File Manager"),
|
i18nc("@title", "File Manager"),
|
||||||
KAboutLicense::GPL,
|
KAboutLicense::GPL,
|
||||||
|
@ -107,9 +107,6 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
|
||||||
return app.exec();
|
return app.exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
DolphinMainWindow* m_mainWindow = new DolphinMainWindow();
|
|
||||||
m_mainWindow->setAttribute(Qt::WA_DeleteOnClose);
|
|
||||||
|
|
||||||
const QStringList args = parser.positionalArguments();
|
const QStringList args = parser.positionalArguments();
|
||||||
QList<QUrl> urls = Dolphin::validateUris(args);
|
QList<QUrl> urls = Dolphin::validateUris(args);
|
||||||
|
|
||||||
|
@ -125,18 +122,21 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
|
||||||
urls.append(urls.last());
|
urls.append(urls.last());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
DolphinMainWindow* mainWindow = new DolphinMainWindow();
|
||||||
|
mainWindow->setAttribute(Qt::WA_DeleteOnClose);
|
||||||
|
|
||||||
if (parser.isSet("select")) {
|
if (parser.isSet("select")) {
|
||||||
m_mainWindow->openFiles(urls, splitView);
|
mainWindow->openFiles(urls, splitView);
|
||||||
} else {
|
} else {
|
||||||
m_mainWindow->openDirectories(urls, splitView);
|
mainWindow->openDirectories(urls, splitView);
|
||||||
}
|
}
|
||||||
|
|
||||||
m_mainWindow->show();
|
mainWindow->show();
|
||||||
|
|
||||||
if (app.isSessionRestored()) {
|
if (app.isSessionRestored()) {
|
||||||
const QString className = KXmlGuiWindow::classNameOfToplevel(1);
|
const QString className = KXmlGuiWindow::classNameOfToplevel(1);
|
||||||
if (className == QLatin1String("DolphinMainWindow")) {
|
if (className == QLatin1String("DolphinMainWindow")) {
|
||||||
m_mainWindow->restore(1);
|
mainWindow->restore(1);
|
||||||
} else {
|
} else {
|
||||||
qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
|
qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue