| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | kabc/kabc.pro | 2 | ||||
| -rw-r--r-- | korganizer/kdatenavigator.cpp | 7 | ||||
| -rw-r--r-- | korganizer/koeditorrecurrence.cpp | 2 | ||||
| -rw-r--r-- | libkcal/calendar.h | 4 |
5 files changed, 11 insertions, 10 deletions
@@ -1,5 +1,5 @@ ############################################################################# # Makefile for building: kopi-desktop -# Generated by qmake (1.07a) (Qt 3.3.3) on: Thu Aug 19 22:23:29 2004 +# Generated by qmake (1.07a) (Qt 3.3.1) on: Sun Aug 29 13:39:55 2004 # Project: kopi-desktop.pro # Template: subdirs @@ -12,6 +12,4 @@ DEL_FILE = rm -f CHK_DIR_EXISTS= test -d MKDIR = mkdir -p -INSTALL_FILE= -INSTALL_DIR = SUBTARGETS = \ sub-gammu-emb-common \ @@ -90,5 +88,5 @@ sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE) -Makefile: kopi-desktop.pro /usr/local/qtgcc/mkspecs/default/qmake.conf +Makefile: kopi-desktop.pro /usr/lib/qt3/mkspecs/default/qmake.conf $(QMAKE) -o Makefile kopi-desktop.pro qmake: qmake_all diff --git a/kabc/kabc.pro b/kabc/kabc.pro index 95ebd68..417f5b0 100644 --- a/kabc/kabc.pro +++ b/kabc/kabc.pro @@ -82,5 +82,4 @@ vcard/include/VCardSourceParam.h \ vcard/include/VCardTelParam.h \ vcard/include/VCardTextParam.h \ -vcard/include/VCardTextNSParam.h \ vcard/include/VCardTextValue.h \ vcard/include/VCardTextBinParam.h \ @@ -138,4 +137,5 @@ vcard/include/generated/TextListValue-generated.h #formats/binary/binaryformat.h \ +#vcard/include/VCardTextNSParam.h \ SOURCES = \ diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 7d0c516..b420351 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -250,8 +250,11 @@ void KDateNavigator::updateView() int dayOfYear = KOGlobals::self()->calendarSystem()->dayOfYear((daymatrix->getDate((i+1)*7-4))); + int add = 0; + if ( ! KGlobal::locale()->weekStartsMonday() ) + ++add; if (dayOfYear % 7 != 0) - weeknum.setNum(dayOfYear / 7 + 1); + weeknum.setNum(dayOfYear / 7 + 1+add); else - weeknum.setNum(dayOfYear / 7); + weeknum.setNum(dayOfYear / 7 +add); weeknos[i]->setText(weeknum); } diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index 584d1ed..4209e10 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -1053,5 +1053,5 @@ void KOEditorRecurrence::writeEvent( Event *event ) if ( !found ) { days.setBit( event->dtStart().date().dayOfWeek()-1); - qDebug("bit set %d "); + qDebug("bit set %d ", event->dtStart().date().dayOfWeek()-1); } if ( duration != 0 ) r->setWeekly( freq, days, duration ); diff --git a/libkcal/calendar.h b/libkcal/calendar.h index 06a911c..c45d81f 100644 --- a/libkcal/calendar.h +++ b/libkcal/calendar.h @@ -33,6 +33,7 @@ #include "todo.h" #include "journal.h" +#include "calfilter.h" -#define _TIME_ZONE "-0500" /* hardcoded, overridden in config file. */ +//#define _TIME_ZONE "-0500" /* hardcoded, overridden in config file. */ class KConfig; @@ -40,5 +41,4 @@ class KConfig; namespace KCal { -class CalFilter; /** |