From: Toni Jussila <toni.jussila@fudeco.com>
Date: Wed, 31 Mar 2010 07:50:51 +0000 (+0300)
Subject: Route save dialog development. Added: GPS,icons...
X-Git-Tag: v0.2-RC1~11^2~6
X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=commitdiff_plain;h=afbc416a1a09e00162dd5ba4080cf7018b98208f

Route save dialog development. Added: GPS,icons...

Merge branch 'development/routesavedialog'

Conflicts:
	Client/mainwindow.cpp
	Client/speedfreak.pro
---

afbc416a1a09e00162dd5ba4080cf7018b98208f
diff --cc Client/mainwindow.cpp
index d4df9c8,6e5ea66..64a5aa9
--- a/Client/mainwindow.cpp
+++ b/Client/mainwindow.cpp
@@@ -1,7 -1,7 +1,8 @@@
  /*
   * Mainwindow for speedFreak project
   *
-- * @author      Rikhard Kuutti <rikhard.kuutti@fudeco.com>
++ * @author      Rikhard Kuutti 	<rikhard.kuutti@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
   */
@@@ -20,36 -18,26 +21,47 @@@ MainWindow::MainWindow(QWidget *parent
  {
      ui->setupUi(this);
  
 +    QCoreApplication::setOrganizationName("Fudeco Oy");
 +    QCoreApplication::setOrganizationDomain("fudeco.com");
 +    QCoreApplication::setApplicationName("Speed Freak");
 +
      creditsDialog = new CreditsDialog;
      routeSaveDialog = new RouteSaveDialog;
 +    settingsDialog = new SettingsDialog;
 +    connect(settingsDialog,SIGNAL(sendregistration()),this,SLOT(regUserToServer()));
 +    connect(settingsDialog,SIGNAL(userNameChanged()),this,SLOT(userLogin()));
 +    topResultDialog = new TopResultDialog;
 +    connect(topResultDialog, SIGNAL(refreshCategoryList()), this, SLOT(clientRequestCategoryList()));
 +    connect(topResultDialog, SIGNAL(refreshTopList(int)), this, SLOT(clientRequestTopList(int)));
 +    accstart = NULL;
 +
 +    httpClient = new HttpClient(this);
 +    connect(httpClient->myXmlreader, SIGNAL(receivedCategoryList()), this, SLOT(setCategoryCompoBox()));
 +    connect(httpClient->myXmlreader, SIGNAL(receivedTop10List()), this, SLOT(showTop10()));
 +
 +    welcomeDialog = new WelcomeDialog;
 +    welcomeDialog->show();
+ 
+     //Button settings
+     ui->pushButtonAccelerate->setAutoFillBackground(true);
+     ui->pushButtonAccelerate->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
+     ui->pushButtonRoute->setAutoFillBackground(true);
+     ui->pushButtonRoute->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
+     ui->pushButtonResults->setAutoFillBackground(true);
+     ui->pushButtonResults->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
+     ui->pushButtonSettings->setAutoFillBackground(true);
+     ui->pushButtonSettings->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
+     ui->pushButtonWWW->setAutoFillBackground(true);
+     ui->pushButtonWWW->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
  }
  
  MainWindow::~MainWindow()
  {
      delete ui;
- 
      delete routeSaveDialog;
 +
 +    if(!accstart)
 +        delete accstart;
  }
  
  void MainWindow::changeEvent(QEvent *e)
diff --cc Client/routesavedialog.cpp
index 09730ca,befe678..9f81e91
--- a/Client/routesavedialog.cpp
+++ b/Client/routesavedialog.cpp
@@@ -18,11 -18,25 +18,26 @@@ RouteSaveDialog::RouteSaveDialog(QWidge
      ui(new Ui::RouteSaveDialog)
  {
      ui->setupUi(this);
 +    this->setWindowTitle("Tracking");
  
+     routeDialog = new RouteDialog;
+ 
+     //Button settings
+     buttonStatus = true;
+     pixmapRouteStop = new QPixmap("Graphics/route_stop.png");
+     pixmapRoutePlay = new QPixmap("Graphics/route_play.png");
+     iconRouteStop = new QIcon(*pixmapRouteStop);
+     iconRoutePlay = new QIcon(*pixmapRoutePlay);
+     QSize iconSize(125, 125);
+     ui->buttonRouteStartStop->setIconSize(iconSize);
+     ui->buttonRouteStartStop->setIcon(*iconRoutePlay);
+     ui->buttonRouteStartStop->setAutoFillBackground(true);
+     ui->buttonRouteStartStop->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
+ 
+     //Satellite picture and label
      ui->labelRouteSatelliteStatus->setVisible(0);
      ui->labelRouteSatellitePicture->setVisible(0);
-     ui->labelRouteSatellitePicture->setPixmap(QPixmap("satellite_vista.png"));
+     //ui->labelRouteSatellitePicture->setPixmap(QPixmap("Graphics/satellite_vista.png"));
      timerSatellitePicture = new QTimer();
      timerSatellitePicture->setInterval(400);
      connect(timerSatellitePicture, SIGNAL(timeout()),this, SLOT(timerSatellitePictureTimeout()));
diff --cc Client/speedfreak.pro
index 1a3253b,3b190f2..d111ede
--- a/Client/speedfreak.pro
+++ b/Client/speedfreak.pro
@@@ -1,9 -1,9 +1,12 @@@
  # -------------------------------------------------
  # Project created by QtCreator 2010-03-29T09:21:42
+ # @author     Speed Freak team
+ # @copyright  (c) 2010 Speed Freak team
+ # @license    http://opensource.org/licenses/gpl-license.php GNU Public License
  # -------------------------------------------------
 +QT += dbus \
 +    network \
 +    xml
  TARGET = speedfreak
  TEMPLATE = app
  SOURCES += main.cpp \
@@@ -11,52 -11,35 +14,77 @@@
      creditsdialog.cpp \
      routedialog.cpp \
      routesavedialog.cpp \
 +    welcomedialog.cpp \
 +    usersettings.cpp \
 +    resultdialog.cpp \
 +    instructionsdialog.cpp \
 +    settingsdialog.cpp \
 +    accelerationstart.cpp \
 +    accrealtimedialog.cpp \
 +    accelerometer.cpp \
 +    movingaverage.cpp \
 +    calculate.cpp \
 +    calibratedialog.cpp \
 +    topresultdialog.cpp \
 +    categorylist.cpp \
 +    httpclient.cpp \
 +    xmlreader.cpp \
-     xmlwriter.cpp
++    xmlwriter.cpp \
+     gpsdata.cpp \
+     maemo5locationprivate.cpp \
+     maemo5location.cpp
++
  HEADERS += mainwindow.h \
      creditsdialog.h \
      routedialog.h \
      routesavedialog.h \
 +    welcomedialog.h \
 +    usersettings.h \
 +    resultdialog.h \
 +    instructionsdialog.h \
 +    settingsdialog.h \
 +    accelerationstart.h \
 +    accrealtimedialog.h \
 +    accelerometer.h \
 +    movingaverage.h \
 +    calculate.h \
 +    calibratedialog.h \
 +    topresultdialog.h \
 +    categorylist.h \
 +    httpclient.h \
 +    xmlreader.h \
 +    xmlwriter.h
+     gpsdata.h \
+     maemo5locationprivate.h \
+     maemo5location.h
++
  FORMS += mainwindow.ui \
      creditsdialog.ui \
      routedialog.ui \
 -    routesavedialog.ui
 +    routesavedialog.ui \
 +    welcomedialog.ui \
 +    resultdialog.ui \
 +    instructionsdialog.ui \
 +    settingsdialog.ui \
 +    accelerationstartdialog.ui \
 +    accrealtimedialog.ui \
 +    calibratedialog.ui \
 +    topresultdialog.ui
  RESOURCES += graphics.qrc
+ 
+ contains(QT_CONFIG, hildon):CONFIG += hildon
+ CONFIG += link_pkgconfig
+ 
+ # Enable this to disable debugging
+ DEFINES += QT_NO_DEBUG_OUTPUT
+ target.path += /usr/lib
+ devincludes.files = $$HEADERS
+ devincludes.path += /usr/include/$$TEMPLATE$$TARGET
+ INSTALLS += target \
+     devincludes
+ PKGCONFIG += glib-2.0 \
+     liblocation
+ exists(/usr/lib/liblocation.so) {
+     DEFINES += LIBLOCATION
+     message(liblocation found)
+ }