Skip to content

Commit e77573e

Browse files
committed
Merge branch 'Bump-minimum-Python-version-to-match-what-we-actually-ship' of https://github.com/Toufool/AutoSplit into Bump-minimum-Python-version-to-match-what-we-actually-ship
2 parents 4ca7329 + 8e7a442 commit e77573e

4 files changed

Lines changed: 3 additions & 4 deletions

File tree

src/AutoSplit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535

3636
import cv2
3737
from cv2.typing import MatLike
38+
from gen import about, design, settings, update_checker
3839
from PySide6 import QtCore, QtGui
3940
from PySide6.QtTest import QTest
4041
from PySide6.QtWidgets import QApplication, QFileDialog, QLabel, QMainWindow, QMessageBox
@@ -44,7 +45,6 @@
4445
from AutoControlledThread import AutoControlledThread
4546
from AutoSplitImage import START_KEYWORD, AutoSplitImage, ImageType
4647
from capture_method import CaptureMethodBase, CaptureMethodEnum
47-
from gen import about, design, settings, update_checker
4848
from hotkeys import (
4949
HOTKEYS,
5050
KEYBOARD_GROUPS_ISSUE,

src/menu_bar.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from urllib.error import URLError
77
from urllib.request import urlopen
88

9+
from gen import about, design, settings as settings_ui, update_checker
910
from packaging.version import parse as version_parse
1011
from PySide6 import QtCore, QtWidgets
1112
from PySide6.QtCore import Qt
@@ -21,7 +22,6 @@
2122
change_capture_method,
2223
get_all_video_capture_devices,
2324
)
24-
from gen import about, design, settings as settings_ui, update_checker
2525
from hotkeys import HOTKEYS, HOTKEYS_WHEN_AUTOCONTROLLED, CommandStr, set_hotkey
2626
from utils import AUTOSPLIT_VERSION, GITHUB_REPOSITORY, ONE_SECOND, decimal, fire_and_forget
2727

src/user_profile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
from warnings import deprecated
66

77
import tomli_w
8+
from gen import design
89
from PySide6 import QtCore, QtWidgets
910

1011
import error_messages
1112
from capture_method import CAPTURE_METHODS, CaptureMethodEnum, Region, change_capture_method
12-
from gen import design
1313
from hotkeys import HOTKEYS, CommandStr, Hotkey, remove_all_hotkeys, set_hotkey
1414
from menu_bar import open_settings
1515
from utils import auto_split_directory

src/utils.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import cv2
1515
import numpy as np
1616
from cv2.typing import MatLike
17-
1817
from gen.build_vars import AUTOSPLIT_BUILD_NUMBER, AUTOSPLIT_GITHUB_REPOSITORY
1918

2019
if sys.platform == "win32":

0 commit comments

Comments
 (0)