enh: unify action button size, alignment, and spacing across all tabs

Author: paulmueller

CHANGELOG

@@ -5,6 +5,7 @@
  - fix: cache download resource file size
  - fix: action button behavior in downloads panel (#94)
  - fix: action button behavior in uploads panel
+ - enh: unify action button size, alignment, and spacing across all tabs
  - enh: allow sharing individual datasets instead of collections (#32)
  - enh: add preview option for dataset description in upload dialog (#52)
  - enh: introduce write lock for eternal job updates

dcoraid/gui/dbview/filter_base.py

@@ -100,10 +100,10 @@ def set_entry(self, row, entry):
         # tool buttons (2nd column)
         widact = QtWidgets.QWidget(self)
         horz_layout = QtWidgets.QHBoxLayout(widact)
-        horz_layout.setContentsMargins(0, 0, 5, 0)
         horz_layout.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight)
+        horz_layout.setSpacing(2)
+        horz_layout.setContentsMargins(0, 0, 2, 0)
 
-        col_width = 0
         for action in self.get_entry_actions(row, entry):
             if action["name"] in self.active_actions:
                 tbact = QtWidgets.QToolButton(widact)
@@ -113,10 +113,8 @@ def set_entry(self, row, entry):
                 tbact.clicked.connect(action["function"])
                 horz_layout.addWidget(tbact)
                 row_height = tbact.geometry().height()
-                col_width += row_height
-                tbact.setFixedWidth(row_height)
+                tbact.setFixedSize(row_height - 2, row_height - 2)
 
-        self.tableWidget.setColumnWidth(1, col_width)
         self.tableWidget.setCellWidget(row, 1, widact)
 
         return widact

dcoraid/gui/panel_downloads/widget_actions_download.py

@@ -29,6 +29,15 @@ def __init__(self, job, *args, **kwargs):
         self.tb_view.clicked.connect(self.on_view)
         self.tb_folder.clicked.connect(self.on_folder)
 
+        for tbact in [self.tb_delete,
+                      self.tb_error,
+                      self.tb_retry,
+                      self.tb_view,
+                      self.tb_folder,
+                      ]:
+            row_height = tbact.geometry().height()
+            tbact.setFixedSize(row_height - 2, row_height - 2)
+
     @QtCore.pyqtSlot()
     def on_delete(self):
         self.delete_job.emit(self.job.job_id)

dcoraid/gui/panel_downloads/widget_actions_download.ui

@@ -29,7 +29,7 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item>
+   <item alignment="Qt::AlignmentFlag::AlignRight">
     <widget class="QToolButton" name="tb_delete">
      <property name="toolTip">
       <string>Remove from queue (DCOR data is not deleted)</string>
@@ -42,7 +42,7 @@
      </property>
     </widget>
    </item>
-   <item>
+   <item alignment="Qt::AlignmentFlag::AlignRight">
     <widget class="QToolButton" name="tb_error">
      <property name="toolTip">
       <string>Show error message</string>
@@ -55,7 +55,7 @@
      </property>
     </widget>
    </item>
-   <item>
+   <item alignment="Qt::AlignmentFlag::AlignRight">
     <widget class="QToolButton" name="tb_retry">
      <property name="toolTip">
       <string>Retry upload</string>
@@ -68,7 +68,7 @@
      </property>
     </widget>
    </item>
-   <item>
+   <item alignment="Qt::AlignmentFlag::AlignRight">
     <widget class="QToolButton" name="tb_folder">
      <property name="toolTip">
       <string>Open download location</string>
@@ -81,7 +81,7 @@
      </property>
     </widget>
    </item>
-   <item>
+   <item alignment="Qt::AlignmentFlag::AlignRight">
     <widget class="QToolButton" name="tb_view">
      <property name="toolTip">
       <string>View dataset online</string>

dcoraid/gui/panel_downloads/widget_download.py

@@ -253,6 +253,10 @@ def update_job_status(self):
                 QtCore.QEventLoop.ProcessEventsFlag.AllEvents, 300)
         self.setUpdatesEnabled(True)
 
+        header = self.horizontalHeader()
+        header.setSectionResizeMode(
+            5, QtWidgets.QHeaderView.ResizeMode.ResizeToContents)
+
     def set_label_item(self, row, col, label):
         """Get/Create a Qlabel at the specified position
 

dcoraid/gui/panel_uploads/widget_actions_upload.py

@@ -27,6 +27,15 @@ def __init__(self, job, *args, **kwargs):
         self.tb_retry.clicked.connect(self.on_retry)
         self.tb_view.clicked.connect(self.on_view)
 
+        for tbact in [self.tb_abort,
+                      self.tb_delete,
+                      self.tb_error,
+                      self.tb_retry,
+                      self.tb_view,
+                      ]:
+            row_height = tbact.geometry().height()
+            tbact.setFixedSize(row_height - 2, row_height - 2)
+
     @QtCore.pyqtSlot()
     def on_abort(self):
         self.abort_job.emit(self.job.dataset_id)

dcoraid/gui/panel_uploads/widget_actions_upload.ui

@@ -29,7 +29,7 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item>
+   <item alignment="Qt::AlignmentFlag::AlignRight">
     <widget class="QToolButton" name="tb_delete">
      <property name="toolTip">
       <string>Remove from queue (DCOR data is not deleted)</string>
@@ -42,7 +42,7 @@
      </property>
     </widget>
    </item>
-   <item>
+   <item alignment="Qt::AlignmentFlag::AlignRight">
     <widget class="QToolButton" name="tb_abort">
      <property name="toolTip">
       <string>Abort job</string>
@@ -55,7 +55,7 @@
      </property>
     </widget>
    </item>
-   <item>
+   <item alignment="Qt::AlignmentFlag::AlignRight">
     <widget class="QToolButton" name="tb_error">
      <property name="toolTip">
       <string>Show error message</string>
@@ -68,7 +68,7 @@
      </property>
     </widget>
    </item>
-   <item>
+   <item alignment="Qt::AlignmentFlag::AlignRight">
     <widget class="QToolButton" name="tb_retry">
      <property name="toolTip">
       <string>Retry upload</string>
@@ -81,7 +81,7 @@
      </property>
     </widget>
    </item>
-   <item>
+   <item alignment="Qt::AlignmentFlag::AlignRight">
     <widget class="QToolButton" name="tb_view">
      <property name="toolTip">
       <string>View dataset online</string>

dcoraid/gui/panel_uploads/widget_upload.py

@@ -509,6 +509,9 @@ def update_job_status(self):
 
         # enable updates again
         self.setUpdatesEnabled(True)
+        header = self.horizontalHeader()
+        header.setSectionResizeMode(
+            5, QtWidgets.QHeaderView.ResizeMode.ResizeToContents)
 
     def set_label_item(self, row, col, label):
         """Get/Create a Qlabel at the specified position