Add Radio Button files

This commit is contained in:
johanneshilden 2017-09-29 17:50:04 +03:00
parent df78fc7b51
commit 49ed0a2ed3
6 changed files with 15 additions and 8 deletions

View File

@ -22,7 +22,8 @@ SOURCES = \
qtmaterialcircularprogress_internal.cpp \ qtmaterialcircularprogress_internal.cpp \
qtmaterialcircularprogress.cpp \ qtmaterialcircularprogress.cpp \
qtmaterialslider_internal.cpp \ qtmaterialslider_internal.cpp \
qtmaterialslider.cpp qtmaterialslider.cpp \
qtmaterialradiobutton.cpp
HEADERS = \ HEADERS = \
qtmaterialavatar_p.h \ qtmaterialavatar_p.h \
qtmaterialavatar.h \ qtmaterialavatar.h \
@ -59,6 +60,8 @@ HEADERS = \
qtmaterialcircularprogress.h \ qtmaterialcircularprogress.h \
qtmaterialslider_internal.h \ qtmaterialslider_internal.h \
qtmaterialslider_p.h \ qtmaterialslider_p.h \
qtmaterialslider.h qtmaterialslider.h \
qtmaterialradiobutton_p.h \
qtmaterialradiobutton.h
RESOURCES += \ RESOURCES += \
resources.qrc resources.qrc

View File

@ -1,10 +1,10 @@
#include "xx/qtmaterialradiobutton.h" #include "qtmaterialradiobutton.h"
#include "xx/qtmaterialradiobutton_p.h" #include "qtmaterialradiobutton_p.h"
#include <QStateMachine> #include <QStateMachine>
#include <QState> #include <QState>
#include <QPropertyAnimation> #include <QPropertyAnimation>
#include <QColor> #include <QColor>
#include "xxlib/qtmaterialcheckable_internal.h" #include "lib/qtmaterialcheckable_internal.h"
/*! /*!
* \class QtMaterialRadioButtonPrivate * \class QtMaterialRadioButtonPrivate

View File

@ -1,7 +1,7 @@
#ifndef QTMATERIALRADIOBUTTON_H #ifndef QTMATERIALRADIOBUTTON_H
#define QTMATERIALRADIOBUTTON_H #define QTMATERIALRADIOBUTTON_H
#include "xxlib/qtmaterialcheckable.h" #include "lib/qtmaterialcheckable.h"
class QtMaterialRadioButtonPrivate; class QtMaterialRadioButtonPrivate;

View File

@ -1,7 +1,7 @@
#ifndef QTMATERIALRADIOBUTTON_P_H #ifndef QTMATERIALRADIOBUTTON_P_H
#define QTMATERIALRADIOBUTTON_P_H #define QTMATERIALRADIOBUTTON_P_H
#include "xxlib/qtmaterialcheckable_p.h" #include "lib/qtmaterialcheckable_p.h"
class QtMaterialRadioButton; class QtMaterialRadioButton;

View File

@ -12,6 +12,7 @@
#include "progresssettingseditor.h" #include "progresssettingseditor.h"
#include "circularprogresssettingseditor.h" #include "circularprogresssettingseditor.h"
#include "slidersettingseditor.h" #include "slidersettingseditor.h"
#include "radiobuttonsettingseditor.h"
MainWindow::MainWindow(QWidget *parent) MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent) : QMainWindow(parent)
@ -41,6 +42,7 @@ MainWindow::MainWindow(QWidget *parent)
ProgressSettingsEditor *progress = new ProgressSettingsEditor; ProgressSettingsEditor *progress = new ProgressSettingsEditor;
CircularProgressSettingsEditor *circularProgress = new CircularProgressSettingsEditor; CircularProgressSettingsEditor *circularProgress = new CircularProgressSettingsEditor;
SliderSettingsEditor *slider = new SliderSettingsEditor; SliderSettingsEditor *slider = new SliderSettingsEditor;
RadioButtonSettingsEditor *radioButton = new RadioButtonSettingsEditor;
stack->addWidget(avatar); stack->addWidget(avatar);
stack->addWidget(badge); stack->addWidget(badge);
@ -50,6 +52,7 @@ MainWindow::MainWindow(QWidget *parent)
stack->addWidget(flatButton); stack->addWidget(flatButton);
stack->addWidget(iconButton); stack->addWidget(iconButton);
stack->addWidget(progress); stack->addWidget(progress);
stack->addWidget(radioButton);
stack->addWidget(raisedButton); stack->addWidget(raisedButton);
stack->addWidget(slider); stack->addWidget(slider);
@ -61,6 +64,7 @@ MainWindow::MainWindow(QWidget *parent)
list->addItem("Flat Button"); list->addItem("Flat Button");
list->addItem("Icon Button"); list->addItem("Icon Button");
list->addItem("Progress"); list->addItem("Progress");
list->addItem("Radio Button");
list->addItem("Raised Button"); list->addItem("Raised Button");
list->addItem("Slider"); list->addItem("Slider");

View File

@ -2,7 +2,7 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QRadioButton> #include <QRadioButton>
#include <QColorDialog> #include <QColorDialog>
#include "xx/qtmaterialradiobutton.h" #include "qtmaterialradiobutton.h"
RadioButtonSettingsEditor::RadioButtonSettingsEditor(QWidget *parent) RadioButtonSettingsEditor::RadioButtonSettingsEditor(QWidget *parent)
: QWidget(parent), : QWidget(parent),