瀏覽代碼

various fixes

olinox 4 年之前
父節點
當前提交
7c3ab481b5

+ 3 - 2
core/youtube.py

@@ -5,10 +5,11 @@ from pytube import YouTube
 
 from core import constants, logging_
 from core.exceptions import YoutubeStreamNotFound
+from core.logging_ import Logger
 
 MAX_ATTEMPTS = 5
 
-logger = logging_.get()
+logger = Logger.get()
 
 
 class YoutubeDownloader:
@@ -69,5 +70,5 @@ class YoutubeDownloader:
 if __name__ == "__main__":
 
     YoutubeDownloader.download(
-        'https://www.youtube.com/watch?v=nOWjX4BpC24XXXXXX',
+        'https://youtu.be/nOWjX4BpC24',
     )

+ 9 - 0
notes

@@ -35,3 +35,12 @@ Priorité 2:
 * Permettre de prioriser l'indexation selon certaines actions (sélection d'un artiste, téléchargement, nouveaux morceaux)
 * Charger l'explorer de manière asynchrone
 * faire un prompt premier lancement pour ajouter des dossiers de musique et créer une première séance
+
+
+
+Demandes mathilde:
+
+* Imprimer la séance
+* "ma séance": il faut voir la durée des musiques
+* possibilité d'ajouter des silences?
+* ajouter un changement de musique progressif

+ 1 - 1
ui/qt/dlg_meta_editor_ui.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'dlg_meta_editor.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.2
+# Created by: PyQt5 UI code generator 5.15.4
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.

+ 1 - 1
ui/qt/dlg_playlist_ui.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'dlg_playlist.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.2
+# Created by: PyQt5 UI code generator 5.15.4
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.

+ 1 - 1
ui/qt/dlg_select_playlist_ui.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'dlg_select_playlist.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.2
+# Created by: PyQt5 UI code generator 5.15.4
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.

+ 1 - 1
ui/qt/dlg_tag_editor_ui.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'dlg_tag_editor.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.2
+# Created by: PyQt5 UI code generator 5.15.4
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.

+ 16 - 9
ui/qt/main.ui

@@ -96,7 +96,7 @@
         <item>
          <widget class="QStackedWidget" name="stack">
           <property name="currentIndex">
-           <number>2</number>
+           <number>1</number>
           </property>
           <widget class="QWidget" name="page_1">
            <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -148,7 +148,7 @@
                </layout>
               </item>
               <item>
-               <layout class="QHBoxLayout" name="horizontalLayout_14" stretch="1,1">
+               <layout class="QHBoxLayout" name="horizontalLayout_14" stretch="1,3">
                 <item>
                  <widget class="PlaylistTable" name="sessionPlaylist">
                   <property name="enabled">
@@ -253,13 +253,6 @@
             </item>
            </layout>
           </widget>
-          <widget class="QWidget" name="page_2">
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <item>
-             <layout class="QVBoxLayout" name="verticalLayout_4"/>
-            </item>
-           </layout>
-          </widget>
           <widget class="QWidget" name="page_3">
            <layout class="QHBoxLayout" name="horizontalLayout_4">
             <item>
@@ -406,6 +399,20 @@
                   </item>
                  </layout>
                 </item>
+                <item>
+                 <widget class="QComboBox" name="comboBox">
+                  <item>
+                   <property name="text">
+                    <string>Feu rapide</string>
+                   </property>
+                  </item>
+                  <item>
+                   <property name="text">
+                    <string>Terre lent</string>
+                   </property>
+                  </item>
+                 </widget>
+                </item>
                 <item>
                  <widget class="ExplorerTable" name="explorerTable">
                   <property name="minimumSize">

+ 11 - 4
ui/qt/main_ui.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'main.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.2
+# Created by: PyQt5 UI code generator 5.15.4
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.
@@ -106,7 +106,7 @@ class Ui_mainWindow(object):
         self.frameNotes.setObjectName("frameNotes")
         self.horizontalLayout_14.addWidget(self.frameNotes)
         self.horizontalLayout_14.setStretch(0, 1)
-        self.horizontalLayout_14.setStretch(1, 1)
+        self.horizontalLayout_14.setStretch(1, 3)
         self.verticalLayout_3.addLayout(self.horizontalLayout_14)
         self.horizontalLayout_17 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_17.setObjectName("horizontalLayout_17")
@@ -187,6 +187,11 @@ class Ui_mainWindow(object):
         self.explorerBtnFilter.setObjectName("explorerBtnFilter")
         self.horizontalLayout_21.addWidget(self.explorerBtnFilter)
         self.verticalLayout_8.addLayout(self.horizontalLayout_21)
+        self.comboBox = QtWidgets.QComboBox(self.page_3)
+        self.comboBox.setObjectName("comboBox")
+        self.comboBox.addItem("")
+        self.comboBox.addItem("")
+        self.verticalLayout_8.addWidget(self.comboBox)
         self.explorerTable = ExplorerTable(self.page_3)
         self.explorerTable.setMinimumSize(QtCore.QSize(320, 0))
         self.explorerTable.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
@@ -446,7 +451,7 @@ class Ui_mainWindow(object):
         self.explorerPlaylist.setHorizontalHeaderItem(2, item)
         self.explorerPlaylist.horizontalHeader().setVisible(False)
         self.explorerPlaylist.horizontalHeader().setStretchLastSection(True)
-        self.explorerPlaylist.verticalHeader().setVisible(True)
+        self.explorerPlaylist.verticalHeader().setVisible(False)
         self.verticalLayout_12.addWidget(self.explorerPlaylist)
         self.horizontalLayout_6.addLayout(self.verticalLayout_12)
         self.horizontalLayout_6.setStretch(0, 1)
@@ -600,7 +605,7 @@ class Ui_mainWindow(object):
 
         self.retranslateUi(mainWindow)
         self.menu.setCurrentRow(-1)
-        self.stack.setCurrentIndex(2)
+        self.stack.setCurrentIndex(0)
         self.explorerTrackMetaStack.setCurrentIndex(1)
         QtCore.QMetaObject.connectSlotsByName(mainWindow)
 
@@ -621,6 +626,8 @@ class Ui_mainWindow(object):
         self.explorerBtnSearch.setText(_translate("mainWindow", "..."))
         self.explorerLineSearch.setPlaceholderText(_translate("mainWindow", "Rechercher un morceau..."))
         self.explorerBtnFilter.setText(_translate("mainWindow", "..."))
+        self.comboBox.setItemText(0, _translate("mainWindow", "Feu rapide"))
+        self.comboBox.setItemText(1, _translate("mainWindow", "Terre lent"))
         self.explorerTable.headerItem().setText(1, _translate("mainWindow", "2"))
         self.label_2.setText(_translate("mainWindow", "Sélectionnez une piste"))
         self.label_11.setText(_translate("mainWindow", "Informations sur la piste"))

文件差異過大導致無法顯示
+ 1096 - 1192
ui/qt/rsc_rc.py


+ 1 - 1
ui/qt/widgets/frame_notes_ui.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'widgets/frame_notes.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.2
+# Created by: PyQt5 UI code generator 5.15.4
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.

+ 1 - 1
ui/qt/widgets/vlcframe_ui.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'widgets/vlcframe.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.2
+# Created by: PyQt5 UI code generator 5.15.4
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.

+ 3 - 4
ui/window.py

@@ -46,10 +46,9 @@ class MainWindow(QMainWindow):
 
         menu_items = {
             0: (':/img/rsc/dance.png', 'Ma séance'),
-            # 1: (':/img/rsc/writing-tool.png', 'Préparer'),
-            2: (':/img/rsc/map.png', 'Explorer'),
-            # 3: (':/img/rsc/calendar.png', 'Agenda'),
-            4: (':/img/rsc/settings.png', 'Paramètres'),
+            1: (':/img/rsc/map.png', 'Explorer'),
+            # 2: (':/img/rsc/calendar.png', 'Agenda'),
+            3: (':/img/rsc/settings.png', 'Paramètres'),
         }
 
         for i, item in menu_items.items():

部分文件因文件數量過多而無法顯示