Add Snackbar settings editor

This commit is contained in:
johanneshilden 2017-09-30 01:57:55 +03:00
parent 67c9da5516
commit f0c2df6f2c
6 changed files with 121 additions and 16 deletions

View File

@ -23,11 +23,8 @@ SOURCES = \
qtmaterialcircularprogress.cpp \
qtmaterialslider_internal.cpp \
qtmaterialslider.cpp \
<<<<<<< HEAD \
qtmaterialsnackbar_internal.cpp \
qtmaterialsnackbar.cpp
qtmaterialsnackbar.cpp
=======
qtmaterialsnackbar.cpp \
qtmaterialradiobutton.cpp \
qtmaterialtoggle_internal.cpp \
qtmaterialtoggle.cpp \
@ -37,7 +34,6 @@ SOURCES = \
qtmaterialtabs.cpp \
qtmaterialscrollbar_internal.cpp \
qtmaterialscrollbar.cpp
>>>>>>> cleanup
HEADERS = \
qtmaterialavatar_p.h \
qtmaterialavatar.h \
@ -75,13 +71,9 @@ HEADERS = \
qtmaterialslider_internal.h \
qtmaterialslider_p.h \
qtmaterialslider.h \
<<<<<<< HEAD \
qtmaterialsnackbar_internal.h \
qtmaterialsnackbar_p.h \
qtmaterialsnackbar.h
qtmaterialsnackbar_p.h \
qtmaterialsnackbar.h
=======
qtmaterialsnackbar.h \
qtmaterialradiobutton_p.h \
qtmaterialradiobutton.h \
qtmaterialtoggle_internal.h \
@ -96,6 +88,5 @@ HEADERS = \
qtmaterialscrollbar_internal.h \
qtmaterialscrollbar_p.h \
qtmaterialscrollbar.h
>>>>>>> cleanup
RESOURCES += \
resources.qrc

View File

@ -1,7 +1,7 @@
#include "xx/qtmaterialsnackbar_internal.h"
#include "qtmaterialsnackbar_internal.h"
#include <QPropertyAnimation>
#include "xx/qtmaterialsnackbar.h"
#include "xxlib/qtmaterialstatetransition.h"
#include "qtmaterialsnackbar.h"
#include "lib/qtmaterialstatetransition.h"
#include <QDebug>
QtMaterialSnackbarStateMachine::QtMaterialSnackbarStateMachine(QtMaterialSnackbar *parent)

View File

@ -15,7 +15,8 @@ SOURCES = mainwindow.cpp \
radiobuttonsettingseditor.cpp \
togglesettingseditor.cpp \
textfieldsettingseditor.cpp \
tabssettingseditor.cpp
tabssettingseditor.cpp \
snackbarsettingseditor.cpp
HEADERS = mainwindow.h \
avatarsettingseditor.h \
badgesettingseditor.h \
@ -30,7 +31,8 @@ HEADERS = mainwindow.h \
radiobuttonsettingseditor.h \
togglesettingseditor.h \
textfieldsettingseditor.h \
tabssettingseditor.h
tabssettingseditor.h \
snackbarsettingseditor.h
LIBS += ../components/libcomponents.a
INCLUDEPATH += ../components/
TARGET = ../examples-exe

View File

@ -16,6 +16,7 @@
#include "togglesettingseditor.h"
#include "textfieldsettingseditor.h"
#include "tabssettingseditor.h"
#include "snackbarsettingseditor.h"
MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent)
@ -49,6 +50,7 @@ MainWindow::MainWindow(QWidget *parent)
ToggleSettingsEditor *toggle = new ToggleSettingsEditor;
TextFieldSettingsEditor *textField = new TextFieldSettingsEditor;
TabsSettingsEditor *tabs = new TabsSettingsEditor;
SnackbarSettingsEditor *snackbar = new SnackbarSettingsEditor;
stack->addWidget(avatar);
stack->addWidget(badge);
@ -61,6 +63,7 @@ MainWindow::MainWindow(QWidget *parent)
stack->addWidget(radioButton);
stack->addWidget(raisedButton);
stack->addWidget(slider);
stack->addWidget(snackbar);
stack->addWidget(tabs);
stack->addWidget(textField);
stack->addWidget(toggle);
@ -76,6 +79,7 @@ MainWindow::MainWindow(QWidget *parent)
list->addItem("Radio Button");
list->addItem("Raised Button");
list->addItem("Slider");
list->addItem("Snackbar");
list->addItem("Tabs");
list->addItem("Text Field");
list->addItem("Toggle");

View File

@ -0,0 +1,82 @@
#include "snackbarsettingseditor.h"
#include <QVBoxLayout>
#include <QColorDialog>
#include "qtmaterialsnackbar.h"
SnackbarSettingsEditor::SnackbarSettingsEditor(QWidget *parent)
: QWidget(parent),
ui(new Ui::SnackbarSettingsForm),
m_snackbar(new QtMaterialSnackbar)
{
QVBoxLayout *layout = new QVBoxLayout;
setLayout(layout);
QWidget *widget = new QWidget;
layout->addWidget(widget);
QWidget *canvas = new QWidget;
canvas->setStyleSheet("QWidget { background: white; }");
layout->addWidget(canvas);
ui->setupUi(widget);
layout->setContentsMargins(20, 20, 20, 20);
layout = new QVBoxLayout;
canvas->setLayout(layout);
canvas->setMaximumHeight(300);
// layout->addWidget(m_snackbar);
// layout->setAlignment(m_snackbar, Qt::AlignHCenter);
// setupForm();
// connect(ui->disabledCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateWidget()));
// connect(ui->valueLineEdit, SIGNAL(textChanged(QString)), this, SLOT(updateWidget()));
// connect(ui->orientationComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateWidget()));
// connect(ui->invertedCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateWidget()));
//
// connect(m_slider, SIGNAL(valueChanged(int)), this, SLOT(setupForm()));
}
SnackbarSettingsEditor::~SnackbarSettingsEditor()
{
delete ui;
}
void SnackbarSettingsEditor::setupForm()
{
// switch (m_slider->orientation())
// {
// case Qt::Horizontal:
// ui->orientationComboBox->setCurrentIndex(0);
// break;
// case Qt::Vertical:
// ui->orientationComboBox->setCurrentIndex(1);
// break;
// default:
// break;
// }
//
// ui->disabledCheckBox->setChecked(!m_slider->isEnabled());
// ui->valueLineEdit->setText(QString::number(m_slider->value()));
// ui->invertedCheckBox->setChecked(m_slider->invertedAppearance());
}
void SnackbarSettingsEditor::updateWidget()
{
// switch (ui->orientationComboBox->currentIndex())
// {
// case 0:
// m_slider->setOrientation(Qt::Horizontal);
// break;
// case 1:
// m_slider->setOrientation(Qt::Vertical);
// break;
// default:
// break;
// }
//
// m_slider->setDisabled(ui->disabledCheckBox->isChecked());
// m_slider->setValue(ui->valueLineEdit->text().toInt());
// m_slider->setInvertedAppearance(ui->invertedCheckBox->isChecked());
}

View File

@ -0,0 +1,26 @@
#ifndef SNACKBARSETTINGSEDITOR_H
#define SNACKBARSETTINGSEDITOR_H
#include <QWidget>
#include "ui_snackbarsettingsform.h"
class QtMaterialSnackbar;
class SnackbarSettingsEditor : public QWidget
{
Q_OBJECT
public:
explicit SnackbarSettingsEditor(QWidget *parent = 0);
~SnackbarSettingsEditor();
protected slots:
void setupForm();
void updateWidget();
private:
Ui::SnackbarSettingsForm *const ui;
QtMaterialSnackbar *const m_snackbar;
};
#endif // SNACKBARSETTINGSEDITOR_H