mirror of
https://github.com/MultiMC/MultiMC5.git
synced 2024-09-03 13:39:21 +00:00
Merge pull request #4526 from jopejoe1/develop
NOISSUE Change Technic and FTB legacy layout to be more consistent
This commit is contained in:
commit
ae8667726e
@ -25,7 +25,7 @@
|
|||||||
<widget class="QTreeView" name="publicPackList">
|
<widget class="QTreeView" name="publicPackList">
|
||||||
<property name="maximumSize">
|
<property name="maximumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>250</width>
|
<width>16777215</width>
|
||||||
<height>16777215</height>
|
<height>16777215</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -51,7 +51,7 @@
|
|||||||
<widget class="QTreeView" name="thirdPartyPackList">
|
<widget class="QTreeView" name="thirdPartyPackList">
|
||||||
<property name="maximumSize">
|
<property name="maximumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>250</width>
|
<width>16777215</width>
|
||||||
<height>16777215</height>
|
<height>16777215</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -71,7 +71,7 @@
|
|||||||
<widget class="QTreeView" name="privatePackList">
|
<widget class="QTreeView" name="privatePackList">
|
||||||
<property name="maximumSize">
|
<property name="maximumSize">
|
||||||
<size>
|
<size>
|
||||||
<width>250</width>
|
<width>16777215</width>
|
||||||
<height>16777215</height>
|
<height>16777215</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
@ -103,16 +103,6 @@
|
|||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<layout class="QGridLayout" name="gridLayout_4">
|
<layout class="QGridLayout" name="gridLayout_4">
|
||||||
<item row="0" column="1">
|
|
||||||
<widget class="QLabel" name="label">
|
|
||||||
<property name="text">
|
|
||||||
<string>Version selected:</string>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="2">
|
<item row="0" column="2">
|
||||||
<widget class="QComboBox" name="versionSelectionBox"/>
|
<widget class="QComboBox" name="versionSelectionBox"/>
|
||||||
</item>
|
</item>
|
||||||
@ -126,6 +116,16 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QLabel" name="label">
|
||||||
|
<property name="text">
|
||||||
|
<string>Version selected:</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright 2013-2021 MultiMC Contributors
|
/* Copyright 2013-2022 MultiMC Contributors
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -11,6 +11,7 @@
|
|||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "TechnicPage.h"
|
#include "TechnicPage.h"
|
||||||
@ -187,8 +188,9 @@ void TechnicPage::metadataLoaded()
|
|||||||
text += tr(" by ") + current.author;
|
text += tr(" by ") + current.author;
|
||||||
}
|
}
|
||||||
|
|
||||||
ui->frame->setModText(text);
|
text += "<br><br>";
|
||||||
ui->frame->setModDescription(current.description);
|
|
||||||
|
ui->packDescription->setHtml(text + current.description);
|
||||||
if (!current.isSolder)
|
if (!current.isSolder)
|
||||||
{
|
{
|
||||||
dialog->setSuggestedPack(current.name, new Technic::SingleZipPackInstallTask(current.url, current.minecraftVersion));
|
dialog->setSuggestedPack(current.name, new Technic::SingleZipPackInstallTask(current.url, current.minecraftVersion));
|
||||||
|
@ -44,51 +44,36 @@
|
|||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QListView" name="packView">
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
<property name="horizontalScrollBarPolicy">
|
<property name="rightMargin">
|
||||||
<enum>Qt::ScrollBarAlwaysOff</enum>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="alternatingRowColors">
|
<item row="0" column="1">
|
||||||
<bool>true</bool>
|
<widget class="QTextBrowser" name="packDescription"/>
|
||||||
</property>
|
</item>
|
||||||
<property name="iconSize">
|
<item row="0" column="0">
|
||||||
<size>
|
<widget class="QListView" name="packView">
|
||||||
<width>48</width>
|
<property name="horizontalScrollBarPolicy">
|
||||||
<height>48</height>
|
<enum>Qt::ScrollBarAlwaysOff</enum>
|
||||||
</size>
|
</property>
|
||||||
</property>
|
<property name="alternatingRowColors">
|
||||||
</widget>
|
<bool>true</bool>
|
||||||
</item>
|
</property>
|
||||||
<item>
|
<property name="iconSize">
|
||||||
<widget class="MCModInfoFrame" name="frame">
|
<size>
|
||||||
<property name="sizePolicy">
|
<width>48</width>
|
||||||
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
|
<height>48</height>
|
||||||
<horstretch>0</horstretch>
|
</size>
|
||||||
<verstretch>0</verstretch>
|
</property>
|
||||||
</sizepolicy>
|
</widget>
|
||||||
</property>
|
</item>
|
||||||
<property name="frameShape">
|
</layout>
|
||||||
<enum>QFrame::StyledPanel</enum>
|
|
||||||
</property>
|
|
||||||
<property name="frameShadow">
|
|
||||||
<enum>QFrame::Raised</enum>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<customwidgets>
|
|
||||||
<customwidget>
|
|
||||||
<class>MCModInfoFrame</class>
|
|
||||||
<extends>QFrame</extends>
|
|
||||||
<header>ui/widgets/MCModInfoFrame.h</header>
|
|
||||||
<container>1</container>
|
|
||||||
</customwidget>
|
|
||||||
</customwidgets>
|
|
||||||
<tabstops>
|
<tabstops>
|
||||||
<tabstop>searchEdit</tabstop>
|
<tabstop>searchEdit</tabstop>
|
||||||
<tabstop>searchButton</tabstop>
|
<tabstop>searchButton</tabstop>
|
||||||
<tabstop>packView</tabstop>
|
|
||||||
</tabstops>
|
</tabstops>
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections/>
|
<connections/>
|
||||||
|
Loading…
Reference in New Issue
Block a user