From b5e7233b079fc2ec25698a83f415b669923ae83a Mon Sep 17 00:00:00 2001 From: Daniel Francis Date: Sat, 10 Dec 2011 14:50:41 +0000 Subject: Merge branch 'master' of git.sugarlabs.org:jamedit/jamedit --- diff --git a/activity.py b/activity.py index c3b9601..73f6db3 100644 --- a/activity.py +++ b/activity.py @@ -48,6 +48,7 @@ import file_choosers file_choosers.langsmanager = LANGUAGE_MANAGER file_choosers.langs = LANGUAGES + class JAMEdit(activity.Activity): def __init__(self, handle): @@ -61,7 +62,7 @@ class JAMEdit(activity.Activity): self.editor.set_size_request(800, 790) scroll = gtk.ScrolledWindow() scroll.set_policy(gtk.POLICY_AUTOMATIC, - gtk.POLICY_AUTOMATIC) + gtk.POLICY_AUTOMATIC) scroll.add(self.editor) scroll.show_all() @@ -77,10 +78,11 @@ class JAMEdit(activity.Activity): activity_button = ActivityToolbarButton(self) activity_toolbar = activity_button.page - + # Abrir objeto / Open object open_obj_btn = ToolButton("open-from-journal") - open_obj_btn.connect("clicked", file_choosers.open_from_journal, None, self) + open_obj_btn.connect("clicked", + file_choosers.open_from_journal, None, self) open_obj_btn.set_tooltip(_("Open object from journal")) activity_toolbar.insert(open_obj_btn, -1) @@ -96,7 +98,7 @@ class JAMEdit(activity.Activity): open_btn.set_accelerator('o') open_btn.connect("clicked", self.open_file) activity_toolbar.insert(open_btn, -1) - + # ****** Save File button ****** save_btn = ToolButton("stock_save") save_btn.set_tooltip(_("Save this file")) @@ -228,7 +230,7 @@ class JAMEdit(activity.Activity): font_options = FontToolbarButton() font_options.connect("load-pango-context", - self.load_pango_context) + self.load_pango_context) font_options.load_toolbar() font_options.connect("font-changed", self.change_font) self.toolbar_box.toolbar.insert(font_options, -1) @@ -265,13 +267,12 @@ class JAMEdit(activity.Activity): def pep8_check(self, widget): self.editor.pep8.check_file(self.editor._get_all_text(), - self.editor) + self.editor) def close(self, skip_save=False): close = True if not self.editor.file: - close = self.save_file(None, type="exit", - mode=2) + close = self.save_file(None, type="exit", mode=2) if close: activity.Activity.close(self) @@ -289,9 +290,10 @@ class JAMEdit(activity.Activity): self.editor.buffer.set_text(file.read()) if remember: self.editor.file = file_path - self.editor._search_and_active_language(mime_type) + self.editor._search_and_active_language( + mime_type) file.close() - + if from_journal: file_path = from_journal mime_type = mime.get_from_file_name(file_path) @@ -302,7 +304,6 @@ class JAMEdit(activity.Activity): self.editor.file = file_path self.editor._search_and_active_language(mime_type) file.close() - def new(self, widget): self.editor.pep8.check_exit() @@ -342,19 +343,18 @@ class JAMEdit(activity.Activity): file_path = file_choosers.save_file_dialog() if file_path: self.editor.file = file_path - file = open(self.editor.file, - "w") + file = open(self.editor.file, "w") file.write(self.editor._get_all_text()) file.close() if type == "exit": - dialog = gtk.MessageDialog(type= \ - gtk.MESSAGE_QUESTION) + dialog = gtk.MessageDialog(type=gtk.MESSAGE_QUESTION) dialog.add_buttons(gtk.STOCK_CANCEL, - gtk.RESPONSE_CANCEL, - gtk.STOCK_NO, - gtk.RESPONSE_NO, - gtk.STOCK_YES, - gtk.RESPONSE_YES) + gtk.RESPONSE_CANCEL, + gtk.STOCK_NO, + gtk.RESPONSE_NO, + gtk.STOCK_YES, + gtk.RESPONSE_YES) + dialog.set_markup("%s" % _("Save changes...")) if mode == 1: dialog.format_secondary_text( @@ -368,9 +368,9 @@ class JAMEdit(activity.Activity): if response == gtk.RESPONSE_YES: if self.editor.file: file = open( - self.editor.file, "w") + self.editor.file, "w") file.write( - self.editor._get_all_text()) + self.editor._get_all_text()) file.close() else: file_path = \ @@ -384,7 +384,8 @@ class JAMEdit(activity.Activity): self.editor._get_all_text()) file.close() return True - else: return False + else: + return False def write_file(self, file_path): if self.editor.lang: diff --git a/editor.py b/editor.py index 004803c..947c9ee 100644 --- a/editor.py +++ b/editor.py @@ -44,6 +44,7 @@ STYLES = STYLE_MANAGER.get_scheme_ids() LANGUAGE_MANAGER = gtksourceview2.language_manager_get_default() LANGUAGES = LANGUAGE_MANAGER.get_language_ids() + class Editor(gtksourceview2.View): def __init__(self, activity): @@ -79,15 +80,15 @@ class Editor(gtksourceview2.View): self.pep8 = PEP8_Check(self.activity) self.show_all() - + def _set_style(self, widget): name = self.style_combo.get_active() id = STYLES[name] self.buffer.set_style_scheme(STYLE_MANAGER.get_scheme(id)) - + def make_style_combo(self, toolbar): self.style_combo = ComboBox() - count= 0 + count = 0 classic = 0 for style in STYLES: self.style_combo.append_item(None, style.capitalize()) @@ -116,16 +117,16 @@ class Editor(gtksourceview2.View): self.buffer.copy_clipboard(clipboard) self.buffer.delete_selection(True, True) - + def _paste_cb(self, widget): clipboard = gtk.Clipboard() text = clipboard.wait_for_text() - + self.buffer.insert_at_cursor(text) def _undo_cb(self, widget): self.buffer.undo() - + def _redo_cb(self, widget): self.buffer.redo() @@ -138,9 +139,8 @@ class Editor(gtksourceview2.View): self.lang_combo.append_item(None, lang.capitalize()) self.lang_combo.connect("changed", self._set_language) - + tool_item = ToolComboBox(self.lang_combo) - toolbar.insert(tool_item, -1) tool_item.show() @@ -148,23 +148,26 @@ class Editor(gtksourceview2.View): def _set_language(self, combo): name = self.lang_combo.get_active() if name != 0: - id = LANGUAGES[name-1] + id = LANGUAGES[name - 1] self.lang = LANGUAGE_MANAGER.get_language(id) self.buffer.set_highlight_syntax(True) self.buffer.set_language(self.lang) if id == "python": self.activity.edit_toolbar.pep8_btn.show() - self.activity.edit_toolbar.pep8_datetime_separator.set_draw(True) - else: + self.activity.edit_toolbar. \ + pep8_datetime_separator.set_draw(True) + else: self.activity.edit_toolbar.pep8_btn.hide() - self.activity.edit_toolbar.pep8_datetime_separator.set_draw(False) + self.activity.edit_toolbar. \ + pep8_datetime_separator.set_draw(False) elif name == 0: self.buffer.set_highlight_syntax(False) self.lang = None self.activity.edit_toolbar.pep8_btn.hide() - self.activity.edit_toolbar.pep8_datetime_separator.set_draw(False) - + self.activity.edit_toolbar. \ + pep8_datetime_separator.set_draw(False) + def _search_and_active_language(self, mimetype): encontrado = False for id in LANGUAGES: @@ -175,22 +178,28 @@ class Editor(gtksourceview2.View): self.buffer.set_highlight_syntax(True) self.buffer.set_language(lang) list_num = LANGUAGES.index(id) - self.lang_combo.set_active(list_num+1) + self.lang_combo.set_active( + list_num + 1) encontrado = True if id == "python": - self.activity.edit_toolbar.pep8_btn.show() - self.activity.edit_toolbar.pep8_datetime_separator.set_draw(True) - else: - self.activity.edit_toolbar.pep8_btn.hide() - self.activity.edit_toolbar.pep8_datetime_separator.set_draw(False) + self.activity.edit_toolbar. \ + pep8_btn.show() + self.activity.edit_toolbar. \ + pep8_datetime_separator.set_draw(True) + else: + self.activity.edit_toolbar. \ + pep8_btn.hide() + self.activity.edit_toolbar. \ + pep8_datetime_separator.set_draw(False) if not encontrado: self.buffer.set_highlight_syntax(False) self.lang_combo.set_active(0) self.lang = None self.activity.edit_toolbar.pep8_btn.hide() - self.activity.edit_toolbar.pep8_datetime_separator.set_draw(False) - + self.activity.edit_toolbar.pep8_datetime_separator. \ + set_draw(False) + def _get_all_text(self): start = self.buffer.get_start_iter() end = self.buffer.get_end_iter() @@ -201,8 +210,8 @@ class Editor(gtksourceview2.View): today = datetime.date.today() today = today.strftime("%d/%m/%y") _time = time.strftime("%H:%M:%S") - zone = locale.getdefaultlocale()[0] - date_time = str(today)+" "+_time+"-"+zone + zone = locale.getdefaultlocale()[0] + date_time = str(today) + " " + _time + "-" + zone self.buffer.insert_at_cursor(date_time) def _search_entry_activate_cb(self, entry): diff --git a/pep8_check.py b/pep8_check.py index 6b627d4..a48bf43 100644 --- a/pep8_check.py +++ b/pep8_check.py @@ -28,9 +28,11 @@ log.setLevel(logging.DEBUG) logging.basicConfig() import commands + class PEP8_Check(): - def __init__(self, activity): self.activity = activity + def __init__(self, activity): + self.activity = activity def check_file(self, text, editor): tmp_file = open("/tmp/jamedit-pep8-chk.py", "w") @@ -48,20 +50,20 @@ class PEP8_Check(): for line in text.split("\n"): num += 1 if str(num) in chk: - line_iter = editor.buffer.get_iter_at_line(num) - if num == len(text.split("\n"))-1: + line_iter = editor.buffer.get_iter_at_line(num + 2) + if num == len(text.split("\n")) - 1: editor.buffer.insert_with_tags(line_iter, line, \ editor.error_tag) else: - editor.buffer.insert_with_tags(line_iter, line+"\n", \ + editor.buffer.insert_with_tags(line_iter, line + "\n", \ editor.error_tag) else: line_iter = editor.buffer.get_iter_at_line(num) - if num == len(text.split("\n"))-1: + if num == len(text.split("\n")) - 1: editor.buffer.insert_with_tags_by_name(line_iter, line) else: editor.buffer.insert_with_tags_by_name(line_iter, \ - line+"\n") + line + "\n") editor.connect("move-cursor", self.set_bar_text, chk) def get_check(self): @@ -75,7 +77,7 @@ class PEP8_Check(): outputs = output.split("\n") for out in outputs: try: - splits = out.split(":") + splits = out.split(":") line = splits[1] character = splits[2] error = splits[3] @@ -84,24 +86,26 @@ class PEP8_Check(): else: checks[line] = '%s; %s:%s' % ( checks[line], character, error) - except: pass + except: + pass return checks def set_bar_text(self, widget, step_size, count, extend_selection, check): cursor_position = widget.buffer.get_property("cursor-position") offset_iter = widget.buffer.get_iter_at_offset(cursor_position) - line = offset_iter.get_line()+2 + line = offset_iter.get_line() if str(line) in check: this_line_error = check[str(line)] char = this_line_error.split(":")[0] this_line_error = this_line_error.split(":")[1] self.activity.pep8_bar.label.set_text( - str(line)+":"+char+" "+this_line_error) + str(line) + ":" + char + " " + this_line_error) print this_line_error self.activity.pep8_bar.show_all() - else: pass - + else: + pass + def check_exit(self): text = self.activity.editor._get_all_text() self.activity.editor.buffer.set_text("") @@ -110,11 +114,10 @@ class PEP8_Check(): for line in text.split("\n"): num += 1 line_iter = editor.buffer.get_iter_at_line(num) - if num == len(text.split("\n"))-1: + if num == len(text.split("\n")) - 1: editor.buffer.insert_with_tags_by_name(line_iter, line) else: - editor.buffer.insert_with_tags_by_name(line_iter, \ - line+"\n") - + editor.buffer.insert_with_tags_by_name(line_iter, line + "\n") + self.activity.pep8_bar.hide() self.activity.pep8_bar.label.set_text("") -- cgit v0.9.1