From 78828df3577aa6d962ddf00adcac28f49d65a9dc Mon Sep 17 00:00:00 2001
From: johanneshilden <hildenjohannes@gmail.com>
Date: Fri, 29 Sep 2017 21:17:44 +0300
Subject: [PATCH] Add Icon Menu

---
 components/components.pro           | 7 +++++--
 components/qtmaterialiconmenu.cpp   | 8 ++++----
 components/qtmaterialiconmenu.h     | 2 +-
 components/qtmaterialiconmenu_p.h   | 2 +-
 examples/examples.pro               | 9 ++++++---
 examples/iconmenusettingseditor.cpp | 8 ++++----
 examples/mainwindow.cpp             | 4 ++++
 7 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/components/components.pro b/components/components.pro
index 17b8815..16a489a 100644
--- a/components/components.pro
+++ b/components/components.pro
@@ -36,7 +36,8 @@ SOURCES = \
     qtmaterialcollapsiblemenu_internal.cpp \
     qtmaterialcollapsiblemenu.cpp \
     qtmaterialscrollbar_internal.cpp \
-    qtmaterialscrollbar.cpp
+    qtmaterialscrollbar.cpp \
+    qtmaterialiconmenu.cpp
 HEADERS = \
     qtmaterialavatar_p.h \
     qtmaterialavatar.h \
@@ -95,6 +96,8 @@ HEADERS = \
     qtmaterialcollapsiblemenu.h \
     qtmaterialscrollbar_internal.h \
     qtmaterialscrollbar_p.h \
-    qtmaterialscrollbar.h
+    qtmaterialscrollbar.h \
+    qtmaterialiconmenu_p.h \
+    qtmaterialiconmenu.h
 RESOURCES += \
     resources.qrc
diff --git a/components/qtmaterialiconmenu.cpp b/components/qtmaterialiconmenu.cpp
index 0a41741..8cc07e6 100644
--- a/components/qtmaterialiconmenu.cpp
+++ b/components/qtmaterialiconmenu.cpp
@@ -1,9 +1,9 @@
-#include "xx/qtmaterialiconmenu.h"
-#include "xx/qtmaterialiconmenu_p.h"
+#include "qtmaterialiconmenu.h"
+#include "qtmaterialiconmenu_p.h"
 #include <QEvent>
 #include <QTimer>
-#include "xxlib/qtmaterialoverlaywidget.h"
-#include "xx/qtmaterialcollapsiblemenu.h"
+#include "lib/qtmaterialoverlaywidget.h"
+#include "qtmaterialcollapsiblemenu.h"
 
 /*!
  *  \class QtMaterialIconMenuPrivate
diff --git a/components/qtmaterialiconmenu.h b/components/qtmaterialiconmenu.h
index 9468cac..99fb75d 100644
--- a/components/qtmaterialiconmenu.h
+++ b/components/qtmaterialiconmenu.h
@@ -1,7 +1,7 @@
 #ifndef QTMATERIALICONMENU_H
 #define QTMATERIALICONMENU_H
 
-#include "xx/qtmaterialiconbutton.h"
+#include "qtmaterialiconbutton.h"
 
 class QtMaterialIconMenuPrivate;
 class QtMaterialMenuItem;
diff --git a/components/qtmaterialiconmenu_p.h b/components/qtmaterialiconmenu_p.h
index 3cfda43..4331268 100644
--- a/components/qtmaterialiconmenu_p.h
+++ b/components/qtmaterialiconmenu_p.h
@@ -1,7 +1,7 @@
 #ifndef QTMATERIALICONMENU_P_H
 #define QTMATERIALICONMENU_P_H
 
-#include "xx/qtmaterialiconbutton_p.h"
+#include "qtmaterialiconbutton_p.h"
 
 class QtMaterialIconMenu;
 class QtMaterialOverlayWidget;
diff --git a/examples/examples.pro b/examples/examples.pro
index db94f02..9744ed1 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -17,7 +17,8 @@ SOURCES = mainwindow.cpp \
     togglesettingseditor.cpp \
     textfieldsettingseditor.cpp \
     tabssettingseditor.cpp \
-    selectfieldsettingseditor.cpp
+    selectfieldsettingseditor.cpp \
+    iconmenusettingseditor.cpp
 HEADERS = mainwindow.h \
     avatarsettingseditor.h \
     badgesettingseditor.h \
@@ -35,7 +36,8 @@ HEADERS = mainwindow.h \
     togglesettingseditor.h \
     textfieldsettingseditor.h \
     tabssettingseditor.h \
-    selectfieldsettingseditor.h
+    selectfieldsettingseditor.h \
+    iconmenusettingseditor.h
 LIBS += ../components/libcomponents.a
 INCLUDEPATH += ../components/
 TARGET = ../examples-exe
@@ -56,4 +58,5 @@ FORMS += \
     radiobuttonsettingsform.ui \
     togglesettingsform.ui \
     textfieldsettingsform.ui \
-    selectfieldsettingsform.ui
+    selectfieldsettingsform.ui \
+    iconmenusettingsform.ui
diff --git a/examples/iconmenusettingseditor.cpp b/examples/iconmenusettingseditor.cpp
index 4db69db..aec2c49 100644
--- a/examples/iconmenusettingseditor.cpp
+++ b/examples/iconmenusettingseditor.cpp
@@ -1,14 +1,14 @@
-#include "yy/iconmenusettingseditor.h"
+#include "iconmenusettingseditor.h"
 #include <QVBoxLayout>
 #include <QDebug>
 #include <QColorDialog>
-#include "xx/qtmaterialiconmenu.h"
-#include "xx/qtmaterialmenuitem.h"
+#include "qtmaterialiconmenu.h"
+#include "qtmaterialmenuitem.h"
 
 IconMenuSettingsEditor::IconMenuSettingsEditor(QWidget *parent)
     : QWidget(parent),
       ui(new Ui::IconMenuSettingsForm),
-      m_iconMenu(new QtMaterialIconMenu(QIcon("../qt-material-widgets/ic_star_black_24px.svg")))
+      m_iconMenu(new QtMaterialIconMenu(QtMaterialTheme::icon("toggle", "star")))
 {
     QVBoxLayout *layout = new QVBoxLayout;
     setLayout(layout);
diff --git a/examples/mainwindow.cpp b/examples/mainwindow.cpp
index 429b73d..a864b48 100644
--- a/examples/mainwindow.cpp
+++ b/examples/mainwindow.cpp
@@ -17,6 +17,7 @@
 #include "textfieldsettingseditor.h"
 #include "tabssettingseditor.h"
 #include "selectfieldsettingseditor.h"
+#include "iconmenusettingseditor.h"
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
@@ -51,6 +52,7 @@ MainWindow::MainWindow(QWidget *parent)
     TextFieldSettingsEditor *textField = new TextFieldSettingsEditor;
     TabsSettingsEditor *tabs = new TabsSettingsEditor;
     SelectFieldSettingsEditor *selectField = new SelectFieldSettingsEditor;
+    IconMenuSettingsEditor *iconMenu = new IconMenuSettingsEditor;
 
     stack->addWidget(avatar);
     stack->addWidget(badge);
@@ -59,6 +61,7 @@ MainWindow::MainWindow(QWidget *parent)
     stack->addWidget(fab);
     stack->addWidget(flatButton);
     stack->addWidget(iconButton);
+    stack->addWidget(iconMenu);
     stack->addWidget(progress);
     stack->addWidget(radioButton);
     stack->addWidget(raisedButton);
@@ -75,6 +78,7 @@ MainWindow::MainWindow(QWidget *parent)
     list->addItem("Floating Action Button");
     list->addItem("Flat Button");
     list->addItem("Icon Button");
+    list->addItem("Icon Menu");
     list->addItem("Progress");
     list->addItem("Radio Button");
     list->addItem("Raised Button");