August 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r40534 - in /trunk/squid/src: Squid.ycp complex.ycp
by dfiser＠svn.opensuse.org 28 Aug '07

28 Aug '07

Author: dfiser Date: Tue Aug 28 14:22:43 2007 New Revision: 40534 URL: http://svn.opensuse.org/viewcvs/yast?rev=40534&view=rev Log: Changed Read dialog to show more than one stage. Removed Back button in MainDialog. Modified: trunk/squid/src/Squid.ycp trunk/squid/src/complex.ycp Modified: trunk/squid/src/Squid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Squid.ycp?rev=40534&r1… ============================================================================== --- trunk/squid/src/Squid.ycp (original) +++ trunk/squid/src/Squid.ycp Tue Aug 28 14:22:43 2007 @@ -982,22 +982,22 @@ boolean ok = true; if (!readHttpPorts()) ok = false; - Progress::NextStep(); + Progress::NextStage(); if (!readRefreshPatterns()) ok = false; - Progress::NextStep(); + Progress::NextStage(); if (!readACLs()) ok = false; - Progress::NextStep(); + Progress::NextStage(); if (!readHttpAccesses()) ok = false; - Progress::NextStep(); + Progress::NextStage(); if (!readRestSetting()) ok = false; - Progress::NextStep(); + Progress::NextStage(); if (!readServiceStatus()) ok = false; - Progress::NextStep(); + Progress::NextStage(); return ok; } @@ -1012,8 +1012,18 @@ Progress::New(_("Initializing squid Configuration"), " ", 6, - [_("Read the settings.")], - [_("Reading the setting ...")], + [_("Read HTTP Ports from config file."), + _("Read Refresh Patterns from config file."), + _("Read ACL Groups from config file."), + _("Read Access Control table from config file."), + _("Read the rest settings."), + _("Read service status.")], + [_("Reading HTTP Ports ..."), + _("Reading Refresh Patterns ..."), + _("Reading ACL Groups ..."), + _("Reading Access Control table ..."), + _("Reading the rest settings ..."), + _("Reading service status ...")], ""); if(Abort()) return false; Modified: trunk/squid/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/complex.ycp?rev=40534&… ============================================================================== --- trunk/squid/src/complex.ycp (original) +++ trunk/squid/src/complex.ycp Tue Aug 28 14:22:43 2007 @@ -267,8 +267,8 @@ "widget_descr" : widget_descr, "screens" : screens, "functions" : $[`abort : ReallyAbort], - "back_button" : Label::BackButton(), - "next_button" : Label::FinishButton(), + "back_button" : "", + "next_button" : Label::AcceptButton(), "abort_button" : Label::AbortButton() ]); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40533 - in /trunk/squid/src: Squid.ycp complex.ycp dialogs.ycp handlers.ycp wizards.ycp
by dfiser＠svn.opensuse.org 28 Aug '07

28 Aug '07

Author: dfiser Date: Tue Aug 28 13:59:33 2007 New Revision: 40533 URL: http://svn.opensuse.org/viewcvs/yast?rev=40533&view=rev Log: Added possibility to enable/disable service (bug #304271). Changed some button labels. Modified: trunk/squid/src/Squid.ycp trunk/squid/src/complex.ycp trunk/squid/src/dialogs.ycp trunk/squid/src/handlers.ycp trunk/squid/src/wizards.ycp Modified: trunk/squid/src/Squid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Squid.ycp?rev=40533&r1… ============================================================================== --- trunk/squid/src/Squid.ycp (original) +++ trunk/squid/src/Squid.ycp Tue Aug 28 13:59:33 2007 @@ -55,6 +55,12 @@ boolean modified = false; /** + * Is service enabled? + */ +boolean service_enabled = false; + + +/** * Map of all configuration settings except consequential. Format: * $[ "parameter name" : [ list of options (rest of line) ] * ... @@ -366,6 +372,18 @@ } +/******* SERVICE *******/ +global boolean IsServiceEnabled() +{ + return service_enabled; +} + +global void SetServiceEnabled(boolean enabled) +{ + service_enabled = enabled; +} +/******* SERVICE END **/ + /******* ACL *******/ global list<map<string,any> > GetACLs() { @@ -953,6 +971,12 @@ return ok; } +boolean readServiceStatus() +{ + service_enabled = Service::Enabled("squid"); + return true; +} + boolean readAllSettings() { boolean ok = true; @@ -972,6 +996,9 @@ if (!readRestSetting()) ok = false; Progress::NextStep(); + if (!readServiceStatus()) ok = false; + Progress::NextStep(); + return ok; } @@ -984,7 +1011,7 @@ Progress::New(_("Initializing squid Configuration"), " ", - 5, + 6, [_("Read the settings.")], [_("Reading the setting ...")], ""); @@ -1000,6 +1027,7 @@ y2debug("Squid::Read - acls: %1", acls); y2debug("Squid::Read - refresh_patterns: %1", refresh_patterns); y2debug("Squid::Read - settings: %1", settings); + y2debug("Squid::Read - enabled: %1", service_enabled); y2milestone("================ Setting END =================="); /* Error message */ @@ -1231,6 +1259,16 @@ return ok; } +global boolean EnableService() +{ + return Service::Enable("squid"); +} + +global boolean DisableService() +{ + return Service::Disable("squid"); +} + /** * Write all squid settings * @return true on success @@ -1268,6 +1306,10 @@ ok = false; } + //enabling / disabling service + if (service_enabled == true) EnableService(); + if (service_enabled == false) DisableService(); + // start Service if(Abort()) return false; Progress::NextStage (); Modified: trunk/squid/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/complex.ycp?rev=40533&… ============================================================================== --- trunk/squid/src/complex.ycp (original) +++ trunk/squid/src/complex.ycp Tue Aug 28 13:59:33 2007 @@ -86,11 +86,20 @@ } - string main_caption = _("Squid"); map<string, map<string, any> > widget_descr = $[ - "start_stop" : CWMServiceStart::CreateStartStopWidget ($[ + "auto_start" : CWMServiceStart::CreateAutoStartWidget($[ + "get_service_auto_start" : Squid::IsServiceEnabled, + "set_service_auto_start" : Squid::SetServiceEnabled, + "start_auto_button" : _("When &Booting"), + "start_manual_button" : _("&Manually"), + "help" : sformat(CWMServiceStart::AutoStartHelpTemplate(), + _("When Booting"), + _("Manually") + ) + ]), + "start_stop" : CWMServiceStart::CreateStartStopWidget($[ "service_id" : "squid", "service_running_label" : _("Squid is running"), "service_not_running_label" : _("Squid is not running"), @@ -108,7 +117,7 @@ // TRANSLATORS: part of help text - push button label, NO SHORTCUT!!! _("Save Settings and Restart Squid Now") ) - ]), + ]), "http_ports_table" : $[ "widget" : `custom, @@ -181,10 +190,13 @@ map<string, map<string, any> > screens = $[ "s1" : $[ - "widget_names" : ["start_stop"], + "widget_names" : ["auto_start", "start_stop"], "contents" : `HBox( `HSpacing(3), - "start_stop", + `VBox( + "auto_start", + "start_stop" + ), `HSpacing(3) ), "caption" : main_caption + ": " + _("Start-Up"), @@ -247,13 +259,8 @@ list<string> ids_order = ["s1", "s2", "s3", "s4", "s5", "s6", "s7"]; string initial_screen = "s1"; -any MainDialog(boolean start_up_dialog) +any MainDialog() { - if (!start_up_dialog){ - ids_order = remove(ids_order, 0); - initial_screen = "s2"; - } - return DialogTree::ShowAndRun($[ "ids_order" : ids_order, "initial_screen" : initial_screen, Modified: trunk/squid/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/dialogs.ycp?rev=40533&… ============================================================================== --- trunk/squid/src/dialogs.ycp (original) +++ trunk/squid/src/dialogs.ycp Tue Aug 28 13:59:33 2007 @@ -82,22 +82,22 @@ `HBox( `HWeight(1,`VBox( `VWeight(1, `HBox( - `IntField(`id("cache_mem"), _("Cache Memory"), 1, 99999, 10), + `IntField(`id("cache_mem"), _("C&ache Memory"), 1, 99999, 10), sizeUnitWidget("cache_mem_units") )), `VSpacing(0.4), `VWeight(1, `HBox( - `IntField(`id("cache_max_object_size"), _("Max Object Size"), 0, 99999, 0), + `IntField(`id("cache_max_object_size"), _("Ma&x Object Size"), 0, 99999, 0), sizeUnitWidget("cache_max_object_size_units") )), `VSpacing(0.4), `VWeight(1, `HBox( - `IntField(`id("cache_swap_low"), _("Swap Low-Water Mark (in percents)"), 0, 100, 0) + `IntField(`id("cache_swap_low"), _("Swap &Low-Water Mark (in percents)"), 0, 100, 0) )), `VSpacing(0.4), `Left(`VWeight(1, `HBox( `ComboBox(`id("cache_replacement_policy"), - _("Cache Replacement Policy"), + _("&Cache Replacement Policy"), [`item("lru"), `item("heap GDSF"), `item("heap LFUDA"), `item("heap LRU")]) ))) )), @@ -106,17 +106,17 @@ `VWeight(1, `HBox(`Empty())), `VSpacing(0.4), `VWeight(1, `HBox( - `IntField(`id("cache_min_object_size"), _("Min Object Size"), 0, 99999, 0), + `IntField(`id("cache_min_object_size"), _("M&in Object Size"), 0, 99999, 0), sizeUnitWidget("cache_min_object_size_units") )), `VSpacing(0.4), `VWeight(1, `HBox( - `IntField(`id("cache_swap_high"), _("Swap High-Water Mark (in percents)"), 0, 100, 0) + `IntField(`id("cache_swap_high"), _("Swap &High-Water Mark (in percents)"), 0, 100, 0) )), `VSpacing(0.4), `Left(`VWeight(1, `HBox( `ComboBox(`id("memory_replacement_policy"), - _("Memory Replacement Policy"), + _("&Memory Replacement Policy"), [`item("lru"), `item("heap GDSF"), `item("heap LFUDA"), `item("heap LRU")]) ))) )) @@ -126,15 +126,15 @@ `VWeight(1, `Frame(_("Cache Directory"), `VBox( `VSquash(`HBox( - `TextEntry(`id("cache_dir"), _("Cache Directory"), ""), + `TextEntry(`id("cache_dir"), _("Cache &Directory"), ""), `Bottom(`PushButton(`id(`browse_cache_dir), Label::BrowseButton())) )), `VSpacing(0.4), - `IntField(`id("mbytes"), _("Size (in MB)"), 1, 99999, 1), + `IntField(`id("mbytes"), _("&Size (in MB)"), 1, 99999, 1), `VSpacing(0.4), - `IntField(`id("l1dirs"), _("Level 1 Directories"), 1, 99999, 1), + `IntField(`id("l1dirs"), _("L&evel 1 Directories"), 1, 99999, 1), `VSpacing(0.4), - `IntField(`id("l2dirs"), _("Level 2 Directories"), 1, 99999, 1) + `IntField(`id("l2dirs"), _("Le&vel 2 Directories"), 1, 99999, 1) ) )) ), @@ -186,18 +186,18 @@ `Frame(_("Logging"), `VBox( `VSquash(`HBox( - `TextEntry(`id("access_log"), _("Access Log") , ""), + `TextEntry(`id("access_log"), _("&Access Log") , ""), `Bottom(`PushButton(`id(`access_log_browse), Label::BrowseButton())) )), `VSquash(`HBox( - `TextEntry(`id("cache_log"), _("Cache Log"), ""), + `TextEntry(`id("cache_log"), _("&Cache Log"), ""), `Bottom(`PushButton(`id(`cache_log_browse), Label::BrowseButton())) )), `VSquash(`HBox( - `TextEntry(`id("cache_store_log"), _("Cache Store Log"), ""), + `TextEntry(`id("cache_store_log"), _("Cache &Store Log"), ""), `Bottom(`PushButton(`id(`cache_store_log_browse), Label::BrowseButton())) )), - `Left(`CheckBox(`id("emulate_httpd_log"), _("Emulate Httpd Log?"))) + `Left(`CheckBox(`id("emulate_httpd_log"), _("&Emulate Httpd Log?"))) ) ); } @@ -208,11 +208,11 @@ `Frame(_("Timeouts"), `VBox( `HBox( - `IntField(`id("connect_timeout"), _("Connection timeout"), 0, 99999, 0), + `IntField(`id("connect_timeout"), _("Connection &Timeout"), 0, 99999, 0), timeUnitWidget("connect_timeout_units") ), `HBox( - `IntField(`id("client_lifetime"), _("Client Lifetime"), 0, 99999, 0), + `IntField(`id("client_lifetime"), _("Client &Lifetime"), 0, 99999, 0), timeUnitWidget("client_lifetime_units") ) ) @@ -225,12 +225,12 @@ return `HVCenter(`Frame(_("Miscellaneous Setting"), `VBox( `ComboBox(`id("error_language"), - _("Language of error messages"), + _("&Language of error messages"), []), `VSpacing(), - `TextEntry(`id("cache_mgr"), _("Administrator's e-mail"), ""), + `TextEntry(`id("cache_mgr"), _("&Administrator's e-mail"), ""), `VSpacing(), - `CheckBox(`id("ftp_passive"), _("Use Ftp Pasive Mode")) + `CheckBox(`id("ftp_passive"), _("&Use Ftp Pasive Mode")) ))); } Modified: trunk/squid/src/handlers.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/handlers.ycp?rev=40533… ============================================================================== --- trunk/squid/src/handlers.ycp (original) +++ trunk/squid/src/handlers.ycp Tue Aug 28 13:59:33 2007 @@ -56,10 +56,7 @@ id_item = DelFromHttpPortsTable((integer)UI::QueryWidget(`id("http_port"), `CurrentItem)); InitHttpPortsTable(""); UI::ChangeWidget(`id("http_port"), `CurrentItem, id_item); - }else{ - return (symbol)ui; } - return nil; } @@ -94,10 +91,7 @@ InitRefreshPatternsTable(""); UI::ChangeWidget(`id("refresh_patterns"), `CurrentItem, id_item); } - }else{ - return (symbol)ui; } - return nil; } @@ -144,10 +138,7 @@ tmp = UI::QueryWidget(`id("cache_swap_high"), `Value); if ((integer)UI::QueryWidget(`id("cache_swap_low"), `Value) > (integer)tmp) UI::ChangeWidget(`id("cache_swap_low"), `Value, tmp); - }else{ - return (symbol)ui; } - return nil; } @@ -196,10 +187,7 @@ InitHttpAccessTable(""); UI::ChangeWidget(`id("http_access"), `CurrentItem, id_item); } - }else{ - return (symbol)ui; } - return nil; } @@ -221,10 +209,7 @@ tmp = UI::AskForExistingFile("/var/log", "*", "Cache Store Log"); if (tmp != nil) UI::ChangeWidget(`id("cache_store_log"), `Value, tmp); - }else{ - return (symbol)ui; } - return nil; } Modified: trunk/squid/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/wizards.ycp?rev=40533&… ============================================================================== --- trunk/squid/src/wizards.ycp (original) +++ trunk/squid/src/wizards.ycp Tue Aug 28 13:59:33 2007 @@ -43,8 +43,8 @@ * Main workflow of the squid configuration * @return sequence result */ -any MainSequence(boolean start_up_dialog) { - map aliases = $[ "main" : ``(MainDialog(start_up_dialog))]; +any MainSequence() { + map aliases = $[ "main" : ``(MainDialog())]; map sequence = $[ "ws_start" : "main", "main" : $[ @@ -65,13 +65,11 @@ map aliases = $[ "read" : [ ``( ReadDialog() ), true ], - "main" : ``( MainSequence(true) ), + "main" : ``( MainSequence() ), "write" : [ ``( WriteDialog() ), true ] ]; - map sequence = $[ - "ws_start" : "read", - "read" : $[ + map sequence = $[ "ws_start" : "read", "read" : $[ `abort : `abort, `next : "main" ], @@ -109,7 +107,7 @@ Wizard::SetContentsButtons(caption, contents, "", Label::BackButton(), Label::NextButton()); - any ret = MainSequence(false); + any ret = MainSequence(); UI::CloseDialog(); return ret; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40532 - /tags/stable-2_15_22/storage/
by fehr＠svn.opensuse.org 28 Aug '07

28 Aug '07

Author: fehr Date: Tue Aug 28 13:24:16 2007 New Revision: 40532 URL: http://svn.opensuse.org/viewcvs/yast?rev=40532&view=rev Log: update Removed: tags/stable-2_15_22/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40531 - /trunk/storage/libstorage/src/EtcFstab.cc
by fehr＠svn.opensuse.org 28 Aug '07

28 Aug '07

Author: fehr Date: Tue Aug 28 13:20:18 2007 New Revision: 40531 URL: http://svn.opensuse.org/viewcvs/yast?rev=40531&view=rev Log: add debug output to fstab handling Modified: trunk/storage/libstorage/src/EtcFstab.cc Modified: trunk/storage/libstorage/src/EtcFstab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EtcFstab.… ============================================================================== --- trunk/storage/libstorage/src/EtcFstab.cc (original) +++ trunk/storage/libstorage/src/EtcFstab.cc Tue Aug 28 13:20:18 2007 @@ -650,6 +650,21 @@ return( line ); } +static void printFile( const string& fname ) + { + y2mil( "name:" << fname ); + ifstream file( fname.c_str() ); + string line; + int count = 1; + getline( file, line ); + while( file.good() ) + { + y2mil( "line:" << count++ << " \"" << line << "\"" ); + getline( file, line ); + } + file.close(); + } + int EtcFstab::flush() { int ret = 0; @@ -786,6 +801,9 @@ } if( !crypttab.removeIfEmpty() ) crypttab.updateFile(); + printFile( prefix + "/fstab" ); + printFile( prefix + "/cryptotab" ); + printFile( prefix + "/crypttab" ); y2milestone( "ret:%d", ret ); return( ret ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40530 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/FileSystems.ycp
by fehr＠svn.opensuse.org 28 Aug '07

28 Aug '07

Author: fehr Date: Tue Aug 28 13:20:05 2007 New Revision: 40530 URL: http://svn.opensuse.org/viewcvs/yast?rev=40530&view=rev Log: rename hotplug to nofail for iSCSI fstab entries (#302158) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/FileSystems.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Aug 28 13:20:05 2007 @@ -1,9 +1,14 @@ ------------------------------------------------------------------- +Tue Aug 28 13:19:11 CEST 2007 - fehr(a)suse.de + +- rename hotplug to nofail for iSCSI fstab entries (#302158) +- version 2.15.22 + +------------------------------------------------------------------- Mon Aug 27 10:34:10 CEST 2007 - fehr(a)suse.de - add missing tools used by libstorage to Requires (#304213) - set default format options also during create (#304699) -- version 2.15.22 ------------------------------------------------------------------- Mon Aug 20 19:25:39 CEST 2007 - fehr(a)suse.de Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/File… ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Tue Aug 28 13:20:05 2007 @@ -1429,7 +1429,7 @@ { if( size(fst_default)>0 ) fst_default = fst_default + ","; - fst_default = fst_default + "hotplug"; + fst_default = fst_default + "nofail"; } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40529 - in /trunk/squid/src: Makefile.am Squid.ycp complex.ycp dialogs.ycp handlers.ycp helps.ycp inits.ycp store_del.ycp wizards.ycp
by dfiser＠svn.opensuse.org 28 Aug '07

28 Aug '07

Author: dfiser Date: Tue Aug 28 12:56:04 2007 New Revision: 40529 URL: http://svn.opensuse.org/viewcvs/yast?rev=40529&view=rev Log: Changed workflow to DialogTree based dialogs. Squid::StartService now uses Service::Restart instead of Service::Reload. Added: trunk/squid/src/handlers.ycp Modified: trunk/squid/src/Makefile.am trunk/squid/src/Squid.ycp trunk/squid/src/complex.ycp trunk/squid/src/dialogs.ycp trunk/squid/src/helps.ycp trunk/squid/src/inits.ycp trunk/squid/src/store_del.ycp trunk/squid/src/wizards.ycp Modified: trunk/squid/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Makefile.am?rev=40529&… ============================================================================== --- trunk/squid/src/Makefile.am (original) +++ trunk/squid/src/Makefile.am Tue Aug 28 12:56:04 2007 @@ -15,7 +15,8 @@ inits.ycp \ store_del.ycp \ SquidACL_local_functions.ycp \ - helper_functions.ycp + helper_functions.ycp \ + handlers.ycp desktop_DATA = \ squid.desktop Modified: trunk/squid/src/Squid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Squid.ycp?rev=40529&r1… ============================================================================== --- trunk/squid/src/Squid.ycp (original) +++ trunk/squid/src/Squid.ycp Tue Aug 28 12:56:04 2007 @@ -1205,7 +1205,7 @@ Report::Error(Message::CannotStartService("squid")); } }else{ - if (!Service::Reload("squid")){ + if (!Service::Restart("squid")){ ok = false; Report::Error(Message::CannotRestartService("squid")); } Modified: trunk/squid/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/complex.ycp?rev=40529&… ============================================================================== --- trunk/squid/src/complex.ycp (original) +++ trunk/squid/src/complex.ycp Tue Aug 28 12:56:04 2007 @@ -31,17 +31,17 @@ textdomain "squid"; -import "Popup"; import "Wizard"; -import "Wizard_hw"; import "Confirm"; - +import "DialogTree"; +import "CWMServiceStart"; import "Squid"; -import "SquidACL"; -import "SquidErrorMessages"; - include "squid/helps.ycp"; +include "squid/dialogs.ycp"; +include "squid/handlers.ycp"; +include "squid/store_del.ycp"; +include "squid/inits.ycp"; @@ -78,7 +78,193 @@ } +void SaveAndRestart() +{ + Wizard::CreateDialog(); + WriteDialog(); + UI::CloseDialog(); +} + +string main_caption = _("Squid"); + +map<string, map<string, any> > widget_descr = $[ + "start_stop" : CWMServiceStart::CreateStartStopWidget ($[ + "service_id" : "squid", + "service_running_label" : _("Squid is running"), + "service_not_running_label" : _("Squid is not running"), + "start_now_button" : _("&Start Squid Now"), + "stop_now_button" : _("S&top Squid Now"), + "save_now_action" : SaveAndRestart, + "save_now_button" : _("Sa&ve Settings and Restart Firewall Now"), + //"start_now_action" : uses the default function + //"stop_now_action" : uses the default function + "help" : sformat (CWMServiceStart::StartStopHelpTemplate (true), + // TRANSLATORS: part of help text - push button label, NO SHORTCUT!!! + _("Start Squid Now"), + // TRANSLATORS: part of help text - push button label, NO SHORTCUT!!! + _("Stop Squid Now"), + // TRANSLATORS: part of help text - push button label, NO SHORTCUT!!! + _("Save Settings and Restart Squid Now") + ) + ]), + + "http_ports_table" : $[ + "widget" : `custom, + "custom_widget" : HttpPortsTableWidget(), + "init" : InitHttpPortsTable, + "handle" : HandleHttpPortsTable, + "help" : HELPS["http_ports"]:"" + ], + + "refresh_patterns_table" : $[ + "widget" : `custom, + "custom_widget" : RefreshPatternsTableWidget(), + "init" : InitRefreshPatternsTable, + "handle" : HandleRefreshPatternsTable, + "help" : HELPS["cache"]:"" + ], + + "cache2_dialog" : $[ + "widget" : `custom, + "custom_widget" : Cache2DialogWidget(), + "init" : InitCache2Dialog, + "handle" : HandleCache2Dialog, + "store" : StoreDataFromCache2Dialog, + "validate_type" : `function, + "validate_function" : ValidateCache2Dialog, + "help" : HELPS["cache2"]:"" + ], + + "acl_groups_table" : $[ + "widget" : `custom, + "custom_widget" : ACLGroupsTableWidget(), + "init" : InitACLGroupsTable, + "handle" : HandleAccessControlDialog, + "help" : HELPS["acl_groups"]:"" + ], + "http_access_table" : $[ + "widget" : `custom, + "custom_widget" : HttpAccessTableWidget(), + "init" : InitHttpAccessTable, + "help" : HELPS["http_access"]:"" + ], + + "logging_frame" : $[ + "widget" : `custom, + "custom_widget" : LoggingFrameWidget(), + "init" : InitLoggingFrame, + "handle" : HandleLoggingFrame, + "store" : StoreDataFromLoggingFrame, + "validate_type" : `function, + "validate_function" : ValidateLoggingFrame, + "help" : HELPS["logging"]:"" + ], + "timeouts_frame" : $[ + "widget" : `custom, + "custom_widget" : TimeoutsFrameWidget(), + "init" : InitTimeoutsFrame, + "help" : HELPS["timeouts"]:"" + ], + + "miscellaneous_frame" : $[ + "widget" : `custom, + "custom_widget" : MiscellaneousFrameWidget(), + "init" : InitMiscellaneousFrame, + "store" : StoreDataFromMiscellaneousFrame, + "validate_type" : `function, + "validate_function" : ValidateMiscellaneousFrame, + "help" : HELPS["miscellaneous"]:"" + ] + ]; + +map<string, map<string, any> > screens = $[ + "s1" : $[ + "widget_names" : ["start_stop"], + "contents" : `HBox( + `HSpacing(3), + "start_stop", + `HSpacing(3) + ), + "caption" : main_caption + ": " + _("Start-Up"), + "tree_item_label" : _("Start-Up") + ], + + "s2" : $[ + "widget_names" : ["http_ports_table"], + "contents" : `VBox("http_ports_table"), + "caption" : main_caption + ": " + _("HTTP Ports Setting"), + "tree_item_label" : _("HTTP Ports") + ], + + "s3" : $[ + "widget_names" : ["refresh_patterns_table"], + "contents" : `VBox("refresh_patterns_table"), + "caption" : main_caption + ": " + _("Refresh Patterns Setting"), + "tree_item_label" : _("Refresh Patterns") + ], + + "s4" : $[ + "widget_names" : ["cache2_dialog"], + "contents" : `VCenter("cache2_dialog"), + "caption" : main_caption + ": " + _("Cache Setting"), + "tree_item_label" : _("Cache Setting") + ], + + "s5" : $[ + "widget_names" : ["acl_groups_table", "http_access_table"], + "contents" : `VBox( + "acl_groups_table", + `VSpacing(), + "http_access_table" + ), + "caption" : main_caption + ": " + _("Access Control Setting"), + "tree_item_label" : _("Access Control") + ], + + "s6" : $[ + "widget_names" : ["logging_frame", "timeouts_frame"], + "contents" : `HBox(`HSpacing(3), + `VBox( + "logging_frame", + `VSpacing(), + "timeouts_frame" + ), + `HSpacing(3)), + "caption" : main_caption + ": " + _("Logging and Timeouts Setting"), + "tree_item_label" : _("Logging and Timeouts") + ], + + "s7" : $[ + "widget_names" : ["miscellaneous_frame"], + "contents" : `VBox("miscellaneous_frame"), + "caption" : main_caption + ": " + _("Miscellaneous Setting"), + "tree_item_label" : _("Miscellaneous") + ] + ]; + +list<string> ids_order = ["s1", "s2", "s3", "s4", "s5", "s6", "s7"]; +string initial_screen = "s1"; + +any MainDialog(boolean start_up_dialog) +{ + if (!start_up_dialog){ + ids_order = remove(ids_order, 0); + initial_screen = "s2"; + } + + return DialogTree::ShowAndRun($[ + "ids_order" : ids_order, + "initial_screen" : initial_screen, + "widget_descr" : widget_descr, + "screens" : screens, + "functions" : $[`abort : ReallyAbort], + "back_button" : Label::BackButton(), + "next_button" : Label::FinishButton(), + "abort_button" : Label::AbortButton() + ]); +} + } /* vim: set sw=4 ts=4 et ft=ycp : */ Modified: trunk/squid/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/dialogs.ycp?rev=40529&… ============================================================================== --- trunk/squid/src/dialogs.ycp (original) +++ trunk/squid/src/dialogs.ycp Tue Aug 28 12:56:04 2007 @@ -32,83 +32,27 @@ textdomain "squid"; import "Label"; -import "Wizard"; -import "SquidACL"; -include "squid/helps.ycp"; -include "squid/popup_dialogs.ycp"; -include "squid/inits.ycp"; -include "squid/store_del.ycp"; +include "squid/helper_functions.ycp"; -boolean reallyAbort() +term HttpPortsTableWidget() { - if (!Squid::GetModified()) - return true; - if (Popup::ReallyAbort(true)) - return true; - return false; -} - - -any HttpPortsDialog(){ - any ret = nil; - any http_port = nil; - any tmp = nil; - integer id_item = nil; - - term dialog_contents = - `VBox( - `Left(`Label( _("HTTP Ports"))), - `Table(`id("http_port"), `opt(`notify), `header(_("Host"), _("Port"), _("Options"))), - `HBox( - `PushButton(`id(`add), Label::AddButton()), - `PushButton(`id(`del), Label::DeleteButton()), - `PushButton(`id(`edit), Label::EditButton()), - `HStretch() - ) - ); - - Wizard::SetContentsButtons(_("Squid - HTTP Ports Setting"), dialog_contents, HELPS["http_ports"]:"", - Label::BackButton(), Label::NextButton()); - Wizard::DisableBackButton(); - - InitHttpPortsTable(); - - while (true){ - ret = UI::UserInput(); - - y2debug("HttpPortsDialog(): ret == %1",ret); - - if (ret == `next) break; - else if (ret == `abort || ret == `cancel){ - if (reallyAbort()) break; - continue; - }else if (ret == `add){ - if (AddEditHttpPortDialog(nil)) - InitHttpPortsTable(); - }else if (ret == `edit || ret == "http_port"){ - id_item = (integer)UI::QueryWidget(`id("http_port"), `CurrentItem); - if (AddEditHttpPortDialog(id_item)){ - InitHttpPortsTable(); - UI::ChangeWidget(`id("http_port"), `CurrentItem, id_item); - } - }else if (ret == `del){ - id_item = DelFromHttpPortsTable((integer)UI::QueryWidget(`id("http_port"), `CurrentItem)); - InitHttpPortsTable(); - UI::ChangeWidget(`id("http_port"), `CurrentItem, id_item); - } - } - - return ret; + return `VBox( + `Left(`Label( _("HTTP Ports"))), + `Table(`id("http_port"), `opt(`notify), `header(_("Host"), _("Port"), _("Options"))), + `HBox( + `PushButton(`id(`add), Label::AddButton()), + `PushButton(`id(`del), Label::DeleteButton()), + `PushButton(`id(`edit), Label::EditButton()), + `HStretch() + ) + ); } - - -any CacheDialog(){ - any ret = nil; - integer id_item = 0; - term dialog_contents = +term RefreshPatternsTableWidget() +{ + return `VBox( `Left(`Label( _("Refresh Patterns"))), `HBox( @@ -126,61 +70,12 @@ `HStretch() ) ); - - Wizard::SetContentsButtons(_("Squid - Cache Setting"), dialog_contents, HELPS["cache"]:"", - Label::BackButton(), Label::NextButton()); - - InitRefreshPatternsTable(); - - while (true){ - ret = UI::UserInput(); - - y2debug("CacheDialog(): ret == %1",ret); - - if (ret == `next || ret == `back) break; - else if (ret == `abort || ret == `cancel){ - if (reallyAbort()) break; - continue; - }else if (ret == `add){ - if (AddEditRefreshPatternDialog(nil)) - InitRefreshPatternsTable(); - }else if (ret == `edit || ret == "refresh_patterns"){ - id_item = (integer)UI::QueryWidget(`id("refresh_patterns"), `CurrentItem); - if (AddEditRefreshPatternDialog(id_item)){ - InitRefreshPatternsTable(); - UI::ChangeWidget(`id("refresh_patterns"), `CurrentItem, id_item); - } - }else if (ret == `del){ - id_item = DelFromRefreshPatternsTable((integer)UI::QueryWidget(`id("refresh_patterns"), `CurrentItem)); - InitRefreshPatternsTable(); - UI::ChangeWidget(`id("refresh_patterns"), `CurrentItem, id_item); - }else if (ret == `up){ - id_item = MoveUpRefreshPattern((integer)UI::QueryWidget(`id("refresh_patterns"), `CurrentItem)); - if (id_item != nil){ - InitRefreshPatternsTable(); - UI::ChangeWidget(`id("refresh_patterns"), `CurrentItem, id_item); - } - }else if (ret == `down){ - id_item = MoveDownRefreshPattern((integer)UI::QueryWidget(`id("refresh_patterns"), `CurrentItem)); - if (id_item != nil){ - InitRefreshPatternsTable(); - UI::ChangeWidget(`id("refresh_patterns"), `CurrentItem, id_item); - } - } - } - - return ret; } - -any Cache2Dialog(){ - any ret = nil; - string cache_dir = ""; - any tmp = nil; - any tmp2 = nil; - - term dialog_contents = - `VCenter( `HBox( +term Cache2DialogWidget() +{ + return + `HBox( `HSpacing(3), `VBox( `VWeight(1, `Frame(_("Cache Setting"), @@ -244,79 +139,14 @@ )) ), `HSpacing(3) - )); - - Wizard::SetContentsButtons("Squid - Cache Setting 2", dialog_contents, HELPS["cache2"]:"", - Label::BackButton(), Label::NextButton()); - - UI::ChangeWidget(`id("cache_max_object_size"), `Notify, true); - UI::ChangeWidget(`id("cache_min_object_size"), `Notify, true); - UI::ChangeWidget(`id("cache_max_object_size_units"), `Notify, true); - UI::ChangeWidget(`id("cache_min_object_size_units"), `Notify, true); - - UI::ChangeWidget(`id("cache_swap_low"), `Notify, true); - UI::ChangeWidget(`id("cache_swap_high"), `Notify, true); - - InitCache2Dialog(); - - while (true){ - ret = UI::UserInput(); - - y2debug("Cache2Dialog(): ret == %1",ret); - - if (ret == `next || ret == `back){ - if (StoreDataFromCache2Dialog()) - break; - }else if (ret == `abort || ret == `cancel){ - if (reallyAbort()) break; - continue; - }else if (ret == `browse_cache_dir){ - cache_dir = UI::AskForExistingDirectory((string)UI::QueryWidget(`id("cache_dir"), `Value), "Cache Directory"); - if (cache_dir != nil){ - UI::ChangeWidget(`id("cache_dir"), `Value, cache_dir); - } - - //cache_min_object_size <= cache_max_object_size - }else if (ret == "cache_min_object_size" || ret == "cache_min_object_size_units"){ - tmp = (integer)UI::QueryWidget(`id("cache_min_object_size"), `Value) * - unitToMultiple((string)UI::QueryWidget(`id("cache_min_object_size_units"), `Value)); - tmp2 = (integer)UI::QueryWidget(`id("cache_max_object_size"), `Value) * - unitToMultiple((string)UI::QueryWidget(`id("cache_max_object_size_units"), `Value)); - if ((integer)tmp > (integer)tmp2){ - UI::ChangeWidget(`id("cache_max_object_size"), `Value, UI::QueryWidget(`id("cache_min_object_size"), `Value)); - UI::ChangeWidget(`id("cache_max_object_size_units"), `Value, UI::QueryWidget(`id("cache_min_object_size_units"), `Value)); - } - }else if (ret == "cache_max_object_size" || ret == "cache_max_object_size_units"){ - tmp = (integer)UI::QueryWidget(`id("cache_min_object_size"), `Value) * - unitToMultiple((string)UI::QueryWidget(`id("cache_min_object_size_units"), `Value)); - tmp2 = (integer)UI::QueryWidget(`id("cache_max_object_size"), `Value) * - unitToMultiple((string)UI::QueryWidget(`id("cache_max_object_size_units"), `Value)); - if ((integer)tmp > (integer)tmp2){ - UI::ChangeWidget(`id("cache_min_object_size"), `Value, UI::QueryWidget(`id("cache_max_object_size"), `Value)); - UI::ChangeWidget(`id("cache_min_object_size_units"), `Value, UI::QueryWidget(`id("cache_max_object_size_units"), `Value)); - } - - //cache_swap_low <= cache_swap_high - }else if (ret == "cache_swap_low"){ - tmp = UI::QueryWidget(`id("cache_swap_low"), `Value); - if ((integer)tmp > (integer)UI::QueryWidget(`id("cache_swap_high"), `Value)) - UI::ChangeWidget(`id("cache_swap_high"), `Value, tmp); - }else if (ret == "cache_swap_high"){ - tmp = UI::QueryWidget(`id("cache_swap_high"), `Value); - if ((integer)UI::QueryWidget(`id("cache_swap_low"), `Value) > (integer)tmp) - UI::ChangeWidget(`id("cache_swap_low"), `Value, tmp); - } - } - - return ret; + ); } -any AccessControlDialog(){ - any ret = nil; - integer id_item = nil; - term dialog_contents = +term ACLGroupsTableWidget() +{ + return `VBox( `Left(`Label(_("ACL Groups"))), `Table(`id("acl"), `opt(`notify), `header(_("Name"), _("Type"), _("Description"))), @@ -325,10 +155,14 @@ `PushButton(`id(`del_acl), Label::DeleteButton()), `PushButton(`id(`edit_acl), Label::EditButton()), `HStretch() - ), - - `VSpacing(), + ) + ); +} +term HttpAccessTableWidget() +{ + return + `VBox( `Left(`Label(_("Access Control"))), `HBox( `Table(`id("http_access"), `opt(`keepSorting, `notify), `header(_("Allow/Deny"), _("ACL Groups"))), @@ -344,77 +178,11 @@ `HStretch() ) ); - - Wizard::SetContentsButtons(_("Squid - Access Control Setting"), dialog_contents, HELPS["access_control"]:"", - Label::BackButton(), Label::NextButton()); - - InitACLGroupsTable(); - InitHttpAccessTable(); - - while (true){ - ret = UI::UserInput(); - - y2debug("BaseDialog(): ret == %1",ret); - - if (ret == `next || ret == `back) break; - else if (ret == `abort || ret == `cancel){ - if (reallyAbort()) break; - continue; - }else if (ret == `add_acl){ - if (AddEditACLDialog(nil)){ - InitACLGroupsTable(); - } - }else if (ret == `edit_acl || ret == "acl"){ - id_item = (integer)UI::QueryWidget(`id("acl"), `CurrentItem); - if (AddEditACLDialog(id_item)){ - InitACLGroupsTable(); - UI::ChangeWidget(`id("acl"), `CurrentItem, id_item); - } - }else if (ret == `del_acl){ - id_item = DelFromACLGroupsTable((integer)UI::QueryWidget(`id("acl"), `CurrentItem)); - InitACLGroupsTable(); - UI::ChangeWidget(`id("acl"), `CurrentItem, id_item); - - }else if (ret == `add_http_access){ - if (AddEditHttpAccessDialog(nil)){ - InitHttpAccessTable(); - } - }else if (ret == `edit_http_access || ret == "http_access"){ - id_item = (integer)UI::QueryWidget(`id("http_access"), `CurrentItem); - if (AddEditHttpAccessDialog(id_item)){ - InitHttpAccessTable(); - UI::ChangeWidget(`id("http_access"), `CurrentItem, id_item); - } - }else if (ret == `del_http_access){ - id_item = DelFromHttpAccessTable((integer)UI::QueryWidget(`id("http_access"), `CurrentItem)); - InitHttpAccessTable(); - UI::ChangeWidget(`id("http_access"), `CurrentItem, id_item); - }else if (ret == `up_http_access){ - id_item = MoveUpHttpAccess((integer)UI::QueryWidget(`id("http_access"), `CurrentItem)); - if (id_item != nil){ - InitHttpAccessTable(); - UI::ChangeWidget(`id("http_access"), `CurrentItem, id_item); - } - }else if (ret == `down_http_access){ - id_item = MoveDownHttpAccess((integer)UI::QueryWidget(`id("http_access"), `CurrentItem)); - if (id_item != nil){ - InitHttpAccessTable(); - UI::ChangeWidget(`id("http_access"), `CurrentItem, id_item); - } - } - } - - return ret; } - - -any LoggingAndTimeoutsDialog() +term LoggingFrameWidget() { - any ret = nil; - string tmp = nil; - term dialog_contents = - `HBox(`HSpacing(3), `VBox( + return `Frame(_("Logging"), `VBox( `VSquash(`HBox( @@ -431,10 +199,12 @@ )), `Left(`CheckBox(`id("emulate_httpd_log"), _("Emulate Httpd Log?"))) ) - ), - - `VSpacing(), + ); +} +term TimeoutsFrameWidget() +{ + return `Frame(_("Timeouts"), `VBox( `HBox( @@ -446,49 +216,13 @@ timeUnitWidget("client_lifetime_units") ) ) - ) - ), `HSpacing(3)); - - Wizard::SetContentsButtons("Squid - Logging and Timeouts Setting", dialog_contents, HELPS["logging_timeouts"]:"", - Label::BackButton(), Label::NextButton()); - - InitLoggingFrame(); - InitTimeoutsFrame(); - - while (true){ - ret = UI::UserInput(); - - y2debug("BaseDialog(): ret == %1",ret); - - if (ret == `next || ret == `back){ - if(StoreDataFromLoggingFrame() && StoreDataFromTimeoutsFrame()) - break; - }else if (ret == `abort || ret == `cancel){ - if (reallyAbort()) break; - continue; - }else if (ret == `access_log_browse){ - tmp = UI::AskForExistingFile("/var/log", "*", "Access Log"); - if (tmp != nil) - UI::ChangeWidget(`id("access_log"), `Value, tmp); - }else if (ret == `cache_log_browse){ - tmp = UI::AskForExistingFile("/var/log", "*", "Cache Log"); - if (tmp != nil) - UI::ChangeWidget(`id("cache_log"), `Value, tmp); - }else if (ret == `cache_store_log_browse){ - tmp = UI::AskForExistingFile("/var/log", "*", "Cache Store Log"); - if (tmp != nil) - UI::ChangeWidget(`id("cache_store_log"), `Value, tmp); - } - } - - return ret; + ); } -any MiscellaneousDialog() +term MiscellaneousFrameWidget() { - any ret = nil; - term dialog_contents = + return `HVCenter(`Frame(_("Miscellaneous Setting"), `VBox( `ComboBox(`id("error_language"), _("Language of error messages"), @@ -498,28 +232,8 @@ `VSpacing(), `CheckBox(`id("ftp_passive"), _("Use Ftp Pasive Mode")) ))); - - Wizard::SetContentsButtons("Squid - Miscellaneous Setting", dialog_contents, HELPS["miscellaneous"]:"", - Label::BackButton(), Label::FinishButton()); - - InitMiscellaneousDialog(); - - while (true){ - ret = UI::UserInput(); - - y2debug("BaseDialog(): ret == %1",ret); - - if (ret == `next || ret == `back){ - if (StoreDataFromMiscellaneousDialog()) - break; - }else if (ret == `abort || ret == `cancel){ - if (reallyAbort()) break; - continue; - } - } - - return ret; } + /* EOF */ } /* vim: set sw=4 ts=4 et ft=ycp : */ Added: trunk/squid/src/handlers.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/handlers.ycp?rev=40529… ============================================================================== --- trunk/squid/src/handlers.ycp (added) +++ trunk/squid/src/handlers.ycp Tue Aug 28 12:56:04 2007 @@ -0,0 +1,231 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/squid/handlers.ycp + * Package: Configuration of squid + * Summary: Handle functions to CWM + * Authors: Daniel Fiser <dfiser(a)suse.cz> + * + * $Id: wizards.ycp 27914 2006-02-13 14:32:08Z locilka $ + */ + +{ + +textdomain "squid"; + +include "squid/inits.ycp"; +include "squid/store_del.ycp"; +include "squid/dialogs.ycp"; +include "squid/popup_dialogs.ycp"; + +symbol HandleHttpPortsTable(string widget_id, map event_map) +{ + any ui = event_map["ID"]:nil; + integer id_item = nil; + + y2debug("HandleHttpPortsTable: widget_id: %1, event_map: %2", widget_id, event_map); + + if (ui == `add){ + if (AddEditHttpPortDialog(nil)) + InitHttpPortsTable(""); + }else if (ui == `edit || ui == "http_port"){ + id_item = (integer)UI::QueryWidget(`id("http_port"), `CurrentItem); + if (AddEditHttpPortDialog(id_item)){ + InitHttpPortsTable(""); + UI::ChangeWidget(`id("http_port"), `CurrentItem, id_item); + } + }else if (ui == `del){ + id_item = DelFromHttpPortsTable((integer)UI::QueryWidget(`id("http_port"), `CurrentItem)); + InitHttpPortsTable(""); + UI::ChangeWidget(`id("http_port"), `CurrentItem, id_item); + }else{ + return (symbol)ui; + } + + return nil; +} + + +symbol HandleRefreshPatternsTable(string widget_id, map event_map) +{ + any ui = event_map["ID"]:nil; + integer id_item = nil; + + if (ui == `add){ + if (AddEditRefreshPatternDialog(nil)) + InitRefreshPatternsTable(""); + }else if (ui == `edit || ui == "refresh_patterns"){ + id_item = (integer)UI::QueryWidget(`id("refresh_patterns"), `CurrentItem); + if (AddEditRefreshPatternDialog(id_item)){ + InitRefreshPatternsTable(""); + UI::ChangeWidget(`id("refresh_patterns"), `CurrentItem, id_item); + } + }else if (ui == `del){ + id_item = DelFromRefreshPatternsTable((integer)UI::QueryWidget(`id("refresh_patterns"), `CurrentItem)); + InitRefreshPatternsTable(""); + UI::ChangeWidget(`id("refresh_patterns"), `CurrentItem, id_item); + }else if (ui == `up){ + id_item = MoveUpRefreshPattern((integer)UI::QueryWidget(`id("refresh_patterns"), `CurrentItem)); + if (id_item != nil){ + InitRefreshPatternsTable(""); + UI::ChangeWidget(`id("refresh_patterns"), `CurrentItem, id_item); + } + }else if (ui == `down){ + id_item = MoveDownRefreshPattern((integer)UI::QueryWidget(`id("refresh_patterns"), `CurrentItem)); + if (id_item != nil){ + InitRefreshPatternsTable(""); + UI::ChangeWidget(`id("refresh_patterns"), `CurrentItem, id_item); + } + }else{ + return (symbol)ui; + } + + return nil; +} + + +symbol HandleCache2Dialog(string widget_id, map event_map) +{ + any ui = event_map["ID"]:nil; + string cache_dir = ""; + any tmp = nil; + any tmp2 = nil; + + if (ui == `browse_cache_dir){ + cache_dir = UI::AskForExistingDirectory((string)UI::QueryWidget(`id("cache_dir"), `Value), "Cache Directory"); + if (cache_dir != nil){ + UI::ChangeWidget(`id("cache_dir"), `Value, cache_dir); + } + + //cache_min_object_size <= cache_max_object_size + }else if (ui == "cache_min_object_size" || ui == "cache_min_object_size_units"){ + tmp = (integer)UI::QueryWidget(`id("cache_min_object_size"), `Value) * + unitToMultiple((string)UI::QueryWidget(`id("cache_min_object_size_units"), `Value)); + tmp2 = (integer)UI::QueryWidget(`id("cache_max_object_size"), `Value) * + unitToMultiple((string)UI::QueryWidget(`id("cache_max_object_size_units"), `Value)); + if ((integer)tmp > (integer)tmp2){ + UI::ChangeWidget(`id("cache_max_object_size"), `Value, UI::QueryWidget(`id("cache_min_object_size"), `Value)); + UI::ChangeWidget(`id("cache_max_object_size_units"), `Value, UI::QueryWidget(`id("cache_min_object_size_units"), `Value)); + } + }else if (ui == "cache_max_object_size" || ui == "cache_max_object_size_units"){ + tmp = (integer)UI::QueryWidget(`id("cache_min_object_size"), `Value) * + unitToMultiple((string)UI::QueryWidget(`id("cache_min_object_size_units"), `Value)); + tmp2 = (integer)UI::QueryWidget(`id("cache_max_object_size"), `Value) * + unitToMultiple((string)UI::QueryWidget(`id("cache_max_object_size_units"), `Value)); + if ((integer)tmp > (integer)tmp2){ + UI::ChangeWidget(`id("cache_min_object_size"), `Value, UI::QueryWidget(`id("cache_max_object_size"), `Value)); + UI::ChangeWidget(`id("cache_min_object_size_units"), `Value, UI::QueryWidget(`id("cache_max_object_size_units"), `Value)); + } + + //cache_swap_low <= cache_swap_high + }else if (ui == "cache_swap_low"){ + tmp = UI::QueryWidget(`id("cache_swap_low"), `Value); + if ((integer)tmp > (integer)UI::QueryWidget(`id("cache_swap_high"), `Value)) + UI::ChangeWidget(`id("cache_swap_high"), `Value, tmp); + }else if (ui == "cache_swap_high"){ + tmp = UI::QueryWidget(`id("cache_swap_high"), `Value); + if ((integer)UI::QueryWidget(`id("cache_swap_low"), `Value) > (integer)tmp) + UI::ChangeWidget(`id("cache_swap_low"), `Value, tmp); + }else{ + return (symbol)ui; + } + + return nil; +} + +symbol HandleAccessControlDialog(string widget_id, map event_map) +{ + any ui = event_map["ID"]:nil; + integer id_item = nil; + + if (ui == `add_acl){ + if (AddEditACLDialog(nil)){ + InitACLGroupsTable(""); + } + }else if (ui == `edit_acl || ui == "acl"){ + id_item = (integer)UI::QueryWidget(`id("acl"), `CurrentItem); + if (AddEditACLDialog(id_item)){ + InitACLGroupsTable(""); + UI::ChangeWidget(`id("acl"), `CurrentItem, id_item); + } + }else if (ui == `del_acl){ + id_item = DelFromACLGroupsTable((integer)UI::QueryWidget(`id("acl"), `CurrentItem)); + InitACLGroupsTable(""); + UI::ChangeWidget(`id("acl"), `CurrentItem, id_item); + }else if (ui == `add_http_access){ + if (AddEditHttpAccessDialog(nil)){ + InitHttpAccessTable(""); + } + }else if (ui == `edit_http_access || ui == "http_access"){ + id_item = (integer)UI::QueryWidget(`id("http_access"), `CurrentItem); + if (AddEditHttpAccessDialog(id_item)){ + InitHttpAccessTable(""); + UI::ChangeWidget(`id("http_access"), `CurrentItem, id_item); + } + }else if (ui == `del_http_access){ + id_item = DelFromHttpAccessTable((integer)UI::QueryWidget(`id("http_access"), `CurrentItem)); + InitHttpAccessTable(""); + UI::ChangeWidget(`id("http_access"), `CurrentItem, id_item); + }else if (ui == `up_http_access){ + id_item = MoveUpHttpAccess((integer)UI::QueryWidget(`id("http_access"), `CurrentItem)); + if (id_item != nil){ + InitHttpAccessTable(""); + UI::ChangeWidget(`id("http_access"), `CurrentItem, id_item); + } + }else if (ui == `down_http_access){ + id_item = MoveDownHttpAccess((integer)UI::QueryWidget(`id("http_access"), `CurrentItem)); + if (id_item != nil){ + InitHttpAccessTable(""); + UI::ChangeWidget(`id("http_access"), `CurrentItem, id_item); + } + }else{ + return (symbol)ui; + } + + return nil; +} + + +symbol HandleLoggingFrame(string widget_id, map event_map) +{ + any ui = event_map["ID"]:nil; + string tmp = nil; + + if (ui == `access_log_browse){ + tmp = UI::AskForExistingFile("/var/log", "*", "Access Log"); + if (tmp != nil) + UI::ChangeWidget(`id("access_log"), `Value, tmp); + }else if (ui == `cache_log_browse){ + tmp = UI::AskForExistingFile("/var/log", "*", "Cache Log"); + if (tmp != nil) + UI::ChangeWidget(`id("cache_log"), `Value, tmp); + }else if (ui == `cache_store_log_browse){ + tmp = UI::AskForExistingFile("/var/log", "*", "Cache Store Log"); + if (tmp != nil) + UI::ChangeWidget(`id("cache_store_log"), `Value, tmp); + }else{ + return (symbol)ui; + } + + return nil; +} + +} Modified: trunk/squid/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/helps.ycp?rev=40529&r1… ============================================================================== --- trunk/squid/src/helps.ycp (original) +++ trunk/squid/src/helps.ycp Tue Aug 28 12:56:04 2007 @@ -129,11 +129,12 @@ "), - /* Access Control Dialog */ - "access_control" : + /* ACL Groups */ + "acl_groups" : _("Access to Squid server can be controlled via ACL Groups.") + _("ACL Group has various types and description of ACL Group depends -on them.") + +on them."), + "http_access" : _("In Access Control table can be denied or allowed ACL Groups. If there is more ACL Groups in one line it means that access will be allowed or denied for those who are from all ACL Groups at the same time.") + @@ -142,7 +143,7 @@ /* Logging and Timeouts Dialog */ - "logging_timeouts" : + "logging" : _("Access Log defines the file where client activities are logged.") + _("Cache Log defines the file where general informations about your cache's behavior is logged.") + @@ -150,7 +151,8 @@ objects that are stored in the object store, as well as the time when the object get deleted. This option can be leaved empty.") + _("Emulate Httpd Log allows you to specify that Squid write its -Access Log in HTTPD common log file format.") + +Access Log in HTTPD common log file format."), + "timeouts" : _("Connection Timeout is an option to force Squid to close connections after a specified time.") + _("Client Lifetime defines the maximum amount of time that a client Modified: trunk/squid/src/inits.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/inits.ycp?rev=40529&r1… ============================================================================== --- trunk/squid/src/inits.ycp (original) +++ trunk/squid/src/inits.ycp Tue Aug 28 12:56:04 2007 @@ -60,7 +60,7 @@ /******************** HTTP_PORT *****************/ -void InitHttpPortsTable() +void InitHttpPortsTable(string key) { list items = []; integer i = 0; @@ -97,7 +97,7 @@ /***************** REFRESH_PATTERNS *************/ -void InitRefreshPatternsTable() +void InitRefreshPatternsTable(string key) { list items = []; integer i = 0; @@ -142,7 +142,7 @@ /***************** CACHE DIALOG *****************/ -void InitCache2Dialog() +void InitCache2Dialog(string key) { map<string, list> set = (map<string, list>)Squid::GetSettings(); simpleInit($[ @@ -161,12 +161,19 @@ "l1dirs" : tointeger((set["cache_dir"]:[])[3]:""), "l2dirs" : tointeger((set["cache_dir"]:[])[4]:"") ]); + UI::ChangeWidget(`id("cache_max_object_size"), `Notify, true); + UI::ChangeWidget(`id("cache_min_object_size"), `Notify, true); + UI::ChangeWidget(`id("cache_max_object_size_units"), `Notify, true); + UI::ChangeWidget(`id("cache_min_object_size_units"), `Notify, true); + + UI::ChangeWidget(`id("cache_swap_low"), `Notify, true); + UI::ChangeWidget(`id("cache_swap_high"), `Notify, true); } /***************** CACHE DIALOG END *************/ /***************** ACL **************************/ -void InitACLGroupsTable() +void InitACLGroupsTable(string key) { list items = []; integer i = 0; @@ -205,7 +212,7 @@ /***************** HTTP_ACCESS ******************/ -void InitHttpAccessTable() +void InitHttpAccessTable(string key) { list items = []; integer i = 0; @@ -272,7 +279,7 @@ /********** LOGGING AND TIMETOUS DIALOG *********/ -void InitLoggingFrame() +void InitLoggingFrame(string key) { map<string, list> set = (map<string, list>)Squid::GetSettings(); simpleInit($[ @@ -284,7 +291,7 @@ ]); } -void InitTimeoutsFrame() +void InitTimeoutsFrame(string key) { map<string, list> set = (map<string, list>)Squid::GetSettings(); simpleInit($[ @@ -297,7 +304,7 @@ /********** LOGGING AND TIMETOUS DIALOG END *****/ -void InitMiscellaneousDialog() +void InitMiscellaneousFrame(string key) { simpleInit($[ "cache_mgr" : (Squid::GetSetting("cache_mgr"))[0]:"", Modified: trunk/squid/src/store_del.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/store_del.ycp?rev=4052… ============================================================================== --- trunk/squid/src/store_del.ycp (original) +++ trunk/squid/src/store_del.ycp Tue Aug 28 12:56:04 2007 @@ -41,8 +41,6 @@ import "SquidACL"; import "SquidErrorMessages"; - -include "squid/helps.ycp"; include "squid/helper_functions.ycp"; /***************** HTTP_PORT ********************/ @@ -155,51 +153,55 @@ /************** CACHE DIALOG ********************/ -boolean StoreDataFromCache2Dialog() +boolean ValidateCache2Dialog(string widget_id, map event) { boolean ok = true; - list squid_cache_dir = Squid::GetSetting("cache_dir"); - string cache_dir = (string)UI::QueryWidget(`id("cache_dir"), `Value); - if (size(cache_dir) == 0){ - ok = false; - Report::Error(_("Cache directory must not be empty.")); - }else if (!FileUtils::CheckAndCreatePath(cache_dir)){ - ok = false; - }else{ - integer cache_mem = (integer)UI::QueryWidget(`id("cache_mem"), `Value) * - unitToMultiple((string)UI::QueryWidget(`id("cache_mem_units"), `Value)); - integer cache_dir_mbytes = (integer)UI::QueryWidget(`id("mbytes"), `Value) * 1024 * 1024; - integer max_obj_size = (integer)UI::QueryWidget(`id("cache_max_object_size"), `Value) * - unitToMultiple((string)UI::QueryWidget(`id("cache_max_object_size_units"), `Value)); + if (event["ID"]:nil != `abort){ + string cache_dir = (string)UI::QueryWidget(`id("cache_dir"), `Value); - if (max_obj_size > cache_mem + cache_dir_mbytes){ + if (size(cache_dir) == 0){ ok = false; - Report::Error( _("Cache Memory + Size of Cache Directory\nmust be more than Max Object Size.")); - } - } + Report::Error(_("Cache directory must not be empty.")); + }else if (!FileUtils::CheckAndCreatePath(cache_dir)){ + ok = false; + }else{ + integer cache_mem = (integer)UI::QueryWidget(`id("cache_mem"), `Value) * + unitToMultiple((string)UI::QueryWidget(`id("cache_mem_units"), `Value)); + integer cache_dir_mbytes = (integer)UI::QueryWidget(`id("mbytes"), `Value) * 1024 * 1024; + integer max_obj_size = (integer)UI::QueryWidget(`id("cache_max_object_size"), `Value) * + unitToMultiple((string)UI::QueryWidget(`id("cache_max_object_size_units"), `Value)); - if (ok){ - Squid::SetSetting("cache_dir", - [squid_cache_dir[0]:"", - cache_dir, - tostring(UI::QueryWidget(`id("mbytes"), `Value)), - tostring(UI::QueryWidget(`id("l1dirs"), `Value)), - tostring(UI::QueryWidget(`id("l2dirs"), `Value))]); - Squid::SetSetting("cache_mem", [tostring(UI::QueryWidget(`id("cache_mem"), `Value)), - UI::QueryWidget(`id("cache_mem_units"), `Value)]); - Squid::SetSetting("maximum_object_size", [tostring(UI::QueryWidget(`id("cache_max_object_size"), `Value)), - UI::QueryWidget(`id("cache_max_object_size_units"), `Value)]); - Squid::SetSetting("minimum_object_size", [tostring(UI::QueryWidget(`id("cache_min_object_size"), `Value)), - UI::QueryWidget(`id("cache_min_object_size_units"), `Value)]); - Squid::SetSetting("cache_swap_low", [tostring(UI::QueryWidget(`id("cache_swap_low"), `Value))]); - Squid::SetSetting("cache_swap_high", [tostring(UI::QueryWidget(`id("cache_swap_high"), `Value))]); - Squid::SetSetting("cache_replacement_policy", [UI::QueryWidget(`id("cache_replacement_policy"), `Value)]); - Squid::SetSetting("memory_replacement_policy", [UI::QueryWidget(`id("memory_replacement_policy"), `Value)]); + if (max_obj_size > cache_mem + cache_dir_mbytes){ + ok = false; + Report::Error( _("Cache Memory + Size of Cache Directory\nmust be more than Max Object Size.")); + } + } } return ok; } +void StoreDataFromCache2Dialog(string widget_id, map event) +{ + list squid_cache_dir = Squid::GetSetting("cache_dir"); + + Squid::SetSetting("cache_dir", + [squid_cache_dir[0]:"", + (string)UI::QueryWidget(`id("cache_dir"), `Value), + tostring(UI::QueryWidget(`id("mbytes"), `Value)), + tostring(UI::QueryWidget(`id("l1dirs"), `Value)), + tostring(UI::QueryWidget(`id("l2dirs"), `Value))]); + Squid::SetSetting("cache_mem", [tostring(UI::QueryWidget(`id("cache_mem"), `Value)), + UI::QueryWidget(`id("cache_mem_units"), `Value)]); + Squid::SetSetting("maximum_object_size", [tostring(UI::QueryWidget(`id("cache_max_object_size"), `Value)), + UI::QueryWidget(`id("cache_max_object_size_units"), `Value)]); + Squid::SetSetting("minimum_object_size", [tostring(UI::QueryWidget(`id("cache_min_object_size"), `Value)), + UI::QueryWidget(`id("cache_min_object_size_units"), `Value)]); + Squid::SetSetting("cache_swap_low", [tostring(UI::QueryWidget(`id("cache_swap_low"), `Value))]); + Squid::SetSetting("cache_swap_high", [tostring(UI::QueryWidget(`id("cache_swap_high"), `Value))]); + Squid::SetSetting("cache_replacement_policy", [UI::QueryWidget(`id("cache_replacement_policy"), `Value)]); + Squid::SetSetting("memory_replacement_policy", [UI::QueryWidget(`id("memory_replacement_policy"), `Value)]); +} /************** CACHE DIALOG END ****************/ @@ -394,86 +396,102 @@ /******** LOGGING AND TIMEOUTS DIALOG ***********/ -boolean StoreDataFromLoggingFrame() +boolean ValidateLoggingFrame(string widget_id, map event) +{ + if (event["ID"]:nil != `abort){ + boolean ok = true; + string message = ""; + string access_log = (string)UI::QueryWidget(`id("access_log"), `Value); + string cache_log = (string)UI::QueryWidget(`id("cache_log"), `Value); + string cache_store_log = (string)UI::QueryWidget(`id("cache_store_log"), `Value); + string emulate_httpd_log = ((boolean)UI::QueryWidget(`id("emulate_httpd_log"), `Value) + ? "on" : "off"); + + if (size(access_log) == 0){ + ok = false; + message = message + (size(message)>0 ? "\n" : "") + _("Access Log must not be empty."); + } + if (size(cache_log) == 0){ + ok = false; + message = message + (size(message)>0 ? "\n" : "") + _("Cache Log must not be empty."); + } + if (size(access_log) > 0 && !isCorrectPathnameOfLogFile(access_log)){ + ok = false; + message = message + (size(message)>0 ? "\n" : "") + _("Incorrect pathname in Access Log field."); + } + if (size(cache_log) > 0 && !isCorrectPathnameOfLogFile(cache_log)){ + ok = false; + message = message + (size(message)>0 ? "\n" : "") + _("Incorrect pathname in Cache Log field."); + } + if (size(cache_store_log) > 0 && !isCorrectPathnameOfLogFile(cache_store_log)){ + ok = false; + message = message + (size(message)>0 ? "\n" : "") + _("Incorrect pathname in Cache Store Log field."); + } + /* + if (size(cache_store_log) == 0){ + ok = false; + message = message + (size(message)>0 ? "\n" : "") + _("Cache Store Log must not be empty."); + } + */ + + if (!ok){ + Report::Error(message); + } + + return ok; + } + return true; +} +void StoreDataFromLoggingFrame(string widget_id, map event) { - boolean ok = true; - string message = ""; string access_log = (string)UI::QueryWidget(`id("access_log"), `Value); string cache_log = (string)UI::QueryWidget(`id("cache_log"), `Value); string cache_store_log = (string)UI::QueryWidget(`id("cache_store_log"), `Value); string emulate_httpd_log = ((boolean)UI::QueryWidget(`id("emulate_httpd_log"), `Value) ? "on" : "off"); - if (size(access_log) == 0){ - ok = false; - message = message + (size(message)>0 ? "\n" : "") + _("Access Log must not be empty."); - } - if (size(cache_log) == 0){ - ok = false; - message = message + (size(message)>0 ? "\n" : "") + _("Cache Log must not be empty."); - } - if (size(access_log) > 0 && !isCorrectPathnameOfLogFile(access_log)){ - ok = false; - message = message + (size(message)>0 ? "\n" : "") + _("Incorrect pathname in Access Log field."); - } - if (size(cache_log) > 0 && !isCorrectPathnameOfLogFile(cache_log)){ - ok = false; - message = message + (size(message)>0 ? "\n" : "") + _("Incorrect pathname in Cache Log field."); - } - if (size(cache_store_log) > 0 && !isCorrectPathnameOfLogFile(cache_store_log)){ - ok = false; - message = message + (size(message)>0 ? "\n" : "") + _("Incorrect pathname in Cache Store Log field."); - } - /* - if (size(cache_store_log) == 0){ - ok = false; - message = message + (size(message)>0 ? "\n" : "") + _("Cache Store Log must not be empty."); - } - */ - - if (ok){ - list<string> tmp = Squid::GetSetting("access_log"); - Squid::SetSetting("access_log", prepend(remove(tmp, 0), access_log)); - Squid::SetSetting("cache_log", [cache_log]); - Squid::SetSetting("cache_store_log", [cache_store_log]); - Squid::SetSetting("emulate_httpd_log", [emulate_httpd_log]); - }else{ - Report::Error(message); - } - - return ok; + list<string> tmp = Squid::GetSetting("access_log"); + Squid::SetSetting("access_log", prepend(remove(tmp, 0), access_log)); + Squid::SetSetting("cache_log", [cache_log]); + Squid::SetSetting("cache_store_log", [cache_store_log]); + Squid::SetSetting("emulate_httpd_log", [emulate_httpd_log]); } -boolean StoreDataFromTimeoutsFrame() +void StoreDataFromTimeoutsFrame(string widget_id, map event) { Squid::SetSetting("connect_timeout", [tostring(UI::QueryWidget(`id("connect_timeout"), `Value)), (string)UI::QueryWidget(`id("connect_timeout_units"), `Value)]); Squid::SetSetting("client_lifetime", [tostring(UI::QueryWidget(`id("client_lifetime"), `Value)), (string)UI::QueryWidget(`id("client_lifetime_units"), `Value)]); - return true; } /******** LOGGING AND TIMEOUTS DIALOG END *******/ +boolean ValidateMiscellaneousFrame(string widget_id, map event) +{ + if (event["ID"]:nil != `abort){ + boolean ok = true; + string cache_mgr = (string)UI::QueryWidget(`id("cache_mgr"), `Value); -boolean StoreDataFromMiscellaneousDialog() + if (regexpmatch(cache_mgr, "[ \t\n]")){ + ok = false; + Report::Error( _("Administrator's E-mail must not contain any white spaces.")); + } + + return ok; + } + return true; +} +void StoreDataFromMiscellaneousFrame(string widget_id, map event) { - boolean ok = true; string error_language = (string)UI::QueryWidget(`id("error_language"), `Value); string cache_mgr = (string)UI::QueryWidget(`id("cache_mgr"), `Value); string ftp_passive = (boolean)UI::QueryWidget(`id("ftp_passive"), `Value) ? "on" : "off"; - if (regexpmatch(cache_mgr, "[ \t\n]")){ - ok = false; - Report::Error( _("Administrator's E-mail must not contain any white spaces.")); - } + Squid::SetSetting("error_directory",[SquidErrorMessages::GetPath(error_language)]); + Squid::SetSetting("cache_mgr", [cache_mgr]); + Squid::SetSetting("ftp_passive", [ftp_passive]); +} - if (ok){ - Squid::SetSetting("error_directory",[SquidErrorMessages::GetPath(error_language)]); - Squid::SetSetting("cache_mgr", [cache_mgr]); - Squid::SetSetting("ftp_passive", [ftp_passive]); - } - return ok; -} } /* vim: set sw=4 ts=4 et ft=ycp : */ Modified: trunk/squid/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/wizards.ycp?rev=40529&… ============================================================================== --- trunk/squid/src/wizards.ycp (original) +++ trunk/squid/src/wizards.ycp Tue Aug 28 12:56:04 2007 @@ -33,53 +33,25 @@ import "Sequencer"; import "Wizard"; +import "Label"; include "squid/complex.ycp"; -include "squid/dialogs.ycp"; + + /** * Main workflow of the squid configuration * @return sequence result */ -any MainSequence() { - - map aliases = $[ - "http_ports" : ``(HttpPortsDialog()), - "cache" : ``(CacheDialog()), - "cache2" : ``(Cache2Dialog()), - "access" : ``(AccessControlDialog()), - "logging_and_timeouts" : ``(LoggingAndTimeoutsDialog()), - "miscellaneous" : ``(MiscellaneousDialog()) - ]; - +any MainSequence(boolean start_up_dialog) { + map aliases = $[ "main" : ``(MainDialog(start_up_dialog))]; map sequence = $[ - "ws_start" : "http_ports", - "http_ports" : $[ - `abort : `abort, - `next : "cache" - ], - "cache" : $[ - `abort : `abort, - `next : "cache2" - ], - "cache2" : $[ - `abort : `abort, - `next : "access" - ], - "access" : $[ - `abort : `abort, - `next : "logging_and_timeouts" - ], - "logging_and_timeouts" : $[ - `abort : `abort, - `next : "miscellaneous" - ], - "miscellaneous" : $[ - `abort : `abort, - `next : `next - ] + "ws_start" : "main", + "main" : $[ + `abort : `abort, + `next : `next + ] ]; - any ret = Sequencer::Run(aliases, sequence); return ret; @@ -93,7 +65,7 @@ map aliases = $[ "read" : [ ``( ReadDialog() ), true ], - "main" : ``( MainSequence() ), + "main" : ``( MainSequence(true) ), "write" : [ ``( WriteDialog() ), true ] ]; @@ -137,7 +109,7 @@ Wizard::SetContentsButtons(caption, contents, "", Label::BackButton(), Label::NextButton()); - any ret = MainSequence(); + any ret = MainSequence(false); UI::CloseDialog(); return ret; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40528 - in /trunk/update: VERSION package/yast2-update.changes src/clients/update_proposal.ycp
by locilka＠svn.opensuse.org 28 Aug '07

28 Aug '07

Author: locilka Date: Tue Aug 28 12:37:27 2007 New Revision: 40528 URL: http://svn.opensuse.org/viewcvs/yast?rev=40528&view=rev Log: - Update proposal doesn't use recommended Kernel if the package is not available (#304646). - 2.15.23 Modified: trunk/update/VERSION trunk/update/package/yast2-update.changes trunk/update/src/clients/update_proposal.ycp Modified: trunk/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/VERSION?rev=40528&r1=4052… ============================================================================== --- trunk/update/VERSION (original) +++ trunk/update/VERSION Tue Aug 28 12:37:27 2007 @@ -1 +1 @@ -2.15.22 +2.15.23 Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Tue Aug 28 12:37:27 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Aug 28 12:35:29 CEST 2007 - locilka(a)suse.cz + +- Update proposal doesn't use recommended Kernel if the package is + not available (#304646). +- 2.15.23 + +------------------------------------------------------------------- Mon Aug 27 14:18:25 CEST 2007 - locilka(a)suse.cz - Calling Storage::DeviceMatchFstab with not-translated device name Modified: trunk/update/src/clients/update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/update_propos… ============================================================================== --- trunk/update/src/clients/update_proposal.ycp (original) +++ trunk/update/src/clients/update_proposal.ycp Tue Aug 28 12:37:27 2007 @@ -158,6 +158,11 @@ y2milestone ("Selected kernel: %1, recommended kernel: %2", selected_kernel, recom_kernel); + // when the recommended Kernel is not available (installable) + if (recom_kernel[0]:nil != nil && ! Pkg::IsAvailable (recom_kernel[0]:nil)) { + recom_kernel[0] = selected_kernel; + } + // recommended package is different to the selected one // select the recommended one if (recom_kernel[0]:nil != nil && recom_kernel[0]:nil != selected_kernel) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40527 - /trunk/ntp-client/src/NtpClient.ycp
by kmachalkova＠svn.opensuse.org 28 Aug '07

28 Aug '07

Author: kmachalkova Date: Tue Aug 28 12:20:25 2007 New Revision: 40527 URL: http://svn.opensuse.org/viewcvs/yast?rev=40527&view=rev Log: Do not check for xntp package in 1st stage of installation Modified: trunk/ntp-client/src/NtpClient.ycp Modified: trunk/ntp-client/src/NtpClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ntp-client/src/NtpClient.ycp?rev… ============================================================================== --- trunk/ntp-client/src/NtpClient.ycp (original) +++ trunk/ntp-client/src/NtpClient.ycp Tue Aug 28 12:20:25 2007 @@ -320,7 +320,7 @@ boolean failed = false; - if (! Mode::testsuite () + if (! Mode::testsuite () && ! Mode::installation () && ! PackageSystem::CheckAndInstallPackagesInteractive (["xntp"]) ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40526 - in /trunk/yast2: library/network/src/SuSEFirewall.ycp package/yast2.changes
by locilka＠svn.opensuse.org 28 Aug '07

28 Aug '07

Author: locilka Date: Tue Aug 28 12:16:25 2007 New Revision: 40526 URL: http://svn.opensuse.org/viewcvs/yast?rev=40526&view=rev Log: - Fixed SuSEFirewall to better handle erroneous data from NetworkDevices module (#303858). Modified: trunk/yast2/library/network/src/SuSEFirewall.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/network/src/SuSEFirewall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/SuSEFi… ============================================================================== --- trunk/yast2/library/network/src/SuSEFirewall.ycp (original) +++ trunk/yast2/library/network/src/SuSEFirewall.ycp Tue Aug 28 12:16:25 2007 @@ -1472,15 +1472,37 @@ // All dial-up interfaces list <string> dialup_interfaces = NetworkDevices::List("dialup"); - dialup_interfaces = filter(string interface, dialup_interfaces, ``{ - return interface != "" && !issubstring(interface, "lo") && !issubstring(interface, "sit"); + if (dialup_interfaces == nil) dialup_interfaces = []; + + // bugzilla #303858 - wrong values from NetworkDevices + dialup_interfaces = filter (string one_iface, dialup_interfaces, { + if (one_iface == nil || one_iface == "") { + y2error ("Wrong interface definition '%1'", one_iface); + return false; + } + return true; + }); + + dialup_interfaces = filter (string interface, dialup_interfaces, ``{ + return interface != "" && !issubstring (interface, "lo") && !issubstring (interface, "sit"); }); // All non-dial-up interfaces list <string> non_dialup_interfaces = NetworkDevices::List(""); - non_dialup_interfaces = filter(string interface, non_dialup_interfaces, ``{ - return interface != "" && !issubstring(interface, "lo") && !issubstring(interface, "sit") - && !contains(dialup_interfaces, interface); + if (non_dialup_interfaces == nil) non_dialup_interfaces = []; + + // bugzilla #303858 - wrong values from NetworkDevices + non_dialup_interfaces = filter (string one_iface, non_dialup_interfaces, { + if (one_iface == nil || one_iface == "") { + y2error ("Wrong interface definition '%1'", one_iface); + return false; + } + return true; + }); + + non_dialup_interfaces = filter (string interface, non_dialup_interfaces, ``{ + return interface != "" && !issubstring (interface, "lo") && !issubstring (interface, "sit") + && !contains (dialup_interfaces, interface); }); foreach (string interface, dialup_interfaces, { Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Aug 28 12:16:25 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 28 12:12:49 CEST 2007 - locilka(a)suse.cz + +- Fixed SuSEFirewall to better handle erroneous data from + NetworkDevices module (#303858). + +------------------------------------------------------------------- Mon Aug 27 11:59:50 CEST 2007 - sh(a)suse.de - Fixed bug #304776: save_y2logs usage message -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r40525 - /trunk/product-creator/src/ProductCreator.ycp
by jsuchome＠svn.opensuse.org 28 Aug '07

28 Aug '07

Author: jsuchome Date: Tue Aug 28 11:12:00 2007 New Revision: 40525 URL: http://svn.opensuse.org/viewcvs/yast?rev=40525&view=rev Log: include the package from "post-packages" section of autoyast profile (#291776 Modified: trunk/product-creator/src/ProductCreator.ycp Modified: trunk/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreat… ============================================================================== --- trunk/product-creator/src/ProductCreator.ycp (original) +++ trunk/product-creator/src/ProductCreator.ycp Tue Aug 28 11:12:00 2007 @@ -2292,6 +2292,18 @@ PackageAI::toinstall = software["packages"]:[]; Config["packages"] = AutoinstSoftware::autoinstPackages(); + + // add "post-packages" + list post_packages = software["post-packages"]:[]; + if (size(post_packages) > 0) + { + y2milestone("Adding \"post-packages\": %1", post_packages); + Config["packages"] = union(Config["packages"]:[], post_packages); + } + + // TODO: remove also "remove-packages" from the list? + // Is it safe to remove them due to possible dependencies?? + y2milestone("Config: %1", Config ); profile_parsed = true; return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0