Author: lslezak
Date: Fri Sep 30 11:07:25 2011
New Revision: 66185
URL: http://svn.opensuse.org/viewcvs/yast?rev=66185&view=rev
Log:
refactoring joystick configuration, added support for USB joysticks
Modified:
branches/tmp/lslezak/sound/sound/src/Joystick.ycp
branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp
branches/tmp/lslezak/sound/sound/src/joystick.ycp
Modified: branches/tmp/lslezak/sound/sound/src/Joystick.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/Joystick.ycp?rev=66185&r1=66184&r2=66185&view=diff
==============================================================================
--- branches/tmp/lslezak/sound/sound/src/Joystick.ycp (original)
+++ branches/tmp/lslezak/sound/sound/src/Joystick.ycp Fri Sep 30 11:07:25 2011
@@ -39,6 +39,13 @@
// database entry
global string generic_joystick_translated = _("Generic Analog Joystick");
+ list<map> detected_joysticks = [];
+
+ global list<map> Detected()
+ {
+ return detected_joysticks;
+ }
+
/**
* Get list of all required joystick kernel modules
* @return list list of modules
@@ -173,6 +180,8 @@
}
joystick_backup = joystick;
+
+ detected_joysticks = (list<map>)SCR::Read(.probe.joystick);
return true;
}
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=66185&r1=66184&r2=66185&view=diff
==============================================================================
--- branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp (original)
+++ branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Fri Sep 30 11:07:25 2011
@@ -14,12 +14,13 @@
textdomain "sound";
import "Wizard";
+ import "WizardHW";
import "Joystick";
import "Sound";
- import "Joystick";
import "Package";
import "Label";
import "Popup";
+ import "String";
include "sound/joysticks.ycp";
include "sound/ui.ycp";
@@ -503,6 +504,7 @@
`next : Label::NextButton()
];
+ Wizard::OpenNextBackDialog();
Wizard::SetContents (caption, contents, helptext, true, true);
Wizard::SetNextButton(`next, nextbutton[button]:Label::NextButton() );
if (!Mode::installation()) Wizard::HideBackButton();
@@ -583,9 +585,329 @@
}
if (!Mode::installation()) Wizard::RestoreBackButton();
+ Wizard::CloseDialog();
return s;
}
+ define list