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

List:       kde-commits
Subject:    branches/work/kdab-post-4.0/kdepim
From:       Till Adam <adam () kde ! org>
Date:       2007-11-21 15:04:21
Message-ID: 1195657461.364925.9688.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 739676 by tilladam:

Merged revisions 739670 via svnmerge from 
svn+ssh://tilladam@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r739670 | tilladam | 2007-11-21 15:54:36 +0100 (Wed, 21 Nov 2007) | 4 lines
  
  Make sure to signal changes to the category list in both directions.
  
  kolab/issue1864
........


 _M            . (directory)  
 M  +1 -1      korganizer/kodialogmanager.cpp  
 M  +1 -0      korganizer/koeditorgeneral.cpp  
 M  +1 -0      korganizer/koeditorgeneral.h  
 M  +3 -0      korganizer/koeventeditor.cpp  
 M  +0 -4      korganizer/koincidenceeditor.cpp  
 M  +1 -1      korganizer/koincidenceeditor.h  


** branches/work/kdab-post-4.0/kdepim #property svnmerge-integrated
   - /branches/kdepim/enterprise/kdepim:1-708704,708706,708741,708749,709066,711604,71 \
1623,712056,714358,715112,717162,717727,723348-723367,723653,724153,724155,724546,729306,729611,731653,733159,733883,734242,734247,734273,735684,738629,739069 \
/trunk/KDE/kdepim:1-738080  + \
/branches/kdepim/enterprise/kdepim:1-708704,708706,708741,708749,709066,711604,711623, \
712056,714358,715112,717162,717727,723348-723367,723653,724153,724155,724546,729306,729611,731653,733159,733883,734242,734247,734273,735684,738629,739069,739670 \
                /trunk/KDE/kdepim:1-738080
--- branches/work/kdab-post-4.0/kdepim/korganizer/kodialogmanager.cpp #739675:739676
@@ -233,7 +233,7 @@
            mMainView, SLOT( deleteIncidence( Incidence * ) ) );
 
   connect( mCategoryEditDialog, SIGNAL( categoryConfigChanged() ),
-           editor, SLOT( updateCategoryConfig() ) );
+           editor, SIGNAL( updateCategoryConfig() ) );
   connect( editor, SIGNAL( editCategories() ),
            mCategoryEditDialog, SLOT( show() ) );
 
--- branches/work/kdab-post-4.0/kdepim/korganizer/koeditorgeneral.cpp #739675:739676
@@ -318,6 +318,7 @@
   categoryDialog->setSelected( mCategories );
 
   connect( categoryDialog, SIGNAL(editCategories()), this, \
SIGNAL(openCategoryDialog()) ); +  connect(this, SIGNAL(updateCategoryConfig()), \
categoryDialog, SLOT(updateCategoryConfig()));  
   if ( categoryDialog->exec() ) {
     setCategories( categoryDialog->selectedCategories() );
--- branches/work/kdab-post-4.0/kdepim/korganizer/koeditorgeneral.h #739675:739676
@@ -118,6 +118,7 @@
 
   signals:
     void openCategoryDialog();
+    void updateCategoryConfig();
     void focusReceivedSignal();
 
   protected:
--- branches/work/kdab-post-4.0/kdepim/korganizer/koeventeditor.cpp #739675:739676
@@ -95,6 +95,9 @@
 
   connect( mGeneral, SIGNAL( openCategoryDialog() ),
            SIGNAL( editCategories() ) );
+  connect( this, SIGNAL( updateCategoryConfig() ),
+           mGeneral, SIGNAL( updateCategoryConfig() ) );
+
 }
 
 void KOEventEditor::reload()
--- branches/work/kdab-post-4.0/kdepim/korganizer/koincidenceeditor.cpp \
#739675:739676 @@ -140,10 +140,6 @@
   if ( processInput() && ptr ) accept();
 }
 
-void KOIncidenceEditor::updateCategoryConfig()
-{
-}
-
 void KOIncidenceEditor::slotCancel()
 {
   processCancel();
--- branches/work/kdab-post-4.0/kdepim/korganizer/koincidenceeditor.h #739675:739676
@@ -69,7 +69,6 @@
     void selectInvitationCounterProposal( bool enable );
 
   public slots:
-    void updateCategoryConfig();
     /** Edit an existing todo. */
     virtual void editIncidence(Incidence *) = 0;
     virtual void setIncidenceChanger( IncidenceChangerBase *changer ) {
@@ -92,6 +91,7 @@
     void deleteAttendee( Incidence * );
 
     void editCategories();
+    void updateCategoryConfig();
     void dialogClose( Incidence * );
     void editCanceled( Incidence * );
 


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