From 4fc790c377f4ca154ea5fc8beca6fd9078edf2ee Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 4 Jun 2013 15:35:59 -0400 Subject: Introduce UnityMenuModel and UnityQmlMenuModel UnityMenuModel serves the same purpose as QMenuModel, but it is based on GtkMenuTracker and has a different API. GtkMenuTracker is maintained in gtk, but meant to be copy-and-pasted into other consumers of menu models. It does not introduce new dependencies. It does give us access to all the features that GMenuModel has. --- libqmenumodel/src/CMakeLists.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'libqmenumodel/src/CMakeLists.txt') diff --git a/libqmenumodel/src/CMakeLists.txt b/libqmenumodel/src/CMakeLists.txt index 1fb89df..cd81371 100644 --- a/libqmenumodel/src/CMakeLists.txt +++ b/libqmenumodel/src/CMakeLists.txt @@ -9,6 +9,19 @@ set(QMENUMODEL_SRC qdbusmenumodel.cpp qdbusactiongroup.cpp qstateaction.cpp + unitymenumodel.cpp + unitymenumodel.h + unityqmlmenumodel.cpp + gtk/gtkactionmuxer.c + gtk/gtkactionmuxer.h + gtk/gtkactionobservable.c + gtk/gtkactionobservable.h + gtk/gtkactionobserver.c + gtk/gtkactionobserver.h + gtk/gtkmenutracker.c + gtk/gtkmenutracker.h + gtk/gtkmenutrackeritem.c + gtk/gtkmenutrackeritem.h ) set(SHAREDLIBNAME qmenumodel) @@ -43,6 +56,7 @@ set(QMENUMODEL_HEADERS qdbusobject.h qmenumodel.h qstateaction.h + unitymenumodel.h ) set(INCLUDEDIR qmenumodel) -- cgit v1.2.3 From 550306421fa0ece045d3e8930fdc7f135fe70c47 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 4 Jun 2013 15:40:43 -0400 Subject: CMakeLists.txt: explicitly specify qml include path CMake doesn't call moc correctly if this is not specified. --- libqmenumodel/src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'libqmenumodel/src/CMakeLists.txt') diff --git a/libqmenumodel/src/CMakeLists.txt b/libqmenumodel/src/CMakeLists.txt index cd81371..d1d19c9 100644 --- a/libqmenumodel/src/CMakeLists.txt +++ b/libqmenumodel/src/CMakeLists.txt @@ -36,6 +36,7 @@ set_target_properties(${SHAREDLIBNAME} PROPERTIES ) include_directories( + /usr/include/qt5/QtQml ${GLIB_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS} ) -- cgit v1.2.3 From 692926cb12c8f8e6d3969c249dbf924a0bd1499b Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 5 Jun 2013 10:29:43 -0400 Subject: Link against the qml module Reverts r69, that was nonsense. --- libqmenumodel/src/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libqmenumodel/src/CMakeLists.txt') diff --git a/libqmenumodel/src/CMakeLists.txt b/libqmenumodel/src/CMakeLists.txt index d1d19c9..a2a6177 100644 --- a/libqmenumodel/src/CMakeLists.txt +++ b/libqmenumodel/src/CMakeLists.txt @@ -36,7 +36,6 @@ set_target_properties(${SHAREDLIBNAME} PROPERTIES ) include_directories( - /usr/include/qt5/QtQml ${GLIB_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS} ) @@ -46,7 +45,7 @@ target_link_libraries(${SHAREDLIBNAME} ${GIO_LDFLAGS} ) -qt5_use_modules(${SHAREDLIBNAME} Core) +qt5_use_modules(${SHAREDLIBNAME} Core Qml) install(TARGETS ${SHAREDLIBNAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- cgit v1.2.3 From 050958c58924934b10cf3a6272cff3ebe867f1dd Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Mon, 24 Jun 2013 17:04:57 -0400 Subject: Remove unityqmlmenumodel It was used for calling ::init() on the unitymenumodel when parsing finished (so that unitymenumodel wouldn't have to implement QQmlParserStatus). Now that init() is gone, unityqmlmenumodel doesn't serve any purpose. --- libqmenumodel/src/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'libqmenumodel/src/CMakeLists.txt') diff --git a/libqmenumodel/src/CMakeLists.txt b/libqmenumodel/src/CMakeLists.txt index a2a6177..d74f2cc 100644 --- a/libqmenumodel/src/CMakeLists.txt +++ b/libqmenumodel/src/CMakeLists.txt @@ -11,7 +11,6 @@ set(QMENUMODEL_SRC qstateaction.cpp unitymenumodel.cpp unitymenumodel.h - unityqmlmenumodel.cpp gtk/gtkactionmuxer.c gtk/gtkactionmuxer.h gtk/gtkactionobservable.c -- cgit v1.2.3 From 6aaafd55328c1860fd1b734fa29ff77673538a2b Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 25 Jun 2013 15:39:11 -0400 Subject: unitymenumodel: add support for icons For now, this includes themed icons, file icons, and icons send as raw data. --- libqmenumodel/src/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libqmenumodel/src/CMakeLists.txt') diff --git a/libqmenumodel/src/CMakeLists.txt b/libqmenumodel/src/CMakeLists.txt index d74f2cc..24b65d2 100644 --- a/libqmenumodel/src/CMakeLists.txt +++ b/libqmenumodel/src/CMakeLists.txt @@ -10,7 +10,7 @@ set(QMENUMODEL_SRC qdbusactiongroup.cpp qstateaction.cpp unitymenumodel.cpp - unitymenumodel.h + unitythemediconprovider.cpp gtk/gtkactionmuxer.c gtk/gtkactionmuxer.h gtk/gtkactionobservable.c @@ -44,7 +44,7 @@ target_link_libraries(${SHAREDLIBNAME} ${GIO_LDFLAGS} ) -qt5_use_modules(${SHAREDLIBNAME} Core Qml) +qt5_use_modules(${SHAREDLIBNAME} Core Qml Quick) install(TARGETS ${SHAREDLIBNAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) @@ -56,6 +56,7 @@ set(QMENUMODEL_HEADERS qmenumodel.h qstateaction.h unitymenumodel.h + unitythemediconprovider.h ) set(INCLUDEDIR qmenumodel) -- cgit v1.2.3 From 01d57d800729a0ca7b9fd023b47b4517495883b3 Mon Sep 17 00:00:00 2001 From: Nick Dedekind Date: Tue, 30 Jul 2013 07:01:48 +0200 Subject: Add ActionStateParser --- libqmenumodel/src/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libqmenumodel/src/CMakeLists.txt') diff --git a/libqmenumodel/src/CMakeLists.txt b/libqmenumodel/src/CMakeLists.txt index 24b65d2..cf9c426 100644 --- a/libqmenumodel/src/CMakeLists.txt +++ b/libqmenumodel/src/CMakeLists.txt @@ -1,6 +1,7 @@ project(src) set(QMENUMODEL_SRC + actionstateparser.cpp converter.cpp dbus-enums.h menunode.cpp @@ -49,6 +50,7 @@ qt5_use_modules(${SHAREDLIBNAME} Core Qml Quick) install(TARGETS ${SHAREDLIBNAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) set(QMENUMODEL_HEADERS + actionstateparser.h dbus-enums.h qdbusactiongroup.h qdbusmenumodel.h -- cgit v1.2.3 From d1c96de04570d8365c2ab2fde597ccd21c7a3dc2 Mon Sep 17 00:00:00 2001 From: Nick Dedekind Date: Tue, 30 Jul 2013 12:23:42 +0200 Subject: Add action role (replacing actionState role) --- libqmenumodel/src/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libqmenumodel/src/CMakeLists.txt') diff --git a/libqmenumodel/src/CMakeLists.txt b/libqmenumodel/src/CMakeLists.txt index cf9c426..e0ee902 100644 --- a/libqmenumodel/src/CMakeLists.txt +++ b/libqmenumodel/src/CMakeLists.txt @@ -10,6 +10,7 @@ set(QMENUMODEL_SRC qdbusmenumodel.cpp qdbusactiongroup.cpp qstateaction.cpp + unitymenuaction.cpp unitymenumodel.cpp unitythemediconprovider.cpp gtk/gtkactionmuxer.c @@ -57,6 +58,7 @@ set(QMENUMODEL_HEADERS qdbusobject.h qmenumodel.h qstateaction.h + unitymenuaction.h unitymenumodel.h unitythemediconprovider.h ) -- cgit v1.2.3 From 2bbdf4e2347ec566280b9d878a12b7b1e732f632 Mon Sep 17 00:00:00 2001 From: Nick Dedekind Date: Fri, 9 Aug 2013 10:50:12 +0100 Subject: glib callbacks pass events through qt. --- libqmenumodel/src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'libqmenumodel/src/CMakeLists.txt') diff --git a/libqmenumodel/src/CMakeLists.txt b/libqmenumodel/src/CMakeLists.txt index e0ee902..db8095a 100644 --- a/libqmenumodel/src/CMakeLists.txt +++ b/libqmenumodel/src/CMakeLists.txt @@ -12,6 +12,7 @@ set(QMENUMODEL_SRC qstateaction.cpp unitymenuaction.cpp unitymenumodel.cpp + unitymenumodelevents.cpp unitythemediconprovider.cpp gtk/gtkactionmuxer.c gtk/gtkactionmuxer.h -- cgit v1.2.3