rebrand: prismlauncher → launcher (binary, src dir, theme auto-deploy)
This commit is contained in:
parent
5a5be11eb3
commit
32b74856d2
1446 changed files with 48 additions and 17 deletions
18
.github/workflows/build.yml
vendored
18
.github/workflows/build.yml
vendored
|
|
@ -100,6 +100,24 @@ jobs:
|
|||
- name: Install
|
||||
run: cmake --install build --config Release
|
||||
|
||||
- name: Deploy Qt (Linux)
|
||||
if: runner.os == 'Linux'
|
||||
run: |
|
||||
# Bundle Qt libs alongside the binary for portability
|
||||
mkdir -p install/lib
|
||||
ldd install/bin/launcher | awk '/Qt6/ {print $3}' | xargs -I {} cp -L {} install/lib/ || true
|
||||
|
||||
- name: Deploy Qt (Windows)
|
||||
if: runner.os == 'Windows'
|
||||
shell: pwsh
|
||||
run: |
|
||||
windeployqt --release --no-translations install\launcher.exe
|
||||
|
||||
- name: Deploy Qt (macOS)
|
||||
if: runner.os == 'macOS'
|
||||
run: |
|
||||
macdeployqt install/Launcher.app -always-overwrite || true
|
||||
|
||||
# ---------- Package ----------
|
||||
- name: Package (Linux)
|
||||
if: runner.os == 'Linux'
|
||||
|
|
|
|||
|
|
@ -342,7 +342,7 @@ include(ECMQtDeclareLoggingCategory)
|
|||
|
||||
####################################### Program Info #######################################
|
||||
|
||||
set(Launcher_APP_BINARY_NAME "prismlauncher" CACHE STRING "Name of the Launcher binary")
|
||||
set(Launcher_APP_BINARY_NAME "launcher" CACHE STRING "Name of the Launcher binary")
|
||||
add_subdirectory(program_info)
|
||||
|
||||
####################################### Install layout #######################################
|
||||
|
|
@ -452,7 +452,7 @@ elseif(UNIX)
|
|||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${Launcher_PNG_256} DESTINATION "${KDE_INSTALL_ICONDIR}/hicolor/256x256/apps" RENAME "${Launcher_AppID}.png")
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${Launcher_MIMEInfo} DESTINATION ${KDE_INSTALL_MIMEDIR})
|
||||
|
||||
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/launcher/qtlogging.ini" DESTINATION "share/${Launcher_Name}")
|
||||
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/app/qtlogging.ini" DESTINATION "share/${Launcher_Name}")
|
||||
|
||||
set(PLUGIN_DEST_DIR "plugins")
|
||||
set(BUNDLE_DEST_DIR ".")
|
||||
|
|
@ -463,7 +463,7 @@ elseif(UNIX)
|
|||
endif()
|
||||
|
||||
# Install basic runner script if component "portable" is selected
|
||||
configure_file(launcher/Launcher.in "${CMAKE_CURRENT_BINARY_DIR}/LauncherScript" @ONLY)
|
||||
configure_file(app/Launcher.in "${CMAKE_CURRENT_BINARY_DIR}/LauncherScript" @ONLY)
|
||||
install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/LauncherScript" DESTINATION "." RENAME ${Launcher_Name} COMPONENT portable EXCLUDE_FROM_ALL)
|
||||
|
||||
elseif(WIN32)
|
||||
|
|
@ -501,4 +501,4 @@ add_subdirectory(libraries/qdcss) # css parser
|
|||
add_subdirectory(buildconfig)
|
||||
|
||||
# NOTE: this must always be last to appease the CMake deity of quirky install command evaluation order.
|
||||
add_subdirectory(launcher)
|
||||
add_subdirectory(app)
|
||||
|
|
|
|||
|
|
@ -807,25 +807,20 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
|
|||
|
||||
// Window state and geometry
|
||||
m_settings->registerSetting("MainWindowState", "");
|
||||
m_settings->registerSetting("MainWindowGeometry",
|
||||
"AdnQywADAAAAAAcIAAAAAAAACGIAAAEJAAAHCAAAAAAAAAhiAAABCQAAAAAAAAAAB4AAAAcIAAAAAAAACGIAAAEJ");
|
||||
m_settings->registerSetting("MainWindowGeometry", "");
|
||||
|
||||
m_settings->registerSetting("ConsoleWindowState", "");
|
||||
m_settings->registerSetting("ConsoleWindowGeometry",
|
||||
"AdnQywADAAAAAAcIAAAAAAAAChYAAALBAAAHCAAAAAAAAAoWAAACwQAAAAAAAAAAB4AAAAcIAAAAAAAAChYAAALB");
|
||||
m_settings->registerSetting("ConsoleWindowGeometry", "");
|
||||
|
||||
m_settings->registerSetting("SettingsGeometry", "");
|
||||
|
||||
m_settings->registerSetting("PagedGeometry",
|
||||
"AdnQywADAAAAAAcIAAAAAAAACm8AAAKJAAAHCAAAAAAAAApvAAACiQAAAAAAAAAAB4AAAAcIAAAAAAAACm8AAAKJ");
|
||||
m_settings->registerSetting("PagedGeometry", "");
|
||||
|
||||
m_settings->registerSetting("NewInstanceGeometry",
|
||||
"AdnQywADAAAAAAcIAAAAAAAAC2AAAAH7AAAHCAAAAAAAAAtgAAAB+wAAAAAAAAAAB4AAAAcIAAAAAAAAC2AAAAH7");
|
||||
m_settings->registerSetting("NewInstanceGeometry", "");
|
||||
|
||||
m_settings->registerSetting("UpdateDialogGeometry", "");
|
||||
|
||||
m_settings->registerSetting("NewsGeometry",
|
||||
"AdnQywADAAAAAAcIAAAAAAAACicAAAHzAAAHCAAAAAAAAAonAAAB8wAAAAAAAAAAB4AAAAcIAAAAAAAACicAAAHz");
|
||||
m_settings->registerSetting("NewsGeometry", "");
|
||||
|
||||
m_settings->registerSetting("ModDownloadGeometry", "");
|
||||
m_settings->registerSetting("RPDownloadGeometry", "");
|
||||
|
|
@ -1675,7 +1670,10 @@ MainWindow* Application::showMainWindow(bool minimized)
|
|||
} else {
|
||||
m_mainWindow = new MainWindow();
|
||||
m_mainWindow->restoreState(QByteArray::fromBase64(APPLICATION->settings()->get("MainWindowState").toString().toUtf8()));
|
||||
m_mainWindow->restoreGeometry(QByteArray::fromBase64(APPLICATION->settings()->get("MainWindowGeometry").toString().toUtf8()));
|
||||
QString geomStr = APPLICATION->settings()->get("MainWindowGeometry").toString();
|
||||
if (geomStr.isEmpty() || !m_mainWindow->restoreGeometry(QByteArray::fromBase64(geomStr.toUtf8()))) {
|
||||
m_mainWindow->resize(700, 500);
|
||||
}
|
||||
|
||||
if (auto* newsBar = m_mainWindow->findChild<QToolBar*>("newsToolBar")) {
|
||||
newsBar->hide();
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue