summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2018-03-28 21:57:41 +0200
committerPetr Mrázek <peterix@gmail.com>2018-03-28 21:57:41 +0200
commit370bbada876752fbae2a92999acab5ce5474a5ee (patch)
treefaf4a07ffde3c7f98915706dbb9a01876e42eaa0 /application
parent1ef416cb5609bf33e9b67952feb7c182ae807e2f (diff)
downloadMultiMC-370bbada876752fbae2a92999acab5ce5474a5ee.tar
MultiMC-370bbada876752fbae2a92999acab5ce5474a5ee.tar.gz
MultiMC-370bbada876752fbae2a92999acab5ce5474a5ee.tar.lz
MultiMC-370bbada876752fbae2a92999acab5ce5474a5ee.tar.xz
MultiMC-370bbada876752fbae2a92999acab5ce5474a5ee.zip
NOISSUE polish the new instance UI a bit more
Diffstat (limited to 'application')
-rw-r--r--application/dialogs/NewInstanceDialog.cpp2
-rw-r--r--application/pages/modplatform/FTBPage.cpp1
-rw-r--r--application/pages/modplatform/FTBPage.ui91
-rw-r--r--application/pages/modplatform/VanillaPage.ui2
4 files changed, 51 insertions, 45 deletions
diff --git a/application/dialogs/NewInstanceDialog.cpp b/application/dialogs/NewInstanceDialog.cpp
index 0631714c..900b33f7 100644
--- a/application/dialogs/NewInstanceDialog.cpp
+++ b/application/dialogs/NewInstanceDialog.cpp
@@ -70,7 +70,7 @@ NewInstanceDialog::NewInstanceDialog(const QString & initialGroup, const QString
m_container = new PageContainer(this);
m_container->setSizePolicy(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Expanding);
- m_container->setContentsMargins(0, 0, 0, 0);
+ m_container->layout()->setContentsMargins(0, 0, 0, 0);
ui->verticalLayout->insertWidget(2, m_container);
m_container->addButtons(m_buttons);
diff --git a/application/pages/modplatform/FTBPage.cpp b/application/pages/modplatform/FTBPage.cpp
index a8ec6577..26b1e30b 100644
--- a/application/pages/modplatform/FTBPage.cpp
+++ b/application/pages/modplatform/FTBPage.cpp
@@ -13,6 +13,7 @@ FTBPage::FTBPage(NewInstanceDialog* dialog, QWidget *parent)
: QWidget(parent), dialog(dialog), ui(new Ui::FTBPage)
{
ui->setupUi(this);
+ ui->tabWidget->tabBar()->hide();
ftbPackDownloader = new FtbPackDownloader();
connect(ftbPackDownloader, &FtbPackDownloader::ready, this, &FTBPage::ftbPackDataDownloadSuccessfully);
diff --git a/application/pages/modplatform/FTBPage.ui b/application/pages/modplatform/FTBPage.ui
index c54fc392..a64c9606 100644
--- a/application/pages/modplatform/FTBPage.ui
+++ b/application/pages/modplatform/FTBPage.ui
@@ -6,52 +6,57 @@
<rect>
<x>0</x>
<y>0</y>
- <width>801</width>
- <height>674</height>
+ <width>709</width>
+ <height>602</height>
</rect>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QTreeView" name="packList">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="0" column="1" colspan="3">
- <widget class="QTextBrowser" name="modpackInfo"/>
- </item>
- <item row="1" column="0">
- <widget class="QComboBox" name="sortByBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLabel" name="selectedVersionLabel">
- <property name="text">
- <string>Version selected:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="1" column="2" colspan="2">
- <widget class="QComboBox" name="packVersionSelection">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="currentIndex">
+ <number>0</number>
</property>
+ <widget class="QWidget" name="tab">
+ <attribute name="title">
+ <string notr="true"/>
+ </attribute>
+ <layout class="QGridLayout" name="gridLayout" columnstretch="0,0,4,4">
+ <item row="0" column="0" colspan="2">
+ <widget class="QTreeView" name="packList"/>
+ </item>
+ <item row="0" column="2" colspan="2">
+ <widget class="QTextBrowser" name="modpackInfo"/>
+ </item>
+ <item row="1" column="3">
+ <widget class="QComboBox" name="packVersionSelection"/>
+ </item>
+ <item row="1" column="2">
+ <widget class="QLabel" name="selectedVersionLabel">
+ <property name="text">
+ <string>Version selected:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="2">
+ <widget class="QComboBox" name="sortByBox"/>
+ </item>
+ </layout>
+ </widget>
</widget>
</item>
</layout>
diff --git a/application/pages/modplatform/VanillaPage.ui b/application/pages/modplatform/VanillaPage.ui
index 713d04a0..ae9cab47 100644
--- a/application/pages/modplatform/VanillaPage.ui
+++ b/application/pages/modplatform/VanillaPage.ui
@@ -30,7 +30,7 @@
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
- <string notr="true">Tab 1</string>
+ <string notr="true"/>
</attribute>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="1">