From 523db871138277062675db9108cbcb3ca61da5e1 Mon Sep 17 00:00:00 2001 From: Nick Dedekind Date: Tue, 8 Sep 2015 12:38:18 +0100 Subject: accelerators --- libqmenumodel/src/unitymenumodel.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'libqmenumodel') diff --git a/libqmenumodel/src/unitymenumodel.cpp b/libqmenumodel/src/unitymenumodel.cpp index 63d5e5b..56d73c6 100644 --- a/libqmenumodel/src/unitymenumodel.cpp +++ b/libqmenumodel/src/unitymenumodel.cpp @@ -50,7 +50,9 @@ enum MenuRoles { ActionStateRole, IsCheckRole, IsRadioRole, - IsToggledRole + IsToggledRole, + KeySequence, + HasSubmenu }; class UnityMenuModelPrivate @@ -482,6 +484,12 @@ QVariant UnityMenuModel::data(const QModelIndex &index, int role) const case IsToggledRole: return gtk_menu_tracker_item_get_toggled (item) == TRUE ? true : false; + case KeySequence: + return QKeySequence(gtk_menu_tracker_item_get_accel (item), QKeySequence::NativeText); + + case HasSubmenu: + return gtk_menu_tracker_item_get_has_submenu (item) == TRUE ? true : false; + default: return QVariant(); } @@ -513,6 +521,8 @@ QHash UnityMenuModel::roleNames() const names[IsCheckRole] = "isCheck"; names[IsRadioRole] = "isRadio"; names[IsToggledRole] = "isToggled"; + names[KeySequence] = "keySequence"; + names[HasSubmenu] = "hasSubmenu"; return names; } -- cgit v1.2.3 From 388be5be7f75b06578074d7a0f6e80caf06f31cb Mon Sep 17 00:00:00 2001 From: Nick Dedekind Date: Tue, 4 Oct 2016 13:17:20 +0100 Subject: better boolean check --- libqmenumodel/src/unitymenumodel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libqmenumodel') diff --git a/libqmenumodel/src/unitymenumodel.cpp b/libqmenumodel/src/unitymenumodel.cpp index 8b64ee2..6a75f40 100644 --- a/libqmenumodel/src/unitymenumodel.cpp +++ b/libqmenumodel/src/unitymenumodel.cpp @@ -483,13 +483,13 @@ QVariant UnityMenuModel::data(const QModelIndex &index, int role) const return gtk_menu_tracker_item_get_role (item) == GTK_MENU_TRACKER_ITEM_ROLE_RADIO; case IsToggledRole: - return gtk_menu_tracker_item_get_toggled (item) == TRUE ? true : false; + return gtk_menu_tracker_item_get_toggled (item) != FALSE; case ShortcutRole: return QKeySequence(gtk_menu_tracker_item_get_accel (item), QKeySequence::NativeText); case HasSubmenuRole: - return gtk_menu_tracker_item_get_has_submenu (item) == TRUE ? true : false; + return gtk_menu_tracker_item_get_has_submenu (item) != FALSE; default: return QVariant(); -- cgit v1.2.3