[Openvas-commits] r12209 - in trunk/gsd: . src

[scm-commit@wald.intevation.org]

Author: raimund
Date: 2011-11-29 13:15:11 +0100 (Tue, 29 Nov 2011)
New Revision: 12209

Modified:
   trunk/gsd/ChangeLog
   trunk/gsd/src/gsd_control.cpp
   trunk/gsd/src/gsd_dialogs.cpp
Log:
Updated the gsd to accept omp version 3.0.

* src/gsd_control.cpp: Added checks for omp version 3.0.

* src/gsd_dialogs.cpp: Display omp version 3.0 if available.



Modified: trunk/gsd/ChangeLog
===================================================================
--- trunk/gsd/ChangeLog	2011-11-28 16:18:16 UTC (rev 12208)
+++ trunk/gsd/ChangeLog	2011-11-29 12:15:11 UTC (rev 12209)
@@ -1,3 +1,11 @@
+2011-11-29  Raimund Renkert <raimund.renkert at greenbone.net>
+
+	Updated the gsd to accept omp version 3.0.
+
+	* src/gsd_control.cpp: Added checks for omp version 3.0.
+
+	* src/gsd_dialogs.cpp: Display omp version 3.0 if available.
+
 2011-11-21  Matthew Mundell <matthew.mundell at greenbone.net>
 
 	* src/delegate_date_time.cpp (delegate_date_time::modifyDate): Try parse

Modified: trunk/gsd/src/gsd_control.cpp
===================================================================
--- trunk/gsd/src/gsd_control.cpp	2011-11-28 16:18:16 UTC (rev 12208)
+++ trunk/gsd/src/gsd_control.cpp	2011-11-29 12:15:11 UTC (rev 12209)
@@ -522,7 +522,7 @@
   request_system_reports (0);
   request_system_reports (NULL, 3600);
   request_families ();
-  if (protocol_version == 2)
+  if (protocol_version == 2 || protocol_version == 3)
     request_report_formats ();
 }
 
@@ -1681,7 +1681,7 @@
 void
 gsd_control::report_download (QMap<QString, QString> parameter)
 {
-  if (protocol_version == 2)
+  if (protocol_version == 2 || protocol_version == 3)
     {
       if (parameter.contains ("format"))
         {
@@ -2353,6 +2353,8 @@
         }
       else if (version.compare ("2.0") == 0)
         protocol_version = 2;
+      else if (version.compare ("3.0") == 0)
+        protocol_version = 3;
       loadData ();
     }
   else
@@ -2362,6 +2364,8 @@
         p = 2;
       else if (version.compare ("2.0") == 0)
         p = 3;
+      else if (version.compare ("3.0") == 0)
+        p = 4;
       emit sig_check_result (p);
     }
 }

Modified: trunk/gsd/src/gsd_dialogs.cpp
===================================================================
--- trunk/gsd/src/gsd_dialogs.cpp	2011-11-28 16:18:16 UTC (rev 12208)
+++ trunk/gsd/src/gsd_dialogs.cpp	2011-11-29 12:15:11 UTC (rev 12209)
@@ -382,6 +382,14 @@
       la_result2->setText ("OMP 2.0");
       la_result2->setStyleSheet ("QLabel {color: green}");
     }
+  else if (res == 4)
+    {
+      QImage image (":/img/favicon.gif");
+      QPixmap pm = QPixmap::fromImage (image);
+      la_result->setPixmap (pm);
+      la_result2->setText ("OMP 3.0");
+      la_result2->setStyleSheet ("QLabel {color: green}");
+    }
   else
     {
       la_result2->setText ("");