diff --git a/devsetup.cpp b/devsetup.cpp index b21de7e07..743231275 100644 --- a/devsetup.cpp +++ b/devsetup.cpp @@ -109,8 +109,8 @@ void DevSetup::initDlg() ui.mult570SpinBox->setValue(m_mult570); ui.mult570TxSpinBox->setValue(m_mult570Tx); ui.cal570SpinBox->setValue(m_cal570); -// sscanf(m_colors.toLatin1(),"%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x", -// &r,&g,&b,&r0,&g0,&b0,&r1,&g1,&b1,&r2,&g2,&b2,&r3,&g3,&b3); + sscanf(m_colors.toLatin1(),"%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x%2x", + &r,&g,&b,&r0,&g0,&b0,&r1,&g1,&b1,&r2,&g2,&b2,&r3,&g3,&b3); updateColorLabels(); ui.sbBackgroundRed->setValue(r); ui.sbBackgroundGreen->setValue(g); diff --git a/mainwindow.cpp b/mainwindow.cpp index 9edd92fcb..f99c47892 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//-------------------------------------------------------------- MainWindow +//--------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h" diff --git a/map65.pro b/map65.pro index 249a1766c..3a0a51317 100644 --- a/map65.pro +++ b/map65.pro @@ -10,7 +10,7 @@ CONFIG += thread #CONFIG += console TARGET = map65 -VERSION = 2.3.0 +VERSION = 2.5.0 TEMPLATE = app DEFINES = QT5 DESTDIR = ../map65_install