Comments remap, undoremap ...

3 files changed, 22 insertions, 22 deletions

diff --git a/evolution/menu_reorganization.py b/evolution/menu_reorganization.py
index b3122fd..7a55115 100644
--- a/evolution/menu_reorganization.py
+++ b/evolution/menu_reorganization.py
@@ -28,17 +28,17 @@ from ldtputils import *
 def select_mail(fldr,subject):
 	try:
 		log('select mail in a folder','teststart')
-		remap('evolution','frmEvolution-Mail')
-		if selectrowpartialmatch('frmEvolution-Mail','ttblMailFolderTree',fldr) == 1:
+		#remap('evolution','frmEvolution-Mail')
+		if selectrowpartialmatch('frmEvolution-*','ttblMailFolderTree',fldr) == 1:
 			log('Folder selected','info')
-			if selectrow('frmEvolution-Mail','ttblMessageList',subject) == 1:
+			if selectrow('frmEvolution-*','ttblMessages',subject) == 1:
 				log('Mail selected','info')
-				undoremap('evolution','frmEvolution-Mail')
+				#undoremap('evolution','frmEvolution-Mail')
 				log('select mail in a folder','testend')
 				return 1
 			else:
 				log('Unable to select the mail','error')
-				undoremap('evolution','frmEvolution-Mail')
+				#undoremap('evolution','frmEvolution-Mail')
 				log('select mail in a folder','testend')
 				return 0
 	except:
diff --git a/evolution/print.py b/evolution/print.py
index 7f73e3a..6ce80f6 100755
--- a/evolution/print.py
+++ b/evolution/print.py
@@ -33,39 +33,39 @@ def print_msg(fldr, subject, printer):
 		log('Print a message','teststart')
 		windowname = 'dlgPrintMessage'
 		if select_mail (fldr,subject) == 1:
-			remap('evolution','frmEvolution-Mail')
-			selectmenuitem('frmEvolution-Mail','mnuFile;mnuPrint')
+			#remap('evolution','frmEvolution-Mail')
+			selectmenuitem('frmEvolution-*','mnuFile;mnuPrint')
 			if waittillguiexist(windowname)	== 1:
 				time.sleep(3)
 				if selectrow(windowname,'tbl0',printer): 
 					print 'Printing message : '+fldr+' -> '+subject
 					
 					log('The print window has emerged, hence verified','info')
-					remap('evolution',windowname)
+					#remap('evolution',windowname)
 					time.sleep(3)
 					click(windowname,'btnCancel')
 #					click(windowname,'btnPrint')
-					undoremap('evolution',windowname)
+					#undoremap('evolution',windowname)
 				else:
 					log('Unable to find the print window','cause')
 					log('Print a message','testend')		
-					undoremap('evolution','frmEvolution-Mail')
+					#undoremap('evolution','frmEvolution-Mail')
 					raise LdtpExecutionError (0)
 			else:
 				log('Unable to find the print window','cause')
 				log('Print a message','testend')		
-				undoremap('evolution','frmEvolution-Mail')
+				#undoremap('evolution','frmEvolution-Mail')
 				raise LdtpExecutionError (0)
 		else:
 			log('Unable to find the fldr/mail','cause')
 			log('Print a message','testend')		
-			undoremap('evolution','frmEvolution-Mail')
+			#undoremap('evolution','frmEvolution-Mail')
 			raise LdtpExecutionError (0)
-		undoremap('evolution','frmEvolution-Mail')
+		#undoremap('evolution','frmEvolution-Mail')
 	except:
 		log('Unable to print the message','error')
 		log('Print a message','testend')		
-		undoremap('evolution','frmEvolution-Mail')
+		#undoremap('evolution','frmEvolution-Mail')
 		raise LdtpExecutionError (0)
 		
 # Read data from xml file.
diff --git a/evolution/print_preview.py b/evolution/print_preview.py
index 8f61c76..c2409dc 100644
--- a/evolution/print_preview.py
+++ b/evolution/print_preview.py
@@ -32,28 +32,28 @@ def print_preview(fldr, subject):
 		log('Print preview','teststart')
 		windowname = 'frmPrintPreview'
 		if select_mail (fldr,subject) == 1:
-			remap('evolution','frmEvolution-Mail')
-			selectmenuitem('frmEvolution-Mail','mnuFile;mnuPrintPreview')
+			#remap('evolution','frmEvolution-Mail')
+			selectmenuitem('frmEvolution-*','mnuFile;mnuPrintPreview')
 			if waittillguiexist(windowname)	== 1:
 				time.sleep(3)
 				print 'Previewing message : '+fldr+' -> '+subject
 				log('The print Preview window has emerged, hence verified','info')
-				remap('evolution',windowname)
+				#remap('evolution',windowname)
 				click(windowname,'btnclose')
-				undoremap('evolution',windowname)
+				#undoremap('evolution',windowname)
 			else:
 				log('Unable to find the print preview window','cause')
 				log('Print preview','testend')		
-				undoremap('evolution','frmEvolution-Mail')
+				#undoremap('evolution','frmEvolution-Mail')
 		else:
 			log('Unable to find the fldr/mail','cause')
 			log('Print preview','testend')		
-			undoremap('evolution','frmEvolution-Mail')
-		undoremap('evolution','frmEvolution-Mail')
+			#undoremap('evolution','frmEvolution-Mail')
+		#undoremap('evolution','frmEvolution-Mail')
 	except:
 		log('Unable to preview the message','error')
 		log('Print preview','testend')		
-		undoremap('evolution','frmEvolution-Mail')
+		#undoremap('evolution','frmEvolution-Mail')
 		
 	log('Print preview','testend')
 # Read data from xml file.