Skip to content

Commit be261bb

Browse files
committed
_update_items(): regroup code per column
- alignment never changes, move it outside the loop - set new_item flags once at object creation - it makes the code a bit easier to read imho
1 parent 4e1ff55 commit be261bb

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

picard/ui/metadatabox.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -668,48 +668,48 @@ def _update_items(self, result=None, error=None):
668668

669669
orig_flags = QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled
670670
new_flags = orig_flags | QtCore.Qt.ItemFlag.ItemIsEditable
671+
alignment = QtCore.Qt.AlignmentFlag.AlignLeft | QtCore.Qt.AlignmentFlag.AlignTop
671672

672673
for i, tag in enumerate(self.tag_diff.tag_names):
674+
color = self.colors.get(self.tag_diff.tag_status(tag),
675+
self.colors[TagStatus.NOCHANGE])
676+
673677
tag_item = self.item(i, self.COLUMN_TAG)
674-
orig_item = self.item(i, self.COLUMN_ORIG)
675-
new_item = self.item(i, self.COLUMN_NEW)
676678
if not tag_item:
677679
tag_item = QtWidgets.QTableWidgetItem()
678680
tag_item.setFlags(orig_flags)
679681
font = tag_item.font()
680682
font.setBold(True)
681683
tag_item.setFont(font)
684+
tag_item.setTextAlignment(alignment)
682685
self.setItem(i, self.COLUMN_TAG, tag_item)
686+
tag_item.setText(display_tag_name(tag))
687+
688+
orig_item = self.item(i, self.COLUMN_ORIG)
683689
if not orig_item:
684690
orig_item = QtWidgets.QTableWidgetItem()
685691
orig_item.setFlags(orig_flags)
692+
orig_item.setTextAlignment(alignment)
686693
self.setItem(i, self.COLUMN_ORIG, orig_item)
694+
self._set_item_value(orig_item, self.tag_diff.orig, tag)
695+
orig_item.setForeground(color)
696+
697+
new_item = self.item(i, self.COLUMN_NEW)
687698
if not new_item:
688699
new_item = QtWidgets.QTableWidgetItem()
700+
new_item.setTextAlignment(alignment)
701+
if tag == '~length':
702+
new_item.setFlags(orig_flags)
703+
else:
704+
new_item.setFlags(new_flags)
689705
self.setItem(i, self.COLUMN_NEW, new_item)
690-
tag_item.setText(display_tag_name(tag))
691-
self._set_item_value(orig_item, self.tag_diff.orig, tag)
692-
if tag == '~length':
693-
new_item.setFlags(orig_flags)
694-
else:
695-
new_item.setFlags(new_flags)
696706
self._set_item_value(new_item, self.tag_diff.new, tag)
697-
698707
font = new_item.font()
699708
strikeout = self.tag_diff.tag_status(tag) == TagStatus.REMOVED
700709
font.setStrikeOut(strikeout)
701710
new_item.setFont(font)
702-
703-
color = self.colors.get(self.tag_diff.tag_status(tag),
704-
self.colors[TagStatus.NOCHANGE])
705-
orig_item.setForeground(color)
706711
new_item.setForeground(color)
707712

708-
alignment = QtCore.Qt.AlignmentFlag.AlignLeft | QtCore.Qt.AlignmentFlag.AlignTop
709-
tag_item.setTextAlignment(alignment)
710-
orig_item.setTextAlignment(alignment)
711-
new_item.setTextAlignment(alignment)
712-
713713
# Adjust row height to content size
714714
self.setRowHeight(i, self.sizeHintForRow(i))
715715

0 commit comments

Comments
 (0)