8 files changed, 135 insertions, 70 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 6b739ba..711509d 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1303,41 +1303,41 @@
 { "Agenda View","Agenda Ansicht" },
 { "Show current time","Zeige aktuelle Zeit" },
 { "Edit new item","Bearbeite neuen Eintrag" },
 { "Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals","Bitte wählen Sie mindestens\neinen dieser Typen\num darin zu suchen:\n\nTermine\nTodos\nJournale" },
 { "There is no next alarm.","Es gibt keinen nächsten Alarm." },
 { "%1 %2 - %3 (next event/todo with alarm)","%1 %2 - %3 (nächster Termin/Todo mit Alarm)" },
 { "The next alarm is in:\n","Der nächste Alarm ist in:\n" },
 { "%1 days\n","%1 Tagen\n" },
 { "1 day\n","1 Tag\n" },
 { "%1 hours\n","%1 Stunden\n" },
 { "1 hour\n","1 Stunde\n" },
 { "%1 minutes\n","%1 Minuten\n" },
 { "1 minute\n","1 Minute\n" },
 { "Only one toolbar","Nur eine Toolbar" },
 { "Print","Drucke" },
 { "Print selected event / todo...","Drucke ausgewählten Termin / Todo..." },
 { "There is nothing selected!","Es ist nichts ausgewählt!" },
 { "\n\nDo you really want to print this item?","\n\nMöchten Sie wirklich diesen Eintrag ausdrucken? " },
 { "KO/Pi Print Confirmation","KO/Pi Druckbestätigung" },
 { "This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.\n","Dies druckt die Ansicht wie man sie sieht.\n(Mit dem kompletten Inhalt natürlich.)\nMan kann das Layout ändern durch ändern der Fenstergröße.\nDrucke unskaliert druckt ggf. mehrere Seiten\nabhängig von der Menge der Daten.\nDrucke runterskaliert um auf eine Seite zu passen\ndruckt alles auf eine Seite.\nDrucke hoch/runterskaliert um genau auf eine Seite zu passen\nvergrößert den Text gegebenenfalls.\nDas Seitenlayout kann im nächsten Dialog gewählt werden.\n" },
 { "KO/Pi Printout","KO/Pi Ausdruck" },
 { "Print unscaled","Drucke unskaliert" },
 { "Print scaled down to fit one page","Drucke runterskaliert um auf eine Seite zu passen." },
 { "Print scaled up/down to fit one page","Drucke hoch/runterskaliert um genau auf eine Seite zu passen." },
 { "Printout Mode","Druck Modus" },
 { "Filter menu icon","Filtermenu Icon" },
 { "<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n","<p><b>A+(shift oder ctrl)</b>: Zeige Zeit bis zum nächsten Alarm</p>\n" },
 { "<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n","<p><b>N</b>: Wechsle zur nächsten Ansicht, die ein Icon in der Toolbar hat</p>\n" },
 { "%1d","%1t" },
 { "%1h","%1std" },
 { "%1min","%1min" },
 { "( %1 before )","( %1 vorher )" },
+{ "The next alarm is in\nless than one minute!","Der nächste Alarm kommt in\nweniger als einer Minute!" },
+{ "\nThe internal alarm notification is disabled!\n","\nDie interne Alarmbenachrichtigung ist ausgeschaltet!\n" },
+{ "Enable it in the settings menu, TAB alarm.","Schalten Sie sie an im Menu Einstellungen, TAB Alarm." },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
-{ "","" },
-{ "","" },
-{ "","" },
-{ "","" }
\ No newline at end of file
+{ "","" },
\ No newline at end of file
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 648e780..19b52bb 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -97,67 +97,68 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
   listLayout->addWidget( mAddresseeEdit );
 
   if ( mMultiple ) {
       //QBoxLayout *selectedLayout = new QVBoxLayout;
       //topLayout->addLayout( selectedLayout );
       //topLayout->setSpacing( spacingHint() );
 
     QVBox *selectedGroup = new QVBox( mMiniSplitter );
     new QLabel ( i18n("Selected:"), selectedGroup );
     //selectedLayout->addWidget( selectedGroup );
 
     mSelectedList = new KListView( selectedGroup );
     mSelectedList->addColumn( i18n("Name") );
     mSelectedList->addColumn( i18n("Email") );
     mSelectedList->setAllColumnsShowFocus( true );
     mSelectedList->setFullWidth( true );
     connect( mSelectedList, SIGNAL( doubleClicked( QListViewItem * ) ),
              SLOT( removeSelected() ) );
 
     QPushButton *unselectButton = new QPushButton( i18n("Unselect"), selectedGroup ); 
     connect ( unselectButton, SIGNAL( clicked() ), SLOT( removeSelected() ) );
 
     connect( mAddresseeList, SIGNAL( clicked( QListViewItem * ) ),
              SLOT( addSelected( QListViewItem * ) ) );
     connect( mAddresseeList, SIGNAL( returnPressed( QListViewItem * ) ),
              SLOT( selectNextItem( QListViewItem * ) ) );
 
   }
 
   mAddressBook = StdAddressBook::self( true );
   connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook* ) ),
            SLOT( addressBookChanged() ) );
+#if 0
   connect( mAddressBook, SIGNAL( loadingFinished( Resource* ) ),
            SLOT( addressBookChanged() ) );
-
+#endif
   loadAddressBook();  
   QValueList<int> splitterSize; 
   splitterSize.append( ( width() / 5 ) * 3 );
   splitterSize.append( ( width() / 5 ) *2 );
   mMiniSplitter->setSizes( splitterSize );
 }
 
 AddresseeDialog::~AddresseeDialog()
 {
     qDebug("DELETE AddresseeDialog ");
 }
 
 void AddresseeDialog::loadAddressBook()
 {
   mAddresseeList->clear();
   mItemDict.clear();
   if ( mAddresseeEdit->text().isEmpty() ) {
       AddressBook::Iterator it;
       for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
       if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
             continue; 
           new AddresseeItem( mAddresseeList, (*it) );
       }
       return;
   }
   //mAddresseeEdit->completionObject()->clear();
   QRegExp re;
   re.setWildcard(true); // most people understand these better.
   re.setCaseSensitive(false);
   re.setPattern( "*"+ mAddresseeEdit->text() + "*");
 
   AddressBook::Iterator it;
@@ -249,63 +250,104 @@ Addressee AddresseeDialog::addressee()
       aItem = (AddresseeItem *)( mSelectedList->firstChild() );
   else
       aItem = (AddresseeItem *)( mAddresseeList->selectedItem() );
  
   if (aItem) return aItem->addressee();
   return Addressee();
 }
 
 Addressee::List AddresseeDialog::addressees()
 {
   Addressee::List al;
   AddresseeItem *aItem = 0;
 
   if ( mMultiple ) {
     QListViewItem *item = mSelectedList->firstChild();
     while( item ) {
         aItem = (AddresseeItem *)( item );
       if ( aItem ) al.append( aItem->addressee() );
       item = item->nextSibling();
     }
   }
   else
   {
       aItem = (AddresseeItem *)( mAddresseeList->selectedItem() );
     if (aItem) al.append( aItem->addressee() );
   }
 
   return al;
 }
 
 Addressee AddresseeDialog::getAddressee( QWidget *parent )
 {
-  AddresseeDialog *dlg = new AddresseeDialog( parent );
-  Addressee addressee;
-  int result = dlg->exec();
+    AddresseeDialog *dlg = new AddresseeDialog( parent );
+    Addressee addressee;
+#ifdef DESKTOP_VERSION
+    static int geoX = 0;
+    static int geoY = 0;
+    static int geoW = 0;
+    static int geoH = 0;
+    if ( !geoX  && ! geoY && !geoW &&!geoH ) {
+        geoX = dlg->geometry().x();
+        geoY = dlg->geometry().y();
+        geoW = dlg->width();
+        geoH = dlg->height();
+    } else {
+        dlg->show();
+        dlg->setGeometry(geoX , geoY,geoW , geoH  );
 
-  if ( result == QDialog::Accepted ) {
-    addressee =  dlg->addressee();
-  }
+    }
+#endif
+    int result = dlg->exec();
+#ifdef DESKTOP_VERSION
+    geoX = dlg->geometry().x();
+    geoY = dlg->geometry().y();
+    geoW = dlg->width();
+    geoH = dlg->height();
+#endif
+    if ( result == QDialog::Accepted ) {
+        addressee =  dlg->addressee();
+    }
 
-  delete dlg;
-  return addressee;
+    delete dlg;
+    return addressee;
 }
 
 Addressee::List AddresseeDialog::getAddressees( QWidget *parent )
 {
-  AddresseeDialog *dlg = new AddresseeDialog( parent, true );
-  Addressee::List addressees;
-  if ( QApplication::desktop()->width() <= 640 )
-      dlg->showMaximized();
-  int result = dlg->exec();
-  if ( result == QDialog::Accepted ) {
-    addressees =  dlg->addressees();
-  }
+    AddresseeDialog *dlg = new AddresseeDialog( parent, true );
+    Addressee::List addressees;
+    static int geoX = 0;
+    static int geoY = 0;
+    static int geoW = 0;
+    static int geoH = 0;
+    if ( QApplication::desktop()->width() <= 640 )
+        dlg->showMaximized();
+    else {
+        if ( !geoX  && ! geoY && !geoW &&!geoH ) {
+            geoX = dlg->geometry().x();
+            geoY = dlg->geometry().y();
+            geoW = dlg->width();
+            geoH = dlg->height();
+        } else {
+            dlg->show();
+            dlg->setGeometry(geoX , geoY,geoW , geoH  );
+
+        }
+    }
+    int result = dlg->exec();
+    geoX = dlg->geometry().x();
+    geoY = dlg->geometry().y();
+    geoW = dlg->width();
+    geoH = dlg->height();
+    if ( result == QDialog::Accepted ) {
+        addressees =  dlg->addressees();
+    }
 
-  delete dlg;
-  return addressees;
+    delete dlg;
+    return addressees;
 }
 
 void AddresseeDialog::addressBookChanged()
 {
   loadAddressBook();
 }
diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp
index bdeee4a..53ff488 100644
--- a/kalarmd/alarmdialog.cpp
+++ b/kalarmd/alarmdialog.cpp
@@ -3,91 +3,92 @@
     Copyright (c) 2000 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 // $Id$
 
 #include <qhbox.h>
 #include <qvbox.h>
 #include <qapp.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qfile.h>
 #include <qtimer.h>
 #include <qsound.h>
 #include <qpushbutton.h>
+#include <qregexp.h>
 #ifndef DESKTOP_VERSION
 #define protected public
 #include <qspinbox.h>
 #undef protected 
 #else
 #include <qspinbox.h>
 #endif
 #include <stdlib.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #include <sys/ioctl.h>
 #endif
 #include <stdio.h>
 #include <fcntl.h>
 
 #ifndef DESKTOP_VERSION
 #include <qtopia/alarmserver.h>
 #include <qpe/resource.h>
 #include <qtopia/sound.h>
 
 #endif     
 
 #include "alarmdialog.h"
 
 
 AlarmDialog::AlarmDialog(QWidget *parent,const char *name)
-    : QDialog (parent, name, true, Qt::WStyle_StaysOnTop ) 
+    : QDialog (parent, name, true, Qt::WStyle_Customize |Qt::WStyle_StaysOnTop | Qt::WStyle_DialogBorder) 
 {
     setCaption( "KO/Pi Alarm!" );
     QVBoxLayout* layout = new QVBoxLayout( this);
   QLabel* l = new QLabel("The following event triggered alarm:",this);
   layout->addWidget ( l );
   l->setAlignment( AlignCenter);
   mMessage = new QLabel ( " ", this );
   int fs = 18;
   int fs2 = 12;
   int baseSize = 6;
   if ( QApplication::desktop()->width() < 480 ) {
       fs2 = 10;
       fs = 12;
       baseSize = 4;
   }
   layout->setSpacing( 3 );
   layout->setMargin( 3 );
   QFont fo = QApplication::font();
   fo.setBold( true );
   fo.setPointSize( fs2 );
   l->setFont( fo );
   fo.setPointSize( fs );
   mMessage->setFont(fo );
   mMessage->setAlignment( AlignCenter);
   layout->addWidget ( mMessage );
   mMissedAlarms= new QLabel ( "(No missed Alarms)", this );
   mMissedAlarms->setAlignment( AlignCenter);
 
   playSoundTimer = new QTimer( this );
   connect ( playSoundTimer, SIGNAL( timeout()  ), this, SLOT (playSound() ) );
 
   playSoundTimer->stop();
@@ -203,104 +204,106 @@ void AlarmDialog::slotSuspend()
     emit addAlarm( nextA , mess  );  
    slotOk();
 }
 
 void AlarmDialog::setServerNotification( bool b )
 {
     mServerNotification = b;
 }
 int  AlarmDialog::getSuspendTime( )
 {
     return mSuspendSpin->value();
 
 }
 void AlarmDialog::setSuspendTime( int val )
 {
     mSuspendSpin->setValue( val );
 }
 bool AlarmDialog::eventNotification( QString mess, int replay ,  QString fn, bool playwav, int pause , int suspendtimes)
 {
     if ( mess.left( 9) != "Suspended" )
         mSuspendCounter = suspendtimes;
     mPauseCount = pause;
     mFileName = fn;
     mPlayWav = playwav;
     if ( !QFile::exists( fn ) )
         mFileName = "";
     alarmCounter = 0 ;
     maxAlarmReplay = replay ;
     mStopAlarm = false;
     mSilent = false;
     if ( !mMessage->text().stripWhiteSpace().isEmpty() ) {
         mMissedAlarmsCombo->show();
-        mMissedAlarmsCombo->insertItem( mMessage->text().stripWhiteSpace() );
+        QString newItem = mMessage->text().stripWhiteSpace();
+        newItem.replace( QRegExp("\n"), QString(" ") );
+        mMissedAlarmsCombo->insertItem( newItem );
         mMissedAlarms->setText( "Missed alarms:");
     } else
         mMissedAlarmsCombo->hide();
     mMessage->setText(mess);
     int w =sizeHint().width() ;
     int h = sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     show();
     raise();
     //qApp->processEvents();
     //repaint();
     qApp->processEvents();
 
 #ifndef _WIN32_
     if (  fd_led > 0 ) {
         statusLED.status =  LED_SALARM_ON ;
         ioctl (fd_led, SHARP_LED_SETSTATUS, &statusLED);
     }
 #endif
     playSoundTimer->start( 1000, true );
     return true;
  
 }
 
 
 void  AlarmDialog::playSound ()
 {
     
     if (mStopAlarm )
         return;
-    if (mSilent )
+    if ( mSilent )
         return;
     showNormal();
     setActiveWindow();
+    raise(); 
     mSuspendSpin->setFocus();
-    raise();
-    repaint();
+   
     
     qApp->processEvents();
     if (  alarmCounter < maxAlarmReplay && ! mSilent) {
         ++alarmCounter;
 #ifdef DESKTOP_VERSION
         mPlayWav = true;
 #endif
         if ( !mPlayWav || mFileName.length() < 2 ) {
 
 #ifdef DESKTOP_VERSION
             qDebug("Sound play not possible - file not found");
 #else
             Sound::soundAlarm ();
 #endif
         } else
 
             {
 #ifdef DESKTOP_VERSION
 #ifdef _WIN32_
                 QSound::play ( mFileName );
 #else
 
                 QString command = "playwave -r 22050 " + mFileName;
                 qDebug("KO: Playing file %s with 22kHz",mFileName.latin1() );
                 int ret = system ( command.latin1() );
                 if ( ret != 0 ) {
                     qDebug("Sound play command failed: %s ",command.latin1() );
                 }
 
 #endif
 
 #else
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index beb19d9..76cce26 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -501,64 +501,69 @@ CalendarView::~CalendarView()
     delete mDialogManager;
     delete mViewManager;
     delete mStorage;
     delete mDateFrame ;
     delete beamDialog;
     delete mEventViewerDialog;
     //kdDebug() << "~CalendarView() done" << endl;
 }
 
 void CalendarView::showDay( QDate d )
 {
     dateNavigator()->blockSignals( true );
     dateNavigator()->selectDate( d );
     dateNavigator()->blockSignals( false );
     mViewManager->showDayView();
     //dateNavigator()->selectDate( d );
 }
 void CalendarView::timerAlarm()
 {
     //qDebug("CalendarView::timerAlarm() ");
     computeAlarm(mAlarmNotification );
 }
 
 void CalendarView::suspendAlarm()
 {
     //qDebug(" CalendarView::suspendAlarm() ");
     computeAlarm(mSuspendAlarmNotification );
 
 }
 
 void  CalendarView::startAlarm( QString mess , QString filename)
 {
+
+    topLevelWidget()->showNormal();
+    topLevelWidget()->setActiveWindow();
+    topLevelWidget()->raise(); 
+
     mAlarmDialog->eventNotification( mess, KOPrefs::instance()->mAlarmPlayBeeps, filename, true,KOPrefs::instance()->mAlarmBeepInterval ,KOPrefs::instance()->mAlarmSuspendCount );
     QTimer::singleShot( 3000, this, SLOT( checkNextTimerAlarm() ) );
 
 }
     
 void CalendarView::checkNextTimerAlarm()
 {
     mCalendar->checkAlarmForIncidence( 0, true );
 }
 
 void  CalendarView::computeAlarm( QString msg )
 {
 
  QString mess = msg; 
     QString  mAlarmMessage = mess.mid( 9 ); 
     QString filename =  MainWindow::resourcePath();
     filename += "koalarm.wav";
     QString tempfilename;
     if ( mess.left( 13 )  == "suspend_alarm") {  
         bool error = false;
         int len = mess.mid( 13 ).find("+++");
         if ( len < 2 )
             error = true;
         else {
             tempfilename = mess.mid( 13, len );
             if ( !QFile::exists( tempfilename  ) )
                 error = true;
         }
         if ( ! error ) {
             filename = tempfilename;
         }
         mAlarmMessage = mess.mid( 13+len+3 );
@@ -4065,53 +4070,63 @@ void CalendarView::resetFocus()
         if ( mDialogManager->getSearchDialog()->isVisible() ){
             mDialogManager->getSearchDialog()->raise();
             mDialogManager->getSearchDialog()->setActiveWindow();
             mDialogManager->getSearchDialog()->listview()->resetFocus(); 
         } else
             mViewerCallerIsSearchDialog = false;
     }
     if ( !mViewerCallerIsSearchDialog ) {
         //mViewManager->currentView()->setFocus();
         //qDebug("sssssssssssssssset focus ");
         topLevelWidget()->raise();
         setActiveWindow();
         //setFocus();
     }
     mViewerCallerIsSearchDialog = false;
 }
 
 void CalendarView::showNextAlarms()
 {
     QString message;
     QDateTime nextAl = mCalendar->nextAlarmEventDateTime();
     if (  nextAl.isValid() && mNextAlarmDateTime > QDateTime::currentDateTime() ) {
         QString sum = mCalendar->nextSummary();
         QDateTime nextA = mNextAlarmDateTime;
         QDateTime cur = QDateTime::currentDateTime();
         int  secs = cur.secsTo( nextA );
         int min = secs /60; 
         int hours = min /60;
         min = min % 60;
         int days = hours /24;
         hours = hours % 24;
         
-        message = i18n("The next alarm is in:\n");
+        //message = i18n("The next alarm is in:\n");
         if ( days > 1 )
             message += i18n("%1 days\n").arg( days );
         else if ( days == 1 )
             message += i18n("1 day\n");
         if ( hours > 1 )
             message += i18n("%1 hours\n").arg( hours );
         else if ( hours == 1 )
             message += i18n("1 hour\n");
         if ( min > 1 )
             message += i18n("%1 minutes\n").arg( min );
         else if ( min == 1 )
             message += i18n("1 minute\n");
-
+        if ( message.isEmpty() ) 
+            message = i18n("The next alarm is in\nless than one minute!");
+        else 
+            message = i18n("The next alarm is in:\n") + message;
         message += i18n("\n(%1)\n\n%2\n(%3)\n").arg( KGlobal::locale()->formatDateTime(nextA , false)).arg(sum ).arg( KGlobal::locale()->formatDateTime(nextAl , false)) ;
     } else {
         message = i18n("There is no next alarm.");
 
     }
+#ifdef DESKTOP_VERSION
+    if ( ! KOPrefs::instance()->mUseInternalAlarmNotification ) {
+        message += i18n("\nThe internal alarm notification is disabled!\n");
+        message += i18n("Enable it in the settings menu, TAB alarm.");
+    }
+
+#endif
     KMessageBox::information( this, message);
 }
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index d450a97..6d1e6d5 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -124,127 +124,127 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
     p->setFont( font());
    
     if (!KGlobal::locale()->use12Clock()) {
             suffix = "00";
     } else
         if (cell > 11) suffix = "pm";
        
     if ( timeHeight >  mCellHeight ) {
         timeHeight = mCellHeight-1;
         int pointS = nFont.pointSize();
         while ( pointS > 4 ) {
             nFont.setPointSize( pointS );
             fm = QFontMetrics( nFont );
             if ( fm.ascent() < mCellHeight )
                 break;
             -- pointS;
         }
         fm = QFontMetrics( nFont );
         timeHeight = fm.ascent();
     }
     //timeHeight -= (timeHeight/4-2); 
     QFont sFont = nFont;
     sFont.setPointSize( sFont.pointSize()/2 );
     QFontMetrics fmS(  sFont );
     int sHei = fmS.ascent() ;
     //sHei -= (sHei/4-2); 
     int startW = mMiniWidth - frameWidth()-2 ;
     int tw2 = fmS.width(suffix);
     timeHeight = (timeHeight-1) /2 -1; 
     //testline
     //p->drawLine(0,0,0,contentsHeight());
     while (y < cy + ch+mCellHeight) {
-        p->drawLine(startW-tw2 ,y,cw+2,y);
+        p->drawLine(startW-tw2+1 ,y,cw+2,y);
         hour.setNum(cell);
         // handle 24h and am/pm time formats
         if (KGlobal::locale()->use12Clock()) {
             if (cell == 12) suffix = "pm";
             if (cell == 0) hour.setNum(12);
             if (cell > 12) hour.setNum(cell - 12);
         }
 
         // center and draw the time label
         int timeWidth = fm.width(hour);
         int offset = startW - timeWidth - tw2 -1 ;
         p->setFont( nFont );
         p->drawText(  offset, y+ timeHeight, hour);
         p->setFont( sFont ); 
         offset = startW - tw2;
         p->drawText( offset, y -1, suffix);
 
         // increment indices
         y += mCellHeight;
         cell++;
     }
 
 
 
 
 }
 
 /**
    Calculates the minimum width.
 */
 int TimeLabels::minimumWidth() const
 {
     return mMiniWidth;
 }
 
 /** updates widget's internal state */
 void TimeLabels::updateConfig()
 {
     mRedrawNeeded = true;
     // set the font
     //  config->setGroup("Fonts");
     //  QFont font = config->readFontEntry("TimeBar Font");
     setFont(KOPrefs::instance()->mTimeBarFont);
     QString test = "20";
     if (KGlobal::locale()->use12Clock())
         test = "12";
     mMiniWidth = fontMetrics().width(test);
     if (KGlobal::locale()->use12Clock())
         test = "pm";
     else {
         test = "00";
     }
     QFont sFont = font();
     sFont.setPointSize( sFont.pointSize()/2 );
     QFontMetrics fmS(  sFont );
     mMiniWidth += fmS.width( test ) + frameWidth()*2+4 ;
     // update geometry restrictions based on new settings
     setFixedWidth( mMiniWidth );
   
     // update HourSize
     mCellHeight = KOPrefs::instance()->mHourSize*4;
-    resizeContents(50,mRows * mCellHeight);
+    resizeContents(mMiniWidth,mRows * mCellHeight+1);
 }
 
 /** update time label positions */
 void TimeLabels::positionChanged()
 {
     int adjustment = mAgenda->contentsY();
     setContentsPos(0, adjustment);
 }
 
 /**  */
 void TimeLabels::setAgenda(KOAgenda* agenda)
 {
     mAgenda = agenda;
 }
  
 void TimeLabels::contentsMousePressEvent ( QMouseEvent * e) 
 {
     mMouseDownY = e->pos().y();
     mOrgCap = topLevelWidget()->caption();
 }
   
 void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e ) 
 {
   int diff = mMouseDownY -  e->pos().y();
     if ( diff < 10 && diff > -10 )
         return;
     int tSize = KOPrefs::instance()->mHourSize + (diff/10) ;
     if ( tSize  < 4 )
         tSize = 4;
     if ( tSize > 22 )
         tSize = 22;
     tSize = (tSize-2)/2;
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index b14ca43..abc80d4 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -198,117 +198,114 @@ void KOEditorGeneral::initAlarm(QWidget *parent,QBoxLayout *topLayout)
         mAlarmIncrCombo->insertItem(i18n("minute(s)"));
         mAlarmIncrCombo->insertItem(i18n("hour(s)"));
         mAlarmIncrCombo->insertItem(i18n("day(s)"));
     }
 
     //  mAlarmIncrCombo->setMinimumHeight(20);
     alarmLayout->addWidget(mAlarmIncrCombo);
     mAlarmSoundButton = new QPushButton(parent);
     mAlarmSoundButton->setPixmap(SmallIcon("playsound"));
     mAlarmSoundButton->setToggleButton(true);
     QToolTip::add(mAlarmSoundButton, i18n("No sound set"));
     connect(mAlarmSoundButton, SIGNAL(clicked()), SLOT(pickAlarmSound()));
     alarmLayout->addWidget(mAlarmSoundButton);
 
     mAlarmProgramButton = new QPushButton(parent);
     mAlarmProgramButton->setPixmap(SmallIcon("run"));
     mAlarmProgramButton->setToggleButton(true);
     QToolTip::add(mAlarmProgramButton, i18n("No program set"));
     connect(mAlarmProgramButton, SIGNAL(clicked()), SLOT(pickAlarmProgram()));
     alarmLayout->addWidget(mAlarmProgramButton);
     mAlarmSoundButton->setMaximumWidth( mAlarmSoundButton->sizeHint().width() + 4 );
     mAlarmProgramButton->setMaximumWidth(mAlarmProgramButton->sizeHint().width() + 4 );
     //   if ( KOPrefs::instance()->mCompactDialogs ) {
     //     mAlarmSoundButton->hide();
     //     mAlarmProgramButton->hide();
     //   }
 }
 
 void KOEditorGeneral::pickAlarmSound()
 {
 
     qDebug("KOEditorGeneral::pickAlarmSound() %d",mAlarmSoundButton->isOn() );
-    //QString prefix = mAlarmSound;
-    if (!mAlarmSoundButton->isOn()) {
+    
+    bool oldState = mAlarmSoundButton->isOn();
+   
+    QString fileName(KFileDialog::getOpenFileName(mAlarmSound,
+                                                  i18n("*.wav|Wav Files"), 0));
+    if (!fileName.isEmpty()) {
+        mAlarmSound = fileName;
+        QToolTip::remove(mAlarmSoundButton);
+        QString dispStr = i18n("Playing '%1'").arg(fileName);
+        QToolTip::add(mAlarmSoundButton, dispStr);
+        mAlarmProgramButton->setOn(false);
         mAlarmSoundButton->setOn(true);
-        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
+        QToolTip::add(mAlarmProgramButton, i18n("No program set"));
     } else {
-        QString fileName(KFileDialog::getOpenFileName(mAlarmSound,
-                                                      i18n("*.wav|Wav Files"), 0));
-        if (!fileName.isEmpty()) {
-            mAlarmSound = fileName;
-            QToolTip::remove(mAlarmSoundButton);
-            QString dispStr = i18n("Playing '%1'").arg(fileName);
-            QToolTip::add(mAlarmSoundButton, dispStr);
-            mAlarmProgramButton->setOn(false);
-            mAlarmSoundButton->setOn(true);
-        } else {
-            mAlarmProgramButton->setOn(true);
-            mAlarmSoundButton->setOn(false);
-           
-        }
+        mAlarmProgramButton->setOn(oldState);
+        mAlarmSoundButton->setOn(!oldState);
+        
+        
     }
-#if 0
+
     if (mAlarmProgramButton->isOn())
         ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
     if ( mAlarmSoundButton->isOn())
         ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
-#endif
+
 }
 
 void KOEditorGeneral::pickAlarmProgram()
 {
-    if (!mAlarmProgramButton->isOn()) {
+    bool oldState = mAlarmProgramButton->isOn();
+      
+    QString fileName(KFileDialog::getOpenFileName(mAlarmProgram,i18n("Procedure Alarm: ")  , 0));
+    if (!fileName.isEmpty()) {
+        mAlarmProgram = fileName;
+        QToolTip::remove(mAlarmProgramButton);
+        QString dispStr = i18n("Running '%1'").arg(fileName);
+        QToolTip::add(mAlarmProgramButton, dispStr);
+        mAlarmSoundButton->setOn(false);
         mAlarmProgramButton->setOn(true);
-        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
-    } else {
-        QString fileName(KFileDialog::getOpenFileName(mAlarmProgram,i18n("Procedure Alarm: ")  , 0));
-        if (!fileName.isEmpty()) {
-            mAlarmProgram = fileName;
-            QToolTip::remove(mAlarmProgramButton);
-            QString dispStr = i18n("Running '%1'").arg(fileName);
-            QToolTip::add(mAlarmProgramButton, dispStr);
-            mAlarmSoundButton->setOn(false);
-            mAlarmProgramButton->setOn(true);
-        }  else {
-            mAlarmProgramButton->setOn(false);
-            mAlarmSoundButton->setOn(true);
-        }
+        QToolTip::add(mAlarmSoundButton, i18n("No sound set"));
+    }  else {
+        mAlarmProgramButton->setOn(!oldState);
+        mAlarmSoundButton->setOn(oldState);
     }
-#if 0
+ 
     if (mAlarmProgramButton->isOn())
         ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
     if ( mAlarmSoundButton->isOn())
         ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
-#endif
+
 }
 
 
 QString KOEditorGeneral::getFittingPath( const QString  s ) 
 {
     int maxlen = 50;
     if ( QApplication::desktop()->width() < 640 ) {
         if ( QApplication::desktop()->width() < 320 )
             maxlen = 22;
         else
             maxlen = 35;
     }
     if ( s.length() > maxlen ) {
         return "..."+s.right(maxlen -3);
     }
     return s;
 }
 
 void KOEditorGeneral::enableAlarmEdit(bool enable)
 {
     if (  enable ) {
         if (!mAlarmProgramButton->isOn() && !mAlarmSoundButton->isOn()) {
             mAlarmSoundButton->setOn( true );
             if ( mAlarmSound.isEmpty() )
                 mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile;
             else {
                 if ( ! QFile::exists( mAlarmSound ) )
                     mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile;
             }
         }
     }
     ((QWidget*)parent())->topLevelWidget()->setCaption(mAlarmMessage);
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 01cf0ff..395325c 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -175,90 +175,96 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e)
           unparentTodoSignal(existingTodo);
       delete todo;
     } else {
       mCalendar->addTodo(todo);
       emit todoDropped(todo, KOGlobals::EVENTADDED);
       if ( destinationEvent )
           reparentTodoSignal( destinationEvent, todo );
     }
   }
   else {
     QString text;
     if (QTextDrag::decode(e,text)) {
       //QListViewItem *qlvi = itemAt( contentsToViewport(e->pos()) );
       KOTodoViewItem *todoi = static_cast<KOTodoViewItem *>(itemAt( contentsToViewport(e->pos()) ));
       qDebug("Dropped : " + text);
       QStringList emails = QStringList::split(",",text);
       for(QStringList::ConstIterator it = emails.begin();it!=emails.end();++it) {
         int pos = (*it).find("<");
         QString name = (*it).left(pos);
         QString email = (*it).mid(pos);
         if (!email.isEmpty() && todoi) {
           todoi->todo()->addAttendee(new Attendee(name,email));
         }
       }
     }
     else {
         qDebug("KOTodoListView::contentsDropEvent(): Todo from drop not decodable ");
       e->ignore();
     }
   }
 #endif
 }
+void KOTodoListView::wheelEvent (QWheelEvent *e)
+{
+    QListView::wheelEvent (e);
+}
 
 void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
 {
 
     QPoint p(contentsToViewport(e->pos()));
     QListViewItem *i = itemAt(p);
     bool rootClicked = true;
     if (i) {
         // if the user clicked into the root decoration of the item, don't
         // try to start a drag!
         int X = p.x();
         //qDebug("%d %d %d", X, header()->sectionPos(0), treeStepSize() );
         if (X > header()->sectionPos(0) +
             treeStepSize() * (i->depth() + (rootIsDecorated() ? 1 : 0)) +
             itemMargin() +i->height()||
             X < header()->sectionPos(0)) {
             rootClicked = false;
         }
     } else {
         rootClicked = false;
     }
 #ifndef KORG_NODND
     mMousePressed = false; 
-    if (! rootClicked ) {
+    if (! rootClicked && !( e->button() == RightButton)  ) {
         mPressPos = e->pos();
         mMousePressed = true;
+    } else {
+        mMousePressed = false;
     }
 #endif
     //qDebug("KOTodoListView::contentsMousePressEvent %d", rootClicked);
 #ifndef DESKTOP_VERSION
     if (!( e->button() == RightButton && rootClicked) )
         QListView::contentsMousePressEvent(e);   
 #else
     QListView::contentsMousePressEvent(e);   
 #endif
 }
 void KOTodoListView::paintEvent(QPaintEvent* e)
 {
     emit paintNeeded();
     QListView::paintEvent( e);
 }
 void KOTodoListView::contentsMouseMoveEvent(QMouseEvent* e)
 {
 
 #ifndef KORG_NODND
     //QListView::contentsMouseMoveEvent(e);
   if (mMousePressed && (mPressPos - e->pos()).manhattanLength() >
       QApplication::startDragDistance()*3) {
     mMousePressed = false;
     QListViewItem *item = itemAt(contentsToViewport(mPressPos));
     if (item) {
       DndFactory factory( mCalendar );
       ICalDrag *vd = factory.createDrag(
                           ((KOTodoViewItem *)item)->todo(),viewport());
       internalDrop = false;
       // we cannot do any senseful here, because the DnD is still broken in Qt
       if (vd->drag()) {
           if ( !internalDrop ) {
@@ -1053,65 +1059,65 @@ void KOTodoView::changedCategories(int index)
   if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) {
     QStringList categories = mActiveItem->todo()->categories ();
     QString colcat = categories.first();
     if (categories.find (mCategory[index]) != categories.end ())
       categories.remove (mCategory[index]);
     else
       categories.insert (categories.end(), mCategory[index]);
     categories.sort ();
     if ( !colcat.isEmpty() ) {
         if ( categories.find ( colcat ) != categories.end () ) {
             categories.remove( colcat );
             categories.prepend( colcat );
         }
     }
     mActiveItem->todo()->setCategories (categories);
     mActiveItem->construct();
     mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1  );
     todoModified (mActiveItem->todo (), KOGlobals::CATEGORY_MODIFIED);
   }
 }
 void KOTodoView::itemDoubleClicked(QListViewItem *item)
 {
     if ( pendingSubtodo != 0 ) {
         topLevelWidget()->setCaption(i18n("Reparenting aborted!"));
     }
     pendingSubtodo = 0;
     int row = mTodoListView->header()->sectionAt ( mTodoListView->header()->mapFromGlobal( QCursor::pos()).x() );
     //qDebug("ROW %d ", row);
     if (!item) {
         newTodo();
         return;
     } else {
-        if ( row == 1 ) {
+        if ( row == 1 || row == 2 ) {
             mActiveItem = (KOTodoViewItem *) item;
             newSubTodo();
             return;
         }
     }
     if ( KOPrefs::instance()->mEditOnDoubleClick )
         editItem( item );
     else
         showItem( item , QPoint(), 0 );
 }
 void KOTodoView::itemClicked(QListViewItem *item)
 {
     //qDebug("KOTodoView::itemClicked %d", item);
   if (!item) {
       if ( pendingSubtodo != 0 ) {
           topLevelWidget()->setCaption(i18n("Reparenting aborted!"));
       }
       pendingSubtodo = 0;
       return;
   }
   KOTodoViewItem *todoItem = (KOTodoViewItem *)item;
   if ( pendingSubtodo != 0 ) {
       bool allowReparent = true;
       QListViewItem *par = item;
       while ( par ) {
           if ( par ==  pendingSubtodo ) {
               allowReparent = false;
               break;
           }
           par = par->parent();
       }
       if ( !allowReparent  ) {
@@ -1242,64 +1248,65 @@ void KOTodoView::displayAllFlat()
         return;
     }
     mPopupMenu->setItemChecked( 8,true );
     isFlatDisplay = true;
     QPtrList<Todo> todoList = calendar()->todos();
     mTodoMap.clear();
     mTodoListView->clear();
     Todo *todo;   
     for(todo = todoList.first(); todo; todo = todoList.next()) {
         KOTodoViewItem *todoItem = new KOTodoViewItem(mTodoListView,todo,this);
         mTodoMap.insert(todo,todoItem);
     }
     mTodoListView->setFocus();
     processSelectionChange();
 }
 
 void  KOTodoView::setAllFlat()
 {
     if ( isFlatDisplay ) {
         isFlatDisplay = false;
         mPopupMenu->setItemChecked( 8,false );
         updateView();
         return;
     } 
     storeCurrentItem();
     displayAllFlat();
     resetCurrentItem();
 }
 
 void KOTodoView::purgeCompleted()
 {
   emit purgeCompletedSignal();
+ 
 }
 void KOTodoView::toggleQuickTodo()
 {
     if ( mQuickAdd->isVisible() ) {
         mQuickAdd->hide();
         KOPrefs::instance()->mEnableQuickTodo = false;
     }
     else {
         mQuickAdd->show();
         KOPrefs::instance()->mEnableQuickTodo = true;
     }
     mPopupMenu->setItemChecked(4,KOPrefs::instance()->mEnableQuickTodo);
     mItemPopupMenu->setItemChecked( 34 , KOPrefs::instance()->mEnableQuickTodo );
 }
 
 void KOTodoView::toggleRunning()
 {
     KOPrefs::instance()->mHideNonStartedTodos = !KOPrefs::instance()->mHideNonStartedTodos;
     mPopupMenu->setItemChecked(5,KOPrefs::instance()->mHideNonStartedTodos);
     mItemPopupMenu->setItemChecked( 35 , KOPrefs::instance()->mHideNonStartedTodos );
     updateView();
 }
 
 void KOTodoView::toggleCompleted()
 {
     KOPrefs::instance()->mShowCompletedTodo = !KOPrefs::instance()->mShowCompletedTodo;
     mPopupMenu->setItemChecked( 3,KOPrefs::instance()->mShowCompletedTodo  );
     mItemPopupMenu->setItemChecked( 33 , KOPrefs::instance()->mShowCompletedTodo   );
     updateView();
 }
 
 void KOTodoView::addQuickTodo()
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index e553d0e..39976cf 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -39,64 +39,65 @@
 #include <libkcal/todo.h>
 
 #include <korganizer/baseview.h>
 
 #include "kotodoviewitem.h"
 #include "koprefs.h"
 #include "koglobals.h"
 #include "datenavigator.h"
 
 class QDragEnterEvent;
 class QDragMoveEvent;
 class QDragLeaveEvent;
 class QDropEvent;
 class KOTodoViewWhatsThis;
 
 class DocPrefs;
 
 class KOTodoListView : public KListView
 {
     Q_OBJECT
   public:
     KOTodoListView(Calendar *,QWidget *parent=0,const char *name=0);
     virtual ~KOTodoListView() {}
 
   signals:
     void paintNeeded();
     void todoDropped(Todo *, int);  
     void double_Clicked(QListViewItem *item);
     void reparentTodoSignal( Todo *,Todo * );
     void unparentTodoSignal(Todo *);
     void deleteTodo( Todo * );
   protected:
+    void wheelEvent (QWheelEvent *e);
     void contentsDragEnterEvent(QDragEnterEvent *);
     void contentsDragMoveEvent(QDragMoveEvent *);
     void contentsDragLeaveEvent(QDragLeaveEvent *);
     void contentsDropEvent(QDropEvent *);
 
     void contentsMousePressEvent(QMouseEvent *);
     void contentsMouseMoveEvent(QMouseEvent *);
     void contentsMouseReleaseEvent(QMouseEvent *);
     void contentsMouseDoubleClickEvent(QMouseEvent *);
 
   private:
     void paintEvent(QPaintEvent * pevent);
     bool internalDrop;
     QString mName;
     Calendar *mCalendar;
     QPoint mPressPos;
     bool mMousePressed;
     QListViewItem *mOldCurrent;
     bool  mFlagKeyPressed;
     void keyPressEvent ( QKeyEvent * ) ;
     void keyReleaseEvent ( QKeyEvent * ) ;
 };
 
 
 /**
   This is the line-edit on top of the todoview for fast addition of new todos
 */
 class KOQuickTodo : public QLineEdit
 {
   public:
     KOQuickTodo(QWidget *parent=0);
   protected: