-rw-r--r-- | kaddressbook/kabcore.cpp | 3 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 1 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.cpp | 1 | ||||
-rw-r--r-- | libkdepim/kprefswidget.h | 1 | ||||
-rw-r--r-- | libkdepim/libkdepim.pro | 2 |
5 files changed, 7 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 1b40d71..df634d0 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1,168 +1,169 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KAddressbook. | 2 | This file is part of KAddressbook. |
3 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> | 3 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | /* | 24 | /* |
25 | Enhanced Version of the file for platform independent KDE tools. | 25 | Enhanced Version of the file for platform independent KDE tools. |
26 | Copyright (c) 2004 Ulf Schenk | 26 | Copyright (c) 2004 Ulf Schenk |
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "kabcore.h" | 31 | #include "kabcore.h" |
32 | 32 | ||
33 | #include <stdaddressbook.h> | 33 | #include <stdaddressbook.h> |
34 | #include <klocale.h> | 34 | #include <klocale.h> |
35 | #include <kfiledialog.h> | 35 | #include <kfiledialog.h> |
36 | #include <qtimer.h> | ||
36 | #include <qprogressbar.h> | 37 | #include <qprogressbar.h> |
37 | 38 | ||
38 | #ifndef KAB_EMBEDDED | 39 | #ifndef KAB_EMBEDDED |
39 | #include <qclipboard.h> | 40 | #include <qclipboard.h> |
40 | #include <qdir.h> | 41 | #include <qdir.h> |
41 | #include <qfile.h> | 42 | #include <qfile.h> |
42 | #include <qapplicaton.h> | 43 | #include <qapplicaton.h> |
43 | #include <qprogressbar.h> | 44 | #include <qprogressbar.h> |
44 | #include <qlayout.h> | 45 | #include <qlayout.h> |
45 | #include <qregexp.h> | 46 | #include <qregexp.h> |
46 | #include <qvbox.h> | 47 | #include <qvbox.h> |
47 | #include <kabc/addresseelist.h> | 48 | #include <kabc/addresseelist.h> |
48 | #include <kabc/errorhandler.h> | 49 | #include <kabc/errorhandler.h> |
49 | #include <kabc/resource.h> | 50 | #include <kabc/resource.h> |
50 | #include <kabc/vcardconverter.h> | 51 | #include <kabc/vcardconverter.h> |
51 | #include <kapplication.h> | 52 | #include <kapplication.h> |
52 | #include <kactionclasses.h> | 53 | #include <kactionclasses.h> |
53 | #include <kcmultidialog.h> | 54 | #include <kcmultidialog.h> |
54 | #include <kdebug.h> | 55 | #include <kdebug.h> |
55 | #include <kdeversion.h> | 56 | #include <kdeversion.h> |
56 | #include <kkeydialog.h> | 57 | #include <kkeydialog.h> |
57 | #include <kmessagebox.h> | 58 | #include <kmessagebox.h> |
58 | #include <kprinter.h> | 59 | #include <kprinter.h> |
59 | #include <kprotocolinfo.h> | 60 | #include <kprotocolinfo.h> |
60 | #include <kresources/selectdialog.h> | 61 | #include <kresources/selectdialog.h> |
61 | #include <kstandarddirs.h> | 62 | #include <kstandarddirs.h> |
62 | #include <ktempfile.h> | 63 | #include <ktempfile.h> |
63 | #include <kxmlguiclient.h> | 64 | #include <kxmlguiclient.h> |
64 | #include <kaboutdata.h> | 65 | #include <kaboutdata.h> |
65 | #include <libkdepim/categoryselectdialog.h> | 66 | #include <libkdepim/categoryselectdialog.h> |
66 | 67 | ||
67 | #include "addresseeutil.h" | 68 | #include "addresseeutil.h" |
68 | #include "addresseeeditordialog.h" | 69 | #include "addresseeeditordialog.h" |
69 | #include "extensionmanager.h" | 70 | #include "extensionmanager.h" |
70 | #include "kstdaction.h" | 71 | #include "kstdaction.h" |
71 | #include "kaddressbookservice.h" | 72 | #include "kaddressbookservice.h" |
72 | #include "ldapsearchdialog.h" | 73 | #include "ldapsearchdialog.h" |
73 | #include "printing/printingwizard.h" | 74 | #include "printing/printingwizard.h" |
74 | #else // KAB_EMBEDDED | 75 | #else // KAB_EMBEDDED |
75 | 76 | ||
76 | #include <kapplication.h> | 77 | #include <kapplication.h> |
77 | #include "KDGanttMinimizeSplitter.h" | 78 | #include "KDGanttMinimizeSplitter.h" |
78 | #include "kaddressbookmain.h" | 79 | #include "kaddressbookmain.h" |
79 | #include "kactioncollection.h" | 80 | #include "kactioncollection.h" |
80 | #include "addresseedialog.h" | 81 | #include "addresseedialog.h" |
81 | //US | 82 | //US |
82 | #include <addresseeview.h> | 83 | #include <addresseeview.h> |
83 | 84 | ||
84 | #include <qapp.h> | 85 | #include <qapp.h> |
85 | #include <qmenubar.h> | 86 | #include <qmenubar.h> |
86 | //#include <qtoolbar.h> | 87 | //#include <qtoolbar.h> |
87 | #include <qmessagebox.h> | 88 | #include <qmessagebox.h> |
88 | #include <kdebug.h> | 89 | #include <kdebug.h> |
89 | #include <kiconloader.h> // needed for SmallIcon | 90 | #include <kiconloader.h> // needed for SmallIcon |
90 | #include <kresources/kcmkresources.h> | 91 | #include <kresources/kcmkresources.h> |
91 | #include <ktoolbar.h> | 92 | #include <ktoolbar.h> |
92 | 93 | ||
93 | 94 | ||
94 | //#include <qlabel.h> | 95 | //#include <qlabel.h> |
95 | 96 | ||
96 | 97 | ||
97 | #ifndef DESKTOP_VERSION | 98 | #ifndef DESKTOP_VERSION |
98 | #include <qpe/ir.h> | 99 | #include <qpe/ir.h> |
99 | #include <qpe/qpemenubar.h> | 100 | #include <qpe/qpemenubar.h> |
100 | #include <qtopia/qcopenvelope_qws.h> | 101 | #include <qtopia/qcopenvelope_qws.h> |
101 | #else | 102 | #else |
102 | 103 | ||
103 | #include <qmenubar.h> | 104 | #include <qmenubar.h> |
104 | #endif | 105 | #endif |
105 | 106 | ||
106 | #endif // KAB_EMBEDDED | 107 | #endif // KAB_EMBEDDED |
107 | #include "kcmconfigs/kcmkabconfig.h" | 108 | #include "kcmconfigs/kcmkabconfig.h" |
108 | #include "kcmconfigs/kcmkdepimconfig.h" | 109 | #include "kcmconfigs/kcmkdepimconfig.h" |
109 | #include "kpimglobalprefs.h" | 110 | #include "kpimglobalprefs.h" |
110 | #include "externalapphandler.h" | 111 | #include "externalapphandler.h" |
111 | 112 | ||
112 | 113 | ||
113 | #include <kresources/selectdialog.h> | 114 | #include <kresources/selectdialog.h> |
114 | #include <kmessagebox.h> | 115 | #include <kmessagebox.h> |
115 | 116 | ||
116 | #include <picture.h> | 117 | #include <picture.h> |
117 | #include <resource.h> | 118 | #include <resource.h> |
118 | 119 | ||
119 | //US#include <qsplitter.h> | 120 | //US#include <qsplitter.h> |
120 | #include <qmap.h> | 121 | #include <qmap.h> |
121 | #include <qdir.h> | 122 | #include <qdir.h> |
122 | #include <qfile.h> | 123 | #include <qfile.h> |
123 | #include <qvbox.h> | 124 | #include <qvbox.h> |
124 | #include <qlayout.h> | 125 | #include <qlayout.h> |
125 | #include <qclipboard.h> | 126 | #include <qclipboard.h> |
126 | #include <qtextstream.h> | 127 | #include <qtextstream.h> |
127 | 128 | ||
128 | #include <libkdepim/categoryselectdialog.h> | 129 | #include <libkdepim/categoryselectdialog.h> |
129 | #include <kabc/vcardconverter.h> | 130 | #include <kabc/vcardconverter.h> |
130 | 131 | ||
131 | 132 | ||
132 | #include "addresseeutil.h" | 133 | #include "addresseeutil.h" |
133 | #include "undocmds.h" | 134 | #include "undocmds.h" |
134 | #include "addresseeeditordialog.h" | 135 | #include "addresseeeditordialog.h" |
135 | #include "viewmanager.h" | 136 | #include "viewmanager.h" |
136 | #include "details/detailsviewcontainer.h" | 137 | #include "details/detailsviewcontainer.h" |
137 | #include "kabprefs.h" | 138 | #include "kabprefs.h" |
138 | #include "xxportmanager.h" | 139 | #include "xxportmanager.h" |
139 | #include "incsearchwidget.h" | 140 | #include "incsearchwidget.h" |
140 | #include "jumpbuttonbar.h" | 141 | #include "jumpbuttonbar.h" |
141 | #include "extensionmanager.h" | 142 | #include "extensionmanager.h" |
142 | #include "addresseeconfig.h" | 143 | #include "addresseeconfig.h" |
143 | #include <kcmultidialog.h> | 144 | #include <kcmultidialog.h> |
144 | 145 | ||
145 | #ifdef _WIN32_ | 146 | #ifdef _WIN32_ |
146 | 147 | ||
147 | #include "kaimportoldialog.h" | 148 | #include "kaimportoldialog.h" |
148 | #else | 149 | #else |
149 | #include <unistd.h> | 150 | #include <unistd.h> |
150 | #endif | 151 | #endif |
151 | // sync includes | 152 | // sync includes |
152 | #include <libkdepim/ksyncprofile.h> | 153 | #include <libkdepim/ksyncprofile.h> |
153 | #include <libkdepim/ksyncprefsdialog.h> | 154 | #include <libkdepim/ksyncprefsdialog.h> |
154 | 155 | ||
155 | 156 | ||
156 | bool pasteWithNewUid = true; | 157 | bool pasteWithNewUid = true; |
157 | 158 | ||
158 | #ifdef KAB_EMBEDDED | 159 | #ifdef KAB_EMBEDDED |
159 | KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name ) | 160 | KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name ) |
160 | : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ), | 161 | : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ), |
161 | mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US mLdapSearchDialog( 0 ),*/ | 162 | mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US mLdapSearchDialog( 0 ),*/ |
162 | mReadWrite( readWrite ), mModified( false ), mMainWindow(client) | 163 | mReadWrite( readWrite ), mModified( false ), mMainWindow(client) |
163 | #else //KAB_EMBEDDED | 164 | #else //KAB_EMBEDDED |
164 | KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name ) | 165 | KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name ) |
165 | : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ), | 166 | : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ), |
166 | mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ), | 167 | mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ), |
167 | mReadWrite( readWrite ), mModified( false ) | 168 | mReadWrite( readWrite ), mModified( false ) |
168 | #endif //KAB_EMBEDDED | 169 | #endif //KAB_EMBEDDED |
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 073ab74..03034b4 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -1,166 +1,167 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KdePim/Pi. | 2 | This file is part of KdePim/Pi. |
3 | Copyright (c) 2004 Ulf Schenk | 3 | Copyright (c) 2004 Ulf Schenk |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | /* | 24 | /* |
25 | Enhanced Version of the file for platform independent KDE tools. | 25 | Enhanced Version of the file for platform independent KDE tools. |
26 | Copyright (c) 2004 Ulf Schenk | 26 | Copyright (c) 2004 Ulf Schenk |
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <qlayout.h> | 31 | #include <qlayout.h> |
32 | #include <qtabwidget.h> | 32 | #include <qtabwidget.h> |
33 | #include <qcombobox.h> | 33 | #include <qcombobox.h> |
34 | #include <qgroupbox.h> | 34 | #include <qgroupbox.h> |
35 | #include <qlabel.h> | 35 | #include <qlabel.h> |
36 | #include <qlineedit.h> | 36 | #include <qlineedit.h> |
37 | #include <qbuttongroup.h> | 37 | #include <qbuttongroup.h> |
38 | #include <qfile.h> | 38 | #include <qfile.h> |
39 | #include <qregexp.h> | ||
39 | 40 | ||
40 | #include <kdialog.h> | 41 | #include <kdialog.h> |
41 | #include <klocale.h> | 42 | #include <klocale.h> |
42 | #include <kdateedit.h> | 43 | #include <kdateedit.h> |
43 | #include <kglobal.h> | 44 | #include <kglobal.h> |
44 | #include <stdlib.h> | 45 | #include <stdlib.h> |
45 | 46 | ||
46 | /*US | 47 | /*US |
47 | #include <qcheckbox.h> | 48 | #include <qcheckbox.h> |
48 | #include <qframe.h> | 49 | #include <qframe.h> |
49 | #include <qpushbutton.h> | 50 | #include <qpushbutton.h> |
50 | #include <qcombobox.h> | 51 | #include <qcombobox.h> |
51 | #include <qlineedit.h> | 52 | #include <qlineedit.h> |
52 | #include <qlabel.h> | 53 | #include <qlabel.h> |
53 | #include <qfile.h> | 54 | #include <qfile.h> |
54 | 55 | ||
55 | #include <kconfig.h> | 56 | #include <kconfig.h> |
56 | #include <kdebug.h> | 57 | #include <kdebug.h> |
57 | #include <kdialog.h> | 58 | #include <kdialog.h> |
58 | #include <klistview.h> | 59 | #include <klistview.h> |
59 | #include <klocale.h> | 60 | #include <klocale.h> |
60 | #include <kglobal.h> | 61 | #include <kglobal.h> |
61 | #include <kmessagebox.h> | 62 | #include <kmessagebox.h> |
62 | #include <kstandarddirs.h> | 63 | #include <kstandarddirs.h> |
63 | 64 | ||
64 | #ifndef KAB_EMBEDDED | 65 | #ifndef KAB_EMBEDDED |
65 | #include <ktrader.h> | 66 | #include <ktrader.h> |
66 | #else // KAB_EMBEDDED | 67 | #else // KAB_EMBEDDED |
67 | #include <mergewidget.h> | 68 | #include <mergewidget.h> |
68 | #include <distributionlistwidget.h> | 69 | #include <distributionlistwidget.h> |
69 | #endif // KAB_EMBEDDED | 70 | #endif // KAB_EMBEDDED |
70 | 71 | ||
71 | #include "addresseewidget.h" | 72 | #include "addresseewidget.h" |
72 | #include "extensionconfigdialog.h" | 73 | #include "extensionconfigdialog.h" |
73 | #include "extensionwidget.h" | 74 | #include "extensionwidget.h" |
74 | */ | 75 | */ |
75 | 76 | ||
76 | #include "qapplication.h" | 77 | #include "qapplication.h" |
77 | 78 | ||
78 | #include "kpimglobalprefs.h" | 79 | #include "kpimglobalprefs.h" |
79 | 80 | ||
80 | #include "kdepimconfigwidget.h" | 81 | #include "kdepimconfigwidget.h" |
81 | 82 | ||
82 | 83 | ||
83 | KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name ) | 84 | KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name ) |
84 | : KPrefsWidget(prefs, parent, name ) | 85 | : KPrefsWidget(prefs, parent, name ) |
85 | { | 86 | { |
86 | mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email")); | 87 | mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email")); |
87 | mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone")); | 88 | mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone")); |
88 | mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS")); | 89 | mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS")); |
89 | mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax")); | 90 | mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax")); |
90 | mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager")); | 91 | mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager")); |
91 | mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP")); | 92 | mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP")); |
92 | 93 | ||
93 | 94 | ||
94 | QVBoxLayout *topLayout = new QVBoxLayout( this, 0, | 95 | QVBoxLayout *topLayout = new QVBoxLayout( this, 0, |
95 | KDialog::spacingHint() ); | 96 | KDialog::spacingHint() ); |
96 | 97 | ||
97 | tabWidget = new QTabWidget( this ); | 98 | tabWidget = new QTabWidget( this ); |
98 | topLayout->addWidget( tabWidget ); | 99 | topLayout->addWidget( tabWidget ); |
99 | 100 | ||
100 | 101 | ||
101 | setupLocaleTab(); | 102 | setupLocaleTab(); |
102 | setupLocaleDateTab(); | 103 | setupLocaleDateTab(); |
103 | setupTimeZoneTab(); | 104 | setupTimeZoneTab(); |
104 | setupExternalAppTab(); | 105 | setupExternalAppTab(); |
105 | 106 | ||
106 | } | 107 | } |
107 | void KDEPIMConfigWidget::showTimeZoneTab() | 108 | void KDEPIMConfigWidget::showTimeZoneTab() |
108 | { | 109 | { |
109 | tabWidget->setCurrentPage ( 2 ) ; | 110 | tabWidget->setCurrentPage ( 2 ) ; |
110 | } | 111 | } |
111 | void KDEPIMConfigWidget::setupExternalAppTab() | 112 | void KDEPIMConfigWidget::setupExternalAppTab() |
112 | { | 113 | { |
113 | QWidget *externalAppsPage = new QWidget( this ); | 114 | QWidget *externalAppsPage = new QWidget( this ); |
114 | QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(), | 115 | QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(), |
115 | KDialog::spacingHintSmall() ); | 116 | KDialog::spacingHintSmall() ); |
116 | 117 | ||
117 | mExternalApps = new QComboBox( externalAppsPage ); | 118 | mExternalApps = new QComboBox( externalAppsPage ); |
118 | 119 | ||
119 | QMap<ExternalAppHandler::Types, QString>::Iterator it; | 120 | QMap<ExternalAppHandler::Types, QString>::Iterator it; |
120 | for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it ) | 121 | for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it ) |
121 | mExternalApps->insertItem( it.data(), it.key() ); | 122 | mExternalApps->insertItem( it.data(), it.key() ); |
122 | 123 | ||
123 | layout->addWidget( mExternalApps ); | 124 | layout->addWidget( mExternalApps ); |
124 | 125 | ||
125 | connect( mExternalApps, SIGNAL( activated( int ) ), | 126 | connect( mExternalApps, SIGNAL( activated( int ) ), |
126 | this, SLOT (externalapp_changed( int ) ) ); | 127 | this, SLOT (externalapp_changed( int ) ) ); |
127 | 128 | ||
128 | 129 | ||
129 | mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage ); | 130 | mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage ); |
130 | QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" ); | 131 | QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" ); |
131 | 132 | ||
132 | 133 | ||
133 | mClient = new QComboBox( mExternalAppGroupBox ); | 134 | mClient = new QComboBox( mExternalAppGroupBox ); |
134 | boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 ); | 135 | boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 ); |
135 | 136 | ||
136 | connect( mClient, SIGNAL( activated( int ) ), | 137 | connect( mClient, SIGNAL( activated( int ) ), |
137 | this, SLOT (client_changed( int ) ) ); | 138 | this, SLOT (client_changed( int ) ) ); |
138 | 139 | ||
139 | QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox); | 140 | QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox); |
140 | boxLayout->addWidget( lab, 1, 0 ); | 141 | boxLayout->addWidget( lab, 1, 0 ); |
141 | mChannel = new QLineEdit(mExternalAppGroupBox); | 142 | mChannel = new QLineEdit(mExternalAppGroupBox); |
142 | mChannel->setReadOnly(true); | 143 | mChannel->setReadOnly(true); |
143 | boxLayout->addMultiCellWidget( mChannel, 2 , 2, 0, 1 ); | 144 | boxLayout->addMultiCellWidget( mChannel, 2 , 2, 0, 1 ); |
144 | 145 | ||
145 | lab = new QLabel( i18n("Message:"), mExternalAppGroupBox); | 146 | lab = new QLabel( i18n("Message:"), mExternalAppGroupBox); |
146 | boxLayout->addWidget( lab, 3, 0 ); | 147 | boxLayout->addWidget( lab, 3, 0 ); |
147 | mMessage = new QLineEdit(mExternalAppGroupBox); | 148 | mMessage = new QLineEdit(mExternalAppGroupBox); |
148 | mMessage->setReadOnly(true); | 149 | mMessage->setReadOnly(true); |
149 | boxLayout->addWidget( mMessage , 4, 0); | 150 | boxLayout->addWidget( mMessage , 4, 0); |
150 | 151 | ||
151 | lab = new QLabel( i18n("Parameters:"), mExternalAppGroupBox); | 152 | lab = new QLabel( i18n("Parameters:"), mExternalAppGroupBox); |
152 | boxLayout->addWidget( lab, 3, 1 ); | 153 | boxLayout->addWidget( lab, 3, 1 ); |
153 | mParameters = new QLineEdit(mExternalAppGroupBox); | 154 | mParameters = new QLineEdit(mExternalAppGroupBox); |
154 | mParameters->setReadOnly(true); | 155 | mParameters->setReadOnly(true); |
155 | boxLayout->addWidget( mParameters, 4, 1 ); | 156 | boxLayout->addWidget( mParameters, 4, 1 ); |
156 | 157 | ||
157 | lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox); | 158 | lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox); |
158 | boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 ); | 159 | boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 ); |
159 | 160 | ||
160 | lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox); | 161 | lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox); |
161 | boxLayout->addWidget( lab, 6, 0 ); | 162 | boxLayout->addWidget( lab, 6, 0 ); |
162 | mMessage2 = new QLineEdit(mExternalAppGroupBox); | 163 | mMessage2 = new QLineEdit(mExternalAppGroupBox); |
163 | mMessage2->setReadOnly(true); | 164 | mMessage2->setReadOnly(true); |
164 | boxLayout->addWidget( mMessage2 , 7, 0); | 165 | boxLayout->addWidget( mMessage2 , 7, 0); |
165 | 166 | ||
166 | lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox); | 167 | lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox); |
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp index a896a0f..b2b7663 100644 --- a/libkdepim/kpimglobalprefs.cpp +++ b/libkdepim/kpimglobalprefs.cpp | |||
@@ -1,132 +1,133 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of libkdepim. | 2 | This file is part of libkdepim. |
3 | Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | /* | 24 | /* |
25 | Enhanced Version of the file for platform independent KDE tools. | 25 | Enhanced Version of the file for platform independent KDE tools. |
26 | Copyright (c) 2004 Ulf Schenk | 26 | Copyright (c) 2004 Ulf Schenk |
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <kglobal.h> | 31 | #include <kglobal.h> |
32 | #include <kconfig.h> | 32 | #include <kconfig.h> |
33 | #include <klocale.h> | 33 | #include <klocale.h> |
34 | #include <kdebug.h> | 34 | #include <kdebug.h> |
35 | #include <kstaticdeleter.h> | 35 | #include <kstaticdeleter.h> |
36 | 36 | ||
37 | #include <qregexp.h> | ||
37 | #include "kpimglobalprefs.h" | 38 | #include "kpimglobalprefs.h" |
38 | 39 | ||
39 | KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0; | 40 | KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0; |
40 | static KStaticDeleter<KPimGlobalPrefs> staticDeleter; | 41 | static KStaticDeleter<KPimGlobalPrefs> staticDeleter; |
41 | 42 | ||
42 | 43 | ||
43 | KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) | 44 | KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) |
44 | : KPrefs("microkdeglobalrc") | 45 | : KPrefs("microkdeglobalrc") |
45 | { | 46 | { |
46 | 47 | ||
47 | KPrefs::setCurrentGroup("Locale"); | 48 | KPrefs::setCurrentGroup("Locale"); |
48 | addItemInt("PreferredLanguage",&mPreferredLanguage,0); | 49 | addItemInt("PreferredLanguage",&mPreferredLanguage,0); |
49 | addItemInt("PreferredTime",&mPreferredTime,0); | 50 | addItemInt("PreferredTime",&mPreferredTime,0); |
50 | addItemInt("PreferredDate",&mPreferredDate,0); | 51 | addItemInt("PreferredDate",&mPreferredDate,0); |
51 | addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); | 52 | addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); |
52 | //addItemBool("QuickSavingWOUnicode",&mUseQuicksave,false); | 53 | //addItemBool("QuickSavingWOUnicode",&mUseQuicksave,false); |
53 | // addItemBool("ShortDateInViewer",&mShortDateInViewer,false); | 54 | // addItemBool("ShortDateInViewer",&mShortDateInViewer,false); |
54 | addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y"); | 55 | addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y"); |
55 | addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y"); | 56 | addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y"); |
56 | 57 | ||
57 | KPrefs::setCurrentGroup("Time & Date"); | 58 | KPrefs::setCurrentGroup("Time & Date"); |
58 | 59 | ||
59 | addItemString("TimeZoneName",&mTimeZoneId,i18n ("+01:00 Europe/Oslo(CET)") ); | 60 | addItemString("TimeZoneName",&mTimeZoneId,i18n ("+01:00 Europe/Oslo(CET)") ); |
60 | addItemBool("UseDaylightsaving",&mUseDaylightsaving,true); | 61 | addItemBool("UseDaylightsaving",&mUseDaylightsaving,true); |
61 | addItemInt("DaylightsavingStart",&mDaylightsavingStart,90); | 62 | addItemInt("DaylightsavingStart",&mDaylightsavingStart,90); |
62 | addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304); | 63 | addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304); |
63 | 64 | ||
64 | 65 | ||
65 | 66 | ||
66 | 67 | ||
67 | KPrefs::setCurrentGroup( "ExternalApplications" ); | 68 | KPrefs::setCurrentGroup( "ExternalApplications" ); |
68 | 69 | ||
69 | addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC ); | 70 | addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC ); |
70 | addItemString( "EmailChannel", &mEmailOtherChannel, "" ); | 71 | addItemString( "EmailChannel", &mEmailOtherChannel, "" ); |
71 | addItemString( "EmailChannelMessage", &mEmailOtherMessage, "" ); | 72 | addItemString( "EmailChannelMessage", &mEmailOtherMessage, "" ); |
72 | addItemString( "EmailChannelParameters", &mEmailOtherMessageParameters, "" ); | 73 | addItemString( "EmailChannelParameters", &mEmailOtherMessageParameters, "" ); |
73 | addItemString( "EmailChannelMessage2", &mEmailOtherMessage2, "" ); | 74 | addItemString( "EmailChannelMessage2", &mEmailOtherMessage2, "" ); |
74 | addItemString( "EmailChannelParameters2", &mEmailOtherMessageParameters2, "" ); | 75 | addItemString( "EmailChannelParameters2", &mEmailOtherMessageParameters2, "" ); |
75 | 76 | ||
76 | addItemInt( "PhoneChannelType", &mPhoneClient, KPPI_PHC ); | 77 | addItemInt( "PhoneChannelType", &mPhoneClient, KPPI_PHC ); |
77 | addItemString( "PhoneChannel", &mPhoneOtherChannel, "" ); | 78 | addItemString( "PhoneChannel", &mPhoneOtherChannel, "" ); |
78 | addItemString( "PhoneChannelMessage", &mPhoneOtherMessage, "" ); | 79 | addItemString( "PhoneChannelMessage", &mPhoneOtherMessage, "" ); |
79 | addItemString( "PhoneChannelParameters", &mPhoneOtherMessageParameters, "" ); | 80 | addItemString( "PhoneChannelParameters", &mPhoneOtherMessageParameters, "" ); |
80 | 81 | ||
81 | addItemInt( "FaxChannelType", &mFaxClient, NONE_FAC ); | 82 | addItemInt( "FaxChannelType", &mFaxClient, NONE_FAC ); |
82 | addItemString( "FaxChannel", &mFaxOtherChannel, "" ); | 83 | addItemString( "FaxChannel", &mFaxOtherChannel, "" ); |
83 | addItemString( "FaxChannelMessage", &mFaxOtherMessage, "" ); | 84 | addItemString( "FaxChannelMessage", &mFaxOtherMessage, "" ); |
84 | addItemString( "FaxChannelParameters", &mFaxOtherMessageParameters, "" ); | 85 | addItemString( "FaxChannelParameters", &mFaxOtherMessageParameters, "" ); |
85 | 86 | ||
86 | addItemInt( "SMSChannelType", &mSMSClient, NONE_SMC ); | 87 | addItemInt( "SMSChannelType", &mSMSClient, NONE_SMC ); |
87 | addItemString( "SMSChannel", &mSMSOtherChannel, "" ); | 88 | addItemString( "SMSChannel", &mSMSOtherChannel, "" ); |
88 | addItemString( "SMSChannelMessage", &mSMSOtherMessage, "" ); | 89 | addItemString( "SMSChannelMessage", &mSMSOtherMessage, "" ); |
89 | addItemString( "SMSChannelParameters", &mSMSOtherMessageParameters, "" ); | 90 | addItemString( "SMSChannelParameters", &mSMSOtherMessageParameters, "" ); |
90 | 91 | ||
91 | addItemInt( "PagerChannelType", &mPagerClient, NONE_PAC ); | 92 | addItemInt( "PagerChannelType", &mPagerClient, NONE_PAC ); |
92 | addItemString( "PagerChannel", &mPagerOtherChannel, "" ); | 93 | addItemString( "PagerChannel", &mPagerOtherChannel, "" ); |
93 | addItemString( "PagerChannelMessage", &mPagerOtherMessage, "" ); | 94 | addItemString( "PagerChannelMessage", &mPagerOtherMessage, "" ); |
94 | addItemString( "PagerChannelParameters", &mPagerOtherMessageParameters, "" ); | 95 | addItemString( "PagerChannelParameters", &mPagerOtherMessageParameters, "" ); |
95 | 96 | ||
96 | addItemInt( "SIPChannelType", &mSipClient, NONE_SIC ); | 97 | addItemInt( "SIPChannelType", &mSipClient, NONE_SIC ); |
97 | addItemString( "SIPChannel", &mSipOtherChannel, "" ); | 98 | addItemString( "SIPChannel", &mSipOtherChannel, "" ); |
98 | addItemString( "SIPChannelMessage", &mSipOtherMessage, "" ); | 99 | addItemString( "SIPChannelMessage", &mSipOtherMessage, "" ); |
99 | addItemString( "SIPChannelParameters", &mSipOtherMessageParameters, "" ); | 100 | addItemString( "SIPChannelParameters", &mSipOtherMessageParameters, "" ); |
100 | 101 | ||
101 | } | 102 | } |
102 | 103 | ||
103 | void KPimGlobalPrefs::setGlobalConfig() | 104 | void KPimGlobalPrefs::setGlobalConfig() |
104 | { | 105 | { |
105 | 106 | ||
106 | KGlobal::locale()->setHore24Format( !mPreferredTime ); | 107 | KGlobal::locale()->setHore24Format( !mPreferredTime ); |
107 | KGlobal::locale()->setWeekStartMonday( !mWeekStartsOnSunday ); | 108 | KGlobal::locale()->setWeekStartMonday( !mWeekStartsOnSunday ); |
108 | KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)mPreferredDate ); | 109 | KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)mPreferredDate ); |
109 | KGlobal::locale()->setLanguage( mPreferredLanguage ); | 110 | KGlobal::locale()->setLanguage( mPreferredLanguage ); |
110 | QString dummy = mUserDateFormatLong; | 111 | QString dummy = mUserDateFormatLong; |
111 | KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") )); | 112 | KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") )); |
112 | dummy = mUserDateFormatShort; | 113 | dummy = mUserDateFormatShort; |
113 | KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") )); | 114 | KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") )); |
114 | KGlobal::locale()->setDaylightSaving( mUseDaylightsaving, | 115 | KGlobal::locale()->setDaylightSaving( mUseDaylightsaving, |
115 | mDaylightsavingStart, | 116 | mDaylightsavingStart, |
116 | mDaylightsavingEnd ); | 117 | mDaylightsavingEnd ); |
117 | KGlobal::locale()->setTimezone( mTimeZoneId ); | 118 | KGlobal::locale()->setTimezone( mTimeZoneId ); |
118 | 119 | ||
119 | } | 120 | } |
120 | KPimGlobalPrefs::~KPimGlobalPrefs() | 121 | KPimGlobalPrefs::~KPimGlobalPrefs() |
121 | { | 122 | { |
122 | } | 123 | } |
123 | 124 | ||
124 | KPimGlobalPrefs *KPimGlobalPrefs::instance() | 125 | KPimGlobalPrefs *KPimGlobalPrefs::instance() |
125 | { | 126 | { |
126 | if ( !sInstance ) { | 127 | if ( !sInstance ) { |
127 | sInstance = staticDeleter.setObject( new KPimGlobalPrefs() ); | 128 | sInstance = staticDeleter.setObject( new KPimGlobalPrefs() ); |
128 | sInstance->readConfig(); | 129 | sInstance->readConfig(); |
129 | } | 130 | } |
130 | 131 | ||
131 | return sInstance; | 132 | return sInstance; |
132 | } | 133 | } |
diff --git a/libkdepim/kprefswidget.h b/libkdepim/kprefswidget.h index 8a24515..8543a39 100644 --- a/libkdepim/kprefswidget.h +++ b/libkdepim/kprefswidget.h | |||
@@ -1,157 +1,158 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> | 3 | Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | // $Id$ | 23 | // $Id$ |
24 | 24 | ||
25 | #ifndef _KPREFSWIDGET_H | 25 | #ifndef _KPREFSWIDGET_H |
26 | #define _KPREFSWIDGET_H | 26 | #define _KPREFSWIDGET_H |
27 | 27 | ||
28 | #include <qptrlist.h> | 28 | #include <qptrlist.h> |
29 | #include <qlineedit.h> | 29 | #include <qlineedit.h> |
30 | #include <qpushbutton.h> | ||
30 | 31 | ||
31 | #include <qwidget.h> | 32 | #include <qwidget.h> |
32 | 33 | ||
33 | class KPrefs; | 34 | class KPrefs; |
34 | 35 | ||
35 | class KColorButton; | 36 | class KColorButton; |
36 | class QCheckBox; | 37 | class QCheckBox; |
37 | class QLabel; | 38 | class QLabel; |
38 | class QSpinBox; | 39 | class QSpinBox; |
39 | class QButtonGroup; | 40 | class QButtonGroup; |
40 | 41 | ||
41 | /** | 42 | /** |
42 | @short Base class for widgets used by @ref KPrefsDialog. | 43 | @short Base class for widgets used by @ref KPrefsDialog. |
43 | @author Cornelius Schumacher | 44 | @author Cornelius Schumacher |
44 | @see KPrefsDialog | 45 | @see KPrefsDialog |
45 | 46 | ||
46 | This class provides the interface for the preferences widgets used by | 47 | This class provides the interface for the preferences widgets used by |
47 | KPrefsDialog. | 48 | KPrefsDialog. |
48 | */ | 49 | */ |
49 | class KPrefsWid : public QObject | 50 | class KPrefsWid : public QObject |
50 | { | 51 | { |
51 | Q_OBJECT | 52 | Q_OBJECT |
52 | public: | 53 | public: |
53 | /** | 54 | /** |
54 | This function is called to read value of the setting from the | 55 | This function is called to read value of the setting from the |
55 | stored configuration and display it in the widget. | 56 | stored configuration and display it in the widget. |
56 | */ | 57 | */ |
57 | virtual void readConfig() = 0; | 58 | virtual void readConfig() = 0; |
58 | /** | 59 | /** |
59 | This function is called to write the current setting of the widget to the | 60 | This function is called to write the current setting of the widget to the |
60 | stored configuration. | 61 | stored configuration. |
61 | */ | 62 | */ |
62 | virtual void writeConfig() = 0; | 63 | virtual void writeConfig() = 0; |
63 | 64 | ||
64 | //connect to this signal if you want to be notified of changes | 65 | //connect to this signal if you want to be notified of changes |
65 | signals: | 66 | signals: |
66 | void modified(); | 67 | void modified(); |
67 | 68 | ||
68 | }; | 69 | }; |
69 | 70 | ||
70 | /** | 71 | /** |
71 | @short Widget for bool settings in @ref KPrefsDialog. | 72 | @short Widget for bool settings in @ref KPrefsDialog. |
72 | 73 | ||
73 | This class provides a widget for configuring bool values. It is meant to be | 74 | This class provides a widget for configuring bool values. It is meant to be |
74 | used by KPrefsDialog. The user is responsible for the layout management. | 75 | used by KPrefsDialog. The user is responsible for the layout management. |
75 | */ | 76 | */ |
76 | class KPrefsWidBool : public KPrefsWid | 77 | class KPrefsWidBool : public KPrefsWid |
77 | { | 78 | { |
78 | public: | 79 | public: |
79 | /** | 80 | /** |
80 | Create a bool widget consisting of a QCheckbox. | 81 | Create a bool widget consisting of a QCheckbox. |
81 | 82 | ||
82 | @param text Text of QCheckBox. | 83 | @param text Text of QCheckBox. |
83 | @param reference Pointer to variable read and written by this widget. | 84 | @param reference Pointer to variable read and written by this widget. |
84 | @param parent Parent widget. | 85 | @param parent Parent widget. |
85 | */ | 86 | */ |
86 | KPrefsWidBool(const QString &text,bool *reference,QWidget *parent); | 87 | KPrefsWidBool(const QString &text,bool *reference,QWidget *parent); |
87 | 88 | ||
88 | /** | 89 | /** |
89 | Return the QCheckbox used by this widget. | 90 | Return the QCheckbox used by this widget. |
90 | */ | 91 | */ |
91 | QCheckBox *checkBox(); | 92 | QCheckBox *checkBox(); |
92 | 93 | ||
93 | void readConfig(); | 94 | void readConfig(); |
94 | void writeConfig(); | 95 | void writeConfig(); |
95 | 96 | ||
96 | private: | 97 | private: |
97 | bool *mReference; | 98 | bool *mReference; |
98 | 99 | ||
99 | QCheckBox *mCheck; | 100 | QCheckBox *mCheck; |
100 | }; | 101 | }; |
101 | 102 | ||
102 | /** | 103 | /** |
103 | @short Widget for time settings in @ref KPrefsDialog. | 104 | @short Widget for time settings in @ref KPrefsDialog. |
104 | 105 | ||
105 | This class provides a widget for configuring time values. It is meant to be | 106 | This class provides a widget for configuring time values. It is meant to be |
106 | used by KPrefsDialog. The user is responsible for the layout management. | 107 | used by KPrefsDialog. The user is responsible for the layout management. |
107 | */ | 108 | */ |
108 | class KPrefsWidTime : public KPrefsWid | 109 | class KPrefsWidTime : public KPrefsWid |
109 | { | 110 | { |
110 | public: | 111 | public: |
111 | /** | 112 | /** |
112 | Create a time widget consisting of a label and a spinbox. | 113 | Create a time widget consisting of a label and a spinbox. |
113 | 114 | ||
114 | @param text Text of Label. | 115 | @param text Text of Label. |
115 | @param reference Pointer to variable read and written by this widget. | 116 | @param reference Pointer to variable read and written by this widget. |
116 | @param parent Parent widget. | 117 | @param parent Parent widget. |
117 | */ | 118 | */ |
118 | KPrefsWidTime(const QString &text,int *reference,QWidget *parent); | 119 | KPrefsWidTime(const QString &text,int *reference,QWidget *parent); |
119 | 120 | ||
120 | /** | 121 | /** |
121 | Return QLabel used by this widget. | 122 | Return QLabel used by this widget. |
122 | */ | 123 | */ |
123 | QLabel *label(); | 124 | QLabel *label(); |
124 | /** | 125 | /** |
125 | Return QSpinBox used by this widget. | 126 | Return QSpinBox used by this widget. |
126 | */ | 127 | */ |
127 | QSpinBox *spinBox(); | 128 | QSpinBox *spinBox(); |
128 | 129 | ||
129 | void readConfig(); | 130 | void readConfig(); |
130 | void writeConfig(); | 131 | void writeConfig(); |
131 | 132 | ||
132 | private: | 133 | private: |
133 | int *mReference; | 134 | int *mReference; |
134 | 135 | ||
135 | QLabel *mLabel; | 136 | QLabel *mLabel; |
136 | QSpinBox *mSpin; | 137 | QSpinBox *mSpin; |
137 | }; | 138 | }; |
138 | 139 | ||
139 | /** | 140 | /** |
140 | @short Widget for color settings in @ref KPrefsDialog. | 141 | @short Widget for color settings in @ref KPrefsDialog. |
141 | 142 | ||
142 | This class provides a widget for configuring color values. It is meant to be | 143 | This class provides a widget for configuring color values. It is meant to be |
143 | used by KPrefsDialog. The user is responsible for the layout management. | 144 | used by KPrefsDialog. The user is responsible for the layout management. |
144 | */ | 145 | */ |
145 | class KPrefsWidColor : public KPrefsWid | 146 | class KPrefsWidColor : public KPrefsWid |
146 | { | 147 | { |
147 | public: | 148 | public: |
148 | /** | 149 | /** |
149 | Create a color widget consisting of a test field and a button for opening | 150 | Create a color widget consisting of a test field and a button for opening |
150 | a color dialog. | 151 | a color dialog. |
151 | 152 | ||
152 | @param text Text of button. | 153 | @param text Text of button. |
153 | @param reference Pointer to variable read and written by this widget. | 154 | @param reference Pointer to variable read and written by this widget. |
154 | @param parent Parent widget. | 155 | @param parent Parent widget. |
155 | */ | 156 | */ |
156 | KPrefsWidColor(const QString &text,QColor *reference,QWidget *parent); | 157 | KPrefsWidColor(const QString &text,QColor *reference,QWidget *parent); |
157 | /** | 158 | /** |
diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro index 1fedac7..7231842 100644 --- a/libkdepim/libkdepim.pro +++ b/libkdepim/libkdepim.pro | |||
@@ -1,55 +1,57 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG = qt warn_on | 2 | CONFIG = qt warn_on |
3 | DEFINES +=KORG_NOKABC | 3 | DEFINES +=KORG_NOKABC |
4 | TARGET = microkdepim | 4 | TARGET = microkdepim |
5 | INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kdeui . .. | 5 | INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kdeui . .. |
6 | DESTDIR=../bin | 6 | DESTDIR=../bin |
7 | 7 | ||
8 | DEFINES += DESKTOP_VERSION | 8 | DEFINES += DESKTOP_VERSION |
9 | include( ../variables.pri ) | 9 | include( ../variables.pri ) |
10 | unix : { | 10 | unix : { |
11 | OBJECTS_DIR = obj/unix | 11 | OBJECTS_DIR = obj/unix |
12 | MOC_DIR = moc/unix | 12 | MOC_DIR = moc/unix |
13 | } | 13 | } |
14 | win32: { | 14 | win32: { |
15 | DEFINES += _WIN32_ | 15 | DEFINES += _WIN32_ |
16 | OBJECTS_DIR = obj/win | 16 | OBJECTS_DIR = obj/win |
17 | MOC_DIR = moc/win | 17 | MOC_DIR = moc/win |
18 | } | 18 | } |
19 | INTERFACES = \ | 19 | INTERFACES = \ |
20 | 20 | ||
21 | HEADERS = \ | 21 | HEADERS = \ |
22 | categoryeditdialog.h \ | 22 | categoryeditdialog.h \ |
23 | categoryeditdialog_base.h \ | 23 | categoryeditdialog_base.h \ |
24 | categoryselectdialog.h \ | 24 | categoryselectdialog.h \ |
25 | categoryselectdialog_base.h \ | 25 | categoryselectdialog_base.h \ |
26 | externalapphandler.h \ | 26 | externalapphandler.h \ |
27 | kdateedit.h \ | 27 | kdateedit.h \ |
28 | kdatepicker.h \ | 28 | kdatepicker.h \ |
29 | kinputdialog.h \ | 29 | kinputdialog.h \ |
30 | kpimprefs.h \ | 30 | kpimprefs.h \ |
31 | kpimglobalprefs.h \ | 31 | kpimglobalprefs.h \ |
32 | kprefsdialog.h \ | 32 | kprefsdialog.h \ |
33 | kprefswidget.h \ | ||
33 | ksyncprofile.h \ | 34 | ksyncprofile.h \ |
34 | ksyncprefsdialog.h \ | 35 | ksyncprefsdialog.h \ |
35 | kcmconfigs/kcmkdepimconfig.h \ | 36 | kcmconfigs/kcmkdepimconfig.h \ |
36 | kcmconfigs/kdepimconfigwidget.h | 37 | kcmconfigs/kdepimconfigwidget.h |
37 | 38 | ||
38 | SOURCES = \ | 39 | SOURCES = \ |
39 | categoryeditdialog.cpp \ | 40 | categoryeditdialog.cpp \ |
40 | categoryeditdialog_base.cpp \ | 41 | categoryeditdialog_base.cpp \ |
41 | categoryselectdialog.cpp \ | 42 | categoryselectdialog.cpp \ |
42 | categoryselectdialog_base.cpp \ | 43 | categoryselectdialog_base.cpp \ |
43 | externalapphandler.cpp \ | 44 | externalapphandler.cpp \ |
44 | kdateedit.cpp \ | 45 | kdateedit.cpp \ |
45 | kdatepicker.cpp \ | 46 | kdatepicker.cpp \ |
46 | kinputdialog.cpp \ | 47 | kinputdialog.cpp \ |
47 | kpimprefs.cpp \ | 48 | kpimprefs.cpp \ |
48 | kpimglobalprefs.cpp \ | 49 | kpimglobalprefs.cpp \ |
49 | kprefsdialog.cpp \ | 50 | kprefsdialog.cpp \ |
51 | kprefswidget.cpp \ | ||
50 | ksyncprofile.cpp \ | 52 | ksyncprofile.cpp \ |
51 | ksyncprefsdialog.cpp \ | 53 | ksyncprefsdialog.cpp \ |
52 | kcmconfigs/kcmkdepimconfig.cpp \ | 54 | kcmconfigs/kcmkdepimconfig.cpp \ |
53 | kcmconfigs/kdepimconfigwidget.cpp | 55 | kcmconfigs/kdepimconfigwidget.cpp |
54 | 56 | ||
55 | 57 | ||