projects
/
speedfreak
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f7f1405
)
Bugfix: top results unit km/h -> s and routedialog max speed
author
Toni Jussila
<toni.jussila@fudeco.com>
Tue, 20 Apr 2010 08:05:34 +0000
(11:05 +0300)
committer
Toni Jussila
<toni.jussila@fudeco.com>
Tue, 20 Apr 2010 08:05:34 +0000
(11:05 +0300)
Client/routedialog.cpp
patch
|
blob
|
history
Client/routedialog.ui
patch
|
blob
|
history
Client/routesavedialog.cpp
patch
|
blob
|
history
Client/routesavedialog.ui
patch
|
blob
|
history
Client/xmlreader.cpp
patch
|
blob
|
history
diff --git
a/Client/routedialog.cpp
b/Client/routedialog.cpp
index
6b5e468
..
0fc2dcf
100644
(file)
--- a/
Client/routedialog.cpp
+++ b/
Client/routedialog.cpp
@@
-363,7
+363,8
@@
void RouteDialog::paintEvent(QPaintEvent *)
painter.drawEllipse( x1Screen-5, y1Screen-5, 10, 10);
QString jono;
painter.drawEllipse( x1Screen-5, y1Screen-5, 10, 10);
QString jono;
- jono = QString("%1 km/h").arg(maxv);
+ //jono = QString("%1 km/h").arg(maxv);
+ jono.sprintf("%.1f km/h", maxv);
ui->speedValueLabel->setText(jono);
}
}
ui->speedValueLabel->setText(jono);
}
}
diff --git
a/Client/routedialog.ui
b/Client/routedialog.ui
index
563cd7c
..
e6cafbe
100644
(file)
--- a/
Client/routedialog.ui
+++ b/
Client/routedialog.ui
@@
-7,7
+7,7
@@
<x>0</x>
<y>0</y>
<width>800</width>
<x>0</x>
<y>0</y>
<width>800</width>
- <height>300</height>
+ <height>380</height>
</rect>
</property>
<property name="windowTitle">
</rect>
</property>
<property name="windowTitle">
@@
-59,12
+59,12
@@
</size>
</property>
</widget>
</size>
</property>
</widget>
- <widget class="QWidget" name="">
+ <widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<property name="geometry">
<rect>
- <x>660</x>
+ <x>650</x>
<y>210</y>
<y>210</y>
- <width>121</width>
+ <width>141</width>
<height>81</height>
</rect>
</property>
<height>81</height>
</rect>
</property>
diff --git
a/Client/routesavedialog.cpp
b/Client/routesavedialog.cpp
index
506c1e5
..
253784e
100644
(file)
--- a/
Client/routesavedialog.cpp
+++ b/
Client/routesavedialog.cpp
@@
-51,6
+51,9
@@
RouteSaveDialog::RouteSaveDialog(QWidget *parent) :
//GPS speed label
ui->labelGpsSpeed->setVisible(0);
//GPS speed label
ui->labelGpsSpeed->setVisible(0);
+ //User info label
+ ui->labelUserInfo->setText("");
+
//GPS
location = new Maemo5Location(this);
gpsData = new GPSData(location);
//GPS
location = new Maemo5Location(this);
gpsData = new GPSData(location);
diff --git
a/Client/routesavedialog.ui
b/Client/routesavedialog.ui
index
5edc2ff
..
1ae73c6
100644
(file)
--- a/
Client/routesavedialog.ui
+++ b/
Client/routesavedialog.ui
@@
-182,7
+182,7
@@
<pixmap resource="graphics.qrc">:/new/prefix1/Graphics/sf_2.png</pixmap>
</property>
</widget>
<pixmap resource="graphics.qrc">:/new/prefix1/Graphics/sf_2.png</pixmap>
</property>
</widget>
- <widget class="QLabel" name="label_2">
+ <widget class="QLabel" name="labelUserInfo">
<property name="geometry">
<rect>
<x>200</x>
<property name="geometry">
<rect>
<x>200</x>
diff --git
a/Client/xmlreader.cpp
b/Client/xmlreader.cpp
index
2140ca7
..
eeed22e
100644
(file)
--- a/
Client/xmlreader.cpp
+++ b/
Client/xmlreader.cpp
@@
-72,7
+72,8
@@
void XmlReader::xmlReadTop10Results(QNetworkReply *device)
user = attr.value("username").toString();
position = attr.value("position").toString();
date = attr.value("date").toString();
user = attr.value("username").toString();
position = attr.value("position").toString();
date = attr.value("date").toString();
- unit = attr.value("unit").toString();
+ //unit = attr.value("unit").toString();
+ unit = "s";
value = attr.value("value").toString();
myCategoryList->top10List.append(position + "\t" +
value = attr.value("value").toString();
myCategoryList->top10List.append(position + "\t" +