QThread fire_and_forget + toggle auto reset image

Avasam · Sep 3, 2022 · 72883d4 · 72883d4
1 parent 537f8bf
commit 72883d4
Show file tree

Hide file tree

Showing 24 changed files with 738 additions and 673 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,12 +13,12 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ main, master, develop, dev, 2.0.0]
+    branches: [main, master, develop, dev, 2.0.0]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ develop, dev, 2.0.0 ]
+    branches: [develop, dev, 2.0.0]
   schedule:
-    - cron: '26 13 * * 6'
+    - cron: "26 13 * * 6"
 
 jobs:
   analyze:
@@ -28,40 +28,40 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'python' ]
+        language: ["python"]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
         # Learn more:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v2
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+      #- run: |
+      #   make bootstrap
+      #   make release
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
diff --git a/PyInstaller/hooks/hook-cv2.py b/PyInstaller/hooks/hook-cv2.py
diff --git a/README.md b/README.md
@@ -22,6 +22,7 @@ This program can be used to automatically start, split, and reset your preferred
 
 ### Compatibility
 
+- Python 3.9+
 - Windows 10 and 11.
 
 ### Building
@@ -30,7 +31,7 @@ This program can be used to automatically start, split, and reset your preferred
 
 - Python 3.9 - 3.10.
 - Microsoft Visual C++ 14.0 or greater may be required to build the executable. Get it with [Microsoft C++ Build Tools](https://visualstudio.microsoft.com/visual-cpp-build-tools/).
-- Node is optional, but required for complete linting (using Pyright).
+
 - Read [requirements.txt](/scripts/requirements.txt) for more information on how to install, run and build the python code.
   - Run `./scripts/install.ps1` to install all dependencies.
   - Run the app directly with `./scripts/start.ps1 [--auto-controlled]`.
@@ -97,6 +98,10 @@ This program can be used to automatically start, split, and reset your preferred
     There are currently performance issues, but it might be more convenient.  
     If you want to use this with OBS' Virtual Camera, use the [Virtualcam plugin](https://obsproject.com/forum/resources/obs-virtualcam.949/) instead.  
 
+#### Capture Device
+
+Select the Video Capture Device that you wanna use if selecting the `Video Capture Device` Capture Method. Will show `[occupied]` if a device is detected but can't be started.
+
 #### Show Live Similarity
 
 - Displays the live similarity between the capture region and the current split image. This number is between 0 and 1, with 1 being a perfect match.
@@ -240,7 +245,7 @@ Still need help?
 - Created by [Toufool](https://twitter.com/Toufool) and [Faschz](https://twitter.com/faschz).
 - [Harutaka Kawamura](https://github.com/harupy/) for the snipping tool code that I used to integrate into the autosplitter.
 - [amaringos](https://twitter.com/amaringos) for the icon.
-- [ZanasoBayncuh](https://twitter.com/ZanasoBayncuh) for motivating me to start this project back up and for all of the time spent testing and suggesting improvements.
+- [Zana_G](https://www.twitch.tv/zana_g) for motivating me to start this project back up and for all of the time spent testing and suggesting improvements.
 - [Avasam](https://twitter.com/Avasam06) for their continued work on making an incredible amount of improvements and changes to AutoSplit while I have not had the time/motivation to do so.
 - [KaDiWa](https://github.com/KaDiWa4) for the LiveSplit integration.
 - [Tyron18](https://twitter.com/Tyron18_) for assisting with Windows 11 testing.

diff --git a/res/about.ui b/res/about.ui
@@ -52,7 +52,7 @@
     <rect>
      <x>10</x>
      <y>44</y>
-     <width>171</width>
+     <width>241</width>
      <height>32</height>
     </rect>
    </property>
@@ -65,7 +65,7 @@
     <rect>
      <x>10</x>
      <y>21</y>
-     <width>161</width>
+     <width>241</width>
      <height>16</height>
     </rect>
    </property>
@@ -76,15 +76,16 @@
   <widget class="QLabel" name="donate_text_label">
    <property name="geometry">
     <rect>
-     <x>30</x>
-     <y>95</y>
-     <width>204</width>
-     <height>32</height>
+     <x>10</x>
+     <y>90</y>
+     <width>241</width>
+     <height>41</height>
     </rect>
    </property>
    <property name="text">
-    <string>If you enjoy using this program, please
-consider donating. Thank you!</string>
+    <string>If you enjoy using this program,
+please consider donating.
+Thank you!</string>
    </property>
    <property name="alignment">
     <set>Qt::AlignCenter</set>
@@ -128,6 +129,9 @@ consider donating. Thank you!</string>
     <bool>true</bool>
    </property>
   </widget>
+  <zorder>ok_button</zorder>
+  <zorder>donate_text_label</zorder>
+  <zorder>donate_button_label</zorder>
   <zorder>icon_label</zorder>
   <zorder>version_label</zorder>
   <zorder>created_by_label</zorder>