summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-03-28 19:45:15 (UTC)
committer zautrix <zautrix>2005-03-28 19:45:15 (UTC)
commit4034290f894ff7d1b0cf1197078e0ed832566bb7 (patch) (unidiff)
tree21b7d2e2568f11079f705b8312e15146be4309ac
parentea070abfcff313cac87dbb4d5c9410784740de21 (diff)
downloadkdepimpi-4034290f894ff7d1b0cf1197078e0ed832566bb7.zip
kdepimpi-4034290f894ff7d1b0cf1197078e0ed832566bb7.tar.gz
kdepimpi-4034290f894ff7d1b0cf1197078e0ed832566bb7.tar.bz2
print fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile662
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt4
-rw-r--r--korganizer/koagendaview.cpp5
-rw-r--r--korganizer/koeventviewer.h8
4 files changed, 395 insertions, 284 deletions
diff --git a/Makefile b/Makefile
index f93af01..594d47d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,279 +1,385 @@
1############################################################################# 1export KDEPIMDIR = $(shell pwd)
2# Makefile for building: kdepim-desktop 2
3# Generated by qmake (1.07a) (Qt 3.3.4) on: Mon Mar 28 20:19:36 2005 3export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < version)
4# Project: kdepim-desktop.pro 4
5# Template: subdirs 5ifeq ($(PLATFORM) , zaurus)
6# Command: $(QMAKE) -o Makefile kdepim-desktop.pro 6 BUILD_NO_LDAP_PLUGIN=1
7############################################################################# 7endif
8 8
9 MAKEFILE =Makefile 9ifneq ($(PLATFORM) , zaurus)
10 QMAKE =qmake 10 BUILD_NO_SHARP_PLUGIN=1
11DEL_FILE = rm -f 11endif
12CHK_DIR_EXISTS= test -d 12
13MKDIR = mkdir -p 13#opie plugin is deprecated. The qtopia plugin handles the task from now on.
14INSTALL_FILE= 14BUILD_NO_OPIE_PLUGIN=1
15INSTALL_DIR = 15
16 SUBTARGETS = \ 16SUBDIRS_MICROKDE = \
17 sub-libical \ 17 libical/src/libical \
18 sub-libkcal \ 18 libical/src/libicalss \
19 sub-kabc \ 19 qtcompat \
20 sub-libkdepim \ 20 microkde \
21 sub-microkde \ 21 libkcal \
22 sub-korganizer \ 22 libkdepim \
23 sub-kaddressbook \ 23 kabc \
24 sub-kabc-plugins-file \ 24 kabc/formats/binary \
25 sub-kabc-plugins-dir \ 25 kabc/plugins/file \
26 sub-kabc-plugins-qtopia \ 26 kabc/plugins/dir \
27 sub-gammu-emb-common \ 27 korganizer \
28 sub-gammu-emb-gammu \ 28 kalarmd \
29 sub-libetpan \ 29 kaddressbook
30 sub-kmicromail-libmailwrapper \ 30
31 sub-kmicromail \ 31SUBDIRS_QTOPIA_PLUGIN = \
32 sub-pwmanager-libcrypt-cipher \ 32 kabc/plugins/qtopia
33 sub-pwmanager-libcrypt-error \ 33
34 sub-pwmanager-libcrypt-mpi \ 34SUBDIRS_OPIE_PLUGIN = \
35 sub-pwmanager-libcrypt-zlib \ 35 kabc/plugins/opie
36 sub-pwmanager-pwmanager 36
37 37SUBDIRS_SHARP_PLUGIN = \
38first: all 38 kabc/plugins/sharpdtm
39 39
40all: Makefile $(SUBTARGETS) 40SUBDIRS_LDAP_PLUGIN = \
41 41 kabc/plugins/ldap
42libical/$(MAKEFILE): 42
43 @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical" 43SUBDIRS_MICROMAIL = \
44 cd libical && $(QMAKE) libical.pro -o $(MAKEFILE) 44 libetpan \
45sub-libical: libical/$(MAKEFILE) FORCE 45 kmicromail/libmailwrapper \
46 cd libical && $(MAKE) -f $(MAKEFILE) 46 kmicromail
47 47
48libkcal/$(MAKEFILE): 48SUBDIRS_GAMMU = \
49 @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal" 49 gammu/emb/common \
50 cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE) 50 gammu/emb/gammu
51sub-libkcal: libkcal/$(MAKEFILE) FORCE 51
52 cd libkcal && $(MAKE) -f $(MAKEFILE) 52SUBDIRS_PWMANAGER = \
53 53 pwmanager/libcrypt/mpi \
54kabc/$(MAKEFILE): 54 pwmanager/libcrypt/error \
55 @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc" 55 pwmanager/libcrypt/cipher \
56 cd kabc && $(QMAKE) kabc.pro -o $(MAKEFILE) 56 pwmanager/libcrypt/zlib \
57sub-kabc: kabc/$(MAKEFILE) FORCE 57 pwmanager/pwmanager
58 cd kabc && $(MAKE) -f $(MAKEFILE) 58
59 59SUBDIRS = \
60libkdepim/$(MAKEFILE): 60 $(SUBDIRS_MICROKDE) \
61 @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim" 61 $(SUBDIRS_QTOPIA_PLUGIN) \
62 cd libkdepim && $(QMAKE) libkdepim.pro -o $(MAKEFILE) 62 $(SUBDIRS_OPIE_PLUGIN) \
63sub-libkdepim: libkdepim/$(MAKEFILE) FORCE 63 $(SUBDIRS_SHARP_PLUGIN) \
64 cd libkdepim && $(MAKE) -f $(MAKEFILE) 64 $(SUBDIRS_LDAP_PLUGIN) \
65 65 $(SUBDIRS_MICROMAIL) \
66microkde/$(MAKEFILE): 66 $(SUBDIRS_GAMMU) \
67 @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde" 67 $(SUBDIRS_PWMANAGER)
68 cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE) 68
69sub-microkde: microkde/$(MAKEFILE) FORCE 69
70 cd microkde && $(MAKE) -f $(MAKEFILE) 70all: build_microkde \
71 71 build_qtopia_plugin \
72korganizer/$(MAKEFILE): 72 build_opie_plugin \
73 @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer" 73 build_sharp_plugin \
74 cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE) 74 build_ldap_plugin \
75sub-korganizer: korganizer/$(MAKEFILE) FORCE 75 build_micromail \
76 cd korganizer && $(MAKE) -f $(MAKEFILE) 76 build_gammu \
77 77 build_pwmanager
78kaddressbook/$(MAKEFILE): 78
79 @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook" 79
80 cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE) 80build_microkde: variable_test tmake
81sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE 81 for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
82 cd kaddressbook && $(MAKE) -f $(MAKEFILE) 82 make -f Makefile$(PLATFORM) || exit 1; popd; \
83 83 done
84kabc/plugins/file/$(MAKEFILE): 84
85 @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file" 85build_qtopia_plugin: build_microkde
86 cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE) 86 ifdef BUILD_NO_QTOPIA_PLUGIN
87sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE 87 @echo == qtopia plugin not build.
88 cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE) 88 else
89 89 for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
90kabc/plugins/dir/$(MAKEFILE): 90 make -f Makefile$(PLATFORM) || exit 1; popd; \
91 @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir" 91 done
92 cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE) 92 endif
93sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE 93
94 cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE) 94build_opie_plugin: build_microkde
95 95 ifdef BUILD_NO_OPIE_PLUGIN
96kabc/plugins/qtopia/$(MAKEFILE): 96 @echo == opie plugin not build.
97 @$(CHK_DIR_EXISTS) "kabc/plugins/qtopia" || $(MKDIR) "kabc/plugins/qtopia" 97 else
98 cd kabc/plugins/qtopia && $(QMAKE) qtopia.pro -o $(MAKEFILE) 98 for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
99sub-kabc-plugins-qtopia: kabc/plugins/qtopia/$(MAKEFILE) FORCE 99 make -f Makefile$(PLATFORM) || exit 1; popd; \
100 cd kabc/plugins/qtopia && $(MAKE) -f $(MAKEFILE) 100 done
101 101 endif
102gammu/emb/common/$(MAKEFILE): 102
103 @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common" 103build_sharp_plugin: build_microkde
104 cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE) 104 ifdef BUILD_NO_SHARP_PLUGIN
105sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE 105 @echo == ldap plugin not build.
106 cd gammu/emb/common && $(MAKE) -f $(MAKEFILE) 106 else
107 107 for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
108gammu/emb/gammu/$(MAKEFILE): 108 make -f Makefile$(PLATFORM) || exit 1; popd; \
109 @$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu" 109 done
110 cd gammu/emb/gammu && $(QMAKE) gammu.pro -o $(MAKEFILE) 110 endif
111sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE 111
112 cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE) 112build_ldap_plugin: build_microkde
113 113 ifdef BUILD_NO_LDAP_PLUGIN
114libetpan/$(MAKEFILE): 114 @echo == ldap plugin not build.
115 @$(CHK_DIR_EXISTS) "libetpan" || $(MKDIR) "libetpan" 115 else
116 cd libetpan && $(QMAKE) libetpan.pro -o $(MAKEFILE) 116 for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \
117sub-libetpan: libetpan/$(MAKEFILE) FORCE 117 make -f Makefile$(PLATFORM) || exit 1; popd; \
118 cd libetpan && $(MAKE) -f $(MAKEFILE) 118 done
119 119 endif
120kmicromail/libmailwrapper/$(MAKEFILE): 120
121 @$(CHK_DIR_EXISTS) "kmicromail/libmailwrapper" || $(MKDIR) "kmicromail/libmailwrapper" 121
122 cd kmicromail/libmailwrapper && $(QMAKE) libmailwrapper.pro -o $(MAKEFILE) 122build_micromail: build_microkde
123sub-kmicromail-libmailwrapper: kmicromail/libmailwrapper/$(MAKEFILE) FORCE 123 ifdef BUILD_NO_MICROMAIL
124 cd kmicromail/libmailwrapper && $(MAKE) -f $(MAKEFILE) 124 @echo == kmicromail not build.
125 125 else
126kmicromail/$(MAKEFILE): 126 for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
127 @$(CHK_DIR_EXISTS) "kmicromail" || $(MKDIR) "kmicromail" 127 make -f Makefile$(PLATFORM) || exit 1; popd; \
128 cd kmicromail && $(QMAKE) kmicromail.pro -o $(MAKEFILE) 128 done
129sub-kmicromail: kmicromail/$(MAKEFILE) FORCE 129 endif
130 cd kmicromail && $(MAKE) -f $(MAKEFILE) 130
131 131build_gammu: variable_test tmake
132pwmanager/libcrypt/cipher/$(MAKEFILE): 132 ifdef BUILD_NO_GAMMU
133 @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/cipher" || $(MKDIR) "pwmanager/libcrypt/cipher" 133 @echo == gammu not build.
134 cd pwmanager/libcrypt/cipher && $(QMAKE) cipher.pro -o $(MAKEFILE) 134 else
135sub-pwmanager-libcrypt-cipher: pwmanager/libcrypt/cipher/$(MAKEFILE) FORCE 135 for i in $(SUBDIRS_GAMMU); do pushd $$i; \
136 cd pwmanager/libcrypt/cipher && $(MAKE) -f $(MAKEFILE) 136 make -f Makefile$(PLATFORM) || exit 1; popd; \
137 137 done
138pwmanager/libcrypt/error/$(MAKEFILE): 138 endif
139 @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/error" || $(MKDIR) "pwmanager/libcrypt/error" 139
140 cd pwmanager/libcrypt/error && $(QMAKE) error.pro -o $(MAKEFILE) 140build_pwmanager: build_microkde
141sub-pwmanager-libcrypt-error: pwmanager/libcrypt/error/$(MAKEFILE) FORCE 141 ifdef BUILD_NO_PWMANAGER
142 cd pwmanager/libcrypt/error && $(MAKE) -f $(MAKEFILE) 142 @echo == pwmanager not build.
143 143 else
144pwmanager/libcrypt/mpi/$(MAKEFILE): 144 for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \
145 @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/mpi" || $(MKDIR) "pwmanager/libcrypt/mpi" 145 make -f Makefile$(PLATFORM) || exit 1; popd; \
146 cd pwmanager/libcrypt/mpi && $(QMAKE) mpi.pro -o $(MAKEFILE) 146 done
147sub-pwmanager-libcrypt-mpi: pwmanager/libcrypt/mpi/$(MAKEFILE) FORCE 147 endif
148 cd pwmanager/libcrypt/mpi && $(MAKE) -f $(MAKEFILE) 148
149 149
150pwmanager/libcrypt/zlib/$(MAKEFILE): 150variable_info:
151 @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/zlib" || $(MKDIR) "pwmanager/libcrypt/zlib" 151 @echo --------------------------------------
152 cd pwmanager/libcrypt/zlib && $(QMAKE) zlib.pro -o $(MAKEFILE) 152 @echo KDEPIM buildsystem, variableinfo...
153sub-pwmanager-libcrypt-zlib: pwmanager/libcrypt/zlib/$(MAKEFILE) FORCE 153 @echo KDEPIMDIR=$(KDEPIMDIR)
154 cd pwmanager/libcrypt/zlib && $(MAKE) -f $(MAKEFILE) 154 @echo QTDIR=$(QTDIR)
155 155 @echo QPEDIR=$(QPEDIR)
156pwmanager/pwmanager/$(MAKEFILE): 156 @echo OPIEDIR=$(OPIEDIR)
157 @$(CHK_DIR_EXISTS) "pwmanager/pwmanager" || $(MKDIR) "pwmanager/pwmanager" 157 @echo PLATFORM=$(PLATFORM)
158 cd pwmanager/pwmanager && $(QMAKE) pwmanager.pro -o $(MAKEFILE) 158 @echo RELEASE_DEBUG=$(RELEASE_DEBUG)
159sub-pwmanager-pwmanager: pwmanager/pwmanager/$(MAKEFILE) FORCE 159 @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
160 cd pwmanager/pwmanager && $(MAKE) -f $(MAKEFILE) 160 @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
161 161 @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
162Makefile: kdepim-desktop.pro /usr/lib/qt3/mkspecs/default/qmake.conf 162 @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
163 $(QMAKE) -o Makefile kdepim-desktop.pro 163 @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
164qmake: qmake_all 164 ifndef BUILD_NO_SHARP_PLUGIN
165 @$(QMAKE) -o Makefile kdepim-desktop.pro 165 @echo SHARPDTMSDK=$(SHARPDTMSDK)
166 166 endif
167all: $(SUBTARGETS) 167 @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
168qmake_all: libical/$(MAKEFILE) libkcal/$(MAKEFILE) kabc/$(MAKEFILE) libkdepim/$(MAKEFILE) microkde/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE) kabc/plugins/qtopia/$(MAKEFILE) gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) libetpan/$(MAKEFILE) kmicromail/libmailwrapper/$(MAKEFILE) kmicromail/$(MAKEFILE) pwmanager/libcrypt/cipher/$(MAKEFILE) pwmanager/libcrypt/error/$(MAKEFILE) pwmanager/libcrypt/mpi/$(MAKEFILE) pwmanager/libcrypt/zlib/$(MAKEFILE) pwmanager/pwmanager/$(MAKEFILE) 168 @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
169 ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 169 @echo --------------------------------------
170 ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 170
171 ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 171variable_test: variable_info
172 ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 172 @echo KDEPIM buildsystem, variablecheck...
173 ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 173 ifndef KDEPIMDIR
174 ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 174 @echo KDEPIMDIR is not defined.
175 ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 175 $(error KDEPIMDIR is not defined)
176 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 176 endif
177 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 177 ifndef PLATFORM
178 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 178 @echo PLATFORM is not defined.
179 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 179 $(error PLATFORM is not defined)
180 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 180 endif
181 ( [ -d libetpan ] && cd libetpan ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 181 ifdef BUILD_NO_LDAP_PLUGIN
182 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 182 @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
183 ( [ -d kmicromail ] && cd kmicromail ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 183 endif
184 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 184 ifdef BUILD_NO_OPIE_PLUGIN
185 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 185 @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
186 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 186 endif
187 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 187 ifdef BUILD_NO_QTOPIA_PLUGIN
188 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true 188 @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
189clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE 189 endif
190 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true 190 ifdef BUILD_NO_MICROMAIL
191 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true 191 @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
192 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true 192 endif
193 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true 193 ifdef BUILD_NO_SHARP_PLUGIN
194 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true 194 @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
195 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true 195 else
196 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true 196 ifndef SHARPDTMSDK
197 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true 197 @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
198 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true 198 $(error SHARPDTMSDK is not defined)
199 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; ) || true 199 endif
200 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true 200 endif
201 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true 201 ifdef BUILD_NO_GAMMU
202 ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) $@; ) || true 202 @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
203 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) $@; ) || true 203 endif
204 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) $@; ) || true 204 ifdef BUILD_NO_PWMANAGER
205 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; ) || true 205 @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
206 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; ) || true 206 endif
207 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; ) || true 207 @echo --------------------------------------
208 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; ) || true 208
209 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; ) || true 209
210uninstall_subdirs: qmake_all FORCE 210objects:
211 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 211 for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
212 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 212 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
213 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 213 mkdir -p libical/lib/$(PLATFORM)
214 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 214 mkdir -p dest
215 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 215 mkdir -p dest$(LIBICAL_PATH)
216 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 216 mkdir -p pwmanager/libcrypt/$(PLATFORM)
217 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 217
218 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 218clean:
219 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 219 rm -rf libical/lib/$(PLATFORM)/*;
220 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 220 rm -rf pwmanager/libcrypt/$(PLATFORM)/*;
221 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 221 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
222 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 222 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
223 ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 223 done
224 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 224
225 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 225pac:
226 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 226 rm -f $(QPEDIR)/lib/libmicro*
227 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 227 rm -f $(QPEDIR)/plugins/applets/libkopi*
228 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 228 make
229 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 229 make install
230 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true 230 make dist
231install_subdirs: qmake_all FORCE 231install:
232 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true 232
233 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true 233 cd bin/kdepim; make install
234 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true 234 cp -r Pim $(QPEDIR)/apps
235 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true 235 cp db2file/db2file $(QPEDIR)/bin/db2file
236 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true 236 chmod ugo+x $(QPEDIR)/bin/db2file
237 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true 237 cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
238 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true 238 cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
239 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true 239 cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
240 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true 240 cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
241 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) install; ) || true 241
242 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true 242dist:
243 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) install; ) || true 243 @echo Dont forget to do "make install" before "make dist"
244 ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) install; ) || true 244 rm -f *arm.ipk
245 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) install; ) || true 245 rm -f *ipk.zip
246 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) install; ) || true 246 rm -rf ../kdepimpi_$(KDEPIM_VERSION)/*
247 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) install; ) || true 247 rm -f *~
248 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) install; ) || true 248 cd ..;mkdir -p kdepimpi_$(KDEPIM_VERSION)
249 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) install; ) || true 249 cd ../kdepimpi_$(KDEPIM_VERSION);mkdir -p ipk
250 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) install; ) || true 250 cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim
251 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) install; ) || true 251 mkipks kmicrokdelibs.control
252distclean: qmake_all FORCE 252 mkipks korganizer.control
253 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 253 mkipks kaddressbook.control
254 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 254 ifndef BUILD_NO_MICROMAIL
255 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 255 mkipks kopiemail.control
256 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 256 endif
257 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 257 ifndef BUILD_NO_SHARP_PLUGIN
258 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 258 mkipks ksharpPIM-DTMaccess.control
259 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 259 endif
260 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 260 mkipks korganizer-alarm.control
261 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 261 ifndef BUILD_NO_GAMMU
262 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 262 mkipks kmobilephoneaccess.control
263 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 263 endif
264 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 264 ifndef BUILD_NO_PWMANAGER
265 ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 265 mkipks pwmanager.control
266 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 266 endif
267 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 267 mkipks pimTABicon.control
268 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 268 zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk ReleaseNotes.txt
269 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 269 mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/
270 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 270 mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/
271 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 271 mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../kdepimpi_$(KDEPIM_VERSION)/
272 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true 272
273 273tmake: objects \
274install: install_subdirs 274 qtcompat/Makefile$(PLATFORM) \
275 275 microkde/Makefile$(PLATFORM) \
276uninstall: uninstall_subdirs 276 libkcal/Makefile$(PLATFORM) \
277 277 libkdepim/Makefile$(PLATFORM) \
278FORCE: 278 korganizer/Makefile$(PLATFORM) \
279 kalarmd/Makefile$(PLATFORM) \
280 libical/src/libical/Makefile$(PLATFORM) \
281 libical/src/libicalss/Makefile$(PLATFORM) \
282 kabc/Makefile$(PLATFORM) \
283 kabc/formats/binary/Makefile$(PLATFORM) \
284 kabc/plugins/file/Makefile$(PLATFORM) \
285 kabc/plugins/dir/Makefile$(PLATFORM) \
286 kabc/plugins/ldap/Makefile$(PLATFORM) \
287 kabc/plugins/opie/Makefile$(PLATFORM) \
288 kabc/plugins/qtopia/Makefile$(PLATFORM) \
289 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
290 kaddressbook/Makefile$(PLATFORM) \
291 kmicromail/Makefile$(PLATFORM) \
292 libetpan/Makefile$(PLATFORM) \
293 kmicromail/libmailwrapper/Makefile$(PLATFORM) \
294 gammu/emb/common/Makefile$(PLATFORM) \
295 gammu/emb/gammu/Makefile$(PLATFORM) \
296 pwmanager/pwmanager/Makefile$(PLATFORM) \
297 pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
298 pwmanager/libcrypt/error/Makefile$(PLATFORM) \
299 pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
300 pwmanager/libcrypt/zlib/Makefile$(PLATFORM)
301
302qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
303 cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
304
305microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
306 cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM)
307
308libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
309 cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM)
310
311
312libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
313 cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM)
314
315kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
316 cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM)
317
318korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
319 cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM)
320
321libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
322 cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM)
323
324libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
325 cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM)
326
327kabc/Makefile$(PLATFORM): kabc/kabcE.pro
328 cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM)
329
330kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
331 cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
332
333kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
334 cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM)
335
336kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
337 cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM)
338
339kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
340 cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM)
341
342kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
343 cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM)
344
345kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
346 cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)
347
348kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
349 cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)
350
351kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
352 cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)
353
354kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
355 cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)
356
357libetpan/Makefile$(PLATFORM): libetpan/libetpanE.pro
358 cd libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
359
360kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
361 cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
362
363gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
364 cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
365
366gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
367 cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
368
369pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
370 cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)
371
372
373pwmanager/libcrypt/mpi/Makefile$(PLATFORM): pwmanager/libcrypt/mpi/mpi.pro
374 cd pwmanager/libcrypt/mpi;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" mpi.pro -o Makefile$(PLATFORM)
375
376pwmanager/libcrypt/error/Makefile$(PLATFORM): pwmanager/libcrypt/error/error.pro
377 cd pwmanager/libcrypt/error;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" error.pro -o Makefile$(PLATFORM)
378
379pwmanager/libcrypt/cipher/Makefile$(PLATFORM): pwmanager/libcrypt/cipher/cipher.pro
380 cd pwmanager/libcrypt/cipher;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" cipher.pro -o Makefile$(PLATFORM)
381
382pwmanager/libcrypt/zlib/Makefile$(PLATFORM): pwmanager/libcrypt/zlib/zlib.pro
383 cd pwmanager/libcrypt/zlib;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" zlib.pro -o Makefile$(PLATFORM)
384
279 385
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index c6e6d9b..b3a406c 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1066,266 +1066,266 @@
1066{ "Incoming calendar filter:","Eingehender Kalender Filter:" }, 1066{ "Incoming calendar filter:","Eingehender Kalender Filter:" },
1067{ "Incoming addressbook filter:","Eingehender Adressbuch Filter:" }, 1067{ "Incoming addressbook filter:","Eingehender Adressbuch Filter:" },
1068{ "Write back options","Optionen zum Zurückschreiben" }, 1068{ "Write back options","Optionen zum Zurückschreiben" },
1069{ "Write back (on remote) existing entries only","Schreibe nur existierende (auf Entfernt) Einträge zurück" }, 1069{ "Write back (on remote) existing entries only","Schreibe nur existierende (auf Entfernt) Einträge zurück" },
1070{ "Apply filter when adding data to remote:","Filter für das Hinzufügen von Daten zu Entfernt:" }, 1070{ "Apply filter when adding data to remote:","Filter für das Hinzufügen von Daten zu Entfernt:" },
1071{ "Outgoing calendar filter:","Ausgehender Kalender Filter:" }, 1071{ "Outgoing calendar filter:","Ausgehender Kalender Filter:" },
1072{ "Outgoing addressbook filter:","Ausgehender Adressbuch Filter:" }, 1072{ "Outgoing addressbook filter:","Ausgehender Adressbuch Filter:" },
1073{ "Write back (calendar) entries for time period only","Schreibe nur Kalender Einträge für Zeitspanne zurück" }, 1073{ "Write back (calendar) entries for time period only","Schreibe nur Kalender Einträge für Zeitspanne zurück" },
1074{ "Time period","Zeitspanne" }, 1074{ "Time period","Zeitspanne" },
1075{ "From ","Von " }, 1075{ "From ","Von " },
1076{ " weeks in the past to "," Wochen in der Vergangenheit bis zu " }, 1076{ " weeks in the past to "," Wochen in der Vergangenheit bis zu " },
1077{ " weeks in the future "," Wochen in der Zukunft " }, 1077{ " weeks in the future "," Wochen in der Zukunft " },
1078{ "Profile kind specific settings","Profil Art abhängige Einstellungen" }, 1078{ "Profile kind specific settings","Profil Art abhängige Einstellungen" },
1079{ "Local temp file:","Lokale temp Datei:" }, 1079{ "Local temp file:","Lokale temp Datei:" },
1080{ "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" }, 1080{ "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" },
1081{ "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" }, 1081{ "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" },
1082{ "Language","Sprache" }, 1082{ "Language","Sprache" },
1083{ "Time Format","Zeit Format" }, 1083{ "Time Format","Zeit Format" },
1084{ "Time Zone","Zeit Zone" }, 1084{ "Time Zone","Zeit Zone" },
1085{ "%1 groups subscribed","%1 Guppen abboniert" }, 1085{ "%1 groups subscribed","%1 Guppen abboniert" },
1086{ "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Aktuelles Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverz.)/apps/kopiemail/localmail" }, 1086{ "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Aktuelles Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverz.)/apps/kopiemail/localmail" },
1087{ "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" }, 1087{ "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" },
1088{ "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" }, 1088{ "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" },
1089{ "Save settings","Speichere Einstellungen" }, 1089{ "Save settings","Speichere Einstellungen" },
1090{ "Save standard","Speichere Standard" }, 1090{ "Save standard","Speichere Standard" },
1091{ "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" }, 1091{ "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },
1092{ "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" }, 1092{ "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" },
1093{ "Data storage path","Daten Speicherpfad" }, 1093{ "Data storage path","Daten Speicherpfad" },
1094{ "Language","Sprache" }, 1094{ "Language","Sprache" },
1095{ "Show time in agenda items","Zeige Zeit in Agenda Items" }, 1095{ "Show time in agenda items","Zeige Zeit in Agenda Items" },
1096{ "Color for Sundays + category "Holiday"","Farbe für Sonntags + Kategorie "Feiertag"" }, 1096{ "Color for Sundays + category "Holiday"","Farbe für Sonntags + Kategorie "Feiertag"" },
1097{ "Show events, that are done in \nWhat's Next view","Zeige abgelaufene Termine in\nWhat's Next Ansicht" }, 1097{ "Show events, that are done in \nWhat's Next view","Zeige abgelaufene Termine in\nWhat's Next Ansicht" },
1098{ "Hide not running Todos in To-do view","Verstecke nicht laufende Todos" }, 1098{ "Hide not running Todos in To-do view","Verstecke nicht laufende Todos" },
1099{ "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" }, 1099{ "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
1100{ "KO/Pi","KO/Pi" }, 1100{ "KO/Pi","KO/Pi" },
1101{ "There is nothing to undo!","Es gibt nichts zum\nRückgängigmachen!" }, 1101{ "There is nothing to undo!","Es gibt nichts zum\nRückgängigmachen!" },
1102{ "Recreating edit dialog. Please wait...","Recreating edit dialog. Please wait..." }, 1102{ "Recreating edit dialog. Please wait...","Recreating edit dialog. Please wait..." },
1103{ "Sound.Al.: ","Sound.Al.: " }, 1103{ "Sound.Al.: ","Sound.Al.: " },
1104{ "From: %1 To: %2 %3","Von: %1 Bis: %2 %3" }, 1104{ "From: %1 To: %2 %3","Von: %1 Bis: %2 %3" },
1105{ "Restore","Wiederherstellen" }, 1105{ "Restore","Wiederherstellen" },
1106{ "\nAre you sure you want\nto restore this?","\nMöchten Sie das wirklicht\nwiederherstellen?" }, 1106{ "\nAre you sure you want\nto restore this?","\nMöchten Sie das wirklicht\nwiederherstellen?" },
1107{ "% completed","% erledigt" }, 1107{ "% completed","% erledigt" },
1108{ "%d item(s) found.","%d Item(s) gefunden." }, 1108{ "%d item(s) found.","%d Item(s) gefunden." },
1109{ "Set complete","Setze auf erledigt" }, 1109{ "Set complete","Setze auf erledigt" },
1110{ "(cancelled)","(gecancelt)" }, 1110{ "(cancelled)","(gecancelt)" },
1111{ "Click on the week number to\nshow week in agenda view","Klicke auf die Wochennummer\num die Woche in der Agenda anzuzeigen" }, 1111{ "Click on the week number to\nshow week in agenda view","Klicke auf die Wochennummer\num die Woche in der Agenda anzuzeigen" },
1112{ " Local time "," Locale Zeit " }, 1112{ " Local time "," Locale Zeit " },
1113{ "Form2","Form2" }, 1113{ "Form2","Form2" },
1114{ "Filter enabled","Filter angeschaltet" }, 1114{ "Filter enabled","Filter angeschaltet" },
1115{ "Edit Filters","Ändere Filter" }, 1115{ "Edit Filters","Ändere Filter" },
1116{ "Print What's Next View...","Drucke What's Next Ansicht..." }, 1116{ "Print What's Next View...","Drucke What's Next Ansicht..." },
1117{ "Agenda","Agenda" }, 1117{ "Agenda","Agenda" },
1118{ " ("," (" }, 1118{ " ("," (" },
1119{ "<p><b>Due on:</b> %1</p>","<p><b>Fällig am:</b> %1</p>" }, 1119{ "<p><b>Due on:</b> %1</p>","<p><b>Fällig am:</b> %1</p>" },
1120{ "Print","Print" }, 1120{ "Print","Print" },
1121{ "&Setup Printer...","Drucker &Setup..." }, 1121{ "&Setup Printer...","Drucker &Setup..." },
1122{ "View Type","Zeige Typ" }, 1122{ "View Type","Zeige Typ" },
1123{ "Page &orientation:","Seiten Ausrichtung:" }, 1123{ "Page &orientation:","Seiten Ausrichtung:" },
1124{ "Use Default of Selected Style","Default des selektierten Stils" }, 1124{ "Use Default of Selected Style","Default des selektierten Stils" },
1125{ "Use Default Setting of Printer","Default Einstellung des Druckers" }, 1125{ "Use Default Setting of Printer","Default Einstellung des Druckers" },
1126{ "Portrait","Portrait" }, 1126{ "Portrait","Portrait" },
1127{ "Landscape","Landschaft" }, 1127{ "Landscape","Landschaft" },
1128{ "Print day","Drucke Tag" }, 1128{ "Print day","Drucke Tag" },
1129{ "CalPrintDay_Base","CalPrintDay_Base" }, 1129{ "CalPrintDay_Base","CalPrintDay_Base" },
1130{ "Date && Time Range","Datum && Zeitspanne" }, 1130{ "Date && Time Range","Datum && Zeitspanne" },
1131{ "&End date:","&Enddatum:" }, 1131{ "&End date:","&Enddatum:" },
1132{ "&Start date:","&Startdatum:" }, 1132{ "&Start date:","&Startdatum:" },
1133{ "Start &time:","Startzeit:" }, 1133{ "Start &time:","Startzeit:" },
1134{ "End ti&me:","Endzeit:" }, 1134{ "End ti&me:","Endzeit:" },
1135{ "E&xtend time range to include all events","Erweitere Zeitspanne um alle Termine einzuschliessen" }, 1135{ "E&xtend time range to include all events","Erweitere Zeitspanne um alle Termine einzuschliessen" },
1136{ "Include to&dos that are due on the printed day(s)","Inclusive To&dos, die an den selektierten Tagen fällig sind" }, 1136{ "Include to&dos that are due on the printed day(s)","Inclusive To&dos, die an den selektierten Tagen fällig sind" },
1137{ "Alt+D","Alt+D" }, 1137{ "Alt+D","Alt+D" },
1138{ "&Use colors","Nutze Farben" }, 1138{ "&Use colors","Nutze Farben" },
1139{ "Alt+U","Alt+U" }, 1139{ "Alt+U","Alt+U" },
1140{ "Print week","Drucke Woche" }, 1140{ "Print week","Drucke Woche" },
1141{ "CalPrintWeek_Base","CalPrintWeek_Base" }, 1141{ "CalPrintWeek_Base","CalPrintWeek_Base" },
1142{ "Use &colors","Nutze Farben" }, 1142{ "Use &colors","Nutze Farben" },
1143{ "Type of View","Typ der Ansicht" }, 1143{ "Type of View","Typ der Ansicht" },
1144{ "Print as &Filofax page","Drucke als &Filofax Seite" }, 1144{ "Print as &Filofax page","Drucke als &Filofax Seite" },
1145{ "Alt+F","Alt+F" }, 1145{ "Alt+F","Alt+F" },
1146{ "Print as &timetable view:","Drucke als Zeittabelle:" }, 1146{ "Print as &timetable view:","Drucke als Zeittabelle:" },
1147{ "Alt+T","Alt+T" }, 1147{ "Alt+T","Alt+T" },
1148{ "Print as split week view","Drucke als gesplittete Wochenansicht" }, 1148{ "Print as split week view","Drucke als gesplittete Wochenansicht" },
1149{ "Print month","Drucke Monat" }, 1149{ "Print month","Drucke Monat" },
1150{ "CalPrintMonth_Base","CalPrintMonth_Base" }, 1150{ "CalPrintMonth_Base","CalPrintMonth_Base" },
1151{ "&Start month:","&Startmonat:" }, 1151{ "&Start month:","&Startmonat:" },
1152{ "&End month:","&Endmonat:" }, 1152{ "&End month:","&Endmonat:" },
1153{ "Print week &numbers","Drucke Wochen Nummer(n)" }, 1153{ "Print week &numbers","Drucke Wochen Nummer(n)" },
1154{ "Print todos","Drucke Todos" }, 1154{ "Print todos","Drucke Todos" },
1155{ "CalPrintTodoConfig_Base","CalPrintTodoConfig_Base" }, 1155{ "CalPrintTodoConfig_Base","CalPrintTodoConfig_Base" },
1156{ "Include &description of the item","Inclusive Itembeschreibung" }, 1156{ "Include &description of the item","Inclusive Itembeschreibung" },
1157{ "Include d&ue date of the item","Inclusive Fälligkeitsdatum des Items" }, 1157{ "Include d&ue date of the item","Inclusive Fälligkeitsdatum des Items" },
1158{ "Include &priority of the item","Inclusive Priorität des Items" }, 1158{ "Include &priority of the item","Inclusive Priorität des Items" },
1159{ "Items to Print","Zu druckende Items" }, 1159{ "Items to Print","Zu druckende Items" },
1160{ "&From:","Von:" }, 1160{ "&From:","Von:" },
1161{ "&To:","Bis:" }, 1161{ "&To:","Bis:" },
1162{ "Print &all todo items","Drucke alle Todo Items" }, 1162{ "Print &all todo items","Drucke alle Todo Items" },
1163{ "Print only &uncompleted items","Drucke nur nicht erledigte Todos" }, 1163{ "Print only &uncompleted items","Drucke nur nicht erledigte Todos" },
1164{ "Only items due in the &range:","Nur Items in dem Zeitraum:" }, 1164{ "Only items due in the &range:","Nur Items in dem Zeitraum:" },
1165{ "Todo List","Todo Liste" }, 1165{ "Todo List","Todo Liste" },
1166{ "&Title:","&Titel:" }, 1166{ "&Title:","&Titel:" },
1167{ "Co&nnect subtodos with its parent","Verbinde Unter-Todos mit ihren Ober-Todos" }, 1167{ "Co&nnect subtodos with its parent","Verbinde Unter-Todos mit ihren Ober-Todos" },
1168{ "Todo list","Todo Liste" }, 1168{ "Todo list","Todo Liste" },
1169{ "&Print...","Drucke..." }, 1169{ "&Print...","Drucke..." },
1170{ "<qt>Printing on printer <b>%1</b></qt>","<qt>Drucke auf Drucker <b>%1</b></qt>" }, 1170{ "<qt>Printing on printer <b>%1</b></qt>","<qt>Drucke auf Drucker <b>%1</b></qt>" },
1171{ "[Unconfigured]","[Unkonfiguriert]" }, 1171{ "[Unconfigured]","[Unkonfiguriert]" },
1172{ "OK","OK" }, 1172{ "OK","OK" },
1173{ "FilterEditor","FilterEditor" }, 1173{ "FilterEditor","FilterEditor" },
1174{ "Include","Inclusive" }, 1174{ "Include","Inclusive" },
1175{ "Exclude","Exclusive" }, 1175{ "Exclude","Exclusive" },
1176{ "Edit Selection...","Editiere Auswahl" }, 1176{ "Edit Selection...","Editiere Auswahl" },
1177{ "recurring events","wiederholende Termine" }, 1177{ "recurring events","wiederholende Termine" },
1178{ "recurr. events","wiederh.Termine" }, 1178{ "recurr. events","wiederh.Termine" },
1179{ "completed to-dos","erledigte Todos" }, 1179{ "completed to-dos","erledigte Todos" },
1180{ "events","Termine" }, 1180{ "events","Termine" },
1181{ "todos","Todos" }, 1181{ "todos","Todos" },
1182{ "journals","Journale" }, 1182{ "journals","Journale" },
1183{ "public","öffentl." }, 1183{ "public","öffentl." },
1184{ "private","privat" }, 1184{ "private","privat" },
1185{ "confidential","vertraul." }, 1185{ "confidential","vertraul." },
1186{ "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Unter-Todos.\nAlle erledigten Unter-Todos\nwerden auch gelöscht!" }, 1186{ "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Unter-Todos.\nAlle erledigten Unter-Todos\nwerden auch gelöscht!" },
1187{ "Yesterday","Gestern" }, 1187{ "Yesterday","Gestern" },
1188{ "Day after tomorrow","Übermorgen" }, 1188{ "Day after tomorrow","Übermorgen" },
1189{ "Tomorrow","Morgen" }, 1189{ "Tomorrow","Morgen" },
1190{ "Day before yesterday","Vorgestern" }, 1190{ "Day before yesterday","Vorgestern" },
1191{ "Size %1","Größe %1" }, 1191{ "Size %1","Größe %1" },
1192{ "New Agendasize: %1","Neue Agendagröße: %1" }, 1192{ "New Agendasize: %1","Neue Agendagröße: %1" },
1193{ " (%1 y.)"," (%1 J.)" }, 1193{ " (%1 y.)"," (%1 J.)" },
1194{ "Allday:","Ganztägig:" }, 1194{ "Allday:","Ganztägig:" },
1195{ "compl.todos","erled.Todos" }, 1195{ "compl.todos","erled.Todos" },
1196{ "Day view","Tagesansicht" }, 1196{ "Day view","Tagesansicht" },
1197{ "Next days","Nächste Tage" }, 1197{ "Next days","Nächste Tage" },
1198{ "Next week","Nächste Woche" }, 1198{ "Next week","Nächste Woche" },
1199{ "Next two weeks","Nächste zwei Wochen" }, 1199{ "Next two weeks","Nächste zwei Wochen" },
1200{ "Next month","Nächster Monat" }, 1200{ "Next month","Nächster Monat" },
1201{ "Journal view","Journal" }, 1201{ "Journal view","Journal" },
1202{ "Display all opened","Zeige alle geöffnet" }, 1202{ "Display all opened","Zeige alle geöffnet" },
1203{ "Display all closed","Zeige alle geschlossen" }, 1203{ "Display all closed","Zeige alle geschlossen" },
1204{ "Display all flat","Zeige alle flach" }, 1204{ "Display all flat","Zeige alle flach" },
1205{ "<p><i>Completed on %1</i></p>","<p><i>Erledigt am %1</i></p>" }, 1205{ "<p><i>Completed on %1</i></p>","<p><i>Erledigt am %1</i></p>" },
1206{ "Default todo done color:","Standard Todo erledigt Farbe" }, 1206{ "Default todo done color:","Standard Todo erledigt Farbe" },
1207{ "Select week %1-%2","Wähle Woche %1-%2" }, 1207{ "Select week %1-%2","Wähle Woche %1-%2" },
1208{ "Select Week","Wähle Woche" }, 1208{ "Select Week","Wähle Woche" },
1209{ "Set alarm for selected...","Setze Alarm für Selekt..." }, 1209{ "Set alarm for selected...","Setze Alarm für Selekt..." },
1210{ "Set Alarm!","Setze Alarm!" }, 1210{ "Set Alarm!","Setze Alarm!" },
1211{ "Canged alarm for %1 items","Alarm für %1 Items geändert" }, 1211{ "Canged alarm for %1 items","Alarm für %1 Items geändert" },
1212{ " and "," und " }, 1212{ " and "," und " },
1213{ "<IMG src="%1"> only )","nur <IMG src="%1"> )" }, 1213{ "<IMG src="%1"> only )","nur <IMG src="%1"> )" },
1214{ "Mail to selected","Mail an Ausgewählte" }, 1214{ "Mail to selected","Mail an Ausgewählte" },
1215{ "Mail to all","Mail an Alle" }, 1215{ "Mail to all","Mail an Alle" },
1216{ "Week view mode uses bigger font","Wochenansicht Modus nutzt größeren Font" }, 1216{ "Week view mode uses bigger font","Wochenansicht Modus nutzt größeren Font" },
1217{ "Set reminder ON with offset to:","Alarm AN mit Offset auf:" }, 1217{ "Set reminder ON with offset to:","Alarm AN mit Offset auf:" },
1218{ " on"," am" }, 1218{ " on"," am" },
1219{ " completed on "," erledigt am " }, 1219{ " completed on "," erledigt am " },
1220{ "Save as Event template","Speichere als Vorlage" }, 1220{ "Save as Event template","Speichere als Vorlage" },
1221{ "Load Event template","Lade Termin Vorlage" }, 1221{ "Load Event template","Lade Termin Vorlage" },
1222{ "Save as Journal template","Speichere als Journal Vorlage" }, 1222{ "Save as Journal template","Speichere als Journal Vorlage" },
1223{ "Insert Journal template","Füge Journal Vorlage ein" }, 1223{ "Insert Journal template","Füge Journal Vorlage ein" },
1224{ "Sub todos:<br>","Unter Todos:<br>" }, 1224{ "Sub todos:<br>","Unter Todos:<br>" },
1225{ "Parent todo:<br>","Über Todo:<br>" }, 1225{ "Parent todo:<br>","Über Todo:<br>" },
1226{ "Set current as color category","Setze Gewählte als Farbkategorie" }, 1226{ "Set current as color category","Setze Gewählte als Farbkategorie" },
1227{ " completed"," erledigt" }, 1227{ " completed"," erledigt" },
1228{ "(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.info --- 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.info --- www.korganizer.org\nBesonderen Dank an Michael und Ben\nfür intensives Testen!" }, 1228{ "(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.info --- 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.info --- www.korganizer.org\nBesonderen Dank an Michael und Ben\nfür intensives Testen!" },
1229{ "Syncing aborted. Nothing synced.","Syncing abgebrochen.Nichts wurde gesynct." }, 1229{ "Syncing aborted. Nothing synced.","Syncing abgebrochen.Nichts wurde gesynct." },
1230{ "Connected! Sending request for remote file ...","Verbunden! Sende Daten Anfrage..." }, 1230{ "Connected! Sending request for remote file ...","Verbunden! Sende Daten Anfrage..." },
1231{ "Trying to connect to remote...","Versuche mit Gegenstelle zu verbinden..." }, 1231{ "Trying to connect to remote...","Versuche mit Gegenstelle zu verbinden..." },
1232{ "Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?","Verbindungsversuch wegen\nZeitüberschreitung gescheitert!\nWurde vergessen Pi-Sync auf\nder Gegenstelle anzuschalten?" }, 1232{ "Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?","Verbindungsversuch wegen\nZeitüberschreitung gescheitert!\nWurde vergessen Pi-Sync auf\nder Gegenstelle anzuschalten?" },
1233{ "ERROR: Receiving remote file failed.","FEHLER: Empfang der entfernten Daten fehlgeschlagen." }, 1233{ "ERROR: Receiving remote file failed.","FEHLER: Empfang der entfernten Daten fehlgeschlagen." },
1234{ "Error","Fehler" }, 1234{ "Error","Fehler" },
1235{ ""You entered an invalid date!\n Date changed to current date.","Ungültiges Datum eingegeben.\nSetze heutiges Datum." }, 1235{ ""You entered an invalid date!\n Date changed to current date.","Ungültiges Datum eingegeben.\nSetze heutiges Datum." },
1236{ "You entered an invalid date!\n Will use current date instead.","Ungültiges Datum eingegeben.\nSetze stattdessen heutiges Datum." }, 1236{ "You entered an invalid date!\n Will use current date instead.","Ungültiges Datum eingegeben.\nSetze stattdessen heutiges Datum." },
1237{ "Warning","Warnung" }, 1237{ "Warning","Warnung" },
1238{ "Select week number","Wähle Wochen Nummer" }, 1238{ "Select week number","Wähle Wochen Nummer" },
1239{ "Februar","Februar" }, 1239{ "Februar","Februar" },
1240{ "Click on the week number to\nshow week zoomed","Klicke auf die Wochennummer\num die Woche groß zu zeigen" }, 1240{ "Click on the week number to\nshow week zoomed","Klicke auf die Wochennummer\num die Woche groß zu zeigen" },
1241{ "W","W" }, 1241{ "W","W" },
1242{ "Click on this to\nselect week number","Klicke hierauf um\ndie Woche auszuwählen" }, 1242{ "Click on this to\nselect week number","Klicke hierauf um\ndie Woche auszuwählen" },
1243{ "T: %1","T: %1" }, 1243{ "T: %1","T: %1" },
1244{ "Start: ","Start: " }, 1244{ "Start: ","Start: " },
1245{ "Pi-Sync options for device: ","Pi-Sync Einstellungen für Gerät: " }, 1245{ "Pi-Sync options for device: ","Pi-Sync Einstellungen für Gerät: " },
1246{ "Password for remote access:","Passwort für fernen Zugriff:" }, 1246{ "Password for remote access:","Passwort für fernen Zugriff:" },
1247{ "Remote IP address:","Ferne IP Adresse:" }, 1247{ "Remote IP address:","Ferne IP Adresse:" },
1248{ "Remote port number:","Ferne Port Nummer:" }, 1248{ "Remote port number:","Ferne Port Nummer:" },
1249{ "Remote file saved to temp file.","Ferne Daten in temp Datei gespeichert." }, 1249{ "Remote file saved to temp file.","Ferne Daten in temp Datei gespeichert." },
1250{ "Remote from: ","Fern von: " }, 1250{ "Remote from: ","Fern von: " },
1251{ "Local from: ","Lokal von: " }, 1251{ "Local from: ","Lokal von: " },
1252{ "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n %d incoming filtered out\n %d outgoing filtered out\n","Synchronisationsübersicht:\n\n %d lokal hinzugefügt\n %d fern hinzugefügt\n %d lokal geändert\n %d fern geändert\n %d lokal gelöscht\n %d fern gelöscht\n %d eingehende ausgefiltert\n %d ausgehende ausgefiltert\n" }, 1252{ "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n %d incoming filtered out\n %d outgoing filtered out\n","Synchronisationsübersicht:\n\n %d lokal hinzugefügt\n %d fern hinzugefügt\n %d lokal geändert\n %d fern geändert\n %d lokal gelöscht\n %d fern gelöscht\n %d eingehende ausgefiltert\n %d ausgehende ausgefiltert\n" },
1253{ "Local calendar changed!\n","Lokaler Kalender geändert!\n" }, 1253{ "Local calendar changed!\n","Lokaler Kalender geändert!\n" },
1254{ "Write back","Schreibe zurück" }, 1254{ "Write back","Schreibe zurück" },
1255{ "KO/Pi Synchronization","KO/Pi Synchronisation" }, 1255{ "KO/Pi Synchronization","KO/Pi Synchronisation" },
1256{ "Pi-Sync succesful!","Pi-Sync erfolgreich!" }, 1256{ "Pi-Sync succesful!","Pi-Sync erfolgreich!" },
1257{ "Received sync request","Sync Anfrage erhalten" }, 1257{ "Received sync request","Sync Anfrage erhalten" },
1258{ "Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog.","Ferne Synchronisation ...\n\nBenutze diese Anwendung nicht!\n\nWenn das Syncen fehlschlägt kann\ndieser Dialog geschlossen werden." }, 1258{ "Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog.","Ferne Synchronisation ...\n\nBenutze diese Anwendung nicht!\n\nWenn das Syncen fehlschlägt kann\ndieser Dialog geschlossen werden." },
1259{ "Saving Data to temp file ...","Speichere Daten in temp Datei..." }, 1259{ "Saving Data to temp file ...","Speichere Daten in temp Datei..." },
1260{ "Data saved to temp file!","Daten in temp Datei gespeichert!" }, 1260{ "Data saved to temp file!","Daten in temp Datei gespeichert!" },
1261{ "Sending file...","Sende Datei..." }, 1261{ "Sending file...","Sende Datei..." },
1262{ "Waiting for synced file...","Warte auf gesyncte Daten..." }, 1262{ "Waiting for synced file...","Warte auf gesyncte Daten..." },
1263{ "Receiving synced file...","Gesyncte Daten erhalten..." }, 1263{ "Receiving synced file...","Gesyncte Daten erhalten..." },
1264{ "Received %1 bytes","%1 Bytes erhalten" }, 1264{ "Received %1 bytes","%1 Bytes erhalten" },
1265{ "Writing file to disk...","Speichere Datei..." }, 1265{ "Writing file to disk...","Speichere Datei..." },
1266{ "Pi-Sync successful!","Pi-Sync erfolgreich!" }, 1266{ "Pi-Sync successful!","Pi-Sync erfolgreich!" },
1267{ "Clock skew of\nsyncing devices\nis %1 seconds!","Uhrzeitunterschied der\nsyncenden Geräte\nist %1 Sekunden!" }, 1267{ "Clock skew of\nsyncing devices\nis %1 seconds!","Uhrzeitunterschied der\nsyncenden Geräte\nist %1 Sekunden!" },
1268{ "Synchronize!","Synchronisiere!" }, 1268{ "Synchronize!","Synchronisiere!" },
1269{ "High clock skew!","Großer Uhrzeitunterschied!" }, 1269{ "High clock skew!","Großer Uhrzeitunterschied!" },
1270{ "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" }, 1270{ "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" },
1271{ "The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!","Die Uhren der syncenden Geräte\nhaben einen Unterschied von\nmehr als 5 Minuten. Bitte die\nUhrzeiten anpassen. Sie können\nfalsche Sync-Resultate erhalten!\nBitte das Syncen bestätigen!" }, 1271{ "The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!","Die Uhren der syncenden Geräte\nhaben einen Unterschied von\nmehr als 5 Minuten. Bitte die\nUhrzeiten anpassen. Sie können\nfalsche Sync-Resultate erhalten!\nBitte das Syncen bestätigen!" },
1272{ "This is a %1 recurring todo.","Das ist eine %1 wiederholende Aufgabe." }, 1272{ "This is a %1 recurring todo.","Das ist eine %1 wiederholende Aufgabe." },
1273{ "<p><b>Start on:</b> %1</p>","<p><b>Start am:</b> %1</p>" }, 1273{ "<p><b>Start on:</b> %1</p>","<p><b>Start am:</b> %1</p>" },
1274{ "List week view","Listenwochenansicht" }, 1274{ "List week view","Listenwochenansicht" },
1275{ "List week","Listenwochenansicht" }, 1275{ "List week","Listenwochenansicht" },
1276{ "Next Week","Nächste Woche" }, 1276{ "Next Week","Nächste Woche" },
1277{ "Previous Week","Vorherige Woche" }, 1277{ "Previous Week","Vorherige Woche" },
1278{ "No items were found matching\nyour search expression.\nUse the wildcard characters\n'*' and '?' where needed.","Keine Einträge gefunden die\ndem Suchausdruck entsprechen.\nBenutze Platzhalter Zeichen\n'*' und '?' wo benötigt." }, 1278{ "No items were found matching\nyour search expression.\nUse the wildcard characters\n'*' and '?' where needed.","Keine Einträge gefunden die\ndem Suchausdruck entsprechen.\nBenutze Platzhalter Zeichen\n'*' und '?' wo benötigt." },
1279{ "Show in todo/event viewer:","Zeige in Termin/Todo Anzeige:" }, 1279{ "Show in todo/event viewer:","Zeige in Termin/Todo Anzeige:" },
1280{ "Details","Details" }, 1280{ "Details","Details" },
1281{ "Created time","Erstellt Zeit" }, 1281{ "Created time","Erstellt Zeit" },
1282{ "Last modified time","Geändert Zeit" }, 1282{ "Last modified time","Geändert Zeit" },
1283{ "Show in What'sThis quick overview:","Zeige in What'sThis Schnellübersicht:" }, 1283{ "Show in What'sThis quick overview:","Zeige in What'sThis Schnellübersicht:" },
1284{ "View Options","Anzeige Optionen" }, 1284{ "View Options","Anzeige Optionen" },
1285{ "<b>Created: ","<b>Erstellt am: " }, 1285{ "<b>Created: ","<b>Erstellt am: " },
1286{ "<b>Last modified: ","<b>Zuletzt geändert am: " }, 1286{ "<b>Last modified: ","<b>Zuletzt geändert am: " },
1287{ "Journal: ","Journal: " }, 1287{ "Journal: ","Journal: " },
1288{ "yearly","jährlich" }, 1288{ "yearly","jährlich" },
1289{ "(%1) ","%1-" }, 1289{ "(%1) ","%1-" },
1290{ "<p><b>K</b>: Week view in Month view syle</p>\n","<p><b>K</b>: Wochenansicht in Art der Monatsansicht</p>\n" }, 1290{ "<p><b>K</b>: Week view in Month view syle</p>\n","<p><b>K</b>: Wochenansicht in Art der Monatsansicht</p>\n" },
1291{ "Enable tooltips displaying summary of ev.","Titel-Tooltips anzeigen" }, 1291{ "Enable tooltips displaying summary of ev.","Titel-Tooltips anzeigen" },
1292{ "Enable scrollbars in month view cells","Scrollbar in Zellen anzeigen" }, 1292{ "Enable scrollbars in month view cells","Scrollbar in Zellen anzeigen" },
1293{ "Summary/Loc.","Titel/Ort" }, 1293{ "Summary/Loc.","Titel/Ort" },
1294{ "No items found. Use '*' and '?' where needed.","Nichts gefunden. Benutze '*' and '?' wo benötigt." }, 1294{ "No items found. Use '*' and '?' where needed.","Nichts gefunden. Benutze '*' and '?' wo benötigt." },
1295{ "Week Number","Wochennummer" }, 1295{ "Week Number","Wochennummer" },
1296{ "Import","Importiere" }, 1296{ "Import","Importiere" },
1297{ "Export","Exportiere" }, 1297{ "Export","Exportiere" },
1298{ "Beam","Beame" }, 1298{ "Beam","Beame" },
1299{ "Export selected","Exportiere Selektierte" }, 1299{ "Export selected","Exportiere Selektierte" },
1300{ "As iCal (ics) file...","Als iCal (ics) Datei..." }, 1300{ "As iCal (ics) file...","Als iCal (ics) Datei..." },
1301{ "As vCal (vcs) file...","Als vCal (vcs) Datei..." }, 1301{ "As vCal (vcs) file...","Als vCal (vcs) Datei..." },
1302{ "Journal/Details...","Journale/Details..." }, 1302{ "Journal/Details...","Journale/Details..." },
1303{ "Agenda View","Agenda Ansicht" }, 1303{ "Agenda View","Agenda Ansicht" },
1304{ "Show current time","Zeige aktuelle Zeit" }, 1304{ "Show current time","Zeige aktuelle Zeit" },
1305{ "Edit new item","Bearbeite neuen Eintrag" }, 1305{ "Edit new item","Bearbeite neuen Eintrag" },
1306{ "Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals","Bitte wählen Sie mindestens\neinen dieser Typen\num darin zu suchen:\n\nTermine\nTodos\nJournale" }, 1306{ "Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals","Bitte wählen Sie mindestens\neinen dieser Typen\num darin zu suchen:\n\nTermine\nTodos\nJournale" },
1307{ "There is no next alarm.","Es gibt keinen nächsten Alarm." }, 1307{ "There is no next alarm.","Es gibt keinen nächsten Alarm." },
1308{ "%1 %2 - %3 (next event/todo with alarm)","%1 %2 - %3 (nächster Termin/Todo mit Alarm)" }, 1308{ "%1 %2 - %3 (next event/todo with alarm)","%1 %2 - %3 (nächster Termin/Todo mit Alarm)" },
1309{ "The next alarm is in:\n","Der nächste Alarm ist in:\n" }, 1309{ "The next alarm is in:\n","Der nächste Alarm ist in:\n" },
1310{ "%1 days\n","%1 Tagen\n" }, 1310{ "%1 days\n","%1 Tagen\n" },
1311{ "1 day\n","1 Tag\n" }, 1311{ "1 day\n","1 Tag\n" },
1312{ "%1 hours\n","%1 Stunden\n" }, 1312{ "%1 hours\n","%1 Stunden\n" },
1313{ "1 hour\n","1 Stunde\n" }, 1313{ "1 hour\n","1 Stunde\n" },
1314{ "%1 minutes\n","%1 Minuten\n" }, 1314{ "%1 minutes\n","%1 Minuten\n" },
1315{ "1 minute\n","1 Minute\n" }, 1315{ "1 minute\n","1 Minute\n" },
1316{ "Only one toolbar","Nur eine Toolbar" }, 1316{ "Only one toolbar","Nur eine Toolbar" },
1317{ "Print","Drucke" }, 1317{ "Print","Drucke" },
1318{ "Print selected event / todo...","Drucke ausgewählten Termin / Todo..." }, 1318{ "Print selected event / todo...","Drucke ausgewählten Termin / Todo..." },
1319{ "There is nothing selected!","Es ist nichts ausgewählt!" }, 1319{ "There is nothing selected!","Es ist nichts ausgewählt!" },
1320{ "\n\nDo you really want to print this item?","\n\nMöchten Sie wirklich diesen Eintrag ausdrucken? " }, 1320{ "\n\nDo you really want to print this item?","\n\nMöchten Sie wirklich diesen Eintrag ausdrucken? " },
1321{ "KO/Pi Print Confirmation","KO/Pi Druckbestätigung" }, 1321{ "KO/Pi Print Confirmation","KO/Pi Druckbestätigung" },
1322{ "This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.","Dies druckt die Ansicht wie man sie sieht.\n(Mit dem kompletten Inhalt natürlich.)\nMan kann das Layout ändern durch ändern der Fenstergröße.\nDrucke unskaliert druckt ggf. mehrere Seiten\nabhängig von der Menge der Daten.\nDrucke runterskaliert um auf eine Seite zu passen\ndruckt alles auf eine Seite.\nDrucke hoch/runterskaliert um genau auf eine Seite zu passen\nvergrößert den Text gegebenenfalls.\nDas Seitenlayout kann im nächsten Dialog gewählt werden." }, 1322{ "This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.\n","Dies druckt die Ansicht wie man sie sieht.\n(Mit dem kompletten Inhalt natürlich.)\nMan kann das Layout ändern durch ändern der Fenstergröße.\nDrucke unskaliert druckt ggf. mehrere Seiten\nabhängig von der Menge der Daten.\nDrucke runterskaliert um auf eine Seite zu passen\ndruckt alles auf eine Seite.\nDrucke hoch/runterskaliert um genau auf eine Seite zu passen\nvergrößert den Text gegebenenfalls.\nDas Seitenlayout kann im nächsten Dialog gewählt werden.\n" },
1323{ "KO/Pi Printout","KO/Pi Ausdruck" }, 1323{ "KO/Pi Printout","KO/Pi Ausdruck" },
1324{ "Print unscaled","Drucke unskaliert" }, 1324{ "Print unscaled","Drucke unskaliert" },
1325{ "Print scaled down to fit one page","Drucke runterskaliert um auf eine Seite zu passen." }, 1325{ "Print scaled down to fit one page","Drucke runterskaliert um auf eine Seite zu passen." },
1326{ "Print scaled up/down to fit one page","Drucke hoch/runterskaliert um genau auf eine Seite zu passen." }, 1326{ "Print scaled up/down to fit one page","Drucke hoch/runterskaliert um genau auf eine Seite zu passen." },
1327{ "","" }, 1327{ "Printout Mode","Druck Modus" },
1328{ "","" }, 1328{ "","" },
1329{ "","" }, 1329{ "","" },
1330{ "","" }, 1330{ "","" },
1331{ "","" }, \ No newline at end of file 1331{ "","" }, \ No newline at end of file
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index f452db0..b9909d6 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -817,699 +817,704 @@ void KOAgendaView::createDayLabels()
817 if ( appendLabels ) { 817 if ( appendLabels ) {
818 dayLabel = getNewDaylabel(); 818 dayLabel = getNewDaylabel();
819 } 819 }
820 //dayLabel->hide();//test only 820 //dayLabel->hide();//test only
821 821
822 int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ; 822 int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ;
823 if ( offset < 0 ) offset = 0; 823 if ( offset < 0 ) offset = 0;
824 //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 ); 824 //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 );
825 dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) ); 825 dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) );
826 dayLabel->setFont( dlf ); 826 dayLabel->setFont( dlf );
827 dayLabel->setAutoRepeat( true ); 827 dayLabel->setAutoRepeat( true );
828 dayLabel->show(); 828 dayLabel->show();
829 dayLabel->setNum( -2 ); 829 dayLabel->setNum( -2 );
830 dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset ); 830 dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset );
831 //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2); 831 //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2);
832 //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2); 832 //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2);
833 if ( !appendLabels ) { 833 if ( !appendLabels ) {
834 dayLabel = mDayLabelsList.next(); 834 dayLabel = mDayLabelsList.next();
835 while ( dayLabel ) { 835 while ( dayLabel ) {
836 //qDebug("!dayLabel %d",dayLabel ); 836 //qDebug("!dayLabel %d",dayLabel );
837 dayLabel->hide(); 837 dayLabel->hide();
838 dayLabel = mDayLabelsList.next(); 838 dayLabel = mDayLabelsList.next();
839 } 839 }
840 } 840 }
841 841
842 mDayLabelsFrame->setFixedHeight( newHight + 4 ); 842 mDayLabelsFrame->setFixedHeight( newHight + 4 );
843} 843}
844 844
845int KOAgendaView::maxDatesHint() 845int KOAgendaView::maxDatesHint()
846{ 846{
847 // Not sure about the max number of events, so return 0 for now. 847 // Not sure about the max number of events, so return 0 for now.
848 return 0; 848 return 0;
849} 849}
850 850
851int KOAgendaView::currentDateCount() 851int KOAgendaView::currentDateCount()
852{ 852{
853 return mSelectedDates.count(); 853 return mSelectedDates.count();
854} 854}
855 855
856QPtrList<Incidence> KOAgendaView::selectedIncidences() 856QPtrList<Incidence> KOAgendaView::selectedIncidences()
857{ 857{
858 QPtrList<Incidence> selected; 858 QPtrList<Incidence> selected;
859 Incidence *incidence; 859 Incidence *incidence;
860 860
861 incidence = mAgenda->selectedIncidence(); 861 incidence = mAgenda->selectedIncidence();
862 if (incidence) selected.append(incidence); 862 if (incidence) selected.append(incidence);
863 863
864 incidence = mAllDayAgenda->selectedIncidence(); 864 incidence = mAllDayAgenda->selectedIncidence();
865 if (incidence) selected.append(incidence); 865 if (incidence) selected.append(incidence);
866 866
867 return selected; 867 return selected;
868} 868}
869 869
870DateList KOAgendaView::selectedDates() 870DateList KOAgendaView::selectedDates()
871{ 871{
872 DateList selected; 872 DateList selected;
873 QDate qd; 873 QDate qd;
874 874
875 qd = mAgenda->selectedIncidenceDate(); 875 qd = mAgenda->selectedIncidenceDate();
876 if (qd.isValid()) selected.append(qd); 876 if (qd.isValid()) selected.append(qd);
877 877
878 qd = mAllDayAgenda->selectedIncidenceDate(); 878 qd = mAllDayAgenda->selectedIncidenceDate();
879 if (qd.isValid()) selected.append(qd); 879 if (qd.isValid()) selected.append(qd);
880 880
881 return selected; 881 return selected;
882} 882}
883 883
884 884
885void KOAgendaView::updateView() 885void KOAgendaView::updateView()
886{ 886{
887 if ( mBlockUpdating ) 887 if ( mBlockUpdating )
888 return; 888 return;
889 // kdDebug() << "KOAgendaView::updateView()" << endl; 889 // kdDebug() << "KOAgendaView::updateView()" << endl;
890 fillAgenda(); 890 fillAgenda();
891 891
892} 892}
893 893
894 894
895/* 895/*
896 Update configuration settings for the agenda view. This method is not 896 Update configuration settings for the agenda view. This method is not
897 complete. 897 complete.
898*/ 898*/
899void KOAgendaView::updateConfig() 899void KOAgendaView::updateConfig()
900{ 900{
901 if ( mBlockUpdating ) 901 if ( mBlockUpdating )
902 return; 902 return;
903 if ( mAgenda->height() > 96 * KOPrefs::instance()->mHourSize ) { 903 if ( mAgenda->height() > 96 * KOPrefs::instance()->mHourSize ) {
904 int old = KOPrefs::instance()->mHourSize; 904 int old = KOPrefs::instance()->mHourSize;
905 KOPrefs::instance()->mHourSize = mAgenda->height()/96 +1; 905 KOPrefs::instance()->mHourSize = mAgenda->height()/96 +1;
906 qDebug("KOPrefs::instance()->mHourSize adjusted %d to %d ", old,KOPrefs::instance()->mHourSize ); 906 qDebug("KOPrefs::instance()->mHourSize adjusted %d to %d ", old,KOPrefs::instance()->mHourSize );
907 } 907 }
908 908
909 909
910 // update config for children 910 // update config for children
911 mTimeLabels->updateConfig(); 911 mTimeLabels->updateConfig();
912 mAgenda->storePosition(); 912 mAgenda->storePosition();
913 mAgenda->updateConfig(); 913 mAgenda->updateConfig();
914 mAllDayAgenda->updateConfig(); 914 mAllDayAgenda->updateConfig();
915 // widget synchronization 915 // widget synchronization
916 //TODO: find a better way, maybe signal/slot 916 //TODO: find a better way, maybe signal/slot
917 mTimeLabels->positionChanged(); 917 mTimeLabels->positionChanged();
918 918
919 // for some reason, this needs to be called explicitly 919 // for some reason, this needs to be called explicitly
920 mTimeLabels->repaint(); 920 mTimeLabels->repaint();
921 921
922 mDummyAllDayLeft->setFixedWidth(mTimeLabels->width()); 922 mDummyAllDayLeft->setFixedWidth(mTimeLabels->width());
923 923
924 // ToolTips displaying summary of events 924 // ToolTips displaying summary of events
925 KOAgendaItem::toolTipGroup()->setEnabled(KOPrefs::instance() 925 KOAgendaItem::toolTipGroup()->setEnabled(KOPrefs::instance()
926 ->mEnableToolTips); 926 ->mEnableToolTips);
927 927
928 //setHolidayMasks(); 928 //setHolidayMasks();
929 929
930 //createDayLabels(); called by via updateView(); 930 //createDayLabels(); called by via updateView();
931 mEventIndicatorTop->setXOffset(mTimeLabels->width() + mAgenda->frameWidth()); 931 mEventIndicatorTop->setXOffset(mTimeLabels->width() + mAgenda->frameWidth());
932 updateView(); 932 updateView();
933 mAgenda->restorePosition(); 933 mAgenda->restorePosition();
934} 934}
935 935
936 936
937void KOAgendaView::updateEventDates(KOAgendaItem *item, int type) 937void KOAgendaView::updateEventDates(KOAgendaItem *item, int type)
938{ 938{
939 // kdDebug() << "KOAgendaView::updateEventDates(): " << item->text() << endl; 939 // kdDebug() << "KOAgendaView::updateEventDates(): " << item->text() << endl;
940 //qDebug("KOAgendaView::updateEventDates "); 940 //qDebug("KOAgendaView::updateEventDates ");
941 QDateTime startDt,endDt; 941 QDateTime startDt,endDt;
942 QDate startDate; 942 QDate startDate;
943 int lenInSecs; 943 int lenInSecs;
944 // if ( type == KOAgenda::RESIZETOP ) 944 // if ( type == KOAgenda::RESIZETOP )
945 // qDebug("RESIZETOP "); 945 // qDebug("RESIZETOP ");
946 // if ( type == KOAgenda::RESIZEBOTTOM ) 946 // if ( type == KOAgenda::RESIZEBOTTOM )
947 // qDebug("RESIZEBOTTOM "); 947 // qDebug("RESIZEBOTTOM ");
948 // if ( type == KOAgenda::MOVE ) 948 // if ( type == KOAgenda::MOVE )
949 // qDebug("MOVE "); 949 // qDebug("MOVE ");
950 if ( item->incidence()->type() == "Event" ) { 950 if ( item->incidence()->type() == "Event" ) {
951 startDt =item->incidence()->dtStart(); 951 startDt =item->incidence()->dtStart();
952 endDt = item->incidence()->dtEnd(); 952 endDt = item->incidence()->dtEnd();
953 lenInSecs = startDt.secsTo( endDt ); 953 lenInSecs = startDt.secsTo( endDt );
954 } 954 }
955 955
956 // emit incidenceItemChanged( item->incidence(), KOGlobals::EVENTEDITED ); 956 // emit incidenceItemChanged( item->incidence(), KOGlobals::EVENTEDITED );
957 957
958 if ( item->incidence()->type()=="Todo" && item->mLastMoveXPos > 0 ) { 958 if ( item->incidence()->type()=="Todo" && item->mLastMoveXPos > 0 ) {
959 startDate = mSelectedDates[item->mLastMoveXPos]; 959 startDate = mSelectedDates[item->mLastMoveXPos];
960 } else { 960 } else {
961 if (item->cellX() < 0) { 961 if (item->cellX() < 0) {
962 startDate = (mSelectedDates.first()).addDays(item->cellX()); 962 startDate = (mSelectedDates.first()).addDays(item->cellX());
963 } else { 963 } else {
964 startDate = mSelectedDates[item->cellX()]; 964 startDate = mSelectedDates[item->cellX()];
965 } 965 }
966 } 966 }
967 startDt.setDate(startDate); 967 startDt.setDate(startDate);
968 968
969 if (item->incidence()->doesFloat()) { 969 if (item->incidence()->doesFloat()) {
970 endDt.setDate(startDate.addDays(item->cellWidth() - 1)); 970 endDt.setDate(startDate.addDays(item->cellWidth() - 1));
971 } else { 971 } else {
972 if ( type == KOAgenda::RESIZETOP || type == KOAgenda::MOVE ) 972 if ( type == KOAgenda::RESIZETOP || type == KOAgenda::MOVE )
973 startDt.setTime(mAgenda->gyToTime(item->cellYTop())); 973 startDt.setTime(mAgenda->gyToTime(item->cellYTop()));
974 if ( item->incidence()->type() == "Event" ) { 974 if ( item->incidence()->type() == "Event" ) {
975 if ( type == KOAgenda::MOVE ) { 975 if ( type == KOAgenda::MOVE ) {
976 endDt = startDt.addSecs(lenInSecs); 976 endDt = startDt.addSecs(lenInSecs);
977 977
978 } else if ( type == KOAgenda::RESIZEBOTTOM ) { 978 } else if ( type == KOAgenda::RESIZEBOTTOM ) {
979 if (item->lastMultiItem()) { 979 if (item->lastMultiItem()) {
980 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1)); 980 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1));
981 endDt.setDate(startDate. 981 endDt.setDate(startDate.
982 addDays(item->lastMultiItem()->cellX() - item->cellX())); 982 addDays(item->lastMultiItem()->cellX() - item->cellX()));
983 } else { 983 } else {
984 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1)); 984 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1));
985 endDt.setDate(startDate); 985 endDt.setDate(startDate);
986 } 986 }
987 } 987 }
988 } else { 988 } else {
989 // todo 989 // todo
990 if (item->lastMultiItem()) { 990 if (item->lastMultiItem()) {
991 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1)); 991 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1));
992 endDt.setDate(startDate. 992 endDt.setDate(startDate.
993 addDays(item->lastMultiItem()->cellX() - item->cellX())); 993 addDays(item->lastMultiItem()->cellX() - item->cellX()));
994 } else { 994 } else {
995 //qDebug("tem->cellYBottom() %d",item->cellYBottom() ); 995 //qDebug("tem->cellYBottom() %d",item->cellYBottom() );
996 if ( item->cellYBottom() > 0 ) 996 if ( item->cellYBottom() > 0 )
997 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1)); 997 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1));
998 else 998 else
999 endDt.setTime((static_cast<Todo*>(item->incidence()))->dtDue().time()); 999 endDt.setTime((static_cast<Todo*>(item->incidence()))->dtDue().time());
1000 endDt.setDate(startDate); 1000 endDt.setDate(startDate);
1001 } 1001 }
1002 } 1002 }
1003 } 1003 }
1004 if ( item->incidence()->type() == "Event" ) { 1004 if ( item->incidence()->type() == "Event" ) {
1005 item->incidence()->setDtStart(startDt); 1005 item->incidence()->setDtStart(startDt);
1006 (static_cast<Event*>(item->incidence()))->setDtEnd(endDt); 1006 (static_cast<Event*>(item->incidence()))->setDtEnd(endDt);
1007 } else if ( item->incidence()->type() == "Todo" ) { 1007 } else if ( item->incidence()->type() == "Todo" ) {
1008 Todo* to = static_cast<Todo*>(item->incidence()); 1008 Todo* to = static_cast<Todo*>(item->incidence());
1009 1009
1010 to->setDtDue(endDt); 1010 to->setDtDue(endDt);
1011 if ( to->hasStartDate() ) { 1011 if ( to->hasStartDate() ) {
1012 if (to->dtStart() >= to->dtDue() ) 1012 if (to->dtStart() >= to->dtDue() )
1013 to->setDtStart(to->dtDue().addDays( -2 )); 1013 to->setDtStart(to->dtDue().addDays( -2 ));
1014 } 1014 }
1015 1015
1016 } 1016 }
1017 //qDebug("KOAgendaView::updateEventDates stsart %s end %s ", startDt.toString().latin1(), endDt.toString().latin1() ); 1017 //qDebug("KOAgendaView::updateEventDates stsart %s end %s ", startDt.toString().latin1(), endDt.toString().latin1() );
1018 item->incidence()->setRevision(item->incidence()->revision()+1); 1018 item->incidence()->setRevision(item->incidence()->revision()+1);
1019 item->setItemDate(startDt.date()); 1019 item->setItemDate(startDt.date());
1020 //item->updateItem(); 1020 //item->updateItem();
1021 if ( item->incidence()->type() == "Todo" ) { 1021 if ( item->incidence()->type() == "Todo" ) {
1022 emit todoMoved((Todo*)item->incidence(), KOGlobals::EVENTEDITED ); 1022 emit todoMoved((Todo*)item->incidence(), KOGlobals::EVENTEDITED );
1023 1023
1024 } 1024 }
1025 else 1025 else
1026 emit incidenceChanged(item->incidence(), KOGlobals::EVENTEDITED); 1026 emit incidenceChanged(item->incidence(), KOGlobals::EVENTEDITED);
1027 item->updateItem(); 1027 item->updateItem();
1028} 1028}
1029 1029
1030void KOAgendaView::showDates( const QDate &start, const QDate &end ) 1030void KOAgendaView::showDates( const QDate &start, const QDate &end )
1031{ 1031{
1032 // kdDebug() << "KOAgendaView::selectDates" << endl; 1032 // kdDebug() << "KOAgendaView::selectDates" << endl;
1033 1033
1034 mSelectedDates.clear(); 1034 mSelectedDates.clear();
1035 // qDebug("KOAgendaView::showDates "); 1035 // qDebug("KOAgendaView::showDates ");
1036 QDate d = start; 1036 QDate d = start;
1037 while (d <= end) { 1037 while (d <= end) {
1038 mSelectedDates.append(d); 1038 mSelectedDates.append(d);
1039 d = d.addDays( 1 ); 1039 d = d.addDays( 1 );
1040 } 1040 }
1041 1041
1042 // and update the view 1042 // and update the view
1043 fillAgenda(); 1043 fillAgenda();
1044} 1044}
1045 1045
1046 1046
1047void KOAgendaView::showEvents(QPtrList<Event>) 1047void KOAgendaView::showEvents(QPtrList<Event>)
1048{ 1048{
1049 kdDebug() << "KOAgendaView::showEvents() is not yet implemented" << endl; 1049 kdDebug() << "KOAgendaView::showEvents() is not yet implemented" << endl;
1050} 1050}
1051 1051
1052void KOAgendaView::changeEventDisplay(Event *, int) 1052void KOAgendaView::changeEventDisplay(Event *, int)
1053{ 1053{
1054 // qDebug("KOAgendaView::changeEventDisplay "); 1054 // qDebug("KOAgendaView::changeEventDisplay ");
1055 // kdDebug() << "KOAgendaView::changeEventDisplay" << endl; 1055 // kdDebug() << "KOAgendaView::changeEventDisplay" << endl;
1056 // this should be re-written to be MUCH smarter. Right now we 1056 // this should be re-written to be MUCH smarter. Right now we
1057 // are just playing dumb. 1057 // are just playing dumb.
1058 fillAgenda(); 1058 fillAgenda();
1059} 1059}
1060 1060
1061void KOAgendaView::fillAgenda(const QDate &) 1061void KOAgendaView::fillAgenda(const QDate &)
1062{ 1062{
1063 // qDebug("KOAgendaView::fillAgenda "); 1063 // qDebug("KOAgendaView::fillAgenda ");
1064 fillAgenda(); 1064 fillAgenda();
1065} 1065}
1066 1066
1067void KOAgendaView::fillAgenda() 1067void KOAgendaView::fillAgenda()
1068{ 1068{
1069 if ( globalFlagBlockStartup ) 1069 if ( globalFlagBlockStartup )
1070 return; 1070 return;
1071 if ( globalFlagBlockAgenda == 1 ) 1071 if ( globalFlagBlockAgenda == 1 )
1072 return; 1072 return;
1073 static bool onlyOne = false;
1074 if ( onlyOne )
1075 return;
1076 onlyOne = true;
1073 //if ( globalFlagBlockAgenda == 2 ) 1077 //if ( globalFlagBlockAgenda == 2 )
1074 //globalFlagBlockAgenda = 0; 1078 //globalFlagBlockAgenda = 0;
1075 // globalFlagBlockPainting = false; 1079 // globalFlagBlockPainting = false;
1076 if ( globalFlagBlockAgenda == 0 ) 1080 if ( globalFlagBlockAgenda == 0 )
1077 globalFlagBlockAgenda = 1; 1081 globalFlagBlockAgenda = 1;
1078 // clearView(); 1082 // clearView();
1079 //qDebug("fillAgenda()++++ "); 1083 //qDebug("fillAgenda()++++ ");
1080 globalFlagBlockAgendaItemPaint = 1; 1084 globalFlagBlockAgendaItemPaint = 1;
1081 1085
1082 mAllDayAgenda->changeColumns(mSelectedDates.count()); 1086 mAllDayAgenda->changeColumns(mSelectedDates.count());
1083 mAgenda->changeColumns(mSelectedDates.count()); 1087 mAgenda->changeColumns(mSelectedDates.count());
1084 qApp->processEvents(); 1088 qApp->processEvents();
1085 mEventIndicatorTop->changeColumns(mSelectedDates.count()); 1089 mEventIndicatorTop->changeColumns(mSelectedDates.count());
1086 mEventIndicatorBottom->changeColumns(mSelectedDates.count()); 1090 mEventIndicatorBottom->changeColumns(mSelectedDates.count());
1087 setHolidayMasks(); 1091 setHolidayMasks();
1088 1092
1089 //mAgenda->hideUnused(); 1093 //mAgenda->hideUnused();
1090 //mAllDayAgenda->hideUnused(); 1094 //mAllDayAgenda->hideUnused();
1091 1095
1092 // mAgenda->blockNextRepaint( false ); 1096 // mAgenda->blockNextRepaint( false );
1093 // mAgenda->viewport()->repaint(); 1097 // mAgenda->viewport()->repaint();
1094 // mAgenda->blockNextRepaint( true ); 1098 // mAgenda->blockNextRepaint( true );
1095 mMinY.resize(mSelectedDates.count()); 1099 mMinY.resize(mSelectedDates.count());
1096 mMaxY.resize(mSelectedDates.count()); 1100 mMaxY.resize(mSelectedDates.count());
1097 1101
1098 QPtrList<Event> dayEvents; 1102 QPtrList<Event> dayEvents;
1099 1103
1100 // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue. 1104 // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue.
1101 // Therefore, gtodoset all of them. 1105 // Therefore, gtodoset all of them.
1102 QPtrList<Todo> todos = calendar()->todos(); 1106 QPtrList<Todo> todos = calendar()->todos();
1103 1107
1104 mAgenda->setDateList(mSelectedDates); 1108 mAgenda->setDateList(mSelectedDates);
1105 1109
1106 QDate today = QDate::currentDate(); 1110 QDate today = QDate::currentDate();
1107 1111
1108 DateList::ConstIterator dit; 1112 DateList::ConstIterator dit;
1109 int curCol = 0; 1113 int curCol = 0;
1110 for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { 1114 for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) {
1111 QDate currentDate = *dit; 1115 QDate currentDate = *dit;
1112 // kdDebug() << "KOAgendaView::fillAgenda(): " << currentDate.toString() 1116 // kdDebug() << "KOAgendaView::fillAgenda(): " << currentDate.toString()
1113 // << endl; 1117 // << endl;
1114 1118
1115 dayEvents = calendar()->events(currentDate,true); 1119 dayEvents = calendar()->events(currentDate,true);
1116 1120
1117 // Default values, which can never be reached 1121 // Default values, which can never be reached
1118 mMinY[curCol] = mAgenda->timeToY(QTime(23,59)) + 1; 1122 mMinY[curCol] = mAgenda->timeToY(QTime(23,59)) + 1;
1119 mMaxY[curCol] = mAgenda->timeToY(QTime(0,0)) - 1; 1123 mMaxY[curCol] = mAgenda->timeToY(QTime(0,0)) - 1;
1120 1124
1121 unsigned int numEvent; 1125 unsigned int numEvent;
1122 for(numEvent=0;numEvent<dayEvents.count();++numEvent) { 1126 for(numEvent=0;numEvent<dayEvents.count();++numEvent) {
1123 Event *event = dayEvents.at(numEvent); 1127 Event *event = dayEvents.at(numEvent);
1124 if ( !KOPrefs::instance()->mShowSyncEvents && event->uid().left(2) == QString("la") ) 1128 if ( !KOPrefs::instance()->mShowSyncEvents && event->uid().left(2) == QString("la") )
1125 if ( event->uid().left(15) == QString("last-syncEvent-") ) 1129 if ( event->uid().left(15) == QString("last-syncEvent-") )
1126 continue; 1130 continue;
1127 // kdDebug() << " Event: " << event->summary() << endl; 1131 // kdDebug() << " Event: " << event->summary() << endl;
1128 1132
1129 int beginX = currentDate.daysTo(event->dtStart().date()) + curCol; 1133 int beginX = currentDate.daysTo(event->dtStart().date()) + curCol;
1130 int endX = currentDate.daysTo(event->dtEnd().date()) + curCol; 1134 int endX = currentDate.daysTo(event->dtEnd().date()) + curCol;
1131 1135
1132 // kdDebug() << " beginX: " << beginX << " endX: " << endX << endl; 1136 // kdDebug() << " beginX: " << beginX << " endX: " << endX << endl;
1133 1137
1134 if (event->doesFloat()) { 1138 if (event->doesFloat()) {
1135 if (event->recurrence()->doesRecur()) { 1139 if (event->recurrence()->doesRecur()) {
1136 mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol); 1140 mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol);
1137 } else { 1141 } else {
1138 if (beginX <= 0 && curCol == 0) { 1142 if (beginX <= 0 && curCol == 0) {
1139 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); 1143 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
1140 } else if (beginX == curCol) { 1144 } else if (beginX == curCol) {
1141 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX); 1145 mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
1142 } 1146 }
1143 } 1147 }
1144 } else if (event->isMultiDay()) { 1148 } else if (event->isMultiDay()) {
1145 if ( event->doesRecur () ) { 1149 if ( event->doesRecur () ) {
1146 QDate dateit = currentDate; 1150 QDate dateit = currentDate;
1147 int count = 0; 1151 int count = 0;
1148 int max = event->dtStart().daysTo( event->dtEnd() ) +2; 1152 int max = event->dtStart().daysTo( event->dtEnd() ) +2;
1149 while (! event->recursOn( dateit ) && count <= max ) { 1153 while (! event->recursOn( dateit ) && count <= max ) {
1150 ++count; 1154 ++count;
1151 dateit = dateit.addDays( -1 ); 1155 dateit = dateit.addDays( -1 );
1152 } 1156 }
1153 bool ok; 1157 bool ok;
1154 QDateTime nextOcstart = event->getNextOccurence( QDateTime(dateit) ,&ok ); 1158 QDateTime nextOcstart = event->getNextOccurence( QDateTime(dateit) ,&ok );
1155 if ( ok ) 1159 if ( ok )
1156 { 1160 {
1157 int secs = event->dtStart().secsTo( event->dtEnd() ); 1161 int secs = event->dtStart().secsTo( event->dtEnd() );
1158 QDateTime nextOcend =nextOcstart.addSecs( secs ); ; 1162 QDateTime nextOcend =nextOcstart.addSecs( secs ); ;
1159 beginX = currentDate.daysTo(nextOcstart.date()) + curCol; 1163 beginX = currentDate.daysTo(nextOcstart.date()) + curCol;
1160 endX = currentDate.daysTo(nextOcend.date()) + curCol; 1164 endX = currentDate.daysTo(nextOcend.date()) + curCol;
1161 1165
1162 } 1166 }
1163 } 1167 }
1164 int startY = mAgenda->timeToY(event->dtStart().time()); 1168 int startY = mAgenda->timeToY(event->dtStart().time());
1165 int endY = mAgenda->timeToY(event->dtEnd().time()) - 1; 1169 int endY = mAgenda->timeToY(event->dtEnd().time()) - 1;
1166 //qDebug("insert %d %d %d %d %d ",beginX,endX,startY,endY , curCol ); 1170 //qDebug("insert %d %d %d %d %d ",beginX,endX,startY,endY , curCol );
1167 if ((beginX <= 0 && curCol == 0) || beginX == curCol) { 1171 if ((beginX <= 0 && curCol == 0) || beginX == curCol) {
1168 //qDebug("insert!!! "); 1172 //qDebug("insert!!! ");
1169 mAgenda->insertMultiItem(event,currentDate,beginX,endX,startY,endY); 1173 mAgenda->insertMultiItem(event,currentDate,beginX,endX,startY,endY);
1170 } 1174 }
1171 if (beginX == curCol) { 1175 if (beginX == curCol) {
1172 mMaxY[curCol] = mAgenda->timeToY(QTime(23,59)); 1176 mMaxY[curCol] = mAgenda->timeToY(QTime(23,59));
1173 if (startY < mMinY[curCol]) mMinY[curCol] = startY; 1177 if (startY < mMinY[curCol]) mMinY[curCol] = startY;
1174 } else if (endX == curCol) { 1178 } else if (endX == curCol) {
1175 mMinY[curCol] = mAgenda->timeToY(QTime(0,0)); 1179 mMinY[curCol] = mAgenda->timeToY(QTime(0,0));
1176 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY; 1180 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY;
1177 } else { 1181 } else {
1178 mMinY[curCol] = mAgenda->timeToY(QTime(0,0)); 1182 mMinY[curCol] = mAgenda->timeToY(QTime(0,0));
1179 mMaxY[curCol] = mAgenda->timeToY(QTime(23,59)); 1183 mMaxY[curCol] = mAgenda->timeToY(QTime(23,59));
1180 } 1184 }
1181 } else { 1185 } else {
1182 int startY = mAgenda->timeToY(event->dtStart().time()); 1186 int startY = mAgenda->timeToY(event->dtStart().time());
1183 int endY = mAgenda->timeToY(event->dtEnd().time()) - 1; 1187 int endY = mAgenda->timeToY(event->dtEnd().time()) - 1;
1184 if (endY < startY) endY = startY; 1188 if (endY < startY) endY = startY;
1185 mAgenda->insertItem(event,currentDate,curCol,startY,endY); 1189 mAgenda->insertItem(event,currentDate,curCol,startY,endY);
1186 if (startY < mMinY[curCol]) mMinY[curCol] = startY; 1190 if (startY < mMinY[curCol]) mMinY[curCol] = startY;
1187 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY; 1191 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY;
1188 } 1192 }
1189 } 1193 }
1190 // ---------- [display Todos -------------- 1194 // ---------- [display Todos --------------
1191 unsigned int numTodo; 1195 unsigned int numTodo;
1192 for (numTodo = 0; numTodo < todos.count(); ++numTodo) { 1196 for (numTodo = 0; numTodo < todos.count(); ++numTodo) {
1193 Todo *todo = todos.at(numTodo); 1197 Todo *todo = todos.at(numTodo);
1194 1198
1195 if ( ! todo->hasDueDate() && !todo->hasCompletedDate()) continue; // todo shall not be displayed if it has no date 1199 if ( ! todo->hasDueDate() && !todo->hasCompletedDate()) continue; // todo shall not be displayed if it has no date
1196 1200
1197 // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue. 1201 // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue.
1198 // Already completed items can be displayed on their original due date 1202 // Already completed items can be displayed on their original due date
1199 //if not KOPrefs::instance()->mShowTodoInAgenda, show overdue in agenda 1203 //if not KOPrefs::instance()->mShowTodoInAgenda, show overdue in agenda
1200 bool overdue = (!todo->isCompleted()) && (todo->dtDue() < today) && KOPrefs::instance()->mShowTodoInAgenda; 1204 bool overdue = (!todo->isCompleted()) && (todo->dtDue() < today) && KOPrefs::instance()->mShowTodoInAgenda;
1201 bool fillIn = false; 1205 bool fillIn = false;
1202 if ( todo->hasCompletedDate() && todo->completed().date() == currentDate ) 1206 if ( todo->hasCompletedDate() && todo->completed().date() == currentDate )
1203 fillIn = true; 1207 fillIn = true;
1204 if ( ! fillIn && !todo->hasCompletedDate() ) 1208 if ( ! fillIn && !todo->hasCompletedDate() )
1205 fillIn = ((todo->dtDue().date() == currentDate) && !overdue) || ((currentDate == today) && overdue); 1209 fillIn = ((todo->dtDue().date() == currentDate) && !overdue) || ((currentDate == today) && overdue);
1206 if ( fillIn ) { 1210 if ( fillIn ) {
1207 if ( (todo->doesFloat() || overdue ) && !todo->hasCompletedDate() ) { // Todo has no due-time set or is already overdue 1211 if ( (todo->doesFloat() || overdue ) && !todo->hasCompletedDate() ) { // Todo has no due-time set or is already overdue
1208 if ( KOPrefs::instance()->mShowTodoInAgenda ) 1212 if ( KOPrefs::instance()->mShowTodoInAgenda )
1209 mAllDayAgenda->insertAllDayItem(todo, currentDate, curCol, curCol); 1213 mAllDayAgenda->insertAllDayItem(todo, currentDate, curCol, curCol);
1210 } 1214 }
1211 else { 1215 else {
1212 QDateTime dt; 1216 QDateTime dt;
1213 if ( todo->hasCompletedDate() ) 1217 if ( todo->hasCompletedDate() )
1214 dt = todo->completed(); 1218 dt = todo->completed();
1215 else 1219 else
1216 dt = todo->dtDue();; 1220 dt = todo->dtDue();;
1217 1221
1218 1222
1219 int endY = mAgenda->timeToY(dt.time()) - 1; 1223 int endY = mAgenda->timeToY(dt.time()) - 1;
1220 int hi = (18/KOPrefs::instance()->mHourSize); 1224 int hi = (18/KOPrefs::instance()->mHourSize);
1221 //qDebug("hei %d ",KOPrefs::instance()->mHourSize); 1225 //qDebug("hei %d ",KOPrefs::instance()->mHourSize);
1222 int startY = endY -hi; 1226 int startY = endY -hi;
1223 1227
1224 mAgenda->insertItem(todo,currentDate,curCol,startY,endY); 1228 mAgenda->insertItem(todo,currentDate,curCol,startY,endY);
1225 1229
1226 if (startY < mMinY[curCol]) mMinY[curCol] = startY; 1230 if (startY < mMinY[curCol]) mMinY[curCol] = startY;
1227 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY; 1231 if (endY > mMaxY[curCol]) mMaxY[curCol] = endY;
1228 } 1232 }
1229 } 1233 }
1230 } 1234 }
1231 // ---------- display Todos] -------------- 1235 // ---------- display Todos] --------------
1232 1236
1233 ++curCol; 1237 ++curCol;
1234 } 1238 }
1235 mAgenda->hideUnused(); 1239 mAgenda->hideUnused();
1236 mAllDayAgenda->hideUnused(); 1240 mAllDayAgenda->hideUnused();
1237 mAgenda->checkScrollBoundaries(); 1241 mAgenda->checkScrollBoundaries();
1238 1242
1239 deleteSelectedDateTime(); 1243 deleteSelectedDateTime();
1240 1244
1241 createDayLabels(); 1245 createDayLabels();
1242 emit incidenceSelected( 0 ); 1246 emit incidenceSelected( 0 );
1243 1247
1244 if ( globalFlagBlockAgenda == 2 ) { 1248 if ( globalFlagBlockAgenda == 2 ) {
1245 if ( KOPrefs::instance()->mSetTimeToDayStartAt ) 1249 if ( KOPrefs::instance()->mSetTimeToDayStartAt )
1246 setStartHour( KOPrefs::instance()->mDayBegins ); 1250 setStartHour( KOPrefs::instance()->mDayBegins );
1247 else if ( KOPrefs::instance()->mCenterOnCurrentTime ) 1251 else if ( KOPrefs::instance()->mCenterOnCurrentTime )
1248 setStartHour( QTime::currentTime ().hour() ); 1252 setStartHour( QTime::currentTime ().hour() );
1249 // qApp->processEvents(); 1253 // qApp->processEvents();
1250 } 1254 }
1251 qApp->processEvents(); 1255 qApp->processEvents();
1252 //qDebug("qApp->processEvents(); END "); 1256 //qDebug("qApp->processEvents(); END ");
1253 globalFlagBlockAgenda = 0; 1257 globalFlagBlockAgenda = 0;
1254 1258
1255 // mAgenda->hideUnused(); 1259 // mAgenda->hideUnused();
1256 //mAllDayAgenda->hideUnused(); 1260 //mAllDayAgenda->hideUnused();
1257 mAllDayAgenda->drawContentsToPainter(); 1261 mAllDayAgenda->drawContentsToPainter();
1258 mAgenda->drawContentsToPainter(); 1262 mAgenda->drawContentsToPainter();
1259 repaintAgenda(); 1263 repaintAgenda();
1264 onlyOne = false;
1260 // mAgenda->finishUpdate(); 1265 // mAgenda->finishUpdate();
1261 //mAllDayAgenda->finishUpdate(); 1266 //mAllDayAgenda->finishUpdate();
1262 1267
1263 // repaintAgenda(); 1268 // repaintAgenda();
1264 //qApp->processEvents(); 1269 //qApp->processEvents();
1265 // globalFlagBlockAgenda = 0; 1270 // globalFlagBlockAgenda = 0;
1266} 1271}
1267void KOAgendaView::repaintAgenda() 1272void KOAgendaView::repaintAgenda()
1268{ 1273{
1269 // mAllDayAgenda->drawContentsToPainter(); 1274 // mAllDayAgenda->drawContentsToPainter();
1270// mAllDayAgenda->viewport()->repaint( false ); 1275// mAllDayAgenda->viewport()->repaint( false );
1271// mAgenda->drawContentsToPainter(); 1276// mAgenda->drawContentsToPainter();
1272// mAgenda->viewport()->repaint( false ); 1277// mAgenda->viewport()->repaint( false );
1273// qApp->processEvents(); 1278// qApp->processEvents();
1274 1279
1275 //qDebug("KOAgendaView::repaintAgenda() "); 1280 //qDebug("KOAgendaView::repaintAgenda() ");
1276 //qApp->processEvents(); 1281 //qApp->processEvents();
1277 mAgenda->viewport()->repaint( false ); 1282 mAgenda->viewport()->repaint( false );
1278 mAllDayAgenda->viewport()->repaint( false ); 1283 mAllDayAgenda->viewport()->repaint( false );
1279 mAgenda->finishUpdate(); 1284 mAgenda->finishUpdate();
1280 mAllDayAgenda->finishUpdate(); 1285 mAllDayAgenda->finishUpdate();
1281} 1286}
1282 1287
1283 1288
1284void KOAgendaView::clearView() 1289void KOAgendaView::clearView()
1285{ 1290{
1286 // kdDebug() << "ClearView" << endl; 1291 // kdDebug() << "ClearView" << endl;
1287 mAllDayAgenda->clear(); 1292 mAllDayAgenda->clear();
1288 mAgenda->clear(); 1293 mAgenda->clear();
1289} 1294}
1290 1295
1291void KOAgendaView::printPreview(CalPrinter *calPrinter, const QDate &fd, 1296void KOAgendaView::printPreview(CalPrinter *calPrinter, const QDate &fd,
1292 const QDate &td) 1297 const QDate &td)
1293{ 1298{
1294#ifndef KORG_NOPRINTER 1299#ifndef KORG_NOPRINTER
1295 if (fd == td) 1300 if (fd == td)
1296 calPrinter->preview(CalPrinter::Day, fd, td); 1301 calPrinter->preview(CalPrinter::Day, fd, td);
1297 else 1302 else
1298 calPrinter->preview(CalPrinter::Week, fd, td); 1303 calPrinter->preview(CalPrinter::Week, fd, td);
1299#endif 1304#endif
1300} 1305}
1301 1306
1302// void KOAgendaView::updateMovedTodo() 1307// void KOAgendaView::updateMovedTodo()
1303// { 1308// {
1304// // updateConfig(); 1309// // updateConfig();
1305// // emit updateTodoViews(); 1310// // emit updateTodoViews();
1306// } 1311// }
1307 1312
1308void KOAgendaView::newEvent(int gx, int gy) 1313void KOAgendaView::newEvent(int gx, int gy)
1309{ 1314{
1310 if (!mSelectedDates.count()) return; 1315 if (!mSelectedDates.count()) return;
1311 1316
1312 QDate day = mSelectedDates[gx]; 1317 QDate day = mSelectedDates[gx];
1313 1318
1314 QTime time = mAgenda->gyToTime(gy); 1319 QTime time = mAgenda->gyToTime(gy);
1315 QDateTime dt(day,time); 1320 QDateTime dt(day,time);
1316 // if ( dt < QDateTime::currentDateTime () ) 1321 // if ( dt < QDateTime::currentDateTime () )
1317 // dt = QDateTime::currentDateTime ().addSecs( 3600 ); 1322 // dt = QDateTime::currentDateTime ().addSecs( 3600 );
1318 emit newEventSignal(dt); 1323 emit newEventSignal(dt);
1319} 1324}
1320 1325
1321void KOAgendaView::newEvent(int gxStart, int gyStart, int gxEnd, int gyEnd) 1326void KOAgendaView::newEvent(int gxStart, int gyStart, int gxEnd, int gyEnd)
1322{ 1327{
1323 if (!mSelectedDates.count()) return; 1328 if (!mSelectedDates.count()) return;
1324 1329
1325 QDate dayStart = mSelectedDates[gxStart]; 1330 QDate dayStart = mSelectedDates[gxStart];
1326 QDate dayEnd = mSelectedDates[gxEnd]; 1331 QDate dayEnd = mSelectedDates[gxEnd];
1327 1332
1328 QTime timeStart = mAgenda->gyToTime(gyStart); 1333 QTime timeStart = mAgenda->gyToTime(gyStart);
1329 QTime timeEnd = mAgenda->gyToTime( gyEnd + 1 ); 1334 QTime timeEnd = mAgenda->gyToTime( gyEnd + 1 );
1330 1335
1331 QDateTime dtStart(dayStart,timeStart); 1336 QDateTime dtStart(dayStart,timeStart);
1332 QDateTime dtEnd(dayEnd,timeEnd); 1337 QDateTime dtEnd(dayEnd,timeEnd);
1333 1338
1334 emit newEventSignal(dtStart,dtEnd); 1339 emit newEventSignal(dtStart,dtEnd);
1335} 1340}
1336 1341
1337void KOAgendaView::newEventAllDay(int gx, int ) 1342void KOAgendaView::newEventAllDay(int gx, int )
1338{ 1343{
1339 if (!mSelectedDates.count()) return; 1344 if (!mSelectedDates.count()) return;
1340 1345
1341 QDate day = mSelectedDates[gx]; 1346 QDate day = mSelectedDates[gx];
1342 1347
1343 emit newEventSignal(day); 1348 emit newEventSignal(day);
1344} 1349}
1345void KOAgendaView::newTodoAllDay(int gx, int ) 1350void KOAgendaView::newTodoAllDay(int gx, int )
1346{ 1351{
1347 if (!mSelectedDates.count()) return; 1352 if (!mSelectedDates.count()) return;
1348 1353
1349 QDateTime day (mSelectedDates[gx] ); 1354 QDateTime day (mSelectedDates[gx] );
1350 emit newTodoSignal(day, true); 1355 emit newTodoSignal(day, true);
1351} 1356}
1352void KOAgendaView::newTodo(int gx, int gy ) 1357void KOAgendaView::newTodo(int gx, int gy )
1353{ 1358{
1354 if (!mSelectedDates.count()) return; 1359 if (!mSelectedDates.count()) return;
1355 QDate dayStart = mSelectedDates[gx]; 1360 QDate dayStart = mSelectedDates[gx];
1356 QTime timeStart = mAgenda->gyToTime(gy); 1361 QTime timeStart = mAgenda->gyToTime(gy);
1357 QDateTime dt (dayStart,timeStart); 1362 QDateTime dt (dayStart,timeStart);
1358 emit newTodoSignal( dt, false ); 1363 emit newTodoSignal( dt, false );
1359} 1364}
1360 1365
1361void KOAgendaView::updateEventIndicatorTop(int newY) 1366void KOAgendaView::updateEventIndicatorTop(int newY)
1362{ 1367{
1363 uint i; 1368 uint i;
1364 for(i=0;i<mMinY.size();++i) { 1369 for(i=0;i<mMinY.size();++i) {
1365 if (newY >= mMinY.at(i)) mEventIndicatorTop->enableColumn(i,true); 1370 if (newY >= mMinY.at(i)) mEventIndicatorTop->enableColumn(i,true);
1366 else mEventIndicatorTop->enableColumn(i,false); 1371 else mEventIndicatorTop->enableColumn(i,false);
1367 } 1372 }
1368 1373
1369 mEventIndicatorTop->update(); 1374 mEventIndicatorTop->update();
1370} 1375}
1371 1376
1372void KOAgendaView::updateEventIndicatorBottom(int newY) 1377void KOAgendaView::updateEventIndicatorBottom(int newY)
1373{ 1378{
1374 uint i; 1379 uint i;
1375 for(i=0;i<mMaxY.size();++i) { 1380 for(i=0;i<mMaxY.size();++i) {
1376 if (newY <= mMaxY.at(i)) mEventIndicatorBottom->enableColumn(i,true); 1381 if (newY <= mMaxY.at(i)) mEventIndicatorBottom->enableColumn(i,true);
1377 else mEventIndicatorBottom->enableColumn(i,false); 1382 else mEventIndicatorBottom->enableColumn(i,false);
1378 } 1383 }
1379 1384
1380 mEventIndicatorBottom->update(); 1385 mEventIndicatorBottom->update();
1381} 1386}
1382 1387
1383void KOAgendaView::startDrag(Event *event) 1388void KOAgendaView::startDrag(Event *event)
1384{ 1389{
1385#ifndef KORG_NODND 1390#ifndef KORG_NODND
1386 DndFactory factory( calendar() ); 1391 DndFactory factory( calendar() );
1387 ICalDrag *vd = factory.createDrag(event,this); 1392 ICalDrag *vd = factory.createDrag(event,this);
1388 if (vd->drag()) { 1393 if (vd->drag()) {
1389 kdDebug() << "KOAgendaView::startDrag(): Delete drag source" << endl; 1394 kdDebug() << "KOAgendaView::startDrag(): Delete drag source" << endl;
1390 } 1395 }
1391#endif 1396#endif
1392} 1397}
1393 1398
1394void KOAgendaView::readSettings() 1399void KOAgendaView::readSettings()
1395{ 1400{
1396 readSettings(KOGlobals::config()); 1401 readSettings(KOGlobals::config());
1397} 1402}
1398 1403
1399void KOAgendaView::readSettings(KConfig *config) 1404void KOAgendaView::readSettings(KConfig *config)
1400{ 1405{
1401 // kdDebug() << "KOAgendaView::readSettings()" << endl; 1406 // kdDebug() << "KOAgendaView::readSettings()" << endl;
1402 1407
1403 config->setGroup("Views"); 1408 config->setGroup("Views");
1404 1409
1405 //#ifndef KORG_NOSPLITTER 1410 //#ifndef KORG_NOSPLITTER
1406 QValueList<int> sizes = config->readIntListEntry("Separator AgendaView"); 1411 QValueList<int> sizes = config->readIntListEntry("Separator AgendaView");
1407 if (sizes.count() == 2) { 1412 if (sizes.count() == 2) {
1408 if ( sizes[0] < 20 ) { 1413 if ( sizes[0] < 20 ) {
1409 sizes[1] = sizes[1] +20 - sizes[0]; 1414 sizes[1] = sizes[1] +20 - sizes[0];
1410 sizes[0] = 20; 1415 sizes[0] = 20;
1411 } 1416 }
1412 mSplitterAgenda->setSizes(sizes); 1417 mSplitterAgenda->setSizes(sizes);
1413 // qDebug("read %d %d ",sizes[0],sizes[1] ); 1418 // qDebug("read %d %d ",sizes[0],sizes[1] );
1414 } 1419 }
1415 //#endif 1420 //#endif
1416 1421
1417 // updateConfig(); 1422 // updateConfig();
1418} 1423}
1419 1424
1420void KOAgendaView::writeSettings(KConfig *config) 1425void KOAgendaView::writeSettings(KConfig *config)
1421{ 1426{
1422 // kdDebug() << "KOAgendaView::writeSettings()" << endl; 1427 // kdDebug() << "KOAgendaView::writeSettings()" << endl;
1423 1428
1424 config->setGroup("Views"); 1429 config->setGroup("Views");
1425 1430
1426 //#ifndef KORG_NOSPLITTER 1431 //#ifndef KORG_NOSPLITTER
1427 QValueList<int> list = mSplitterAgenda->sizes(); 1432 QValueList<int> list = mSplitterAgenda->sizes();
1428 config->writeEntry("Separator AgendaView",list); 1433 config->writeEntry("Separator AgendaView",list);
1429 //qDebug("write %d %d ", list[0],list[1] ); 1434 //qDebug("write %d %d ", list[0],list[1] );
1430 //#endif 1435 //#endif
1431} 1436}
1432 1437
1433void KOAgendaView::setHolidayMasks() 1438void KOAgendaView::setHolidayMasks()
1434{ 1439{
1435 mHolidayMask.resize(mSelectedDates.count()); 1440 mHolidayMask.resize(mSelectedDates.count());
1436 1441
1437 uint i; 1442 uint i;
1438 for(i=0;i<mSelectedDates.count();++i) { 1443 for(i=0;i<mSelectedDates.count();++i) {
1439 QDate date = mSelectedDates[i]; 1444 QDate date = mSelectedDates[i];
1440 bool showSaturday = KOPrefs::instance()->mExcludeSaturdays && (date.dayOfWeek() == 6); 1445 bool showSaturday = KOPrefs::instance()->mExcludeSaturdays && (date.dayOfWeek() == 6);
1441 bool showSunday = KOPrefs::instance()->mExcludeHolidays && (date.dayOfWeek() == 7); 1446 bool showSunday = KOPrefs::instance()->mExcludeHolidays && (date.dayOfWeek() == 7);
1442 bool showHoliday = false; 1447 bool showHoliday = false;
1443 if ( KOPrefs::instance()->mExcludeHolidays ) { 1448 if ( KOPrefs::instance()->mExcludeHolidays ) {
1444 QPtrList<Event> events = calendar()->events( date, true ); 1449 QPtrList<Event> events = calendar()->events( date, true );
1445 Event *event; 1450 Event *event;
1446 for( event = events.first(); event; event = events.next() ) { 1451 for( event = events.first(); event; event = events.next() ) {
1447 if ( event->isHoliday()) { 1452 if ( event->isHoliday()) {
1448 showHoliday = true; 1453 showHoliday = true;
1449 break; 1454 break;
1450 } 1455 }
1451 } 1456 }
1452 1457
1453 } 1458 }
1454 1459
1455#ifndef KORG_NOPLUGINS 1460#ifndef KORG_NOPLUGINS
1456 bool showHoliday = KOPrefs::instance()->mExcludeHolidays && 1461 bool showHoliday = KOPrefs::instance()->mExcludeHolidays &&
1457 !KOCore::self()->holiday(date).isEmpty(); 1462 !KOCore::self()->holiday(date).isEmpty();
1458#endif 1463#endif
1459 bool showDay = showSaturday || showSunday || showHoliday; 1464 bool showDay = showSaturday || showSunday || showHoliday;
1460 1465
1461 if (showDay) { 1466 if (showDay) {
1462 mHolidayMask.at(i) = true; 1467 mHolidayMask.at(i) = true;
1463 } else { 1468 } else {
1464 mHolidayMask.at(i) = false; 1469 mHolidayMask.at(i) = false;
1465 } 1470 }
1466 } 1471 }
1467 1472
1468 mAgenda->setHolidayMask(&mHolidayMask); 1473 mAgenda->setHolidayMask(&mHolidayMask);
1469 mAllDayAgenda->setHolidayMask(&mHolidayMask); 1474 mAllDayAgenda->setHolidayMask(&mHolidayMask);
1470} 1475}
1471 1476
1472void KOAgendaView::setContentsPos(int y) 1477void KOAgendaView::setContentsPos(int y)
1473{ 1478{
1474 mAgenda->setContentsPos(0,y); 1479 mAgenda->setContentsPos(0,y);
1475} 1480}
1476 1481
1477void KOAgendaView::clearSelection() 1482void KOAgendaView::clearSelection()
1478{ 1483{
1479 mAgenda->deselectItem(); 1484 mAgenda->deselectItem();
1480 mAllDayAgenda->deselectItem(); 1485 mAllDayAgenda->deselectItem();
1481} 1486}
1482 1487
1483void KOAgendaView::newTimeSpanSelectedAllDay(int gxStart, int gyStart, 1488void KOAgendaView::newTimeSpanSelectedAllDay(int gxStart, int gyStart,
1484 int gxEnd, int gyEnd) 1489 int gxEnd, int gyEnd)
1485{ 1490{
1486 mTimeSpanInAllDay = true; 1491 mTimeSpanInAllDay = true;
1487 newTimeSpanSelected(gxStart,gyStart,gxEnd,gyEnd); 1492 newTimeSpanSelected(gxStart,gyStart,gxEnd,gyEnd);
1488} 1493}
1489 1494
1490 1495
1491 1496
1492 1497
1493void KOAgendaView::newTimeSpanSelected(int gxStart, int gyStart, 1498void KOAgendaView::newTimeSpanSelected(int gxStart, int gyStart,
1494 int gxEnd, int gyEnd) 1499 int gxEnd, int gyEnd)
1495{ 1500{
1496 if (!mSelectedDates.count()) return; 1501 if (!mSelectedDates.count()) return;
1497 1502
1498 QDate dayStart = mSelectedDates[gxStart]; 1503 QDate dayStart = mSelectedDates[gxStart];
1499 QDate dayEnd = mSelectedDates[gxEnd]; 1504 QDate dayEnd = mSelectedDates[gxEnd];
1500 1505
1501 QTime timeStart = mAgenda->gyToTime(gyStart); 1506 QTime timeStart = mAgenda->gyToTime(gyStart);
1502 QTime timeEnd = mAgenda->gyToTime( gyEnd + 1 ); 1507 QTime timeEnd = mAgenda->gyToTime( gyEnd + 1 );
1503 1508
1504 QDateTime dtStart(dayStart,timeStart); 1509 QDateTime dtStart(dayStart,timeStart);
1505 QDateTime dtEnd(dayEnd,timeEnd); 1510 QDateTime dtEnd(dayEnd,timeEnd);
1506 1511
1507 mTimeSpanBegin = dtStart; 1512 mTimeSpanBegin = dtStart;
1508 mTimeSpanEnd = dtEnd; 1513 mTimeSpanEnd = dtEnd;
1509 1514
1510} 1515}
1511 1516
1512void KOAgendaView::deleteSelectedDateTime() 1517void KOAgendaView::deleteSelectedDateTime()
1513{ 1518{
1514 mTimeSpanBegin.setDate(QDate()); 1519 mTimeSpanBegin.setDate(QDate());
1515 mTimeSpanEnd.setDate(QDate()); 1520 mTimeSpanEnd.setDate(QDate());
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index 6ecc233..1eeb8d1 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -1,131 +1,131 @@
1/* 1/*
2 This file is part of KOrganizer. 2 This file is part of KOrganizer.
3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 GNU General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18*/ 18*/
19#ifndef KOEVENTVIEWER_H 19#ifndef KOEVENTVIEWER_H
20#define KOEVENTVIEWER_H 20#define KOEVENTVIEWER_H
21// 21//
22// Viewer widget for events. 22// Viewer widget for events.
23// 23//
24 24
25#include <qtextbrowser.h> 25#include <qtextbrowser.h>
26 26
27#include <libkcal/event.h> 27#include <libkcal/event.h>
28#include <libkcal/journal.h> 28#include <libkcal/journal.h>
29 29
30 30
31using namespace KCal; 31using namespace KCal;
32 32
33#ifdef DESKTOP_VERSION 33#ifdef DESKTOP_VERSION
34 34
35#include <qradiobutton.h> 35#include <qradiobutton.h>
36#include <qpushbutton.h> 36#include <qpushbutton.h>
37#include <qlayout.h> 37#include <qlayout.h>
38#include <qdialog.h> 38#include <qdialog.h>
39#include <qlabel.h> 39#include <qlabel.h>
40#include <qbuttongroup.h> 40#include <qbuttongroup.h>
41#include <kglobal.h> 41#include <kglobal.h>
42 42
43class KOPrintPrefs : public QDialog 43class KOPrintPrefs : public QDialog
44{ 44{
45 public: 45 public:
46 KOPrintPrefs( QWidget *parent=0, const char *name=0 ) : 46 KOPrintPrefs( QWidget *parent=0, const char *name=0 ) :
47 QDialog( parent, name, true ) 47 QDialog( parent, name, true )
48 { 48 {
49 setCaption( i18n("KO/Pi Printout") ); 49 setCaption( i18n("KO/Pi Printout") );
50 QVBoxLayout* lay = new QVBoxLayout( this ); 50 QVBoxLayout* lay = new QVBoxLayout( this );
51 lay->setSpacing( 3 ); 51 lay->setSpacing( 9 );
52 lay->setMargin( 3 ); 52 lay->setMargin( 9 );
53 QLabel * lab = new QLabel( i18n("This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog."), this ); 53 QLabel * lab = new QLabel( i18n("This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.\n"), this );
54 lay->addWidget( lab ); 54 lay->addWidget( lab );
55 lab->setAlignment( AlignCenter );
55 QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("Printout Mode"), this ); 56 QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("Printout Mode"), this );
56 lay->addWidget( format ); 57 lay->addWidget( format );
57 format->setExclusive ( true ) ; 58 format->setExclusive ( true ) ;
58 pmNo = new QRadioButton(i18n("Print unscaled"), format ); 59 pmNo = new QRadioButton(i18n("Print unscaled"), format );
59 pmScaledDown = new QRadioButton(i18n("Print scaled down to fit one page"), format ); 60 pmScaledDown = new QRadioButton(i18n("Print scaled down to fit one page"), format );
60 new QRadioButton(i18n("Print scaled up/down to fit one page"), format ); 61 new QRadioButton(i18n("Print scaled up/down to fit one page"), format );
61 pmScaledDown->setChecked( true ); 62 pmScaledDown->setChecked( true );
62 QPushButton * ok = new QPushButton( i18n("OK"), this ); 63 QPushButton * ok = new QPushButton( i18n("OK"), this );
63 lay->addWidget( ok ); 64 lay->addWidget( ok );
64 QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); 65 QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
65 lay->addWidget( cancel ); 66 lay->addWidget( cancel );
66 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); 67 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) );
67 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); 68 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) );
68 resize( 200, 200 );
69 } 69 }
70 70
71 int printMode() 71 int printMode()
72 { 72 {
73 if ( pmNo->isChecked() ) 73 if ( pmNo->isChecked() )
74 return 0; 74 return 0;
75 if ( pmScaledDown->isChecked() ) 75 if ( pmScaledDown->isChecked() )
76 return 1; 76 return 1;
77 return 2; 77 return 2;
78 } 78 }
79private: 79private:
80 QRadioButton* pmNo; 80 QRadioButton* pmNo;
81 QRadioButton* pmScaledDown; 81 QRadioButton* pmScaledDown;
82}; 82};
83 83
84#endif 84#endif
85 85
86class KOEventViewer : public QTextBrowser { 86class KOEventViewer : public QTextBrowser {
87 Q_OBJECT 87 Q_OBJECT
88 public: 88 public:
89 KOEventViewer(QWidget *parent=0,const char *name=0); 89 KOEventViewer(QWidget *parent=0,const char *name=0);
90 virtual ~KOEventViewer(); 90 virtual ~KOEventViewer();
91 91
92 void setSource(const QString &); 92 void setSource(const QString &);
93 void setEvent(Event *event); 93 void setEvent(Event *event);
94 void addEvent(Event *event); 94 void addEvent(Event *event);
95 void setTodo(Todo *event, bool clearV = true ); 95 void setTodo(Todo *event, bool clearV = true );
96 void setJournal(Journal *jour, bool clearV = true ); 96 void setJournal(Journal *jour, bool clearV = true );
97 97
98 void appendEvent(Event *event, int mode = 0 ); 98 void appendEvent(Event *event, int mode = 0 );
99 void appendTodo(Todo *event, int mode = 0 ); 99 void appendTodo(Todo *event, int mode = 0 );
100 void appendJournal(Journal *jour, int mode = 0 ); 100 void appendJournal(Journal *jour, int mode = 0 );
101 101
102 void clearEvents(bool now=false); 102 void clearEvents(bool now=false);
103 103
104 void addText(QString text); 104 void addText(QString text);
105 void setSyncMode( bool ); 105 void setSyncMode( bool );
106 void setColorMode( int ); 106 void setColorMode( int );
107 void mailToAttendees( bool all ); 107 void mailToAttendees( bool all );
108 void printMe(); 108 void printMe();
109 109
110 protected: 110 protected:
111 int mColorMode; 111 int mColorMode;
112 void addTag(const QString & tag,const QString & text); 112 void addTag(const QString & tag,const QString & text);
113 113
114 void formatCategories(Incidence *event); 114 void formatCategories(Incidence *event);
115 void formatAttendees(Incidence *event); 115 void formatAttendees(Incidence *event);
116 void formatReadOnly(Incidence *event); 116 void formatReadOnly(Incidence *event);
117 void keyPressEvent ( QKeyEvent * e ); 117 void keyPressEvent ( QKeyEvent * e );
118 118
119 private: 119 private:
120 QTextBrowser *mEventTextView; 120 QTextBrowser *mEventTextView;
121 bool mSyncMode; 121 bool mSyncMode;
122 QString deTag(QString text); 122 QString deTag(QString text);
123 123
124 QString mText; 124 QString mText;
125 QString mMailSubject; 125 QString mMailSubject;
126 Incidence* mCurrentIncidence; 126 Incidence* mCurrentIncidence;
127 signals: 127 signals:
128 void launchaddressbook(QString uid); 128 void launchaddressbook(QString uid);
129}; 129};
130 130
131#endif 131#endif