projects / speedfreak / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0d6e45d 2650bec)
Changes in measuredialog.cpp, .h and carmainwindow.cpp and .h
authorJanne Änäkkälä <Janne_anakkala@hotmail.com>
Tue, 2 Mar 2010 07:30:47 +0000 (09:30 +0200)
committerJanne Änäkkälä <Janne_anakkala@hotmail.com>
Tue, 2 Mar 2010 07:30:47 +0000 (09:30 +0200)
commit87caacddd53a392c4b747dc586fb91484fc394ae
treefce72de5adb1fcbd106712d637084b1729d80fa5tree | snapshot
parent0d6e45dfceb257688268bc9561f249dffbd5fa7ccommit | diff
parent2650becbf772dc623f16cf29f236fd19df335334commit | diff
Changes in measuredialog.cpp, .h and carmainwindow.cpp and .h

Added timer in measure dialog which makes timeout every second and updates
speed and time to the UI. When target speed is achieved emits signal
speedAchieved() and then carmainwindow opens result dialog.

Merge branch 'testiBranch'

Conflicts:
Client/UI.pro
Client/carmainwindow.cpp
Client/UI.pro diff1 | diff2 | blob | history
Client/carmainwindow.cpp diff1 | diff2 | blob | history
Client/carmainwindow.h diff1 | diff2 | blob | history
Unnamed repository; edit this file to name it for gitweb.