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

List:       kde-commits
Subject:    branches/KDE/3.5/kdepim
From:       Volker Krause <vkrause () kde ! org>
Date:       2008-08-18 18:10:20
Message-ID: 1219083020.561872.4870.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 848925 by vkrause:

Merged revisions 843760 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r843760 | vkrause | 2008-08-07 21:47:35 +0200 (Thu, 07 Aug 2008) | 11 lines
  
  Backport SVN commit 840125 by ervin from enterprise4 branch:
  
  Adding one more item in the test app.
  
  
  Backport SVN commit 840127 by ervin from enterprise4 branch:
  
  Fix for kolab/issue2751.
  When the dialog is shown pre-select the first item.
  On dismiss, select the next item.
........


 _M            . (directory)  
 M  +14 -3     korganizer/korgac/alarmdialog.cpp  
 M  +21 -8     korganizer/korgac/testalarmdlg.cpp  


** branches/KDE/3.5/kdepim #property svnmerge-integrated
   - /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-767946,76794 \
8-769318,769320-769354,769356-771105,771107-771251,771253-772311,772313-772316,772318-775194,775 \
196-775202,775204,775207-775211,775213-778001,778003-778004,778007,778010-778011,778013-778029,7 \
78031-778727,778729-779448,779450-779482,779484-779505,779507-779852,779854-779994,780211,780250 \
-780452,780454-780495,780497,780499-780529,780531-782028,782030-783127,783129-783243,783245,7832 \
48-783477,783479-784380,784382-784426,784428-784691,784693-785478,785480-785558,787827,788634,78 \
9925,790349-790352,791184-791440,791443-792201,792203-792957,793296,794734,795745-795763,795765, \
795767-798445,798447-798448,798450-798495,798497-800070,800072-800167,800169-802138,802140-80214 \
8,802150-802151,802153-803259,803261-803299,803301-803308,803310-803380,803383-803397,803399-804 \
993,804995-805347,805349-805427,805429-805459,805461-805702,807761-809708,809710-810236,810238-810302,810304,810306-811205,811
  207-813547,813549-814372,814374,814376-816024,816026-816313,816315-816322,816324-817070,817072 \
-817087,817089-817101,817103-819076,819078-821035,821037-821124,821126-821378,821380-821648,8216 \
50-822268,822270-824277,824279-825075,825077-825083,825085-826354,826356-827612,827614-827891,82 \
7893-827944,827946-827949,827951-829033,829035-830477,830479-830875,830877-830932,830934-836103, \
836105-836275,836278-836391,836393-836428,836430-837231,837233-837624,840224-840428,840430-840706,840708-840710,840712-843750
  + /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-767946,767948 \
-769318,769320-769354,769356-771105,771107-771251,771253-772311,772313-772316,772318-775194,7751 \
96-775202,775204,775207-775211,775213-778001,778003-778004,778007,778010-778011,778013-778029,77 \
8031-778727,778729-779448,779450-779482,779484-779505,779507-779852,779854-779994,780211,780250- \
780452,780454-780495,780497,780499-780529,780531-782028,782030-783127,783129-783243,783245,78324 \
8-783477,783479-784380,784382-784426,784428-784691,784693-785478,785480-785558,787827,788634,789 \
925,790349-790352,791184-791440,791443-792201,792203-792957,793296,794734,795745-795763,795765,7 \
95767-798445,798447-798448,798450-798495,798497-800070,800072-800167,800169-802138,802140-802148 \
,802150-802151,802153-803259,803261-803299,803301-803308,803310-803380,803383-803397,803399-8049 \
93,804995-805347,805349-805427,805429-805459,805461-805702,807761-809708,809710-810236,810238-810302,810304,810306-811205,811
  207-813547,813549-814372,814374,814376-816024,816026-816313,816315-816322,816324-817070,817072 \
-817087,817089-817101,817103-819076,819078-821035,821037-821124,821126-821378,821380-821648,8216 \
50-822268,822270-824277,824279-825075,825077-825083,825085-826354,826356-827612,827614-827891,82 \
7893-827944,827946-827949,827951-829033,829035-830477,830479-830875,830877-830932,830934-836103, \
836105-836275,836278-836391,836393-836428,836430-837231,837233-837624,840224-840428,840430-840706,840708-840710,840712-843750,843760
                
--- branches/KDE/3.5/kdepim/korganizer/korgac/alarmdialog.cpp #848924:848925
@@ -162,8 +162,13 @@
 void AlarmDialog::slotOk()
 {
   ItemList selection = selectedItems();
-  for ( ItemList::Iterator it = selection.begin(); it != selection.end(); ++it )
+  for ( ItemList::Iterator it = selection.begin(); it != selection.end(); ++it ) {
+    if ( (*it)->itemBelow() )
+      (*it)->itemBelow()->setSelected( true );
+    else if ( (*it)->itemAbove() )
+      (*it)->itemAbove()->setSelected( true );
     delete *it;
+  }
   if ( activeCount() == 0 )
     accept();
   else {
@@ -282,10 +287,12 @@
 
 void AlarmDialog::dismissAll()
 {
-  for ( QListViewItemIterator it( mIncidenceListView ) ; it.current() ; ++it ) {
+  for ( QListViewItemIterator it( mIncidenceListView ) ; it.current() ; ) {
     AlarmListItem *item = static_cast<AlarmListItem*>( it.current() );
-    if ( !item->isVisible() )
+    if ( !item->isVisible() ) {
+      ++it;
       continue;
+    }
     delete item;
   }
   setTimer();
@@ -295,6 +302,10 @@
 
 void AlarmDialog::show()
 {
+  mIncidenceListView->clearSelection();
+  if ( mIncidenceListView->firstChild() )
+    mIncidenceListView->firstChild()->setSelected( true );
+  updateButtons();
   KDialogBase::show();
   KWin::setState( winId(), NET::KeepAbove );
   KWin::setOnAllDesktops( winId(), true );
--- branches/KDE/3.5/kdepim/korganizer/korgac/testalarmdlg.cpp #848924:848925
@@ -39,20 +39,33 @@
 
   KApplication app;
 
-  Event *e = new Event;
-  e->setSummary( "This is a summary." );
-  e->setDtStart( QDateTime::currentDateTime() );
-  e->setDtEnd( QDateTime::currentDateTime().addDays( 1 ) );
-
-  Alarm *a = e->newAlarm();
+  Event *e1 = new Event;
+  e1->setSummary( "This is a summary." );
+  QDateTime now = QDateTime::currentDateTime();
+  e1->setDtStart( now );
+  e1->setDtEnd( now.addDays( 1 ) );
+  Alarm *a = e1->newAlarm();
 //  a->setProcedureAlarm( "/usr/X11R6/bin/xeyes" );
   a->setAudioAlarm( "/opt/kde/share/apps/korganizer/sounds/spinout.wav" );
 
+  Todo *t1 = new Todo;
+  t1->setSummary( "To-do A" );
+  t1->setDtDue( now );
+  t1->newAlarm();
+
+  Event *e2 = new Event;
+  e2->setSummary( "This is another summary." );
+  e2->setDtStart( now );
+  e2->setDtEnd( now.addDays( 1 ) );
+  e2->newAlarm();
+
   AlarmDialog dlg;
   app.setMainWidget( &dlg );
-  dlg.addIncidence( e, QDateTime::currentDateTime() );
+  dlg.addIncidence( e1, QDateTime::currentDateTime() );
+  dlg.addIncidence( t1, QDateTime::currentDateTime() );
+  dlg.addIncidence( e2, QDateTime::currentDateTime() );
   dlg.show();
   dlg.eventNotification();
-    
+
   app.exec();
 }


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