sya

commit 19080ea6dec38ece6ebcf2dd9c7aabc541a87b27
parent 8559aad47288a0aa5e38bffc051007d4214fee64
Author: gearsix <gearsix@tuta.io>
Date:   Fri,  1 Oct 2021 19:38:58 +0100

minor adjust to install notes; tracklist uses file icon

Diffstat:
M
README.txt
 | 
6
+++---
M
sya-pyqt.py
 | 
7
++++---

2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/README.txt b/README.txt
@@ -73,11 +73,11 @@ BUILDING
   To do this 'pyinstaller' seems most convenient (installed via "pip
   install pyinstaller"):
 
-	pyinstaller sya-pyqt.py -F --windowed --add-data "folder.png:file.png:."
+	pyinstaller sya-pyqt.py -F --windowed --add-data "folder.png:." --add-data "file.png:."
 
   On Windows, you'll need to use the following:
 
-	pyinstaller sya-pyqt.py -F --windowed --add-data "folder.png;file.png;."
+	pyinstaller sya-pyqt.py -F --windowed --add-data "folder.png;." --add-data "file.png;."
 
   This process also works to create binaries for the terminal version
   of the tool (sya.py). When building that version, the "--windowed"
@@ -94,7 +94,7 @@ INSTALL
   Note that there are a lot of ways to install a python package from
   source, this is just one.
 
-	python ./setup.py install --user --record install.txt
+	python3 ./setup.py install --user --record install.txt
 
   The "--user" argument will only install sya for the current user. Remove
   it to install the tool to the system, although note that this will require
diff --git a/sya-pyqt.py b/sya-pyqt.py
@@ -11,6 +11,8 @@ import PyQt5.QtCore as qtcore
 import PyQt5.QtWidgets as qtwidg
 import PyQt5.QtGui as qtgui
 
+
+
 def resource_path(relative_path):
     try:
         base_path = sys._MEIPASS
@@ -70,7 +72,7 @@ class SyaGui(qtwidg.QMainWindow):
         # tracklist
         self._tracklistLabel = 'Tracklist:'
         layout.addLayout(self._init_filepicker(options, self._tracklistLabel,
-            self._filepicker_tracklist, self.args.tracklist), 0, 0, 1, 3)
+            self._filepicker_tracklist, self.args.tracklist, 'file'), 0, 0, 1, 3)
         # formats
         formats = ['mp3', 'flv', 'wav', 'ogg', 'aac']
         layout.addLayout(self._init_combobox(options, 'Format:', self._set_format, formats,
@@ -162,7 +164,7 @@ class SyaGui(qtwidg.QMainWindow):
     
     def _filepicker_tracklist(self, signal):
         file = qtwidg.QFileDialog.getOpenFileName(self._options,
-            'Select a tracklist', os.path.expanduser("~"), "Plain-Text file (*.txt)")
+            'Select a tracklist', os.path.expanduser('~'), "Text file (*.txt)")
         if len(file) > 0:
             self.args.tracklist = file[0]
             self._edits[self._tracklistLabel].setText(self.args.tracklist)
@@ -221,7 +223,6 @@ class SyaGui(qtwidg.QMainWindow):
     def cancel(self):
         self.main_t.exit()
         self.check_t.exit()
-        sys.exit()
 
 if __name__ == '__main__':
     app = qtwidg.QApplication(sys.argv)