Add AppBar to examples

This commit is contained in:
johanneshilden 2017-10-11 22:25:22 +03:00
parent c082269a71
commit f954d5e9c5
4 changed files with 8 additions and 41 deletions

View File

@ -50,7 +50,8 @@ void QtMaterialAppBarPrivate::init()
*/ */
QtMaterialAppBar::QtMaterialAppBar(QWidget *parent) QtMaterialAppBar::QtMaterialAppBar(QWidget *parent)
: QWidget(parent) : QWidget(parent),
d_ptr(new QtMaterialAppBarPrivate(this))
{ {
d_func()->init(); d_func()->init();
} }

View File

@ -1,11 +1,12 @@
#include "appbarsettingseditor.h" #include "appbarsettingseditor.h"
#include <QtWidgets/QVBoxLayout>
#include <qtmaterialappbar.h> #include <qtmaterialappbar.h>
#include <lib/qtmaterialtheme.h> #include <lib/qtmaterialtheme.h>
AppBarSettingsEditor::AppBarSettingsEditor(QWidget *parent) AppBarSettingsEditor::AppBarSettingsEditor(QWidget *parent)
: QWidget(parent), : QWidget(parent),
ui(new Ui::AppBarSettingsForm), ui(new Ui::AppBarSettingsForm),
m_appbar(new QtMaterialAppBar(QChar('X'))) m_appBar(new QtMaterialAppBar)
{ {
QVBoxLayout *layout = new QVBoxLayout; QVBoxLayout *layout = new QVBoxLayout;
setLayout(layout); setLayout(layout);
@ -23,6 +24,7 @@ AppBarSettingsEditor::AppBarSettingsEditor(QWidget *parent)
layout = new QVBoxLayout; layout = new QVBoxLayout;
canvas->setLayout(layout); canvas->setLayout(layout);
layout->addWidget(m_appBar); layout->addWidget(m_appBar);
layout->addStretch(1);
setupForm(); setupForm();
} }
@ -34,44 +36,8 @@ AppBarSettingsEditor::~AppBarSettingsEditor()
void AppBarSettingsEditor::setupForm() 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() 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());
} }

View File

@ -2,7 +2,7 @@
#define APPBARSETTINGSEDITOR_H #define APPBARSETTINGSEDITOR_H
#include <QWidget> #include <QWidget>
#include "ui_avatarsettingsform.h" #include "ui_appbarsettingsform.h"
class QtMaterialAppBar; class QtMaterialAppBar;

View File

@ -58,8 +58,9 @@ MainWindow::MainWindow(QWidget *parent)
DialogSettingsEditor *dialog = new DialogSettingsEditor; DialogSettingsEditor *dialog = new DialogSettingsEditor;
DrawerSettingsEditor *drawer = new DrawerSettingsEditor; DrawerSettingsEditor *drawer = new DrawerSettingsEditor;
ScrollBarSettingsEditor *scrollBar = new ScrollBarSettingsEditor; ScrollBarSettingsEditor *scrollBar = new ScrollBarSettingsEditor;
AppBarSettingsEditors *appBar = new AppBarSettingsEditors; AppBarSettingsEditor *appBar = new AppBarSettingsEditor;
stack->addWidget(appBar);
stack->addWidget(avatar); stack->addWidget(avatar);
stack->addWidget(badge); stack->addWidget(badge);
stack->addWidget(checkbox); stack->addWidget(checkbox);
@ -78,7 +79,6 @@ MainWindow::MainWindow(QWidget *parent)
stack->addWidget(tabs); stack->addWidget(tabs);
stack->addWidget(textField); stack->addWidget(textField);
stack->addWidget(toggle); stack->addWidget(toggle);
stack->addWidget(appBar);
list->addItem("App Bar"); list->addItem("App Bar");
list->addItem("Avatar"); list->addItem("Avatar");