[Amsn-commits] msn abook.tcl,1.157,1.158

[Philippe V. - P. <lep...@us...>]

Update of /cvsroot/amsn/msn
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15055

Modified Files:
	abook.tcl 
Log Message:
GUI option for ignore feature...


Index: abook.tcl
===================================================================
RCS file: /cvsroot/amsn/msn/abook.tcl,v
retrieving revision 1.157
retrieving revision 1.158
diff -C2 -d -r1.157 -r1.158
*** abook.tcl	30 Apr 2006 16:16:34 -0000	1.157
--- abook.tcl	30 Apr 2006 21:14:34 -0000	1.158
***************
*** 1006,1010 ****
  
  	proc showUserProperties { email } {
! 		global colorval_$email showcustomsmileys_$email
  		set w ".user_[::md5::md5 $email]_prop"
  		if { [winfo exists $w] } {
--- 1006,1010 ----
  
  	proc showUserProperties { email } {
! 		global colorval_$email showcustomsmileys_$email ignorecontact_$email
  		set w ".user_[::md5::md5 $email]_prop"
  		if { [winfo exists $w] } {
***************
*** 1115,1118 ****
--- 1115,1119 ----
  		set colorval_$email [::abook::getContactData $email customcolor] 
  		set showcustomsmileys_$email [::abook::getContactData $email showcustomsmileys]
+ 		set ignorecontact_$email [::abook::getContactData $email ignored]
  
  		#frame $nbIdent.customcolorf.col -width 40 -bd 0 -relief flat\
***************
*** 1205,1224 ****
  		
  		checkbutton $nbIdent.showcustomsmileys -variable showcustomsmileys_$email -text "[trans custshowcustomsmileys]"
  		#the -columnspan option is here so that the checkbutton fills more space
  		grid $nbIdent.showcustomsmileys -row 8 -sticky w -columnspan 4
  	
! 		grid $nbIdent.g -row 9 -column 0 -pady 5 -padx 5 -sticky w
! 		grid $nbIdent.g1 -row 10 -column 0 -sticky e
! 		grid $nbIdent.g2 -row 10 -column 1 -sticky w
  		
! 		grid $nbIdent.titlephones -row 11 -column 0 -pady 5 -padx 5 -columnspan 2 -sticky w 
! 		grid $nbPhone.phh -row 12 -column 0 -sticky e
! 		grid $nbPhone.phh1 -row 12 -column 1 -sticky w
! 		grid $nbPhone.phw -row 13 -column 0 -sticky e
! 		grid $nbPhone.phw1 -row 13 -column 1 -sticky w
! 		grid $nbPhone.phm -row 14 -column 0 -sticky e
! 		grid $nbPhone.phm1 -row 14 -column 1 -sticky w
! 		grid $nbPhone.php -row 15 -column 0 -sticky e
! 		grid $nbPhone.php1 -row 15 -column 1 -sticky w
  		
  		grid $nbIdent.titleothers -row 20 -column 0 -pady 5 -padx 5 -columnspan 2 -sticky w 
--- 1206,1227 ----
  		
  		checkbutton $nbIdent.showcustomsmileys -variable showcustomsmileys_$email -text "[trans custshowcustomsmileys]"
+ 		checkbutton $nbIdent.ignoreuser -variable ignorecontact_$email -text "[trans ignorecontact]"
  		#the -columnspan option is here so that the checkbutton fills more space
  		grid $nbIdent.showcustomsmileys -row 8 -sticky w -columnspan 4
+ 		grid $nbIdent.ignoreuser -row 9 -sticky w -columnspan 4
  	
! 		grid $nbIdent.g -row 10 -column 0 -pady 5 -padx 5 -sticky w
! 		grid $nbIdent.g1 -row 11 -column 0 -sticky e
! 		grid $nbIdent.g2 -row 11 -column 1 -sticky w
  		
! 		grid $nbIdent.titlephones -row 12 -column 0 -pady 5 -padx 5 -columnspan 2 -sticky w 
! 		grid $nbPhone.phh -row 13 -column 0 -sticky e
! 		grid $nbPhone.phh1 -row 13 -column 1 -sticky w
! 		grid $nbPhone.phw -row 14 -column 0 -sticky e
! 		grid $nbPhone.phw1 -row 14 -column 1 -sticky w
! 		grid $nbPhone.phm -row 15 -column 0 -sticky e
! 		grid $nbPhone.phm1 -row 15 -column 1 -sticky w
! 		grid $nbPhone.php -row 16 -column 0 -sticky e
! 		grid $nbPhone.php1 -row 16 -column 1 -sticky w
  		
  		grid $nbIdent.titleothers -row 20 -column 0 -pady 5 -padx 5 -columnspan 2 -sticky w 
***************
*** 1404,1408 ****
  	
  	proc PropDestroyed { email w win } {
! 		global colorval_$email showcustomsmileys_$email
  
  		if { $w == $win } {
--- 1407,1411 ----
  	
  	proc PropDestroyed { email w win } {
! 		global colorval_$email showcustomsmileys_$email ignorecontact_$email
  
  		if { $w == $win } {
***************
*** 1414,1417 ****
--- 1417,1421 ----
  			catch {unset colorval_$email}
  			catch {unset showcustomsmileys_$email}
+ 			catch {unset ignorecontact_$email}
  		}
  	}
***************
*** 1495,1499 ****
  
  	proc PropOk { email w } {
! 		global colorval_$email showcustomsmileys_$email
  		
  		if {[::alarms::SaveAlarm $email] != 0 } {
--- 1499,1503 ----
  
  	proc PropOk { email w } {
! 		global colorval_$email showcustomsmileys_$email ignorecontact_$email
  		
  		if {[::alarms::SaveAlarm $email] != 0 } {
***************
*** 1505,1510 ****
  
  		# Store custom display information options
! 		::abook::setAtomicContactData $email [list customnick customfnick cust_p4c_name customcolor showcustomsmileys] \
! 			[list [$nbIdent.customnick.ent get] [$nbIdent.customfnick.ent get] [$nbIdent.ycustomfnick.ent get] [set colorval_$email] [set showcustomsmileys_$email]]
  
  		# Store custom notification options
--- 1509,1514 ----
  
  		# Store custom display information options
! 		::abook::setAtomicContactData $email [list customnick customfnick cust_p4c_name customcolor showcustomsmileys ignored] \
! 			[list [$nbIdent.customnick.ent get] [$nbIdent.customfnick.ent get] [$nbIdent.ycustomfnick.ent get] [set colorval_$email] [set showcustomsmileys_$email] [set ignorecontact_$email]]
  
  		# Store custom notification options