Comments remap, undoremap...

8 files changed, 135 insertions, 132 deletions

diff --git a/evolution/composerprefs.py b/evolution/composerprefs.py
index 00fd82a..d827f4c 100644
--- a/evolution/composerprefs.py
+++ b/evolution/composerprefs.py
@@ -45,7 +45,7 @@ def addnewsignature(name,text):
             #undoremap ('evolution',window_id)
             time.sleep (1)
             #remap ('evolution',window_id)
-            click (window_id,'btnAdd2')
+            click (window_id,'btnAdd1')
             waittillguiexist ('frmEditsignature')
             time.sleep (1)
         except:
@@ -88,7 +88,7 @@ def fillinsignaturevalues (name,text):
         raise LdtpExecutionError (0)
 
 def verifysignature (name,text):
-    window_id='dlgEvolutionSettings'
+    window_id='dlgEvolutionPreferences'
     try:
         selectrow (window_id,'tblSignatures',name)
     except:
@@ -96,7 +96,7 @@ def verifysignature (name,text):
         raise LdtpExecutionError (0)
     try:
         time.sleep (1)
-        click (window_id,'btnEdit2')
+        click (window_id,'btnEdit1')
         waittillguiexist ('frmEditsignature')
         if verifysettext ('frmEditSignature','txt0',name) ==0:
             log ('Name not set properly','cause')
@@ -114,23 +114,24 @@ def edit_signature (name,text,newname=''):
     try:
         #selectMailPane()
         try:
-            selectmenuitem ('frmEvolution-Mail','mnuEdit;mnuPreferences')
-            window_id='dlgEvolutionSettings'
+            selectmenuitem ('frmEvolution-*','mnuEdit;mnuPreferences')
+            window_id='dlgEvolutionPreferences'
             waittillguiexist (window_id)
             time.sleep (1)
-            selecttab ('dlgEvolutionSettings', 'ptl0', 'Composer Preferences')
+            selecttab ('dlgEvolutionPreferences', 'ptl0', 'Composer Preferences')
             time.sleep (1)
-            remap ('evolution',window_id)
-            selecttab ('dlgEvolutionSettings', 'ptl2','Signatures')
-            undoremap ('evolution',window_id)
+            #remap ('evolution',window_id)
+            selecttab ('dlgEvolutionPreferences', 'ptl2','Signatures')
+            #undoremap ('evolution',window_id)
             time.sleep (1)
-            remap ('evolution',window_id)
+            #remap ('evolution',window_id)
             try:
-                selectrow ('dlgEvolutionSettings','tblSignatures',name)
+                selectrow ('dlgEvolutionPreferences','tblSignatures',name)
             except:
                 log ('signature not present','cause')
                 raise LdtpExecutionError (0)
-            click (window_id,'btnEdit2')
+            time.sleep (1)
+            click (window_id,'btnEdit1')
             waittillguiexist ('frmEditsignature')
             time.sleep (1)
         except:
@@ -145,7 +146,7 @@ def edit_signature (name,text,newname=''):
         log ('Edit Signature failed','error')
         log ('Edit Signature','testend')
         raise LdtpExecutionError (0)
-    undoremap ('evolution',window_id)
+    #undoremap ('evolution',window_id)
     log ('Edit Signature','testend')
 
 
@@ -206,13 +207,13 @@ def format_in_HTML ():
         text='aaaa'
         #selectMailPane()
         try:
-            selectmenuitem ('frmEvolution-Mail','mnuEdit;mnuPreferences')
-            window_id='dlgEvolutionSettings'
+            selectmenuitem ('frmEvolution-*','mnuEdit;mnuPreferences')
+            window_id='dlgEvolutionPreferences'
             waittillguiexist (window_id)
             time.sleep (1)
             selecttab (window_id, 'ptl0', 'Composer Preferences')
             time.sleep (1)
-            remap ('evolution',window_id)
+            #remap ('evolution',window_id)
             #selecttab (window_id, 'ptl2','General')
             check (window_id,'chkFormatmessagesinHTML')
             time.sleep (1)
@@ -224,22 +225,22 @@ def format_in_HTML ():
             raise LdtpExecutionError (0)
 
         click (window_id,'btnClose')
-        undoremap ('evolution',window_id)
+        #undoremap ('evolution',window_id)
         #verification
         
         try:
-            selectmenuitem ('frmEvolution-Mail','mnuFile;mnuNew;mnuMailMessage')
-            waittillguiexist ('frmComposeamessage')
-            settextvalue ('frmComposeamessage','txtTo',to)
-            settextvalue ('frmComposeamessage','txt6',text)
+            selectmenuitem ('frmEvolution-*','mnuFile;mnuNew;mnuMailMessage')
+            waittillguiexist ('frmComposeMessage')
+            settextvalue ('frmComposeMessage','txtTo',to)
+            settextvalue ('frmComposeMessage','txt6',text)
             settextvalue ('frmComposeamessage','txtSubject','Test for HTML formatting')
             setcontext ('Compose a message','Test for HTML formatting')
-            click ('frmComposeamessage','btnSend')
+            click ('frmComposeMessage','btnSend')
             time.sleep (2)
             if guiexist ('dlgEvolutionQuery') != 1:
                 log ('Warning for HTML formatting did not come up','cause')
                 raise LdtpExecutionError (0)
-            remap ('evolution','dlgEvolutionQuery')
+            #remap ('evolution','dlgEvolutionQuery')
             click ('dlgEvolutionQuery','btnCancel')
             closecomposewindow (0)
         except:
@@ -249,13 +250,13 @@ def format_in_HTML ():
         #undo setting HTML formatting
         try:
             
-            selectmenuitem ('frmEvolution-Mail','mnuEdit;mnuPreferences')
-            window_id='dlgEvolutionSettings'
+            selectmenuitem ('frmEvolution-*','mnuEdit;mnuPreferences')
+            window_id='dlgEvolutionPreferences'
             waittillguiexist (window_id)
             time.sleep (1)
             selecttab (window_id, 'ptl0', 'Composer Preferences')
             time.sleep (1)
-            remap ('evolution',window_id)
+            #remap ('evolution',window_id)
             #selecttab (window_id, 'ptl2','General')
             uncheck (window_id,'chkFormatmessagesinHTML')
         except:
@@ -263,7 +264,7 @@ def format_in_HTML ():
             raise LdtpExecutionError (0)
 
         click (window_id,'btnClose')
-        undoremap ('evolution',window_id)
+        #undoremap ('evolution',window_id)
     except:
         log ('setting default HTML formatting failed','error')
         log ('format messages in HTML','testend')
@@ -328,13 +329,13 @@ def forwardstyle(fldr,subject):
     try:
         #selectMailPane()
         try:
-            selectmenuitem ('frmEvolution-Mail','mnuEdit;mnuPreferences')
-            window_id='dlgEvolutionSettings'
+            selectmenuitem ('frmEvolution-*','mnuEdit;mnuPreferences')
+            window_id='dlgEvolutionPreferences'
             waittillguiexist (window_id)
             time.sleep (1)
             selecttab (window_id, 'ptl0', 'Composer Preferences')
             time.sleep (1)
-            remap ('evolution',window_id)
+            #remap ('evolution',window_id)
             for combo in getobjectlist (window_id):
                 if combo in ['cboQuoted','cboAttachment','cboInline']:
                     break
@@ -344,9 +345,9 @@ def forwardstyle(fldr,subject):
             time.sleep (2)
             selectrowpartialmatch ('frmEvolution-Mail','ttblMailFolderTree',fldr)
             time.sleep (2)
-            selectrow ('frmEvolution-Mail','ttblMessageList',subject)
+            selectrow ('frmEvolution-*','ttblMessages',subject)
             setcontext ('Readonlyframe',subject)
-            selectmenuitem ('frmEvolution-Mail','mnuMessage;mnuOpeninNewWindow')
+            selectmenuitem ('frmEvolution-*','mnuMessage;mnuOpeninNewWindow')
             waittillguiexist ('frmReadonly')
             time.sleep (2)
             text = getsentmailtext ()
@@ -355,7 +356,7 @@ def forwardstyle(fldr,subject):
             releasecontext ()
             click ('frmEvolution-Mail','btnForward')                        
             setcontext ('Compose a message','[Fwd: '+subject+']')
-            waittillguiexist ('frmComposeamessage')
+            waittillguiexist ('frmComposeMessage')
             time.sleep (2)
             fwdtext=getmailtext ()
             if fwdtext == '':
@@ -364,31 +365,31 @@ def forwardstyle(fldr,subject):
                 log ('Forward style - Attachment not proper','cause')
                 raise LdtpExecutionError (0)
 
-            selectmenuitem ('frmComposeamessage','mnuFile;mnuClose')
-            waittillguinotexist ('frmComposeamessage')
+            selectmenuitem ('frmComposeMessage','mnuFile;mnuClose')
+            waittillguinotexist ('frmComposeMessage')
             #undoremap ('evolution',window_id)
         except:
             log ('Forward style Attachment failed','error')
             raise LdtpExecutionError (0)
 
         try:            
-            selectmenuitem ('frmEvolution-Mail','mnuEdit;mnuPreferences')
-            window_id='dlgEvolutionSettings'
+            selectmenuitem ('frmEvolution-*','mnuEdit;mnuPreferences')
+            window_id='dlgEvolutionPreferences'
             waittillguiexist (window_id)
             remap ('evolution',window_id)
             time.sleep (1)
             selecttab (window_id, 'ptl0', 'Composer Preferences')
             time.sleep (1)
             #undoremap ('evolution',window_id)
-            remap ('evolution',window_id)
+            #remap ('evolution',window_id)
             for combo in getobjectlist (window_id):
                 if combo in ['cboQuoted','cboAttachment','cboInline']:
                     break
 
             comboselect (window_id,combo,'Inline')
             click (window_id,'btnClose')
-            click ('frmEvolution-Mail','btnForward')
-            waittillguiexist ('frmComposeamessage')
+            click ('frmEvolution-*','btnForward')
+            waittillguiexist ('frmComposeMessage')
             time.sleep (2)
             fwdtext=getmailtext ()
 #             if len (fwdtext)<36:
@@ -408,8 +409,8 @@ def forwardstyle(fldr,subject):
                 raise LdtpExecutionError (0)
             else:
                 log ('Forward style - Inline works fine','info')
-            selectmenuitem ('frmComposeamessage','mnuFile;mnuClose')
-            waittillguinotexist ('frmComposeamessage')
+            selectmenuitem ('frmComposeMessage','mnuFile;mnuClose')
+            waittillguinotexist ('frmComposeMessage')
             releasecontext()
             #undoremap ('evolution',window_id)
         except:
@@ -428,13 +429,13 @@ def prompt_for_empty_subject(to):
     try:
         #selectMailPane()
         try:
-            selectmenuitem ('frmEvolution-Mail','mnuEdit;mnuPreferences')
-            window_id='dlgEvolutionSettings'
+            selectmenuitem ('frmEvolution-*','mnuEdit;mnuPreferences')
+            window_id='dlgEvolutionPreferences'
             waittillguiexist (window_id)
             time.sleep (1)
             selecttab (window_id, 'ptl0', 'Composer Preferences')
             time.sleep (1)
-            remap ('evolution',window_id)
+            #remap ('evolution',window_id)
             check (window_id,'chkPromptwhensendingmessageswithanemptysubjectline')
             time.sleep (1)
             if verifycheck (window_id,'chkPromptwhensendingmessageswithanemptysubjectline') == 0:
@@ -442,20 +443,20 @@ def prompt_for_empty_subject(to):
                 raise LdtpExecutionError (0)
             click (window_id,'btnClose')
             waittillguinotexist (window_id)
-            undoremap ('evolution',window_id)
+            #undoremap ('evolution',window_id)
         except:
             log ('Unable to Enable prompt for empty subject line','cause')
             raise LdtpExecutionError (0)
 
         try:
-            selectmenuitem ('frmEvolution-Mail','mnuFile;mnuNew;mnuMailMessage')
-            waittillguiexist ('frmComposeamessage')
-            settextvalue ('frmComposeamessage','txtTo',to)
-            click ('frmComposeamessage','btnSend')
+            selectmenuitem ('frmEvolution-*','mnuFile;mnuNew;mnuMailMessage')
+            waittillguiexist ('frmComposeMessage')
+            settextvalue ('frmComposeMessage','txtTo',to)
+            click ('frmComposeMessage','btnSend')
             if waittillguiexist ('dlgEvolutionQuery') == 0:
                 log ('Prompt did not appear','cause')
                 raise LdtpExecutionError (0)
-            remap ('evolution','dlgEvolutionQuery')
+            #remap ('evolution','dlgEvolutionQuery')
             time.sleep (1)
             click ('dlgEvolutionQuery','btnSend')
             #undoremap ('evolution','dlgEvolutionQuery')
diff --git a/evolution/evoutils/mail.py b/evolution/evoutils/mail.py
index e330dfb..760f235 100644
--- a/evolution/evoutils/mail.py
+++ b/evolution/evoutils/mail.py
@@ -84,7 +84,6 @@ def populate_mail_header (to=[], subject=[], body=[], cc = [], bcc = []):
         if to and setandverify ('frmComposeMessage', 'txtTo', to) == 0:
             log ('Failed to insert text into To field','error')
             raise LdtpExecutionError (0)
-	print "HERE"    
         if cc:
 	    check ('frmComposeMessage','mnuCcField')
 	    if setandverify ('frmComposeMessage', 'txtCc', cc) == 0:
@@ -254,17 +253,17 @@ def apply_template(template):
 
 def getmailtext():
     try:
-        window_id='frmComposeamessage'
+        window_id='frmComposeMessage'
         if guiexist (window_id) != 1:
 	    log ('Compose window not open','cause')
 	    raise LdtpExecutionError (0)
         numchild=getpanelchildcount(window_id,'pnlPanelcontainingHTML')
-	remap ('evolution',window_id)
+	#remap ('evolution',window_id)
 	text=''
 	for val in range (6,6+numchild):
 	    text+=gettextvalue(window_id,'txt'+str(val))
 	    text+='\n'
-	undoremap ('evolution',window_id)
+	#undoremap ('evolution',window_id)
     except:
         log ('could not get text from Compose Window','error')
 	raise LdtpExecutionError (0)
@@ -276,9 +275,9 @@ def getmailtext():
 
 def getrowindex(subject):
     try:
-        noofchild=getrowcount ('frmEvolution-Mail','ttblMessageList')
+        noofchild=getrowcount ('frmEvolution-*','ttblMessages')
 	for ind in range (noofchild):
-	    if getcellvalue ('frmEvolution-Mail','ttblMessageList',ind,4) == subject:
+	    if getcellvalue ('frmEvolution-*','ttblMessages',ind,4) == subject:
 	        return ind
 	if ind == noofchild-1:
 	    log ('Message not present','cause')
@@ -291,8 +290,9 @@ def getrowindex(subject):
 def go_offline():
     log ('Go Offline','teststart')
     try:
-        window_id=getcurwindow()
-        remap ('evolultion',window_id)
+        #window_id=getcurwindow()
+        window_id = 'frmEvolution-*'
+        #remap ('evolultion',window_id)
         flag=False
         for x in getobjectlist(window_id):
             if x == 'mnuWorkOffline':
@@ -306,10 +306,10 @@ def go_offline():
             log ('already offline','info')
             log ('Go Offline','testend')
             return
-        undoremap ('evolution',window_id)
+        #undoremap ('evolution',window_id)
 	time.sleep (1)
         flag=False
-        remap ('evolution',window_id)
+        #remap ('evolution',window_id)
         for x in getobjectlist (window_id):
             if x == 'mnuWorkOnline':
                 flag=True
@@ -317,7 +317,7 @@ def go_offline():
         if flag == False:
             log ('Work Online not available','cause')
             raise LdtpExecutionError (0)
-        undoremap ('evolution',window_id)
+        #undoremap ('evolution',window_id)
     except:
         log ('Could not go offline','error')
         log ('Go Offline','testend')
@@ -328,8 +328,9 @@ def go_offline():
 def go_online ():
     log ('Go Online','teststart')
     try:
-        window_id=getcurwindow()
-        remap ('evolultion',window_id)
+        #window_id=getcurwindow()
+        window_id = 'frmEvolution-*'
+        #remap ('evolultion',window_id)
         flag=False
         for x in getobjectlist(window_id):
             if x == 'mnuWorkOnline':
@@ -343,10 +344,10 @@ def go_online ():
             log ('already online','info')
             log ('Go Online','testend')
             return
-        undoremap ('evolution',window_id)
+        #undoremap ('evolution',window_id)
 	time.sleep (1)
         flag=False
-        remap ('evolution',window_id)
+        #remap ('evolution',window_id)
         for x in getobjectlist (window_id):
             if x == 'mnuWorkOffline':
                 flag=True
@@ -354,7 +355,7 @@ def go_online ():
         if flag == False:
             log ('Work Offline not available','cause')
             raise LdtpExecutionError (0)
-        undoremap ('evolution',window_id)
+        #undoremap ('evolution',window_id)
     except:
         log ('Could not go Online','error')
         log ('Go Online','testend')
diff --git a/evolution/evoutils/mailpreferences.py b/evolution/evoutils/mailpreferences.py
index 0198aee..38d9efa 100644
--- a/evolution/evoutils/mailpreferences.py
+++ b/evolution/evoutils/mailpreferences.py
@@ -29,22 +29,22 @@ from ldtputils import *
 def change_style (type, style):
 	try:
 		if type == 'Forward':
-			component = 'cboAttachment'
+			component = 'cboForwardstyle'
 		else:
 			style = style + ' original message'
 			component = 'cboQuoteoriginalmessage'
 	
-		selectmenuitem ('frmEvolution-Mail', 'mnuEdit;mnuPreferences')
+		selectmenuitem ('frmEvolution-*', 'mnuEdit;mnuPreferences')
 		time.sleep (3)
-		if waittillguiexist ('dlgEvolutionSettings') == 0:
+		if waittillguiexist ('dlgEvolutionPreferences') == 0:
 			log ('Evolution Settings dialog not opened', 'error')
 			raise LdtpExecutionError (0)
 	
-		selecttab ('dlgEvolutionSettings', 'ptl0', 'Composer Preferences')	
-		selecttab ('dlgEvolutionSettings', 'ptl2', 'General')
-		comboselect ('dlgEvolutionSettings', component, style)
-		click ('dlgEvolutionSettings', 'btnClose')
-		if waittillguinotexist ('dlgEvolutionSettings') == 0:
+		selecttab ('dlgEvolutionPreferences', 'ptl0', 'Composer Preferences')	
+		selecttab ('dlgEvolutionPreferences', 'ptl2', 'General')
+		comboselect ('dlgEvolutionPreferences', component, style)
+		click ('dlgEvolutionPreferences', 'btnClose')
+		if waittillguinotexist ('dlgEvolutionPreferences') == 0:
 			log ('Evolution Settings dialog not closed', 'error')
 			raise LdtpExecutionError (0)
 	except ldtp.error, msg:
diff --git a/evolution/findandreplace.py b/evolution/findandreplace.py
index 7e535bc..4721234 100644
--- a/evolution/findandreplace.py
+++ b/evolution/findandreplace.py
@@ -36,11 +36,11 @@ except:
     raise LdtpExecutionError (0)
 
 try:
-    selectMailPane()
-    window_id='frmEvolution-Mail'
+    #selectMailPane()
+    window_id='frmEvolution-*'
     selectmenuitem (window_id,'mnuFile;mnuNew;mnuMailMessage')
-    waittillguiexist ('frmComposeamessage')
-    settextvalue ('frmComposeamessage','txt6',text[0])
+    waittillguiexist ('frmComposeMessage')
+    settextvalue ('frmComposeMessage','txt6',text[0])
 except:
     log ('Unable to set text','cause')
     raise LdtpExecutionError (0)
diff --git a/evolution/forward-mail.py b/evolution/forward-mail.py
index 4b6e0cd..904bdad 100644
--- a/evolution/forward-mail.py
+++ b/evolution/forward-mail.py
@@ -80,8 +80,8 @@ def forward_mail (source_fldr, mail_index, to, body, subject_new, cc, refimg):
 	except ldtp.error, msg:
 		log ('Forward messsage Failed ' + str (msg), 'cause')
 		log ('Forward Mail Failed', 'fail')
-		if guiexist ('frmComposeamessage'):
-			selectmenuitem ('frmComposeamessage', 'mnuFile;mnuClose')
+		if guiexist ('frmComposeMessage'):
+			selectmenuitem ('frmComposeMessage', 'mnuFile;mnuClose')
 		raise LdtpExecutionError (0)
 
 # Reading Input from File
diff --git a/evolution/mailaccounts.py b/evolution/mailaccounts.py
index 089f1c3..2d64a59 100644
--- a/evolution/mailaccounts.py
+++ b/evolution/mailaccounts.py
@@ -65,9 +65,9 @@ def deletemailaccount (account_name):
 def verifyaccountexist (account_name):
     try:
         print account_name
-        numofchild=getrowcount ('dlgEvolutionSettings','tblMailAccountsTable')
+        numofchild=getrowcount ('dlgEvolutionPreferences','tblMailAccounts')
         for num in range (numofchild):
-            if getcellvalue ('dlgEvolutionSettings','tblMailAccountsTable',num,1).startswith (account_name):
+            if getcellvalue ('dlgEvolutionPreferences','tblMailAccounts',num,1).startswith (account_name):
                 print num
                 return num
 
@@ -81,21 +81,21 @@ def enablemailaccount (account_name):
     log ('Enable Mail Account','teststart')
     try:
         try:
-            selectmenuitem ('frmEvolution-Mail','mnuEdit;mnuPreferences')
-            waittillguiexist ('dlgEvolutionSettings')
+            selectmenuitem ('frmEvolution-*','mnuEdit;mnuPreferences')
+            waittillguiexist ('dlgEvolutionPreferences')
             index=verifyaccountexist (account_name)
             if index==-1:                                 
                 raise LdtpExecutionError (0)
-            selectrowpartialmatch ('dlgEvolutionSettings','tblMailAccountsTable',account_name)
+            selectrowpartialmatch ('dlgEvolutionPreferences','tblMailAccounts',account_name)
         except:
             log ('Account not present','cause')
             raise LdtpExecutionError (0)
 
         try:
-            selectrow ('dlgEvolutionSettings','tblMailAccountsTable',name)
+            selectrow ('dlgEvolutionPreferences','tblMailAccounts',name)
             time.sleep (2)
-            checkrow ('dlgEvolutionSettings','tblMailAccountsTable',index,0)
-            checkrow ('dlgEvolutionSettings','tblMailAccountsTable',index,0)
+            checkrow ('dlgEvolutionPreferences','tblMailAccounts',index,0)
+            checkrow ('dlgEvolutionPreferences','tblMailAccounts',index,0)
         except:
             log ('Unable to enable Mail Account','cause')
             raise LdtpExecutionError (0)
@@ -103,7 +103,7 @@ def enablemailaccount (account_name):
         #verification
 
         try:
-            selectrowpartialmatch ('frmEvolution-Mail','ttblMailFolderTree',account_name)
+            selectrowpartialmatch ('frmEvolution-*','ttblMailFolderTree',account_name)
         except:
             log ('Enable Account','fail')
             raise LdtpExecutionError (0)
@@ -120,20 +120,20 @@ def disablemailaccount (account_name):
     log ('Disable Mail Account','teststart')
     try:
         try:
-            selectmenuitem ('frmEvolution-Mail','mnuEdit;mnuPreferences')
-            waittillguiexist ('dlgEvolutionSettings')
+            selectmenuitem ('frmEvolution-*','mnuEdit;mnuPreferences')
+            waittillguiexist ('dlgEvolutionPreferences')
             index=verifyaccountexist (account_name)
             if index==-1:                                 
                 raise LdtpExecutionError (0)
-            selectrowpartialmatch ('dlgEvolutionSettings','tblMailAccountsTable',account_name)
+            selectrowpartialmatch ('dlgEvolutionPreferences','tblMailAccounts',account_name)
             time.sleep (2)
         except:
             log ('Account not present','cause')
             raise LdtpExecutionError (0)
 
         try:
-            uncheckrow ('dlgEvolutionSettings','tblMailAccountsTable',index,0)
-            uncheckrow ('dlgEvolutionSettings','tblMailAccountsTable',index,0)
+            uncheckrow ('dlgEvolutionPreferences','tblMailAccounts',index,0)
+            uncheckrow ('dlgEvolutionPreferences','tblMailAccounts',index,0)
         except:
             log ('Unable to disable Mail Account','cause')
             raise LdtpExecutionError (0)
@@ -142,11 +142,11 @@ def disablemailaccount (account_name):
 
         try:
             print account_name
-            selectrowpartialmatch ('frmEvolution-Mail','ttblMailFolderTree',account_name)
+            selectrowpartialmatch ('frmEvolution-*','ttblMailFolderTree',account_name)
         except:
             log ('Disable Account','pass')
             log ('Disable Mail Account','testend')
-            click ('dlgEvolutionSettings','btnClose')
+            click ('dlgEvolutionPreferences','btnClose')
             return
         log ('Disable Account','fail')
         raise LdtpExecutionError (0)
@@ -161,21 +161,21 @@ def makedefault (account_name):
     try:
         time.sleep (3)
         try:
-            selectmenuitem ('frmEvolution-Mail','mnuEdit;mnuPreferences')
-            waittillguiexist ('dlgEvolutionSettings')
+            selectmenuitem ('frmEvolution-*','mnuEdit;mnuPreferences')
+            waittillguiexist ('dlgEvolutionPreferences')
             index=verifyaccountexist (account_name)
             if index==-1:                                 
                 raise LdtpExecutionError (0)
-            selectrowpartialmatch ('dlgEvolutionSettings','tblMailAccountsTable',account_name)
+            selectrowpartialmatch ('dlgEvolutionPreferences','tblMailAccounts',account_name)
             time.sleep (2)
         except:
             log ('Account not present','cause')
             raise LdtpExecutionError (0)
 
         try:
-            click ('dlgEvolutionSettings','btnDefault')
+            click ('dlgEvolutionPreferences','btnDefault')
             time.sleep (2)
-            name=getcellvalue ('dlgEvolutionSettings','tblMailAccountsTable',index,1)
+            name=getcellvalue ('dlgEvolutionPreferences','tblMailAccounts',index,1)
             desired_name=account_name+' '+'[Default]'
             if name == desired_name:
                 log ('Set Default','pass')
@@ -188,7 +188,7 @@ def makedefault (account_name):
         log ('Make Account default failed','error')
         log ('Make Mail account default','testend')
         raise LdtpExecutionError (0)
-    click ('dlgEvolutionSettings','btnClose')
+    click ('dlgEvolutionPreferences','btnClose')
     log ('Make Mail account default','testend')
 
 
diff --git a/evolution/mailtests.py b/evolution/mailtests.py
index 8167f24..5e3519c 100644
--- a/evolution/mailtests.py
+++ b/evolution/mailtests.py
@@ -303,7 +303,7 @@ def background_image_test (to,bgimage,ref_image):
         subject=['background image test']
         body=['background image test']
         #selectMailPane()
-        window_id='frmEvolution-Mail'
+        window_id='frmEvolution-*'
         time.sleep (2)
         #remap ('evolution',window_id)
         selectrowpartialmatch (window_id,'ttblMailFolderTree','Sent')
@@ -608,7 +608,7 @@ def text_formatting_test(to,ref_image):
     try:
         subject=['bold,italic,strikethrough test']
         #selectMailPane()
-        window_id='frmEvolution-Mail'
+        window_id='frmEvolution-*'
         #remap ('evolution',window_id)
         selectrowpartialmatch (window_id,'ttblMailFolderTree','Sent')
         sent_mail_count=getrowcount (window_id,'ttblMessages')
@@ -618,28 +618,28 @@ def text_formatting_test(to,ref_image):
         time.sleep (1)
         selectmenuitem ('frmComposeMessage','mnuFormat;mnuStyle;mnuBold')
         settextvalue ('frmComposeMessage','txt6','Hello\n')
-        remap ('evolution','frmComposeMessage')
+        #remap ('evolution','frmComposeMessage')
         selectmenuitem ('frmComposeMessage','mnuFormat;mnuStyle;mnuItalic')
         settextvalue ('frmComposeMessage','txt7','Hello\n')
-        undoremap ('evolution','frmComposeMessage')
-        remap ('evolution','frmComposeMessage')
-        selectmenuitem ('frmComposeMessage','mnuFormat;mnuStyle;mnuItalic')
+        #undoremap ('evolution','frmComposeMessage')
+        #remap ('evolution','frmComposeMessage')
+        #selectmenuitem ('frmComposeMessage','mnuFormat;mnuStyle;mnuItalic')
         settextvalue ('frmComposeMessage','txt8','Hello\n')
-        undoremap ('evolution','frmComposeMessage')
-        remap ('evolution','frmComposeMessage')
+        #undoremap ('evolution','frmComposeMessage')
+        #remap ('evolution','frmComposeMessage')
         selectmenuitem ('frmComposeMessage','mnuFormat;mnuStyle;mnuStrikeout')
         settextvalue ('frmComposeMessage','txt9','Hello\n')
-        undoremap ('evolution','frmComposeMessage')
-        remap ('evolution','frmComposeMessage')
+        #undoremap ('evolution','frmComposeMessage')
+        #remap ('evolution','frmComposeMessage')
         settextvalue ('frmComposeMessage','txt10','Hello')
         selectmenuitem ('frmComposeMessage','mnuFormat;mnuAlignment;mnuCenter')
         settextvalue ('frmComposeMessage','txt10','Hello\n')
-        undoremap ('evolution','frmComposeMessage')
-        remap ('evolution','frmComposeMessage')
+        #undoremap ('evolution','frmComposeMessage')
+        #remap ('evolution','frmComposeMessage')
         settextvalue ('frmComposeMessage','txt11','Hello')
         selectmenuitem ('frmComposeMessage','mnuFormat;mnuAlignment;mnuRight')
         settextvalue ('frmComposeMessage','txt11','Hello\n')
-        undoremap ('evolution','frmComposeMessage')
+        #undoremap ('evolution','frmComposeMessage')
         populate_mail_header ([to],subject)
         #undoremap ('evolution',window_id)
         sendmail (subject)
@@ -676,7 +676,7 @@ def lists_test(to,ref_image):
     try:
         subject=['Compose editor List test']
         #selectMailPane()
-        window_id='frmEvolution-Mail'
+        window_id='frmEvolution-*'
         selectmenuitem (window_id,'mnuFile;mnuNew;mnuMailMessage')
         selectrowpartialmatch (window_id,'ttblMailFolderTree','Sent')
         #remap ('evolution',window_id)
@@ -686,18 +686,18 @@ def lists_test(to,ref_image):
         time.sleep (1)
         selectmenuitem ('frmComposeMessage','mnuFormat;mnuHeading;mnuBulletedList')
         settextvalue ('frmComposeMessage','txt6','Hello\nHello\nHello\n')
-        remap ('evolution','frmComposeMessage')
+        #remap ('evolution','frmComposeMessage')
         selectmenuitem ('frmComposeMessage','mnuFormat;mnuHeading;mnuNumberedList')
         settextvalue ('frmComposeMessage','txt9','Hello\nHello\nHello\n')
-        undoremap ('evolution','frmComposeMessage')
-        remap ('evolution','frmComposeMessage')
+        #undoremap ('evolution','frmComposeMessage')
+        #remap ('evolution','frmComposeMessage')
         selectmenuitem ('frmComposeMessage','mnuFormat;mnuHeading;mnuAlphabeticalList')
         settextvalue ('frmComposeMessage','txt12','Hello\nHello\nHello\n')
-        undoremap ('evolution','frmComposeMessage')
-        remap ('evolution','frmComposeMessage')
+        #undoremap ('evolution','frmComposeMessage')
+        #remap ('evolution','frmComposeMessage')
         selectmenuitem ('frmComposeMessage','mnuFormat;mnuHeading;mnuRomanNumeralList')
         settextvalue ('frmComposeMessage','txt15','Hello\nHello\nHello\n')
-        undoremap ('evolution','frmComposeMessage')
+        #undoremap ('evolution','frmComposeMessage')
         populate_mail_header ([to],subject)
         sendmail (subject)
         click ('frmEvolution-Mail', 'btnSend/Receive')
@@ -732,28 +732,29 @@ def fonts_test(to,ref_image):
     try:
         subject=['Compose editor Fonts test']
         #selectMailPane()
-        window_id='frmEvolution-Mail'
-        selectmenuitem (window_id,'mnuFile;mnuNew;mnuMailMessage')
+        window_id='frmEvolution-*'
+        #selectmenuitem (window_id,'mnuFile;mnuNew;mnuMailMessage')
         #remap ('evolution',window_id)
         selectrowpartialmatch (window_id,'ttblMailFolderTree','Sent')
         #remap ('evolution',window_id)
         sent_mail_count=getrowcount (window_id,'ttblMessages')
+        selectmenuitem (window_id,'mnuFile;mnuNew;mnuMailMessage')
         waittillguiexist ('frmComposeMessage')
         check ('frmComposeMessage','mnuHTML')
         time.sleep (1)
         settextvalue ('frmComposeMessage','txt6','Hello\n')
-        remap ('evolution','frmComposeMessage')
+        #remap ('evolution','frmComposeMessage')
         selectmenuitem ('frmComposeMessage','mnuFormat;mnuFontSize;mnu+1')
         settextvalue ('frmComposeMessage','txt7','Hello\n')
-        undoremap ('evolution','frmComposeMessage')
-        remap ('evolution','frmComposeMessage')
+        #undoremap ('evolution','frmComposeMessage')
+        #remap ('evolution','frmComposeMessage')
         selectmenuitem ('frmComposeMessage','mnuFormat;mnuFontSize;mnu+2')
         settextvalue ('frmComposeMessage','txt8','Hello\n')
-        undoremap ('evolution','frmComposeMessage')
-        remap ('evolution','frmComposeMessage')
+        #undoremap ('evolution','frmComposeMessage')
+        #remap ('evolution','frmComposeMessage')
         selectmenuitem ('frmComposeMessage','mnuFormat;mnuFontSize;mnu+3')
         settextvalue ('frmComposeMessage','txt9','Hello\n')
-        undoremap ('evolution','frmComposeMessage')
+        #undoremap ('evolution','frmComposeMessage')
         populate_mail_header ([to],subject)
         sendmail (subject)
         click ('frmEvolution-Mail', 'btnSend/Receive')
diff --git a/evolution/offline.py b/evolution/offline.py
index 93d0e36..6382b50 100644
--- a/evolution/offline.py
+++ b/evolution/offline.py
@@ -365,7 +365,7 @@ def create_folder_when_offline (fldr,location=''):
     log ('create folder while offline','teststart')
     try:
         go_offline ()
-        selectmenuitem ('frmEvolution-Mail','mnuFile;mnuNew;mnuMailFolder')
+        selectmenuitem ('frmEvolution-*','mnuFile;mnuNew;mnuMailFolder')
         #selectMailPane()
     except:
         log ('unable to select Mailpane','error')