Hello community,
here is the log from the commit of package cherrytree for openSUSE:Factory
checked in at Sun Oct 2 09:52:12 CEST 2011.
--------
--- openSUSE:Factory/cherrytree/cherrytree.changes 2011-09-23 01:53:22.000000000 +0200
+++ /mounts/work_src_done/STABLE/cherrytree/cherrytree.changes 2011-09-21 21:57:51.000000000 +0200
@@ -1,0 +2,13 @@
+Wed Sep 21 19:49:23 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 0.23.1:
+ + Handle double-click on bookmarks
+ + Fix bugs in find all matches
+- Stop manually removing cherrytree.glade.h: it is now gone.
+
+-------------------------------------------------------------------
+Sat Sep 17 22:52:56 UTC 2011 - jengelh@medozas.de
+
+- Remove redundant tags/sections from specfile
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
cherrytree-0.23.tar.gz
New:
----
cherrytree-0.23.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cherrytree.spec ++++++
--- /var/tmp/diff_new_pack.h5jXVa/_old 2011-10-02 09:52:08.000000000 +0200
+++ /var/tmp/diff_new_pack.h5jXVa/_new 2011-10-02 09:52:08.000000000 +0200
@@ -18,7 +18,7 @@
Name: cherrytree
-Version: 0.23
+Version: 0.23.1
Release: 1
License: GPL-2.0+
Summary: A hierarchical note taking application
@@ -63,13 +63,9 @@
# Remove old mime registration files
rm %{buildroot}%{_datadir}/application-registry/cherrytree.*
rm %{buildroot}%{_datadir}/mime-info/cherrytree.*
-rm %{buildroot}%{_datadir}/cherrytree/glade/cherrytree.glade.h
%find_lang %{name} %{?no_lang_C}
%suse_update_desktop_file -G "Hierarchical Notes Utility" cherrytree TextEditor
-%clean
-rm -rf %{buildroot}
-
%post
%if 0%{?suse_version} > 1130
%desktop_database_post
++++++ cherrytree-0.23.tar.gz -> cherrytree-0.23.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cherrytree-0.23/changelog new/cherrytree-0.23.1/changelog
--- old/cherrytree-0.23/changelog 2011-08-25 15:07:07.000000000 +0200
+++ new/cherrytree-0.23.1/changelog 2011-09-16 19:00:12.000000000 +0200
@@ -1,4 +1,10 @@
+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)
+• implemented the insertion of timestamps. the timestamp 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
+
0.22.2 (July 10th, 2011)
• fixed bugs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cherrytree-0.23/debian/changelog new/cherrytree-0.23.1/debian/changelog
--- old/cherrytree-0.23/debian/changelog 2011-08-25 15:04:28.000000000 +0200
+++ new/cherrytree-0.23.1/debian/changelog 2011-09-16 19:05:59.000000000 +0200
@@ -1,4 +1,4 @@
-cherrytree (0.23-1) stable; urgency=low
+cherrytree (0.23.1-1) stable; urgency=low
* Fellow upstream.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cherrytree-0.23/glade/cherrytree.glade.h new/cherrytree-0.23.1/glade/cherrytree.glade.h
--- old/cherrytree-0.23/glade/cherrytree.glade.h 2011-09-01 19:21:34.000000000 +0200
+++ new/cherrytree-0.23.1/glade/cherrytree.glade.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,134 +0,0 @@
-char *s = N_("\n"
- "This program is free software; you can redistribute it and/or modify\n"
- "it under the terms of the GNU General Public License as published by\n"
- "the Free Software Foundation; either version 2 of the License, or\n"
- "(at your option) any later version.\n"
- " \n"
- "This program is distributed in the hope that it will be useful,\n"
- "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
- "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
- "GNU General Public License for more details.\n"
- " \n"
- "You should have received a copy of the GNU General Public License\n"
- "along with this program; if not, write to the Free Software\n"
- "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n"
- "MA 02110-1301, USA.\n"
- "");
-char *s = N_(" Height ");
-char *s = N_(" Columns ");
-char *s = N_(" Max Width");
-/* xgettext:no-c-format */
-char *s = N_("%");
-char *s = N_("<b>Anchor Name (optional)</b>");
-char *s = N_("<b>Automatic Syntax Highlighting</b>");
-char *s = N_("<b>Columns Properties</b>");
-char *s = N_("<b>File/Folder Path</b>");
-char *s = N_("<b>Fonts</b>");
-char *s = N_("<b>Language</b>");
-char *s = N_("<b>Links</b>");
-char *s = N_("<b>Miscellaneous</b>");
-char *s = N_("<b>Node</b>");
-char *s = N_("<b>Options</b>");
-char *s = N_("<b>Replace with</b>");
-char *s = N_("<b>Saving</b>");
-char *s = N_("<b>Search options</b>");
-char *s = N_("<b>Size</b>");
-char *s = N_("<b>System Tray</b>");
-char *s = N_("<b>Table size</b>");
-char *s = N_("<b>Tags for Searching</b>");
-char *s = N_("<b>Text Editor</b>");
-char *s = N_("<b>The current document was updated</b>,\n"
- "do you want to save the changes?");
-char *s = N_("<b>Tree</b>");
-char *s = N_("<b>Type</b>");
-char *s = N_("<b>WebSite URL</b>");
-char *s = N_("A Hierarchical Note Taking Application, featuring Rich Text and Syntax Highlighting");
-char *s = N_("About CherryTree");
-char *s = N_("Add Column");
-char *s = N_("All, List Matches");
-char *s = N_("Are you sure to Delete the node?");
-char *s = N_("Automatically Check for Newer Version");
-char *s = N_("Autosave Every");
-char *s = N_("Autosave on Quit");
-char *s = N_("Backward");
-char *s = N_("Browse for Existing Anchors on the Selected Node");
-char *s = N_("Browse for a File to link to");
-char *s = N_("Cancel");
-char *s = N_("CherryTree");
-char *s = N_("Close");
-char *s = N_("Code Font");
-char *s = N_("Copyright © 2009-2011\n"
- "Giuseppe Penone ");
-char *s = N_("Create a Backup Copy Before Saving");
-char *s = N_("Czech (cs) Pavel Fric \n"
- "French (fr) Ludovic Troisi \n"
- "German (de) Frank Brungräber (former Sven Neubauer)\n"
- "Italian (it) Giuseppe Penone \n"
- "Polish (pl) Marcin Swierczynski \n"
- "Russian (ru) Andriy Kovtun \n"
- "Spanish (es) Daniel MC \n"
- "Ukrainian (uk) Andriy Kovtun ");
-char *s = N_("Delete Column");
-char *s = N_("Detail of Available Format Codes");
-char *s = N_("Display Tree on the Right Side");
-char *s = N_("Do Not Display Nodes Icons");
-char *s = N_("Enable Automatic Indentation");
-char *s = N_("Enable Custom File Link Clicked Action");
-char *s = N_("Enable Custom Folder Link Clicked Action");
-char *s = N_("Enable Custom Web Link Clicked Action");
-char *s = N_("Enable System Tray Docking");
-char *s = N_("Expand All Nodes When Loading the Tree");
-char *s = N_("Find");
-char *s = N_("First From Selection");
-char *s = N_("First in All Range");
-char *s = N_("Forward");
-char *s = N_("Height");
-char *s = N_("Highlight Matching Brackets");
-char *s = N_("Image Properties");
-char *s = N_("Import from CSV File");
-char *s = N_("Input Dialog");
-char *s = N_("Insert Spaces Instead of Tabs");
-char *s = N_("Iterate Latest Find/Replace");
-char *s = N_("Iterate the Last Find Operation");
-char *s = N_("Iterate the Last Find Operation in Opposite Direction");
-char *s = N_("Limit of Undoable Steps Per Node");
-char *s = N_("Match Case");
-char *s = N_("Min Width");
-char *s = N_("Minutes");
-char *s = N_("Move Column Left");
-char *s = N_("Move Column Right");
-char *s = N_("No");
-char *s = N_("OK");
-char *s = N_("Pick a Color");
-char *s = N_("Preferences");
-char *s = N_("Read Only");
-char *s = N_("Regular Expression");
-char *s = N_("Rename Column");
-char *s = N_("Replace");
-char *s = N_("Rows ");
-char *s = N_("Select the New Father");
-char *s = N_("Show Iterated Find/Replace Dialog");
-char *s = N_("Show Line Numbers");
-char *s = N_("Start Minimized in the System Tray");
-char *s = N_("Start Word");
-char *s = N_("Tab Width ");
-char *s = N_("Text Font");
-char *s = N_("Timestamp Format");
-char *s = N_("To File");
-char *s = N_("To Folder");
-char *s = N_("To Node");
-char *s = N_("To WebSite");
-char *s = N_("Tree Font");
-char *s = N_("Tree Nodes Names Wrapping Width");
-char *s = N_("Undo");
-char *s = N_("Undo the Latest Replace");
-char *s = N_("Use Bullets as Nodes Icons");
-char *s = N_("Use Cherries as Nodes Icons");
-char *s = N_("Use Line Wrapping");
-char *s = N_("Warning");
-char *s = N_("Whole Word");
-char *s = N_("Width");
-char *s = N_("Width ");
-char *s = N_("Yes");
-char *s = N_("http://www.giuspen.com/cherrytree/");
-char *s = N_("pixels");
Files old/cherrytree-0.23/locale/cs/LC_MESSAGES/cherrytree.mo and new/cherrytree-0.23.1/locale/cs/LC_MESSAGES/cherrytree.mo differ
Files old/cherrytree-0.23/locale/de/LC_MESSAGES/cherrytree.mo and new/cherrytree-0.23.1/locale/de/LC_MESSAGES/cherrytree.mo differ
Files old/cherrytree-0.23/locale/es/LC_MESSAGES/cherrytree.mo and new/cherrytree-0.23.1/locale/es/LC_MESSAGES/cherrytree.mo differ
Files old/cherrytree-0.23/locale/fr/LC_MESSAGES/cherrytree.mo and new/cherrytree-0.23.1/locale/fr/LC_MESSAGES/cherrytree.mo differ
Files old/cherrytree-0.23/locale/it/LC_MESSAGES/cherrytree.mo and new/cherrytree-0.23.1/locale/it/LC_MESSAGES/cherrytree.mo differ
Files old/cherrytree-0.23/locale/pl/LC_MESSAGES/cherrytree.mo and new/cherrytree-0.23.1/locale/pl/LC_MESSAGES/cherrytree.mo differ
Files old/cherrytree-0.23/locale/ru/LC_MESSAGES/cherrytree.mo and new/cherrytree-0.23.1/locale/ru/LC_MESSAGES/cherrytree.mo differ
Files old/cherrytree-0.23/locale/uk/LC_MESSAGES/cherrytree.mo and new/cherrytree-0.23.1/locale/uk/LC_MESSAGES/cherrytree.mo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cherrytree-0.23/modules/cons.py new/cherrytree-0.23.1/modules/cons.py
--- old/cherrytree-0.23/modules/cons.py 2011-08-25 15:04:07.000000000 +0200
+++ new/cherrytree-0.23.1/modules/cons.py 2011-09-16 19:05:11.000000000 +0200
@@ -22,7 +22,7 @@
import os, sys
-VERSION = "0.23"
+VERSION = "0.23.1"
APP_NAME = "cherrytree"
NEWER_VERSION_URL = "http://www.giuspen.com/software/version_cherrytree"
if sys.platform[0:3] == "win":
Files old/cherrytree-0.23/modules/cons.pyc and new/cherrytree-0.23.1/modules/cons.pyc differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cherrytree-0.23/modules/findreplace.py new/cherrytree-0.23.1/modules/findreplace.py
--- old/cherrytree-0.23/modules/findreplace.py 2011-07-23 22:38:53.000000000 +0200
+++ new/cherrytree-0.23.1/modules/findreplace.py 2011-09-16 19:04:19.000000000 +0200
@@ -297,19 +297,22 @@
else: num_objs = 0
self.dad.set_selection_at_offset_n_delta(match_offsets[0] + num_objs,
match_offsets[1] - match_offsets[0])
- self.dad.sourceview.scroll_to_mark(self.dad.curr_buffer.get_insert(), 0.25)
+ mark_insert = self.dad.curr_buffer.get_insert()
+ iter_insert = self.dad.curr_buffer.get_iter_at_mark(mark_insert)
+ self.dad.sourceview.scroll_to_mark(mark_insert, 0.25)
if all_matches:
self.liststore.append([self.dad.curr_tree_iter,
match_offsets[0] + num_objs,
match_offsets[1] + num_objs,
self.dad.treestore[self.dad.curr_tree_iter][1],
- self.get_line_content(target) if not obj_match_offsets[0] else obj_match_offsets[2]])
+ self.get_line_content(iter_insert) if not obj_match_offsets[0] else obj_match_offsets[2]])
if self.replace_active:
replacer_text = self.dad.glade.replace_entry.get_text().decode("utf-8")
self.dad.curr_buffer.delete_selection(interactive=False, default_editable=True)
self.dad.curr_buffer.insert_at_cursor(replacer_text)
- self.dad.set_selection_at_offset_n_delta(match_offsets[0] + num_objs,
- len(replacer_text))
+ if not all_matches:
+ self.dad.set_selection_at_offset_n_delta(match_offsets[0] + num_objs,
+ len(replacer_text))
self.dad.state_machine.update_state(self.dad.treestore[self.dad.curr_tree_iter][3])
return True
else: return False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cherrytree-0.23/modules/support.py new/cherrytree-0.23.1/modules/support.py
--- old/cherrytree-0.23/modules/support.py 2011-08-24 17:43:36.000000000 +0200
+++ new/cherrytree-0.23.1/modules/support.py 2011-09-16 19:04:19.000000000 +0200
@@ -294,6 +294,7 @@
dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
liststore = gtk.ListStore(str, str, str)
for node_id_str in dad.bookmarks:
+ # icon, node name, node id string
liststore.append(["Red Cherry", dad.nodes_names_dict[long(node_id_str)], node_id_str])
treeview = gtk.TreeView(liststore)
treeview.set_headers_visible(False)
@@ -305,7 +306,17 @@
if keyname == "Delete":
model, tree_iter = treeviewselection.get_selected()
if tree_iter: model.remove(tree_iter)
+ def on_mouse_button_clicked_liststore(widget, event):
+ """Catches mouse buttons clicks"""
+ if event.button != 1: return
+ if event.type != gtk.gdk._2BUTTON_PRESS: return
+ path_n_tvc = treeview.get_path_at_pos(int(event.x), int(event.y))
+ if not path_n_tvc: return
+ tree_path = path_n_tvc[0]
+ dad_tree_path = dad.get_tree_iter_from_node_id(long(liststore[tree_path][2]))
+ dad.treeview_safe_set_cursor(dad_tree_path)
treeview.connect('key_press_event', on_key_press_liststore)
+ treeview.connect('button-press-event', on_mouse_button_clicked_liststore)
renderer_pixbuf = gtk.CellRendererPixbuf()
renderer_text = gtk.CellRendererText()
column = gtk.TreeViewColumn()
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org