projects
/
speedfreak
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WWW, settings and info buttons changed to custom buttons.
[speedfreak]
/
Client
/
resultdialog.h
diff --git
a/Client/resultdialog.h
b/Client/resultdialog.h
index
6f19c38
..
752b790
100644
(file)
--- a/
Client/resultdialog.h
+++ b/
Client/resultdialog.h
@@
-1,7
+1,8
@@
/*
/*
- * CarMainWindow main class
+ * Result dialog
*
*
- * @author Janne Änäkkälä <janne.anakkala@fudeco.com>
+ * @author Janne Änäkkälä <janne.anakkala@fudeco.com>
+ * @author Toni Jussila <toni.jussila@fudeco.com>
* @copyright (c) 2010 Speed Freak team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*/
* @copyright (c) 2010 Speed Freak team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*/
@@
-10,7
+11,8
@@
#define RESULTDIALOG_H
#include <QDialog>
#define RESULTDIALOG_H
#include <QDialog>
-//#include "measures.h"
+#include <helpaccelerationdialog.h>
+
namespace Ui {
class ResultDialog;
namespace Ui {
class ResultDialog;
@@
-21,12
+23,16
@@
class ResultDialog : public QDialog {
public:
ResultDialog(QWidget *parent = 0);
~ResultDialog();
public:
ResultDialog(QWidget *parent = 0);
~ResultDialog();
+ HelpAccelerationDialog *helpAccelerationDialog;
void setEnd(int pValue);
void setValue(int pSpeed, double pTime);
void setEnd(int pValue);
void setValue(int pSpeed, double pTime);
+ void setLabelInfoToUser(QString infoText);
+ double getResult();
+ void setSendServerButtonEnabled();
signals:
signals:
- void sendresult(double result);
+ void sendresult(double);
protected:
void changeEvent(QEvent *e);
protected:
void changeEvent(QEvent *e);
@@
-51,8
+57,10
@@
private:
QString resultString;
private slots:
QString resultString;
private slots:
+ void on_pushButtonInfo_clicked();
void on_pushButtonNew_clicked();
void on_pushButtonSend_clicked();
void on_pushButtonNew_clicked();
void on_pushButtonSend_clicked();
+ void killHelpDialog();
};
#endif // RESULTDIALOG_H
};
#endif // RESULTDIALOG_H