Message for registering vv's user information

diff --git a/vv/qt_ui/vvRegisterForm.ui b/vv/qt_ui/vvRegisterForm.ui
index 59f776427bf4bc64c515b82bf81aca11a422f8e2..d700b0c379f58fa6dcf65c3a281defd1c8d6b63d 100644 (file)
--- a/vv/qt_ui/vvRegisterForm.ui
+++ b/vv/qt_ui/vvRegisterForm.ui
@@ -32,9 +32,9 @@
   <widget class="QLineEdit" name="firstName">
    <property name="geometry">
     <rect>
-     <x>160</x>
-     <y>120</y>
-     <width>201</width>
+     <x>110</x>
+     <y>150</y>
+     <width>241</width>
      <height>21</height>
     </rect>
    </property>
@@ -42,9 +42,9 @@
   <widget class="QLabel" name="label">
    <property name="geometry">
     <rect>
-     <x>100</x>
-     <y>120</y>
-     <width>61</width>
+     <x>40</x>
+     <y>150</y>
+     <width>71</width>
      <height>20</height>
     </rect>
    </property>
@@ -55,9 +55,9 @@
   <widget class="QLabel" name="label_2">
    <property name="geometry">
     <rect>
-     <x>100</x>
-     <y>140</y>
-     <width>61</width>
+     <x>40</x>
+     <y>170</y>
+     <width>71</width>
      <height>20</height>
     </rect>
    </property>
@@ -68,9 +68,9 @@
   <widget class="QLineEdit" name="lastName">
    <property name="geometry">
     <rect>
-     <x>160</x>
-     <y>140</y>
-     <width>201</width>
+     <x>110</x>
+     <y>170</y>
+     <width>241</width>
      <height>21</height>
     </rect>
    </property>
@@ -78,9 +78,9 @@
   <widget class="QLineEdit" name="email">
    <property name="geometry">
     <rect>
-     <x>160</x>
-     <y>160</y>
-     <width>201</width>
+     <x>110</x>
+     <y>190</y>
+     <width>241</width>
      <height>21</height>
     </rect>
    </property>
@@ -88,9 +88,9 @@
   <widget class="QLineEdit" name="group">
    <property name="geometry">
     <rect>
-     <x>160</x>
-     <y>180</y>
-     <width>201</width>
+     <x>110</x>
+     <y>210</y>
+     <width>241</width>
      <height>21</height>
     </rect>
    </property>
@@ -98,9 +98,9 @@
   <widget class="QLabel" name="label_3">
    <property name="geometry">
     <rect>
-     <x>100</x>
-     <y>160</y>
-     <width>61</width>
+     <x>40</x>
+     <y>190</y>
+     <width>71</width>
      <height>20</height>
     </rect>
    </property>
@@ -111,9 +111,9 @@
   <widget class="QLabel" name="label_4">
    <property name="geometry">
     <rect>
-     <x>100</x>
-     <y>180</y>
-     <width>61</width>
+     <x>40</x>
+     <y>210</y>
+     <width>71</width>
      <height>20</height>
     </rect>
    </property>
@@ -121,6 +121,53 @@
     <string>Institute</string>
    </property>
   </widget>
+  <widget class="QTextBrowser" name="textBrowser">
+   <property name="geometry">
+    <rect>
+     <x>40</x>
+     <y>10</y>
+     <width>311</width>
+     <height>121</height>
+    </rect>
+   </property>
+   <property name="html">
+    <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Thank you for using vv!&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;We would like to know more about our vv users. Those informations are private and will not be shared to any other society.&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The data which will be sent are the facultative input to fill below, and the operating system name.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label_5">
+   <property name="geometry">
+    <rect>
+     <x>40</x>
+     <y>240</y>
+     <width>61</width>
+     <height>20</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>OS name</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="osName">
+   <property name="geometry">
+    <rect>
+     <x>110</x>
+     <y>240</y>
+     <width>241</width>
+     <height>20</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>OS name</string>
+   </property>
+  </widget>
  </widget>
  <resources/>
  <connections>

diff --git a/vv/vvRegisterForm.cxx b/vv/vvRegisterForm.cxx
index 430ba5fd4330c47824727509a10524307d2e0ad2..c084bfa25eb6b095ba33dce5534a375b8c5b8d69 100644 (file)
--- a/vv/vvRegisterForm.cxx
+++ b/vv/vvRegisterForm.cxx
@@ -52,4 +52,8 @@ bool vvRegisterForm::canPush(){
 void vvRegisterForm::acquitPushed(){
   QSettings settings(getVVSettingsPath(), getSettingsOptionFormat());
   settings.setValue("vvVersion", VV_VERSION);
+}
+void vvRegisterForm::show(){
+ osName->setText(QString::fromStdString(OS_NAME));
+ QDialog::show();
 }
\ No newline at end of file

diff --git a/vv/vvRegisterForm.h b/vv/vvRegisterForm.h
index 10c57708d98340c1165830fc239788caee8640da..72bec2a61f274eb082687d28fc0ace8c5cda332f 100644 (file)
--- a/vv/vvRegisterForm.h
+++ b/vv/vvRegisterForm.h
@@ -34,6 +34,7 @@ public:
     virtual void acquitPushed();
 public slots:
   virtual void accept();
+  virtual void show();
 protected:
   QUrl url;
   QNetworkAccessManager* manager;