diff --git a/components/components.pro b/components/components.pro index 2459a10..fbe8eaa 100644 --- a/components/components.pro +++ b/components/components.pro @@ -22,7 +22,8 @@ SOURCES = \ qtmaterialcircularprogress_internal.cpp \ qtmaterialcircularprogress.cpp \ qtmaterialslider_internal.cpp \ - qtmaterialslider.cpp + qtmaterialslider.cpp \ + qtmaterialradiobutton.cpp HEADERS = \ qtmaterialavatar_p.h \ qtmaterialavatar.h \ @@ -59,6 +60,8 @@ HEADERS = \ qtmaterialcircularprogress.h \ qtmaterialslider_internal.h \ qtmaterialslider_p.h \ - qtmaterialslider.h + qtmaterialslider.h \ + qtmaterialradiobutton_p.h \ + qtmaterialradiobutton.h RESOURCES += \ resources.qrc diff --git a/components/qtmaterialradiobutton.cpp b/components/qtmaterialradiobutton.cpp index aae289f..da3014e 100644 --- a/components/qtmaterialradiobutton.cpp +++ b/components/qtmaterialradiobutton.cpp @@ -1,10 +1,10 @@ -#include "xx/qtmaterialradiobutton.h" -#include "xx/qtmaterialradiobutton_p.h" +#include "qtmaterialradiobutton.h" +#include "qtmaterialradiobutton_p.h" #include #include #include #include -#include "xxlib/qtmaterialcheckable_internal.h" +#include "lib/qtmaterialcheckable_internal.h" /*! * \class QtMaterialRadioButtonPrivate diff --git a/components/qtmaterialradiobutton.h b/components/qtmaterialradiobutton.h index 7c12a45..adc535c 100644 --- a/components/qtmaterialradiobutton.h +++ b/components/qtmaterialradiobutton.h @@ -1,7 +1,7 @@ #ifndef QTMATERIALRADIOBUTTON_H #define QTMATERIALRADIOBUTTON_H -#include "xxlib/qtmaterialcheckable.h" +#include "lib/qtmaterialcheckable.h" class QtMaterialRadioButtonPrivate; diff --git a/components/qtmaterialradiobutton_p.h b/components/qtmaterialradiobutton_p.h index 7ca9f16..6bb954a 100644 --- a/components/qtmaterialradiobutton_p.h +++ b/components/qtmaterialradiobutton_p.h @@ -1,7 +1,7 @@ #ifndef QTMATERIALRADIOBUTTON_P_H #define QTMATERIALRADIOBUTTON_P_H -#include "xxlib/qtmaterialcheckable_p.h" +#include "lib/qtmaterialcheckable_p.h" class QtMaterialRadioButton; diff --git a/examples/mainwindow.cpp b/examples/mainwindow.cpp index 71dc2a0..f61fb2c 100644 --- a/examples/mainwindow.cpp +++ b/examples/mainwindow.cpp @@ -12,6 +12,7 @@ #include "progresssettingseditor.h" #include "circularprogresssettingseditor.h" #include "slidersettingseditor.h" +#include "radiobuttonsettingseditor.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) @@ -41,6 +42,7 @@ MainWindow::MainWindow(QWidget *parent) ProgressSettingsEditor *progress = new ProgressSettingsEditor; CircularProgressSettingsEditor *circularProgress = new CircularProgressSettingsEditor; SliderSettingsEditor *slider = new SliderSettingsEditor; + RadioButtonSettingsEditor *radioButton = new RadioButtonSettingsEditor; stack->addWidget(avatar); stack->addWidget(badge); @@ -50,6 +52,7 @@ MainWindow::MainWindow(QWidget *parent) stack->addWidget(flatButton); stack->addWidget(iconButton); stack->addWidget(progress); + stack->addWidget(radioButton); stack->addWidget(raisedButton); stack->addWidget(slider); @@ -61,6 +64,7 @@ MainWindow::MainWindow(QWidget *parent) list->addItem("Flat Button"); list->addItem("Icon Button"); list->addItem("Progress"); + list->addItem("Radio Button"); list->addItem("Raised Button"); list->addItem("Slider"); diff --git a/examples/radiobuttonsettingseditor.cpp b/examples/radiobuttonsettingseditor.cpp index 88bf2e6..8b246f8 100644 --- a/examples/radiobuttonsettingseditor.cpp +++ b/examples/radiobuttonsettingseditor.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "xx/qtmaterialradiobutton.h" +#include "qtmaterialradiobutton.h" RadioButtonSettingsEditor::RadioButtonSettingsEditor(QWidget *parent) : QWidget(parent),