168492376
/
qt-material-widgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Icon Menu

This commit is contained in:
johanneshilden 2017-09-29 21:17:44 +03:00
parent 8515cc2c8f
commit 78828df357
7 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/components.pro
View File

@ -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

8
components/qtmaterialiconmenu.cpp
View File

@ -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

2
components/qtmaterialiconmenu.h
View File

@ -1,7 +1,7 @@
#ifndef QTMATERIALICONMENU_H
#define QTMATERIALICONMENU_H
#include "xx/qtmaterialiconbutton.h"
#include "qtmaterialiconbutton.h"
class QtMaterialIconMenuPrivate;
class QtMaterialMenuItem;

2
components/qtmaterialiconmenu_p.h
View File

@ -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;

9
examples/examples.pro
View File

@ -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

8
examples/iconmenusettingseditor.cpp
View File

@ -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);

4
examples/mainwindow.cpp
View File

@ -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");