From 1ed90293acd34a67258b9ecf85ebfdea29657e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 21 Jul 2014 00:10:13 +0200 Subject: [PATCH] Unify look of all pages. Now they have a QTabWidget with no tabs as a background. --- gui/pages/LegacyJarModPage.cpp | 2 + gui/pages/LegacyJarModPage.ui | 200 +++++++++++---------- gui/pages/LogPage.cpp | 1 + gui/pages/LogPage.ui | 222 ++++++++++++----------- gui/pages/ModFolderPage.cpp | 1 + gui/pages/ModFolderPage.ui | 106 +++++------ gui/pages/NotesPage.cpp | 1 + gui/pages/NotesPage.ui | 38 ++-- gui/pages/OtherLogsPage.cpp | 1 + gui/pages/OtherLogsPage.ui | 142 ++++++++------- gui/pages/ScreenshotsPage.cpp | 1 + gui/pages/ScreenshotsPage.ui | 104 +++++------ gui/pages/VersionPage.cpp | 2 +- gui/pages/VersionPage.ui | 311 +++++++++++++++++---------------- 14 files changed, 607 insertions(+), 525 deletions(-) diff --git a/gui/pages/LegacyJarModPage.cpp b/gui/pages/LegacyJarModPage.cpp index 16a2ff66..8ff23ae2 100644 --- a/gui/pages/LegacyJarModPage.cpp +++ b/gui/pages/LegacyJarModPage.cpp @@ -35,6 +35,8 @@ LegacyJarModPage::LegacyJarModPage(LegacyInstance *inst, QWidget *parent) : QWidget(parent), ui(new Ui::LegacyJarModPage), m_inst(inst) { ui->setupUi(this); + ui->tabWidget->tabBar()->hide(); + m_jarmods = m_inst->jarModList(); ui->jarModsTreeView->setModel(m_jarmods.get()); ui->jarModsTreeView->setDragDropMode(QAbstractItemView::DragDrop); diff --git a/gui/pages/LegacyJarModPage.ui b/gui/pages/LegacyJarModPage.ui index a1da2b20..50edfc8e 100644 --- a/gui/pages/LegacyJarModPage.ui +++ b/gui/pages/LegacyJarModPage.ui @@ -6,8 +6,8 @@ 0 0 - 378 - 324 + 659 + 593 @@ -27,100 +27,114 @@ 0 - - - - - Qt::ScrollBarAlwaysOn - - - Qt::ScrollBarAlwaysOff - - - - - + + + 0 + + + + Tab 1 + + - - - Selection - - - Qt::AlignCenter - - - - - - - &Remove - - - - - - - Move &Up - - - - - - - Move &Down - - - - - - - - - - Install - - - Qt::AlignCenter - - - - - - - &Add jar mod - - - - - - - Install Forge - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - &View Folder - - + + + + + Qt::ScrollBarAlwaysOn + + + Qt::ScrollBarAlwaysOff + + + + + + + + + Selection + + + Qt::AlignCenter + + + + + + + &Remove + + + + + + + Move &Up + + + + + + + Move &Down + + + + + + + + + + Install + + + Qt::AlignCenter + + + + + + + &Add jar mod + + + + + + + Install Forge + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + &View Folder + + + + + + - - + + diff --git a/gui/pages/LogPage.cpp b/gui/pages/LogPage.cpp index 601c738f..7fbf5929 100644 --- a/gui/pages/LogPage.cpp +++ b/gui/pages/LogPage.cpp @@ -11,6 +11,7 @@ LogPage::LogPage(MinecraftProcess *proc, QWidget *parent) : QWidget(parent), ui(new Ui::LogPage), m_process(proc) { ui->setupUi(this); + ui->tabWidget->tabBar()->hide(); connect(m_process, SIGNAL(log(QString, MessageLevel::Enum)), this, SLOT(write(QString, MessageLevel::Enum))); } diff --git a/gui/pages/LogPage.ui b/gui/pages/LogPage.ui index d6b0a0c0..b87a7522 100644 --- a/gui/pages/LogPage.ui +++ b/gui/pages/LogPage.ui @@ -13,7 +13,7 @@ Log - + 0 @@ -26,112 +26,126 @@ 0 - - - - false + + + + 0 + + + Tab 1 + + + + + + false + + + Search: + + + + + + + false + + + + + + + false + + + Find next + + + + + + + false + + + true + + + + + + Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + false + + + + + + + + + false + + + Keep updating + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Copy the whole log into the clipboard + + + &Copy + + + + + + + Upload the log to paste.ee - it will stay online for a month + + + Upload + + + + + + + Clear the log + + + Clear + + + + + + + - - - - false - - - Search: - - - - - - - false - - - Find next - - - - - - - false - - - true - - - - - - Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - false - - - - - - - - - false - - - Keep updating - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Copy the whole log into the clipboard - - - &Copy - - - - - - - Upload the log to paste.ee - it will stay online for a month - - - Upload - - - - - - - Clear the log - - - Clear - - - - - diff --git a/gui/pages/ModFolderPage.cpp b/gui/pages/ModFolderPage.cpp index d94696ec..24421e55 100644 --- a/gui/pages/ModFolderPage.cpp +++ b/gui/pages/ModFolderPage.cpp @@ -38,6 +38,7 @@ ModFolderPage::ModFolderPage(BaseInstance *inst, std::shared_ptr mods, : QWidget(parent), ui(new Ui::ModFolderPage) { ui->setupUi(this); + ui->tabWidget->tabBar()->hide(); m_inst = inst; m_mods = mods; m_id = id; diff --git a/gui/pages/ModFolderPage.ui b/gui/pages/ModFolderPage.ui index eb29a2c0..019b8faf 100644 --- a/gui/pages/ModFolderPage.ui +++ b/gui/pages/ModFolderPage.ui @@ -13,7 +13,7 @@ Mods - + 0 @@ -27,10 +27,16 @@ 0 - - - - + + + 0 + + + + Tab 1 + + + @@ -46,56 +52,56 @@ - - - - - - - - &Add - - + + + + + + &Add + + + + + + + &Remove + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + &View Folder + + + + - - - - &Remove - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - &View Folder + + + + + 0 + 0 + - - - - - - - - 0 - 0 - - + diff --git a/gui/pages/NotesPage.cpp b/gui/pages/NotesPage.cpp index a2558e3c..48bb468c 100644 --- a/gui/pages/NotesPage.cpp +++ b/gui/pages/NotesPage.cpp @@ -5,6 +5,7 @@ NotesPage::NotesPage(BaseInstance *inst, QWidget *parent) : QWidget(parent), ui(new Ui::NotesPage), m_inst(inst) { ui->setupUi(this); + ui->tabWidget->tabBar()->hide(); ui->noteEditor->setText(m_inst->notes()); } diff --git a/gui/pages/NotesPage.ui b/gui/pages/NotesPage.ui index ab33ffd3..8da01c8b 100644 --- a/gui/pages/NotesPage.ui +++ b/gui/pages/NotesPage.ui @@ -6,14 +6,14 @@ 0 0 - 400 - 300 + 731 + 538 Form - + 0 @@ -27,16 +27,30 @@ 0 - - - Qt::ScrollBarAlwaysOn - - - false - - - Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextEditable|Qt::TextEditorInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + 0 + + + Tab 1 + + + + + + Qt::ScrollBarAlwaysOn + + + false + + + Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextEditable|Qt::TextEditorInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + diff --git a/gui/pages/OtherLogsPage.cpp b/gui/pages/OtherLogsPage.cpp index 555075e3..55c632fd 100644 --- a/gui/pages/OtherLogsPage.cpp +++ b/gui/pages/OtherLogsPage.cpp @@ -28,6 +28,7 @@ OtherLogsPage::OtherLogsPage(BaseInstance *instance, QWidget *parent) m_watcher(new RecursiveFileSystemWatcher(this)) { ui->setupUi(this); + ui->tabWidget->tabBar()->hide(); m_watcher->setFileExpression("(.*\\.log(\\.[0-9]*)?$)|(crash-.*\\.txt)"); m_watcher->setRootDir(QDir::current().absoluteFilePath(m_instance->minecraftRoot())); diff --git a/gui/pages/OtherLogsPage.ui b/gui/pages/OtherLogsPage.ui index 1083ebcb..08200684 100644 --- a/gui/pages/OtherLogsPage.ui +++ b/gui/pages/OtherLogsPage.ui @@ -13,7 +13,7 @@ Form - + 0 @@ -27,70 +27,84 @@ 0 - - - - - - 0 - 0 - - - - - - - - Reload - - - - - - - Copy the whole log into the clipboard - - - &Copy - - - - - - - Upload the log to paste.ee - it will stay online for a month - - - Upload - - - - - - - Clear the log - - - Delete - - - - - - - - - false - - - Qt::ScrollBarAlwaysOn - - - true - - - Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + 0 + + + Tab 1 + + + + + + + + + 0 + 0 + + + + + + + + Reload + + + + + + + Copy the whole log into the clipboard + + + &Copy + + + + + + + Upload the log to paste.ee - it will stay online for a month + + + Upload + + + + + + + Clear the log + + + Delete + + + + + + + + + false + + + Qt::ScrollBarAlwaysOn + + + true + + + Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + diff --git a/gui/pages/ScreenshotsPage.cpp b/gui/pages/ScreenshotsPage.cpp index 004f797b..d47a2897 100644 --- a/gui/pages/ScreenshotsPage.cpp +++ b/gui/pages/ScreenshotsPage.cpp @@ -222,6 +222,7 @@ ScreenshotsPage::ScreenshotsPage(BaseInstance *instance, QWidget *parent) m_valid = ensureFolderPathExists(m_folder); ui->setupUi(this); + ui->tabWidget->tabBar()->hide(); ui->listView->setModel(m_filterModel.get()); ui->listView->setIconSize(QSize(128, 128)); ui->listView->setGridSize(QSize(192, 160)); diff --git a/gui/pages/ScreenshotsPage.ui b/gui/pages/ScreenshotsPage.ui index 5951ab02..30b55092 100644 --- a/gui/pages/ScreenshotsPage.ui +++ b/gui/pages/ScreenshotsPage.ui @@ -13,7 +13,7 @@ Mods - + 0 @@ -27,9 +27,15 @@ 0 - - - + + + 0 + + + + Tab 1 + + @@ -40,54 +46,54 @@ - - - - - - - &Upload - - - - - - - &Delete - - - - - - - &Rename - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - &View Folder - - + + + + + &Upload + + + + + + + &Delete + + + + + + + &Rename + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + &View Folder + + + + - - + + diff --git a/gui/pages/VersionPage.cpp b/gui/pages/VersionPage.cpp index 6e29dd41..e19cf7cc 100644 --- a/gui/pages/VersionPage.cpp +++ b/gui/pages/VersionPage.cpp @@ -63,7 +63,7 @@ VersionPage::VersionPage(OneSixInstance *inst, QWidget *parent) : QWidget(parent), ui(new Ui::VersionPage), m_inst(inst) { ui->setupUi(this); - // libraries! + ui->tabWidget->tabBar()->hide(); m_version = m_inst->getFullVersion(); if (m_version) diff --git a/gui/pages/VersionPage.ui b/gui/pages/VersionPage.ui index f770df55..9b270d01 100644 --- a/gui/pages/VersionPage.ui +++ b/gui/pages/VersionPage.ui @@ -6,17 +6,14 @@ 0 0 - 400 - 475 + 693 + 575 Version - - - 6 - + 0 @@ -30,152 +27,162 @@ 0 - - - - - Qt::ScrollBarAlwaysOn - - - Qt::ScrollBarAlwaysOff - - - false - - - true - - - - - - - - - - - Selection - - - Qt::AlignCenter - - - - - - - Change version - - - - - - - This isn't implemented yet. - - - Move up - - - - - - - This isn't implemented yet. - - - Move down - - - - - - - Remove - - - - - - - - - - Install - - - Qt::AlignCenter - - - - - - - Replace any current custom version with Minecraft Forge - - - Install Forge - - - - - - - Install LiteLoader - - - - - - - Add jar mod - - - - - - - - - - List - - - Qt::AlignCenter - - - - - - - This isn't implemented yet. - - - Reset order - - - - - - - Reload - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - + + + 0 + + + + Tab 1 + + + + + + Qt::ScrollBarAlwaysOn + + + Qt::ScrollBarAlwaysOff + + + false + + + true + + + + + + + + + Selection + + + Qt::AlignCenter + + + + + + + Change version + + + + + + + This isn't implemented yet. + + + Move up + + + + + + + This isn't implemented yet. + + + Move down + + + + + + + Remove + + + + + + + + + + Install + + + Qt::AlignCenter + + + + + + + Replace any current custom version with Minecraft Forge + + + Install Forge + + + + + + + Install LiteLoader + + + + + + + Add jar mod + + + + + + + + + + List + + + Qt::AlignCenter + + + + + + + This isn't implemented yet. + + + Reset order + + + + + + + Reload + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + +