Index: functions.py =================================================================== RCS file: /cvs/gnome/gedit/plugins/externaltools/tools/functions.py,v retrieving revision 1.4 diff -u -r1.4 functions.py --- functions.py 21 Jan 2006 16:40:09 -0000 1.4 +++ functions.py 12 Feb 2006 15:49:18 -0000 @@ -208,10 +208,6 @@ # Assign the error output to the output panel panel.process = capture - - capture.connect('stderr-line', capture_stderr_line_panel, panel) - capture.connect('begin-execute', capture_begin_execute_panel, panel, node.get('label')) - capture.connect('end-execute', capture_end_execute_panel, panel, view) # Get input text input_type = default(node.get('input'), 'nothing') @@ -279,6 +275,9 @@ capture.connect('stdout-line', capture_stdout_line_panel, panel) document.begin_user_action() + capture.connect('stderr-line', capture_stderr_line_panel, panel) + capture.connect('begin-execute', capture_begin_execute_panel, panel, node.get('label')) + capture.connect('end-execute', capture_end_execute_panel, panel, view) # Run the command view.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor(gdk.Cursor(gdk.WATCH)) @@ -291,18 +290,24 @@ def capture_begin_execute_panel(capture, panel, label): panel['stop'].set_sensitive(True) panel.clear() - panel.write("Running %s...\n" % label, panel.command_tag) + panel.write("Running tool: ", panel.italic_tag); + panel.write("%s\n\n" % label, panel.bold_tag); def capture_end_execute_panel(capture, exit_code, panel, view): - panel.write("Exit code: %s\n" % exit_code, panel.command_tag) panel['stop'].set_sensitive(False) view.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor(gdk.Cursor(gdk.XTERM)) view.set_cursor_visible(True) view.set_editable(True) + if exit_code == 0: + panel.write("\nDone.\n", panel.italic_tag) + else: + panel.write("\nExited", panel.italic_tag) + panel.write(" with exit code: ") + panel.write("%d\n" % exit_code, panel.bold_tag) + def capture_stdout_line_panel(capture, line, panel): panel.write(line) def capture_stdout_line_document(capture, line, document, pos): document.insert(pos, line) - Index: manager.py =================================================================== RCS file: /cvs/gnome/gedit/plugins/externaltools/tools/manager.py,v retrieving revision 1.3 diff -u -r1.3 manager.py --- manager.py 7 Feb 2006 23:32:35 -0000 1.3 +++ manager.py 12 Feb 2006 15:49:18 -0000 @@ -311,7 +311,7 @@ def on_accelerator_focus_out(self, entry, event): if self.current_node is not None: - entry.set_text(self.current_node.get('accelerator')) + entry.set_text(default(self.current_node.get('accelerator'), '')) def on_tool_manager_dialog_response(self, dialog, response): if response == gtk.RESPONSE_HELP: Index: outputpanel.py =================================================================== RCS file: /cvs/gnome/gedit/plugins/externaltools/tools/outputpanel.py,v retrieving revision 1.3 diff -u -r1.3 outputpanel.py --- outputpanel.py 21 Jan 2006 16:40:09 -0000 1.3 +++ outputpanel.py 12 Feb 2006 15:49:18 -0000 @@ -63,8 +63,10 @@ self.normal_tag = buffer.create_tag("normal") self.error_tag = buffer.create_tag("error") self.error_tag.set_property("foreground", "red") - self.command_tag = buffer.create_tag("command") - self.command_tag.set_property("foreground", "blue") + self.italic_tag = buffer.create_tag("italic") + self.italic_tag.set_property("style", pango.STYLE_OBLIQUE) + self.bold_tag = buffer.create_tag("bold") + self.bold_tag.set_property("weight", pango.WEIGHT_BOLD) self.process = None @@ -74,7 +76,7 @@ def on_stop_clicked(self, widget, *args): if self.process is not None: - self.write("Stopping...\n", self.command_tag) + self.write("\nStopping...\n\n", self.italic_tag) self.process.stop(-1) def scroll_to_end(self):