[yast-commit] r40338 - in /trunk/squid/src: dialogs.ycp inits.ycp popup_dialogs.ycp store_del.ycp

Author: dfiser Date: Fri Aug 17 15:39:08 2007 New Revision: 40338 URL: http://svn.opensuse.org/viewcvs/yast?rev=40338&view=rev Log: All dialogs centered. Removed CacheDirAdvancedSetting dialog. Modified: trunk/squid/src/dialogs.ycp trunk/squid/src/inits.ycp trunk/squid/src/popup_dialogs.ycp trunk/squid/src/store_del.ycp Modified: trunk/squid/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/dialogs.ycp?rev=40338&r1=40337&r2=40338&view=diff ============================================================================== --- trunk/squid/src/dialogs.ycp (original) +++ trunk/squid/src/dialogs.ycp Fri Aug 17 15:39:08 2007 @@ -197,60 +197,71 @@ string cache_dir = ""; term dialog_contents = - `Top(`Left(`VBox( + `VCenter( `HBox( + `HSpacing(3), `VBox( - `HBox( - `HWeight(1,`VBox( - `VWeight(1, `HBox( - `IntField(`id("cache_mem"), _("Cache Memory"), 1, 99999, 10), - sizeUnitWidget("cache_mem_units") - )), - `VSpacing(), - `VWeight(1, `HBox( - `IntField(`id("cache_max_object_size"), _("Max Object Size"), 0, 99999, 0), - sizeUnitWidget("cache_max_object_size_units") - )), - `VSpacing(), - `VWeight(1, `HBox( - `IntField(`id("cache_swap_low"), _("Swap Low-Water Mark"), 0, 100, 0), - `Bottom(`Label("%")) - )), - `VSpacing(), - `Left(`VWeight(1, `HBox( - `ComboBox(`id("cache_replacement_policy"), - _("Cache Replacement Policy"), - [`item("lru"), `item("heap GDSF"), `item("heap LFUDA"), `item("heap LRU")]) - ))) - )), - `HSpacing(3), - `HWeight(1,`VBox( - `VWeight(1, `HBox(`Empty())), - `VSpacing(), - `VWeight(1, `HBox( - `IntField(`id("cache_min_object_size"), _("Min Object Size"), 0, 99999, 0), - sizeUnitWidget("cache_min_object_size_units") - )), - `VSpacing(), - `VWeight(1, `HBox( - `IntField(`id("cache_swap_high"), _("Swap High-Water Mark"), 0, 100, 0), - `Bottom(`Label("%")) + `VWeight(1, `Frame(_("Cache Setting"), + `HBox( + `HWeight(1,`VBox( + `VWeight(1, `HBox( + `IntField(`id("cache_mem"), _("Cache 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), + 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) + )), + `VSpacing(0.4), + `Left(`VWeight(1, `HBox( + `ComboBox(`id("cache_replacement_policy"), + _("Cache Replacement Policy"), + [`item("lru"), `item("heap GDSF"), `item("heap LFUDA"), `item("heap LRU")]) + ))) )), - `VSpacing(), - `Left(`VWeight(1, `HBox( - `ComboBox(`id("memory_replacement_policy"), - _("Memory Replacement Policy"), - [`item("lru"), `item("heap GDSF"), `item("heap LFUDA"), `item("heap LRU")]) - ))) - )) - ), + `HSpacing(3), + `HWeight(1,`VBox( + `VWeight(1, `HBox(`Empty())), + `VSpacing(0.4), + `VWeight(1, `HBox( + `IntField(`id("cache_min_object_size"), _("Min 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) + )), + `VSpacing(0.4), + `Left(`VWeight(1, `HBox( + `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(`browse_cache_dir), Label::BrowseButton())), - `Bottom(`PushButton(`id(`cache_dir), "Advanced Setting")) + `VWeight(1, `Frame(_("Cache Directory"), + `VBox( + `VSquash(`HBox( + `TextEntry(`id("cache_dir"), _("Cache Directory"), ""), + `Bottom(`PushButton(`id(`browse_cache_dir), Label::BrowseButton())) + )), + `VSpacing(0.4), + `IntField(`id("mbytes"), _("Size (in MB)"), 0, 99999, 0), + `VSpacing(0.4), + `IntField(`id("l1dirs"), _("Level 1 Directories"), 0, 99999, 0), + `VSpacing(0.4), + `IntField(`id("l2dirs"), _("Level 2 Directories"), 0, 99999, 0) + ) )) - ) - ))); + ), + `HSpacing(3) + )); Wizard::SetContentsButtons("Squid - Cache Setting 2", dialog_contents, HELPS["cache2"]:"", Label::BackButton(), Label::NextButton()); @@ -268,8 +279,6 @@ }else if (ret == `abort || ret == `cancel){ if (reallyAbort()) break; continue; - }else if (ret == `cache_dir){ - CacheDirAdvancedSettingDialog(); }else if (ret == `browse_cache_dir){ cache_dir = UI::AskForExistingDirectory((string)UI::QueryWidget(`id("cache_dir"), `Value), "Cache Directory"); if (cache_dir != nil){ @@ -384,7 +393,7 @@ any ret = nil; string tmp = nil; term dialog_contents = - `Left(`Top(`VBox( + `HBox(`HSpacing(3), `VBox( `Frame(_("Logging"), `VBox( `VSquash(`HBox( @@ -417,7 +426,7 @@ ) ) ) - ))); + ), `HSpacing(3)); Wizard::SetContentsButtons("Squid - Logging and Timeouts Setting", dialog_contents, HELPS["logging_timeouts"]:"", Label::BackButton(), Label::NextButton()); @@ -459,15 +468,15 @@ { any ret = nil; term dialog_contents = - `Top(`VBox( - `Left(`ComboBox(`id("error_language"), + `HVCenter(`Frame(_("Miscellaneous Setting"), `VBox( + `ComboBox(`id("error_language"), _("Language of error messages"), - [])), + []), `VSpacing(), - `Left(`TextEntry(`id("cache_mgr"), _("Administrator's e-mail"), "")), + `TextEntry(`id("cache_mgr"), _("Administrator's e-mail"), ""), `VSpacing(), - `Left(`CheckBox(`id("ftp_passive"), _("Use Ftp Pasive Mode"))) - )); + `CheckBox(`id("ftp_passive"), _("Use Ftp Pasive Mode")) + ))); Wizard::SetContentsButtons("Squid - Miscellaneous Setting", dialog_contents, HELPS["miscellaneous"]:"", Label::BackButton(), Label::FinishButton()); Modified: trunk/squid/src/inits.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/inits.ycp?rev=40338&r1=40337&r2=40338&view=diff ============================================================================== --- trunk/squid/src/inits.ycp (original) +++ trunk/squid/src/inits.ycp Fri Aug 17 15:39:08 2007 @@ -156,14 +156,7 @@ "cache_swap_high" : tointeger((set["cache_swap_high"]:[])[0]:""), "cache_replacement_policy" : (set["cache_replacement_policy"]:[])[0]:"", "memory_replacement_policy" : (set["memory_replacement_policy"]:[])[0]:"", - "cache_dir" : (set["cache_dir"]:[])[1]:"" - ]); -} -void InitCacheDirAdvancedSettingDialog() -{ - map set = (map)Squid::GetSettings(); - simpleInit($[ - //"type" : (set["cache_dir"]:[])[0]:"", + "cache_dir" : (set["cache_dir"]:[])[1]:"", "mbytes" : tointeger((set["cache_dir"]:[])[2]:""), "l1dirs" : tointeger((set["cache_dir"]:[])[3]:""), "l2dirs" : tointeger((set["cache_dir"]:[])[4]:"") Modified: trunk/squid/src/popup_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/popup_dialogs.ycp?rev=40338&r1=40337&r2=40338&view=diff ============================================================================== --- trunk/squid/src/popup_dialogs.ycp (original) +++ trunk/squid/src/popup_dialogs.ycp Fri Aug 17 15:39:08 2007 @@ -138,52 +138,6 @@ UI::CloseDialog(); return ret; } - - -boolean CacheDirAdvancedSettingDialog(){ - boolean ret = false; - any ui = nil; - term contents = - `VBox( - `Label( _("Cache Directory Advanced Setting")), - `VSpacing(0.5), - - //`ComboBox(`id("type"), _("Type"), []), - `IntField(`id("mbytes"), _("Size (in MB)"), 1, 99999, 10), - `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); - - - InitCacheDirAdvancedSettingDialog(); - - while (true){ - ui = UI::UserInput(); - - if (ui == `cancel || ui == `abort){ - ret = false; - break; - }else if (ui == `ok){ - if (StoreDataFromCacheDirAdvancedSettingDialog()){ - ret = true; - break; - } - } - } - - - UI::CloseDialog(); - return ret; -} /***************** CACHE END ********************/ Modified: trunk/squid/src/store_del.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/store_del.ycp?rev=40338&r1=40337&r2=40338&view=diff ============================================================================== --- trunk/squid/src/store_del.ycp (original) +++ trunk/squid/src/store_del.ycp Fri Aug 17 15:39:08 2007 @@ -155,19 +155,6 @@ /************** CACHE DIALOG ********************/ -boolean StoreDataFromCacheDirAdvancedSettingDialog() -{ - list set = Squid::GetSetting("cache_dir"); - Squid::SetSetting("cache_dir", - [set[0]:"", - set[1]:"", - tostring(UI::QueryWidget(`id("mbytes"), `Value)), - tostring(UI::QueryWidget(`id("l1dirs"), `Value)), - tostring(UI::QueryWidget(`id("l2dirs"), `Value))]); - return true; -} - - boolean StoreDataFromCache2Dialog() { boolean ok = true; @@ -182,8 +169,12 @@ } if (ok){ - Squid::SetSetting("cache_dir", [squid_cache_dir[0]:"", cache_dir, squid_cache_dir[2]:"", - squid_cache_dir[3]:"", squid_cache_dir[4]:""]); + 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)), -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org