summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/SyncHowto.txt (renamed from bin/kdepim/korganizer/howtoSYNC.txt)0
-rw-r--r--bin/kdepim/WhatsNew.txt (renamed from bin/kdepim/korganizer/kopiWhatsNew.txt)6
-rw-r--r--korganizer/mainwindow.cpp19
3 files changed, 7 insertions, 18 deletions
diff --git a/bin/kdepim/korganizer/howtoSYNC.txt b/bin/kdepim/SyncHowto.txt
index 3cab446..3cab446 100644
--- a/bin/kdepim/korganizer/howtoSYNC.txt
+++ b/bin/kdepim/SyncHowto.txt
diff --git a/bin/kdepim/korganizer/kopiWhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 3f95dcf..3eecf8c 100644
--- a/bin/kdepim/korganizer/kopiWhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,51 +1,53 @@
1Info about the changes in new versions of KO/Pi 1Info about the changes in new versions of KDE-Pim/Pi
2and KDE-Pim/Pi
3 2
4********** VERSION 1.9.7 ************ 3********** VERSION 1.9.7 ************
5 4
6KO/Pi - KA/Pi on Windows: 5KO/Pi - KA/Pi on Windows:
7Now a directory can be defined by the user, where the 6Now a directory can be defined by the user, where the
8application/config data should be saved. 7application/config data should be saved.
9 Define your desired path in the evironment variable 8 Define your desired path in the evironment variable
10 MICROKDEHOME 9 MICROKDEHOME
11 before starting KO/Pi or KA/Pi. 10 before starting KO/Pi or KA/Pi.
12 11
13An easy Kx/Pi to Kx/Pi syncing is now possible 12An easy Kx/Pi to Kx/Pi syncing is now possible
14(it is called Pi-Sync) via network. 13(it is called Pi-Sync) via network.
15Please look at the Sync Howto. 14Please look at the Sync Howto.
16 15
17Exporting of calendar data and contacts to mobile phones is now possible. 16Exporting of calendar data and contacts to mobile phones is now possible.
18The SyncHowto is updated with information howto 17The SyncHowto is updated with information howto
19access/sync mobile phones. 18access/sync mobile phones.
20Please look at the Sync Howto. 19Please look at the Sync Howto.
21 20
22Now KO/Pi and KA/Pi on the Zaurus can receive data via infrared directly. 21Now KO/Pi and KA/Pi on the Zaurus can receive data via infrared directly.
23Please disable Fastload for the original contact/calendar applications 22Please disable Fastload for the original contact/calendar applications
24and close them. 23and close them.
25KO/Pi and KA/Pi must be running in order to receive the data. 24KO/Pi and KA/Pi must be running in order to receive the data.
26(KO/Pi and KA/Pi are always running if Fastload for them is enabled!) 25(KO/Pi and KA/Pi are always running if Fastload for them is enabled!)
27 26
27In the KA/Pi details view are now the preferred tel. numbers displayed on top
28of the other data ( emails/tel.numbers/addresses)
29
28 30
29********** VERSION 1.9.6 ************ 31********** VERSION 1.9.6 ************
30 32
31Changes in the external application communication on the Zaurus 33Changes in the external application communication on the Zaurus
32in order to use less RAM when the apps are running. 34in order to use less RAM when the apps are running.
33First syncing of addressbooks (KA/Pi) is possible. 35First syncing of addressbooks (KA/Pi) is possible.
34 36
35 37
36********** VERSION 1.9.5a ************ 38********** VERSION 1.9.5a ************
37 39
38Fixed a bug in KO/Pi in the SharpDTM sync of version 1.9.5. 40Fixed a bug in KO/Pi in the SharpDTM sync of version 1.9.5.
39Fixed some small bugs. 41Fixed some small bugs.
40KA/Pi shows now the birthday in summary view. 42KA/Pi shows now the birthday in summary view.
41Now OM/Pi and KA/Pi are using the date format defined in KO/Pi 43Now OM/Pi and KA/Pi are using the date format defined in KO/Pi
42for displaying dates. 44for displaying dates.
43 45
44 46
45********** VERSION 1.9.5 ************ 47********** VERSION 1.9.5 ************
46 48
47There is still no Addressbook syncing! 49There is still no Addressbook syncing!
48 50
49New in 1.9.5: 51New in 1.9.5:
50 52
51Many bugfixes. 53Many bugfixes.
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a69a0bd..58d8d34 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1063,72 +1063,59 @@ void MainWindow::displayFile( QString fn, QString cap )
1063 QFile file( fileName ); 1063 QFile file( fileName );
1064 if (!file.open( IO_ReadOnly ) ) { 1064 if (!file.open( IO_ReadOnly ) ) {
1065 return ; 1065 return ;
1066 1066
1067 } 1067 }
1068 QTextStream ts( &file ); 1068 QTextStream ts( &file );
1069 text = ts.read(); 1069 text = ts.read();
1070 file.close(); 1070 file.close();
1071 displayText( text, cap); 1071 displayText( text, cap);
1072} 1072}
1073void MainWindow::features() 1073void MainWindow::features()
1074{ 1074{
1075 1075
1076 displayFile( "featuresKOPI.txt",i18n("KO/Pi Features and hints") ); 1076 displayFile( "featuresKOPI.txt",i18n("KO/Pi Features and hints") );
1077} 1077}
1078 1078
1079void MainWindow::usertrans() 1079void MainWindow::usertrans()
1080{ 1080{
1081 1081
1082 displayFile( "usertranslationHOWTO.txt",i18n("KO/Pi User translation HowTo") ); 1082 displayFile( "usertranslationHOWTO.txt",i18n("KO/Pi User translation HowTo") );
1083} 1083}
1084 1084
1085void MainWindow::synchowto() 1085void MainWindow::synchowto()
1086{ 1086{
1087#if 0 1087
1088 QPtrList<Incidence> er = mCalendar->rawIncidences(); 1088 KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" );
1089 Incidence* inR = er.first();
1090 VCalFormat vf;
1091 QString strout;
1092 while ( inR ) {
1093 if ( inR->type() == "Todo" )
1094 strout = vf.todoToString( (Todo *) inR );
1095 if ( inR->type() == "Event" )
1096 strout = vf.eventToString( (Event *) inR );
1097 qDebug("incidence: \n%s\n ente\n\n",strout.latin1() );
1098 inR = er.next();
1099 }
1100#endif
1101 displayFile( "howtoSYNC.txt",i18n("KO/Pi Synchronization HowTo") );
1102} 1089}
1103void MainWindow::faq() 1090void MainWindow::faq()
1104{ 1091{
1105 displayFile( "kopiFAQ.txt",i18n("KO/Pi FAQ") ); 1092 displayFile( "kopiFAQ.txt",i18n("KO/Pi FAQ") );
1106 1093
1107} 1094}
1108void MainWindow::whatsNew() 1095void MainWindow::whatsNew()
1109{ 1096{
1110 displayFile( "kopiWhatsNew.txt",i18n("KO/Pi Version Info") ); 1097 KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" );
1111 1098
1112} 1099}
1113void MainWindow::licence() 1100void MainWindow::licence()
1114{ 1101{
1115 KApplication::showLicence(); 1102 KApplication::showLicence();
1116 1103
1117} 1104}
1118void MainWindow::about() 1105void MainWindow::about()
1119{ 1106{
1120 QString version; 1107 QString version;
1121#include <../version> 1108#include <../version>
1122 QMessageBox::about( this, i18n("About KOrganizer/Pi"), 1109 QMessageBox::about( this, i18n("About KOrganizer/Pi"),
1123 i18n("KOrganizer/Platform-independent\n") + 1110 i18n("KOrganizer/Platform-independent\n") +
1124 "(KO/Pi) " + version + " - " + 1111 "(KO/Pi) " + version + " - " +
1125 1112
1126#ifdef DESKTOP_VERSION 1113#ifdef DESKTOP_VERSION
1127 i18n("Desktop Edition\n") + 1114 i18n("Desktop Edition\n") +
1128#else 1115#else
1129 i18n("PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n") + 1116 i18n("PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n") +
1130#endif 1117#endif
1131 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") ); 1118 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") );
1132} 1119}
1133void MainWindow::keyBindings() 1120void MainWindow::keyBindings()
1134{ 1121{