Skip to content

Change icon directories #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 20, 2024
Merged

Change icon directories #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions usr/libexec/msgcollector/generic_gui_message
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Examples:
/usr/libexec/msgcollector/generic_gui_message info "Info" "This is an info message with a link: <a href='https://www.example.com'>Click here</a>" "" ok
"""

import os
import sys
import signal
import argparse
Expand Down Expand Up @@ -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 + '<p>' + question + '</p>'
Expand Down
11 changes: 6 additions & 5 deletions usr/libexec/msgcollector/msgdispatcher_dispatch_x
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
## Copyright (C) 2014 troubadour <trobador@riseup.net>
## Copyright (C) 2014 - 2023 ENCRYPTED SUPPORT LP <adrelanos@whonix.org>

import os
import sys
import signal

Expand Down Expand Up @@ -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])
Expand All @@ -146,5 +149,3 @@ msgdispatcher_dispatch_x requires 4 mandatory and 1 optional arguments
timer.timeout.connect(lambda: None)

app.exec_()


11 changes: 6 additions & 5 deletions usr/libexec/msgcollector/tb_updater_gui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
## Copyright (C) 2014 troubadour <trobador@riseup.net>
## Copyright (C) 2014 - 2023 ENCRYPTED SUPPORT LP <adrelanos@whonix.org>

import os
import sys
import signal

Expand Down Expand Up @@ -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(',')

Expand Down