Youtube video and text (draft).

diff --git a/Client/mainwindow.cpp b/Client/mainwindow.cpp
index d495074..8dbfc79 100644 (file)
--- a/Client/mainwindow.cpp
+++ b/Client/mainwindow.cpp
@@ -26,24 +26,29 @@ MainWindow::MainWindow(QWidget *parent) :
     QCoreApplication::setApplicationName("Speed Freak");
 
     routeDialog = new RouteDialog;
     QCoreApplication::setApplicationName("Speed Freak");
 
     routeDialog = new RouteDialog;

-    accstart = NULL;
+    connect(routeDialog,SIGNAL(sendroute()),this,SLOT(clientSendRoute()));

 
 

-    creditsDialog = new CreditsDialog;

     routeSaveDialog = new RouteSaveDialog;
     routeSaveDialog = new RouteSaveDialog;

-    routeDialog = new RouteDialog;
-    connect(routeDialog,SIGNAL(sendroute()),this,SLOT(clientSendRoute()));
+

     settingsDialog = new SettingsDialog;
     connect(settingsDialog,SIGNAL(sendregistration()),this,SLOT(clientRegUserToServer()));
     connect(settingsDialog,SIGNAL(userNameChanged()),this,SLOT(clientUserLogin()));
     settingsDialog = new SettingsDialog;
     connect(settingsDialog,SIGNAL(sendregistration()),this,SLOT(clientRegUserToServer()));
     connect(settingsDialog,SIGNAL(userNameChanged()),this,SLOT(clientUserLogin()));

+

     topResultDialog = new TopResultDialog;
     connect(topResultDialog, SIGNAL(refreshCategoryList()), this, SLOT(clientRequestCategoryList()));
     connect(topResultDialog, SIGNAL(refreshTopList(int)), this, SLOT(clientRequestTopList(int)));
     topResultDialog = new TopResultDialog;
     connect(topResultDialog, SIGNAL(refreshCategoryList()), this, SLOT(clientRequestCategoryList()));
     connect(topResultDialog, SIGNAL(refreshTopList(int)), this, SLOT(clientRequestTopList(int)));

+

     httpClient = new HttpClient(this);
     connect(httpClient->myXmlreader, SIGNAL(receivedCategoryList()), this, SLOT(setCategoryCompoBox()));
     connect(httpClient->myXmlreader, SIGNAL(receivedTop10List()), this, SLOT(showTop10()));
     httpClient = new HttpClient(this);
     connect(httpClient->myXmlreader, SIGNAL(receivedCategoryList()), this, SLOT(setCategoryCompoBox()));
     connect(httpClient->myXmlreader, SIGNAL(receivedTop10List()), this, SLOT(showTop10()));

+

     resultDialog = new ResultDialog;
     connect(resultDialog, SIGNAL(sendresult()), this, SLOT(clientSendResult()));
 
     resultDialog = new ResultDialog;
     connect(resultDialog, SIGNAL(sendresult()), this, SLOT(clientSendResult()));
 

+    accstart = NULL;
+
+    creditsDialog = new CreditsDialog;
+

     welcomeDialog = new WelcomeDialog;
     welcomeDialog->show();
 
     welcomeDialog = new WelcomeDialog;
     welcomeDialog->show();
 

@@ -195,11 +200,17 @@ void MainWindow::clientUserLogin()
     httpClient->checkLogin();
 }
 
     httpClient->checkLogin();
 }
 

+/**
+  * This function send route to server
+  */

 void MainWindow::clientSendRoute()
 {
     httpClient->sendRouteXml();
 }
 
 void MainWindow::clientSendRoute()
 {
     httpClient->sendRouteXml();
 }
 

+/**
+  * This function send acceleration data to server
+  */

 void MainWindow::clientSendResult()
 {
     qDebug() << "_clientSendResult";
 void MainWindow::clientSendResult()
 {
     qDebug() << "_clientSendResult";

diff --git a/Client/settingsdialog.ui b/Client/settingsdialog.ui
index 03d9af6..bb0f326 100644 (file)
--- a/Client/settingsdialog.ui
+++ b/Client/settingsdialog.ui
@@ -29,7 +29,7 @@
   <widget class="QLabel" name="setUserLabel">
    <property name="geometry">
     <rect>
   <widget class="QLabel" name="setUserLabel">
    <property name="geometry">
     <rect>

-     <x>50</x>
+     <x>40</x>

      <y>210</y>
      <width>371</width>
      <height>31</height>
      <y>210</y>
      <width>371</width>
      <height>31</height>

diff --git a/Client/xmlreader.cpp b/Client/xmlreader.cpp
index 8c75c97..2140ca7 100644 (file)
--- a/Client/xmlreader.cpp
+++ b/Client/xmlreader.cpp
@@ -167,4 +167,3 @@ void XmlReader::xmlShow()
     //xmlReadCategories(&file);
     file.close();
 }
     //xmlReadCategories(&file);
     file.close();
 }

-

diff --git a/Client/xmlwriter.cpp b/Client/xmlwriter.cpp
index 7fca219..495eed9 100644 (file)
--- a/Client/xmlwriter.cpp
+++ b/Client/xmlwriter.cpp
@@ -172,4 +172,3 @@ void XmlWriter::writeItems()
     xmlwriter.writeAttribute("date", QDateTime::currentDateTime().toString());
     xmlwriter.writeEndElement();
 }
     xmlwriter.writeAttribute("date", QDateTime::currentDateTime().toString());
     xmlwriter.writeEndElement();
 }

-

diff --git a/documents/youtube_video.mp4 b/documents/youtube_video.mp4
new file mode 100755 (executable)
index 0000000..f35c660
Binary files /dev/null and b/documents/youtube_video.mp4 differ

diff --git a/documents/youtube_video.odt b/documents/youtube_video.odt
new file mode 100644 (file)
index 0000000..08d5921
Binary files /dev/null and b/documents/youtube_video.odt differ