From fc578d9f61658677a07bc3f6c1503c1afe7d61b7 Mon Sep 17 00:00:00 2001 From: sezanzeb Date: Mon, 9 Nov 2020 23:43:34 +0100 Subject: [PATCH] Still moving stuff around --- bin/key-mapper-gtk | 10 ++++------ keymapper/gtk/window.py | 5 +---- 2 files changed, 5 insertions(+), 10 deletions(-) mode change 100644 => 100755 bin/key-mapper-gtk diff --git a/bin/key-mapper-gtk b/bin/key-mapper-gtk old mode 100644 new mode 100755 index 13a40398..bae901c2 --- a/bin/key-mapper-gtk +++ b/bin/key-mapper-gtk @@ -19,6 +19,8 @@ # along with key-mapper. If not, see . +"""Starts the user interface.""" + import sys import getpass @@ -30,12 +32,8 @@ gi.require_version('GLib', '2.0') from gi.repository import Gtk from keymapper.logger import logger, update_verbosity, log_info -from keymapper.gtk.window import Window from keymapper.gtk.error import ErrorDialog -from keymapper.gtk.window import window - - -window = None +from keymapper.gtk.window import Window if __name__ == '__main__': @@ -62,4 +60,4 @@ if __name__ == '__main__': 'Key Mapper needs administrator privileges to run properly.' ) - Gtk.main() \ No newline at end of file + Gtk.main() diff --git a/keymapper/gtk/window.py b/keymapper/gtk/window.py index 16a5da87..30fce9ed 100755 --- a/keymapper/gtk/window.py +++ b/keymapper/gtk/window.py @@ -163,7 +163,7 @@ class Window: f'Saved "{self.selected_preset}"' ) except PermissionError as e: - window.get('status_bar').push( + self.get('status_bar').push( CTX_ERROR, 'Error: Permission denied!' ) @@ -269,6 +269,3 @@ class Window: self.selected_device, self.selected_preset ) - - -window = Window()