[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdevplatform/veritas
From:       Manuel Breugelmans <mbr.nxi () gmail ! com>
Date:       2008-08-31 21:22:36
Message-ID: 1220217756.665062.16961.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 855473 by mbreugel:

Implement ResultWidget by hand, remove designer files.

 M  +1 -1      CMakeLists.txt  
 D             mvc/resultsview.ui  
 A             mvc/resultswidget.cpp   [License: GPL (v2+)]
 A             mvc/resultswidget.h   [License: GPL (v2+)]
 M  +9 -5      mvc/runnerwindow.cpp  
 M  +4 -4      mvc/runnerwindow.h  


--- trunk/KDE/kdevplatform/veritas/CMakeLists.txt #855472:855473
@@ -27,12 +27,12 @@
     mvc/verbosetoggle.cpp
     mvc/overlaymanager.cpp
     mvc/overlaytoggle.cpp
+    mvc/resultswidget.cpp
     tests/runnertesthelper.cpp)
     #${CMAKE_SOURCE_DIR}/tests/common/modeltest.cpp)
 
 kde4_add_ui_files(veritas_SRCS
     mvc/runnerwindow.ui
-    mvc/resultsview.ui
     mvc/stoppingdialog.ui)
 
 qt4_add_resources(veritas_SRCS
--- trunk/KDE/kdevplatform/veritas/mvc/runnerwindow.cpp #855472:855473
@@ -22,7 +22,6 @@
 #include "veritas/mvc/runnerwindow.h"
 
 #include "ui_runnerwindow.h"
-#include "ui_resultsview.h"
 
 #include "interfaces/iproject.h"
 
@@ -42,6 +41,7 @@
 #include "interfaces/idocumentcontroller.h"
 
 #include "veritas/utils.h"
+#include "mvc/resultswidget.h"
 
 #include <QMessageBox>
 #include <QCloseEvent>
@@ -86,9 +86,7 @@
     m_resultsModel = rmodel;
     m_ui = new Ui::RunnerWindow;
     m_ui->setupUi(this);
-    m_uiResults = new Ui::ResultsView;
-    m_results = new QWidget;
-    m_uiResults->setupUi(m_results);
+    m_results = new ResultsWidget();
     runnerView()->setRootIsDecorated(false);
     runnerView()->setUniformRowHeights(true);
 
@@ -873,9 +871,15 @@
 
 QTreeView* RunnerWindow::resultsView() const
 {
-    return m_uiResults->treeResults;
+//    return m_results->treeResults;
+    return m_results->tree();
 }
 
+QWidget* RunnerWindow::resultsWidget() const
+{
+    return m_results;
+}
+
 RunnerModel* RunnerWindow::runnerModel() const
 {
     return runnerController()->runnerModel();
--- trunk/KDE/kdevplatform/veritas/mvc/runnerwindow.h #855472:855473
@@ -30,7 +30,7 @@
 #include "../veritasexport.h"
 
 namespace KDevelop { class IProject; }
-namespace Ui { class RunnerWindow; class ResultsView; }
+namespace Ui { class RunnerWindow;}
 
 class QAction;
 class QItemSelection;
@@ -48,6 +48,7 @@
 class SelectionManager;
 class StatusWidget;
 class VerboseManager;
+class ResultsWidget;
 
 /*!
  * \brief The RunnerWindow class defines the Veritas main window.
@@ -104,7 +105,7 @@
     KSelectAction* projectPopup() const;
 
     VerboseManager* verboseManager() const;
-    QWidget* resultsWidget() const { return m_results; }
+    QWidget* resultsWidget() const;
 
     void resetProgressBar() const;
 
@@ -210,8 +211,7 @@
 
 private: // Attributes
     Ui::RunnerWindow *m_ui;            // QtDesigner main object
-    Ui::ResultsView* m_uiResults;      //
-    QWidget* m_results;
+    ResultsWidget* m_results;
     QSemaphore m_sema;                 // currently unused, should remove
     QBrush m_highlightBrush;           // hmm
     RunnerViewController*  m_runnerViewController; // used to reduce bloat in this class
[prev in list] [next in list] [prev in thread] [next in thread]