diff options
| -rw-r--r-- | src/qt/mainwindow.cpp | 13 | ||||
| -rw-r--r-- | src/qt/mainwindow.hpp | 2 | ||||
| -rw-r--r-- | src/qt/mainwindow.ui | 227 |
3 files changed, 160 insertions, 82 deletions
diff --git a/src/qt/mainwindow.cpp b/src/qt/mainwindow.cpp index 49cc09f..cab22ce 100644 --- a/src/qt/mainwindow.cpp +++ b/src/qt/mainwindow.cpp @@ -61,8 +61,6 @@ MainWindow::MainWindow(QWidget *parent) connect(ui->mainButton, SIGNAL(clicked()), this, SLOT(updateButton())); connect(ui->mainButton, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(showButtonContext(const QPoint&))); - connect(ui->buttonDiscord, SIGNAL(clicked()), this, SLOT(openDiscordInvite())); - connect(ui->buttonWebsite, SIGNAL(clicked()), this, SLOT(openWebsite())); ui->mainButton->setText("..."); ui->statusLabel->setText("..."); @@ -224,17 +222,6 @@ void MainWindow::showButtonContext(const QPoint& pos) } } - -void MainWindow::openDiscordInvite() -{ - QDesktopServices::openUrl(QUrl("https://discord.gg/mKjW2ACCrm", QUrl::TolerantMode)); -} - -void MainWindow::openWebsite() -{ - QDesktopServices::openUrl(QUrl("https://openfortress.fun/", QUrl::TolerantMode)); -} - void MainWindow::resetProgress() { ui->progressBar->setFormat("%p%"); diff --git a/src/qt/mainwindow.hpp b/src/qt/mainwindow.hpp index 0d21efc..1340c37 100644 --- a/src/qt/mainwindow.hpp +++ b/src/qt/mainwindow.hpp @@ -40,8 +40,6 @@ private slots: void settingsWindow(); void updateButton(); void showButtonContext(const QPoint&); - void openDiscordInvite(); - void openWebsite(); signals: void workerOperate(const Worker::Tasks_t&); diff --git a/src/qt/mainwindow.ui b/src/qt/mainwindow.ui index 574129b..646208a 100644 --- a/src/qt/mainwindow.ui +++ b/src/qt/mainwindow.ui @@ -49,7 +49,10 @@ }</string> </property> <property name="text"> - <string><html><head/><body><p><img width="300" src=":/icon/assets/logo.png"/></p></body></html></string> + <string/> + </property> + <property name="pixmap"> + <pixmap resource="assets.qrc">:/icon/assets/logo.png</pixmap> </property> </widget> </item> @@ -84,82 +87,173 @@ <item> <layout class="QVBoxLayout" name="layoutRight"> <item> - <layout class="QHBoxLayout" name="layoutSocial"> - <property name="leftMargin"> - <number>6</number> + <widget class="QToolBox" name="toolBox"> + <property name="layoutDirection"> + <enum>Qt::LeftToRight</enum> </property> - <property name="topMargin"> - <number>6</number> + <property name="styleSheet"> + <string notr="true">QToolBox::tab { + background-color: rgba(0, 0, 0, 140); + font: bold 15pt; +} + +QWidget { + background-color: rgba(255, 255, 255, 0); +} + +QPlainTextEdit { + background-color: rgba(0, 0, 0, 140); +}</string> </property> - <property name="rightMargin"> - <number>6</number> + <property name="currentIndex"> + <number>0</number> </property> - <item> - <widget class="QPushButton" name="buttonWebsite"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <property name="tabSpacing"> + <number>0</number> + </property> + <widget class="QWidget" name="page"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>268</width> + <height>250</height> + </rect> + </property> + <attribute name="label"> + <string>Page 1</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <property name="spacing"> + <number>0</number> </property> - <property name="minimumSize"> - <size> - <width>45</width> - <height>45</height> - </size> + <property name="leftMargin"> + <number>0</number> </property> - <property name="styleSheet"> - <string notr="true">QPushButton { - image: url(:/icon/assets/globe.png); - background-color: rgba(0, 0, 0, 0); - border: 0; -}</string> + <property name="topMargin"> + <number>0</number> </property> - <property name="text"> - <string/> + <property name="rightMargin"> + <number>0</number> </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="buttonDiscord"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <item> + <widget class="QPlainTextEdit" name="plainTextEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="plainText"> + <string>NEWS PAGE 1 +</string> + </property> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="page_2"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>268</width> + <height>250</height> + </rect> + </property> + <attribute name="label"> + <string>Page 2</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <property name="spacing"> + <number>0</number> </property> - <property name="minimumSize"> - <size> - <width>45</width> - <height>45</height> - </size> + <property name="leftMargin"> + <number>0</number> </property> - <property name="styleSheet"> - <string notr="true">QPushButton { - image: url(:/icon/assets/discord.png); - background-color: rgba(0, 0, 0, 0); - border: 0; -}</string> + <property name="topMargin"> + <number>0</number> </property> - <property name="text"> - <string/> + <property name="rightMargin"> + <number>0</number> </property> - </widget> - </item> - </layout> - </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> + <widget class="QPlainTextEdit" name="plainTextEdit_2"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="plainText"> + <string>NEWS PAGE 1 +</string> + </property> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="page_3"> + <attribute name="label"> + <string>Page</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_4"> + <property name="spacing"> + <number>0</number> + </property> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <item> + <widget class="QPlainTextEdit" name="plainTextEdit_3"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="plainText"> + <string>NEWS PAGE 1 +</string> + </property> + </widget> + </item> + </layout> + </widget> + </widget> </item> </layout> </item> @@ -340,7 +434,6 @@ QPushButton:pressed { <tabstops> <tabstop>mainButton</tabstop> <tabstop>settingsButton</tabstop> - <tabstop>buttonDiscord</tabstop> </tabstops> <resources> <include location="assets.qrc"/> |