Compare commits

..

No commits in common. "c0ae9eba9f3521c28450f39561fb1663a6962d71" and "f07ff569870be1cfa78d3843aef584510f973ee8" have entirely different histories.

2 changed files with 7 additions and 14 deletions

View File

@ -1241,7 +1241,7 @@ class Window(QMainWindow, Ui_MainWindow):
for _ in range(3):
if self.music.player:
volume = self.music.player.audio_get_volume()
if volume < Config.VOLUME_VLC_DEFAULT:
if volume < 10:
self.music.set_volume()
log.error(f"Reset from {volume=}")
break

View File

@ -233,7 +233,6 @@ class PlaylistTab(QTableWidget):
if not event.source() == self:
return # We don't accept external drops
top_row = self.rowAt(0)
row_set = set([mi.row() for mi in self.selectedIndexes()])
targetRow = self.indexAt(event.position().toPoint()).row()
row_set.discard(targetRow)
@ -252,22 +251,16 @@ class PlaylistTab(QTableWidget):
rowMapping[row + len(rows)] = targetRow + idx
colCount = self.columnCount()
for srcRow, tgtRow in sorted(rowMapping.items()):
if self._get_row_track_id(srcRow):
# This is a track row
for col in range(0, colCount):
self.setItem(tgtRow, col, self.takeItem(srcRow, col))
else:
self.setItem(tgtRow, HEADER_NOTES_COLUMN,
self.takeItem(srcRow, HEADER_NOTES_COLUMN))
self.setSpan(tgtRow, HEADER_NOTES_COLUMN, 1, len(columns) - 1)
for row in reversed(sorted(rowMapping.keys())):
self.removeRow(row)
self.resizeRowsToContents()
# Scroll to drop zone
self.scrollToItem(self.item(top_row, 1),
QAbstractItemView.ScrollHint.PositionAtTop)
event.accept()
# Scroll to drop zone
self.scrollToItem(self.item(targetRow, 1),
QAbstractItemView.ScrollHint.PositionAtCenter)
# Reset drag mode to allow row selection by dragging
self.setDragEnabled(False)