ui file and icons moved in res dir + cosmetic UI changes

Author: nvandamme

ui/opensnitch/plugins/list_subscriptions/__init__.py

@@ -1 +1,15 @@
-"""List subscriptions plugin package."""
+#   This file is part of OpenSnitch.
+#
+#   OpenSnitch is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   OpenSnitch is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with OpenSnitch.  If not, see <http://www.gnu.org/licenses/>.
+

ui/opensnitch/plugins/list_subscriptions/_gui.py

@@ -57,11 +57,12 @@
 )
 DEFAULT_LISTS_DIR = os.path.join(xdg_config_home, "opensnitch", "list_subscriptions")
 PLUGIN_DIR = os.path.abspath(os.path.dirname(__file__))
+RES_DIR = os.path.join(PLUGIN_DIR, "res")
 LIST_SUBSCRIPTIONS_DIALOG_UI_PATH = os.path.join(
-    PLUGIN_DIR, "list_subscriptions_dialog.ui"
+    RES_DIR, "list_subscriptions_dialog.ui"
 )
-SUBSCRIPTION_DIALOG_UI_PATH = os.path.join(PLUGIN_DIR, "subscription_dialog.ui")
-BULK_EDIT_DIALOG_UI_PATH = os.path.join(PLUGIN_DIR, "bulk_edit_dialog.ui")
+SUBSCRIPTION_DIALOG_UI_PATH = os.path.join(RES_DIR, "subscription_dialog.ui")
+BULK_EDIT_DIALOG_UI_PATH = os.path.join(RES_DIR, "bulk_edit_dialog.ui")
 
 SubscriptionDialogUI = uic.loadUiType(SUBSCRIPTION_DIALOG_UI_PATH)[0] # type: ignore
 BulkEditDialogUI = uic.loadUiType(BULK_EDIT_DIALOG_UI_PATH)[0] # type: ignore
@@ -94,6 +95,25 @@
 logger = logging.getLogger(__name__)
 
 
+class KeepForegroundOnSelectionDelegate(QtWidgets.QStyledItemDelegate):
+    def initStyleOption(self, option, index):
+        super().initStyleOption(option, index)
+        if option is None or index is None:
+            return
+        foreground = index.data(QtCore.Qt.ItemDataRole.ForegroundRole)
+        if foreground is None:
+            return
+        brush = foreground if isinstance(foreground, QtGui.QBrush) else QtGui.QBrush(foreground)
+        option.palette.setBrush(
+            QtGui.QPalette.ColorRole.Text,
+            brush,
+        )
+        option.palette.setBrush(
+            QtGui.QPalette.ColorRole.HighlightedText,
+            brush,
+        )
+
+
 class SubscriptionDialog(QtWidgets.QDialog, SubscriptionDialogUI):
     _url_test_finished = QtCore.pyqtSignal(bool, str)
 
@@ -809,7 +829,7 @@ def _build_ui(self):
         self.table.setColumnCount(19)
         self.table.setHorizontalHeaderLabels(
             [
-                QC.translate("stats", "Enabled"),
+                "☑",
                 QC.translate("stats", "Name"),
                 QC.translate("stats", "URL"),
                 QC.translate("stats", "Filename"),
@@ -855,9 +875,32 @@ def _build_ui(self):
         self.table.setSelectionMode(
             QtWidgets.QAbstractItemView.SelectionMode.ExtendedSelection
         )
+        state_delegate = KeepForegroundOnSelectionDelegate(self.table)
+        for col in (
+            COL_STATE,
+            COL_LAST_CHECKED,
+            COL_LAST_UPDATED,
+        ):
+            self.table.setItemDelegateForColumn(col, state_delegate)
         header = self.table.horizontalHeader()
         if header is not None:
             header.setStretchLastSection(True)
+            header.setSectionResizeMode(
+                COL_ENABLED, QtWidgets.QHeaderView.ResizeMode.Fixed
+            )
+            style = self.table.style()
+            if style is not None:
+                indicator_w = style.pixelMetric(
+                    QtWidgets.QStyle.PixelMetric.PM_IndicatorWidth,
+                    None,
+                    self.table,
+                )
+                indicator_h = style.pixelMetric(
+                    QtWidgets.QStyle.PixelMetric.PM_IndicatorHeight,
+                    None,
+                    self.table,
+                )
+                self.table.setColumnWidth(COL_ENABLED, max(indicator_w, indicator_h) + 12)
             header.setSectionResizeMode(
                 COL_URL, QtWidgets.QHeaderView.ResizeMode.Stretch
             )
@@ -1261,22 +1304,23 @@ def refresh_states(self):
             last_updated = str(meta.get("last_updated", "")) if meta else ""
             fail_count = str(meta.get("fail_count", 0)) if meta else "0"
             last_error = str(meta.get("last_error", "")) if meta else ""
+            fg_color: QtGui.QColor
 
             if not enabled:
                 state = "disabled"
-                color = QtGui.QColor("lightgray")
+                fg_color = self._state_text_color("disabled")
             elif not file_exists:
                 # New/manual subscriptions may not be downloaded yet.
                 # Expose that as pending instead of an error-like missing state.
                 if not meta_exists or last_result in ("never", "", "busy"):
                     state = "pending"
-                    color = QtGui.QColor("khaki")
+                    fg_color = self._state_text_color("pending")
                 else:
                     state = "missing"
-                    color = QtGui.QColor("tomato")
+                    fg_color = self._state_text_color("missing")
             elif last_result in ("updated", "not_modified"):
                 state = last_result
-                color = QtGui.QColor("lightgreen")
+                fg_color = self._state_text_color(last_result)
             elif last_result in (
                 "error",
                 "write_error",
@@ -1286,13 +1330,13 @@ def refresh_states(self):
                 "too_large",
             ):
                 state = last_result
-                color = QtGui.QColor("salmon")
+                fg_color = self._state_text_color(last_result)
             elif last_result == "busy":
                 state = "busy"
-                color = QtGui.QColor("khaki")
+                fg_color = self._state_text_color("busy")
             else:
                 state = last_result
-                color = QtGui.QColor("lightyellow")
+                fg_color = self._state_text_color("other")
 
             self._set_text_item(
                 row, COL_FILE, "yes" if file_exists else "no", editable=False
@@ -1317,7 +1361,46 @@ def refresh_states(self):
             ):
                 item = self.table.item(row, col)
                 if item is not None:
-                    item.setBackground(color)
+                    item.setForeground(fg_color)
+
+    def _state_text_color(self, state: str):
+        palette = self.table.palette()
+        dark_theme = palette.base().color().lightness() < 128
+
+        if dark_theme:
+            colors = {
+                "disabled": "#B8C0CC",
+                "pending": "#F5D76E",
+                "busy": "#F5D76E",
+                "missing": "#FF8A80",
+                "updated": "#7CE3A1",
+                "not_modified": "#86C5FF",
+                "error": "#FF8A80",
+                "write_error": "#FF8A80",
+                "request_error": "#FF8A80",
+                "unexpected_error": "#FF8A80",
+                "bad_format": "#FF8A80",
+                "too_large": "#FF8A80",
+                "other": "#F7E37A",
+            }
+        else:
+            colors = {
+                "disabled": "#6B7280",
+                "pending": "#9A6700",
+                "busy": "#9A6700",
+                "missing": "#C62828",
+                "updated": "#0F8A4B",
+                "not_modified": "#1565C0",
+                "error": "#C62828",
+                "write_error": "#C62828",
+                "request_error": "#C62828",
+                "unexpected_error": "#C62828",
+                "bad_format": "#C62828",
+                "too_large": "#C62828",
+                "other": "#8D6E00",
+            }
+
+        return QtGui.QColor(colors.get(state, colors["other"]))
 
     def add_subscription_row(self):
         dlg = SubscriptionDialog(

ui/opensnitch/plugins/list_subscriptions/list_subscriptions.py

@@ -547,7 +547,7 @@ def configure(self, parent: Any = None):
                 return
 
             icon_path = os.path.join(
-                os.path.abspath(os.path.dirname(__file__)), "blocklist.svg"
+                os.path.abspath(os.path.dirname(__file__)), "res", "blocklist.svg"
             )
             icon = (
                 QtGui.QIcon(icon_path) if os.path.exists(icon_path) else QtGui.QIcon()

ui/opensnitch/plugins/list_subscriptions/res/__init__.py

@@ -204,7 +204,7 @@
      <item>
       <widget class="QGroupBox" name="rule_actions_box">
        <property name="title">
-        <string>Rule actions</string>
+        <string>Selected subscription(s) actions</string>
        </property>
        <layout class="QHBoxLayout" name="ruleActionsLayout">
         <item>