Welcome dialog added.
authorToni Jussila <toni.jussila@fudeco.com>
Thu, 11 Mar 2010 11:58:40 +0000 (13:58 +0200)
committerToni Jussila <toni.jussila@fudeco.com>
Thu, 11 Mar 2010 11:58:40 +0000 (13:58 +0200)
Merge branch 'feature/welcome'

Conflicts:
Client/UI.pro
Client/carmainwindow.cpp

1  2 
Client/UI.pro
Client/carmainwindow.cpp
Client/carmainwindow.h

diff --cc Client/UI.pro
@@@ -22,7 -22,7 +22,9 @@@ SOURCES += main.cpp 
      xmlwriter.cpp \
      xmlreader.cpp \
      httpclient.cpp \
-     categorylist.cpp
++    categorylist.cpp \
+     welcomedialog.cpp
++
  HEADERS += carmainwindow.h \
      resultdialog.h \
      stringlistmodel.h \
@@@ -35,7 -35,7 +37,9 @@@
      xmlwriter.h \
      xmlreader.h \
      httpclient.h \
-     categorylist.h
++    categorylist.h \
+     welcomedialog.h
++
  FORMS += carmainwindow.ui \
      resultdialog.ui \
      measuredialog.ui \
@@@ -67,7 -68,7 +70,8 @@@ CarMainWindow::~CarMainWindow(
      delete xmlreader;
      delete xmlwriter;
      delete manager;
 +    delete categorylist;
+     delete welcomeDialog;
  }
  
  /**
Simple merge