diff options
| -rw-r--r-- | application/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | application/dialogs/NewInstanceDialog.cpp | 2 | ||||
| -rw-r--r-- | application/pages/modplatform/TechnicPage.cpp | 26 | ||||
| -rw-r--r-- | application/pages/modplatform/TechnicPage.h | 61 | ||||
| -rw-r--r-- | application/pages/modplatform/TechnicPage.ui | 113 | ||||
| -rw-r--r-- | application/resources/assets/assets.qrc | 1 | ||||
| -rw-r--r-- | application/resources/assets/underconstruction.png | bin | 14490 -> 0 bytes |
7 files changed, 0 insertions, 206 deletions
diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index 825d0a7c..4ce031f7 100644 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -135,8 +135,6 @@ SET(MULTIMC_SOURCES pages/modplatform/FtbListModel.cpp pages/modplatform/TwitchPage.cpp pages/modplatform/TwitchPage.h - pages/modplatform/TechnicPage.cpp - pages/modplatform/TechnicPage.h pages/modplatform/ImportPage.cpp pages/modplatform/ImportPage.h @@ -254,7 +252,6 @@ SET(MULTIMC_UIS pages/modplatform/VanillaPage.ui pages/modplatform/FTBPage.ui pages/modplatform/TwitchPage.ui - pages/modplatform/TechnicPage.ui pages/modplatform/ImportPage.ui # Dialogs diff --git a/application/dialogs/NewInstanceDialog.cpp b/application/dialogs/NewInstanceDialog.cpp index 3533763d..a82593c0 100644 --- a/application/dialogs/NewInstanceDialog.cpp +++ b/application/dialogs/NewInstanceDialog.cpp @@ -37,8 +37,6 @@ #include <pages/modplatform/FTBPage.h> #include <pages/modplatform/TwitchPage.h> #include <pages/modplatform/ImportPage.h> -#include <pages/modplatform/TechnicPage.h> - NewInstanceDialog::NewInstanceDialog(const QString & initialGroup, const QString & url, QWidget *parent) diff --git a/application/pages/modplatform/TechnicPage.cpp b/application/pages/modplatform/TechnicPage.cpp deleted file mode 100644 index 2f95bec8..00000000 --- a/application/pages/modplatform/TechnicPage.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "TechnicPage.h" -#include "ui_TechnicPage.h" - -#include "MultiMC.h" -#include "dialogs/NewInstanceDialog.h" - -TechnicPage::TechnicPage(NewInstanceDialog* dialog, QWidget *parent) - : QWidget(parent), ui(new Ui::TechnicPage), dialog(dialog) -{ - ui->setupUi(this); -} - -TechnicPage::~TechnicPage() -{ - delete ui; -} - -bool TechnicPage::shouldDisplay() const -{ - return true; -} - -void TechnicPage::openedImpl() -{ - dialog->setSuggestedPack(); -} diff --git a/application/pages/modplatform/TechnicPage.h b/application/pages/modplatform/TechnicPage.h deleted file mode 100644 index cc82ddf3..00000000 --- a/application/pages/modplatform/TechnicPage.h +++ /dev/null @@ -1,61 +0,0 @@ -/* Copyright 2013-2019 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include <QWidget> - -#include "pages/BasePage.h" -#include <MultiMC.h> -#include "tasks/Task.h" - -namespace Ui -{ -class TechnicPage; -} - -class NewInstanceDialog; - -class TechnicPage : public QWidget, public BasePage -{ - Q_OBJECT - -public: - explicit TechnicPage(NewInstanceDialog* dialog, QWidget *parent = 0); - virtual ~TechnicPage(); - virtual QString displayName() const override - { - return tr("Technic"); - } - virtual QIcon icon() const override - { - return MMC->getThemedIcon("technic"); - } - virtual QString id() const override - { - return "technic"; - } - virtual QString helpPage() const override - { - return "Technic-platform"; - } - virtual bool shouldDisplay() const override; - - void openedImpl() override; - -private: - Ui::TechnicPage *ui = nullptr; - NewInstanceDialog* dialog = nullptr; -}; diff --git a/application/pages/modplatform/TechnicPage.ui b/application/pages/modplatform/TechnicPage.ui deleted file mode 100644 index 702427b5..00000000 --- a/application/pages/modplatform/TechnicPage.ui +++ /dev/null @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>TechnicPage</class> - <widget class="QWidget" name="TechnicPage"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>546</width> - <height>405</height> - </rect> - </property> - <layout class="QVBoxLayout" name="verticalLayout_5"> - <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> - <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="QLabel" name="label"> - <property name="font"> - <font> - <pointsize>40</pointsize> - </font> - </property> - <property name="styleSheet"> - <string notr="true">color:#ffc000</string> - </property> - <property name="text"> - <string notr="true">UNDER</string> - </property> - <property name="textFormat"> - <enum>Qt::PlainText</enum> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string notr="true"/> - </property> - <property name="pixmap"> - <pixmap resource="../../resources/assets/assets.qrc">:/assets/underconstruction</pixmap> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="label_2"> - <property name="font"> - <font> - <pointsize>40</pointsize> - </font> - </property> - <property name="styleSheet"> - <string notr="true">color:#7ca32b</string> - </property> - <property name="text"> - <string notr="true">CONSTRUCTION</string> - </property> - <property name="textFormat"> - <enum>Qt::PlainText</enum> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - <item> - <spacer name="verticalSpacer_2"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <resources> - <include location="../../resources/assets/assets.qrc"/> - </resources> - <connections/> -</ui> diff --git a/application/resources/assets/assets.qrc b/application/resources/assets/assets.qrc index 38638e7f..7a916f05 100644 --- a/application/resources/assets/assets.qrc +++ b/application/resources/assets/assets.qrc @@ -1,7 +1,6 @@ <!DOCTYPE RCC> <RCC version="1.0"> <qresource prefix="/assets"> - <file alias="underconstruction">underconstruction.png</file> <file alias="deadglitch">deadglitch.svg</file> </qresource> </RCC> diff --git a/application/resources/assets/underconstruction.png b/application/resources/assets/underconstruction.png Binary files differdeleted file mode 100644 index 6ae06476..00000000 --- a/application/resources/assets/underconstruction.png +++ /dev/null |
