summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-09-20 23:43:55 +0200
committerPetr Mrázek <peterix@gmail.com>2017-09-20 23:43:55 +0200
commit102804ef8284f57c4a12197ac6543f790bccbba4 (patch)
tree42282c9b60c6a3f0006b07f6df5474f1e1587987
parentba3cbb7330fd3435423eb3a77373ca82d65681d3 (diff)
downloadMultiMC-102804ef8284f57c4a12197ac6543f790bccbba4.tar
MultiMC-102804ef8284f57c4a12197ac6543f790bccbba4.tar.gz
MultiMC-102804ef8284f57c4a12197ac6543f790bccbba4.tar.lz
MultiMC-102804ef8284f57c4a12197ac6543f790bccbba4.tar.xz
MultiMC-102804ef8284f57c4a12197ac6543f790bccbba4.zip
NOISSUE remove obsolete LWJGL folder setting
-rw-r--r--application/MultiMC.cpp1
-rw-r--r--application/pages/global/MultiMCPage.cpp14
-rw-r--r--application/pages/global/MultiMCPage.h1
-rw-r--r--application/pages/global/MultiMCPage.ui28
4 files changed, 3 insertions, 41 deletions
diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp
index 0d3ed9a8..fd004b05 100644
--- a/application/MultiMC.cpp
+++ b/application/MultiMC.cpp
@@ -427,7 +427,6 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
// Folders
m_settings->registerSetting("InstanceDir", "instances");
m_settings->registerSetting({"CentralModsDir", "ModsDir"}, "mods");
- m_settings->registerSetting({"LWJGLDir", "LwjglDir"}, "lwjgl");
m_settings->registerSetting("IconsDir", "icons");
// Editors
diff --git a/application/pages/global/MultiMCPage.cpp b/application/pages/global/MultiMCPage.cpp
index 29075778..d945de94 100644
--- a/application/pages/global/MultiMCPage.cpp
+++ b/application/pages/global/MultiMCPage.cpp
@@ -149,18 +149,6 @@ void MultiMCPage::on_modsDirBrowseBtn_clicked()
ui->modsDirTextBox->setText(cooked_dir);
}
}
-void MultiMCPage::on_lwjglDirBrowseBtn_clicked()
-{
- QString raw_dir = QFileDialog::getExistingDirectory(this, tr("LWJGL Folder"),
- ui->lwjglDirTextBox->text());
- QString cooked_dir = FS::NormalizePath(raw_dir);
-
- // do not allow current dir - it's dirty. Do not allow dirs that don't exist
- if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists())
- {
- ui->lwjglDirTextBox->setText(cooked_dir);
- }
-}
void MultiMCPage::languageIndexChanged(int index)
{
@@ -320,7 +308,6 @@ void MultiMCPage::applySettings()
// TODO: Offer to move instances to new instance folder.
s->set("InstanceDir", ui->instDirTextBox->text());
s->set("CentralModsDir", ui->modsDirTextBox->text());
- s->set("LWJGLDir", ui->lwjglDirTextBox->text());
s->set("IconsDir", ui->iconsDirTextBox->text());
auto sortMode = (InstSortMode)ui->sortingModeGroup->checkedId();
@@ -425,7 +412,6 @@ void MultiMCPage::loadSettings()
// Folders
ui->instDirTextBox->setText(s->get("InstanceDir").toString());
ui->modsDirTextBox->setText(s->get("CentralModsDir").toString());
- ui->lwjglDirTextBox->setText(s->get("LWJGLDir").toString());
ui->iconsDirTextBox->setText(s->get("IconsDir").toString());
QString sortMode = s->get("InstSortMode").toString();
diff --git a/application/pages/global/MultiMCPage.h b/application/pages/global/MultiMCPage.h
index d18d70d6..f63c66c7 100644
--- a/application/pages/global/MultiMCPage.h
+++ b/application/pages/global/MultiMCPage.h
@@ -66,7 +66,6 @@ private
slots:
void on_instDirBrowseBtn_clicked();
void on_modsDirBrowseBtn_clicked();
- void on_lwjglDirBrowseBtn_clicked();
void on_iconsDirBrowseBtn_clicked();
void languageIndexChanged(int index);
diff --git a/application/pages/global/MultiMCPage.ui b/application/pages/global/MultiMCPage.ui
index cf434631..6280439a 100644
--- a/application/pages/global/MultiMCPage.ui
+++ b/application/pages/global/MultiMCPage.ui
@@ -127,9 +127,6 @@
<item row="1" column="1">
<widget class="QLineEdit" name="modsDirTextBox"/>
</item>
- <item row="2" column="1">
- <widget class="QLineEdit" name="lwjglDirTextBox"/>
- </item>
<item row="1" column="2">
<widget class="QToolButton" name="modsDirBrowseBtn">
<property name="text">
@@ -137,27 +134,10 @@
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="labelLWJGLDir">
- <property name="text">
- <string notr="true">LW&amp;JGL:</string>
- </property>
- <property name="buddy">
- <cstring>lwjglDirTextBox</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
- <widget class="QToolButton" name="lwjglDirBrowseBtn">
- <property name="text">
- <string notr="true">...</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
+ <item row="2" column="1">
<widget class="QLineEdit" name="iconsDirTextBox"/>
</item>
- <item row="3" column="0">
+ <item row="2" column="0">
<widget class="QLabel" name="labelIconsDir">
<property name="text">
<string>&amp;Icons:</string>
@@ -167,7 +147,7 @@
</property>
</widget>
</item>
- <item row="3" column="2">
+ <item row="2" column="2">
<widget class="QToolButton" name="iconsDirBrowseBtn">
<property name="text">
<string notr="true">...</string>
@@ -580,8 +560,6 @@
<tabstop>instDirBrowseBtn</tabstop>
<tabstop>modsDirTextBox</tabstop>
<tabstop>modsDirBrowseBtn</tabstop>
- <tabstop>lwjglDirTextBox</tabstop>
- <tabstop>lwjglDirBrowseBtn</tabstop>
<tabstop>iconsDirTextBox</tabstop>
<tabstop>iconsDirBrowseBtn</tabstop>
<tabstop>resetNotificationsBtn</tabstop>