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
1818 #include <UUID.h>
1919
2020 #include "DiscoverabilityManager.h"
21+#include "Menu.h"
2122
2223 const Discoverability::Mode DEFAULT_DISCOVERABILITY_MODE = Discoverability::All;
2324
@@ -96,4 +97,32 @@ void DiscoverabilityManager::setDiscoverabilityMode(Discoverability::Mode discov · 72 unmodified lines
9697
9798 emit discoverabilityModeChanged(discoverabilityMode);
9899 }
99−}
100+}
101+
102+void 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+
116+void 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
3636 Discoverability::Mode getDiscoverabilityMode() { return static_cast<Discoverability::Mode>(_mode.get()); }
3737 void setDiscoverabilityMode(Discoverability::Mode discoverabilityMode);
3838
39+ void setVisibility();
40+ void visibilityChanged(Discoverability::Mode discoverabilityMode);
41+
3942 signals:
4043 void discoverabilityModeChanged(Discoverability::Mode discoverabilityMode);
4144
interface/src/Menu.cpp+4−30
@@ -163,21 +163,21 @@ Menu::Menu() { · 162 unmodified lines
163163
164164 QAction* visibleToEveryone = addCheckableActionToQMenuAndActionHash(visibilityMenu, MenuOption::VisibleToEveryone,
165165 0, discoverabilityManager->getDiscoverabilityMode() == Discoverability::All,
166− this, SLOT(setVisibility()));
166+ discoverabilityManager.data(), SLOT(setVisibility()));
167167 visibilityGroup->addAction(visibleToEveryone);
168168
169169 QAction* visibleToFriends = addCheckableActionToQMenuAndActionHash(visibilityMenu, MenuOption::VisibleToFriends,
170170 0, discoverabilityManager->getDiscoverabilityMode() == Discoverability::Friends,
171− this, SLOT(setVisibility()));
171+ discoverabilityManager.data(), SLOT(setVisibility()));
172172 visibilityGroup->addAction(visibleToFriends);
173173
174174 QAction* visibleToNoOne = addCheckableActionToQMenuAndActionHash(visibilityMenu, MenuOption::VisibleToNoOne,
175175 0, discoverabilityManager->getDiscoverabilityMode() == Discoverability::None,
176− this, SLOT(setVisibility()));
176+ discoverabilityManager.data(), SLOT(setVisibility()));
177177 visibilityGroup->addAction(visibleToNoOne);
178178
179179 connect(discoverabilityManager.data(), &DiscoverabilityManager::discoverabilityModeChanged,
180− this, &Menu::visibilityChanged);
180+ discoverabilityManager.data(), &DiscoverabilityManager::visibilityChanged);
181181 }
182182
183183 addActionToQMenuAndActionHash(toolsMenu,
@@ -963,29 +963,3 @@ bool Menu::menuItemExists(const QString& menu, const QString& menuitem) { · 779 unmodified lines
963963 }
964964 return false;
965965 };
966−
967−void 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−
981−void 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
6666 bool isOptionChecked(const QString& menuOption) const;
6767 void setIsOptionChecked(const QString& menuOption, bool isChecked);
6868
69−private slots:
70− void setVisibility();
71−
7269 private:
7370 static Menu* _instance;
7471 Menu();
@@ -99,8 +96,6 @@ private: · 24 unmodified lines
9996 int findPositionOfMenuItem(QMenu* menu, const QString& searchMenuItem);
10097 int positionBeforeSeparatorIfNeeded(QMenu* menu, int requestedPosition);
10198
102− void visibilityChanged(Discoverability::Mode discoverabilityMode);
103−
10499 QHash<QString, QAction*> _actionHash;
105100 };
106101

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