Merge pull request #85 from MatthewZMD/minor-fix

Minor fixes, use const EAF_DBUS_NAME whenever possible
master
Andy Stewart 6 years ago committed by GitHub
commit 2e6b3cf715
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      app/camera/buffer.py
  2. 1
      core/buffer.py
  3. 1
      eaf.el
  4. 22
      eaf.py

@ -34,7 +34,6 @@ import os
class AppBuffer(Buffer): class AppBuffer(Buffer):
def __init__(self, buffer_id, url, arguments): def __init__(self, buffer_id, url, arguments):
Buffer.__init__(self, buffer_id, url, arguments, True, QColor(0, 0, 0, 255)) Buffer.__init__(self, buffer_id, url, arguments, True, QColor(0, 0, 0, 255))
self.add_widget(CameraWidget(QColor(0, 0, 0, 255))) self.add_widget(CameraWidget(QColor(0, 0, 0, 255)))
def all_views_hide(self): def all_views_hide(self):

@ -25,7 +25,6 @@ from PyQt5.QtWidgets import QGraphicsScene
from PyQt5.QtCore import Qt, QEvent from PyQt5.QtCore import Qt, QEvent
from PyQt5.QtGui import QKeyEvent from PyQt5.QtGui import QKeyEvent
from PyQt5.QtWidgets import QApplication from PyQt5.QtWidgets import QApplication
import abc import abc
qt_key_dict = { qt_key_dict = {

@ -274,6 +274,7 @@ by `dired-find-alternate-file'. Otherwise they will be opened normally with `dir
(frame-parameter frame 'window-id)) (frame-parameter frame 'window-id))
(defun eaf-start-process () (defun eaf-start-process ()
"Start EAF process if it haven't started yet"
(interactive) (interactive)
(if (process-live-p eaf-process) (if (process-live-p eaf-process)
(message "EAF process has started.") (message "EAF process has started.")

@ -262,35 +262,35 @@ class EAF(dbus.service.Object):
def focus_emacs_buffer(self, message): def focus_emacs_buffer(self, message):
pass pass
@dbus.service.signal("com.lazycat.eaf") @dbus.service.signal(EAF_DBUS_NAME)
def start_finish(self): def start_finish(self):
pass pass
@dbus.service.signal("com.lazycat.eaf") @dbus.service.signal(EAF_DBUS_NAME)
def update_buffer_title(self, buffer_id, title): def update_buffer_title(self, buffer_id, title):
pass pass
@dbus.service.signal("com.lazycat.eaf") @dbus.service.signal(EAF_DBUS_NAME)
def open_buffer_url(self, url): def open_buffer_url(self, url):
pass pass
@dbus.service.signal("com.lazycat.eaf") @dbus.service.signal(EAF_DBUS_NAME)
def translate_text(self, text): def translate_text(self, text):
pass pass
@dbus.service.signal("com.lazycat.eaf") @dbus.service.signal(EAF_DBUS_NAME)
def input_message(self, buffer_id, message, callback_type): def input_message(self, buffer_id, message, callback_type):
pass pass
@dbus.service.signal("com.lazycat.eaf") @dbus.service.signal(EAF_DBUS_NAME)
def create_new_browser_buffer(self, buffer_id): def create_new_browser_buffer(self, buffer_id):
pass pass
@dbus.service.signal("com.lazycat.eaf") @dbus.service.signal(EAF_DBUS_NAME)
def request_kill_buffer(self, buffer_id): def request_kill_buffer(self, buffer_id):
pass pass
@dbus.service.signal("com.lazycat.eaf") @dbus.service.signal(EAF_DBUS_NAME)
def message_to_emacs(self, message): def message_to_emacs(self, message):
pass pass
@ -350,11 +350,11 @@ class EAF(dbus.service.Object):
if buf.url in session_dict[buf.module_path]: if buf.url in session_dict[buf.module_path]:
buf.restore_session_data(session_dict[buf.module_path][buf.url]) 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: 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: else:
print("No data in session file, no need restore session.") print("No data present in session file, no need to restore session.")
else: else:
print("Not found %s, no need restore session." % (self.session_file_path)) print("Not found %s, no need restore session." % (self.session_file_path))

Loading…
Cancel
Save