Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 07:09:47 +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:
Ryan Huffman 2019-10-04 14:37:29 -07:00
commit cd453791e2
4 changed files with 37 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
launchers/qt/CMakeLists.txt
View file

@ -191,7 +191,6 @@ elseif (APPLE)
add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${src_files} ${RES_SOURCES}) add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${src_files} ${RES_SOURCES})
set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${APP_NAME} set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${APP_NAME}
MACOSX_BUNDLE_BUNDLE_NAME ${APP_NAME}) MACOSX_BUNDLE_BUNDLE_NAME ${APP_NAME})
set_target_properties(${PROJECT_NAME} PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE "NO")
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD

1
launchers/qt/resources/qml/HFBase/LoginBase.qml
View file

@ -127,6 +127,7 @@ Item {
left: parent.left left: parent.left
right: parent.right; right: parent.right;
} }
onAccepted: LauncherState.login(username.text, password.text, displayName.text)
} }
HFButton { HFButton {

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

@ -8,6 +8,7 @@
#include "objbase.h" #include "objbase.h"
#include "objidl.h" #include "objidl.h"
#include "shlguid.h" #include "shlguid.h"
#include <atlstr.h>
#include <tlhelp32.h> #include <tlhelp32.h>
#include <strsafe.h> #include <strsafe.h>

67
launchers/qt/src/LauncherInstaller_windows.cpp
View file

@ -47,42 +47,47 @@ void LauncherInstaller::install() {
qDebug() << "not successful"; qDebug() << "not successful";
} }
qDebug() << "LauncherInstaller: create uninstall link"; deleteShortcuts();
QString uninstallLinkPath = _launcherInstallDir.absolutePath() + "/Uninstall HQ.lnk"; createShortcuts();
if (QFile::exists(uninstallLinkPath)) {
QFile::remove(uninstallLinkPath);
}
QString desktopPath = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
QString applicationPath = _launcherApplicationsDir.absolutePath();
QString appStartLinkPath = applicationPath + "/HQ.lnk";
QString uninstallAppStartLinkPath = applicationPath + "/Uninstall HQ.lnk";
QString desktopAppLinkPath = desktopPath + "/HQ.lnk";
createSymbolicLink((LPCSTR)oldLauncherPath.toStdString().c_str(), (LPCSTR)uninstallLinkPath.toStdString().c_str(),
(LPCSTR)("Click to Uninstall HQ"), (LPCSTR)("--uninstall"));
createSymbolicLink((LPCSTR)oldLauncherPath.toStdString().c_str(), (LPCSTR)uninstallAppStartLinkPath.toStdString().c_str(),
(LPCSTR)("Click to Uninstall HQ"), (LPCSTR)("--uninstall"));
createSymbolicLink((LPCSTR)oldLauncherPath.toStdString().c_str(), (LPCSTR)desktopAppLinkPath.toStdString().c_str(),
(LPCSTR)("Click to Setup and Launch HQ"));
createSymbolicLink((LPCSTR)oldLauncherPath.toStdString().c_str(), (LPCSTR)appStartLinkPath.toStdString().c_str(),
(LPCSTR)("Click to Setup and Launch HQ"));
createApplicationRegistryKeys(); createApplicationRegistryKeys();
} else { } else {
qDebug() << "FAILED!!!!!!!"; qDebug() << "Failed to install HQ Launcher";
} }
} }
void LauncherInstaller::createShortcuts() {
QString launcherPath = _launcherInstallDir.absolutePath() + "/HQ Launcher.exe";
QString uninstallLinkPath = _launcherInstallDir.absolutePath() + "/Uninstall HQ.lnk";
QString desktopPath = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
QString applicationPath = _launcherApplicationsDir.absolutePath();
QString appStartLinkPath = applicationPath + "/HQ Launcher.lnk";
QString uninstallAppStartLinkPath = applicationPath + "/Uninstall HQ.lnk";
QString desktopAppLinkPath = desktopPath + "/HQ Launcher.lnk";
createSymbolicLink((LPCSTR)launcherPath.toStdString().c_str(), (LPCSTR)uninstallLinkPath.toStdString().c_str(),
(LPCSTR)("Click to Uninstall HQ"), (LPCSTR)("--uninstall"));
createSymbolicLink((LPCSTR)launcherPath.toStdString().c_str(), (LPCSTR)uninstallAppStartLinkPath.toStdString().c_str(),
(LPCSTR)("Click to Uninstall HQ"), (LPCSTR)("--uninstall"));
createSymbolicLink((LPCSTR)launcherPath.toStdString().c_str(), (LPCSTR)desktopAppLinkPath.toStdString().c_str(),
(LPCSTR)("Click to Setup and Launch HQ"));
createSymbolicLink((LPCSTR)launcherPath.toStdString().c_str(), (LPCSTR)appStartLinkPath.toStdString().c_str(),
(LPCSTR)("Click to Setup and Launch HQ"));
}
void LauncherInstaller::uninstall() { void LauncherInstaller::uninstall() {
qDebug() << "Uninstall Launcher"; qDebug() << "Uninstall Launcher";
deleteShortcuts();
deleteApplicationRegistryKeys();
}
void LauncherInstaller::deleteShortcuts() {
QString desktopPath = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation); QString desktopPath = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
QString applicationPath = _launcherApplicationsDir.absolutePath(); QString applicationPath = _launcherApplicationsDir.absolutePath();
@ -91,7 +96,7 @@ void LauncherInstaller::uninstall() {
QFile::remove(uninstallLinkPath); QFile::remove(uninstallLinkPath);
} }
QString appStartLinkPath = applicationPath + "/HQ.lnk"; QString appStartLinkPath = applicationPath + "/HQ Launcher.lnk";
if (QFile::exists(appStartLinkPath)) { if (QFile::exists(appStartLinkPath)) {
QFile::remove(appStartLinkPath); QFile::remove(appStartLinkPath);
} }
@ -101,12 +106,10 @@ void LauncherInstaller::uninstall() {
QFile::remove(uninstallAppStartLinkPath); QFile::remove(uninstallAppStartLinkPath);
} }
QString desktopAppLinkPath = desktopPath + "/HQ.lnk"; QString desktopAppLinkPath = desktopPath + "/HQ Launcher.lnk";
if (QFile::exists(desktopAppLinkPath)) { if (QFile::exists(desktopAppLinkPath)) {
QFile::remove(desktopAppLinkPath); QFile::remove(desktopAppLinkPath);
} }
deleteApplicationRegistryKeys();
} }