Author: lslezak Date: Thu Oct 6 16:20:32 2011 New Revision: 66307 URL: http://svn.opensuse.org/viewcvs/yast?rev=66307&view=rev Log: removed "Configure joystick" option from the sound card setup, the joystick API has changed, the dialog is not displayed during installtion (automatic setup) anyway and USB joysticks are more common these days Modified: branches/tmp/lslezak/sound/sound/src/Sound.ycp branches/tmp/lslezak/sound/sound/src/card_wizard.ycp branches/tmp/lslezak/sound/sound/src/ui.ycp branches/tmp/lslezak/sound/sound/src/volume.ycp Modified: branches/tmp/lslezak/sound/sound/src/Sound.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/Sound.ycp?rev=66307&r1=66306&r2=66307&view=diff ============================================================================== --- branches/tmp/lslezak/sound/sound/src/Sound.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/Sound.ycp Thu Oct 6 16:20:32 2011 @@ -138,9 +138,6 @@ */ global string curr_model = ""; - // if joystick dialog should be started after sound card config - global boolean conf_joystick = true; - /** * default value of volume for new card */ Modified: branches/tmp/lslezak/sound/sound/src/card_wizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/card_wizard.ycp?rev=66307&r1=66306&r2=66307&view=diff ============================================================================== --- branches/tmp/lslezak/sound/sound/src/card_wizard.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/card_wizard.ycp Thu Oct 6 16:20:32 2011 @@ -33,15 +33,8 @@ string modelname = Sound::save_entry["model"]:""; string modname = Sound::save_entry["module"]:""; - boolean has_joy = false; - if (Sound::db_modules[modname, "joystick"]:$[] != $[]) - { - has_joy = true; - } - - map res = DisplayName ( - modelname, Sound::save_entry["alias"]:"", card_id, flags, has_joy); + map res = DisplayName (modelname, Sound::save_entry["alias"]:"", card_id, flags); symbol ui = res["ui"]:`back; Modified: branches/tmp/lslezak/sound/sound/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/ui.ycp?rev=66307&r1=66306&r2=66307&view=diff ============================================================================== --- branches/tmp/lslezak/sound/sound/src/ui.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/ui.ycp Thu Oct 6 16:20:32 2011 @@ -47,11 +47,9 @@ * @param name card model * @param cname alias for modules conf * @param cpos position of the card - * @param has_joy If true checkbox for joystick configuration is added * @return term with widget */ - define term AutoconfDlg (string name, string cname, integer cpos, - boolean has_joy) ``{ + define term AutoconfDlg (string name, string cname, integer cpos) { string clab = ""; if (cpos < 3) { @@ -63,10 +61,6 @@ cpos + 1); } - term jcheckbox = (!has_joy) ? `Empty() : - // push button label - `Left (`CheckBox(`id(`joystick), _("&Configure joystick"))); - term con = `VBox ( `VSpacing (1), // this is the first part of message "The sound card 'cardname' @@ -87,11 +81,9 @@ `VSpacing (0.3), `RadioButton (`id (`options), `opt (`hstretch, `notify), // radio button label - type of setup - _("Advanced setup with possibility to change &options")), - `VSpacing (3), - jcheckbox + _("Advanced setup with possibility to change &options")) )) - ), + ), `VStretch () ); return con; @@ -104,14 +96,12 @@ * @param cname sound card alias for modules conf * @param cpos cards position * @param flags enable/disable radiobuttons accordingly - * @param has_joy sound card supports joystick * @return map symbol of next dialog */ - define map DisplayName (string name, string cname, integer cpos, - integer flags, boolean has_joy) ``{ + define map DisplayName (string name, string cname, integer cpos, integer flags) { string helptext = Sound::STRINGS["DisplayName"]:""; - term con = AutoconfDlg (name, cname, cpos, has_joy); + term con = AutoconfDlg (name, cname, cpos); // dialog header Wizard::SetContents (_("Sound Card Configuration"), con, helptext, true, true); @@ -165,15 +155,6 @@ { output = `next; } - if (has_joy == true) - { - Sound::conf_joystick = - (boolean)UI::QueryWidget(`id(`joystick), `Value); - } - else - { - Sound::conf_joystick = false; - } } return $["ui" : output]; } Modified: branches/tmp/lslezak/sound/sound/src/volume.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/volume.ycp?rev=66307&r1=66306&r2=66307&view=diff ============================================================================== --- branches/tmp/lslezak/sound/sound/src/volume.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/volume.ycp Thu Oct 6 16:20:32 2011 @@ -174,23 +174,6 @@ } } } - else if (ui == `next && Sound::conf_joystick && !Mode::config()) - { - symbol ret = nil; //FIXME: joy_dialog(card_id, `next); - if (ret == `back) - { - con = VolumeCon(save_entry, vol); - // dialog header - Wizard::SetContents (_("Sound Card Volume"), con, - help_text, true, true); - continue; - } - else - { - ui = ret; - break; - } - } else if (ui == `abort || ui == `cancel) { if (ReallyAbort()) @@ -350,20 +333,7 @@ } if (!quick) { - while (true) - { - ui = VolumeDialog (save_entry, finish, card_id); - if (ui != `joystick) - { - break; - } - symbol s = nil; // FIXME: joy_dialog (card_id, `next); - if (s == `abort || s == `cancel) - { - ui = `abort; - break; - } - } + ui = VolumeDialog (save_entry, finish, card_id); } else { @@ -393,11 +363,6 @@ setVolume ("Speaker", card_id, devs["Speaker"]:Sound::default_volume); } - - if (Sound::conf_joystick == true && Sound::use_ui) - { - // FIXME: joy_dialog(card_id, `next); - } ui = `next; } if (!Mode::config() && !Mode::autoinst()) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org