Merge lp:~maxime-bochon/mixxx/bug801096 into lp:mixxx/1.10

[Maxime Bochon]

Fixed bug #801096 about the missing CANCEL button in the MIDI wizard startup.
Some simple code logic improvement.
The CLOSE button now stops the wizard, as does the CANCEL button.

[RJ Skerry-Ryan (rryan)]

review: Approve

=== modified file 'mixxx/src/dlgprefmidibindings.cpp'
--- mixxx/src/dlgprefmidibindings.cpp	2011-12-15 06:52:54 +0000
+++ mixxx/src/dlgprefmidibindings.cpp	2012-03-01 16:13:22 +0000
@@ -269,17 +269,16 @@
         QMessageBox::StandardButton result = QMessageBox::question(this,
                     tr("Apply MIDI device settings?"),
                     tr("Your settings must be applied before starting the MIDI learning wizard.\n"
-                        "Apply settings and continue?"));
-        if (result == QMessageBox::Cancel)
-        {
-            return;
-        }
-        else
-        {
-            slotApply();
-        }
+                        "Apply settings and continue?"),
+                    QMessageBox::Ok | QMessageBox::Cancel, //Buttons to be displayed
+                    QMessageBox::Ok);                      //Default button
+        //Stop if the user has not pressed the Ok button,
+        //which could be the Cancel or the Close Button.
+        if (result != QMessageBox::Ok) return;
     }
-
+    
+    slotApply();
+    
     //Note that DlgMidiLearning is set to delete itself on
     //close using the Qt::WA_DeleteOnClose attribute (so this "new" doesn't leak memory)
     m_pDlgMidiLearning = new DlgMidiLearning(this, m_pMidiDevice->getMidiMapping());