kitbash 1.11.0__tar.gz → 1.12.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kitbash
-Version: 1.11.0
+Version: 1.12.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
@@ -10,7 +10,7 @@ Requires-Dist: PyQt5
 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: soso_qt_extras >= 1.13.0
 Requires-Dist: xdg_soso >= 1.1.0
 Project-URL: Home, https://github.com/Zen-Master-SoSo/kitbash
 

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

@@ -28,11 +28,14 @@ from functools import lru_cache
 from PyQt5.QtCore import QSettings
 from PyQt5.QtWidgets import QApplication, QSplitter
 from qt_extras import DevilBox
+from qt_extras.settings import get_setting
 from xdg_soso import XDGSetup
 
-__version__ = "1.11.0"
+__version__ = "1.12.0"
 
-APPLICATION_NAME			= "kitbash"
+VENDOR_NAME					= 'ZenSoSo'
+APPLICATION_NAME			= 'KitBash'
+PACKAGE_NAME				= 'kitbash'
 PACKAGE_DIR					= dirname(__file__)
 DEFAULT_STYLE				= 'system'
 AUDIO_ICON_SIZE				= 16
@@ -55,28 +58,6 @@ def audio():
 		audio.instance = Audio()
 	return audio.instance
 
-@lru_cache
-def __settings():
-	return QSettings('ZenSoSo', APPLICATION_NAME)
-
-def get_setting(key, default = None, type_ = None):
-	value = __settings().value(key, default)
-	if type_:
-		if value is None:
-			return type_()
-		if type_ is bool:
-			return value == '1'
-		return type_(value)
-	return value
-
-def set_setting(key, value):
-	if isinstance(value, bool):
-		value = '1' if value else '0'
-	__settings().setValue(key, value)
-
-def delete_setting(key):
-	__settings().remove(key)
-
 @lru_cache
 def styles():
 	return {
@@ -90,58 +71,15 @@ def set_application_style():
 		QApplication.instance().setStyleSheet(cssfile.read())
 
 
-class GeometrySaver:
-	"""
-	Provides classes declared in this project which inherit from QDialog methods to
-	easily save/restore window / splitter geometry.
-
-	Geometry is saved in this project's QSettings accessed as "settings()"
-	"""
-
-	def restore_geometry(self):
-		if not hasattr(self, 'restoreGeometry'):
-			logging.error('Object of type %s has no "restoreGeometry" function',
-				self.__class__.__name__)
-			return
-		geometry = get_setting(self.__geometry_key())
-		if geometry is not None:
-			self.restoreGeometry(geometry)	# pylint: disable = no-member
-		# pylint: disable-next = no-member
-		for splitter in self.findChildren(QSplitter):
-			geometry = get_setting(self.__splitter_geometry_key(splitter))
-			if geometry is not None:
-				splitter.restoreState(geometry)	# pylint: disable = no-member
-
-	def save_geometry(self):
-		if not hasattr(self, 'saveGeometry'):
-			logging.error('Object of type %s has no "saveGeometry" function',
-				self.__class__.__name__)
-			return
-		set_setting(
-			self.__geometry_key(),
-			self.saveGeometry())	# pylint: disable = no-member
-		# pylint: disable-next = no-member
-		for splitter in self.findChildren(QSplitter):
-			set_setting(
-				self.__splitter_geometry_key(splitter),
-				splitter.saveState())	# pylint: disable = no-member
-
-	def __geometry_key(self):
-		return f'{self.__class__.__name__}/geometry'
-
-	def __splitter_geometry_key(self, splitter):
-		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']
+		super().__init__(PACKAGE_NAME, APPLICATION_NAME)
+		self.vendor_name = VENDOR_NAME
+		self.comment = "Bash together new .SFZ drumkits from pieces of existing ones."
+		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-1.12.0}/kitbash/__main__.py

@@ -26,8 +26,9 @@ from os import environ
 from argparse import ArgumentParser
 from PyQt5.QtWidgets import QApplication
 from qt_extras import exceptions_hook
+from qt_extras.settings import init_settings
 from xdg_soso import is_xdg
-from kitbash import KitbashSetup
+from kitbash import VENDOR_NAME, PACKAGE_NAME, KitbashSetup
 from kitbash.gui.main_window import MainWindow
 
 
@@ -81,6 +82,7 @@ menu.""")
 			pass
 		#-----------------------------------------------------------------------
 		app = QApplication([])
+		init_settings(VENDOR_NAME, PACKAGE_NAME)
 		sys.excepthook = exceptions_hook
 		main_window = MainWindow(options)
 		main_window.show()

{kitbash-1.11.0 → kitbash-1.12.0}/kitbash/gui/kit_save_dialog.py

@@ -24,9 +24,11 @@ from os.path import realpath, splitext
 from functools import partial
 from PyQt5.QtCore import Qt, pyqtSlot, QCoreApplication
 from PyQt5.QtWidgets import QVBoxLayout, QLabel, QFileDialog, QGroupBox, QRadioButton
-from sfzen import (
-	SAMPLES_ABSPATH, SAMPLES_RELPATH, SAMPLES_COPY, SAMPLES_SYMLINK, SAMPLES_HARDLINK)
-from kitbash import set_setting, GeometrySaver, KEY_SAMPLES_MODE
+from qt_extras.geometry_saver import GeometrySaver
+from qt_extras.settings import get_setting, set_setting
+from sfzen import (SAMPLES_ABSPATH, SAMPLES_RELPATH, SAMPLES_COPY,
+	SAMPLES_SYMLINK, SAMPLES_HARDLINK)
+from kitbash import KEY_SAMPLES_MODE
 
 
 class KitSaveDialog(QFileDialog, GeometrySaver):
@@ -77,6 +79,18 @@ class KitSaveDialog(QFileDialog, GeometrySaver):
 		self.layout().addWidget(gb)
 		self.selected_file = None
 
+	# -------------------------
+	# GeometrySaver overrides
+
+	def get_setting(self, key, default = None, type_ = None):
+		return get_setting(key, default, type_)
+
+	def set_setting(self, key, value):
+		set_setting(key, value)
+
+	# -------------------------
+	# Slots
+
 	@pyqtSlot(int, bool)
 	def slot_set_mode(self, mode, _):
 		"""

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

@@ -34,12 +34,14 @@ from PyQt5.QtWidgets import (
 from PyQt5.QtGui import QIcon
 from qt_extras import ShutUpQT, DevilBox
 from qt_extras.list_layout import VListLayout
+from qt_extras.settings import get_setting, set_setting
+from qt_extras.geometry_saver import GeometrySaver
 from recent_items_list import RecentItemsList
 from sfzen import SAMPLES_ABSPATH
 from sfzen.drumkits import Drumkit
 from kitbash import (
 	APPLICATION_NAME, PACKAGE_DIR, DEFAULT_STYLE,
-	styles, set_application_style, get_setting, set_setting, GeometrySaver, audio,
+	styles, set_application_style, audio,
 	KEY_PREVIEW_VELOCITY, KEY_STYLE, KEY_SAMPLES_MODE,
 	KEY_RECENT_DRUMKIT_FOLDER, KEY_RECENT_DRUMKITS,
 	KEY_RECENT_PROJECT_FOLDER, KEY_RECENT_PROJECTS)
@@ -72,6 +74,7 @@ class MainWindow(QMainWindow, GeometrySaver):
 		with ShutUpQT():
 			uic.loadUi(join(PACKAGE_DIR, 'gui', 'main_window.ui'), self)
 		self.setWindowIcon(QIcon(join(PACKAGE_DIR, 'res', 'kitbash-icon.png')))
+		self.action_save_bashed_kit.setIcon(QIcon(join(PACKAGE_DIR, 'res', 'save-sfz-icon.svg')))
 		self.b_save_kit.setIcon(QIcon(join(PACKAGE_DIR, 'res', 'save-sfz-icon.svg')))
 		self.b_save_kit.setIconSize(QSize(20, 20))
 		# Setup signals
@@ -175,6 +178,15 @@ class MainWindow(QMainWindow, GeometrySaver):
 		self.b_save_kit.setEnabled(has_kits)
 		self.b_copy_path.setVisible(bool(self.saved_sfz_filename))
 
+	# -----------------------------------------------------------------
+	# GeometrySaver overrides
+
+	def get_setting(self, key, default = None, type_ = None):
+		return get_setting(key, default, type_)
+
+	def set_setting(self, key, value):
+		set_setting(key, value)
+
 	# -----------------------------------------------------------------
 	# Style functions:
 
@@ -579,21 +591,22 @@ class MainWindow(QMainWindow, GeometrySaver):
 	@pyqtSlot()
 	def slot_save_kit(self):
 		if self.saved_sfz_filename is None:
-			return self.slot_save_kit_as()
-		try:
-			self.bashed_kit.save_as(
-				self.saved_sfz_filename, samples_mode = self.saved_sfz_samples_mode)
-		except OSError as e:
-			if e.errno == 18:
-				DevilBox('Hardlinks between devices are not allowed.\n' +
-					'Choose a different path or sample mode.')
-			elif e.errno == 2:
-				return self.slot_save_kit_as()
-			else:
-				DevilBox(str(e))
+			self.slot_save_kit_as()
 		else:
-			self.statusbar.showMessage(f'Saved {self.saved_sfz_filename}', MESSAGE_TIMEOUT)
-			self.update_ui()
+			try:
+				self.bashed_kit.save_as(
+					self.saved_sfz_filename, samples_mode = self.saved_sfz_samples_mode)
+			except OSError as e:
+				if e.errno == 18:
+					DevilBox('Hardlinks between devices are not allowed.\n' +
+						'Choose a different path or sample mode.')
+				elif e.errno == 2:
+					self.slot_save_kit_as()
+				else:
+					DevilBox(str(e))
+			else:
+				self.statusbar.showMessage(f'Saved {self.saved_sfz_filename}', MESSAGE_TIMEOUT)
+				self.update_ui()
 
 	@pyqtSlot()
 	def slot_save_kit_as(self):

{kitbash-1.11.0 → kitbash-1.12.0}/kitbash/jack_audio.py

@@ -23,8 +23,9 @@ Provides MainWindow of the kitbash application.
 import logging	# pylint: disable = unused-import
 from tempfile import mkstemp
 from os import unlink
+from qt_extras.settings import get_setting, set_setting
 from qt_liquid_pool import LiquidPool
-from kitbash import get_setting, set_setting, KEY_MIDI_SOURCE, KEY_AUDIO_SINK
+from kitbash import KEY_MIDI_SOURCE, KEY_AUDIO_SINK
 
 
 class Audio(LiquidPool):

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

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