X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvRegisterForm.cxx;h=2d6057e9e9bed82217ec327ad3a70607589234c0;hb=0722e563db4e7b4493e4c697f75fb6f6aee93ebb;hp=c084bfa25eb6b095ba33dce5534a375b8c5b8d69;hpb=fdc1613169b9725128ad19aaa4c4a5c39f2920d7;p=clitk.git

diff --git a/vv/vvRegisterForm.cxx b/vv/vvRegisterForm.cxx
index c084bfa..2d6057e 100644
--- a/vv/vvRegisterForm.cxx
+++ b/vv/vvRegisterForm.cxx
@@ -19,41 +19,74 @@
 
 #include "vvRegisterForm.h"
 #include <QNetworkRequest>
-#include <QSettings>
 #include <QDir>
-#include <iostream>
-#include "common/globals.h"
-#include "vvCommon.h"
+#if QT_VERSION >= 0x050000
+#include <QUrlQuery>
+#endif
+#include <QPalette>
+#include "clitkConfiguration.h"
+#include "vvConfiguration.h"
 #include "vvUtils.h"
 
-vvRegisterForm::vvRegisterForm(QUrl url):url(url) { 
+vvRegisterForm::vvRegisterForm(QUrl url, QString path, QSettings::Format format):url(url), settings(path, format){ 
   manager = new QNetworkAccessManager(this);
   setupUi(this);
+  textBrowser->viewport()->setAutoFillBackground(false);
 }
 
 void vvRegisterForm::sendData(){
   QUrl url2(url);
+  
+#if QT_VERSION < 0x050000
   url2.addQueryItem("name", firstName->text().toUtf8());
   url2.addQueryItem("lastName", lastName->text().toUtf8());
   url2.addQueryItem("email", email->text().toUtf8());
   url2.addQueryItem("group", group->text().toUtf8());
-  url2.addQueryItem("os", QString::fromUtf8(OS_NAME));
-  url2.addQueryItem("vvVersion", QString::fromUtf8(VV_VERSION));
+  url2.addQueryItem("os", OS_NAME);
+  url2.addQueryItem("vvVersion", VV_VERSION);
+  url2.addQueryItem("architecture", ARCHITECTURE);
+  url2.addQueryItem("adressing", QString::number(sizeof(char*)*8)+"-bit");
+  url2.addQueryItem("compilationDate", QString(__DATE__) + ", " + QString(__TIME__) );
+#else
+  QUrlQuery url2Query;
+    
+  url2Query.addQueryItem("name", firstName->text().toUtf8());
+  url2Query.addQueryItem("lastName", lastName->text().toUtf8());
+  url2Query.addQueryItem("email", email->text().toUtf8());
+  url2Query.addQueryItem("group", group->text().toUtf8());
+  url2Query.addQueryItem("os", OS_NAME);
+  url2Query.addQueryItem("vvVersion", VV_VERSION);
+  url2Query.addQueryItem("architecture", ARCHITECTURE);
+  url2Query.addQueryItem("adressing", QString::number(sizeof(char*)*8)+"-bit");
+  url2Query.addQueryItem("compilationDate", QString(__DATE__) + ", " + QString(__TIME__) );
+  url2.setQuery(url2Query);
+#endif
+  
   manager->get(QNetworkRequest(url2));
 }
 void vvRegisterForm::accept(){
   sendData();
+  settings.setValue("name", firstName->text().toUtf8());
+  settings.setValue("lastName", lastName->text().toUtf8());
+  settings.setValue("email", email->text().toUtf8());
+  settings.setValue("group", group->text().toUtf8());
+  settings.setValue("os", osName->text().toUtf8());
   QDialog::accept();
 }
 bool vvRegisterForm::canPush(){
-  QSettings settings(getVVSettingsPath(), getSettingsOptionFormat());
+  ///maybe we show this dialog only for new major release, not for any patches?
   return settings.value("vvVersion").toString().toStdString()<VV_VERSION;
 }
 void vvRegisterForm::acquitPushed(){
-  QSettings settings(getVVSettingsPath(), getSettingsOptionFormat());
   settings.setValue("vvVersion", VV_VERSION);
 }
 void vvRegisterForm::show(){
- osName->setText(QString::fromStdString(OS_NAME));
+ firstName->setText(settings.value("name").toString());
+ lastName->setText(settings.value("lastName").toString()); 
+ email->setText(settings.value("email").toString()); 
+ group->setText(settings.value("group").toString()); 
+ osName->setText(QString::fromStdString(OS_NAME) + ", " +
+                 ARCHITECTURE + ", " +
+                 QString::number(sizeof(char*)*8)+"-bit");
  QDialog::show();
-}
\ No newline at end of file
+}