From 254b9ffb5095f946b94d537bedd07701f9c9e44e Mon Sep 17 00:00:00 2001 From: Xphalnos <164882787+Xphalnos@users.noreply.github.com> Date: Thu, 8 Aug 2024 17:19:44 +0200 Subject: [PATCH] Workflows cleanup + misc fixes (#371) * Workflows cleanup * clang-format * SDL3: Disabling unnecessary options * Revert CMakeLists.txt changes --- .github/workflows/linux-qt.yml | 5 ++--- .github/workflows/linux.yml | 2 -- .github/workflows/macos-qt.yml | 5 ++--- .github/workflows/macos.yml | 2 -- .github/workflows/windows-qt.yml | 7 ------- .github/workflows/windows.yml | 12 +++--------- externals/CMakeLists.txt | 7 +++++++ src/qt_gui/main_window.cpp | 24 ++++++++++++------------ src/qt_gui/main_window_ui.h | 2 +- 9 files changed, 27 insertions(+), 39 deletions(-) diff --git a/.github/workflows/linux-qt.yml b/.github/workflows/linux-qt.yml index 31f8df01..5611ae50 100644 --- a/.github/workflows/linux-qt.yml +++ b/.github/workflows/linux-qt.yml @@ -10,7 +10,6 @@ on: branches: [ "main" ] env: - # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Release jobs: @@ -19,8 +18,8 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Fetch submodules - run: git submodule update --init --recursive + with: + submodules: recursive - name: Install misc packages run: > diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 7ebb3365..ef77a16c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -8,10 +8,8 @@ on: branches: [ "main" ] pull_request: branches: [ "main" ] - workflow_dispatch: env: - # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Release jobs: diff --git a/.github/workflows/macos-qt.yml b/.github/workflows/macos-qt.yml index e9a9aa4f..4b3672df 100644 --- a/.github/workflows/macos-qt.yml +++ b/.github/workflows/macos-qt.yml @@ -8,10 +8,8 @@ on: branches: [ "main" ] pull_request: branches: [ "main" ] - workflow_dispatch: env: - # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Release jobs: @@ -36,10 +34,11 @@ jobs: - name: Setup Qt uses: jurplel/install-qt-action@v4 with: + version: 6.7.2 host: mac target: desktop arch: clang_64 - version: 6.7.2 + archives: qtbase - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_OSX_ARCHITECTURES=x86_64 -DENABLE_QT_GUI=ON diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 910f0484..e46401cb 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -8,10 +8,8 @@ on: branches: [ "main" ] pull_request: branches: [ "main" ] - workflow_dispatch: env: - # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Release jobs: diff --git a/.github/workflows/windows-qt.yml b/.github/workflows/windows-qt.yml index 019a8ab2..06a16eb5 100644 --- a/.github/workflows/windows-qt.yml +++ b/.github/workflows/windows-qt.yml @@ -10,12 +10,8 @@ on: branches: [ "main" ] env: - # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Release -permissions: - contents: read - jobs: build: runs-on: windows-latest @@ -35,12 +31,9 @@ jobs: archives: qtbase - name: Configure CMake - # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. - # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -T ClangCL -DENABLE_QT_GUI=ON - name: Build - # Build your program with the given configuration run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel - name: Deploy diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 01ae3f9c..46dc13a8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -10,12 +10,8 @@ on: branches: [ "main" ] env: - # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Release -permissions: - contents: read - jobs: build: runs-on: windows-latest @@ -25,16 +21,14 @@ jobs: submodules: recursive - name: Configure CMake - # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. - # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -T ClangCL + - name: Build - # Build your program with the given configuration run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel - - name: Upload a Build Artifact + + - name: Upload executable uses: actions/upload-artifact@v4 with: name: shadps4-win64 - # A file, directory or wildcard pattern that describes what to upload path: | ${{github.workspace}}/build/Release/shadPS4.exe diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 9ebdd878..6426ef16 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -59,7 +59,14 @@ endif() # SDL3 if (NOT TARGET SDL3::SDL3) + set(SDL_DIRECTX OFF) + set(SDL_MMX OFF) + set(SDL_OPENGL OFF) + set(SDL_OPENGLES OFF) set(SDL_PIPEWIRE OFF) + set(SDL_RENDER_D3D OFF) + set(SDL_WASAPI OFF) + set(SDL_XINPUT OFF) add_subdirectory(sdl3) endif() diff --git a/src/qt_gui/main_window.cpp b/src/qt_gui/main_window.cpp index b3778be0..0b88a84f 100644 --- a/src/qt_gui/main_window.cpp +++ b/src/qt_gui/main_window.cpp @@ -51,8 +51,8 @@ bool MainWindow::Init() { this->setStatusBar(statusBar.data()); // Update status bar int numGames = m_game_info->m_games.size(); - QString statusMessage = "Games: " + QString::number(numGames) + " (" + - QString::number(duration.count()) + "ms). Ready."; + QString statusMessage = + "Games: " + QString::number(numGames) + " (" + QString::number(duration.count()) + "ms)"; statusBar->showMessage(statusMessage); return true; } @@ -72,8 +72,8 @@ void MainWindow::CreateActions() { // create action group for themes m_theme_act_group = new QActionGroup(this); - m_theme_act_group->addAction(ui->setThemeLight); m_theme_act_group->addAction(ui->setThemeDark); + m_theme_act_group->addAction(ui->setThemeLight); m_theme_act_group->addAction(ui->setThemeGreen); m_theme_act_group->addAction(ui->setThemeBlue); m_theme_act_group->addAction(ui->setThemeViolet); @@ -344,14 +344,6 @@ void MainWindow::CreateConnects() { }); // Themes - connect(ui->setThemeLight, &QAction::triggered, &m_window_themes, [this]() { - m_window_themes.SetWindowTheme(Theme::Light, ui->mw_searchbar); - Config::setMainWindowTheme(static_cast(Theme::Light)); - if (!isIconBlack) { - SetUiIcons(true); - isIconBlack = true; - } - }); connect(ui->setThemeDark, &QAction::triggered, &m_window_themes, [this]() { m_window_themes.SetWindowTheme(Theme::Dark, ui->mw_searchbar); Config::setMainWindowTheme(static_cast(Theme::Dark)); @@ -360,6 +352,14 @@ void MainWindow::CreateConnects() { isIconBlack = false; } }); + connect(ui->setThemeLight, &QAction::triggered, &m_window_themes, [this]() { + m_window_themes.SetWindowTheme(Theme::Light, ui->mw_searchbar); + Config::setMainWindowTheme(static_cast(Theme::Light)); + if (!isIconBlack) { + SetUiIcons(true); + isIconBlack = true; + } + }); connect(ui->setThemeGreen, &QAction::triggered, &m_window_themes, [this]() { m_window_themes.SetWindowTheme(Theme::Green, ui->mw_searchbar); Config::setMainWindowTheme(static_cast(Theme::Green)); @@ -415,7 +415,7 @@ void MainWindow::RefreshGameTable() { m_game_grid_frame->PopulateGameGrid(m_game_info->m_games, false); statusBar->clearMessage(); int numGames = m_game_info->m_games.size(); - QString statusMessage = "Games: " + QString::number(numGames) + ". Ready."; + QString statusMessage = "Games: " + QString::number(numGames); statusBar->showMessage(statusMessage); } diff --git a/src/qt_gui/main_window_ui.h b/src/qt_gui/main_window_ui.h index 69d71847..06e5cf7f 100644 --- a/src/qt_gui/main_window_ui.h +++ b/src/qt_gui/main_window_ui.h @@ -297,7 +297,7 @@ public: menuRecent->setTitle(QCoreApplication::translate("MainWindow", "Recent Games", nullptr)); exitAct->setText(QCoreApplication::translate("MainWindow", "Exit", nullptr)); #if QT_CONFIG(tooltip) - exitAct->setToolTip(QCoreApplication::translate("MainWindow", "Exit Shadps4", nullptr)); + exitAct->setToolTip(QCoreApplication::translate("MainWindow", "Exit shadPS4", nullptr)); #endif // QT_CONFIG(tooltip) #if QT_CONFIG(statustip) exitAct->setStatusTip(