diff --git a/components/qtmaterialappbar.cpp b/components/qtmaterialappbar.cpp index 5e5e230..45492f9 100644 --- a/components/qtmaterialappbar.cpp +++ b/components/qtmaterialappbar.cpp @@ -50,7 +50,8 @@ void QtMaterialAppBarPrivate::init() */ QtMaterialAppBar::QtMaterialAppBar(QWidget *parent) - : QWidget(parent) + : QWidget(parent), + d_ptr(new QtMaterialAppBarPrivate(this)) { d_func()->init(); } diff --git a/examples/appbarsettingseditor.cpp b/examples/appbarsettingseditor.cpp index fac6618..1b131af 100644 --- a/examples/appbarsettingseditor.cpp +++ b/examples/appbarsettingseditor.cpp @@ -1,11 +1,12 @@ #include "appbarsettingseditor.h" +#include #include #include AppBarSettingsEditor::AppBarSettingsEditor(QWidget *parent) : QWidget(parent), ui(new Ui::AppBarSettingsForm), - m_appbar(new QtMaterialAppBar(QChar('X'))) + m_appBar(new QtMaterialAppBar) { QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); @@ -23,6 +24,7 @@ AppBarSettingsEditor::AppBarSettingsEditor(QWidget *parent) layout = new QVBoxLayout; canvas->setLayout(layout); layout->addWidget(m_appBar); + layout->addStretch(1); setupForm(); } @@ -34,44 +36,8 @@ AppBarSettingsEditor::~AppBarSettingsEditor() void AppBarSettingsEditor::setupForm() { - //switch (m_avatar->type()) - //{ - //case Material::LetterAppBar: - // ui->typeComboBox->setCurrentIndex(0); - // break; - //case Material::ImageAppBar: - // ui->typeComboBox->setCurrentIndex(1); - // break; - //case Material::IconAppBar: - // ui->typeComboBox->setCurrentIndex(2); - // break; - //default: - // break; - //} - - //ui->disabledCheckBox->setChecked(!m_avatar->isEnabled()); - //ui->useThemeColorsCheckBox->setChecked(m_avatar->useThemeColors()); - //ui->sizeSpinBox->setValue(m_avatar->size()); } void AppBarSettingsEditor::updateWidget() { - //switch (ui->typeComboBox->currentIndex()) - //{ - //case 0: - // m_avatar->setLetter(QChar('X')); - // break; - //case 1: - // m_avatar->setImage(QImage(":/images/assets/sikh.jpg")); - // break; - //case 2: - // m_avatar->setIcon(QtMaterialTheme::icon("communication", "message")); - // break; - //default: - // break; - //} - - //m_avatar->setDisabled(ui->disabledCheckBox->isChecked()); - //m_avatar->setUseThemeColors(ui->useThemeColorsCheckBox->isChecked()); - //m_avatar->setSize(ui->sizeSpinBox->value()); } diff --git a/examples/appbarsettingseditor.h b/examples/appbarsettingseditor.h index ebefee3..e1d4043 100644 --- a/examples/appbarsettingseditor.h +++ b/examples/appbarsettingseditor.h @@ -2,7 +2,7 @@ #define APPBARSETTINGSEDITOR_H #include -#include "ui_avatarsettingsform.h" +#include "ui_appbarsettingsform.h" class QtMaterialAppBar; diff --git a/examples/mainwindow.cpp b/examples/mainwindow.cpp index 73d0e40..b6683ec 100644 --- a/examples/mainwindow.cpp +++ b/examples/mainwindow.cpp @@ -58,8 +58,9 @@ MainWindow::MainWindow(QWidget *parent) DialogSettingsEditor *dialog = new DialogSettingsEditor; DrawerSettingsEditor *drawer = new DrawerSettingsEditor; ScrollBarSettingsEditor *scrollBar = new ScrollBarSettingsEditor; - AppBarSettingsEditors *appBar = new AppBarSettingsEditors; + AppBarSettingsEditor *appBar = new AppBarSettingsEditor; + stack->addWidget(appBar); stack->addWidget(avatar); stack->addWidget(badge); stack->addWidget(checkbox); @@ -78,7 +79,6 @@ MainWindow::MainWindow(QWidget *parent) stack->addWidget(tabs); stack->addWidget(textField); stack->addWidget(toggle); - stack->addWidget(appBar); list->addItem("App Bar"); list->addItem("Avatar");