From 5b31acc7f5a230a66d305acc2f8ce5c29ab12bc7 Mon Sep 17 00:00:00 2001 From: Juraj Oravec Date: Thu, 7 Dec 2023 22:08:37 +0100 Subject: [PATCH] Python: Port from Pyside2 to Pyside6 BUG: 477234 FIXED-IN: 24.02.0 Signed-off-by: Juraj Oravec --- src/scripts/hellopython/button.py | 2 +- src/scripts/hellopython/hellopython.py | 2 +- src/scripts/hellopython/sidebar.py | 4 ++-- src/scripts/i18n.py | 2 +- src/scripts/middleclickloader/__init__.py | 2 +- src/scripts/middleclickloader/mcl_handler.py | 2 +- src/scripts/middleclickloader/mcl_settings.py | 2 +- src/scripts/runaction/action.py | 2 +- src/scripts/runaction/actionmanager.py | 2 +- src/scripts/runaction/button.py | 2 +- src/scripts/runaction/runaction.py | 2 +- src/scripts/runaction/settingsdialog.py | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/scripts/hellopython/button.py b/src/scripts/hellopython/button.py index 01c78ff5a..5c886e83e 100644 --- a/src/scripts/hellopython/button.py +++ b/src/scripts/hellopython/button.py @@ -16,7 +16,7 @@ # along with this program. If not, see . # ============================================================ import Falkon -from PySide2 import QtGui, QtWidgets +from PySide6 import QtGui, QtWidgets class HelloButton(Falkon.AbstractButtonInterface): def __init__(self): diff --git a/src/scripts/hellopython/hellopython.py b/src/scripts/hellopython/hellopython.py index 77684d50d..4f8ec9610 100644 --- a/src/scripts/hellopython/hellopython.py +++ b/src/scripts/hellopython/hellopython.py @@ -16,7 +16,7 @@ # along with this program. If not, see . # ============================================================ import Falkon -from PySide2 import QtCore, QtGui, QtWidgets +from PySide6 import QtCore, QtGui, QtWidgets from hellopython import sidebar, button from hellopython.i18n import i18n diff --git a/src/scripts/hellopython/sidebar.py b/src/scripts/hellopython/sidebar.py index a1c79cc38..55262e831 100644 --- a/src/scripts/hellopython/sidebar.py +++ b/src/scripts/hellopython/sidebar.py @@ -16,7 +16,7 @@ # along with this program. If not, see . # ============================================================ import Falkon -from PySide2 import QtGui, QtWidgets +from PySide6 import QtGui, QtWidgets from hellopython.i18n import i18n class HelloSidebar(Falkon.SideBarInterface): @@ -24,7 +24,7 @@ class HelloSidebar(Falkon.SideBarInterface): return i18n("Hello Python Sidebar") def createMenuAction(self): - act = QtWidgets.QAction(i18n("Hello Python Sidebar")) + act = QtGui.QAction(i18n("Hello Python Sidebar")) act.setCheckable(True) return act diff --git a/src/scripts/i18n.py b/src/scripts/i18n.py index f6f272a7e..8bab91a0f 100644 --- a/src/scripts/i18n.py +++ b/src/scripts/i18n.py @@ -16,7 +16,7 @@ # along with this program. If not, see . # ============================================================ import gettext -from PySide2 import QtCore +from PySide6 import QtCore locale = QtCore.QLocale.system() languages = [ locale.name(), locale.bcp47Name() ] diff --git a/src/scripts/middleclickloader/__init__.py b/src/scripts/middleclickloader/__init__.py index 3c9c76b72..6ea9fe584 100644 --- a/src/scripts/middleclickloader/__init__.py +++ b/src/scripts/middleclickloader/__init__.py @@ -17,7 +17,7 @@ # ============================================================ import Falkon -from PySide2 import QtCore +from PySide6 import QtCore from middleclickloader.mcl_handler import MCL_Handler diff --git a/src/scripts/middleclickloader/mcl_handler.py b/src/scripts/middleclickloader/mcl_handler.py index bea9a0ca4..b46a30f8f 100644 --- a/src/scripts/middleclickloader/mcl_handler.py +++ b/src/scripts/middleclickloader/mcl_handler.py @@ -17,7 +17,7 @@ # ============================================================ import Falkon -from PySide2 import QtCore, QtGui, QtWidgets +from PySide6 import QtCore, QtGui, QtWidgets from middleclickloader.mcl_loadmode import MCL_LoadMode from middleclickloader.mcl_settings import MCL_Settings diff --git a/src/scripts/middleclickloader/mcl_settings.py b/src/scripts/middleclickloader/mcl_settings.py index adaac3cbc..afdf1b346 100644 --- a/src/scripts/middleclickloader/mcl_settings.py +++ b/src/scripts/middleclickloader/mcl_settings.py @@ -17,7 +17,7 @@ # ============================================================ import os -from PySide2 import QtCore, QtWidgets, QtUiTools +from PySide6 import QtCore, QtWidgets, QtUiTools from middleclickloader.i18n import i18n from middleclickloader.mcl_loadmode import MCL_LoadMode diff --git a/src/scripts/runaction/action.py b/src/scripts/runaction/action.py index 97e39a39f..4c456495e 100644 --- a/src/scripts/runaction/action.py +++ b/src/scripts/runaction/action.py @@ -20,7 +20,7 @@ import os import re import enum import shlex -from PySide2 import QtCore, QtGui +from PySide6 import QtCore, QtGui class Action(): diff --git a/src/scripts/runaction/actionmanager.py b/src/scripts/runaction/actionmanager.py index 94e7c5f65..0f6cf01fd 100644 --- a/src/scripts/runaction/actionmanager.py +++ b/src/scripts/runaction/actionmanager.py @@ -18,7 +18,7 @@ import Falkon import os import subprocess -from PySide2 import QtCore +from PySide6 import QtCore from runaction.action import Action from runaction.settingsdialog import SettingsDialog diff --git a/src/scripts/runaction/button.py b/src/scripts/runaction/button.py index e236bf19f..bf4081c0b 100644 --- a/src/scripts/runaction/button.py +++ b/src/scripts/runaction/button.py @@ -17,7 +17,7 @@ # ============================================================ import Falkon import os -from PySide2 import QtGui, QtWidgets +from PySide6 import QtGui, QtWidgets from runaction.i18n import i18n diff --git a/src/scripts/runaction/runaction.py b/src/scripts/runaction/runaction.py index 699c2a0b2..c3e2f3400 100644 --- a/src/scripts/runaction/runaction.py +++ b/src/scripts/runaction/runaction.py @@ -16,7 +16,7 @@ # along with this program. If not, see . # ============================================================ import Falkon -from PySide2 import QtCore +from PySide6 import QtCore from runaction import actionmanager, button diff --git a/src/scripts/runaction/settingsdialog.py b/src/scripts/runaction/settingsdialog.py index b3937b058..8d131e277 100644 --- a/src/scripts/runaction/settingsdialog.py +++ b/src/scripts/runaction/settingsdialog.py @@ -16,7 +16,7 @@ # along with this program. If not, see . # ============================================================ import os -from PySide2 import QtCore, QtWidgets, QtUiTools +from PySide6 import QtCore, QtWidgets, QtUiTools from runaction.i18n import i18n