Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-06 03:33:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher

Browse source
This commit is contained in:
danteruiz 2019-10-29 13:45:38 -07:00
commit f9446e8247
5 changed files with 0 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
launchers/qt/cmake/installer/Thumbs.db
View file

Binary file not shown.

76
launchers/qt/resources/qml/DisplayName.qml
View file

@ -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
}
}
}

30
launchers/qt/src/Helper.cpp
View file

@ -13,7 +13,6 @@
#include <QTextStream>
#include <QStandardPaths>
#include <iostream>
//#incluce <QTextStream>
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 <Windows.h>
//#include <tlhelp32.h>
//#include <wincrypt.h>
//#include <tlhelp32.h>
//#include <strsafe.h>
//#include <winhttp.h>
//
//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

4
launchers/qt/src/Helper.h
View file

@ -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

1
launchers/qt/src/LauncherState.cpp
View file

@ -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();