Author: dfiser Date: Mon Jul 23 17:50:25 2007 New Revision: 39615 URL: http://svn.opensuse.org/viewcvs/yast?rev=39615&view=rev Log: Concept of most dialogs. Modified: trunk/squid/src/complex.ycp trunk/squid/src/dialogs.ycp trunk/squid/src/wizards.ycp Modified: trunk/squid/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/complex.ycp?rev=39615&r1=39614&r2=39615&view=diff ============================================================================== --- trunk/squid/src/complex.ycp (original) +++ trunk/squid/src/complex.ycp Mon Jul 23 17:50:25 2007 @@ -42,14 +42,6 @@ include "squid/helps.ycp"; -/** - * Returns a widget with setting of units - */ -term unitWidget(string id) -{ - return `ComboBox(`id(id), " ", - [`item("KB"), `item("MB")]); -} /** @@ -75,7 +67,7 @@ symbol ReadDialog() { Wizard::RestoreHelp(HELPS["read"]:""); // Squid::AbortFunction = PollAbort; - if (!Confirm::MustBeRoot()) return `abort; + //if (!Confirm::MustBeRoot()) return `abort; boolean ret = Squid::Read(); return ret ? `next : `abort; } @@ -91,234 +83,6 @@ return ret ? `next : `abort; } -any BaseDialog(){ - any ret = nil; - term dialog_contents = - `VBox( - `Left(`Label( _("HTTP Ports"))), - `Table(`header("Host","Port","Options")), - `HBox( - `PushButton(`id(`add), _("Add")), - `PushButton(`id(`del), _("Del")), - `PushButton(`id(`modify), _("Modify")), - `HStretch() - ), - `HBox( - `Label( _("Language of error messages:")), - `ComboBox(`id("error_language"), - "", - [ `item("aaa"),`item("bbb",true)]), - `HStretch() - ) - ); - - Wizard::SetContentsButtons("Squid Configuration", dialog_contents, "help text ad", - Label::BackButton(), Label::NextButton()); - - while (true){ - ret = UI::UserInput(); - - y2debug("BaseDialog(): ret == %1",ret); - - if (ret == `next) break; - else if (ret == `abort || ret == `back || ret == `cancel){ - //if (Popup::ReallyAbort(true)) break; - break; - continue; - } - } - - return ret; -} - - -any CacheDialog(){ - any ret = nil; - term dialog_contents = - `VBox( - `Left(`Label( _("Refresh Patterns"))), - `Table(`id("refresh_patterns"), `header("Regular Expression", "Min", "Precent", "Max", "Options")), - `HBox( - `PushButton(`id(`add), _("Add")), - `PushButton(`id(`del), _("Del")), - `PushButton(`id(`modify), _("Modify")), - `HStretch() - ), - `Left(`Frame("Cache Setting", - `VBox( - `HBox( - `HSquash(`TextEntry(`id("cache_mem"), `opt(`shrinkable), "Cache Memory", "")), - unitWidget("cache_mem_units"), - `HStretch() - ), - `HBox( - `HSquash(`TextEntry(`id("cache_max_object_size"), `opt(`shrinkable), "Max Object Size", "")), - unitWidget("cache_max_object_size_units"), - `HSpacing(), - `HSquash(`TextEntry(`id("cache_min_object_size"), `opt(`shrinkable),"Min Object Size", "")), - unitWidget("cache_min_object_size_units"), - `HStretch() - ), - `VSquash(`HBox( - `HSquash(`IntField(`id("cache_swap_low"), "Swap Low-Water Mark", 1, 100, 10)), - `Bottom(`Label("%")), - `HSpacing(), - `HSquash(`IntField(`id("cache_swap_high"), "Swap High-Water Mark", 1, 100, 10)), - `Bottom(`Label("%")), - `HStretch() - )), - `Left(`HBox( - `ComboBox(`id("cache_replacement_policy"), - "Cache Replacement Policy", - [`item("lru"), `item("heap GDSF"), `item("heap LFUDA"), `item("heap LRU")]), - `ComboBox(`id("memory_replacement_policy"), - "Memory Replacement Policy", - [`item("lru"), `item("heap GDSF"), `item("heap LFUDA"), `item("heap LRU")]) - )), - `VSquash(`HBox( - `TextEntry(`id("cache_dir"), "Cache Directory", ""), - `Bottom(`PushButton(`id(`cache_dir), "Advanced Setting")) - )) - ) - )) - ); - - Wizard::SetContentsButtons("Squid - Cache Setting", dialog_contents, "help", - Label::BackButton(), Label::NextButton()); - - UI::ChangeWidget(`id("cache_mem"), `ValidChars, "0123456789"); - UI::ChangeWidget(`id("cache_max_object_size"), `ValidChars, "0123456789"); - UI::ChangeWidget(`id("cache_min_object_size"), `ValidChars, "0123456789"); - UI::ChangeWidget(`id("cache_mem_units"), `Items, [`item("B"),`item("KB",true), `item("MB")]); - - while (true){ - ret = UI::UserInput(); - - y2debug("BaseDialog(): ret == %1",ret); - - if (ret == `next || ret == `back) break; - else if (ret == `abort || ret == `cancel){ - //if (Popup::ReallyAbort(true)) break; - break; - continue; - } - } - - return ret; -} - - -any AccessControlDialog(){ - any ret = nil; - term dialog_contents = - `VBox( - `Left(`Label("ACL Groups")), - `Table(`id("acl"), `header("Name", "Type", "Description")), - `HBox( - `PushButton(`id(`add_acl), "Add"), - `PushButton(`id(`del_acl), "Del"), - `PushButton(`id(`modify_acl), "Modify"), - `HStretch() - ), - - `VSpacing(), - - `Left(`Label("Access Control")), - `HBox( - `Table(`id("http_access"), `header("Allow/Deny", "ACL Groups")), - `HSquash(`VBox( - `HWeight(1, `PushButton(`id(`up_http_access), "Up")), - `HWeight(1, `PushButton(`id(`down_http_access), "Down")) - )) - ), - `HBox( - `PushButton(`id(`add_http_access), "Add"), - `PushButton(`id(`del_http_access), "Del"), - `PushButton(`id(`modify_http_access), "Modify"), - `HStretch() - ) - ); - - Wizard::SetContentsButtons("caption", dialog_contents, "help", - Label::BackButton(), Label::NextButton()); - - while (true){ - ret = UI::UserInput(); - - y2debug("BaseDialog(): ret == %1",ret); - - if (ret == `next || ret == `back) break; - else if (ret == `abort || ret == `cancel){ - //if (Popup::ReallyAbort(true)) break; - break; - continue; - } - } - - return ret; -} - - - -any MiscellaneousDialog() -{ - any ret = nil; - term dialog_contents = - `Top(`VBox( - - `Left(`Frame("Miscellaneous", - `VBox( - `Left(`HSquash(`TextEntry(`id("cache_mgr"), "Administrator's e-mail", ""))), - `Left(`CheckBox(`id("ftp_pasive_mode"), "Use Ftp Pasive Mode")) - ) - )), - - `VSpacing(), - - `Left(`Frame("Logging", - `VBox( - `HSquash(`TextEntry(`id("access_log"), "Access Log" , "")), - `HSquash(`TextEntry(`id("cache_log"), "Cache Log", "")), - `HSquash(`TextEntry(`id("cache_store_log"), "Cache Store Log", "")), - `HSquash(`TextEntry(`id("cache_swap_log"), "Cache Swap Log", "")), - `Left(`CheckBox(`id("emulate_httpd_log"), "Emulate Httpd Log?")) - ) - )), - - `VSpacing(), - - `Left(`Frame("Timeouts", - `VBox( - `HBox( - `HSquash(`TextEntry(`id("connect_timeout"), "Connection timeout", "")), - `ComboBox(`id("connect_timeout_units"), " ", [`item("seconds"), `item("minutes")]) - ), - `HBox( - `HSquash(`TextEntry(`id("client_lifetime"), "Client Lifetime", "")), - `ComboBox(`id("client_lifetime_units"), " ", [`item("seconds"), `item("minutes")]) - ) - ) - )) - )); - - Wizard::SetContentsButtons("Squid - Miscellaneous Setting", dialog_contents, "help", - Label::BackButton(), Label::NextButton()); - - while (true){ - ret = UI::UserInput(); - - y2debug("BaseDialog(): ret == %1",ret); - - if (ret == `next || ret == `back) break; - else if (ret == `abort || ret == `cancel){ - //if (Popup::ReallyAbort(true)) break; - break; - continue; - } - } - - return ret; -} } /* 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=39615&r1=39614&r2=39615&view=diff ============================================================================== --- trunk/squid/src/dialogs.ycp (original) +++ trunk/squid/src/dialogs.ycp Mon Jul 23 17:50:25 2007 @@ -37,73 +37,417 @@ include "squid/helps.ycp"; + /** - * Configure1 dialog - * @return dialog result + * Returns a widget with setting of units */ -any Configure1Dialog () { +term sizeUnitWidget(string id) +{ + return `ComboBox(`id(id), " ", + [`item("KB"), `item("MB")]); +} +/** + * Returns a widget with setting of units + */ +term timeUnitWidget(string id) +{ + return `ComboBox(`id(id), " ", + [`item("seconds"), `item("minutes")]); +} - /* Squid configure1 dialog caption */ - string caption = _("Squid Configuration"); - /* Squid configure1 dialog contents */ - term contents = `Label (_("First part of configuration of squid")); +/** + * returns true if something added/edited otherwise false + */ +boolean AddEditHttpPortDialog(any id_item) +{ + any ui = nil; + boolean ret = false; + string label = (id_item == nil ? _("Add New HTTP Port") + : _("Edit Current HTTP Port")); + + term contents = + `VBox( + `Left(`Label(label)), + `TextEntry(`id("host"), _("Host"), ""), + `TextEntry(`id("port"), _("Port"), ""), + `Frame(_("Options"), + `VBox( + `CheckBox(`id("transparent"), "Transparent", false) + ) + ), + `VSpacing(), + `HBox( + `PushButton(`id(`cancel), Label::CancelButton()), + `PushButton(`id(`ok), Label::OKButton()) + ) + ); + + UI::OpenDialog(`opt(`decorated), contents); + UI::ChangeWidget(`id("port"), `ValidChars, "1234567890"); - Wizard::SetContentsButtons(caption, contents, HELPS["c1"]:"", - Label::BackButton(), Label::NextButton()); + while (true){ + ui = UI::UserInput(); + if (ui == `abort || ui == `cancel){ + ret = false; + break; + }else if (ui == `ok){ + ret = true; + break; + } + } + + UI::CloseDialog(); + return ret; +} + + + +any HttpPortsDialog(){ any ret = nil; - while(true) { + any http_port = nil; + + term dialog_contents = + `VBox( + `Left(`Label( _("HTTP Ports"))), + `Table(`id("http_port"), `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, "help text ad", + Label::BackButton(), Label::NextButton()); + Wizard::DisableBackButton(); + + UI::ChangeWidget(`id("http_port"), `Items, [`item(`id(1), "localhost","3128",""), `item(`id(2), "","80","tranparent")]); + + + while (true){ + ret = UI::UserInput(); + + y2debug("HttpPortsDialog(): ret == %1",ret); + + if (ret == `next) break; + else if (ret == `abort || ret == `cancel){ + //if (Popup::ReallyAbort(true)) break; + break; + continue; + }else if (ret == `add){ + AddEditHttpPortDialog(nil); + }else if (ret == `edit){ + AddEditHttpPortDialog(UI::QueryWidget(`id("http_port"), `CurrentItem)); + + http_port = UI::QueryWidget(`id("http_port"), `CurrentItem); + y2debug("id: %1, currentPort: %2, currentPortValue: %3", ret, http_port,UI::QueryWidget(`id("http_port"), `Item(http_port))); + } + } + + return ret; +} + + +boolean AddEditRefreshPattern(any id_item) +{ + boolean ret = false; + any ui = nil; + string label = (id_item == nil ? _("Add New Refresh Pattern") + : _("Edit Current refresh Pattern")); + term contents = + `VBox( + `Left(`Label(label)), + + `HBox( + `TextEntry(`id("regexp"), _("Regular Expression"), ""), + `CheckBox(`id("regexp_case_insensitive"), _("Case Insensitive")) + ), + `HBox( + `Bottom(`IntField(`id("min"), _("Min"), 1, 99999, 10)), + `Bottom(`Label(_("minutes"))) + ), + `HBox( + `Bottom(`IntField(`id("percent"), _("Percent"), 1, 99999, 10)), + `Bottom(`Label("%")) + ), + `HBox( + `Bottom(`IntField(`id("max"), _("Max"), 1, 99999, 10)), + `Bottom(`Label(_("minutes"))) + ), + + `VSpacing(), + + `HBox( + `PushButton(`id(`cancel), Label::CancelButton()), + `PushButton(`id(`ok), Label::OKButton()) + ) + ); - ret = UI::UserInput(); + UI::OpenDialog(`opt(`decorated), contents); - /* abort? */ - if(ret == `abort || ret == `cancel) { - if(ReallyAbort()) break; - else continue; - } - else if(ret == `next || ret == `back) { + while (true){ + ui = UI::UserInput(); + + if (ui == `cancel || ui == `abort){ + ret = false; + break; + }else if (ui == `ok){ + ret = true; break; } - else { - y2error("unexpected retcode: %1", ret); + } + + UI::CloseDialog(); + return ret; +} + +any CacheDialog(){ + any ret = nil; + term dialog_contents = + `VBox( + `Left(`Label( _("Refresh Patterns"))), + `Table(`id("refresh_patterns"), `header(_("Regular Expression"), _("Min"), _("Precent"), _("Max")/*, _("Options")*/)), + `HBox( + `PushButton(`id(`add), Label::AddButton()), + `PushButton(`id(`del), Label::DeleteButton()), + `PushButton(`id(`modify), Label::EditButton()), + `HStretch() + ) + ); + + Wizard::SetContentsButtons(_("Squid - Cache Setting"), dialog_contents, "help", + Label::BackButton(), Label::NextButton()); + + while (true){ + ret = UI::UserInput(); + + y2debug("CacheDialog(): ret == %1",ret); + + if (ret == `next || ret == `back) break; + else if (ret == `abort || ret == `cancel){ + //if (Popup::ReallyAbort(true)) break; + break; continue; + }else if (ret == `add){ + AddEditRefreshPattern(nil); } } return ret; } -/** - * Configure2 dialog - * @return dialog result - */ -any Configure2Dialog () { +boolean CacheDirAdvancedSettingDialog(){ + boolean ret = false; + any ui = nil; + term contents = + `VBox( + `Left(`Label( _("Cache Directory Advanced Setting"))), + + `ComboBox(`id("type"), _("Type"), []), + `HBox( + `IntField(`id("mbytes"), _("Size"), 1, 99999, 10), + `Bottom(`Label(_("MB"))) + ), + `IntField(`id("l1dirs"), _("Level 1 Directories"), 1, 99999, 20), + `IntField(`id("l2dirs"), _("Level 2 Directories"), 1, 99999, 20), + + `VSpacing(), + + `HBox( + `PushButton(`id(`cancel), Label::CancelButton()), + `PushButton(`id(`ok), Label::OKButton()) + ) + ); + + UI::OpenDialog(contents); - /* Squid configure2 dialog caption */ - string caption = _("Squid Configuration"); + while (true){ + ui = UI::UserInput(); + + if (ui == `cancel || ui == `abort){ + ret = false; + break; + }else if (ui == `ok){ + ret = true; + break; + } + } - /* Squid configure2 dialog contents */ - term contents = `Label (_("Second part of configuration of squid")); - Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"", - Label::BackButton(), Label::NextButton()); + UI::CloseDialog(); + return ret; +} +any Cache2Dialog(){ any ret = nil; - while(true) { + term dialog_contents = + `VBox( + `Top(`Left( + `VBox( + `HBox( + `HSquash(`IntField(`id("cache_mem"), _("Cache Memory"), 1, 99999, 10)), + sizeUnitWidget("cache_mem_units"), + `HStretch() + ), + `VSpacing(), + `HBox( + `HSquash(`IntField(`id("cache_max_object_size"), _("Max Object Size"), 1, 99999, 10)), + sizeUnitWidget("cache_max_object_size_units"), + `HSpacing(3), + `HSquash(`IntField(`id("cache_min_object_size"), _("Min Object Size"), 1, 99999, 10)), + sizeUnitWidget("cache_min_object_size_units"), + `HStretch() + ), + `VSpacing(), + `VSquash(`HBox( + `HSquash(`IntField(`id("cache_swap_low"), _("Swap Low-Water Mark"), 1, 100, 10)), + `Bottom(`Label("%")), + `HSpacing(3), + `HSquash(`IntField(`id("cache_swap_high"), _("Swap High-Water Mark"), 1, 100, 10)), + `Bottom(`Label("%")), + `HStretch() + )), + `VSpacing(), + `Left(`HBox( + `ComboBox(`id("cache_replacement_policy"), + _("Cache Replacement Policy"), + [`item("lru"), `item("heap GDSF"), `item("heap LFUDA"), `item("heap LRU")]), + `HSpacing(3), + `ComboBox(`id("memory_replacement_policy"), + _("Memory Replacement Policy"), + [`item("lru"), `item("heap GDSF"), `item("heap LFUDA"), `item("heap LRU")]) + )), + `VSpacing(), + `VSquash(`HBox( + `TextEntry(`id("cache_dir"), _("Cache Directory"), ""), + `Bottom(`PushButton(`id(`cache_dir), "Advanced Setting")) + )) + ) + )) + ); + + Wizard::SetContentsButtons("Squid - Cache Setting 2", dialog_contents, "help", + Label::BackButton(), Label::NextButton()); + + UI::ChangeWidget(`id("cache_mem_units"), `Items, [`item("B"),`item("KB",true), `item("MB")]); + + while (true){ + ret = UI::UserInput(); + + y2debug("Cache2Dialog(): ret == %1",ret); + + if (ret == `next || ret == `back) break; + else if (ret == `abort || ret == `cancel){ + //if (Popup::ReallyAbort(true)) break; + break; + continue; + }else if (ret == `cache_dir){ + CacheDirAdvancedSettingDialog(); + } + } + + return ret; +} - ret = UI::UserInput(); - /* abort? */ - if(ret == `abort || ret == `cancel) { - if(ReallyAbort()) break; - else continue; - } - else if(ret == `next || ret == `back) { +any AccessControlDialog(){ + any ret = nil; + term dialog_contents = + `VBox( + `Left(`Label(_("ACL Groups"))), + `Table(`id("acl"), `header(_("Name"), _("Type"), _("Description"))), + `HBox( + `PushButton(`id(`add_acl), Label::AddButton()), + `PushButton(`id(`del_acl), Label::DeleteButton()), + `PushButton(`id(`modify_acl), Label::EditButton()), + `HStretch() + ), + + `VSpacing(), + + `Left(`Label(_("Access Control"))), + `HBox( + `Table(`id("http_access"), `header(_("Allow/Deny"), _("ACL Groups"))), + `HSquash(`VBox( + `HWeight(1, `PushButton(`id(`up_http_access), Label::UpButton())), + `HWeight(1, `PushButton(`id(`down_http_access), Label::DownButton())) + )) + ), + `HBox( + `PushButton(`id(`add_http_access), Label::AddButton()), + `PushButton(`id(`del_http_access), Label::DeleteButton()), + `PushButton(`id(`modify_http_access), Label::EditButton()), + `HStretch() + ) + ); + + Wizard::SetContentsButtons(_("Squid - Access Control Setting"), dialog_contents, "help", + Label::BackButton(), Label::NextButton()); + + while (true){ + ret = UI::UserInput(); + + y2debug("BaseDialog(): ret == %1",ret); + + if (ret == `next || ret == `back) break; + else if (ret == `abort || ret == `cancel){ + //if (Popup::ReallyAbort(true)) break; break; + continue; } - else { - y2error("unexpected retcode: %1", ret); + } + + return ret; +} + + + +any LoggingAndTimeoutsDialog() +{ + any ret = nil; + term dialog_contents = + `Top(`VBox( + `Left(`Frame(_("Logging"), + `VBox( + `TextEntry(`id("access_log"), _("Access Log") , ""), + `TextEntry(`id("cache_log"), _("Cache Log"), ""), + `TextEntry(`id("cache_store_log"), _("Cache Store Log"), ""), + `TextEntry(`id("cache_swap_log"), _("Cache Swap Log"), ""), + `Left(`CheckBox(`id("emulate_httpd_log"), _("Emulate Httpd Log?"))) + ) + )), + + `VSpacing(), + + `Left(`Frame(_("Timeouts"), + `VBox( + `HBox( + `HSquash(`IntField(`id("connect_timeout"), _("Connection timeout"), 1, 99999, 10)), + timeUnitWidget("connection_timeout_units") + ), + `HBox( + `HSquash(`IntField(`id("client_lifetime"), _("Client Lifetime"), 1, 99999, 10)), + timeUnitWidget("clien_lifetime_units") + ) + ) + )) + )); + + Wizard::SetContentsButtons("Squid - Logging + Timeouts Setting", dialog_contents, "help", + Label::BackButton(), Label::NextButton()); + + while (true){ + ret = UI::UserInput(); + + y2debug("BaseDialog(): ret == %1",ret); + + if (ret == `next || ret == `back) break; + else if (ret == `abort || ret == `cancel){ + //if (Popup::ReallyAbort(true)) break; + break; continue; } } @@ -111,6 +455,39 @@ return ret; } + +any MiscellaneousDialog() +{ + any ret = nil; + term dialog_contents = + `Top(`VBox( + `Left(`ComboBox(`id("error_language"), + _("Language of error messages"), + [])), + `VSpacing(), + `Left(`TextEntry(`id("cache_mgr"), _("Administrator's e-mail"), "")), + `VSpacing(), + `Left(`CheckBox(`id("ftp_pasive_mode"), _("Use Ftp Pasive Mode"))) + )); + + Wizard::SetContentsButtons("Squid - Miscellaneous Setting", dialog_contents, "help", + Label::BackButton(), Label::NextButton()); + + while (true){ + ret = UI::UserInput(); + + y2debug("BaseDialog(): ret == %1",ret); + + if (ret == `next || ret == `back) break; + else if (ret == `abort || ret == `cancel){ + //if (Popup::ReallyAbort(true)) break; + break; + continue; + } + } + + return ret; +} /* EOF */ } /* 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=39615&r1=39614&r2=39615&view=diff ============================================================================== --- trunk/squid/src/wizards.ycp (original) +++ trunk/squid/src/wizards.ycp Mon Jul 23 17:50:25 2007 @@ -38,101 +38,46 @@ include "squid/dialogs.ycp"; /** - * Add a configuration of squid - * @return sequence result - */ -any AddSequence() { - - /* FIXME: adapt to your needs */ - map aliases = $[ - "config1" : ``(Configure1Dialog()), - "config2" : ``(Configure2Dialog()), - ]; - - /* FIXME: adapt to your needs */ - map sequence = $[ - "ws_start" : "config1", - "config1" : $[ - `abort : `abort, - `next : "config2" - ], - "config2" : $[ - `abort : `abort, - `next : `next - ] - ]; - - return Sequencer::Run(aliases, sequence); -} - -/** * Main workflow of the squid configuration * @return sequence result */ any MainSequence() { - /* FIXME: adapt to your needs */ map aliases = $[ - "base" : ``(BaseDialog()), + "http_ports" : ``(HttpPortsDialog()), "cache" : ``(CacheDialog()), + "cache2" : ``(Cache2Dialog()), "access" : ``(AccessControlDialog()), + "logging_and_timeouts" : ``(LoggingAndTimeoutsDialog()), "miscellaneous" : ``(MiscellaneousDialog()) ]; - /* - "summary" : ``( SummaryDialog() ), - "overview" : ``( OverviewDialog() ), - "configure" : [ ``( AddSequence() ), true ], - "add" : [ ``( AddSequence() ), true ], - "edit" : [ ``( AddSequence() ), true ] - ]; - */ - /* FIXME: adapt to your needs */ map sequence = $[ - "ws_start" : "base", - "base" : $[ + "ws_start" : "http_ports", + "http_ports" : $[ `abort : `abort, `next : "cache" ], "cache" : $[ `abort : `abort, + `next : "cache2" + ], + "cache2" : $[ + `abort : `abort, `next : "access" ], "access" : $[ `abort : `abort, - `next : "miscellaneous" + `next : "logging_and_timeouts" + ], + "logging_and_timeouts" : $[ + `abort : `abort, + `next : "miscellaneous" ], "miscellaneous" : $[ `abort : `abort, `next : `next ] - /* - "summary" : $[ - `abort : `abort, - `next : `next, - `overview : "overview", - `configure : "configure", - `other : "configure", - ], - "overview" : $[ - `abort : `abort, - `next : `next, - `add : "add", - `edit : "edit", - ], - "configure" : $[ - `abort : `abort, - `next : "summary", - ], - "add" : $[ - `abort : `abort, - `next : "overview", - ], - "edit" : $[ - `abort : `abort, - `next : "overview", - ] - */ ]; any ret = Sequencer::Run(aliases, sequence); @@ -147,17 +92,17 @@ any SquidSequence() { map aliases = $[ -//"read" : [ ``( ReadDialog() ), true ], + "read" : [ ``( ReadDialog() ), true ], "main" : ``( MainSequence() ) // "write" : [ ``( WriteDialog() ), true ] ]; map sequence = $[ - "ws_start" : "main",/* + "ws_start" : "read", "read" : $[ `abort : `abort, `next : "main" - ],*/ + ], "main" : $[ `abort : `abort, `next : `next -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org