diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-10-10 01:47:48 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-10-10 01:47:48 +0200 |
| commit | 73f8bc5c92cb4a9b7ce507309001c6b206b5c8eb (patch) | |
| tree | da0b7c09fcd105a4144387e4261ad3aabc910862 /gui | |
| parent | eaf0cbeafc5ff70bd2bb0d66b5f5980a71f824c5 (diff) | |
| download | MultiMC-73f8bc5c92cb4a9b7ce507309001c6b206b5c8eb.tar MultiMC-73f8bc5c92cb4a9b7ce507309001c6b206b5c8eb.tar.gz MultiMC-73f8bc5c92cb4a9b7ce507309001c6b206b5c8eb.tar.lz MultiMC-73f8bc5c92cb4a9b7ce507309001c6b206b5c8eb.tar.xz MultiMC-73f8bc5c92cb4a9b7ce507309001c6b206b5c8eb.zip | |
Version changing removes any existing version json.
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/MCModInfoFrame.ui | 14 | ||||
| -rw-r--r-- | gui/mainwindow.cpp | 9 |
2 files changed, 10 insertions, 13 deletions
diff --git a/gui/MCModInfoFrame.ui b/gui/MCModInfoFrame.ui index b24251ae..60e0a65c 100644 --- a/gui/MCModInfoFrame.ui +++ b/gui/MCModInfoFrame.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>527</width> - <height>68</height> + <height>113</height> </rect> </property> <property name="sizePolicy"> @@ -28,12 +28,6 @@ <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <widget class="QLabel" name="label_ModText"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Minimum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> <property name="text"> <string>Select a mod to view title and authors...</string> </property> @@ -53,12 +47,6 @@ </item> <item> <widget class="QLabel" name="label_ModDescription"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> <property name="text"> <string>Select a mod to view description...</string> </property> diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 5784b85a..c726591d 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -606,6 +606,15 @@ void MainWindow::on_actionChangeInstMCVersion_triggered() vselect.setFilter(1, "OneSix"); if (vselect.exec() && vselect.selectedVersion()) { + if (m_selectedInstance->versionIsCustom()) + { + auto result = QMessageBox::warning( + this, tr("Are you sure?"), + tr("This will remove any library/version customization you did previously. " + "This includes things like Forge install and similar."), QMessageBox::Ok, QMessageBox::Abort); + if(result != QMessageBox::Ok) + return; + } m_selectedInstance->setIntendedVersionId(vselect.selectedVersion()->descriptor()); } } |