|
|
|
@ -458,26 +458,23 @@ class ConsoleLogger(dbus.service.Object):
|
|
|
|
|
|
|
|
|
|
self._window = gtk.Window()
|
|
|
|
|
self._window.set_title("Console")
|
|
|
|
|
self._window.set_default_size(640, 480)
|
|
|
|
|
self._window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DOCK)
|
|
|
|
|
self._window.set_decorated(False)
|
|
|
|
|
self._window.set_skip_taskbar_hint(True)
|
|
|
|
|
self._window.connect("delete_event", lambda w, e: w.hide_on_delete())
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
self._nb = gtk.Notebook()
|
|
|
|
|
self._window.add(self._nb)
|
|
|
|
|
self._nb.show()
|
|
|
|
|
|
|
|
|
|
self._consoles = {}
|
|
|
|
|
|
|
|
|
|
def set_parent_window(self, window):
|
|
|
|
|
window.connect("key-press-event", self.__key_press_event_cb)
|
|
|
|
|
self._window.connect("key-press-event", self.__key_press_event_cb)
|
|
|
|
|
console_wm = WindowManager(self._window)
|
|
|
|
|
|
|
|
|
|
def __key_press_event_cb(self, window, event):
|
|
|
|
|
if event.keyval == gtk.keysyms.d and \
|
|
|
|
|
event.state & gtk.gdk.CONTROL_MASK:
|
|
|
|
|
if self._window.get_property('visible'):
|
|
|
|
|
self._window.hide()
|
|
|
|
|
else:
|
|
|
|
|
self._window.show()
|
|
|
|
|
console_wm.set_width(0.7, WindowManager.SCREEN_RELATIVE)
|
|
|
|
|
console_wm.set_height(0.9, WindowManager.SCREEN_RELATIVE)
|
|
|
|
|
console_wm.set_position(WindowManager.BOTTOM)
|
|
|
|
|
console_wm.manage()
|
|
|
|
|
|
|
|
|
|
def _create_console(self, application):
|
|
|
|
|
sw = gtk.ScrolledWindow()
|
|
|
|
@ -535,8 +532,6 @@ class Shell(gobject.GObject):
|
|
|
|
|
wm.show()
|
|
|
|
|
wm.manage()
|
|
|
|
|
|
|
|
|
|
console.set_parent_window(activity_container.window)
|
|
|
|
|
|
|
|
|
|
def __activity_container_destroy_cb(self, activity_container):
|
|
|
|
|
self.emit('close')
|
|
|
|
|
|
|
|
|
|