From b4a5d7e1c3c02e67fce8ba9003d07ec36e20f831 Mon Sep 17 00:00:00 2001 From: Jan200101 Date: Sat, 28 Jan 2023 22:53:21 +0100 Subject: rss stash: 55c37a7c21ec98fdbfcb8e8fc2b1bb7e6c1f99a7 --- src/qt/mainwindow.cpp | 13 --- src/qt/mainwindow.hpp | 2 - 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 @@ } - <html><head/><body><p><img width="300" src=":/icon/assets/logo.png"/></p></body></html> + + + + :/icon/assets/logo.png @@ -84,82 +87,173 @@ - - - 6 + + + Qt::LeftToRight - - 6 + + 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); +} - - 6 + + 0 - - - - - 0 - 0 - + + 0 + + + + + 0 + 0 + 268 + 250 + + + + Page 1 + + + + 0 - - - 45 - 45 - + + 0 - - QPushButton { - image: url(:/icon/assets/globe.png); - background-color: rgba(0, 0, 0, 0); - border: 0; -} + + 0 - - + + 0 - - - - - - - 0 - 0 - + + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + true + + + NEWS PAGE 1 + + + + + + + + + + 0 + 0 + 268 + 250 + + + + Page 2 + + + + 0 - - - 45 - 45 - + + 0 - - QPushButton { - image: url(:/icon/assets/discord.png); - background-color: rgba(0, 0, 0, 0); - border: 0; -} + + 0 - - + + 0 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - + + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + true + + + NEWS PAGE 1 + + + + + + + + + Page + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + QFrame::NoFrame + + + QFrame::Plain + + + true + + + NEWS PAGE 1 + + + + + + + @@ -340,7 +434,6 @@ QPushButton:pressed { mainButton settingsButton - buttonDiscord -- cgit v1.2.3