Author: mvidner Date: Tue Apr 10 15:44:18 2012 New Revision: 67875 URL: http://svn.opensuse.org/viewcvs/yast?rev=67875&view=rev Log: removing dependencies on network: includes, textdomain Modified: trunk/proxy/src/clients/proxy.ycp trunk/proxy/src/clients/proxy_auto.ycp trunk/proxy/src/clients/proxy_proposal.ycp trunk/proxy/src/modules/Proxy.ycp Modified: trunk/proxy/src/clients/proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/clients/proxy.ycp?rev=67875&r1=67874&r2=67875&view=diff ============================================================================== --- trunk/proxy/src/clients/proxy.ycp (original) +++ trunk/proxy/src/clients/proxy.ycp Tue Apr 10 15:44:18 2012 @@ -12,7 +12,7 @@ { -textdomain "network"; +textdomain "proxy"; /* The main () */ y2milestone("----------------------------------------"); Modified: trunk/proxy/src/clients/proxy_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/clients/proxy_auto.ycp?rev=67875&r1=67874&r2=67875&view=diff ============================================================================== --- trunk/proxy/src/clients/proxy_auto.ycp (original) +++ trunk/proxy/src/clients/proxy_auto.ycp Tue Apr 10 15:44:18 2012 @@ -21,7 +21,7 @@ { -textdomain "network"; +textdomain "proxy"; y2milestone("----------------------------------------"); y2milestone("Proxy auto started"); Modified: trunk/proxy/src/clients/proxy_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/clients/proxy_proposal.ycp?rev=67875&r1=67874&r2=67875&view=diff ============================================================================== --- trunk/proxy/src/clients/proxy_proposal.ycp (original) +++ trunk/proxy/src/clients/proxy_proposal.ycp Tue Apr 10 15:44:18 2012 @@ -13,7 +13,7 @@ { -textdomain "network"; +textdomain "proxy"; /* The main () */ y2milestone("----------------------------------------"); Modified: trunk/proxy/src/modules/Proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/modules/Proxy.ycp?rev=67875&r1=67874&r2=67875&view=diff ============================================================================== --- trunk/proxy/src/modules/Proxy.ycp (original) +++ trunk/proxy/src/modules/Proxy.ycp Tue Apr 10 15:44:18 2012 @@ -13,13 +13,12 @@ { module "Proxy"; -textdomain "network"; +textdomain "proxy"; import "Summary"; import "Progress"; - -include "network/routines.ycp"; -include "network/runtime.ycp"; +import "Mode"; +import "Popup"; global boolean proposal_valid = false; global boolean write_only = false; @@ -41,11 +40,28 @@ * Display popup at the end of the proxy configuration * @param modified true if proxy settings have been modified */ -define void ProxyFinishPopup(boolean modified) ``{ +void ProxyFinishPopup(boolean modified) { + if(!modified) return; -string text = _("It is recommended to relogin to make new proxy settings effective."); + /* Popup headline */ + string head = _("Proxy Configuration Successfully Saved"); + string text = _("It is recommended to relogin to make new proxy settings effective."); + Popup::AnyMessage(head, text); +} - FinishPopup(modified, "proxy", text, "", []); +/** + * Create comment for changed file + * @param modul YaST2 module changing the file + * @return comment + * @example ChangedComment("lan") -> # Changed by YaST2 module lan 1.1.2000" + */ +string ChangedComment(string modul) { + string ret = "\n# Changed by YaST2"; + if(modul != nil && modul != "") ret = ret + " module " + modul; + map out = (map)SCR::Execute(.target.bash_output, "/bin/date '+%x'"); + string date = out["stdout"]:""; + if(date != "") ret = ret + " " + date; + return ret; } /** @@ -118,7 +134,8 @@ Progress::New(caption, " ", size(steps), steps, [], ""); - ProgressNextStage(_("Updating proxy configuration...")); + Progress::NextStage(); + Progress::Title(_("Updating proxy configuration...")); /* Update /etc/sysconfig/proxy */ SCR::Write(.sysconfig.proxy.PROXY_ENABLED, enabled?"yes":"no"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org