kitbash 1.9.0__tar.gz → 1.11.0__tar.gz

{kitbash-1.9.0 → kitbash-1.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kitbash
-Version: 1.9.0
+Version: 1.11.0
 Summary: Provides universal settings, styles, cached icons, and pixmaps, and the base
 Author-email: Leon Dionne <ldionne@dridesign.sh.cn>
 Description-Content-Type: text/markdown
@@ -11,7 +11,7 @@ Requires-Dist: qt_liquid_pool >= 1.2.0
 Requires-Dist: recent_items_list >= 1.1.2
 Requires-Dist: sfzen >= 2.3.2
 Requires-Dist: soso_qt_extras >= 1.7.0
-Requires-Dist: xdg_soso >= 0.2.0
+Requires-Dist: xdg_soso >= 1.1.0
 Project-URL: Home, https://github.com/Zen-Master-SoSo/kitbash
 
 # KitBash

{kitbash-1.9.0 → kitbash-1.11.0}/kitbash/__init__.py

@@ -28,8 +28,9 @@ from functools import lru_cache
 from PyQt5.QtCore import QSettings
 from PyQt5.QtWidgets import QApplication, QSplitter
 from qt_extras import DevilBox
+from xdg_soso import XDGSetup
 
-__version__ = "1.9.0"
+__version__ = "1.11.0"
 
 APPLICATION_NAME			= "kitbash"
 PACKAGE_DIR					= dirname(__file__)
@@ -132,4 +133,15 @@ class GeometrySaver:
 		return f'{self.__class__.__name__}/{splitter.objectName()}/geometry'
 
 
+class KitbashSetup(XDGSetup):
+
+	def __init__(self):
+		super().__init__('kitbash', 'Kitbash')
+		self._comment = "Bash together new .SFZ drumkits from pieces of existing ones."
+		self._vendor_name = 'zen_soso'
+		self._application_icon = join(dirname(__file__), 'res', 'kitbash-icon.svg')
+		self._categories = ['AudioVideo', 'Audio']
+		self._keywords = ['Audio', 'Sound', 'midi', 'SFZ', 'Drumkit']
+
+
 #  end kitbash/kitbash/__init__.py

kitbash-1.11.0/kitbash/__main__.py

@@ -0,0 +1,93 @@
+#  kitbash/kitbash/__init__.py
+#
+#  Copyright 2025-2026 Leon Dionne <ldionne@dridesign.sh.cn>
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+#  MA 02110-1301, USA.
+#
+"""
+kitbash is a program you can use to combine parts of various SFZ files into a
+new SFZ with instruments "borrowed" from the originals.
+"""
+import sys, logging
+from os import environ
+from argparse import ArgumentParser
+from PyQt5.QtWidgets import QApplication
+from qt_extras import exceptions_hook
+from xdg_soso import is_xdg
+from kitbash import KitbashSetup
+from kitbash.gui.main_window import MainWindow
+
+
+def main():
+	parser = ArgumentParser()
+	parser.epilog = __doc__
+	parser.add_argument('Filename', type=str, nargs='?',
+		help='SFZ file[s] to include at startup')
+	parser.add_argument("--log-file", "-l", type=str,
+		help="Log to this file")
+	if is_xdg():
+		parser.add_argument('--install', '-i', action = 'store_true',
+			help = """Install this application into your desktop
+environment. This will create a desktop launcher so you can start KitBash from
+your menu or Dash, and associate KitBash with SFZ files.""")
+		parser.add_argument('--uninstall', '-u', action = 'store_true',
+			help = """Remove KitBash from your desktop environment.
+The program will still be on your computer, and can be called from the command
+line as "kitbash", but you won't be able to see it in your desktop applications
+menu.""")
+	parser.add_argument("--verbose", "-v", action="store_true",
+		help="Show more detailed debug information")
+	options = parser.parse_args()
+
+	log_level = logging.DEBUG if options.verbose else logging.ERROR
+	log_format = "[%(filename)24s:%(lineno)4d] %(levelname)-8s %(message)s"
+	if options.log_file:
+		logging.basicConfig(
+			filename = options.log_file,
+			filemode = 'w',
+			level = log_level,
+			format = log_format
+		)
+	else:
+		logging.basicConfig(
+			level = log_level,
+			format = log_format
+		)
+
+	if options.install:
+		KitbashSetup().install()
+	elif options.uninstall:
+		KitbashSetup().uninstall()
+	else:
+		#-----------------------------------------------------------------------
+		# Annoyance fix per:
+		# https://stackoverflow.com/questions/986964/qt-session-management-error
+		try:
+			del environ['SESSION_MANAGER']
+		except KeyError:
+			pass
+		#-----------------------------------------------------------------------
+		app = QApplication([])
+		sys.excepthook = exceptions_hook
+		main_window = MainWindow(options)
+		main_window.show()
+		sys.exit(app.exec())
+
+if __name__ == "__main__":
+	sys.exit(main())
+
+
+#  end kitbash/kitbash/__init__.py

{kitbash-1.9.0 → kitbash-1.11.0}/kitbash/gui/main_window.py

@@ -46,7 +46,6 @@ from kitbash import (
 from kitbash.worker_threads import KitLoader, KitBasher
 from kitbash.gui.drumkit_widget import DrumkitWidget
 from kitbash.gui.kit_save_dialog import KitSaveDialog
-from kitbash.install import install
 
 
 UPDATES_DEBOUNCE = 680
@@ -123,7 +122,6 @@ class MainWindow(QMainWindow, GeometrySaver):
 		self.audio.connect()
 		if self.options.Filename:
 			self.load_project(self.options.Filename)
-		install()
 
 	def setup_kits_area(self):
 		self.drumkit_widgets = VListLayout(end_space = 10)

{kitbash-1.9.0 → kitbash-1.11.0}/pyproject.toml

@@ -12,7 +12,7 @@ dependencies = [
 	"recent_items_list >= 1.1.2",
 	"sfzen >= 2.3.2",
 	"soso_qt_extras >= 1.7.0",
-	"xdg_soso >= 0.2.0"
+	"xdg_soso >= 1.1.0"
 ]
 
 [project.urls]
@@ -27,7 +27,7 @@ requires = ["flit_core >=3.2,<4"]
 build-backend = "flit_core.buildapi"
 
 [bumpver]
-current_version = "1.9.0"
+current_version = "1.11.0"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "Bump version {old_version} -> {new_version}"
 commit = true

kitbash-1.9.0/kitbash/__main__.py

@@ -1,72 +0,0 @@
-#  kitbash/kitbash/__init__.py
-#
-#  Copyright 2025-2026 Leon Dionne <ldionne@dridesign.sh.cn>
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-#  MA 02110-1301, USA.
-#
-"""
-kitbash is a program you can use to combine parts of various SFZ files into a
-new SFZ with instruments "borrowed" from the originals.
-"""
-import sys, os, argparse, logging
-from PyQt5.QtWidgets import QApplication, QErrorMessage
-from qt_extras import exceptions_hook
-from kitbash.gui.main_window import MainWindow
-
-
-def main():
-	p = argparse.ArgumentParser()
-	p.epilog = __doc__
-	p.add_argument('Filename', type=str, nargs='?', help='SFZ file[s] to include at startup')
-	p.add_argument("--log-file", "-l", type=str, help="Log to this file")
-	p.add_argument("--verbose", "-v", action="store_true", help="Show more detailed debug information")
-	options = p.parse_args()
-
-	log_level = logging.DEBUG if options.verbose else logging.ERROR
-	log_format = "[%(filename)24s:%(lineno)4d] %(levelname)-8s %(message)s"
-	if options.log_file:
-		logging.basicConfig(
-			filename = options.log_file,
-			filemode = 'w',
-			level = log_level,
-			format = log_format
-		)
-	else:
-		logging.basicConfig(
-			level = log_level,
-			format = log_format
-		)
-
-	#-----------------------------------------------------------------------
-	# Annoyance fix per:
-	# https://stackoverflow.com/questions/986964/qt-session-management-error
-	try:
-		del os.environ['SESSION_MANAGER']
-	except KeyError:
-		pass
-	#-----------------------------------------------------------------------
-
-	app = QApplication([])
-	sys.excepthook = exceptions_hook
-	main_window = MainWindow(options)
-	main_window.show()
-	sys.exit(app.exec())
-
-if __name__ == "__main__":
-	sys.exit(main())
-
-
-#  end kitbash/kitbash/__init__.py

kitbash-1.9.0/kitbash/install.py

@@ -1,42 +0,0 @@
-#  kitbash/kitbash/install.py
-#
-#  Copyright 2026 Leon Dionne <ldionne@dridesign.sh.cn>
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-#  MA 02110-1301, USA.
-#
-"""
-Install phoney-dictate as an application on XDG-compliant systems (like gnome).
-"""
-import logging
-from os.path import dirname, join
-from xdg_soso import XDGSetup, is_xdg
-
-def install():
-	if is_xdg():
-		xdg = XDGSetup('kitbash', 'Kitbash')
-		xdg.comment = "Bash together new .SFZ drumkits from pieces of existing ones."
-		xdg.application_icon = join(dirname(__file__), 'res', 'kitbash-icon.svg')
-		xdg.categories = ['AudioVideo', 'Audio']
-		xdg.keywords = ['Audio', 'Sound', 'midi', 'SFZ', 'Drumkit']
-		xdg.install()
-
-if __name__ == '__main__':
-	log_format = "[%(filename)24s:%(lineno)4d] %(levelname)-8s %(message)s"
-	logging.basicConfig(level = logging.DEBUG, format = log_format)
-	install()
-
-
-#  end kitbash/kitbash/install.py