[elj-commits] CVS: dev/svene/notes notes_tree_view.e,1.1,1.2

[Sven E. <sv...@us...>]

Update of /cvsroot/elj/dev/svene/notes
In directory sc8-pr-cvs1:/tmp/cvs-serv7020

Modified Files:
	notes_tree_view.e 
Log Message:
using new images


Index: notes_tree_view.e
===================================================================
RCS file: /cvsroot/elj/dev/svene/notes/notes_tree_view.e,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** notes_tree_view.e	26 Dec 2002 13:06:14 -0000	1.1
--- notes_tree_view.e	27 Dec 2002 19:30:18 -0000	1.2
***************
*** 199,203 ****
  		end
  
! 	add_child (a_parent_item: WX_TREE_ITEM; a_name: STRING; a_tree: NOTES_TREE) is
  			-- Add new child element to `a_parent_item'.
  		require
--- 199,203 ----
  		end
  
! 	add_child (a_parent_item: WX_TREE_ITEM; a_name: STRING; a_tree: NOTES_TREE; a_is_folder: BOOLEAN) is
  			-- Add new child element to `a_parent_item'.
  		require
***************
*** 209,213 ****
  		do
  			create a_new_item.make
! 			append_item (a_parent_item, a_name, -1, -1, a_tree.to_pointer, a_new_item)
  			model.tree_elements.put (a_tree, a_tree.to_pointer)
  			expand (a_parent_item)
--- 209,217 ----
  		do
  			create a_new_item.make
! 			if a_is_folder then
! 				append_item (a_parent_item, a_name, 0, 1, a_tree.to_pointer, a_new_item)
! 			else
! 				append_item (a_parent_item, a_name, 2, -1, a_tree.to_pointer, a_new_item)
! 			end
  			model.tree_elements.put (a_tree, a_tree.to_pointer)
  			expand (a_parent_item)
***************
*** 248,252 ****
  			t: NOTES_TREE
  			n: NOTES_NOTE
! 			s : STRING
  		do
  			from
--- 252,256 ----
  			t: NOTES_TREE
  			n: NOTES_NOTE
! 			a_is_folder: BOOLEAN
  		do
  			from
***************
*** 259,268 ****
  				if t /= Void then
  					n := t.cell_item
! 					if not n.item.is_equal ("") then
! 						s := "[" + n.name + "]"
! 					else
! 						s := n.name
! 					end
! 					add_child (a_item, s, t)
  					load_tree_internal (last_item, t)
  				end
--- 263,268 ----
  				if t /= Void then
  					n := t.cell_item
! 					a_is_folder := n.item.is_equal ("")
! 					add_child (a_item, n.name, t, a_is_folder)
  					load_tree_internal (last_item, t)
  				end
***************
*** 292,302 ****
  			i: INTEGER
  		do
! 			create names.from_collection ( <<"16red_close.bmp", "16red_close_cross.bmp",
! 					"16red_open.bmp","16red_open_cross.bmp", "16blue_close.bmp","16blue_close_cross.bmp",
! 					"16blue_open.bmp","16blue_open_cross.bmp" >>)
  			from
  				i := 1
  			until
! 				i > 8
  			loop
  				create bitmap.make_load(names.item(i), wxBITMAP_TYPE_BMP)				
--- 292,301 ----
  			i: INTEGER
  		do
! 			create names.from_collection ( <<"res/win32/folder_closed.bmp", "res/win32/folder_open.bmp"
! 				"res/win32/note1.bmp">>)
  			from
  				i := 1
  			until
! 				i > names.count
  			loop
  				create bitmap.make_load(names.item(i), wxBITMAP_TYPE_BMP)				
***************
*** 306,311 ****
  				i := i + 1
  			end
- 		ensure
- 			eight_images_added: a_image_list.image_count = 8
  		end
  
--- 305,308 ----