summaryrefslogtreecommitdiffabout
path: root/libkdepim
authorzautrix <zautrix>2004-09-22 04:05:36 (UTC)
committer zautrix <zautrix>2004-09-22 04:05:36 (UTC)
commita56783aace3496c8b40008d0dec4c42437165e54 (patch) (unidiff)
tree7c3c070c3346d67356508d586327212d97b457cb /libkdepim
parentd63eac7a612a9724705bc58ad98c65c6ac052d07 (diff)
downloadkdepimpi-a56783aace3496c8b40008d0dec4c42437165e54.zip
kdepimpi-a56783aace3496c8b40008d0dec4c42437165e54.tar.gz
kdepimpi-a56783aace3496c8b40008d0dec4c42437165e54.tar.bz2
Fix for startup question for timezone
Diffstat (limited to 'libkdepim') (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.cpp5
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index 2819ab1..073ab74 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -43,129 +43,132 @@ $Id$
43#include <kglobal.h> 43#include <kglobal.h>
44#include <stdlib.h> 44#include <stdlib.h>
45 45
46/*US 46/*US
47#include <qcheckbox.h> 47#include <qcheckbox.h>
48#include <qframe.h> 48#include <qframe.h>
49#include <qpushbutton.h> 49#include <qpushbutton.h>
50#include <qcombobox.h> 50#include <qcombobox.h>
51#include <qlineedit.h> 51#include <qlineedit.h>
52#include <qlabel.h> 52#include <qlabel.h>
53#include <qfile.h> 53#include <qfile.h>
54 54
55#include <kconfig.h> 55#include <kconfig.h>
56#include <kdebug.h> 56#include <kdebug.h>
57#include <kdialog.h> 57#include <kdialog.h>
58#include <klistview.h> 58#include <klistview.h>
59#include <klocale.h> 59#include <klocale.h>
60#include <kglobal.h> 60#include <kglobal.h>
61#include <kmessagebox.h> 61#include <kmessagebox.h>
62#include <kstandarddirs.h> 62#include <kstandarddirs.h>
63 63
64#ifndef KAB_EMBEDDED 64#ifndef KAB_EMBEDDED
65#include <ktrader.h> 65#include <ktrader.h>
66#else // KAB_EMBEDDED 66#else // KAB_EMBEDDED
67#include <mergewidget.h> 67#include <mergewidget.h>
68#include <distributionlistwidget.h> 68#include <distributionlistwidget.h>
69#endif // KAB_EMBEDDED 69#endif // KAB_EMBEDDED
70 70
71#include "addresseewidget.h" 71#include "addresseewidget.h"
72#include "extensionconfigdialog.h" 72#include "extensionconfigdialog.h"
73#include "extensionwidget.h" 73#include "extensionwidget.h"
74*/ 74*/
75 75
76#include "qapplication.h" 76#include "qapplication.h"
77 77
78#include "kpimglobalprefs.h" 78#include "kpimglobalprefs.h"
79 79
80#include "kdepimconfigwidget.h" 80#include "kdepimconfigwidget.h"
81 81
82 82
83KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name ) 83KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name )
84 : KPrefsWidget(prefs, parent, name ) 84 : KPrefsWidget(prefs, parent, name )
85{ 85{
86 mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email")); 86 mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email"));
87 mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone")); 87 mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone"));
88 mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS")); 88 mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS"));
89 mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax")); 89 mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax"));
90 mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager")); 90 mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager"));
91 mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP")); 91 mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP"));
92 92
93 93
94 QVBoxLayout *topLayout = new QVBoxLayout( this, 0, 94 QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
95 KDialog::spacingHint() ); 95 KDialog::spacingHint() );
96 96
97 tabWidget = new QTabWidget( this ); 97 tabWidget = new QTabWidget( this );
98 topLayout->addWidget( tabWidget ); 98 topLayout->addWidget( tabWidget );
99 99
100 100
101 setupLocaleTab(); 101 setupLocaleTab();
102 setupLocaleDateTab(); 102 setupLocaleDateTab();
103 setupTimeZoneTab(); 103 setupTimeZoneTab();
104 setupExternalAppTab(); 104 setupExternalAppTab();
105 105
106} 106}
107 107void KDEPIMConfigWidget::showTimeZoneTab()
108{
109 tabWidget->setCurrentPage ( 2 ) ;
110}
108void KDEPIMConfigWidget::setupExternalAppTab() 111void KDEPIMConfigWidget::setupExternalAppTab()
109{ 112{
110 QWidget *externalAppsPage = new QWidget( this ); 113 QWidget *externalAppsPage = new QWidget( this );
111 QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(), 114 QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(),
112 KDialog::spacingHintSmall() ); 115 KDialog::spacingHintSmall() );
113 116
114 mExternalApps = new QComboBox( externalAppsPage ); 117 mExternalApps = new QComboBox( externalAppsPage );
115 118
116 QMap<ExternalAppHandler::Types, QString>::Iterator it; 119 QMap<ExternalAppHandler::Types, QString>::Iterator it;
117 for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it ) 120 for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it )
118 mExternalApps->insertItem( it.data(), it.key() ); 121 mExternalApps->insertItem( it.data(), it.key() );
119 122
120 layout->addWidget( mExternalApps ); 123 layout->addWidget( mExternalApps );
121 124
122 connect( mExternalApps, SIGNAL( activated( int ) ), 125 connect( mExternalApps, SIGNAL( activated( int ) ),
123 this, SLOT (externalapp_changed( int ) ) ); 126 this, SLOT (externalapp_changed( int ) ) );
124 127
125 128
126 mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage ); 129 mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage );
127 QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" ); 130 QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" );
128 131
129 132
130 mClient = new QComboBox( mExternalAppGroupBox ); 133 mClient = new QComboBox( mExternalAppGroupBox );
131 boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 ); 134 boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 );
132 135
133 connect( mClient, SIGNAL( activated( int ) ), 136 connect( mClient, SIGNAL( activated( int ) ),
134 this, SLOT (client_changed( int ) ) ); 137 this, SLOT (client_changed( int ) ) );
135 138
136 QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox); 139 QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox);
137 boxLayout->addWidget( lab, 1, 0 ); 140 boxLayout->addWidget( lab, 1, 0 );
138 mChannel = new QLineEdit(mExternalAppGroupBox); 141 mChannel = new QLineEdit(mExternalAppGroupBox);
139 mChannel->setReadOnly(true); 142 mChannel->setReadOnly(true);
140 boxLayout->addMultiCellWidget( mChannel, 2 , 2, 0, 1 ); 143 boxLayout->addMultiCellWidget( mChannel, 2 , 2, 0, 1 );
141 144
142 lab = new QLabel( i18n("Message:"), mExternalAppGroupBox); 145 lab = new QLabel( i18n("Message:"), mExternalAppGroupBox);
143 boxLayout->addWidget( lab, 3, 0 ); 146 boxLayout->addWidget( lab, 3, 0 );
144 mMessage = new QLineEdit(mExternalAppGroupBox); 147 mMessage = new QLineEdit(mExternalAppGroupBox);
145 mMessage->setReadOnly(true); 148 mMessage->setReadOnly(true);
146 boxLayout->addWidget( mMessage , 4, 0); 149 boxLayout->addWidget( mMessage , 4, 0);
147 150
148 lab = new QLabel( i18n("Parameters:"), mExternalAppGroupBox); 151 lab = new QLabel( i18n("Parameters:"), mExternalAppGroupBox);
149 boxLayout->addWidget( lab, 3, 1 ); 152 boxLayout->addWidget( lab, 3, 1 );
150 mParameters = new QLineEdit(mExternalAppGroupBox); 153 mParameters = new QLineEdit(mExternalAppGroupBox);
151 mParameters->setReadOnly(true); 154 mParameters->setReadOnly(true);
152 boxLayout->addWidget( mParameters, 4, 1 ); 155 boxLayout->addWidget( mParameters, 4, 1 );
153 156
154 lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox); 157 lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox);
155 boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 ); 158 boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 );
156 159
157 lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox); 160 lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox);
158 boxLayout->addWidget( lab, 6, 0 ); 161 boxLayout->addWidget( lab, 6, 0 );
159 mMessage2 = new QLineEdit(mExternalAppGroupBox); 162 mMessage2 = new QLineEdit(mExternalAppGroupBox);
160 mMessage2->setReadOnly(true); 163 mMessage2->setReadOnly(true);
161 boxLayout->addWidget( mMessage2 , 7, 0); 164 boxLayout->addWidget( mMessage2 , 7, 0);
162 165
163 lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox); 166 lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox);
164 boxLayout->addWidget( lab, 6, 1 ); 167 boxLayout->addWidget( lab, 6, 1 );
165 mParameters2 = new QLineEdit(mExternalAppGroupBox); 168 mParameters2 = new QLineEdit(mExternalAppGroupBox);
166 mParameters2->setReadOnly(true); 169 mParameters2->setReadOnly(true);
167 boxLayout->addWidget( mParameters2, 7, 1 ); 170 boxLayout->addWidget( mParameters2, 7, 1 );
168 171
169 lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox); 172 lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox);
170 boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 ); 173 boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 );
171 174
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.h b/libkdepim/kcmconfigs/kdepimconfigwidget.h
index 6f26513..619f3d7 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.h
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.h
@@ -1,119 +1,120 @@
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/*
25Enhanced Version of the file for platform independent KDE tools. 25Enhanced Version of the file for platform independent KDE tools.
26Copyright (c) 2004 Ulf Schenk 26Copyright (c) 2004 Ulf Schenk
27 27
28$Id$ 28$Id$
29*/ 29*/
30 30
31#ifndef KDEPIMCONFIGWIDGET_H 31#ifndef KDEPIMCONFIGWIDGET_H
32#define KDEPIMCONFIGWIDGET_H 32#define KDEPIMCONFIGWIDGET_H
33 33
34#include <kprefswidget.h> 34#include <kprefswidget.h>
35#include <qmap.h> 35#include <qmap.h>
36 36
37#include "externalapphandler.h" 37#include "externalapphandler.h"
38 38
39 39
40class QComboBox; 40class QComboBox;
41class QLineEdit; 41class QLineEdit;
42class KPimGlobalPrefs; 42class KPimGlobalPrefs;
43class QGroupBox; 43class QGroupBox;
44class QTabWidget; 44class QTabWidget;
45class KDateEdit; 45class KDateEdit;
46 46
47class KDEPIMConfigWidget : public KPrefsWidget 47class KDEPIMConfigWidget : public KPrefsWidget
48{ 48{
49 Q_OBJECT 49 Q_OBJECT
50 50
51 public: 51 public:
52 KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name = 0 ); 52 KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name = 0 );
53 53
54 public slots: 54 public slots:
55 void textChanged( const QString& text ); 55 void textChanged( const QString& text );
56 void showTimeZoneTab();
56 57
57 protected: 58 protected:
58 /** Implement this to read custom configuration widgets. */ 59 /** Implement this to read custom configuration widgets. */
59 virtual void usrReadConfig(); 60 virtual void usrReadConfig();
60 /** Implement this to write custom configuration widgets. */ 61 /** Implement this to write custom configuration widgets. */
61 virtual void usrWriteConfig(); 62 virtual void usrWriteConfig();
62 63
63 64
64 private slots: 65 private slots:
65// void configureExtension(); 66// void configureExtension();
66// void selectionChanged( QListViewItem* ); 67// void selectionChanged( QListViewItem* );
67// void itemClicked( QListViewItem* ); 68// void itemClicked( QListViewItem* );
68 void client_changed( int newClient ); 69 void client_changed( int newClient );
69 void externalapp_changed( int newApp ); 70 void externalapp_changed( int newApp );
70 71
71 private: 72 private:
72 void setupExternalAppTab(); 73 void setupExternalAppTab();
73 void setupLocaleDateTab(); 74 void setupLocaleDateTab();
74 void setupLocaleTab(); 75 void setupLocaleTab();
75 void setupTimeZoneTab(); 76 void setupTimeZoneTab();
76 77
77 void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0); 78 void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0);
78 79
79 80
80 void saveEditFieldSettings(); 81 void saveEditFieldSettings();
81 void updateClientWidgets(); 82 void updateClientWidgets();
82 83
83 QTabWidget *tabWidget; 84 QTabWidget *tabWidget;
84 85
85 86
86 QLineEdit* mUserDateFormatShort; 87 QLineEdit* mUserDateFormatShort;
87 QLineEdit* mUserDateFormatLong; 88 QLineEdit* mUserDateFormatLong;
88 QComboBox* mTimeZoneCombo; 89 QComboBox* mTimeZoneCombo;
89 KDateEdit* mStartDateSavingEdit; 90 KDateEdit* mStartDateSavingEdit;
90 KDateEdit* mEndDateSavingEdit; 91 KDateEdit* mEndDateSavingEdit;
91 92
92// void restoreExtensionSettings(); 93// void restoreExtensionSettings();
93// void saveExtensionSettings(); 94// void saveExtensionSettings();
94 95
95// KListView *mExtensionView; 96// KListView *mExtensionView;
96 97
97// QCheckBox *mNameParsing; 98// QCheckBox *mNameParsing;
98// QCheckBox *mViewsSingleClickBox; 99// QCheckBox *mViewsSingleClickBox;
99// QPushButton *mConfigureButton; 100// QPushButton *mConfigureButton;
100 QComboBox* mExternalApps; 101 QComboBox* mExternalApps;
101 QGroupBox* mExternalAppGroupBox; 102 QGroupBox* mExternalAppGroupBox;
102 103
103 104
104 QComboBox* mClient; 105 QComboBox* mClient;
105 QLineEdit* mChannel; 106 QLineEdit* mChannel;
106 QLineEdit* mMessage; 107 QLineEdit* mMessage;
107 QLineEdit* mParameters; 108 QLineEdit* mParameters;
108 QLineEdit* mMessage2; 109 QLineEdit* mMessage2;
109 QLineEdit* mParameters2; 110 QLineEdit* mParameters2;
110 111
111 ExternalAppHandler::Types mCurrentApp; 112 ExternalAppHandler::Types mCurrentApp;
112 int mCurrentClient; 113 int mCurrentClient;
113 114
114 115
115 int mEmailClient; 116 int mEmailClient;
116 QString mEmailOtherChannel; 117 QString mEmailOtherChannel;
117 QString mEmailOtherMessage; 118 QString mEmailOtherMessage;
118 QString mEmailOtherMessageParameters; 119 QString mEmailOtherMessageParameters;
119 QString mEmailOtherMessage2; 120 QString mEmailOtherMessage2;