Now channel labels are displayed correctly.

Add an option to change the tint of the chequer board.
Show unsigned integer options in hexadecimal format.
Fixed a crash caused by attemting seeking when no file is being played.

1 files changed, 36 insertions, 0 deletions

diff --git a/qmidiplayer-desktop/qmpsettingswindow.hpp b/qmidiplayer-desktop/qmpsettingswindow.hpp
index efa69d5..3820279 100644
--- a/qmidiplayer-desktop/qmpsettingswindow.hpp
+++ b/qmidiplayer-desktop/qmpsettingswindow.hpp
@@ -7,6 +7,7 @@
 #include <QSettings>
 #include <QListWidget>
 #include <QComboBox>
+#include <QSpinBox>
 #include <QFormLayout>
 #include "qmpplugin.hpp"
 
@@ -21,6 +22,41 @@ struct qmpCustomOption
 	QVariant defaultval,minv,maxv;
 };
 
+class QHexSpinBox:public QSpinBox
+{
+	public:
+		QHexSpinBox(QWidget *parent=0):QSpinBox(parent)
+		{
+			setPrefix("0x");
+			setDisplayIntegerBase(16);
+			setRange(-0x80000000,0x7FFFFFFF);
+		}
+	protected:
+		QString textFromValue(int value)const
+		{
+			return QString::number(u(value),16).toUpper();
+		}
+		int valueFromText(const QString &text)const
+		{
+			return i(text.toUInt(0,16));
+		}
+		QValidator::State validate(QString &input,int &pos)const
+		{
+			QString t=input;
+			if(t.startsWith("0x"))t.remove(0,2);
+			pos-=t.size()-t.trimmed().size();t=t.trimmed();
+			if(t.isEmpty())return QValidator::Intermediate;
+			input=QString("0x")+t.toUpper();
+			bool okay;t.toUInt(&okay,16);
+			if(!okay)return QValidator::Invalid;
+			return QValidator::Acceptable;
+		}
+		inline unsigned int u(int i)const
+		{return *reinterpret_cast<unsigned int*>(&i);}
+		inline int i(unsigned int u)const
+		{return *reinterpret_cast<int*>(&u);}
+};
+
 class qmpSettingsWindow:public QDialog
 {
 	Q_OBJECT