[Openvas-commits] r10585 - in trunk/gsd: . src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Mar 18 15:21:11 CET 2011
Author: raimund
Date: 2011-03-18 15:21:09 +0100 (Fri, 18 Mar 2011)
New Revision: 10585
Modified:
trunk/gsd/ChangeLog
trunk/gsd/src/delegate_text.cpp
trunk/gsd/src/gsd_control.cpp
trunk/gsd/src/gsd_control.h
trunk/gsd/src/gsd_mw.cpp
trunk/gsd/src/gsd_mw.h
Log:
Added report format dock widget.
* src/gsd_control.cpp (gsd_control): Added Header to report format model.
(logout): Remove all entities from report format model on logout.
(getReportFormatModel): New.
* src/gsd_mw.cpp (gsd_mw): Added dockwidget for report formats.
(prepareWidgets): Set properties for new dock widget.
(reportformat_dw, focus_reportformats): New.
* src/delegate_text.cpp (paint): Print 'yes' or 'no' in column trust instead
of '1' or '0'.
* src/gsd_control.h, src/gsd_mw.h: Updated prototypes.
Modified: trunk/gsd/ChangeLog
===================================================================
--- trunk/gsd/ChangeLog 2011-03-18 13:53:39 UTC (rev 10584)
+++ trunk/gsd/ChangeLog 2011-03-18 14:21:09 UTC (rev 10585)
@@ -1,5 +1,22 @@
2011-03-18 Raimund Renkert <raimund.renkert at greenbone.net>
+ Added report format dock widget.
+
+ * src/gsd_control.cpp (gsd_control): Added Header to report format model.
+ (logout): Remove all entities from report format model on logout.
+ (getReportFormatModel): New.
+
+ * src/gsd_mw.cpp (gsd_mw): Added dockwidget for report formats.
+ (prepareWidgets): Set properties for new dock widget.
+ (reportformat_dw, focus_reportformats): New.
+
+ * src/delegate_text.cpp (paint): Print 'yes' or 'no' in column trust instead
+ of '1' or '0'.
+
+ * src/gsd_control.h, src/gsd_mw.h: Updated prototypes.
+
+2011-03-18 Raimund Renkert <raimund.renkert at greenbone.net>
+
Fixed a bug in the top 5 chart.
* src/gsd_mw.cpp (updateDashboard): Limit the string concatenation to the
Modified: trunk/gsd/src/delegate_text.cpp
===================================================================
--- trunk/gsd/src/delegate_text.cpp 2011-03-18 13:53:39 UTC (rev 10584)
+++ trunk/gsd/src/delegate_text.cpp 2011-03-18 14:21:09 UTC (rev 10585)
@@ -244,6 +244,23 @@
QPalette::HighlightedText);
return;
}
+ if (model->getHeader (index.column ()).compare ("active") == 0)
+ {
+ QString out = "";
+ QString s1 = model->getValue (pItem, "active");
+ if (s1.compare ("1") == 0)
+ out = "yes";
+ else
+ out = "no";
+ QApplication::style ()->drawItemText(painter,
+ option.rect,
+ Qt::AlignCenter,
+ opts.palette,
+ true,
+ out,
+ QPalette::HighlightedText);
+ return;
+ }
}
QStyledItemDelegate::paint (painter, option, index);
}
Modified: trunk/gsd/src/gsd_control.cpp
===================================================================
--- trunk/gsd/src/gsd_control.cpp 2011-03-18 13:53:39 UTC (rev 10584)
+++ trunk/gsd/src/gsd_control.cpp 2011-03-18 14:21:09 UTC (rev 10585)
@@ -124,6 +124,13 @@
xmlReportModel = new model_omp_entity ();
configDownloadModel = new model_omp_entity ();
reportFormatModel = new model_omp_entity ();
+ reportFormatModel->addHeader (tr ("Name"), "name");
+ reportFormatModel->addHeader (tr ("Extension"), "extension");
+ reportFormatModel->addHeader (tr ("Content Type"), "content_type");
+ reportFormatModel->addHeader (tr ("Trust"), "trust");
+ reportFormatModel->addHeader (tr ("Last verified"), "trust time");
+ reportFormatModel->addHeader (tr ("Active"), "active");
+
tmpReportModel = new model_omp_entity ();
}
@@ -541,6 +548,7 @@
htmlReportModel->removeEntities ();
xmlReportModel->removeEntities ();
configDownloadModel->removeEntities ();
+ reportFormatModel->removeEntities ();
connector->removeCredentials();
}
@@ -2143,6 +2151,19 @@
return tmpReportModel;
}
+
+/**
+ * @brief Getter
+ *
+ * @return The model containing the report formats.
+ */
+model_omp_entity*
+gsd_control::getReportFormatModel ()
+{
+ return reportFormatModel;
+}
+
+
void
gsd_control::note_modify(int)
{}
Modified: trunk/gsd/src/gsd_control.h
===================================================================
--- trunk/gsd/src/gsd_control.h 2011-03-18 13:53:39 UTC (rev 10584)
+++ trunk/gsd/src/gsd_control.h 2011-03-18 14:21:09 UTC (rev 10585)
@@ -204,6 +204,7 @@
model_omp_entity *getOverrideModel ();
model_omp_entity *getOverrideDetailsModel ();
model_omp_entity *getSlaveModel ();
+ model_omp_entity *getReportFormatModel ();
model_omp_entity *getSystemDiagramModel ();
model_omp_entity *getSystemReportModel ();
model_omp_entity *getFamilyModel ();
Modified: trunk/gsd/src/gsd_mw.cpp
===================================================================
--- trunk/gsd/src/gsd_mw.cpp 2011-03-18 13:53:39 UTC (rev 10584)
+++ trunk/gsd/src/gsd_mw.cpp 2011-03-18 14:21:09 UTC (rev 10585)
@@ -75,6 +75,9 @@
slaves = new dock_table ();
slaves->setObjectName ("Slaves");
this->addDockWidget (Qt::BottomDockWidgetArea, slaves);
+ reportformats = new dock_table ();
+ reportformats->setObjectName ("Reportformats");
+ this->addDockWidget (Qt::BottomDockWidgetArea, reportformats);
taskProgress = new delegate_progress ();
trendIcon = new delegate_trend ();
@@ -539,6 +542,27 @@
SLOT (slave_selectionchanged (const QItemSelection&,
const QItemSelection&)));
+ reportformats->setWindowTitle (tr ("Report Formats"));
+ QMainWindow::tabifyDockWidget (targets, reportformats);
+ reportformats->setModel (control->getReportFormatModel ());
+ reportformats->setFeatures (QDockWidget::DockWidgetClosable |
+ QDockWidget::DockWidgetMovable |
+ QDockWidget::DockWidgetFloatable);
+ QTableView *tv_reportformats = reportformats->getTable ();
+ tv_reportformats->setObjectName ("tv_reportformats");
+ tv_reportformats->setItemDelegateForColumn (5, text);
+ tv_reportformats->horizontalHeader ()->setResizeMode (QHeaderView::Fixed);
+ tv_reportformats->horizontalHeader ()->setResizeMode (0, QHeaderView::Stretch);
+ tv_reportformats->setColumnWidth (0, 150);
+ tv_reportformats->setColumnWidth (1, 80);
+ tv_reportformats->setColumnWidth (2, 90);
+ tv_reportformats->setColumnWidth (3, 90);
+ tv_reportformats->setColumnWidth (4, 140);
+ tv_reportformats->setColumnWidth (5, 80);
+ tv_reportformats->verticalHeader ()->setVisible (false);
+ tv_reportformats->horizontalHeader ()->setHighlightSections (false);
+ tv_reportformats->horizontalHeader ()->setMinimumSectionSize (60);
+
QMainWindow::tabifyDockWidget (targets, performance);
performance->setReportModel (control->getSystemReportModel ());
performance->setGraphicsModel (control->getSystemDiagramModel ());
@@ -2781,6 +2805,17 @@
/**
+ * @brief SLOT to show report formats widget.
+ */
+void
+gsd_mw::reportformat_dw ()
+{
+ reportformats->show ();
+ reportformats->raise ();
+}
+
+
+/**
* @brief SLOT to show performance widget
*/
void
@@ -3090,7 +3125,34 @@
QItemSelection ());
}
+
/**
+ * @brief SLOT called when the reportformat dockwidget becomes visible or
+ * invisble.
+ */
+void
+gsd_mw::focus_reportformats (bool focus)
+{
+ if (focus)
+ reportformats->getTable ()->setFocus ();
+ reportformats->getTable ()->viewport ()->update ();
+ if (!reportformats->getTable ()->selectionModel ()->hasSelection ())
+ {
+ QModelIndex start;
+ QModelIndex end;
+ start = control->getReportFormatModel ()->index (0, 0, QModelIndex ());
+ end = control->getReportFormatModel ()->index (0,
+ control->getReportFormatModel ()
+ ->columnCount () -1,
+ QModelIndex ());
+ QItemSelection sel (start, end);
+ reportformats->getTable ()
+ ->selectionModel ()
+ ->select (sel, QItemSelectionModel::Select);
+ return;
+ }
+}
+/**
* @brief SLOT called when the overrides dockwidget becomes visible or
* invisble.
*
Modified: trunk/gsd/src/gsd_mw.h
===================================================================
--- trunk/gsd/src/gsd_mw.h 2011-03-18 13:53:39 UTC (rev 10584)
+++ trunk/gsd/src/gsd_mw.h 2011-03-18 14:21:09 UTC (rev 10585)
@@ -150,6 +150,7 @@
void focus_overrides (bool focus);
void focus_slaves (bool focus);
void focus_performance (bool focus);
+ void focus_reportformats (bool focus);
void save_config ();
@@ -227,6 +228,7 @@
void slave_dw ();
void performance_dw ();
void update_dw ();
+ void reportformat_dw ();
void task_selectionchanged (const QItemSelection &sel,
const QItemSelection &desel);
@@ -298,6 +300,7 @@
dock_table *notes;
dock_table *overrides;
dock_table *slaves;
+ dock_table *reportformats;
dock_table *quickInfo;
delegate_progress *taskProgress;
delegate_trend *trendIcon;
More information about the Openvas-commits
mailing list