Skip to content

Commit

Permalink
* Changing #292 back to PySide2 to be compatible with Windows 7 and 8…
Browse files Browse the repository at this point in the history
… (thanks to Causemic)
  • Loading branch information
cdgriffith committed Mar 26, 2022
1 parent ffbbc0e commit 9a2e67a
Show file tree
Hide file tree
Showing 44 changed files with 46 additions and 45 deletions.
1 change: 1 addition & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

* Adding #313 basic vsync support for hardware encoders (thanks to Wontell)
* Adding "Auto" profile for VCEncC
* Changing #292 back to PySide2 to be compatible with Windows 7 and 8 (thanks to Causemic)
* Fixing profile not being passed for AVC with VCEencC and stuck on Baseline
* Fixing that force 10-bit encoding for NVEencC was not set from profiles properly (thanks to wynterca)

Expand Down
2 changes: 1 addition & 1 deletion fastflix/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import coloredlogs
import reusables
from PySide6 import QtGui, QtWidgets, QtCore
from PySide2 import QtGui, QtWidgets, QtCore

from fastflix.flix import ffmpeg_audio_encoders, ffmpeg_configuration, ffprobe_configuration, ffmpeg_opencl_support
from fastflix.language import t
Expand Down
2 changes: 1 addition & 1 deletion fastflix/encoders/av1_aom/settings_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import logging

from box import Box
from PySide6 import QtCore, QtWidgets
from PySide2 import QtCore, QtWidgets

from fastflix.encoders.common.setting_panel import SettingPanel
from fastflix.language import t
Expand Down
2 changes: 1 addition & 1 deletion fastflix/encoders/avc_x264/settings_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import logging

from box import Box
from PySide6 import QtCore, QtWidgets
from PySide2 import QtCore, QtWidgets

from fastflix.encoders.common.setting_panel import SettingPanel
from fastflix.language import t
Expand Down
2 changes: 1 addition & 1 deletion fastflix/encoders/common/setting_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from pathlib import Path

from box import Box
from PySide6 import QtGui, QtWidgets, QtCore
from PySide2 import QtGui, QtWidgets, QtCore

from fastflix.exceptions import FastFlixInternalException
from fastflix.language import t
Expand Down
2 changes: 1 addition & 1 deletion fastflix/encoders/copy/settings_panel.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import logging

from PySide6 import QtWidgets
from PySide2 import QtWidgets

from fastflix.encoders.common.setting_panel import SettingPanel
from fastflix.language import t
Expand Down
2 changes: 1 addition & 1 deletion fastflix/encoders/ffmpeg_hevc_nvenc/settings_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import logging

from box import Box
from PySide6 import QtCore, QtWidgets
from PySide2 import QtCore, QtWidgets

from fastflix.encoders.common.setting_panel import SettingPanel
from fastflix.language import t
Expand Down
2 changes: 1 addition & 1 deletion fastflix/encoders/gif/settings_panel.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
from box import Box
from PySide6 import QtWidgets
from PySide2 import QtWidgets

from fastflix.encoders.common.setting_panel import SettingPanel
from fastflix.models.encode import GIFSettings
Expand Down
2 changes: 1 addition & 1 deletion fastflix/encoders/hevc_x265/settings_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from pathlib import Path

from box import Box
from PySide6 import QtCore, QtGui, QtWidgets
from PySide2 import QtCore, QtGui, QtWidgets

from fastflix.encoders.common.setting_panel import SettingPanel
from fastflix.language import t
Expand Down
2 changes: 1 addition & 1 deletion fastflix/encoders/nvencc_avc/settings_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from typing import List, Optional

from box import Box
from PySide6 import QtCore, QtWidgets, QtGui
from PySide2 import QtCore, QtWidgets, QtGui

from fastflix.encoders.common.setting_panel import SettingPanel
from fastflix.language import t
Expand Down
2 changes: 1 addition & 1 deletion fastflix/encoders/nvencc_hevc/settings_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from typing import List, Optional

from box import Box
from PySide6 import QtCore, QtWidgets, QtGui
from PySide2 import QtCore, QtWidgets, QtGui

from fastflix.encoders.common.setting_panel import SettingPanel
from fastflix.language import t
Expand Down
2 changes: 1 addition & 1 deletion fastflix/encoders/rav1e/settings_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
import logging

from PySide6 import QtCore, QtWidgets
from PySide2 import QtCore, QtWidgets

from fastflix.encoders.common.setting_panel import SettingPanel
from fastflix.language import t
Expand Down
2 changes: 1 addition & 1 deletion fastflix/encoders/svt_av1/settings_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import logging

from box import Box
from PySide6 import QtCore, QtWidgets
from PySide2 import QtCore, QtWidgets

from fastflix.encoders.common.setting_panel import SettingPanel
from fastflix.language import t
Expand Down
2 changes: 1 addition & 1 deletion fastflix/encoders/vceencc_avc/settings_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import logging

from box import Box
from PySide6 import QtCore, QtWidgets, QtGui
from PySide2 import QtCore, QtWidgets, QtGui

from fastflix.encoders.common.setting_panel import SettingPanel
from fastflix.language import t
Expand Down
2 changes: 1 addition & 1 deletion fastflix/encoders/vceencc_hevc/settings_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import logging

from box import Box
from PySide6 import QtCore, QtWidgets, QtGui
from PySide2 import QtCore, QtWidgets, QtGui

from fastflix.encoders.common.setting_panel import SettingPanel
from fastflix.language import t
Expand Down
2 changes: 1 addition & 1 deletion fastflix/encoders/vp9/settings_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import logging

from box import Box
from PySide6 import QtCore, QtWidgets
from PySide2 import QtCore, QtWidgets

from fastflix.encoders.common.setting_panel import SettingPanel
from fastflix.language import t
Expand Down
2 changes: 1 addition & 1 deletion fastflix/encoders/webp/settings_panel.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
from box import Box
from PySide6 import QtWidgets
from PySide2 import QtWidgets

from fastflix.encoders.common.setting_panel import SettingPanel
from fastflix.models.encode import WebPSettings
Expand Down
2 changes: 1 addition & 1 deletion fastflix/entry.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def startup_options():
import coloredlogs
import iso639
import mistune
import PySide6
import PySide2
import requests
import reusables
import ruamel.yaml
Expand Down
2 changes: 1 addition & 1 deletion fastflix/models/fastflix_app.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-

from PySide6 import QtWidgets
from PySide2 import QtWidgets

from fastflix.models.fastflix import FastFlix

Expand Down
2 changes: 1 addition & 1 deletion fastflix/program_downloads.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import requests
import reusables
from appdirs import user_data_dir
from PySide6 import QtWidgets
from PySide2 import QtWidgets

from fastflix.language import t
from fastflix.shared import message
Expand Down
2 changes: 1 addition & 1 deletion fastflix/shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
base_path = os.path.abspath(".")
pyinstaller = False

from PySide6 import QtCore, QtGui, QtWidgets
from PySide2 import QtCore, QtGui, QtWidgets

from fastflix.language import t
from fastflix.resources import get_bool_env
Expand Down
4 changes: 2 additions & 2 deletions fastflix/widgets/about.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import reusables
from box import __version__ as box_version
from PySide6 import QtCore, QtGui, QtWidgets
from PySide2 import QtCore, QtGui, QtWidgets

from fastflix.language import t
from fastflix.shared import base_path, link, pyinstaller
Expand Down Expand Up @@ -62,7 +62,7 @@ def __init__(self, app):
f"{link('https://github.com/cdgriffith/Reusables', t('Reusables'), app.fastflix.config.theme)} {reusables.__version__} (MIT)<br>"
"mistune (BSD), colorama (BSD), coloredlogs (MIT), Requests (Apache 2.0)<br>"
"appdirs (MIT), iso639-lang (MIT), psutil (BSD), pathvalidate (MIT) <br>"
"BreezeStyleSheets (MIT), PySide6 (LGPL)"
"BreezeStyleSheets (MIT), PySide2 (LGPL)"
)
supporting_libraries_label.setAlignment(QtCore.Qt.AlignCenter)
supporting_libraries_label.setOpenExternalLinks(True)
Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/background_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from subprocess import PIPE, STDOUT, Popen, run, check_output
from distutils.version import LooseVersion

from PySide6 import QtCore
from PySide2 import QtCore

from fastflix.language import t
from fastflix.models.fastflix_app import FastFlixApp
Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/changes.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import re

import mistune
from PySide6 import QtCore, QtWidgets
from PySide2 import QtCore, QtWidgets

from fastflix.resources import changes_file, local_changes_file

Expand Down
4 changes: 2 additions & 2 deletions fastflix/widgets/container.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

import reusables
from appdirs import user_data_dir
from PySide6 import QtCore, QtGui, QtWidgets
from PySide6.QtGui import QAction
from PySide2 import QtCore, QtGui, QtWidgets
from PySide2.QtWidgets import QAction

from fastflix.exceptions import FastFlixInternalException
from fastflix.language import t
Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/logs.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import logging

from PySide6 import QtWidgets
from PySide2 import QtWidgets

__all__ = ["Logs"]

Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import reusables
from box import Box
from pydantic import BaseModel, Field
from PySide6 import QtCore, QtGui, QtWidgets
from PySide2 import QtCore, QtGui, QtWidgets

from fastflix.encoders.common import helpers
from fastflix.exceptions import FastFlixInternalException, FlixError
Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/panels/abstract_list.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
from box import Box
from PySide6 import QtCore, QtGui, QtWidgets
from PySide2 import QtCore, QtGui, QtWidgets

from fastflix.language import t
from fastflix.models.fastflix_app import FastFlixApp
Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/panels/advanced_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import logging

from box import Box
from PySide6 import QtCore, QtGui, QtWidgets
from PySide2 import QtCore, QtGui, QtWidgets

from fastflix.language import t
from fastflix.models.fastflix_app import FastFlixApp
Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/panels/audio_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from box import Box
from iso639 import Lang
from iso639.exceptions import InvalidLanguageValue
from PySide6 import QtCore, QtGui, QtWidgets
from PySide2 import QtCore, QtGui, QtWidgets

from fastflix.encoders.common.audio import lossless, channel_list
from fastflix.language import t
Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/panels/command_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from pathlib import Path

import reusables
from PySide6 import QtCore, QtGui, QtWidgets
from PySide2 import QtCore, QtGui, QtWidgets

from fastflix.language import t
from fastflix.models.fastflix_app import FastFlixApp
Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/panels/cover_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from typing import List, Tuple, Union

from box import Box
from PySide6 import QtCore, QtGui, QtWidgets
from PySide2 import QtCore, QtGui, QtWidgets

from fastflix.language import t
from fastflix.models.encode import AttachmentTrack
Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/panels/debug_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from typing import Union

from box import Box, BoxList
from PySide6 import QtCore, QtGui, QtWidgets
from PySide2 import QtCore, QtGui, QtWidgets

from fastflix.models.fastflix_app import FastFlixApp
from fastflix.shared import DEVMODE
Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/panels/info_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from typing import List, Union

from box import Box, BoxList
from PySide6 import QtCore, QtGui, QtWidgets
from PySide2 import QtCore, QtGui, QtWidgets

from fastflix.language import t
from fastflix.models.encode import AttachmentTrack
Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/panels/queue_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import reusables
from box import Box
from PySide6 import QtCore, QtGui, QtWidgets
from PySide2 import QtCore, QtGui, QtWidgets

from fastflix.language import t
from fastflix.models.fastflix_app import FastFlixApp
Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/panels/status_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from datetime import timedelta
from typing import Optional

from PySide6 import QtCore, QtWidgets
from PySide2 import QtCore, QtWidgets

from fastflix.exceptions import FlixError
from fastflix.language import t
Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/panels/subtitle_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from box import Box
from iso639 import Lang
from iso639.exceptions import InvalidLanguageValue
from PySide6 import QtCore, QtGui, QtWidgets
from PySide2 import QtCore, QtGui, QtWidgets

from fastflix.exceptions import FastFlixInternalException
from fastflix.language import t
Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/progress_bar.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from typing import Callable, Dict, List

import reusables
from PySide6 import QtCore, QtWidgets
from PySide2 import QtCore, QtWidgets

from fastflix.language import t

Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from iso639 import Lang
from iso639.exceptions import InvalidLanguageValue
from PySide6 import QtCore, QtGui, QtWidgets
from PySide2 import QtCore, QtGui, QtWidgets

from fastflix.exceptions import FastFlixInternalException
from fastflix.language import t
Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/video_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import copy
import logging

from PySide6 import QtGui, QtWidgets, QtCore
from PySide2 import QtGui, QtWidgets, QtCore

from fastflix.language import t
from fastflix.models.fastflix_app import FastFlixApp
Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/windows/audio_select.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from typing import Optional
import secrets

from PySide6 import QtWidgets, QtCore, QtGui
from PySide2 import QtWidgets, QtCore, QtGui

from fastflix.flix import (
generate_thumbnail_command,
Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/windows/concat.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import os
import logging

from PySide6 import QtWidgets, QtGui, QtCore
from PySide2 import QtWidgets, QtGui, QtCore

from fastflix.language import t
from fastflix.flix import probe
Expand Down
2 changes: 1 addition & 1 deletion fastflix/widgets/windows/large_preview.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from typing import Optional
import secrets

from PySide6 import QtWidgets, QtCore, QtGui
from PySide2 import QtWidgets, QtCore, QtGui

from fastflix.flix import (
generate_thumbnail_command,
Expand Down
Loading

0 comments on commit 9a2e67a

Please sign in to comment.