Hello community, here is the log from the commit of package cherrytree for openSUSE:Factory checked in at 2012-07-22 21:58:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-06-26 15:16:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cherrytree.new/cherrytree.changes 2012-07-22 21:58:49.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Jul 22 11:35:21 UTC 2012 - [email protected] + +- Update to version 0.26.3: + + Bug fixes. + +------------------------------------------------------------------- Old: ---- cherrytree-0.26.2.tar.bz2 New: ---- cherrytree-0.26.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cherrytree.spec ++++++ --- /var/tmp/diff_new_pack.llUEvg/_old 2012-07-22 21:58:50.000000000 +0200 +++ /var/tmp/diff_new_pack.llUEvg/_new 2012-07-22 21:58:50.000000000 +0200 @@ -17,7 +17,7 @@ Name: cherrytree -Version: 0.26.2 +Version: 0.26.3 Release: 0 Summary: A hierarchical note taking application License: GPL-2.0+ ++++++ cherrytree-0.26.2.tar.bz2 -> cherrytree-0.26.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cherrytree-0.26.2/changelog new/cherrytree-0.26.3/changelog --- old/cherrytree-0.26.2/changelog 2012-01-31 21:32:47.000000000 +0100 +++ new/cherrytree-0.26.3/changelog 2012-07-03 23:43:43.000000000 +0200 @@ -1,4 +1,53 @@ +0.26.2 (June 11th, 2012) +• fixed bugs + +0.26.1 (June 6th, 2012 ) +• added language Chinese Simplified (great job from Channing Wong) +• fixed minor bug + +0.26 (May 16th, 2012) +• added text formatting superscript, subscript, monospace and h3 +• h1, h2 and h3 formatting is now automatically applied to the whole row +• the switch between rich text and automatic syntax highlighting for the nodes is now simpler +• the dialog to choose the file storage type is now file extension oriented +• it is now possible to configure the default rich text foreground and background, so is for the tree +• the horizontal rule inserted characters are now configurable +• the TOC now includes h3 and can be created also for the whole tree +• the links anchors size is now configurable +• fixed several bugs +• we have now a complete manual of the application linked at help–manual (great job from Robert) +• WARNING: documents edited with a version >= 0.26 cannot be edited again with a version < 0.26 + +0.25.4 (February 24th, 2012) +• fixed bugs + +0.25.3 (February 3rd, 2012) +• fixed bugs + +0.25.2 (January 24th, 2012) +• fixed bugs + +0.25.1 (January 21st, 2012) +• fixed bugs +• mouse middle-click (or wheel-click) on a tree node expands/collapses it + +0.25 (January 14th, 2012) +• on linux, cherrytree can now be installed on any “prefix”, but the “exec-prefix” is not to be set different than “prefix” +• the minimum required gtk version is now 2.16 +• the single (but very big) new feature is a new data storage type, a sqlite 3 database (which is anyway a single file). Storing the old way (a single xml file) will be still available but probably not much used since the new storage type offers faster reading, faster saving and less memory usage. To the two old file extensions “ctd” and “ctz” (xml and xml 7zipped+password protected) were added “ctb” and “ctx” (sqlite and sqlite 7zipped+password protected) +• since really a lot of code changed I ask everybody to backup the data and report possible bugs. To try the new storage type just click file–save as + +0.24 (December 28th, 2011) +• automatic syntax highlighting: it is now possible to choose between several style schemes (a couple of them with dark background), the same style scheme is used for tree nodes and codeboxes +• automatic syntax highlighting: added the options to show white spaces and highlight the current line +• added menu items and keyboard shortcuts to move the current row/selected rows up and down the document +• added support for appindicator where the system tray is not supported (ubuntu unity) +• fixed several bugs and bad behaviours + +0.23.1 (September 16th, 2011) +• fixed bugs + 0.23 (September 4th, 2011) • the limit of undoable steps per node is now configurable (lower the limit to save ram) • implemented a dialog to iterate graphical way the find/replace (before it was possible only through keyboard shortcuts) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cherrytree-0.26.2/debian/changelog new/cherrytree-0.26.3/debian/changelog --- old/cherrytree-0.26.2/debian/changelog 2012-06-11 22:42:18.000000000 +0200 +++ new/cherrytree-0.26.3/debian/changelog 2012-07-02 22:40:05.000000000 +0200 @@ -1,4 +1,4 @@ -cherrytree (0.26.2-1) stable; urgency=low +cherrytree (0.26.3-1) stable; urgency=low * Fellow upstream. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cherrytree-0.26.2/glade/cherrytree.glade new/cherrytree-0.26.3/glade/cherrytree.glade --- old/cherrytree-0.26.2/glade/cherrytree.glade 2012-06-03 22:24:49.000000000 +0200 +++ new/cherrytree-0.26.3/glade/cherrytree.glade 2012-07-03 23:31:30.000000000 +0200 @@ -1495,7 +1495,7 @@ <property name="can_focus">False</property> <property name="layout_style">center</property> <child> - <object class="GtkButton" id="button2"> + <object class="GtkButton" id="button_exitdialog_canc"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -1538,7 +1538,7 @@ </packing> </child> <child> - <object class="GtkButton" id="button3"> + <object class="GtkButton" id="button_exitdialog_no"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -1581,7 +1581,7 @@ </packing> </child> <child> - <object class="GtkButton" id="button4"> + <object class="GtkButton" id="button_exitdialog_yes"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -1673,9 +1673,9 @@ </object> </child> <action-widgets> - <action-widget response="6">button2</action-widget> - <action-widget response="4">button3</action-widget> - <action-widget response="2">button4</action-widget> + <action-widget response="6">button_exitdialog_canc</action-widget> + <action-widget response="4">button_exitdialog_no</action-widget> + <action-widget response="2">button_exitdialog_yes</action-widget> </action-widgets> </object> <object class="GtkDialog" id="imageeditdialog"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cherrytree-0.26.2/modules/cons.py new/cherrytree-0.26.3/modules/cons.py --- old/cherrytree-0.26.2/modules/cons.py 2012-06-11 22:41:38.000000000 +0200 +++ new/cherrytree-0.26.3/modules/cons.py 2012-07-02 22:39:41.000000000 +0200 @@ -22,7 +22,7 @@ import os, sys -VERSION = "0.26.2" +VERSION = "0.26.3" APP_NAME = "cherrytree" NEWER_VERSION_URL = "http://www.giuspen.com/software/version_cherrytree"; if sys.platform[0:3] == "win": Files old/cherrytree-0.26.2/modules/cons.pyc and new/cherrytree-0.26.3/modules/cons.pyc differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cherrytree-0.26.2/modules/core.py new/cherrytree-0.26.3/modules/core.py --- old/cherrytree-0.26.2/modules/core.py 2012-06-11 22:40:42.000000000 +0200 +++ new/cherrytree-0.26.3/modules/core.py 2012-07-03 23:33:45.000000000 +0200 @@ -164,6 +164,7 @@ self.glade.choosenodedialog.connect('key_press_event', self.on_key_press_choosenodedialog) self.glade.tablehandledialog.connect('key_press_event', self.tables_handler.on_key_press_tablehandledialog) self.glade.codeboxhandledialog.connect('key_press_event', self.codeboxes_handler.on_key_press_codeboxhandledialog) + self.glade.exitdialog.connect('key_press_event', self.on_key_press_exitdialog) self.sourcestyleschememanager = gtksourceview2.StyleSchemeManager() self.sourceview = gtksourceview2.View() self.sourceview.set_sensitive(False) @@ -1118,12 +1119,13 @@ try: xml_string = self.xml_handler.treestore_to_dom() except: support.dialog_error("%s write failed - tree to xml" % filepath, self.window) - raise + #raise return False else: xml_string = "" # backup before save new version if self.backup_copy and os.path.isfile(filepath): - shutil.copy(filepath, filepath + cons.CHAR_TILDE) + try: shutil.copy(filepath, filepath + cons.CHAR_TILDE) + except: subprocess.call("cp %s %s~" % (re.escape(filepath), re.escape(filepath)), shell=True) # if the filename is protected, we use unprotected type before compress and protect try: self.statusbar.push(self.statusbar_context_id, _("Writing to Disk...")) @@ -1381,6 +1383,10 @@ def reset(self): """Reset the Application""" if not self.tree_is_empty() and not self.check_unsaved(): return False + if self.user_active: + self.user_active = False + user_active_restore = True + else: user_active_restore = False if self.curr_tree_iter != None: self.curr_buffer.set_text("") self.curr_tree_iter = None @@ -1394,6 +1400,7 @@ if "db" in dir(self) and self.db: self.db.close() for filepath_tmp in self.ctdb_handler.remove_at_quit_set: os.remove(filepath_tmp) self.ctdb_handler.reset() + if user_active_restore: self.user_active = True return True def export_to_ctd(self, action): @@ -2717,6 +2724,14 @@ if response == 6: return False # button CANCEL else: return True + def on_key_press_exitdialog(self, widget, event): + """Catches Exit Dialog key presses""" + keyname = gtk.gdk.keyval_name(event.keyval) + if keyname == "Return": self.glade.button_exitdialog_yes.clicked() + elif keyname == "Escape": self.glade.button_exitdialog_canc.clicked() + else: print keyname + return True + def dialog_about(self, *args): """Show the About Dialog and hide it when a button is pressed""" self.glade.aboutdialog.run() @@ -3363,7 +3378,7 @@ tag.set_property("rise", rise) elif property_value[0:4] == "webs": tag.set_property("underline", pango.UNDERLINE_SINGLE) - tag.set_property("foreground", "#00000000ffff") + tag.set_property("foreground", "#00004444ffff") elif property_value[0:4] == "node": tag.set_property("underline", pango.UNDERLINE_SINGLE) tag.set_property("foreground", "#071c838e071c") Files old/cherrytree-0.26.2/modules/core.pyc and new/cherrytree-0.26.3/modules/core.pyc differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cherrytree-0.26.2/modules/findreplace.py new/cherrytree-0.26.3/modules/findreplace.py --- old/cherrytree-0.26.2/modules/findreplace.py 2012-02-22 23:58:49.000000000 +0100 +++ new/cherrytree-0.26.3/modules/findreplace.py 2012-06-27 00:41:16.000000000 +0200 @@ -436,7 +436,7 @@ 0, 0, self.dad.treestore[node_iter][1], - self.get_first_line_content(self.dad.treestore[node_iter][2])]) + self.get_first_line_content(self.dad.get_textbuffer_from_tree_iter(node_iter))]) if self.replace_active: replacer_text = self.dad.glade.replace_entry.get_text().decode("utf-8") text_name = text_name.replace(self.curr_find[1], replacer_text) @@ -445,13 +445,13 @@ if not all_matches: self.dad.treeview_safe_set_cursor(node_iter) self.dad.sourceview.grab_focus() - return True + return True + else: self.matches_num += 1 node_iter = self.dad.treestore.iter_children(node_iter) # check for children if node_iter != None and not forward: node_iter = self.dad.get_tree_iter_last_sibling(node_iter) while node_iter != None: - if self.parse_node_name(node_iter, pattern, forward, all_matches): - self.matches_num += 1 - if not all_matches: return True + if self.parse_node_name(node_iter, pattern, forward, all_matches)\ + and not all_matches: return True if forward: node_iter = self.dad.treestore.iter_next(node_iter) else: node_iter = self.dad.get_tree_iter_prev_sibling(self.dad.treestore, node_iter) return False Files old/cherrytree-0.26.2/modules/findreplace.pyc and new/cherrytree-0.26.3/modules/findreplace.pyc differ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
