aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--NEWS5
-rwxr-xr-xsrc/msec/msecgui.py57
2 files changed, 26 insertions, 36 deletions
diff --git a/NEWS b/NEWS
index 9f64439..f44a952 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Version 2.xx - May 9, 2024 David Geiger
+- First systemd unit file to switch to systemd unit from initscripts
+- Replace temporary dir from /var/run -> /run
+- Migrate from deprecated imp to importlib python module
+
Version 2.13 - May 5, 2023 David Geiger
- Use `grep -F` instead of deprecated `fgrep`
- Translation updates
diff --git a/src/msec/msecgui.py b/src/msec/msecgui.py
index a005bb3..ac66fb6 100755
--- a/src/msec/msecgui.py
+++ b/src/msec/msecgui.py
@@ -174,7 +174,6 @@ class MsecGui:
# loading the current config
self.reload_config()
-
if embed:
# embedding in MCC
self.window = Gtk.Plug.new(embed)
@@ -236,7 +235,7 @@ class MsecGui:
image.set_from_pixbuf(pixbuf)
banner.pack_start(image, False, False, 0)
label = Gtk.Label(label=_("MSEC: System Security and Audit"))
- label.modify_font(Pango.FontDescription("13"))
+ #label.modify_font(Pango.FontDescription("13"))
banner.pack_start(label, False, False, 0)
main_vbox.pack_start(banner, False, False, 0)
except:
@@ -340,20 +339,11 @@ class MsecGui:
curperms = self.permconfig
# creating preview window
+ dialog = Gtk.Dialog(_('Saving changes...'), self.window, Gtk.DialogFlags.MODAL)
+ dialog.add_action_widget(Gtk.Button(label=_('Cancel')), Gtk.ResponseType.CANCEL)
if ask_ignore:
- dialog = Gtk.Dialog(_("Saving changes.."),
- self.window, Gtk.DialogFlags.MODAL,
- (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
- _("Ignore and quit"), Gtk.ResponseType.REJECT,
- Gtk.STOCK_OK, Gtk.ResponseType.OK)
- )
- else:
- dialog = Gtk.Dialog(_("Saving changes.."),
- self.window, Gtk.DialogFlags.MODAL,
- (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
- Gtk.STOCK_OK, Gtk.ResponseType.OK)
- )
-
+ dialog.add_action_widget(Gtk.Button(label=_("Ignore and quit")), Gtk.ResponseType.REJECT)
+ dialog.add_action_widget(Gtk.Button(label=_('OK')), Gtk.ResponseType.OK)
dialog.set_default_size(640, 300)
dialog.set_default_response(Gtk.ResponseType.OK)
@@ -491,7 +481,6 @@ class MsecGui:
# treeview
treeview = Gtk.TreeView(model=lstore)
- treeview.set_rules_hint(True)
treeview.set_search_column(self.COLUMN_DESCR)
treeview.connect('row-activated', self.option_changed, lstore)
@@ -589,7 +578,7 @@ class MsecGui:
print("Unable to load icon %s: %s" % (icon, sys.exc_info()[1]))
label = Gtk.Label(label=text)
label.set_property("xalign", 0.0)
- label.modify_font(Pango.FontDescription("12"))
+ #label.modify_font(Pango.FontDescription("12"))
label.set_property("xalign", 0.0)
label.set_property("yalign", 0.5)
@@ -656,7 +645,7 @@ class MsecGui:
label = Gtk.Label(label=_("Periodic checks"))
label.set_property("xalign", 0.0)
label.set_property("yalign", 0.5)
- label.modify_font(Pango.FontDescription("11"))
+ # label.modify_font(Pango.FontDescription("11"))
table.attach(label, 2, 3, row, row + 1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, 0, 0, 0)
row += 1
for check, logfile, updated_n, updated in tools.periodic_check_status(log):
@@ -695,10 +684,8 @@ class MsecGui:
data = fd.readlines()
except:
data = [_("Unable to read log file: %s") % sys.exc_info()[1]]
- dialog = Gtk.Dialog(_("Periodic check results"),
- self.window,
- 0,
- (Gtk.STOCK_OK, Gtk.ResponseType.OK))
+ dialog = Gtk.Dialog((_("Periodic check results"), parent=self.window, flags=0)
+ dialog.add_button(Gtk.STOCK_OK, Gtk.ResponseType.OK)
dialog.set_size_request(640, 280)
view = Gtk.TextView()
buffer = view.get_buffer()
@@ -1155,7 +1142,6 @@ class MsecGui:
# treeview
treeview = Gtk.TreeView(model=lstore)
- treeview.set_rules_hint(True)
treeview.set_search_column(self.COLUMN_EXCEPTION)
# TODO: fix
@@ -1227,7 +1213,6 @@ class MsecGui:
# treeview
treeview = Gtk.TreeView(model=lstore)
- treeview.set_rules_hint(True)
treeview.set_search_column(self.COLUMN_DESCR)
# TODO: fix
@@ -1431,10 +1416,9 @@ class MsecGui:
title = _("Adding new exception")
# asks for new parameter value
- dialog = Gtk.Dialog(title,
- self.window, 0,
- (Gtk.STOCK_OK, Gtk.ResponseType.OK,
- Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
+ dialog = Gtk.Dialog(title, parent=self.window, flags=0)
+ dialog.add_button(Gtk.STOCK_OK, Gtk.ResponseType.OK,
+ Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL)
label = Gtk.Label(label=_("Editing exception. Please select the correspondent msec check and exception value\n"))
label.set_line_wrap(True)
label.set_use_markup(True)
@@ -1509,10 +1493,9 @@ class MsecGui:
force = "force"
# asks for new parameter value
- dialog = Gtk.Dialog(title,
- self.window, 0,
- (Gtk.STOCK_OK, Gtk.ResponseType.OK,
- Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
+ dialog = Gtk.Dialog(title, parent=self.window, flags=0)
+ dialog.add_button(Gtk.STOCK_OK, Gtk.ResponseType.OK,
+ Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL)
label = Gtk.Label(label=_("Changing permissions on <b>%s</b>") % (file or _("new file")))
label.set_line_wrap(True)
label.set_use_markup(True)
@@ -1647,9 +1630,9 @@ class MsecGui:
# asks for new parameter value
dialog = Gtk.Dialog(_("Select new value for %s") % (param),
- self.window, 0,
- (Gtk.STOCK_OK, Gtk.ResponseType.OK,
- Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
+ parent=self.window, flags=0)
+ dialog.add_button(Gtk.STOCK_OK, Gtk.ResponseType.OK,
+ Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL)
# option title
label = Gtk.Label(label="<b>%s</b>\n" % param)
label.set_use_markup(True)
@@ -1665,7 +1648,9 @@ class MsecGui:
# new value
hbox = Gtk.HBox()
- hbox.pack_start(Gtk.Label(_("New value:")), True, True, 0)
+ alignment = Gtk.Alignment.new(xvalign=0.5, yvalign=0.5, xscale=1.0, yscale=1.0)
+ alignment.add(Gtk.Label(_("New value:")))
+ hbox.add(alignment)
if '*' in params:
# string parameter
entry = Gtk.Entry()
generated by cgit v1.2.1 (git 2.21.0) at 2024-06-13 10:04:07 +0000