From 8826d9970be430761a5588da2a128cd13f3b5d33 Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 26 Nov 2019 20:03:29 -0500 Subject: [PATCH] Minor fixes, use const EAF_DBUS_NAME whenever possible --- app/camera/buffer.py | 1 - core/buffer.py | 1 - eaf.el | 1 + eaf.py | 22 +++++++++++----------- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/app/camera/buffer.py b/app/camera/buffer.py index 09657b8..d5f3c3c 100644 --- a/app/camera/buffer.py +++ b/app/camera/buffer.py @@ -34,7 +34,6 @@ import os class AppBuffer(Buffer): def __init__(self, buffer_id, url, arguments): Buffer.__init__(self, buffer_id, url, arguments, True, QColor(0, 0, 0, 255)) - self.add_widget(CameraWidget(QColor(0, 0, 0, 255))) def all_views_hide(self): diff --git a/core/buffer.py b/core/buffer.py index 6d90637..29a90dd 100644 --- a/core/buffer.py +++ b/core/buffer.py @@ -25,7 +25,6 @@ from PyQt5.QtWidgets import QGraphicsScene from PyQt5.QtCore import Qt, QEvent from PyQt5.QtGui import QKeyEvent from PyQt5.QtWidgets import QApplication - import abc qt_key_dict = { diff --git a/eaf.el b/eaf.el index 108c964..6b305c4 100644 --- a/eaf.el +++ b/eaf.el @@ -269,6 +269,7 @@ by `dired-find-alternate-file'. Otherwise they will be opened normally with `dir (frame-parameter frame 'window-id)) (defun eaf-start-process () + "Start EAF process if it haven't started yet" (interactive) (if (process-live-p eaf-process) (message "EAF process has started.") diff --git a/eaf.py b/eaf.py index de4da67..089ca2c 100755 --- a/eaf.py +++ b/eaf.py @@ -253,35 +253,35 @@ class EAF(dbus.service.Object): def focus_emacs_buffer(self, message): pass - @dbus.service.signal("com.lazycat.eaf") + @dbus.service.signal(EAF_DBUS_NAME) def start_finish(self): pass - @dbus.service.signal("com.lazycat.eaf") + @dbus.service.signal(EAF_DBUS_NAME) def update_buffer_title(self, buffer_id, title): pass - @dbus.service.signal("com.lazycat.eaf") + @dbus.service.signal(EAF_DBUS_NAME) def open_buffer_url(self, url): pass - @dbus.service.signal("com.lazycat.eaf") + @dbus.service.signal(EAF_DBUS_NAME) def translate_text(self, text): pass - @dbus.service.signal("com.lazycat.eaf") + @dbus.service.signal(EAF_DBUS_NAME) def input_message(self, buffer_id, message, callback_type): pass - @dbus.service.signal("com.lazycat.eaf") + @dbus.service.signal(EAF_DBUS_NAME) def create_new_browser_buffer(self, buffer_id): pass - @dbus.service.signal("com.lazycat.eaf") + @dbus.service.signal(EAF_DBUS_NAME) def request_kill_buffer(self, buffer_id): pass - @dbus.service.signal("com.lazycat.eaf") + @dbus.service.signal(EAF_DBUS_NAME) def message_to_emacs(self, message): pass @@ -337,11 +337,11 @@ class EAF(dbus.service.Object): if buf.url in session_dict[buf.module_path]: buf.restore_session_data(session_dict[buf.module_path][buf.url]) - print("Restore session: ", buf.buffer_id, buf.module_path, self.session_file_path) + print("Restored session: ", buf.buffer_id, buf.module_path, self.session_file_path) else: - print("No session data about %s, no need restore session." % (buf.url)) + print("No session data about %s, no need to restore session." % (buf.url)) else: - print("No data in session file, no need restore session.") + print("No data present in session file, no need to restore session.") else: print("Not found %s, no need restore session." % (self.session_file_path))