Rewrite of how the events are handled by the menusetting* objects.

src/menusetting.h

@@ -47,7 +47,7 @@ public:
 	virtual void draw(int y);
 	virtual void handleTS();
 
-	virtual void manageInput(bevent_t *event) = 0;
+	virtual bool manageInput(bevent_t *event) = 0;
 	virtual void adjustInput();
 	virtual void drawSelected(int y);
 	virtual bool edited() = 0;

src/menusettingbool.cpp

@@ -64,10 +64,13 @@ void MenuSettingBool::draw(int y)
 	gmenu2x->s->write( gmenu2x->font, strvalue, 155, y, ASFont::HAlignLeft, ASFont::VAlignTop );
 }
 
-void MenuSettingBool::manageInput(bevent_t *event)
+bool MenuSettingBool::manageInput(bevent_t *event)
 {
-    if (event->button == ACCEPT && event->state == PRESSED)
+    if (event->button == ACCEPT && event->state == PRESSED) {
-      toggle();
+		toggle();
+		return true;
+	}
+	return false;
 }
 
 void MenuSettingBool::toggle()

src/menusettingbool.h

@@ -45,7 +45,7 @@ public:
 	virtual ~MenuSettingBool() {}
 
 	virtual void draw(int y);
-	virtual void manageInput(bevent_t *event);
+	virtual bool manageInput(bevent_t *event);
 	virtual bool edited();
 
 	void setValue(int value);

src/menusettingint.cpp

@@ -65,7 +65,7 @@ void MenuSettingInt::draw(int y)
 	gmenu2x->s->write( gmenu2x->font, strvalue, 155, y, ASFont::HAlignLeft, ASFont::VAlignTop );
 }
 
-void MenuSettingInt::manageInput(bevent_t *event)
+bool MenuSettingInt::manageInput(bevent_t *event)
 {
     switch (event->button) {
         case LEFT:
@@ -81,8 +81,9 @@ void MenuSettingInt::manageInput(bevent_t *event)
             setValue(value() + 10);
             break;
         default:
-            break;
+			return false;
     }
+	return true;
 }
 
 void MenuSettingInt::inc()

src/menusettingint.h

@@ -39,7 +39,7 @@ public:
 			const std::string &description, int *value, int min, int max);
 	virtual ~MenuSettingInt() {}
 
-	virtual void manageInput(bevent_t *event);
+	virtual bool manageInput(bevent_t *event);
 	virtual void adjustInput();
 	virtual void draw(int);
 	virtual bool edited();

src/menusettingmultistring.cpp

@@ -49,7 +49,7 @@ MenuSettingMultiString::MenuSettingMultiString(
 	buttonBox.add(btn);
 }
 
-void MenuSettingMultiString::manageInput(bevent_t *event)
+bool MenuSettingMultiString::manageInput(bevent_t *event)
 {
     switch(event->button) {
         case LEFT:
@@ -59,8 +59,9 @@ void MenuSettingMultiString::manageInput(bevent_t *event)
             incSel();
             break;
         default:
-            break;
+			return false;
     }
+	return true;
 }
 
 void MenuSettingMultiString::incSel()

src/menusettingmultistring.h

@@ -45,7 +45,7 @@ public:
 			const std::vector<std::string> *choices);
 	virtual ~MenuSettingMultiString() {};
 
-	virtual void manageInput(bevent_t *event);
+	virtual bool manageInput(bevent_t *event);
 };
 
 #endif

src/menusettingrgba.cpp

@@ -82,29 +82,30 @@ void MenuSettingRGBA::handleTS() {
 	MenuSetting::handleTS();
 }
 
-void MenuSettingRGBA::manageInput(bevent_t *event) {
+bool MenuSettingRGBA::manageInput(bevent_t *event) {
-    switch(event->button) {
+	switch(event->button) {
-        case MANUAL:
+		case MANUAL:
-            inc();
+			inc();
-            break;
+			break;
-        case CLEAR:
+		case CLEAR:
-            dec();
+			dec();
-            break;
+			break;
 		case ALTLEFT:
 			update_value(-10);
 			break;
 		case ALTRIGHT:
 			update_value(10);
 			break;
-        case LEFT:
+		case LEFT:
-            leftComponent();
+			leftComponent();
-            break;
+			break;
-        case RIGHT:
+		case RIGHT:
-            rightComponent();
+			rightComponent();
-            break;
+			break;
-        default:
+		default:
-            break;
+			return false;
-    }
+	}
+	return true;
 }
 
 void MenuSettingRGBA::update_value(int value)

src/menusettingrgba.h

@@ -48,7 +48,7 @@ public:
 
 	virtual void draw(int y);
 	virtual void handleTS();
-	virtual void manageInput(bevent_t *event);
+	virtual bool manageInput(bevent_t *event);
 	virtual void adjustInput();
 	virtual void drawSelected(int y);
 	virtual bool edited();

src/menusettingstringbase.cpp

@@ -42,7 +42,7 @@ void MenuSettingStringBase::draw(int y)
 			ASFont::HAlignLeft, ASFont::VAlignTop);
 }
 
-void MenuSettingStringBase::manageInput(bevent_t *event)
+bool MenuSettingStringBase::manageInput(bevent_t *event)
 {
     switch (event->button) {
         case CLEAR:
@@ -52,8 +52,10 @@ void MenuSettingStringBase::manageInput(bevent_t *event)
             edit();
             break;
         default:
+			return false;
             break;
     }
+	return true;
 }
 
 void MenuSettingStringBase::clear()

src/menusettingstringbase.h

@@ -38,7 +38,7 @@ public:
 	virtual ~MenuSettingStringBase();
 
 	virtual void draw(int y);
-	virtual void manageInput(bevent_t *event);
+	virtual bool manageInput(bevent_t *event);
 	virtual bool edited();
 
 	void setValue(const std::string &value) { *_value = value; }

src/settingsdialog.cpp

@@ -110,53 +110,28 @@ bool SettingsDialog::exec() {
             inputMgr.waitForEvent(&event);
         } while (event.state != PRESSED);
 
-        switch (event.button) {
+		if (voices[sel]->manageInput(&event) == false) {
-            case SETTINGS:
+			switch (event.button) {
-                close = true;
+				case SETTINGS:
-                break;
+					close = true;
-            case UP:
+					break;
-				if (sel==0)
+				case UP:
-					sel = voices.size()-1;
+					if (sel==0)
-				else
+						sel = voices.size()-1;
-					sel -= 1;
+					else
-				gmenu2x->setInputSpeed();
+						sel -= 1;
-				voices[sel]->adjustInput();
+					gmenu2x->setInputSpeed();
-                break;
+					voices[sel]->adjustInput();
-            case DOWN:
+					break;
-				sel += 1;
+				case DOWN:
-				if (sel>=voices.size()) sel = 0;
+					sel += 1;
-				gmenu2x->setInputSpeed();
+					if (sel>=voices.size()) sel = 0;
-				voices[sel]->adjustInput();
+					gmenu2x->setInputSpeed();
-                break;
+					voices[sel]->adjustInput();
-            default:
+				default:
-                voices[sel]->manageInput(&event);
+					break;
-                break;
+			}
-        }
-
-        /*
-		inputMgr.update();
-		if ( inputMgr[ACTION_START] ) action = SD_ACTION_CLOSE;
-		if ( inputMgr[ACTION_UP   ] ) action = SD_ACTION_UP;
-		if ( inputMgr[ACTION_DOWN ] ) action = SD_ACTION_DOWN;
-
-		switch (action) {
-			case SD_ACTION_CLOSE: close = true; break;
-			case SD_ACTION_UP: {
-				if (sel==0)
-					sel = voices.size()-1;
-				else
-					sel -= 1;
-				gmenu2x->setInputSpeed();
-				voices[sel]->adjustInput();
-			} break;
-			case SD_ACTION_DOWN: {
-				sel += 1;
-				if (sel>=voices.size()) sel = 0;
-				gmenu2x->setInputSpeed();
-				voices[sel]->adjustInput();
-			} break;
 		}
-        */
 	}
 
 	gmenu2x->setInputSpeed();