Author: varkoly Date: Tue Jan 6 09:47:34 2009 New Revision: 54387 URL: http://svn.opensuse.org/viewcvs/yast?rev=54387&view=rev Log: make the progress wizard by WriteDiealog visable clean up code Modified: trunk/mail/src/MailServer.ycp trunk/mail/src/mail-server_complex.ycp trunk/mail/src/mail-server_dialogs.ycp Modified: trunk/mail/src/MailServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/MailServer.ycp?rev=54387&r1=54386&r2=54387&view=diff ============================================================================== --- trunk/mail/src/MailServer.ycp (original) +++ trunk/mail/src/MailServer.ycp Tue Jan 6 09:47:34 2009 @@ -582,7 +582,7 @@ else { return false; - } + } } Service::Enable("amavis"); Service::Enable("clamd"); Modified: trunk/mail/src/mail-server_complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_complex.ycp?rev=54387&r1=54386&r2=54387&view=diff ============================================================================== --- trunk/mail/src/mail-server_complex.ycp (original) +++ trunk/mail/src/mail-server_complex.ycp Tue Jan 6 09:47:34 2009 @@ -127,6 +127,8 @@ */ symbol WriteDialog() { + Wizard::CreateDialog (); + Wizard::SetDesktopIcon("mail"); Wizard::RestoreHelp(HELPS["write"]:""); boolean ret = MailServer::Write(); return ret ? `next : `abort; Modified: trunk/mail/src/mail-server_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_dialogs.ycp?rev=54387&r1=54386&r2=54387&view=diff ============================================================================== --- trunk/mail/src/mail-server_dialogs.ycp (original) +++ trunk/mail/src/mail-server_dialogs.ycp Tue Jan 6 09:47:34 2009 @@ -658,7 +658,7 @@ term MailPreventionDialog(string CID, string CIDRBL) { - y2milestone("--Start MailTransportsDialog ---"); + y2milestone("--Start MailPreventionDialog ---"); list<term> AccessItems= []; list<term> RBLItems = []; string BasicProtection = (string)MailServer::MailPrevention["BasicProtection"]:""; @@ -671,8 +671,7 @@ boolean BasicProtectionMedium = false; boolean BasicProtectionHard = true; -y2milestone("---- MailPrevention %1",MailServer::MailPrevention); -y2milestone("---- VSCount %1",VSCount); + y2milestone("---- VSCount %1",VSCount); if(BasicProtection == "off"){ BasicProtectionOff = true; @@ -701,9 +700,9 @@ SpamL = `Left(`CheckBox (`id(`SpamLearning), `opt(`notify), _("Configure Spam Learning Extension"), SpamLearning)); } term content = `VBox ( - `Left(`CheckBox (`id(`VirusScanning), `opt(`notify), _("Start Virus Scanner AMAVIS"), VirusScanning)), + `Left(`CheckBox (`id(`VirusScanning), `opt(`notify), _("Start Virus Scanner AMAVIS"), VirusScanning)), `VSpacing (1), - `Left(`IntField (`id(`VSCount), `opt(`notify), _("Count of Virsus Scanner Process"), 1,50,VSCount)), + `Left(`IntField (`id(`VSCount), `opt(`notify), _("Count of Virsus Scanner Process"), 1,50,VSCount)), `VSpacing (1), SpamL, `VSpacing (1), @@ -1349,6 +1348,10 @@ ret = event["ID"]:nil; EventType = event["EventType"]:nil; +y2milestone("event %1",event); +y2milestone("event %1",ret); +y2milestone("FocusedContent %1",FocusedContent); + if(ret == `cancel || ret == `abort ) { if(ReallyAbort()) break; else continue; @@ -1655,9 +1658,6 @@ focus_changed = true; FocusedContent ="MailLocalDomains"; } -y2milestone("event %1",event); -y2milestone("event %1",ret); -y2milestone("FocusedContent %1",FocusedContent); if(ret != `cancel && ret != `abort && ret != `next ) { Wizard::SetContents(title, content ,helptext, false, true); Wizard::SetDesktopIcon("mail"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org