瀏覽代碼

minor fixes

Olivier Massot 4 年之前
父節點
當前提交
d7cb7a45ce
共有 7 個文件被更改,包括 476 次插入763 次删除
  1. 6 3
      ui/qt/main.ui
  2. 4 3
      ui/qt/main_ui.py
  3. 452 750
      ui/qt/rsc_rc.py
  4. 6 2
      ui/qt/widgets/explorertable.py
  5. 2 2
      ui/qt/widgets/vlcframe.ui
  6. 2 2
      ui/qt/widgets/vlcframe_ui.py
  7. 4 1
      ui/window.py

+ 6 - 3
ui/qt/main.ui

@@ -96,7 +96,7 @@
         <item>
          <widget class="QStackedWidget" name="stack">
           <property name="currentIndex">
-           <number>0</number>
+           <number>2</number>
           </property>
           <widget class="QWidget" name="page_1">
            <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -174,7 +174,7 @@
                    <bool>true</bool>
                   </attribute>
                   <attribute name="verticalHeaderVisible">
-                   <bool>true</bool>
+                   <bool>false</bool>
                   </attribute>
                   <column>
                    <property name="text">
@@ -378,6 +378,9 @@
                   </item>
                   <item>
                    <widget class="QToolButton" name="explorerBtnFilter">
+                    <property name="enabled">
+                     <bool>false</bool>
+                    </property>
                     <property name="minimumSize">
                      <size>
                       <width>28</width>
@@ -1020,7 +1023,7 @@
                    <bool>true</bool>
                   </attribute>
                   <attribute name="verticalHeaderVisible">
-                   <bool>false</bool>
+                   <bool>true</bool>
                   </attribute>
                   <column>
                    <property name="text">

+ 4 - 3
ui/qt/main_ui.py

@@ -96,7 +96,7 @@ class Ui_mainWindow(object):
         self.sessionPlaylist.setHorizontalHeaderItem(2, item)
         self.sessionPlaylist.horizontalHeader().setVisible(False)
         self.sessionPlaylist.horizontalHeader().setStretchLastSection(True)
-        self.sessionPlaylist.verticalHeader().setVisible(True)
+        self.sessionPlaylist.verticalHeader().setVisible(False)
         self.horizontalLayout_14.addWidget(self.sessionPlaylist)
         self.frameNotes = FrameNotes(self.page_1)
         self.frameNotes.setFrameShape(QtWidgets.QFrame.StyledPanel)
@@ -176,6 +176,7 @@ class Ui_mainWindow(object):
         self.explorerLineSearch.setObjectName("explorerLineSearch")
         self.horizontalLayout_21.addWidget(self.explorerLineSearch)
         self.explorerBtnFilter = QtWidgets.QToolButton(self.page_3)
+        self.explorerBtnFilter.setEnabled(False)
         self.explorerBtnFilter.setMinimumSize(QtCore.QSize(28, 28))
         self.explorerBtnFilter.setMaximumSize(QtCore.QSize(28, 28))
         icon4 = QtGui.QIcon()
@@ -407,7 +408,7 @@ class Ui_mainWindow(object):
         self.explorerPlaylist.setHorizontalHeaderItem(2, item)
         self.explorerPlaylist.horizontalHeader().setVisible(False)
         self.explorerPlaylist.horizontalHeader().setStretchLastSection(True)
-        self.explorerPlaylist.verticalHeader().setVisible(False)
+        self.explorerPlaylist.verticalHeader().setVisible(True)
         self.verticalLayout_12.addWidget(self.explorerPlaylist)
         self.horizontalLayout_6.addLayout(self.verticalLayout_12)
         self.horizontalLayout_6.setStretch(0, 1)
@@ -507,7 +508,7 @@ class Ui_mainWindow(object):
 
         self.retranslateUi(mainWindow)
         self.menu.setCurrentRow(-1)
-        self.stack.setCurrentIndex(0)
+        self.stack.setCurrentIndex(2)
         self.explorerTrackMetaStack.setCurrentIndex(1)
         QtCore.QMetaObject.connectSlotsByName(mainWindow)
 

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


+ 6 - 2
ui/qt/widgets/explorertable.py

@@ -60,6 +60,7 @@ class ExplorerTable(QTreeWidget):
             item.setData(2, 0, track.id)
 
         self.setUpdatesEnabled(True)
+        self.trackSelected.emit(None)
 
     def selected_track(self):
         track_id = self.selectionModel().selection().indexes()[2].data(2)
@@ -68,7 +69,10 @@ class ExplorerTable(QTreeWidget):
         return TrackRepository().get_by_id(int(track_id))
 
     def selectionChanged(self, selected, _):
-        track_id = selected.indexes()[2].data(2)
+        try:
+            track_id = selected.indexes()[2].data(2)
+        except IndexError:
+            return
         if track_id:
             track = TrackRepository().get_by_id(int(track_id))
         else:
@@ -142,4 +146,4 @@ class ExplorerTable(QTreeWidget):
         if searchText:
             self.expandAll()
 
-        self.setUpdatesEnabled(True)
+        self.setUpdatesEnabled(True)

+ 2 - 2
ui/qt/widgets/vlcframe.ui

@@ -67,13 +67,13 @@
         <widget class="QToolButton" name="btnPlayPause">
          <property name="minimumSize">
           <size>
-           <width>28</width>
+           <width>56</width>
            <height>28</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>28</width>
+           <width>56</width>
            <height>28</height>
           </size>
          </property>

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

@@ -29,8 +29,8 @@ class Ui_VlcFrame(object):
         self.horizontalLayout.setSpacing(12)
         self.horizontalLayout.setObjectName("horizontalLayout")
         self.btnPlayPause = QtWidgets.QToolButton(VlcFrame)
-        self.btnPlayPause.setMinimumSize(QtCore.QSize(28, 28))
-        self.btnPlayPause.setMaximumSize(QtCore.QSize(28, 28))
+        self.btnPlayPause.setMinimumSize(QtCore.QSize(56, 28))
+        self.btnPlayPause.setMaximumSize(QtCore.QSize(56, 28))
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap(":/img/rsc/play.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.btnPlayPause.setIcon(icon)

+ 4 - 1
ui/window.py

@@ -120,8 +120,9 @@ class MainWindow(QMainWindow):
 
     def refresh_explorer_tree(self):
         self.ui.explorerTable.populate()
+        self.ui.explorerLineSearch.clear()
 
-    def newTrackSelected(self, track):
+    def newTrackSelected(self, track=None):
         sender = self.sender()
         self.selected_track = None
         self.ui.explorerTrackMetaStack.setCurrentIndex(0)
@@ -252,6 +253,7 @@ class MainWindow(QMainWindow):
             playlist.id
         )
         self.ui.explorerPlaylist.populate(playlist)
+        self.ui.sessionPlaylist.populate(playlist)
 
     def remove_from_playlist(self):
         session_track = self.ui.explorerPlaylist.selected_session_track()
@@ -260,6 +262,7 @@ class MainWindow(QMainWindow):
         session_track_repo = SessionTrackRepository()
         session_track_repo.delete(session_track, True)
         self.ui.explorerPlaylist.populate()
+        self.ui.sessionPlaylist.populate()
 
     def play_playlist(self, track=None):
 

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