From cdd880708d7685e66bf0b6b1f021816e6a382924 Mon Sep 17 00:00:00 2001 From: zcy <290198252@qq.com> Date: Sat, 1 May 2021 01:32:54 +0800 Subject: [PATCH] no message --- Qss.cpp | 30 +++++++++++++++++++++++++++++- Qss.h | 20 ++++++++++++++++++++ process.ui => forms/process.ui | 0 process.cpp | 28 ---------------------------- process.h | 24 ------------------------ qsswraper.pri | 9 ++++----- 6 files changed, 53 insertions(+), 58 deletions(-) rename process.ui => forms/process.ui (100%) delete mode 100644 process.cpp delete mode 100644 process.h diff --git a/Qss.cpp b/Qss.cpp index 47ff4af..2283d49 100644 --- a/Qss.cpp +++ b/Qss.cpp @@ -23,7 +23,7 @@ #include -#define QSSDIALOG_SHADOW_WIDTH 12 //QFrame#dialog,QFrame#messagebox padding +#define QSSDIALOG_SHADOW_WIDTH 12 #define QSSDIALOG_BODER_WIDTH 0 QssTtitleBar::QssTtitleBar(QWidget *parent , @@ -684,6 +684,7 @@ void QssDialog::show() QDialog::show(); m_frame->show(); } + void QssDockWidget::paintEvent(QPaintEvent *){ QStyleOption opt; opt.init(this); @@ -1612,3 +1613,30 @@ void QssToastWidget::paintEvent(QPaintEvent *event) paint.drawRect(0, 0, width(), height()); paint.end(); } + + +QSSProcessBar::QSSProcessBar(QWidget *parent) : + QDialog(parent), + ui(new Ui::Process) +{ + ui->setupUi(this); + ui->progressBar->setValue(1); + + setWindowFlags(Qt::FramelessWindowHint); + this->setModal(true); +} + +QSSProcessBar::~QSSProcessBar() +{ + delete ui; +} + +void QSSProcessBar::on_percent(int percent) +{ + ui->progressBar->setValue(percent); +} + +void QSSProcessBar::on_done_close() +{ + this->close(); +} diff --git a/Qss.h b/Qss.h index f7df1d2..3e282ca 100644 --- a/Qss.h +++ b/Qss.h @@ -13,6 +13,8 @@ #include #include "ui_qsstoast.h" +#include "ui_process.h" + #ifdef __MINGW32__ #include "windows.h" #include "winuser.h" @@ -433,6 +435,24 @@ protected: private: Ui::Toast ui; }; + + + +class QSSProcessBar : public QDialog +{ + Q_OBJECT + +public: + explicit QSSProcessBar(QWidget *parent = nullptr); + ~QSSProcessBar(); +public slots: + void on_percent(int); + void on_done_close(); +private: + Ui::Process *ui; +}; + + #define tipBox(text) QssMessageBox::tips(text) #define warnBox(text) QssMessageBox::warn(text) #define errBox(text) QssMessageBox::error(text) diff --git a/process.ui b/forms/process.ui similarity index 100% rename from process.ui rename to forms/process.ui diff --git a/process.cpp b/process.cpp deleted file mode 100644 index 536b0c6..0000000 --- a/process.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include "process.h" -#include "ui_process.h" - -Process::Process(QWidget *parent) : - QDialog(parent), - ui(new Ui::Process) -{ - ui->setupUi(this); - ui->progressBar->setValue(1); - - setWindowFlags(Qt::FramelessWindowHint); - this->setModal(true); -} - -Process::~Process() -{ - delete ui; -} - -void Process::on_percent(int percent) -{ - ui->progressBar->setValue(percent); -} - -void Process::on_done_close() -{ - this->close(); -} diff --git a/process.h b/process.h deleted file mode 100644 index 8e822f4..0000000 --- a/process.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef PROCESS_H -#define PROCESS_H - -#include "Qss.h" - -namespace Ui { -class Process; -} - -class Process : public QDialog -{ - Q_OBJECT - -public: - explicit Process(QWidget *parent = nullptr); - ~Process(); -public slots: - void on_percent(int); - void on_done_close(); -private: - Ui::Process *ui; -}; - -#endif // PROCESS_H diff --git a/qsswraper.pri b/qsswraper.pri index 64b4e0e..6131296 100644 --- a/qsswraper.pri +++ b/qsswraper.pri @@ -1,12 +1,11 @@ INCLUDEPATH += $$PWD DEPENDPATH += $$PWD -HEADERS += $$PWD/Qss.h \ - $$PWD/process.h -SOURCES += $$PWD/Qss.cpp \ - $$PWD/process.cpp +HEADERS += $$PWD/Qss.h +SOURCES += $$PWD/Qss.cpp RESOURCES += $$PWD/qss.qrc FORMS += $$PWD/forms/qsstoast.ui \ - $$PWD/process.ui + $$PWD/forms/process.ui +