From 4f0990293a33312057e662552a9e9ad98aeb356d Mon Sep 17 00:00:00 2001 From: RigoLigoRLC Date: Thu, 22 Jul 2021 19:26:00 +0800 Subject: [PATCH] =?UTF-8?q?SpkPageQssTest=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E4=B8=BASpkPageUiTest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- gui/spkdialog.cpp | 12 ++++++++---- gui/spkmainwindow.cpp | 2 +- gui/{spkpageqsstest.cpp => spkpageuitest.cpp} | 16 ++++++++-------- inc/spkdialog.h | 4 +++- inc/spkmainwindow.h | 4 ++-- inc/{spkpageqsstest.h => spkpageuitest.h} | 4 ++-- 7 files changed, 25 insertions(+), 19 deletions(-) rename gui/{spkpageqsstest.cpp => spkpageuitest.cpp} (86%) rename inc/{spkpageqsstest.h => spkpageuitest.h} (91%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec3173b..19ee3df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,7 @@ set(SOURCE_FILES inc/spkmsgbox.h gui/spkmsgbox.cpp inc/spkdialog.h gui/spkdialog.cpp inc/spkabout.h gui/spkabout.cpp - inc/spkpageqsstest.h gui/spkpageqsstest.cpp + inc/spkpageuitest.h gui/spkpageuitest.cpp inc/spkloading.h gui/spkloading.cpp inc/spksidebartree.h gui/spksidebartree.cpp inc/spkpopup.h gui/spkpopup.cpp diff --git a/gui/spkdialog.cpp b/gui/spkdialog.cpp index 61b9502..bf5a8d8 100644 --- a/gui/spkdialog.cpp +++ b/gui/spkdialog.cpp @@ -1,9 +1,8 @@ -#include #include "spkdialog.h" +#include -SpkDialog::SpkDialog(QWidget *parent) : - SpkWindow(parent, Qt::Dialog) +SpkDialog::SpkDialog(QWidget *parent) : SpkWindow(parent, Qt::Dialog) { mDialogWidget = new QWidget; mMainVLay = new QVBoxLayout(mDialogWidget); @@ -30,7 +29,7 @@ SpkDialog::~SpkDialog() auto itp = mParentsList.begin(); for(auto itw = mWidgetsList.begin(); itw != mWidgetsList.end(); itw++) { - (*itw)->setParent(*(itp++)); // We shall never take the ownership of these widgets + (*itw)->setParent(*(itp++));// We shall never take the ownership of these widgets } delete mDialogWidget; } @@ -103,3 +102,8 @@ void SpkDialog::ForceClose() disconnect(this, &SpkDialog::CloseWindow, this, &QMainWindow::close); emit ExitEventLoop(-1); } + +void SpkDialog::SetMargin(int left, int top, int right, int bottom) +{ + mWidgetsVLay->setContentsMargins(left, top, right, bottom); +} diff --git a/gui/spkmainwindow.cpp b/gui/spkmainwindow.cpp index fac9518..f112dc0 100644 --- a/gui/spkmainwindow.cpp +++ b/gui/spkmainwindow.cpp @@ -170,7 +170,7 @@ SpkUi::SpkMainWidget::SpkMainWidget(QWidget *parent) : QFrame(parent) HorizontalDivide->addLayout(VLayMain); // Initialize pages - PageQssTest = new SpkUi::SpkPageQssTest(this); + PageQssTest = new SpkUi::SpkPageUiTest(this); Pager->addWidget(PageQssTest); setLayout(HorizontalDivide); diff --git a/gui/spkpageqsstest.cpp b/gui/spkpageuitest.cpp similarity index 86% rename from gui/spkpageqsstest.cpp rename to gui/spkpageuitest.cpp index 264ed38..ac634b9 100644 --- a/gui/spkpageqsstest.cpp +++ b/gui/spkpageuitest.cpp @@ -1,10 +1,10 @@ #include -#include "spkpageqsstest.h" +#include "spkpageuitest.h" #include "spkpopup.h" #include "spkui_general.h" -SpkUi::SpkPageQssTest::SpkPageQssTest(QWidget *parent) : QSplitter(parent) +SpkUi::SpkPageUiTest::SpkPageUiTest(QWidget *parent) : QSplitter(parent) { setObjectName("spk_pg_qsstest"); @@ -15,12 +15,12 @@ SpkUi::SpkPageQssTest::SpkPageQssTest(QWidget *parent) : QSplitter(parent) BtnApply = new QPushButton(this); BtnApply->setObjectName("spk_pg_qsstest_btnapply"); BtnApply->setText("Apply"); - connect(BtnApply, &QPushButton::pressed, this, &SpkPageQssTest::SetStylesheet); + connect(BtnApply, &QPushButton::pressed, this, &SpkPageUiTest::SetStylesheet); BtnFetch = new QPushButton(this); BtnFetch->setObjectName("spk_pg_qsstest_btnfetch"); BtnFetch->setText("Fetch Stylesheet"); - connect(BtnFetch, &QPushButton::pressed, this, &SpkPageQssTest::FetchStylesheet); + connect(BtnFetch, &QPushButton::pressed, this, &SpkPageUiTest::FetchStylesheet); HLayInputBtns = new QHBoxLayout; HLayInputBtns->setObjectName("spk_pg_qsstest_hlay_inputbtns"); @@ -49,7 +49,7 @@ SpkUi::SpkPageQssTest::SpkPageQssTest(QWidget *parent) : QSplitter(parent) ShowPopup = new QPushButton(this); ShowPopup->setText("Show Popup"); - connect(ShowPopup, &QPushButton::clicked, this, &SpkPageQssTest::ShowPopupSlot); + connect(ShowPopup, &QPushButton::clicked, this, &SpkPageUiTest::ShowPopupSlot); SlideV = new QSlider(this); SlideV->setObjectName("spk_pg_qsstest_slider_v"); @@ -104,17 +104,17 @@ SpkUi::SpkPageQssTest::SpkPageQssTest(QWidget *parent) : QSplitter(parent) addWidget(WidR); } -void SpkUi::SpkPageQssTest::SetStylesheet() +void SpkUi::SpkPageUiTest::SetStylesheet() { qApp->setStyleSheet(TextStylesheet->toPlainText()); } -void SpkUi::SpkPageQssTest::FetchStylesheet() +void SpkUi::SpkPageUiTest::FetchStylesheet() { TextStylesheet->setPlainText(SpkUi::CurrentStylesheet); } -void SpkUi::SpkPageQssTest::ShowPopupSlot() +void SpkUi::SpkPageUiTest::ShowPopupSlot() { SpkUi::Popup->Show(PopupText->text()); } diff --git a/inc/spkdialog.h b/inc/spkdialog.h index 79e1a9d..c4d0c38 100644 --- a/inc/spkdialog.h +++ b/inc/spkdialog.h @@ -18,6 +18,7 @@ class SpkDialog : public SpkWindow void AddLayout(QLayout*); void AddSpacing(int); void SetMargin(int); + void SetMargin(int, int, int, int); int Exec(); private slots: @@ -28,8 +29,9 @@ class SpkDialog : public SpkWindow void ExitEventLoop(int); void CloseWindow(); - private: + protected: QWidget *mDialogWidget; + private: QVBoxLayout *mMainVLay, *mWidgetsVLay; QHBoxLayout *mBtnLay; QButtonGroup *mBtnGroup; diff --git a/inc/spkmainwindow.h b/inc/spkmainwindow.h index df80de7..5a8ce8a 100644 --- a/inc/spkmainwindow.h +++ b/inc/spkmainwindow.h @@ -11,7 +11,7 @@ #include #include "spksidebartree.h" // In place of #include #include -#include "spkpageqsstest.h" +#include "spkpageuitest.h" class QNetworkReply; @@ -142,7 +142,7 @@ namespace SpkUi QTreeWidgetItem *CategoryParentItem; //Pages - SpkPageQssTest *PageQssTest; + SpkPageUiTest *PageQssTest; }; } diff --git a/inc/spkpageqsstest.h b/inc/spkpageuitest.h similarity index 91% rename from inc/spkpageqsstest.h rename to inc/spkpageuitest.h index b460d14..6621e52 100644 --- a/inc/spkpageqsstest.h +++ b/inc/spkpageuitest.h @@ -16,11 +16,11 @@ namespace SpkUi { - class SpkPageQssTest : public QSplitter + class SpkPageUiTest : public QSplitter { Q_OBJECT public: - SpkPageQssTest(QWidget *parent = nullptr); + SpkPageUiTest(QWidget *parent = nullptr); QWidget *WidL, *WidR; QVBoxLayout *VLayWidgets, *VLayBtn,