v4.5.0
This commit is contained in:
Muhamed
+130
-48
@@ -19,6 +19,9 @@ class FormatTableMixin:
|
||||
self.format_table.setColumnCount(8)
|
||||
self.format_table.setHorizontalHeaderLabels(['Select', 'Quality', 'Extension', 'Resolution', 'File Size', 'Codec', 'Audio', 'Notes'])
|
||||
|
||||
# Enable alternating row colors
|
||||
self.format_table.setAlternatingRowColors(True)
|
||||
|
||||
# Set specific column widths and resize modes
|
||||
self.format_table.horizontalHeader().setSectionResizeMode(0, QHeaderView.ResizeMode.Fixed) # Select
|
||||
self.format_table.setColumnWidth(0, 50) # Select column width
|
||||
@@ -51,25 +54,32 @@ class FormatTableMixin:
|
||||
|
||||
self.format_table.setStyleSheet("""
|
||||
QTableWidget {
|
||||
background-color: #363636;
|
||||
border: 2px solid #3d3d3d;
|
||||
background-color: #1b2021;
|
||||
border: 2px solid #1b2021;
|
||||
border-radius: 4px;
|
||||
gridline-color: #3d3d3d;
|
||||
gridline-color: #1b2021;
|
||||
}
|
||||
QTableWidget::item {
|
||||
padding: 5px;
|
||||
border-bottom: 1px solid #3d3d3d;
|
||||
border-bottom: 1px solid #1b2021;
|
||||
}
|
||||
QTableWidget::item:selected {
|
||||
background-color: transparent;
|
||||
}
|
||||
QHeaderView::section {
|
||||
background-color: #2b2b2b;
|
||||
background-color: #15181b;
|
||||
padding: 5px;
|
||||
border: 1px solid #3d3d3d;
|
||||
border: 1px solid #1b2021;
|
||||
font-weight: bold;
|
||||
color: white;
|
||||
}
|
||||
/* Style alternating rows with more contrast */
|
||||
QTableWidget::item:alternate {
|
||||
background-color: #212529;
|
||||
}
|
||||
QTableWidget::item {
|
||||
background-color: #16191b;
|
||||
}
|
||||
QCheckBox::indicator {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
@@ -77,11 +87,11 @@ class FormatTableMixin:
|
||||
}
|
||||
QCheckBox::indicator:unchecked {
|
||||
border: 2px solid #666666;
|
||||
background: #2b2b2b;
|
||||
background: #15181b;
|
||||
}
|
||||
QCheckBox::indicator:checked {
|
||||
border: 2px solid #ff0000;
|
||||
background: #ff0000;
|
||||
border: 2px solid #c90000;
|
||||
background: #c90000;
|
||||
}
|
||||
QWidget {
|
||||
background-color: transparent;
|
||||
@@ -145,21 +155,66 @@ class FormatTableMixin:
|
||||
def _update_format_table(self, formats):
|
||||
self.format_table.setRowCount(0)
|
||||
self.format_checkboxes.clear()
|
||||
|
||||
# Find best quality format for recommendations
|
||||
best_video_size = max((f.get('filesize', 0) for f in formats if f.get('vcodec') != 'none'), default=0)
|
||||
|
||||
is_playlist_mode = hasattr(self, 'is_playlist') and self.is_playlist
|
||||
|
||||
# Configure columns based on mode
|
||||
if is_playlist_mode:
|
||||
self.format_table.setColumnCount(5)
|
||||
self.format_table.setHorizontalHeaderLabels(['Select', 'Quality', 'Resolution', 'Notes', 'Audio'])
|
||||
|
||||
# Configure column visibility and resizing for playlist mode
|
||||
self.format_table.setColumnHidden(5, True)
|
||||
self.format_table.setColumnHidden(6, True)
|
||||
self.format_table.setColumnHidden(7, True)
|
||||
|
||||
# Set specific resize modes for playlist columns
|
||||
self.format_table.horizontalHeader().setSectionResizeMode(0, QHeaderView.ResizeMode.Fixed)
|
||||
self.format_table.setColumnWidth(0, 50)
|
||||
self.format_table.horizontalHeader().setSectionResizeMode(1, QHeaderView.ResizeMode.Stretch)
|
||||
self.format_table.horizontalHeader().setSectionResizeMode(2, QHeaderView.ResizeMode.Stretch)
|
||||
self.format_table.horizontalHeader().setSectionResizeMode(3, QHeaderView.ResizeMode.Stretch)
|
||||
self.format_table.horizontalHeader().setSectionResizeMode(4, QHeaderView.ResizeMode.Stretch)
|
||||
|
||||
else:
|
||||
self.format_table.setColumnCount(8)
|
||||
self.format_table.setHorizontalHeaderLabels(['Select', 'Quality', 'Extension', 'Resolution', 'File Size', 'Codec', 'Audio', 'Notes'])
|
||||
# Ensure all columns are visible
|
||||
for i in range(2, 8):
|
||||
self.format_table.setColumnHidden(i, False)
|
||||
|
||||
# Reapply resize modes for non-playlist mode if needed (optional, might be okay without)
|
||||
self.format_table.horizontalHeader().setSectionResizeMode(0, QHeaderView.ResizeMode.Fixed)
|
||||
self.format_table.setColumnWidth(0, 50)
|
||||
self.format_table.horizontalHeader().setSectionResizeMode(1, QHeaderView.ResizeMode.Fixed)
|
||||
self.format_table.setColumnWidth(1, 100)
|
||||
self.format_table.horizontalHeader().setSectionResizeMode(2, QHeaderView.ResizeMode.Fixed)
|
||||
self.format_table.setColumnWidth(2, 80)
|
||||
self.format_table.horizontalHeader().setSectionResizeMode(3, QHeaderView.ResizeMode.Fixed)
|
||||
self.format_table.setColumnWidth(3, 100)
|
||||
self.format_table.horizontalHeader().setSectionResizeMode(4, QHeaderView.ResizeMode.Fixed)
|
||||
self.format_table.setColumnWidth(4, 100)
|
||||
self.format_table.horizontalHeader().setSectionResizeMode(5, QHeaderView.ResizeMode.Fixed)
|
||||
self.format_table.setColumnWidth(5, 150)
|
||||
self.format_table.horizontalHeader().setSectionResizeMode(6, QHeaderView.ResizeMode.Fixed)
|
||||
self.format_table.setColumnWidth(6, 120)
|
||||
self.format_table.horizontalHeader().setSectionResizeMode(7, QHeaderView.ResizeMode.Stretch)
|
||||
|
||||
|
||||
# Find best quality format for recommendations (only needed for non-playlist mode notes)
|
||||
best_video_size = 0
|
||||
if not is_playlist_mode:
|
||||
best_video_size = max((f.get('filesize', 0) for f in formats if f.get('vcodec') != 'none'), default=0)
|
||||
|
||||
for f in formats:
|
||||
row = self.format_table.rowCount()
|
||||
self.format_table.insertRow(row)
|
||||
|
||||
# Add checkbox
|
||||
# Column 0: Select Checkbox (Always shown)
|
||||
checkbox = QCheckBox()
|
||||
checkbox.format_id = str(f.get('format_id', ''))
|
||||
checkbox.clicked.connect(lambda checked, cb=checkbox: self.handle_checkbox_click(cb))
|
||||
self.format_checkboxes.append(checkbox)
|
||||
|
||||
# Create a widget to center the checkbox
|
||||
checkbox_widget = QWidget()
|
||||
checkbox_widget.setStyleSheet("background-color: transparent;")
|
||||
checkbox_layout = QHBoxLayout(checkbox_widget)
|
||||
@@ -169,7 +224,7 @@ class FormatTableMixin:
|
||||
checkbox_layout.setSpacing(0)
|
||||
self.format_table.setCellWidget(row, 0, checkbox_widget)
|
||||
|
||||
# Quality (replacing Format ID)
|
||||
# Column 1: Quality (Always shown)
|
||||
quality_text = self.get_quality_label(f)
|
||||
quality_item = QTableWidgetItem(quality_text)
|
||||
# Set color based on quality
|
||||
@@ -183,46 +238,73 @@ class FormatTableMixin:
|
||||
quality_item.setForeground(QColor('#ff5555')) # Red for low quality
|
||||
self.format_table.setItem(row, 1, quality_item)
|
||||
|
||||
# Extension
|
||||
self.format_table.setItem(row, 2, QTableWidgetItem(f.get('ext', '').upper()))
|
||||
|
||||
# Resolution
|
||||
# --- Populate columns common to both modes (Moved outside the 'if not is_playlist_mode' block) ---
|
||||
|
||||
# Column 2: Resolution (Always shown)
|
||||
resolution = f.get('resolution', 'N/A')
|
||||
if f.get('vcodec') == 'none':
|
||||
resolution = 'Audio only'
|
||||
self.format_table.setItem(row, 3, QTableWidgetItem(resolution))
|
||||
|
||||
# File Size
|
||||
filesize = f"{f.get('filesize', 0) / 1024 / 1024:.2f} MB"
|
||||
self.format_table.setItem(row, 4, QTableWidgetItem(filesize))
|
||||
|
||||
# Codec
|
||||
if f.get('vcodec') == 'none':
|
||||
codec = f.get('acodec', 'N/A')
|
||||
self.format_table.setItem(row, 2, QTableWidgetItem(resolution))
|
||||
|
||||
# Column 3: Notes for playlist mode, Extension for normal mode
|
||||
if is_playlist_mode:
|
||||
# Get notes for playlist mode
|
||||
notes = self.get_format_notes(f, 0) # We don't need best_video_size for simple notes
|
||||
notes_item = QTableWidgetItem(notes)
|
||||
if "✨ Recommended" in notes:
|
||||
notes_item.setForeground(QColor('#00ff00')) # Green for recommended
|
||||
elif "💾 Storage friendly" in notes:
|
||||
notes_item.setForeground(QColor('#00ccff')) # Blue for storage friendly
|
||||
elif "📱 Mobile friendly" in notes:
|
||||
notes_item.setForeground(QColor('#ff9900')) # Orange for mobile
|
||||
self.format_table.setItem(row, 3, notes_item)
|
||||
else:
|
||||
codec = f"{f.get('vcodec', 'N/A')}"
|
||||
if f.get('acodec') != 'none':
|
||||
codec += f" / {f.get('acodec', 'N/A')}"
|
||||
self.format_table.setItem(row, 5, QTableWidgetItem(codec))
|
||||
|
||||
# Audio Status
|
||||
needs_audio = f.get('acodec') == 'none'
|
||||
audio_status = "Will merge audio" if needs_audio else "✓ Has Audio"
|
||||
# Extension for normal mode (column 2)
|
||||
self.format_table.setItem(row, 2, QTableWidgetItem(f.get('ext', '').upper()))
|
||||
|
||||
# Column 4 in playlist mode, Column 6 in normal mode: Audio Status
|
||||
needs_audio = f.get('acodec') == 'none' and f.get('vcodec') != 'none' # Only mark video-only as needing merge
|
||||
audio_status = "Will merge audio" if needs_audio else ("✓ Has Audio" if f.get('vcodec') != 'none' else "Audio Only")
|
||||
audio_item = QTableWidgetItem(audio_status)
|
||||
if needs_audio:
|
||||
audio_item.setForeground(QColor('#ffa500'))
|
||||
self.format_table.setItem(row, 6, audio_item)
|
||||
elif audio_status == "Audio Only":
|
||||
audio_item.setForeground(QColor('#cccccc')) # Neutral color for audio only
|
||||
else: # Has Audio (Video+Audio)
|
||||
audio_item.setForeground(QColor('#00cc00')) # Green for included audio
|
||||
# Set item for correct column based on mode
|
||||
audio_column_index = 4 if is_playlist_mode else 6
|
||||
self.format_table.setItem(row, audio_column_index, audio_item)
|
||||
|
||||
# Add Notes column
|
||||
notes = self.get_format_notes(f, best_video_size)
|
||||
notes_item = QTableWidgetItem(notes)
|
||||
if "✨ Recommended" in notes:
|
||||
notes_item.setForeground(QColor('#00ff00')) # Green for recommended
|
||||
elif "💾 Storage friendly" in notes:
|
||||
notes_item.setForeground(QColor('#00ccff')) # Blue for storage friendly
|
||||
elif "📱 Mobile friendly" in notes:
|
||||
notes_item.setForeground(QColor('#ff9900')) # Orange for mobile
|
||||
self.format_table.setItem(row, 7, notes_item)
|
||||
|
||||
# --- Populate columns only shown in non-playlist mode ---
|
||||
if not is_playlist_mode:
|
||||
# Column 3: Resolution
|
||||
self.format_table.setItem(row, 3, QTableWidgetItem(resolution))
|
||||
|
||||
# Column 4: File Size
|
||||
filesize = f"{f.get('filesize', 0) / 1024 / 1024:.2f} MB"
|
||||
self.format_table.setItem(row, 4, QTableWidgetItem(filesize))
|
||||
|
||||
# Column 5: Codec
|
||||
if f.get('vcodec') == 'none':
|
||||
codec = f.get('acodec', 'N/A')
|
||||
else:
|
||||
codec = f"{f.get('vcodec', 'N/A')}"
|
||||
if f.get('acodec') != 'none':
|
||||
codec += f" / {f.get('acodec', 'N/A')}"
|
||||
self.format_table.setItem(row, 5, QTableWidgetItem(codec))
|
||||
|
||||
# Column 7: Notes
|
||||
notes = self.get_format_notes(f, best_video_size)
|
||||
notes_item = QTableWidgetItem(notes)
|
||||
if "✨ Recommended" in notes:
|
||||
notes_item.setForeground(QColor('#00ff00')) # Green for recommended
|
||||
elif "💾 Storage friendly" in notes:
|
||||
notes_item.setForeground(QColor('#00ccff')) # Blue for storage friendly
|
||||
elif "📱 Mobile friendly" in notes:
|
||||
notes_item.setForeground(QColor('#ff9900')) # Orange for mobile
|
||||
self.format_table.setItem(row, 7, notes_item)
|
||||
|
||||
def handle_checkbox_click(self, clicked_checkbox):
|
||||
for checkbox in self.format_checkboxes:
|
||||
|
||||
Reference in New Issue
Block a user