Revert "Revert using submodules"

This reverts commit cf4af7c.

.clang-format-ignore

@@ -0,0 +1 @@
+src/third-party/*

.github/workflows/main.yml

@@ -0,0 +1,60 @@
+name: Main
+on:
+  push:
+    branches-ignore:
+      - 'releases/**'
+    paths-ignore:
+      - '**.md'
+      - '.github/workflows/release.yml'
+      - '.gitignore'
+      - 'crowdin.yml'
+      - 'data/translations/**'
+  pull_request:
+    paths-ignore:
+      - '**.md'
+      - '.github/workflows/release.yml'
+      - '.gitignore'
+      - 'crowdin.yml'
+      - 'data/translations/**'
+jobs:
+  format:
+    name: Format
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Clone repo
+        uses: actions/checkout@v2
+
+      - name: Check formatting
+        uses: DoozyX/[email protected]
+        with:
+          clangFormatVersion: 12
+
+  build:
+    name: Build
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Clone repo
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Install apt packages
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install extra-cmake-modules libqt5x11extras5-dev qttools5-dev libkf5notifications-dev libkf5iconthemes-dev ninja-build
+
+      # See https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4766#note_1091927
+      - name: Downgrade CMake
+        if: runner.os == 'Windows'
+        uses: lukka/[email protected]
+
+      - name: Build without Plasma feature
+        run: |
+          cmake -B build -G Ninja -D CMAKE_CXX_FLAGS="-Wall -Wextra -pedantic -Werror"
+          cmake --build build --parallel 2
+
+      - name: Build with Plasma feature
+        run: |
+          cmake -B build -G Ninja -D WITH_PLASMA=ON -D CMAKE_CXX_FLAGS="-Wall -Wextra -pedantic -Werror"
+          cmake --build build --parallel 2

.github/workflows/release.yml

@@ -0,0 +1,25 @@
+name: Release
+on:
+  release:
+    types: [created]
+jobs:
+  pack:
+    name: Pack source tarball
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone repo
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Create source tarball
+        run: |
+          SOURCE_NAME=$(awk -F/ '{print $NF}' <<<"${{ github.repository }}")-$(awk -F/ '{print $NF}' <<<"${{ github.ref }}")
+          git ls-files --recurse-submodules | \
+          tar --exclude-vcs --transform "s|^|$SOURCE_NAME/|S" -ca -T - -f ../$SOURCE_NAME-source.tar.gz
+
+      - name: Upload source tarball
+        uses: AButler/[email protected]
+        with:
+          files: '../*.tar.gz'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

.gitmodules

@@ -0,0 +1,9 @@
+[submodule "data/icons/third-party/circle-flags"]
+	path = data/icons/third-party/circle-flags
+	url = https://github.com/HatScripts/circle-flags.git
+[submodule "data/icons/third-party/masalla-icon-theme"]
+	path = data/icons/third-party/masalla-icon-theme
+	url = https://github.com/masalla-art/masalla-icon-theme
+[submodule "src/third-party/singleapplication"]
+	path = src/third-party/singleapplication
+	url = https://github.com/itay-grudev/SingleApplication

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.7.0)
 
 project(optimus-manager-qt
-    VERSION 1.6.5
+    VERSION 1.6.6
     LANGUAGES CXX
     DESCRIPTION "An interface for Optimus Manager that allows to switch GPUs on Optimus laptops."
 )
@@ -29,10 +29,12 @@ if(WITH_PLASMA)
     find_package(KF5 COMPONENTS Notifications IconThemes REQUIRED)
 endif()
 
-include(ExternalLibraries)
 include(ECMInstallIcons)
 include(GNUInstallDirs)
 
+set(QAPPLICATION_CLASS QApplication)
+add_subdirectory(src/third-party/singleapplication)
+
 qt5_add_translation(QM_FILES
     data/translations/${PROJECT_NAME}_de_DE.ts
     data/translations/${PROJECT_NAME}_es_ES.ts
@@ -49,13 +51,11 @@ qt5_add_translation(QM_FILES
 )
 
 configure_file(src/cmake.h.in cmake.h)
-configure_file(data/icons/flags.qrc ${CircleFlags_SOURCE_DIR}/flags/flags.qrc COPYONLY)
-configure_file(data/icons/masalla.qrc ${Masalla_SOURCE_DIR}/masalla/masalla.qrc COPYONLY)
 
 add_executable(${PROJECT_NAME}
-    ${CircleFlags_SOURCE_DIR}/flags/flags.qrc
-    ${Masalla_SOURCE_DIR}/masalla/masalla.qrc
     ${QM_FILES}
+    data/icons/flags.qrc
+    data/icons/masalla.qrc
     src/appsettings.cpp
     src/daemonclient.cpp
     src/main.cpp

data/icons/flags.qrc

@@ -1,17 +1,17 @@
 <RCC>
     <qresource prefix="/icons/flags">
-        <file>br.svg</file>
-        <file>cn.svg</file>
-        <file>de.svg</file>
-        <file>es.svg</file>
-        <file>fi.svg</file>
-        <file>hu.svg</file>
-        <file>jp.svg</file>
-        <file>nl.svg</file>
-        <file>ro.svg</file>
-        <file>ru.svg</file>
-        <file>tr.svg</file>
-        <file>ua.svg</file>
-        <file>us.svg</file>
+        <file alias="br.svg">third-party/circle-flags/flags/br.svg</file>
+        <file alias="cn.svg">third-party/circle-flags/flags/cn.svg</file>
+        <file alias="de.svg">third-party/circle-flags/flags/de.svg</file>
+        <file alias="es.svg">third-party/circle-flags/flags/es.svg</file>
+        <file alias="fi.svg">third-party/circle-flags/flags/fi.svg</file>
+        <file alias="hu.svg">third-party/circle-flags/flags/hu.svg</file>
+        <file alias="jp.svg">third-party/circle-flags/flags/jp.svg</file>
+        <file alias="nl.svg">third-party/circle-flags/flags/nl.svg</file>
+        <file alias="ro.svg">third-party/circle-flags/flags/ro.svg</file>
+        <file alias="ru.svg">third-party/circle-flags/flags/ru.svg</file>
+        <file alias="tr.svg">third-party/circle-flags/flags/tr.svg</file>
+        <file alias="ua.svg">third-party/circle-flags/flags/ua.svg</file>
+        <file alias="us.svg">third-party/circle-flags/flags/us.svg</file>
     </qresource>
 </RCC>

data/icons/masalla.qrc

@@ -1,15 +1,15 @@
 <RCC>
     <qresource prefix="/icons/hicolor">
-        <file alias="16x16/apps/preferences-system-power-management.svg">apps/16x16/preferences-system-power-management.svg</file>
-        <file alias="16x16/apps/qt.svg">apps/16x16/qt.svg</file>
-        <file alias="16x16/apps/utilities-terminal.svg">apps/16x16/utilities-terminal.svg</file>
-        <file alias="16x16/places/folder.svg">places/16x16/folder.svg</file>
-        <file alias="48x48/apps/amd.svg">apps/48x48/amd.svg</file>
-        <file alias="48x48/apps/intel.svg">apps/48x48/intel.svg</file>
-        <file alias="48x48/apps/nvidia.svg">apps/48x48/nvidia.svg</file>
-        <file alias="48x48/apps/preferences-system-power-management.svg">apps/48x48/preferences-system-power-management.svg</file>
-        <file alias="48x48/apps/preferences-system.svg">apps/48x48/preferences-system.svg</file>
-        <file alias="48x48/mimetypes/text-x-generic.svg">mimetypes/48x48/text-x-generic.svg</file>
-        <file alias="48x48/status/dialog-information.png">status/48x48/dialog-information.png</file>
+        <file alias="16x16/apps/preferences-system-power-management.svg">third-party/masalla-icon-theme/masalla/apps/16x16/preferences-system-power-management.svg</file>
+        <file alias="16x16/apps/qt.svg">third-party/masalla-icon-theme/masalla/apps/16x16/qt.svg</file>
+        <file alias="16x16/apps/utilities-terminal.svg">third-party/masalla-icon-theme/masalla/apps/16x16/utilities-terminal.svg</file>
+        <file alias="16x16/places/folder.svg">third-party/masalla-icon-theme/masalla/places/16x16/folder.svg</file>
+        <file alias="48x48/apps/amd.svg">third-party/masalla-icon-theme/masalla/apps/48x48/amd.svg</file>
+        <file alias="48x48/apps/intel.svg">third-party/masalla-icon-theme/masalla/apps/48x48/intel.svg</file>
+        <file alias="48x48/apps/nvidia.svg">third-party/masalla-icon-theme/masalla/apps/48x48/nvidia.svg</file>
+        <file alias="48x48/apps/preferences-system-power-management.svg">third-party/masalla-icon-theme/masalla/apps/48x48/preferences-system-power-management.svg</file>
+        <file alias="48x48/apps/preferences-system.svg">third-party/masalla-icon-theme/masalla/apps/48x48/preferences-system.svg</file>
+        <file alias="48x48/mimetypes/text-x-generic.svg">third-party/masalla-icon-theme/masalla/mimetypes/48x48/text-x-generic.svg</file>
+        <file alias="48x48/status/dialog-information.png">third-party/masalla-icon-theme/masalla/status/48x48/dialog-information.png</file>
     </qresource>
 </RCC>

src/optimusmanager.cpp

@@ -381,7 +381,7 @@ OptimusSettings::Mode OptimusManager::detectGpu()
     if (jsonError.error != QJsonParseError::NoError)
         qFatal("Unable to parse Optimus Manager state file: %s", qPrintable(jsonError.errorString()));
 
-    QJsonValue modeValue = jsonDocument.object().value(u"current_mode");
+    QJsonValue modeValue = jsonDocument.object().value("current_mode");
     if (modeValue.type() != QJsonValue::String)
         qFatal("Unable to read current mode from Optimus Manager state file");