Hello community, here is the log from the commit of package cherrytree for openSUSE:Factory checked in at 2012-02-06 15:54:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cherrytree (Old) and /work/SRC/openSUSE:Factory/.cherrytree.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cherrytree", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/cherrytree/cherrytree.changes 2012-01-25 12:18:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cherrytree.new/cherrytree.changes 2012-02-06 15:54:35.000000000 +0100 @@ -1,0 +2,11 @@ +Sat Feb 4 13:58:27 CET 2012 - zaitor@opensuse.org + +- Update to version 0.25.3: + + The limit of undoable steps per node is now configurable. + + Implemented a dialog to iterate graphical way the find/replace. + + Implemented the insertion of timestamps. Format is configurable + through preferences dialog. + + Fixed some bugs/bad behaviors related to system tray, nodes + drag n drop, links to files dialog and others. + +------------------------------------------------------------------- Old: ---- cherrytree-0.25.2.tar.gz New: ---- cherrytree-0.25.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cherrytree.spec ++++++ --- /var/tmp/diff_new_pack.ZBUa02/_old 2012-02-06 15:54:37.000000000 +0100 +++ /var/tmp/diff_new_pack.ZBUa02/_new 2012-02-06 15:54:37.000000000 +0100 @@ -17,8 +17,8 @@ Name: cherrytree -Version: 0.25.2 -Release: 0 +Version: 0.25.3 +Release: 1 Summary: A hierarchical note taking application License: GPL-2.0+ Group: Productivity/Office/Other ++++++ cherrytree-0.25.2.tar.gz -> cherrytree-0.25.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cherrytree-0.25.2/debian/changelog new/cherrytree-0.25.3/debian/changelog --- old/cherrytree-0.25.2/debian/changelog 2012-01-22 21:55:42.000000000 +0100 +++ new/cherrytree-0.25.3/debian/changelog 2012-02-03 13:39:01.000000000 +0100 @@ -1,4 +1,4 @@ -cherrytree (0.25.2-1) stable; urgency=low +cherrytree (0.25.3-1) stable; urgency=low * Fellow upstream. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cherrytree-0.25.2/debian/debhelper.log new/cherrytree-0.25.3/debian/debhelper.log --- old/cherrytree-0.25.2/debian/debhelper.log 2012-01-24 01:12:26.000000000 +0100 +++ new/cherrytree-0.25.3/debian/debhelper.log 2012-02-03 14:00:28.000000000 +0100 @@ -7,53 +7,6 @@ dh_link dh_compress dh_fixperms -dh_pycentral -dh_installdeb -dh_gencontrol -dh_md5sums -dh_builddeb -dh_prep -dh_installdirs -dh_installchangelogs -dh_installdocs -dh_installexamples -dh_installman -dh_link -dh_compress -dh_fixperms -dh_pycentral -dh_installdeb -dh_gencontrol -dh_md5sums -dh_builddeb -dh_prep -dh_installdirs -dh_installchangelogs -dh_installdocs -dh_installexamples -dh_installman -dh_link -dh_compress -dh_fixperms -dh_pycentral -dh_installdeb -dh_gencontrol -dh_md5sums -dh_builddeb -dh_prep -dh_installdirs -dh_installchangelogs -dh_installdocs -dh_installexamples -dh_installman -dh_link -dh_compress -dh_fixperms -dh_pycentral -dh_installdeb -dh_gencontrol -dh_md5sums -dh_builddeb dh_prep dh_installdirs dh_installchangelogs Files old/cherrytree-0.25.2/linux/cherrytree.1.gz and new/cherrytree-0.25.3/linux/cherrytree.1.gz differ Files old/cherrytree-0.25.2/locale/cs/LC_MESSAGES/cherrytree.mo and new/cherrytree-0.25.3/locale/cs/LC_MESSAGES/cherrytree.mo differ Files old/cherrytree-0.25.2/locale/de/LC_MESSAGES/cherrytree.mo and new/cherrytree-0.25.3/locale/de/LC_MESSAGES/cherrytree.mo differ Files old/cherrytree-0.25.2/locale/es/LC_MESSAGES/cherrytree.mo and new/cherrytree-0.25.3/locale/es/LC_MESSAGES/cherrytree.mo differ Files old/cherrytree-0.25.2/locale/fr/LC_MESSAGES/cherrytree.mo and new/cherrytree-0.25.3/locale/fr/LC_MESSAGES/cherrytree.mo differ Files old/cherrytree-0.25.2/locale/it/LC_MESSAGES/cherrytree.mo and new/cherrytree-0.25.3/locale/it/LC_MESSAGES/cherrytree.mo differ Files old/cherrytree-0.25.2/locale/pl/LC_MESSAGES/cherrytree.mo and new/cherrytree-0.25.3/locale/pl/LC_MESSAGES/cherrytree.mo differ Files old/cherrytree-0.25.2/locale/ru/LC_MESSAGES/cherrytree.mo and new/cherrytree-0.25.3/locale/ru/LC_MESSAGES/cherrytree.mo differ Files old/cherrytree-0.25.2/locale/uk/LC_MESSAGES/cherrytree.mo and new/cherrytree-0.25.3/locale/uk/LC_MESSAGES/cherrytree.mo differ Files old/cherrytree-0.25.2/modules/clipboard.pyc and new/cherrytree-0.25.3/modules/clipboard.pyc differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cherrytree-0.25.2/modules/codeboxes.py new/cherrytree-0.25.3/modules/codeboxes.py --- old/cherrytree-0.25.2/modules/codeboxes.py 2012-01-13 22:51:37.000000000 +0100 +++ new/cherrytree-0.25.3/modules/codeboxes.py 2012-02-03 10:40:15.000000000 +0100 @@ -163,8 +163,7 @@ else: frame_width = self.dad.get_text_window_width()*anchor.frame_width/100 anchor.frame.set_size_request(frame_width, anchor.frame_height) if from_shortcut: - self.dad.update_window_save_needed() - self.dad.state_machine.update_state(self.dad.treestore[self.dad.curr_tree_iter][3]) + self.dad.update_window_save_needed("nbuf", True) def codebox_change_properties(self, action): """Change CodeBox Properties""" @@ -191,8 +190,7 @@ self.curr_codebox_anchor.show_line_numbers = self.dad.glade.checkbutton_codebox_linenumbers.get_active() self.curr_codebox_anchor.sourceview.set_show_line_numbers(self.curr_codebox_anchor.show_line_numbers) self.codebox_apply_width_height(self.curr_codebox_anchor) - self.dad.update_window_save_needed() - self.dad.state_machine.update_state(self.dad.treestore[self.dad.curr_tree_iter][3]) + self.dad.update_window_save_needed("nbuf", True) def on_key_press_sourceview_codebox(self, widget, event, anchor): """Extend the Default Right-Click Menu of the CodeBox""" Files old/cherrytree-0.25.2/modules/codeboxes.pyc and new/cherrytree-0.25.3/modules/codeboxes.pyc differ Files old/cherrytree-0.25.2/modules/config.pyc and new/cherrytree-0.25.3/modules/config.pyc differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cherrytree-0.25.2/modules/cons.py new/cherrytree-0.25.3/modules/cons.py --- old/cherrytree-0.25.2/modules/cons.py 2012-01-22 21:55:28.000000000 +0100 +++ new/cherrytree-0.25.3/modules/cons.py 2012-02-03 13:30:45.000000000 +0100 @@ -22,7 +22,7 @@ import os, sys -VERSION = "0.25.2" +VERSION = "0.25.3" APP_NAME = "cherrytree" NEWER_VERSION_URL = "http://www.giuspen.com/software/version_cherrytree" if sys.platform[0:3] == "win": Files old/cherrytree-0.25.2/modules/cons.pyc and new/cherrytree-0.25.3/modules/cons.pyc differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cherrytree-0.25.2/modules/core.py new/cherrytree-0.25.3/modules/core.py --- old/cherrytree-0.25.2/modules/core.py 2012-01-24 01:08:48.000000000 +0100 +++ new/cherrytree-0.25.3/modules/core.py 2012-02-03 13:37:32.000000000 +0100 @@ -999,8 +999,7 @@ def on_modified_changed(self, sourcebuffer): """When the modification flag is changed""" if self.user_active and sourcebuffer.get_modified() == True: - self.ctdb_handler.pending_edit_db_node_buff(self.treestore[self.curr_tree_iter][3]) - self.update_window_save_needed() + self.update_window_save_needed("nbuf") def file_save_as(self, *args): """Save the file providing a new name""" @@ -1582,6 +1581,7 @@ iter_child = self.treestore.iter_children(iter_father) while iter_child != None: if self.treestore[iter_child][4] != self.treestore[iter_father][4]: + self.get_textbuffer_from_tree_iter(iter_child) self.treestore[iter_child][4] = self.treestore[iter_father][4] self.treestore[iter_child][0] = self.get_node_icon(self.treestore.iter_depth(iter_child), self.treestore[iter_child][4]) @@ -1591,6 +1591,7 @@ if self.treestore[iter_child][4] != cons.CUSTOM_COLORS_ID: self.set_sourcebuffer_syntax_highlight(self.treestore[iter_child][2], self.treestore[iter_child][4]) + self.ctdb_handler.pending_edit_db_node_prop(self.treestore[iter_child][3]) self.update_window_save_needed() self.node_inherit_syntax_iter(iter_child) iter_child = self.treestore.iter_next(iter_child) @@ -2223,13 +2224,12 @@ if new_iter == None: new_iter = self.treestore.iter_next(self.curr_tree_iter) if new_iter == None: new_iter = self.treestore.iter_parent(self.curr_tree_iter) - self.ctdb_handler.pending_rm_db_node(self.treestore[self.curr_tree_iter][3]) + self.update_window_save_needed("ndel") self.treestore.remove(self.curr_tree_iter) self.curr_tree_iter = None if new_iter != None: self.treeview.set_cursor(self.treestore.get_path(new_iter)) self.sourceview.grab_focus() - self.update_window_save_needed() def node_edit(self, *args): """Edit the Properties of the Selected Node""" @@ -2251,13 +2251,10 @@ # SWITCH TextBuffer -> SourceBuffer self.switch_buffer_text_source(self.curr_buffer, self.curr_tree_iter, self.syntax_highlighting) self.curr_buffer = self.treestore[self.curr_tree_iter][2] - change_rich_text_automatic_syntax = True elif self.treestore[self.curr_tree_iter][4] != cons.CUSTOM_COLORS_ID and self.syntax_highlighting == cons.CUSTOM_COLORS_ID: # SWITCH SourceBuffer -> TextBuffer self.switch_buffer_text_source(self.curr_buffer, self.curr_tree_iter, self.syntax_highlighting) self.curr_buffer = self.treestore[self.curr_tree_iter][2] - change_rich_text_automatic_syntax = True - else: change_rich_text_automatic_syntax = False self.treestore[self.curr_tree_iter][1] = node_name self.treestore[self.curr_tree_iter][4] = self.syntax_highlighting self.treestore[self.curr_tree_iter][6] = self.glade.tags_searching_entry.get_text() @@ -2267,11 +2264,8 @@ if self.syntax_highlighting != cons.CUSTOM_COLORS_ID: self.set_sourcebuffer_syntax_highlight(self.curr_buffer, self.syntax_highlighting) self.sourceview.set_editable(not self.treestore[self.curr_tree_iter][7]) - self.ctdb_handler.pending_edit_db_node_prop(self.treestore[self.curr_tree_iter][3]) - if change_rich_text_automatic_syntax: - self.ctdb_handler.pending_edit_db_node_buff(self.treestore[self.curr_tree_iter][3]) self.update_selected_node_statusbar_info() - self.update_window_save_needed() + self.update_window_save_needed("npro") self.sourceview.grab_focus() def sourceview_set_properties(self, tree_iter, syntax_highl): @@ -2298,6 +2292,7 @@ self.treestore[tree_iter][2].connect('modified-changed', self.on_modified_changed) self.sourceview_set_properties(tree_iter, new_syntax_highl) self.user_active = True + self.ctdb_handler.pending_edit_db_node_buff(self.treestore[tree_iter][3]) def on_node_changed(self, *args): """Actions to be triggered from the changing of node""" @@ -2352,10 +2347,24 @@ elif "sourcebuffer" in anchor_dir: support.set_object_highlight(self, anchor.frame) except: pass - def update_window_save_needed(self): + def update_window_save_needed(self, update_type=None, new_state_machine=False): """Window title preceeded by an asterix""" - self.window_title_update(True) - self.file_update = True + if not self.file_update: + self.window_title_update(True) + self.file_update = True + if update_type: + if update_type == "nbuf": + if self.curr_tree_iter: + self.ctdb_handler.pending_edit_db_node_buff(self.treestore[self.curr_tree_iter][3]) + elif update_type == "npro": + if self.curr_tree_iter: + self.ctdb_handler.pending_edit_db_node_prop(self.treestore[self.curr_tree_iter][3]) + elif update_type == "ndel": + if self.curr_tree_iter: + self.ctdb_handler.pending_rm_db_node(self.treestore[self.curr_tree_iter][3]) + elif update_type == "book": self.ctdb_handler.pending_edit_db_bookmarks() + if new_state_machine and self.curr_tree_iter: + self.state_machine.update_state(self.treestore[self.curr_tree_iter][3]) def update_window_save_not_needed(self): """Window title not preceeded by an asterix""" @@ -2490,10 +2499,10 @@ self.curr_buffer.place_cursor(self.curr_buffer.get_iter_at_offset(step_back[2])) self.sourceview.scroll_to_mark(self.curr_buffer.get_insert(), 0.3) self.user_active = True - self.update_window_save_needed() + self.update_window_save_needed("nbuf") elif self.curr_buffer.can_undo(): self.curr_buffer.undo() - self.update_window_save_needed() + self.update_window_save_needed("nbuf") def requested_step_ahead(self, *args): """Step Ahead for the Current Node, if Possible""" @@ -2517,10 +2526,10 @@ self.curr_buffer.place_cursor(self.curr_buffer.get_iter_at_offset(step_ahead[2])) self.sourceview.scroll_to_mark(self.curr_buffer.get_insert(), 0.3) self.user_active = True - self.update_window_save_needed() + self.update_window_save_needed("nbuf") elif self.curr_buffer.can_redo(): self.curr_buffer.redo() - self.update_window_save_needed() + self.update_window_save_needed("nbuf") def objects_buffer_refresh(self): """Buffer Refresh (Needed for Objects)""" @@ -2723,12 +2732,12 @@ return True def tree_cell_edited(self, cell, path, new_text): - """A Table Cell is going to be Edited""" + """A Tree Node Name is going to be Edited""" if new_text != self.treestore[path][1]: self.treestore[path][1] = new_text self.header_node_name_label.set_text("<big><b><i>"+new_text+"</i></b></big>") self.header_node_name_label.set_use_markup(True) - self.update_window_save_needed() + self.update_window_save_needed("npro") def tree_info(self, action): """Tree Summary Information""" @@ -3211,8 +3220,7 @@ text_buffer.apply_tag_by_name(self.apply_tag_exist_or_create(tag_property, property_value), iter_sel_start, iter_sel_end) if self.user_active: - if self.file_update == False: self.update_window_save_needed() # file save needed - self.state_machine.update_state(self.treestore[self.curr_tree_iter][3]) + self.update_window_save_needed("nbuf", True) def next_chars_from_iter_are(self, iter_start, num, chars): """Returns True if the Given Chars are the next 'num' after iter""" @@ -3586,8 +3594,7 @@ return iter_sel_start, iter_sel_end = self.curr_buffer.get_selection_bounds() self.curr_buffer.remove_all_tags(iter_sel_start, iter_sel_end) - self.update_window_save_needed() - self.state_machine.update_state(self.treestore[self.curr_tree_iter][3]) + self.update_window_save_needed("nbuf", True) def bookmark_curr_node(self, *args): """Add the Current Node to the Bookmarks List""" @@ -3598,13 +3605,12 @@ if not curr_node_id_str in self.bookmarks: self.bookmarks.append(curr_node_id_str) support.set_bookmarks_menu_items(self) - self.ctdb_handler.pending_edit_db_bookmarks() - self.update_window_save_needed() + self.update_window_save_needed("book") def bookmarks_handle(self, *args): """Handle the Bookmarks List""" if support.bookmarks_handle(self): - self.update_window_save_needed() + self.update_window_save_needed("book") def timestamp_insert(self, *args): """Insert Timestamp""" Files old/cherrytree-0.25.2/modules/core.pyc and new/cherrytree-0.25.3/modules/core.pyc differ Files old/cherrytree-0.25.2/modules/ctdb.pyc and new/cherrytree-0.25.3/modules/ctdb.pyc differ Files old/cherrytree-0.25.2/modules/exports.pyc and new/cherrytree-0.25.3/modules/exports.pyc differ Files old/cherrytree-0.25.2/modules/findreplace.pyc and new/cherrytree-0.25.3/modules/findreplace.pyc differ Files old/cherrytree-0.25.2/modules/imports.pyc and new/cherrytree-0.25.3/modules/imports.pyc differ Files old/cherrytree-0.25.2/modules/lists.pyc and new/cherrytree-0.25.3/modules/lists.pyc differ Files old/cherrytree-0.25.2/modules/machines.pyc and new/cherrytree-0.25.3/modules/machines.pyc differ Files old/cherrytree-0.25.2/modules/main.pyc and new/cherrytree-0.25.3/modules/main.pyc differ Files old/cherrytree-0.25.2/modules/printing.pyc and new/cherrytree-0.25.3/modules/printing.pyc differ Files old/cherrytree-0.25.2/modules/support.pyc and new/cherrytree-0.25.3/modules/support.pyc differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cherrytree-0.25.2/modules/tablez.py new/cherrytree-0.25.3/modules/tablez.py --- old/cherrytree-0.25.2/modules/tablez.py 2012-01-13 22:51:37.000000000 +0100 +++ new/cherrytree-0.25.3/modules/tablez.py 2012-02-03 11:01:24.000000000 +0100 @@ -205,8 +205,7 @@ if keyname in ["Return", "Up", "Down"]: if model[path][col_num] != widget.get_text(): model[path][col_num] = widget.get_text() - self.dad.state_machine.update_state(self.dad.treestore[self.dad.curr_tree_iter][3]) - self.dad.update_window_save_needed() + self.dad.update_window_save_needed("nbuf", True) if keyname == "Up": if col_num > 0: next_col_num = col_num - 1 @@ -249,8 +248,7 @@ """A Table Cell has been Edited""" if model[path][col_num] != new_text: model[path][col_num] = new_text - self.dad.state_machine.update_state(self.dad.treestore[self.dad.curr_tree_iter][3]) - self.dad.update_window_save_needed() + self.dad.update_window_save_needed("nbuf", True) def table_column_clicked(self, column, anchor, col_num): """The Column Header was Clicked""" @@ -345,8 +343,7 @@ elif action == "paste": if not self.dad.clipboard_handler.table_row_paste([model, iter]): return else: return - self.dad.update_window_save_needed() - self.dad.state_machine.update_state(self.dad.treestore[self.dad.curr_tree_iter][3]) + self.dad.update_window_save_needed("nbuf", True) def table_row_add(self, *args): """Add a Table Row""" Files old/cherrytree-0.25.2/modules/tablez.pyc and new/cherrytree-0.25.3/modules/tablez.pyc differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org