From 41c683c2ce446f91347fdd9c2efe259bfffac272 Mon Sep 17 00:00:00 2001 From: Ben Grande Date: Mon, 19 Aug 2024 16:04:43 +0200 Subject: [PATCH] Change icon directories --- usr/libexec/msgcollector/generic_gui_message | 10 ++++++---- usr/libexec/msgcollector/msgdispatcher_dispatch_x | 11 ++++++----- usr/libexec/msgcollector/tb_updater_gui | 11 ++++++----- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/usr/libexec/msgcollector/generic_gui_message b/usr/libexec/msgcollector/generic_gui_message index 67706b8..27cb4f3 100755 --- a/usr/libexec/msgcollector/generic_gui_message +++ b/usr/libexec/msgcollector/generic_gui_message @@ -22,6 +22,7 @@ Examples: /usr/libexec/msgcollector/generic_gui_message info "Info" "This is an info message with a link: Click here" "" ok """ +import os import sys import signal import argparse @@ -49,13 +50,14 @@ class GuiMessage(QtWidgets.QDialog): question = self.args.question self.button = self.args.button_type + icon_dir = "/usr/share/icons/gnome-colors-common/scalable/status/" # Set default icon path for 'info' type - icon_path = "/usr/share/icons/oxygen/base/64x64/status/dialog-information.png" - + icon_image = "dialog-information.svg" if message_type == "warning": - icon_path = "/usr/share/icons/oxygen/base/64x64/status/dialog-warning.png" + icon_image = "dialog-warning.svg" elif message_type == "error": - icon_path = "/usr/share/icons/oxygen/base/64x64/status/dialog-error.png" + icon_image = "dialog-error.svg" + icon_path = os.path.join(icon_dir, icon_image) if question: message = message + '

' + question + '

' diff --git a/usr/libexec/msgcollector/msgdispatcher_dispatch_x b/usr/libexec/msgcollector/msgdispatcher_dispatch_x index eca0eb7..9a506ca 100755 --- a/usr/libexec/msgcollector/msgdispatcher_dispatch_x +++ b/usr/libexec/msgcollector/msgdispatcher_dispatch_x @@ -4,6 +4,7 @@ ## Copyright (C) 2014 troubadour ## Copyright (C) 2014 - 2023 ENCRYPTED SUPPORT LP +import os import sys import signal @@ -117,15 +118,17 @@ msgdispatcher_dispatch_x requires 4 mandatory and 1 optional arguments app = QtWidgets.QApplication(sys.argv) Dialog = QtWidgets.QDialog() + idir = "/usr/share/icons/gnome-colors-common/scalable/status/" if str(sys.argv[1]) == "info": - itype = "/usr/share/icons/oxygen/base/64x64/status/dialog-information.png" + itype = "dialog-information.svg" elif str(sys.argv[1]) == "warning": - itype = "/usr/share/icons/oxygen/base/128x128/status/dialog-warning.png" + itype = "dialog-warning.svg" elif str(sys.argv[1]) == "error": - itype = "/usr/share/icons/oxygen/base/128x128/status/dialog-error.png" + itype = "dialog-error.svg" else: itype = "" sys.exit("'msgdispatcher_dispatch_x'. Information type not recognized: %s" % str(sys.argv[1])) + itype = os.path.join(idir, itype) title = str(sys.argv[2]) msg = str(sys.argv[3]) @@ -146,5 +149,3 @@ msgdispatcher_dispatch_x requires 4 mandatory and 1 optional arguments timer.timeout.connect(lambda: None) app.exec_() - - diff --git a/usr/libexec/msgcollector/tb_updater_gui b/usr/libexec/msgcollector/tb_updater_gui index 6068508..bc3f118 100755 --- a/usr/libexec/msgcollector/tb_updater_gui +++ b/usr/libexec/msgcollector/tb_updater_gui @@ -4,6 +4,7 @@ ## Copyright (C) 2014 troubadour ## Copyright (C) 2014 - 2023 ENCRYPTED SUPPORT LP +import os import sys import signal @@ -44,13 +45,13 @@ class GuiMessage(QtWidgets.QDialog): self.setup_ui() def setup_ui(self): - itype = "/usr/share/icons/oxygen/base/64x64/status/dialog-information.png" - + idir = "/usr/share/icons/gnome-colors-common/scalable/status/" + itype = "dialog-information.svg" if self.itype == "warning": - itype = "/usr/share/icons/oxygen/base/128x128/status/dialog-warning.png" - + itype = "dialog-warning.svg" elif self.itype == "error": - itype = "/usr/share/icons/oxygen/base/128x128/status/dialog-error.png" + itype = "dialog-error.svg" + itype = os.path.join(idir, itype) versions = self.online_versions.split(',')