History

Merge pull request #997 from birarda/assignment

file of static assignments for DS

Philip Rosedale committed 13 years ago

Commit cebd8e52 parents 6415197 94f7b9850 files · +785 −5169Browse files

Showing the changes to interface/src/Menu.cpp (1 of 50 files). Show all

Unified · Split

interface/src/Menu.cpp+1−20
@@ -21,7 +21,6 @@ · 20 unmodified lines
21#include <QStandardPaths>21#include <QStandardPaths>
22 22
23#include "Application.h"23#include "Application.h"
24#include "fvupdater.h"
25#include "PairingHandler.h"24#include "PairingHandler.h"
26#include "Menu.h"25#include "Menu.h"
27#include "Util.h"26#include "Util.h"
@@ -69,16 +68,7 @@ Menu::Menu() : · 41 unmodified lines
69 Qt::CTRL | Qt::Key_Comma,68 Qt::CTRL | Qt::Key_Comma,
70 this,69 this,
71 SLOT(editPreferences())))->setMenuRole(QAction::PreferencesRole);70 SLOT(editPreferences())))->setMenuRole(QAction::PreferencesRole);
72 71
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
82 addDisabledActionAndSeparator(fileMenu, "Voxels");72 addDisabledActionAndSeparator(fileMenu, "Voxels");
83 addActionToQMenuAndActionHash(fileMenu, MenuOption::ExportVoxels, Qt::CTRL | Qt::Key_E, appInstance, SLOT(exportVoxels()));73 addActionToQMenuAndActionHash(fileMenu, MenuOption::ExportVoxels, Qt::CTRL | Qt::Key_E, appInstance, SLOT(exportVoxels()));
84 addActionToQMenuAndActionHash(fileMenu, MenuOption::ImportVoxels, Qt::CTRL | Qt::Key_I, appInstance, SLOT(importVoxels()));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
558void 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
567void Menu::loadAction(QSettings* set, QAction* action) {548void Menu::loadAction(QSettings* set, QAction* action) {
568 if (action->isChecked() != set->value(action->text(), action->isChecked()).toBool()) {549 if (action->isChecked() != set->value(action->text(), action->isChecked()).toBool()) {
569 action->trigger();550 action->trigger();