April 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r46973 - in /trunk/theme/openSUSE/icons: 16x16/apps/ 22x22/apps/ 32x32/apps/ 48x48/apps/ 64x64/apps/
by jimmacfx＠svn.opensuse.org 22 Apr '08

22 Apr '08

Author: jimmacfx Date: Tue Apr 22 21:40:07 2008 New Revision: 46973 URL: http://svn.opensuse.org/viewcvs/yast?rev=46973&view=rev Log: update KDE icons Added: trunk/theme/openSUSE/icons/16x16/apps/pattern-kde4.png trunk/theme/openSUSE/icons/16x16/apps/yast-gnome.png trunk/theme/openSUSE/icons/16x16/apps/yast-kde.png trunk/theme/openSUSE/icons/16x16/apps/yast-kde4.png trunk/theme/openSUSE/icons/22x22/apps/pattern-kde4.png trunk/theme/openSUSE/icons/22x22/apps/yast-gnome.png trunk/theme/openSUSE/icons/22x22/apps/yast-kde.png trunk/theme/openSUSE/icons/22x22/apps/yast-kde4.png trunk/theme/openSUSE/icons/32x32/apps/pattern-kde4.png trunk/theme/openSUSE/icons/32x32/apps/yast-gnome.png trunk/theme/openSUSE/icons/32x32/apps/yast-kde.png trunk/theme/openSUSE/icons/32x32/apps/yast-kde4.png trunk/theme/openSUSE/icons/48x48/apps/pattern-kde4.png trunk/theme/openSUSE/icons/48x48/apps/yast-kde4.png trunk/theme/openSUSE/icons/64x64/apps/pattern-gnome.png trunk/theme/openSUSE/icons/64x64/apps/pattern-kde.png trunk/theme/openSUSE/icons/64x64/apps/pattern-kde4.png Modified: trunk/theme/openSUSE/icons/16x16/apps/pattern-gnome.png trunk/theme/openSUSE/icons/22x22/apps/pattern-LAMP.png trunk/theme/openSUSE/icons/22x22/apps/pattern-gnome.png trunk/theme/openSUSE/icons/32x32/apps/pattern-gnome.png trunk/theme/openSUSE/icons/48x48/apps/pattern-gnome.png trunk/theme/openSUSE/icons/48x48/apps/yast-gnome.png trunk/theme/openSUSE/icons/48x48/apps/yast-kde.png trunk/theme/openSUSE/icons/64x64/apps/yast-gnome.png trunk/theme/openSUSE/icons/64x64/apps/yast-kde.png trunk/theme/openSUSE/icons/64x64/apps/yast-kde4.png Modified: trunk/theme/openSUSE/icons/16x16/apps/pattern-gnome.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/16x16/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/16x16/apps/pattern-gnome.png (original) and trunk/theme/openSUSE/icons/16x16/apps/pattern-gnome.png Tue Apr 22 21:40:07 2008 differ Added: trunk/theme/openSUSE/icons/16x16/apps/pattern-kde4.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/16x16/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/16x16/apps/pattern-kde4.png (added) and trunk/theme/openSUSE/icons/16x16/apps/pattern-kde4.png Tue Apr 22 21:40:07 2008 differ Added: trunk/theme/openSUSE/icons/16x16/apps/yast-gnome.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/16x16/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/16x16/apps/yast-gnome.png (added) and trunk/theme/openSUSE/icons/16x16/apps/yast-gnome.png Tue Apr 22 21:40:07 2008 differ Added: trunk/theme/openSUSE/icons/16x16/apps/yast-kde.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/16x16/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/16x16/apps/yast-kde.png (added) and trunk/theme/openSUSE/icons/16x16/apps/yast-kde.png Tue Apr 22 21:40:07 2008 differ Added: trunk/theme/openSUSE/icons/16x16/apps/yast-kde4.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/16x16/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/16x16/apps/yast-kde4.png (added) and trunk/theme/openSUSE/icons/16x16/apps/yast-kde4.png Tue Apr 22 21:40:07 2008 differ Modified: trunk/theme/openSUSE/icons/22x22/apps/pattern-LAMP.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/22x22/apps/pattern-LAMP.png (original) and trunk/theme/openSUSE/icons/22x22/apps/pattern-LAMP.png Tue Apr 22 21:40:07 2008 differ Modified: trunk/theme/openSUSE/icons/22x22/apps/pattern-gnome.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Binary files - no diff available. Added: trunk/theme/openSUSE/icons/22x22/apps/pattern-kde4.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/22x22/apps/pattern-kde4.png (added) and trunk/theme/openSUSE/icons/22x22/apps/pattern-kde4.png Tue Apr 22 21:40:07 2008 differ Added: trunk/theme/openSUSE/icons/22x22/apps/yast-gnome.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/22x22/apps/yast-gnome.png (added) and trunk/theme/openSUSE/icons/22x22/apps/yast-gnome.png Tue Apr 22 21:40:07 2008 differ Added: trunk/theme/openSUSE/icons/22x22/apps/yast-kde.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/22x22/apps/yast-kde.png (added) and trunk/theme/openSUSE/icons/22x22/apps/yast-kde.png Tue Apr 22 21:40:07 2008 differ Added: trunk/theme/openSUSE/icons/22x22/apps/yast-kde4.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/22x22/apps/yast-kde4.png (added) and trunk/theme/openSUSE/icons/22x22/apps/yast-kde4.png Tue Apr 22 21:40:07 2008 differ Modified: trunk/theme/openSUSE/icons/32x32/apps/pattern-gnome.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Binary files - no diff available. Added: trunk/theme/openSUSE/icons/32x32/apps/pattern-kde4.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/32x32/apps/pattern-kde4.png (added) and trunk/theme/openSUSE/icons/32x32/apps/pattern-kde4.png Tue Apr 22 21:40:07 2008 differ Added: trunk/theme/openSUSE/icons/32x32/apps/yast-gnome.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/32x32/apps/yast-gnome.png (added) and trunk/theme/openSUSE/icons/32x32/apps/yast-gnome.png Tue Apr 22 21:40:07 2008 differ Added: trunk/theme/openSUSE/icons/32x32/apps/yast-kde.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/32x32/apps/yast-kde.png (added) and trunk/theme/openSUSE/icons/32x32/apps/yast-kde.png Tue Apr 22 21:40:07 2008 differ Added: trunk/theme/openSUSE/icons/32x32/apps/yast-kde4.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/32x32/apps/yast-kde4.png (added) and trunk/theme/openSUSE/icons/32x32/apps/yast-kde4.png Tue Apr 22 21:40:07 2008 differ Modified: trunk/theme/openSUSE/icons/48x48/apps/pattern-gnome.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/48x48/apps/pattern-gnome.png (original) and trunk/theme/openSUSE/icons/48x48/apps/pattern-gnome.png Tue Apr 22 21:40:07 2008 differ Added: trunk/theme/openSUSE/icons/48x48/apps/pattern-kde4.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/48x48/apps/pattern-kde4.png (added) and trunk/theme/openSUSE/icons/48x48/apps/pattern-kde4.png Tue Apr 22 21:40:07 2008 differ Modified: trunk/theme/openSUSE/icons/48x48/apps/yast-gnome.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/48x48/apps/yast-kde.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Binary files - no diff available. Added: trunk/theme/openSUSE/icons/48x48/apps/yast-kde4.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/48x48/apps/yast-kde4.png (added) and trunk/theme/openSUSE/icons/48x48/apps/yast-kde4.png Tue Apr 22 21:40:07 2008 differ Added: trunk/theme/openSUSE/icons/64x64/apps/pattern-gnome.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/64x64/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/64x64/apps/pattern-gnome.png (added) and trunk/theme/openSUSE/icons/64x64/apps/pattern-gnome.png Tue Apr 22 21:40:07 2008 differ Added: trunk/theme/openSUSE/icons/64x64/apps/pattern-kde.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/64x64/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/64x64/apps/pattern-kde.png (added) and trunk/theme/openSUSE/icons/64x64/apps/pattern-kde.png Tue Apr 22 21:40:07 2008 differ Added: trunk/theme/openSUSE/icons/64x64/apps/pattern-kde4.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/64x64/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/64x64/apps/pattern-kde4.png (added) and trunk/theme/openSUSE/icons/64x64/apps/pattern-kde4.png Tue Apr 22 21:40:07 2008 differ Modified: trunk/theme/openSUSE/icons/64x64/apps/yast-gnome.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/64x64/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/64x64/apps/yast-kde.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/64x64/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/64x64/apps/yast-kde4.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/64x64/apps/… ============================================================================== Binary files - no diff available. -- 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] r46972 - in /trunk/theme/openSUSE/icons: 16x16/apps/ 22x22/apps/ 32x32/apps/
by jimmacfx＠svn.opensuse.org 22 Apr '08

22 Apr '08

Author: jimmacfx Date: Tue Apr 22 20:54:35 2008 New Revision: 46972 URL: http://svn.opensuse.org/viewcvs/yast?rev=46972&view=rev Log: remove duplicate icons with a typo Removed: trunk/theme/openSUSE/icons/16x16/apps/patten-gnome.png trunk/theme/openSUSE/icons/16x16/apps/patten-kde.png trunk/theme/openSUSE/icons/22x22/apps/patten-gnome.png trunk/theme/openSUSE/icons/22x22/apps/patten-kde.png trunk/theme/openSUSE/icons/32x32/apps/patten-gnome.png trunk/theme/openSUSE/icons/32x32/apps/patten-kde.png -- 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] r46971 - in /trunk/theme/openSUSE/icons: 16x16/apps/pattern-x11.png 22x22/apps/pattern-x11.png 32x32/apps/pattern-x11.png 48x48/apps/pattern-x11.png
by jimmacfx＠svn.opensuse.org 22 Apr '08

22 Apr '08

Author: jimmacfx Date: Tue Apr 22 20:48:46 2008 New Revision: 46971 URL: http://svn.opensuse.org/viewcvs/yast?rev=46971&view=rev Log: nicer X11 pattern icon Modified: trunk/theme/openSUSE/icons/16x16/apps/pattern-x11.png trunk/theme/openSUSE/icons/22x22/apps/pattern-x11.png trunk/theme/openSUSE/icons/32x32/apps/pattern-x11.png trunk/theme/openSUSE/icons/48x48/apps/pattern-x11.png Modified: trunk/theme/openSUSE/icons/16x16/apps/pattern-x11.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/16x16/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/16x16/apps/pattern-x11.png (original) and trunk/theme/openSUSE/icons/16x16/apps/pattern-x11.png Tue Apr 22 20:48:46 2008 differ Modified: trunk/theme/openSUSE/icons/22x22/apps/pattern-x11.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/22x22/apps/pattern-x11.png (original) and trunk/theme/openSUSE/icons/22x22/apps/pattern-x11.png Tue Apr 22 20:48:46 2008 differ Modified: trunk/theme/openSUSE/icons/32x32/apps/pattern-x11.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/32x32/apps/pattern-x11.png (original) and trunk/theme/openSUSE/icons/32x32/apps/pattern-x11.png Tue Apr 22 20:48:46 2008 differ Modified: trunk/theme/openSUSE/icons/48x48/apps/pattern-x11.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/48x48/apps/pattern-x11.png (original) and trunk/theme/openSUSE/icons/48x48/apps/pattern-x11.png Tue Apr 22 20:48:46 2008 differ -- 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] r46970 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_automatic_configuration.ycp
by locilka＠svn.opensuse.org 22 Apr '08

22 Apr '08

Author: locilka Date: Tue Apr 22 18:50:59 2008 New Revision: 46970 URL: http://svn.opensuse.org/viewcvs/yast?rev=46970&view=rev Log: - Adjusting automatic configuration UI to use two progress bars instead of one. Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_automatic_configuration.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Apr 22 18:50:59 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 22 18:46:51 CEST 2008 - locilka(a)suse.cz + +- Adjusting automatic configuration UI to use two progress bars + instead of one. + +------------------------------------------------------------------- Tue Apr 22 12:26:52 CEST 2008 - locilka(a)suse.cz - Fixed filtering-out already registered repos (bnc #379051). Modified: trunk/installation/src/clients/inst_automatic_configuration.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_au… ============================================================================== --- trunk/installation/src/clients/inst_automatic_configuration.ycp (original) +++ trunk/installation/src/clients/inst_automatic_configuration.ycp Tue Apr 22 18:50:59 2008 @@ -15,8 +15,8 @@ import "FileUtils"; import "Directory"; import "GetInstArgs"; - import "Progress"; import "Wizard"; + import "Progress"; textdomain "installation"; @@ -25,10 +25,17 @@ return `auto; } - y2milestone ("automatic_configuration started"); + boolean test_mode = false; + + if (size (WFM::Args()) > 0 && is (WFM::Args(0), string)) { + y2milestone ("Args: %1", WFM::Args()); + if (WFM::Args(0) == "test") + test_mode = true; + } + + if (test_mode) Wizard::CreateDialog(); - Mode::SetMode ("installation"); - Stage::Set ("continue"); + y2milestone ("automatic_configuration started"); // TODO: read this from control file // (at least the list of modules in proposals) @@ -107,6 +114,9 @@ if (! UI::TextMode()) { y2milestone ("Printing >don't panic<!"); SCR::Write (.dev.tty.stderr, + // TRANSLATORS: this message is displayed on console when X11 configuration + // switches from running X to console. Sometimes it looks like + // the installation has failed. _(" *********************************************************** @@ -123,70 +133,60 @@ } } - integer current_step = 0; integer current_sub_step = 0; - integer nr_of_sub_steps = 0; - - void ResetSubSteps (integer substeps) { - nr_of_sub_steps = substeps; - current_sub_step = 0; - } + integer current_step = 0; - void NextStep (string progress_title) { - current_step = current_step + 1; + void NextStep () { current_sub_step = current_sub_step + 1; + current_step = current_step + 1; - if (nr_of_sub_steps > 0 && current_sub_step > 0 && nr_of_sub_steps >= current_sub_step) { - progress_title = sformat ( - // TRANSLATORS: Progress step label - // %1 - text defined by script, e.g., "Configuring hardware..." - // %2 - number of the current step - // %3 - number of all steps - // Finally, it might look like this "Configuring hardware... (2/5)" - _("%1 (%2/%3)"), - progress_title, - current_sub_step, - nr_of_sub_steps - ); - } + UI::ChangeWidget (`id ("one_set_progress"), `Value, current_sub_step); + UI::ChangeWidget (`id ("autoconf_progress"), `Value, current_step); + } - Progress::Title (progress_title); - Progress::Step (current_step); + void DummyFunction () { + sleep (random (1600)); } - void CallScripts (list <string> scripts_to_call, string progress_title) { + void CallScripts (list <string> scripts_to_call) { y2milestone ("Scripts to call: %1", scripts_to_call); scripts_to_call = NormalizeScriptNames (scripts_to_call); - // every single script has one step - ResetSubSteps (size (scripts_to_call)); foreach (string one_script, scripts_to_call, { y2milestone ("Calling script %1", one_script); - NextStep (progress_title); + NextStep(); boolean progress_before = Progress::set (false); - any result = WFM::CallFunction (one_script, [ $["AutomaticConfiguration":true] ]); + any result = ( + test_mode ? + DummyFunction() + : + WFM::CallFunction (one_script, [ $["AutomaticConfiguration":true] ]) + ); Progress::set (progress_before); y2milestone ("Script %1 returned %2", one_script, result); }); } - void CallProposals (list <string> proposals_to_call, string progress_title) { + void CallProposals (list <string> proposals_to_call) { y2milestone ("Scripts to call: %1", proposals_to_call); proposals_to_call = NormalizeProposalNames (proposals_to_call); - // every single proposal has two steps - ResetSubSteps (2 * size (proposals_to_call)); foreach (string one_proposal, proposals_to_call, { y2milestone ("Calling script %1 MakeProposal", one_proposal); - NextStep (progress_title); + NextStep(); boolean progress_before = Progress::set (false); HandleExceptions (one_proposal); - any result = WFM::CallFunction (one_proposal, ["MakeProposal", $[ "AutomaticConfiguration":true ]]); + any result = ( + test_mode ? + DummyFunction() + : + WFM::CallFunction (one_proposal, ["MakeProposal", $[ "AutomaticConfiguration":true ]]) + ); Progress::set (progress_before); y2milestone ("Script %1 returned %2", one_proposal, result); @@ -201,12 +201,16 @@ foreach (string one_proposal, proposals_to_call, { y2milestone ("Calling script %1 Write", one_proposal); - NextStep (progress_title); + NextStep(); boolean progress_before = Progress::set (false); - any result = WFM::CallFunction (one_proposal, ["Write", $[ "AutomaticConfiguration":true ]]); + any result = ( + test_mode ? + DummyFunction() + : + WFM::CallFunction (one_proposal, ["Write", $[ "AutomaticConfiguration":true ]]) + ); - Progress::set (progress_before); y2milestone ("Script %1 returned %2", one_proposal, result); }); } @@ -219,39 +223,68 @@ ((one_autoconf_call["type"]:"" == "proposals" ? 2:1) * size (one_autoconf_call["items"]:[])); }); - Progress::Simple( + Wizard::SetContents ( _("Automatic Configuration"), - "", - nr_of_steps, - _("<p>Installation is currently writing the automatic configuration. Please wait...</p>") + `VBox ( + // faster progress + `ReplacePoint( + `id ("rp_one_set_progress"), + `ProgressBar ( + `id ("one_set_progress"), + _("Preparing configuration..."), + 100, + 0 + ) + ), + // overall-autoconf progress + `ProgressBar ( + `id ("autoconf_progress"), + _("Creating automatic configuration..."), + nr_of_steps, + 0 + ) + ), + _("<p>Installation is currently writing the automatic configuration. Please wait...</p>"), + false, false ); foreach (map one_autoconf_call, proposal_scripts_to_call, { string type = one_autoconf_call["type"]:""; - string progress_title = one_autoconf_call["label"]:_("Automatic configuration..."); + // reset the faster prgress + current_sub_step = 0; + UI::ReplaceWidget (`id ("rp_one_set_progress"), + `ProgressBar ( + `id ("one_set_progress"), + one_autoconf_call["label"]:_("Automatic configuration..."), + ((one_autoconf_call["type"]:"" == "proposals" ? 2:1) * size (one_autoconf_call["items"]:[])), + 0 + ) + ); + y2milestone ("Steps: %1", ((one_autoconf_call["type"]:"" == "proposals" ? 2:1) * size (one_autoconf_call["items"]:[]))); + y2milestone ("Label: %1", one_autoconf_call["label"]:_("Automatic configuration...")); switch (type) { case "scripts": - CallScripts (one_autoconf_call["items"]:[], progress_title); + CallScripts (one_autoconf_call["items"]:[]); break; case "proposals": - CallProposals (one_autoconf_call["items"]:[], progress_title); + CallProposals (one_autoconf_call["items"]:[]); break; y2error ("Unknown script type '%1'", type); } }); - Progress::Finish(); - y2milestone ("automatic_configuration finished"); - Wizard::SetContents ( - _("Automatic Configuration"), - `Label (_("Finishing configuration...")), - "", - false, false - ); +// Wizard::SetContents ( +// _("Automatic Configuration"), +// `Label (_("Finishing configuration...")), +// "", +// false, false +// ); + + if (test_mode) Wizard::CloseDialog(); return `auto; } -- 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] r46969 - in /trunk/theme: VERSION package/yast2-theme.changes
by coolo＠svn.opensuse.org 22 Apr '08

22 Apr '08

Author: coolo Date: Tue Apr 22 18:20:45 2008 New Revision: 46969 URL: http://svn.opensuse.org/viewcvs/yast?rev=46969&view=rev Log: changes Modified: trunk/theme/VERSION trunk/theme/package/yast2-theme.changes Modified: trunk/theme/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/VERSION?rev=46969&r1=46968… ============================================================================== --- trunk/theme/VERSION (original) +++ trunk/theme/VERSION Tue Apr 22 18:20:45 2008 @@ -1 +1 @@ -2.16.22 +2.16.23 Modified: trunk/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/package/yast2-theme.change… ============================================================================== --- trunk/theme/package/yast2-theme.changes (original) +++ trunk/theme/package/yast2-theme.changes Tue Apr 22 18:20:45 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 22 18:20:39 CEST 2008 - coolo(a)suse.de + +- adding a kde4 icon + +------------------------------------------------------------------- Thu Apr 17 15:33:52 CEST 2008 - coolo(a)suse.de - overwrite the red color - does not fit well on gray -- 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] r46968 - in /trunk/x11: package/yast2-x11.changes src/XMessages.ycp src/autoyast/dialog/autoDialog.ycp src/proposal/x11_proposal.ycp
by jdsn＠svn.opensuse.org 22 Apr '08

22 Apr '08

Author: jdsn Date: Tue Apr 22 18:15:10 2008 New Revision: 46968 URL: http://svn.opensuse.org/viewcvs/yast?rev=46968&view=rev Log: added strings for Xgl settings and abbreviation of millions Modified: trunk/x11/package/yast2-x11.changes trunk/x11/src/XMessages.ycp trunk/x11/src/autoyast/dialog/autoDialog.ycp trunk/x11/src/proposal/x11_proposal.ycp Modified: trunk/x11/package/yast2-x11.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/package/yast2-x11.changes?re… ============================================================================== --- trunk/x11/package/yast2-x11.changes (original) +++ trunk/x11/package/yast2-x11.changes Tue Apr 22 18:15:10 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 22 18:13:29 CEST 2008 - jdsn(a)suse.de + +- added new strings for Xgl settings and abbr. of million + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain(a)suse.cz - added 'StartupNotify=true' to the desktop file (bnc #304964) Modified: trunk/x11/src/XMessages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/XMessages.ycp?rev=46968&… ============================================================================== --- trunk/x11/src/XMessages.ycp (original) +++ trunk/x11/src/XMessages.ycp Tue Apr 22 18:15:10 2008 @@ -45,30 +45,70 @@ X11 configuration module. "); -//============================================= -// 256 colors -//--------------------------------------------- -global string colors256 = _("256 Colors"); +// 256 colors - lower case +string colors256_lc = _("256 colors"); +// 256 Colors - upper case +string colors256_uc = _("256 Colors"); + +// 32768 colors - lower case +string colors32k_lc = _("32768 colors"); +// 32768 colors - upper case +string colors32k_uc = _("32768 Colors"); + +// 65536 colors - lower case +string colors65k_lc = _("65536 colors"); +// 65536 colors - upper case +string colors65k_uc = _("65536 Colors"); + +// 16.7 m colors - lower case +string colors16m_lc = _("16.7 m colors"); +// 16.7 M colors - upper case +string colors16m_uc = _("16.7 M Colors"); +// 16.7 Mio. colors - business language +string colors16m_uc_business = _("16.7 Mio. Colors"); + +global string colors256 = colors256_lc; +global string colors32k = colors32k_lc; +global string colors65k = colors65k_lc; +global string colors16m = colors16m_lc; -//============================================= -// 32768 colors -//--------------------------------------------- -global string colors32k = _("32768 Colors"); //============================================= -// 65536 colors -//--------------------------------------------- -global string colors65k = _("65536 Colors"); +// Colors - title for a drop-down box +global string colors = _("Colors"); -//============================================= -// 16.7 Mio. colors -//--------------------------------------------- -global string colors16m = _("16.7 Mio. Colors"); +// string for a drop-down box +global string color8bit = _("256 [ 8 bit ]"); +// string for a drop-down box +global string color15bit = _("32768 [ 15 bit ]"); +// string for a drop-down box +global string color16bit = _("65536 [ 16 bit ]"); +// string for a drop-down box - lower case +string color24bit_lc = _("16.7 m [ 24 bit ]"); +// string for a drop-down box - upper case +string color24bit_uc = _("16.7 M [ 24 bit ]"); +// string for a drop-down box - business language +string color24bit_uc_business = _("16.7 Mio. [ 24 bit ]"); +global string color24bit = color24bit_lc; + +//============================================= +// Xgl strings +//--------------------------------------------- +// label for a checkbox +global string enableXgl = _("Enable Xgl"); +// label for a checkbox +global string enableXglIfPossible = _("Enable Xgl if possible"); +// label for a text entry +global string xglOptions = _("Xgl options"); +// label for a heading +global string xglOptions = _("Xgl Options"); +// label for a text entry +global string customXglOptions = _("Custom Xgl options"); +// label for a heading +global string customXglOptions = _("Custom Xgl Options"); +// label for a drop-down box +global string XServer = _("X server"); -//============================================= -// color key -//--------------------------------------------- -global string colors = _("Colors"); //============================================= // graphics card Modified: trunk/x11/src/autoyast/dialog/autoDialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/autoyast/dialog/autoDial… ============================================================================== --- trunk/x11/src/autoyast/dialog/autoDialog.ycp (original) +++ trunk/x11/src/autoyast/dialog/autoDialog.ycp Tue Apr 22 18:15:10 2008 @@ -109,7 +109,21 @@ `id(`enable_3d), _("&Enable 3D Support if possible"), x11["enable_3d"]:false) + ), + `Left( + `CheckBox( + `id(`enable_xgl), + _("Enable &Xgl if possible"), + x11["enable_xgl"]:false) ), + `Left( + `HBox( `CheckBox( + `id(`xgl_options), + _("&Custom Xgl options"), + x11["xgl_options"]:false), + `TextEntry(`id(`xgl_options_string), ""), + `PushButton(`id(`fetch_xgl_options), _("Fetch from system")) + )), `VSpacing(1), `HBox( `HWeight(50, Modified: trunk/x11/src/proposal/x11_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/x11/src/proposal/x11_proposal.yc… ============================================================================== --- trunk/x11/src/proposal/x11_proposal.ycp (original) +++ trunk/x11/src/proposal/x11_proposal.ycp Tue Apr 22 18:15:10 2008 @@ -261,15 +261,15 @@ if (chosenID == "sax-resolution") { y2milestone("X11: setup resolution..."); string depth = XLib::getActiveColorDepth(); - string colstr = "256 [ 8 bit ]"; + string colstr = XMessages::color8bit; if (depth == "15") { - colstr = "32768 [ 15 bit ]"; + colstr = XMessages::color15bit; } if (depth == "16") { - colstr = "65536 [ 16 bit ]"; + colstr = XMessages::color16bit; } if (depth == "24") { - colstr = "16.7 Mio. [ 24 bit ]"; + colstr = XMessages::color24bit; } string selectedRes = setupResolutions ( XLib::getAvailableResolutionNames(), @@ -292,15 +292,15 @@ if (chosenID == "sax-colors") { y2milestone("X11: setup color depth..."); string depth = XLib::getActiveColorDepth(); - string colstr = "256 [ 8 bit ]"; + string colstr = XMessages::color8bit; if (depth == "15") { - colstr = "32768 [ 15 bit ]"; + colstr = XMessages::color15bit; } if (depth == "16") { - colstr = "65536 [ 16 bit ]"; + colstr = XMessages::color16bit; } if (depth == "24") { - colstr = "16.7 Mio. [ 24 bit ]"; + colstr = XMessages::color24bit; } string selectedColor = setupColors ( XLib::getActiveResolutionString(), -- 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] r46967 - in /trunk/theme/openSUSE/icons: 64x64/ 64x64/Makefile.am 64x64/apps/ 64x64/apps/Makefile.am 64x64/apps/yast-gnome.png 64x64/apps/yast-kde.png 64x64/apps/yast-kde4.png Makefile.am
by coolo＠svn.opensuse.org 22 Apr '08

22 Apr '08

Author: coolo Date: Tue Apr 22 17:52:38 2008 New Revision: 46967 URL: http://svn.opensuse.org/viewcvs/yast?rev=46967&view=rev Log: put the 64x64 icons in the right dir Added: trunk/theme/openSUSE/icons/64x64/ trunk/theme/openSUSE/icons/64x64/Makefile.am trunk/theme/openSUSE/icons/64x64/apps/ trunk/theme/openSUSE/icons/64x64/apps/Makefile.am trunk/theme/openSUSE/icons/64x64/apps/yast-gnome.png (props changed) - copied unchanged from r46790, trunk/theme/openSUSE/icons/48x48/apps/yast-gnome.png trunk/theme/openSUSE/icons/64x64/apps/yast-kde.png (props changed) - copied unchanged from r46790, trunk/theme/openSUSE/icons/48x48/apps/yast-kde.png trunk/theme/openSUSE/icons/64x64/apps/yast-kde4.png (with props) Modified: trunk/theme/openSUSE/icons/Makefile.am Added: trunk/theme/openSUSE/icons/64x64/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/64x64/Makef… ============================================================================== --- trunk/theme/openSUSE/icons/64x64/Makefile.am (added) +++ trunk/theme/openSUSE/icons/64x64/Makefile.am Tue Apr 22 17:52:38 2008 @@ -0,0 +1,6 @@ +# +# Makefile.am for theme/openSUSE/icons/48x48 +# + +SUBDIRS = apps + Added: trunk/theme/openSUSE/icons/64x64/apps/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/64x64/apps/… ============================================================================== --- trunk/theme/openSUSE/icons/64x64/apps/Makefile.am (added) +++ trunk/theme/openSUSE/icons/64x64/apps/Makefile.am Tue Apr 22 17:52:38 2008 @@ -0,0 +1,9 @@ +# +# Makefile.am for theme/openSUSE/icons/48x48/apps +# + +icondir = @themedir@/openSUSE/icons/64x64/apps + +icon_DATA = $(wildcard *.png ) + +EXTRA_DIST = $(icon_DATA) Added: trunk/theme/openSUSE/icons/64x64/apps/yast-kde4.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/64x64/apps/… ============================================================================== Binary file - no diff available. Modified: trunk/theme/openSUSE/icons/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/Makefile.am… ============================================================================== --- trunk/theme/openSUSE/icons/Makefile.am (original) +++ trunk/theme/openSUSE/icons/Makefile.am Tue Apr 22 17:52:38 2008 @@ -2,5 +2,5 @@ # Makefile.am for theme/openSUSE/icons # -SUBDIRS = 48x48 32x32 22x22 +SUBDIRS = 48x48 32x32 22x22 64x64 -- 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] r46966 - in /branches/tmp/aschnell/part-redesign/storage/src: include/ep-dialogs.ycp include/ep-hd-dialogs.ycp include/ep-lvm-dialogs.ycp modules/DualMultiSelectionBox.ycp modules/MiniWorkflow.ycp
by aschnell＠svn.opensuse.org 22 Apr '08

22 Apr '08

Author: aschnell Date: Tue Apr 22 17:38:02 2008 New Revision: 46966 URL: http://svn.opensuse.org/viewcvs/yast?rev=46966&view=rev Log: - use symbol for widget Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/DualMultiSelectionBox.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/MiniWorkflow.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp Tue Apr 22 17:38:02 2008 @@ -72,7 +72,7 @@ repeat { - widget = (symbol) MiniWorkflow::UserInput(); + widget = MiniWorkflow::UserInput(); if (widget == `max_size) { @@ -167,7 +167,7 @@ repeat { - widget = (symbol) MiniWorkflow::UserInput(); + widget = MiniWorkflow::UserInput(); if (widget == `crypt_fs) { @@ -253,7 +253,7 @@ repeat { - widget = (symbol) MiniWorkflow::UserInput(); + widget = MiniWorkflow::UserInput(); if (widget == `next) { Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp Tue Apr 22 17:38:02 2008 @@ -48,7 +48,7 @@ repeat { - widget = (symbol) MiniWorkflow::UserInput(); + widget = MiniWorkflow::UserInput(); } until (widget == `abort || widget == `back || widget == `next); Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp Tue Apr 22 17:38:02 2008 @@ -82,7 +82,7 @@ repeat { - widget = (symbol) MiniWorkflow::UserInput(); + widget = MiniWorkflow::UserInput(); DualMultiSelectionBox::Handle(widget); if (contains([`add, `add_all, `remove, `remove_all], widget)) @@ -176,7 +176,7 @@ repeat { - widget = (symbol) MiniWorkflow::UserInput(); + widget = MiniWorkflow::UserInput(); } until (widget == `abort || widget == `back || widget == `next); Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/DualMultiSelectionBox.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/DualMultiSelectionBox.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/DualMultiSelectionBox.ycp Tue Apr 22 17:38:02 2008 @@ -93,43 +93,45 @@ } - global void Handle(any widget) + global void Handle(symbol widget) { - if (widget == `add) + switch (widget) { - SetItems(maplist(term item, GetItems(), { - if (item[2]:false == false && item[3]:false == true) - return `item(item[0]:nil, item[1]:nil, true, false); - else - return item; - })); - } - else if (widget == `remove) - { - SetItems(maplist(term item, GetItems(), { - if (item[2]:false == true && item[3]:false == true) - return `item(item[0]:nil, item[1]:nil, false, false); - else - return item; - })); - } - else if (widget == `add_all) - { - SetItems(maplist(term item, GetItems(), { - if (item[2]:false == false) - return `item(item[0]:nil, item[1]:nil, true, false); - else - return item; - })); - } - else if (widget == `remove_all) - { - SetItems(maplist(term item, GetItems(), { - if (item[2]:false == true) - return `item(item[0]:nil, item[1]:nil, false, false); - else - return item; - })); + case `add: + SetItems(maplist(term item, GetItems(), { + if (item[2]:false == false && item[3]:false == true) + return `item(item[0]:nil, item[1]:nil, true, false); + else + return item; + })); + break; + + case `remove: + SetItems(maplist(term item, GetItems(), { + if (item[2]:false == true && item[3]:false == true) + return `item(item[0]:nil, item[1]:nil, false, false); + else + return item; + })); + break; + + case `add_all: + SetItems(maplist(term item, GetItems(), { + if (item[2]:false == false) + return `item(item[0]:nil, item[1]:nil, true, false); + else + return item; + })); + break; + + case `remove_all: + SetItems(maplist(term item, GetItems(), { + if (item[2]:false == true) + return `item(item[0]:nil, item[1]:nil, false, false); + else + return item; + })); + break; } } } Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/MiniWorkflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/MiniWorkflow.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/MiniWorkflow.ycp Tue Apr 22 17:38:02 2008 @@ -24,18 +24,18 @@ } - global void SetLastStep(boolean last) + global void SetLastStep(boolean last_step) { - if (last) + if (last_step) Wizard::SetNextButton(`next, Label::FinishButton()); else Wizard::SetNextButton(`next, Label::NextButton()); } - global any UserInput() + global symbol UserInput() { - return Wizard::UserInput(); + return (symbol) Wizard::UserInput(); } -- 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] r46965 - /tags/stable-2_16_7/http-server/
by mzugec＠svn.opensuse.org 22 Apr '08

22 Apr '08

Author: mzugec Date: Tue Apr 22 17:33:37 2008 New Revision: 46965 URL: http://svn.opensuse.org/viewcvs/yast?rev=46965&view=rev Log: Created tag stable-2_16_7 for http-server Added: tags/stable-2_16_7/http-server/ - copied from r46964, trunk/http-server/ -- 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] r46964 - in /trunk/http-server: VERSION package/yast2-http-server.changes src/HttpServer.ycp src/HttpServerWidgets.ycp src/dialogs.ycp src/wizard-dialog.ycp src/wizards.ycp
by mzugec＠svn.opensuse.org 22 Apr '08

22 Apr '08

Author: mzugec Date: Tue Apr 22 17:33:32 2008 New Revision: 46964 URL: http://svn.opensuse.org/viewcvs/yast?rev=46964&view=rev Log: fixed Missing "Open Firewall Ports" checkbox in wizard expert (bnc#378742) Modified: trunk/http-server/VERSION trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/HttpServer.ycp trunk/http-server/src/HttpServerWidgets.ycp trunk/http-server/src/dialogs.ycp trunk/http-server/src/wizard-dialog.ycp trunk/http-server/src/wizards.ycp Modified: trunk/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/VERSION?rev=46964&r1… ============================================================================== --- trunk/http-server/VERSION (original) +++ trunk/http-server/VERSION Tue Apr 22 17:33:32 2008 @@ -1 +1 @@ -2.16.6 +2.16.7 Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-s… ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Tue Apr 22 17:33:32 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 22 17:30:57 CEST 2008 - mzugec(a)suse.cz + +- fixed Missing "Open Firewall Ports" checkbox in wizard expert + (bnc#378742) +- 2.16.7 + +------------------------------------------------------------------- Thu Apr 3 01:20:12 CEST 2008 - mzugec(a)suse.de - check checksums from configuration files (FaTE#303374) Modified: trunk/http-server/src/HttpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/HttpServer.ycp?r… ============================================================================== --- trunk/http-server/src/HttpServer.ycp (original) +++ trunk/http-server/src/HttpServer.ycp Tue Apr 22 17:33:32 2008 @@ -71,18 +71,12 @@ include "http-server/routines.ycp"; -global boolean firewall = false; -global boolean firewall_first = true; - /** * Mapping of IPs to network devices */ global map<string,string> ip2device = $[]; -global boolean getFirewallStatus(){ - return firewall; -} list<string> files_to_check = ["/etc/sysconfig/apache2", "/etc/apache2/default-server.conf", "/etc/apache2/httpd.conf", "/etc/apache2/listen.conf", "/etc/apache2/vhosts.d/yast2_vhosts.conf"]; @@ -195,7 +189,6 @@ configured_dns = true; } Progress::set(true); //on(); -// firewall_started = SuSEFirewall::IsEnabled(); //Service::Enabled( "SuSEfirewall2_final" ); // read current settings from httpd.conf and sysconfig Progress::NextStage(); @@ -283,28 +276,6 @@ y2milestone ("Mapping of IP addresses and network devices: %1", ip2device); - // now, check the firewall status to set up the original status correctly - firewall = true; - foreach (map<string,any> listen, YaST::HTTPDData::GetCurrentListen (), - { - // find out the port and host - string port = listen["PORT"]:""; - string ip = listen["ADDRESS"]:""; - - firewall = SuSEFirewall::HaveService ( port, "TCP", ip2device[ip]:"any"); - - if (!firewall && port == "80") - { - // also try http name - firewall = SuSEFirewall::HaveService ( "http", "TCP", ip2device[ip]:"any"); - } - - y2milestone ("Status of firewall for %2:%1: %3", ip, port, firewall); - - // the firewall is not properly opened - if (! firewall) - break; - }); Progress::set(true); //on(); @@ -432,6 +403,9 @@ Report::Error( Message::CannotAdjustService("apache2") ); } } + // configuration test +// map<string, any> test = (map<string, any>)SCR::Execute(.target.bash_output, "apache2ctl conftest"); +//y2internal("test %1", test); foreach(string file, files_to_check, { FileChanges::StoreFileCheckSum( file ); @@ -540,12 +514,6 @@ { YaST::HTTPDData::ModifyService (s["service"]:false); } - - // setup firewall - if (haskey( s, "firewall" )) - { - firewall = s["firewall"]:false; - } modified = false; configured = true; @@ -614,7 +582,6 @@ "hosts" : hosts, "Listen": YaST::HTTPDData::GetCurrentListen(), "service" : YaST::HTTPDData::GetService (), - "firewall" : firewall, ]; configured = true; Modified: trunk/http-server/src/HttpServerWidgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/HttpServerWidget… ============================================================================== --- trunk/http-server/src/HttpServerWidgets.ycp (original) +++ trunk/http-server/src/HttpServerWidgets.ycp Tue Apr 22 17:33:32 2008 @@ -1407,14 +1407,6 @@ "help" : HELPS["firewall_adapt"]:"", "display_details" : true, ]), - "firewall_first" : $[ - "widget" : `checkbox, - // translators: checkbox label - "label" : _("Open &Firewall on Selected Ports"), - "help" : HELPS["firewall_adapt"]:"", - "init" : initAdaptFirewall, - "store" : storeAdaptFirewall, - ], "host" : hostwidget, "LISTEN" : $[ "widget" : `custom, @@ -2706,33 +2698,6 @@ return nil; } -// ************************************ Adapt firewall widget ******************** - - /** - * Initialization function for firewall adapting - * @param key any option key to be initialized - */ - global void initAdaptFirewall (string key) ``{ - if( SuSEFirewall::IsStarted() ) { - UI::ChangeWidget (`id (key), `Value, HttpServer::getFirewallStatus()); - UI::ChangeWidget (`id (key), `Enabled, true ); - } else { - // disable the widget - UI::ChangeWidget (`id (key), `Enabled, false ); - } - } - - /** - * Store function for firewall adapting - * @param opt_id any option id - * @param event map event description - */ - global void storeAdaptFirewall (string opt_id, map event) ``{ - if( SuSEFirewall::IsStarted() ) { - HttpServer::firewall = (boolean)UI::QueryWidget (`id (opt_id), `Value); - HttpServer::modified = true; - } - } /* these are for future use: */ // error message - the entered ip address is not found @@ -2828,33 +2793,6 @@ } - /** - * Initialize firewall settings - * @param key string - */ -global define void initFwOpen (string key) ``{ - y2milestone("initializing firewall open ..."); - if( SuSEFirewall::IsStarted() ) { - UI::ChangeWidget (`id (key), `Value, true); - UI::ChangeWidget (`id (key), `Enabled, true ); - } else { - // disable the widget - UI::ChangeWidget (`id (key), `Enabled, false ); - } -} - - /** - * Store firewall settings - * @param opt_id string - * @param event map - */ - global define void storeFwOpen (string opt_id, map event) ``{ - if( SuSEFirewall::IsEnabled() || Mode::config ()) { - HttpServer::firewall = (boolean)UI::QueryWidget (`id (opt_id), `Value); - HttpServer::modified = true; - } - } - // *********************** Wizard Dialog 2 Widgets ***************************************** /** Modified: trunk/http-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/http-server/src/dialogs.ycp (original) +++ trunk/http-server/src/dialogs.ycp Tue Apr 22 17:33:32 2008 @@ -112,7 +112,7 @@ */ symbol OverviewDialog () { string caption = _("HTTP Server Configuration"); - if (HttpServer::firewall_first) tabs_descr["listen", "widget_names"]= [ "server_enable", "LISTEN", "logs" ]; +// if (HttpServer::firewall_first) tabs_descr["listen", "widget_names"]= [ "server_enable", "LISTEN", "logs" ]; map widget_descr = $[ "tab": CWMTab::CreateWidget($[ "tab_order": [ "listen", "modules", "main_host", "hosts"], Modified: trunk/http-server/src/wizard-dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/wizard-dialog.yc… ============================================================================== --- trunk/http-server/src/wizard-dialog.ycp (original) +++ trunk/http-server/src/wizard-dialog.ycp Tue Apr 22 17:33:32 2008 @@ -32,13 +32,14 @@ `VSpacing(0.5), "listen_interfaces", `VSpacing(0.5), - "firewall_first", +// "firewall_first", + "firewall_adapt", `VSpacing(8) ), `HStretch() // ) ); - list<string> widget_names = ["open_port", "listen_interfaces", "firewall_first"]; + list<string> widget_names = ["open_port", "listen_interfaces", /*"firewall_first"*/"firewall_adapt"]; list<map<string,any> > w = CWM::CreateWidgets (widget_names, HttpServerWidgets::widgets); string help = "<h3>" + _("Network Device Selection") + "</h3>" + CWM::MergeHelps (w); contents = CWM::PrepareDialog (contents, w); Modified: trunk/http-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/wizards.ycp?rev=… ============================================================================== --- trunk/http-server/src/wizards.ycp (original) +++ trunk/http-server/src/wizards.ycp Tue Apr 22 17:33:32 2008 @@ -235,10 +235,7 @@ if ($[] == SCR::Read (.target.stat, Directory::vardir + "/http_server")) { sequence["read", `next] = "wizard"; - } else - { - HttpServer::firewall_first = false; - } + } symbol ret = Sequencer::Run(aliases, sequence); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0