diff --git a/ScStwLibraries/headers/client/scstwremoterace.h b/ScStwLibraries/headers/client/scstwremoterace.h index c5eb83d..ccf780f 100644 --- a/ScStwLibraries/headers/client/scstwremoterace.h +++ b/ScStwLibraries/headers/client/scstwremoterace.h @@ -60,12 +60,13 @@ public slots: private slots: void handleBaseStationSignal(ScStw::SignalKey key, QVariant data); - void handleSettingChange(int keyInt, int keyLevel, QVariant value); bool refreshRemoteTimers(QVariantList remoteTimers); void rebuildRemoteTimers(QVariantList remoteTimers); void refreshDetails(QVariantMap details); void handleClientStateChange(); + + void refreshCompetitionMode(); RaceMode getMode(); bool local(); }; diff --git a/ScStwLibraries/sources/client/scstwremoterace.cpp b/ScStwLibraries/sources/client/scstwremoterace.cpp index 1dd7acc..d0ca62e 100644 --- a/ScStwLibraries/sources/client/scstwremoterace.cpp +++ b/ScStwLibraries/sources/client/scstwremoterace.cpp @@ -129,12 +129,6 @@ bool ScStwRemoteRace::local() { return this->getMode() == LOCAL; } -void ScStwRemoteRace::handleSettingChange(int keyInt, int keyLevel, QVariant value) { - if(this->local()) - return ScStwRace::handleSettingChange(keyInt, keyLevel, value); -} - - /** * @brief ScStwAppBackend::handleBaseStationUpdate * @@ -292,3 +286,8 @@ bool ScStwRemoteRace::getReadySoundEnabled() { return this->readySoundEnabled; } + +void ScStwRemoteRace::refreshCompetitionMode() { + if(this->local()) + return ScStwRace::refreshCompetitionMode(); +} diff --git a/ScStwLibraries/sources/scstwlibraries.cpp b/ScStwLibraries/sources/scstwlibraries.cpp index 34b75b7..08ba19d 100644 --- a/ScStwLibraries/sources/scstwlibraries.cpp +++ b/ScStwLibraries/sources/scstwlibraries.cpp @@ -30,7 +30,7 @@ void ScStwLibraries::init() { qRegisterMetaType("ScStw::SocketCommand"); qRegisterMetaType("ScStw::StatusCode"); - qmlRegisterType("de.itsblue.ScStw", 2, 0, "ScStwRace"); + qmlRegisterUncreatableType("de.itsblue.ScStw", 2, 0, "ScStwRace", "ScStwRace is not creatable"); qmlRegisterType("de.itsblue.ScStw", 2, 0, "ScStwTimer"); #ifdef ScStwLibraries_ClientLibs diff --git a/ScStwLibraries/sources/scstwrace.cpp b/ScStwLibraries/sources/scstwrace.cpp index a3ef689..0f40cd0 100644 --- a/ScStwLibraries/sources/scstwrace.cpp +++ b/ScStwLibraries/sources/scstwrace.cpp @@ -667,6 +667,7 @@ QVariantList ScStwRace::getTimerDetailList() { tmpTimer.insert("reactionTime", timer->getReactionTime()); tmpTimer.insert("letter", timer->getLetter()); tmpTimer.insert("readyState", timer->getReadyState()); + tmpTimer.insert("text", timer->getText()); tmpTimers.append(tmpTimer); }