Skip to content

Commit

Permalink
Merge pull request #13 from rchaput/develop
Browse files Browse the repository at this point in the history
Merge develop to master
  • Loading branch information
rchaput authored Aug 1, 2024
2 parents d30b51b + c6ea686 commit 4e0eed9
Show file tree
Hide file tree
Showing 12 changed files with 103 additions and 14 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Directly reads the files that compose each of the following databases:

This project only depends on
* Python3.6 (should work with later versions)
* PySide2 (Qt5 for Python ; tested with version 5.9.0a1)
* PySide6 (Qt6 for Python)
* configparser (Python standard library to read config files)
* Uses code from https://github.com/wor/desktop_file_parser
(in order to parse [Desktop files][apps-spec])
Expand Down
70 changes: 70 additions & 0 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[tool.poetry]
name = "XDG-Prefs"
version = "0.3.0"
description = "A GUI program to view and change your default programs preferences (which program should open which type of file), using the XDG Specifications"
authors = ["Remy Chaput <[email protected]>"]
license = "Apache"
readme = "README.md"
packages = [{include = "xdgprefs"}]

[tool.poetry.dependencies]
python = "^3.9, <3.13"
PySide6 = "^6.7"


[build-system]
requires = [
"setuptools >= 40.9.0",
]
build-backend = "setuptools.build_meta"
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pyside2
pyside6
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ def read(fname):

setup(
name='XDG-Prefs',
version='0.2',
version='0.3',

packages=['xdgprefs', 'xdgprefs.core', 'xdgprefs.gui'],
install_requires=['PySide2'],
install_requires=['PySide6'],

entry_points={
'gui_scripts': [
Expand All @@ -38,7 +38,7 @@ def read(fname):
'License :: OSI Approved :: Apache Software License',
'Natural Language :: English',
'Operating System :: Unix',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.9',
'Topic :: Utilities'
]
)
2 changes: 1 addition & 1 deletion xdgprefs/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


import sys
from PySide2.QtWidgets import QApplication
from PySide6.QtWidgets import QApplication

from xdgprefs.gui.main_window import MainWindow

Expand Down
2 changes: 1 addition & 1 deletion xdgprefs/gui/apps_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"""


from PySide2.QtWidgets import QListWidget, QWidget, \
from PySide6.QtWidgets import QListWidget, QWidget, \
QLabel, QGridLayout, QLineEdit, QCheckBox

from xdgprefs.core import DesktopEntry
Expand Down
2 changes: 1 addition & 1 deletion xdgprefs/gui/association_item.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from threading import Thread

from PySide2.QtWidgets import QComboBox
from PySide6.QtWidgets import QComboBox

from xdgprefs.gui.mime_item import MimeTypeItem

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


from PySide2.QtWidgets import QListWidget, QWidget, \
from PySide6.QtWidgets import QListWidget, QWidget, \
QLabel, QCheckBox, QLineEdit, QGridLayout

from xdgprefs.core import MimeType
Expand Down
6 changes: 3 additions & 3 deletions xdgprefs/gui/custom_item.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"""


from PySide2.QtWidgets import QListWidgetItem, QWidget, \
from PySide6.QtWidgets import QListWidgetItem, QWidget, \
QVBoxLayout, QHBoxLayout, QLabel
from PySide2.QtGui import QPixmap
from PySide2.QtCore import QSize
from PySide6.QtGui import QPixmap
from PySide6.QtCore import QSize


class CustomItem(QListWidgetItem):
Expand Down
2 changes: 1 addition & 1 deletion xdgprefs/gui/main_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"""


from PySide2.QtWidgets import QMainWindow, QTabWidget
from PySide6.QtWidgets import QMainWindow, QTabWidget

from xdgprefs.gui import MimeTypePanel, AppsPanel, AssociationsPanel
from xdgprefs.core import MimeDatabase, AppDatabase, AssociationsDatabase
Expand Down
2 changes: 1 addition & 1 deletion xdgprefs/gui/mime_type_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"""


from PySide2.QtWidgets import QListWidget, QWidget, QLabel, QGridLayout, \
from PySide6.QtWidgets import QListWidget, QWidget, QLabel, QGridLayout, \
QLineEdit, QCheckBox

from xdgprefs.core import MimeType
Expand Down

0 comments on commit 4e0eed9

Please sign in to comment.