Skip to content

Commit 4e0eed9

Browse files
authored
Merge pull request #13 from rchaput/develop
Merge develop to master
2 parents d30b51b + c6ea686 commit 4e0eed9

12 files changed

+103
-14
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Directly reads the files that compose each of the following databases:
7575

7676
This project only depends on
7777
* Python3.6 (should work with later versions)
78-
* PySide2 (Qt5 for Python ; tested with version 5.9.0a1)
78+
* PySide6 (Qt6 for Python)
7979
* configparser (Python standard library to read config files)
8080
* Uses code from https://github.com/wor/desktop_file_parser
8181
(in order to parse [Desktop files][apps-spec])

poetry.lock

Lines changed: 70 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[tool.poetry]
2+
name = "XDG-Prefs"
3+
version = "0.3.0"
4+
description = "A GUI program to view and change your default programs preferences (which program should open which type of file), using the XDG Specifications"
5+
authors = ["Remy Chaput <rchaput.pro@gmail.com>"]
6+
license = "Apache"
7+
readme = "README.md"
8+
packages = [{include = "xdgprefs"}]
9+
10+
[tool.poetry.dependencies]
11+
python = "^3.9, <3.13"
12+
PySide6 = "^6.7"
13+
14+
15+
[build-system]
16+
requires = [
17+
"setuptools >= 40.9.0",
18+
]
19+
build-backend = "setuptools.build_meta"

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pyside2
1+
pyside6

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ def read(fname):
88

99
setup(
1010
name='XDG-Prefs',
11-
version='0.2',
11+
version='0.3',
1212

1313
packages=['xdgprefs', 'xdgprefs.core', 'xdgprefs.gui'],
14-
install_requires=['PySide2'],
14+
install_requires=['PySide6'],
1515

1616
entry_points={
1717
'gui_scripts': [
@@ -38,7 +38,7 @@ def read(fname):
3838
'License :: OSI Approved :: Apache Software License',
3939
'Natural Language :: English',
4040
'Operating System :: Unix',
41-
'Programming Language :: Python :: 3.6',
41+
'Programming Language :: Python :: 3.9',
4242
'Topic :: Utilities'
4343
]
4444
)

xdgprefs/__main__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
import sys
7-
from PySide2.QtWidgets import QApplication
7+
from PySide6.QtWidgets import QApplication
88

99
from xdgprefs.gui.main_window import MainWindow
1010

xdgprefs/gui/apps_panel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"""
55

66

7-
from PySide2.QtWidgets import QListWidget, QWidget, \
7+
from PySide6.QtWidgets import QListWidget, QWidget, \
88
QLabel, QGridLayout, QLineEdit, QCheckBox
99

1010
from xdgprefs.core import DesktopEntry

xdgprefs/gui/association_item.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from threading import Thread
77

8-
from PySide2.QtWidgets import QComboBox
8+
from PySide6.QtWidgets import QComboBox
99

1010
from xdgprefs.gui.mime_item import MimeTypeItem
1111

xdgprefs/gui/associations_panel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"""
66

77

8-
from PySide2.QtWidgets import QListWidget, QWidget, \
8+
from PySide6.QtWidgets import QListWidget, QWidget, \
99
QLabel, QCheckBox, QLineEdit, QGridLayout
1010

1111
from xdgprefs.core import MimeType

xdgprefs/gui/custom_item.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"""
99

1010

11-
from PySide2.QtWidgets import QListWidgetItem, QWidget, \
11+
from PySide6.QtWidgets import QListWidgetItem, QWidget, \
1212
QVBoxLayout, QHBoxLayout, QLabel
13-
from PySide2.QtGui import QPixmap
14-
from PySide2.QtCore import QSize
13+
from PySide6.QtGui import QPixmap
14+
from PySide6.QtCore import QSize
1515

1616

1717
class CustomItem(QListWidgetItem):

xdgprefs/gui/main_window.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"""
55

66

7-
from PySide2.QtWidgets import QMainWindow, QTabWidget
7+
from PySide6.QtWidgets import QMainWindow, QTabWidget
88

99
from xdgprefs.gui import MimeTypePanel, AppsPanel, AssociationsPanel
1010
from xdgprefs.core import MimeDatabase, AppDatabase, AssociationsDatabase

xdgprefs/gui/mime_type_panel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"""
55

66

7-
from PySide2.QtWidgets import QListWidget, QWidget, QLabel, QGridLayout, \
7+
from PySide6.QtWidgets import QListWidget, QWidget, QLabel, QGridLayout, \
88
QLineEdit, QCheckBox
99

1010
from xdgprefs.core import MimeType

0 commit comments

Comments
 (0)