author | zautrix <zautrix> | 2005-03-28 19:45:15 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-28 19:45:15 (UTC) |
commit | 4034290f894ff7d1b0cf1197078e0ed832566bb7 (patch) (unidiff) | |
tree | 21b7d2e2568f11079f705b8312e15146be4309ac | |
parent | ea070abfcff313cac87dbb4d5c9410784740de21 (diff) | |
download | kdepimpi-4034290f894ff7d1b0cf1197078e0ed832566bb7.zip kdepimpi-4034290f894ff7d1b0cf1197078e0ed832566bb7.tar.gz kdepimpi-4034290f894ff7d1b0cf1197078e0ed832566bb7.tar.bz2 |
print fixes
-rw-r--r-- | Makefile | 662 | ||||
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 4 | ||||
-rw-r--r-- | korganizer/koagendaview.cpp | 5 | ||||
-rw-r--r-- | korganizer/koeventviewer.h | 8 |
4 files changed, 395 insertions, 284 deletions
@@ -1,279 +1,385 @@ | |||
1 | ############################################################################# | 1 | export 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 | 3 | export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < version) |
4 | # Project: kdepim-desktop.pro | 4 | |
5 | # Template: subdirs | 5 | ifeq ($(PLATFORM) , zaurus) |
6 | # Command: $(QMAKE) -o Makefile kdepim-desktop.pro | 6 | BUILD_NO_LDAP_PLUGIN=1 |
7 | ############################################################################# | 7 | endif |
8 | 8 | ||
9 | MAKEFILE =Makefile | 9 | ifneq ($(PLATFORM) , zaurus) |
10 | QMAKE =qmake | 10 | BUILD_NO_SHARP_PLUGIN=1 |
11 | DEL_FILE = rm -f | 11 | endif |
12 | CHK_DIR_EXISTS= test -d | 12 | |
13 | MKDIR = mkdir -p | 13 | #opie plugin is deprecated. The qtopia plugin handles the task from now on. |
14 | INSTALL_FILE= | 14 | BUILD_NO_OPIE_PLUGIN=1 |
15 | INSTALL_DIR = | 15 | |
16 | SUBTARGETS = \ | 16 | SUBDIRS_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 \ | 31 | SUBDIRS_QTOPIA_PLUGIN = \ |
32 | sub-pwmanager-libcrypt-cipher \ | 32 | kabc/plugins/qtopia |
33 | sub-pwmanager-libcrypt-error \ | 33 | |
34 | sub-pwmanager-libcrypt-mpi \ | 34 | SUBDIRS_OPIE_PLUGIN = \ |
35 | sub-pwmanager-libcrypt-zlib \ | 35 | kabc/plugins/opie |
36 | sub-pwmanager-pwmanager | 36 | |
37 | 37 | SUBDIRS_SHARP_PLUGIN = \ | |
38 | first: all | 38 | kabc/plugins/sharpdtm |
39 | 39 | ||
40 | all: Makefile $(SUBTARGETS) | 40 | SUBDIRS_LDAP_PLUGIN = \ |
41 | 41 | kabc/plugins/ldap | |
42 | libical/$(MAKEFILE): | 42 | |
43 | @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical" | 43 | SUBDIRS_MICROMAIL = \ |
44 | cd libical && $(QMAKE) libical.pro -o $(MAKEFILE) | 44 | libetpan \ |
45 | sub-libical: libical/$(MAKEFILE) FORCE | 45 | kmicromail/libmailwrapper \ |
46 | cd libical && $(MAKE) -f $(MAKEFILE) | 46 | kmicromail |
47 | 47 | ||
48 | libkcal/$(MAKEFILE): | 48 | SUBDIRS_GAMMU = \ |
49 | @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal" | 49 | gammu/emb/common \ |
50 | cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE) | 50 | gammu/emb/gammu |
51 | sub-libkcal: libkcal/$(MAKEFILE) FORCE | 51 | |
52 | cd libkcal && $(MAKE) -f $(MAKEFILE) | 52 | SUBDIRS_PWMANAGER = \ |
53 | 53 | pwmanager/libcrypt/mpi \ | |
54 | kabc/$(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 \ |
57 | sub-kabc: kabc/$(MAKEFILE) FORCE | 57 | pwmanager/pwmanager |
58 | cd kabc && $(MAKE) -f $(MAKEFILE) | 58 | |
59 | 59 | SUBDIRS = \ | |
60 | libkdepim/$(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) \ |
63 | sub-libkdepim: libkdepim/$(MAKEFILE) FORCE | 63 | $(SUBDIRS_SHARP_PLUGIN) \ |
64 | cd libkdepim && $(MAKE) -f $(MAKEFILE) | 64 | $(SUBDIRS_LDAP_PLUGIN) \ |
65 | 65 | $(SUBDIRS_MICROMAIL) \ | |
66 | microkde/$(MAKEFILE): | 66 | $(SUBDIRS_GAMMU) \ |
67 | @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde" | 67 | $(SUBDIRS_PWMANAGER) |
68 | cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE) | 68 | |
69 | sub-microkde: microkde/$(MAKEFILE) FORCE | 69 | |
70 | cd microkde && $(MAKE) -f $(MAKEFILE) | 70 | all: build_microkde \ |
71 | 71 | build_qtopia_plugin \ | |
72 | korganizer/$(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 \ |
75 | sub-korganizer: korganizer/$(MAKEFILE) FORCE | 75 | build_micromail \ |
76 | cd korganizer && $(MAKE) -f $(MAKEFILE) | 76 | build_gammu \ |
77 | 77 | build_pwmanager | |
78 | kaddressbook/$(MAKEFILE): | 78 | |
79 | @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook" | 79 | |
80 | cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE) | 80 | build_microkde: variable_test tmake |
81 | sub-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 | |
84 | kabc/plugins/file/$(MAKEFILE): | 84 | |
85 | @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file" | 85 | build_qtopia_plugin: build_microkde |
86 | cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE) | 86 | ifdef BUILD_NO_QTOPIA_PLUGIN |
87 | sub-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; \ | |
90 | kabc/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 |
93 | sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE | 93 | |
94 | cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE) | 94 | build_opie_plugin: build_microkde |
95 | 95 | ifdef BUILD_NO_OPIE_PLUGIN | |
96 | kabc/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; \ |
99 | sub-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 | |
102 | gammu/emb/common/$(MAKEFILE): | 102 | |
103 | @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common" | 103 | build_sharp_plugin: build_microkde |
104 | cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE) | 104 | ifdef BUILD_NO_SHARP_PLUGIN |
105 | sub-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; \ | |
108 | gammu/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 |
111 | sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE | 111 | |
112 | cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE) | 112 | build_ldap_plugin: build_microkde |
113 | 113 | ifdef BUILD_NO_LDAP_PLUGIN | |
114 | libetpan/$(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; \ |
117 | sub-libetpan: libetpan/$(MAKEFILE) FORCE | 117 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
118 | cd libetpan && $(MAKE) -f $(MAKEFILE) | 118 | done |
119 | 119 | endif | |
120 | kmicromail/libmailwrapper/$(MAKEFILE): | 120 | |
121 | @$(CHK_DIR_EXISTS) "kmicromail/libmailwrapper" || $(MKDIR) "kmicromail/libmailwrapper" | 121 | |
122 | cd kmicromail/libmailwrapper && $(QMAKE) libmailwrapper.pro -o $(MAKEFILE) | 122 | build_micromail: build_microkde |
123 | sub-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 | |
126 | kmicromail/$(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 |
129 | sub-kmicromail: kmicromail/$(MAKEFILE) FORCE | 129 | endif |
130 | cd kmicromail && $(MAKE) -f $(MAKEFILE) | 130 | |
131 | 131 | build_gammu: variable_test tmake | |
132 | pwmanager/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 |
135 | sub-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 | |
138 | pwmanager/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) | 140 | build_pwmanager: build_microkde |
141 | sub-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 | |
144 | pwmanager/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 |
147 | sub-pwmanager-libcrypt-mpi: pwmanager/libcrypt/mpi/$(MAKEFILE) FORCE | 147 | endif |
148 | cd pwmanager/libcrypt/mpi && $(MAKE) -f $(MAKEFILE) | 148 | |
149 | 149 | ||
150 | pwmanager/libcrypt/zlib/$(MAKEFILE): | 150 | variable_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... |
153 | sub-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) | |
156 | pwmanager/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) |
159 | sub-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) | |
162 | Makefile: 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) |
164 | qmake: qmake_all | 164 | ifndef BUILD_NO_SHARP_PLUGIN |
165 | @$(QMAKE) -o Makefile kdepim-desktop.pro | 165 | @echo SHARPDTMSDK=$(SHARPDTMSDK) |
166 | 166 | endif | |
167 | all: $(SUBTARGETS) | 167 | @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) |
168 | qmake_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 | 171 | variable_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) |
189 | clean 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 | |
210 | uninstall_subdirs: qmake_all FORCE | 210 | objects: |
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 | 218 | clean: |
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 | 225 | pac: |
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 |
231 | install_subdirs: qmake_all FORCE | 231 | install: |
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 | 242 | dist: |
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 |
252 | distclean: 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 | 273 | tmake: objects \ | |
274 | install: install_subdirs | 274 | qtcompat/Makefile$(PLATFORM) \ |
275 | 275 | microkde/Makefile$(PLATFORM) \ | |
276 | uninstall: uninstall_subdirs | 276 | libkcal/Makefile$(PLATFORM) \ |
277 | 277 | libkdepim/Makefile$(PLATFORM) \ | |
278 | FORCE: | 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 | |||
302 | qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro | ||
303 | cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM) | ||
304 | |||
305 | microkde/Makefile$(PLATFORM): microkde/microkdeE.pro | ||
306 | cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM) | ||
307 | |||
308 | libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro | ||
309 | cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM) | ||
310 | |||
311 | |||
312 | libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro | ||
313 | cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM) | ||
314 | |||
315 | kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro | ||
316 | cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM) | ||
317 | |||
318 | korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro | ||
319 | cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM) | ||
320 | |||
321 | libical/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 | |||
324 | libical/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 | |||
327 | kabc/Makefile$(PLATFORM): kabc/kabcE.pro | ||
328 | cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM) | ||
329 | |||
330 | kabc/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 | |||
333 | kabc/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 | |||
336 | kabc/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 | |||
339 | kabc/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 | |||
342 | kabc/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 | |||
345 | kabc/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 | |||
348 | kabc/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 | |||
351 | kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro | ||
352 | cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM) | ||
353 | |||
354 | kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro | ||
355 | cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM) | ||
356 | |||
357 | libetpan/Makefile$(PLATFORM): libetpan/libetpanE.pro | ||
358 | cd libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM) | ||
359 | |||
360 | kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro | ||
361 | cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM) | ||
362 | |||
363 | gammu/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 | |||
366 | gammu/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 | |||
369 | pwmanager/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 | |||
373 | pwmanager/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 | |||
376 | pwmanager/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 | |||
379 | pwmanager/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 | |||
382 | pwmanager/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 | |||
@@ -1290,42 +1290,42 @@ | |||
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 | |||
@@ -1041,64 +1041,68 @@ void KOAgendaView::showDates( const QDate &start, const QDate &end ) | |||
1041 | 1041 | ||
1042 | // and update the view | 1042 | // and update the view |
1043 | fillAgenda(); | 1043 | fillAgenda(); |
1044 | } | 1044 | } |
1045 | 1045 | ||
1046 | 1046 | ||
1047 | void KOAgendaView::showEvents(QPtrList<Event>) | 1047 | void 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 | ||
1052 | void KOAgendaView::changeEventDisplay(Event *, int) | 1052 | void 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 | ||
1061 | void KOAgendaView::fillAgenda(const QDate &) | 1061 | void KOAgendaView::fillAgenda(const QDate &) |
1062 | { | 1062 | { |
1063 | // qDebug("KOAgendaView::fillAgenda "); | 1063 | // qDebug("KOAgendaView::fillAgenda "); |
1064 | fillAgenda(); | 1064 | fillAgenda(); |
1065 | } | 1065 | } |
1066 | 1066 | ||
1067 | void KOAgendaView::fillAgenda() | 1067 | void 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); |
@@ -1228,64 +1232,65 @@ void KOAgendaView::fillAgenda() | |||
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 | } |
1267 | void KOAgendaView::repaintAgenda() | 1272 | void 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 | ||
1284 | void KOAgendaView::clearView() | 1289 | void 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 | ||
1291 | void KOAgendaView::printPreview(CalPrinter *calPrinter, const QDate &fd, | 1296 | void KOAgendaView::printPreview(CalPrinter *calPrinter, const QDate &fd, |
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h index 6ecc233..1eeb8d1 100644 --- a/korganizer/koeventviewer.h +++ b/korganizer/koeventviewer.h | |||
@@ -19,82 +19,82 @@ | |||
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 | ||
31 | using namespace KCal; | 31 | using 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 | ||
43 | class KOPrintPrefs : public QDialog | 43 | class 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 | } |
79 | private: | 79 | private: |
80 | QRadioButton* pmNo; | 80 | QRadioButton* pmNo; |
81 | QRadioButton* pmScaledDown; | 81 | QRadioButton* pmScaledDown; |
82 | }; | 82 | }; |
83 | 83 | ||
84 | #endif | 84 | #endif |
85 | 85 | ||
86 | class KOEventViewer : public QTextBrowser { | 86 | class 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 ); |