3 files changed, 4 insertions, 4 deletions
diff --git a/korganizer/kolocationbox.cpp b/korganizer/kolocationbox.cpp
index f8fee2e..35a8123 100644
--- a/korganizer/kolocationbox.cpp
+++ b/korganizer/kolocationbox.cpp
@@ -1,54 +1,54 @@
 /*
    Copyright (c) 2004 Dirk Loesche <dirk.loesche@bigfoot.de>
    This file is part of KOrganizer/PI
    KOrganizer    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
-    KOrganizer/PI Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.net>
+    KOrganizer/PI Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.info>
    
    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.
 */
 #include "kolocationbox.h"
 #include <qstring.h>
 #include <qlineedit.h>
 #include <qapplication.h>
 KOLocationBox::KOLocationBox( bool rw , QWidget *parent , int _maxItems) :
  QComboBox( rw , parent )
 {
  maxItems = _maxItems;
  maxItems = 50; // sorry - hack from me to set maxitems globally to 30
  setInsertionPolicy(AtTop);
  setDuplicatesEnabled( FALSE );
  setMaxCount( maxItems );
  setAutoCompletion( TRUE );  
 }
 KOLocationBox::~KOLocationBox()
 {
 }
 void KOLocationBox::load(int what)
 {
  clear();
  // qDebug("load %d ",what );
  switch(what) {
    case LOCATION:
diff --git a/korganizer/kolocationbox.h b/korganizer/kolocationbox.h
index be8ea86..b604d33 100644
--- a/korganizer/kolocationbox.h
+++ b/korganizer/kolocationbox.h
@@ -1,54 +1,54 @@
 /*
    File Copyright (c) 2004 Dirk Loesche <dirk.loesche@bigfoot.de>
    This file is part of KOrganizer/PI
    KOrganizer    Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
-    KOrganizer/PI Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.net>
+    KOrganizer/PI Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.info>
    
    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.
 */
 #ifndef KOLOCATIONBOX_H
 #define KOLOCATIONBOX_H
 #include <qcombobox.h>
 #include "koprefs.h"
 class KOLocationBox : public QComboBox
 {
  public:
    KOLocationBox( bool rw , QWidget *parent , int _maxItems );
    virtual ~KOLocationBox();
    
    enum {LOCATION, SUMMARYEVENT, SUMMARYTODO};
  
  public slots:
    void        load(int);
    void        save(int);
    void        clearItems(int); // clear listbox and config rc items
  protected:
 //    void        focusOutEvent( QFocusEvent * );
 //    void        timerEvent( QTimerEvent * );
  private:
    int         maxItems;       // maximal listbox items
    QStringList strlist;        // temporary stringlist
 };
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 4f71788..bd9efc8 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1230,169 +1230,169 @@ void MainWindow::features()
 }
 void MainWindow::usertrans()
 {
    KApplication::showFile( i18n("KO/Pi User translation HowTo"), "kdepim/korganizer/usertranslationHOWTO.txt" );
 }
 void MainWindow::kdesynchowto()
 {
    KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" );
 }
 void MainWindow::multisynchowto()
 {
    KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" );
 }
 void MainWindow::synchowto()
 {
    KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" );
 }
 void  MainWindow::faq()
 {
    KApplication::showFile( i18n("KO/Pi FAQ"), "kdepim/korganizer/kopiFAQ.txt" );
 }
 void  MainWindow::whatsNew()
 {
    KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" );
 }
 void  MainWindow::licence()
 {
    KApplication::showLicence();
 }
 void MainWindow::about()
 {
    QString version;
 #include <../version>
    QMessageBox::about( this, i18n("About KOrganizer/Pi"),
                        i18n("KOrganizer/Platform-independent\n") +
                        "(KO/Pi) " + version + " - " +
 #ifdef DESKTOP_VERSION
                        i18n("Desktop Edition\n") +
 #else
                        i18n("PDA-Edition\nfor: Zaurus 5x00/7x0/860/3000/6000\n") +
 #endif
-                        i18n("(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi is based on KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) and the KDE team.\nKOrganizer/Pi is licensed under the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.pi-sync.net --- www.korganizer.org\nSpecial thanks to Michael and Ben\nfor intensive testing!") );
+                        i18n("(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi is based on KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) and the KDE team.\nKOrganizer/Pi is licensed under the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.pi-sync.info --- www.korganizer.org\nSpecial thanks to Michael and Ben\nfor intensive testing!") );
 }
 void MainWindow::keyBindings()
 {
    QString cap = i18n("KO/Pi Keys + Colors");
    QString text =  i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") +
        i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+
        i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") +
        i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+
        i18n("<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n")+
        i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+
        i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+
        i18n("<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ")+
        i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+
        i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+
        i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+
        i18n("<p><b>K</b>: Week view in Month view syle</p>\n")+
        i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+
        i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+
        i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n")+
        i18n("<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n")+
        i18n("<p><b>C</b>: Show current time in agenda view</p>\n")+
        i18n("<p><b>B</b>: Edit description (details) of selected item</p>\n")+
        i18n("<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n")+
        i18n("<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n")+
        i18n("<p><b>del,backspace</b>: Delete selected item</p>\n")+
        i18n("<p><h3>In agenda view:</h3></p>\n") +
        i18n("<p><b>up/down</b>: Scroll agenda view</p>\n")+
        i18n("<p><b>ctrl+up/down</b>: Scroll small todo view</p>\n")+
        i18n("<p><h3>In todo view:</h3></p>\n") +
        i18n("<p><b>shift+U</b>: <b>U</b>nparent todo (make root todo)</p>\n")+
        i18n("<p><b>shift+S</b>: Make <b>S</b>ubtodo (reparent todo)</p>\n")+
        i18n("<p><b>shift+P</b>: Make new <b>P</b>arent for todo selected with shift+S</p>\n")+
        i18n("<p><b>Q</b>: Toggle quick todo line edit.</p>\n")+
        i18n("<p><b>I</b>: Show info of current item+one step down.</p>\n")+
        i18n("<p><b>return</b>: Mark item as completed+one step down.</p>\n")+
        i18n("<p><b>return+shift</b>:  Mark item as not completed+one step down</p>\n")+
        i18n("<p><h3>In list view:</h3></p>\n") +
        i18n("<p><b>I</b>: Show info of current item+one step down.</p>\n")+
        i18n("<p><b>return</b>: Select item+one step down</p>\n")+
        i18n("<p><b>return+shift</b>: Deselect item+one step down</p>\n")+
        i18n("<p><b>up/down</b>: Next/prev item</p>\n")+
        i18n("<p><b>ctrl+up/down</b>:  Goto up/down by 20% of items</p>\n")+
        i18n("<p><b>shift+up/down</b>: Goto first/last item</p>\n")+
        i18n("<p><h3>In event/todo viewer:</h3></p>\n") +
        i18n("<p><b>I,C</b>: Close dialog.</p>\n")+
        i18n("<p><b>A</b>: Show agenda view.</p>\n")+
        i18n("<p><b>E</b>:  Edit item</p>\n") +
        i18n("<p><h2>KO/Pi icon colors:</h2></p>\n") +
        i18n("<p><b>(for square icons in agenda and month view)</b></p>\n") +
        i18n("<p><b>Cross</b>: Item cancelled.([c] in Whats'Next view)</p>\n")+
        i18n("<p><b>Red</b>: Alarm set.([a] in Whats'Next view)</p>\n")+
        i18n("<p><b>Blue</b>: Recurrent event.([r] in Whats'Next view)</p>\n")+
        i18n("<p><b>Dark green</b>: Information(description) available.([i] in WN view)</p>\n")+
        i18n("<p><b>Black</b>: Event/todo with attendees. You are the organizer!</p>\n")+
        i18n("<p><b>Dark yellow</b>:  Event/todo with attendees.</p>\n") +
        i18n("<p><b>White</b>: Item readonly</p>\n");
    displayText( text, cap);
 }
 void MainWindow::aboutAutoSaving()
 {
    QString text = i18n("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");
  
    KApplication::showText( i18n("Auto Saving in  KOrganizer/Pi"), text);
 }
 void MainWindow::aboutKnownBugs()
 {
    QMessageBox* msg;
    msg = new QMessageBox(  i18n("Known Problems in  KOrganizer/Pi"),
                            i18n("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")+
                            i18n("2) Audio alarm daemon\nfor Zaurus is available!\nas an additional small application\n")+
-                            i18n("\nPlease report unexpected behaviour to\nlutz@pi-sync.net\n") +
+                            i18n("\nPlease report unexpected behaviour to\nlutz@pi-sync.info\n") +
                            i18n("\nor report them in the bugtracker on\n") +
                            i18n("\nhttp://sourceforge.net/projects/kdepimpi\n"),
                            QMessageBox::NoIcon,
                            QMessageBox::Ok,
                            QMessageBox::NoButton,
                            QMessageBox::NoButton);
    msg->exec();
    delete msg;
 }
 QString MainWindow::defaultFileName()
 {
    return locateLocal( "data", "korganizer/mycalendar.ics" );
 }
 QString MainWindow::syncFileName()
 {
 #ifdef DESKTOP_VERSION
    return  locateLocal( "tmp", "synccalendar.ics" );
 #else
    return QString( "/tmp/synccalendar.ics" );
 #endif
 }
 void MainWindow::updateWeek(QDate seda)
 {
    int weekNum = 0;
    QDate d = QDate ( seda.year(), 1,1);
    seda = seda.addDays( 1-seda.dayOfWeek() );//we are on monday
    if ( seda.addDays(6).year() != seda.year()  ) {
        if ( seda.year() != d.year() ) {
            if ( d.dayOfWeek() > 4 )
                d = QDate ( seda.year(), 1,1);
            else
                weekNum = 1;
        } else {
            QDate dd( seda.year()+1, 1,1);
            if ( dd.dayOfWeek() <= 4 )
                weekNum = 1;
        }
    }
    if ( weekNum == 0 ){
        int dow = d.dayOfWeek();
        if ( dow <= 4 )
            d = d.addDays( 1-dow );
        else // 5,6,7
            d = d.addDays( 8-dow );
        // we have the first week of the year.we are on monday
        weekNum =  d.daysTo( seda ) / 7 +1;