Finish of the OtherLogs page, and (re)format page related files

This commit is contained in:
Jan Dalheimer
2014-07-12 23:02:52 +02:00
committed by Petr Mrázek
parent 5c43842359
commit 4c0dc51110
35 changed files with 423 additions and 356 deletions

View File

@ -14,11 +14,12 @@
*/
#pragma once
#include <QWidget>
#include <logic/OneSixInstance.h>
#include <logic/net/NetJob.h>
#include <logic/java/JavaChecker.h>
#include "logic/OneSixInstance.h"
#include "logic/net/NetJob.h"
#include "logic/java/JavaChecker.h"
#include "BasePage.h"
class JavaChecker;
@ -34,11 +35,23 @@ class InstanceSettingsPage : public QWidget, public BasePage
public:
explicit InstanceSettingsPage(BaseInstance *inst, QWidget *parent = 0);
virtual ~InstanceSettingsPage();
virtual QString displayName() const override;
virtual QIcon icon() const override;
virtual QString id() const override;
virtual QString displayName() const override
{
return tr("Settings");
}
virtual QIcon icon() const override
{
return QIcon::fromTheme("settings");
}
virtual QString id() const override
{
return "settings";
}
virtual bool apply();
virtual QString helpPage() const override { return "Instance-settings"; }
virtual QString helpPage() const override
{
return "Instance-settings";
}
virtual bool shouldDisplay() const;
private slots:
void on_javaDetectBtn_clicked();
@ -51,6 +64,7 @@ private slots:
void applySettings();
void loadSettings();
private:
Ui::InstanceSettingsPage *ui;
BaseInstance *m_instance;