diff --git a/app/commons.py b/app/commons.py
index 35624385..3860e907 100644
--- a/app/commons.py
+++ b/app/commons.py
@@ -7,13 +7,12 @@ from gi.repository import GLib
_LOG_FILE = "demon-editor.log"
_DATE_FORMAT = "%d-%m-%y %H:%M:%S"
-_LOGGER_NAME = None
+
+LOGGER_NAME = "main_logger"
def init_logger():
- global _LOGGER_NAME
- _LOGGER_NAME = "main_logger"
- logging.Logger(_LOGGER_NAME)
+ logging.Logger(LOGGER_NAME)
logging.basicConfig(level=logging.INFO,
format="%(asctime)s %(message)s",
datefmt=_DATE_FORMAT,
@@ -23,7 +22,7 @@ def init_logger():
def log(message, level=logging.ERROR, debug=False, fmt_message="{}"):
""" The main logging function. """
- logger = logging.getLogger(_LOGGER_NAME)
+ logger = logging.getLogger(LOGGER_NAME)
if debug:
from traceback import format_exc
logger.log(level, fmt_message.format(format_exc()))
diff --git a/app/ui/app_menu.ui b/app/ui/app_menu.ui
index 0f7d3ca6..1d1e44e0 100644
--- a/app/ui/app_menu.ui
+++ b/app/ui/app_menu.ui
@@ -147,6 +147,10 @@
Telnet
app.on_telnet_show
+ -
+ Logs
+ app.on_logs_show
+
@@ -333,6 +337,10 @@
Telnet
app.on_telnet_show
+ -
+ Logs
+ app.on_logs_show
+
diff --git a/app/ui/logs.glade b/app/ui/logs.glade
new file mode 100644
index 00000000..ebc7f5fc
--- /dev/null
+++ b/app/ui/logs.glade
@@ -0,0 +1,125 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/ui/logs.py b/app/ui/logs.py
new file mode 100644
index 00000000..a1a252a6
--- /dev/null
+++ b/app/ui/logs.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2018-2021 Dmitriy Yefremov
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Author: Dmitriy Yefremov
+#
+
+
+import logging
+
+from gi.repository import GLib
+
+from app.commons import LOGGER_NAME
+from app.ui.dialogs import get_builder
+from app.ui.main_helper import append_text_to_tview
+from app.ui.uicommons import Gtk, UI_RESOURCES_PATH
+
+
+class LogsClient(Gtk.Box):
+ """ Logger GUI client. """
+
+ class LogHandler(logging.Handler):
+ def __init__(self, view):
+ logging.Handler.__init__(self)
+ self._view = view
+
+ def handle(self, rec):
+ GLib.idle_add(append_text_to_tview, f"{rec.msg}\n", self._view)
+
+ def __init__(self, app, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ self._app = app
+
+ handlers = {"on_clear": self.on_clear}
+ builder = get_builder(UI_RESOURCES_PATH + "logs.glade", handlers)
+
+ self._log_view = builder.get_object("log_view")
+ self.pack_start(builder.get_object("log_frame"), True, True, 0)
+
+ logger = logging.getLogger(LOGGER_NAME)
+ logger.addHandler(LogsClient.LogHandler(self._log_view))
+
+ self.show()
+
+ def on_clear(self, button):
+ GLib.idle_add(self._log_view.get_buffer().set_text, "")
diff --git a/app/ui/main.glade b/app/ui/main.glade
index 493fe476..12be77fb 100644
--- a/app/ui/main.glade
+++ b/app/ui/main.glade
@@ -27,11 +27,11 @@ Author: Dmitriy Yefremov
-->
-
+
-
+