kitbash 1.0.1__tar.gz → 1.1.0__tar.gz

{kitbash-1.0.1 → kitbash-1.1.0}/.gitignore

@@ -6,3 +6,5 @@ temp
 temp.*
 debug.*
 TODO
+/venv
+/dist

{kitbash-1.0.1 → kitbash-1.1.0}/PKG-INFO

@@ -1,11 +1,10 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: kitbash
-Version: 1.0.1
+Version: 1.1.0
 Summary: kitbash is a program you can use to combine parts of various SFZ files into a
 Author-email: Leon Dionne <ldionne@dridesign.sh.cn>
 Description-Content-Type: text/markdown
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
-License-File: LICENSE
 Requires-Dist: PyQt5
 Requires-Dist: conn_jack
 Requires-Dist: jack_audio_player

{kitbash-1.0.1 → kitbash-1.1.0}/kitbash/__init__.py

@@ -31,7 +31,7 @@ from PyQt5.QtWidgets import QApplication
 from qt_extras import DevilBox
 from conn_jack import JackConnectError
 
-__version__ = "1.0.1"
+__version__ = "1.1.0"
 
 APPLICATION_NAME			= "kitbash"
 PACKAGE_DIR					= os.path.dirname(__file__)

{kitbash-1.0.1 → kitbash-1.1.0}/kitbash/gui/main_window.py

@@ -353,18 +353,14 @@ class MainWindow(QMainWindow, GeometrySaver):
 		self.clear()
 		# Setup background threadpool for KitLoader and KitBasher workers
 		self.background_threadpool = QThreadPool()
-		# Setup connection manager and synth creation pool
-		self.conn_man = JackConnectionManager()
-		self.conn_man.on_error(self.jack_error)
-		self.conn_man.on_xrun(self.jack_xrun)
-		self.conn_man.on_shutdown(self.jack_shutdown)
-		self.conn_man.on_client_registration(self.jack_client_registration)
-		self.conn_man.on_port_registration(self.jack_port_registration)
+		self.setup_conn_man()
 		# Fill sink/source menus:
 		self.fill_cmb_sources()
 		self.fill_cmb_sinks()
 		# Setup signals
-		self.sig_ports_complete.connect(self.slot_ports_complete)
+		# Note: sig_ports_complete is emitted from a JACK.Client process thread.
+		# That is why we force use of QueuedConnection between that signal and the main GUI thread.
+		self.sig_ports_complete.connect(self.slot_ports_complete, type = Qt.QueuedConnection)
 		self.cmb_midi_srcs.currentTextChanged.connect(self.slot_midi_src_changed)
 		self.cmb_audio_sinks.currentTextChanged.connect(self.slot_audio_sink_changed)
 		# Setup MidiSplitter
@@ -391,6 +387,7 @@ class MainWindow(QMainWindow, GeometrySaver):
 		self.action_save_bashed_kit.triggered.connect(self.slot_save_kit)
 		self.action_save_kit_as.triggered.connect(self.slot_save_kit_as)
 		self.action_add_drumkit.triggered.connect(self.slot_add_drumkit)
+		self.b_add_drumkit.clicked.connect(self.slot_add_drumkit)
 		self.action_remove_all_kits.triggered.connect(self.slot_remove_all_kits)
 		self.action_reload_style.triggered.connect(self.slot_reload_style)
 		self.menu_recent_project.aboutToShow.connect(self.slot_show_recent_projects)
@@ -400,6 +397,15 @@ class MainWindow(QMainWindow, GeometrySaver):
 		self.b_copy_path.clicked.connect(self.slot_copy_kit_path)
 		self.b_xruns.clicked.connect(self.slot_xruns_clicked)
 
+	def setup_conn_man(self):
+		# Setup JackConnectionManager
+		self.conn_man = JackConnectionManager()
+		self.conn_man.on_error(self.jack_error)
+		self.conn_man.on_xrun(self.jack_xrun)
+		self.conn_man.on_shutdown(self.jack_shutdown)
+		self.conn_man.on_client_registration(self.jack_client_registration)
+		self.conn_man.on_port_registration(self.jack_port_registration)
+
 	def update_ui(self):
 		title = APPLICATION_NAME \
 			if self.project_filename is None \
@@ -411,6 +417,7 @@ class MainWindow(QMainWindow, GeometrySaver):
 		self.action_remove_all_kits.setEnabled(has_kits)
 		self.action_new_project.setEnabled(has_kits)
 		self.action_save_project.setEnabled(has_kits and self.dirty)
+		self.action_save_project_as.setEnabled(has_kits)
 		self.action_save_bashed_kit.setEnabled(has_kits)
 		self.b_save_kit.setEnabled(has_kits)
 		self.b_copy_path.setVisible(bool(self.bashed_sfz_filename))
@@ -549,6 +556,7 @@ class MainWindow(QMainWindow, GeometrySaver):
 		PyQt closeEvent overload.
 		"""
 		if self.okay_to_clear():
+			self.conn_man.close()
 			for drumkit_widget in self.drumkit_widgets:
 				drumkit_widget.synth.quit()
 			self.save_geometry()

{kitbash-1.0.1 → kitbash-1.1.0}/kitbash/gui/main_window.ui

@@ -53,6 +53,9 @@
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="toolTip">
+          <string>Save this bashed kit</string>
+         </property>
          <property name="text">
           <string/>
          </property>
@@ -62,6 +65,25 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QPushButton" name="b_add_drumkit">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>Add an existing drumkit to the mix</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="icon">
+          <iconset theme="list-add"/>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QLabel" name="lbl_bashed_sfz_filename">
          <property name="minimumSize">
@@ -70,6 +92,9 @@
            <height>0</height>
           </size>
          </property>
+         <property name="toolTip">
+          <string>Path to the current bashed kit</string>
+         </property>
          <property name="text">
           <string/>
          </property>
@@ -80,11 +105,15 @@
          <property name="enabled">
           <bool>true</bool>
          </property>
+         <property name="toolTip">
+          <string>Copy the path to the current bashed kit to the clipboard</string>
+         </property>
          <property name="text">
           <string/>
          </property>
          <property name="icon">
-          <iconset theme="edit-copy"/>
+          <iconset theme="edit-copy">
+           <normaloff>.</normaloff>.</iconset>
          </property>
         </widget>
        </item>
@@ -114,7 +143,11 @@
           </widget>
          </item>
          <item>
-          <widget class="QComboBox" name="cmb_midi_srcs"/>
+          <widget class="QComboBox" name="cmb_midi_srcs">
+           <property name="toolTip">
+            <string>Get MIDI input from this JACK client</string>
+           </property>
+          </widget>
          </item>
         </layout>
        </item>
@@ -131,7 +164,11 @@
           </widget>
          </item>
          <item>
-          <widget class="QComboBox" name="cmb_audio_sinks"/>
+          <widget class="QComboBox" name="cmb_audio_sinks">
+           <property name="toolTip">
+            <string>Send audio out to this JACK client</string>
+           </property>
+          </widget>
          </item>
         </layout>
        </item>
@@ -143,12 +180,15 @@
          <item>
           <widget class="QLabel" name="lbl3">
            <property name="text">
-            <string>Velocity:</string>
+            <string>Touch vel.:</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QSpinBox" name="spn_velocity">
+           <property name="toolTip">
+            <string>Play instruments when clicked at this MIDI velocity</string>
+           </property>
            <property name="maximum">
             <number>127</number>
            </property>
@@ -179,6 +219,9 @@
              <height>16777215</height>
             </size>
            </property>
+           <property name="toolTip">
+            <string>JACK &quot;xruns&quot; - click to reset</string>
+           </property>
            <property name="text">
             <string>0</string>
            </property>
@@ -242,11 +285,6 @@
       <string>&amp;Recent Projects ...</string>
      </property>
     </widget>
-    <widget class="QMenu" name="menu_recent_drumkits">
-     <property name="title">
-      <string>Recent &amp;Drumkits</string>
-     </property>
-    </widget>
     <addaction name="action_new_project"/>
     <addaction name="action_open_project"/>
     <addaction name="action_save_project"/>
@@ -256,8 +294,6 @@
     <addaction name="action_save_bashed_kit"/>
     <addaction name="action_save_kit_as"/>
     <addaction name="separator"/>
-    <addaction name="menu_recent_drumkits"/>
-    <addaction name="separator"/>
     <addaction name="action_quit"/>
    </widget>
    <widget class="QMenu" name="menu_View">
@@ -278,7 +314,14 @@
     <property name="title">
      <string>&amp;Edit</string>
     </property>
+    <widget class="QMenu" name="menu_recent_drumkits">
+     <property name="title">
+      <string>Recent &amp;Drumkits</string>
+     </property>
+    </widget>
     <addaction name="action_add_drumkit"/>
+    <addaction name="menu_recent_drumkits"/>
+    <addaction name="separator"/>
     <addaction name="action_remove_all_kits"/>
    </widget>
    <addaction name="menu_File"/>

{kitbash-1.0.1 → kitbash-1.1.0}/pyproject.toml

@@ -30,7 +30,7 @@ requires = ["flit_core >=3.2,<4"]
 build-backend = "flit_core.buildapi"
 
 [bumpver]
-current_version = "1.0.1"
+current_version = "1.1.0"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "Bump version {old_version} -> {new_version}"
 commit = true