author | zautrix <zautrix> | 2005-04-13 23:54:32 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-13 23:54:32 (UTC) |
commit | 5ea16ef9058a21016402dd5affc0a7f82857e606 (patch) (unidiff) | |
tree | 3c147e24c3bd51208a8055a94e4a487a1708d337 | |
parent | 93b536533e1c908085adb61553907615c31786c0 (diff) | |
download | kdepimpi-5ea16ef9058a21016402dd5affc0a7f82857e606.zip kdepimpi-5ea16ef9058a21016402dd5affc0a7f82857e606.tar.gz kdepimpi-5ea16ef9058a21016402dd5affc0a7f82857e606.tar.bz2 |
fix
-rw-r--r-- | Makefile | 662 | ||||
-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 2 | ||||
-rw-r--r-- | bin/kdepim/kopiemail/germantranslation.txt | 2 | ||||
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 4 | ||||
-rw-r--r-- | bin/kdepim/pwmanager/germantranslation.txt | 2 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 11 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.cpp | 5 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.h | 1 | ||||
-rw-r--r-- | microkde/kglobalsettings.cpp | 19 | ||||
-rw-r--r-- | microkde/kglobalsettings.h | 2 |
10 files changed, 319 insertions, 391 deletions
@@ -1,385 +1,279 @@ | |||
1 | export KDEPIMDIR = $(shell pwd) | 1 | ############################################################################# |
2 | 2 | # Makefile for building: kdepim-desktop | |
3 | export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < version) | 3 | # Generated by qmake (1.07a) (Qt 3.3.3) on: Wed Apr 13 21:23:44 2005 |
4 | 4 | # Project: kdepim-desktop.pro | |
5 | ifeq ($(PLATFORM) , zaurus) | 5 | # Template: subdirs |
6 | BUILD_NO_LDAP_PLUGIN=1 | 6 | # Command: $(QMAKE) -o Makefile kdepim-desktop.pro |
7 | endif | 7 | ############################################################################# |
8 | 8 | ||
9 | ifneq ($(PLATFORM) , zaurus) | 9 | MAKEFILE =Makefile |
10 | BUILD_NO_SHARP_PLUGIN=1 | 10 | QMAKE =qmake |
11 | endif | 11 | DEL_FILE = rm -f |
12 | 12 | CHK_DIR_EXISTS= test -d | |
13 | #opie plugin is deprecated. The qtopia plugin handles the task from now on. | 13 | MKDIR = mkdir -p |
14 | BUILD_NO_OPIE_PLUGIN=1 | 14 | INSTALL_FILE= |
15 | 15 | INSTALL_DIR = | |
16 | SUBDIRS_MICROKDE = \ | 16 | SUBTARGETS = \ |
17 | libical/src/libical \ | 17 | sub-kabc-plugins-file \ |
18 | libical/src/libicalss \ | 18 | sub-kabc-plugins-dir \ |
19 | qtcompat \ | 19 | sub-kabc-plugins-qtopia \ |
20 | microkde \ | 20 | sub-libical \ |
21 | libkcal \ | 21 | sub-libkcal \ |
22 | libkdepim \ | 22 | sub-kabc \ |
23 | kabc \ | 23 | sub-libkdepim \ |
24 | kabc/formats/binary \ | 24 | sub-microkde \ |
25 | kabc/plugins/file \ | 25 | sub-korganizer \ |
26 | kabc/plugins/dir \ | 26 | sub-kaddressbook \ |
27 | korganizer \ | 27 | sub-gammu-emb-common \ |
28 | kalarmd \ | 28 | sub-gammu-emb-gammu \ |
29 | kaddressbook | 29 | sub-libetpan \ |
30 | 30 | sub-kmicromail-libmailwrapper \ | |
31 | SUBDIRS_QTOPIA_PLUGIN = \ | 31 | sub-kmicromail \ |
32 | kabc/plugins/qtopia | 32 | sub-pwmanager-libcrypt-cipher \ |
33 | 33 | sub-pwmanager-libcrypt-error \ | |
34 | SUBDIRS_OPIE_PLUGIN = \ | 34 | sub-pwmanager-libcrypt-mpi \ |
35 | kabc/plugins/opie | 35 | sub-pwmanager-libcrypt-zlib \ |
36 | 36 | sub-pwmanager-pwmanager | |
37 | SUBDIRS_SHARP_PLUGIN = \ | 37 | |
38 | kabc/plugins/sharpdtm | 38 | first: all |
39 | 39 | ||
40 | SUBDIRS_LDAP_PLUGIN = \ | 40 | all: Makefile $(SUBTARGETS) |
41 | kabc/plugins/ldap | 41 | |
42 | 42 | kabc/plugins/file/$(MAKEFILE): | |
43 | SUBDIRS_MICROMAIL = \ | 43 | @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file" |
44 | libetpan \ | 44 | cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE) |
45 | kmicromail/libmailwrapper \ | 45 | sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE |
46 | kmicromail | 46 | cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE) |
47 | 47 | ||
48 | SUBDIRS_GAMMU = \ | 48 | kabc/plugins/dir/$(MAKEFILE): |
49 | gammu/emb/common \ | 49 | @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir" |
50 | gammu/emb/gammu | 50 | cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE) |
51 | 51 | sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE | |
52 | SUBDIRS_PWMANAGER = \ | 52 | cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE) |
53 | pwmanager/libcrypt/mpi \ | 53 | |
54 | pwmanager/libcrypt/error \ | 54 | kabc/plugins/qtopia/$(MAKEFILE): |
55 | pwmanager/libcrypt/cipher \ | 55 | @$(CHK_DIR_EXISTS) "kabc/plugins/qtopia" || $(MKDIR) "kabc/plugins/qtopia" |
56 | pwmanager/libcrypt/zlib \ | 56 | cd kabc/plugins/qtopia && $(QMAKE) qtopia.pro -o $(MAKEFILE) |
57 | pwmanager/pwmanager | 57 | sub-kabc-plugins-qtopia: kabc/plugins/qtopia/$(MAKEFILE) FORCE |
58 | 58 | cd kabc/plugins/qtopia && $(MAKE) -f $(MAKEFILE) | |
59 | SUBDIRS = \ | 59 | |
60 | $(SUBDIRS_MICROKDE) \ | 60 | libical/$(MAKEFILE): |
61 | $(SUBDIRS_QTOPIA_PLUGIN) \ | 61 | @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical" |
62 | $(SUBDIRS_OPIE_PLUGIN) \ | 62 | cd libical && $(QMAKE) libical.pro -o $(MAKEFILE) |
63 | $(SUBDIRS_SHARP_PLUGIN) \ | 63 | sub-libical: libical/$(MAKEFILE) FORCE |
64 | $(SUBDIRS_LDAP_PLUGIN) \ | 64 | cd libical && $(MAKE) -f $(MAKEFILE) |
65 | $(SUBDIRS_MICROMAIL) \ | 65 | |
66 | $(SUBDIRS_GAMMU) \ | 66 | libkcal/$(MAKEFILE): |
67 | $(SUBDIRS_PWMANAGER) | 67 | @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal" |
68 | 68 | cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE) | |
69 | 69 | sub-libkcal: libkcal/$(MAKEFILE) FORCE | |
70 | all: build_microkde \ | 70 | cd libkcal && $(MAKE) -f $(MAKEFILE) |
71 | build_qtopia_plugin \ | 71 | |
72 | build_opie_plugin \ | 72 | kabc/$(MAKEFILE): |
73 | build_sharp_plugin \ | 73 | @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc" |
74 | build_ldap_plugin \ | 74 | cd kabc && $(QMAKE) kabc.pro -o $(MAKEFILE) |
75 | build_micromail \ | 75 | sub-kabc: kabc/$(MAKEFILE) FORCE |
76 | build_gammu \ | 76 | cd kabc && $(MAKE) -f $(MAKEFILE) |
77 | build_pwmanager | 77 | |
78 | 78 | libkdepim/$(MAKEFILE): | |
79 | 79 | @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim" | |
80 | build_microkde: variable_test tmake | 80 | cd libkdepim && $(QMAKE) libkdepim.pro -o $(MAKEFILE) |
81 | for i in $(SUBDIRS_MICROKDE); do pushd $$i; \ | 81 | sub-libkdepim: libkdepim/$(MAKEFILE) FORCE |
82 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 82 | cd libkdepim && $(MAKE) -f $(MAKEFILE) |
83 | done | 83 | |
84 | 84 | microkde/$(MAKEFILE): | |
85 | build_qtopia_plugin: build_microkde | 85 | @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde" |
86 | ifdef BUILD_NO_QTOPIA_PLUGIN | 86 | cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE) |
87 | @echo == qtopia plugin not build. | 87 | sub-microkde: microkde/$(MAKEFILE) FORCE |
88 | else | 88 | cd microkde && $(MAKE) -f $(MAKEFILE) |
89 | for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \ | 89 | |
90 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 90 | korganizer/$(MAKEFILE): |
91 | done | 91 | @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer" |
92 | endif | 92 | cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE) |
93 | 93 | sub-korganizer: korganizer/$(MAKEFILE) FORCE | |
94 | build_opie_plugin: build_microkde | 94 | cd korganizer && $(MAKE) -f $(MAKEFILE) |
95 | ifdef BUILD_NO_OPIE_PLUGIN | 95 | |
96 | @echo == opie plugin not build. | 96 | kaddressbook/$(MAKEFILE): |
97 | else | 97 | @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook" |
98 | for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \ | 98 | cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE) |
99 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 99 | sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE |
100 | done | 100 | cd kaddressbook && $(MAKE) -f $(MAKEFILE) |
101 | endif | 101 | |
102 | 102 | gammu/emb/common/$(MAKEFILE): | |
103 | build_sharp_plugin: build_microkde | 103 | @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common" |
104 | ifdef BUILD_NO_SHARP_PLUGIN | 104 | cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE) |
105 | @echo == ldap plugin not build. | 105 | sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE |
106 | else | 106 | cd gammu/emb/common && $(MAKE) -f $(MAKEFILE) |
107 | for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \ | 107 | |
108 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 108 | gammu/emb/gammu/$(MAKEFILE): |
109 | done | 109 | @$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu" |
110 | endif | 110 | cd gammu/emb/gammu && $(QMAKE) gammu.pro -o $(MAKEFILE) |
111 | 111 | sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE | |
112 | build_ldap_plugin: build_microkde | 112 | cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE) |
113 | ifdef BUILD_NO_LDAP_PLUGIN | 113 | |
114 | @echo == ldap plugin not build. | 114 | libetpan/$(MAKEFILE): |
115 | else | 115 | @$(CHK_DIR_EXISTS) "libetpan" || $(MKDIR) "libetpan" |
116 | for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \ | 116 | cd libetpan && $(QMAKE) libetpan.pro -o $(MAKEFILE) |
117 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 117 | sub-libetpan: libetpan/$(MAKEFILE) FORCE |
118 | done | 118 | cd libetpan && $(MAKE) -f $(MAKEFILE) |
119 | endif | 119 | |
120 | 120 | kmicromail/libmailwrapper/$(MAKEFILE): | |
121 | 121 | @$(CHK_DIR_EXISTS) "kmicromail/libmailwrapper" || $(MKDIR) "kmicromail/libmailwrapper" | |
122 | build_micromail: build_microkde | 122 | cd kmicromail/libmailwrapper && $(QMAKE) libmailwrapper.pro -o $(MAKEFILE) |
123 | ifdef BUILD_NO_MICROMAIL | 123 | sub-kmicromail-libmailwrapper: kmicromail/libmailwrapper/$(MAKEFILE) FORCE |
124 | @echo == kmicromail not build. | 124 | cd kmicromail/libmailwrapper && $(MAKE) -f $(MAKEFILE) |
125 | else | 125 | |
126 | for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \ | 126 | kmicromail/$(MAKEFILE): |
127 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 127 | @$(CHK_DIR_EXISTS) "kmicromail" || $(MKDIR) "kmicromail" |
128 | done | 128 | cd kmicromail && $(QMAKE) kmicromail.pro -o $(MAKEFILE) |
129 | endif | 129 | sub-kmicromail: kmicromail/$(MAKEFILE) FORCE |
130 | 130 | cd kmicromail && $(MAKE) -f $(MAKEFILE) | |
131 | build_gammu: variable_test tmake | 131 | |
132 | ifdef BUILD_NO_GAMMU | 132 | pwmanager/libcrypt/cipher/$(MAKEFILE): |
133 | @echo == gammu not build. | 133 | @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/cipher" || $(MKDIR) "pwmanager/libcrypt/cipher" |
134 | else | 134 | cd pwmanager/libcrypt/cipher && $(QMAKE) cipher.pro -o $(MAKEFILE) |
135 | for i in $(SUBDIRS_GAMMU); do pushd $$i; \ | 135 | sub-pwmanager-libcrypt-cipher: pwmanager/libcrypt/cipher/$(MAKEFILE) FORCE |
136 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 136 | cd pwmanager/libcrypt/cipher && $(MAKE) -f $(MAKEFILE) |
137 | done | 137 | |
138 | endif | 138 | pwmanager/libcrypt/error/$(MAKEFILE): |
139 | 139 | @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/error" || $(MKDIR) "pwmanager/libcrypt/error" | |
140 | build_pwmanager: build_microkde | 140 | cd pwmanager/libcrypt/error && $(QMAKE) error.pro -o $(MAKEFILE) |
141 | ifdef BUILD_NO_PWMANAGER | 141 | sub-pwmanager-libcrypt-error: pwmanager/libcrypt/error/$(MAKEFILE) FORCE |
142 | @echo == pwmanager not build. | 142 | cd pwmanager/libcrypt/error && $(MAKE) -f $(MAKEFILE) |
143 | else | 143 | |
144 | for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \ | 144 | pwmanager/libcrypt/mpi/$(MAKEFILE): |
145 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 145 | @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/mpi" || $(MKDIR) "pwmanager/libcrypt/mpi" |
146 | done | 146 | cd pwmanager/libcrypt/mpi && $(QMAKE) mpi.pro -o $(MAKEFILE) |
147 | endif | 147 | sub-pwmanager-libcrypt-mpi: pwmanager/libcrypt/mpi/$(MAKEFILE) FORCE |
148 | 148 | cd pwmanager/libcrypt/mpi && $(MAKE) -f $(MAKEFILE) | |
149 | 149 | ||
150 | variable_info: | 150 | pwmanager/libcrypt/zlib/$(MAKEFILE): |
151 | @echo -------------------------------------- | 151 | @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/zlib" || $(MKDIR) "pwmanager/libcrypt/zlib" |
152 | @echo KDEPIM buildsystem, variableinfo... | 152 | cd pwmanager/libcrypt/zlib && $(QMAKE) zlib.pro -o $(MAKEFILE) |
153 | @echo KDEPIMDIR=$(KDEPIMDIR) | 153 | sub-pwmanager-libcrypt-zlib: pwmanager/libcrypt/zlib/$(MAKEFILE) FORCE |
154 | @echo QTDIR=$(QTDIR) | 154 | cd pwmanager/libcrypt/zlib && $(MAKE) -f $(MAKEFILE) |
155 | @echo QPEDIR=$(QPEDIR) | 155 | |
156 | @echo OPIEDIR=$(OPIEDIR) | 156 | pwmanager/pwmanager/$(MAKEFILE): |
157 | @echo PLATFORM=$(PLATFORM) | 157 | @$(CHK_DIR_EXISTS) "pwmanager/pwmanager" || $(MKDIR) "pwmanager/pwmanager" |
158 | @echo RELEASE_DEBUG=$(RELEASE_DEBUG) | 158 | cd pwmanager/pwmanager && $(QMAKE) pwmanager.pro -o $(MAKEFILE) |
159 | @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) | 159 | sub-pwmanager-pwmanager: pwmanager/pwmanager/$(MAKEFILE) FORCE |
160 | @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) | 160 | cd pwmanager/pwmanager && $(MAKE) -f $(MAKEFILE) |
161 | @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) | 161 | |
162 | @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN) | 162 | Makefile: kdepim-desktop.pro /usr/lib/qt3/mkspecs/default/qmake.conf variables.pri |
163 | @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) | 163 | $(QMAKE) -o Makefile kdepim-desktop.pro |
164 | ifndef BUILD_NO_SHARP_PLUGIN | 164 | qmake: qmake_all |
165 | @echo SHARPDTMSDK=$(SHARPDTMSDK) | 165 | @$(QMAKE) -o Makefile kdepim-desktop.pro |
166 | endif | 166 | |
167 | @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) | 167 | all: $(SUBTARGETS) |
168 | @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER) | 168 | qmake_all: kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE) kabc/plugins/qtopia/$(MAKEFILE) libical/$(MAKEFILE) libkcal/$(MAKEFILE) kabc/$(MAKEFILE) libkdepim/$(MAKEFILE) microkde/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(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) |
169 | @echo -------------------------------------- | 169 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
170 | 170 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true | |
171 | variable_test: variable_info | 171 | ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
172 | @echo KDEPIM buildsystem, variablecheck... | 172 | ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
173 | ifndef KDEPIMDIR | 173 | ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
174 | @echo KDEPIMDIR is not defined. | 174 | ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
175 | $(error KDEPIMDIR is not defined) | 175 | ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
176 | endif | 176 | ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
177 | ifndef PLATFORM | 177 | ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
178 | @echo PLATFORM is not defined. | 178 | ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
179 | $(error PLATFORM is not defined) | 179 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
180 | endif | 180 | ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
181 | ifdef BUILD_NO_LDAP_PLUGIN | 181 | ( [ -d libetpan ] && cd libetpan ; 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) | 182 | ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
183 | endif | 183 | ( [ -d kmicromail ] && cd kmicromail ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
184 | ifdef BUILD_NO_OPIE_PLUGIN | 184 | ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; 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) | 185 | ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
186 | endif | 186 | ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
187 | ifdef BUILD_NO_QTOPIA_PLUGIN | 187 | ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; 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) | 188 | ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true |
189 | endif | 189 | clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE |
190 | ifdef BUILD_NO_MICROMAIL | 190 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
191 | @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) | 191 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
192 | endif | 192 | ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
193 | ifdef BUILD_NO_SHARP_PLUGIN | 193 | ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
194 | @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) | 194 | ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
195 | else | 195 | ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
196 | ifndef SHARPDTMSDK | 196 | ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
197 | @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) | 197 | ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
198 | $(error SHARPDTMSDK is not defined) | 198 | ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
199 | endif | 199 | ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
200 | endif | 200 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
201 | ifdef BUILD_NO_GAMMU | 201 | ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
202 | @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU) | 202 | ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
203 | endif | 203 | ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
204 | ifdef BUILD_NO_PWMANAGER | 204 | ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
205 | @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER) | 205 | ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
206 | endif | 206 | ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
207 | @echo -------------------------------------- | 207 | ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; ) || true |
208 | 208 | ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; ) || true | |
209 | 209 | ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; ) || true | |
210 | objects: | 210 | uninstall_subdirs: qmake_all FORCE |
211 | for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done | 211 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
212 | for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done | 212 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
213 | mkdir -p libical/lib/$(PLATFORM) | 213 | ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
214 | mkdir -p dest | 214 | ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
215 | mkdir -p dest$(LIBICAL_PATH) | 215 | ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
216 | mkdir -p pwmanager/libcrypt/$(PLATFORM) | 216 | ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
217 | 217 | ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true | |
218 | clean: | 218 | ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
219 | rm -rf libical/lib/$(PLATFORM)/*; | 219 | ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
220 | rm -rf pwmanager/libcrypt/$(PLATFORM)/*; | 220 | ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
221 | for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ | 221 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
222 | rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ | 222 | ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
223 | done | 223 | ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
224 | 224 | ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true | |
225 | pac: | 225 | ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
226 | rm -f $(QPEDIR)/lib/libmicro* | 226 | ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
227 | rm -f $(QPEDIR)/plugins/applets/libkopi* | 227 | ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
228 | make | 228 | ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
229 | make install | 229 | ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
230 | make dist | 230 | ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true |
231 | install: | 231 | install_subdirs: qmake_all FORCE |
232 | 232 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true | |
233 | cd bin/kdepim; make install | 233 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true |
234 | cp -r Pim $(QPEDIR)/apps | 234 | ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) install; ) || true |
235 | cp db2file/db2file $(QPEDIR)/bin/db2file | 235 | ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true |
236 | chmod ugo+x $(QPEDIR)/bin/db2file | 236 | ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true |
237 | cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop | 237 | ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true |
238 | cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop | 238 | ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true |
239 | cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop | 239 | ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true |
240 | cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop | 240 | ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true |
241 | 241 | ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true | |
242 | dist: | 242 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true |
243 | @echo Dont forget to do "make install" before "make dist" | 243 | ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) install; ) || true |
244 | rm -f *arm.ipk | 244 | ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) install; ) || true |
245 | rm -f *ipk.zip | 245 | ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) install; ) || true |
246 | rm -rf ../kdepimpi_$(KDEPIM_VERSION)/* | 246 | ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) install; ) || true |
247 | rm -f *~ | 247 | ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) install; ) || true |
248 | cd ..;mkdir -p kdepimpi_$(KDEPIM_VERSION) | 248 | ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) install; ) || true |
249 | cd ../kdepimpi_$(KDEPIM_VERSION);mkdir -p ipk | 249 | ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(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 | 250 | ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) install; ) || true |
251 | mkipks kmicrokdelibs.control | 251 | ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) install; ) || true |
252 | mkipks korganizer.control | 252 | distclean: qmake_all FORCE |
253 | mkipks kaddressbook.control | 253 | ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
254 | ifndef BUILD_NO_MICROMAIL | 254 | ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
255 | mkipks kopiemail.control | 255 | ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
256 | endif | 256 | ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
257 | ifndef BUILD_NO_SHARP_PLUGIN | 257 | ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
258 | mkipks ksharpPIM-DTMaccess.control | 258 | ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
259 | endif | 259 | ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
260 | mkipks korganizer-alarm.control | 260 | ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
261 | ifndef BUILD_NO_GAMMU | 261 | ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
262 | mkipks kmobilephoneaccess.control | 262 | ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
263 | endif | 263 | ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
264 | ifndef BUILD_NO_PWMANAGER | 264 | ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
265 | mkipks pwmanager.control | 265 | ( [ -d libetpan ] && cd libetpan ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
266 | endif | 266 | ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
267 | mkipks pimTABicon.control | 267 | ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
268 | zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk ReleaseNotes.txt | 268 | ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
269 | mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/ | 269 | ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
270 | mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/ | 270 | ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
271 | mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../kdepimpi_$(KDEPIM_VERSION)/ | 271 | ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true |
272 | 272 | ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true | |
273 | tmake: objects \ | 273 | |
274 | qtcompat/Makefile$(PLATFORM) \ | 274 | install: install_subdirs |
275 | microkde/Makefile$(PLATFORM) \ | 275 | |
276 | libkcal/Makefile$(PLATFORM) \ | 276 | uninstall: uninstall_subdirs |
277 | libkdepim/Makefile$(PLATFORM) \ | 277 | |
278 | korganizer/Makefile$(PLATFORM) \ | 278 | FORCE: |
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 | |||
385 | 279 | ||
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index f67a34d..fc364c9 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt | |||
@@ -747,16 +747,18 @@ | |||
747 | { "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" }, | 747 | { "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" }, |
748 | { "The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!","Die Uhren der syncenden Geräte\nhaben einen Unterschied von\nmehr als 5 Minuten. Bitte die\nUhrzeiten anpassen. Sie können\nfalsche Sync-Resultate erhalten!\nBitte das Syncen bestätigen!" }, | 748 | { "The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!","Die Uhren der syncenden Geräte\nhaben einen Unterschied von\nmehr als 5 Minuten. Bitte die\nUhrzeiten anpassen. Sie können\nfalsche Sync-Resultate erhalten!\nBitte das Syncen bestätigen!" }, |
749 | { "Change search field enable jump bar","Ändere Suchfeld um Jumpbar anzuzeigen" }, | 749 | { "Change search field enable jump bar","Ändere Suchfeld um Jumpbar anzuzeigen" }, |
750 | { "Search with '*' prefix (wildcard)","Suche mit '*' Prefix (Wildcard)" }, | 750 | { "Search with '*' prefix (wildcard)","Suche mit '*' Prefix (Wildcard)" }, |
751 | { "Shrink searchfield in portrait view","Verkleinere Suchfeld im Portraitmodus" }, | 751 | { "Shrink searchfield in portrait view","Verkleinere Suchfeld im Portraitmodus" }, |
752 | { "Edit new contact","Bearbeite neuen Kontakt" }, | 752 | { "Edit new contact","Bearbeite neuen Kontakt" }, |
753 | { "Edit ","Bearbeite " }, | 753 | { "Edit ","Bearbeite " }, |
754 | { "No contact changed!","Kein Kontakt verändert" }, | 754 | { "No contact changed!","Kein Kontakt verändert" }, |
755 | { "%1 contacts changed!","%1 Kontakte geändert!" }, | 755 | { "%1 contacts changed!","%1 Kontakte geändert!" }, |
756 | { "Mobile (home)","Handy (Arbeit)" }, | 756 | { "Mobile (home)","Handy (Arbeit)" }, |
757 | { "Mobile (work)","Handy (Privat)" }, | 757 | { "Mobile (work)","Handy (Privat)" }, |
758 | { "Def.Formatted Name","Def. Format. Name" }, | 758 | { "Def.Formatted Name","Def. Format. Name" }, |
759 | { "Alternate background","Abwechselnder Hintergrund" }, | ||
760 | { "Colors","Farben" }, | ||
759 | { "","" }, | 761 | { "","" }, |
760 | { "","" }, | 762 | { "","" }, |
761 | { "","" }, | 763 | { "","" }, |
762 | { "","" }, \ No newline at end of file | 764 | { "","" }, \ No newline at end of file |
diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt index 86a9569..e9aa28a 100644 --- a/bin/kdepim/kopiemail/germantranslation.txt +++ b/bin/kdepim/kopiemail/germantranslation.txt | |||
@@ -264,15 +264,17 @@ | |||
264 | { "Show "From" info field","Zeige "Von" Info Feld" }, | 264 | { "Show "From" info field","Zeige "Von" Info Feld" }, |
265 | { "Show "To" info field","Zeige "An" Info Feld" }, | 265 | { "Show "To" info field","Zeige "An" Info Feld" }, |
266 | { "Mail saved as draft!","Mail als Entwurf gespeichert!" }, | 266 | { "Mail saved as draft!","Mail als Entwurf gespeichert!" }, |
267 | { "Save signature","Speichere Signatur" }, | 267 | { "Save signature","Speichere Signatur" }, |
268 | { "No paths allowed in\nlocal folder settings.\nPlease specify a folder\nname or leave empty\nto create local folder\nwith account name\nautomatically.","Beim lokalen Verzeichnis\nsind keine Pfade erlaubt.\nBitte Verzeichnisnamen\nangeben oder leer lassen\num automatisch ein lokales\nVerzeichnis mit dem\nZugangsnamen anzulegen." }, | 268 | { "No paths allowed in\nlocal folder settings.\nPlease specify a folder\nname or leave empty\nto create local folder\nwith account name\nautomatically.","Beim lokalen Verzeichnis\nsind keine Pfade erlaubt.\nBitte Verzeichnisnamen\nangeben oder leer lassen\num automatisch ein lokales\nVerzeichnis mit dem\nZugangsnamen anzulegen." }, |
269 | { "Do you really want to\nsend all queued mails?","Möchten sie wirklich\nalle Mails im\nOutgoing-Ordner\nsenden?" }, | 269 | { "Do you really want to\nsend all queued mails?","Möchten sie wirklich\nalle Mails im\nOutgoing-Ordner\nsenden?" }, |
270 | { "Sending all mails","Senden aller Mails" }, | 270 | { "Sending all mails","Senden aller Mails" }, |
271 | { "SMTP Account:","SMTP Zugang:" }, | 271 | { "SMTP Account:","SMTP Zugang:" }, |
272 | { "Select SMTP Account","Wähle SMTP Zugang" }, | 272 | { "Select SMTP Account","Wähle SMTP Zugang" }, |
273 | { "Error sending mail:\n%1","Fehler beim Mailversand:\n%1\nHaben Sie vergessen\ndie Post ausreichend\nzu frankieren? ;-)" }, | 273 | { "Error sending mail:\n%1","Fehler beim Mailversand:\n%1\nHaben Sie vergessen\ndie Post ausreichend\nzu frankieren? ;-)" }, |
274 | { "Error sending mail","Fehler beim Mailversand" }, | 274 | { "Error sending mail","Fehler beim Mailversand" }, |
275 | { "Error sending queued mail.\nBreaking.","Fehler beim Mailversand.\nAbbruch." }, | 275 | { "Error sending queued mail.\nBreaking.","Fehler beim Mailversand.\nAbbruch." }, |
276 | { "Alternate background","Abwechselnder Hintergrund" }, | ||
277 | { "Colors","Farben" }, | ||
276 | { "","" }, | 278 | { "","" }, |
277 | { "","" }, | 279 | { "","" }, |
278 | { "","" }, \ No newline at end of file | 280 | { "","" }, \ No newline at end of file |
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index a688eaf..ca73f9b 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -1337,21 +1337,21 @@ | |||
1337 | { "<i>The recurrence is computed from the start datetime!</i>","<i>Die Wiederholung wird vom Startwert aus berechnet!</i>" }, | 1337 | { "<i>The recurrence is computed from the start datetime!</i>","<i>Die Wiederholung wird vom Startwert aus berechnet!</i>" }, |
1338 | { "Start/Stop todo...","Starte/Stoppe Todo..." }, | 1338 | { "Start/Stop todo...","Starte/Stoppe Todo..." }, |
1339 | { "Color for running todos:","Farbe für laufende Todos:" }, | 1339 | { "Color for running todos:","Farbe für laufende Todos:" }, |
1340 | { "The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?","Das Todo\n%1\nist gestartet.\nWollen Sie es\nauf gestoppt setzen?" }, | 1340 | { "The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?","Das Todo\n%1\nist gestartet.\nWollen Sie es\nauf gestoppt setzen?" }, |
1341 | { "Todo is started","Todo is gestarted" }, | 1341 | { "Todo is started","Todo is gestarted" }, |
1342 | { "Stop todo","Stoppe Todo" }, | 1342 | { "Stop todo","Stoppe Todo" }, |
1343 | { "Todo is stopped","Todo ist gestoppt" }, | 1343 | { "Todo is stopped","Todo ist gestoppt" }, |
1344 | { "Start todo","Starte Todo" }, | 1344 | { "Start todo","Starte Todo" }, |
1345 | { "The todo\n%1\nis stopped.\nDo you want to set\nthe state to started?","Das Todo\n%1\nist gestoppt.\nWollen Sie es auf\ngestartet setzen?" }, | 1345 | { "The todo\n%1\nis stopped.\nDo you want to set\nthe state to started?","Das Todo\n%1\nist gestoppt.\nWollen Sie es auf\ngestartet setzen?" }, |
1346 | { "The todo\n%1\nwill be cloned!\nIt has subtodos!\nDo you want to clone\nall subtodos as well?","Das Todo\n%1\nwird geklont!\nEs hat Untertodos!\nMöchten Sie\nalle Untertodos auch klonen?" }, | 1346 | { "The todo\n%1\nwill be cloned!\nIt has subtodos!\nDo you want to clone\nall subtodos as well?","Das Todo\n%1\nwird geklont!\nEs hat Untertodos!\nMöchten Sie\nalle Untertodos auch klonen?" }, |
1347 | { "Todo has subtodos","Todo hat Untertodos" }, | 1347 | { "Todo has subtodos","Todo hat Untertodos" }, |
1348 | { "Block popup until mouse button release","Sperre Popup bis Mausknopf losgelassen" }, | 1348 | { "Block popup until mouse button release","Sperre Popup bis Mausknopf losgelassen" }, |
1349 | { "","" }, | 1349 | { "Alternate background","Abwechselnder Hintergrund" }, |
1350 | { "","" }, | 1350 | { "Colors","Farben" }, |
1351 | { "","" }, | 1351 | { "","" }, |
1352 | { "","" }, | 1352 | { "","" }, |
1353 | { "","" }, | 1353 | { "","" }, |
1354 | { "","" }, | 1354 | { "","" }, |
1355 | { "","" }, | 1355 | { "","" }, |
1356 | { "","" }, | 1356 | { "","" }, |
1357 | { "","" }, | 1357 | { "","" }, |
diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt index 2650e28..80b22a6 100644 --- a/bin/kdepim/pwmanager/germantranslation.txt +++ b/bin/kdepim/pwmanager/germantranslation.txt | |||
@@ -342,19 +342,21 @@ | |||
342 | { "U&RL","URL" }, | 342 | { "U&RL","URL" }, |
343 | { "delete?","Löschen?" }, | 343 | { "delete?","Löschen?" }, |
344 | { "Do you really want to delete\nthe selected entry","Wollen Sie wirklich\nden Eintrag löschen:" }, | 344 | { "Do you really want to delete\nthe selected entry","Wollen Sie wirklich\nden Eintrag löschen:" }, |
345 | { "Save?","Speichern?" }, | 345 | { "Save?","Speichern?" }, |
346 | { ""\nhas been modified.\nDo you want to save it?",""\nwurde geändert.\nMöchten Sie speichern?" }, | 346 | { ""\nhas been modified.\nDo you want to save it?",""\nwurde geändert.\nMöchten Sie speichern?" }, |
347 | { "The list\n "","Die Liste\n "" }, | 347 | { "The list\n "","Die Liste\n "" }, |
348 | { "nothing to do","Nichts zu tun" }, | 348 | { "nothing to do","Nichts zu tun" }, |
349 | { "Sorry, there's nothing to save.\nPlease first add some passwords.","Sorry, es gibt nichts zu speichern.\nBitte erst Passwörter hinzufügen." }, | 349 | { "Sorry, there's nothing to save.\nPlease first add some passwords.","Sorry, es gibt nichts zu speichern.\nBitte erst Passwörter hinzufügen." }, |
350 | { "Add new password","Passwort hinzufügen" }, | 350 | { "Add new password","Passwort hinzufügen" }, |
351 | { "Successfully saved data.","Datei gespeichert." }, | 351 | { "Successfully saved data.","Datei gespeichert." }, |
352 | { "Category:","Kategorie:" }, | 352 | { "Category:","Kategorie:" }, |
353 | { "LOCKED","GESPERRT" }, | 353 | { "LOCKED","GESPERRT" }, |
354 | { "Alternate background","Abwechselnder Hintergrund" }, | ||
355 | { "Colors","Farben" }, | ||
354 | { "","" }, | 356 | { "","" }, |
355 | { "","" }, | 357 | { "","" }, |
356 | { "","" }, | 358 | { "","" }, |
357 | { "","" }, | 359 | { "","" }, |
358 | { "","" }, | 360 | { "","" }, |
359 | { "","" }, | 361 | { "","" }, |
360 | 362 | ||
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index d62d9f9..759b29d 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -108,24 +108,35 @@ KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, | |||
108 | setupLocaleDateTab(); | 108 | setupLocaleDateTab(); |
109 | setupTimeZoneTab(); | 109 | setupTimeZoneTab(); |
110 | setupExternalAppTab(); | 110 | setupExternalAppTab(); |
111 | setupStoreTab(); | 111 | setupStoreTab(); |
112 | 112 | ||
113 | } | 113 | } |
114 | void KDEPIMConfigWidget::showTimeZoneTab() | 114 | void KDEPIMConfigWidget::showTimeZoneTab() |
115 | { | 115 | { |
116 | tabWidget->setCurrentPage ( 3 ) ; | 116 | tabWidget->setCurrentPage ( 3 ) ; |
117 | } | 117 | } |
118 | void KDEPIMConfigWidget::setupStoreTab() | 118 | void KDEPIMConfigWidget::setupStoreTab() |
119 | { | 119 | { |
120 | QVBox *colorPage = new QVBox( this ); | ||
121 | tabWidget->addTab( colorPage, i18n( "Colors" ) ); | ||
122 | QWidget* cw = new QWidget( colorPage ); | ||
123 | KPrefsWidColor *holidayColor = | ||
124 | addWidColor(i18n("Alternate background"), | ||
125 | &(KPimGlobalPrefs::instance()->mAlternateColor),cw); | ||
126 | QHBoxLayout *topLayout = new QHBoxLayout(cw); | ||
127 | topLayout->addWidget(holidayColor->label()); | ||
128 | topLayout->addWidget( (QWidget* )holidayColor->button()); | ||
129 | |||
130 | |||
120 | QVBox *storePage = new QVBox( this ); | 131 | QVBox *storePage = new QVBox( this ); |
121 | new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage ); | 132 | new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage ); |
122 | new QLabel( i18n("<b>New data storage dir:</b>"), storePage ); | 133 | new QLabel( i18n("<b>New data storage dir:</b>"), storePage ); |
123 | mStoreUrl = new KURLRequester( storePage ); | 134 | mStoreUrl = new KURLRequester( storePage ); |
124 | mStoreUrl->setURL( KGlobal::dirs()->localkdedir() ); | 135 | mStoreUrl->setURL( KGlobal::dirs()->localkdedir() ); |
125 | #ifdef DESKTOP_VERSION | 136 | #ifdef DESKTOP_VERSION |
126 | QString confFile = qApp->applicationDirPath ()+ "/.microkdehome" ; | 137 | QString confFile = qApp->applicationDirPath ()+ "/.microkdehome" ; |
127 | QFileInfo fi ( confFile ); | 138 | QFileInfo fi ( confFile ); |
128 | if ( fi.exists() ) { | 139 | if ( fi.exists() ) { |
129 | KConfig cfg ( confFile ); | 140 | KConfig cfg ( confFile ); |
130 | cfg.setGroup("Global"); | 141 | cfg.setGroup("Global"); |
131 | QString localKdeDir = cfg.readEntry( "MICROKDEHOME", "x_x_x" ); | 142 | QString localKdeDir = cfg.readEntry( "MICROKDEHOME", "x_x_x" ); |
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp index a09b278..873f0eb 100644 --- a/libkdepim/kpimglobalprefs.cpp +++ b/libkdepim/kpimglobalprefs.cpp | |||
@@ -51,24 +51,28 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) | |||
51 | { | 51 | { |
52 | mLocaleDict = 0; | 52 | mLocaleDict = 0; |
53 | KPrefs::setCurrentGroup("Fonts"); | 53 | KPrefs::setCurrentGroup("Fonts"); |
54 | addItemFont("ApplicationFont",&mApplicationFont,KGlobalSettings::generalFont() ); | 54 | addItemFont("ApplicationFont",&mApplicationFont,KGlobalSettings::generalFont() ); |
55 | KPrefs::setCurrentGroup("Locale"); | 55 | KPrefs::setCurrentGroup("Locale"); |
56 | addItemInt("PreferredLanguage",&mPreferredLanguage,0); | 56 | addItemInt("PreferredLanguage",&mPreferredLanguage,0); |
57 | addItemInt("PreferredTime",&mPreferredTime,0); | 57 | addItemInt("PreferredTime",&mPreferredTime,0); |
58 | addItemInt("PreferredDate",&mPreferredDate,0); | 58 | addItemInt("PreferredDate",&mPreferredDate,0); |
59 | addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); | 59 | addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); |
60 | addItemString("UserDateFormatLong", &mUserDateFormatLong, "%AK %d. %b %y"); | 60 | addItemString("UserDateFormatLong", &mUserDateFormatLong, "%AK %d. %b %y"); |
61 | addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y"); | 61 | addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y"); |
62 | 62 | ||
63 | KPrefs::setCurrentGroup("Colors"); | ||
64 | addItemColor("AlternateBGcolor",&mAlternateColor,KGlobalSettings::alternateBackgroundColor()); | ||
65 | |||
66 | |||
63 | KPrefs::setCurrentGroup("Time & Date"); | 67 | KPrefs::setCurrentGroup("Time & Date"); |
64 | 68 | ||
65 | addItemString("TimeZoneName",&mTimeZoneId, ("+01:00 Europe/Oslo(CET)") ); | 69 | addItemString("TimeZoneName",&mTimeZoneId, ("+01:00 Europe/Oslo(CET)") ); |
66 | addItemBool("UseDaylightsaving",&mUseDaylightsaving,true); | 70 | addItemBool("UseDaylightsaving",&mUseDaylightsaving,true); |
67 | addItemBool("TimeZoneAdd30min",&mTimeZoneAdd30min,false); | 71 | addItemBool("TimeZoneAdd30min",&mTimeZoneAdd30min,false); |
68 | addItemInt("DaylightsavingStart",&mDaylightsavingStart,90); | 72 | addItemInt("DaylightsavingStart",&mDaylightsavingStart,90); |
69 | addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304); | 73 | addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304); |
70 | 74 | ||
71 | KPrefs::setCurrentGroup( "ExternalApplications" ); | 75 | KPrefs::setCurrentGroup( "ExternalApplications" ); |
72 | 76 | ||
73 | addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC ); | 77 | addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC ); |
74 | addItemString( "EmailChannel", &mEmailOtherChannel, "" ); | 78 | addItemString( "EmailChannel", &mEmailOtherChannel, "" ); |
@@ -179,24 +183,25 @@ void KPimGlobalPrefs::setGlobalConfig() | |||
179 | KGlobal::locale()->setHore24Format( !mPreferredTime ); | 183 | KGlobal::locale()->setHore24Format( !mPreferredTime ); |
180 | KGlobal::locale()->setWeekStartMonday( !mWeekStartsOnSunday ); | 184 | KGlobal::locale()->setWeekStartMonday( !mWeekStartsOnSunday ); |
181 | KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)mPreferredDate ); | 185 | KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)mPreferredDate ); |
182 | KGlobal::locale()->setLanguage( mPreferredLanguage ); | 186 | KGlobal::locale()->setLanguage( mPreferredLanguage ); |
183 | QString dummy = mUserDateFormatLong; | 187 | QString dummy = mUserDateFormatLong; |
184 | KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") )); | 188 | KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") )); |
185 | dummy = mUserDateFormatShort; | 189 | dummy = mUserDateFormatShort; |
186 | KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") )); | 190 | KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") )); |
187 | KGlobal::locale()->setDaylightSaving( mUseDaylightsaving, | 191 | KGlobal::locale()->setDaylightSaving( mUseDaylightsaving, |
188 | mDaylightsavingStart, | 192 | mDaylightsavingStart, |
189 | mDaylightsavingEnd ); | 193 | mDaylightsavingEnd ); |
190 | KGlobal::locale()->setTimezone( mTimeZoneId, mTimeZoneAdd30min ); | 194 | KGlobal::locale()->setTimezone( mTimeZoneId, mTimeZoneAdd30min ); |
195 | KGlobalSettings::setAlternateBackgroundColor(mAlternateColor); | ||
191 | 196 | ||
192 | } | 197 | } |
193 | KPimGlobalPrefs::~KPimGlobalPrefs() | 198 | KPimGlobalPrefs::~KPimGlobalPrefs() |
194 | { | 199 | { |
195 | if (sInstance == this) | 200 | if (sInstance == this) |
196 | sInstance = staticDeleterGP.setObject(0); | 201 | sInstance = staticDeleterGP.setObject(0); |
197 | else | 202 | else |
198 | qDebug("Whats this? Error in KPimGlobalPrefs::~KPimGlobalPrefs() ?"); | 203 | qDebug("Whats this? Error in KPimGlobalPrefs::~KPimGlobalPrefs() ?"); |
199 | if ( mLocaleDict ) | 204 | if ( mLocaleDict ) |
200 | delete mLocaleDict; | 205 | delete mLocaleDict; |
201 | } | 206 | } |
202 | 207 | ||
diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h index bf17338..36cc25a 100644 --- a/libkdepim/kpimglobalprefs.h +++ b/libkdepim/kpimglobalprefs.h | |||
@@ -93,24 +93,25 @@ class KPimGlobalPrefs : public KPrefs | |||
93 | int mPreferredDate; | 93 | int mPreferredDate; |
94 | QString mUserDateFormatLong; | 94 | QString mUserDateFormatLong; |
95 | QString mUserDateFormatShort; | 95 | QString mUserDateFormatShort; |
96 | int mPreferredLanguage; | 96 | int mPreferredLanguage; |
97 | int mPreferredTime; | 97 | int mPreferredTime; |
98 | bool mWeekStartsOnSunday; | 98 | bool mWeekStartsOnSunday; |
99 | QString mTimeZoneId; | 99 | QString mTimeZoneId; |
100 | bool mUseDaylightsaving; | 100 | bool mUseDaylightsaving; |
101 | int mDaylightsavingStart; | 101 | int mDaylightsavingStart; |
102 | int mDaylightsavingEnd; | 102 | int mDaylightsavingEnd; |
103 | bool mTimeZoneAdd30min; | 103 | bool mTimeZoneAdd30min; |
104 | QFont mApplicationFont; | 104 | QFont mApplicationFont; |
105 | QColor mAlternateColor; | ||
105 | 106 | ||
106 | int mEmailClient; | 107 | int mEmailClient; |
107 | QString mEmailOtherChannel; | 108 | QString mEmailOtherChannel; |
108 | QString mEmailOtherMessage; | 109 | QString mEmailOtherMessage; |
109 | QString mEmailOtherMessageParameters; | 110 | QString mEmailOtherMessageParameters; |
110 | QString mEmailOtherMessage2; | 111 | QString mEmailOtherMessage2; |
111 | QString mEmailOtherMessageParameters2; | 112 | QString mEmailOtherMessageParameters2; |
112 | 113 | ||
113 | int mPhoneClient; | 114 | int mPhoneClient; |
114 | QString mPhoneOtherChannel; | 115 | QString mPhoneOtherChannel; |
115 | QString mPhoneOtherMessage; | 116 | QString mPhoneOtherMessage; |
116 | QString mPhoneOtherMessageParameters; | 117 | QString mPhoneOtherMessageParameters; |
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp index 92a2b48..5976aae 100644 --- a/microkde/kglobalsettings.cpp +++ b/microkde/kglobalsettings.cpp | |||
@@ -1,19 +1,26 @@ | |||
1 | #include "kglobalsettings.h" | 1 | #include "kglobalsettings.h" |
2 | #include "kconfig.h" | 2 | #include "kconfig.h" |
3 | #include "kglobal.h" | 3 | #include "kglobal.h" |
4 | #include "kconfigbase.h" | 4 | #include "kconfigbase.h" |
5 | 5 | ||
6 | #include <qapplication.h> | 6 | #include <qapplication.h> |
7 | 7 | ||
8 | #ifdef DESKTOP_VERSION | ||
9 | QColor KGlobalSettings::mAlternate = QColor( 235, 235, 235 ); | ||
10 | #else | ||
11 | QColor KGlobalSettings::mAlternate = QColor( 210, 210, 210 ); | ||
12 | #endif | ||
13 | |||
14 | |||
8 | QFont KGlobalSettings::generalFont() | 15 | QFont KGlobalSettings::generalFont() |
9 | { | 16 | { |
10 | int size = 12; | 17 | int size = 12; |
11 | if (QApplication::desktop()->width() < 480 ) { | 18 | if (QApplication::desktop()->width() < 480 ) { |
12 | size = 10; | 19 | size = 10; |
13 | } | 20 | } |
14 | #ifndef DESKTOP_VERSION | 21 | #ifndef DESKTOP_VERSION |
15 | else | 22 | else |
16 | if (QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) | 23 | if (QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) |
17 | size = 18; | 24 | size = 18; |
18 | #endif | 25 | #endif |
19 | QFont f = QApplication::font(); | 26 | QFont f = QApplication::font(); |
@@ -51,29 +58,31 @@ QString KGlobalSettings::timeTrackerDir() | |||
51 | QFont KGlobalSettings::toolBarFont() | 58 | QFont KGlobalSettings::toolBarFont() |
52 | { | 59 | { |
53 | return QApplication::font(); | 60 | return QApplication::font(); |
54 | } | 61 | } |
55 | 62 | ||
56 | QColor KGlobalSettings::toolBarHighlightColor() | 63 | QColor KGlobalSettings::toolBarHighlightColor() |
57 | { | 64 | { |
58 | return QColor( "black" ); | 65 | return QColor( "black" ); |
59 | } | 66 | } |
60 | 67 | ||
61 | QColor KGlobalSettings::alternateBackgroundColor() | 68 | QColor KGlobalSettings::alternateBackgroundColor() |
62 | { | 69 | { |
63 | #ifdef DESKTOP_VERSION | 70 | return mAlternate; |
64 | return QColor( 235, 235, 235 ); | 71 | |
65 | #else | 72 | } |
66 | return QColor( 220, 220, 220 ); | 73 | void KGlobalSettings::setAlternateBackgroundColor(QColor c) |
67 | #endif | 74 | { |
75 | mAlternate = c; | ||
76 | |||
68 | } | 77 | } |
69 | 78 | ||
70 | QRect KGlobalSettings::desktopGeometry( QWidget * ) | 79 | QRect KGlobalSettings::desktopGeometry( QWidget * ) |
71 | { | 80 | { |
72 | return QApplication::desktop()->rect(); | 81 | return QApplication::desktop()->rect(); |
73 | } | 82 | } |
74 | 83 | ||
75 | /** | 84 | /** |
76 | * Returns whether KDE runs in single (default) or double click | 85 | * Returns whether KDE runs in single (default) or double click |
77 | * mode. | 86 | * mode. |
78 | * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html | 87 | * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html |
79 | * @return true if single click mode, or false if double click mode. | 88 | * @return true if single click mode, or false if double click mode. |
diff --git a/microkde/kglobalsettings.h b/microkde/kglobalsettings.h index e2620b3..05ef279 100644 --- a/microkde/kglobalsettings.h +++ b/microkde/kglobalsettings.h | |||
@@ -6,26 +6,28 @@ | |||
6 | 6 | ||
7 | 7 | ||
8 | #define KDE_DEFAULT_SINGLECLICK true | 8 | #define KDE_DEFAULT_SINGLECLICK true |
9 | 9 | ||
10 | 10 | ||
11 | class KGlobalSettings | 11 | class KGlobalSettings |
12 | { | 12 | { |
13 | public: | 13 | public: |
14 | static QFont generalFont(); | 14 | static QFont generalFont(); |
15 | static QFont generalMaxFont(); | 15 | static QFont generalMaxFont(); |
16 | static QFont toolBarFont(); | 16 | static QFont toolBarFont(); |
17 | 17 | ||
18 | static QColor mAlternate; | ||
18 | static QColor toolBarHighlightColor(); | 19 | static QColor toolBarHighlightColor(); |
19 | static QColor alternateBackgroundColor(); | 20 | static QColor alternateBackgroundColor(); |
21 | static void setAlternateBackgroundColor(QColor); | ||
20 | static QRect desktopGeometry( QWidget * ); | 22 | static QRect desktopGeometry( QWidget * ); |
21 | static QString timeTrackerDir(); | 23 | static QString timeTrackerDir(); |
22 | 24 | ||
23 | /** | 25 | /** |
24 | * Returns whether KDE runs in single (default) or double click | 26 | * Returns whether KDE runs in single (default) or double click |
25 | * mode. | 27 | * mode. |
26 | * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html | 28 | * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html |
27 | * @return true if single click mode, or false if double click mode. | 29 | * @return true if single click mode, or false if double click mode. |
28 | **/ | 30 | **/ |
29 | static bool singleClick(); | 31 | static bool singleClick(); |
30 | 32 | ||
31 | }; | 33 | }; |