summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt5
-rw-r--r--korganizer/datenavigator.cpp8
-rw-r--r--korganizer/datenavigator.h1
-rw-r--r--korganizer/koviewmanager.cpp4
-rw-r--r--korganizer/mainwindow.cpp4
-rw-r--r--korganizer/navigatorbar.h1
6 files changed, 14 insertions, 9 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index d52fad0..2275f3a 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1045,6 +1045,5 @@
{ "Known Problems in KOrganizer/Pi","Bekannte Probleme in KOrganizer/Pi" },
{ "KO/Pi FAQ","KO/Pi FAQ" },
-{ "(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi is based on KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi is licensed\nunder the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.korganizer.org\nwww.pi-sync.net\n","(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi basiert auf KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi ist lizensiert unter der GPL.\nKO/Pi kann kompiliert werden für\nLinux, Zaurus-PDA und Windows\nwww.korganizer.org\nwww.pi-sync.net\n" },
-{ "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n","PDA-Edition\nfür: Zaurus 5x00 / 7x0 / 8x0\n" },
+{ "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" },
@@ -1227,5 +1226,5 @@
{ "Set current as color category","Setze Gewählte als Farbkategorie" },
{ " completed"," erledigt" },
-{ "","" },
+{ "(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!","(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi basiert auf KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) und das KDE Team.\nKOrganizer/Pi ist lizensiert unter der GPL.\nKO/Pi kann kompiliert werden für\nLinux, Zaurus-PDA und Windows\nwww.pi-sync.net --- www.korganizer.org\nBesonderen Dank an Michael und Ben\nfür intensives Testen!" },
{ "","" },
{ "","" },
diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp
index d2824de..8b7c993 100644
--- a/korganizer/datenavigator.cpp
+++ b/korganizer/datenavigator.cpp
@@ -156,4 +156,12 @@ void DateNavigator::selectWeek( int num )
{
int year = mSelectedDates.first().year();
+ QDate d = QDate ( year, 1,1);
+ while ( d.dayOfWeek() != 4 )
+ d = d.addDays( 1 );
+ selectWeek( d.addDays ( (num-1) *7 ) );
+}
+void DateNavigator::selectWeekFromMonthView( int num )
+{
+ int year = mSelectedDates.first().year();
if ( mSelectedDates.first().dayOfYear() > 300 && num < 10 )
++year;
diff --git a/korganizer/datenavigator.h b/korganizer/datenavigator.h
index 4a19e17..4265e84 100644
--- a/korganizer/datenavigator.h
+++ b/korganizer/datenavigator.h
@@ -54,4 +54,5 @@ class DateNavigator : public QObject
void selectWeek();
void selectWeek( int weeknum );
+ void selectWeekFromMonthView( int weeknum );
void selectWeek( const QDate & );
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index b551e2a..90be237 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -508,5 +508,5 @@ void KOViewManager::showMonthView()
mMainView, SLOT ( beamIncidence( Incidence * ) ) );
connect( mMonthView, SIGNAL( selectWeekNum( int ) ),
- mMainView->dateNavigator(), SLOT ( selectWeek( int ) ) );
+ mMainView->dateNavigator(), SLOT ( selectWeekFromMonthView( int ) ) );
connect( mMonthView, SIGNAL( showDaySignal( QDate ) ),
mMainView, SLOT ( showDay( QDate ) ) );
@@ -524,6 +524,4 @@ void KOViewManager::showMonthView()
connect( mMonthView->navigatorBar(), SIGNAL( goNextMonth() ),
mMainView->dateNavigator(), SLOT( selectNextMonth() ) );
- connect( mMonthView->navigatorBar(), SIGNAL( selectWeek( int ) ),
- mMainView->dateNavigator(), SLOT( selectWeek( int ) ) );
connect( mMainView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 119e28a..7810bf9 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1254,7 +1254,7 @@ void MainWindow::about()
i18n("Desktop Edition\n") +
#else
- i18n("PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n") +
+ i18n("PDA-Edition\nfor: Zaurus 5x00/7x0/860/3000/6000\n") +
#endif
- i18n("(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi is based on KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi is licensed\nunder the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.korganizer.org\nwww.pi-sync.net\n") );
+ 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!") );
}
void MainWindow::keyBindings()
diff --git a/korganizer/navigatorbar.h b/korganizer/navigatorbar.h
index ee4c06d..93240a6 100644
--- a/korganizer/navigatorbar.h
+++ b/korganizer/navigatorbar.h
@@ -50,5 +50,4 @@ class NavigatorBar: public QWidget
void goPrevYear();
void monthSelected( int );
- void selectWeek( int );
private: