From 0797e154a1a2a8a03e1c74fd25e3f0719dcaa27a Mon Sep 17 00:00:00 2001 From: dante ruiz Date: Mon, 28 Oct 2019 13:41:15 -0700 Subject: [PATCH] first round of review changes --- launchers/qt/resources/qml/DisplayName.qml | 76 ---------------------- launchers/qt/src/Helper.cpp | 30 --------- launchers/qt/src/Helper.h | 4 -- launchers/qt/src/LauncherState.cpp | 1 - 4 files changed, 111 deletions(-) delete mode 100644 launchers/qt/resources/qml/DisplayName.qml diff --git a/launchers/qt/resources/qml/DisplayName.qml b/launchers/qt/resources/qml/DisplayName.qml deleted file mode 100644 index af688e549e..0000000000 --- a/launchers/qt/resources/qml/DisplayName.qml +++ /dev/null @@ -1,76 +0,0 @@ -// login - -import QtQuick 2.3 -import QtQuick 2.1 -import "HFControls" - -Item { - id: root - anchors.fill: parent - Text { - id: title - width: 325 - height: 26 - font.family: "Graphik" - font.pixelSize: 28 - color: "#FFFFFF" - text: "Choose a display name" - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - anchors { - top: root.top - topMargin: 29 - horizontalCenter: root.horizontalCenter - } - } - - Text { - id: instruction - width: 425 - height: 22 - font.family: "Graphik" - font.pixelSize: 14 - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - color: "#C4C4C4" - text: "This is the name that your teammates will see." - anchors { - left: root.left - right: root.right - top: title.bottom - topMargin: 18 - } - } - - HFTextField { - id: password - width: 306 - height: 40 - font.family: "Graphik" - font.pixelSize: 18 - placeholderText: "Display Name" - color: "#808080" - seperatorColor: Qt.rgba(1, 1, 1, 0.3) - anchors { - top: instruction.bottom - horizontalCenter: instruction.horizontalCenter - topMargin: 79 - } - } - - HFButton { - id: button - width: 122 - height: 36 - - font.family: "Graphik" - font.pixelSize: 18 - text: "NEXT" - - anchors { - top: password.bottom - horizontalCenter: instruction.horizontalCenter - topMargin: 59 - } - } -} diff --git a/launchers/qt/src/Helper.cpp b/launchers/qt/src/Helper.cpp index d09088a0e6..31ec6d773e 100644 --- a/launchers/qt/src/Helper.cpp +++ b/launchers/qt/src/Helper.cpp @@ -13,7 +13,6 @@ #include #include #include -//#incluce QString getMetaverseAPIDomain() { @@ -104,32 +103,3 @@ const QString& getInterfaceSharedMemoryName() { static const QString applicationName = "High Fidelity Interface - " + qgetenv("USERNAME"); return applicationName; } - -//#ifdef Q_OS_WIN -//#include -//#include -//#include -//#include -//#include -//#include -// -//bool isProcessRunning(const wchar_t *processName, int& processID) { -// bool exists = false; -// PROCESSENTRY32 entry; -// entry.dwSize = sizeof(PROCESSENTRY32); -// -// HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, NULL); -// -// if (Process32First(snapshot, &entry)) { -// while (Process32Next(snapshot, &entry)) { -// if (!_wcsicmp(entry.szExeFile, processName)) { -// exists = true; -// processID = entry.th32ProcessID; -// break; -// } -// } -// } -// CloseHandle(snapshot); -// return exists; -//} -//#endif diff --git a/launchers/qt/src/Helper.h b/launchers/qt/src/Helper.h index 619b754c5a..dc97dd603e 100644 --- a/launchers/qt/src/Helper.h +++ b/launchers/qt/src/Helper.h @@ -37,7 +37,3 @@ BOOL shutdownProcess(DWORD dwProcessId, UINT uExitCode); QString getHTTPUserAgent(); const QString& getInterfaceSharedMemoryName(); - -//#ifdef Q_OS_WIN -//bool isProcessRunning(const wchar_t *processName, int& processID) { -//#endif diff --git a/launchers/qt/src/LauncherState.cpp b/launchers/qt/src/LauncherState.cpp index 01463b002d..a9dc47a35d 100644 --- a/launchers/qt/src/LauncherState.cpp +++ b/launchers/qt/src/LauncherState.cpp @@ -63,7 +63,6 @@ void LauncherState::gotoNextDebugScreen() { #ifdef DEBUG_UI if (_currentDebugScreen < (UIState::UI_STATE_NUM - 1)) { _currentDebugScreen = (UIState)(_currentDebugScreen + 1); - //UIState updatedUIState = getUIState(); emit uiStateChanged(); emit updateSourceUrl(PathUtils::resourcePath(getCurrentUISource())); _uiState = getUIState();