author | zautrix <zautrix> | 2004-08-06 10:53:41 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-08-06 10:53:41 (UTC) |
commit | cde989298c4891f54ad70ae03080ac8fa57b5c3f (patch) (unidiff) | |
tree | 945e4d75d5c6f2a6a2ebed6e50a6a1a769e4366c | |
parent | 841ce8881dbeee8a10dea8b96f82addd28f52536 (diff) | |
download | kdepimpi-cde989298c4891f54ad70ae03080ac8fa57b5c3f.zip kdepimpi-cde989298c4891f54ad70ae03080ac8fa57b5c3f.tar.gz kdepimpi-cde989298c4891f54ad70ae03080ac8fa57b5c3f.tar.bz2 |
Added licence menu in kopi
-rw-r--r-- | Makefile | 22 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 10 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 1 | ||||
-rw-r--r-- | microkde/kapplication.cpp | 44 | ||||
-rw-r--r-- | microkde/kapplication.h | 1 |
5 files changed, 60 insertions, 18 deletions
@@ -1,67 +1,67 @@ | |||
1 | DISTPATH = $(shell pwd) | 1 | DISTPATH = $(shell pwd) |
2 | DISTDIR = $(shell basename $(DISTPATH)) | 2 | DISTDIR = $(shell basename $(DISTPATH)) |
3 | 3 | ||
4 | 4 | ||
5 | ifeq ($(PLATFORM) , zaurus) | 5 | ifeq ($(PLATFORM) , zaurus) |
6 | BUILD_NO_LDAP_PLUGIN=1 | 6 | BUILD_NO_LDAP_PLUGIN=1 |
7 | endif | 7 | endif |
8 | 8 | ||
9 | ifneq ($(PLATFORM) , zaurus) | 9 | ifneq ($(PLATFORM) , zaurus) |
10 | BUILD_NO_SHARP_PLUGIN=1 | 10 | BUILD_NO_SHARP_PLUGIN=1 |
11 | endif | 11 | endif |
12 | 12 | ||
13 | SUBDIRS_MICROKDE = \ | 13 | SUBDIRS_MICROKDE = \ |
14 | libical/src/libical \ | 14 | libical/src/libical \ |
15 | libical/src/libicalss \ | 15 | libical/src/libicalss \ |
16 | qtcompat \ | 16 | qtcompat \ |
17 | microkde \ | 17 | microkde \ |
18 | libkcal \ | 18 | libkcal \ |
19 | libkdepim \ | 19 | libkdepim \ |
20 | kabc \ | 20 | kabc \ |
21 | kabc/formats/binary \ | 21 | kabc/formats/binary \ |
22 | kabc/plugins/file \ | 22 | kabc/plugins/file \ |
23 | kabc/plugins/dir \ | 23 | kabc/plugins/dir \ |
24 | korganizer \ | 24 | korganizer \ |
25 | kalarmd \ | 25 | kalarmd \ |
26 | kaddressbook | 26 | kaddressbook |
27 | 27 | ||
28 | SUBDIRS_QTOPIA_PLUGIN = \ | 28 | SUBDIRS_QTOPIA_PLUGIN = \ |
29 | kabc/plugins/qtopia | 29 | kabc/plugins/qtopia |
30 | 30 | ||
31 | SUBDIRS_OPIE_PLUGIN = \ | 31 | SUBDIRS_OPIE_PLUGIN = \ |
32 | kabc/plugins/opie | 32 | kabc/plugins/opie |
33 | 33 | ||
34 | SUBDIRS_SHARP_PLUGIN = \ | 34 | SUBDIRS_SHARP_PLUGIN = \ |
35 | kabc/plugins/sharpdtm | 35 | kabc/plugins/sharpdtm |
36 | 36 | ||
37 | SUBDIRS_LDAP_PLUGIN = \ | 37 | SUBDIRS_LDAP_PLUGIN = \ |
38 | kabc/plugins/ldap | 38 | kabc/plugins/ldap |
39 | 39 | ||
40 | SUBDIRS_MICROMAIL = \ | 40 | SUBDIRS_MICROMAIL = \ |
41 | kmicromail/libetpan \ | 41 | kmicromail/libetpan \ |
42 | kmicromail/libmailwrapper \ | 42 | kmicromail/libmailwrapper \ |
43 | kmicromail | 43 | kmicromail |
44 | 44 | ||
45 | SUBDIRS = \ | 45 | SUBDIRS = \ |
46 | $(SUBDIRS_MICROKDE) \ | 46 | $(SUBDIRS_MICROKDE) \ |
47 | $(SUBDIRS_QTOPIA_PLUGIN) \ | 47 | $(SUBDIRS_QTOPIA_PLUGIN) \ |
48 | $(SUBDIRS_OPIE_PLUGIN) \ | 48 | $(SUBDIRS_OPIE_PLUGIN) \ |
49 | $(SUBDIRS_SHARP_PLUGIN) \ | 49 | $(SUBDIRS_SHARP_PLUGIN) \ |
50 | $(SUBDIRS_LDAP_PLUGIN) \ | 50 | $(SUBDIRS_LDAP_PLUGIN) \ |
51 | $(SUBDIRS_MICROMAIL) | 51 | $(SUBDIRS_MICROMAIL) |
52 | 52 | ||
53 | 53 | ||
54 | all: build_microkde \ | 54 | all: build_microkde \ |
55 | build_qtopia_plugin \ | 55 | build_qtopia_plugin \ |
56 | build_opie_plugin \ | 56 | build_opie_plugin \ |
57 | build_sharp_plugin \ | 57 | build_sharp_plugin \ |
58 | build_ldap_plugin \ | 58 | build_ldap_plugin \ |
59 | build_micromail | 59 | build_micromail |
60 | 60 | ||
61 | 61 | ||
62 | build_microkde: variable_test tmake | 62 | build_microkde: variable_test tmake |
63 | for i in $(SUBDIRS_MICROKDE); do pushd $$i; \ | 63 | for i in $(SUBDIRS_MICROKDE); do pushd $$i; \ |
64 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 64 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
65 | done | 65 | done |
66 | 66 | ||
67 | build_qtopia_plugin: build_microkde | 67 | build_qtopia_plugin: build_microkde |
@@ -113,167 +113,155 @@ variable_info: | |||
113 | @echo QTDIR=$(QTDIR) | 113 | @echo QTDIR=$(QTDIR) |
114 | @echo QPEDIR=$(QPEDIR) | 114 | @echo QPEDIR=$(QPEDIR) |
115 | @echo OPIEDIR=$(OPIEDIR) | 115 | @echo OPIEDIR=$(OPIEDIR) |
116 | @echo PLATFORM=$(PLATFORM) | 116 | @echo PLATFORM=$(PLATFORM) |
117 | @echo RELEASE_DEBUG=$(RELEASE_DEBUG) | 117 | @echo RELEASE_DEBUG=$(RELEASE_DEBUG) |
118 | @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) | 118 | @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) |
119 | @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) | 119 | @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) |
120 | @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) | 120 | @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) |
121 | @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) | 121 | @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) |
122 | ifndef BUILD_NO_SHARP_PLUGIN | 122 | ifndef BUILD_NO_SHARP_PLUGIN |
123 | @echo SHARPDTMSDK=$(SHARPDTMSDK) | 123 | @echo SHARPDTMSDK=$(SHARPDTMSDK) |
124 | endif | 124 | endif |
125 | @echo -------------------------------------- | 125 | @echo -------------------------------------- |
126 | 126 | ||
127 | variable_test: variable_info | 127 | variable_test: variable_info |
128 | @echo KDEPIM buildsystem, variablecheck... | 128 | @echo KDEPIM buildsystem, variablecheck... |
129 | ifndef PLATFORM | 129 | ifndef PLATFORM |
130 | @echo PLATFORM is not defined. | 130 | @echo PLATFORM is not defined. |
131 | $(error PLATFORM is not defined) | 131 | $(error PLATFORM is not defined) |
132 | endif | 132 | endif |
133 | ifdef BUILD_NO_LDAP_PLUGIN | 133 | ifdef BUILD_NO_LDAP_PLUGIN |
134 | @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) | 134 | @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) |
135 | endif | 135 | endif |
136 | ifdef BUILD_NO_OPIE_PLUGIN | 136 | ifdef BUILD_NO_OPIE_PLUGIN |
137 | @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN) | 137 | @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN) |
138 | endif | 138 | endif |
139 | ifdef BUILD_NO_MICROMAIL | 139 | ifdef BUILD_NO_MICROMAIL |
140 | @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) | 140 | @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) |
141 | endif | 141 | endif |
142 | ifdef BUILD_NO_SHARP_PLUGIN | 142 | ifdef BUILD_NO_SHARP_PLUGIN |
143 | @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) | 143 | @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) |
144 | else | 144 | else |
145 | ifndef SHARPDTMSDK | 145 | ifndef SHARPDTMSDK |
146 | @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) | 146 | @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) |
147 | $(error SHARPDTMSDK is not defined) | 147 | $(error SHARPDTMSDK is not defined) |
148 | endif | 148 | endif |
149 | endif | 149 | endif |
150 | @echo -------------------------------------- | 150 | @echo -------------------------------------- |
151 | 151 | ||
152 | 152 | ||
153 | objects: | 153 | objects: |
154 | for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done | 154 | for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done |
155 | for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done | 155 | for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done |
156 | mkdir -p libical/lib/$(PLATFORM) | 156 | mkdir -p libical/lib/$(PLATFORM) |
157 | 157 | ||
158 | clean: | 158 | clean: |
159 | rm -f libical/lib/$(PLATFORM)/*; | 159 | rm -f libical/lib/$(PLATFORM)/*; |
160 | for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ | 160 | for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ |
161 | rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ | 161 | rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ |
162 | done | 162 | done |
163 | install: | 163 | install: |
164 | cd bin/kdepim; make install | 164 | cd bin/kdepim; make install |
165 | cp db2file/db2file $(QPEDIR)/bin/db2file | 165 | cp db2file/db2file $(QPEDIR)/bin/db2file |
166 | cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop | 166 | cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop |
167 | cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop | 167 | cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop |
168 | cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop | 168 | cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop |
169 | 169 | ||
170 | dist: | 170 | dist: |
171 | @echo Dont forget to do "make install" before "make dist" | 171 | @echo Dont forget to do "make install" before "make dist" |
172 | rm -f *arm.ipk | 172 | rm -f *arm.ipk |
173 | rm -f *~ | 173 | rm -f *~ |
174 | cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim | 174 | cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc kdepim |
175 | ./mkipks kmicrokdelibs.control | 175 | ./mkipks kmicrokdelibs.control |
176 | ./mkipks korganizer.control | 176 | ./mkipks korganizer.control |
177 | ./mkipks kaddressbook.control | 177 | ./mkipks kaddressbook.control |
178 | ifndef BUILD_NO_MICROMAIL | 178 | ifndef BUILD_NO_MICROMAIL |
179 | ./mkipks kopiemail.control | 179 | ./mkipks kopiemail.control |
180 | endif | 180 | endif |
181 | ./mkipks korganizer-alarm.control | 181 | ./mkipks korganizer-alarm.control |
182 | 182 | ||
183 | tmake: objects \ | 183 | tmake: objects \ |
184 | qtcompat/Makefile$(PLATFORM) \ | 184 | qtcompat/Makefile$(PLATFORM) \ |
185 | microkde/Makefile$(PLATFORM) \ | 185 | microkde/Makefile$(PLATFORM) \ |
186 | libkcal/Makefile$(PLATFORM) \ | 186 | libkcal/Makefile$(PLATFORM) \ |
187 | libkdepim/Makefile$(PLATFORM) \ | 187 | libkdepim/Makefile$(PLATFORM) \ |
188 | korganizer/Makefile$(PLATFORM) \ | 188 | korganizer/Makefile$(PLATFORM) \ |
189 | kalarmd/Makefile$(PLATFORM) \ | 189 | kalarmd/Makefile$(PLATFORM) \ |
190 | libical/src/libical/Makefile$(PLATFORM) \ | 190 | libical/src/libical/Makefile$(PLATFORM) \ |
191 | libical/src/libicalss/Makefile$(PLATFORM) \ | 191 | libical/src/libicalss/Makefile$(PLATFORM) \ |
192 | kabc/Makefile$(PLATFORM) \ | 192 | kabc/Makefile$(PLATFORM) \ |
193 | kabc/formats/binary/Makefile$(PLATFORM) \ | 193 | kabc/formats/binary/Makefile$(PLATFORM) \ |
194 | kabc/plugins/file/Makefile$(PLATFORM) \ | 194 | kabc/plugins/file/Makefile$(PLATFORM) \ |
195 | kabc/plugins/dir/Makefile$(PLATFORM) \ | 195 | kabc/plugins/dir/Makefile$(PLATFORM) \ |
196 | kabc/plugins/ldap/Makefile$(PLATFORM) \ | 196 | kabc/plugins/ldap/Makefile$(PLATFORM) \ |
197 | kabc/plugins/opie/Makefile$(PLATFORM) \ | 197 | kabc/plugins/opie/Makefile$(PLATFORM) \ |
198 | kabc/plugins/qtopia/Makefile$(PLATFORM) \ | 198 | kabc/plugins/qtopia/Makefile$(PLATFORM) \ |
199 | kabc/plugins/sharpdtm/Makefile$(PLATFORM) \ | 199 | kabc/plugins/sharpdtm/Makefile$(PLATFORM) \ |
200 | kaddressbook/xxport/opie/Makefile$(PLATFORM) \ | ||
201 | kaddressbook/xxport/qtopia/Makefile$(PLATFORM) \ | ||
202 | kaddressbook/xxport/sharpdtm/Makefile$(PLATFORM) \ | ||
203 | kaddressbook/Makefile$(PLATFORM) \ | 200 | kaddressbook/Makefile$(PLATFORM) \ |
204 | kmicromail/Makefile$(PLATFORM) \ | 201 | kmicromail/Makefile$(PLATFORM) \ |
205 | kmicromail/libetpan/Makefile$(PLATFORM) \ | 202 | kmicromail/libetpan/Makefile$(PLATFORM) \ |
206 | kmicromail/libmailwrapper/Makefile$(PLATFORM) | 203 | kmicromail/libmailwrapper/Makefile$(PLATFORM) |
204 | |||
207 | 205 | ||
208 | 206 | ||
209 | 207 | ||
210 | qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro | 208 | qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro |
211 | cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM) | 209 | cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" qtcompat.pro -o Makefile$(PLATFORM) |
212 | 210 | ||
213 | microkde/Makefile$(PLATFORM): microkde/microkdeE.pro | 211 | microkde/Makefile$(PLATFORM): microkde/microkdeE.pro |
214 | cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM) | 212 | cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" microkdeE.pro -o Makefile$(PLATFORM) |
215 | 213 | ||
216 | libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro | 214 | libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro |
217 | cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM) | 215 | cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" libkcalE.pro -o Makefile$(PLATFORM) |
218 | 216 | ||
219 | 217 | ||
220 | libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro | 218 | libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro |
221 | cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" libkdepimE.pro -o Makefile$(PLATFORM) | 219 | cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" libkdepimE.pro -o Makefile$(PLATFORM) |
222 | 220 | ||
223 | kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro | 221 | kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro |
224 | cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" kalarmdE.pro -o Makefile$(PLATFORM) | 222 | cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" kalarmdE.pro -o Makefile$(PLATFORM) |
225 | 223 | ||
226 | korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro | 224 | korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro |
227 | cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" korganizerE.pro -o Makefile$(PLATFORM) | 225 | cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" korganizerE.pro -o Makefile$(PLATFORM) |
228 | 226 | ||
229 | libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro | 227 | libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro |
230 | cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM) | 228 | cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalE.pro -o Makefile$(PLATFORM) |
231 | 229 | ||
232 | libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro | 230 | libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro |
233 | cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalssE.pro -o Makefile$(PLATFORM) | 231 | cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" libicalssE.pro -o Makefile$(PLATFORM) |
234 | 232 | ||
235 | kabc/Makefile$(PLATFORM): kabc/kabcE.pro | 233 | kabc/Makefile$(PLATFORM): kabc/kabcE.pro |
236 | cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcE.pro -o Makefile$(PLATFORM) | 234 | cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcE.pro -o Makefile$(PLATFORM) |
237 | 235 | ||
238 | kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro | 236 | kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro |
239 | cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM) | 237 | cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" kabcformat_binaryE.pro -o Makefile$(PLATFORM) |
240 | 238 | ||
241 | kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro | 239 | kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro |
242 | cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" fileE.pro -o Makefile$(PLATFORM) | 240 | cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" fileE.pro -o Makefile$(PLATFORM) |
243 | 241 | ||
244 | kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro | 242 | kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro |
245 | cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" dirE.pro -o Makefile$(PLATFORM) | 243 | cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" dirE.pro -o Makefile$(PLATFORM) |
246 | 244 | ||
247 | kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro | 245 | kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro |
248 | cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" ldapE.pro -o Makefile$(PLATFORM) | 246 | cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" ldapE.pro -o Makefile$(PLATFORM) |
249 | 247 | ||
250 | kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro | 248 | kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro |
251 | cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM) | 249 | cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM) |
252 | 250 | ||
253 | kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro | 251 | kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro |
254 | cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM) | 252 | cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM) |
255 | 253 | ||
256 | kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro | 254 | kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro |
257 | cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" sharpdtmE.pro -o Makefile$(PLATFORM) | 255 | cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" sharpdtmE.pro -o Makefile$(PLATFORM) |
258 | 256 | ||
259 | kaddressbook/xxport/opie/Makefile$(PLATFORM): kaddressbook/xxport/opie/opieE.pro | ||
260 | cd kaddressbook/xxport/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM) | ||
261 | |||
262 | kaddressbook/xxport/qtopia/Makefile$(PLATFORM): kaddressbook/xxport/qtopia/qtopiaE.pro | ||
263 | cd kaddressbook/xxport/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM) | ||
264 | |||
265 | kaddressbook/xxport/sharpdtm/Makefile$(PLATFORM): kaddressbook/xxport/sharpdtm/sharpdtmE.pro | ||
266 | cd kaddressbook/xxport/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" sharpdtmE.pro -o Makefile$(PLATFORM) | ||
267 | |||
268 | |||
269 | kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro | 257 | kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro |
270 | cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM) | 258 | cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM) |
271 | 259 | ||
272 | kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro | 260 | kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro |
273 | cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" kmicromailE.pro -o Makefile$(PLATFORM) | 261 | cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" kmicromailE.pro -o Makefile$(PLATFORM) |
274 | 262 | ||
275 | kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro | 263 | kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro |
276 | cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" libetpanE.pro -o Makefile$(PLATFORM) | 264 | cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" libetpanE.pro -o Makefile$(PLATFORM) |
277 | 265 | ||
278 | kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro | 266 | kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro |
279 | cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM) | 267 | cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" libmailwrapperE.pro -o Makefile$(PLATFORM) |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 6020a46..57b299f 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -12,64 +12,65 @@ | |||
12 | #include <qfileinfo.h> | 12 | #include <qfileinfo.h> |
13 | #include <qlabel.h> | 13 | #include <qlabel.h> |
14 | #include <qwmatrix.h> | 14 | #include <qwmatrix.h> |
15 | #include <qtextbrowser.h> | 15 | #include <qtextbrowser.h> |
16 | #include <qtextstream.h> | 16 | #include <qtextstream.h> |
17 | #ifndef DESKTOP_VERSION | 17 | #ifndef DESKTOP_VERSION |
18 | #include <qpe/global.h> | 18 | #include <qpe/global.h> |
19 | #include <qpe/qpemenubar.h> | 19 | #include <qpe/qpemenubar.h> |
20 | #include <qpe/qpetoolbar.h> | 20 | #include <qpe/qpetoolbar.h> |
21 | #include <qpe/resource.h> | 21 | #include <qpe/resource.h> |
22 | #include <qpe/qpeapplication.h> | 22 | #include <qpe/qpeapplication.h> |
23 | #include <qtopia/alarmserver.h> | 23 | #include <qtopia/alarmserver.h> |
24 | #include <qtopia/qcopenvelope_qws.h> | 24 | #include <qtopia/qcopenvelope_qws.h> |
25 | #else | 25 | #else |
26 | #include <qmenubar.h> | 26 | #include <qmenubar.h> |
27 | #include <qtoolbar.h> | 27 | #include <qtoolbar.h> |
28 | #include <qapplication.h> | 28 | #include <qapplication.h> |
29 | //#include <resource.h> | 29 | //#include <resource.h> |
30 | 30 | ||
31 | #endif | 31 | #endif |
32 | #include <libkcal/calendarlocal.h> | 32 | #include <libkcal/calendarlocal.h> |
33 | #include <libkcal/todo.h> | 33 | #include <libkcal/todo.h> |
34 | #include <libkdepim/ksyncprofile.h> | 34 | #include <libkdepim/ksyncprofile.h> |
35 | #include <libkdepim/kincidenceformatter.h> | 35 | #include <libkdepim/kincidenceformatter.h> |
36 | 36 | ||
37 | #include "calendarview.h" | 37 | #include "calendarview.h" |
38 | #include "koviewmanager.h" | 38 | #include "koviewmanager.h" |
39 | #include "datenavigator.h" | 39 | #include "datenavigator.h" |
40 | #include "koagendaview.h" | 40 | #include "koagendaview.h" |
41 | #include "koagenda.h" | 41 | #include "koagenda.h" |
42 | #include "kodialogmanager.h" | 42 | #include "kodialogmanager.h" |
43 | #include "kdialogbase.h" | 43 | #include "kdialogbase.h" |
44 | #include "kapplication.h" | ||
44 | #include "kstandarddirs.h" | 45 | #include "kstandarddirs.h" |
45 | #include "koprefs.h" | 46 | #include "koprefs.h" |
46 | #include "kfiledialog.h" | 47 | #include "kfiledialog.h" |
47 | #include "koglobals.h" | 48 | #include "koglobals.h" |
48 | #include "kglobal.h" | 49 | #include "kglobal.h" |
49 | #include "klocale.h" | 50 | #include "klocale.h" |
50 | #include "kconfig.h" | 51 | #include "kconfig.h" |
51 | #include "simplealarmclient.h" | 52 | #include "simplealarmclient.h" |
52 | using namespace KCal; | 53 | using namespace KCal; |
53 | #ifndef _WIN32_ | 54 | #ifndef _WIN32_ |
54 | #include <unistd.h> | 55 | #include <unistd.h> |
55 | #else | 56 | #else |
56 | #include "koimportoldialog.h" | 57 | #include "koimportoldialog.h" |
57 | #endif | 58 | #endif |
58 | #include "mainwindow.h" | 59 | #include "mainwindow.h" |
59 | 60 | ||
60 | int globalFlagBlockStartup; | 61 | int globalFlagBlockStartup; |
61 | MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | 62 | MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : |
62 | QMainWindow( parent, name ) | 63 | QMainWindow( parent, name ) |
63 | { | 64 | { |
64 | 65 | ||
65 | #ifdef DESKTOP_VERSION | 66 | #ifdef DESKTOP_VERSION |
66 | setFont( QFont("Arial"), 14 ); | 67 | setFont( QFont("Arial"), 14 ); |
67 | #endif | 68 | #endif |
68 | 69 | ||
69 | //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; | 70 | //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; |
70 | QString confFile = locateLocal("config","korganizerrc"); | 71 | QString confFile = locateLocal("config","korganizerrc"); |
71 | QFileInfo finf ( confFile ); | 72 | QFileInfo finf ( confFile ); |
72 | bool showWarning = !finf.exists(); | 73 | bool showWarning = !finf.exists(); |
73 | setIcon(SmallIcon( "ko24" ) ); | 74 | setIcon(SmallIcon( "ko24" ) ); |
74 | mBlockAtStartup = true; | 75 | mBlockAtStartup = true; |
75 | mFlagKeyPressed = false; | 76 | mFlagKeyPressed = false; |
@@ -662,64 +663,68 @@ void MainWindow::initActions() | |||
662 | connect( action, SIGNAL( activated() ), | 663 | connect( action, SIGNAL( activated() ), |
663 | SLOT( features() ) ); | 664 | SLOT( features() ) ); |
664 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); | 665 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); |
665 | action->addTo( helpMenu ); | 666 | action->addTo( helpMenu ); |
666 | connect( action, SIGNAL( activated() ), | 667 | connect( action, SIGNAL( activated() ), |
667 | SLOT( aboutAutoSaving() ) ); | 668 | SLOT( aboutAutoSaving() ) ); |
668 | action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); | 669 | action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); |
669 | action->addTo( helpMenu ); | 670 | action->addTo( helpMenu ); |
670 | connect( action, SIGNAL( activated() ), | 671 | connect( action, SIGNAL( activated() ), |
671 | SLOT( aboutKnownBugs() ) ); | 672 | SLOT( aboutKnownBugs() ) ); |
672 | action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); | 673 | action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); |
673 | action->addTo( helpMenu ); | 674 | action->addTo( helpMenu ); |
674 | connect( action, SIGNAL( activated() ), | 675 | connect( action, SIGNAL( activated() ), |
675 | SLOT( usertrans() ) ); | 676 | SLOT( usertrans() ) ); |
676 | action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); | 677 | action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); |
677 | action->addTo( helpMenu ); | 678 | action->addTo( helpMenu ); |
678 | connect( action, SIGNAL( activated() ), | 679 | connect( action, SIGNAL( activated() ), |
679 | SLOT( synchowto() ) ); | 680 | SLOT( synchowto() ) ); |
680 | action = new QAction( "Whats New", i18n("What's new?"), 0,this ); | 681 | action = new QAction( "Whats New", i18n("What's new?"), 0,this ); |
681 | action->addTo( helpMenu ); | 682 | action->addTo( helpMenu ); |
682 | connect( action, SIGNAL( activated() ), | 683 | connect( action, SIGNAL( activated() ), |
683 | SLOT( whatsNew() ) ); | 684 | SLOT( whatsNew() ) ); |
684 | action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); | 685 | action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this ); |
685 | action->addTo( helpMenu ); | 686 | action->addTo( helpMenu ); |
686 | connect( action, SIGNAL( activated() ), | 687 | connect( action, SIGNAL( activated() ), |
687 | SLOT( faq() ) ); | 688 | SLOT( faq() ) ); |
688 | 689 | ||
689 | 690 | ||
690 | action = new QAction( "about", i18n("About..."), 0, this ); | 691 | action = new QAction( "about", i18n("About..."), 0, this ); |
691 | action->addTo( helpMenu ); | 692 | action->addTo( helpMenu ); |
692 | connect( action, SIGNAL( activated() ), | 693 | connect( action, SIGNAL( activated() ), |
693 | SLOT( about() ) ); | 694 | SLOT( about() ) ); |
695 | action = new QAction( "licence", i18n("Licence..."), 0, this ); | ||
696 | action->addTo( helpMenu ); | ||
697 | connect( action, SIGNAL( activated() ), | ||
698 | SLOT( licence() ) ); | ||
694 | //menuBar->insertSeparator(); | 699 | //menuBar->insertSeparator(); |
695 | 700 | ||
696 | // ****************************************************** | 701 | // ****************************************************** |
697 | // menubar icons | 702 | // menubar icons |
698 | 703 | ||
699 | 704 | ||
700 | iconToolBar->setHorizontalStretchable (true ); | 705 | iconToolBar->setHorizontalStretchable (true ); |
701 | //menuBar->insertItem( iconToolBar ); | 706 | //menuBar->insertItem( iconToolBar ); |
702 | //xdays_action | 707 | //xdays_action |
703 | if (p-> mShowIconNewEvent) | 708 | if (p-> mShowIconNewEvent) |
704 | ne_action->addTo( iconToolBar ); | 709 | ne_action->addTo( iconToolBar ); |
705 | if (p->mShowIconNewTodo ) | 710 | if (p->mShowIconNewTodo ) |
706 | nt_action->addTo( iconToolBar ); | 711 | nt_action->addTo( iconToolBar ); |
707 | if (p-> mShowIconSearch) | 712 | if (p-> mShowIconSearch) |
708 | search_action->addTo( iconToolBar ); | 713 | search_action->addTo( iconToolBar ); |
709 | if (p-> mShowIconNext) | 714 | if (p-> mShowIconNext) |
710 | whatsnext_action->addTo( iconToolBar ); | 715 | whatsnext_action->addTo( iconToolBar ); |
711 | if (p-> mShowIconNextDays) | 716 | if (p-> mShowIconNextDays) |
712 | xdays_action->addTo( iconToolBar ); | 717 | xdays_action->addTo( iconToolBar ); |
713 | if (p-> mShowIconList) | 718 | if (p-> mShowIconList) |
714 | showlist_action->addTo( iconToolBar ); | 719 | showlist_action->addTo( iconToolBar ); |
715 | if (p-> mShowIconDay1) | 720 | if (p-> mShowIconDay1) |
716 | day1_action->addTo( iconToolBar ); | 721 | day1_action->addTo( iconToolBar ); |
717 | if (p-> mShowIconDay5) | 722 | if (p-> mShowIconDay5) |
718 | day5_action->addTo( iconToolBar ); | 723 | day5_action->addTo( iconToolBar ); |
719 | if (p-> mShowIconDay7) | 724 | if (p-> mShowIconDay7) |
720 | day7_action->addTo( iconToolBar ); | 725 | day7_action->addTo( iconToolBar ); |
721 | if (p-> mShowIconMonth) | 726 | if (p-> mShowIconMonth) |
722 | month_action->addTo( iconToolBar ); | 727 | month_action->addTo( iconToolBar ); |
723 | if (p-> mShowIconTodoview) | 728 | if (p-> mShowIconTodoview) |
724 | todoview_action->addTo( iconToolBar ); | 729 | todoview_action->addTo( iconToolBar ); |
725 | if (p-> mShowIconJournal) | 730 | if (p-> mShowIconJournal) |
@@ -1031,64 +1036,69 @@ void MainWindow::displayFile( QString fn, QString cap ) | |||
1031 | } | 1036 | } |
1032 | QTextStream ts( &file ); | 1037 | QTextStream ts( &file ); |
1033 | text = ts.read(); | 1038 | text = ts.read(); |
1034 | file.close(); | 1039 | file.close(); |
1035 | displayText( text, cap); | 1040 | displayText( text, cap); |
1036 | } | 1041 | } |
1037 | void MainWindow::features() | 1042 | void MainWindow::features() |
1038 | { | 1043 | { |
1039 | 1044 | ||
1040 | displayFile( "featuresKOPI.txt",i18n("KO/Pi Features and hints") ); | 1045 | displayFile( "featuresKOPI.txt",i18n("KO/Pi Features and hints") ); |
1041 | } | 1046 | } |
1042 | 1047 | ||
1043 | void MainWindow::usertrans() | 1048 | void MainWindow::usertrans() |
1044 | { | 1049 | { |
1045 | 1050 | ||
1046 | displayFile( "usertranslationHOWTO.txt",i18n("KO/Pi User translation HowTo") ); | 1051 | displayFile( "usertranslationHOWTO.txt",i18n("KO/Pi User translation HowTo") ); |
1047 | } | 1052 | } |
1048 | void MainWindow::synchowto() | 1053 | void MainWindow::synchowto() |
1049 | { | 1054 | { |
1050 | 1055 | ||
1051 | displayFile( "howtoSYNC.txt",i18n("KO/Pi Synchronization HowTo") ); | 1056 | displayFile( "howtoSYNC.txt",i18n("KO/Pi Synchronization HowTo") ); |
1052 | } | 1057 | } |
1053 | void MainWindow::faq() | 1058 | void MainWindow::faq() |
1054 | { | 1059 | { |
1055 | displayFile( "kopiFAQ.txt",i18n("KO/Pi FAQ") ); | 1060 | displayFile( "kopiFAQ.txt",i18n("KO/Pi FAQ") ); |
1056 | 1061 | ||
1057 | } | 1062 | } |
1058 | void MainWindow::whatsNew() | 1063 | void MainWindow::whatsNew() |
1059 | { | 1064 | { |
1060 | displayFile( "kopiWhatsNew.txt",i18n("KO/Pi Version Info") ); | 1065 | displayFile( "kopiWhatsNew.txt",i18n("KO/Pi Version Info") ); |
1061 | 1066 | ||
1062 | } | 1067 | } |
1068 | void MainWindow::licence() | ||
1069 | { | ||
1070 | KApplication::showLicence(); | ||
1071 | |||
1072 | } | ||
1063 | void MainWindow::about() | 1073 | void MainWindow::about() |
1064 | { | 1074 | { |
1065 | QString version; | 1075 | QString version; |
1066 | #include <../version> | 1076 | #include <../version> |
1067 | QMessageBox::about( this, i18n("About KOrganizer/Pi"), | 1077 | QMessageBox::about( this, i18n("About KOrganizer/Pi"), |
1068 | i18n("KOrganizer/Platform-independent\n") + | 1078 | i18n("KOrganizer/Platform-independent\n") + |
1069 | "(KO/Pi) " + version + " - " + | 1079 | "(KO/Pi) " + version + " - " + |
1070 | 1080 | ||
1071 | #ifdef DESKTOP_VERSION | 1081 | #ifdef DESKTOP_VERSION |
1072 | i18n("Desktop Edition\n") + | 1082 | i18n("Desktop Edition\n") + |
1073 | #else | 1083 | #else |
1074 | i18n("PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n") + | 1084 | i18n("PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n") + |
1075 | #endif | 1085 | #endif |
1076 | i18n("(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi is based on KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi is licensed\nunder the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.korganizer.org\nwww.pi-sync.net\n") ); | 1086 | i18n("(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi is based on KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi is licensed\nunder the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.korganizer.org\nwww.pi-sync.net\n") ); |
1077 | } | 1087 | } |
1078 | void MainWindow::keyBindings() | 1088 | void MainWindow::keyBindings() |
1079 | { | 1089 | { |
1080 | QString cap = i18n("Key bindings KOrganizer/Pi"); | 1090 | QString cap = i18n("Key bindings KOrganizer/Pi"); |
1081 | QString text = i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") + | 1091 | QString text = i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") + |
1082 | i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+ | 1092 | i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+ |
1083 | i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") + | 1093 | i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") + |
1084 | i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+ | 1094 | i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+ |
1085 | i18n("<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n")+ | 1095 | i18n("<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n")+ |
1086 | i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+ | 1096 | i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+ |
1087 | i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+ | 1097 | i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+ |
1088 | i18n("<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ")+ | 1098 | i18n("<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ")+ |
1089 | i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+ | 1099 | i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+ |
1090 | i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+ | 1100 | i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+ |
1091 | i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+ | 1101 | i18n("<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n")+ |
1092 | i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+ | 1102 | i18n("<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n")+ |
1093 | i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+ | 1103 | i18n("<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n")+ |
1094 | i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n")+ | 1104 | i18n("<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n")+ |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index a681f42..8a3f7b3 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -11,64 +11,65 @@ | |||
11 | class QAction; | 11 | class QAction; |
12 | class CalendarView; | 12 | class CalendarView; |
13 | class KSyncProfile; | 13 | class KSyncProfile; |
14 | #ifdef DESKTOP_VERSION | 14 | #ifdef DESKTOP_VERSION |
15 | 15 | ||
16 | #define QPEToolBar QToolBar | 16 | #define QPEToolBar QToolBar |
17 | #define QPEMenuBar QMenuBar | 17 | #define QPEMenuBar QMenuBar |
18 | #endif | 18 | #endif |
19 | class QPEToolBar; | 19 | class QPEToolBar; |
20 | 20 | ||
21 | namespace KCal { | 21 | namespace KCal { |
22 | class CalendarLocal; | 22 | class CalendarLocal; |
23 | } | 23 | } |
24 | 24 | ||
25 | using namespace KCal; | 25 | using namespace KCal; |
26 | 26 | ||
27 | class MainWindow : public QMainWindow | 27 | class MainWindow : public QMainWindow |
28 | { | 28 | { |
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | public: | 30 | public: |
31 | MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); | 31 | MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); |
32 | ~MainWindow(); | 32 | ~MainWindow(); |
33 | public slots: | 33 | public slots: |
34 | void configureAgenda( int ); | 34 | void configureAgenda( int ); |
35 | void recieve( const QCString& msg, const QByteArray& data ); | 35 | void recieve( const QCString& msg, const QByteArray& data ); |
36 | static QString defaultFileName(); | 36 | static QString defaultFileName(); |
37 | static QString resourcePath(); | 37 | static QString resourcePath(); |
38 | protected slots: | 38 | protected slots: |
39 | void setCaptionToDates(); | 39 | void setCaptionToDates(); |
40 | int ringSync(); | 40 | int ringSync(); |
41 | void multiSync( bool askforPrefs = false ); | 41 | void multiSync( bool askforPrefs = false ); |
42 | void about(); | 42 | void about(); |
43 | void licence(); | ||
43 | void faq(); | 44 | void faq(); |
44 | void usertrans(); | 45 | void usertrans(); |
45 | void features(); | 46 | void features(); |
46 | void synchowto(); | 47 | void synchowto(); |
47 | void whatsNew(); | 48 | void whatsNew(); |
48 | void keyBindings(); | 49 | void keyBindings(); |
49 | void aboutAutoSaving();; | 50 | void aboutAutoSaving();; |
50 | void aboutKnownBugs(); | 51 | void aboutKnownBugs(); |
51 | 52 | ||
52 | void processIncidenceSelection( Incidence * ); | 53 | void processIncidenceSelection( Incidence * ); |
53 | 54 | ||
54 | void importQtopia(); | 55 | void importQtopia(); |
55 | void importBday(); | 56 | void importBday(); |
56 | void importOL(); | 57 | void importOL(); |
57 | void importIcal(); | 58 | void importIcal(); |
58 | void importFile( QString, bool ); | 59 | void importFile( QString, bool ); |
59 | void quickImportIcal(); | 60 | void quickImportIcal(); |
60 | 61 | ||
61 | void slotModifiedChanged( bool ); | 62 | void slotModifiedChanged( bool ); |
62 | 63 | ||
63 | void save(); | 64 | void save(); |
64 | void configureToolBar( int ); | 65 | void configureToolBar( int ); |
65 | void printSel(); | 66 | void printSel(); |
66 | void printCal(); | 67 | void printCal(); |
67 | void saveCalendar(); | 68 | void saveCalendar(); |
68 | void loadCalendar(); | 69 | void loadCalendar(); |
69 | void exportVCalendar(); | 70 | void exportVCalendar(); |
70 | 71 | ||
71 | void slotSyncMenu( int ); | 72 | void slotSyncMenu( int ); |
72 | void syncSSH(); | 73 | void syncSSH(); |
73 | void confSync(); | 74 | void confSync(); |
74 | void syncSharp(); | 75 | void syncSharp(); |
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp index 1b3e689..f0de71e 100644 --- a/microkde/kapplication.cpp +++ b/microkde/kapplication.cpp | |||
@@ -1,33 +1,75 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | #include <stdio.h> | ||
2 | 3 | ||
3 | #include "kapplication.h" | 4 | #include "kapplication.h" |
4 | #include <qapplication.h> | 5 | #include <qapplication.h> |
6 | #include <qstring.h> | ||
7 | #include <qfile.h> | ||
8 | #include <qtextstream.h> | ||
9 | #include <qdialog.h> | ||
10 | #include <qlayout.h> | ||
11 | #include <qtextbrowser.h> | ||
5 | 12 | ||
6 | int KApplication::random() | 13 | int KApplication::random() |
7 | { | 14 | { |
8 | return rand(); | 15 | return rand(); |
9 | } | 16 | } |
10 | 17 | ||
11 | //US | 18 | //US |
12 | QString KApplication::randomString(int length) | 19 | QString KApplication::randomString(int length) |
13 | { | 20 | { |
14 | if (length <=0 ) return QString::null; | 21 | if (length <=0 ) return QString::null; |
15 | 22 | ||
16 | QString str; | 23 | QString str; |
17 | while (length--) | 24 | while (length--) |
18 | { | 25 | { |
19 | int r=random() % 62; | 26 | int r=random() % 62; |
20 | r+=48; | 27 | r+=48; |
21 | if (r>57) r+=7; | 28 | if (r>57) r+=7; |
22 | if (r>90) r+=6; | 29 | if (r>90) r+=6; |
23 | str += char(r); | 30 | str += char(r); |
24 | // so what if I work backwards? | 31 | // so what if I work backwards? |
25 | } | 32 | } |
26 | return str; | 33 | return str; |
27 | } | 34 | } |
28 | int KApplication::execDialog( QDialog* d ) | 35 | int KApplication::execDialog( QDialog* d ) |
29 | { | 36 | { |
30 | if (QApplication::desktop()->width() <= 640 ) | 37 | if (QApplication::desktop()->width() <= 640 ) |
31 | d->showMaximized(); | 38 | d->showMaximized(); |
32 | return d->exec(); | 39 | return d->exec(); |
33 | } | 40 | } |
41 | void KApplication::showLicence() | ||
42 | { | ||
43 | QString fileName ; | ||
44 | QString text; | ||
45 | #ifndef DESKTOP_VERSION | ||
46 | fileName = getenv("QPEDIR"); | ||
47 | fileName += "/pics/kdepim/LICENCE.TXT" ; | ||
48 | #else | ||
49 | fileName = qApp->applicationDirPath () + "/kdepim/LICENCE.TXT"; | ||
50 | #endif | ||
51 | QFile file( fileName ); | ||
52 | qDebug("Licence file name %s ",fileName.latin1() ); | ||
53 | if (!file.open( IO_ReadOnly ) ) { | ||
54 | return ; | ||
55 | } | ||
56 | QTextStream ts( &file ); | ||
57 | text = ts.read(); | ||
58 | file.close(); | ||
59 | |||
60 | QDialog dia( 0, "name", true ); ; | ||
61 | dia.setCaption( "KDE-Pim/Pi licence" ); | ||
62 | QVBoxLayout* lay = new QVBoxLayout( &dia ); | ||
63 | lay->setSpacing( 3 ); | ||
64 | lay->setMargin( 3 ); | ||
65 | QTextBrowser tb ( &dia ); | ||
66 | lay->addWidget( &tb ); | ||
67 | tb.setText( text ); | ||
68 | #ifdef DESKTOP_VERSION | ||
69 | dia.resize( 640, 480); | ||
70 | #else | ||
71 | dia.showMaximized(); | ||
72 | #endif | ||
73 | dia.exec(); | ||
74 | |||
75 | } | ||
diff --git a/microkde/kapplication.h b/microkde/kapplication.h index 77206f5..9515c60 100644 --- a/microkde/kapplication.h +++ b/microkde/kapplication.h | |||
@@ -1,23 +1,24 @@ | |||
1 | #ifndef MINIKDE_KAPPLICATION_H | 1 | #ifndef MINIKDE_KAPPLICATION_H |
2 | #define MINIKDE_KAPPLICATION_H | 2 | #define MINIKDE_KAPPLICATION_H |
3 | 3 | ||
4 | #include "qstring.h" | 4 | #include "qstring.h" |
5 | #include <qdialog.h> | 5 | #include <qdialog.h> |
6 | 6 | ||
7 | class KApplication | 7 | class KApplication |
8 | { | 8 | { |
9 | public: | 9 | public: |
10 | static int random(); | 10 | static int random(); |
11 | 11 | ||
12 | //US | 12 | //US |
13 | /** | 13 | /** |
14 | * Generates a random string. It operates in the range [A-Za-z0-9] | 14 | * Generates a random string. It operates in the range [A-Za-z0-9] |
15 | * @param length Generate a string of this length. | 15 | * @param length Generate a string of this length. |
16 | * @return the random string | 16 | * @return the random string |
17 | */ | 17 | */ |
18 | static QString randomString(int length); | 18 | static QString randomString(int length); |
19 | static int execDialog( QDialog* ); | 19 | static int execDialog( QDialog* ); |
20 | static void showLicence(); | ||
20 | }; | 21 | }; |
21 | 22 | ||
22 | 23 | ||
23 | #endif | 24 | #endif |