file of static assignments for DS
Showing the changes to interface/src/Menu.cpp (1 of 50 files). Show all
Unified · Split
| @@ -21,7 +21,6 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <QStandardPaths> |
| 22 | 22 | |
| 23 | 23 | #include "Application.h" |
| 24 | −#include "fvupdater.h" | |
| 25 | 24 | #include "PairingHandler.h" |
| 26 | 25 | #include "Menu.h" |
| 27 | 26 | #include "Util.h" |
| @@ -69,16 +68,7 @@ Menu::Menu() : · 41 unmodified lines | ||
| 69 | 68 | Qt::CTRL | Qt::Key_Comma, |
| 70 | 69 | this, |
| 71 | 70 | SLOT(editPreferences())))->setMenuRole(QAction::PreferencesRole); |
| 72 | − | |
| 73 | −#if defined(Q_OS_MAC) && defined(QT_NO_DEBUG) | |
| 74 | − // show "Check for Updates" in the menu | |
| 75 | − (addActionToQMenuAndActionHash(fileMenu, | |
| 76 | − MenuOption::CheckForUpdates, | |
| 77 | − 0, | |
| 78 | − this, | |
| 79 | − SLOT(checkForUpdates())))->setMenuRole(QAction::ApplicationSpecificRole); | |
| 80 | −#endif | |
| 81 | − | |
| 71 | + | |
| 82 | 72 | addDisabledActionAndSeparator(fileMenu, "Voxels"); |
| 83 | 73 | addActionToQMenuAndActionHash(fileMenu, MenuOption::ExportVoxels, Qt::CTRL | Qt::Key_E, appInstance, SLOT(exportVoxels())); |
| 84 | 74 | addActionToQMenuAndActionHash(fileMenu, MenuOption::ImportVoxels, Qt::CTRL | Qt::Key_I, appInstance, SLOT(importVoxels())); |
| @@ -555,15 +545,6 @@ void Menu::exportSettings() { · 470 unmodified lines | ||
| 555 | 545 | } |
| 556 | 546 | } |
| 557 | 547 | |
| 558 | −void Menu::checkForUpdates() { | |
| 559 | −#if defined(Q_OS_MAC) && defined(QT_NO_DEBUG) | |
| 560 | − qDebug() << "Checking if there are available updates.\n"; | |
| 561 | − // if this is a release OS X build use fervor to check for an update | |
| 562 | − FvUpdater::sharedUpdater()->SetFeedURL("http://s3.highfidelity.io/appcast.xml"); | |
| 563 | − FvUpdater::sharedUpdater()->CheckForUpdatesSilent(); | |
| 564 | −#endif | |
| 565 | −} | |
| 566 | − | |
| 567 | 548 | void Menu::loadAction(QSettings* set, QAction* action) { |
| 568 | 549 | if (action->isChecked() != set->value(action->text(), action->isChecked()).toBool()) { |
| 569 | 550 | action->trigger(); |