kitbash 1.8.2__tar.gz → 1.10.0__tar.gz

{kitbash-1.8.2 → kitbash-1.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kitbash
-Version: 1.8.2
+Version: 1.10.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.0.2
 Project-URL: Home, https://github.com/Zen-Master-SoSo/kitbash
 
 # KitBash

{kitbash-1.8.2 → kitbash-1.10.0}/kitbash/__init__.py

@@ -29,7 +29,7 @@ from PyQt5.QtCore import QSettings
 from PyQt5.QtWidgets import QApplication, QSplitter
 from qt_extras import DevilBox
 
-__version__ = "1.8.2"
+__version__ = "1.10.0"
 
 APPLICATION_NAME			= "kitbash"
 PACKAGE_DIR					= dirname(__file__)

{kitbash-1.8.2 → kitbash-1.10.0}/kitbash/__main__.py

@@ -21,19 +21,36 @@
 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
+import sys, logging
+from os import environ, getlogin
+from argparse import ArgumentParser
+from PyQt5.QtWidgets import QApplication
 from qt_extras import exceptions_hook
+from xdg_soso import is_xdg
+from kitbash.install import KitbashSetup
 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()
+	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"
@@ -50,11 +67,21 @@ def main():
 			format = log_format
 		)
 
+	if is_xdg() and (options.install or options.uninstall):
+		installer = KitbashSetup()
+		if options.install:
+			installer.install()
+			print(f'Successfully installed KitBash for {getlogin()} on this machine.')
+		else:
+			installer.uninstall()
+			print(f'Successfully uninstalled KitBash for {getlogin()} on this machine.')
+		return 0
+
 	#-----------------------------------------------------------------------
 	# Annoyance fix per:
 	# https://stackoverflow.com/questions/986964/qt-session-management-error
 	try:
-		del os.environ['SESSION_MANAGER']
+		del environ['SESSION_MANAGER']
 	except KeyError:
 		pass
 	#-----------------------------------------------------------------------

{kitbash-1.8.2 → kitbash-1.10.0}/kitbash/gui/main_window.py

@@ -27,7 +27,8 @@ from os.path import dirname, realpath, exists, join, splitext
 from functools import partial
 from signal import signal, SIGINT, SIGTERM
 from PyQt5 import uic
-from PyQt5.QtCore import Qt, QObject, pyqtSlot, QTimer, QThreadPool, QPoint, QCoreApplication
+from PyQt5.QtCore import (
+	Qt, QObject, pyqtSlot, QTimer, QThreadPool, QPoint, QSize, QCoreApplication)
 from PyQt5.QtWidgets import (
 	QApplication, QMainWindow, QMessageBox, QFileDialog, QAction, QActionGroup, QMenu)
 from PyQt5.QtGui import QIcon
@@ -45,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
@@ -72,6 +72,8 @@ 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.b_save_kit.setIcon(QIcon(join(PACKAGE_DIR, 'res', 'save-sfz-icon.svg')))
+		self.b_save_kit.setIconSize(QSize(20, 20))
 		# Setup signals
 		signal(SIGINT, self.system_signal)
 		signal(SIGTERM, self.system_signal)
@@ -120,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.8.2 → kitbash-1.10.0}/kitbash/install.py

@@ -22,21 +22,23 @@ 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
+from xdg_soso import XDGSetup
 
-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()
+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']
 
 if __name__ == '__main__':
-	log_format = "[%(filename)24s:%(lineno)4d] %(levelname)-8s %(message)s"
-	logging.basicConfig(level = logging.DEBUG, format = log_format)
-	install()
+	logging.basicConfig(level = logging.DEBUG,
+		format = "[%(filename)24s:%(lineno)4d] %(levelname)-8s %(message)s")
+	installer = KitbashSetup()
+	installer.install()
 
 
 #  end kitbash/kitbash/install.py

kitbash-1.10.0/kitbash/res/save-sfz-icon.svg

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="600"
+   height="600"
+   viewBox="0 0 600 600"
+   id="svg2"
+   version="1.1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3772">
+      <stop
+         style="stop-color:#999999;stop-opacity:1;"
+         offset="0.375784"
+         id="stop3768" />
+      <stop
+         style="stop-color:#cdd4df;stop-opacity:1;"
+         offset="1"
+         id="stop3770" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3772"
+       id="linearGradient3774"
+       x1="109.431"
+       y1="549.968"
+       x2="220.251"
+       y2="18.7833"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="translate(0,-452.36)">
+    <g
+       id="g1078"
+       transform="translate(-262.858,485.714)">
+      <g
+         id="g3430"
+         transform="matrix(1.02414,0,0,1.02414,-13.2997,0.475953)"
+         style="stroke-width:0.976431">
+        <path
+           id="rect864"
+           style="overflow:visible;fill:url(#linearGradient3774);fill-opacity:1;fill-rule:evenodd;stroke-width:0.585858"
+           transform="translate(262.858,-33.354)"
+           d="M 75.2027,4.34041 409.518,4.34 530.095,124.917 V 589.699 H 75.2027 Z" />
+        <path
+           id="path2357"
+           style="overflow:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:0.585858"
+           d="m 97.2031,567.699 c 136.9639,0 273.9289,0 410.8929,0 0,-144.557 0,-289.114 0,-433.672 C 472.2,98.1315 436.304,62.2357 400.408,26.3398 c -101.068,0 -202.137,0 -303.2049,0 0,180.4532 0,360.9062 0,541.3592 z"
+           transform="translate(262.858,-33.354)" />
+      </g>
+      <path
+         id="path6081"
+         style="font-size:14.6667px;line-height:100%;font-family:Z003;-inkscape-font-specification:Z003;text-align:center;letter-spacing:-0.99px;text-anchor:middle;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.0127256;stroke-miterlimit:3"
+         d="m 184.994,352.959 c -1.502,0.211 -2.55,1.622 -2.707,3.07 -0.243,0.575 -0.819,-0.01 -1.085,-0.261 -1.23,-1.12 -3.704,-0.65 -4.14,1.052 -0.291,1.219 0.858,2.064 1.764,2.608 0.878,0.307 0.743,1.658 -0.133,1.853 -0.488,0.161 -1.471,0.06 -1.396,-0.635 0.302,-0.441 1.102,-0.281 1.281,-0.816 -0.487,-1.005 -2.163,-1.14 -2.782,-0.181 -0.716,0.87 -0.54,2.364 0.533,2.868 0.536,0.45 1.479,0.589 2.001,0.629 -0.55,0.315 -0.89,1.217 -0.23,1.606 1.221,0.987 3.303,0.437 3.804,-1.082 0.903,-1.771 1.173,-3.766 1.75,-5.65 0.842,-0.268 2.019,0.4 2.606,-0.516 0.04,-0.298 0.526,-0.312 0.693,-0.145 -1.623,1.263 -3.139,2.744 -4.215,4.493 0.08,0.58 0.731,1.184 1.315,0.916 0.259,-0.616 1.035,-0.334 1.415,0 1.506,0.731 3.8,0.263 4.326,-1.495 0.321,-0.958 0.193,-2.216 -0.649,-2.859 -0.782,-0.04 -1.677,0.511 -1.768,1.319 0.249,0.399 1.126,0.88 0.545,1.369 -0.631,0.485 -1.486,0.203 -2.1,-0.16 1.087,-1.707 2.699,-2.977 4.211,-4.28 0.348,-0.687 -0.786,-1.364 -1.24,-0.756 -0.669,0.313 -1.408,0 -2.07,-0.17 0.571,-0.149 1.428,-0.72 1.019,-1.394 -0.549,-0.924 -1.589,-1.603 -2.691,-1.382 z m 0.477,1.502 c 0.626,0 0.638,0.707 0.602,1.125 -0.648,0.01 -1.361,0.334 -1.975,0.639 0.113,-0.751 0.455,-1.763 1.373,-1.764 z m -5.746,2.391 c 0.669,0.07 -0.344,0.692 0.115,0.982 0.567,0.356 1.298,-0.107 1.894,0.127 0.271,0.499 -0.204,1.046 -0.213,1.588 -0.106,0.359 -0.125,1.124 -0.278,0.406 -0.358,-0.944 -1.396,-1.305 -2.014,-2.006 -0.384,-0.379 -0.227,-1.2 0.412,-1.096 h 0.08 z m 1.189,5.287 c -0.207,0.541 -0.502,1.264 -1.137,1.392 -0.456,-0.201 -0.483,-0.674 0.05,-0.715 0.501,-0.228 0.937,-0.614 1.214,-1.091 -0.04,0.138 -0.09,0.276 -0.129,0.414 z"
+         transform="matrix(39.2909,0,0,39.2909,-6616.21,-13836.7)" />
+      <path
+         d="m 175.591,360.898 c -0.01,1.204 1.433,1.971 2.831,1.98 1.163,0 2.053,-0.543 2.488,-1.447 0.717,-1.49 -0.471,-2.162 -1.382,-2.854 -0.351,-0.249 -1.032,-0.864 -0.715,-1.529 0.136,-0.482 0.647,-0.497 1.164,-0.391 0.434,0.09 0.7,0.674 0.63,1.03 l 0.932,-0.848 c 0,0 0.03,-0.57 -0.518,-0.964 -0.398,-0.289 -1.12,-0.418 -1.519,-0.441 -0.813,-0.05 -2.075,0.355 -2.258,1.785 0.07,1.018 1.047,1.549 1.744,2.009 0.861,0.43 1.015,1.667 0.08,2.158 -0.902,0.473 -1.988,0.09 -2.097,-0.488 -0.116,-0.621 0.89,-0.842 1.318,-1 0.416,-0.154 -1.172,-0.772 -1.443,-0.695 -0.797,0.349 -1.247,1.036 -1.255,1.695 z"
+         style="font-size:14.6667px;line-height:100%;font-family:Z003;-inkscape-font-specification:Z003;text-align:center;letter-spacing:-0.99px;text-anchor:middle;fill:#3a6973;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.0127256;stroke-miterlimit:3"
+         id="path2715"
+         transform="matrix(39.2909,0,0,39.2909,-6616.21,-13836.7)" />
+      <path
+         d="m 178.058,364.076 c -0.03,0.28 0.364,0.979 1.951,0.945 2.107,-0.05 2.62,-3.953 3.578,-7.291 l 2.26,0.05 0.877,-1.282 -2.902,0.169 c 0.339,-1.447 0.626,-2.352 1.684,-2.405 0.951,-0.05 1.069,0.843 0.856,1.363 0.306,-0.02 1.284,-0.393 1.394,-0.86 -0.623,-1.01 -0.974,-1.518 -2.134,-1.513 -2.17,-0.06 -2.666,1.494 -3.111,3.288 l -1.591,-0.05 -0.917,1.185 2.348,0.05 c -0.626,1.92 -0.878,5.9 -2.311,6.083 -0.896,0.08 -0.583,-0.675 -0.804,-0.743 -0.524,0.183 -1.16,0.702 -1.178,1.008 z"
+         style="font-size:14.6667px;line-height:100%;font-family:Z003;-inkscape-font-specification:Z003;text-align:center;letter-spacing:-0.99px;text-anchor:middle;fill:#438561;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.0127256;stroke-miterlimit:3"
+         id="path2717"
+         transform="matrix(39.2909,0,0,39.2909,-6620.37,-13837.6)" />
+      <path
+         d="m 184.183,362.603 c 0.129,-0.01 0.232,-0.275 0.369,-0.399 0.148,-0.133 0.464,-0.231 0.618,-0.125 0.734,0.401 1.423,0.801 2.411,0.709 1.863,-0.173 2.469,-1.121 2.498,-2.593 0.01,-0.743 -0.408,-1.493 -0.557,-1.568 -0.529,-0.162 -1.484,0.604 -1.546,0.93 0.04,0.296 0.989,0.648 0.815,1.287 -0.522,1.046 -1.79,0.88 -2.943,0.151 0.268,-0.674 1.474,-1.932 2.313,-2.776 0.631,-0.635 1.94,-1.544 2.081,-1.789 0.1,-0.171 -0.405,-0.715 -0.657,-0.519 -0.302,0.228 -0.651,0.39 -1.031,0.373 -0.841,0.01 -0.938,-0.41 -2.164,-0.427 -0.929,-0.01 -1.967,0.667 -1.967,0.667 0,0 -0.218,1.079 -0.03,1.059 1.372,-1.047 2.383,-0.648 3.555,-0.39 -1.535,0.997 -3.105,2.706 -3.895,3.698 -0.198,0.248 -0.528,0.614 -0.692,0.886 -0.04,0.36 0.645,0.856 0.82,0.83 z"
+         style="font-size:14.6667px;line-height:100%;font-family:Z003;-inkscape-font-specification:Z003;text-align:center;letter-spacing:-0.99px;text-anchor:middle;fill:#574f4b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.0127256;stroke-miterlimit:3"
+         id="path2719"
+         transform="matrix(39.2909,0,0,39.2909,-6631.07,-13834.7)" />
+    </g>
+  </g>
+</svg>

{kitbash-1.8.2 → kitbash-1.10.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.0.2"
 ]
 
 [project.urls]
@@ -27,7 +27,7 @@ requires = ["flit_core >=3.2,<4"]
 build-backend = "flit_core.buildapi"
 
 [bumpver]
-current_version = "1.8.2"
+current_version = "1.10.0"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "Bump version {old_version} -> {new_version}"
 commit = true