summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-12 20:54:38 (UTC)
committer zautrix <zautrix>2004-10-12 20:54:38 (UTC)
commit95ce1ce07164da5660a2bf1992fed4c263c6afca (patch) (unidiff)
tree46309cb90affec4c56f7453e3e87af7368744e98
parent60a63813f7ec38fe275e7ef06033a6d3eb3ec31c (diff)
downloadkdepimpi-95ce1ce07164da5660a2bf1992fed4c263c6afca.zip
kdepimpi-95ce1ce07164da5660a2bf1992fed4c263c6afca.tar.gz
kdepimpi-95ce1ce07164da5660a2bf1992fed4c263c6afca.tar.bz2
howto files moved
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,5 +1,4 @@
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
@@ -25,6 +24,9 @@ and 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
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a69a0bd..58d8d34 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1084,21 +1084,8 @@ void MainWindow::usertrans()
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{
@@ -1107,7 +1094,7 @@ void MainWindow::faq()
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()