From fd8bc21674fa82f23ee10bfdc57d08214c1401e7 Mon Sep 17 00:00:00 2001 From: tianduanrui <2407223896@qq.com> Date: Thu, 16 Nov 2017 22:09:17 +0800 Subject: [PATCH] move some QQT to QQt, delete some ui, add some svgwidgets --- QQt.pro | 3 + examples/svgtest/main.cpp | 11 +++ examples/svgtest/mainwindow.cpp | 24 ++++++ examples/svgtest/mainwindow.h | 22 ++++++ examples/svgtest/mainwindow.ui | 110 ++++++++++++++++++++++++++++ examples/svgtest/svgtest.pro | 80 ++++++++++++++++++++ src/frame/qqtinput.ui | 24 +++--- src/frame/qqtmsgbox.ui | 6 +- src/frame/qqtpassworddialog.ui | 4 +- src/frame/qqtprogressdialog.ui | 4 +- src/qqt_header.pri | 7 +- src/qqt_source.pri | 19 ++--- src/svgwidgets/qqtsvgpushbutton.cpp | 30 ++++++++ src/svgwidgets/qqtsvgpushbutton.h | 34 +++++++++ src/svgwidgets/qqtsvgwidget.cpp | 16 ++++ src/svgwidgets/qqtsvgwidget.h | 19 +++++ src/widgets/qqtcheckbox.cpp | 18 ++--- src/widgets/qqtcheckbox.h | 18 ++--- src/widgets/qqtcheckbox.ui | 19 ----- src/widgets/qqtlistview.cpp | 10 +-- src/widgets/qqtlistview.h | 11 +-- src/widgets/qqtlistview.ui | 21 ------ src/widgets/qqtmptablewidget.cpp | 12 +-- src/widgets/qqtmptablewidget.h | 2 +- src/widgets/qqtpushbutton.cpp | 29 ++++---- src/widgets/qqtpushbutton.h | 40 +++++----- src/widgets/qqtpushbutton.ui | 19 ----- src/widgets/qqtradiobutton.cpp | 18 ++--- src/widgets/qqtradiobutton.h | 17 ++--- src/widgets/qqtradiobutton.ui | 21 ------ src/widgets/qqttableview.cpp | 17 ++--- src/widgets/qqttableview.h | 13 +--- src/widgets/qqttableview.ui | 16 ---- src/widgets/qqttablewidget.cpp | 38 +++++----- src/widgets/qqttablewidget.h | 11 +-- src/widgets/qqttablewidget.ui | 19 ----- src/widgets/qqttreeview.cpp | 17 ++--- src/widgets/qqttreeview.h | 15 ++-- src/widgets/qqttreeview.ui | 21 ------ src/widgets/qqttreewidget.cpp | 9 +-- src/widgets/qqttreewidget.h | 11 +-- src/widgets/qqttreewidget.ui | 21 ------ src/widgets/qqtwidget.cpp | 6 +- src/widgets/qqtwidget.h | 12 +-- src/widgets/qqtwidget.ui | 19 ----- src/widgets/qqtwidgets.h | 8 +- 46 files changed, 508 insertions(+), 413 deletions(-) create mode 100644 examples/svgtest/main.cpp create mode 100644 examples/svgtest/mainwindow.cpp create mode 100644 examples/svgtest/mainwindow.h create mode 100644 examples/svgtest/mainwindow.ui create mode 100644 examples/svgtest/svgtest.pro create mode 100644 src/svgwidgets/qqtsvgpushbutton.cpp create mode 100644 src/svgwidgets/qqtsvgpushbutton.h create mode 100644 src/svgwidgets/qqtsvgwidget.cpp create mode 100644 src/svgwidgets/qqtsvgwidget.h delete mode 100644 src/widgets/qqtcheckbox.ui delete mode 100644 src/widgets/qqtlistview.ui delete mode 100644 src/widgets/qqtpushbutton.ui delete mode 100644 src/widgets/qqtradiobutton.ui delete mode 100644 src/widgets/qqttableview.ui delete mode 100644 src/widgets/qqttablewidget.ui delete mode 100644 src/widgets/qqttreeview.ui delete mode 100644 src/widgets/qqttreewidget.ui delete mode 100644 src/widgets/qqtwidget.ui diff --git a/QQt.pro b/QQt.pro index f8e509d2..d248b215 100644 --- a/QQt.pro +++ b/QQt.pro @@ -20,7 +20,10 @@ SUBDIRS = src/qqt.pro #SUBDIRS += examples/exquisite #can't support ios #SUBDIRS += examples/qqtprintsupportexample +# SUBDIRS += examples/tabwidgetexamples +# +SUBDIRS += examples/svgtest #----------------------------------------------------------------- #need vlcQt libvlc library diff --git a/examples/svgtest/main.cpp b/examples/svgtest/main.cpp new file mode 100644 index 00000000..b48f94ec --- /dev/null +++ b/examples/svgtest/main.cpp @@ -0,0 +1,11 @@ +#include "mainwindow.h" +#include + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + MainWindow w; + w.show(); + + return a.exec(); +} diff --git a/examples/svgtest/mainwindow.cpp b/examples/svgtest/mainwindow.cpp new file mode 100644 index 00000000..58bcc08f --- /dev/null +++ b/examples/svgtest/mainwindow.cpp @@ -0,0 +1,24 @@ +#include "mainwindow.h" +#include "ui_mainwindow.h" + +#include "qqtsvgwidget.h" +#include "qqtsvgpushbutton.h" + +MainWindow::MainWindow(QWidget* parent) : + QMainWindow(parent), + ui(new Ui::MainWindow) +{ + ui->setupUi(this); + QString svg = QString("/Users/abel/Pictures/jia.svg"); + ui->w->setSvgFile(svg); + + ui->b0->iconTable()[BTN_NORMAL] = "/Users/abel/Develop/d1-product/App/skin/default/bt_stir.svg"; + ui->b0->iconTable()[BTN_HOVER] = "/Users/abel/Develop/d1-product/App/skin/default/bt_stir.svg"; + ui->b0->iconTable()[BTN_PRESS] = "/Users/abel/Develop/d1-product/App/skin/default/bt_stir_press.svg"; + ui->b0->renderToVariable(); +} + +MainWindow::~MainWindow() +{ + delete ui; +} diff --git a/examples/svgtest/mainwindow.h b/examples/svgtest/mainwindow.h new file mode 100644 index 00000000..a3948a91 --- /dev/null +++ b/examples/svgtest/mainwindow.h @@ -0,0 +1,22 @@ +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include + +namespace Ui { +class MainWindow; +} + +class MainWindow : public QMainWindow +{ + Q_OBJECT + +public: + explicit MainWindow(QWidget *parent = 0); + ~MainWindow(); + +private: + Ui::MainWindow *ui; +}; + +#endif // MAINWINDOW_H diff --git a/examples/svgtest/mainwindow.ui b/examples/svgtest/mainwindow.ui new file mode 100644 index 00000000..99194d25 --- /dev/null +++ b/examples/svgtest/mainwindow.ui @@ -0,0 +1,110 @@ + + + MainWindow + + + + 0 + 0 + 800 + 480 + + + + MainWindow + + + + + + + 1 + + + + + 0 + 0 + 782 + 282 + + + + Page 1 + + + + + + + + + + + 0 + 0 + 782 + 282 + + + + Page 2 + + + + + + + 0 + 0 + + + + PushButton + + + + + + + + Page 3 + + + + + Page 4 + + + + + Page 5 + + + + + Page 6 + + + + + + + + + + + QQtSvgWidget + QWidget +
qqtsvgwidget.h
+ 1 + + + QQtSvgPushButton + QPushButton +
qqtsvgpushbutton.h
+ + + + + diff --git a/examples/svgtest/svgtest.pro b/examples/svgtest/svgtest.pro new file mode 100644 index 00000000..27a19f64 --- /dev/null +++ b/examples/svgtest/svgtest.pro @@ -0,0 +1,80 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2017-11-16T19:08:13 +# +#------------------------------------------------- + +QT += core gui + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +TARGET = svgtest +TEMPLATE = app + +# The following define makes your compiler emit warnings if you use +# any feature of Qt which has been marked as deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if you use deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + + +SOURCES += \ + main.cpp \ + mainwindow.cpp + +HEADERS += \ + mainwindow.h + +FORMS += \ + mainwindow.ui + +CONFIG += mobility +MOBILITY = + + +#------------------------------------------------- +#link qqt library +#if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#------------------------------------------------- +include(../qqtframe2/link_qqt_library.pri) + +#------------------------------------------------- +#install +#------------------------------------------------- +#CONFIG += can_install +can_install:equals(QKIT_PRIVATE, EMBEDDED) { + target.path = /Application + INSTALLS += target +} else: unix { + equals(QKIT_PRIVATE, macOS) { + target.path = /Applications + INSTALLS += target + } +} + +#------------------------------------------------- +##project environ +#------------------------------------------------- +#default +message ($${TARGET} config $${CONFIG}) +message ($${TARGET} define $${DEFINES}) + +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml \ + android/gradle/wrapper/gradle-wrapper.jar \ + android/gradlew \ + android/res/values/libs.xml \ + android/build.gradle \ + android/gradle/wrapper/gradle-wrapper.properties \ + android/gradlew.bat + + ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android +} diff --git a/src/frame/qqtinput.ui b/src/frame/qqtinput.ui index e6fdd32a..5aa85a25 100644 --- a/src/frame/qqtinput.ui +++ b/src/frame/qqtinput.ui @@ -472,7 +472,7 @@ 2 - + @@ -1033,7 +1033,7 @@ - + 0 @@ -1265,7 +1265,7 @@ - + 0 @@ -1779,28 +1779,28 @@ 2 - + 中文 - + 英文 - + 123 - + 0 @@ -1816,7 +1816,7 @@ - + 0 @@ -1832,7 +1832,7 @@ - + 0 @@ -1857,17 +1857,17 @@ - QQTPushButton + QQtPushButton QPushButton
qqtpushbutton.h
 - QQTRadioButton + QQtRadioButton QRadioButton
qqtradiobutton.h
 - QQTCheckBox + QQtCheckBox QCheckBox
qqtcheckbox.h
 diff --git a/src/frame/qqtmsgbox.ui b/src/frame/qqtmsgbox.ui index 8ac45703..cdffece0 100644 --- a/src/frame/qqtmsgbox.ui +++ b/src/frame/qqtmsgbox.ui @@ -29,7 +29,7 @@ - + 80 @@ -42,7 +42,7 @@ Yes - + 240 @@ -61,7 +61,7 @@ - QQTPushButton + QQtPushButton QPushButton
qqtpushbutton.h
 diff --git a/src/frame/qqtpassworddialog.ui b/src/frame/qqtpassworddialog.ui index 7e02ef4a..39914cea 100644 --- a/src/frame/qqtpassworddialog.ui +++ b/src/frame/qqtpassworddialog.ui @@ -36,7 +36,7 @@ - + 270 @@ -78,7 +78,7 @@ - QQTPushButton + QQtPushButton QPushButton
qqtpushbutton.h
 diff --git a/src/frame/qqtprogressdialog.ui b/src/frame/qqtprogressdialog.ui index eb655a4f..3e2f20e8 100644 --- a/src/frame/qqtprogressdialog.ui +++ b/src/frame/qqtprogressdialog.ui @@ -13,7 +13,7 @@ Dialog - + 220 @@ -52,7 +52,7 @@ - QQTPushButton + QQtPushButton QPushButton
qqtpushbutton.h
 diff --git a/src/qqt_header.pri b/src/qqt_header.pri index fb9ce07a..0b5e1f0f 100644 --- a/src/qqt_header.pri +++ b/src/qqt_header.pri @@ -167,7 +167,11 @@ contains (DEFINES, __PRINTSUPPORT__) { DEFINES += __EXQUISITE__ #if you use QR encode, open this annotation DEFINES += __QRENCODE__ - +#if you use Svg widgets, open this annotation +DEFINES += __SVGWIDGETS__ +contains (DEFINES, __SVGWIDGETS__) { + QT += svg +} ##################WebSocket Module############################### #if you use QtSoap, open this annotation DEFINES += __QTSOAP__ @@ -239,3 +243,4 @@ INCLUDEPATH += $$PWD/exquisite # c support INCLUDEPATH += $$PWD/qrencode INCLUDEPATH += $$PWD/soap +INCLUDEPATH += $$PWD/svgwidgets diff --git a/src/qqt_source.pri b/src/qqt_source.pri index 0bbe5001..7312d3a2 100644 --- a/src/qqt_source.pri +++ b/src/qqt_source.pri @@ -12,8 +12,12 @@ #if you succeed with LibQQt, please thumb up. #2017年11月10日18:53:56 #------------------------------------------------- -SOURCES += -HEADERS += +SOURCES += \ + $$PWD/svgwidgets/qqtsvgwidget.cpp \ + $$PWD/svgwidgets/qqtsvgpushbutton.cpp +HEADERS += \ + $$PWD/svgwidgets/qqtsvgwidget.h \ + $$PWD/svgwidgets/qqtsvgpushbutton.h #root dir HEADERS += $$PWD/qqt.h \ @@ -111,17 +115,8 @@ HEADERS += \ $$PWD/widgets/qqtapplication.h \ $$PWD/widgets/qqtlabel.h FORMS += \ - $$PWD/widgets/qqtcheckbox.ui \ - $$PWD/widgets/qqtlistview.ui \ $$PWD/widgets/qqtprogressbar.ui \ - $$PWD/widgets/qqtpushbutton.ui \ - $$PWD/widgets/qqtradiobutton.ui \ - $$PWD/widgets/qqttableview.ui \ - $$PWD/widgets/qqttreeview.ui \ - $$PWD/widgets/qqtwidget.ui \ - $$PWD/widgets/qqttablewidget.ui \ - $$PWD/widgets/qqtmptablewidget.ui \ - $$PWD/widgets/qqttreewidget.ui + $$PWD/widgets/qqtmptablewidget.ui diff --git a/src/svgwidgets/qqtsvgpushbutton.cpp b/src/svgwidgets/qqtsvgpushbutton.cpp new file mode 100644 index 00000000..cb6f6624 --- /dev/null +++ b/src/svgwidgets/qqtsvgpushbutton.cpp @@ -0,0 +1,30 @@ +#include "qqtsvgpushbutton.h" +#include + +QQtSvgPushButton::QQtSvgPushButton(QWidget* parent) : QQtPushButton(parent) +{ + +} + +void QQtSvgPushButton::renderToVariable() +{ + TBtnIconTable& pic = iconTable(); + for (int i = 0; i < BTN_MAX; i++) + r[i].load(pic[i]); +} + + + +void QQtSvgPushButton::paintEvent(QPaintEvent* event) +{ + Q_UNUSED(event) + + QStylePainter p(this); + EBtnStatus bs = btnStatus(); + r[bs].render(&p); + + bool enabled = isEnabled(); + QStyleOptionButton opt; + initStyleOption(&opt); + p.drawItemText(rect(), Qt::AlignCenter, opt.palette, enabled, text()); +} diff --git a/src/svgwidgets/qqtsvgpushbutton.h b/src/svgwidgets/qqtsvgpushbutton.h new file mode 100644 index 00000000..abf2d72f --- /dev/null +++ b/src/svgwidgets/qqtsvgpushbutton.h @@ -0,0 +1,34 @@ +#ifndef QQTSVGPUSHBUTTON_H +#define QQTSVGPUSHBUTTON_H + +#include +#include +#include + +class QQtSvgPushButton : public QQtPushButton +{ + Q_OBJECT +public: + explicit QQtSvgPushButton(QWidget* parent = nullptr); + virtual ~QQtSvgPushButton() {} + + /** + * @brief renderToVariable + * call this function after iconTable() set. + */ + void renderToVariable(); + +signals: + +public slots: + + // QWidget interface +protected: + virtual void paintEvent(QPaintEvent* event) override; + +private: + QSvgRenderer r[BTN_MAX]; + +}; + +#endif // QQTSVGPUSHBUTTON_H diff --git a/src/svgwidgets/qqtsvgwidget.cpp b/src/svgwidgets/qqtsvgwidget.cpp new file mode 100644 index 00000000..094c82ff --- /dev/null +++ b/src/svgwidgets/qqtsvgwidget.cpp @@ -0,0 +1,16 @@ +#include "qqtsvgwidget.h" + +QQtSvgWidget::QQtSvgWidget(QWidget* parent) : QSvgWidget(parent) +{ + +} + +void QQtSvgWidget::setSvgFile(QString& filename) +{ + return load(filename); +} + +void QQtSvgWidget::setSvgContent(QByteArray& bytes) +{ + return load(bytes); +} diff --git a/src/svgwidgets/qqtsvgwidget.h b/src/svgwidgets/qqtsvgwidget.h new file mode 100644 index 00000000..22cd7f62 --- /dev/null +++ b/src/svgwidgets/qqtsvgwidget.h @@ -0,0 +1,19 @@ +#ifndef QQTSVGWIDGET_H +#define QQTSVGWIDGET_H + +#include + +class QQtSvgWidget : public QSvgWidget +{ + Q_OBJECT +public: + explicit QQtSvgWidget(QWidget* parent = nullptr); + + void setSvgFile(QString& filename); + void setSvgContent(QByteArray& bytes); +signals: + +public slots: +}; + +#endif // QQTSVGWIDGET_H diff --git a/src/widgets/qqtcheckbox.cpp b/src/widgets/qqtcheckbox.cpp index 8bfcd92a..95db01f1 100644 --- a/src/widgets/qqtcheckbox.cpp +++ b/src/widgets/qqtcheckbox.cpp @@ -1,34 +1,30 @@ #include "qqtcheckbox.h" -#include "ui_qqtcheckbox.h" #include #include "qqtwidgets.h" -QQTCheckBox::QQTCheckBox(QWidget* parent) : - QCheckBox(parent), - ui(new Ui::QQTCheckBox) +QQtCheckBox::QQtCheckBox(QWidget* parent) : + QCheckBox(parent) { - ui->setupUi(this); } -QQTCheckBox::~QQTCheckBox() +QQtCheckBox::~QQtCheckBox() { - delete ui; } -void QQTCheckBox::pixMap(QImage& icon, QImage& iconSel) +void QQtCheckBox::pixMap(QImage& icon, QImage& iconSel) { icon = QImage(this->m_icon[BTN_NORMAL]); iconSel = QImage(this->m_icon[BTN_PRESS]); } -void QQTCheckBox::setPixmap(const QString& icon, const QString& iconSel) +void QQtCheckBox::setPixmap(const QString& icon, const QString& iconSel) { this->m_icon[BTN_NORMAL] = icon; this->m_icon[BTN_PRESS] = iconSel; } -void QQTCheckBox::paintEvent(QPaintEvent*) +void QQtCheckBox::paintEvent(QPaintEvent*) { QStylePainter p(this); @@ -43,7 +39,7 @@ void QQTCheckBox::paintEvent(QPaintEvent*) p.drawItemText(rect(), Qt::AlignCenter, opt.palette, true, text()); } -bool QQTCheckBox::hitButton(const QPoint& pos) const +bool QQtCheckBox::hitButton(const QPoint& pos) const { Q_UNUSED(pos) //TODO: diff --git a/src/widgets/qqtcheckbox.h b/src/widgets/qqtcheckbox.h index 7e130658..9d4b4409 100644 --- a/src/widgets/qqtcheckbox.h +++ b/src/widgets/qqtcheckbox.h @@ -6,34 +6,30 @@ #include "qqtwidgets.h" #include "qqt-local.h" -namespace Ui { -class QQTCheckBox; -} /** - * @brief The QQTCheckBox class + * @brief The QQtCheckBox class * 为了图片占据全部全部控件而编写。 */ -class QQTSHARED_EXPORT QQTCheckBox : public QCheckBox +class QQTSHARED_EXPORT QQtCheckBox : public QCheckBox { Q_OBJECT public: - explicit QQTCheckBox(QWidget *parent = 0); - ~QQTCheckBox(); + explicit QQtCheckBox(QWidget* parent = 0); + virtual ~QQtCheckBox(); void pixMap(QImage& m_icon, QImage& m_iconSel); - void setPixmap(const QString& m_icon = QString(), const QString &m_iconSel = QString()); + void setPixmap(const QString& m_icon = QString(), const QString& m_iconSel = QString()); private: - Ui::QQTCheckBox *ui; TBtnIconTable m_icon; // QWidget interface protected: - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent*); // QAbstractButton interface protected: - bool hitButton(const QPoint &pos) const; + bool hitButton(const QPoint& pos) const; }; #endif // QQTCHECKBOX_H diff --git a/src/widgets/qqtcheckbox.ui b/src/widgets/qqtcheckbox.ui deleted file mode 100644 index e8bd840a..00000000 --- a/src/widgets/qqtcheckbox.ui +++ /dev/null @@ -1,19 +0,0 @@ - - - QQTCheckBox - - - - 0 - 0 - 149 - 43 - - - - Form - - - - - diff --git a/src/widgets/qqtlistview.cpp b/src/widgets/qqtlistview.cpp index 5a16e8a8..dbd61577 100644 --- a/src/widgets/qqtlistview.cpp +++ b/src/widgets/qqtlistview.cpp @@ -1,14 +1,10 @@ #include "qqtlistview.h" -#include "ui_qqtlistview.h" -QQTListView::QQTListView(QWidget *parent) : - QListView(parent), - ui(new Ui::QQTListView) +QQtListView::QQtListView(QWidget* parent) : + QListView(parent) { - ui->setupUi(this); } -QQTListView::~QQTListView() +QQtListView::~QQtListView() { - delete ui; } diff --git a/src/widgets/qqtlistview.h b/src/widgets/qqtlistview.h index 530c05c4..9dde75c5 100644 --- a/src/widgets/qqtlistview.h +++ b/src/widgets/qqtlistview.h @@ -4,20 +4,15 @@ #include #include -namespace Ui { -class QQTListView; -} - -class QQTSHARED_EXPORT QQTListView : public QListView +class QQTSHARED_EXPORT QQtListView : public QListView { Q_OBJECT public: - explicit QQTListView(QWidget *parent = 0); - ~QQTListView(); + explicit QQtListView(QWidget* parent = 0); + virtual ~QQtListView(); private: - Ui::QQTListView *ui; }; #endif // QQTLISTVIEW_H diff --git a/src/widgets/qqtlistview.ui b/src/widgets/qqtlistview.ui deleted file mode 100644 index 1d3cc884..00000000 --- a/src/widgets/qqtlistview.ui +++ /dev/null @@ -1,21 +0,0 @@ - - - - - QQTListView - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - diff --git a/src/widgets/qqtmptablewidget.cpp b/src/widgets/qqtmptablewidget.cpp index 8048a964..143ff39f 100644 --- a/src/widgets/qqtmptablewidget.cpp +++ b/src/widgets/qqtmptablewidget.cpp @@ -99,7 +99,7 @@ void QQTMPTableWidget::query(QString filter) for(int i = 0; i < pix; i++) { //ptime();//89ms - QQTTableWidget* page = new QQTTableWidget(this); + QQtTableWidget* page = new QQtTableWidget(this); //ptime();//2ms page->setDB(m_name); //ptime();//8ms @@ -140,7 +140,7 @@ void QQTMPTableWidget::query(QString filter) for(int i = 0; i < m_pageNum; i++) { - QQTTableWidget* page = (QQTTableWidget*)(ui->stWidgetPage->widget(i)); + QQtTableWidget* page = (QQtTableWidget*)(ui->stWidgetPage->widget(i)); page->query(QString("%1 limit %2 offset %3") .arg(filter) .arg(m_numPerPage) @@ -251,7 +251,7 @@ void QQTMPTableWidget::selectedRows(int column, QVector &strl) { for(int i = 0; i < m_pageNum; i++) { - QQTTableWidget* page = (QQTTableWidget*)ui->stWidgetPage->widget(i); + QQtTableWidget* page = (QQtTableWidget*)ui->stWidgetPage->widget(i); QMap ids; page->selectedRows(column, ids); QMapIterator itor(ids); @@ -263,7 +263,7 @@ void QQTMPTableWidget::selectedRows(int column, QVector &strl) return; } -QQTTableWidget* QQTMPTableWidget::selectedRows(int column) +QQtTableWidget* QQTMPTableWidget::selectedRows(int column) { QString sectionName; QSqlQuery query(m_db); @@ -275,7 +275,7 @@ QQTTableWidget* QQTMPTableWidget::selectedRows(int column) QVector lid; selectedRows(column, lid); - static QQTTableWidget* page = new QQTTableWidget(this); + static QQtTableWidget* page = new QQtTableWidget(this); page->setDB(m_name); page->setTable(m_table); @@ -316,7 +316,7 @@ void QQTMPTableWidget::removeSelectedRows(int column) { for(int i = 0; i < m_pageNum; i++) { - QQTTableWidget* page = (QQTTableWidget*)ui->stWidgetPage->widget(i); + QQtTableWidget* page = (QQtTableWidget*)ui->stWidgetPage->widget(i); QMap ids; page->selectedRows(column, ids); page->removeRows(column, ids.values()); diff --git a/src/widgets/qqtmptablewidget.h b/src/widgets/qqtmptablewidget.h index 550b4349..c38f9bdf 100644 --- a/src/widgets/qqtmptablewidget.h +++ b/src/widgets/qqtmptablewidget.h @@ -39,7 +39,7 @@ public: void setColumnWidth(int column, int width); void query(QString filter = "1=1"); void selectedRows(int column, QVector & strl); - QQTTableWidget* selectedRows(int column = 0); + QQtTableWidget* selectedRows(int column = 0); int pageNum(); int currentPage(); void setCurrentPage(int page); diff --git a/src/widgets/qqtpushbutton.cpp b/src/widgets/qqtpushbutton.cpp index b4b9788b..aeabda98 100644 --- a/src/widgets/qqtpushbutton.cpp +++ b/src/widgets/qqtpushbutton.cpp @@ -1,24 +1,20 @@ #include "qqtpushbutton.h" -#include "ui_qqtpushbutton.h" #include #include #include "qqtcore.h" -#include "qqtwidgets.h" -QQTPushButton::QQTPushButton(QWidget* parent) : - QPushButton(parent), - ui(new Ui::QQTPushButton) +QQtPushButton::QQtPushButton(QWidget* parent) : + QPushButton(parent) { - ui->setupUi(this); state = BTN_NORMAL; + ring = false; } -QQTPushButton::~QQTPushButton() +QQtPushButton::~QQtPushButton() { - delete ui; } -void QQTPushButton::paintEvent(QPaintEvent* e) +void QQtPushButton::paintEvent(QPaintEvent* e) { Q_UNUSED(e) QStylePainter p(this); @@ -50,18 +46,19 @@ void QQTPushButton::paintEvent(QPaintEvent* e) p.drawItemText(rect(), Qt::AlignCenter, opt.palette, enabled, text()); } -void QQTPushButton::mousePressEvent(QMouseEvent* e) +void QQtPushButton::mousePressEvent(QMouseEvent* e) { if (e->button() == Qt::LeftButton) { state = BTN_PRESS; - QApplication::beep(); + if (ring) + QApplication::beep(); //pline() << state; } QPushButton::mousePressEvent(e); } -void QQTPushButton::mouseReleaseEvent(QMouseEvent* e) +void QQtPushButton::mouseReleaseEvent(QMouseEvent* e) { if (e->button() == Qt::LeftButton) { @@ -79,24 +76,24 @@ void QQTPushButton::mouseReleaseEvent(QMouseEvent* e) QPushButton::mouseReleaseEvent(e); } -void QQTPushButton::enterEvent(QEvent* e) +void QQtPushButton::enterEvent(QEvent* e) { state = BTN_HOVER; QPushButton::enterEvent(e); } -void QQTPushButton::leaveEvent(QEvent* e) +void QQtPushButton::leaveEvent(QEvent* e) { state = BTN_NORMAL; QPushButton::leaveEvent(e); } -void QQTPushButton::changeEvent(QEvent* e) +void QQtPushButton::changeEvent(QEvent* e) { QPushButton::changeEvent(e); } -void QQTPushButton::enabledChange(bool enabled) +void QQtPushButton::enabledChange(bool enabled) { state = isEnabled() ? BTN_NORMAL : BTN_DISABLE; #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) diff --git a/src/widgets/qqtpushbutton.h b/src/widgets/qqtpushbutton.h index 4fdc947e..a50de9b4 100644 --- a/src/widgets/qqtpushbutton.h +++ b/src/widgets/qqtpushbutton.h @@ -1,47 +1,45 @@ -#ifndef QQTPushButton_H -#define QQTPushButton_H +#ifndef QQTPUSHBUTTON_H +#define QQTPUSHBUTTON_H #include #include "qqtwidgets.h" #include +#include "qqtwidgets.h" -namespace Ui { -class QQTPushButton; -} - -class QQTSHARED_EXPORT QQTPushButton : public QPushButton +class QQTSHARED_EXPORT QQtPushButton : public QPushButton { Q_OBJECT public: - explicit QQTPushButton(QWidget *parent = 0); - ~QQTPushButton(); + explicit QQtPushButton(QWidget* parent = 0); + ~QQtPushButton(); /* - * QQTPushButton [] = 不能正常运算 所以采用这种形式。 + * QQtPushButton [] = 不能正常运算 所以采用这种形式。 */ - TBtnIconTable& iconTable() { return m_pixmap; } - + inline TBtnIconTable& iconTable() { return m_pixmap; } + inline EBtnStatus btnStatus() const { return state; } + inline void setRing(bool op = false) { ring = op; } private: - Ui::QQTPushButton *ui; - int state; + EBtnStatus state; TBtnIconTable m_pixmap; + bool ring; // QWidget interface protected: - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent*); // QWidget interface protected: - void mousePressEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void enterEvent(QEvent *); - void leaveEvent(QEvent *); - void changeEvent(QEvent *e); + void mousePressEvent(QMouseEvent*); + void mouseReleaseEvent(QMouseEvent*); + void enterEvent(QEvent*); + void leaveEvent(QEvent*); + void changeEvent(QEvent* e); // QWidget interface protected: void enabledChange(bool); }; -#endif // QQTPushButton_H +#endif // QQTPUSHBUTTON_H diff --git a/src/widgets/qqtpushbutton.ui b/src/widgets/qqtpushbutton.ui deleted file mode 100644 index 50f2e528..00000000 --- a/src/widgets/qqtpushbutton.ui +++ /dev/null @@ -1,19 +0,0 @@ - - - QQTPushButton - - - - 0 - 0 - 58 - 27 - - - - Form - - - - - diff --git a/src/widgets/qqtradiobutton.cpp b/src/widgets/qqtradiobutton.cpp index c34eea42..664ff6a6 100644 --- a/src/widgets/qqtradiobutton.cpp +++ b/src/widgets/qqtradiobutton.cpp @@ -1,32 +1,28 @@ #include "qqtradiobutton.h" -#include "ui_qqtradiobutton.h" #include -QQTRadioButton::QQTRadioButton(QWidget* parent) : - QRadioButton(parent), - ui(new Ui::QQTRadioButton) +QQtRadioButton::QQtRadioButton(QWidget* parent) : + QRadioButton(parent) { - ui->setupUi(this); } -QQTRadioButton::~QQTRadioButton() +QQtRadioButton::~QQtRadioButton() { - delete ui; } -void QQTRadioButton::pixMap(QImage& icon, QImage& iconSel) +void QQtRadioButton::pixMap(QImage& icon, QImage& iconSel) { icon = QImage(this->m_icon[BTN_NORMAL]); iconSel = QImage(this->m_icon[BTN_PRESS]); } -void QQTRadioButton::setPixmap(const QString& icon, const QString& iconSel) +void QQtRadioButton::setPixmap(const QString& icon, const QString& iconSel) { this->m_icon[BTN_NORMAL] = icon; this->m_icon[BTN_PRESS] = iconSel; } -void QQTRadioButton::paintEvent(QPaintEvent*) +void QQtRadioButton::paintEvent(QPaintEvent*) { QStylePainter p(this); QString icon = isChecked() ? m_icon[BTN_PRESS] : m_icon[BTN_NORMAL]; @@ -47,7 +43,7 @@ void QQTRadioButton::paintEvent(QPaintEvent*) } -bool QQTRadioButton::hitButton(const QPoint& pos) const +bool QQtRadioButton::hitButton(const QPoint& pos) const { Q_UNUSED(pos) return true; diff --git a/src/widgets/qqtradiobutton.h b/src/widgets/qqtradiobutton.h index 9f4c0eb4..b593e8c7 100644 --- a/src/widgets/qqtradiobutton.h +++ b/src/widgets/qqtradiobutton.h @@ -6,31 +6,26 @@ #include "qqtwidgets.h" #include "qqt-local.h" -namespace Ui { -class QQTRadioButton; -} - -class QQTSHARED_EXPORT QQTRadioButton : public QRadioButton +class QQTSHARED_EXPORT QQtRadioButton : public QRadioButton { Q_OBJECT public: - explicit QQTRadioButton(QWidget *parent = 0); - ~QQTRadioButton(); + explicit QQtRadioButton(QWidget* parent = 0); + virtual ~QQtRadioButton(); void pixMap(QImage& m_icon, QImage& m_iconSel); - void setPixmap(const QString& m_icon = QString(), const QString &m_iconSel = QString()); + void setPixmap(const QString& m_icon = QString(), const QString& m_iconSel = QString()); private: - Ui::QQTRadioButton *ui; TBtnIconTable m_icon; // QWidget interface protected: - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent*); // QAbstractButton interface protected: - bool hitButton(const QPoint &pos) const; + bool hitButton(const QPoint& pos) const; }; #endif // QQTRADIOBUTTON_H diff --git a/src/widgets/qqtradiobutton.ui b/src/widgets/qqtradiobutton.ui deleted file mode 100644 index 0d8a8ff5..00000000 --- a/src/widgets/qqtradiobutton.ui +++ /dev/null @@ -1,21 +0,0 @@ - - - - - QQTRadioButton - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - diff --git a/src/widgets/qqttableview.cpp b/src/widgets/qqttableview.cpp index bc13b5df..a0e7a7da 100644 --- a/src/widgets/qqttableview.cpp +++ b/src/widgets/qqttableview.cpp @@ -1,15 +1,11 @@ #include "qqttableview.h" -#include "ui_qqttableview.h" #include #include #include -QQTTableView::QQTTableView(QWidget *parent) : - QTableView(parent), - ui(new Ui::QQTTableView) +QQtTableView::QQtTableView(QWidget* parent) : + QTableView(parent) { - ui->setupUi(this); - m_header = new QQTHeaderView(Qt::Horizontal, this); m_vheader = new QQTHeaderView(Qt::Vertical, this); @@ -27,22 +23,21 @@ QQTTableView::QQTTableView(QWidget *parent) : } -QQTTableView::~QQTTableView() +QQtTableView::~QQtTableView() { - delete ui; } -void QQTTableView::setQQTHeader() +void QQtTableView::setQQTHeader() { setHorizontalHeader(m_header); } -void QQTTableView::setQQTVHeader() +void QQtTableView::setQQTVHeader() { setVerticalHeader(m_vheader); } -void QQTTableView::setObjectName(const QString &name) +void QQtTableView::setObjectName(const QString& name) { QTableView::setObjectName(name); horizontalHeader()->setObjectName(QString("%1_Header").arg(name)); diff --git a/src/widgets/qqttableview.h b/src/widgets/qqttableview.h index 1d4d1656..37ceac6d 100644 --- a/src/widgets/qqttableview.h +++ b/src/widgets/qqttableview.h @@ -5,25 +5,20 @@ #include "qqtheaderview.h" #include "qqt-local.h" -namespace Ui { -class QQTTableView; -} - -class QQTSHARED_EXPORT QQTTableView : public QTableView +class QQTSHARED_EXPORT QQtTableView : public QTableView { Q_OBJECT public: - explicit QQTTableView(QWidget *parent = 0); - ~QQTTableView(); + explicit QQtTableView(QWidget* parent = 0); + virtual ~QQtTableView(); QQTHeaderView* QQTHHeader() { return m_header; } QQTHeaderView* QQTVHeader() { return m_vheader; } void setQQTHeader(); void setQQTVHeader(); - void setObjectName(const QString &name); + void setObjectName(const QString& name); private: - Ui::QQTTableView *ui; QQTHeaderView* m_vheader; QQTHeaderView* m_header; diff --git a/src/widgets/qqttableview.ui b/src/widgets/qqttableview.ui deleted file mode 100644 index f87b20a3..00000000 --- a/src/widgets/qqttableview.ui +++ /dev/null @@ -1,16 +0,0 @@ - - - QQTTableView - - - - 0 - 0 - 458 - 211 - - - - - - diff --git a/src/widgets/qqttablewidget.cpp b/src/widgets/qqttablewidget.cpp index 2b10d76c..d189ce05 100644 --- a/src/widgets/qqttablewidget.cpp +++ b/src/widgets/qqttablewidget.cpp @@ -1,15 +1,11 @@ #include "qqttablewidget.h" -#include "ui_qqttablewidget.h" - #include "qqt-qt.h" #include "qqtcore.h" #include "qqtsql.h" -QQTTableWidget::QQTTableWidget(QWidget *parent) : - QQTTableView(parent), - ui(new Ui::QQTTableWidget) +QQtTableWidget::QQtTableWidget(QWidget* parent) : + QQtTableView(parent) { - ui->setupUi(this); m_db = newDatabaseConn(); m_model = new QQTTableModel(this, m_db); setModel(m_model); @@ -19,14 +15,13 @@ QQTTableWidget::QQTTableWidget(QWidget *parent) : setItemDelegate(new QSqlRelationalDelegate(this)); } -QQTTableWidget::~QQTTableWidget() +QQtTableWidget::~QQtTableWidget() { - delete ui; } -void QQTTableWidget::setDB(QString db) +void QQtTableWidget::setDB(QString db) { - if(db.isEmpty()) + if (db.isEmpty()) { //TODO: closeDatabase(m_db); @@ -36,34 +31,34 @@ void QQTTableWidget::setDB(QString db) setDatabaseName(m_db, db); } -void QQTTableWidget::setTable(QString table) +void QQtTableWidget::setTable(QString table) { m_model->setTable(table); } -void QQTTableWidget::query(QString excp) +void QQtTableWidget::query(QString excp) { m_model->query(excp); } -void QQTTableWidget::removeRow(int row) +void QQtTableWidget::removeRow(int row) { m_model->removeRow(row); m_model->submit(); } -void QQTTableWidget::removeRows(int column, QList ids) +void QQtTableWidget::removeRows(int column, QList ids) { int rowCount = m_model->rowCount(); int i = 0; - while(i < rowCount) + while (i < rowCount) { QModelIndex idx = m_model->index(i, column); /* * 经过删除，真实的rowCount后的index无效 */ - if(!idx.isValid()) + if (!idx.isValid()) break; QString modelColValue = m_model->data(idx).toString(); @@ -72,11 +67,11 @@ void QQTTableWidget::removeRows(int column, QList ids) * 在ids中找到列值相等的，针对row进行删除，i不变； */ QListIterator itor(ids); - while(itor.hasNext()) + while (itor.hasNext()) { QString colValue = itor.next().at(column); - if(colValue == modelColValue) + if (colValue == modelColValue) { removeRow(i); i--; break; @@ -86,13 +81,14 @@ void QQTTableWidget::removeRows(int column, QList ids) } } -void QQTTableWidget::selectedRows(int column , QMap &ids) +void QQtTableWidget::selectedRows(int column, QMap& ids) { QModelIndexList l = selectionModel()->selectedRows(column); QModelIndex idx; - foreach (idx, l) { + foreach (idx, l) + { QStringList l; - for(int i = 0; i < m_model->columnCount(); i++) + for (int i = 0; i < m_model->columnCount(); i++) l << m_model->index(idx.row(), i).data().toString(); ids.insert(idx.row(), l); } diff --git a/src/widgets/qqttablewidget.h b/src/widgets/qqttablewidget.h index f7cef39b..9ef7226f 100644 --- a/src/widgets/qqttablewidget.h +++ b/src/widgets/qqttablewidget.h @@ -5,17 +5,13 @@ #include "qqttablemodel.h" #include "qqt-local.h" -namespace Ui { -class QQTTableWidget; -} - -class QQTSHARED_EXPORT QQTTableWidget : public QQTTableView +class QQTSHARED_EXPORT QQtTableWidget : public QQtTableView { Q_OBJECT public: - explicit QQTTableWidget(QWidget *parent = 0); - ~QQTTableWidget(); + explicit QQtTableWidget(QWidget* parent = 0); + virtual ~QQtTableWidget(); void setDB(QString db = ""); void setTable(QString table); @@ -33,7 +29,6 @@ public: void selectedRows(int column, QMap& ids); private: - Ui::QQTTableWidget *ui; QQTTableModel* m_model; QSqlDatabase m_db; }; diff --git a/src/widgets/qqttablewidget.ui b/src/widgets/qqttablewidget.ui deleted file mode 100644 index 430ef4c5..00000000 --- a/src/widgets/qqttablewidget.ui +++ /dev/null @@ -1,19 +0,0 @@ - - - QQTTableWidget - - - - 0 - 0 - 417 - 115 - - - - Form - - - - - diff --git a/src/widgets/qqttreeview.cpp b/src/widgets/qqttreeview.cpp index 1c1b14ea..fd62a24f 100644 --- a/src/widgets/qqttreeview.cpp +++ b/src/widgets/qqttreeview.cpp @@ -1,13 +1,9 @@ #include "qqttreeview.h" -#include "ui_qqttreeview.h" -#include +#include -QQTTreeView::QQTTreeView(QWidget *parent) : - QTreeView(parent), - ui(new Ui::QQTTreeView) +QQtTreeView::QQtTreeView(QWidget* parent) : + QTreeView(parent) { - ui->setupUi(this); - setSelectionMode(QAbstractItemView::SingleSelection); setSelectionBehavior(QAbstractItemView::SelectRows); setEditTriggers(QAbstractItemView::NoEditTriggers); @@ -25,18 +21,17 @@ QQTTreeView::QQTTreeView(QWidget *parent) : #endif } -QQTTreeView::~QQTTreeView() +QQtTreeView::~QQtTreeView() { - delete ui; } -void QQTTreeView::drawRow(QPainter *painter, const QStyleOptionViewItem &options, const QModelIndex &index) const +void QQtTreeView::drawRow(QPainter* painter, const QStyleOptionViewItem& options, const QModelIndex& index) const { return QTreeView::drawRow(painter, options, index); } -void QQTTreeView::drawBranches(QPainter *painter, const QRect &rect, const QModelIndex &index) const +void QQtTreeView::drawBranches(QPainter* painter, const QRect& rect, const QModelIndex& index) const { return QTreeView::drawBranches(painter, rect, index); } diff --git a/src/widgets/qqttreeview.h b/src/widgets/qqttreeview.h index 6d064967..7ec1d2f6 100644 --- a/src/widgets/qqttreeview.h +++ b/src/widgets/qqttreeview.h @@ -4,25 +4,20 @@ #include #include -namespace Ui { -class QQTTreeView; -} - -class QQTSHARED_EXPORT QQTTreeView : public QTreeView +class QQTSHARED_EXPORT QQtTreeView : public QTreeView { Q_OBJECT public: - explicit QQTTreeView(QWidget *parent = 0); - ~QQTTreeView(); + explicit QQtTreeView(QWidget* parent = 0); + virtual ~QQtTreeView(); private: - Ui::QQTTreeView *ui; // QQTTreeView interface protected: - void drawRow(QPainter *painter, const QStyleOptionViewItem &options, const QModelIndex &index) const; - void drawBranches(QPainter *painter, const QRect &rect, const QModelIndex &index) const; + void drawRow(QPainter* painter, const QStyleOptionViewItem& options, const QModelIndex& index) const; + void drawBranches(QPainter* painter, const QRect& rect, const QModelIndex& index) const; }; #endif // QQTTREEVIEW_H diff --git a/src/widgets/qqttreeview.ui b/src/widgets/qqttreeview.ui deleted file mode 100644 index 3b286bb3..00000000 --- a/src/widgets/qqttreeview.ui +++ /dev/null @@ -1,21 +0,0 @@ - - - - - QQTTreeView - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - diff --git a/src/widgets/qqttreewidget.cpp b/src/widgets/qqttreewidget.cpp index 9e072663..a6ec5dc5 100644 --- a/src/widgets/qqttreewidget.cpp +++ b/src/widgets/qqttreewidget.cpp @@ -2,14 +2,11 @@ #include "ui_qqttreewidget.h" #include "qqtxmltreemodel.h" -QQTTreeWidget::QQTTreeWidget(QWidget *parent) : - QQTTreeView(parent), - ui(new Ui::QQTTreeWidget) +QQtTreeWidget::QQtTreeWidget(QWidget* parent) : + QQtTreeView(parent) { - ui->setupUi(this); } -QQTTreeWidget::~QQTTreeWidget() +QQtTreeWidget::~QQtTreeWidget() { - delete ui; } diff --git a/src/widgets/qqttreewidget.h b/src/widgets/qqttreewidget.h index 8a9c4561..d3af1ad2 100644 --- a/src/widgets/qqttreewidget.h +++ b/src/widgets/qqttreewidget.h @@ -5,23 +5,18 @@ #include "qqttreemodel.h" #include "qqt-local.h" -namespace Ui { -class QQTTreeWidget; -} - -class QQTSHARED_EXPORT QQTTreeWidget : public QQTTreeView +class QQTSHARED_EXPORT QQtTreeWidget : public QQtTreeView { Q_OBJECT public: - explicit QQTTreeWidget(QWidget *parent = 0); - ~QQTTreeWidget(); + explicit QQtTreeWidget(QWidget* parent = 0); + virtual ~QQtTreeWidget(); public slots: private: - Ui::QQTTreeWidget *ui; QQTTreeModel* mModel; }; diff --git a/src/widgets/qqttreewidget.ui b/src/widgets/qqttreewidget.ui deleted file mode 100644 index 3f0205c9..00000000 --- a/src/widgets/qqttreewidget.ui +++ /dev/null @@ -1,21 +0,0 @@ - - - - - QQTTreeWidget - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - diff --git a/src/widgets/qqtwidget.cpp b/src/widgets/qqtwidget.cpp index 79fa7b14..3f98e8f1 100644 --- a/src/widgets/qqtwidget.cpp +++ b/src/widgets/qqtwidget.cpp @@ -1,19 +1,15 @@ #include "qqtwidget.h" -#include "ui_qqtwidget.h" #include #include "qqtcore.h" QQtWidget::QQtWidget(QWidget* parent) : - QWidget(parent), - ui(new Ui::QQtWidget) + QWidget(parent) { - ui->setupUi(this); m_style = QQTCENTER; } QQtWidget::~QQtWidget() { - delete ui; } void QQtWidget::setPixmap(QString pic) diff --git a/src/widgets/qqtwidget.h b/src/widgets/qqtwidget.h index e655e745..2b221a33 100644 --- a/src/widgets/qqtwidget.h +++ b/src/widgets/qqtwidget.h @@ -1,21 +1,16 @@ -#ifndef QPICWIDGET_H -#define QPICWIDGET_H +#ifndef QQTWIDGET_H +#define QQTWIDGET_H #include #include -namespace Ui -{ -class QQtWidget; -} - class QQTSHARED_EXPORT QQtWidget : public QWidget { Q_OBJECT public: explicit QQtWidget(QWidget* parent = 0); - ~QQtWidget(); + virtual ~QQtWidget(); enum ImageStyle { @@ -35,7 +30,6 @@ signals: void doubleClick(); private: - Ui::QQtWidget* ui; QString m_pic; quint32 m_style; // QWidget interface diff --git a/src/widgets/qqtwidget.ui b/src/widgets/qqtwidget.ui deleted file mode 100644 index 2f392de6..00000000 --- a/src/widgets/qqtwidget.ui +++ /dev/null @@ -1,19 +0,0 @@ - - - QQtWidget - - - - 0 - 0 - 300 - 27 - - - - Form - - - - - diff --git a/src/widgets/qqtwidgets.h b/src/widgets/qqtwidgets.h index 3862d71c..4f3d48e9 100644 --- a/src/widgets/qqtwidgets.h +++ b/src/widgets/qqtwidgets.h @@ -20,16 +20,16 @@ extern "C" { /* * 自定义组件的公共部分 */ -enum +typedef enum tagEBtnStatus { BTN_NORMAL = 0, BTN_UNCHECK = BTN_NORMAL, BTN_PRESS = 1, BTN_CHECK = BTN_PRESS, - BTN_HOVER, - BTN_DISABLE, + BTN_HOVER = 2, + BTN_DISABLE = 3, BTN_MAX, -}; +} EBtnStatus; #ifdef __cplusplus }