Support OBS 31

.clang-format

@@ -0,0 +1,2 @@
+BasedOnStyle: InheritParentConfig
+ColumnLimit: 132

.github/workflows/build.yml

@@ -293,20 +293,6 @@ jobs:
         with:
           name: 'installer-files'
           path: .
-      - name: Create Code Signing Certificate
-        if: success() && github.event_name != 'pull_request'
-        run: |
-          New-Item -ItemType directory -Path certificate
-          Set-Content -Path certificate\certificate.txt -Value '${{ secrets.CERTIFICATE }}'
-          certutil -decode certificate\certificate.txt certificate\certificate.pfx
-      - name: Code Sign 32
-        if: success() && github.event_name != 'pull_request'
-        run: |
-          & 'C:/Program Files (x86)/Windows Kits/10/bin/10.0.20348.0/x86/signtool.exe' sign /f certificate\certificate.pfx /p '${{ secrets.CERTIFICATE_PASS }}' /t http://timestamp.comodoca.com/authenticode .\package\obs-plugins\32bit\${{ env.PLUGIN_NAME }}.dll
-      - name: Code Sign 64
-        if: success() && github.event_name != 'pull_request'
-        run: |
-          & 'C:/Program Files (x86)/Windows Kits/10/bin/10.0.20348.0/x64/signtool.exe' sign /f certificate\certificate.pfx /p '${{ secrets.CERTIFICATE_PASS }}' /t http://timestamp.comodoca.com/authenticode .\package\obs-plugins\64bit\${{ env.PLUGIN_NAME }}.dll
       - name: Publish zip
         if: success()
         uses: actions/upload-artifact@v3.1.1
@@ -320,10 +306,6 @@ jobs:
       - name: "Package Installer (Compile)"
         run: |
           & 'C:\Program Files (x86)\Inno Setup 6\ISCC.exe' /Qp ".\installer.iss"
-      - name: Code Sign Installer
-        if: success() && github.event_name != 'pull_request'
-        run: |
-          & 'C:/Program Files (x86)/Windows Kits/10/bin/10.0.20348.0/x64/signtool.exe' sign /f certificate\certificate.pfx /p '${{ secrets.CERTIFICATE_PASS }}' /t http://timestamp.comodoca.com/authenticode .\package\${{ env.PLUGIN_NAME }}-installer.exe
       - name: Publish installer
         if: success()
         uses: actions/upload-artifact@v3.1.1
@@ -333,4 +315,4 @@ jobs:
       - name: Remove temp artifacts
         uses: geekyeggo/delete-artifact@v2.0.0
         with:
-          name: "${{ env.FILE_NAME_X86 }}\n${{ env.FILE_NAME_X64 }}\ninstaller-files"
+          name: "${{ env.FILE_NAME_X86 }}\n${{ env.FILE_NAME_X64 }}"

CMakeLists.txt

@@ -6,7 +6,7 @@ else()
   cmake_minimum_required(VERSION 3.18)
 endif()
 
-project(scene-collection-manager VERSION 0.1.1)
+project(scene-collection-manager VERSION 0.1.2)
 set(PROJECT_FULL_NAME "Scene Collection Manager")
 
 # Set new UUIDs when you start to create a new plugin.
@@ -29,12 +29,18 @@ if(BUILD_OUT_OF_TREE)
 	find_package(libobs REQUIRED)
 	find_package(obs-frontend-api REQUIRED)
 	include(cmake/ObsPluginHelpers.cmake)
+	find_qt(COMPONENTS Widgets COMPONENTS_LINUX Gui)
 	set(OBS_FRONTEND_API_NAME "obs-frontend-api")
-  else()
-	  set(OBS_FRONTEND_API_NAME "frontend-api")
-  endif()
-
-  if(OS_WINDOWS)
+else()
+	if(OBS_VERSION VERSION_GREATER_EQUAL 30.1.0)
+		find_package(Qt6 COMPONENTS Core Widgets)
+	else()
+		find_qt(COMPONENTS Widgets COMPONENTS_LINUX Gui)
+	endif()
+	set(OBS_FRONTEND_API_NAME "frontend-api")
+endif()
+
+if(OS_WINDOWS)
 	get_filename_component(ISS_FILES_DIR "${CMAKE_BINARY_DIR}\\..\\package" ABSOLUTE)
 	file(TO_NATIVE_PATH "${ISS_FILES_DIR}" ISS_FILES_DIR)
 	get_filename_component(ISS_PACKAGE_DIR "${CMAKE_PACKAGE_PREFIX}\\.." ABSOLUTE)
@@ -56,8 +62,6 @@ elseif(OS_MACOS)
 	target_compile_options(${PROJECT_NAME} PRIVATE -Wall)
 endif()
 
-# lines if you want add Qt UI in your plugin
-find_qt(COMPONENTS Widgets COMPONENTS_LINUX Gui)
 set_target_properties(${PROJECT_NAME} PROPERTIES AUTOMOC ON AUTOUIC ON AUTORCC ON)
 
 target_link_libraries(${PROJECT_NAME}

SceneCollectionManager.ui

@@ -109,6 +109,9 @@
    <property name="themeID" stdset="0">
     <string notr="true">addIconSmall</string>
    </property>
+   <property name="class" stdset="0">
+    <string notr="true">icon-plus</string>
+   </property>
   </action>
   <action name="actionRemoveSceneCollection">
    <property name="icon">
@@ -121,6 +124,9 @@
    <property name="themeID" stdset="0">
     <string notr="true">removeIconSmall</string>
    </property>
+   <property name="class" stdset="0">
+    <string notr="true">icon-minus</string>
+   </property>
   </action>
   <action name="actionAddBackup">
    <property name="icon">
@@ -133,6 +139,9 @@
    <property name="themeID" stdset="0">
     <string notr="true">addIconSmall</string>
    </property>
+   <property name="class" stdset="0">
+    <string notr="true">icon-plus</string>
+   </property>
   </action>
   <action name="actionRemoveBackup">
    <property name="icon">
@@ -145,6 +154,9 @@
    <property name="themeID" stdset="0">
     <string notr="true">removeIconSmall</string>
    </property>
+   <property name="class" stdset="0">
+    <string notr="true">icon-minus</string>
+   </property>
   </action>
   <action name="actionConfigSceneCollection">
    <property name="icon">
@@ -157,6 +169,9 @@
    <property name="themeID" stdset="0">
     <string notr="true">propertiesIconSmall</string>
    </property>
+   <property name="class" stdset="0">
+    <string notr="true">icon-gear</string>
+   </property>
   </action>
   <action name="actionConfigBackup">
    <property name="icon">
@@ -169,6 +184,9 @@
    <property name="themeID" stdset="0">
     <string notr="true">propertiesIconSmall</string>
    </property>
+   <property name="class" stdset="0">
+    <string notr="true">icon-gear</string>
+   </property>
   </action>
   <action name="actionSwitchBackup">
    <property name="icon">
@@ -181,6 +199,9 @@
    <property name="themeID" stdset="0">
     <string notr="true">playIcon</string>
    </property>
+   <property name="class" stdset="0">
+    <string notr="true">icon-media-play</string>
+   </property>
   </action>
   <action name="actionSwitchSceneCollection">
    <property name="icon">
@@ -193,6 +214,9 @@
    <property name="themeID" stdset="0">
     <string notr="true">playIcon</string>
    </property>
+   <property name="class" stdset="0">
+    <string notr="true">icon-media-play</string>
+   </property>
   </action>
  </widget>
  <resources/>

buildspec.json

@@ -79,5 +79,5 @@
         }
     },
     "name": "scene-collection-manager",
-    "version": "0.1.1"
+    "version": "0.1.2"
 }