Author: lslezak Date: Mon Oct 3 18:25:17 2011 New Revision: 66211 URL: http://svn.opensuse.org/viewcvs/yast?rev=66211&view=rev Log: removed "No joystick" item, joustick is removed using [Delete] button now Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp?rev=66211&r1=66210&r2=66211&view=diff ============================================================================== --- branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Mon Oct 3 18:25:17 2011 @@ -92,10 +92,6 @@ * @return symbol Id of pressed button in the dialog */ define symbol joy_dialog (integer joy_id, symbol button, map sound_card) ``{ - - // item in joystick types - string nonejoy = _("No joystick"); - if (joy_id == nil) { return `back; @@ -112,19 +108,7 @@ _("<P>In this dialog, specify your joystick type. If your joystick type is not in the list, select <B>Generic Analog Joystick</B>.</p> <p>You will not find any USB joysticks here. If you have a USB device, just plug in the joystick and start using it.</P> -") + - - // help text for joystick configuration 2/4 -_("<P>To remove the configured joystick from the system -or if you do not have a joystick, select <B>No joystick</B>.</P> -") + - - // help text for joystick configuration 3/4 -_("<P>Press <B>Test</B> to test the functionality of the selected joystick type.</P>") + - - // help text for joystick configuration 4/4 -_("<P><B>Note:</B> Connect your joystick to your computer -before pressing <B>Test</B> or <B>Next</B>.</P>"); +"); map joy = Joystick::joystick[joy_id]:$[]; string mod = joy["model"]:""; @@ -137,12 +121,6 @@ mod = Joystick::generic_joystick_translated; } - // set none joystick - if (mod == "") - { - mod = nonejoy; - } - joylist = maplist(string modname, list<string> models, JoystickDB, ``( maplist(string model, models, ``([modname, model])) )); @@ -153,8 +131,6 @@ joylist = prepend (joylist, ["analog", Joystick::generic_joystick_translated]); - joylist = prepend(joylist, ["", nonejoy]); - y2debug("joylist: %1", joylist); integer index = 0; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org