lss
/
Tembro
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Better download dialog

master
Nils 3 years ago
parent
9d56b96dd3
commit
fe82e32154
6 changed files with 208 additions and 143 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      qtgui/chooseDownloadDirectory.py
  2. 92
      qtgui/designer/chooseDownloadDirectory.py
  3. 224
      qtgui/designer/chooseDownloadDirectory.ui
  4. 2
      qtgui/mainwindow.py
  5. 3
      template/documentation/readme.template
  6. 1
      template/qtgui/mainwindow.py

29
qtgui/chooseDownloadDirectory.py
View File

@ -73,11 +73,16 @@ class ChooseDownloadDirectory(QtWidgets.QDialog):
self.ui.pathComboBox.setCurrentText("") self.ui.pathComboBox.setCurrentText("")
self.ui.buttonBox.accepted.connect(self.accept) self.ui.buttonBox.accepted.connect(self.accept)
self.ui.buttonBox.rejected.connect(self.reject) self.ui.buttonBox.rejected.connect(self.reject) #For the hidden cancel button
self.ui.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(QtCore.QCoreApplication.translate("ChooseDownloadDirectory", "Rescan Sample Directory")) self._rescanButtonDefaultText = QtCore.QCoreApplication.translate("ChooseDownloadDirectory", "Rescan and Close Dialog")
self._cancelDefaultText = QtCore.QCoreApplication.translate("ChooseDownloadDirectory", "Don't rescan") self._rescanButtonPleaseWaitForDownloadText = QtCore.QCoreApplication.translate("ChooseDownloadDirectory", "Please wait for download to finish")
self.ui.buttonBox.button(QtWidgets.QDialogButtonBox.Cancel).setText(self._cancelDefaultText)
self.ui.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(self._rescanButtonDefaultText)
#self._cancelDefaultText = QtCore.QCoreApplication.translate("ChooseDownloadDirectory", "Don't rescan")
#self.ui.buttonBox.button(QtWidgets.QDialogButtonBox.Cancel).setText(self._cancelDefaultText)
self.ui.abortDownloadButton.hide()
self.ui.abortDownloadButton.clicked.connect(self.reject)
self.ui.openFileDialogButton.setText("") self.ui.openFileDialogButton.setText("")
self.ui.openFileDialogButton.setIcon(self.style().standardIcon(getattr(QtWidgets.QStyle, "SP_DialogOpenButton"))) self.ui.openFileDialogButton.setIcon(self.style().standardIcon(getattr(QtWidgets.QStyle, "SP_DialogOpenButton")))
@ -85,6 +90,8 @@ class ChooseDownloadDirectory(QtWidgets.QDialog):
self.ui.downloadPushButton.setEnabled(True) self.ui.downloadPushButton.setEnabled(True)
self._downloadDefaultText = QtCore.QCoreApplication.translate("ChooseDownloadDirectory", "Download and Update Instrument Libraries") self._downloadDefaultText = QtCore.QCoreApplication.translate("ChooseDownloadDirectory", "Download and Update Instrument Libraries")
self._pauseText = QtCore.QCoreApplication.translate("ChooseDownloadDirectory", "Pause Download") self._pauseText = QtCore.QCoreApplication.translate("ChooseDownloadDirectory", "Pause Download")
self._resumeText = QtCore.QCoreApplication.translate("ChooseDownloadDirectory", "Resume Download") self._resumeText = QtCore.QCoreApplication.translate("ChooseDownloadDirectory", "Resume Download")
self.ui.downloadPushButton.setText(self._downloadDefaultText) self.ui.downloadPushButton.setText(self._downloadDefaultText)
@ -125,12 +132,13 @@ class ChooseDownloadDirectory(QtWidgets.QDialog):
super().accept() super().accept()
def reject(self): def reject(self):
#During Download the button says "Abort". We make sure all downloads are actually stopped and then exist as normal. #We make sure all downloads are actually stopped and then exist as normal.
self._abortDownloadNOW = True #just to be safe self._abortDownloadNOW = True #just to be safe
if self.currentSmartDL: if self.currentSmartDL:
self.currentSmartDL.unpause() #Just stopping here while paused will freeze Qt. With setting the abort switch above we can let it play out. self.currentSmartDL.unpause() #Just stopping here while paused will freeze Qt. With setting the abort switch above we can let it play out.
self.path = None self.path = None
super().reject() super().reject()
@ -154,9 +162,6 @@ class ChooseDownloadDirectory(QtWidgets.QDialog):
http://itaybb.github.io/pySmartDL/examples.html#example-6-use-the-nonblocking-flag-and-get-information-during-the-download-process http://itaybb.github.io/pySmartDL/examples.html#example-6-use-the-nonblocking-flag-and-get-information-during-the-download-process
""" """
#hier weiter machen. Während des Downloads muss der Download button ein pause/resume werden.
#und abort tatsächlich zuverlässig den momentanen und alle zukünftigen downloads in der queue abbrechen
def _resetDialog(message): def _resetDialog(message):
self.ui.pathComboBox.setEnabled(True) self.ui.pathComboBox.setEnabled(True)
@ -173,7 +178,9 @@ class ChooseDownloadDirectory(QtWidgets.QDialog):
self.ui.buttonBox.setEnabled(True) self.ui.buttonBox.setEnabled(True)
self.ui.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(True) self.ui.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(True)
self.ui.buttonBox.button(QtWidgets.QDialogButtonBox.Cancel).setText(self._cancelDefaultText) self.ui.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(self._rescanButtonDefaultText)
self.ui.abortDownloadButton.hide()
#self.ui.buttonBox.button(QtWidgets.QDialogButtonBox.Cancel).setText(self._cancelDefaultText)
self.currentSmartDL = None #TODO: Make sure all downloads are stopped self.currentSmartDL = None #TODO: Make sure all downloads are stopped
@ -216,7 +223,9 @@ class ChooseDownloadDirectory(QtWidgets.QDialog):
self.ui.downloadPushButton.setEnabled(False) self.ui.downloadPushButton.setEnabled(False)
#self.ui.buttonBox.setEnabled(False) #self.ui.buttonBox.setEnabled(False)
self.ui.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(False) self.ui.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setEnabled(False)
self.ui.buttonBox.button(QtWidgets.QDialogButtonBox.Cancel).setText(QtCore.QCoreApplication.translate("ChooseDownloadDirectory", "Abort Download")) self.ui.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(self._rescanButtonPleaseWaitForDownloadText)
self.ui.abortDownloadButton.show()
#self.ui.buttonBox.button(QtWidgets.QDialogButtonBox.Cancel).setText(QtCore.QCoreApplication.translate("ChooseDownloadDirectory", "Abort Download"))
self.ui.pathComboBox.setEnabled(False) self.ui.pathComboBox.setEnabled(False)

92
qtgui/designer/chooseDownloadDirectory.py
View File

@ -14,31 +14,26 @@ from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_ChooseDownloadDirectory(object): class Ui_ChooseDownloadDirectory(object):
def setupUi(self, ChooseDownloadDirectory): def setupUi(self, ChooseDownloadDirectory):
ChooseDownloadDirectory.setObjectName("ChooseDownloadDirectory") ChooseDownloadDirectory.setObjectName("ChooseDownloadDirectory")
ChooseDownloadDirectory.resize(410, 391) ChooseDownloadDirectory.resize(453, 578)
self.verticalLayout = QtWidgets.QVBoxLayout(ChooseDownloadDirectory) self.verticalLayout = QtWidgets.QVBoxLayout(ChooseDownloadDirectory)
self.verticalLayout.setSpacing(20)
self.verticalLayout.setObjectName("verticalLayout") self.verticalLayout.setObjectName("verticalLayout")
self.layoutWidget = QtWidgets.QWidget(ChooseDownloadDirectory) self.groupBox_2 = QtWidgets.QGroupBox(ChooseDownloadDirectory)
self.layoutWidget.setObjectName("layoutWidget") self.groupBox_2.setObjectName("groupBox_2")
self.formLayout = QtWidgets.QFormLayout(self.layoutWidget) self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.groupBox_2)
self.formLayout.setContentsMargins(-1, -1, -1, 0) self.verticalLayout_3.setObjectName("verticalLayout_3")
self.formLayout.setObjectName("formLayout") self.label_2 = QtWidgets.QLabel(self.groupBox_2)
self.label = QtWidgets.QLabel(self.layoutWidget) self.label_2.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
self.label.setWordWrap(True) self.label_2.setWordWrap(True)
self.label.setObjectName("label") self.label_2.setObjectName("label_2")
self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.label) self.verticalLayout_3.addWidget(self.label_2)
self.verticalLayout.addWidget(self.layoutWidget)
self.horizontalLayout_2 = QtWidgets.QHBoxLayout() self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
self.horizontalLayout_2.setObjectName("horizontalLayout_2") self.horizontalLayout_2.setObjectName("horizontalLayout_2")
self.pathComboBox = QtWidgets.QComboBox(ChooseDownloadDirectory) self.pathComboBox = QtWidgets.QComboBox(self.groupBox_2)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.pathComboBox.sizePolicy().hasHeightForWidth())
self.pathComboBox.setSizePolicy(sizePolicy)
self.pathComboBox.setEditable(True) self.pathComboBox.setEditable(True)
self.pathComboBox.setObjectName("pathComboBox") self.pathComboBox.setObjectName("pathComboBox")
self.horizontalLayout_2.addWidget(self.pathComboBox) self.horizontalLayout_2.addWidget(self.pathComboBox)
self.openFileDialogButton = QtWidgets.QPushButton(ChooseDownloadDirectory) self.openFileDialogButton = QtWidgets.QPushButton(self.groupBox_2)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0) sizePolicy.setVerticalStretch(0)
@ -47,18 +42,36 @@ class Ui_ChooseDownloadDirectory(object):
self.openFileDialogButton.setFlat(False) self.openFileDialogButton.setFlat(False)
self.openFileDialogButton.setObjectName("openFileDialogButton") self.openFileDialogButton.setObjectName("openFileDialogButton")
self.horizontalLayout_2.addWidget(self.openFileDialogButton) self.horizontalLayout_2.addWidget(self.openFileDialogButton)
self.verticalLayout.addLayout(self.horizontalLayout_2) self.verticalLayout_3.addLayout(self.horizontalLayout_2)
spacerItem = QtWidgets.QSpacerItem(20, 30, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed) self.verticalLayout.addWidget(self.groupBox_2)
self.verticalLayout.addItem(spacerItem) self.groupBox = QtWidgets.QGroupBox(ChooseDownloadDirectory)
self.progressLabel = QtWidgets.QLabel(ChooseDownloadDirectory) self.groupBox.setObjectName("groupBox")
self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.groupBox)
self.verticalLayout_2.setObjectName("verticalLayout_2")
self.label_3 = QtWidgets.QLabel(self.groupBox)
self.label_3.setWordWrap(True)
self.label_3.setObjectName("label_3")
self.verticalLayout_2.addWidget(self.label_3)
self.downloadPushButton = QtWidgets.QPushButton(self.groupBox)
self.downloadPushButton.setObjectName("downloadPushButton")
self.verticalLayout_2.addWidget(self.downloadPushButton)
self.abortDownloadButton = QtWidgets.QPushButton(self.groupBox)
self.abortDownloadButton.setObjectName("abortDownloadButton")
self.verticalLayout_2.addWidget(self.abortDownloadButton)
self.progressLabel = QtWidgets.QLabel(self.groupBox)
self.progressLabel.setAlignment(QtCore.Qt.AlignCenter) self.progressLabel.setAlignment(QtCore.Qt.AlignCenter)
self.progressLabel.setObjectName("progressLabel") self.progressLabel.setObjectName("progressLabel")
self.verticalLayout.addWidget(self.progressLabel) self.verticalLayout_2.addWidget(self.progressLabel)
self.widget = QtWidgets.QWidget(ChooseDownloadDirectory) self.widget = QtWidgets.QWidget(self.groupBox)
self.widget.setObjectName("widget") self.widget.setObjectName("widget")
self.horizontalLayout = QtWidgets.QHBoxLayout(self.widget) self.horizontalLayout = QtWidgets.QHBoxLayout(self.widget)
self.horizontalLayout.setObjectName("horizontalLayout") self.horizontalLayout.setObjectName("horizontalLayout")
self.progressBar = QtWidgets.QProgressBar(self.widget) self.progressBar = QtWidgets.QProgressBar(self.widget)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.progressBar.sizePolicy().hasHeightForWidth())
self.progressBar.setSizePolicy(sizePolicy)
self.progressBar.setProperty("value", 24) self.progressBar.setProperty("value", 24)
self.progressBar.setTextVisible(True) self.progressBar.setTextVisible(True)
self.progressBar.setOrientation(QtCore.Qt.Horizontal) self.progressBar.setOrientation(QtCore.Qt.Horizontal)
@ -69,24 +82,35 @@ class Ui_ChooseDownloadDirectory(object):
self.labelSpeed = QtWidgets.QLabel(self.widget) self.labelSpeed = QtWidgets.QLabel(self.widget)
self.labelSpeed.setObjectName("labelSpeed") self.labelSpeed.setObjectName("labelSpeed")
self.horizontalLayout.addWidget(self.labelSpeed) self.horizontalLayout.addWidget(self.labelSpeed)
self.verticalLayout.addWidget(self.widget) self.verticalLayout_2.addWidget(self.widget)
self.downloadPushButton = QtWidgets.QPushButton(ChooseDownloadDirectory) self.verticalLayout.addWidget(self.groupBox)
self.downloadPushButton.setObjectName("downloadPushButton") self.groupBox_3 = QtWidgets.QGroupBox(ChooseDownloadDirectory)
self.verticalLayout.addWidget(self.downloadPushButton) self.groupBox_3.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
self.buttonBox = QtWidgets.QDialogButtonBox(ChooseDownloadDirectory) self.groupBox_3.setFlat(False)
self.groupBox_3.setObjectName("groupBox_3")
self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.groupBox_3)
self.verticalLayout_4.setObjectName("verticalLayout_4")
self.buttonBox = QtWidgets.QDialogButtonBox(self.groupBox_3)
self.buttonBox.setOrientation(QtCore.Qt.Horizontal) self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok) self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Ok)
self.buttonBox.setCenterButtons(True)
self.buttonBox.setObjectName("buttonBox") self.buttonBox.setObjectName("buttonBox")
self.verticalLayout.addWidget(self.buttonBox) self.verticalLayout_4.addWidget(self.buttonBox)
self.verticalLayout.addWidget(self.groupBox_3)
self.retranslateUi(ChooseDownloadDirectory) self.retranslateUi(ChooseDownloadDirectory)
QtCore.QMetaObject.connectSlotsByName(ChooseDownloadDirectory) QtCore.QMetaObject.connectSlotsByName(ChooseDownloadDirectory)
def retranslateUi(self, ChooseDownloadDirectory): def retranslateUi(self, ChooseDownloadDirectory):
_translate = QtCore.QCoreApplication.translate _translate = QtCore.QCoreApplication.translate
ChooseDownloadDirectory.setWindowTitle(_translate("ChooseDownloadDirectory", "Choose Session Directory")) ChooseDownloadDirectory.setWindowTitle(_translate("ChooseDownloadDirectory", "Instrument Location and Download"))
self.label.setText(_translate("ChooseDownloadDirectory", "<html><head/><body><p>Please choose a directory for your sample files. The location will be shared by all sessions. </p><p>The instrument sample files are around 10 Gigabytes in size.</p><p>You can either use this integrated downloader or get the files manually from: <a href=\"https://laborejo.org/downloads/tembro-instruments/\"><span style=\" text-decoration: underline; color:#00ffff;\">https://laborejo.org/downloads/tembro-instruments/ </span></a></p><p>The downloader can be used to update instruments at any time and will not download the same instrument/version twice.</p></body></html>")) self.groupBox_2.setTitle(_translate("ChooseDownloadDirectory", "Step 1: Choose Instrument Directory"))
self.label_2.setText(_translate("ChooseDownloadDirectory", "<html><head/><body><p>Please choose a directory for you instrument libaries.</p><p>This location will be shared among all Tembro-sessions.</p></body></html>"))
self.openFileDialogButton.setText(_translate("ChooseDownloadDirectory", "Choose Directory")) self.openFileDialogButton.setText(_translate("ChooseDownloadDirectory", "Choose Directory"))
self.groupBox.setTitle(_translate("ChooseDownloadDirectory", "Step 2: Download Instruments"))
self.label_3.setText(_translate("ChooseDownloadDirectory", "<html><head/><body><p>Click the button below to download all instrument libraries from our servers. </p><p>You can skip this and copy the files manually into the directory chosen in Step 1.</p><p>Please visit <a href=\"https://laborejo.org/downloads/tembro-instruments/\"><span style=\" text-decoration: underline; color:#0000ff;\">https://laborejo.org/downloads/tembro-instruments/</span></a> for direct downloads.</p><p>At a later date you can start the download again to check for new instruments. Only new and updated libraries will be downloaded again.</p></body></html>"))
self.downloadPushButton.setText(_translate("ChooseDownloadDirectory", "Download"))
self.abortDownloadButton.setText(_translate("ChooseDownloadDirectory", "Abort Download and Close"))
self.progressLabel.setText(_translate("ChooseDownloadDirectory", "Library 4 of 10: Kazoo Ensemble")) self.progressLabel.setText(_translate("ChooseDownloadDirectory", "Library 4 of 10: Kazoo Ensemble"))
self.labelSpeed.setText(_translate("ChooseDownloadDirectory", "TextLabel")) self.labelSpeed.setText(_translate("ChooseDownloadDirectory", "TextLabel"))
self.downloadPushButton.setText(_translate("ChooseDownloadDirectory", "Download")) self.groupBox_3.setTitle(_translate("ChooseDownloadDirectory", "Step 3: Rescan the instrument directory"))

224
qtgui/designer/chooseDownloadDirectory.ui
View File

@ -6,139 +6,173 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>410</width> <width>453</width>
<height>391</height> <height>578</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Choose Session Directory</string> <string>Instrument Location and Download</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>20</number>
</property>
<item> <item>
<widget class="QWidget" name="layoutWidget" native="true"> <widget class="QGroupBox" name="groupBox_2">
<layout class="QFormLayout" name="formLayout"> <property name="title">
<property name="bottomMargin"> <string>Step 1: Choose Instrument Directory</string>
<number>0</number> </property>
</property> <layout class="QVBoxLayout" name="verticalLayout_3">
<item row="0" column="1"> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please choose a directory for your sample files. The location will be shared by all sessions. &lt;/p&gt;&lt;p&gt;The instrument sample files are around 10 Gigabytes in size.&lt;/p&gt;&lt;p&gt;You can either use this integrated downloader or get the files manually from: &lt;a href=&quot;https://laborejo.org/downloads/tembro-instruments/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#00ffff;&quot;&gt;https://laborejo.org/downloads/tembro-instruments/ &lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;The downloader can be used to update instruments at any time and will not download the same instrument/version twice.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Please choose a directory for you instrument libaries.&lt;/p&gt;&lt;p&gt;This location will be shared among all Tembro-sessions.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QComboBox" name="pathComboBox">
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="openFileDialogButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Choose Directory</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <widget class="QGroupBox" name="groupBox">
<item> <property name="title">
<widget class="QComboBox" name="pathComboBox"> <string>Step 2: Download Instruments</string>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="openFileDialogButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Choose Directory</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>30</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="progressLabel">
<property name="text">
<string>Library 4 of 10: Kazoo Ensemble</string>
</property> </property>
<property name="alignment"> <layout class="QVBoxLayout" name="verticalLayout_2">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="widget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QProgressBar" name="progressBar"> <widget class="QLabel" name="label_3">
<property name="value"> <property name="text">
<number>24</number> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click the button below to download all instrument libraries from our servers. &lt;/p&gt;&lt;p&gt;You can skip this and copy the files manually into the directory chosen in Step 1.&lt;/p&gt;&lt;p&gt;Please visit &lt;a href=&quot;https://laborejo.org/downloads/tembro-instruments/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://laborejo.org/downloads/tembro-instruments/&lt;/span&gt;&lt;/a&gt; for direct downloads.&lt;/p&gt;&lt;p&gt;At a later date you can start the download again to check for new instruments. Only new and updated libraries will be downloaded again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="textVisible"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="orientation"> </widget>
<enum>Qt::Horizontal</enum> </item>
</property> <item>
<property name="invertedAppearance"> <widget class="QPushButton" name="downloadPushButton">
<bool>false</bool> <property name="text">
<string>Download</string>
</property> </property>
<property name="format"> </widget>
<string notr="true">%p%</string> </item>
<item>
<widget class="QPushButton" name="abortDownloadButton">
<property name="text">
<string>Abort Download and Close</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="labelSpeed"> <widget class="QLabel" name="progressLabel">
<property name="text"> <property name="text">
<string>TextLabel</string> <string>Library 4 of 10: Kazoo Ensemble</string>
</property> </property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="widget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QProgressBar" name="progressBar">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="value">
<number>24</number>
</property>
<property name="textVisible">
<bool>true</bool>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="format">
<string notr="true">%p%</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="labelSpeed">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="downloadPushButton"> <widget class="QGroupBox" name="groupBox_3">
<property name="text"> <property name="title">
<string>Download</string> <string>Step 3: Rescan the instrument directory</string>
</property> </property>
</widget> <property name="alignment">
</item> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property> </property>
<property name="standardButtons"> <property name="flat">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> <bool>false</bool>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Ok</set>
</property>
<property name="centerButtons">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
</layout> </layout>

2
qtgui/mainwindow.py
View File

@ -177,7 +177,7 @@ class MainWindow(TemplateMainWindow):
#New menu entries and template-menu overrides #New menu entries and template-menu overrides
#self.menu.connectMenuEntry("actionAbout", lambda: print("About Dialog Menu deactivated")) #deactivates the original function #self.menu.connectMenuEntry("actionAbout", lambda: print("About Dialog Menu deactivated")) #deactivates the original function
#self.menu.addMenuEntry("menuEdit", "actionNils", "Nils", lambda: print("Merle")) #self.menu.addMenuEntry("menuEdit", "actionNils", "Nils", lambda: print("Merle"))
self.menu.addMenuEntry("menuEdit", "actionSampleDirPathDialog", "Sample Files Location", lambda: ChooseDownloadDirectory(parentMainWindow=self)) self.menu.addMenuEntry("menuEdit", "actionSampleDirPathDialog", "Instrument Location and Download", lambda: ChooseDownloadDirectory(parentMainWindow=self))
self.menu.addMenuEntry("menuEdit", "actionLoadSamples", QtCore.QCoreApplication.translate("Menu", "Load all Instrument Samples (slow!)"), api.loadAllInstrumentSamples) self.menu.addMenuEntry("menuEdit", "actionLoadSamples", QtCore.QCoreApplication.translate("Menu", "Load all Instrument Samples (slow!)"), api.loadAllInstrumentSamples)
self.menu.addMenuEntry("menuEdit", "actionUnloadSamples", QtCore.QCoreApplication.translate("Menu", "Unload all Instrument Samples (also slow.)"), api.unloadAllInstrumentSamples) self.menu.addMenuEntry("menuEdit", "actionUnloadSamples", QtCore.QCoreApplication.translate("Menu", "Unload all Instrument Samples (also slow.)"), api.unloadAllInstrumentSamples)

3
template/documentation/readme.template
View File

@ -1,7 +1,7 @@
[//]: # (Generated <date>. Changes belong into template/documentation/readme.template) [//]: # (Generated <date>. Changes belong into template/documentation/readme.template)
#<name> # <name>
Program version <version> Program version <version>
@ -120,4 +120,3 @@ Or even shorter:
This is the minimal run mode which is only useful for testing and development. But if you only want This is the minimal run mode which is only useful for testing and development. But if you only want
to look at the GUI and are not in the mood to install anything -including dependencies-, go ahead. to look at the GUI and are not in the mood to install anything -including dependencies-, go ahead.

1
template/qtgui/mainwindow.py
View File

@ -30,7 +30,6 @@ from sys import exit as sysexit
#Third Party #Third Party
from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5 import QtCore, QtGui, QtWidgets
logger.info(f"PyQt Version: {QtCore.PYQT_VERSION_STR}") logger.info(f"PyQt Version: {QtCore.PYQT_VERSION_STR}")
#from PyQt5 import QtOpenGL
#Template Modules #Template Modules
from .nsmclient import NSMClient from .nsmclient import NSMClient

Write Preview
Loading…
Cancel
Save