summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-08-07 01:38:18 +0200
committerPetr Mrázek <peterix@gmail.com>2013-08-07 01:38:18 +0200
commitafaa1dc223ec87b685778ee0aed81cb6caaa05c7 (patch)
tree4e1e6589d56ba9bc6984547d158d413a0495272f /gui
parent091b7502cfc1bc01a1abd68a0fb9a0b2693a4658 (diff)
downloadMultiMC-afaa1dc223ec87b685778ee0aed81cb6caaa05c7.tar
MultiMC-afaa1dc223ec87b685778ee0aed81cb6caaa05c7.tar.gz
MultiMC-afaa1dc223ec87b685778ee0aed81cb6caaa05c7.tar.lz
MultiMC-afaa1dc223ec87b685778ee0aed81cb6caaa05c7.tar.xz
MultiMC-afaa1dc223ec87b685778ee0aed81cb6caaa05c7.zip
Get rid of QNAM (now subclassed and less needy). Basic LWJGL download and extraction.
Diffstat (limited to 'gui')
-rw-r--r--gui/mainwindow.cpp2
-rw-r--r--gui/versionselectdialog.cpp2
-rw-r--r--gui/versionselectdialog.ui55
3 files changed, 55 insertions, 4 deletions
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 25949042..309e4180 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -412,7 +412,7 @@ void MainWindow::onLoginComplete(LoginResponse response)
return;
m_activeLogin = LoginResponse(response);
- OneSixUpdate *updateTask = m_activeInst->doUpdate();
+ BaseUpdate *updateTask = m_activeInst->doUpdate();
if(!updateTask)
{
launchInstance(m_activeInst, m_activeLogin);
diff --git a/gui/versionselectdialog.cpp b/gui/versionselectdialog.cpp
index 9f1a8653..b3a14db1 100644
--- a/gui/versionselectdialog.cpp
+++ b/gui/versionselectdialog.cpp
@@ -90,7 +90,7 @@ void VersionSelectDialog::updateFilterState()
if (!ui->filterSnapshotsCheckbox->isChecked())
filteredTypes += "Snapshot";
if (!ui->filterMCNostalgiaCheckbox->isChecked())
- filteredTypes += "MCNostalgia";
+ filteredTypes += "Nostalgia";
QString regexStr = "^.*$";
if (filteredTypes.length() > 0)
diff --git a/gui/versionselectdialog.ui b/gui/versionselectdialog.ui
index 2bdd4449..5cb0ebad 100644
--- a/gui/versionselectdialog.ui
+++ b/gui/versionselectdialog.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>400</width>
- <height>300</height>
+ <height>347</height>
</rect>
</property>
<property name="windowTitle">
@@ -39,19 +39,70 @@
<item>
<layout class="QHBoxLayout" name="filterCheckboxLayout1">
<item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
<widget class="QCheckBox" name="filterSnapshotsCheckbox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
<string>Show &amp;snapshots?</string>
</property>
</widget>
</item>
<item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
<widget class="QCheckBox" name="filterMCNostalgiaCheckbox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="text">
- <string>Show MC&amp;Nostalgia?</string>
+ <string>Show &amp;Nostalgia?</string>
</property>
</widget>
</item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</item>
<item>