ソースを参照

add time indications to vlc frame

olinox 4 年 前
コミット
83ec2769ef

+ 4 - 0
core/models.py

@@ -1,3 +1,4 @@
+import time
 from datetime import datetime
 
 from sqlalchemy import Column, Integer, String, DateTime, Boolean
@@ -55,6 +56,9 @@ class Track(Model):
     path = Column(String, nullable=False)
     hash = Column(String, nullable=False)
 
+    def literal_duration(self):
+        return time.strftime("%M:%S", time.gmtime(self.duration))
+
 
 class TrackTag(Model):
     __tablename__ = 'TracksTags'

+ 16 - 6
ui/qt/main.ui

@@ -195,9 +195,6 @@
                   <attribute name="horizontalHeaderVisible">
                    <bool>false</bool>
                   </attribute>
-                  <attribute name="horizontalHeaderStretchLastSection">
-                   <bool>true</bool>
-                  </attribute>
                   <attribute name="verticalHeaderVisible">
                    <bool>false</bool>
                   </attribute>
@@ -216,6 +213,14 @@
                     <string>Titre</string>
                    </property>
                   </column>
+                  <column>
+                   <property name="text">
+                    <string>duration</string>
+                   </property>
+                   <property name="textAlignment">
+                    <set>AlignCenter</set>
+                   </property>
+                  </column>
                   <column>
                    <property name="text">
                     <string>order</string>
@@ -1335,9 +1340,6 @@
                   <attribute name="horizontalHeaderVisible">
                    <bool>false</bool>
                   </attribute>
-                  <attribute name="horizontalHeaderStretchLastSection">
-                   <bool>true</bool>
-                  </attribute>
                   <attribute name="verticalHeaderVisible">
                    <bool>true</bool>
                   </attribute>
@@ -1356,6 +1358,14 @@
                     <string>Label</string>
                    </property>
                   </column>
+                  <column>
+                   <property name="text">
+                    <string>duration</string>
+                   </property>
+                   <property name="textAlignment">
+                    <set>AlignCenter</set>
+                   </property>
+                  </column>
                   <column>
                    <property name="text">
                     <string>order</string>

+ 44 - 38
ui/qt/main_ui.py

@@ -94,7 +94,7 @@ class Ui_mainWindow(object):
         self.sessionPlaylist.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
         self.sessionPlaylist.setIconSize(QtCore.QSize(8, 8))
         self.sessionPlaylist.setObjectName("sessionPlaylist")
-        self.sessionPlaylist.setColumnCount(4)
+        self.sessionPlaylist.setColumnCount(5)
         self.sessionPlaylist.setRowCount(0)
         item = QtWidgets.QTableWidgetItem()
         self.sessionPlaylist.setHorizontalHeaderItem(0, item)
@@ -103,9 +103,11 @@ class Ui_mainWindow(object):
         item = QtWidgets.QTableWidgetItem()
         self.sessionPlaylist.setHorizontalHeaderItem(2, item)
         item = QtWidgets.QTableWidgetItem()
+        item.setTextAlignment(QtCore.Qt.AlignCenter)
         self.sessionPlaylist.setHorizontalHeaderItem(3, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.sessionPlaylist.setHorizontalHeaderItem(4, item)
         self.sessionPlaylist.horizontalHeader().setVisible(False)
-        self.sessionPlaylist.horizontalHeader().setStretchLastSection(True)
         self.sessionPlaylist.verticalHeader().setVisible(False)
         self.horizontalLayout_14.addWidget(self.sessionPlaylist)
         self.frameNotes = FrameNotes(self.page_1)
@@ -182,9 +184,7 @@ class Ui_mainWindow(object):
         self.explorerFilterTags.setMinimumSize(QtCore.QSize(0, 28))
         self.explorerFilterTags.setMaximumSize(QtCore.QSize(16777215, 28))
         self.explorerFilterTags.setObjectName("explorerFilterTags")
-        icon4 = QtGui.QIcon()
-        icon4.addPixmap(QtGui.QPixmap(":/img/rsc/filter.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.explorerFilterTags.addItem(icon4, "")
+        self.explorerFilterTags.addItem("")
         self.verticalLayout_8.addWidget(self.explorerFilterTags)
         self.explorerTable = ExplorerTable(self.page_3)
         self.explorerTable.setMinimumSize(QtCore.QSize(320, 0))
@@ -241,9 +241,9 @@ class Ui_mainWindow(object):
         self.explorerTrackEdit.setMinimumSize(QtCore.QSize(28, 28))
         self.explorerTrackEdit.setMaximumSize(QtCore.QSize(28, 28))
         self.explorerTrackEdit.setText("")
-        icon5 = QtGui.QIcon()
-        icon5.addPixmap(QtGui.QPixmap(":/img/rsc/edit.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.explorerTrackEdit.setIcon(icon5)
+        icon4 = QtGui.QIcon()
+        icon4.addPixmap(QtGui.QPixmap(":/img/rsc/edit.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.explorerTrackEdit.setIcon(icon4)
         self.explorerTrackEdit.setObjectName("explorerTrackEdit")
         self.horizontalLayout_13.addWidget(self.explorerTrackEdit)
         self.verticalLayout_9.addLayout(self.horizontalLayout_13)
@@ -448,9 +448,9 @@ class Ui_mainWindow(object):
         self.explorerTrackPlay.setEnabled(False)
         self.explorerTrackPlay.setMinimumSize(QtCore.QSize(220, 38))
         self.explorerTrackPlay.setMaximumSize(QtCore.QSize(16777215, 38))
-        icon6 = QtGui.QIcon()
-        icon6.addPixmap(QtGui.QPixmap(":/img/rsc/play.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.explorerTrackPlay.setIcon(icon6)
+        icon5 = QtGui.QIcon()
+        icon5.addPixmap(QtGui.QPixmap(":/img/rsc/play.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.explorerTrackPlay.setIcon(icon5)
         self.explorerTrackPlay.setIconSize(QtCore.QSize(12, 12))
         self.explorerTrackPlay.setObjectName("explorerTrackPlay")
         self.verticalLayout_5.addWidget(self.explorerTrackPlay)
@@ -458,9 +458,9 @@ class Ui_mainWindow(object):
         self.explorerAddToPlaylist.setEnabled(False)
         self.explorerAddToPlaylist.setMinimumSize(QtCore.QSize(220, 38))
         self.explorerAddToPlaylist.setMaximumSize(QtCore.QSize(16777215, 38))
-        icon7 = QtGui.QIcon()
-        icon7.addPixmap(QtGui.QPixmap(":/img/rsc/plus.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.explorerAddToPlaylist.setIcon(icon7)
+        icon6 = QtGui.QIcon()
+        icon6.addPixmap(QtGui.QPixmap(":/img/rsc/plus.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.explorerAddToPlaylist.setIcon(icon6)
         self.explorerAddToPlaylist.setObjectName("explorerAddToPlaylist")
         self.verticalLayout_5.addWidget(self.explorerAddToPlaylist)
         self.horizontalLayout_6.addLayout(self.verticalLayout_5)
@@ -501,7 +501,7 @@ class Ui_mainWindow(object):
         self.explorerPlaylist.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
         self.explorerPlaylist.setIconSize(QtCore.QSize(8, 8))
         self.explorerPlaylist.setObjectName("explorerPlaylist")
-        self.explorerPlaylist.setColumnCount(4)
+        self.explorerPlaylist.setColumnCount(5)
         self.explorerPlaylist.setRowCount(0)
         item = QtWidgets.QTableWidgetItem()
         self.explorerPlaylist.setHorizontalHeaderItem(0, item)
@@ -510,9 +510,11 @@ class Ui_mainWindow(object):
         item = QtWidgets.QTableWidgetItem()
         self.explorerPlaylist.setHorizontalHeaderItem(2, item)
         item = QtWidgets.QTableWidgetItem()
+        item.setTextAlignment(QtCore.Qt.AlignCenter)
         self.explorerPlaylist.setHorizontalHeaderItem(3, item)
+        item = QtWidgets.QTableWidgetItem()
+        self.explorerPlaylist.setHorizontalHeaderItem(4, item)
         self.explorerPlaylist.horizontalHeader().setVisible(False)
-        self.explorerPlaylist.horizontalHeader().setStretchLastSection(True)
         self.explorerPlaylist.verticalHeader().setVisible(True)
         self.verticalLayout_12.addWidget(self.explorerPlaylist)
         self.horizontalLayout_22 = QtWidgets.QHBoxLayout()
@@ -520,33 +522,33 @@ class Ui_mainWindow(object):
         self.btnPlaylistMoveToTop = QtWidgets.QToolButton(self.page_3)
         self.btnPlaylistMoveToTop.setMinimumSize(QtCore.QSize(28, 28))
         self.btnPlaylistMoveToTop.setMaximumSize(QtCore.QSize(28, 28))
-        icon8 = QtGui.QIcon()
-        icon8.addPixmap(QtGui.QPixmap(":/img/rsc/double-up-arrow.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.btnPlaylistMoveToTop.setIcon(icon8)
+        icon7 = QtGui.QIcon()
+        icon7.addPixmap(QtGui.QPixmap(":/img/rsc/double-up-arrow.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.btnPlaylistMoveToTop.setIcon(icon7)
         self.btnPlaylistMoveToTop.setObjectName("btnPlaylistMoveToTop")
         self.horizontalLayout_22.addWidget(self.btnPlaylistMoveToTop)
         self.btnPlaylistMoveUp = QtWidgets.QToolButton(self.page_3)
         self.btnPlaylistMoveUp.setMinimumSize(QtCore.QSize(28, 28))
         self.btnPlaylistMoveUp.setMaximumSize(QtCore.QSize(28, 28))
-        icon9 = QtGui.QIcon()
-        icon9.addPixmap(QtGui.QPixmap(":/img/rsc/arrow-up.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.btnPlaylistMoveUp.setIcon(icon9)
+        icon8 = QtGui.QIcon()
+        icon8.addPixmap(QtGui.QPixmap(":/img/rsc/arrow-up.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.btnPlaylistMoveUp.setIcon(icon8)
         self.btnPlaylistMoveUp.setObjectName("btnPlaylistMoveUp")
         self.horizontalLayout_22.addWidget(self.btnPlaylistMoveUp)
         self.btnPlaylistMoveDown = QtWidgets.QToolButton(self.page_3)
         self.btnPlaylistMoveDown.setMinimumSize(QtCore.QSize(28, 28))
         self.btnPlaylistMoveDown.setMaximumSize(QtCore.QSize(28, 288))
-        icon10 = QtGui.QIcon()
-        icon10.addPixmap(QtGui.QPixmap(":/img/rsc/arrow-down.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.btnPlaylistMoveDown.setIcon(icon10)
+        icon9 = QtGui.QIcon()
+        icon9.addPixmap(QtGui.QPixmap(":/img/rsc/arrow-down.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.btnPlaylistMoveDown.setIcon(icon9)
         self.btnPlaylistMoveDown.setObjectName("btnPlaylistMoveDown")
         self.horizontalLayout_22.addWidget(self.btnPlaylistMoveDown)
         self.btnPlaylistMoveToBottom = QtWidgets.QToolButton(self.page_3)
         self.btnPlaylistMoveToBottom.setMinimumSize(QtCore.QSize(28, 28))
         self.btnPlaylistMoveToBottom.setMaximumSize(QtCore.QSize(28, 28))
-        icon11 = QtGui.QIcon()
-        icon11.addPixmap(QtGui.QPixmap(":/img/rsc/double-below-arrow.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.btnPlaylistMoveToBottom.setIcon(icon11)
+        icon10 = QtGui.QIcon()
+        icon10.addPixmap(QtGui.QPixmap(":/img/rsc/double-below-arrow.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.btnPlaylistMoveToBottom.setIcon(icon10)
         self.btnPlaylistMoveToBottom.setObjectName("btnPlaylistMoveToBottom")
         self.horizontalLayout_22.addWidget(self.btnPlaylistMoveToBottom)
         spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
@@ -554,9 +556,9 @@ class Ui_mainWindow(object):
         self.btnPlaylistRemove = QtWidgets.QToolButton(self.page_3)
         self.btnPlaylistRemove.setMinimumSize(QtCore.QSize(28, 28))
         self.btnPlaylistRemove.setMaximumSize(QtCore.QSize(28, 28))
-        icon12 = QtGui.QIcon()
-        icon12.addPixmap(QtGui.QPixmap(":/img/rsc/trash.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.btnPlaylistRemove.setIcon(icon12)
+        icon11 = QtGui.QIcon()
+        icon11.addPixmap(QtGui.QPixmap(":/img/rsc/trash.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.btnPlaylistRemove.setIcon(icon11)
         self.btnPlaylistRemove.setObjectName("btnPlaylistRemove")
         self.horizontalLayout_22.addWidget(self.btnPlaylistRemove)
         self.verticalLayout_12.addLayout(self.horizontalLayout_22)
@@ -624,16 +626,16 @@ class Ui_mainWindow(object):
         self.horizontalLayout_7.setObjectName("horizontalLayout_7")
         self.musicFoldersRemoveButton = QtWidgets.QPushButton(self.page_5)
         self.musicFoldersRemoveButton.setMinimumSize(QtCore.QSize(0, 32))
-        icon13 = QtGui.QIcon()
-        icon13.addPixmap(QtGui.QPixmap(":/img/rsc/delete.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.musicFoldersRemoveButton.setIcon(icon13)
+        icon12 = QtGui.QIcon()
+        icon12.addPixmap(QtGui.QPixmap(":/img/rsc/delete.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.musicFoldersRemoveButton.setIcon(icon12)
         self.musicFoldersRemoveButton.setObjectName("musicFoldersRemoveButton")
         self.horizontalLayout_7.addWidget(self.musicFoldersRemoveButton)
         spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
         self.horizontalLayout_7.addItem(spacerItem5)
         self.musicFoldersAddButton = QtWidgets.QPushButton(self.page_5)
         self.musicFoldersAddButton.setMinimumSize(QtCore.QSize(128, 32))
-        self.musicFoldersAddButton.setIcon(icon7)
+        self.musicFoldersAddButton.setIcon(icon6)
         self.musicFoldersAddButton.setObjectName("musicFoldersAddButton")
         self.horizontalLayout_7.addWidget(self.musicFoldersAddButton)
         self.verticalLayout_6.addLayout(self.horizontalLayout_7)
@@ -677,7 +679,7 @@ class Ui_mainWindow(object):
         self.tableTagsRemoveButton = QtWidgets.QPushButton(self.page_5)
         self.tableTagsRemoveButton.setMinimumSize(QtCore.QSize(100, 32))
         self.tableTagsRemoveButton.setMaximumSize(QtCore.QSize(100, 32))
-        self.tableTagsRemoveButton.setIcon(icon13)
+        self.tableTagsRemoveButton.setIcon(icon12)
         self.tableTagsRemoveButton.setObjectName("tableTagsRemoveButton")
         self.horizontalLayout_20.addWidget(self.tableTagsRemoveButton)
         spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
@@ -685,7 +687,7 @@ class Ui_mainWindow(object):
         self.tagsTableAddButton = QtWidgets.QPushButton(self.page_5)
         self.tagsTableAddButton.setMinimumSize(QtCore.QSize(128, 32))
         self.tagsTableAddButton.setMaximumSize(QtCore.QSize(128, 32))
-        self.tagsTableAddButton.setIcon(icon7)
+        self.tagsTableAddButton.setIcon(icon6)
         self.tagsTableAddButton.setObjectName("tagsTableAddButton")
         self.horizontalLayout_20.addWidget(self.tagsTableAddButton)
         self.verticalLayout_6.addLayout(self.horizontalLayout_20)
@@ -712,7 +714,7 @@ class Ui_mainWindow(object):
         self.retranslateUi(mainWindow)
         self.menu.setCurrentRow(-1)
         self.stack.setCurrentIndex(1)
-        self.explorerFilterTags.setCurrentIndex(-1)
+        self.explorerFilterTags.setCurrentIndex(0)
         self.explorerTrackMetaStack.setCurrentIndex(1)
         QtCore.QMetaObject.connectSlotsByName(mainWindow)
 
@@ -728,6 +730,8 @@ class Ui_mainWindow(object):
         item = self.sessionPlaylist.horizontalHeaderItem(2)
         item.setText(_translate("mainWindow", "Titre"))
         item = self.sessionPlaylist.horizontalHeaderItem(3)
+        item.setText(_translate("mainWindow", "duration"))
+        item = self.sessionPlaylist.horizontalHeaderItem(4)
         item.setText(_translate("mainWindow", "order"))
         self.btnSessionStart.setText(_translate("mainWindow", "Lancer la séance"))
         self.label_3.setText(_translate("mainWindow", "Mes musiques"))
@@ -766,6 +770,8 @@ class Ui_mainWindow(object):
         item = self.explorerPlaylist.horizontalHeaderItem(2)
         item.setText(_translate("mainWindow", "Label"))
         item = self.explorerPlaylist.horizontalHeaderItem(3)
+        item.setText(_translate("mainWindow", "duration"))
+        item = self.explorerPlaylist.horizontalHeaderItem(4)
         item.setText(_translate("mainWindow", "order"))
         self.btnPlaylistMoveToTop.setText(_translate("mainWindow", "..."))
         self.btnPlaylistMoveUp.setText(_translate("mainWindow", "..."))

ファイルの差分が大きいため隠しています
+ 783 - 1489
ui/qt/rsc_rc.py


+ 11 - 3
ui/qt/widgets/playlist_table.py

@@ -1,4 +1,5 @@
-from PyQt5.QtCore import pyqtSignal
+from PyQt5 import QtWidgets
+from PyQt5.QtCore import pyqtSignal, Qt
 from PyQt5.QtGui import QIcon, QPixmap
 from PyQt5.QtWidgets import QTableWidgetItem
 
@@ -25,7 +26,10 @@ class PlaylistTable(SQTableWidget):
 
         self.hideColumn(0)
         self.hideColumn(1)
-        self.hideColumn(3)
+        header = self.horizontalHeader()
+        header.setSectionResizeMode(2, QtWidgets.QHeaderView.Stretch)
+        self.setColumnWidth(3, 50)
+        self.hideColumn(4)
 
         self.clear()
         self.update()
@@ -70,9 +74,13 @@ class PlaylistTable(SQTableWidget):
 
             self.setItem(row, 2, QTableWidgetItem(track.title))
 
+            item = QTableWidgetItem(track.literal_duration())
+            item.setTextAlignment(Qt.AlignCenter)
+            self.setItem(row, 3, item)
+
             item = QTableWidgetItem()
             item.setData(0, session_track.order)
-            self.setItem(row, 3, item)
+            self.setItem(row, 4, item)
 
             i += 1
         self.count = i

+ 7 - 0
ui/qt/widgets/vlcframe.py

@@ -1,3 +1,4 @@
+import time
 from collections import deque
 
 import vlc
@@ -108,6 +109,7 @@ class VlcFrame(QtWidgets.QFrame):
         )
         # Set the title of the track
         self.ui.lblTrack.setText(f"{self.currentTrack.artist or '(artiste inconnu)'} - {self.currentTrack.title}")
+        self.ui.lblDuration.setText(self.currentTrack.literal_duration())
 
     def play_pause(self):
         """Toggle play/pause status
@@ -162,8 +164,13 @@ class VlcFrame(QtWidgets.QFrame):
         # Note that the setValue function only takes values of type int,
         # so we must first convert the corresponding media position.
         media_pos = int(self._mediaplayer.get_position() * 1000)
+
         self.ui.progressionSlider.setValue(media_pos)
 
+        if self.currentTrack:
+            time_pos = media_pos * self.currentTrack.duration // 1000
+            self.ui.lblPosition.setText(time.strftime("%M:%S", time.gmtime(time_pos)))
+
         # No need to call this function if nothing is played
         if not self._mediaplayer.is_playing():
             self.timer.stop()

+ 42 - 10
ui/qt/widgets/vlcframe.ui

@@ -6,22 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>424</width>
-    <height>79</height>
+    <width>524</width>
+    <height>78</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>424</width>
+    <width>524</width>
     <height>78</height>
    </size>
   </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>10000</height>
-   </size>
-  </property>
   <property name="windowTitle">
    <string>Frame</string>
   </property>
@@ -86,11 +80,30 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QLabel" name="lblPosition">
+         <property name="minimumSize">
+          <size>
+           <width>50</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>50</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="ClickableSlider" name="progressionSlider">
          <property name="minimumSize">
           <size>
-           <width>168</width>
+           <width>150</width>
            <height>28</height>
           </size>
          </property>
@@ -102,6 +115,25 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QLabel" name="lblDuration">
+         <property name="minimumSize">
+          <size>
+           <width>50</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>50</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QToolButton" name="btnMute">
          <property name="minimumSize">

+ 15 - 4
ui/qt/widgets/vlcframe_ui.py

@@ -14,9 +14,8 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_VlcFrame(object):
     def setupUi(self, VlcFrame):
         VlcFrame.setObjectName("VlcFrame")
-        VlcFrame.resize(424, 79)
-        VlcFrame.setMinimumSize(QtCore.QSize(424, 78))
-        VlcFrame.setMaximumSize(QtCore.QSize(16777215, 10000))
+        VlcFrame.resize(524, 78)
+        VlcFrame.setMinimumSize(QtCore.QSize(524, 78))
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout(VlcFrame)
         self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0)
         self.horizontalLayout_2.setSpacing(0)
@@ -36,12 +35,24 @@ class Ui_VlcFrame(object):
         self.btnPlayPause.setIcon(icon)
         self.btnPlayPause.setObjectName("btnPlayPause")
         self.horizontalLayout.addWidget(self.btnPlayPause)
+        self.lblPosition = QtWidgets.QLabel(VlcFrame)
+        self.lblPosition.setMinimumSize(QtCore.QSize(50, 0))
+        self.lblPosition.setMaximumSize(QtCore.QSize(50, 16777215))
+        self.lblPosition.setText("")
+        self.lblPosition.setObjectName("lblPosition")
+        self.horizontalLayout.addWidget(self.lblPosition)
         self.progressionSlider = ClickableSlider(VlcFrame)
-        self.progressionSlider.setMinimumSize(QtCore.QSize(168, 28))
+        self.progressionSlider.setMinimumSize(QtCore.QSize(150, 28))
         self.progressionSlider.setMaximum(1000)
         self.progressionSlider.setOrientation(QtCore.Qt.Horizontal)
         self.progressionSlider.setObjectName("progressionSlider")
         self.horizontalLayout.addWidget(self.progressionSlider)
+        self.lblDuration = QtWidgets.QLabel(VlcFrame)
+        self.lblDuration.setMinimumSize(QtCore.QSize(50, 0))
+        self.lblDuration.setMaximumSize(QtCore.QSize(50, 16777215))
+        self.lblDuration.setText("")
+        self.lblDuration.setObjectName("lblDuration")
+        self.horizontalLayout.addWidget(self.lblDuration)
         self.btnMute = QtWidgets.QToolButton(VlcFrame)
         self.btnMute.setMinimumSize(QtCore.QSize(28, 28))
         self.btnMute.setMaximumSize(QtCore.QSize(28, 28))

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません