From 9ad24d127cb0a3f8150ac9bbc124da66c8948d76 Mon Sep 17 00:00:00 2001 From: Johannes Hilden Date: Sun, 15 Oct 2017 16:54:35 +0300 Subject: [PATCH] Fill out scaffolding code in menu component --- components/qtmaterialmenu.cpp | 9 ++++ components/qtmaterialmenu.h | 11 +++++ examples/mainwindow.cpp | 4 ++ examples/menusettingseditor.cpp | 85 +++++---------------------------- examples/menusettingseditor.h | 20 ++++---- 5 files changed, 45 insertions(+), 84 deletions(-) diff --git a/components/qtmaterialmenu.cpp b/components/qtmaterialmenu.cpp index 2bca0bb..5808a99 100644 --- a/components/qtmaterialmenu.cpp +++ b/components/qtmaterialmenu.cpp @@ -1,2 +1,11 @@ #include "qtmaterialmenu.h" #include "qtmaterialmenu_p.h" + +QtMaterialMenu::QtMaterialMenu(QWidget *parent) + : QWidget(parent) +{ +} + +QtMaterialMenu::~QtMaterialMenu() +{ +} diff --git a/components/qtmaterialmenu.h b/components/qtmaterialmenu.h index 0964481..beb01b5 100644 --- a/components/qtmaterialmenu.h +++ b/components/qtmaterialmenu.h @@ -1,4 +1,15 @@ #ifndef QTMATERIALMENU_H #define QTMATERIALMENU_H +#include + +class QtMaterialMenu : public QWidget +{ + Q_OBJECT + +public: + explicit QtMaterialMenu(QWidget *parent = 0); + ~QtMaterialMenu(); +}; + #endif // QTMATERIALMENU_H diff --git a/examples/mainwindow.cpp b/examples/mainwindow.cpp index 404bfd7..cc4992e 100644 --- a/examples/mainwindow.cpp +++ b/examples/mainwindow.cpp @@ -22,6 +22,7 @@ #include "scrollbarsettingseditor.h" #include "appbarsettingseditor.h" #include "autocompletesettingseditor.h" +#include "menusettingseditor.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) @@ -61,6 +62,7 @@ MainWindow::MainWindow(QWidget *parent) ScrollBarSettingsEditor *scrollBar = new ScrollBarSettingsEditor; AppBarSettingsEditor *appBar = new AppBarSettingsEditor; AutoCompleteSettingsEditor *autocomplete = new AutoCompleteSettingsEditor; + MenuSettingsEditor *menu = new MenuSettingsEditor; stack->addWidget(appBar); stack->addWidget(autocomplete); @@ -73,6 +75,7 @@ MainWindow::MainWindow(QWidget *parent) stack->addWidget(fab); stack->addWidget(flatButton); stack->addWidget(iconButton); + stack->addWidget(menu); stack->addWidget(progress); stack->addWidget(radioButton); stack->addWidget(raisedButton); @@ -94,6 +97,7 @@ MainWindow::MainWindow(QWidget *parent) 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"); diff --git a/examples/menusettingseditor.cpp b/examples/menusettingseditor.cpp index 0c8dede..fcf5c65 100644 --- a/examples/menusettingseditor.cpp +++ b/examples/menusettingseditor.cpp @@ -1,12 +1,12 @@ -#include "autocompletesettingseditor.h" +#include "menusettingseditor.h" #include #include -#include +#include -AutoCompleteSettingsEditor::AutoCompleteSettingsEditor(QWidget *parent) +MenuSettingsEditor::MenuSettingsEditor(QWidget *parent) : QWidget(parent), - //ui(new Ui::AutoCompleteSettingsForm), - m_autocomplete(new QtMaterialAutoComplete) + //ui(new Ui::MenuSettingsForm), + m_menu(new QtMaterialMenu) { QVBoxLayout *layout = new QVBoxLayout; setLayout(layout); @@ -18,95 +18,32 @@ AutoCompleteSettingsEditor::AutoCompleteSettingsEditor(QWidget *parent) canvas->setStyleSheet("QWidget { background: white; }"); layout->addWidget(canvas); - canvas->setMinimumHeight(900); // - //ui->setupUi(widget); layout->setContentsMargins(20, 20, 20, 20); layout = new QVBoxLayout; canvas->setLayout(layout); - QStringList states = - { "Alabama" - , "Alaska" - , "American Samoa" - , "Arizona" - , "Arkansas" - , "California" - , "Colorado" - , "Connecticut" - , "Delaware" - , "District of Columbia" - , "Florida" - , "Georgia" - , "Guam" - , "Hawaii" - , "Idaho" - , "Illinois" - , "Indiana" - , "Iowa" - , "Kansas" - , "Kentucky" - , "Louisiana" - , "Maine" - , "Maryland" - , "Massachusetts" - , "Michigan" - , "Minnesota" - , "Mississippi" - , "Missouri" - , "Montana" - , "Nebraska" - , "Nevada" - , "New Hampshire" - , "New Jersey" - , "New Mexico" - , "New York" - , "North Carolina" - , "North Dakota" - , "Northern Marianas Islands" - , "Ohio" - , "Oklahoma" - , "Oregon" - , "Pennsylvania" - , "Puerto Rico" - , "Rhode Island" - , "South Carolina" - , "South Dakota" - , "Tennessee" - , "Texas" - , "Utah" - , "Vermont" - , "Virginia" - , "Virgin Islands" - , "Washington" - , "West Virginia" - , "Wisconsin" - , "Wyoming" - }; - - m_autocomplete->setDataSource(states); - - layout->addWidget(m_autocomplete); + layout->addWidget(m_menu); layout->addSpacing(600); - layout->setAlignment(m_autocomplete, Qt::AlignCenter); + layout->setAlignment(m_menu, Qt::AlignCenter); setupForm(); } -AutoCompleteSettingsEditor::~AutoCompleteSettingsEditor() +MenuSettingsEditor::~MenuSettingsEditor() { //delete ui; } -void AutoCompleteSettingsEditor::setupForm() +void MenuSettingsEditor::setupForm() { } -void AutoCompleteSettingsEditor::updateWidget() +void MenuSettingsEditor::updateWidget() { } -void AutoCompleteSettingsEditor::selectColor() +void MenuSettingsEditor::selectColor() { } diff --git a/examples/menusettingseditor.h b/examples/menusettingseditor.h index b6c5743..bed5c41 100644 --- a/examples/menusettingseditor.h +++ b/examples/menusettingseditor.h @@ -1,20 +1,20 @@ -#ifndef AUTOCOMPLETESETTINGSEDITOR_H -#define AUTOCOMPLETESETTINGSEDITOR_H +#ifndef MENUSETTINGSEDITOR_H +#define MENUSETTINGSEDITOR_H #include -//#include "ui_autocompletesettingsform.h" +//#include "ui_menusettingsform.h" #include "lib/qtmaterialoverlaywidget.h" -class QtMaterialAutoComplete; +class QtMaterialMenu; -class AutoCompleteSettingsEditor : public QWidget +class MenuSettingsEditor : public QWidget { Q_OBJECT public: - explicit AutoCompleteSettingsEditor(QWidget *parent = 0); - ~AutoCompleteSettingsEditor(); + explicit MenuSettingsEditor(QWidget *parent = 0); + ~MenuSettingsEditor(); protected slots: void setupForm(); @@ -22,8 +22,8 @@ protected slots: void selectColor(); private: - //Ui::AutoCompleteSettingsForm *const ui; - QtMaterialAutoComplete *const m_autocomplete; + //Ui::MenuSettingsForm *const ui; + QtMaterialMenu *const m_menu; }; -#endif // AUTOCOMPLETESETTINGSEDITOR_H +#endif // MENUSETTINGSEDITOR_H