Skip to content

Commit 3845f60

Browse files
authored
Toggle autoreset image + ui adjustments (#164)
1 parent 537f8bf commit 3845f60

File tree

9 files changed

+173
-109
lines changed

9 files changed

+173
-109
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ main, master, develop, dev, 2.0.0]
16+
branches: [main, master, develop, dev, 2.0.0]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ develop, dev, 2.0.0 ]
19+
branches: [develop, dev, 2.0.0]
2020
schedule:
21-
- cron: '26 13 * * 6'
21+
- cron: "26 13 * * 6"
2222

2323
jobs:
2424
analyze:
@@ -28,40 +28,40 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
language: [ 'python' ]
31+
language: ["python"]
3232
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
3333
# Learn more:
3434
# 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
3535

3636
steps:
37-
- name: Checkout repository
38-
uses: actions/checkout@v2
37+
- name: Checkout repository
38+
uses: actions/checkout@v2
3939

40-
# Initializes the CodeQL tools for scanning.
41-
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@v2
43-
with:
44-
languages: ${{ matrix.language }}
45-
# If you wish to specify custom queries, you can do so here or in a config file.
46-
# By default, queries listed here will override any specified in a config file.
47-
# Prefix the list here with "+" to use these queries and those in the config file.
48-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
40+
# Initializes the CodeQL tools for scanning.
41+
- name: Initialize CodeQL
42+
uses: github/codeql-action/init@v2
43+
with:
44+
languages: ${{ matrix.language }}
45+
# If you wish to specify custom queries, you can do so here or in a config file.
46+
# By default, queries listed here will override any specified in a config file.
47+
# Prefix the list here with "+" to use these queries and those in the config file.
48+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
4949

50-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
51-
# If this step fails, then you should remove it and run the build manually (see below)
52-
- name: Autobuild
53-
uses: github/codeql-action/autobuild@v2
50+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
51+
# If this step fails, then you should remove it and run the build manually (see below)
52+
- name: Autobuild
53+
uses: github/codeql-action/autobuild@v2
5454

55-
# ℹ️ Command-line programs to run using the OS shell.
56-
# 📚 https://git.io/JvXDl
55+
# ℹ️ Command-line programs to run using the OS shell.
56+
# 📚 https://git.io/JvXDl
5757

58-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
59-
# and modify them (or add more) to build your code if your project
60-
# uses a compiled language
58+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
59+
# and modify them (or add more) to build your code if your project
60+
# uses a compiled language
6161

62-
#- run: |
63-
# make bootstrap
64-
# make release
62+
#- run: |
63+
# make bootstrap
64+
# make release
6565

66-
- name: Perform CodeQL Analysis
67-
uses: github/codeql-action/analyze@v2
66+
- name: Perform CodeQL Analysis
67+
uses: github/codeql-action/analyze@v2

PyInstaller/hooks/hook-cv2.py

Lines changed: 0 additions & 24 deletions
This file was deleted.

README.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ This program can be used to automatically start, split, and reset your preferred
2222

2323
### Compatibility
2424

25+
- Python 3.9+
2526
- Windows 10 and 11.
2627

2728
### Building
@@ -30,7 +31,7 @@ This program can be used to automatically start, split, and reset your preferred
3031

3132
- Python 3.9 - 3.10.
3233
- 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/).
33-
- Node is optional, but required for complete linting (using Pyright).
34+
3435
- Read [requirements.txt](/scripts/requirements.txt) for more information on how to install, run and build the python code.
3536
- Run `./scripts/install.ps1` to install all dependencies.
3637
- 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
9798
There are currently performance issues, but it might be more convenient.
9899
If you want to use this with OBS' Virtual Camera, use the [Virtualcam plugin](https://obsproject.com/forum/resources/obs-virtualcam.949/) instead.
99100

101+
#### Capture Device
102+
103+
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.
104+
100105
#### Show Live Similarity
101106

102107
- 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?
240245
- Created by [Toufool](https://twitter.com/Toufool) and [Faschz](https://twitter.com/faschz).
241246
- [Harutaka Kawamura](https://github.com/harupy/) for the snipping tool code that I used to integrate into the autosplitter.
242247
- [amaringos](https://twitter.com/amaringos) for the icon.
243-
- [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.
248+
- [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.
244249
- [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.
245250
- [KaDiWa](https://github.com/KaDiWa4) for the LiveSplit integration.
246251
- [Tyron18](https://twitter.com/Tyron18_) for assisting with Windows 11 testing.

res/about.ui

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<rect>
5353
<x>10</x>
5454
<y>44</y>
55-
<width>171</width>
55+
<width>241</width>
5656
<height>32</height>
5757
</rect>
5858
</property>
@@ -65,7 +65,7 @@
6565
<rect>
6666
<x>10</x>
6767
<y>21</y>
68-
<width>161</width>
68+
<width>241</width>
6969
<height>16</height>
7070
</rect>
7171
</property>
@@ -76,15 +76,16 @@
7676
<widget class="QLabel" name="donate_text_label">
7777
<property name="geometry">
7878
<rect>
79-
<x>30</x>
80-
<y>95</y>
81-
<width>204</width>
82-
<height>32</height>
79+
<x>10</x>
80+
<y>90</y>
81+
<width>241</width>
82+
<height>41</height>
8383
</rect>
8484
</property>
8585
<property name="text">
86-
<string>If you enjoy using this program, please
87-
consider donating. Thank you!</string>
86+
<string>If you enjoy using this program,
87+
please consider donating.
88+
Thank you!</string>
8889
</property>
8990
<property name="alignment">
9091
<set>Qt::AlignCenter</set>
@@ -128,6 +129,9 @@ consider donating. Thank you!</string>
128129
<bool>true</bool>
129130
</property>
130131
</widget>
132+
<zorder>ok_button</zorder>
133+
<zorder>donate_text_label</zorder>
134+
<zorder>donate_button_label</zorder>
131135
<zorder>icon_label</zorder>
132136
<zorder>version_label</zorder>
133137
<zorder>created_by_label</zorder>

0 commit comments

Comments
 (0)