diff --git a/moo/moopython/Makefile.incl b/moo/moopython/Makefile.incl index f9648d64..0bf3ef84 100644 --- a/moo/moopython/Makefile.incl +++ b/moo/moopython/Makefile.incl @@ -6,7 +6,9 @@ moopython = $(moo_prefix)/moopython moopython_srcdir = $(srcdir)/$(moopython) moopython_plugins = \ - $(moopython)/plugins/console.py + $(moopython)/plugins/console.py \ + $(moopython)/plugins/pyconsole.py \ + $(moopython)/plugins/pystuff.py moopython_sources = \ $(moopython)/moo-pygtk.c \ diff --git a/moo/moopython/moo-mod.py b/moo/moopython/moo-mod.py index de6d0511..4aa396ac 100644 --- a/moo/moopython/moo-mod.py +++ b/moo/moopython/moo-mod.py @@ -1,3 +1,5 @@ +"""moo module""" + import moo_utils as utils import moo_term as term import moo_edit as edit diff --git a/moo/moopython/mooapp-mod.py b/moo/moopython/mooapp-mod.py index 455a4eba..90c7213a 100644 --- a/moo/moopython/mooapp-mod.py +++ b/moo/moopython/mooapp-mod.py @@ -1 +1,2 @@ +"""moo.app module""" from _moo_app import * diff --git a/moo/moopython/mooedit-mod.py b/moo/moopython/mooedit-mod.py index 25bf7b81..fd67f2b4 100644 --- a/moo/moopython/mooedit-mod.py +++ b/moo/moopython/mooedit-mod.py @@ -1 +1,2 @@ +"""moo.edit module""" from _moo_edit import * diff --git a/moo/moopython/mooterm-mod.py b/moo/moopython/mooterm-mod.py index 93097316..eea64e24 100644 --- a/moo/moopython/mooterm-mod.py +++ b/moo/moopython/mooterm-mod.py @@ -1 +1,2 @@ +"""moo.term module""" from _moo_term import * diff --git a/moo/moopython/mooutils-mod.py b/moo/moopython/mooutils-mod.py index 89a83bfb..145969b7 100644 --- a/moo/moopython/mooutils-mod.py +++ b/moo/moopython/mooutils-mod.py @@ -1,3 +1,4 @@ +"""moo.utils module""" import _moo_utils as _utils from _moo_utils import * diff --git a/moo/moopython/plugins/pyconsole.py b/moo/moopython/plugins/pyconsole.py index 0ef7968a..1e7bd3f4 100644 --- a/moo/moopython/plugins/pyconsole.py +++ b/moo/moopython/plugins/pyconsole.py @@ -17,8 +17,8 @@ # it creates the widget and 'starts' interactive session; see the end of # this file. # -# This widget is not intended to be used as a replacement for real terminal: -# gtk.TextView sucks as a terminal, and it can't be fixed. +# This widget is not a replacement for real terminal with python running +# inside: gtk.TextView sucks as a terminal, and it can't be changed. # The use case is: you have a python program, you create this widget, # and inspect your program interiors. diff --git a/moo/moopython/plugins/pystuff.py b/moo/moopython/plugins/pystuff.py index 1e25575d..ce4e8105 100644 --- a/moo/moopython/plugins/pystuff.py +++ b/moo/moopython/plugins/pystuff.py @@ -2,6 +2,8 @@ import moo import gtk import pango +SHOW_LOG_WINDOW = False + try: import pyconsole have_pyconsole = True @@ -25,13 +27,16 @@ class Plugin(object): def init(self): editor = moo.edit.editor_instance() xml = editor.get_ui_xml() - moo.utils.window_class_add_action (moo.edit.EditWindow, "ShowLogWindow", - name="Show Log Window", - label="Show Log Window", - callback=self.show_log_window) + self.ui_merge_id = xml.new_merge_id() - xml.add_item(self.ui_merge_id, "Editor/Menubar/Tools", - "ShowLogWindow", "ShowLogWindow", -1) + + if SHOW_LOG_WINDOW: + moo.utils.window_class_add_action (moo.edit.EditWindow, "ShowLogWindow", + name="Show Log Window", + label="Show Log Window", + callback=self.show_log_window) + xml.add_item(self.ui_merge_id, "Editor/Menubar/Tools", + "ShowLogWindow", "ShowLogWindow", -1) if have_pyconsole: moo.utils.window_class_add_action (moo.edit.EditWindow, "ShowPythonConsole", @@ -68,7 +73,7 @@ class Plugin(object): console.modify_font(pango.FontDescription("Courier New 11")) swin.add(console) - swin.set_size_request(400,300) + window.set_default_size(400,300) window.show_all() moo.edit.plugin_register(Plugin)