Author: visnov Date: Fri Sep 16 11:44:31 2011 New Revision: 65738 URL: http://svn.opensuse.org/viewcvs/yast?rev=65738&view=rev Log: remove unused dialogs and thus deprecated import (Wizard_hw) Modified: trunk/slp-server/package/yast2-slp-server.changes trunk/slp-server/src/complex.ycp trunk/slp-server/src/helps.ycp trunk/slp-server/src/wizards.ycp Modified: trunk/slp-server/package/yast2-slp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/package/yast2-slp-server.changes?rev=65738&r1=65737&r2=65738&view=diff ============================================================================== --- trunk/slp-server/package/yast2-slp-server.changes (original) +++ trunk/slp-server/package/yast2-slp-server.changes Fri Sep 16 11:44:31 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Sep 16 11:43:56 CEST 2011 - visnov@suse.de + +- remove unneded dialogs and deprecated import + +------------------------------------------------------------------- Fri Aug 5 12:35:10 CEST 2011 - tgoettlicher@suse.de - fixed .desktop file (bnc #681249) Modified: trunk/slp-server/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/src/complex.ycp?rev=65738&r1=65737&r2=65738&view=diff ============================================================================== --- trunk/slp-server/src/complex.ycp (original) +++ trunk/slp-server/src/complex.ycp Fri Sep 16 11:44:31 2011 @@ -14,7 +14,6 @@ import "Label"; import "Popup"; import "Wizard"; -import "Wizard_hw"; import "SlpServer"; include "slp-server/helps.ycp"; @@ -57,68 +56,5 @@ return ret ? `next : `abort; } -/** - * Summary dialog - * @return dialog result - */ -any SummaryDialog() { - - /* SlpServer summary dialog caption */ - string caption = _("SLP Server Configuration"); - - /* FIXME */ - list summary = SlpServer::Summary(); - list unconfigured = summary[1]:[]; - string configured = summary[0]:""; - - /* Frame label */ - term contents = Wizard_hw::DetectedContent(_("SLP Server to Configure"), - unconfigured, false, configured); - - Wizard::SetContentsButtons(caption, contents, HELPS["summary"]:"", - Label::BackButton(), Label::FinishButton()); - Wizard::SetNextButton(`next, Label::OKButton()); - Wizard::SetAbortButton(`abort, Label::CancelButton()); - Wizard::HideBackButton(); - - any ret = nil; - while(true) { - - ret = UI::UserInput(); - - /* abort? */ - if(ret == `abort || ret == `cancel || ret == `back) { - if(ReallyAbort()) break; - else continue; - } - /* overview dialog */ - else if(ret == `edit_button) { - ret = `overview; - break; - } - /* configure the selected device */ - else if(ret == `configure_button) { - // TODO FIXME: check for change of the configuration - any selected = UI::QueryWidget(`id(`detected_selbox), `CurrentItem); - if(selected == `other) { - ret = `other; - } - else { - ret = `configure; - } - break; - } - else if(ret == `next) { - break; - } - else { - y2error("unexpected retcode: %1", ret); - continue; - } - } - - return ret; -} - /* EOF */ } Modified: trunk/slp-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/src/helps.ycp?rev=65738&r1=65737&r2=65738&view=diff ============================================================================== --- trunk/slp-server/src/helps.ycp (original) +++ trunk/slp-server/src/helps.ycp Fri Sep 16 11:44:31 2011 @@ -38,24 +38,6 @@ </p> "), - /* Summary dialog help 1/3 */ - "summary" : _("<p><b><big>SLP Server Configuration</big></b><br> -Configure SLP server here.<br></p> -") + - - /* Summary dialog help 2/3 */ - _("<p><b><big>Adding an SLP Server</big></b><br> -Choose an SLP server from the list of detected SLP servers. -If your SLP server was not detected, use <b>Other (not detected)</b>. -Then press <b>Configure</b>.</p> -") + - - /* Summary dialog help 3/3 */ - _("<p><b><big>Editing or Deleting:</big></b><br> -If you press <b>Edit</b>, an additional dialog in which to change -the configuration opens.</p> -"), - /* Ovreview dialog help 1/3 */ "overview" : _("<p><b><big>SLP Server Configuration Overview</big></b><br> Obtain an overview of installed SLP servers. Additionally Modified: trunk/slp-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/slp-server/src/wizards.ycp?rev=65738&r1=65737&r2=65738&view=diff ============================================================================== --- trunk/slp-server/src/wizards.ycp (original) +++ trunk/slp-server/src/wizards.ycp Fri Sep 16 11:44:31 2011 @@ -26,7 +26,6 @@ /* FIXME: adapt to your needs */ map aliases = $[ - "summary" : ``( SummaryDialog() ), "overview" : ``( OverviewDialog() ), "expert" : ``( ExpertDialog() ), "edit_reg" : ``( editRegFile() ) @@ -35,12 +34,6 @@ /* FIXME: adapt to your needs */ map sequence = $[ "ws_start" : "overview", - "summary" : $[ - `abort : `abort, - `next : `next, - `overview : "overview", - `expert : "expert" - ], "overview" : $[ `abort : `abort, `next : `next, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org