From 96be2968452df3610e3785d2197b73721e7b8134 Mon Sep 17 00:00:00 2001 From: laserpants Date: Sun, 19 Jun 2016 12:17:31 +0300 Subject: [PATCH] mess up examples even further --- examples/appbarexamples.cpp | 30 +++++++++++++++++++++++++++++- examples/appbarexamples.h | 2 +- examples/avatarexamples.cpp | 18 ++++++++++++++++++ examples/textfieldexamples.cpp | 16 ++++++++++++++++ 4 files changed, 64 insertions(+), 2 deletions(-) diff --git a/examples/appbarexamples.cpp b/examples/appbarexamples.cpp index 37400ac..3fd6a59 100644 --- a/examples/appbarexamples.cpp +++ b/examples/appbarexamples.cpp @@ -1,12 +1,39 @@ #include +#include +#include #include "appbarexamples.h" #include "components/appbar.h" #include "frame.h" #include "components/progress.h" +#include "components/circularprogress.h" AppBarExamples::AppBarExamples(QWidget *parent) - : ExampleList(parent) + : QWidget(parent) { + Progress *p = new Progress; + + QVBoxLayout *l = new QVBoxLayout; + + setLayout(l); + + l->addStretch(1); + + l->addWidget(p); + + CircularProgress *cp = new CircularProgress; + cp->setSize(30); + + l->addWidget(cp); + + QProgressBar *pb = new QProgressBar; + + QPushButton *b = new QPushButton; + + l->addWidget(b); + + l->addWidget(pb); + + /* QLayout *mainLayout = widget()->layout(); { @@ -53,6 +80,7 @@ AppBarExamples::AppBarExamples(QWidget *parent) mainLayout->addWidget(frame); } + */ } AppBarExamples::~AppBarExamples() diff --git a/examples/appbarexamples.h b/examples/appbarexamples.h index 53d2605..f7ad61d 100644 --- a/examples/appbarexamples.h +++ b/examples/appbarexamples.h @@ -3,7 +3,7 @@ #include "examplelist.h" -class AppBarExamples : public ExampleList +class AppBarExamples : public QWidget { Q_OBJECT diff --git a/examples/avatarexamples.cpp b/examples/avatarexamples.cpp index cd8cb72..2767365 100644 --- a/examples/avatarexamples.cpp +++ b/examples/avatarexamples.cpp @@ -135,6 +135,24 @@ AvatarExamples::AvatarExamples(QWidget *parent) ); frame->setWidget(view); + layout->addWidget(frame); + } + { + Avatar *avatar = new Avatar; + avatar->setSize(80); + + QImage img("../qt-material-widgets/sikh.jpg"); + avatar->setImage(img); + + ExampleView *view = new ExampleView; + view->setWidget(avatar); + + Frame *frame = new Frame; + frame->setCodeSnippet( + "hello" + ); + frame->setWidget(view); + layout->addWidget(frame); } } diff --git a/examples/textfieldexamples.cpp b/examples/textfieldexamples.cpp index 93ce6f4..1592329 100644 --- a/examples/textfieldexamples.cpp +++ b/examples/textfieldexamples.cpp @@ -71,6 +71,22 @@ TextFieldExamples::TextFieldExamples(QWidget *parent) layout->addWidget(frame); } + { + TextField *textField = new TextField; + textField->setDisabled(true); + textField->setLabel("Disabled"); + + ExampleView *view = new ExampleView; + view->setWidget(textField); + + Frame *frame = new Frame; + frame->setCodeSnippet( + "hello" + ); + frame->setWidget(view); + + layout->addWidget(frame); + } { QLineEdit *edit = new QLineEdit;