summaryrefslogtreecommitdiffabout
path: root/kmicromail
authorzautrix <zautrix>2004-09-22 02:03:15 (UTC)
committer zautrix <zautrix>2004-09-22 02:03:15 (UTC)
commit633522024e48efc423155a04b71083a03696211d (patch) (unidiff)
treec383ee8fa3489351450b948eb83a42b504752131 /kmicromail
parented2feaa9f7e2064e5b26ff678a25eb79ceae599b (diff)
downloadkdepimpi-633522024e48efc423155a04b71083a03696211d.zip
kdepimpi-633522024e48efc423155a04b71083a03696211d.tar.gz
kdepimpi-633522024e48efc423155a04b71083a03696211d.tar.bz2
global prefs integrated in kopi amd ompi
Diffstat (limited to 'kmicromail') (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/kmicromailE.pro4
-rw-r--r--kmicromail/koprefsdialog.cpp18
-rw-r--r--kmicromail/koprefsdialog.h3
3 files changed, 20 insertions, 5 deletions
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index 0d6cf86..75ba92f 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -1,70 +1,70 @@
1CONFIG += qt warn_on 1CONFIG += qt warn_on
2 TEMPLATE= app 2 TEMPLATE= app
3HEADERS = defines.h \ 3HEADERS = defines.h \
4 editaccounts.h \ 4 editaccounts.h \
5 composemail.h \ 5 composemail.h \
6 accountview.h \ 6 accountview.h \
7 accountitem.h \ 7 accountitem.h \
8 mainwindow.h \ 8 mainwindow.h \
9 viewmail.h \ 9 viewmail.h \
10 viewmailbase.h \ 10 viewmailbase.h \
11 opiemail.h \ 11 opiemail.h \
12 mailistviewitem.h \ 12 mailistviewitem.h \
13 settingsdialog.h \ 13 settingsdialog.h \
14 statuswidget.h \ 14 statuswidget.h \
15 newmaildir.h \ 15 newmaildir.h \
16 selectstore.h \ 16 selectstore.h \
17 selectsmtp.h \ 17 selectsmtp.h \
18 nntpgroups.h \ 18 nntpgroups.h \
19 koprefs.h \ 19 koprefs.h \
20 koprefsdialog.h \ 20 koprefsdialog.h \
21 nntpgroupsdlg.h 21 nntpgroupsdlg.h
22 22
23SOURCES = main.cpp \ 23SOURCES = main.cpp \
24 opiemail.cpp \ 24 opiemail.cpp \
25 mainwindow.cpp \ 25 mainwindow.cpp \
26 accountview.cpp \ 26 accountview.cpp \
27 accountitem.cpp \ 27 accountitem.cpp \
28 composemail.cpp \ 28 composemail.cpp \
29 editaccounts.cpp \ 29 editaccounts.cpp \
30 viewmail.cpp \ 30 viewmail.cpp \
31 viewmailbase.cpp \ 31 viewmailbase.cpp \
32 mailistviewitem.cpp \ 32 mailistviewitem.cpp \
33 settingsdialog.cpp \ 33 settingsdialog.cpp \
34 statuswidget.cpp \ 34 statuswidget.cpp \
35 newmaildir.cpp \ 35 newmaildir.cpp \
36 selectstore.cpp \ 36 selectstore.cpp \
37 selectsmtp.cpp \ 37 selectsmtp.cpp \
38 nntpgroups.cpp \ 38 nntpgroups.cpp \
39 koprefs.cpp\ 39 koprefs.cpp\
40 koprefsdialog.cpp\ 40 koprefsdialog.cpp\
41 nntpgroupsdlg.cpp 41 nntpgroupsdlg.cpp
42 42
43INTERFACES = editaccountsui.ui \ 43INTERFACES = editaccountsui.ui \
44 selectmailtypeui.ui \ 44 selectmailtypeui.ui \
45 imapconfigui.ui \ 45 imapconfigui.ui \
46 pop3configui.ui \ 46 pop3configui.ui \
47 nntpconfigui.ui \ 47 nntpconfigui.ui \
48 smtpconfigui.ui \ 48 smtpconfigui.ui \
49 composemailui.ui \ 49 composemailui.ui \
50 settingsdialogui.ui \ 50 settingsdialogui.ui \
51 statuswidgetui.ui \ 51 statuswidgetui.ui \
52 newmaildirui.ui \ 52 newmaildirui.ui \
53 selectstoreui.ui \ 53 selectstoreui.ui \
54 nntpgroupsui.ui 54 nntpgroupsui.ui
55 55
56 56
57INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include 57INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include
58LIBS += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokde -lmicroqtcompat -lmicrokabc -lmicrokcal -lmicrokdepim 58LIBS += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicroqtcompat -lmicrokdepim
59LIBS += $(QTOPIALIB) 59LIBS += $(QTOPIALIB)
60#LIBS += -lqtopia 60#LIBS += -lqtopia
61#next line for Zaurus only 61#next line for Zaurus only
62#LIBS += -luuid 62#LIBS += -luuid
63 63
64# 64#
65OBJECTS_DIR = obj/$(PLATFORM) 65OBJECTS_DIR = obj/$(PLATFORM)
66MOC_DIR = moc/$(PLATFORM) 66MOC_DIR = moc/$(PLATFORM)
67DESTDIR=$(QPEDIR)/bin 67DESTDIR=$(QPEDIR)/bin
68TARGET = ompi 68TARGET = ompi
69 69
70 70
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 7d7bd2a..598d12f 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -1,704 +1,716 @@
1/* 1/*
2 This file is part of KOrganizer. 2 This file is part of KOrganizer.
3 Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2000,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 23
24#include <qlayout.h> 24#include <qlayout.h>
25#include <qlabel.h> 25#include <qlabel.h>
26#include <qgroupbox.h> 26#include <qgroupbox.h>
27#include <qbuttongroup.h> 27#include <qbuttongroup.h>
28#include <qlineedit.h> 28#include <qlineedit.h>
29#include <qfont.h> 29#include <qfont.h>
30#include <qslider.h> 30#include <qslider.h>
31#include <qfile.h> 31#include <qfile.h>
32#include <qtextstream.h> 32#include <qtextstream.h>
33#include <qcombobox.h> 33#include <qcombobox.h>
34#include <qvbox.h> 34#include <qvbox.h>
35#include <qhbox.h> 35#include <qhbox.h>
36#include <qregexp.h> 36#include <qregexp.h>
37#include <qspinbox.h> 37#include <qspinbox.h>
38#include <qdatetime.h> 38#include <qdatetime.h>
39#include <qcheckbox.h> 39#include <qcheckbox.h>
40#include <qradiobutton.h> 40#include <qradiobutton.h>
41#include <qpushbutton.h> 41#include <qpushbutton.h>
42#include <qstrlist.h> 42#include <qstrlist.h>
43#include <qapplication.h> 43#include <qapplication.h>
44 44
45#include <kcolorbutton.h> 45#include <kcolorbutton.h>
46#include <kdebug.h> 46#include <kdebug.h>
47#include <klocale.h> 47#include <klocale.h>
48#include <kglobal.h> 48#include <kglobal.h>
49#include <kfontdialog.h> 49#include <kfontdialog.h>
50#include <kfiledialog.h> 50#include <kfiledialog.h>
51#include <kmessagebox.h> 51#include <kmessagebox.h>
52#include <kcolordialog.h> 52#include <kcolordialog.h>
53#include <kiconloader.h> 53#include <kiconloader.h>
54#include <kemailsettings.h> 54#include <kemailsettings.h>
55#include <kstandarddirs.h> 55#include <kstandarddirs.h>
56 56
57#include <klineedit.h> 57#include <klineedit.h>
58 58
59 59
60#include "koprefs.h" 60#include "koprefs.h"
61 61
62#include "koprefsdialog.h" 62#include "koprefsdialog.h"
63//#include <kprefswidget.h>
63 64
64 65
65KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : 66KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
66 KPrefsDialog(KOPrefs::instance(),parent,name,true) 67 KPrefsDialog(KOPrefs::instance(),parent,name,true)
67{ 68{
68 69
69 setCaption( i18n("Settings - some need a restart (nr)")); 70 setCaption( i18n("Settings - some need a restart (nr)"));
71 setupGlobalTab();
70 setupMainTab(); 72 setupMainTab();
71 setupMailTab();; 73 setupMailTab();;
72 setupFontsTab(); 74 setupFontsTab();
73 readConfig(); 75 readConfig();
74 76
75#if 0 77#if 0
76 78
77 setupMainTab(); 79 setupMainTab();
78 setupLocaleTab(); 80 setupLocaleTab();
79 setupTimeZoneTab(); 81 setupTimeZoneTab();
80 setupTimeTab(); 82 setupTimeTab();
81 setupLocaleDateTab(); 83 setupLocaleDateTab();
82 setupFontsTab(); 84 setupFontsTab();
83 setupColorsTab(); 85 setupColorsTab();
84 setupViewsTab(); 86 setupViewsTab();
85 //setupSyncTab(); 87 //setupSyncTab();
86 //setupSyncAlgTab(); 88 //setupSyncAlgTab();
87 //setupPrinterTab(); 89 //setupPrinterTab();
88 //setupGroupSchedulingTab(); 90 //setupGroupSchedulingTab();
89 //setupGroupAutomationTab(); 91 //setupGroupAutomationTab();
90#endif 92#endif
91} 93}
92 94
95#include "kpimglobalprefs.h"
93 96
94KOPrefsDialog::~KOPrefsDialog() 97KOPrefsDialog::~KOPrefsDialog()
95{ 98{
96} 99}
97 100void KOPrefsDialog::setupGlobalTab()
101{
102 QFrame *topFrame = addPage(i18n("Global"),0,0);
103 kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" );
104 QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
105 topLayout->addWidget( kdelibcfg );
106
107
108}
98void KOPrefsDialog::setupMainTab() 109void KOPrefsDialog::setupMainTab()
99{ 110{
100 QFrame *topFrame = addPage(i18n("General"),0,0); 111 QFrame *topFrame = addPage(i18n("General"),0,0);
101 112
102 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 113 QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
103 topLayout->setSpacing(spacingHint()); 114 topLayout->setSpacing(spacingHint());
104 topLayout->setMargin(marginHint()); 115 topLayout->setMargin(marginHint());
105 116
106 117
107 mNameEdit = new QLineEdit(topFrame); 118 mNameEdit = new QLineEdit(topFrame);
108 mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame); 119 mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame);
109 topLayout->addWidget(mNameLabel,0,0); 120 topLayout->addWidget(mNameLabel,0,0);
110 topLayout->addWidget(mNameEdit,0,1); 121 topLayout->addWidget(mNameEdit,0,1);
111 122
112 mEmailEdit = new QLineEdit(topFrame); 123 mEmailEdit = new QLineEdit(topFrame);
113 mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame); 124 mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame);
114 topLayout->addWidget(mEmailLabel,1,0); 125 topLayout->addWidget(mEmailLabel,1,0);
115 topLayout->addWidget(mEmailEdit,1,1); 126 topLayout->addWidget(mEmailEdit,1,1);
116 QLabel *lab = new QLabel( i18n("HINT: Separate multiple\neMail addresses by \";\""), topFrame); 127 QLabel *lab = new QLabel( i18n("HINT: Separate multiple\neMail addresses by \";\""), topFrame);
117 topLayout->addMultiCellWidget(lab,2,2,0,1); 128 topLayout->addMultiCellWidget(lab,2,2,0,1);
118 KPrefsDialogWidBool* ttt = addWidBool(i18n("Ignore above settings and\nuse KA/Pi \"Who am I\" instead!"), 129 KPrefsDialogWidBool* ttt = addWidBool(i18n("Ignore above settings and\nuse KA/Pi \"Who am I\" instead!"),
119 &(KOPrefs::instance()->mUseKapi),topFrame); 130 &(KOPrefs::instance()->mUseKapi),topFrame);
120 topLayout->addMultiCellWidget(ttt->checkBox(),3,3,0,1); 131 topLayout->addMultiCellWidget(ttt->checkBox(),3,3,0,1);
121} 132}
122 133
123void KOPrefsDialog::setupMailTab() 134void KOPrefsDialog::setupMailTab()
124{ 135{
125 QFrame *topFrame = addPage(i18n("Mail"),0,0); 136 QFrame *topFrame = addPage(i18n("Mail"),0,0);
126 137
127 QGridLayout *topLayout = new QGridLayout(topFrame,4,2); 138 QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
128 topLayout->setSpacing(spacingHint()); 139 topLayout->setSpacing(spacingHint());
129 topLayout->setMargin(marginHint()); 140 topLayout->setMargin(marginHint());
130 141
131 KPrefsDialogWidBool* ttt = addWidBool(i18n("View mail as html"), 142 KPrefsDialogWidBool* ttt = addWidBool(i18n("View mail as html"),
132 &(KOPrefs::instance()->mViewAsHtml),topFrame); 143 &(KOPrefs::instance()->mViewAsHtml),topFrame);
133 topLayout->addMultiCellWidget(ttt->checkBox(),0,0,0,1); 144 topLayout->addMultiCellWidget(ttt->checkBox(),0,0,0,1);
134 145
135 146
136 ttt = addWidBool(i18n("Send mails later"), 147 ttt = addWidBool(i18n("Send mails later"),
137 &(KOPrefs::instance()->mSendLater),topFrame); 148 &(KOPrefs::instance()->mSendLater),topFrame);
138 topLayout->addMultiCellWidget(ttt->checkBox(),1,1,0,1); 149 topLayout->addMultiCellWidget(ttt->checkBox(),1,1,0,1);
139 150
140 151
141} 152}
142void KOPrefsDialog::setupFontsTab() 153void KOPrefsDialog::setupFontsTab()
143{ 154{
144 155
145 QFrame *topFrame = addPage(i18n("Fonts"),0,0); 156 QFrame *topFrame = addPage(i18n("Fonts"),0,0);
146 // DesktopIcon("fonts",KIcon::SizeMedium)); 157 // DesktopIcon("fonts",KIcon::SizeMedium));
147 158
148 QGridLayout *topLayout = new QGridLayout(topFrame,7,3); 159 QGridLayout *topLayout = new QGridLayout(topFrame,7,3);
149 topLayout->setSpacing(1); 160 topLayout->setSpacing(1);
150 topLayout->setMargin(3); 161 topLayout->setMargin(3);
151 KPrefsDialogWidFont * tVFont; 162 KPrefsDialogWidFont * tVFont;
152 int i = 0; 163 int i = 0;
153 KPrefsDialogWidFont *timeLabelsFont = 164 KPrefsDialogWidFont *timeLabelsFont =
154 addWidFont(i18n("OK"),i18n("Application(nr)"), 165 addWidFont(i18n("OK"),i18n("Application(nr)"),
155 &(KOPrefs::instance()->mAppFont),topFrame); 166 &(KOPrefs::instance()->mAppFont),topFrame);
156 topLayout->addWidget(timeLabelsFont->label(),i,0); 167 topLayout->addWidget(timeLabelsFont->label(),i,0);
157 topLayout->addWidget(timeLabelsFont->preview(),i,1); 168 topLayout->addWidget(timeLabelsFont->preview(),i,1);
158 topLayout->addWidget(timeLabelsFont->button(),i,2); 169 topLayout->addWidget(timeLabelsFont->button(),i,2);
159 ++i; 170 ++i;
160 171
161 172
162 timeLabelsFont = 173 timeLabelsFont =
163 addWidFont(i18n("Dear Mr."),i18n("Compose mail:"), 174 addWidFont(i18n("Dear Mr."),i18n("Compose mail:"),
164 &(KOPrefs::instance()->mComposeFont),topFrame); 175 &(KOPrefs::instance()->mComposeFont),topFrame);
165 topLayout->addWidget(timeLabelsFont->label(),i,0); 176 topLayout->addWidget(timeLabelsFont->label(),i,0);
166 topLayout->addWidget(timeLabelsFont->preview(),i,1); 177 topLayout->addWidget(timeLabelsFont->preview(),i,1);
167 topLayout->addWidget(timeLabelsFont->button(),i,2); 178 topLayout->addWidget(timeLabelsFont->button(),i,2);
168 ++i; 179 ++i;
169 180
170 KPrefsDialogWidFont *timeBarFont = 181 KPrefsDialogWidFont *timeBarFont =
171 addWidFont(i18n("Hello"),i18n("Read mail:"), 182 addWidFont(i18n("Hello"),i18n("Read mail:"),
172 &(KOPrefs::instance()->mReadFont),topFrame); 183 &(KOPrefs::instance()->mReadFont),topFrame);
173 topLayout->addWidget(timeBarFont->label(),i,0); 184 topLayout->addWidget(timeBarFont->label(),i,0);
174 topLayout->addWidget(timeBarFont->preview(),i,1); 185 topLayout->addWidget(timeBarFont->preview(),i,1);
175 topLayout->addWidget(timeBarFont->button(),i,2); 186 topLayout->addWidget(timeBarFont->button(),i,2);
176 ++i; 187 ++i;
177 188
178 topLayout->setColStretch(1,1); 189 topLayout->setColStretch(1,1);
179 topLayout->setRowStretch(4,1); 190 topLayout->setRowStretch(4,1);
180 191
181} 192}
182void KOPrefsDialog::usrReadConfig() 193void KOPrefsDialog::usrReadConfig()
183{ 194{
184 qDebug("read "); 195
185 mNameEdit->setText(KOPrefs::instance()->mName); 196 mNameEdit->setText(KOPrefs::instance()->mName);
186 mEmailEdit->setText(KOPrefs::instance()->mEmail); 197 mEmailEdit->setText(KOPrefs::instance()->mEmail);
198 kdelibcfg->readConfig();
187} 199}
188void KOPrefsDialog::usrWriteConfig() 200void KOPrefsDialog::usrWriteConfig()
189{ 201{
190 qDebug("write ");
191 KOPrefs::instance()->mName = mNameEdit->text(); 202 KOPrefs::instance()->mName = mNameEdit->text();
192 KOPrefs::instance()->mEmail = mEmailEdit->text(); 203 KOPrefs::instance()->mEmail = mEmailEdit->text();
204 kdelibcfg->writeConfig();
193 205
194 206
195} 207}
196 208
197#if 0 209#if 0
198void KOPrefsDialog::setupLocaleDateTab() 210void KOPrefsDialog::setupLocaleDateTab()
199{ 211{
200QFrame *topFrame = addPage(i18n("Date Format"),0,0); 212QFrame *topFrame = addPage(i18n("Date Format"),0,0);
201 QGridLayout *topLayout = new QGridLayout(topFrame,3,2); 213 QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
202 topLayout->setSpacing(spacingHint()); 214 topLayout->setSpacing(spacingHint());
203 topLayout->setMargin(marginHint()); 215 topLayout->setMargin(marginHint());
204 int iii = 0; 216 int iii = 0;
205 217
206 218
207 KPrefsWidRadios *syncPrefsGroup = 219 KPrefsWidRadios *syncPrefsGroup =
208 addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); 220 addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame);
209 QString format; 221 QString format;
210 if ( QApplication::desktop()->width() < 480 ) 222 if ( QApplication::desktop()->width() < 480 )
211 format = "(%d.%m.%Y)"; 223 format = "(%d.%m.%Y)";
212 else 224 else
213 format = "(%d.%m.%Y|%A %d %B %Y)"; 225 format = "(%d.%m.%Y|%A %d %B %Y)";
214 syncPrefsGroup->addRadio(i18n("24.03.2004 "+format)); 226 syncPrefsGroup->addRadio(i18n("24.03.2004 "+format));
215 if ( QApplication::desktop()->width() < 480 ) 227 if ( QApplication::desktop()->width() < 480 )
216 format = "(%m.%d.%Y)"; 228 format = "(%m.%d.%Y)";
217 else 229 else
218 format = "(%m.%d.%Y|%A %B %d %Y)"; 230 format = "(%m.%d.%Y|%A %B %d %Y)";
219 syncPrefsGroup->addRadio(i18n("03.24.2004 "+format)); 231 syncPrefsGroup->addRadio(i18n("03.24.2004 "+format));
220 if ( QApplication::desktop()->width() < 480 ) 232 if ( QApplication::desktop()->width() < 480 )
221 format = "(%Y-%m-%d)"; 233 format = "(%Y-%m-%d)";
222 else 234 else
223 format = "(%Y-%m-%d|%A %Y %B %d)"; 235 format = "(%Y-%m-%d|%A %Y %B %d)";
224 syncPrefsGroup->addRadio(i18n("2004-03-24 "+format)); 236 syncPrefsGroup->addRadio(i18n("2004-03-24 "+format));
225 syncPrefsGroup->addRadio(i18n("User defined")); 237 syncPrefsGroup->addRadio(i18n("User defined"));
226 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); 238 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
227 ++iii; 239 ++iii;
228 ++iii; 240 ++iii;
229 QLabel * lab; 241 QLabel * lab;
230 mUserDateFormatLong = new QLineEdit(topFrame); 242 mUserDateFormatLong = new QLineEdit(topFrame);
231 lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame); 243 lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame);
232 topLayout->addWidget(lab ,iii,0); 244 topLayout->addWidget(lab ,iii,0);
233 topLayout->addWidget(mUserDateFormatLong,iii,1); 245 topLayout->addWidget(mUserDateFormatLong,iii,1);
234 ++iii; 246 ++iii;
235 mUserDateFormatShort = new QLineEdit(topFrame); 247 mUserDateFormatShort = new QLineEdit(topFrame);
236 lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame); 248 lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame);
237 topLayout->addWidget(lab ,iii,0); 249 topLayout->addWidget(lab ,iii,0);
238 topLayout->addWidget(mUserDateFormatShort,iii,1); 250 topLayout->addWidget(mUserDateFormatShort,iii,1);
239 ++iii; 251 ++iii;
240 lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame); 252 lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame);
241 topLayout->addMultiCellWidget(lab ,iii,iii,0,1); 253 topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
242 ++iii; 254 ++iii;
243 lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame); 255 lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame);
244 topLayout->addMultiCellWidget(lab ,iii,iii,0,1); 256 topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
245 ++iii; 257 ++iii;
246 lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame); 258 lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame);
247 topLayout->addMultiCellWidget(lab ,iii,iii,0,1); 259 topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
248 ++iii; 260 ++iii;
249 261
250} 262}
251 263
252void KOPrefsDialog::setupLocaleTab() 264void KOPrefsDialog::setupLocaleTab()
253{ 265{
254 QFrame *topFrame = addPage(i18n("Locale"),0,0); 266 QFrame *topFrame = addPage(i18n("Locale"),0,0);
255 QGridLayout *topLayout = new QGridLayout(topFrame,4,2); 267 QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
256 topLayout->setSpacing(spacingHint()); 268 topLayout->setSpacing(spacingHint());
257 topLayout->setMargin(marginHint()); 269 topLayout->setMargin(marginHint());
258 int iii = 0; 270 int iii = 0;
259 KPrefsWidRadios *syncPrefsGroup = 271 KPrefsWidRadios *syncPrefsGroup =
260 addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame); 272 addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame);
261 syncPrefsGroup->addRadio(i18n("English")); 273 syncPrefsGroup->addRadio(i18n("English"));
262 syncPrefsGroup->addRadio(i18n("German")); 274 syncPrefsGroup->addRadio(i18n("German"));
263 syncPrefsGroup->addRadio(i18n("French")); 275 syncPrefsGroup->addRadio(i18n("French"));
264 syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); 276 syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)"));
265 if ( QApplication::desktop()->width() < 300 ) 277 if ( QApplication::desktop()->width() < 300 )
266 ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); 278 ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
267 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); 279 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
268 ++iii; 280 ++iii;
269 281
270 syncPrefsGroup = 282 syncPrefsGroup =
271 addWidRadios(i18n("Time Format(nr):"),&(KOPrefs::instance()->mPreferredTime),topFrame); 283 addWidRadios(i18n("Time Format(nr):"),&(KOPrefs::instance()->mPreferredTime),topFrame);
272 if ( QApplication::desktop()->width() > 300 ) 284 if ( QApplication::desktop()->width() > 300 )
273 syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); 285 syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
274 syncPrefsGroup->addRadio(i18n("24:00")); 286 syncPrefsGroup->addRadio(i18n("24:00"));
275 syncPrefsGroup->addRadio(i18n("12:00am")); 287 syncPrefsGroup->addRadio(i18n("12:00am"));
276 syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); 288 syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
277 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); 289 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
278 ++iii; 290 ++iii;
279 KPrefsDialogWidBool *sb; 291 KPrefsDialogWidBool *sb;
280 if ( QApplication::desktop()->width() < 300 ) { 292 if ( QApplication::desktop()->width() < 300 ) {
281 sb = 293 sb =
282 addWidBool(i18n("Week starts on Sunday"), 294 addWidBool(i18n("Week starts on Sunday"),
283 &(KOPrefs::instance()->mWeekStartsOnSunday),topFrame); 295 &(KOPrefs::instance()->mWeekStartsOnSunday),topFrame);
284 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 296 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
285 ++iii; 297 ++iii;
286 sb = 298 sb =
287 addWidBool(i18n("Use short date in (WN/E) view"), 299 addWidBool(i18n("Use short date in (WN/E) view"),
288 &(KOPrefs::instance()->mShortDateInViewer),topFrame); 300 &(KOPrefs::instance()->mShortDateInViewer),topFrame);
289 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 301 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
290 } 302 }
291 else { 303 else {
292 QWidget * hb = new QWidget( topFrame ); 304 QWidget * hb = new QWidget( topFrame );
293 QHBoxLayout *hbLayout = new QHBoxLayout(hb); 305 QHBoxLayout *hbLayout = new QHBoxLayout(hb);
294 sb = 306 sb =
295 addWidBool(i18n("Week starts on Sunday"), 307 addWidBool(i18n("Week starts on Sunday"),
296 &(KOPrefs::instance()->mWeekStartsOnSunday),hb); 308 &(KOPrefs::instance()->mWeekStartsOnSunday),hb);
297 hbLayout->addWidget(sb->checkBox() ); 309 hbLayout->addWidget(sb->checkBox() );
298 sb = 310 sb =
299 addWidBool(i18n("Use short date in (WN/E) view"), 311 addWidBool(i18n("Use short date in (WN/E) view"),
300 &(KOPrefs::instance()->mShortDateInViewer),hb); 312 &(KOPrefs::instance()->mShortDateInViewer),hb);
301 hbLayout->addWidget(sb->checkBox() ); 313 hbLayout->addWidget(sb->checkBox() );
302 topLayout->addMultiCellWidget(hb, iii,iii,0,1); 314 topLayout->addMultiCellWidget(hb, iii,iii,0,1);
303 315
304 } 316 }
305 //#ifndef DESKTOP_VERSION 317 //#ifndef DESKTOP_VERSION
306#if 0 318#if 0
307 ++iii; 319 ++iii;
308 sb = 320 sb =
309 addWidBool(i18n("Quick load/save (w/o Unicode)"), 321 addWidBool(i18n("Quick load/save (w/o Unicode)"),
310 &(KOPrefs::instance()->mUseQuicksave),topFrame); 322 &(KOPrefs::instance()->mUseQuicksave),topFrame);
311 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 323 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
312#endif 324#endif
313} 325}
314void KOPrefsDialog::showSyncPage() 326void KOPrefsDialog::showSyncPage()
315{ 327{
316 showPage ( 2 ) ; 328 showPage ( 2 ) ;
317 329
318} 330}
319void KOPrefsDialog::setupSyncAlgTab() 331void KOPrefsDialog::setupSyncAlgTab()
320{ 332{
321#if 0 333#if 0
322 QLabel * lab; 334 QLabel * lab;
323 QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0); 335 QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0);
324 mSetupSyncAlgTab = topFrame; 336 mSetupSyncAlgTab = topFrame;
325 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 337 QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
326 topLayout->setSpacing(spacingHint()); 338 topLayout->setSpacing(spacingHint());
327 topLayout->setMargin(marginHint()); 339 topLayout->setMargin(marginHint());
328 int iii = 0; 340 int iii = 0;
329 341
330 KPrefsDialogWidBool *sb = 342 KPrefsDialogWidBool *sb =
331 addWidBool(i18n("Ask for preferences before syncing"), 343 addWidBool(i18n("Ask for preferences before syncing"),
332 &(KOPrefs::instance()->mAskForPreferences),topFrame); 344 &(KOPrefs::instance()->mAskForPreferences),topFrame);
333 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 345 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
334 346
335 ++iii; 347 ++iii;
336 348
337 KPrefsWidRadios *syncPrefsGroup = 349 KPrefsWidRadios *syncPrefsGroup =
338 addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs), 350 addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs),
339 topFrame); 351 topFrame);
340 syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); 352 syncPrefsGroup->addRadio(i18n("Take local entry on conflict"));
341 syncPrefsGroup->addRadio(i18n("Take remote entry on conflict")); 353 syncPrefsGroup->addRadio(i18n("Take remote entry on conflict"));
342 syncPrefsGroup->addRadio(i18n("Take newest entry on conflict")); 354 syncPrefsGroup->addRadio(i18n("Take newest entry on conflict"));
343 syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict")); 355 syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict"));
344 syncPrefsGroup->addRadio(i18n("Force take local entry always")); 356 syncPrefsGroup->addRadio(i18n("Force take local entry always"));
345 syncPrefsGroup->addRadio(i18n("Force take remote entry always")); 357 syncPrefsGroup->addRadio(i18n("Force take remote entry always"));
346 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); 358 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
347 ++iii; 359 ++iii;
348 sb = 360 sb =
349 addWidBool(i18n("Show summary after syncing"), 361 addWidBool(i18n("Show summary after syncing"),
350 &(KOPrefs::instance()->mShowSyncSummary),topFrame); 362 &(KOPrefs::instance()->mShowSyncSummary),topFrame);
351 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 363 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
352 364
353 ++iii; 365 ++iii;
354#endif 366#endif
355 367
356 368
357 369
358} 370}
359 371
360 372
361void KOPrefsDialog::setupSyncTab() 373void KOPrefsDialog::setupSyncTab()
362{ 374{
363#if 0 375#if 0
364 QLabel * lab; 376 QLabel * lab;
365 QFrame *topFrame = addPage(i18n("Sync Network"),0,0); 377 QFrame *topFrame = addPage(i18n("Sync Network"),0,0);
366 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 378 QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
367 topLayout->setSpacing(spacingHint()); 379 topLayout->setSpacing(spacingHint());
368 topLayout->setMargin(marginHint()); 380 topLayout->setMargin(marginHint());
369 lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame); 381 lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame);
370 int iii = 0; 382 int iii = 0;
371 topLayout->addMultiCellWidget(lab , iii,iii,0,1); 383 topLayout->addMultiCellWidget(lab , iii,iii,0,1);
372 ++iii; 384 ++iii;
373 385
374 mRemoteIPEdit = new QLineEdit(topFrame); 386 mRemoteIPEdit = new QLineEdit(topFrame);
375 lab = new QLabel(mRemoteIPEdit, i18n("Remote IP:"), topFrame); 387 lab = new QLabel(mRemoteIPEdit, i18n("Remote IP:"), topFrame);
376 topLayout->addWidget(lab ,iii,0); 388 topLayout->addWidget(lab ,iii,0);
377 topLayout->addWidget(mRemoteIPEdit,iii,1); 389 topLayout->addWidget(mRemoteIPEdit,iii,1);
378 ++iii; 390 ++iii;
379 mRemoteUser = new QLineEdit(topFrame); 391 mRemoteUser = new QLineEdit(topFrame);
380 lab = new QLabel(mRemoteUser, i18n("Remote user:"), topFrame); 392 lab = new QLabel(mRemoteUser, i18n("Remote user:"), topFrame);
381 topLayout->addWidget(lab ,iii,0); 393 topLayout->addWidget(lab ,iii,0);
382 topLayout->addWidget(mRemoteUser, iii,1); 394 topLayout->addWidget(mRemoteUser, iii,1);
383 ++iii; 395 ++iii;
384 396
385 mRemoteFile = new QLineEdit(topFrame); 397 mRemoteFile = new QLineEdit(topFrame);
386 lab = new QLabel(mRemoteFile, i18n("Remote file:"), topFrame); 398 lab = new QLabel(mRemoteFile, i18n("Remote file:"), topFrame);
387 topLayout->addWidget(lab ,iii,0); 399 topLayout->addWidget(lab ,iii,0);
388 topLayout->addWidget(mRemoteFile,iii,1); 400 topLayout->addWidget(mRemoteFile,iii,1);
389 ++iii; 401 ++iii;
390 402
391 mLocalTempFile = new QLineEdit(topFrame); 403 mLocalTempFile = new QLineEdit(topFrame);
392 lab = new QLabel(mLocalTempFile, i18n("Local temp file:"), topFrame); 404 lab = new QLabel(mLocalTempFile, i18n("Local temp file:"), topFrame);
393 topLayout->addWidget(lab ,iii,0); 405 topLayout->addWidget(lab ,iii,0);
394 topLayout->addWidget(mLocalTempFile,iii,1); 406 topLayout->addWidget(mLocalTempFile,iii,1);
395 ++iii; 407 ++iii;
396 408
397 KPrefsDialogWidBool *wb = 409 KPrefsDialogWidBool *wb =
398 addWidBool(i18n("Write back synced file"), 410 addWidBool(i18n("Write back synced file"),
399 &(KOPrefs::instance()->mWriteBackFile),topFrame); 411 &(KOPrefs::instance()->mWriteBackFile),topFrame);
400 topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1); 412 topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1);
401 ++iii; 413 ++iii;
402 wb = 414 wb =
403 addWidBool(i18n("Write back existing entries only"), 415 addWidBool(i18n("Write back existing entries only"),
404 &(KOPrefs::instance()->mWriteBackExistingOnly),topFrame); 416 &(KOPrefs::instance()->mWriteBackExistingOnly),topFrame);
405 topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1); 417 topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1);
406 ++iii; 418 ++iii;
407 419
408#endif 420#endif
409} 421}
410 422
411void KOPrefsDialog::setupMainTab() 423void KOPrefsDialog::setupMainTab()
412{ 424{
413 QFrame *topFrame = addPage(i18n("General"),0,0); 425 QFrame *topFrame = addPage(i18n("General"),0,0);
414 // DesktopIcon("identity",KIcon::SizeMedium)); 426 // DesktopIcon("identity",KIcon::SizeMedium));
415 427
416 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 428 QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
417 topLayout->setSpacing(spacingHint()); 429 topLayout->setSpacing(spacingHint());
418 topLayout->setMargin(marginHint()); 430 topLayout->setMargin(marginHint());
419 431
420 // KPrefsDialogWidBool *emailControlCenter = 432 // KPrefsDialogWidBool *emailControlCenter =
421// addWidBool(i18n("&Use email settings from Control Center"), 433// addWidBool(i18n("&Use email settings from Control Center"),
422// &(KOPrefs::instance()->mEmailControlCenter),topFrame); 434// &(KOPrefs::instance()->mEmailControlCenter),topFrame);
423// topLayout->addMultiCellWidget(emailControlCenter->checkBox(),0,0,0,1); 435// topLayout->addMultiCellWidget(emailControlCenter->checkBox(),0,0,0,1);
424 // connect(emailControlCenter->checkBox(),SIGNAL(toggled(bool)), 436 // connect(emailControlCenter->checkBox(),SIGNAL(toggled(bool)),
425 // SLOT(toggleEmailSettings(bool))); 437 // SLOT(toggleEmailSettings(bool)));
426 438
427 mNameEdit = new QLineEdit(topFrame); 439 mNameEdit = new QLineEdit(topFrame);
428 mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame); 440 mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame);
429 topLayout->addWidget(mNameLabel,0,0); 441 topLayout->addWidget(mNameLabel,0,0);
430 topLayout->addWidget(mNameEdit,0,1); 442 topLayout->addWidget(mNameEdit,0,1);
431 443
432 mEmailEdit = new QLineEdit(topFrame); 444 mEmailEdit = new QLineEdit(topFrame);
433 mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame); 445 mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame);
434 topLayout->addWidget(mEmailLabel,1,0); 446 topLayout->addWidget(mEmailLabel,1,0);
435 topLayout->addWidget(mEmailEdit,1,1); 447 topLayout->addWidget(mEmailEdit,1,1);
436 KPrefsDialogWidBool *wb; 448 KPrefsDialogWidBool *wb;
437 QHBox *dummy; 449 QHBox *dummy;
438 if ( QApplication::desktop()->width() > 480 ) { 450 if ( QApplication::desktop()->width() > 480 ) {
439 dummy = new QHBox(topFrame); 451 dummy = new QHBox(topFrame);
440 } else { 452 } else {
441 dummy = new QVBox(topFrame); 453 dummy = new QVBox(topFrame);
442 } 454 }
443 455
444 topLayout->addMultiCellWidget(dummy, 2,2,0,1); 456 topLayout->addMultiCellWidget(dummy, 2,2,0,1);
445 addWidBool(i18n("Full menu bar(nr)"), 457 addWidBool(i18n("Full menu bar(nr)"),
446 &(KOPrefs::instance()->mShowFullMenu),dummy); 458 &(KOPrefs::instance()->mShowFullMenu),dummy);
447 459
448 460
449 addWidBool(i18n("Mini icons in toolbar(nr)"), 461 addWidBool(i18n("Mini icons in toolbar(nr)"),
450 &(KOPrefs::instance()->mToolBarMiniIcons),dummy); 462 &(KOPrefs::instance()->mToolBarMiniIcons),dummy);
451 463
452 464
453 dummy = new QHBox(topFrame); 465 dummy = new QHBox(topFrame);
454 new QLabel(i18n("Days in What's Next:"),dummy); 466 new QLabel(i18n("Days in What's Next:"),dummy);
455 mWhatsNextSpin = new QSpinBox(1,14,1,dummy); 467 mWhatsNextSpin = new QSpinBox(1,14,1,dummy);
456 468
457 topLayout->addMultiCellWidget(dummy,3,3,0,1); 469 topLayout->addMultiCellWidget(dummy,3,3,0,1);
458 470
459 471
460 472
461 dummy = new QHBox(topFrame); 473 dummy = new QHBox(topFrame);
462 new QLabel(i18n("Days in Next-X-Days:"),dummy); 474 new QLabel(i18n("Days in Next-X-Days:"),dummy);
463 mNextXDaysSpin = new QSpinBox(2,14,1,dummy); 475 mNextXDaysSpin = new QSpinBox(2,14,1,dummy);
464 476
465 topLayout->addMultiCellWidget(dummy,4,4,0,1); 477 topLayout->addMultiCellWidget(dummy,4,4,0,1);
466 478
467 QHBox *prioBox = new QHBox(topFrame); 479 QHBox *prioBox = new QHBox(topFrame);
468 // intervalBox->setSpacing(spacingHint()); 480 // intervalBox->setSpacing(spacingHint());
469 topLayout->addMultiCellWidget(prioBox,5,5,0,1); 481 topLayout->addMultiCellWidget(prioBox,5,5,0,1);
470 QString messa = i18n("Show topmost todo prios in What's Next:"); 482 QString messa = i18n("Show topmost todo prios in What's Next:");
471 483
472 if ( QApplication::desktop()->width() < 300 ) 484 if ( QApplication::desktop()->width() < 300 )
473 messa = i18n("Show topmost todo prios in What's N.:"); 485 messa = i18n("Show topmost todo prios in What's N.:");
474 QLabel *prioLabel = new QLabel(messa, prioBox); 486 QLabel *prioLabel = new QLabel(messa, prioBox);
475 mPrioSpin = new QSpinBox(0,5,1,prioBox); 487 mPrioSpin = new QSpinBox(0,5,1,prioBox);
476 if ( QApplication::desktop()->width() < 300 ) 488 if ( QApplication::desktop()->width() < 300 )
477 mPrioSpin->setFixedWidth( 40 ); 489 mPrioSpin->setFixedWidth( 40 );
478 490
479 // KPrefsDialogWidBool *bcc = 491 // KPrefsDialogWidBool *bcc =
480// addWidBool(i18n("Send copy to owner when mailing events"), 492// addWidBool(i18n("Send copy to owner when mailing events"),
481// &(KOPrefs::instance()->mBcc),topFrame); 493// &(KOPrefs::instance()->mBcc),topFrame);
482// topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1); 494// topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1);
483 495
484 496
485 // QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"), topFrame); 497 // QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"), topFrame);
486 //topLayout->addMultiCellWidget(autoSaveGroup,6,6,0,1); 498 //topLayout->addMultiCellWidget(autoSaveGroup,6,6,0,1);
487 499
488 // addWidBool(i18n("Enable automatic saving of calendar"), 500 // addWidBool(i18n("Enable automatic saving of calendar"),
489 // &(KOPrefs::instance()->mAutoSave),autoSaveGroup); 501 // &(KOPrefs::instance()->mAutoSave),autoSaveGroup);
490 502
491 QHBox *intervalBox = new QHBox(topFrame); 503 QHBox *intervalBox = new QHBox(topFrame);
492 // intervalBox->setSpacing(spacingHint()); 504 // intervalBox->setSpacing(spacingHint());
493 topLayout->addMultiCellWidget(intervalBox,6,6,0,1); 505 topLayout->addMultiCellWidget(intervalBox,6,6,0,1);
494 QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox); 506 QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox);
495 mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox); 507 mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox);
496 autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin); 508 autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin);
497 /* 509 /*
498 QHBox * agendasize = new QHBox ( topFrame ); 510 QHBox * agendasize = new QHBox ( topFrame );
499 511
500 new QLabel (i18n("AllDayAgenda Height:"), agendasize ); 512 new QLabel (i18n("AllDayAgenda Height:"), agendasize );
501 513
502 514
503 mHourSizeSlider = new QSlider(24,47,1,24,Horizontal,agendasize); 515 mHourSizeSlider = new QSlider(24,47,1,24,Horizontal,agendasize);
504 topLayout->addMultiCellWidget(agendasize,7,7,0,1); 516 topLayout->addMultiCellWidget(agendasize,7,7,0,1);
505 */ 517 */
506 KPrefsDialogWidBool *verticalScreen = 518 KPrefsDialogWidBool *verticalScreen =
507 addWidBool(i18n("Show vertical screen (Needs restart)"), 519 addWidBool(i18n("Show vertical screen (Needs restart)"),
508 &(KOPrefs::instance()->mVerticalScreen),topFrame); 520 &(KOPrefs::instance()->mVerticalScreen),topFrame);
509 //topLayout->addWidget(verticalScreen->checkBox(),ii++,0); 521 //topLayout->addWidget(verticalScreen->checkBox(),ii++,0);
510 topLayout->addMultiCellWidget(verticalScreen->checkBox(),7,7,0,1); 522 topLayout->addMultiCellWidget(verticalScreen->checkBox(),7,7,0,1);
511 523
512 KPrefsDialogWidBool *ask = 524 KPrefsDialogWidBool *ask =
513 addWidBool(i18n("Ask for quit when closing KO/Pi"), 525 addWidBool(i18n("Ask for quit when closing KO/Pi"),
514 &(KOPrefs::instance()->mAskForQuit),topFrame); 526 &(KOPrefs::instance()->mAskForQuit),topFrame);
515 topLayout->addMultiCellWidget(ask->checkBox(),8,8,0,1); 527 topLayout->addMultiCellWidget(ask->checkBox(),8,8,0,1);
516 528
517 529
518 /* 530 /*
519 KPrefsDialogWidBool *confirmCheck = 531 KPrefsDialogWidBool *confirmCheck =
520 addWidBool(i18n("Confirm &deletes"),&(KOPrefs::instance()->mConfirm), 532 addWidBool(i18n("Confirm &deletes"),&(KOPrefs::instance()->mConfirm),
521 topFrame); 533 topFrame);
522 topLayout->addMultiCellWidget(confirmCheck->checkBox(),7,7,0,1); 534 topLayout->addMultiCellWidget(confirmCheck->checkBox(),7,7,0,1);
523 535
524 536
525 mEnableGroupScheduling = 537 mEnableGroupScheduling =
526 addWidBool(i18n("Enable group scheduling"), 538 addWidBool(i18n("Enable group scheduling"),
527 &(KOPrefs::instance()->mEnableGroupScheduling),topFrame); 539 &(KOPrefs::instance()->mEnableGroupScheduling),topFrame);
528 topLayout->addWidget(mEnableGroupScheduling->checkBox(),8,0); 540 topLayout->addWidget(mEnableGroupScheduling->checkBox(),8,0);
529 connect(mEnableGroupScheduling->checkBox(),SIGNAL(clicked()), 541 connect(mEnableGroupScheduling->checkBox(),SIGNAL(clicked()),
530 SLOT(warningGroupScheduling())); 542 SLOT(warningGroupScheduling()));
531 543
532 mEnableProjectView = 544 mEnableProjectView =
533 addWidBool(i18n("Enable project view"), 545 addWidBool(i18n("Enable project view"),
534 &(KOPrefs::instance()->mEnableProjectView),topFrame); 546 &(KOPrefs::instance()->mEnableProjectView),topFrame);
535 topLayout->addWidget(mEnableProjectView->checkBox(),9,0); 547 topLayout->addWidget(mEnableProjectView->checkBox(),9,0);
536 connect(mEnableProjectView->checkBox(),SIGNAL(clicked()), 548 connect(mEnableProjectView->checkBox(),SIGNAL(clicked()),
537 SLOT(warningProjectView())); 549 SLOT(warningProjectView()));
538 550
539 // Can't be disabled anymore 551 // Can't be disabled anymore
540 mEnableGroupScheduling->checkBox()->hide(); 552 mEnableGroupScheduling->checkBox()->hide();
541 553
542 // Disable setting, because this feature now becomes stable 554 // Disable setting, because this feature now becomes stable
543 mEnableProjectView->checkBox()->hide(); 555 mEnableProjectView->checkBox()->hide();
544 556
545 KPrefsWidRadios *defaultFormatGroup = 557 KPrefsWidRadios *defaultFormatGroup =
546 addWidRadios(i18n("Default Calendar Format"), 558 addWidRadios(i18n("Default Calendar Format"),
547 &(KOPrefs::instance()->mDefaultFormat),topFrame); 559 &(KOPrefs::instance()->mDefaultFormat),topFrame);
548 defaultFormatGroup->addRadio(i18n("vCalendar")); 560 defaultFormatGroup->addRadio(i18n("vCalendar"));
549 defaultFormatGroup->addRadio(i18n("iCalendar")); 561 defaultFormatGroup->addRadio(i18n("iCalendar"));
550 562
551 topLayout->addMultiCellWidget(defaultFormatGroup->groupBox(),10,10,0,1); 563 topLayout->addMultiCellWidget(defaultFormatGroup->groupBox(),10,10,0,1);
552 564
553 // Default format unconditionally is iCalendar 565 // Default format unconditionally is iCalendar
554 defaultFormatGroup->groupBox()->hide(); 566 defaultFormatGroup->groupBox()->hide();
555 567
556 KPrefsWidRadios *mailClientGroup = 568 KPrefsWidRadios *mailClientGroup =
557 addWidRadios(i18n("Mail Client"),&(KOPrefs::instance()->mMailClient), 569 addWidRadios(i18n("Mail Client"),&(KOPrefs::instance()->mMailClient),
558 topFrame); 570 topFrame);
559 mailClientGroup->addRadio(i18n("KMail")); 571 mailClientGroup->addRadio(i18n("KMail"));
560 mailClientGroup->addRadio(i18n("Sendmail")); 572 mailClientGroup->addRadio(i18n("Sendmail"));
561 topLayout->addMultiCellWidget(mailClientGroup->groupBox(),11,11,0,1); 573 topLayout->addMultiCellWidget(mailClientGroup->groupBox(),11,11,0,1);
562 574
563 KPrefsDialogWidBool *htmlsave = 575 KPrefsDialogWidBool *htmlsave =
564 addWidBool(i18n("Export to HTML with every save"),&(KOPrefs::instance()->mHtmlWithSave), 576 addWidBool(i18n("Export to HTML with every save"),&(KOPrefs::instance()->mHtmlWithSave),
565 topFrame); 577 topFrame);
566 topLayout->addMultiCellWidget(htmlsave->checkBox(),12,12,0,1); 578 topLayout->addMultiCellWidget(htmlsave->checkBox(),12,12,0,1);
567 579
568 KPrefsWidRadios *destinationGroup = 580 KPrefsWidRadios *destinationGroup =
569 addWidRadios(i18n("New Events/Todos should"),&(KOPrefs::instance()->mDestination), 581 addWidRadios(i18n("New Events/Todos should"),&(KOPrefs::instance()->mDestination),
570 topFrame); 582 topFrame);
571 destinationGroup->addRadio(i18n("be added to the standard resource")); 583 destinationGroup->addRadio(i18n("be added to the standard resource"));
572 destinationGroup->addRadio(i18n("be asked which resource to use")); 584 destinationGroup->addRadio(i18n("be asked which resource to use"));
573 topLayout->addMultiCellWidget(destinationGroup->groupBox(),13,13,0,1); 585 topLayout->addMultiCellWidget(destinationGroup->groupBox(),13,13,0,1);
574 586
575 topLayout->setRowStretch(14,1); 587 topLayout->setRowStretch(14,1);
576 */ 588 */
577} 589}
578 590
579 591
580void KOPrefsDialog::setupTimeTab() 592void KOPrefsDialog::setupTimeTab()
581{ 593{
582 QFrame *topFrame = addPage(i18n("Time"),0,0); 594 QFrame *topFrame = addPage(i18n("Time"),0,0);
583 // DesktopIcon("clock",KIcon::SizeMedium)); 595 // DesktopIcon("clock",KIcon::SizeMedium));
584 596
585 QGridLayout *topLayout = new QGridLayout(topFrame,4,2); 597 QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
586 topLayout->setSpacing(spacingHint()); 598 topLayout->setSpacing(spacingHint());
587 topLayout->setMargin(marginHint()); 599 topLayout->setMargin(marginHint());
588 600
589 QHBox *dummy = new QHBox(topFrame); 601 QHBox *dummy = new QHBox(topFrame);
590 KPrefsWidTime *dayBegins = 602 KPrefsWidTime *dayBegins =
591 addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins), 603 addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
592 dummy); 604 dummy);
593 //topLayout->addWidget(dayBegins->label(),2,0); 605 //topLayout->addWidget(dayBegins->label(),2,0);
594 606
595 //topLayout->addWidget(dayBegins->spinBox(),2,1); 607 //topLayout->addWidget(dayBegins->spinBox(),2,1);
596 topLayout->addMultiCellWidget(dummy,0,0,0,1); 608 topLayout->addMultiCellWidget(dummy,0,0,0,1);
597 609
598 topLayout->addWidget(new QLabel(i18n("Default appointment time:"), 610 topLayout->addWidget(new QLabel(i18n("Default appointment time:"),
599 topFrame),1,0); 611 topFrame),1,0);
600 mStartTimeSpin = new QSpinBox(0,23,1,topFrame); 612 mStartTimeSpin = new QSpinBox(0,23,1,topFrame);
601 mStartTimeSpin->setSuffix(":00"); 613 mStartTimeSpin->setSuffix(":00");
602 topLayout->addWidget(mStartTimeSpin,1,1); 614 topLayout->addWidget(mStartTimeSpin,1,1);
603 615
604 topLayout->addWidget(new QLabel(i18n("Def. duration of new app.:"), 616 topLayout->addWidget(new QLabel(i18n("Def. duration of new app.:"),
605 topFrame),2,0); 617 topFrame),2,0);
606 mDefaultDurationSpin = new QSpinBox(0,23,1,topFrame); 618 mDefaultDurationSpin = new QSpinBox(0,23,1,topFrame);
607 mDefaultDurationSpin->setSuffix(":00"); 619 mDefaultDurationSpin->setSuffix(":00");
608 topLayout->addWidget(mDefaultDurationSpin,2,1); 620 topLayout->addWidget(mDefaultDurationSpin,2,1);
609 621
610 QStringList alarmList; 622 QStringList alarmList;
611 alarmList << i18n("1 minute") << i18n("5 minutes") << i18n("10 minutes") 623 alarmList << i18n("1 minute") << i18n("5 minutes") << i18n("10 minutes")
612 << i18n("15 minutes") << i18n("30 minutes")<< i18n("1 hour")<< i18n("3 hours") << i18n("24 hours") ; 624 << i18n("15 minutes") << i18n("30 minutes")<< i18n("1 hour")<< i18n("3 hours") << i18n("24 hours") ;
613 topLayout->addWidget(new QLabel(i18n("Default alarm time:"),topFrame), 625 topLayout->addWidget(new QLabel(i18n("Default alarm time:"),topFrame),
614 3,0); 626 3,0);
615 mAlarmTimeCombo = new QComboBox(topFrame); 627 mAlarmTimeCombo = new QComboBox(topFrame);
616 mAlarmTimeCombo->insertStringList(alarmList); 628 mAlarmTimeCombo->insertStringList(alarmList);
617 topLayout->addWidget(mAlarmTimeCombo,3,1); 629 topLayout->addWidget(mAlarmTimeCombo,3,1);
618 630
619 631
620 QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal, 632 QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal,
621 i18n("Working Hours"), 633 i18n("Working Hours"),
622 topFrame); 634 topFrame);
623 topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1); 635 topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1);
624 workingHoursGroup->layout()->setSpacing( 0 ); 636 workingHoursGroup->layout()->setSpacing( 0 );
625 workingHoursGroup->layout()->setMargin( 4 ); 637 workingHoursGroup->layout()->setMargin( 4 );
626 QHBox *workStartBox = new QHBox(workingHoursGroup); 638 QHBox *workStartBox = new QHBox(workingHoursGroup);
627 // workStartBox->setMargin( 0 ); 639 // workStartBox->setMargin( 0 );
628 addWidTime(i18n("Daily starting hour:"), 640 addWidTime(i18n("Daily starting hour:"),
629 &(KOPrefs::instance()->mWorkingHoursStart),workStartBox); 641 &(KOPrefs::instance()->mWorkingHoursStart),workStartBox);
630 642
631 QHBox *workEndBox = new QHBox(workingHoursGroup); 643 QHBox *workEndBox = new QHBox(workingHoursGroup);
632 //workEndBox->setMargin( 0 ); 644 //workEndBox->setMargin( 0 );
633 addWidTime(i18n("Daily ending hour:"), 645 addWidTime(i18n("Daily ending hour:"),
634 &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox); 646 &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox);
635 QVBox *excludeBox = new QVBox(workingHoursGroup); 647 QVBox *excludeBox = new QVBox(workingHoursGroup);
636 //excludeBox->setMargin( 0 ); 648 //excludeBox->setMargin( 0 );
637 addWidBool(i18n("Exclude holidays"), 649 addWidBool(i18n("Exclude holidays"),
638 &(KOPrefs::instance()->mExcludeHolidays),excludeBox); 650 &(KOPrefs::instance()->mExcludeHolidays),excludeBox);
639 651
640 addWidBool(i18n("Exclude Saturdays"), 652 addWidBool(i18n("Exclude Saturdays"),
641 &(KOPrefs::instance()->mExcludeSaturdays),excludeBox); 653 &(KOPrefs::instance()->mExcludeSaturdays),excludeBox);
642 654
643// KPrefsDialogWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"), 655// KPrefsDialogWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"),
644 // &(KOPrefs::instance()->mMarcusBainsShowSeconds), 656 // &(KOPrefs::instance()->mMarcusBainsShowSeconds),
645 // topFrame); 657 // topFrame);
646// topLayout->addWidget(marcusBainsShowSeconds->checkBox(),5,0); 658// topLayout->addWidget(marcusBainsShowSeconds->checkBox(),5,0);
647 659
648 // topLayout->setRowStretch(6,1); 660 // topLayout->setRowStretch(6,1);
649} 661}
650 662
651 663
652void KOPrefsDialog::setupViewsTab() 664void KOPrefsDialog::setupViewsTab()
653{ 665{
654 666
655 QFrame *topFrame = addPage(i18n("Views"),0,0); 667 QFrame *topFrame = addPage(i18n("Views"),0,0);
656 // DesktopIcon("viewmag",KIcon::SizeMedium)); 668 // DesktopIcon("viewmag",KIcon::SizeMedium));
657 669
658 QGridLayout *topLayout = new QGridLayout(topFrame,6,1); 670 QGridLayout *topLayout = new QGridLayout(topFrame,6,1);
659 topLayout->setSpacing(spacingHint()); 671 topLayout->setSpacing(spacingHint());
660 topLayout->setMargin(marginHint()); 672 topLayout->setMargin(marginHint());
661 673
662// QBoxLayout *dayBeginsLayout = new QHBoxLayout; 674// QBoxLayout *dayBeginsLayout = new QHBoxLayout;
663// topLayout->addLayout(dayBeginsLayout,0,0); 675// topLayout->addLayout(dayBeginsLayout,0,0);
664 676
665// KPrefsWidTime *dayBegins = 677// KPrefsWidTime *dayBegins =
666// addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins), 678// addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
667// topFrame); 679// topFrame);
668// dayBeginsLayout->addWidget(dayBegins->label()); 680// dayBeginsLayout->addWidget(dayBegins->label());
669// dayBeginsLayout->addStretch(1); 681// dayBeginsLayout->addStretch(1);
670// dayBeginsLayout->addWidget(dayBegins->spinBox()); 682// dayBeginsLayout->addWidget(dayBegins->spinBox());
671 683
672// QBoxLayout *nextDaysLayout = new QHBoxLayout; 684// QBoxLayout *nextDaysLayout = new QHBoxLayout;
673// topLayout->addLayout(nextDaysLayout,1,0); 685// topLayout->addLayout(nextDaysLayout,1,0);
674// nextDaysLayout->addWidget(new QLabel(i18n("Days to show in Next-X-Days view:"),topFrame)); 686// nextDaysLayout->addWidget(new QLabel(i18n("Days to show in Next-X-Days view:"),topFrame));
675// mNextXDaysSpin = new QSpinBox(2,14,1,topFrame); 687// mNextXDaysSpin = new QSpinBox(2,14,1,topFrame);
676// nextDaysLayout->addStretch(1); 688// nextDaysLayout->addStretch(1);
677// nextDaysLayout->addWidget(mNextXDaysSpin); 689// nextDaysLayout->addWidget(mNextXDaysSpin);
678 690
679 691
680 int ii = 0; 692 int ii = 0;
681 KPrefsDialogWidBool *dummy = 693 KPrefsDialogWidBool *dummy =
682 addWidBool(i18n("Edit item on doubleclick (if not, show)"), 694 addWidBool(i18n("Edit item on doubleclick (if not, show)"),
683 &(KOPrefs::instance()->mEditOnDoubleClick),topFrame); 695 &(KOPrefs::instance()->mEditOnDoubleClick),topFrame);
684 topLayout->addWidget(dummy->checkBox(),ii++,0); 696 topLayout->addWidget(dummy->checkBox(),ii++,0);
685 697
686 dummy = 698 dummy =
687 addWidBool(i18n("Highlight current day in agenda"), 699 addWidBool(i18n("Highlight current day in agenda"),
688 &(KOPrefs::instance()->mHighlightCurrentDay),topFrame); 700 &(KOPrefs::instance()->mHighlightCurrentDay),topFrame);
689 topLayout->addWidget(dummy->checkBox(),ii++,0); 701 topLayout->addWidget(dummy->checkBox(),ii++,0);
690 702
691 dummy = 703 dummy =
692 addWidBool(i18n("Use light color for highlight current day"), 704 addWidBool(i18n("Use light color for highlight current day"),
693 &(KOPrefs::instance()->mUseHighlightLightColor),topFrame); 705 &(KOPrefs::instance()->mUseHighlightLightColor),topFrame);
694 topLayout->addWidget(dummy->checkBox(),ii++,0); 706 topLayout->addWidget(dummy->checkBox(),ii++,0);
695 707
696 KPrefsDialogWidBool *dailyRecur = 708 KPrefsDialogWidBool *dailyRecur =
697 addWidBool(i18n("Show events that recur daily in date nav."), 709 addWidBool(i18n("Show events that recur daily in date nav."),
698 &(KOPrefs::instance()->mDailyRecur),topFrame); 710 &(KOPrefs::instance()->mDailyRecur),topFrame);
699 topLayout->addWidget(dailyRecur->checkBox(),ii++,0); 711 topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
700 712
701 KPrefsDialogWidBool *weeklyRecur = 713 KPrefsDialogWidBool *weeklyRecur =
702 addWidBool(i18n("Show ev. that recur weekly in date nav."), 714 addWidBool(i18n("Show ev. that recur weekly in date nav."),
703 &(KOPrefs::instance()->mWeeklyRecur),topFrame); 715 &(KOPrefs::instance()->mWeeklyRecur),topFrame);
704 topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); 716 topLayout->addWidget(weeklyRecur->checkBox(),ii++,0);
diff --git a/kmicromail/koprefsdialog.h b/kmicromail/koprefsdialog.h
index 4b6bd4b..615574b 100644
--- a/kmicromail/koprefsdialog.h
+++ b/kmicromail/koprefsdialog.h
@@ -1,176 +1,179 @@
1/* 1/*
2 This file is part of KOrganizer. 2 This file is part of KOrganizer.
3 Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2000,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#ifndef _KOPREFSDIALOG_H 23#ifndef _KOPREFSDIALOG_H
24#define _KOPREFSDIALOG_H 24#define _KOPREFSDIALOG_H
25 25
26#include <qframe.h> 26#include <qframe.h>
27#include <qdict.h> 27#include <qdict.h>
28#include <qcolor.h> 28#include <qcolor.h>
29#include <qlistview.h> 29#include <qlistview.h>
30 30
31#include <kdialogbase.h> 31#include <kdialogbase.h>
32 32
33#include <libkdepim/kprefsdialog.h> 33#include <libkdepim/kprefsdialog.h>
34#include <libkdepim/kdateedit.h> 34#include <libkdepim/kdateedit.h>
35#include <kcmconfigs/kdepimconfigwidget.h>
35 36
36class KColorButton; 37class KColorButton;
37class QSpinBox; 38class QSpinBox;
38class QSlider; 39class QSlider;
39class KURLRequester; 40class KURLRequester;
40class QComboBox; 41class QComboBox;
41class QLineEdit; 42class QLineEdit;
42class QStringList; 43class QStringList;
43 44
44/** Dialog to change the korganizer configuration. 45/** Dialog to change the korganizer configuration.
45 */ 46 */
46class KOPrefsDialog : public KPrefsDialog 47class KOPrefsDialog : public KPrefsDialog
47{ 48{
48 Q_OBJECT 49 Q_OBJECT
49 public: 50 public:
50 /** Initialize dialog and pages */ 51 /** Initialize dialog and pages */
51 KOPrefsDialog(QWidget *parent=0,char *name=0,bool modal=false); 52 KOPrefsDialog(QWidget *parent=0,char *name=0,bool modal=false);
52 ~KOPrefsDialog(); 53 ~KOPrefsDialog();
53 54
54protected: 55protected:
55 void usrReadConfig(); 56 void usrReadConfig();
56 void usrWriteConfig(); 57 void usrWriteConfig();
57 58
58 void setupMainTab(); 59 void setupMainTab();
60 void setupGlobalTab();
59 void setupMailTab(); 61 void setupMailTab();
60 void setupFontsTab(); 62 void setupFontsTab();
61 private: 63 private:
64 KDEPIMConfigWidget* kdelibcfg;
62 QLineEdit *mNameEdit; 65 QLineEdit *mNameEdit;
63 QLineEdit *mEmailEdit; 66 QLineEdit *mEmailEdit;
64 QLabel *mNameLabel; 67 QLabel *mNameLabel;
65 QLabel *mEmailLabel; 68 QLabel *mEmailLabel;
66#if 0 69#if 0
67 /* 70 /*
68 public slots: 71 public slots:
69 void showPrinterTab(); 72 void showPrinterTab();
70 73
71 74
72 void updateCategories(); 75 void updateCategories();
73 void showSyncPage(); 76 void showSyncPage();
74 protected slots: 77 protected slots:
75 void selectSoundFile(); 78 void selectSoundFile();
76 void setCategoryColor(); 79 void setCategoryColor();
77 void updateCategoryColor(); 80 void updateCategoryColor();
78 void updateTimezoneOffset( int ); 81 void updateTimezoneOffset( int );
79 82
80 83
81 void warningExperimental(bool on); 84 void warningExperimental(bool on);
82 void warningGroupScheduling(); 85 void warningGroupScheduling();
83 void warningProjectView(); 86 void warningProjectView();
84 87
85 void toggleEmailSettings(bool); 88 void toggleEmailSettings(bool);
86 89
87 //additional emails 90 //additional emails
88 void addItem(); 91 void addItem();
89 void removeItem(); 92 void removeItem();
90 void updateItem(); 93 void updateItem();
91 void updateInput(); 94 void updateInput();
92*/ 95*/
93 protected: 96 protected:
94 void usrReadConfig(); 97 void usrReadConfig();
95 void usrWriteConfig(); 98 void usrWriteConfig();
96 99
97 void setupMainTab(); 100 void setupMainTab();
98 void setupTimeTab(); 101 void setupTimeTab();
99 void setupTimeZoneTab(); 102 void setupTimeZoneTab();
100 void setupLocaleTab(); 103 void setupLocaleTab();
101 void setupLocaleDateTab(); 104 void setupLocaleDateTab();
102 void setupFontsTab(); 105 void setupFontsTab();
103 void setupColorsTab(); 106 void setupColorsTab();
104 void setupViewsTab(); 107 void setupViewsTab();
105 void setupDisplayTab(); 108 void setupDisplayTab();
106 void setupPrinterTab(); 109 void setupPrinterTab();
107 void setupGroupSchedulingTab(); 110 void setupGroupSchedulingTab();
108 void setupGroupAutomationTab(); 111 void setupGroupAutomationTab();
109 void setupSyncTab(); 112 void setupSyncTab();
110 void setupSyncAlgTab(); 113 void setupSyncAlgTab();
111 114
112 void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0); 115 void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0);
113 116
114 117
115 private: 118 private:
116 KPrefsWidBool *mEnableGroupScheduling; 119 KPrefsWidBool *mEnableGroupScheduling;
117 KPrefsWidBool *mEnableProjectView; 120 KPrefsWidBool *mEnableProjectView;
118 121
119 QFrame *mPrinterTab; 122 QFrame *mPrinterTab;
120 123
121 QLineEdit *nameEdit; 124 QLineEdit *nameEdit;
122 QLineEdit *emailEdit; 125 QLineEdit *emailEdit;
123 126
124 QComboBox *timeCombo; 127 QComboBox *timeCombo;
125 QComboBox *tzCombo; 128 QComboBox *tzCombo;
126 129
127 // widgets holding preferences data 130 // widgets holding preferences data
128 QLineEdit *mNameEdit; 131 QLineEdit *mNameEdit;
129 QLineEdit *mEmailEdit; 132 QLineEdit *mEmailEdit;
130 QLabel *mNameLabel; 133 QLabel *mNameLabel;
131 QLabel *mEmailLabel; 134 QLabel *mEmailLabel;
132 QLineEdit *mAdditionalEdit; 135 QLineEdit *mAdditionalEdit;
133 QSpinBox *mAutoSaveIntervalSpin; 136 QSpinBox *mAutoSaveIntervalSpin;
134 QSpinBox *mPrioSpin; 137 QSpinBox *mPrioSpin;
135 // QListView *mAMails; 138 // QListView *mAMails;
136 QLineEdit *aEmailsEdit; 139 QLineEdit *aEmailsEdit;
137 140
138 QComboBox *mTimeZoneCombo; 141 QComboBox *mTimeZoneCombo;
139 QStringList tzonenames; 142 QStringList tzonenames;
140 QSpinBox *mStartTimeSpin; 143 QSpinBox *mStartTimeSpin;
141 QSpinBox *mDefaultDurationSpin; 144 QSpinBox *mDefaultDurationSpin;
142 QComboBox *mAlarmTimeCombo; 145 QComboBox *mAlarmTimeCombo;
143 146
144 QComboBox *mCategoryCombo; 147 QComboBox *mCategoryCombo;
145 KColorButton *mCategoryButton; 148 KColorButton *mCategoryButton;
146 QDict<QColor> mCategoryDict; 149 QDict<QColor> mCategoryDict;
147 150
148 QSlider *mHourSizeSlider; 151 QSlider *mHourSizeSlider;
149 152
150 QSpinBox *mNextXDaysSpin; 153 QSpinBox *mNextXDaysSpin;
151 QSpinBox *mWhatsNextSpin; 154 QSpinBox *mWhatsNextSpin;
152 155
153 QLineEdit * mRemoteIPEdit; 156 QLineEdit * mRemoteIPEdit;
154 QLineEdit * mRemoteUser; 157 QLineEdit * mRemoteUser;
155 QLineEdit * mRemotePassWd; 158 QLineEdit * mRemotePassWd;
156 QLineEdit * mRemoteFile; 159 QLineEdit * mRemoteFile;
157 QLineEdit * mLocalTempFile; 160 QLineEdit * mLocalTempFile;
158 QWidget* mSetupSyncAlgTab; 161 QWidget* mSetupSyncAlgTab;
159 QLineEdit * mUserDateFormatLong; 162 QLineEdit * mUserDateFormatLong;
160 QLineEdit * mUserDateFormatShort; 163 QLineEdit * mUserDateFormatShort;
161 164
162 QSpinBox *mTimezoneOffsetSpin; 165 QSpinBox *mTimezoneOffsetSpin;
163 QSpinBox *mDaylightsavingStart; 166 QSpinBox *mDaylightsavingStart;
164 QSpinBox *mDaylightsavingEnd; 167 QSpinBox *mDaylightsavingEnd;
165 KDateEdit* mStartDateSavingEdit; 168 KDateEdit* mStartDateSavingEdit;
166 KDateEdit* mEndDateSavingEdit; 169 KDateEdit* mEndDateSavingEdit;
167 QSpinBox * mAlarmPlayBeeps; 170 QSpinBox * mAlarmPlayBeeps;
168 QSpinBox * mAlarmSuspendTime; 171 QSpinBox * mAlarmSuspendTime;
169 QSpinBox * mAlarmSuspendCount; 172 QSpinBox * mAlarmSuspendCount;
170 QSpinBox * mAlarmBeepInterval; 173 QSpinBox * mAlarmBeepInterval;
171 174
172 QLineEdit * mDefaultAlarmFile; 175 QLineEdit * mDefaultAlarmFile;
173#endif 176#endif
174}; 177};
175 178
176#endif 179#endif