diff --git a/examples/avatarsettingseditor.cpp b/examples/avatarsettingseditor.cpp index 1720480..2ae95ce 100644 --- a/examples/avatarsettingseditor.cpp +++ b/examples/avatarsettingseditor.cpp @@ -1,12 +1,9 @@ #include "avatarsettingseditor.h" -#include -#include -#include AvatarSettingsEditor::AvatarSettingsEditor(QWidget *parent) : QWidget(parent), ui(new Ui::AvatarSettingsForm), - m_avatar(new QtMaterialAvatar(QChar('X'))) + m_avatar(new Avatar(QChar('X'))) { QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); @@ -76,7 +73,7 @@ void AvatarSettingsEditor::updateWidget() m_avatar->setImage(QImage(":/images/assets/sikh.jpg")); break; case 2: - m_avatar->setIcon(QtMaterialTheme::icon("communication", "message")); + m_avatar->setIcon(Theme::icon("communication", "message")); break; default: break; diff --git a/examples/avatarsettingseditor.h b/examples/avatarsettingseditor.h index c9bc009..6485fa0 100644 --- a/examples/avatarsettingseditor.h +++ b/examples/avatarsettingseditor.h @@ -2,9 +2,14 @@ #define AVATARSETTINGSEDITOR_H #include + +#include +#include +#include #include "ui_avatarsettingsform.h" -class QtMaterialAvatar; +using namespace md; +//class Avatar; class AvatarSettingsEditor : public QWidget { @@ -21,7 +26,7 @@ protected slots: private: Ui::AvatarSettingsForm *const ui; - QtMaterialAvatar *const m_avatar; + Avatar *const m_avatar; }; #endif // AVATARSETTINGSEDITOR_H diff --git a/examples/badgesettingseditor.cpp b/examples/badgesettingseditor.cpp index 4b52146..9e70d7b 100644 --- a/examples/badgesettingseditor.cpp +++ b/examples/badgesettingseditor.cpp @@ -6,7 +6,7 @@ BadgeSettingsEditor::BadgeSettingsEditor(QWidget *parent) : QWidget(parent), ui(new Ui::BadgeSettingsForm), - m_avatar(new QtMaterialAvatar(QImage(":/images/assets/sikh.jpg"))), + m_avatar(new Avatar(QImage(":/images/assets/sikh.jpg"))), m_badge(new QtMaterialBadge) { QVBoxLayout *layout = new QVBoxLayout; diff --git a/examples/badgesettingseditor.h b/examples/badgesettingseditor.h index 8f74808..531dfb2 100644 --- a/examples/badgesettingseditor.h +++ b/examples/badgesettingseditor.h @@ -4,7 +4,7 @@ #include #include "ui_badgesettingsform.h" -class QtMaterialAvatar; +class Avatar; class QtMaterialBadge; class BadgeSettingsEditor : public QWidget @@ -22,7 +22,7 @@ protected slots: private: Ui::BadgeSettingsForm *const ui; - QtMaterialAvatar *const m_avatar; + Avatar *const m_avatar; QtMaterialBadge *const m_badge; }; diff --git a/examples/main.cpp b/examples/main.cpp index 38f8761..95b0f6f 100644 --- a/examples/main.cpp +++ b/examples/main.cpp @@ -4,9 +4,7 @@ int main(int argc, char *argv[]) { - QApplication a(argc, argv); - - Q_INIT_RESOURCE(resources); + QApplication a(argc, argv); MainWindow window; window.show(); diff --git a/examples/mainwindow.cpp b/examples/mainwindow.cpp index cc4992e..773a61d 100644 --- a/examples/mainwindow.cpp +++ b/examples/mainwindow.cpp @@ -1,28 +1,4 @@ #include "mainwindow.h" -#include -#include -#include -#include "avatarsettingseditor.h" -#include "badgesettingseditor.h" -#include "checkboxsettingseditor.h" -#include "fabsettingseditor.h" -#include "raisedbuttonsettingseditor.h" -#include "flatbuttonsettingseditor.h" -#include "iconbuttonsettingseditor.h" -#include "progresssettingseditor.h" -#include "circularprogresssettingseditor.h" -#include "slidersettingseditor.h" -#include "radiobuttonsettingseditor.h" -#include "togglesettingseditor.h" -#include "textfieldsettingseditor.h" -#include "tabssettingseditor.h" -#include "snackbarsettingseditor.h" -#include "dialogsettingseditor.h" -#include "drawersettingseditor.h" -#include "scrollbarsettingseditor.h" -#include "appbarsettingseditor.h" -#include "autocompletesettingseditor.h" -#include "menusettingseditor.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) @@ -43,70 +19,71 @@ MainWindow::MainWindow(QWidget *parent) setCentralWidget(widget); AvatarSettingsEditor *avatar = new AvatarSettingsEditor; - BadgeSettingsEditor *badge = new BadgeSettingsEditor; - CheckBoxSettingsEditor *checkbox = new CheckBoxSettingsEditor; - FloatingActionButtonSettingsEditor *fab = new FloatingActionButtonSettingsEditor; - RaisedButtonSettingsEditor *raisedButton = new RaisedButtonSettingsEditor; - FlatButtonSettingsEditor *flatButton = new FlatButtonSettingsEditor; - IconButtonSettingsEditor *iconButton = new IconButtonSettingsEditor; - ProgressSettingsEditor *progress = new ProgressSettingsEditor; - CircularProgressSettingsEditor *circularProgress = new CircularProgressSettingsEditor; - SliderSettingsEditor *slider = new SliderSettingsEditor; - RadioButtonSettingsEditor *radioButton = new RadioButtonSettingsEditor; - ToggleSettingsEditor *toggle = new ToggleSettingsEditor; - TextFieldSettingsEditor *textField = new TextFieldSettingsEditor; - TabsSettingsEditor *tabs = new TabsSettingsEditor; - SnackbarSettingsEditor *snackbar = new SnackbarSettingsEditor; - DialogSettingsEditor *dialog = new DialogSettingsEditor; - DrawerSettingsEditor *drawer = new DrawerSettingsEditor; - ScrollBarSettingsEditor *scrollBar = new ScrollBarSettingsEditor; - AppBarSettingsEditor *appBar = new AppBarSettingsEditor; - AutoCompleteSettingsEditor *autocomplete = new AutoCompleteSettingsEditor; - MenuSettingsEditor *menu = new MenuSettingsEditor; +// BadgeSettingsEditor *badge = new BadgeSettingsEditor; +// CheckBoxSettingsEditor *checkbox = new CheckBoxSettingsEditor; +// FloatingActionButtonSettingsEditor *fab = new FloatingActionButtonSettingsEditor; +// RaisedButtonSettingsEditor *raisedButton = new RaisedButtonSettingsEditor; +// FlatButtonSettingsEditor *flatButton = new FlatButtonSettingsEditor; +// IconButtonSettingsEditor *iconButton = new IconButtonSettingsEditor; +// ProgressSettingsEditor *progress = new ProgressSettingsEditor; +// CircularProgressSettingsEditor *circularProgress = new CircularProgressSettingsEditor; +// SliderSettingsEditor *slider = new SliderSettingsEditor; +// RadioButtonSettingsEditor *radioButton = new RadioButtonSettingsEditor; +// ToggleSettingsEditor *toggle = new ToggleSettingsEditor; +// TextFieldSettingsEditor *textField = new TextFieldSettingsEditor; +// TabsSettingsEditor *tabs = new TabsSettingsEditor; +// SnackbarSettingsEditor *snackbar = new SnackbarSettingsEditor; +// DialogSettingsEditor *dialog = new DialogSettingsEditor; +// DrawerSettingsEditor *drawer = new DrawerSettingsEditor; +// ScrollBarSettingsEditor *scrollBar = new ScrollBarSettingsEditor; +// AppBarSettingsEditor *appBar = new AppBarSettingsEditor; +// AutoCompleteSettingsEditor *autocomplete = new AutoCompleteSettingsEditor; +// MenuSettingsEditor *menu = new MenuSettingsEditor; - stack->addWidget(appBar); - stack->addWidget(autocomplete); stack->addWidget(avatar); - stack->addWidget(badge); - stack->addWidget(checkbox); - stack->addWidget(circularProgress); - stack->addWidget(dialog); - stack->addWidget(drawer); - stack->addWidget(fab); - stack->addWidget(flatButton); - stack->addWidget(iconButton); - stack->addWidget(menu); - stack->addWidget(progress); - stack->addWidget(radioButton); - stack->addWidget(raisedButton); - stack->addWidget(scrollBar); - stack->addWidget(slider); - stack->addWidget(snackbar); - stack->addWidget(tabs); - stack->addWidget(textField); - stack->addWidget(toggle); +// stack->addWidget(appBar); +// stack->addWidget(autocomplete); +// stack->addWidget(badge); +// stack->addWidget(checkbox); +// stack->addWidget(circularProgress); +// stack->addWidget(dialog); +// stack->addWidget(drawer); +// stack->addWidget(fab); +// stack->addWidget(flatButton); +// stack->addWidget(iconButton); +// stack->addWidget(menu); +// stack->addWidget(progress); +// stack->addWidget(radioButton); +// stack->addWidget(raisedButton); +// stack->addWidget(scrollBar); +// stack->addWidget(slider); +// stack->addWidget(snackbar); +// stack->addWidget(tabs); +// stack->addWidget(textField); +// stack->addWidget(toggle); + - list->addItem("App Bar"); - list->addItem("Auto Complete"); list->addItem("Avatar"); - list->addItem("Badge"); - list->addItem("Checkbox"); - list->addItem("Circular Progress"); - list->addItem("Dialog"); - list->addItem("Drawer"); - list->addItem("Floating Action Button"); - list->addItem("Flat Button"); - list->addItem("Icon Button"); - list->addItem("Menu"); - list->addItem("Progress"); - list->addItem("Radio Button"); - list->addItem("Raised Button"); - list->addItem("ScrollBar"); - list->addItem("Slider"); - list->addItem("Snackbar"); - list->addItem("Tabs"); - list->addItem("Text Field"); - list->addItem("Toggle"); +// list->addItem("App Bar"); +// list->addItem("Auto Complete"); +// list->addItem("Badge"); +// list->addItem("Checkbox"); +// list->addItem("Circular Progress"); +// list->addItem("Dialog"); +// list->addItem("Drawer"); +// list->addItem("Floating Action Button"); +// list->addItem("Flat Button"); +// list->addItem("Icon Button"); +// list->addItem("Menu"); +// list->addItem("Progress"); +// list->addItem("Radio Button"); +// list->addItem("Raised Button"); +// list->addItem("ScrollBar"); +// list->addItem("Slider"); +// list->addItem("Snackbar"); +// list->addItem("Tabs"); +// list->addItem("Text Field"); +// list->addItem("Toggle"); list->setCurrentRow(0); diff --git a/examples/mainwindow.h b/examples/mainwindow.h index 1f39a8c..856795a 100644 --- a/examples/mainwindow.h +++ b/examples/mainwindow.h @@ -2,6 +2,31 @@ #define MAINWINDOW_H #include +#include +#include +#include + +#include "avatarsettingseditor.h" +//#include "badgesettingseditor.h" +//#include "checkboxsettingseditor.h" +//#include "fabsettingseditor.h" +//#include "raisedbuttonsettingseditor.h" +//#include "flatbuttonsettingseditor.h" +//#include "iconbuttonsettingseditor.h" +//#include "progresssettingseditor.h" +//#include "circularprogresssettingseditor.h" +//#include "slidersettingseditor.h" +//#include "radiobuttonsettingseditor.h" +//#include "togglesettingseditor.h" +//#include "textfieldsettingseditor.h" +//#include "tabssettingseditor.h" +//#include "snackbarsettingseditor.h" +//#include "dialogsettingseditor.h" +//#include "drawersettingseditor.h" +//#include "scrollbarsettingseditor.h" +//#include "appbarsettingseditor.h" +//#include "autocompletesettingseditor.h" +//#include "menusettingseditor.h" class MainWindow : public QMainWindow {