0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add close button to page dialog. Add help button to page dialog.

Browse Source 
Smile.
This commit is contained in:
Petr Mrázek
2014-06-10 00:46:05 +02:00
parent 0bccc94471
commit 9ec6deea84
15 changed files with 66 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gui/pages/BasePage.h
View File

@@ -25,14 +25,6 @@ public:
virtual QString id() = 0;
virtual QString displayName() = 0;
virtual QIcon icon() = 0;
virtual bool accept()
{
return true;
}
virtual bool reject()
{
return true;
}
virtual bool apply()
{
return true;
@@ -41,6 +33,10 @@ public:
{
return true;
}
virtual QString helpPage()
{
return QString();
}
int stackIndex = -1;
int listIndex = -1;
};

5
gui/pages/InstanceSettingsPage.cpp
View File

@@ -28,10 +28,6 @@ InstanceSettingsPage::InstanceSettingsPage(SettingsObject *s, QWidget *parent)
{
ui->setupUi(this);
loadSettings();
connect(ui->buttonBox->button(QDialogButtonBox::Apply), SIGNAL(clicked(bool)), this,
SLOT(applySettings()));
connect(ui->buttonBox->button(QDialogButtonBox::Reset), SIGNAL(clicked(bool)), this,
SLOT(loadSettings()));
}
InstanceSettingsPage::~InstanceSettingsPage()
@@ -42,7 +38,6 @@ InstanceSettingsPage::~InstanceSettingsPage()
bool InstanceSettingsPage::apply()
{
applySettings();
loadSettings();
return true;
}

2
gui/pages/InstanceSettingsPage.h
View File

@@ -38,7 +38,7 @@ public:
virtual QIcon icon() override;
virtual QString id() override;
virtual bool apply();
virtual QString helpPage() override { return "InstanceSettingsPage"; };
private:
void updateCheckboxStuff();
private slots:

12
gui/pages/InstanceSettingsPage.ui
View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>458</width>
<height>476</height>
<height>426</height>
</rect>
</property>
<property name="windowTitle">
@@ -425,16 +425,6 @@
</widget>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Apply|QDialogButtonBox::Reset</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>

1
gui/pages/LegacyJarModPage.h
View File

@@ -37,6 +37,7 @@ public:
virtual QString displayName();
virtual QIcon icon();
virtual QString id();
virtual QString helpPage() override { return "LegacyJarModPage"; };
private
slots:

1
gui/pages/LegacyUpgradePage.h
View File

@@ -36,6 +36,7 @@ public:
virtual QString displayName() override;
virtual QIcon icon() override;
virtual QString id() override;
virtual QString helpPage() override { return "LegacyUpgradePage"; };
private
slots:
void on_upgradeButton_clicked();

3
gui/pages/ModFolderPage.cpp
View File

@@ -49,7 +49,7 @@ QString ModFolderPage::id()
}
ModFolderPage::ModFolderPage(std::shared_ptr<ModList> mods, QString id, QString iconName,
QString displayName, QWidget *parent)
QString displayName, QString helpPage, QWidget *parent)
: QWidget(parent), ui(new Ui::ModFolderPage)
{
ui->setupUi(this);
@@ -57,6 +57,7 @@ ModFolderPage::ModFolderPage(std::shared_ptr<ModList> mods, QString id, QString
m_id = id;
m_displayName = displayName;
m_iconName = iconName;
m_helpName = helpPage;
ui->modTreeView->setModel(m_mods.get());
ui->modTreeView->installEventFilter(this);
m_mods->startWatching();

5
gui/pages/ModFolderPage.h
View File

@@ -33,12 +33,12 @@ class ModFolderPage : public QWidget, public BasePage
public:
explicit ModFolderPage(std::shared_ptr<ModList> mods, QString id, QString iconName,
QString displayName, QWidget *parent = 0);
QString displayName, QString helpPage = "" , QWidget *parent = 0);
virtual ~ModFolderPage();
virtual QString displayName() override;
virtual QIcon icon() override;
virtual QString id() override;
virtual QString helpPage() override { return m_helpName; };
protected:
bool eventFilter(QObject *obj, QEvent *ev);
bool modListFilter(QKeyEvent *ev);
@@ -49,6 +49,7 @@ private:
QString m_iconName;
QString m_id;
QString m_displayName;
QString m_helpName;
public slots:
void modCurrent(const QModelIndex &current, const QModelIndex &previous);

3
gui/pages/ResourcePackPage.h
View File

@@ -6,7 +6,7 @@ class ResourcePackPage : public ModFolderPage
public:
explicit ResourcePackPage(BaseInstance *instance, QWidget *parent = 0)
: ModFolderPage(instance->texturePackList(), "resourcepacks", "resourcepacks",
tr("Resource packs"), parent)
tr("Resource packs"), "TexturePacksPage", parent)
{
m_inst = instance;
}
@@ -17,7 +17,6 @@ public:
return !m_inst->traits().contains("no-texturepacks") &&
!m_inst->traits().contains("texturepacks");
}
private:
BaseInstance *m_inst;
};

2
gui/pages/TexturePackPage.h
View File

@@ -6,7 +6,7 @@ class TexturePackPage : public ModFolderPage
public:
explicit TexturePackPage(BaseInstance *instance, QWidget *parent = 0)
: ModFolderPage(instance->texturePackList(), "texturepacks", "resourcepacks",
tr("Texture packs"), parent)
tr("Texture packs"), "ResourcePacksPage", parent)
{
m_inst = instance;
}

1
gui/pages/VersionPage.h
View File

@@ -36,6 +36,7 @@ public:
virtual QString displayName() override;
virtual QIcon icon() override;
virtual QString id() override;
virtual QString helpPage() override { return "VersionPage"; };
private
slots: