0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unify look of all pages.

Browse Source 
Now they have a QTabWidget with no tabs as a background.
This commit is contained in:
Petr Mrázek 2014-07-21 00:10:13 +02:00
parent bc05ad30aa
commit 1ed90293ac
14 changed files with 607 additions and 525 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/pages/LegacyJarModPage.cpp
View File

@ -35,6 +35,8 @@ LegacyJarModPage::LegacyJarModPage(LegacyInstance *inst, QWidget *parent)
: QWidget(parent), ui(new Ui::LegacyJarModPage), m_inst(inst) : QWidget(parent), ui(new Ui::LegacyJarModPage), m_inst(inst)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->tabWidget->tabBar()->hide();
m_jarmods = m_inst->jarModList(); m_jarmods = m_inst->jarModList();
ui->jarModsTreeView->setModel(m_jarmods.get()); ui->jarModsTreeView->setModel(m_jarmods.get());
ui->jarModsTreeView->setDragDropMode(QAbstractItemView::DragDrop); ui->jarModsTreeView->setDragDropMode(QAbstractItemView::DragDrop);

200
gui/pages/LegacyJarModPage.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>378</width> <width>659</width>
<height>324</height> <height>593</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -27,100 +27,114 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <widget class="QTabWidget" name="tabWidget">
<item> <property name="currentIndex">
<widget class="ModListView" name="jarModsTreeView"> <number>0</number>
<property name="verticalScrollBarPolicy"> </property>
<enum>Qt::ScrollBarAlwaysOn</enum> <widget class="QWidget" name="tab">
</property> <attribute name="title">
<property name="horizontalScrollBarPolicy"> <string>Tab 1</string>
<enum>Qt::ScrollBarAlwaysOff</enum> </attribute>
</property> <layout class="QVBoxLayout" name="verticalLayout">
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="jarModsButtonBox">
<item> <item>
<widget class="QLabel" name="label"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="text"> <item>
<string>Selection</string> <widget class="ModListView" name="jarModsTreeView">
</property> <property name="verticalScrollBarPolicy">
<property name="alignment"> <enum>Qt::ScrollBarAlwaysOn</enum>
<set>Qt::AlignCenter</set> </property>
</property> <property name="horizontalScrollBarPolicy">
</widget> <enum>Qt::ScrollBarAlwaysOff</enum>
</item> </property>
<item> </widget>
<widget class="QPushButton" name="rmJarBtn"> </item>
<property name="text"> <item>
<string>&amp;Remove</string> <layout class="QVBoxLayout" name="jarModsButtonBox">
</property> <item>
</widget> <widget class="QLabel" name="label">
</item> <property name="text">
<item> <string>Selection</string>
<widget class="QPushButton" name="moveJarUpBtn"> </property>
<property name="text"> <property name="alignment">
<string>Move &amp;Up</string> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="moveJarDownBtn"> <widget class="QPushButton" name="rmJarBtn">
<property name="text"> <property name="text">
<string>Move &amp;Down</string> <string>&amp;Remove</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="LineSeparator" name="separator" native="true"/> <widget class="QPushButton" name="moveJarUpBtn">
</item> <property name="text">
<item> <string>Move &amp;Up</string>
<widget class="QLabel" name="label_2"> </property>
<property name="text"> </widget>
<string>Install</string> </item>
</property> <item>
<property name="alignment"> <widget class="QPushButton" name="moveJarDownBtn">
<set>Qt::AlignCenter</set> <property name="text">
</property> <string>Move &amp;Down</string>
</widget> </property>
</item> </widget>
<item> </item>
<widget class="QPushButton" name="addJarBtn"> <item>
<property name="text"> <widget class="LineSeparator" name="separator" native="true"/>
<string>&amp;Add jar mod</string> </item>
</property> <item>
</widget> <widget class="QLabel" name="label_2">
</item> <property name="text">
<item> <string>Install</string>
<widget class="QPushButton" name="addForgeBtn"> </property>
<property name="text"> <property name="alignment">
<string>Install Forge</string> <set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer"> <widget class="QPushButton" name="addJarBtn">
<property name="orientation"> <property name="text">
<enum>Qt::Vertical</enum> <string>&amp;Add jar mod</string>
</property> </property>
<property name="sizeHint" stdset="0"> </widget>
<size> </item>
<width>20</width> <item>
<height>40</height> <widget class="QPushButton" name="addForgeBtn">
</size> <property name="text">
</property> <string>Install Forge</string>
</spacer> </property>
</item> </widget>
<item> </item>
<widget class="QPushButton" name="viewJarBtn"> <item>
<property name="text"> <spacer name="verticalSpacer">
<string>&amp;View Folder</string> <property name="orientation">
</property> <enum>Qt::Vertical</enum>
</widget> </property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="viewJarBtn">
<property name="text">
<string>&amp;View Folder</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </widget>
</layout> </widget>
</item> </item>
<item> <item>
<widget class="MCModInfoFrame" name="jarMIFrame"> <widget class="MCModInfoFrame" name="jarMIFrame">

1
gui/pages/LogPage.cpp
View File

@ -11,6 +11,7 @@ LogPage::LogPage(MinecraftProcess *proc, QWidget *parent)
: QWidget(parent), ui(new Ui::LogPage), m_process(proc) : QWidget(parent), ui(new Ui::LogPage), m_process(proc)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->tabWidget->tabBar()->hide();
connect(m_process, SIGNAL(log(QString, MessageLevel::Enum)), this, connect(m_process, SIGNAL(log(QString, MessageLevel::Enum)), this,
SLOT(write(QString, MessageLevel::Enum))); SLOT(write(QString, MessageLevel::Enum)));
} }

222
gui/pages/LogPage.ui
View File

@ -13,7 +13,7 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Log</string> <string>Log</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@ -26,112 +26,126 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="2" column="1"> <item>
<widget class="QLineEdit" name="lineEdit"> <widget class="QTabWidget" name="tabWidget">
<property name="enabled"> <property name="currentIndex">
<bool>false</bool> <number>0</number>
</property> </property>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Tab 1</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
<widget class="QLabel" name="label">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Search:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="lineEdit">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="pushButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Find next</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="3">
<widget class="QPlainTextEdit" name="text">
<property name="undoRedoEnabled">
<bool>false</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
<property name="plainText">
<string notr="true"/>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
<property name="centerOnScroll">
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="checkBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Keep updating</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<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="QPushButton" name="btnCopy">
<property name="toolTip">
<string>Copy the whole log into the clipboard</string>
</property>
<property name="text">
<string>&amp;Copy</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnPaste">
<property name="toolTip">
<string>Upload the log to paste.ee - it will stay online for a month</string>
</property>
<property name="text">
<string>Upload</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnClear">
<property name="toolTip">
<string>Clear the log</string>
</property>
<property name="text">
<string>Clear</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
<item row="2" column="0">
<widget class="QLabel" name="label">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Search:</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="pushButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Find next</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="3">
<widget class="QPlainTextEdit" name="text">
<property name="undoRedoEnabled">
<bool>false</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
<property name="plainText">
<string notr="true"/>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
<property name="centerOnScroll">
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="checkBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Keep updating</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<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="QPushButton" name="btnCopy">
<property name="toolTip">
<string>Copy the whole log into the clipboard</string>
</property>
<property name="text">
<string>&amp;Copy</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnPaste">
<property name="toolTip">
<string>Upload the log to paste.ee - it will stay online for a month</string>
</property>
<property name="text">
<string>Upload</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnClear">
<property name="toolTip">
<string>Clear the log</string>
</property>
<property name="text">
<string>Clear</string>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>

1
gui/pages/ModFolderPage.cpp
View File

@ -38,6 +38,7 @@ ModFolderPage::ModFolderPage(BaseInstance *inst, std::shared_ptr<ModList> mods,
: QWidget(parent), ui(new Ui::ModFolderPage) : QWidget(parent), ui(new Ui::ModFolderPage)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->tabWidget->tabBar()->hide();
m_inst = inst; m_inst = inst;
m_mods = mods; m_mods = mods;
m_id = id; m_id = id;

106
gui/pages/ModFolderPage.ui
View File

@ -13,7 +13,7 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Mods</string> <string>Mods</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@ -27,10 +27,16 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <widget class="QTabWidget" name="tabWidget">
<item> <property name="currentIndex">
<layout class="QVBoxLayout" name="verticalLayout"> <number>0</number>
<item> </property>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Tab 1</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="ModListView" name="modTreeView"> <widget class="ModListView" name="modTreeView">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@ -46,56 +52,56 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="0" column="1">
</item> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_2"> <widget class="QPushButton" name="addModBtn">
<item> <property name="text">
<widget class="QPushButton" name="addModBtn"> <string>&amp;Add</string>
<property name="text"> </property>
<string>&amp;Add</string> </widget>
</property> </item>
</widget> <item>
<widget class="QPushButton" name="rmModBtn">
<property name="text">
<string>&amp;Remove</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="viewModBtn">
<property name="text">
<string>&amp;View Folder</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item row="1" column="0" colspan="2">
<widget class="QPushButton" name="rmModBtn"> <widget class="MCModInfoFrame" name="frame">
<property name="text"> <property name="sizePolicy">
<string>&amp;Remove</string> <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
</property> <horstretch>0</horstretch>
</widget> <verstretch>0</verstretch>
</item> </sizepolicy>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="viewModBtn">
<property name="text">
<string>&amp;View Folder</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </widget>
</layout>
</item>
<item>
<widget class="MCModInfoFrame" name="frame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

1
gui/pages/NotesPage.cpp
View File

@ -5,6 +5,7 @@ NotesPage::NotesPage(BaseInstance *inst, QWidget *parent)
: QWidget(parent), ui(new Ui::NotesPage), m_inst(inst) : QWidget(parent), ui(new Ui::NotesPage), m_inst(inst)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->tabWidget->tabBar()->hide();
ui->noteEditor->setText(m_inst->notes()); ui->noteEditor->setText(m_inst->notes());
} }

38
gui/pages/NotesPage.ui
View File

@ -6,14 +6,14 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>731</width>
<height>300</height> <height>538</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@ -27,16 +27,30 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QTextEdit" name="noteEditor"> <widget class="QTabWidget" name="tabWidget">
<property name="verticalScrollBarPolicy"> <property name="currentIndex">
<enum>Qt::ScrollBarAlwaysOn</enum> <number>0</number>
</property>
<property name="acceptRichText">
<bool>false</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextEditable|Qt::TextEditorInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property> </property>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Tab 1</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QTextEdit" name="noteEditor">
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOn</enum>
</property>
<property name="acceptRichText">
<bool>false</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextEditable|Qt::TextEditorInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
</layout> </layout>

1
gui/pages/OtherLogsPage.cpp
View File

@ -28,6 +28,7 @@ OtherLogsPage::OtherLogsPage(BaseInstance *instance, QWidget *parent)
m_watcher(new RecursiveFileSystemWatcher(this)) m_watcher(new RecursiveFileSystemWatcher(this))
{ {
ui->setupUi(this); ui->setupUi(this);
ui->tabWidget->tabBar()->hide();
m_watcher->setFileExpression("(.*\\.log(\\.[0-9]*)?$)|(crash-.*\\.txt)"); m_watcher->setFileExpression("(.*\\.log(\\.[0-9]*)?$)|(crash-.*\\.txt)");
m_watcher->setRootDir(QDir::current().absoluteFilePath(m_instance->minecraftRoot())); m_watcher->setRootDir(QDir::current().absoluteFilePath(m_instance->minecraftRoot()));

142
gui/pages/OtherLogsPage.ui
View File

@ -13,7 +13,7 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@ -27,70 +27,84 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <widget class="QTabWidget" name="tabWidget">
<item> <property name="currentIndex">
<widget class="QComboBox" name="selectLogBox"> <number>0</number>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnReload">
<property name="text">
<string>Reload</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnCopy">
<property name="toolTip">
<string>Copy the whole log into the clipboard</string>
</property>
<property name="text">
<string>&amp;Copy</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnPaste">
<property name="toolTip">
<string>Upload the log to paste.ee - it will stay online for a month</string>
</property>
<property name="text">
<string>Upload</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnDelete">
<property name="toolTip">
<string>Clear the log</string>
</property>
<property name="text">
<string>Delete</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QPlainTextEdit" name="text">
<property name="enabled">
<bool>false</bool>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOn</enum>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property> </property>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Tab 1</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QComboBox" name="selectLogBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnReload">
<property name="text">
<string>Reload</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnCopy">
<property name="toolTip">
<string>Copy the whole log into the clipboard</string>
</property>
<property name="text">
<string>&amp;Copy</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnPaste">
<property name="toolTip">
<string>Upload the log to paste.ee - it will stay online for a month</string>
</property>
<property name="text">
<string>Upload</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnDelete">
<property name="toolTip">
<string>Clear the log</string>
</property>
<property name="text">
<string>Delete</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QPlainTextEdit" name="text">
<property name="enabled">
<bool>false</bool>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOn</enum>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
</layout> </layout>

1
gui/pages/ScreenshotsPage.cpp
View File

@ -222,6 +222,7 @@ ScreenshotsPage::ScreenshotsPage(BaseInstance *instance, QWidget *parent)
m_valid = ensureFolderPathExists(m_folder); m_valid = ensureFolderPathExists(m_folder);
ui->setupUi(this); ui->setupUi(this);
ui->tabWidget->tabBar()->hide();
ui->listView->setModel(m_filterModel.get()); ui->listView->setModel(m_filterModel.get());
ui->listView->setIconSize(QSize(128, 128)); ui->listView->setIconSize(QSize(128, 128));
ui->listView->setGridSize(QSize(192, 160)); ui->listView->setGridSize(QSize(192, 160));

104
gui/pages/ScreenshotsPage.ui
View File

@ -13,7 +13,7 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Mods</string> <string>Mods</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@ -27,9 +27,15 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <widget class="QTabWidget" name="tabWidget">
<item> <property name="currentIndex">
<layout class="QVBoxLayout" name="verticalLayout"> <number>0</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Tab 1</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QListView" name="listView"> <widget class="QListView" name="listView">
<property name="selectionMode"> <property name="selectionMode">
@ -40,54 +46,54 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="QPushButton" name="uploadBtn"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="text"> <item>
<string>&amp;Upload</string> <widget class="QPushButton" name="uploadBtn">
</property> <property name="text">
</widget> <string>&amp;Upload</string>
</item> </property>
<item> </widget>
<widget class="QPushButton" name="deleteBtn"> </item>
<property name="text"> <item>
<string>&amp;Delete</string> <widget class="QPushButton" name="deleteBtn">
</property> <property name="text">
</widget> <string>&amp;Delete</string>
</item> </property>
<item> </widget>
<widget class="QPushButton" name="renameBtn"> </item>
<property name="text"> <item>
<string>&amp;Rename</string> <widget class="QPushButton" name="renameBtn">
</property> <property name="text">
</widget> <string>&amp;Rename</string>
</item> </property>
<item> </widget>
<spacer name="verticalSpacer"> </item>
<property name="orientation"> <item>
<enum>Qt::Vertical</enum> <spacer name="verticalSpacer">
</property> <property name="orientation">
<property name="sizeHint" stdset="0"> <enum>Qt::Vertical</enum>
<size> </property>
<width>20</width> <property name="sizeHint" stdset="0">
<height>40</height> <size>
</size> <width>20</width>
</property> <height>40</height>
</spacer> </size>
</item> </property>
<item> </spacer>
<widget class="QPushButton" name="viewFolderBtn"> </item>
<property name="text"> <item>
<string>&amp;View Folder</string> <widget class="QPushButton" name="viewFolderBtn">
</property> <property name="text">
</widget> <string>&amp;View Folder</string>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</item> </widget>
</layout> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>

2
gui/pages/VersionPage.cpp
View File

@ -63,7 +63,7 @@ VersionPage::VersionPage(OneSixInstance *inst, QWidget *parent)
: QWidget(parent), ui(new Ui::VersionPage), m_inst(inst) : QWidget(parent), ui(new Ui::VersionPage), m_inst(inst)
{ {
ui->setupUi(this); ui->setupUi(this);
// libraries! ui->tabWidget->tabBar()->hide();
m_version = m_inst->getFullVersion(); m_version = m_inst->getFullVersion();
if (m_version) if (m_version)

311
gui/pages/VersionPage.ui
View File

@ -6,17 +6,14 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>693</width>
<height>475</height> <height>575</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Version</string> <string>Version</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@ -30,152 +27,162 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_10"> <widget class="QTabWidget" name="tabWidget">
<item> <property name="currentIndex">
<widget class="ModListView" name="libraryTreeView"> <number>0</number>
<property name="verticalScrollBarPolicy"> </property>
<enum>Qt::ScrollBarAlwaysOn</enum> <widget class="QWidget" name="tab">
</property> <attribute name="title">
<property name="horizontalScrollBarPolicy"> <string>Tab 1</string>
<enum>Qt::ScrollBarAlwaysOff</enum> </attribute>
</property> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="headerHidden"> <item>
<bool>false</bool> <widget class="ModListView" name="libraryTreeView">
</property> <property name="verticalScrollBarPolicy">
<attribute name="headerVisible"> <enum>Qt::ScrollBarAlwaysOn</enum>
<bool>true</bool> </property>
</attribute> <property name="horizontalScrollBarPolicy">
</widget> <enum>Qt::ScrollBarAlwaysOff</enum>
</item> </property>
</layout> <property name="headerHidden">
</item> <bool>false</bool>
<item> </property>
<layout class="QVBoxLayout" name="verticalLayout_4"> <attribute name="headerVisible">
<item> <bool>true</bool>
<widget class="QLabel" name="label"> </attribute>
<property name="text"> </widget>
<string>Selection</string> </item>
</property> <item>
<property name="alignment"> <layout class="QVBoxLayout" name="verticalLayout_4">
<set>Qt::AlignCenter</set> <item>
</property> <widget class="QLabel" name="label">
</widget> <property name="text">
</item> <string>Selection</string>
<item> </property>
<widget class="QPushButton" name="changeMCVersionBtn"> <property name="alignment">
<property name="text"> <set>Qt::AlignCenter</set>
<string>Change version</string> </property>
</property> </widget>
</widget> </item>
</item> <item>
<item> <widget class="QPushButton" name="changeMCVersionBtn">
<widget class="QPushButton" name="moveLibraryUpBtn"> <property name="text">
<property name="toolTip"> <string>Change version</string>
<string>This isn't implemented yet.</string> </property>
</property> </widget>
<property name="text"> </item>
<string>Move up</string> <item>
</property> <widget class="QPushButton" name="moveLibraryUpBtn">
</widget> <property name="toolTip">
</item> <string>This isn't implemented yet.</string>
<item> </property>
<widget class="QPushButton" name="moveLibraryDownBtn"> <property name="text">
<property name="toolTip"> <string>Move up</string>
<string>This isn't implemented yet.</string> </property>
</property> </widget>
<property name="text"> </item>
<string>Move down</string> <item>
</property> <widget class="QPushButton" name="moveLibraryDownBtn">
</widget> <property name="toolTip">
</item> <string>This isn't implemented yet.</string>
<item> </property>
<widget class="QPushButton" name="removeLibraryBtn"> <property name="text">
<property name="text"> <string>Move down</string>
<string>Remove</string> </property>
</property> </widget>
</widget> </item>
</item> <item>
<item> <widget class="QPushButton" name="removeLibraryBtn">
<widget class="LineSeparator" name="separator" native="true"/> <property name="text">
</item> <string>Remove</string>
<item> </property>
<widget class="QLabel" name="label_2"> </widget>
<property name="text"> </item>
<string>Install</string> <item>
</property> <widget class="LineSeparator" name="separator" native="true"/>
<property name="alignment"> </item>
<set>Qt::AlignCenter</set> <item>
</property> <widget class="QLabel" name="label_2">
</widget> <property name="text">
</item> <string>Install</string>
<item> </property>
<widget class="QPushButton" name="forgeBtn"> <property name="alignment">
<property name="toolTip"> <set>Qt::AlignCenter</set>
<string>Replace any current custom version with Minecraft Forge</string> </property>
</property> </widget>
<property name="text"> </item>
<string>Install Forge</string> <item>
</property> <widget class="QPushButton" name="forgeBtn">
</widget> <property name="toolTip">
</item> <string>Replace any current custom version with Minecraft Forge</string>
<item> </property>
<widget class="QPushButton" name="liteloaderBtn"> <property name="text">
<property name="text"> <string>Install Forge</string>
<string>Install LiteLoader</string> </property>
</property> </widget>
</widget> </item>
</item> <item>
<item> <widget class="QPushButton" name="liteloaderBtn">
<widget class="QPushButton" name="jarmodBtn"> <property name="text">
<property name="text"> <string>Install LiteLoader</string>
<string>Add jar mod</string> </property>
</property> </widget>
</widget> </item>
</item> <item>
<item> <widget class="QPushButton" name="jarmodBtn">
<widget class="LineSeparator" name="widget" native="true"/> <property name="text">
</item> <string>Add jar mod</string>
<item> </property>
<widget class="QLabel" name="label_5"> </widget>
<property name="text"> </item>
<string>List</string> <item>
</property> <widget class="LineSeparator" name="widget" native="true"/>
<property name="alignment"> </item>
<set>Qt::AlignCenter</set> <item>
</property> <widget class="QLabel" name="label_5">
</widget> <property name="text">
</item> <string>List</string>
<item> </property>
<widget class="QPushButton" name="resetLibraryOrderBtn"> <property name="alignment">
<property name="toolTip"> <set>Qt::AlignCenter</set>
<string>This isn't implemented yet.</string> </property>
</property> </widget>
<property name="text"> </item>
<string>Reset order</string> <item>
</property> <widget class="QPushButton" name="resetLibraryOrderBtn">
</widget> <property name="toolTip">
</item> <string>This isn't implemented yet.</string>
<item> </property>
<widget class="QPushButton" name="reloadLibrariesBtn"> <property name="text">
<property name="text"> <string>Reset order</string>
<string>Reload</string> </property>
</property> </widget>
</widget> </item>
</item> <item>
<item> <widget class="QPushButton" name="reloadLibrariesBtn">
<spacer name="verticalSpacer_7"> <property name="text">
<property name="orientation"> <string>Reload</string>
<enum>Qt::Vertical</enum> </property>
</property> </widget>
<property name="sizeHint" stdset="0"> </item>
<size> <item>
<width>20</width> <spacer name="verticalSpacer_7">
<height>40</height> <property name="orientation">
</size> <enum>Qt::Vertical</enum>
</property> </property>
</spacer> <property name="sizeHint" stdset="0">
</item> <size>
</layout> <width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>