From 187a2749c348aa7b3bbae097d0a7d3113c26d6e7 Mon Sep 17 00:00:00 2001 From: Marcus Llewellyn Date: Sun, 17 May 2020 14:26:45 -0500 Subject: [PATCH] Rebrand the About dialog to Vircadia. Also removes trailing whitespace from Menu.cpp. --- interface/resources/images/about-vircadia.png | Bin 0 -> 7767 bytes .../qml/hifi/dialogs/TabletAboutDialog.qml | 2 +- interface/src/Menu.cpp | 42 +++++++++--------- 3 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 interface/resources/images/about-vircadia.png diff --git a/interface/resources/images/about-vircadia.png b/interface/resources/images/about-vircadia.png new file mode 100644 index 0000000000000000000000000000000000000000..14ae73b226cd8965706d77ec25aaba4e9bbaf3b5 GIT binary patch literal 7767 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 PG*U)V;aj!1VZi?Y*sDCR literal 0 HcmV?d00001 diff --git a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml index 2be66442ce..e65bfa5ebb 100644 --- a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml +++ b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml @@ -25,7 +25,7 @@ Rectangle { Image { sourceSize.width: 295 sourceSize.height: 75 - source: "../../../images/about-projectathena.png" + source: "../../../images/about-vircadia.png" } Item { height: 30; width: 1 } Column { diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index b5cacd662b..bc095b3beb 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -223,9 +223,9 @@ Menu::Menu() { MenuWrapper* startupLocationMenu = navigateMenu->addMenu(MenuOption::StartUpLocation); QActionGroup* startupLocatiopnGroup = new QActionGroup(startupLocationMenu); startupLocatiopnGroup->setExclusive(true); - startupLocatiopnGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::HomeLocation, 0, + startupLocatiopnGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::HomeLocation, 0, false)); - startupLocatiopnGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::LastLocation, 0, + startupLocatiopnGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::LastLocation, 0, true)); // Settings menu ---------------------------------- @@ -288,13 +288,13 @@ Menu::Menu() { hmd->toggleShouldShowTablet(); } }); - + // Settings > Entity Script / QML Whitelist action = addActionToQMenuAndActionHash(settingsMenu, "Entity Script / QML Whitelist"); connect(action, &QAction::triggered, [] { auto tablet = DependencyManager::get()->getTablet("com.highfidelity.interface.tablet.system"); auto hmd = DependencyManager::get(); - + tablet->pushOntoStack("hifi/dialogs/security/EntityScriptQMLWhitelist.qml"); if (!hmd->getShouldShowTablet()) { @@ -310,10 +310,10 @@ Menu::Menu() { // Developer menu ---------------------------------- MenuWrapper* developerMenu = addMenu("Developer", "Developer"); - + // Developer > Scripting >>> MenuWrapper* scriptingOptionsMenu = developerMenu->addMenu("Scripting"); - + // Developer > Scripting > Console... addActionToQMenuAndActionHash(scriptingOptionsMenu, MenuOption::Console, Qt::CTRL | Qt::ALT | Qt::Key_J, DependencyManager::get().data(), @@ -328,7 +328,7 @@ Menu::Menu() { defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/tools/currentAPI.js"); DependencyManager::get()->loadScript(defaultScriptsLoc.toString()); }); - + // Developer > Scripting > Entity Script Server Log auto essLogAction = addActionToQMenuAndActionHash(scriptingOptionsMenu, MenuOption::EntityScriptServerLog, 0, qApp, SLOT(toggleEntityScriptServerLogDialog())); @@ -348,7 +348,7 @@ Menu::Menu() { // Developer > Scripting > Verbose Logging addCheckableActionToQMenuAndActionHash(scriptingOptionsMenu, MenuOption::VerboseLogging, 0, false, qApp, SLOT(updateVerboseLogging())); - + // Developer > Scripting > Enable Speech Control API #if defined(Q_OS_MAC) || defined(Q_OS_WIN) auto speechRecognizer = DependencyManager::get(); @@ -360,20 +360,20 @@ Menu::Menu() { UNSPECIFIED_POSITION); connect(speechRecognizer.data(), SIGNAL(enabledUpdated(bool)), speechRecognizerAction, SLOT(setChecked(bool))); #endif - + // Developer > UI >>> MenuWrapper* uiOptionsMenu = developerMenu->addMenu("UI"); action = addCheckableActionToQMenuAndActionHash(uiOptionsMenu, MenuOption::DesktopTabletToToolbar, 0, qApp->getDesktopTabletBecomesToolbarSetting()); - + // Developer > UI > Show Overlays addCheckableActionToQMenuAndActionHash(uiOptionsMenu, MenuOption::Overlays, 0, true); - + // Developer > UI > Desktop Tablet Becomes Toolbar connect(action, &QAction::triggered, [action] { qApp->setDesktopTabletBecomesToolbarSetting(action->isChecked()); }); - + // Developer > UI > HMD Tablet Becomes Toolbar action = addCheckableActionToQMenuAndActionHash(uiOptionsMenu, MenuOption::HMDTabletToToolbar, 0, qApp->getHmdTabletBecomesToolbarSetting()); @@ -702,7 +702,7 @@ Menu::Menu() { result = QProcessEnvironment::systemEnvironment().contains(HIFI_SHOW_DEVELOPER_CRASH_MENU); if (result) { MenuWrapper* crashMenu = developerMenu->addMenu("Crash"); - + // Developer > Crash > Display Crash Options addCheckableActionToQMenuAndActionHash(crashMenu, MenuOption::DisplayCrashOptions, 0, true); @@ -741,7 +741,7 @@ Menu::Menu() { addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashOnShutdown, 0, qApp, SLOT(crashOnShutdown())); } - + // Developer > Show Statistics addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::Stats, 0, true); @@ -782,21 +782,21 @@ Menu::Menu() { // Help/Application menu ---------------------------------- MenuWrapper * helpMenu = addMenu("Help"); - // Help > About Project Athena - action = addActionToQMenuAndActionHash(helpMenu, "About Project Athena"); + // Help > About Vircadiaa + action = addActionToQMenuAndActionHash(helpMenu, "About Vircadia"); connect(action, &QAction::triggered, [] { qApp->showDialog(QString("hifi/dialogs/AboutDialog.qml"), QString("hifi/dialogs/TabletAboutDialog.qml"), "AboutDialog"); }); helpMenu->addSeparator(); - // Help > Athena Docs + // Help > Vircadia Docs action = addActionToQMenuAndActionHash(helpMenu, "Online Documentation"); connect(action, &QAction::triggered, qApp, [] { - QDesktopServices::openUrl(QUrl("https://docs.projectathena.dev/")); + QDesktopServices::openUrl(QUrl("https://apidocs.vircadia.dev/")); }); - // Help > Athena Forum + // Help > Vircadia Forum /* action = addActionToQMenuAndActionHash(helpMenu, "Online Forums"); connect(action, &QAction::triggered, qApp, [] { QDesktopServices::openUrl(QUrl("https://forums.highfidelity.com/")); @@ -805,7 +805,7 @@ Menu::Menu() { // Help > Scripting Reference action = addActionToQMenuAndActionHash(helpMenu, "Online Script Reference"); connect(action, &QAction::triggered, qApp, [] { - QDesktopServices::openUrl(QUrl("https://apidocs.projectathena.dev/")); + QDesktopServices::openUrl(QUrl("https://apidocs.vircadia.dev/")); }); addActionToQMenuAndActionHash(helpMenu, "Controls Reference", 0, qApp, SLOT(showHelp())); @@ -815,7 +815,7 @@ Menu::Menu() { // Help > Release Notes action = addActionToQMenuAndActionHash(helpMenu, "Release Notes"); connect(action, &QAction::triggered, qApp, [] { - QDesktopServices::openUrl(QUrl("https://docs.projectathena.dev/release-notes.html")); + QDesktopServices::openUrl(QUrl("https://docs.vircadia.dev/release-notes.html")); }); // Help > Report a Bug!