diff --git a/qml/ErrorDialog.qml b/qml/ErrorDialog.qml index 944c942..916ed7c 100644 --- a/qml/ErrorDialog.qml +++ b/qml/ErrorDialog.qml @@ -21,7 +21,6 @@ import QtQuick.Window 2.2 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import com.itsblue.speedclimbingstopwatch 1.0 -import "./styles" Popup { diff --git a/qml/SettingsDialog.qml b/qml/SettingsDialog.qml index bf06faa..725b39e 100644 --- a/qml/SettingsDialog.qml +++ b/qml/SettingsDialog.qml @@ -22,7 +22,6 @@ import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import QtGraphicalEffects 1.0 import "./components" -import "./styles" Popup { id: root diff --git a/qml/components/ConnectionDelegate.qml b/qml/components/ConnectionDelegate.qml index 28962c7..cefa04b 100644 --- a/qml/components/ConnectionDelegate.qml +++ b/qml/components/ConnectionDelegate.qml @@ -1,6 +1,5 @@ import QtQuick 2.0 import QtQuick.Controls 2.2 -import "../styles" ItemDelegate { id: control diff --git a/qml/components/NextPageDelegate.qml b/qml/components/NextPageDelegate.qml index f6b4423..914b9dc 100644 --- a/qml/components/NextPageDelegate.qml +++ b/qml/components/NextPageDelegate.qml @@ -1,6 +1,5 @@ import QtQuick 2.0 import QtQuick.Controls 2.2 -import "../styles" ItemDelegate { id: control diff --git a/qml/main.qml b/qml/main.qml index 195a132..d0afb9e 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -22,7 +22,6 @@ import QtQuick.Controls 2.2 import QtGraphicalEffects 1.0 import "." import "./components" -import "./styles" //import QtQuick.Layouts 1.11 import com.itsblue.speedclimbingstopwatch 2.0 @@ -526,27 +525,6 @@ Window { if(ret !== 200){ console.log("+ --- error starting race: "+ret) } - - /*if(baseConn.state === "connected"){ - baseConn.startTimers() - return; - } - - timer_1.setStarting() - if(_cppAppSettings.loadSetting("at_marks_en") === "true"){ - next_actionTimer.action = "at_marks" - next_actionTimer.interval = _cppAppSettings.loadSetting("at_marks_delay")>0 ? _cppAppSettings.loadSetting("at_marks_delay"):1 - next_actionTimer.start() - return - } - if(_cppAppSettings.loadSetting("ready_en") === "true"){ - next_actionTimer.action = "ready" - next_actionTimer.interval = _cppAppSettings.loadSetting("ready_delay")>0 ? _cppAppSettings.loadSetting("ready_delay"):1 - next_actionTimer.start() - return - } - - startSound.play()*/ } function stop(type){ @@ -556,21 +534,6 @@ Window { if(ret !== 200){ console.log("+ --- error stopping race: "+ret) } - - /* - if(baseConn.state === "connected"){ - baseConn.stopTimers(type) - } - else { - timer_1.stop(type) - } - - if(type === "manual" || type === "cancel"){ - - } - //root.state = "STOPPED" - //timer_1.stop(type) - */ } function reset(){ @@ -580,18 +543,6 @@ Window { if(ret !== 200){ console.log("+ --- error resetting race: "+ret) } - - /* - if(baseConn.state === "connected"){ - baseConn.resetTimers() - } - else { - timer_1.reset() - } - - // - //root.state = "IDLE" - */ } } }