Added function to kill usersDialog when dialog is closed.

[speedfreak] / Client / mainwindow.cpp

diff --git a/Client/mainwindow.cpp b/Client/mainwindow.cpp
index 7c27b22..f86681c 100644 (file)
--- a/Client/mainwindow.cpp
+++ b/Client/mainwindow.cpp
@@ -34,6 +34,8 @@ MainWindow::MainWindow(QWidget *parent) :
     routeSaveDialog = NULL;
     topResultDialog = NULL;
 
+    usersDialog = NULL;
+
     settingsDialog = new SettingsDialog;
     connect(settingsDialog, SIGNAL(sendregistration()), this, SLOT(clientRegUserToServer()));
     connect(settingsDialog, SIGNAL(userNameChanged()),  this, SLOT(clientUserLogin()));
@@ -166,6 +168,9 @@ MainWindow::~MainWindow()
     if(helpDialog)
         delete helpDialog;
 
+    if(usersDialog)
+        delete usersDialog;
+
     if(customButtonAccelerate)
         delete customButtonAccelerate;
     if(customButtonRoute)
@@ -283,11 +288,14 @@ void MainWindow::clientUserLogin()
 
 /**
   * This function send route data to server.
+  * @param QString oldName, old file name
+  * @param QString newName, new file name
+  * @param int i
   */
-void MainWindow::clientSendRoute(QString s,int i)
+void MainWindow::clientSendRoute(QString oldName, QString newName, int i)
 {
     if(httpClient)
-        httpClient->sendRouteXml(s,i);
+        httpClient->sendRouteXml(oldName, newName, i);
 }
 
 /**
@@ -338,6 +346,12 @@ void MainWindow::killDialog()
         delete helpDialog;
         helpDialog = NULL;
     }
+    if(usersDialog)
+    {
+        qDebug() << "__MW kill: usersDialog";
+        delete usersDialog;
+        usersDialog = NULL;
+    }
 }
 
 /**
@@ -374,7 +388,7 @@ void MainWindow::OpenRouteDialog()
     if(!routeSaveDialog)
         routeSaveDialog = new RouteSaveDialog;
 
-    connect(routeSaveDialog, SIGNAL(sendroute(QString,int)), this, SLOT(clientSendRoute(QString,int)));
+    connect(routeSaveDialog, SIGNAL(sendroute(QString,QString,int)), this, SLOT(clientSendRoute(QString,QString,int)));
     connect(routeSaveDialog, SIGNAL(rejected()), this, SLOT(killDialog()));
     routeSaveDialog->show();
 }
@@ -426,3 +440,39 @@ void MainWindow::saveProfile()
     if(httpClient)
         httpClient->sendProfileXml();
 }
+
+/**
+  * This slot function calls httpClients requestUserInfo for getting user's information from server.
+  */
+void MainWindow::requestGetUserInfo(QString name)
+{
+    qDebug() << "getUserInfo signal " + name;
+    if(httpClient)
+    {
+        httpClient->requestUserInfo(name);
+    }
+}
+
+/**
+  * This slot function calls httpClients requestUsers for getting usernames from server.
+  */
+void MainWindow::requestGetUsers()
+{
+    qDebug() << "getUsers signal";
+    if(httpClient)
+    {
+        httpClient->requestUsers();
+    }
+}
+
+void MainWindow::on_pushButtonUsers_clicked()
+{
+    if(!usersDialog)
+        usersDialog = new UsersDialog;
+
+    connect(usersDialog, SIGNAL(getUserInfo(QString)), this, SLOT(requestGetUserInfo(QString)));
+    //connect(usersDialog, SIGNAL(getUsers()), this, SLOT(requestGetUsers()));
+    requestGetUsers();
+    connect(usersDialog, SIGNAL(rejected()), this, SLOT(killDialog()));
+    usersDialog->show();
+}