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

List:       kde-commits
Subject:    koffice/kplato
From:       Dag Andersen <danders () get2net ! dk>
Date:       2009-11-12 9:51:58
Message-ID: 1258019518.771974.30922.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1047871 by danders:

Fix bug in taskstatusmodel and add manual refresh.


 M  +10 -1     kptview.cpp  
 M  +1 -0      kptview.h  
 M  +14 -2     libs/models/kpttaskstatusmodel.cpp  
 M  +4 -0      libs/ui/kpttaskstatusview.cpp  
 M  +2 -0      libs/ui/kpttaskstatusview.h  
 M  +2 -1      libs/ui/kptviewbase.h  


--- trunk/koffice/kplato/kptview.cpp #1047870:1047871
@@ -200,7 +200,8 @@
     actionPaste = actionCollection()->addAction(KStandardAction::Paste,  \
"edit_paste", this, SLOT( slotEditPaste() ));  
     // ------ View
-
+    actionCollection()->addAction( KStandardAction::Redisplay, "view_refresh" , \
this, SLOT( slotRefreshView() ) ); +    
     actionViewSelector  = new KToggleAction(i18n("Show Selector"), this);
     actionCollection()->addAction("view_show_selector", actionViewSelector );
     connect( actionViewSelector, SIGNAL( triggered( bool ) ), SLOT( \
slotViewSelector( bool ) ) ); @@ -1251,6 +1252,14 @@
     }
 }
 
+void View::slotRefreshView()
+{
+    ViewBase *v = currentView();
+    if ( v ) {
+        v->slotRefreshView();
+    }
+}
+
 void View::slotViewSelector( bool show )
 {
     //kDebug();
--- trunk/koffice/kplato/kptview.h #1047870:1047871
@@ -146,6 +146,7 @@
     void slotEditCut();
     void slotEditCopy();
     void slotEditPaste();
+    void slotRefreshView();
     void slotViewSelector( bool show );
 
     void slotAddTask();
--- trunk/koffice/kplato/libs/models/kpttaskstatusmodel.cpp #1047870:1047871
@@ -700,8 +700,20 @@
     if ( node == 0 || node->type() == Node::Type_Project ) {
         return;
     }
-    int row = node->parentNode()->findChildNode( node );
-    emit dataChanged( createIndex( row, 0, node ), createIndex( row, columnCount(), \
node ) ); +    QString wbs = node->wbsCode();
+    int row = -1;
+    if ( m_notstarted.value( wbs ) == node ) {
+        row = m_notstarted.keys().indexOf( wbs );
+    } else if ( m_running.value( wbs ) == node ) {
+        row = m_running.keys().indexOf( wbs );
+    } else if ( m_finished.value( wbs ) == node ) {
+        row = m_finished.keys().indexOf( wbs );
+    } else if ( m_upcoming.value( wbs ) == node ) {
+        row = m_upcoming.keys().indexOf( wbs );
+    }
+    if ( row >= 0 ) {
+        emit dataChanged( createIndex( row, 0, node ), createIndex( row, \
columnCount(), node ) ); +    }
 }
 
 void TaskStatusItemModel::slotWbsDefinitionChanged()
--- trunk/koffice/kplato/libs/ui/kpttaskstatusview.cpp #1047870:1047871
@@ -306,6 +306,10 @@
     m_view->setViewSplitMode( ! m_view->isViewSplit() );
 }
 
+void TaskStatusView::slotRefreshView()
+{
+    model()->refresh();
+}
 
 void TaskStatusView::slotOptions()
 {
--- trunk/koffice/kplato/libs/ui/kpttaskstatusview.h #1047870:1047871
@@ -119,6 +119,8 @@
 
     void setScheduleManager( ScheduleManager *sm );
 
+    virtual void slotRefreshView();
+
 protected slots:
     virtual void slotOptions();
 
--- trunk/koffice/kplato/libs/ui/kptviewbase.h #1047870:1047871
@@ -244,7 +244,8 @@
     virtual void slotEditCopy() {}
     virtual void slotEditCut() {}
     virtual void slotEditPaste() {}
-
+    virtual void slotRefreshView() {}
+    
 signals:
     /// Emitted when the gui has been activated or deactivated
     void guiActivated( ViewBase*, bool );


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