@ -38,12 +38,12 @@
|
||||
#pragma once
|
||||
|
||||
#include <QApplication>
|
||||
#include <memory>
|
||||
#include <QDateTime>
|
||||
#include <QDebug>
|
||||
#include <QFlag>
|
||||
#include <QIcon>
|
||||
#include <QDateTime>
|
||||
#include <QUrl>
|
||||
#include <memory>
|
||||
|
||||
#include <BaseInstance.h>
|
||||
|
||||
@ -73,25 +73,19 @@ class MCEditTool;
|
||||
class ThemeManager;
|
||||
|
||||
namespace Meta {
|
||||
class Index;
|
||||
class Index;
|
||||
}
|
||||
|
||||
#if defined(APPLICATION)
|
||||
#undef APPLICATION
|
||||
#endif
|
||||
#define APPLICATION (static_cast<Application *>(QCoreApplication::instance()))
|
||||
#define APPLICATION (static_cast<Application*>(QCoreApplication::instance()))
|
||||
|
||||
class Application : public QApplication
|
||||
{
|
||||
class Application : public QApplication {
|
||||
// friends for the purpose of limiting access to deprecated stuff
|
||||
Q_OBJECT
|
||||
public:
|
||||
enum Status {
|
||||
StartingUp,
|
||||
Failed,
|
||||
Succeeded,
|
||||
Initialized
|
||||
};
|
||||
public:
|
||||
enum Status { StartingUp, Failed, Succeeded, Initialized };
|
||||
|
||||
enum Capability {
|
||||
None = 0,
|
||||
@ -103,19 +97,15 @@ public:
|
||||
};
|
||||
Q_DECLARE_FLAGS(Capabilities, Capability)
|
||||
|
||||
public:
|
||||
Application(int &argc, char **argv);
|
||||
public:
|
||||
Application(int& argc, char** argv);
|
||||
virtual ~Application();
|
||||
|
||||
bool event(QEvent* event) override;
|
||||
|
||||
std::shared_ptr<SettingsObject> settings() const {
|
||||
return m_settings;
|
||||
}
|
||||
std::shared_ptr<SettingsObject> settings() const { return m_settings; }
|
||||
|
||||
qint64 timeSinceStart() const {
|
||||
return startTime.msecsTo(QDateTime::currentDateTime());
|
||||
}
|
||||
qint64 timeSinceStart() const { return startTime.msecsTo(QDateTime::currentDateTime()); }
|
||||
|
||||
QIcon getThemedIcon(const QString& name);
|
||||
|
||||
@ -139,29 +129,17 @@ public:
|
||||
|
||||
std::shared_ptr<JavaInstallList> javalist();
|
||||
|
||||
std::shared_ptr<InstanceList> instances() const {
|
||||
return m_instances;
|
||||
}
|
||||
std::shared_ptr<InstanceList> instances() const { return m_instances; }
|
||||
|
||||
std::shared_ptr<IconList> icons() const {
|
||||
return m_icons;
|
||||
}
|
||||
std::shared_ptr<IconList> icons() const { return m_icons; }
|
||||
|
||||
MCEditTool *mcedit() const {
|
||||
return m_mcedit.get();
|
||||
}
|
||||
MCEditTool* mcedit() const { return m_mcedit.get(); }
|
||||
|
||||
shared_qobject_ptr<AccountList> accounts() const {
|
||||
return m_accounts;
|
||||
}
|
||||
shared_qobject_ptr<AccountList> accounts() const { return m_accounts; }
|
||||
|
||||
Status status() const {
|
||||
return m_status;
|
||||
}
|
||||
Status status() const { return m_status; }
|
||||
|
||||
const QMap<QString, std::shared_ptr<BaseProfilerFactory>> &profilers() const {
|
||||
return m_profilers;
|
||||
}
|
||||
const QMap<QString, std::shared_ptr<BaseProfilerFactory>>& profilers() const { return m_profilers; }
|
||||
|
||||
void updateProxySettings(QString proxyTypeStr, QString addr, int port, QString user, QString password);
|
||||
|
||||
@ -186,35 +164,29 @@ public:
|
||||
QString getUserAgentUncached();
|
||||
|
||||
/// this is the root of the 'installation'. Used for automatic updates
|
||||
const QString &root() {
|
||||
return m_rootPath;
|
||||
}
|
||||
const QString& root() { return m_rootPath; }
|
||||
|
||||
bool isPortable() {
|
||||
return m_portable;
|
||||
}
|
||||
bool isPortable() { return m_portable; }
|
||||
|
||||
const Capabilities capabilities() {
|
||||
return m_capabilities;
|
||||
}
|
||||
const Capabilities capabilities() { return m_capabilities; }
|
||||
|
||||
/*!
|
||||
* Opens a json file using either a system default editor, or, if not empty, the editor
|
||||
* specified in the settings
|
||||
*/
|
||||
bool openJsonEditor(const QString &filename);
|
||||
bool openJsonEditor(const QString& filename);
|
||||
|
||||
InstanceWindow *showInstanceWindow(InstancePtr instance, QString page = QString());
|
||||
MainWindow *showMainWindow(bool minimized = false);
|
||||
InstanceWindow* showInstanceWindow(InstancePtr instance, QString page = QString());
|
||||
MainWindow* showMainWindow(bool minimized = false);
|
||||
|
||||
void updateIsRunning(bool running);
|
||||
bool updatesAreAllowed();
|
||||
|
||||
void ShowGlobalSettings(class QWidget * parent, QString open_page = QString());
|
||||
void ShowGlobalSettings(class QWidget* parent, QString open_page = QString());
|
||||
|
||||
int suitableMaxMem();
|
||||
|
||||
signals:
|
||||
signals:
|
||||
void updateAllowedChanged(bool status);
|
||||
void globalSettingsAboutToOpen();
|
||||
void globalSettingsClosed();
|
||||
@ -224,39 +196,37 @@ signals:
|
||||
void clickedOnDock();
|
||||
#endif
|
||||
|
||||
public slots:
|
||||
bool launch(
|
||||
InstancePtr instance,
|
||||
bool online = true,
|
||||
bool demo = false,
|
||||
BaseProfilerFactory *profiler = nullptr,
|
||||
MinecraftServerTargetPtr serverToJoin = nullptr,
|
||||
MinecraftAccountPtr accountToUse = nullptr
|
||||
);
|
||||
public slots:
|
||||
bool launch(InstancePtr instance,
|
||||
bool online = true,
|
||||
bool demo = false,
|
||||
BaseProfilerFactory* profiler = nullptr,
|
||||
MinecraftServerTargetPtr serverToJoin = nullptr,
|
||||
MinecraftAccountPtr accountToUse = nullptr);
|
||||
bool kill(InstancePtr instance);
|
||||
void closeCurrentWindow();
|
||||
|
||||
private slots:
|
||||
private slots:
|
||||
void on_windowClose();
|
||||
void messageReceived(const QByteArray & message);
|
||||
void messageReceived(const QByteArray& message);
|
||||
void controllerSucceeded();
|
||||
void controllerFailed(const QString & error);
|
||||
void controllerFailed(const QString& error);
|
||||
void setupWizardFinished(int status);
|
||||
|
||||
private:
|
||||
bool handleDataMigration(const QString & currentData, const QString & oldData, const QString & name, const QString & configFile) const;
|
||||
private:
|
||||
bool handleDataMigration(const QString& currentData, const QString& oldData, const QString& name, const QString& configFile) const;
|
||||
bool createSetupWizard();
|
||||
void performMainStartupAction();
|
||||
|
||||
// sets the fatal error message and m_status to Failed.
|
||||
void showFatalErrorMessage(const QString & title, const QString & content);
|
||||
void showFatalErrorMessage(const QString& title, const QString& content);
|
||||
|
||||
private:
|
||||
private:
|
||||
void addRunningInstance();
|
||||
void subRunningInstance();
|
||||
bool shouldExitNow() const;
|
||||
|
||||
private:
|
||||
private:
|
||||
QDateTime startTime;
|
||||
|
||||
shared_qobject_ptr<QNetworkAccessManager> m_network;
|
||||
@ -282,7 +252,7 @@ private:
|
||||
QString m_rootPath;
|
||||
Status m_status = Application::StartingUp;
|
||||
Capabilities m_capabilities;
|
||||
bool m_portable = false;
|
||||
bool m_portable = false;
|
||||
|
||||
#ifdef Q_OS_MACOS
|
||||
Qt::ApplicationState m_prevAppState = Qt::ApplicationInactive;
|
||||
@ -295,7 +265,7 @@ private:
|
||||
|
||||
// FIXME: attach to instances instead.
|
||||
struct InstanceXtras {
|
||||
InstanceWindow * window = nullptr;
|
||||
InstanceWindow* window = nullptr;
|
||||
shared_qobject_ptr<LaunchController> controller;
|
||||
};
|
||||
std::map<QString, InstanceXtras> m_instanceExtras;
|
||||
@ -306,13 +276,14 @@ private:
|
||||
bool m_updateRunning = false;
|
||||
|
||||
// main window, if any
|
||||
MainWindow * m_mainWindow = nullptr;
|
||||
MainWindow* m_mainWindow = nullptr;
|
||||
|
||||
// peer launcher instance connector - used to implement single instance launcher and signalling
|
||||
LocalPeer * m_peerInstance = nullptr;
|
||||
LocalPeer* m_peerInstance = nullptr;
|
||||
|
||||
SetupWizard * m_setupWizard = nullptr;
|
||||
public:
|
||||
SetupWizard* m_setupWizard = nullptr;
|
||||
|
||||
public:
|
||||
QString m_instanceIdToLaunch;
|
||||
QString m_serverToJoin;
|
||||
QString m_profileToUse;
|
||||
|
Reference in New Issue
Block a user