168492376
/
qt-material-widgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor code

This commit is contained in:
Xuan Nguyen 2021-07-02 17:42:28 +07:00
parent 8aea7dfc46
commit c1ab9019d7
31 changed files with 73 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/lib/qtmaterialcheckable.h
View File

@ -2,11 +2,11 @@
#define QTMATERIALCHECKABLE_H #define QTMATERIALCHECKABLE_H
#include <QtWidgets/QAbstractButton> #include <QtWidgets/QAbstractButton>
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialCheckablePrivate; class QtMaterialCheckablePrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialCheckable : public QAbstractButton class QT_MATERIAL_EXPORT QtMaterialCheckable : public QAbstractButton
{ {
Q_OBJECT Q_OBJECT
// Q_PROPERTY(LabelPosition labelPosition READ setLabelPosition WRITE labelPosition) // Q_PROPERTY(LabelPosition labelPosition READ setLabelPosition WRITE labelPosition)

4
components/lib/qtmaterialconst.h
View File

@ -2,9 +2,9 @@
#define QTMATERIALCONST_H #define QTMATERIALCONST_H
#include <QObject> #include <QObject>
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QDESIGNER_WIDGET_EXPORT MaterialConst: public QObject class QT_MATERIAL_EXPORT MaterialConst: public QObject
{ {
Q_OBJECT Q_OBJECT

4
components/lib/qtmaterialoverlaywidget.h
View File

@ -2,9 +2,9 @@
#define QTMATERIALOVERLAYWIDGET_H #define QTMATERIALOVERLAYWIDGET_H
#include <QtWidgets/QWidget> #include <QtWidgets/QWidget>
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QDESIGNER_WIDGET_EXPORT QtMaterialOverlayWidget : public QWidget class QT_MATERIAL_EXPORT QtMaterialOverlayWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT

4
components/lib/qtmaterialripple.h
View File

@ -6,11 +6,11 @@
#include <QPropertyAnimation> #include <QPropertyAnimation>
#include <QPoint> #include <QPoint>
#include <QBrush> #include <QBrush>
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialRippleOverlay; class QtMaterialRippleOverlay;
class QDESIGNER_WIDGET_EXPORT QtMaterialRipple : public QParallelAnimationGroup class QT_MATERIAL_EXPORT QtMaterialRipple : public QParallelAnimationGroup
{ {
Q_OBJECT Q_OBJECT

4
components/lib/qtmaterialrippleoverlay.h
View File

@ -3,11 +3,11 @@
#include <QPainterPath> #include <QPainterPath>
#include "lib/qtmaterialoverlaywidget.h" #include "lib/qtmaterialoverlaywidget.h"
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialRipple; class QtMaterialRipple;
class QDESIGNER_WIDGET_EXPORT QtMaterialRippleOverlay : public QtMaterialOverlayWidget class QT_MATERIAL_EXPORT QtMaterialRippleOverlay : public QtMaterialOverlayWidget
{ {
Q_OBJECT Q_OBJECT

4
components/lib/qtmaterialstyle.h
View File

@ -3,14 +3,14 @@
#include <QtWidgets/QCommonStyle> #include <QtWidgets/QCommonStyle>
#include "lib/qtmaterialstyle_p.h" #include "lib/qtmaterialstyle_p.h"
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
#define MATERIAL_DISABLE_THEME_COLORS \ #define MATERIAL_DISABLE_THEME_COLORS \
if (d->useThemeColors == true) { d->useThemeColors = false; } if (d->useThemeColors == true) { d->useThemeColors = false; }
class QtMaterialTheme; class QtMaterialTheme;
class QDESIGNER_WIDGET_EXPORT QtMaterialStyle : public QCommonStyle class QT_MATERIAL_EXPORT QtMaterialStyle : public QCommonStyle
{ {
Q_OBJECT Q_OBJECT

4
components/lib/qtmaterialtheme.h
View File

@ -6,11 +6,11 @@
#include <QColor> #include <QColor>
#include <QIcon> #include <QIcon>
#include "qtmaterialconst.h" #include "qtmaterialconst.h"
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialThemePrivate; class QtMaterialThemePrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialTheme : public QObject class QT_MATERIAL_EXPORT QtMaterialTheme : public QObject
{ {
Q_OBJECT Q_OBJECT

3
components/link_components.pri
View File

@ -1,7 +1,7 @@
COMP_PATH=$$PWD COMP_PATH=$$PWD
INCLUDEPATH += $$COMP_PATH INCLUDEPATH += $$COMP_PATH
DEFINES += QDESIGNER_EXPORT_WIDGETS DEFINES += QT_MATERIAL_LIBRARY
SOURCES += \ SOURCES += \
$$COMP_PATH/qtmaterialavatar.cpp \ $$COMP_PATH/qtmaterialavatar.cpp \
@ -131,6 +131,7 @@ HEADERS += \
$$COMP_PATH/qtmateriallistitem.h \ $$COMP_PATH/qtmateriallistitem.h \
$$COMP_PATH/qtmateriallistitem_p.h \ $$COMP_PATH/qtmateriallistitem_p.h \
$$PWD/lib/qtmaterialconst.h \ $$PWD/lib/qtmaterialconst.h \
$$PWD/qtmaterial_global.h \
$$PWD/qtmaterialtabwidget.h $$PWD/qtmaterialtabwidget.h
RESOURCES += \ RESOURCES += \

12
components/qtmaterial_global.h Normal file
View File

@ -0,0 +1,12 @@
#ifndef QTMATERIAL_GLOBAL_H
#define QTMATERIAL_GLOBAL_H
#include <QtCore/qglobal.h>
#if defined(QT_MATERIAL_LIBRARY)
# define QT_MATERIAL_EXPORT Q_DECL_EXPORT
#else
# define QT_MATERIAL_EXPORT Q_DECL_IMPORT
#endif
#endif // QTMATERIAL_GLOBAL_H

4
components/qtmaterialappbar.h
View File

@ -3,11 +3,11 @@
#include <QtWidgets/QWidget> #include <QtWidgets/QWidget>
#include <QtWidgets/QHBoxLayout> #include <QtWidgets/QHBoxLayout>
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialAppBarPrivate; class QtMaterialAppBarPrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialAppBar : public QWidget class QT_MATERIAL_EXPORT QtMaterialAppBar : public QWidget
{ {
Q_OBJECT Q_OBJECT

4
components/qtmaterialautocomplete.h
View File

@ -2,11 +2,11 @@
#define QTMATERIALAUTOCOMPLETE_H #define QTMATERIALAUTOCOMPLETE_H
#include "qtmaterialtextfield.h" #include "qtmaterialtextfield.h"
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialAutoCompletePrivate; class QtMaterialAutoCompletePrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialAutoComplete : public QtMaterialTextField class QT_MATERIAL_EXPORT QtMaterialAutoComplete : public QtMaterialTextField
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QStringList dataSource WRITE setDataSource READ dataSource) Q_PROPERTY(QStringList dataSource WRITE setDataSource READ dataSource)

4
components/qtmaterialavatar.h
View File

@ -3,11 +3,11 @@
#include <QtWidgets/QWidget> #include <QtWidgets/QWidget>
#include "lib/qtmaterialtheme.h" #include "lib/qtmaterialtheme.h"
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialAvatarPrivate; class QtMaterialAvatarPrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialAvatar : public QWidget class QT_MATERIAL_EXPORT QtMaterialAvatar : public QWidget
{ {
Q_OBJECT Q_OBJECT

4
components/qtmaterialbadge.h
View File

@ -3,11 +3,11 @@
#include "lib/qtmaterialoverlaywidget.h" #include "lib/qtmaterialoverlaywidget.h"
#include <QIcon> #include <QIcon>
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialBadgePrivate; class QtMaterialBadgePrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialBadge : public QtMaterialOverlayWidget class QT_MATERIAL_EXPORT QtMaterialBadge : public QtMaterialOverlayWidget
{ {
Q_OBJECT Q_OBJECT

4
components/qtmaterialcheckbox.h
View File

@ -2,11 +2,11 @@
#define QTMATERIALCHECKBOX_H #define QTMATERIALCHECKBOX_H
#include "lib/qtmaterialcheckable.h" #include "lib/qtmaterialcheckable.h"
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialCheckBoxPrivate; class QtMaterialCheckBoxPrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialCheckBox : public QtMaterialCheckable class QT_MATERIAL_EXPORT QtMaterialCheckBox : public QtMaterialCheckable
{ {
Q_OBJECT Q_OBJECT

4
components/qtmaterialcircularprogress.h
View File

@ -3,11 +3,11 @@
#include <QtWidgets/QProgressBar> #include <QtWidgets/QProgressBar>
#include "lib/qtmaterialtheme.h" #include "lib/qtmaterialtheme.h"
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialCircularProgressPrivate; class QtMaterialCircularProgressPrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialCircularProgress : public QProgressBar class QT_MATERIAL_EXPORT QtMaterialCircularProgress : public QProgressBar
{ {
Q_OBJECT Q_OBJECT

4
components/qtmaterialdialog.h
View File

@ -3,12 +3,12 @@
#include <QScopedPointer> #include <QScopedPointer>
#include "lib/qtmaterialoverlaywidget.h" #include "lib/qtmaterialoverlaywidget.h"
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QLayout; class QLayout;
class QtMaterialDialogPrivate; class QtMaterialDialogPrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialDialog : public QtMaterialOverlayWidget class QT_MATERIAL_EXPORT QtMaterialDialog : public QtMaterialOverlayWidget
{ {
Q_OBJECT Q_OBJECT

4
components/qtmaterialdrawer.h
View File

@ -2,12 +2,12 @@
#define QTMATERIALDRAWER_H #define QTMATERIALDRAWER_H
#include "lib/qtmaterialoverlaywidget.h" #include "lib/qtmaterialoverlaywidget.h"
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialDrawerPrivate; class QtMaterialDrawerPrivate;
class QtMaterialDrawerStateMachine; class QtMaterialDrawerStateMachine;
class QDESIGNER_WIDGET_EXPORT QtMaterialDrawer : public QtMaterialOverlayWidget class QT_MATERIAL_EXPORT QtMaterialDrawer : public QtMaterialOverlayWidget
{ {
Q_OBJECT Q_OBJECT

4
components/qtmaterialfab.h
View File

@ -2,11 +2,11 @@
#define QTMATERIALFAB_H #define QTMATERIALFAB_H
#include "qtmaterialraisedbutton.h" #include "qtmaterialraisedbutton.h"
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialFloatingActionButtonPrivate; class QtMaterialFloatingActionButtonPrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialFloatingActionButton : public QtMaterialRaisedButton class QT_MATERIAL_EXPORT QtMaterialFloatingActionButton : public QtMaterialRaisedButton
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool mini WRITE setMini READ isMini) Q_PROPERTY(bool mini WRITE setMini READ isMini)

4
components/qtmaterialflatbutton.h
View File

@ -4,11 +4,11 @@
#include <QtWidgets/QPushButton> #include <QtWidgets/QPushButton>
#include <QScopedPointer> #include <QScopedPointer>
#include "lib/qtmaterialtheme.h" #include "lib/qtmaterialtheme.h"
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialFlatButtonPrivate; class QtMaterialFlatButtonPrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialFlatButton : public QPushButton class QT_MATERIAL_EXPORT QtMaterialFlatButton : public QPushButton
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QColor foregroundColor WRITE setForegroundColor READ foregroundColor) Q_PROPERTY(QColor foregroundColor WRITE setForegroundColor READ foregroundColor)

4
components/qtmaterialiconbutton.h
View File

@ -2,11 +2,11 @@
#define QTMATERIALICONBUTTON_H #define QTMATERIALICONBUTTON_H
#include <QtWidgets/QAbstractButton> #include <QtWidgets/QAbstractButton>
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialIconButtonPrivate; class QtMaterialIconButtonPrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialIconButton : public QAbstractButton class QT_MATERIAL_EXPORT QtMaterialIconButton : public QAbstractButton
{ {
Q_OBJECT Q_OBJECT
// Q_PROPERTY(bool useThemeColors READ setUseThemeColors WRITE useThemeColors) // Q_PROPERTY(bool useThemeColors READ setUseThemeColors WRITE useThemeColors)

6
components/qtmaterialmenu.h
View File

@ -2,10 +2,10 @@
#define QTMATERIALMENU_H #define QTMATERIALMENU_H
#include <QtWidgets/QWidget> #include <QtWidgets/QWidget>
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QDESIGNER_WIDGET_EXPORT QtMaterialMenu : public QWidget class QT_MATERIAL_EXPORT QtMaterialMenu : public QWidget
{ {
Q_OBJECT Q_OBJECT

4
components/qtmaterialprogress.h
View File

@ -3,11 +3,11 @@
#include <QtWidgets/QProgressBar> #include <QtWidgets/QProgressBar>
#include "lib/qtmaterialtheme.h" #include "lib/qtmaterialtheme.h"
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialProgressPrivate; class QtMaterialProgressPrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialProgress : public QProgressBar class QT_MATERIAL_EXPORT QtMaterialProgress : public QProgressBar
{ {
Q_OBJECT Q_OBJECT

4
components/qtmaterialradiobutton.h
View File

@ -2,11 +2,11 @@
#define QTMATERIALRADIOBUTTON_H #define QTMATERIALRADIOBUTTON_H
#include "lib/qtmaterialcheckable.h" #include "lib/qtmaterialcheckable.h"
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialRadioButtonPrivate; class QtMaterialRadioButtonPrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialRadioButton : public QtMaterialCheckable class QT_MATERIAL_EXPORT QtMaterialRadioButton : public QtMaterialCheckable
{ {
Q_OBJECT Q_OBJECT

4
components/qtmaterialraisedbutton.h
View File

@ -2,11 +2,11 @@
#define QTMATERIALRAISEDBUTTON_H #define QTMATERIALRAISEDBUTTON_H
#include "qtmaterialflatbutton.h" #include "qtmaterialflatbutton.h"
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialRaisedButtonPrivate; class QtMaterialRaisedButtonPrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialRaisedButton : public QtMaterialFlatButton class QT_MATERIAL_EXPORT QtMaterialRaisedButton : public QtMaterialFlatButton
{ {
Q_OBJECT Q_OBJECT

4
components/qtmaterialscrollbar.h
View File

@ -2,11 +2,11 @@
#define QTMATERIALSCROLLBAR_H #define QTMATERIALSCROLLBAR_H
#include <QtWidgets/QScrollBar> #include <QtWidgets/QScrollBar>
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialScrollBarPrivate; class QtMaterialScrollBarPrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialScrollBar : public QScrollBar class QT_MATERIAL_EXPORT QtMaterialScrollBar : public QScrollBar
{ {
Q_OBJECT Q_OBJECT

4
components/qtmaterialslider.h
View File

@ -3,13 +3,13 @@
#include <QtWidgets/QAbstractSlider> #include <QtWidgets/QAbstractSlider>
#include <QScopedPointer> #include <QScopedPointer>
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
#define QT_MATERIAL_SLIDER_MARGIN 10 #define QT_MATERIAL_SLIDER_MARGIN 10
class QtMaterialSliderPrivate; class QtMaterialSliderPrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialSlider : public QAbstractSlider class QT_MATERIAL_EXPORT QtMaterialSlider : public QAbstractSlider
{ {
Q_OBJECT Q_OBJECT

4
components/qtmaterialsnackbar.h
View File

@ -2,11 +2,11 @@
#define QTMATERIALSNACKBAR_H #define QTMATERIALSNACKBAR_H
#include "lib/qtmaterialoverlaywidget.h" #include "lib/qtmaterialoverlaywidget.h"
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialSnackbarPrivate; class QtMaterialSnackbarPrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialSnackbar : public QtMaterialOverlayWidget class QT_MATERIAL_EXPORT QtMaterialSnackbar : public QtMaterialOverlayWidget
{ {
Q_OBJECT Q_OBJECT

4
components/qtmaterialtabs.h
View File

@ -4,12 +4,12 @@
#include <QtWidgets/QWidget> #include <QtWidgets/QWidget>
#include <QIcon> #include <QIcon>
#include "lib/qtmaterialtheme.h" #include "lib/qtmaterialtheme.h"
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialTabsPrivate; class QtMaterialTabsPrivate;
class QtMaterialTab; class QtMaterialTab;
class QDESIGNER_WIDGET_EXPORT QtMaterialTabs : public QWidget class QT_MATERIAL_EXPORT QtMaterialTabs : public QWidget
{ {
Q_OBJECT Q_OBJECT

4
components/qtmaterialtabwidget.h
View File

@ -2,14 +2,14 @@
#define QTMATERIALTABWIDGET_H #define QTMATERIALTABWIDGET_H
#include <QWidget> #include <QWidget>
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QStackedWidget; class QStackedWidget;
QT_END_NAMESPACE QT_END_NAMESPACE
class QtMaterialTabs; class QtMaterialTabs;
class QDESIGNER_WIDGET_EXPORT QtMaterialTabWidget : public QWidget class QT_MATERIAL_EXPORT QtMaterialTabWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex) Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex)

4
components/qtmaterialtextfield.h
View File

@ -3,11 +3,11 @@
#include <QtWidgets/QLineEdit> #include <QtWidgets/QLineEdit>
#include <QColor> #include <QColor>
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialTextFieldPrivate; class QtMaterialTextFieldPrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialTextField : public QLineEdit class QT_MATERIAL_EXPORT QtMaterialTextField : public QLineEdit
{ {
Q_OBJECT Q_OBJECT

4
components/qtmaterialtoggle.h
View File

@ -2,11 +2,11 @@
#define QTMATERIALTOGGLE_H #define QTMATERIALTOGGLE_H
#include <QtWidgets/QAbstractButton> #include <QtWidgets/QAbstractButton>
#include <QtUiPlugin/QDesignerExportWidget> #include "qtmaterial_global.h"
class QtMaterialTogglePrivate; class QtMaterialTogglePrivate;
class QDESIGNER_WIDGET_EXPORT QtMaterialToggle : public QAbstractButton class QT_MATERIAL_EXPORT QtMaterialToggle : public QAbstractButton
{ {
Q_OBJECT Q_OBJECT