From: Olavi Pulkkinen <olavi.pulkkinen@fudeco.com>
Date: Wed, 31 Mar 2010 09:13:38 +0000 (+0300)
Subject: Merge branch 'master' of https://vcs.maemo.org/git/speedfreak
X-Git-Tag: v0.2-RC1~18
X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=commitdiff_plain;h=3234868e987a0a8bc3967631c2f16afc4419b8e3;hp=-c

Merge branch 'master' of https://vcs.maemo.org/git/speedfreak
---

3234868e987a0a8bc3967631c2f16afc4419b8e3
diff --combined Client/mainwindow.cpp
index 78e71c9,3f33cb9..4eeeca8
--- a/Client/mainwindow.cpp
+++ b/Client/mainwindow.cpp
@@@ -1,7 -1,8 +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
   */
@@@ -24,7 -25,6 +25,7 @@@ MainWindow::MainWindow(QWidget *parent
      QCoreApplication::setOrganizationDomain("fudeco.com");
      QCoreApplication::setApplicationName("Speed Freak");
  
 +    routeDialog = new RouteDialog;
      creditsDialog = new CreditsDialog;
      routeSaveDialog = new RouteSaveDialog;
      settingsDialog = new SettingsDialog;
@@@ -41,16 -41,28 +42,29 @@@
  
      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)");
+     ui->pushButtonCredits->setAutoFillBackground(true);
+     ui->pushButtonCredits->setStyleSheet("background-color: rgb(0, 0, 0); color: rgb(255, 255, 255)");
  }
  
  MainWindow::~MainWindow()
  {
      delete ui;
- 
      delete routeSaveDialog;
 +    delete routeDialog;
  
-     if(!accstart)
+     if(accstart)
          delete accstart;
  }