Olivier Massot 4 rokov pred
rodič
commit
768ebaf08e
2 zmenil súbory, kde vykonal 789 pridanie a 647 odobranie
  1. 71 30
      ui/qt/main_ui.py
  2. 718 617
      ui/qt/rsc_rc.py

+ 71 - 30
ui/qt/main_ui.py

@@ -14,8 +14,8 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_mainWindow(object):
     def setupUi(self, mainWindow):
         mainWindow.setObjectName("mainWindow")
-        mainWindow.resize(1029, 783)
-        mainWindow.setMinimumSize(QtCore.QSize(1029, 618))
+        mainWindow.resize(1029, 784)
+        mainWindow.setMinimumSize(QtCore.QSize(1029, 784))
         font = QtGui.QFont()
         font.setFamily("Verdana")
         font.setPointSize(8)
@@ -426,8 +426,8 @@ class Ui_mainWindow(object):
         self.label_10.setObjectName("label_10")
         self.verticalLayout_9.addWidget(self.label_10)
         self.explorerTrackNotepad = QtWidgets.QTextEdit(self.page_6)
-        self.explorerTrackNotepad.setMinimumSize(QtCore.QSize(218, 160))
-        self.explorerTrackNotepad.setMaximumSize(QtCore.QSize(16777215, 160))
+        self.explorerTrackNotepad.setMinimumSize(QtCore.QSize(218, 120))
+        self.explorerTrackNotepad.setMaximumSize(QtCore.QSize(16777215, 120))
         self.explorerTrackNotepad.viewport().setProperty("cursor", QtGui.QCursor(QtCore.Qt.IBeamCursor))
         self.explorerTrackNotepad.setAutoFormatting(QtWidgets.QTextEdit.AutoAll)
         self.explorerTrackNotepad.setUndoRedoEnabled(True)
@@ -439,7 +439,8 @@ class Ui_mainWindow(object):
         self.verticalLayout_5.addWidget(self.explorerTrackMetaStack)
         self.explorerTrackPlay = QtWidgets.QPushButton(self.page_3)
         self.explorerTrackPlay.setEnabled(False)
-        self.explorerTrackPlay.setMinimumSize(QtCore.QSize(220, 0))
+        self.explorerTrackPlay.setMinimumSize(QtCore.QSize(220, 38))
+        self.explorerTrackPlay.setMaximumSize(QtCore.QSize(16777215, 38))
         icon5 = QtGui.QIcon()
         icon5.addPixmap(QtGui.QPixmap(":/img/rsc/play.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.explorerTrackPlay.setIcon(icon5)
@@ -448,20 +449,13 @@ class Ui_mainWindow(object):
         self.verticalLayout_5.addWidget(self.explorerTrackPlay)
         self.explorerAddToPlaylist = QtWidgets.QPushButton(self.page_3)
         self.explorerAddToPlaylist.setEnabled(False)
-        self.explorerAddToPlaylist.setMinimumSize(QtCore.QSize(220, 0))
+        self.explorerAddToPlaylist.setMinimumSize(QtCore.QSize(220, 38))
+        self.explorerAddToPlaylist.setMaximumSize(QtCore.QSize(16777215, 38))
         icon6 = QtGui.QIcon()
-        icon6.addPixmap(QtGui.QPixmap(":/img/rsc/double-right-arrows-symbol.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        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.explorerRemoveFromPlaylist = QtWidgets.QPushButton(self.page_3)
-        self.explorerRemoveFromPlaylist.setEnabled(False)
-        self.explorerRemoveFromPlaylist.setMinimumSize(QtCore.QSize(220, 0))
-        icon7 = QtGui.QIcon()
-        icon7.addPixmap(QtGui.QPixmap(":/img/rsc/double-left-arrows-symbol.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.explorerRemoveFromPlaylist.setIcon(icon7)
-        self.explorerRemoveFromPlaylist.setObjectName("explorerRemoveFromPlaylist")
-        self.verticalLayout_5.addWidget(self.explorerRemoveFromPlaylist)
         self.horizontalLayout_6.addLayout(self.verticalLayout_5)
         self.verticalLayout_12 = QtWidgets.QVBoxLayout()
         self.verticalLayout_12.setObjectName("verticalLayout_12")
@@ -511,6 +505,51 @@ class Ui_mainWindow(object):
         self.explorerPlaylist.horizontalHeader().setStretchLastSection(True)
         self.explorerPlaylist.verticalHeader().setVisible(True)
         self.verticalLayout_12.addWidget(self.explorerPlaylist)
+        self.horizontalLayout_22 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_22.setObjectName("horizontalLayout_22")
+        self.btnPlaylistMoveToTop = QtWidgets.QToolButton(self.page_3)
+        self.btnPlaylistMoveToTop.setMinimumSize(QtCore.QSize(28, 28))
+        self.btnPlaylistMoveToTop.setMaximumSize(QtCore.QSize(28, 28))
+        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))
+        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.btnPlaylistMoveToBelow = QtWidgets.QToolButton(self.page_3)
+        self.btnPlaylistMoveToBelow.setMinimumSize(QtCore.QSize(28, 28))
+        self.btnPlaylistMoveToBelow.setMaximumSize(QtCore.QSize(28, 288))
+        icon9 = QtGui.QIcon()
+        icon9.addPixmap(QtGui.QPixmap(":/img/rsc/arrow-down.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.btnPlaylistMoveToBelow.setIcon(icon9)
+        self.btnPlaylistMoveToBelow.setObjectName("btnPlaylistMoveToBelow")
+        self.horizontalLayout_22.addWidget(self.btnPlaylistMoveToBelow)
+        self.btnPlaylistMoveToBottom = QtWidgets.QToolButton(self.page_3)
+        self.btnPlaylistMoveToBottom.setMinimumSize(QtCore.QSize(28, 28))
+        self.btnPlaylistMoveToBottom.setMaximumSize(QtCore.QSize(28, 28))
+        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)
+        self.horizontalLayout_22.addItem(spacerItem4)
+        self.btnPlaylistRemove = QtWidgets.QToolButton(self.page_3)
+        self.btnPlaylistRemove.setMinimumSize(QtCore.QSize(28, 28))
+        self.btnPlaylistRemove.setMaximumSize(QtCore.QSize(28, 28))
+        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)
         self.horizontalLayout_6.addLayout(self.verticalLayout_12)
         self.horizontalLayout_6.setStretch(0, 1)
         self.horizontalLayout_6.setStretch(1, 1)
@@ -575,18 +614,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))
-        icon8 = QtGui.QIcon()
-        icon8.addPixmap(QtGui.QPixmap(":/img/rsc/delete.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.musicFoldersRemoveButton.setIcon(icon8)
+        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)
-        spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_7.addItem(spacerItem4)
+        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))
-        icon9 = QtGui.QIcon()
-        icon9.addPixmap(QtGui.QPixmap(":/img/rsc/plus.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.musicFoldersAddButton.setIcon(icon9)
+        self.musicFoldersAddButton.setIcon(icon6)
         self.musicFoldersAddButton.setObjectName("musicFoldersAddButton")
         self.horizontalLayout_7.addWidget(self.musicFoldersAddButton)
         self.verticalLayout_6.addLayout(self.horizontalLayout_7)
@@ -630,20 +667,20 @@ 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(icon8)
+        self.tableTagsRemoveButton.setIcon(icon12)
         self.tableTagsRemoveButton.setObjectName("tableTagsRemoveButton")
         self.horizontalLayout_20.addWidget(self.tableTagsRemoveButton)
-        spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_20.addItem(spacerItem5)
+        spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_20.addItem(spacerItem6)
         self.tagsTableAddButton = QtWidgets.QPushButton(self.page_5)
         self.tagsTableAddButton.setMinimumSize(QtCore.QSize(128, 32))
         self.tagsTableAddButton.setMaximumSize(QtCore.QSize(128, 32))
-        self.tagsTableAddButton.setIcon(icon9)
+        self.tagsTableAddButton.setIcon(icon6)
         self.tagsTableAddButton.setObjectName("tagsTableAddButton")
         self.horizontalLayout_20.addWidget(self.tagsTableAddButton)
         self.verticalLayout_6.addLayout(self.horizontalLayout_20)
-        spacerItem6 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_6.addItem(spacerItem6)
+        spacerItem7 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_6.addItem(spacerItem7)
         self.horizontalLayout_5.addLayout(self.verticalLayout_6)
         self.stack.addWidget(self.page_5)
         self.verticalLayout_7.addWidget(self.stack)
@@ -707,7 +744,6 @@ class Ui_mainWindow(object):
         self.explorerTrackNotepad.setPlaceholderText(_translate("mainWindow", "Mes notes sur ce morceau..."))
         self.explorerTrackPlay.setText(_translate("mainWindow", "  Lire le morceau sélectionné"))
         self.explorerAddToPlaylist.setText(_translate("mainWindow", "  Ajouter à la playlist"))
-        self.explorerRemoveFromPlaylist.setText(_translate("mainWindow", "  Retirer de la playlist"))
         self.label_9.setText(_translate("mainWindow", "Ma séance: "))
         self.explorerLblPlaylistTitle.setText(_translate("mainWindow", "(pas de séance en cours)"))
         self.btnSelectPlaylist.setText(_translate("mainWindow", "..."))
@@ -717,6 +753,11 @@ class Ui_mainWindow(object):
         item.setText(_translate("mainWindow", "track_id"))
         item = self.explorerPlaylist.horizontalHeaderItem(2)
         item.setText(_translate("mainWindow", "Label"))
+        self.btnPlaylistMoveToTop.setText(_translate("mainWindow", "..."))
+        self.btnPlaylistMoveUp.setText(_translate("mainWindow", "..."))
+        self.btnPlaylistMoveToBelow.setText(_translate("mainWindow", "..."))
+        self.btnPlaylistMoveToBottom.setText(_translate("mainWindow", "..."))
+        self.btnPlaylistRemove.setText(_translate("mainWindow", "..."))
         self.label.setText(_translate("mainWindow", "Page 4"))
         self.label_5.setText(_translate("mainWindow", "Mes dossiers de musique"))
         item = self.settingsMusicFoldersTable.horizontalHeaderItem(0)

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 718 - 617
ui/qt/rsc_rc.py


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov