Forssim

Merge lp:~jocke-karlsson/forssim/versionNo_400644 into lp:forssim

  1. versionNo_400644
  2. Merge into development
Proposed by jocke
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jocke-karlsson/forssim/versionNo_400644
Merge into: lp:forssim
Diff against target: None lines
To merge this branch: bzr merge lp:~jocke-karlsson/forssim/versionNo_400644
Reviewer Review Type Date Requested Status
Forsslund Systems Pending
Review via email: mp+10144@code.launchpad.net
To post a comment you must log in.
Revision history for this message
jocke (jocke-karlsson) wrote :

added version number to lower left corner on login page.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'FsWisdom/FsWisdom.pro'
2--- FsWisdom/FsWisdom.pro 2009-06-12 13:32:57 +0000
3+++ FsWisdom/FsWisdom.pro 2009-08-14 10:57:29 +0000
4@@ -49,7 +49,8 @@
5 ../quazip/quazipfileinfo.h \
6 ../quazip/quazipnewinfo.h \
7 ../quazip/unzip.h \
8- ../quazip/zip.h
9+ ../quazip/zip.h \
10+ VersionNo.h
11 INCLUDEPATH += /usr/local/boost_1_39_0
12 SOURCES += Updater_QButton_SFBoolPB.cpp \
13 Updater_QButton_SFFloat.cpp \
14
15=== modified file 'FsWisdom/RegisterUserWindow.cpp'
16--- FsWisdom/RegisterUserWindow.cpp 2009-07-21 07:50:23 +0000
17+++ FsWisdom/RegisterUserWindow.cpp 2009-08-14 10:57:29 +0000
18@@ -12,6 +12,9 @@
19 QObject::connect(ui.buttonBox, SIGNAL(accepted ()), this, SLOT(AcceptUserData()));
20 QObject::connect(ui.usernameLineEdit, SIGNAL(returnPressed ()), this, SLOT(AcceptUserData()));
21 QObject::connect(ui.passwordLineEdit, SIGNAL(returnPressed ()), this, SLOT(AcceptUserData()));
22+ string temp = "v";
23+ temp = temp + PRODUCTVER;
24+ ui.versionNo->setText(QString(temp.c_str()));
25 }
26
27 RegisterUserWindow::~RegisterUserWindow()
28
29=== modified file 'FsWisdom/RegisterUserWindow.h'
30--- FsWisdom/RegisterUserWindow.h 2009-07-06 08:29:08 +0000
31+++ FsWisdom/RegisterUserWindow.h 2009-08-14 10:57:29 +0000
32@@ -4,6 +4,7 @@
33 #include <QtGui/QMainWindow>
34 #include "ui_RegisterUserWindow.h"
35 #include "ApplicationNode.h"
36+#include "VersionNo.h"
37
38 namespace FS
39 {
40
41=== modified file 'FsWisdom/RegisterUserWindow.ui'
42--- FsWisdom/RegisterUserWindow.ui 2009-07-20 13:47:22 +0000
43+++ FsWisdom/RegisterUserWindow.ui 2009-08-14 10:57:29 +0000
44@@ -250,6 +250,13 @@
45 </property>
46 </spacer>
47 </item>
48+ <item>
49+ <widget class="QLabel" name="versionNo" >
50+ <property name="text" >
51+ <string/>
52+ </property>
53+ </widget>
54+ </item>
55 </layout>
56 </item>
57 </layout>
58
59=== added file 'FsWisdom/VersionNo.h'
60--- FsWisdom/VersionNo.h 1970-01-01 00:00:00 +0000
61+++ FsWisdom/VersionNo.h 2009-08-14 10:59:25 +0000
62@@ -0,0 +1,13 @@
63+/*
64+ * VersionNo.h
65+ *
66+ * Created on: Aug 14, 2009
67+ * Author: jockeka
68+ */
69+
70+#ifndef VERSIONNO_H_
71+#define VERSIONNO_H_
72+
73+#define PRODUCTVER "0.2.2"
74+
75+#endif /* VERSIONNO_H_ */

Subscribers

People subscribed via source and target branches

to all changes: