History

Merge pull request #4663 from ctrlaltdavid/menu-tidying

Move visibility methods into DiscoverabilityManager

Clément Brisset committed 11 years ago

Commit 464c69d2 parents 3814fbc 931c4634 files · +37 −36Browse files

Unified · Split

4 files
  1. interface/src/DiscoverabilityManager.cpp +30 −1
  2. interface/src/DiscoverabilityManager.h +3 −0
  3. interface/src/Menu.cpp +4 −30
  4. interface/src/Menu.h +0 −5
interface/src/DiscoverabilityManager.cpp+30−1
@@ -18,6 +18,7 @@ · 17 unmodified lines
18#include <UUID.h>18#include <UUID.h>
19 19
20#include "DiscoverabilityManager.h"20#include "DiscoverabilityManager.h"
21#include "Menu.h"
21 22
22const Discoverability::Mode DEFAULT_DISCOVERABILITY_MODE = Discoverability::All;23const Discoverability::Mode DEFAULT_DISCOVERABILITY_MODE = Discoverability::All;
23 24
@@ -96,4 +97,32 @@ void DiscoverabilityManager::setDiscoverabilityMode(Discoverability::Mode discov · 72 unmodified lines
96 97
97 emit discoverabilityModeChanged(discoverabilityMode);98 emit discoverabilityModeChanged(discoverabilityMode);
98 }99 }
99}100}
101
102void DiscoverabilityManager::setVisibility() {
103 Menu* menu = Menu::getInstance();
104
105 if (menu->isOptionChecked(MenuOption::VisibleToEveryone)) {
106 this->setDiscoverabilityMode(Discoverability::All);
107 } else if (menu->isOptionChecked(MenuOption::VisibleToFriends)) {
108 this->setDiscoverabilityMode(Discoverability::Friends);
109 } else if (menu->isOptionChecked(MenuOption::VisibleToNoOne)) {
110 this->setDiscoverabilityMode(Discoverability::None);
111 } else {
112 qDebug() << "ERROR DiscoverabilityManager::setVisibility() called with unrecognized value.";
113 }
114}
115
116void DiscoverabilityManager::visibilityChanged(Discoverability::Mode discoverabilityMode) {
117 Menu* menu = Menu::getInstance();
118
119 if (discoverabilityMode == Discoverability::All) {
120 menu->setIsOptionChecked(MenuOption::VisibleToEveryone, true);
121 } else if (discoverabilityMode == Discoverability::Friends) {
122 menu->setIsOptionChecked(MenuOption::VisibleToFriends, true);
123 } else if (discoverabilityMode == Discoverability::None) {
124 menu->setIsOptionChecked(MenuOption::VisibleToNoOne, true);
125 } else {
126 qDebug() << "ERROR DiscoverabilityManager::visibilityChanged() called with unrecognized value.";
127 }
128}
interface/src/DiscoverabilityManager.h+3−0
@@ -36,6 +36,9 @@ public slots: · 35 unmodified lines
36 Discoverability::Mode getDiscoverabilityMode() { return static_cast<Discoverability::Mode>(_mode.get()); }36 Discoverability::Mode getDiscoverabilityMode() { return static_cast<Discoverability::Mode>(_mode.get()); }
37 void setDiscoverabilityMode(Discoverability::Mode discoverabilityMode);37 void setDiscoverabilityMode(Discoverability::Mode discoverabilityMode);
38 38
39 void setVisibility();
40 void visibilityChanged(Discoverability::Mode discoverabilityMode);
41
39signals:42signals:
40 void discoverabilityModeChanged(Discoverability::Mode discoverabilityMode);43 void discoverabilityModeChanged(Discoverability::Mode discoverabilityMode);
41 44
interface/src/Menu.cpp+4−30
@@ -163,21 +163,21 @@ Menu::Menu() { · 162 unmodified lines
163 163
164 QAction* visibleToEveryone = addCheckableActionToQMenuAndActionHash(visibilityMenu, MenuOption::VisibleToEveryone,164 QAction* visibleToEveryone = addCheckableActionToQMenuAndActionHash(visibilityMenu, MenuOption::VisibleToEveryone,
165 0, discoverabilityManager->getDiscoverabilityMode() == Discoverability::All,165 0, discoverabilityManager->getDiscoverabilityMode() == Discoverability::All,
166 this, SLOT(setVisibility()));166 discoverabilityManager.data(), SLOT(setVisibility()));
167 visibilityGroup->addAction(visibleToEveryone);167 visibilityGroup->addAction(visibleToEveryone);
168 168
169 QAction* visibleToFriends = addCheckableActionToQMenuAndActionHash(visibilityMenu, MenuOption::VisibleToFriends,169 QAction* visibleToFriends = addCheckableActionToQMenuAndActionHash(visibilityMenu, MenuOption::VisibleToFriends,
170 0, discoverabilityManager->getDiscoverabilityMode() == Discoverability::Friends,170 0, discoverabilityManager->getDiscoverabilityMode() == Discoverability::Friends,
171 this, SLOT(setVisibility()));171 discoverabilityManager.data(), SLOT(setVisibility()));
172 visibilityGroup->addAction(visibleToFriends);172 visibilityGroup->addAction(visibleToFriends);
173 173
174 QAction* visibleToNoOne = addCheckableActionToQMenuAndActionHash(visibilityMenu, MenuOption::VisibleToNoOne,174 QAction* visibleToNoOne = addCheckableActionToQMenuAndActionHash(visibilityMenu, MenuOption::VisibleToNoOne,
175 0, discoverabilityManager->getDiscoverabilityMode() == Discoverability::None,175 0, discoverabilityManager->getDiscoverabilityMode() == Discoverability::None,
176 this, SLOT(setVisibility()));176 discoverabilityManager.data(), SLOT(setVisibility()));
177 visibilityGroup->addAction(visibleToNoOne);177 visibilityGroup->addAction(visibleToNoOne);
178 178
179 connect(discoverabilityManager.data(), &DiscoverabilityManager::discoverabilityModeChanged, 179 connect(discoverabilityManager.data(), &DiscoverabilityManager::discoverabilityModeChanged,
180 this, &Menu::visibilityChanged);180 discoverabilityManager.data(), &DiscoverabilityManager::visibilityChanged);
181 }181 }
182 182
183 addActionToQMenuAndActionHash(toolsMenu,183 addActionToQMenuAndActionHash(toolsMenu,
@@ -963,29 +963,3 @@ bool Menu::menuItemExists(const QString& menu, const QString& menuitem) { · 779 unmodified lines
963 }963 }
964 return false;964 return false;
965};965};
966
967void Menu::setVisibility() {
968 auto discoverabilityManager = DependencyManager::get<DiscoverabilityManager>();
969
970 if (Menu::getInstance()->isOptionChecked(MenuOption::VisibleToEveryone)) {
971 discoverabilityManager->setDiscoverabilityMode(Discoverability::All);
972 } else if (Menu::getInstance()->isOptionChecked(MenuOption::VisibleToFriends)) {
973 discoverabilityManager->setDiscoverabilityMode(Discoverability::Friends);
974 } else if (Menu::getInstance()->isOptionChecked(MenuOption::VisibleToNoOne)) {
975 discoverabilityManager->setDiscoverabilityMode(Discoverability::None);
976 } else {
977 qCDebug(interfaceapp) << "ERROR Menu::setVisibility() called with unrecognized value.";
978 }
979}
980
981void Menu::visibilityChanged(Discoverability::Mode discoverabilityMode) {
982 if (discoverabilityMode == Discoverability::All) {
983 setIsOptionChecked(MenuOption::VisibleToEveryone, true);
984 } else if (discoverabilityMode == Discoverability::Friends) {
985 setIsOptionChecked(MenuOption::VisibleToFriends, true);
986 } else if (discoverabilityMode == Discoverability::None) {
987 setIsOptionChecked(MenuOption::VisibleToNoOne, true);
988 } else {
989 qCDebug(interfaceapp) << "ERROR Menu::visibilityChanged() called with unrecognized value.";
990 }
991}
interface/src/Menu.h+0−5
@@ -66,9 +66,6 @@ public slots: · 65 unmodified lines
66 bool isOptionChecked(const QString& menuOption) const;66 bool isOptionChecked(const QString& menuOption) const;
67 void setIsOptionChecked(const QString& menuOption, bool isChecked);67 void setIsOptionChecked(const QString& menuOption, bool isChecked);
68 68
69private slots:
70 void setVisibility();
71
72private:69private:
73 static Menu* _instance;70 static Menu* _instance;
74 Menu();71 Menu();
@@ -99,8 +96,6 @@ private: · 24 unmodified lines
99 int findPositionOfMenuItem(QMenu* menu, const QString& searchMenuItem);96 int findPositionOfMenuItem(QMenu* menu, const QString& searchMenuItem);
100 int positionBeforeSeparatorIfNeeded(QMenu* menu, int requestedPosition);97 int positionBeforeSeparatorIfNeeded(QMenu* menu, int requestedPosition);
101 98
102 void visibilityChanged(Discoverability::Mode discoverabilityMode);
103
104 QHash<QString, QAction*> _actionHash;99 QHash<QString, QAction*> _actionHash;
105};100};
106 101

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t