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

[scm-commit@wald.intevation.org]

Author: raimund
Date: 2010-11-17 12:54:52 +0100 (Wed, 17 Nov 2010)
New Revision: 9426

Modified:
   trunk/gsd/ChangeLog
   trunk/gsd/src/delegate_text.cpp
   trunk/gsd/src/dock_details.cpp
   trunk/gsd/src/gsd_mw.cpp
Log:
* src/delegate_text.cpp (paint): Fixed some code to display text delegates
correctly.

* src/gsd_mw.cpp (createContextMenu): Added actions to task context menu.
(logout): Stop update on logout.

* src/dock_details.cpp (dock_details_family::load): Removed text delegates.
(dock_details_family::update): Moved text delegate here. Set table header
resize mode to stretch.



Modified: trunk/gsd/ChangeLog
===================================================================
--- trunk/gsd/ChangeLog	2010-11-17 11:37:13 UTC (rev 9425)
+++ trunk/gsd/ChangeLog	2010-11-17 11:54:52 UTC (rev 9426)
@@ -1,5 +1,17 @@
 2010-11-17  Raimund Renkert <raimund.renkert at greenbone.net>
 
+	* src/delegate_text.cpp (paint): Fixed some code to display text delegates
+	correctly.
+
+	* src/gsd_mw.cpp (createContextMenu): Added actions to task context menu.
+	(logout): Stop update on logout.
+
+	* src/dock_details.cpp (dock_details_family::load): Removed text delegates.
+	(dock_details_family::update): Moved text delegate here. Set table header
+	resize mode to stretch.
+
+2010-11-17  Raimund Renkert <raimund.renkert at greenbone.net>
+
 	* dock_details.cpp (dock_details_nvt::update): Remove all entities to have a
 	clear model for the update (fixes crash on windows systems).
 

Modified: trunk/gsd/src/delegate_text.cpp
===================================================================
--- trunk/gsd/src/delegate_text.cpp	2010-11-17 11:37:13 UTC (rev 9425)
+++ trunk/gsd/src/delegate_text.cpp	2010-11-17 11:54:52 UTC (rev 9426)
@@ -197,10 +197,10 @@
         {
           QString out = "";
           QString s1 = model->getValue (pItem, "preference_count");
-          if (s1.compare ("0") == 0 || s1.compare ("-1"))
+          if (s1.compare ("0") == 0 || s1.compare ("-1") == 0)
             out = "";
           else
-            out = s1;
+            out = " " + s1;
           QApplication::style ()->drawItemText(painter,
                                                option.rect,
                                                Qt::AlignVCenter,
@@ -215,9 +215,9 @@
           QString out = "";
           QString s1 = model->getValue (pItem, "timeout");
           if (s1.compare ("") == 0)
-            out = "default";
+            out = " default";
           else
-            out = s1;
+            out = " " + s1;
           QApplication::style ()->drawItemText(painter,
                                                option.rect,
                                                Qt::AlignVCenter,
@@ -234,7 +234,7 @@
           if (s1.compare ("") == 0)
             out = "";
           else
-            out = s1;
+            out = " "+ s1;
           QApplication::style ()->drawItemText(painter,
                                                option.rect,
                                                Qt::AlignVCenter,

Modified: trunk/gsd/src/dock_details.cpp
===================================================================
--- trunk/gsd/src/dock_details.cpp	2010-11-17 11:37:13 UTC (rev 9425)
+++ trunk/gsd/src/dock_details.cpp	2010-11-17 11:54:52 UTC (rev 9426)
@@ -1165,10 +1165,6 @@
   toolBar->setMovable (false);
   toolBar->toggleViewAction ()->setVisible (false);
   this->gridLayout_2->addWidget (toolBar,3,0,1,2);
-  delegate_text *text = new delegate_text ();
-  tv_table->setItemDelegateForColumn (1, text);
-  tv_table->setItemDelegateForColumn (4, text);
-  tv_table->setItemDelegateForColumn (5, text);
   actionDetails_NVT->setObjectName(QString::fromUtf8("actionDetails_Families"));
   QIcon icon1;
   icon1.addPixmap(QPixmap(QString::fromUtf8(":/img/details.png")),
@@ -1218,9 +1214,15 @@
   tv_table->setColumnWidth (1, 180);
   tv_table->setColumnWidth (3, 60);
   tv_table->setColumnWidth (5, 60);
+
+  delegate_text *text = new delegate_text ();
+  tv_table->setItemDelegateForColumn (1, text);
+  tv_table->setItemDelegateForColumn (4, text);
+  tv_table->setItemDelegateForColumn (5, text);
   tv_table->verticalHeader ()->setVisible (false);
   tv_table->horizontalHeader ()->setHighlightSections (false);
   tv_table->horizontalHeader ()->setMinimumSectionSize (75);
+  tv_table->horizontalHeader ()->setResizeMode (0, QHeaderView::Stretch);
   tv_table->setSelectionMode (QAbstractItemView::SingleSelection);
   tv_table->setAlternatingRowColors (true);
   tv_table->setSelectionBehavior (QAbstractItemView::SelectRows);

Modified: trunk/gsd/src/gsd_mw.cpp
===================================================================
--- trunk/gsd/src/gsd_mw.cpp	2010-11-17 11:37:13 UTC (rev 9425)
+++ trunk/gsd/src/gsd_mw.cpp	2010-11-17 11:54:52 UTC (rev 9426)
@@ -191,6 +191,18 @@
 void
 gsd_mw::createContextMenu ()
 {
+  tasks->addActionToMenu (actionNewTask);
+  tasks->addActionToMenu (actionDelete);
+  tasks->addSeparatorToMenu ();
+  tasks->addActionToMenu (actionRun);
+  tasks->addActionToMenu (actionPause);
+  tasks->addActionToMenu (actionResume);
+  tasks->addActionToMenu (actionStop);
+  tasks->addActionToMenu (actionReport);
+  tasks->addActionToMenu (actionDetails_Task);
+  tasks->addSeparatorToMenu ();
+  tasks->addActionToMenu (actionRefresh);
+
   configs->addActionToMenu (actionNew_Config);
   configs->addActionToMenu (actionDelete_Config);
   configs->addSeparatorToMenu ();
@@ -846,7 +858,7 @@
 void
 gsd_mw::logout ()
 {
-  //update_stop ();
+  update_stop ();
   setLoggedOut ();
   closeDockWidgets ();
   emit sig_logout ();