[Todo-manager-cvs] todo-manager ChangeLog.txt,1.35.2.5,1.35.2.6 interface.py,1.39,1.39.2.1 main.py,1.67.2.3,1.67.2.4

[<cl...@us...>]

Update of /cvsroot/todo-manager/todo-manager
In directory sc8-pr-cvs1:/tmp/cvs-serv7477

Modified Files:
      Tag: branch-0_70
	ChangeLog.txt interface.py main.py 
Log Message:
A fix for unicode group strings And the annoying: 'modify a task with group
filtering on and magically all tasks become visible' bug. There is also some
cleanup for the priority selection box in here somewhere.


Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/todo-manager/todo-manager/ChangeLog.txt,v
retrieving revision 1.35.2.5
retrieving revision 1.35.2.6
diff -u -d -r1.35.2.5 -r1.35.2.6
--- ChangeLog.txt	9 Mar 2003 17:20:49 -0000	1.35.2.5
+++ ChangeLog.txt	14 Mar 2003 17:57:45 -0000	1.35.2.6
@@ -1,5 +1,10 @@
 ToDo Manager Change Log
 
+Version 0.70.2:
+	* Groups with multilingual characters no longer cause an exception
+	* Modifying the task list with group filtering on will no longer cause all
+	  tasks to be shown
+
 Version 0.70.1 (03/08/2003):
 	* Task group listings are now correct after opening a file
 

Index: interface.py
===================================================================
RCS file: /cvsroot/todo-manager/todo-manager/interface.py,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -u -d -r1.39 -r1.39.2.1
--- interface.py	2 Jan 2003 02:42:37 -0000	1.39
+++ interface.py	14 Mar 2003 17:57:45 -0000	1.39.2.1
@@ -29,6 +29,7 @@
 		self._font = None
 		self.__sorting_method = IntVar()
 		self.__filter_method = IntVar()
+		self.__current_group = None
 		self.__disable_finish = IntVar()
 		self.__view_calendar = IntVar()
 		self.__calendar_filter = IntVar()
@@ -306,6 +307,7 @@
 			self.update_groups()
 
 		else:
+			self.__current_group = None
 			self._groupList = Label(self._extrasframe, bd=0, width=0)
 			self._groupList.grid()
 			self._groupScroll = Label(self._extrasframe, bd=0, width=0)
@@ -557,7 +559,7 @@
 		self._finished['text'] = _("Finished")
 		self.__modified_name = FALSE
 
-	def OnDisplayPriorityDropdown(self, x, y):
+	def OnDisplayPriorityDropdown(self, event=None):
 		dd = self.__priority_dropdown
 		dd.withdraw()	# Incase it's already displayed
 		dd.focus_set()
@@ -611,11 +613,10 @@
 		filter_method = self.__filter_method.get()
 
 		# Get the group that is currently active
-		g = None
 		if self.__view_group_list.get():
 			i = self._groupList.curselection()
 			if len(i) > 0:
-				g = self._groupList.get(int(i[0]))
+				self.__current_group = self._groupList.get(int(i[0]))
 
 		# The sorting and filter settings must be in the range of the available values
 		# If they aren't, set them to 0
@@ -631,7 +632,7 @@
 			self.__filter_method.set(0)
 			f = 0
 
-		self._app.set_ui_sorting_filter(self, s, f, g)
+		self._app.set_ui_sorting_filter(self, s, f, self.__current_group)
 
 	def OnExit(self, event=None):
 		self.save_config()
@@ -657,8 +658,7 @@
 			tags=(tag, ptag))
 
 		# Tag bindings
-		canvas.tag_bind(ptag, '<Button-1>', lambda e, s=self, x=x, y=y:
-			s.OnDisplayPriorityDropdown(100, 100))
+		canvas.tag_bind(ptag, '<Button-1>', self.OnDisplayPriorityDropdown)
 
 	def draw_finished_box(self, canvas, row, column, x, y, tag):
 		name = self._taskList.get_column_text(row, 1)

Index: main.py
===================================================================
RCS file: /cvsroot/todo-manager/todo-manager/main.py,v
retrieving revision 1.67.2.3
retrieving revision 1.67.2.4
diff -u -d -r1.67.2.3 -r1.67.2.4
--- main.py	6 Mar 2003 05:17:52 -0000	1.67.2.3
+++ main.py	14 Mar 2003 17:57:46 -0000	1.67.2.4
@@ -812,7 +812,9 @@
 
 		# If a group was specified get all tasks in that group
 		if group and (group != 'ALL'):
+			group = unicode_to_utf8(group)
 			new_tasks = []
+
 			for t in tasks:
 				if group in t["Group"]: new_tasks.append(t)