nonmal

2 files changed, 33 insertions, 0 deletions

diff --git a/README b/README
index 663f326..a32191d 100644
--- a/README
+++ b/README
@@ -1,103 +1,132 @@
 
 Howto Compile KO/Pi for Qt-Embedded:
 
 Remove all Makefile files first!
 
 Please look at the files setQtopia and setZaurus in the same dir.
 
 You may have to
 - create a softlink from
     /opt/qtopia/include/qpe to /opt/qtopia/include/qtopia
 - remove
     -ljpeg in korganizer/Makefilezaurus
 -create the directory
    /opt/Qtopia/sharp/plugins
    /opt/Qtopia/sharp/plugins/applets
 
 to get the sources compiled, depending on your Qtopia compiler setup.
 The needed Makefile is  Makefile.Embedded.
 Copy it and rename it to Makefile.
 
 To build for the Zaurus:
 Install Qtopia development environment and the cross-compiler.
 
 The file sharp.tmake.conf contains e DEFINE,which is needed to fix the QWhatsThis problem:
 TMAKE_CXXFLAGS		=  blabla  -DADD_TOOLTIP
 Add this to your tmake.conf file for sharp.
 
 Now, you can do from command line a:
 cz     #comment: for setZaurus
 make clean #comment: for removing old Makefiles - if there are any
 make
 make install
 make clean
 make dist
 
 to build a binary and source package.
 The sources are ../kdepim.src.tar.gz
 The binaries are 
 korganizer-alarm_1.9.0a_arm.ipk
 and 
 kdepim_1.9.0a_arm.ipk
 , depending on the version.
 
 =========================================================
 
 Howto Compile+Run KO/Pi Desktop for Linux Desktop:
 
 Remove all Makefile files first!
 
 Set the needed environment variables to compile a Qt program.
 (e.g. QTDIR, ,... )
 Do a
 qmake
 make clean
 make
 in this directory.
 
 After compilation, you will find the binary and the libs in ./bin.
 
 
 Goto ./bin  in console and type type ./kopi 
 
 Now kopi starts.
+(UPDATE : Now you have probably to copy the libs to /usr/lib to run KO/Pi).
+This can be done by the following prodedure:
+
+Howto build the KDE sync command line tools:
+
+Goto 
+./desktop
+Adjust the paths ( KDEDIR and  KDE_DEV_DIR ) in the Makefile there.
+Type there
+make
+to build the KDE sync command line tools.
+Now switch to super user mode with 
+su
+Copy everything in the right place with
+make install
+(Comment out the lines in the makefile which try to copy files, which are not there, e.g. the line "cp -fr /home/polo/eigene/apps/* /opt/kdepimpi/" ).
+Now build a rpm with
+make dist
+
+make dist uses the rpm spec in ./desktop/rpm/kdepim_rpm.
+
+This all works for a SuSE 9.2.
+For other distris you have to adjust some settings.
 
 =========================================================
 
 KOrganizer/Platform-independent (KO/Pi)
 
 
 This is the  platform-independend version of KOrganizer. It includes a replacement for the
 KDE libraries called microkde, which provides the KDE specific functions
 KOrganizer needs, but does not add the overhead of the complete implementation.
 KOrganizer/Pi compiles with Qt/Embedded 2.3.2 and the corresponding QPE libs.
 
 It compiles with Qt 3.2.3 on the Linux or Windows desktop as well.
 
 KOrganizer/Pi is based on the unaltered original KOrganizer code from the KDE CVS
 HEAD branch of spring 2003.
 
 Some functionality of the full KDE version of Korganizer is not present in the
 platform-independend, because microkde is not yet complete.
 
 KOrganizer/Pi is licenced under the GPL, the microkde library is licenced under
 the LGPL and the original KOrganizer code is licenced under GPL or LPGL.
 
 If you have questions or comments please contact Lutz Rogowski
 <rogowski@kde.org>.
 
 
 History
 -------
 
+2.0.0 (January 2005)
+ - Korganizer/Pi is now integrated in KDE-Pim/Pi together with KA/Pi.
+
+1.7.8 (Juni 2004)
+ - Latest standalone version of Korganizer/Pi (platform-independend).
+
 1.5 (January 2004)
  - Korganizer/E has been renamed to Korganizer/Pi (platform-independend)
    In this version, there are many bugfixes/enhancements.
 
 1.0 (April 2002):
 
  - First stable release as final submission to the Trolltech Qtopia contest.
 
 0.8 (beta1) (January 2002):
 
  - Initial release as entry to the Trolltech Qtopia contest.
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index ddd9cf8..32cc291 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -129,193 +129,197 @@ KOPrefs::KOPrefs() :
   addItemString("Archive File",&mArchiveFile);
   addItemString("Html Export File",&mHtmlExportFile,
       QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html"));
   addItemBool("Html With Save",&mHtmlWithSave,false);
 
   KPrefs::setCurrentGroup("Personal Settings");
 
   addItemInt("Mail Client",&mMailClient,MailClientKMail);
   addItemBool("Use Control Center Email",&mEmailControlCenter,false);
   addItemBool("Bcc",&mBcc,false);
 
   KPrefs::setCurrentGroup("Time & Date");
 
 
   addItemInt("Default Start Time",&mStartTime,10);
   addItemInt("Default Duration",&mDefaultDuration,2);
   addItemInt("Default Alarm Time",&mAlarmTime,3);
   KPrefs::setCurrentGroup("AlarmSettings");
   addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20);
   addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7);
   addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5);
   addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3);
 
 
   KPrefs::setCurrentGroup("Calendar");
 
   addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar);
 
   KPrefs::setCurrentGroup("Fonts");
   // qDebug(" KPrefs::setCurrentGroup(Fonts); ");
   addItemFont("TimeBar Font",&mTimeBarFont);
   addItemFont("MonthView Font",&mMonthViewFont);
   addItemFont("AgendaView Font",&mAgendaViewFont);
   addItemFont("MarcusBains Font",&mMarcusBainsFont);
   addItemFont("TimeLabels Font",&mTimeLabelsFont);
   addItemFont("TodoView Font",&mTodoViewFont);
   addItemFont("ListView Font",&mListViewFont);
   addItemFont("DateNavigator Font",&mDateNavigatorFont);
   addItemFont("EditBox Font",&mEditBoxFont);
   addItemFont("JournalView Font",&mJornalViewFont);
   addItemFont("WhatsNextView Font",&mWhatsNextFont);
   addItemFont("EventView Font",&mEventViewFont);
 
   KPrefs::setCurrentGroup("RemoteSyncing");
   addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" );  
   addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" ); 
   addItemBool("ShowSyncEvents",&mShowSyncEvents,false); 
   addItemInt("LastSyncTime",&mLastSyncTime,0); 
 
 #ifdef _WIN32_
   QString hdp= locateLocal("data","korganizer")+"\\\\";
 #else
   QString hdp= locateLocal("data","korganizer")+"/";
 #endif
 
   KPrefs::setCurrentGroup("LoadSaveFileNames");
 
   addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" );
   addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" );
   addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" );
   addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" );
  
 
   KPrefs::setCurrentGroup("Locale");
   addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 
 
 
   KPrefs::setCurrentGroup("Colors");
   addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor);
   addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor);
   addItemColor("Event Color",&mEventColor,mDefaultCategoryColor);
   addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor);
   addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor);
   addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor);
   addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor);
   addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 ));
   addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 ));
   addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 ));
   addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); 
   addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true);
   addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); 
   addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 ));
   addItemColor("AppColor2",&mAppColor2,QColor(  174,216,255 ));
   addItemBool("UseAppColors",&mUseAppColors,false); 
 
   
 
   KPrefs::setCurrentGroup("Views");
   addItemBool("Show Date Navigator",&mShowDateNavigator,true);
   addItemInt("Hour Size",&mHourSize,8);
   addItemBool("Show Daily Recurrences",&mDailyRecur,true);
   addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
   addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true);
   addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true);
   addItemBool("ShowShortMonthName",&mMonthShowShort,false);
   addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true);
+#ifdef DESKTOP_VERION
+  addItemBool("Enable ToolTips",&mEnableToolTips,true);
+#else
   addItemBool("Enable ToolTips",&mEnableToolTips,false);
+#endif
   addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false);
   addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false);
   addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true);
   addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true);
   addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,true);
   addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false);
   addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false);
   addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true);
   addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true);
   addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);;
   addItemBool("WNViewShowsPast",&mWNViewShowsPast,true);
   addItemBool("WNViewShowLocation",&mWNViewShowLocation,false);
   addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false);
   addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true);
   addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false);
   addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false);
   addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,false);
   addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
   addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
 #ifdef DESKTOP_VERSION
   addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true);
 #else
   addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false);
 #endif
   addItemInt("Day Begins",&mDayBegins,7);
   addItemInt("Working Hours Start",&mWorkingHoursStart,8);
   addItemInt("Working Hours End",&mWorkingHoursEnd,17);
   addItemBool("Exclude Holidays",&mExcludeHolidays,true);
   addItemBool("Exclude Saturdays",&mExcludeSaturdays,true);
 
   addItemBool("Month View Uses Category Color",&mMonthViewUsesCategoryColor,false);
   addItemBool("Full View Month",&mFullViewMonth,true);
   addItemBool("Full View Todo",&mFullViewTodo,true);
   addItemBool("Quick Todo",&mEnableQuickTodo,false);
 
   addItemInt("Next X Days",&mNextXDays,3);
 
   KPrefs::setCurrentGroup("Printer");
 
   KPrefs::setCurrentGroup("Layout");
 
   addItemBool("CompactDialogs",&mCompactDialogs,false);
   addItemBool("VerticalScreen",&mVerticalScreen,true);
 
   KPrefs::setCurrentGroup("KOrganizer Plugins");
 
   addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays");
 
   KPrefs::setCurrentGroup("Group Scheduling");
 
   addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail);
   addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend);
   addItemStringList("AdditionalMails",&mAdditionalMails,"");
   addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto);
   addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto);
   addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto);
   addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto);
   addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto);
 
   KPrefs::setCurrentGroup( "Editors" );
 
   addItemStringList( "EventTemplates", &mEventTemplates );
   addItemStringList( "TodoTemplates", &mTodoTemplates );
 
   addItemInt("DestinationPolicy",&mDestination,standardDestination);
 
 
 
 }
 
 
 KOPrefs::~KOPrefs()
 {
   if (mInstance == this)
       mInstance = insd.setObject(0); 
  
   //qDebug("KOPrefs::~KOPrefs() ");
 }
 
 
 KOPrefs *KOPrefs::instance()
 {
   if (!mInstance) {
       mInstance = insd.setObject(new KOPrefs());
       mInstance->readConfig();
   }
 
   return mInstance;
 }
 
 void KOPrefs::usrSetDefaults()
 {
    
 }
 
 void KOPrefs::fillMailDefaults()