diff --git a/CMakeLists.txt b/CMakeLists.txt index 1725960..d6e5aac 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -project(xivlauncher) +project(Astra) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) @@ -51,23 +51,23 @@ if(UNIX) Xrender) endif() -add_executable(xivlauncher ${SRC}) +add_executable(astra ${SRC}) -target_link_libraries(xivlauncher PUBLIC ${LIBRARIES}) +target_link_libraries(astra PUBLIC ${LIBRARIES}) # disgusting, thanks qtkeychain and quazip -target_include_directories(xivlauncher PRIVATE +target_include_directories(astra PRIVATE ${CMAKE_BINARY_DIR}/_deps/qtkeychain-src ${CMAKE_BINARY_DIR}/_deps/qtkeychain-build ${CMAKE_BINARY_DIR}/_deps/quazip-src) if(ENABLE_WATCHDOG) - target_include_directories(xivlauncher PRIVATE ${TESSERACT_INCLUDE_DIRS} ${LEPTONICA_INCLUDE_DIRS}) + target_include_directories(astra PRIVATE ${TESSERACT_INCLUDE_DIRS} ${LEPTONICA_INCLUDE_DIRS}) - target_compile_definitions(xivlauncher PRIVATE ENABLE_WATCHDOG) + target_compile_definitions(astra PRIVATE ENABLE_WATCHDOG) endif() -install(TARGETS xivlauncher +install(TARGETS astra DESTINATION "${INSTALL_BIN_PATH}" ) @@ -79,8 +79,8 @@ if(WIN32) find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${QT_BIN_DIR}") # Run windeployqt immediately after build - add_custom_command(TARGET xivlauncher + add_custom_command(TARGET astra POST_BUILD - COMMAND "${WINDEPLOYQT_ENV_SETUP}" && "${WINDEPLOYQT_EXECUTABLE}" \"$\" + COMMAND "${WINDEPLOYQT_ENV_SETUP}" && "${WINDEPLOYQT_EXECUTABLE}" \"$\" ) endif() diff --git a/README.md b/README.md index 76f39ed..b75869b 100644 --- a/README.md +++ b/README.md @@ -1,36 +1,34 @@ -# xivlauncher +# Astra -Finally, a cross-platform FFXIV launcher. It should run on Windows, macOS and Linux! +Astra is a FFXIV launcher that supports +**multiple profiles**, **Dalamud mods**, _and_ **macOS and Linux**! -Compared to XIVQuickLauncher and the official launcher, this supports -**multiple profiles**, **Dalamud mods**, _and_ **macOS and Linux**! This means you no longer -have to suffer running your FFXIV launcher through Wine. Under Linux, you have **Watchdog** available to help you through the login queue. +At the moment, there are a few caveats that are good to know if you use these features: +* There is no **game patching** support, but the launcher will prompt you to launch another launcher anyway. +* There is no **news list** yet. +* The **Steam support is untested.** -As of this moment, the three missing major features are **game patching**, **external tool launching** and **the news list**. -If you don't use these features then the launcher is still usable. +Despite this, the launcher is still usable and I use it myself on a regular basis on Linux. I suggest you read more in the [FAQ](https://github.com/redstrate/astra/wiki/Frequently-Asked-Questions)! -More information can be found in the [FAQ](https://github.com/redstrate/xivlauncher/wiki/Frequently-Asked-Questions). - -![screenshot](https://github.com/redstrate/xivlauncher/blob/main/misc/screenshot.png?raw=true) +![screenshot](https://github.com/redstrate/astra/blob/main/misc/screenshot.png?raw=true) ## Features -* Can use native (Windows) and Wine (macOS, Linux) versions of FFXIV. +* Can use native (Windows) and Wine-based (macOS, Linux) versions of FFXIV. * You can use Dalamud, which is downloaded within the launcher just like XIVQuickLauncher. * Can connect to the official Square Enix servers _as well_ as Sapphire servers. * Multiple profile support! - * For example, having a regular Square Enix profile and a test Sapphire profile. Or maybe one for DX11 and another for DX9? + * For example, you can have a regular Square Enix profile and a testing Sapphire profile. Or maybe one for DX11 and another for DX9? + * These also have seperate, saved logins. * All settings can be configured per-profile! -* Saving username and/or password. These are saved per-profile, and are encrypted using your system wallet. -* Encrypted game argument support similiar to what XIVQuickLauncher and the official ffxivboot already does. +* Securely saving username and/or password. These are saved per-profile, and are encrypted using your system wallet, and will never be stored unencrypted. +* Encrypted game argument support similiar to what XIVQuickLauncher and the official ffxivboot does, preventing other programs from snooping your login token. * Enable several (Linux) Wine-specific performance enhancements such as enabling Esync. -* You have a **Watchdog** available to help you through queues. - * Only works on X11 and Linux (at the moment) +* On Linux, take advantafe of Watchdog to help notify you if you've moved in the login queue. + * Only works on X11. * Will send you a notification on any change in the login queue. (moving up, logged in, lobby error, etc) - * Can view your spot in the queue easily by using the system tray icon. + * You can view your spot in the queue easily by using the system tray icon. ## Usage -Pre-compiled binaries are not (yet) available, so you must compile from source. Please see the relevant -usage guide for your platform: -* [Windows](https://github.com/redstrate/xivlauncher/wiki/Windows-Usage) -* [macOS](https://github.com/redstrate/xivlauncher/wiki/macOS-Usage) -* [Linux](https://github.com/redstrate/xivlauncher/wiki/Linux-Usage) +* On [Windows](https://github.com/redstrate/astra/wiki/Windows-Usage) +* On [macOS](https://github.com/redstrate/astra/wiki/macOS-Usage) +* On [Linux](https://github.com/redstrate/astra/wiki/Linux-Usage) diff --git a/src/launcherwindow.cpp b/src/launcherwindow.cpp index 2c38d58..4ac8fcd 100644 --- a/src/launcherwindow.cpp +++ b/src/launcherwindow.cpp @@ -12,6 +12,8 @@ #include "assetupdater.h" LauncherWindow::LauncherWindow(LauncherCore& core, QWidget* parent) : QMainWindow(parent), core(core) { + setWindowTitle("Astra"); + connect(&core, &LauncherCore::settingsChanged, this, &LauncherWindow::reloadControls); QMenu* fileMenu = menuBar()->addMenu("File"); @@ -55,9 +57,9 @@ LauncherWindow::LauncherWindow(LauncherCore& core, QWidget* parent) : QMainWindo #endif QMenu* helpMenu = menuBar()->addMenu("Help"); - QAction* showAbout = helpMenu->addAction("About xivlauncher"); + QAction* showAbout = helpMenu->addAction("About Astra"); connect(showAbout, &QAction::triggered, [=] { - QMessageBox::about(this, "About xivlauncher", "The source code is available here."); + QMessageBox::about(this, "About Astra", "The source code is available here."); }); QAction* showAboutQt = helpMenu->addAction("About Qt"); diff --git a/src/main.cpp b/src/main.cpp index 63ac62a..5ac8ad6 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -15,9 +15,9 @@ int main(int argc, char* argv[]) { QCoreApplication::setOrganizationDomain("redstrate.com"); #ifdef NDEBUG - QCoreApplication::setApplicationName("xivlauncher"); + QCoreApplication::setApplicationName("astra"); #else - QCoreApplication::setApplicationName("xivlauncher-debug"); + QCoreApplication::setApplicationName("astra-debug"); #endif LauncherCore c;