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

List:       koffice
Subject:    kpresenter patch for sidebar
From:       Thorsten Zachmann <t.zachmann () zagge ! de>
Date:       2002-07-25 7:41:12
[Download RAW message or body]

Hello all 

I have removed some errors (no update for some function, no update for sticky 
objects) in updating the sidebar.

Is it ok to commit?

Thorsten
["sidebar10.diff" (text/x-diff)]

Index: kpresenter/kprcommand.cc
===================================================================
RCS file: /home/kde/koffice/kpresenter/kprcommand.cc,v
retrieving revision 1.129
diff -u -3 -p -r1.129 kprcommand.cc
--- kpresenter/kprcommand.cc	2002/07/23 09:47:12	1.129
+++ kpresenter/kprcommand.cc	2002/07/25 07:35:00
@@ -64,6 +64,8 @@ ShadowCmd::ShadowCmd( const QString &_na
     doc = _doc;
     newShadow = _newShadow;
 
+    m_page = doc->findSideBarPage( objects );
+
     QPtrListIterator<KPObject> it( objects );
     for ( ; it.current() ; ++it )
         it.current()->incCmdRef();
@@ -88,6 +90,12 @@ void ShadowCmd::execute()
         it.current()->setShadowParameter(newShadow.shadowDistance,newShadow.shadowDirection,newShadow.shadowColor);
  }
     doc->repaint( false );
+
+    if ( doc->refreshSideBar())
+    {
+        int pos=doc->pageList().findRef(m_page);
+        doc->updateSideBarItem(pos, (m_page == doc->stickyPage()) ? true: false );
+    }
 }
 
 /*====================== unexecute ===============================*/
@@ -98,6 +106,12 @@ void ShadowCmd::unexecute()
         objects.at( i \
)->setShadowParameter(oldShadow.at(i)->shadowDistance,oldShadow.at(i)->shadowDirection,oldShadow.at(i)->shadowColor);
  }
     doc->repaint( false );
+
+    if ( doc->refreshSideBar())
+    {
+        int pos=doc->pageList().findRef(m_page);
+        doc->updateSideBarItem(pos, (m_page == doc->stickyPage()) ? true: false );
+    }
 }
 
 /******************************************************************/
@@ -412,7 +426,7 @@ void DeleteCmd::execute()
     if ( doc->refreshSideBar())
     {
         int pos=doc->pageList().findRef(m_page);
-        doc->updateSideBarItem(pos);
+        doc->updateSideBarItem(pos, (m_page == doc->stickyPage()) ? true: false );
     }
 }
 
@@ -429,7 +443,7 @@ void DeleteCmd::unexecute()
     {
 
         int pos=doc->pageList().findRef(m_page);
-        doc->updateSideBarItem(pos);
+        doc->updateSideBarItem(pos, (m_page == doc->stickyPage()) ? true: false );
     }
 }
 
@@ -765,6 +779,12 @@ void LowerRaiseCmd::execute()
 {
     m_page->setObjectList( newList );
     doc->repaint( false );
+
+    if ( doc->refreshSideBar())
+    {
+        int pos=doc->pageList().findRef(m_page);
+        doc->updateSideBarItem(pos, (m_page == doc->stickyPage()) ? true: false );
+    }
 }
 
 /*====================== unexecute ===============================*/
@@ -772,6 +792,12 @@ void LowerRaiseCmd::unexecute()
 {
     m_page->setObjectList( oldList );
     doc->repaint( false );
+
+    if ( doc->refreshSideBar())
+    {
+        int pos=doc->pageList().findRef(m_page);
+        doc->updateSideBarItem(pos, (m_page == doc->stickyPage()) ? true: false );
+    }
 }
 
 /******************************************************************/
@@ -824,7 +850,7 @@ void MoveByCmd::execute()
     if ( doc->refreshSideBar()) //for redo
     {
         int pos=doc->pageList().findRef(m_page);
-        doc->updateSideBarItem(pos);
+        doc->updateSideBarItem(pos, (m_page == doc->stickyPage()) ? true: false );
     }
 }
 
@@ -848,7 +874,7 @@ void MoveByCmd::unexecute()
     if ( doc->refreshSideBar())
     {
         int pos=doc->pageList().findRef(m_page);
-        doc->updateSideBarItem(pos);
+        doc->updateSideBarItem(pos, (m_page == doc->stickyPage()) ? true: false );
     }
 }
 
@@ -908,7 +934,7 @@ void MoveByCmd2::execute()
     if ( doc->refreshSideBar()) //for redo
     {
         int pos=doc->pageList().findRef(m_page);
-        doc->updateSideBarItem(pos);
+        doc->updateSideBarItem(pos, (m_page == doc->stickyPage()) ? true: false );
     }
 }
 
@@ -932,7 +958,7 @@ void MoveByCmd2::unexecute()
     if ( doc->refreshSideBar()) //for redo
     {
         int pos=doc->pageList().findRef(m_page);
-        doc->updateSideBarItem(pos);
+        doc->updateSideBarItem(pos, (m_page == doc->stickyPage()) ? true: false );
     }
 }
 
Index: kpresenter/kprcommand.h
===================================================================
RCS file: /home/kde/koffice/kpresenter/kprcommand.h,v
retrieving revision 1.65
diff -u -3 -p -r1.65 kprcommand.h
--- kpresenter/kprcommand.h	2002/07/22 07:57:29	1.65
+++ kpresenter/kprcommand.h	2002/07/25 07:35:01
@@ -76,6 +76,7 @@ protected:
     QPtrList<ShadowValues> oldShadow;
     QPtrList<KPObject> objects;
     ShadowValues newShadow;
+    KPrPage *m_page;
 
 };
 
Index: kpresenter/kprpage.cc
===================================================================
RCS file: /home/kde/koffice/kpresenter/kprpage.cc,v
retrieving revision 1.179
diff -u -3 -p -r1.179 kprpage.cc
--- kpresenter/kprpage.cc	2002/07/22 14:11:54	1.179
+++ kpresenter/kprpage.cc	2002/07/25 07:35:02
@@ -3097,7 +3097,7 @@ KCommand *KPrPage::moveObject(KPresenter
                                    _objects, m_doc,this );
 	if ( m_doc->refreshSideBar()) {  //because it's a macro command
 	  int pos=m_doc->pageList().findRef(this);
-	  m_doc->updateSideBarItem(pos);
+	  m_doc->updateSideBarItem(pos, ( this == m_doc->stickyPage()) ? true: false );
 	}
     }
     return moveByCmd;


____________________________________
koffice mailing list
koffice@mail.kde.org
To unsubscribe please visit:
http://mail.kde.org/mailman/listinfo/koffice

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