layout fixes

3 files changed, 32 insertions, 36 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index c6cd0ae..a8035d4 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1011,193 +1011,193 @@
 { "<p><b>shift+P</b>: Make new <b>P</b>arent for todo selected with shift+S</p>\n","<p><b>shift+P</b>: Mache Todo zum neuen <b>P</b>arent Todo für das Todo, welches mit shift+Sselektiert wurde.</p>\n" },
 { "<p><b>shift+S</b>: Make <b>S</b>ubtodo (reparent todo)</p>\n","<p><b>shift+S</b>: Mache Todo zum <b>S</b>ubtodo</p>\n" },
 { "<p><b>shift+U</b>: <b>U</b>nparent todo (make root todo)</p>\n","<p><b>shift+U</b>: <b>U</b>nparent Todo (Mache Sub-Todo zum Toplevel Todo)</p>\n" },
 { "<p><h3>In todo view:</h3></p>\n","<p><h3>In Todo Anzige:</h3></p>\n" },
 { "<p><b>ctrl+up/down</b>: Scroll small todo view</p>\n","<p><b>ctrl+up/down</b>: Scrolle kleine Todo Ansicht</p>\n" },
 { "<p><b>up/down</b>: Scroll agenda view</p>\n","<p><b>up/down</b>: Scrolle Agenda Ansicht</p>\n" },
 { "<p><h3>In agenda view:</h3></p>\n","<p><h3>In Agenda Ansicht:</h3></p>\n" },
 { "<p><b>del,backspace</b>: Delete selected item</p>\n","<p><b>del,backspace</b>: Lösche selektiertes Item</p>\n" },
 { "<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n","<p><b>left</b>: Vorh. Woche | <b>left+ctrl</b>: Vorh. Monat</p>\n" },
 { "<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n","<p><b>right</b>: Nächste Woche | <b>right+ctrl</b>: Nächste Woche</p>\n" },
 { "<p><b>B</b>: Edit description (details) of selected item</p>\n","<p><b>B</b>: Editiere Beschreibung (Details) des selektierten Items</p>\n" },
 { "<p><b>C</b>: Show current time in agenda view</p>\n","<p><b>C</b>: Zeige aktuelle Zeit in Agenda Ansicht</p>\n" },
 { "<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n","<p><b>+,-</b> : Zoom rein/raus Agenda | <b>A</b>: Wechsle Ganztag Agenda Höhe</p>\n" },
 { "<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n","<p><b>S+ctrl</b>: Füge Sub-Todo hinzu | <b>X</b>: Zeige/verstecke Datumsnavigator</p>\n" },
 { "<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n","<p><b>T</b>: Gehe zu Heute | <b>T+ctrl</b>: Neues Todo</p>\n" },
 { "<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n","<p><b>E</b>: Editiere selektiertes Item |<b> E+ctrl</b>: Neuer Termin</p>\n" },
 { "<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n","<p><b>D</b>: Ein-Tages Ansicht | <b>M</b>: Monatsansicht</p>\n" },
 { "<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n","<p><b>Z,Y</b>: Arbeitswochenansicht | <b>U</b>: Wochenansicht</p>\n" },
 { "<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n","<p><b>V</b>: Todo Ansicht | <b>L</b>: Termin Listen Ansicht</p>\n" },
 { "<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ","<p><b>N</b>: Nächste-Tage Ansicht | <b>W</b>: What's Next Ansicht\n " },
 { "<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n","<p><b>1-0</b> (+<b>ctrl</b>): Selektiere Filter 1-10 (11-20)</p>\n" },
 { "<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n","<p><b>O</b>: Filter An/Aus | <b>J</b>: Journal Ansicht</p>\n" },
 { "<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n","<p><b>F</b>: Zeige/verstecke Filter Ansicht |<b>F+ctrl</b>: Editiere Filter </p>\n" },
 { "<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n","<p><b>Space</b>: Zeige fullscreen | <b>P</b>: Datums Picker</p>\n" },
 { "<p><b>I</b>: Show info for selected event/todo</p>\n","<p><b>I</b>: Zeige Info (Details) für selektiertes Item</p>\n" },
 { "<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n","<p><b>H</b>: Dieser Hilfe Dialog | <b>S</b>: Such Dialog</p>\n" },
 { "<p><h2>KO/Pi key shortcuts:</h2></p>\n","<p><h2>KO/Pi Tastatur Kurzbefehle:</h2></p>\n" },
 { "After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configurable) three minutes.\nFor safety reasons there is  one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n","Nachdem etwas geändert wurde, werden die\nDaten automatisch in die Datei abgespeichert\n~/kdepim/apps/korganizer/mycalendar.ics\nnach (konfigurierbar) drei Minuten.\nAus Sicherheitsgründen wird noch einmal\nnach 10 Min. abgespeichert, wenn keine\nÄnderungen vorgenommen wurden. Die \nDaten werden automatisch gespeichert,\nwenn KO/Pi beendet wird.\nSie können eine Backup-Datei erstellen im\nMenu: Datei - Speichere Kalender Backup\n" },
 { "Auto Saving in  KOrganizer/Pi","Auto Speichern in  KOrganizer/Pi" },
 { "\nhttp://sourceforge.net/projects/kdepimpi\n","\nhttp://sourceforge.net/projects/kdepimpi\n" },
 { "\nor report them in the bugtracker on\n","\noder trage sie in dem Bugtracker ein auf\n" },
 { "\nPlease report unexpected behaviour to\nlutz@pi-sync.info\n","\nBitte melde fehlerhaftes Verhalten an\nlutz@pi-sync.info\n" },
 { "2) Audio alarm daemon\nfor Zaurus is available!\nas an additional small application\n","2) Ein Audio Alarm Daemon\nfür den Zaurus ist verfügbar\nals zusätzliche Anwendung\n" },
 { "1) Importing *.vcs or *.ics files from\nother applications may not work properly,\nif there are events with properties\nKO/Pi does not support.\n","1) Importieren von *.vcs oder *.ics Dateien von\nanderen Anwendungen kann möglicherweise\n nicht richtig funktionieren,\nwenn die Termine Eigenschaften haben,\ndie KO/Pi nicht unterstützt.\n" },
 { "Known Problems in  KOrganizer/Pi","Bekannte Probleme in  KOrganizer/Pi" },
 { "KO/Pi FAQ","KO/Pi FAQ" },
 { "PDA-Edition\nfor: Zaurus 5x00/7x0/860/3000/6000\n","PDA-Edition\nfür: Zaurus 5x00/7x0/860/3000/6000\n" },
 { "KOrganizer/Platform-independent\n","KOrganizer/Platform-independent\n" },
 { "About KOrganizer/Pi","Über KOrganizer/Pi" },
 { "From: ","Von: " },
 { "Remove sync info","Entferne Sync Info" },
 { "For all profiles","Für alle Profile" },
 { "Hide not Running","Verstecke nicht Laufende" },
 { "ME","ME" },
 { "Toolbar","Toolbar" },
 { "Undo Delete...","Löschen rückgängig machen..." },
 { "Undo Delete","Löschen rückgängig machen" },
 { "KDE Sync HowTo...","KDE Sync HowTo..." },
 { "Multi Sync HowTo...","Multi Sync HowTo..." },
 { "Januar","Januar" },
 { "KO/Pi Keys + Colors","KO/Pi Tasten + Farben" },
 { "No Filter","Kein Filter" },
 { "Multiple Sync options","Multi Sync Optionen" },
 { "Sync algo options","Sync Ablauf Optionen" },
 { "Apply filter when adding data to local:","Filter für das Hinzufügen von Daten zu Lokal:" },
 { "Incoming calendar filter:","Eingehender Kalender Filter:" },
 { "Incoming addressbook filter:","Eingehender Adressbuch Filter:" },
 { "Write back options","Optionen zum Zurückschreiben" },
 { "Write back (on remote) existing entries only","Schreibe nur existierende (auf Entfernt) Einträge zurück" },
 { "Apply filter when adding data to remote:","Filter für das Hinzufügen von Daten zu Entfernt:" },
 { "Outgoing calendar filter:","Ausgehender Kalender Filter:" },
 { "Outgoing addressbook filter:","Ausgehender Adressbuch Filter:" },
 { "Write back (calendar) entries for time period only","Schreibe nur Kalender Einträge für Zeitspanne zurück" },
 { "Time period","Zeitspanne" },
 { "From ","Von " },
 { " weeks in the past to "," Wochen in der Vergangenheit bis zu " },
 { " weeks in the future "," Wochen in der Zukunft " },
 { "Profile kind specific settings","Profil Art abhängige Einstellungen" },
 { "Local temp file:","Lokale temp Datei:" },
 { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" },
 { "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" },
 { "Language","Sprache" },
 { "Time Format","Zeit Format" },
 { "Time Zone","Zeit Zone" },
 { "%1 groups subscribed","%1 Guppen abboniert" },
 { "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Aktuelles Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverz.)/apps/kopiemail/localmail" },
 { "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" },
 { "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" },
 { "Save settings","Speichere Einstellungen" },
 { "Save standard","Speichere Standard" },
 { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },
 { "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" },
 { "Data storage path","Daten Speicherpfad" },
 { "Language","Sprache" },
 { "Show time in agenda items","Zeige Zeit in Agenda Items" },
 { "Color for Sundays + category "Holiday"","Farbe für Sonntags + Kategorie "Feiertag"" },
 { "Show events, that are done in \nWhat's Next view","Zeige abgelaufene Termine in\nWhat's Next Ansicht" },
 { "Hide not running Todos in To-do view","Verstecke nicht laufende Todos" },
 { "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
 { "KO/Pi","KO/Pi" },
 { "There is nothing to undo!","Es gibt nichts zum\nRückgängigmachen!" },
 { "Recreating edit dialog. Please wait...","Recreating edit dialog. Please wait..." },
 { "Sound.Al.: ","Sound.Al.: " },
 { "From: %1   To: %2   %3","Von: %1   Bis: %2   %3" },
 { "Restore","Wiederherstellen" },
 { "\nAre you sure you want\nto restore this?","\nMöchten Sie das wirklicht\nwiederherstellen?" },
-{ "% completed","% komplett" },
+{ "% completed","% erledigt" },
 { "%d item(s) found.","%d Item(s) gefunden." },
 { "Set complete","Setze auf erledigt" },
 { "(cancelled)","(gecancelt)" },
 { "Click on the week number to\nshow week in agenda view","Klicke auf die Wochennummer\num die Woche in der Agenda anzuzeigen" },
 { " Local time "," Locale Zeit " },
 { "Form2","Form2" },
 { "Filter enabled","Filter angeschaltet" },
 { "Edit Filters","Ändere Filter" },
 { "Print What's Next View...","Drucke What's Next Ansicht..." },
 { "Agenda","Agenda" },
 { " ("," (" },
 { "<p><b>Due on:</b> %1</p>","<p><b>Fällig am:</b> %1</p>" },
 { "Print","Print" },
 { "&Setup Printer...","Drucker &Setup..." },
 { "View Type","Zeige Typ" },
 { "Page &orientation:","Seiten Ausrichtung:" },
 { "Use Default of Selected Style","Default des selektierten Stils" },
 { "Use Default Setting of Printer","Default Einstellung des Druckers" },
 { "Portrait","Portrait" },
 { "Landscape","Landschaft" },
 { "Print day","Drucke Tag" },
 { "CalPrintDay_Base","CalPrintDay_Base" },
 { "Date && Time Range","Datum && Zeitspanne" },
 { "&End date:","&Enddatum:" },
 { "&Start date:","&Startdatum:" },
 { "Start &time:","Startzeit:" },
 { "End ti&me:","Endzeit:" },
 { "E&xtend time range to include all events","Erweitere Zeitspanne um alle Termine einzuschliessen" },
 { "Include to&dos that are due on the printed day(s)","Inclusive To&dos, die an den selektierten Tagen fällig sind" },
 { "Alt+D","Alt+D" },
 { "&Use colors","Nutze Farben" },
 { "Alt+U","Alt+U" },
 { "Print week","Drucke Woche" },
 { "CalPrintWeek_Base","CalPrintWeek_Base" },
 { "Use &colors","Nutze Farben" },
 { "Type of View","Typ der Ansicht" },
 { "Print as &Filofax page","Drucke als &Filofax Seite" },
 { "Alt+F","Alt+F" },
 { "Print as &timetable view:","Drucke als Zeittabelle:" },
 { "Alt+T","Alt+T" },
 { "Print as split week view","Drucke als gesplittete Wochenansicht" },
 { "Print month","Drucke Monat" },
 { "CalPrintMonth_Base","CalPrintMonth_Base" },
 { "&Start month:","&Startmonat:" },
 { "&End month:","&Endmonat:" },
 { "Print week &numbers","Drucke Wochen Nummer(n)" },
 { "Print todos","Drucke Todos" },
 { "CalPrintTodoConfig_Base","CalPrintTodoConfig_Base" },
 { "Include &description of the item","Inclusive Itembeschreibung" },
 { "Include d&ue date of the item","Inclusive Fälligkeitsdatum des Items" },
 { "Include &priority of the item","Inclusive Priorität des Items" },
 { "Items to Print","Zu druckende Items" },
 { "&From:","Von:" },
 { "&To:","Bis:" },
 { "Print &all todo items","Drucke alle Todo Items" },
 { "Print only &uncompleted items","Drucke nur nicht erledigte Todos" },
 { "Only items due in the &range:","Nur Items in dem Zeitraum:" },
 { "Todo List","Todo Liste" },
 { "&Title:","&Titel:" },
 { "Co&nnect subtodos with its parent","Verbinde Unter-Todos mit ihren Ober-Todos" },
 { "Todo list","Todo Liste" },
 { "&Print...","Drucke..." },
 { "<qt>Printing on printer <b>%1</b></qt>","<qt>Drucke auf Drucker <b>%1</b></qt>" },
 { "[Unconfigured]","[Unkonfiguriert]" },
 { "OK","OK" },
 { "FilterEditor","FilterEditor" },
 { "Include","Inclusive" },
 { "Exclude","Exclusive" },
 { "Edit Selection...","Editiere Auswahl" },
 { "recurring events","wiederholende Termine" },
 { "recurr. events","wiederh.Termine" },
 { "completed to-dos","erledigte Todos" },
 { "events","Termine" },
 { "todos","Todos" },
 { "journals","Journale" },
 { "public","öffentl." },
 { "private","privat" },
 { "confidential","vertraul." },
 { "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Unter-Todos.\nAlle erledigten Unter-Todos\nwerden auch gelöscht!" },
 { "Yesterday","Gestern" },
 { "Day after tomorrow","Übermorgen" },
 { "Tomorrow","Morgen" },
 { "Day before yesterday","Vorgestern" },
 { "Size %1","Größe %1" },
 { "New Agendasize: %1","Neue Agendagröße: %1" },
 { " (%1 y.)"," (%1 J.)" },
 { "Allday:","Ganztägig:" },
 { "compl.todos","erled.Todos" },
 { "Day view","Tagesansicht" },
 { "Next days","Nächste Tage" },
 { "Next week","Nächste Woche" },
 { "Next two weeks","Nächste zwei Wochen" },
 { "Next month","Nächster Monat" },
 { "Journal view","Journal" },
 { "Display all opened","Zeige alle geöffnet" },
 { "Display all closed","Zeige alle geschlossen" },
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 5508210..f287216 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -34,217 +34,229 @@
 #include <qpopupmenu.h>
 #include <qtooltip.h>
 #include <qpainter.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
 
 #include <kapplication.h>
 #include <KDGanttMinimizeSplitter.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kconfig.h>
 #include <kglobal.h>
 #include "calendarview.h"
 #include "koviewmanager.h"
 
 #include <libkcal/calendar.h>
 #include <libkcal/icaldrag.h>
 #include <libkcal/dndfactory.h>
 
 #include <kcalendarsystem.h>
 
 #include "koglobals.h"
 #ifndef KORG_NOPLUGINS
 #include "kocore.h"
 #endif
 #include "koprefs.h"
 #include "koagenda.h"
 #include "koagendaitem.h"
 #ifndef KORG_NOPRINTER
 #include "calprinter.h"
 #endif
 
 #include "koagendaview.h"
 //#include "koagendaview.moc"
 
 //extern bool globalFlagBlockPainting;
 extern int globalFlagBlockAgenda;
 extern int globalFlagBlockStartup;
 extern int globalFlagBlockAgendaItemPaint;
 extern int globalFlagBlockAgendaItemUpdate;
 extern int globalFlagBlockLabel;
 using namespace KOrg;
 
 
 
 TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) :
     QScrollView(parent,name,f)
 {
     mRows = rows;
 
     setMinimumHeight( 20 );
     mCellHeight = KOPrefs::instance()->mHourSize*4;
 
     enableClipper(true);
 
     setHScrollBarMode(AlwaysOff);
     setVScrollBarMode(AlwaysOff);
 
     resizeContents(50,mRows * mCellHeight);
 
     viewport()->setBackgroundMode( PaletteBackground );
 }
 
 void TimeLabels::setCellHeight(int height)
 {
     mCellHeight = height;
 }
 
 /*
   Optimization so that only the "dirty" portion of the scroll view
   is redrawn.  Unfortunately, this is not called by default paintEvent() method.
 */
 void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
 {
 
     //   if ( globalFlagBlockAgenda )
     //       return;
     // bug:  the parameters cx, cy, cw, ch are the areas that need to be
     //       redrawn, not the area of the widget.  unfortunately, this
     //       code assumes the latter...
 
     // now, for a workaround...
     // these two assignments fix the weird redraw bug
     cx = contentsX() + 2;
     cw = contentsWidth() - 2;
     // end of workaround
 
     int cell = ((int)(cy/mCellHeight));
     int y = cell * mCellHeight;
     QFontMetrics fm = fontMetrics();
     QString hour;
     QString suffix;
     QString fullTime;
     int tW = fm.width("24:00i");
+    int timeHeight =  fm.height();
+    if ( timeHeight >  mCellHeight )
+        timeHeight = mCellHeight-1;
+    int borderWidth = 5;
+    QFont nFont = p->font();
+    QFont sFont = nFont;
+    sFont.setPointSize( sFont.pointSize()/2+2 );
+    if (!KGlobal::locale()->use12Clock())
+        suffix = "00";
+    QFontMetrics fmS(  sFont );
+    int sHei = fmS.height();
 
     while (y < cy + ch) {
         p->drawLine(cx,y,cx+tW,y);
         hour.setNum(cell);
-        suffix = "am";
 
         // handle 24h and am/pm time formats
         if (KGlobal::locale()->use12Clock()) {
             if (cell > 11) suffix = "pm";
+            else
+                suffix = "am";
             if (cell == 0) hour.setNum(12);
             if (cell > 12) hour.setNum(cell - 12);
-        } else {
-            suffix = ":00";
         }
 
         // create string in format of "XX:XX" or "XXpm/am"
-        fullTime = hour + suffix;
+        fullTime = hour;// + suffix;
 
         // center and draw the time label
         int timeWidth = fm.width(fullTime+"i");
-        int offset = this->width() - timeWidth;
-        int borderWidth = 5;
-        int timeHeight =  fm.height();
-        timeHeight = timeHeight + 2 - ( timeHeight / 4 );
-        p->drawText(cx -borderWidth + offset, y+ timeHeight, fullTime);
+        int tw2 = fm.width(suffix);
+        int offset = this->width() - timeWidth - tw2;
+        p->setFont( nFont );
+        p->drawText(cx - borderWidth + offset, y+ timeHeight, fullTime);
+        p->setFont( sFont ); 
+        offset += timeWidth;
+        p->drawText(cx - borderWidth + offset, y+ sHei, suffix);
 
         // increment indices
         y += mCellHeight;
         cell++;
     }
 }
 
 /**
    Calculates the minimum width.
 */
 int TimeLabels::minimumWidth() const
 {
     QFontMetrics fm = fontMetrics();
 
     //TODO: calculate this value
     int borderWidth = 4;
 
     // the maximum width possible
     int width = fm.width("88:88x") + borderWidth;
 
     return width;
 }
 
 /** updates widget's internal state */
 void TimeLabels::updateConfig()
 {
     // set the font
     //  config->setGroup("Fonts");
     //  QFont font = config->readFontEntry("TimeBar Font");
     setFont(KOPrefs::instance()->mTimeBarFont);
 
     // update geometry restrictions based on new settings
     setFixedWidth(minimumWidth());
   
     // update HourSize
     mCellHeight = KOPrefs::instance()->mHourSize*4;
     resizeContents(50,mRows * mCellHeight);
 }
 
 /** 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;
     topLevelWidget()->setCaption(i18n("New Agendasize: %1").arg(tSize));
 
 }
 void TimeLabels::contentsMouseReleaseEvent ( QMouseEvent * e ) 
 {
     topLevelWidget()->setCaption( mOrgCap );
     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;
     if ( tSize == KOPrefs::instance()->mHourSize )
         return;
     KOPrefs::instance()->mHourSize = tSize;
     emit scaleChanged();
 }
 
 /** This is called in response to repaint() */
 void TimeLabels::paintEvent(QPaintEvent*)
 {
   
     //  kdDebug() << "paintevent..." << endl;
     // this is another hack!
@@ -787,194 +799,192 @@ void KOAgendaView::createDayLabels()
 #endif
     }
     if (  ! appendLabels ) {
         dayLabel = mDayLabelsList.next();
         if (  !dayLabel  )
             appendLabels = true;
     }
     if ( appendLabels ) {
         dayLabel = getNewDaylabel();
     }
     //dayLabel->hide();//test only
 
     int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ;
     if ( offset < 0 ) offset = 0;
     //qDebug("mLayoutDayLabels->addSpacing %d  ", mAgenda->verticalScrollBar()->width()+offset+2  );
     dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) );
     dayLabel->setFont( dlf );
     dayLabel->show();
     dayLabel->setNum( -2 );
     dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset );
     //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2);
     //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2);
     if ( !appendLabels ) {
         dayLabel = mDayLabelsList.next();
         while (  dayLabel  ) {
             //qDebug("!dayLabel %d",dayLabel );
             dayLabel->hide();
             dayLabel = mDayLabelsList.next();
         }
     }
     //mDayLabelsFrame->show();
     //mDayLabels->show();
     //qDebug("heigt %d %d %d ",mDayLabelsFrame->height(), mDayLabelsFrame->sizeHint().height(), newHight);
     //mDayLabelsFrame->resize( mAgenda->visibleWidth(), newHight );
     mDayLabelsFrame->setFixedHeight( newHight );
 }
 
 int KOAgendaView::maxDatesHint()
 {
     // Not sure about the max number of events, so return 0 for now.
     return 0;
 }
 
 int KOAgendaView::currentDateCount()
 {
     return mSelectedDates.count();
 }
 
 QPtrList<Incidence> KOAgendaView::selectedIncidences()
 {
     QPtrList<Incidence> selected;
     Incidence *incidence;
 
     incidence = mAgenda->selectedIncidence();
     if (incidence) selected.append(incidence);
 
     incidence = mAllDayAgenda->selectedIncidence();
     if (incidence) selected.append(incidence);
 
     return selected;
 }
 
 DateList KOAgendaView::selectedDates()
 {
     DateList selected;
     QDate qd;
 
     qd = mAgenda->selectedIncidenceDate();
     if (qd.isValid()) selected.append(qd);
 
     qd = mAllDayAgenda->selectedIncidenceDate();
     if (qd.isValid()) selected.append(qd);
 
     return selected;
 }
 
 
 void KOAgendaView::updateView()
 {
     if ( mBlockUpdating )
         return;
     //  kdDebug() << "KOAgendaView::updateView()" << endl;
     fillAgenda();
  
 }
 
 
 /*
   Update configuration settings for the agenda view. This method is not
   complete.
 */
 void KOAgendaView::updateConfig()
 {
     if ( mBlockUpdating )
         return;
 
-    
-
     // update config for children
     mTimeLabels->updateConfig();
     mAgenda->storePosition();
     mAgenda->updateConfig();
     mAllDayAgenda->updateConfig();
     // widget synchronization
     //TODO: find a better way, maybe signal/slot
     mTimeLabels->positionChanged();
 
     // for some reason, this needs to be called explicitly
     mTimeLabels->repaint();
 
     mDummyAllDayLeft->setFixedWidth(mTimeLabels->width());
 
     // ToolTips displaying summary of events
     KOAgendaItem::toolTipGroup()->setEnabled(KOPrefs::instance()
                                              ->mEnableToolTips);
   
     //setHolidayMasks();
 
     //createDayLabels(); called by via updateView();
     mEventIndicatorTop->setXOffset(mTimeLabels->width() + mAgenda->frameWidth()); 
     updateView();
     mAgenda->restorePosition();
 }
 
 
 void KOAgendaView::updateEventDates(KOAgendaItem *item, int type)
 {
     //  kdDebug() << "KOAgendaView::updateEventDates(): " << item->text() << endl;
     //qDebug("KOAgendaView::updateEventDates ");
     QDateTime startDt,endDt;
     QDate startDate;
     int lenInSecs;
     //  if ( type == KOAgenda::RESIZETOP )
     //       qDebug("RESIZETOP ");
     //   if ( type ==  KOAgenda::RESIZEBOTTOM )
     //       qDebug("RESIZEBOTTOM ");
     //   if ( type ==  KOAgenda::MOVE )
     //       qDebug("MOVE ");
     if ( item->incidence()->type() == "Event" ) {
         startDt =item->incidence()->dtStart();
         endDt = item->incidence()->dtEnd();
         lenInSecs = startDt.secsTo( endDt );
     }
 
     // emit incidenceItemChanged( item->incidence(), KOGlobals::EVENTEDITED );
 
     if ( item->incidence()->type()=="Todo" && item->mLastMoveXPos > 0 ) {
         startDate = mSelectedDates[item->mLastMoveXPos];
     } else {
         if (item->cellX() < 0) {
             startDate = (mSelectedDates.first()).addDays(item->cellX());
         } else {
             startDate = mSelectedDates[item->cellX()];
         }
     }
     startDt.setDate(startDate);
 
     if (item->incidence()->doesFloat()) {
         endDt.setDate(startDate.addDays(item->cellWidth() - 1));
     } else {
         if ( type == KOAgenda::RESIZETOP ||  type ==  KOAgenda::MOVE )
             startDt.setTime(mAgenda->gyToTime(item->cellYTop()));
         if ( item->incidence()->type() == "Event" ) {
             if ( type ==  KOAgenda::MOVE ) {
                 endDt = startDt.addSecs(lenInSecs);
 
             } else if ( type ==  KOAgenda::RESIZEBOTTOM  ) {
                 if (item->lastMultiItem()) {
                     endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1));
                     endDt.setDate(startDate.
                                   addDays(item->lastMultiItem()->cellX() - item->cellX()));
                 } else {
                     endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1));
                     endDt.setDate(startDate);
                 }
             }
         } else {
             // todo
             if (item->lastMultiItem()) {
                 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1));
                 endDt.setDate(startDate.
                               addDays(item->lastMultiItem()->cellX() - item->cellX()));
             } else {
                 //qDebug("tem->cellYBottom() %d",item->cellYBottom() );
                 if ( item->cellYBottom() > 0 )
                     endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1));
                 else
                     endDt.setTime((static_cast<Todo*>(item->incidence()))->dtDue().time());
                 endDt.setDate(startDate);
             }
         }
     }
     if ( item->incidence()->type() == "Event" ) {
         item->incidence()->setDtStart(startDt);
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 4ee5292..cf0d4ae 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -135,365 +135,351 @@ void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout)
     connect(mCategoriesButton,SIGNAL(clicked()),this, SLOT(editCategories() ));
     categoriesLayout->addWidget(mCategoriesButton);
 
     mCategoriesLabel = new QLabel(parent);
     mCategoriesLabel->setFrameStyle(QFrame::Panel|QFrame::Sunken);
     categoriesLayout->addWidget(mCategoriesLabel,1);
 }
 
 void KOEditorGeneral::initSecrecy(QWidget *parent, QBoxLayout *topLayout)
 {
     QBoxLayout *secrecyLayout = new QHBoxLayout( topLayout );
 
     QLabel *secrecyLabel = new QLabel(i18n("Access:"),parent);
     mCancelBox = new QCheckBox ( i18n("Cancelled"), parent);
     secrecyLayout->addWidget(mCancelBox);
     secrecyLayout->addWidget(secrecyLabel);
 
     mSecrecyCombo = new QComboBox(parent);
     mSecrecyCombo->insertStringList(Incidence::secrecyList());
     secrecyLayout->addWidget(mSecrecyCombo);
 }
 
 void KOEditorGeneral::initDescription(QWidget *parent,QBoxLayout *topLayout)
 {
     mDescriptionEdit = new KTextEdit(parent);
     mDescriptionEdit->setFont(KOPrefs::instance()->mEditBoxFont );
     mDescriptionEdit->append("");
     mDescriptionEdit->setReadOnly(false);
     mDescriptionEdit->setOverwriteMode(false);
     mDescriptionEdit->setWordWrap( KTextEdit::WidgetWidth ); 
     topLayout->addWidget(mDescriptionEdit); 
 #ifndef DESKTOP_VERSION
     QPEApplication::setStylusOperation( mDescriptionEdit, QPEApplication::RightOnHold );
 #endif
  
 }
 
 void KOEditorGeneral::initAlarm(QWidget *parent,QBoxLayout *topLayout)
 {
     QBoxLayout *alarmLayout = new QHBoxLayout(topLayout);
 
     //mAlarmBell = new QLabel(parent);
     //mAlarmBell->setPixmap(SmallIcon("bell"));
     //alarmLayout->addWidget(mAlarmBell);
     if ( QApplication::desktop()->width() < 320 ) 
         mAlarmButton = new QCheckBox(i18n("Rem."),parent);
     else
         mAlarmButton = new QCheckBox(i18n("Reminder:"),parent);
       
     connect(mAlarmButton, SIGNAL(toggled(bool)), SLOT(enableAlarmEdit(bool)));
     alarmLayout->addWidget(mAlarmButton);
 
     mAlarmTimeEdit = new QSpinBox ( 0, 9999, 1, parent, "mAlarmTimeEdit  "  ) ;
     alarmLayout->addWidget(mAlarmTimeEdit);
     mAlarmIncrCombo = new QComboBox(false, parent);
     if ( QApplication::desktop()->width() < 320 ) {
         mAlarmIncrCombo->insertItem(i18n("min"));
         mAlarmIncrCombo->insertItem(i18n("hou"));
         mAlarmIncrCombo->insertItem(i18n("day"));
         mAlarmTimeEdit->setMaximumWidth( mAlarmTimeEdit->sizeHint().width() );
         mAlarmIncrCombo->setMaximumWidth( mAlarmIncrCombo->sizeHint().width() );
     } else {
         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()) {
-        //mAlarmSound = "";
-        QToolTip::remove(mAlarmSoundButton);
-        QToolTip::add(mAlarmSoundButton, i18n("No sound set"));
-        mAlarmProgramButton->setOn(true);
-        mAlarmSoundButton->setOn(false);
-        pickAlarmProgram();
+        mAlarmSoundButton->setOn(true);
+        ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
     } 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);
            
         }
     }
-   
+#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()) {
-        //mAlarmProgram = "";
-        QToolTip::remove(mAlarmProgramButton);
-        QToolTip::add(mAlarmProgramButton, i18n("No program set"));
-        mAlarmProgramButton->setOn(false);
-        mAlarmSoundButton->setOn(true);
-        pickAlarmSound();
+        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);
         }
     }
+#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;
             }
         }
-        if (mAlarmProgramButton->isOn())
-            ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
-        if (!mAlarmSound.isEmpty() && mAlarmSoundButton->isOn())
-            ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
-    }
-    else {
-        ((QWidget*)parent())->topLevelWidget()->setCaption(mAlarmMessage);
-           //((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Edit item: ") + mSummaryEdit->currentText());
-
-
     }
+    ((QWidget*)parent())->topLevelWidget()->setCaption(mAlarmMessage);
     mAlarmTimeEdit->setEnabled(enable);
     mAlarmSoundButton->setEnabled(enable);
     mAlarmProgramButton->setEnabled(enable);
     mAlarmIncrCombo->setEnabled(enable);
 }
 
 void KOEditorGeneral::disableAlarmEdit(bool disable)
 {
     enableAlarmEdit( !disable );
 }
 
 void KOEditorGeneral::enableAlarm( bool enable )
 {
     enableAlarmEdit( enable );
 }
 
 void KOEditorGeneral::alarmDisable(bool disable)
 {
     if (!disable) {
         //mAlarmBell->setEnabled(true);
         mAlarmButton->setEnabled(true);
     } else {
         //mAlarmBell->setEnabled(false);
         mAlarmButton->setEnabled(false);
         mAlarmButton->setChecked(false);
         mAlarmTimeEdit->setEnabled(false);
         mAlarmSoundButton->setEnabled(false);
         mAlarmProgramButton->setEnabled(false);
         mAlarmIncrCombo->setEnabled(false);
     }
 }
 
 void KOEditorGeneral::setCategories(const QString &str)
 {
     mCategoriesLabel->setText(str);
 }
 
 void KOEditorGeneral::setDefaults(bool allDay)
 {
 #if 0
     mOwnerLabel->setText(i18n("Owner: ") + KOPrefs::instance()->fullName());
 #endif
 
     mAlarmMessage = i18n("Edit new item");
     enableAlarmEdit( !allDay );
 
     // TODO: Implement a KPrefsComboItem to solve this in a clean way.
     int alarmTime;
     int a[] = { 1,5,10,15,30,60,180, 1440 };
     int index = KOPrefs::instance()->mAlarmTime;
     if (index < 0 || index > 7) {
         alarmTime = 15;
     } else {
         alarmTime = a[index];
     }
     mAlarmButton ->setChecked( false );
     mAlarmTimeEdit->setValue(alarmTime);
     mAlarmIncrCombo->setCurrentItem(0);
     enableAlarmEdit( false );
     //alarmDisable (false);
     mSecrecyCombo->setCurrentItem(Incidence::SecrecyPublic);
     mCancelBox->setChecked( false ); 
     mSummaryEdit->setEditText("");
     mLocationEdit->setEditText("");
     mDescriptionEdit->setText("");
     mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile;
     setCategories("");
 }
 void KOEditorGeneral::setSecrecy( int num )
 {
     mSecrecyCombo->setCurrentItem(num);
 }
 void KOEditorGeneral::readIncidence(Incidence *event)
 {
 
-    mAlarmMessage = i18n("Edit") +" "+event->summary();
+    mAlarmMessage = event->summary();
     mAlarmIncrCombo->setCurrentItem(0);
     mSummaryEdit->setEditText(event->summary());
     mLocationEdit->setEditText(event->location());
     mDescriptionEdit->setText(event->description());
 
 #if 0
     // organizer information
     mOwnerLabel->setText(i18n("Owner: ") + event->organizer());
 #endif
   
     enableAlarmEdit( event->isAlarmEnabled() );
     //qDebug("KOEditorGeneral::readIncidence(Incidence *event) ");
     if(!event->isAlarmEnabled()) {
         // TODO: Implement a KPrefsComboItem to solve this in a clean way.
         int alarmTime;
         int a[] = { 1,5,10,15,30,60,180, 1440 };
         int index = KOPrefs::instance()->mAlarmTime;
         if (index < 0 || index > 7) {
             alarmTime = 15;
         } else {
             alarmTime = a[index];
         }
         mAlarmTimeEdit->setValue(alarmTime);
     }
     mAlarmButton->setChecked( event->isAlarmEnabled() );
     mSecrecyCombo->setCurrentItem(event->secrecy());
     mCancelBox->setChecked( event->cancelled() ); 
     mAlarmProgramButton->setOn(false);
     mAlarmSoundButton->setOn(false);
 
     // set up alarm stuff
     QPtrList<Alarm> alarms = event->alarms();
     Alarm* alarm;
     mAlarmIncrCombo->setCurrentItem(0);
     for ( alarm = alarms.first(); alarm; alarm = alarms.next() ) {
         int offset;
         if ( alarm->hasTime() ) {
             QDateTime t = alarm->time();
             offset = event->dtStart().secsTo( t );
         } else {
             offset = alarm->startOffset().asSeconds();
         }
         if ( offset != 0 ) {
             offset = offset / -60; // make minutes
             if (offset % 60 == 0) { // divides evenly into hours?
                 offset = offset / 60;
                 mAlarmIncrCombo->setCurrentItem(1);
                 if (offset % 24 == 0) { // divides evenly into days?
                     offset = offset / 24;
                     mAlarmIncrCombo->setCurrentItem(2);
                 }
             }
         }
         mAlarmTimeEdit->setValue( offset );
         if (alarm->type() == Alarm::Procedure) {
       
             mAlarmProgram = alarm->programFile();
             mAlarmProgramButton->setOn(true);
             QString dispStr = i18n("Running '%1'").arg(mAlarmProgram);
             QToolTip::add(mAlarmProgramButton, dispStr);
         }
         else if (alarm->type() == Alarm::Audio) {
             mAlarmSound = alarm->audioFile(); 
             if ( ! QFile::exists( mAlarmSound ) )
                 mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile;
             mAlarmSoundButton->setOn(true);
             QString dispStr = i18n("Playing '%1'").arg(mAlarmSound);
             QToolTip::add(mAlarmSoundButton, dispStr);
         }
         mAlarmButton->setChecked(alarm->enabled());
         enableAlarmEdit( alarm->enabled() );
         //qDebug("nableAlarmEdit( alarm->enabled() )********* ");
         // TODO: Deal with multiple alarms
         break; // For now, stop after the first alarm
     }
 
     setCategories(event->categoriesStr());
 }
 
 void KOEditorGeneral::writeIncidence(Incidence *event)
 {
     //  kdDebug() << "KOEditorGeneral::writeEvent()" << endl;
     mLocationEdit->save(KOLocationBox::LOCATION);
     event->setSummary(mSummaryEdit->currentText());
     event->setLocation(mLocationEdit->currentText());
     event->setDescription(mDescriptionEdit->text());
     event->setCategories(mCategoriesLabel->text());
     event->setSecrecy(mSecrecyCombo->currentItem());
     event->setCancelled(mCancelBox->isChecked() );; 
     // alarm stuff
     if (mAlarmButton->isChecked()) {
         if (event->alarms().count() == 0) 
             event->newAlarm();
         QPtrList<Alarm> alarms = event->alarms();
         Alarm *alarm;
         for (alarm = alarms.first(); alarm; alarm = alarms.next() ) {