summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-08-23 21:48:53 (UTC)
committer zautrix <zautrix>2005-08-23 21:48:53 (UTC)
commit2acca9aff5bd651923b5d728712a0fd80b3d54e9 (patch) (unidiff)
treec2113d441908520d86902a8a9fade08eb05ee0d0
parent6f5464760f5fb1e4c13027464cfe4943b85d29a0 (diff)
downloadkdepimpi-2acca9aff5bd651923b5d728712a0fd80b3d54e9.zip
kdepimpi-2acca9aff5bd651923b5d728712a0fd80b3d54e9.tar.gz
kdepimpi-2acca9aff5bd651923b5d728712a0fd80b3d54e9.tar.bz2
fastload fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp22
-rw-r--r--kaddressbook/views/kaddressbooktableview.cpp4
-rw-r--r--korganizer/mainwindow.cpp15
-rw-r--r--microkde/kdeui/ktoolbar.cpp4
4 files changed, 29 insertions, 16 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index af12f2b..4e2523e 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1,1656 +1,1666 @@
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 Async a special exception, permission is given to link this program 19 Async 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/*s 24/*s
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#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 <qtimer.h>
37#include <qlabel.h> 37#include <qlabel.h>
38#include <qregexp.h> 38#include <qregexp.h>
39#include <qlineedit.h> 39#include <qlineedit.h>
40#include <qcheckbox.h> 40#include <qcheckbox.h>
41#include <qpushbutton.h> 41#include <qpushbutton.h>
42#include <qprogressbar.h> 42#include <qprogressbar.h>
43#include <libkdepim/phoneaccess.h> 43#include <libkdepim/phoneaccess.h>
44 44
45#ifndef KAB_EMBEDDED 45#ifndef KAB_EMBEDDED
46#include <qclipboard.h> 46#include <qclipboard.h>
47#include <qdir.h> 47#include <qdir.h>
48#include <qfile.h> 48#include <qfile.h>
49#include <qapplicaton.h> 49#include <qapplicaton.h>
50#include <qprogressbar.h> 50#include <qprogressbar.h>
51#include <qlayout.h> 51#include <qlayout.h>
52#include <qregexp.h> 52#include <qregexp.h>
53#include <qvbox.h> 53#include <qvbox.h>
54#include <kabc/addresseelist.h> 54#include <kabc/addresseelist.h>
55#include <kabc/errorhandler.h> 55#include <kabc/errorhandler.h>
56#include <kabc/resource.h> 56#include <kabc/resource.h>
57#include <kabc/vcardconverter.h> 57#include <kabc/vcardconverter.h>
58#include <kapplication.h> 58#include <kapplication.h>
59#include <kactionclasses.h> 59#include <kactionclasses.h>
60#include <kcmultidialog.h> 60#include <kcmultidialog.h>
61#include <kdebug.h> 61#include <kdebug.h>
62#include <kdeversion.h> 62#include <kdeversion.h>
63#include <kkeydialog.h> 63#include <kkeydialog.h>
64#include <kmessagebox.h> 64#include <kmessagebox.h>
65#include <kprinter.h> 65#include <kprinter.h>
66#include <kprotocolinfo.h> 66#include <kprotocolinfo.h>
67#include <kresources/selectdialog.h> 67#include <kresources/selectdialog.h>
68#include <kstandarddirs.h> 68#include <kstandarddirs.h>
69#include <ktempfile.h> 69#include <ktempfile.h>
70#include <kxmlguiclient.h> 70#include <kxmlguiclient.h>
71#include <kaboutdata.h> 71#include <kaboutdata.h>
72#include <libkdepim/categoryselectdialog.h> 72#include <libkdepim/categoryselectdialog.h>
73 73
74#include "addresseeutil.h" 74#include "addresseeutil.h"
75#include "addresseeeditordialog.h" 75#include "addresseeeditordialog.h"
76#include "extensionmanager.h" 76#include "extensionmanager.h"
77#include "kstdaction.h" 77#include "kstdaction.h"
78#include "kaddressbookservice.h" 78#include "kaddressbookservice.h"
79#include "ldapsearchdialog.h" 79#include "ldapsearchdialog.h"
80#include "printing/printingwizard.h" 80#include "printing/printingwizard.h"
81#else // KAB_EMBEDDED 81#else // KAB_EMBEDDED
82 82
83#include <kapplication.h> 83#include <kapplication.h>
84#include "KDGanttMinimizeSplitter.h" 84#include "KDGanttMinimizeSplitter.h"
85#include "kaddressbookmain.h" 85#include "kaddressbookmain.h"
86#include "kactioncollection.h" 86#include "kactioncollection.h"
87#include "addresseedialog.h" 87#include "addresseedialog.h"
88//US 88//US
89#include <addresseeview.h> 89#include <addresseeview.h>
90 90
91#include <qapp.h> 91#include <qapp.h>
92#include <qmenubar.h> 92#include <qmenubar.h>
93//#include <qtoolbar.h> 93//#include <qtoolbar.h>
94#include <qmessagebox.h> 94#include <qmessagebox.h>
95#include <kdebug.h> 95#include <kdebug.h>
96#include <kiconloader.h> // needed for SmallIcon 96#include <kiconloader.h> // needed for SmallIcon
97#include <kresources/kcmkresources.h> 97#include <kresources/kcmkresources.h>
98#include <ktoolbar.h> 98#include <ktoolbar.h>
99#include <kprefsdialog.h> 99#include <kprefsdialog.h>
100 100
101 101
102//#include <qlabel.h> 102//#include <qlabel.h>
103 103
104 104
105#ifndef DESKTOP_VERSION 105#ifndef DESKTOP_VERSION
106#include <qpe/ir.h> 106#include <qpe/ir.h>
107#include <qpe/qpemenubar.h> 107#include <qpe/qpemenubar.h>
108#include <qtopia/qcopenvelope_qws.h> 108#include <qtopia/qcopenvelope_qws.h>
109#else 109#else
110 110
111#include <qmenubar.h> 111#include <qmenubar.h>
112#endif 112#endif
113 113
114#endif // KAB_EMBEDDED 114#endif // KAB_EMBEDDED
115#include "kcmconfigs/kcmkabconfig.h" 115#include "kcmconfigs/kcmkabconfig.h"
116#include "kcmconfigs/kcmkdepimconfig.h" 116#include "kcmconfigs/kcmkdepimconfig.h"
117#include "kpimglobalprefs.h" 117#include "kpimglobalprefs.h"
118#include "externalapphandler.h" 118#include "externalapphandler.h"
119#include "xxportselectdialog.h" 119#include "xxportselectdialog.h"
120 120
121 121
122#include <kresources/selectdialog.h> 122#include <kresources/selectdialog.h>
123#include <kmessagebox.h> 123#include <kmessagebox.h>
124 124
125#include <picture.h> 125#include <picture.h>
126#include <resource.h> 126#include <resource.h>
127 127
128//US#include <qsplitter.h> 128//US#include <qsplitter.h>
129#include <qmap.h> 129#include <qmap.h>
130#include <qdir.h> 130#include <qdir.h>
131#include <qfile.h> 131#include <qfile.h>
132#include <qvbox.h> 132#include <qvbox.h>
133#include <qlayout.h> 133#include <qlayout.h>
134#include <qclipboard.h> 134#include <qclipboard.h>
135#include <qtextstream.h> 135#include <qtextstream.h>
136#include <qradiobutton.h> 136#include <qradiobutton.h>
137#include <qbuttongroup.h> 137#include <qbuttongroup.h>
138 138
139#include <libkdepim/categoryselectdialog.h> 139#include <libkdepim/categoryselectdialog.h>
140#include <libkdepim/categoryeditdialog.h> 140#include <libkdepim/categoryeditdialog.h>
141#include <kabc/vcardconverter.h> 141#include <kabc/vcardconverter.h>
142 142
143 143
144#include "addresseeutil.h" 144#include "addresseeutil.h"
145#include "undocmds.h" 145#include "undocmds.h"
146#include "addresseeeditordialog.h" 146#include "addresseeeditordialog.h"
147#include "viewmanager.h" 147#include "viewmanager.h"
148#include "details/detailsviewcontainer.h" 148#include "details/detailsviewcontainer.h"
149#include "kabprefs.h" 149#include "kabprefs.h"
150#include "xxportmanager.h" 150#include "xxportmanager.h"
151#include "incsearchwidget.h" 151#include "incsearchwidget.h"
152#include "jumpbuttonbar.h" 152#include "jumpbuttonbar.h"
153#include "extensionmanager.h" 153#include "extensionmanager.h"
154#include "addresseeconfig.h" 154#include "addresseeconfig.h"
155#include "nameeditdialog.h" 155#include "nameeditdialog.h"
156#include <kcmultidialog.h> 156#include <kcmultidialog.h>
157 157
158#ifdef _WIN32_ 158#ifdef _WIN32_
159#ifdef _OL_IMPORT_ 159#ifdef _OL_IMPORT_
160#include "kaimportoldialog.h" 160#include "kaimportoldialog.h"
161#endif 161#endif
162#else 162#else
163#include <unistd.h> 163#include <unistd.h>
164#endif 164#endif
165// sync includes 165// sync includes
166#include <libkdepim/ksyncprofile.h> 166#include <libkdepim/ksyncprofile.h>
167#include <libkdepim/ksyncprefsdialog.h> 167#include <libkdepim/ksyncprefsdialog.h>
168 168
169 169
170class KABCatPrefs : public QDialog 170class KABCatPrefs : public QDialog
171{ 171{
172 public: 172 public:
173 KABCatPrefs( QWidget *parent=0, const char *name=0 ) : 173 KABCatPrefs( QWidget *parent=0, const char *name=0 ) :
174 QDialog( parent, name, true ) 174 QDialog( parent, name, true )
175 { 175 {
176 setCaption( i18n("Manage new Categories") ); 176 setCaption( i18n("Manage new Categories") );
177 QVBoxLayout* lay = new QVBoxLayout( this ); 177 QVBoxLayout* lay = new QVBoxLayout( this );
178 lay->setSpacing( 3 ); 178 lay->setSpacing( 3 );
179 lay->setMargin( 3 ); 179 lay->setMargin( 3 );
180 QLabel * lab = new QLabel( i18n("After importing/loading/syncing\nthere may be new categories in\naddressees\nwhich are not in the category list.\nPlease choose what to do:\n "), this ); 180 QLabel * lab = new QLabel( i18n("After importing/loading/syncing\nthere may be new categories in\naddressees\nwhich are not in the category list.\nPlease choose what to do:\n "), this );
181 lay->addWidget( lab ); 181 lay->addWidget( lab );
182 QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this ); 182 QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this );
183 lay->addWidget( format ); 183 lay->addWidget( format );
184 format->setExclusive ( true ) ; 184 format->setExclusive ( true ) ;
185 addCatBut = new QRadioButton(i18n("Add to category list"), format ); 185 addCatBut = new QRadioButton(i18n("Add to category list"), format );
186 new QRadioButton(i18n("Remove from addressees"), format ); 186 new QRadioButton(i18n("Remove from addressees"), format );
187 addCatBut->setChecked( true ); 187 addCatBut->setChecked( true );
188 QPushButton * ok = new QPushButton( i18n("OK"), this ); 188 QPushButton * ok = new QPushButton( i18n("OK"), this );
189 lay->addWidget( ok ); 189 lay->addWidget( ok );
190 QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); 190 QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
191 lay->addWidget( cancel ); 191 lay->addWidget( cancel );
192 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); 192 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) );
193 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); 193 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) );
194 resize( 200, 200 ); 194 resize( 200, 200 );
195 } 195 }
196 196
197 bool addCat() { return addCatBut->isChecked(); } 197 bool addCat() { return addCatBut->isChecked(); }
198private: 198private:
199 QRadioButton* addCatBut; 199 QRadioButton* addCatBut;
200}; 200};
201 201
202class KABFormatPrefs : public QDialog 202class KABFormatPrefs : public QDialog
203{ 203{
204 public: 204 public:
205 KABFormatPrefs( QWidget *parent=0, const char *name=0 ) : 205 KABFormatPrefs( QWidget *parent=0, const char *name=0 ) :
206 QDialog( parent, name, true ) 206 QDialog( parent, name, true )
207 { 207 {
208 setCaption( i18n("Set formatted name") ); 208 setCaption( i18n("Set formatted name") );
209 QVBoxLayout* lay = new QVBoxLayout( this ); 209 QVBoxLayout* lay = new QVBoxLayout( this );
210 lay->setSpacing( 3 ); 210 lay->setSpacing( 3 );
211 lay->setMargin( 3 ); 211 lay->setMargin( 3 );
212 QLabel * lab = new QLabel( i18n("You can set the formatted name\nfor a list of contacts in one go."), this ); 212 QLabel * lab = new QLabel( i18n("You can set the formatted name\nfor a list of contacts in one go."), this );
213 lay->addWidget( lab ); 213 lay->addWidget( lab );
214 QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("Set formatted name to:"), this ); 214 QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("Set formatted name to:"), this );
215 lay->addWidget( format ); 215 lay->addWidget( format );
216 format->setExclusive ( true ) ; 216 format->setExclusive ( true ) ;
217 simple = new QRadioButton(i18n("Simple: James Bond"), format ); 217 simple = new QRadioButton(i18n("Simple: James Bond"), format );
218 full = new QRadioButton(i18n("Full: Mr. James 007 Bond I"), format ); 218 full = new QRadioButton(i18n("Full: Mr. James 007 Bond I"), format );
219 reverse = new QRadioButton(i18n("Reverse: Bond, James"), format ); 219 reverse = new QRadioButton(i18n("Reverse: Bond, James"), format );
220 company = new QRadioButton(i18n("Organization: MI6"), format ); 220 company = new QRadioButton(i18n("Organization: MI6"), format );
221 simple->setChecked( true ); 221 simple->setChecked( true );
222 setCompany = new QCheckBox(i18n("Set formatted name to\norganization, if name empty"), this); 222 setCompany = new QCheckBox(i18n("Set formatted name to\norganization, if name empty"), this);
223 lay->addWidget( setCompany ); 223 lay->addWidget( setCompany );
224 QPushButton * ok = new QPushButton( i18n("Select contact list"), this ); 224 QPushButton * ok = new QPushButton( i18n("Select contact list"), this );
225 lay->addWidget( ok ); 225 lay->addWidget( ok );
226 QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); 226 QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
227 lay->addWidget( cancel ); 227 lay->addWidget( cancel );
228 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); 228 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) );
229 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); 229 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) );
230 //resize( 200, 200 ); 230 //resize( 200, 200 );
231 231
232 } 232 }
233public: 233public:
234 QRadioButton* simple, *full, *reverse, *company; 234 QRadioButton* simple, *full, *reverse, *company;
235 QCheckBox* setCompany; 235 QCheckBox* setCompany;
236}; 236};
237 237
238 238
239 239
240class KAex2phonePrefs : public QDialog 240class KAex2phonePrefs : public QDialog
241{ 241{
242 public: 242 public:
243 KAex2phonePrefs( QWidget *parent=0, const char *name=0 ) : 243 KAex2phonePrefs( QWidget *parent=0, const char *name=0 ) :
244 QDialog( parent, name, true ) 244 QDialog( parent, name, true )
245 { 245 {
246 setCaption( i18n("Export to phone options") ); 246 setCaption( i18n("Export to phone options") );
247 QVBoxLayout* lay = new QVBoxLayout( this ); 247 QVBoxLayout* lay = new QVBoxLayout( this );
248 lay->setSpacing( 3 ); 248 lay->setSpacing( 3 );
249 lay->setMargin( 3 ); 249 lay->setMargin( 3 );
250 QLabel *lab; 250 QLabel *lab;
251 lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) ); 251 lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) );
252 lab->setAlignment (AlignHCenter ); 252 lab->setAlignment (AlignHCenter );
253 QHBox* temphb; 253 QHBox* temphb;
254 temphb = new QHBox( this ); 254 temphb = new QHBox( this );
255 new QLabel( i18n("I/O device: "), temphb ); 255 new QLabel( i18n("I/O device: "), temphb );
256 mPhoneDevice = new QLineEdit( temphb); 256 mPhoneDevice = new QLineEdit( temphb);
257 lay->addWidget( temphb ); 257 lay->addWidget( temphb );
258 temphb = new QHBox( this ); 258 temphb = new QHBox( this );
259 new QLabel( i18n("Connection: "), temphb ); 259 new QLabel( i18n("Connection: "), temphb );
260 mPhoneConnection = new QLineEdit( temphb); 260 mPhoneConnection = new QLineEdit( temphb);
261 lay->addWidget( temphb ); 261 lay->addWidget( temphb );
262 temphb = new QHBox( this ); 262 temphb = new QHBox( this );
263 new QLabel( i18n("Model(opt.): "), temphb ); 263 new QLabel( i18n("Model(opt.): "), temphb );
264 mPhoneModel = new QLineEdit( temphb); 264 mPhoneModel = new QLineEdit( temphb);
265 lay->addWidget( temphb ); 265 lay->addWidget( temphb );
266 // mWriteToSim = new QCheckBox( i18n("Write Contacts to SIM card\n(if not, write to phone memory)"), this ); 266 // mWriteToSim = new QCheckBox( i18n("Write Contacts to SIM card\n(if not, write to phone memory)"), this );
267 // lay->addWidget( mWriteToSim ); 267 // lay->addWidget( mWriteToSim );
268 lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ncontact data on phone!"), this ) ); 268 lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ncontact data on phone!"), this ) );
269 lab->setAlignment (AlignHCenter); 269 lab->setAlignment (AlignHCenter);
270 QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this ); 270 QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
271 lay->addWidget( ok ); 271 lay->addWidget( ok );
272 QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); 272 QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
273 lay->addWidget( cancel ); 273 lay->addWidget( cancel );
274 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); 274 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) );
275 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); 275 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) );
276 resize( 220, 240 ); 276 resize( 220, 240 );
277 277
278 } 278 }
279 279
280public: 280public:
281 QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; 281 QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel;
282 QCheckBox* mWriteToSim; 282 QCheckBox* mWriteToSim;
283}; 283};
284 284
285 285
286bool pasteWithNewUid = true; 286bool pasteWithNewUid = true;
287 287
288#ifdef KAB_EMBEDDED 288#ifdef KAB_EMBEDDED
289KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name ) 289KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name )
290 : QWidget( parent, name ), KSyncInterface(), mGUIClient( client ), mViewManager( 0 ), 290 : QWidget( parent, name ), KSyncInterface(), mGUIClient( client ), mViewManager( 0 ),
291 mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US mLdapSearchDialog( 0 ),*/ 291 mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US mLdapSearchDialog( 0 ),*/
292 mReadWrite( readWrite ), mModified( false ), mMainWindow(client) 292 mReadWrite( readWrite ), mModified( false ), mMainWindow(client)
293#else //KAB_EMBEDDED 293#else //KAB_EMBEDDED
294KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name ) 294KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name )
295 : QWidget( parent, name ), KSyncInterface(), mGUIClient( client ), mViewManager( 0 ), 295 : QWidget( parent, name ), KSyncInterface(), mGUIClient( client ), mViewManager( 0 ),
296 mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ), 296 mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ),
297 mReadWrite( readWrite ), mModified( false ) 297 mReadWrite( readWrite ), mModified( false )
298#endif //KAB_EMBEDDED 298#endif //KAB_EMBEDDED
299{ 299{
300 // syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu); 300 // syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu);
301 // syncManager->setBlockSave(false); 301 // syncManager->setBlockSave(false);
302 mIncSearchWidget = 0; 302 mIncSearchWidget = 0;
303 mMiniSplitter = 0; 303 mMiniSplitter = 0;
304 mExtensionBarSplitter = 0; 304 mExtensionBarSplitter = 0;
305 mIsPart = !parent->inherits( "KAddressBookMain" ); 305 mIsPart = !parent->inherits( "KAddressBookMain" );
306 mAddressBook = KABC::StdAddressBook::selfNoLoad(); 306 mAddressBook = KABC::StdAddressBook::selfNoLoad();
307 KABC::StdAddressBook::setAutomaticSave( false ); 307 KABC::StdAddressBook::setAutomaticSave( false );
308 308
309#ifndef KAB_EMBEDDED 309#ifndef KAB_EMBEDDED
310 mAddressBook->setErrorHandler( new KABC::GUIErrorHandler ); 310 mAddressBook->setErrorHandler( new KABC::GUIErrorHandler );
311#endif //KAB_EMBEDDED 311#endif //KAB_EMBEDDED
312 312
313 connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook * ) ), 313 connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook * ) ),
314 SLOT( addressBookChanged() ) ); 314 SLOT( addressBookChanged() ) );
315 315
316#if 0 316#if 0
317 // LR moved to addressbook init method 317 // LR moved to addressbook init method
318 mAddressBook->addCustomField( i18n( "Department" ), KABC::Field::Organization, 318 mAddressBook->addCustomField( i18n( "Department" ), KABC::Field::Organization,
319 "X-Department", "KADDRESSBOOK" ); 319 "X-Department", "KADDRESSBOOK" );
320 mAddressBook->addCustomField( i18n( "Profession" ), KABC::Field::Organization, 320 mAddressBook->addCustomField( i18n( "Profession" ), KABC::Field::Organization,
321 "X-Profession", "KADDRESSBOOK" ); 321 "X-Profession", "KADDRESSBOOK" );
322 mAddressBook->addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization, 322 mAddressBook->addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization,
323 "X-AssistantsName", "KADDRESSBOOK" ); 323 "X-AssistantsName", "KADDRESSBOOK" );
324 mAddressBook->addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization, 324 mAddressBook->addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization,
325 "X-ManagersName", "KADDRESSBOOK" ); 325 "X-ManagersName", "KADDRESSBOOK" );
326 mAddressBook->addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal, 326 mAddressBook->addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal,
327 "X-SpousesName", "KADDRESSBOOK" ); 327 "X-SpousesName", "KADDRESSBOOK" );
328 mAddressBook->addCustomField( i18n( "Office" ), KABC::Field::Personal, 328 mAddressBook->addCustomField( i18n( "Office" ), KABC::Field::Personal,
329 "X-Office", "KADDRESSBOOK" ); 329 "X-Office", "KADDRESSBOOK" );
330 mAddressBook->addCustomField( i18n( "IM Address" ), KABC::Field::Personal, 330 mAddressBook->addCustomField( i18n( "IM Address" ), KABC::Field::Personal,
331 "X-IMAddress", "KADDRESSBOOK" ); 331 "X-IMAddress", "KADDRESSBOOK" );
332 mAddressBook->addCustomField( i18n( "Anniversary" ), KABC::Field::Personal, 332 mAddressBook->addCustomField( i18n( "Anniversary" ), KABC::Field::Personal,
333 "X-Anniversary", "KADDRESSBOOK" ); 333 "X-Anniversary", "KADDRESSBOOK" );
334 334
335 //US added this field to become compatible with Opie/qtopia addressbook 335 //US added this field to become compatible with Opie/qtopia addressbook
336 // values can be "female" or "male" or "". An empty field represents undefined. 336 // values can be "female" or "male" or "". An empty field represents undefined.
337 mAddressBook->addCustomField( i18n( "Gender" ), KABC::Field::Personal, 337 mAddressBook->addCustomField( i18n( "Gender" ), KABC::Field::Personal,
338 "X-Gender", "KADDRESSBOOK" ); 338 "X-Gender", "KADDRESSBOOK" );
339 mAddressBook->addCustomField( i18n( "Children" ), KABC::Field::Personal, 339 mAddressBook->addCustomField( i18n( "Children" ), KABC::Field::Personal,
340 "X-Children", "KADDRESSBOOK" ); 340 "X-Children", "KADDRESSBOOK" );
341 mAddressBook->addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal, 341 mAddressBook->addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal,
342 "X-FreeBusyUrl", "KADDRESSBOOK" ); 342 "X-FreeBusyUrl", "KADDRESSBOOK" );
343#endif 343#endif
344 initGUI(); 344 initGUI();
345 345
346 mIncSearchWidget->setFocus(); 346 mIncSearchWidget->setFocus();
347 347
348 348
349 connect( mViewManager, SIGNAL( selected( const QString& ) ), 349 connect( mViewManager, SIGNAL( selected( const QString& ) ),
350 SLOT( setContactSelected( const QString& ) ) ); 350 SLOT( setContactSelected( const QString& ) ) );
351 connect( mViewManager, SIGNAL( executed( const QString& ) ), 351 connect( mViewManager, SIGNAL( executed( const QString& ) ),
352 SLOT( executeContact( const QString& ) ) ); 352 SLOT( executeContact( const QString& ) ) );
353 353
354 connect( mViewManager, SIGNAL( deleteRequest( ) ), 354 connect( mViewManager, SIGNAL( deleteRequest( ) ),
355 SLOT( deleteContacts( ) ) ); 355 SLOT( deleteContacts( ) ) );
356 connect( mViewManager, SIGNAL( modified() ), 356 connect( mViewManager, SIGNAL( modified() ),
357 SLOT( setModified() ) ); 357 SLOT( setModified() ) );
358 358
359 connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) ); 359 connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) );
360 connect( mExtensionManager, SIGNAL( changedActiveExtension( int ) ), this, SLOT( extensionChanged( int ) ) ); 360 connect( mExtensionManager, SIGNAL( changedActiveExtension( int ) ), this, SLOT( extensionChanged( int ) ) );
361 361
362 connect( mXXPortManager, SIGNAL( modified() ), 362 connect( mXXPortManager, SIGNAL( modified() ),
363 SLOT( setModified() ) ); 363 SLOT( setModified() ) );
364 364
365 connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ), 365 connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ),
366 SLOT( incrementalSearchJump( const QString& ) ) ); 366 SLOT( incrementalSearchJump( const QString& ) ) );
367 connect( mIncSearchWidget, SIGNAL( fieldChanged() ), 367 connect( mIncSearchWidget, SIGNAL( fieldChanged() ),
368 mJumpButtonBar, SLOT( recreateButtons() ) ); 368 mJumpButtonBar, SLOT( recreateButtons() ) );
369 369
370 connect( mDetails, SIGNAL( sendEmail( const QString& ) ), 370 connect( mDetails, SIGNAL( sendEmail( const QString& ) ),
371 SLOT( sendMail( const QString& ) ) ); 371 SLOT( sendMail( const QString& ) ) );
372 372
373 373
374 connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&))); 374 connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&)));
375 connect( ExternalAppHandler::instance(), SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)),this, SLOT(requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&))); 375 connect( ExternalAppHandler::instance(), SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)),this, SLOT(requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)));
376 connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&))); 376 connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&)));
377 connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle())); 377 connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle()));
378 connect( ExternalAppHandler::instance(), SIGNAL (doRingSync()),this, SLOT( doRingSync())); 378 connect( ExternalAppHandler::instance(), SIGNAL (doRingSync()),this, SLOT( doRingSync()));
379 connect( ExternalAppHandler::instance(), SIGNAL (callContactdialog()),this, SLOT(callContactdialog())); 379 connect( ExternalAppHandler::instance(), SIGNAL (callContactdialog()),this, SLOT(callContactdialog()));
380 380
381 381
382#ifndef KAB_EMBEDDED 382#ifndef KAB_EMBEDDED
383 connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), 383 connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ),
384 mXXPortManager, SLOT( importVCard( const KURL& ) ) ); 384 mXXPortManager, SLOT( importVCard( const KURL& ) ) );
385 385
386 connect( mDetails, SIGNAL( browse( const QString& ) ), 386 connect( mDetails, SIGNAL( browse( const QString& ) ),
387 SLOT( browse( const QString& ) ) ); 387 SLOT( browse( const QString& ) ) );
388 388
389 389
390 mAddressBookService = new KAddressBookService( this ); 390 mAddressBookService = new KAddressBookService( this );
391 391
392#endif //KAB_EMBEDDED 392#endif //KAB_EMBEDDED
393 393
394 mMessageTimer = new QTimer( this ); 394 mMessageTimer = new QTimer( this );
395 connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) ); 395 connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) );
396 mEditorDialog = 0; 396 mEditorDialog = 0;
397 createAddresseeEditorDialog( this ); 397 createAddresseeEditorDialog( this );
398 setModified( false ); 398 setModified( false );
399 mBRdisabled = false; 399 mBRdisabled = false;
400#ifndef DESKTOP_VERSION 400#ifndef DESKTOP_VERSION
401 infrared = 0; 401 infrared = 0;
402#endif 402#endif
403 //toggleBeamReceive( ); 403 //toggleBeamReceive( );
404 mMainWindow->toolBar()->show(); 404 mMainWindow->toolBar()->show();
405 // we have a toolbar repainting error on the Zaurus when starting KA/Pi 405 // we have a toolbar repainting error on the Zaurus when starting KA/Pi
406 //QTimer::singleShot( 10, this , SLOT ( updateToolBar())); 406 //QTimer::singleShot( 10, this , SLOT ( updateToolBar()));
407 QTimer::singleShot( 100, this, SLOT ( loadDataAfterStart() )); 407 QTimer::singleShot( 100, this, SLOT ( loadDataAfterStart() ));
408} 408}
409void KABCore::receiveStart( const QCString& cmsg, const QByteArray& data ) 409void KABCore::receiveStart( const QCString& cmsg, const QByteArray& data )
410{ 410{
411 //qDebug("KO: QCOP start message received: %s ", cmsg.data() ); 411 //qDebug("KO: QCOP start message received: %s ", cmsg.data() );
412 mCStringMess = cmsg; 412 mCStringMess = cmsg;
413 mByteData = data; 413 mByteData = data;
414} 414}
415 415
416void KABCore::loadDataAfterStart() 416void KABCore::loadDataAfterStart()
417{ 417{
418 //qDebug("KABCore::loadDataAfterStart() "); 418 //qDebug("KABCore::loadDataAfterStart() ");
419 ((StdAddressBook*)mAddressBook)->init( true ); 419 ((StdAddressBook*)mAddressBook)->init( true );
420 mViewManager->refreshView(); 420 mViewManager->refreshView();
421 421
422#ifndef DESKTOP_VERSION 422#ifndef DESKTOP_VERSION
423 disconnect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT (receiveStart ( const QCString &, const QByteArray & ))); 423 disconnect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT (receiveStart ( const QCString &, const QByteArray & )));
424 424
425 QObject::connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); 425 QObject::connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
426 if ( !mCStringMess.isEmpty() ) 426 if ( !mCStringMess.isEmpty() )
427 ExternalAppHandler::instance()->appMessage( mCStringMess, mByteData ); 427 ExternalAppHandler::instance()->appMessage( mCStringMess, mByteData );
428#endif 428#endif
429 // QTimer::singleShot( 10, this , SLOT ( updateToolBar())); 429 // QTimer::singleShot( 10, this , SLOT ( updateToolBar()));
430 setCaptionBack(); 430 setCaptionBack();
431} 431}
432void KABCore::updateToolBar() 432void KABCore::updateToolBar()
433{ 433{
434 static int iii = 0; 434 static int iii = 0;
435 ++iii; 435 ++iii;
436 mMainWindow->toolBar()->repaintMe(); 436 mMainWindow->toolBar()->repaintMe();
437 if ( iii < 4 ) 437 if ( iii < 4 )
438 QTimer::singleShot( 100*iii, this , SLOT ( updateToolBar())); 438 QTimer::singleShot( 100*iii, this , SLOT ( updateToolBar()));
439} 439}
440KABCore::~KABCore() 440KABCore::~KABCore()
441{ 441{
442 // save(); 442 // save();
443 //saveSettings(); 443 //saveSettings();
444 //KABPrefs::instance()->writeConfig(); 444 //KABPrefs::instance()->writeConfig();
445 delete AddresseeConfig::instance(); 445 delete AddresseeConfig::instance();
446 mAddressBook = 0; 446 mAddressBook = 0;
447 KABC::StdAddressBook::close(); 447 KABC::StdAddressBook::close();
448 448
449 delete syncManager; 449 delete syncManager;
450#ifndef DESKTOP_VERSION 450#ifndef DESKTOP_VERSION
451 if ( infrared ) 451 if ( infrared )
452 delete infrared; 452 delete infrared;
453#endif 453#endif
454} 454}
455void KABCore::receive( const QCString& cmsg, const QByteArray& data ) 455void KABCore::receive( const QCString& cmsg, const QByteArray& data )
456{ 456{
457 //qDebug("KA: QCOP message received: %s ", cmsg.data() ); 457 //qDebug("KA: QCOP message received: %s ", cmsg.data() );
458 if ( cmsg == "setDocument(QString)" ) { 458 if ( cmsg == "setDocument(QString)" ) {
459 QDataStream stream( data, IO_ReadOnly ); 459 QDataStream stream( data, IO_ReadOnly );
460 QString fileName; 460 QString fileName;
461 stream >> fileName; 461 stream >> fileName;
462 recieve( fileName ); 462 recieve( fileName );
463 return; 463 return;
464 } 464 }
465} 465}
466void KABCore::toggleBeamReceive( ) 466void KABCore::toggleBeamReceive( )
467{ 467{
468 if ( mBRdisabled ) 468 if ( mBRdisabled )
469 return; 469 return;
470#ifndef DESKTOP_VERSION 470#ifndef DESKTOP_VERSION
471 if ( infrared ) { 471 if ( infrared ) {
472 qDebug("KA: AB disable BeamReceive "); 472 qDebug("KA: AB disable BeamReceive ");
473 delete infrared; 473 delete infrared;
474 infrared = 0; 474 infrared = 0;
475 mActionBR->setChecked(false); 475 mActionBR->setChecked(false);
476 return; 476 return;
477 } 477 }
478 qDebug("KA: AB enable BeamReceive "); 478 qDebug("KA: AB enable BeamReceive ");
479 mActionBR->setChecked(true); 479 mActionBR->setChecked(true);
480 480
481 infrared = new QCopChannel("QPE/Application/addressbook",this, "channelAB" ) ; 481 infrared = new QCopChannel("QPE/Application/addressbook",this, "channelAB" ) ;
482 QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(receive( const QCString&, const QByteArray& ))); 482 QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(receive( const QCString&, const QByteArray& )));
483#endif 483#endif
484} 484}
485 485
486 486
487void KABCore::disableBR(bool b) 487void KABCore::disableBR(bool b)
488{ 488{
489#ifndef DESKTOP_VERSION 489#ifndef DESKTOP_VERSION
490 if ( b ) { 490 if ( b ) {
491 if ( infrared ) { 491 if ( infrared ) {
492 toggleBeamReceive( ); 492 toggleBeamReceive( );
493 } 493 }
494 mBRdisabled = true; 494 mBRdisabled = true;
495 } else { 495 } else {
496 if ( mBRdisabled ) { 496 if ( mBRdisabled ) {
497 mBRdisabled = false; 497 mBRdisabled = false;
498 //toggleBeamReceive( ); 498 //toggleBeamReceive( );
499 } 499 }
500 } 500 }
501#endif 501#endif
502 502
503} 503}
504void KABCore::recieve( QString fn ) 504void KABCore::recieve( QString fn )
505{ 505{
506 //qDebug("KABCore::recieve "); 506 //qDebug("KABCore::recieve ");
507 int count = mAddressBook->importFromFile( fn, true ); 507 int count = mAddressBook->importFromFile( fn, true );
508 if ( count ) 508 if ( count )
509 setModified( true ); 509 setModified( true );
510 mViewManager->refreshView(); 510 mViewManager->refreshView();
511 message(i18n("%1 contact(s) received!").arg( count )); 511 message(i18n("%1 contact(s) received!").arg( count ));
512 topLevelWidget()->showMaximized(); 512 topLevelWidget()->showMaximized();
513 topLevelWidget()->raise(); 513 topLevelWidget()->raise();
514} 514}
515void KABCore::restoreSettings() 515void KABCore::restoreSettings()
516{ 516{
517 mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce; 517 mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce;
518 518
519 bool state; 519 bool state;
520 520
521 if (mMultipleViewsAtOnce) 521 if (mMultipleViewsAtOnce)
522 state = KABPrefs::instance()->mDetailsPageVisible; 522 state = KABPrefs::instance()->mDetailsPageVisible;
523 else 523 else
524 state = false; 524 state = false;
525 525
526 mActionDetails->setChecked( state ); 526 mActionDetails->setChecked( state );
527 setDetailsVisible( state ); 527 setDetailsVisible( state );
528 528
529 state = KABPrefs::instance()->mJumpButtonBarVisible; 529 state = KABPrefs::instance()->mJumpButtonBarVisible;
530 530
531 mActionJumpBar->setChecked( state ); 531 mActionJumpBar->setChecked( state );
532 setJumpButtonBarVisible( state ); 532 setJumpButtonBarVisible( state );
533/*US 533/*US
534 QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter; 534 QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter;
535 if ( splitterSize.count() == 0 ) { 535 if ( splitterSize.count() == 0 ) {
536 splitterSize.append( width() / 2 ); 536 splitterSize.append( width() / 2 );
537 splitterSize.append( width() / 2 ); 537 splitterSize.append( width() / 2 );
538 } 538 }
539 mMiniSplitter->setSizes( splitterSize ); 539 mMiniSplitter->setSizes( splitterSize );
540 if ( mExtensionBarSplitter ) { 540 if ( mExtensionBarSplitter ) {
541 splitterSize = KABPrefs::instance()->mExtensionsSplitter; 541 splitterSize = KABPrefs::instance()->mExtensionsSplitter;
542 if ( splitterSize.count() == 0 ) { 542 if ( splitterSize.count() == 0 ) {
543 splitterSize.append( width() / 2 ); 543 splitterSize.append( width() / 2 );
544 splitterSize.append( width() / 2 ); 544 splitterSize.append( width() / 2 );
545 } 545 }
546 mExtensionBarSplitter->setSizes( splitterSize ); 546 mExtensionBarSplitter->setSizes( splitterSize );
547 547
548 } 548 }
549*/ 549*/
550 mViewManager->restoreSettings(); 550 mViewManager->restoreSettings();
551 mIncSearchWidget->setCurrentItem( KABPrefs::instance()->mCurrentIncSearchField ); 551 mIncSearchWidget->setCurrentItem( KABPrefs::instance()->mCurrentIncSearchField );
552 mExtensionManager->restoreSettings(); 552 mExtensionManager->restoreSettings();
553#ifdef DESKTOP_VERSION 553#ifdef DESKTOP_VERSION
554 int wid = width(); 554 int wid = width();
555 if ( wid < 10 ) 555 if ( wid < 10 )
556 wid = 400; 556 wid = 400;
557#else 557#else
558 int wid = QApplication::desktop()->width(); 558 int wid = QApplication::desktop()->width();
559 if ( wid < 640 ) 559 if ( wid < 640 )
560 wid = QApplication::desktop()->height(); 560 wid = QApplication::desktop()->height();
561#endif 561#endif
562 QValueList<int> splitterSize;// = KABPrefs::instance()->mDetailsSplitter; 562 QValueList<int> splitterSize;// = KABPrefs::instance()->mDetailsSplitter;
563 if ( true /*splitterSize.count() == 0*/ ) { 563 if ( true /*splitterSize.count() == 0*/ ) {
564 splitterSize.append( wid / 2 ); 564 splitterSize.append( wid / 2 );
565 splitterSize.append( wid / 2 ); 565 splitterSize.append( wid / 2 );
566 } 566 }
567 mMiniSplitter->setSizes( splitterSize ); 567 mMiniSplitter->setSizes( splitterSize );
568 if ( mExtensionBarSplitter ) { 568 if ( mExtensionBarSplitter ) {
569 //splitterSize = KABPrefs::instance()->mExtensionsSplitter; 569 //splitterSize = KABPrefs::instance()->mExtensionsSplitter;
570 if ( true /*splitterSize.count() == 0*/ ) { 570 if ( true /*splitterSize.count() == 0*/ ) {
571 splitterSize.append( wid / 2 ); 571 splitterSize.append( wid / 2 );
572 splitterSize.append( wid / 2 ); 572 splitterSize.append( wid / 2 );
573 } 573 }
574 mExtensionBarSplitter->setSizes( splitterSize ); 574 mExtensionBarSplitter->setSizes( splitterSize );
575 575
576 } 576 }
577#ifdef DESKTOP_VERSION 577#ifdef DESKTOP_VERSION
578 KConfig *config = KABPrefs::instance()->getConfig(); 578 KConfig *config = KABPrefs::instance()->getConfig();
579 config->setGroup("WidgetLayout"); 579 config->setGroup("WidgetLayout");
580 QStringList list; 580 QStringList list;
581 list = config->readListEntry("MainLayout"); 581 list = config->readListEntry("MainLayout");
582 int x,y,w,h; 582 int x,y,w,h;
583 if ( ! list.isEmpty() ) { 583 if ( ! list.isEmpty() ) {
584 x = list[0].toInt(); 584 x = list[0].toInt();
585 y = list[1].toInt(); 585 y = list[1].toInt();
586 w = list[2].toInt(); 586 w = list[2].toInt();
587 h = list[3].toInt(); 587 h = list[3].toInt();
588 KApplication::testCoords( &x,&y,&w,&h ); 588 KApplication::testCoords( &x,&y,&w,&h );
589 topLevelWidget()->setGeometry(x,y,w,h); 589 topLevelWidget()->setGeometry(x,y,w,h);
590 590
591 } else { 591 } else {
592 topLevelWidget()->setGeometry( 40 ,40 , 640, 440); 592 topLevelWidget()->setGeometry( 40 ,40 , 640, 440);
593 } 593 }
594#endif 594#endif
595} 595}
596 596
597void KABCore::saveSettings() 597void KABCore::saveSettings()
598{ 598{
599 KABPrefs::instance()->mJumpButtonBarVisible = mActionJumpBar->isChecked(); 599 KABPrefs::instance()->mJumpButtonBarVisible = mActionJumpBar->isChecked();
600 if ( mExtensionBarSplitter ) 600 if ( mExtensionBarSplitter )
601 KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes(); 601 KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes();
602 KABPrefs::instance()->mDetailsPageVisible = mActionDetails->isChecked(); 602 KABPrefs::instance()->mDetailsPageVisible = mActionDetails->isChecked();
603 KABPrefs::instance()->mDetailsSplitter = mMiniSplitter->sizes(); 603 KABPrefs::instance()->mDetailsSplitter = mMiniSplitter->sizes();
604#ifndef KAB_EMBEDDED 604#ifndef KAB_EMBEDDED
605 605
606 KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes(); 606 KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes();
607 KABPrefs::instance()->mDetailsSplitter = mDetailsSplitter->sizes(); 607 KABPrefs::instance()->mDetailsSplitter = mDetailsSplitter->sizes();
608#endif //KAB_EMBEDDED 608#endif //KAB_EMBEDDED
609 mExtensionManager->saveSettings(); 609 mExtensionManager->saveSettings();
610 mViewManager->saveSettings(); 610 mViewManager->saveSettings();
611 611
612 KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem(); 612 KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem();
613 613
614 KABPrefs::instance()->writeConfig(); 614 KABPrefs::instance()->writeConfig();
615 qDebug("KA: KABCore::saveSettings() "); 615 //qDebug("KA: KABCore::saveSettings() ");
616} 616}
617 617
618KABC::AddressBook *KABCore::addressBook() const 618KABC::AddressBook *KABCore::addressBook() const
619{ 619{
620 return mAddressBook; 620 return mAddressBook;
621} 621}
622 622
623KConfig *KABCore::config() 623KConfig *KABCore::config()
624{ 624{
625#ifndef KAB_EMBEDDED 625#ifndef KAB_EMBEDDED
626 return KABPrefs::instance()->config(); 626 return KABPrefs::instance()->config();
627#else //KAB_EMBEDDED 627#else //KAB_EMBEDDED
628 return KABPrefs::instance()->getConfig(); 628 return KABPrefs::instance()->getConfig();
629#endif //KAB_EMBEDDED 629#endif //KAB_EMBEDDED
630} 630}
631 631
632KActionCollection *KABCore::actionCollection() const 632KActionCollection *KABCore::actionCollection() const
633{ 633{
634 return mGUIClient->actionCollection(); 634 return mGUIClient->actionCollection();
635} 635}
636 636
637KABC::Field *KABCore::currentSearchField() const 637KABC::Field *KABCore::currentSearchField() const
638{ 638{
639 if (mIncSearchWidget) 639 if (mIncSearchWidget)
640 return mIncSearchWidget->currentField(); 640 return mIncSearchWidget->currentField();
641 else 641 else
642 return 0; 642 return 0;
643} 643}
644 644
645QStringList KABCore::selectedUIDs() const 645QStringList KABCore::selectedUIDs() const
646{ 646{
647 return mViewManager->selectedUids(); 647 return mViewManager->selectedUids();
648} 648}
649 649
650KABC::Resource *KABCore::requestResource( QWidget *parent ) 650KABC::Resource *KABCore::requestResource( QWidget *parent )
651{ 651{
652 QPtrList<KABC::Resource> kabcResources = addressBook()->resources(); 652 QPtrList<KABC::Resource> kabcResources = addressBook()->resources();
653 653
654 QPtrList<KRES::Resource> kresResources; 654 QPtrList<KRES::Resource> kresResources;
655 QPtrListIterator<KABC::Resource> resIt( kabcResources ); 655 QPtrListIterator<KABC::Resource> resIt( kabcResources );
656 KABC::Resource *resource; 656 KABC::Resource *resource;
657 while ( ( resource = resIt.current() ) != 0 ) { 657 while ( ( resource = resIt.current() ) != 0 ) {
658 ++resIt; 658 ++resIt;
659 if ( !resource->readOnly() ) { 659 if ( !resource->readOnly() ) {
660 KRES::Resource *res = static_cast<KRES::Resource*>( resource ); 660 KRES::Resource *res = static_cast<KRES::Resource*>( resource );
661 if ( res ) 661 if ( res )
662 kresResources.append( res ); 662 kresResources.append( res );
663 } 663 }
664 } 664 }
665 665
666 KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent ); 666 KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent );
667 return static_cast<KABC::Resource*>( res ); 667 return static_cast<KABC::Resource*>( res );
668} 668}
669 669
670#ifndef KAB_EMBEDDED 670#ifndef KAB_EMBEDDED
671KAboutData *KABCore::createAboutData() 671KAboutData *KABCore::createAboutData()
672#else //KAB_EMBEDDED 672#else //KAB_EMBEDDED
673void KABCore::createAboutData() 673void KABCore::createAboutData()
674#endif //KAB_EMBEDDED 674#endif //KAB_EMBEDDED
675{ 675{
676 676
677 677
678 QString version; 678 QString version;
679#include <../version> 679#include <../version>
680 QMessageBox::about( this, "About KAddressbook/Pi", 680 QMessageBox::about( this, "About KAddressbook/Pi",
681 "KAddressbook/Platform-independent\n" 681 "KAddressbook/Platform-independent\n"
682 "(KA/Pi) " +version + " - " + 682 "(KA/Pi) " +version + " - " +
683#ifdef DESKTOP_VERSION 683#ifdef DESKTOP_VERSION
684 "Desktop Edition\n" 684 "Desktop Edition\n"
685#else 685#else
686 "PDA-Edition\n" 686 "PDA-Edition\n"
687 "for: Zaurus 5500 / 7x0 / 8x0\n" 687 "for: Zaurus 5500 / 7x0 / 8x0\n"
688#endif 688#endif
689 689
690 "(c) 2004 Ulf Schenk\n" 690 "(c) 2004 Ulf Schenk\n"
691 "(c) 2004-2005 Lutz Rogowski\nrogowski@kde.org\n" 691 "(c) 2004-2005 Lutz Rogowski\nrogowski@kde.org\n"
692 "(c) 1997-2003, The KDE PIM Team\n" 692 "(c) 1997-2003, The KDE PIM Team\n"
693 "Tobias Koenig Maintainer\n" 693 "Tobias Koenig Maintainer\n"
694 "Don Sanders Original author\n" 694 "Don Sanders Original author\n"
695 "Cornelius Schumacher Co-maintainer\n" 695 "Cornelius Schumacher Co-maintainer\n"
696 "Mike Pilone GUI and framework redesign\n" 696 "Mike Pilone GUI and framework redesign\n"
697 "Greg Stern DCOP interface\n" 697 "Greg Stern DCOP interface\n"
698 "Mark Westcot Contact pinning\n" 698 "Mark Westcot Contact pinning\n"
699 "Michel Boyer de la Giroday LDAP Lookup\n" 699 "Michel Boyer de la Giroday LDAP Lookup\n"
700 "Steffen Hansen LDAP Lookup" 700 "Steffen Hansen LDAP Lookup"
701#ifdef _WIN32_ 701#ifdef _WIN32_
702 "(c) 2004 Lutz Rogowski Import from OL\nrogowski@kde.org\n" 702 "(c) 2004 Lutz Rogowski Import from OL\nrogowski@kde.org\n"
703#endif 703#endif
704 ); 704 );
705} 705}
706 706
707void KABCore::setContactSelected( const QString &uid ) 707void KABCore::setContactSelected( const QString &uid )
708{ 708{
709 KABC::Addressee addr = mAddressBook->findByUid( uid ); 709 KABC::Addressee addr = mAddressBook->findByUid( uid );
710 if ( !mDetails->isHidden() ) 710 if ( !mDetails->isHidden() )
711 mDetails->setAddressee( addr ); 711 mDetails->setAddressee( addr );
712 712
713 if ( !addr.isEmpty() ) { 713 if ( !addr.isEmpty() ) {
714 emit contactSelected( addr.formattedName() ); 714 emit contactSelected( addr.formattedName() );
715 KABC::Picture pic = addr.photo(); 715 KABC::Picture pic = addr.photo();
716 if ( pic.isIntern() ) { 716 if ( pic.isIntern() ) {
717//US emit contactSelected( pic.data() ); 717//US emit contactSelected( pic.data() );
718//US instead use: 718//US instead use:
719 QPixmap px; 719 QPixmap px;
720 if (pic.data().isNull() != true) 720 if (pic.data().isNull() != true)
721 { 721 {
722 px.convertFromImage(pic.data()); 722 px.convertFromImage(pic.data());
723 } 723 }
724 724
725 emit contactSelected( px ); 725 emit contactSelected( px );
726 } 726 }
727 } 727 }
728 728
729 729
730 mExtensionManager->setSelectionChanged(); 730 mExtensionManager->setSelectionChanged();
731 731
732 // update the actions 732 // update the actions
733 bool selected = !uid.isEmpty(); 733 bool selected = !uid.isEmpty();
734 734
735 if ( mReadWrite ) { 735 if ( mReadWrite ) {
736 mActionCut->setEnabled( selected ); 736 mActionCut->setEnabled( selected );
737 mActionPaste->setEnabled( selected ); 737 mActionPaste->setEnabled( selected );
738 } 738 }
739 739
740 mActionCopy->setEnabled( selected ); 740 mActionCopy->setEnabled( selected );
741 mActionDelete->setEnabled( selected ); 741 mActionDelete->setEnabled( selected );
742 mActionEditAddressee->setEnabled( selected ); 742 mActionEditAddressee->setEnabled( selected );
743 mActionMail->setEnabled( selected ); 743 mActionMail->setEnabled( selected );
744 mActionMailVCard->setEnabled( selected ); 744 mActionMailVCard->setEnabled( selected );
745 //if (mActionBeam) 745 //if (mActionBeam)
746 //mActionBeam->setEnabled( selected ); 746 //mActionBeam->setEnabled( selected );
747 mActionWhoAmI->setEnabled( selected ); 747 mActionWhoAmI->setEnabled( selected );
748} 748}
749 749
750void KABCore::sendMail() 750void KABCore::sendMail()
751{ 751{
752 sendMail( mViewManager->selectedEmails().join( ", " ) ); 752 sendMail( mViewManager->selectedEmails().join( ", " ) );
753} 753}
754 754
755void KABCore::sendMail( const QString& emaillist ) 755void KABCore::sendMail( const QString& emaillist )
756{ 756{
757 // the parameter has the form "name1 <abc@aol.com>,name2 <abc@aol.com>;... " 757 // the parameter has the form "name1 <abc@aol.com>,name2 <abc@aol.com>;... "
758 if (emaillist.contains(",") > 0) 758 if (emaillist.contains(",") > 0)
759 ExternalAppHandler::instance()->mailToMultipleContacts( emaillist, QString::null ); 759 ExternalAppHandler::instance()->mailToMultipleContacts( emaillist, QString::null );
760 else 760 else
761 ExternalAppHandler::instance()->mailToOneContact( emaillist ); 761 ExternalAppHandler::instance()->mailToOneContact( emaillist );
762} 762}
763 763
764 764
765 765
766void KABCore::mailVCard() 766void KABCore::mailVCard()
767{ 767{
768 QStringList uids = mViewManager->selectedUids(); 768 QStringList uids = mViewManager->selectedUids();
769 if ( !uids.isEmpty() ) 769 if ( !uids.isEmpty() )
770 mailVCard( uids ); 770 mailVCard( uids );
771} 771}
772 772
773void KABCore::mailVCard( const QStringList& uids ) 773void KABCore::mailVCard( const QStringList& uids )
774{ 774{
775 QStringList urls; 775 QStringList urls;
776 776
777// QString tmpdir = locateLocal("tmp", KGlobal::getAppName()); 777// QString tmpdir = locateLocal("tmp", KGlobal::getAppName());
778 778
779 QString dirName = "/tmp/" + KApplication::randomString( 8 ); 779 QString dirName = "/tmp/" + KApplication::randomString( 8 );
780 780
781 781
782 782
783 QDir().mkdir( dirName, true ); 783 QDir().mkdir( dirName, true );
784 784
785 for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) { 785 for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
786 KABC::Addressee a = mAddressBook->findByUid( *it ); 786 KABC::Addressee a = mAddressBook->findByUid( *it );
787 787
788 if ( a.isEmpty() ) 788 if ( a.isEmpty() )
789 continue; 789 continue;
790 790
791 QString name = a.givenName() + "_" + a.familyName() + ".vcf"; 791 QString name = a.givenName() + "_" + a.familyName() + ".vcf";
792 792
793 QString fileName = dirName + "/" + name; 793 QString fileName = dirName + "/" + name;
794 794
795 QFile outFile(fileName); 795 QFile outFile(fileName);
796 796
797 if ( outFile.open(IO_WriteOnly) ) { // file opened successfully 797 if ( outFile.open(IO_WriteOnly) ) { // file opened successfully
798 KABC::VCardConverter converter; 798 KABC::VCardConverter converter;
799 QString vcard; 799 QString vcard;
800 800
801 converter.addresseeToVCard( a, vcard ); 801 converter.addresseeToVCard( a, vcard );
802 802
803 QTextStream t( &outFile ); // use a text stream 803 QTextStream t( &outFile ); // use a text stream
804 t.setEncoding( QTextStream::UnicodeUTF8 ); 804 t.setEncoding( QTextStream::UnicodeUTF8 );
805 t << vcard; 805 t << vcard;
806 806
807 outFile.close(); 807 outFile.close();
808 808
809 urls.append( fileName ); 809 urls.append( fileName );
810 } 810 }
811 } 811 }
812 812
813 bool result = ExternalAppHandler::instance()->mailToMultipleContacts( QString::null, urls.join(", ") ); 813 bool result = ExternalAppHandler::instance()->mailToMultipleContacts( QString::null, urls.join(", ") );
814 814
815 815
816/*US 816/*US
817 kapp->invokeMailer( QString::null, QString::null, QString::null, 817 kapp->invokeMailer( QString::null, QString::null, QString::null,
818 QString::null, // subject 818 QString::null, // subject
819 QString::null, // body 819 QString::null, // body
820 QString::null, 820 QString::null,
821 urls ); // attachments 821 urls ); // attachments
822*/ 822*/
823 823
824} 824}
825 825
826/** 826/**
827 Beams the "WhoAmI contact. 827 Beams the "WhoAmI contact.
828*/ 828*/
829void KABCore::beamMySelf() 829void KABCore::beamMySelf()
830{ 830{
831 KABC::Addressee a = KABC::StdAddressBook::self()->whoAmI(); 831 KABC::Addressee a = KABC::StdAddressBook::self()->whoAmI();
832 if (!a.isEmpty()) 832 if (!a.isEmpty())
833 { 833 {
834 QStringList uids; 834 QStringList uids;
835 uids << a.uid(); 835 uids << a.uid();
836 836
837 beamVCard(uids); 837 beamVCard(uids);
838 } else { 838 } else {
839 KMessageBox::information( this, i18n( "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n" ) ); 839 KMessageBox::information( this, i18n( "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n" ) );
840 840
841 841
842 } 842 }
843} 843}
844void KABCore::updateMainWindow() 844void KABCore::updateMainWindow()
845{ 845{
846 mMainWindow->showMaximized(); 846 mMainWindow->showMaximized();
847 mMainWindow->update(); 847 //mMainWindow->repaint();
848} 848}
849void KABCore::resizeEvent(QResizeEvent* e ) 849void KABCore::resizeEvent(QResizeEvent* e )
850{ 850{
851 if ( !mMiniSplitter ) 851 if ( !mMiniSplitter )
852 return; 852 return;
853 //qDebug("KABCore::resizeEvent(QResizeEvent* e ) "); 853 static int desktop_width = 0;
854 if ( e->oldSize().width() != e->size().width() ) 854 //qDebug("KABCore::resizeEvent %d %d ",desktop_width,QApplication::desktop()->width() );
855 if ( desktop_width != QApplication::desktop()->width() )
855 if ( QApplication::desktop()->width() >= 480 ) { 856 if ( QApplication::desktop()->width() >= 480 ) {
856 if (QApplication::desktop()->width() == 640 ) { // e.g. 640x480 857 if (QApplication::desktop()->width() == 640 ) { // e.g. 640x480
858 //qDebug("640 ");
857 if ( mMiniSplitter->orientation() == Qt::Vertical ) { 859 if ( mMiniSplitter->orientation() == Qt::Vertical ) {
860 //qDebug("switch V->H ");
858 mMiniSplitter->setOrientation( Qt::Horizontal); 861 mMiniSplitter->setOrientation( Qt::Horizontal);
859 mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); 862 mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
860 } 863 }
861 if ( QApplication::desktop()->width() <= 640 ) { 864 if ( QApplication::desktop()->width() <= 640 ) {
865 bool shot = mMainWindow->isVisible();
862 mMainWindow->showMinimized(); 866 mMainWindow->showMinimized();
863 //mMainWindow->setMaximumSize( QApplication::desktop()->size() ); 867 //mMainWindow->setMaximumSize( QApplication::desktop()->size() );
864 mViewManager->getFilterAction()->setComboWidth( 150 ); 868 mViewManager->getFilterAction()->setComboWidth( 150 );
865 if ( mIncSearchWidget ) 869 if ( mIncSearchWidget )
866 mIncSearchWidget->setSize(); 870 mIncSearchWidget->setSize();
867 QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); 871 if ( shot )
872 QTimer::singleShot( 1, this , SLOT ( updateMainWindow()));
868 } 873 }
869 874
870 } else if (QApplication::desktop()->width() == 480 ){// e.g. 480x640 875 } else if (QApplication::desktop()->width() == 480 ){// e.g. 480x640
876 //qDebug("480 ");
871 if ( mMiniSplitter->orientation() == Qt::Horizontal ) { 877 if ( mMiniSplitter->orientation() == Qt::Horizontal ) {
878 //qDebug("switch H->V ");
872 mMiniSplitter->setOrientation( Qt::Vertical ); 879 mMiniSplitter->setOrientation( Qt::Vertical );
873 mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); 880 mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
874 } 881 }
875 if ( QApplication::desktop()->width() <= 640 ) { 882 if ( QApplication::desktop()->width() <= 640 ) {
876 //mMainWindow->setMaximumSize( QApplication::desktop()->size() ); 883 //mMainWindow->setMaximumSize( QApplication::desktop()->size() );
884 bool shot = mMainWindow->isVisible();
877 mMainWindow->showMinimized(); 885 mMainWindow->showMinimized();
878 if ( KABPrefs::instance()->mHideSearchOnSwitch ) { 886 if ( KABPrefs::instance()->mHideSearchOnSwitch ) {
879 if ( mIncSearchWidget ) { 887 if ( mIncSearchWidget ) {
880 mIncSearchWidget->setSize(); 888 mIncSearchWidget->setSize();
881 } 889 }
882 } else { 890 } else {
883 mViewManager->getFilterAction()->setComboWidth( 0 ); 891 mViewManager->getFilterAction()->setComboWidth( 0 );
884 } 892 }
885 QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); 893 if ( shot )
894 QTimer::singleShot( 1, this , SLOT ( updateMainWindow()));
886 } 895 }
887 } 896 }
888 } 897 }
898 desktop_width = QApplication::desktop()->width();
889 QWidget::resizeEvent( e ); 899 QWidget::resizeEvent( e );
890 900
891} 901}
892void KABCore::export2phone() 902void KABCore::export2phone()
893{ 903{
894 904
895 QStringList uids; 905 QStringList uids;
896 XXPortSelectDialog dlg( this, false, this ); 906 XXPortSelectDialog dlg( this, false, this );
897 if ( dlg.exec() ) 907 if ( dlg.exec() )
898 uids = dlg.uids(); 908 uids = dlg.uids();
899 else 909 else
900 return; 910 return;
901 if ( uids.isEmpty() ) 911 if ( uids.isEmpty() )
902 return; 912 return;
903 // qDebug("count %d ", uids.count()); 913 // qDebug("count %d ", uids.count());
904 914
905 KAex2phonePrefs ex2phone; 915 KAex2phonePrefs ex2phone;
906 ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); 916 ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection );
907 ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); 917 ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice );
908 ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); 918 ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel );
909 919
910 if ( !ex2phone.exec() ) { 920 if ( !ex2phone.exec() ) {
911 return; 921 return;
912 } 922 }
913 KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); 923 KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text();
914 KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); 924 KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text();
915 KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); 925 KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text();
916 926
917 927
918 PhoneAccess::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice, 928 PhoneAccess::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice,
919 KPimGlobalPrefs::instance()->mEx2PhoneConnection, 929 KPimGlobalPrefs::instance()->mEx2PhoneConnection,
920 KPimGlobalPrefs::instance()->mEx2PhoneModel ); 930 KPimGlobalPrefs::instance()->mEx2PhoneModel );
921 931
922 QString fileName = getPhoneFile(); 932 QString fileName = getPhoneFile();
923 if ( ! mAddressBook->export2PhoneFormat( uids ,fileName ) ) 933 if ( ! mAddressBook->export2PhoneFormat( uids ,fileName ) )
924 return; 934 return;
925 935
926 message(i18n("Exporting to phone...")); 936 message(i18n("Exporting to phone..."));
927 QTimer::singleShot( 1, this , SLOT ( writeToPhone())); 937 QTimer::singleShot( 1, this , SLOT ( writeToPhone()));
928 938
929} 939}
930QString KABCore::getPhoneFile() 940QString KABCore::getPhoneFile()
931{ 941{
932#ifdef DESKTOP_VERSION 942#ifdef DESKTOP_VERSION
933 return locateLocal("tmp", "phonefile.vcf"); 943 return locateLocal("tmp", "phonefile.vcf");
934#else 944#else
935 return "/tmp/phonefile.vcf"; 945 return "/tmp/phonefile.vcf";
936#endif 946#endif
937 947
938} 948}
939void KABCore::writeToPhone( ) 949void KABCore::writeToPhone( )
940{ 950{
941 if ( PhoneAccess::writeToPhone( getPhoneFile() ) ) 951 if ( PhoneAccess::writeToPhone( getPhoneFile() ) )
942 message(i18n("Export to phone finished!")); 952 message(i18n("Export to phone finished!"));
943 else 953 else
944 qDebug(i18n("KA: Error exporting to phone")); 954 qDebug(i18n("KA: Error exporting to phone"));
945} 955}
946void KABCore::beamVCard() 956void KABCore::beamVCard()
947{ 957{
948 QStringList uids; 958 QStringList uids;
949 XXPortSelectDialog dlg( this, false, this ); 959 XXPortSelectDialog dlg( this, false, this );
950 if ( dlg.exec() ) 960 if ( dlg.exec() )
951 uids = dlg.uids(); 961 uids = dlg.uids();
952 else 962 else
953 return; 963 return;
954 if ( uids.isEmpty() ) 964 if ( uids.isEmpty() )
955 return; 965 return;
956 beamVCard( uids ); 966 beamVCard( uids );
957} 967}
958 968
959 969
960void KABCore::beamVCard(const QStringList& uids) 970void KABCore::beamVCard(const QStringList& uids)
961{ 971{
962 972
963 // LR: we should use the /tmp dir on the Zaurus, 973 // LR: we should use the /tmp dir on the Zaurus,
964 // because: /tmp = RAM, (HOME)/kdepim = flash memory 974 // because: /tmp = RAM, (HOME)/kdepim = flash memory
965 975
966#ifdef DESKTOP_VERSION 976#ifdef DESKTOP_VERSION
967 QString fileName = locateLocal("tmp", "kapibeamfile.vcf"); 977 QString fileName = locateLocal("tmp", "kapibeamfile.vcf");
968#else 978#else
969 QString fileName = "/tmp/kapibeamfile.vcf"; 979 QString fileName = "/tmp/kapibeamfile.vcf";
970#endif 980#endif
971 981
972 KABC::VCardConverter converter; 982 KABC::VCardConverter converter;
973 QString description; 983 QString description;
974 QString datastream; 984 QString datastream;
975 for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) { 985 for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
976 KABC::Addressee a = mAddressBook->findByUid( *it ); 986 KABC::Addressee a = mAddressBook->findByUid( *it );
977 987
978 if ( a.isEmpty() ) 988 if ( a.isEmpty() )
979 continue; 989 continue;
980 990
981 if (description.isEmpty()) 991 if (description.isEmpty())
982 description = a.formattedName(); 992 description = a.formattedName();
983 993
984 QString vcard; 994 QString vcard;
985 converter.addresseeToVCard( a, vcard ); 995 converter.addresseeToVCard( a, vcard );
986 int start = 0; 996 int start = 0;
987 int next; 997 int next;
988 while ( (next = vcard.find("TYPE=", start) )>= 0 ) { 998 while ( (next = vcard.find("TYPE=", start) )>= 0 ) {
989 int semi = vcard.find(";", next); 999 int semi = vcard.find(";", next);
990 int dopp = vcard.find(":", next); 1000 int dopp = vcard.find(":", next);
991 int sep; 1001 int sep;
992 if ( semi < dopp && semi >= 0 ) 1002 if ( semi < dopp && semi >= 0 )
993 sep = semi ; 1003 sep = semi ;
994 else 1004 else
995 sep = dopp; 1005 sep = dopp;
996 datastream +=vcard.mid( start, next - start); 1006 datastream +=vcard.mid( start, next - start);
997 datastream +=vcard.mid( next+5,sep -next -5 ).upper(); 1007 datastream +=vcard.mid( next+5,sep -next -5 ).upper();
998 start = sep; 1008 start = sep;
999 } 1009 }
1000 datastream += vcard.mid( start,vcard.length() ); 1010 datastream += vcard.mid( start,vcard.length() );
1001 } 1011 }
1002#ifndef DESKTOP_VERSION 1012#ifndef DESKTOP_VERSION
1003 QFile outFile(fileName); 1013 QFile outFile(fileName);
1004 if ( outFile.open(IO_WriteOnly) ) { 1014 if ( outFile.open(IO_WriteOnly) ) {
1005 datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" ); 1015 datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" );
1006 QTextStream t( &outFile ); // use a text stream 1016 QTextStream t( &outFile ); // use a text stream
1007 //t.setEncoding( QTextStream::UnicodeUTF8 ); 1017 //t.setEncoding( QTextStream::UnicodeUTF8 );
1008 t.setEncoding( QTextStream::Latin1 ); 1018 t.setEncoding( QTextStream::Latin1 );
1009 t <<datastream.latin1(); 1019 t <<datastream.latin1();
1010 outFile.close(); 1020 outFile.close();
1011 Ir *ir = new Ir( this ); 1021 Ir *ir = new Ir( this );
1012 connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) ); 1022 connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
1013 ir->send( fileName, description, "text/x-vCard" ); 1023 ir->send( fileName, description, "text/x-vCard" );
1014 } else { 1024 } else {
1015 qDebug("KA: Error open temp beam file "); 1025 qDebug("KA: Error open temp beam file ");
1016 return; 1026 return;
1017 } 1027 }
1018#endif 1028#endif
1019 1029
1020} 1030}
1021 1031
1022void KABCore::beamDone( Ir *ir ) 1032void KABCore::beamDone( Ir *ir )
1023{ 1033{
1024#ifndef DESKTOP_VERSION 1034#ifndef DESKTOP_VERSION
1025 delete ir; 1035 delete ir;
1026#endif 1036#endif
1027 topLevelWidget()->raise(); 1037 topLevelWidget()->raise();
1028 message( i18n("Beaming finished!") ); 1038 message( i18n("Beaming finished!") );
1029} 1039}
1030 1040
1031 1041
1032void KABCore::browse( const QString& url ) 1042void KABCore::browse( const QString& url )
1033{ 1043{
1034#ifndef KAB_EMBEDDED 1044#ifndef KAB_EMBEDDED
1035 kapp->invokeBrowser( url ); 1045 kapp->invokeBrowser( url );
1036#else //KAB_EMBEDDED 1046#else //KAB_EMBEDDED
1037 qDebug("KABCore::browse must be fixed"); 1047 qDebug("KABCore::browse must be fixed");
1038#endif //KAB_EMBEDDED 1048#endif //KAB_EMBEDDED
1039} 1049}
1040 1050
1041void KABCore::selectAllContacts() 1051void KABCore::selectAllContacts()
1042{ 1052{
1043 mViewManager->setSelected( QString::null, true ); 1053 mViewManager->setSelected( QString::null, true );
1044} 1054}
1045 1055
1046void KABCore::deleteContacts() 1056void KABCore::deleteContacts()
1047{ 1057{
1048 QStringList uidList = mViewManager->selectedUids(); 1058 QStringList uidList = mViewManager->selectedUids();
1049 deleteContacts( uidList ); 1059 deleteContacts( uidList );
1050} 1060}
1051 1061
1052void KABCore::deleteContacts( const QStringList &uids ) 1062void KABCore::deleteContacts( const QStringList &uids )
1053{ 1063{
1054 1064
1055 if ( uids.count() > 0 ) { 1065 if ( uids.count() > 0 ) {
1056 1066
1057 if ( KABPrefs::instance()->mAskForDelete ) { 1067 if ( KABPrefs::instance()->mAskForDelete ) {
1058 int count = uids.count(); 1068 int count = uids.count();
1059 if ( count > 5 ) count = 5; 1069 if ( count > 5 ) count = 5;
1060 QString cNames; 1070 QString cNames;
1061 int i; 1071 int i;
1062 for ( i = 0; i < count ; ++i ) { 1072 for ( i = 0; i < count ; ++i ) {
1063 cNames += KGlobal::formatMessage( mAddressBook->findByUid( uids[i] ).realName() ,0) + "\n"; 1073 cNames += KGlobal::formatMessage( mAddressBook->findByUid( uids[i] ).realName() ,0) + "\n";
1064 } 1074 }
1065 if ( uids.count() > 5 ) 1075 if ( uids.count() > 5 )
1066 cNames += i18n("...and %1 more\ncontact(s) selected").arg( uids.count() - 5 ); 1076 cNames += i18n("...and %1 more\ncontact(s) selected").arg( uids.count() - 5 );
1067 QString text = i18n( "Do you really\nwant to delete the\nsetected contact(s)?\n\n" ) + cNames ; 1077 QString text = i18n( "Do you really\nwant to delete the\nsetected contact(s)?\n\n" ) + cNames ;
1068 if ( KMessageBox::questionYesNo( this, text ) != KMessageBox::Yes ) 1078 if ( KMessageBox::questionYesNo( this, text ) != KMessageBox::Yes )
1069 return; 1079 return;
1070 } 1080 }
1071 PwDeleteCommand *command = new PwDeleteCommand( mAddressBook, uids ); 1081 PwDeleteCommand *command = new PwDeleteCommand( mAddressBook, uids );
1072 UndoStack::instance()->push( command ); 1082 UndoStack::instance()->push( command );
1073 RedoStack::instance()->clear(); 1083 RedoStack::instance()->clear();
1074 1084
1075 // now if we deleted anything, refresh 1085 // now if we deleted anything, refresh
1076 setContactSelected( QString::null ); 1086 setContactSelected( QString::null );
1077 setModified( true ); 1087 setModified( true );
1078 } 1088 }
1079} 1089}
1080 1090
1081void KABCore::copyContacts() 1091void KABCore::copyContacts()
1082{ 1092{
1083 KABC::Addressee::List addrList = mViewManager->selectedAddressees(); 1093 KABC::Addressee::List addrList = mViewManager->selectedAddressees();
1084 1094
1085 QString clipText = AddresseeUtil::addresseesToClipboard( addrList ); 1095 QString clipText = AddresseeUtil::addresseesToClipboard( addrList );
1086 1096
1087 kdDebug(5720) << "KABCore::copyContacts: " << clipText << endl; 1097 kdDebug(5720) << "KABCore::copyContacts: " << clipText << endl;
1088 1098
1089 QClipboard *cb = QApplication::clipboard(); 1099 QClipboard *cb = QApplication::clipboard();
1090 cb->setText( clipText ); 1100 cb->setText( clipText );
1091} 1101}
1092 1102
1093void KABCore::cutContacts() 1103void KABCore::cutContacts()
1094{ 1104{
1095 QStringList uidList = mViewManager->selectedUids(); 1105 QStringList uidList = mViewManager->selectedUids();
1096 1106
1097//US if ( uidList.size() > 0 ) { 1107//US if ( uidList.size() > 0 ) {
1098 if ( uidList.count() > 0 ) { 1108 if ( uidList.count() > 0 ) {
1099 PwCutCommand *command = new PwCutCommand( mAddressBook, uidList ); 1109 PwCutCommand *command = new PwCutCommand( mAddressBook, uidList );
1100 UndoStack::instance()->push( command ); 1110 UndoStack::instance()->push( command );
1101 RedoStack::instance()->clear(); 1111 RedoStack::instance()->clear();
1102 1112
1103 setModified( true ); 1113 setModified( true );
1104 } 1114 }
1105} 1115}
1106 1116
1107void KABCore::pasteContacts() 1117void KABCore::pasteContacts()
1108{ 1118{
1109 QClipboard *cb = QApplication::clipboard(); 1119 QClipboard *cb = QApplication::clipboard();
1110 1120
1111 KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( cb->text() ); 1121 KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( cb->text() );
1112 1122
1113 pasteContacts( list ); 1123 pasteContacts( list );
1114} 1124}
1115 1125
1116void KABCore::pasteContacts( KABC::Addressee::List &list ) 1126void KABCore::pasteContacts( KABC::Addressee::List &list )
1117{ 1127{
1118 KABC::Resource *resource = requestResource( this ); 1128 KABC::Resource *resource = requestResource( this );
1119 KABC::Addressee::List::Iterator it; 1129 KABC::Addressee::List::Iterator it;
1120 for ( it = list.begin(); it != list.end(); ++it ) 1130 for ( it = list.begin(); it != list.end(); ++it )
1121 (*it).setResource( resource ); 1131 (*it).setResource( resource );
1122 1132
1123 PwPasteCommand *command = new PwPasteCommand( this, list ); 1133 PwPasteCommand *command = new PwPasteCommand( this, list );
1124 UndoStack::instance()->push( command ); 1134 UndoStack::instance()->push( command );
1125 RedoStack::instance()->clear(); 1135 RedoStack::instance()->clear();
1126 1136
1127 setModified( true ); 1137 setModified( true );
1128} 1138}
1129 1139
1130void KABCore::setWhoAmI() 1140void KABCore::setWhoAmI()
1131{ 1141{
1132 KABC::Addressee::List addrList = mViewManager->selectedAddressees(); 1142 KABC::Addressee::List addrList = mViewManager->selectedAddressees();
1133 1143
1134 if ( addrList.count() > 1 ) { 1144 if ( addrList.count() > 1 ) {
1135 KMessageBox::sorry( this, i18n( "Please select only one contact." ) ); 1145 KMessageBox::sorry( this, i18n( "Please select only one contact." ) );
1136 return; 1146 return;
1137 } 1147 }
1138 1148
1139 QString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) ); 1149 QString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) );
1140 if ( KMessageBox::questionYesNo( this, text.arg( addrList[ 0 ].realName() ) ) == KMessageBox::Yes ) 1150 if ( KMessageBox::questionYesNo( this, text.arg( addrList[ 0 ].realName() ) ) == KMessageBox::Yes )
1141 static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self() )->setWhoAmI( addrList[ 0 ] ); 1151 static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self() )->setWhoAmI( addrList[ 0 ] );
1142} 1152}
1143void KABCore::editCategories() 1153void KABCore::editCategories()
1144{ 1154{
1145 KPIM::CategoryEditDialog dlg ( KABPrefs::instance(), this, "", true ); 1155 KPIM::CategoryEditDialog dlg ( KABPrefs::instance(), this, "", true );
1146 dlg.exec(); 1156 dlg.exec();
1147} 1157}
1148void KABCore::setCategories() 1158void KABCore::setCategories()
1149{ 1159{
1150 1160
1151 QStringList uids; 1161 QStringList uids;
1152 XXPortSelectDialog dlgx( this, false, this ); 1162 XXPortSelectDialog dlgx( this, false, this );
1153 if ( dlgx.exec() ) 1163 if ( dlgx.exec() )
1154 uids = dlgx.uids(); 1164 uids = dlgx.uids();
1155 else 1165 else
1156 return; 1166 return;
1157 if ( uids.isEmpty() ) 1167 if ( uids.isEmpty() )
1158 return; 1168 return;
1159 // qDebug("count %d ", uids.count()); 1169 // qDebug("count %d ", uids.count());
1160 1170
1161 1171
1162 KPIM::CategorySelectDialog dlg( KABPrefs::instance(), this, "", true ); 1172 KPIM::CategorySelectDialog dlg( KABPrefs::instance(), this, "", true );
1163 if ( !dlg.exec() ) { 1173 if ( !dlg.exec() ) {
1164 message( i18n("Setting categories cancelled") ); 1174 message( i18n("Setting categories cancelled") );
1165 return; 1175 return;
1166 } 1176 }
1167 bool merge = false; 1177 bool merge = false;
1168 QString msg = i18n( "Merge with existing categories?" ); 1178 QString msg = i18n( "Merge with existing categories?" );
1169 if ( KMessageBox::questionYesNo( this, msg ) == KMessageBox::Yes ) 1179 if ( KMessageBox::questionYesNo( this, msg ) == KMessageBox::Yes )
1170 merge = true; 1180 merge = true;
1171 1181
1172 message( i18n("Setting categories ... please wait!") ); 1182 message( i18n("Setting categories ... please wait!") );
1173 QStringList categories = dlg.selectedCategories(); 1183 QStringList categories = dlg.selectedCategories();
1174 1184
1175 //QStringList uids = mViewManager->selectedUids(); 1185 //QStringList uids = mViewManager->selectedUids();
1176 QStringList::Iterator it; 1186 QStringList::Iterator it;
1177 for ( it = uids.begin(); it != uids.end(); ++it ) { 1187 for ( it = uids.begin(); it != uids.end(); ++it ) {
1178 KABC::Addressee addr = mAddressBook->findByUid( *it ); 1188 KABC::Addressee addr = mAddressBook->findByUid( *it );
1179 if ( !addr.isEmpty() ) { 1189 if ( !addr.isEmpty() ) {
1180 if ( !merge ) 1190 if ( !merge )
1181 addr.setCategories( categories ); 1191 addr.setCategories( categories );
1182 else { 1192 else {
1183 QStringList addrCategories = addr.categories(); 1193 QStringList addrCategories = addr.categories();
1184 QStringList::Iterator catIt; 1194 QStringList::Iterator catIt;
1185 for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) { 1195 for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
1186 if ( !addrCategories.contains( *catIt ) ) 1196 if ( !addrCategories.contains( *catIt ) )
1187 addrCategories.append( *catIt ); 1197 addrCategories.append( *catIt );
1188 } 1198 }
1189 addr.setCategories( addrCategories ); 1199 addr.setCategories( addrCategories );
1190 } 1200 }
1191 mAddressBook->insertAddressee( addr ); 1201 mAddressBook->insertAddressee( addr );
1192 } 1202 }
1193 } 1203 }
1194 1204
1195 if ( uids.count() > 0 ) 1205 if ( uids.count() > 0 )
1196 setModified( true ); 1206 setModified( true );
1197 message( i18n("Setting categories completed!") ); 1207 message( i18n("Setting categories completed!") );
1198} 1208}
1199 1209
1200void KABCore::setSearchFields( const KABC::Field::List &fields ) 1210void KABCore::setSearchFields( const KABC::Field::List &fields )
1201{ 1211{
1202 mIncSearchWidget->setFields( fields ); 1212 mIncSearchWidget->setFields( fields );
1203} 1213}
1204 1214
1205void KABCore::incrementalSearch( const QString& text ) 1215void KABCore::incrementalSearch( const QString& text )
1206{ 1216{
1207 QString stext; 1217 QString stext;
1208 if ( KABPrefs::instance()->mAutoSearchWithWildcard ) { 1218 if ( KABPrefs::instance()->mAutoSearchWithWildcard ) {
1209 stext = "*" + text; 1219 stext = "*" + text;
1210 } else { 1220 } else {
1211 stext = text; 1221 stext = text;
1212 } 1222 }
1213 mViewManager->doSearch( stext, mIncSearchWidget->currentField() ); 1223 mViewManager->doSearch( stext, mIncSearchWidget->currentField() );
1214} 1224}
1215void KABCore::incrementalSearchJump( const QString& text ) 1225void KABCore::incrementalSearchJump( const QString& text )
1216{ 1226{
1217 mViewManager->doSearch( text, mIncSearchWidget->currentField() ); 1227 mViewManager->doSearch( text, mIncSearchWidget->currentField() );
1218} 1228}
1219 1229
1220void KABCore::setModified() 1230void KABCore::setModified()
1221{ 1231{
1222 setModified( true ); 1232 setModified( true );
1223} 1233}
1224 1234
1225void KABCore::setModifiedWOrefresh() 1235void KABCore::setModifiedWOrefresh()
1226{ 1236{
1227 // qDebug("KABCore::setModifiedWOrefresh() "); 1237 // qDebug("KABCore::setModifiedWOrefresh() ");
1228 mModified = true; 1238 mModified = true;
1229 mActionSave->setEnabled( mModified ); 1239 mActionSave->setEnabled( mModified );
1230 1240
1231 1241
1232} 1242}
1233void KABCore::setModified( bool modified ) 1243void KABCore::setModified( bool modified )
1234{ 1244{
1235 mModified = modified; 1245 mModified = modified;
1236 mActionSave->setEnabled( mModified ); 1246 mActionSave->setEnabled( mModified );
1237 1247
1238 if ( modified ) 1248 if ( modified )
1239 mJumpButtonBar->recreateButtons(); 1249 mJumpButtonBar->recreateButtons();
1240 1250
1241 mViewManager->refreshView(); 1251 mViewManager->refreshView();
1242 1252
1243} 1253}
1244 1254
1245bool KABCore::modified() const 1255bool KABCore::modified() const
1246{ 1256{
1247 return mModified; 1257 return mModified;
1248} 1258}
1249 1259
1250void KABCore::contactModified( const KABC::Addressee &addr ) 1260void KABCore::contactModified( const KABC::Addressee &addr )
1251{ 1261{
1252 addrModified( addr ); 1262 addrModified( addr );
1253#if 0 // debug only 1263#if 0 // debug only
1254 KABC::Addressee ad = addr; 1264 KABC::Addressee ad = addr;
1255 ad.computeCsum( "123"); 1265 ad.computeCsum( "123");
1256#endif 1266#endif
1257} 1267}
1258 1268
1259void KABCore::addrModified( const KABC::Addressee &addr ,bool updateDetails ) 1269void KABCore::addrModified( const KABC::Addressee &addr ,bool updateDetails )
1260{ 1270{
1261 1271
1262 Command *command = 0; 1272 Command *command = 0;
1263 QString uid; 1273 QString uid;
1264 1274
1265 // check if it exists already 1275 // check if it exists already
1266 KABC::Addressee origAddr = mAddressBook->findByUid( addr.uid() ); 1276 KABC::Addressee origAddr = mAddressBook->findByUid( addr.uid() );
1267 if ( origAddr.isEmpty() ) 1277 if ( origAddr.isEmpty() )
1268 command = new PwNewCommand( mAddressBook, addr ); 1278 command = new PwNewCommand( mAddressBook, addr );
1269 else { 1279 else {
1270 command = new PwEditCommand( mAddressBook, origAddr, addr ); 1280 command = new PwEditCommand( mAddressBook, origAddr, addr );
1271 uid = addr.uid(); 1281 uid = addr.uid();
1272 } 1282 }
1273 1283
1274 UndoStack::instance()->push( command ); 1284 UndoStack::instance()->push( command );
1275 RedoStack::instance()->clear(); 1285 RedoStack::instance()->clear();
1276 if ( updateDetails ) 1286 if ( updateDetails )
1277 mDetails->setAddressee( addr ); 1287 mDetails->setAddressee( addr );
1278 setModified( true ); 1288 setModified( true );
1279} 1289}
1280 1290
1281void KABCore::newContact() 1291void KABCore::newContact()
1282{ 1292{
1283 1293
1284 1294
1285 QPtrList<KABC::Resource> kabcResources = mAddressBook->resources(); 1295 QPtrList<KABC::Resource> kabcResources = mAddressBook->resources();
1286 1296
1287 QPtrList<KRES::Resource> kresResources; 1297 QPtrList<KRES::Resource> kresResources;
1288 QPtrListIterator<KABC::Resource> it( kabcResources ); 1298 QPtrListIterator<KABC::Resource> it( kabcResources );
1289 KABC::Resource *resource; 1299 KABC::Resource *resource;
1290 while ( ( resource = it.current() ) != 0 ) { 1300 while ( ( resource = it.current() ) != 0 ) {
1291 ++it; 1301 ++it;
1292 if ( !resource->readOnly() ) { 1302 if ( !resource->readOnly() ) {
1293 KRES::Resource *res = static_cast<KRES::Resource*>( resource ); 1303 KRES::Resource *res = static_cast<KRES::Resource*>( resource );
1294 if ( res ) 1304 if ( res )
1295 kresResources.append( res ); 1305 kresResources.append( res );
1296 } 1306 }
1297 } 1307 }
1298 1308
1299 KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, this ); 1309 KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, this );
1300 resource = static_cast<KABC::Resource*>( res ); 1310 resource = static_cast<KABC::Resource*>( res );
1301 1311
1302 if ( resource ) { 1312 if ( resource ) {
1303 KABC::Addressee addr; 1313 KABC::Addressee addr;
1304 addr.setResource( resource ); 1314 addr.setResource( resource );
1305 mEditorDialog->setAddressee( addr ); 1315 mEditorDialog->setAddressee( addr );
1306 mEditorDialog->setCaption( i18n("Edit new contact")); 1316 mEditorDialog->setCaption( i18n("Edit new contact"));
1307 KApplication::execDialog ( mEditorDialog ); 1317 KApplication::execDialog ( mEditorDialog );
1308 1318
1309 } else 1319 } else
1310 return; 1320 return;
1311 1321
1312 // mEditorDict.insert( dialog->addressee().uid(), dialog ); 1322 // mEditorDict.insert( dialog->addressee().uid(), dialog );
1313 1323
1314 1324
1315} 1325}
1316 1326
1317void KABCore::addEmail( QString aStr ) 1327void KABCore::addEmail( QString aStr )
1318{ 1328{
1319#ifndef KAB_EMBEDDED 1329#ifndef KAB_EMBEDDED
1320 QString fullName, email; 1330 QString fullName, email;
1321 1331
1322 KABC::Addressee::parseEmailAddress( aStr, fullName, email ); 1332 KABC::Addressee::parseEmailAddress( aStr, fullName, email );
1323 1333
1324 // Try to lookup the addressee matching the email address 1334 // Try to lookup the addressee matching the email address
1325 bool found = false; 1335 bool found = false;
1326 QStringList emailList; 1336 QStringList emailList;
1327 KABC::AddressBook::Iterator it; 1337 KABC::AddressBook::Iterator it;
1328 for ( it = mAddressBook->begin(); !found && (it != mAddressBook->end()); ++it ) { 1338 for ( it = mAddressBook->begin(); !found && (it != mAddressBook->end()); ++it ) {
1329 emailList = (*it).emails(); 1339 emailList = (*it).emails();
1330 if ( emailList.contains( email ) > 0 ) { 1340 if ( emailList.contains( email ) > 0 ) {
1331 found = true; 1341 found = true;
1332 (*it).setNameFromString( fullName ); 1342 (*it).setNameFromString( fullName );
1333 editContact( (*it).uid() ); 1343 editContact( (*it).uid() );
1334 } 1344 }
1335 } 1345 }
1336 1346
1337 if ( !found ) { 1347 if ( !found ) {
1338 KABC::Addressee addr; 1348 KABC::Addressee addr;
1339 addr.setNameFromString( fullName ); 1349 addr.setNameFromString( fullName );
1340 addr.insertEmail( email, true ); 1350 addr.insertEmail( email, true );
1341 1351
1342 mAddressBook->insertAddressee( addr ); 1352 mAddressBook->insertAddressee( addr );
1343 mViewManager->refreshView( addr.uid() ); 1353 mViewManager->refreshView( addr.uid() );
1344 editContact( addr.uid() ); 1354 editContact( addr.uid() );
1345 } 1355 }
1346#else //KAB_EMBEDDED 1356#else //KAB_EMBEDDED
1347 qDebug("KABCore::addEmail finsih method"); 1357 qDebug("KABCore::addEmail finsih method");
1348#endif //KAB_EMBEDDED 1358#endif //KAB_EMBEDDED
1349} 1359}
1350 1360
1351void KABCore::importVCard( const KURL &url, bool showPreview ) 1361void KABCore::importVCard( const KURL &url, bool showPreview )
1352{ 1362{
1353 mXXPortManager->importVCard( url, showPreview ); 1363 mXXPortManager->importVCard( url, showPreview );
1354} 1364}
1355void KABCore::importFromOL() 1365void KABCore::importFromOL()
1356{ 1366{
1357#ifdef _OL_IMPORT_ 1367#ifdef _OL_IMPORT_
1358 KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"), mAddressBook, this ); 1368 KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"), mAddressBook, this );
1359 idgl->exec(); 1369 idgl->exec();
1360 KABC::Addressee::List list = idgl->getAddressList(); 1370 KABC::Addressee::List list = idgl->getAddressList();
1361 if ( list.count() > 0 ) { 1371 if ( list.count() > 0 ) {
1362 KABC::Addressee::List listNew; 1372 KABC::Addressee::List listNew;
1363 KABC::Addressee::List listExisting; 1373 KABC::Addressee::List listExisting;
1364 KABC::Addressee::List::Iterator it; 1374 KABC::Addressee::List::Iterator it;
1365 KABC::AddressBook::Iterator iter; 1375 KABC::AddressBook::Iterator iter;
1366 for ( it = list.begin(); it != list.end(); ++it ) { 1376 for ( it = list.begin(); it != list.end(); ++it ) {
1367 if ( mAddressBook->findByUid((*it).uid() ).isEmpty()) 1377 if ( mAddressBook->findByUid((*it).uid() ).isEmpty())
1368 listNew.append( (*it) ); 1378 listNew.append( (*it) );
1369 else 1379 else
1370 listExisting.append( (*it) ); 1380 listExisting.append( (*it) );
1371 } 1381 }
1372 if ( listExisting.count() > 0 ) 1382 if ( listExisting.count() > 0 )
1373 KMessageBox::information( this, i18n("%1 contacts not added to addressbook\nbecause they were already in the addressbook!").arg( listExisting.count() )); 1383 KMessageBox::information( this, i18n("%1 contacts not added to addressbook\nbecause they were already in the addressbook!").arg( listExisting.count() ));
1374 if ( listNew.count() > 0 ) { 1384 if ( listNew.count() > 0 ) {
1375 pasteWithNewUid = false; 1385 pasteWithNewUid = false;
1376 pasteContacts( listNew ); 1386 pasteContacts( listNew );
1377 pasteWithNewUid = true; 1387 pasteWithNewUid = true;
1378 } 1388 }
1379 } 1389 }
1380 delete idgl; 1390 delete idgl;
1381#endif 1391#endif
1382} 1392}
1383 1393
1384void KABCore::importVCard( const QString &vCard, bool showPreview ) 1394void KABCore::importVCard( const QString &vCard, bool showPreview )
1385{ 1395{
1386 mXXPortManager->importVCard( vCard, showPreview ); 1396 mXXPortManager->importVCard( vCard, showPreview );
1387} 1397}
1388 1398
1389//US added a second method without defaultparameter 1399//US added a second method without defaultparameter
1390void KABCore::editContact2() { 1400void KABCore::editContact2() {
1391 editContact( QString::null ); 1401 editContact( QString::null );
1392} 1402}
1393 1403
1394void KABCore::editContact( const QString &uid ) 1404void KABCore::editContact( const QString &uid )
1395{ 1405{
1396 1406
1397 if ( mExtensionManager->isQuickEditVisible() ) 1407 if ( mExtensionManager->isQuickEditVisible() )
1398 return; 1408 return;
1399 1409
1400 // First, locate the contact entry 1410 // First, locate the contact entry
1401 QString localUID = uid; 1411 QString localUID = uid;
1402 if ( localUID.isNull() ) { 1412 if ( localUID.isNull() ) {
1403 QStringList uidList = mViewManager->selectedUids(); 1413 QStringList uidList = mViewManager->selectedUids();
1404 if ( uidList.count() > 0 ) 1414 if ( uidList.count() > 0 )
1405 localUID = *( uidList.at( 0 ) ); 1415 localUID = *( uidList.at( 0 ) );
1406 } 1416 }
1407 1417
1408 KABC::Addressee addr = mAddressBook->findByUid( localUID ); 1418 KABC::Addressee addr = mAddressBook->findByUid( localUID );
1409 if ( !addr.isEmpty() ) { 1419 if ( !addr.isEmpty() ) {
1410 mEditorDialog->setAddressee( addr ); 1420 mEditorDialog->setAddressee( addr );
1411 KApplication::execDialog ( mEditorDialog ); 1421 KApplication::execDialog ( mEditorDialog );
1412 } 1422 }
1413} 1423}
1414 1424
1415/** 1425/**
1416 Shows or edits the detail view for the given uid. If the uid is QString::null, 1426 Shows or edits the detail view for the given uid. If the uid is QString::null,
1417 the method will try to find a selected addressee in the view. 1427 the method will try to find a selected addressee in the view.
1418 */ 1428 */
1419void KABCore::executeContact( const QString &uid /*US = QString::null*/ ) 1429void KABCore::executeContact( const QString &uid /*US = QString::null*/ )
1420{ 1430{
1421 if ( mMultipleViewsAtOnce ) 1431 if ( mMultipleViewsAtOnce )
1422 { 1432 {
1423 editContact( uid ); 1433 editContact( uid );
1424 } 1434 }
1425 else 1435 else
1426 { 1436 {
1427 setDetailsVisible( true ); 1437 setDetailsVisible( true );
1428 mActionDetails->setChecked(true); 1438 mActionDetails->setChecked(true);
1429 } 1439 }
1430 1440
1431} 1441}
1432 1442
1433void KABCore::save() 1443void KABCore::save()
1434{ 1444{
1435 if (syncManager->blockSave()) 1445 if (syncManager->blockSave())
1436 return; 1446 return;
1437 if ( !mModified ) 1447 if ( !mModified )
1438 return; 1448 return;
1439 1449
1440 syncManager->setBlockSave(true); 1450 syncManager->setBlockSave(true);
1441 QString text = i18n( "There was an error while attempting to save\n the " 1451 QString text = i18n( "There was an error while attempting to save\n the "
1442 "address book. Please check that some \nother application is " 1452 "address book. Please check that some \nother application is "
1443 "not using it. " ); 1453 "not using it. " );
1444 message(i18n("Saving ... please wait! "), false); 1454 message(i18n("Saving ... please wait! "), false);
1445 //qApp->processEvents(); 1455 //qApp->processEvents();
1446#ifndef KAB_EMBEDDED 1456#ifndef KAB_EMBEDDED
1447 KABC::StdAddressBook *b = dynamic_cast<KABC::StdAddressBook*>( mAddressBook ); 1457 KABC::StdAddressBook *b = dynamic_cast<KABC::StdAddressBook*>( mAddressBook );
1448 if ( !b || !b->save() ) { 1458 if ( !b || !b->save() ) {
1449 KMessageBox::error( this, text, i18n( "Unable to Save" ) ); 1459 KMessageBox::error( this, text, i18n( "Unable to Save" ) );
1450 } 1460 }
1451#else //KAB_EMBEDDED 1461#else //KAB_EMBEDDED
1452 KABC::StdAddressBook *b = (KABC::StdAddressBook*)( mAddressBook ); 1462 KABC::StdAddressBook *b = (KABC::StdAddressBook*)( mAddressBook );
1453 if ( !b || !b->save() ) { 1463 if ( !b || !b->save() ) {
1454 QMessageBox::critical( this, i18n( "Unable to Save" ), text, i18n("Ok")); 1464 QMessageBox::critical( this, i18n( "Unable to Save" ), text, i18n("Ok"));
1455 } 1465 }
1456#endif //KAB_EMBEDDED 1466#endif //KAB_EMBEDDED
1457 1467
1458 message(i18n("Addressbook saved!")); 1468 message(i18n("Addressbook saved!"));
1459 setModified( false ); 1469 setModified( false );
1460 syncManager->setBlockSave(false); 1470 syncManager->setBlockSave(false);
1461} 1471}
1462 1472
1463 1473
1464void KABCore::undo() 1474void KABCore::undo()
1465{ 1475{
1466 UndoStack::instance()->undo(); 1476 UndoStack::instance()->undo();
1467 1477
1468 // Refresh the view 1478 // Refresh the view
1469 mViewManager->refreshView(); 1479 mViewManager->refreshView();
1470} 1480}
1471 1481
1472void KABCore::redo() 1482void KABCore::redo()
1473{ 1483{
1474 RedoStack::instance()->redo(); 1484 RedoStack::instance()->redo();
1475 1485
1476 // Refresh the view 1486 // Refresh the view
1477 mViewManager->refreshView(); 1487 mViewManager->refreshView();
1478} 1488}
1479void KABCore::setJumpButtonBar( bool visible ) 1489void KABCore::setJumpButtonBar( bool visible )
1480{ 1490{
1481 setJumpButtonBarVisible(visible ); 1491 setJumpButtonBarVisible(visible );
1482 saveSettings(); 1492 saveSettings();
1483} 1493}
1484void KABCore::setJumpButtonBarVisible( bool visible ) 1494void KABCore::setJumpButtonBarVisible( bool visible )
1485{ 1495{
1486 if (mMultipleViewsAtOnce) 1496 if (mMultipleViewsAtOnce)
1487 { 1497 {
1488 if ( visible ) 1498 if ( visible )
1489 mJumpButtonBar->show(); 1499 mJumpButtonBar->show();
1490 else 1500 else
1491 mJumpButtonBar->hide(); 1501 mJumpButtonBar->hide();
1492 } 1502 }
1493 else 1503 else
1494 { 1504 {
1495 // show the jumpbar only if "the details are hidden" == "viewmanager are shown" 1505 // show the jumpbar only if "the details are hidden" == "viewmanager are shown"
1496 if (mViewManager->isVisible()) 1506 if (mViewManager->isVisible())
1497 { 1507 {
1498 if ( visible ) 1508 if ( visible )
1499 mJumpButtonBar->show(); 1509 mJumpButtonBar->show();
1500 else 1510 else
1501 mJumpButtonBar->hide(); 1511 mJumpButtonBar->hide();
1502 } 1512 }
1503 else 1513 else
1504 { 1514 {
1505 mJumpButtonBar->hide(); 1515 mJumpButtonBar->hide();
1506 } 1516 }
1507 } 1517 }
1508 if ( visible ) { 1518 if ( visible ) {
1509 if ( mIncSearchWidget->currentItem() == 0 ) { 1519 if ( mIncSearchWidget->currentItem() == 0 ) {
1510 message( i18n("Change search field enable jump bar") ); 1520 message( i18n("Change search field enable jump bar") );
1511 } 1521 }
1512 } 1522 }
1513} 1523}
1514 1524
1515 1525
1516void KABCore::setDetailsToState() 1526void KABCore::setDetailsToState()
1517{ 1527{
1518 setDetailsVisible( mActionDetails->isChecked() ); 1528 setDetailsVisible( mActionDetails->isChecked() );
1519} 1529}
1520void KABCore::setDetailsToggle() 1530void KABCore::setDetailsToggle()
1521{ 1531{
1522 mActionDetails->setChecked( !mActionDetails->isChecked() ); 1532 mActionDetails->setChecked( !mActionDetails->isChecked() );
1523 setDetailsToState(); 1533 setDetailsToState();
1524} 1534}
1525 1535
1526 1536
1527 1537
1528void KABCore::setDetailsVisible( bool visible ) 1538void KABCore::setDetailsVisible( bool visible )
1529{ 1539{
1530 if (visible && mDetails->isHidden()) 1540 if (visible && mDetails->isHidden())
1531 { 1541 {
1532 KABC::Addressee::List addrList = mViewManager->selectedAddressees(); 1542 KABC::Addressee::List addrList = mViewManager->selectedAddressees();
1533 if ( addrList.count() > 0 ) 1543 if ( addrList.count() > 0 )
1534 mDetails->setAddressee( addrList[ 0 ] ); 1544 mDetails->setAddressee( addrList[ 0 ] );
1535 } 1545 }
1536 1546
1537 // mMultipleViewsAtOnce=false: mDetails is always visible. But we switch between 1547 // mMultipleViewsAtOnce=false: mDetails is always visible. But we switch between
1538 // the listview and the detailview. We do that by changing the splitbar size. 1548 // the listview and the detailview. We do that by changing the splitbar size.
1539 if (mMultipleViewsAtOnce) 1549 if (mMultipleViewsAtOnce)
1540 { 1550 {
1541 if ( visible ) 1551 if ( visible )
1542 mDetails->show(); 1552 mDetails->show();
1543 else 1553 else
1544 mDetails->hide(); 1554 mDetails->hide();
1545 } 1555 }
1546 else 1556 else
1547 { 1557 {
1548 if ( visible ) { 1558 if ( visible ) {
1549 mViewManager->hide(); 1559 mViewManager->hide();
1550 mDetails->show(); 1560 mDetails->show();
1551 mIncSearchWidget->setFocus(); 1561 mIncSearchWidget->setFocus();
1552 } 1562 }
1553 else { 1563 else {
1554 mViewManager->show(); 1564 mViewManager->show();
1555 mDetails->hide(); 1565 mDetails->hide();
1556 mViewManager->setFocusAV(); 1566 mViewManager->setFocusAV();
1557 } 1567 }
1558 setJumpButtonBarVisible( !visible ); 1568 setJumpButtonBarVisible( !visible );
1559 } 1569 }
1560 1570
1561} 1571}
1562 1572
1563void KABCore::extensionChanged( int id ) 1573void KABCore::extensionChanged( int id )
1564{ 1574{
1565 //change the details view only for non desktop systems 1575 //change the details view only for non desktop systems
1566#ifndef DESKTOP_VERSION 1576#ifndef DESKTOP_VERSION
1567 1577
1568 if (id == 0) 1578 if (id == 0)
1569 { 1579 {
1570 //the user disabled the extension. 1580 //the user disabled the extension.
1571 1581
1572 if (mMultipleViewsAtOnce) 1582 if (mMultipleViewsAtOnce)
1573 { // enable detailsview again 1583 { // enable detailsview again
1574 setDetailsVisible( true ); 1584 setDetailsVisible( true );
1575 mActionDetails->setChecked( true ); 1585 mActionDetails->setChecked( true );
1576 } 1586 }
1577 else 1587 else
1578 { //go back to the listview 1588 { //go back to the listview
1579 setDetailsVisible( false ); 1589 setDetailsVisible( false );
1580 mActionDetails->setChecked( false ); 1590 mActionDetails->setChecked( false );
1581 mActionDetails->setEnabled(true); 1591 mActionDetails->setEnabled(true);
1582 } 1592 }
1583 1593
1584 } 1594 }
1585 else 1595 else
1586 { 1596 {
1587 //the user enabled the extension. 1597 //the user enabled the extension.
1588 setDetailsVisible( false ); 1598 setDetailsVisible( false );
1589 mActionDetails->setChecked( false ); 1599 mActionDetails->setChecked( false );
1590 1600
1591 if (!mMultipleViewsAtOnce) 1601 if (!mMultipleViewsAtOnce)
1592 { 1602 {
1593 mActionDetails->setEnabled(false); 1603 mActionDetails->setEnabled(false);
1594 } 1604 }
1595 1605
1596 mExtensionManager->setSelectionChanged(); 1606 mExtensionManager->setSelectionChanged();
1597 1607
1598 } 1608 }
1599 1609
1600#endif// DESKTOP_VERSION 1610#endif// DESKTOP_VERSION
1601 1611
1602} 1612}
1603 1613
1604 1614
1605void KABCore::extensionModified( const KABC::Addressee::List &list ) 1615void KABCore::extensionModified( const KABC::Addressee::List &list )
1606{ 1616{
1607 1617
1608 if ( list.count() != 0 ) { 1618 if ( list.count() != 0 ) {
1609 KABC::Addressee::List::ConstIterator it; 1619 KABC::Addressee::List::ConstIterator it;
1610 for ( it = list.begin(); it != list.end(); ++it ) 1620 for ( it = list.begin(); it != list.end(); ++it )
1611 mAddressBook->insertAddressee( *it ); 1621 mAddressBook->insertAddressee( *it );
1612 if ( list.count() > 1 ) 1622 if ( list.count() > 1 )
1613 setModified(); 1623 setModified();
1614 else 1624 else
1615 setModifiedWOrefresh(); 1625 setModifiedWOrefresh();
1616 } 1626 }
1617 if ( list.count() == 0 ) 1627 if ( list.count() == 0 )
1618 mViewManager->refreshView(); 1628 mViewManager->refreshView();
1619 else 1629 else
1620 mViewManager->refreshView( list[ 0 ].uid() ); 1630 mViewManager->refreshView( list[ 0 ].uid() );
1621 1631
1622 1632
1623 1633
1624} 1634}
1625 1635
1626QString KABCore::getNameByPhone( const QString &phone ) 1636QString KABCore::getNameByPhone( const QString &phone )
1627{ 1637{
1628#ifndef KAB_EMBEDDED 1638#ifndef KAB_EMBEDDED
1629 QRegExp r( "[/*/-/ ]" ); 1639 QRegExp r( "[/*/-/ ]" );
1630 QString localPhone( phone ); 1640 QString localPhone( phone );
1631 1641
1632 bool found = false; 1642 bool found = false;
1633 QString ownerName = ""; 1643 QString ownerName = "";
1634 KABC::AddressBook::Iterator iter; 1644 KABC::AddressBook::Iterator iter;
1635 KABC::PhoneNumber::List::Iterator phoneIter; 1645 KABC::PhoneNumber::List::Iterator phoneIter;
1636 KABC::PhoneNumber::List phoneList; 1646 KABC::PhoneNumber::List phoneList;
1637 for ( iter = mAddressBook->begin(); !found && ( iter != mAddressBook->end() ); ++iter ) { 1647 for ( iter = mAddressBook->begin(); !found && ( iter != mAddressBook->end() ); ++iter ) {
1638 phoneList = (*iter).phoneNumbers(); 1648 phoneList = (*iter).phoneNumbers();
1639 for ( phoneIter = phoneList.begin(); !found && ( phoneIter != phoneList.end() ); 1649 for ( phoneIter = phoneList.begin(); !found && ( phoneIter != phoneList.end() );
1640 ++phoneIter) { 1650 ++phoneIter) {
1641 // Get rid of separator chars so just the numbers are compared. 1651 // Get rid of separator chars so just the numbers are compared.
1642 if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) { 1652 if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) {
1643 ownerName = (*iter).formattedName(); 1653 ownerName = (*iter).formattedName();
1644 found = true; 1654 found = true;
1645 } 1655 }
1646 } 1656 }
1647 } 1657 }
1648 1658
1649 return ownerName; 1659 return ownerName;
1650#else //KAB_EMBEDDED 1660#else //KAB_EMBEDDED
1651 qDebug("KABCore::getNameByPhone finsih method"); 1661 qDebug("KABCore::getNameByPhone finsih method");
1652 return ""; 1662 return "";
1653#endif //KAB_EMBEDDED 1663#endif //KAB_EMBEDDED
1654 1664
1655} 1665}
1656void KABCore::openConfigGlobalDialog() 1666void KABCore::openConfigGlobalDialog()
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 02fc40a..272f2eb 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -1,490 +1,492 @@
1// $Id$ 1// $Id$
2 2
3#include <qvbox.h> 3#include <qvbox.h>
4#include <qlistbox.h> 4#include <qlistbox.h>
5#include <qwidget.h> 5#include <qwidget.h>
6#include <qfile.h> 6#include <qfile.h>
7#include <qimage.h> 7#include <qimage.h>
8#include <qcombobox.h> 8#include <qcombobox.h>
9#include <qapplication.h> 9#include <qapplication.h>
10#include <qdragobject.h> 10#include <qdragobject.h>
11#include <qevent.h> 11#include <qevent.h>
12#include <qurl.h> 12#include <qurl.h>
13#include <qpixmap.h> 13#include <qpixmap.h>
14 14
15#include <kabc/addressbook.h> 15#include <kabc/addressbook.h>
16#include <kapplication.h> 16#include <kapplication.h>
17#include <kconfig.h> 17#include <kconfig.h>
18#include <kcolorbutton.h> 18#include <kcolorbutton.h>
19#include <kdebug.h> 19#include <kdebug.h>
20#include <kglobal.h> 20#include <kglobal.h>
21#include <kiconloader.h> 21#include <kiconloader.h>
22#include <klineedit.h> 22#include <klineedit.h>
23#include <klocale.h> 23#include <klocale.h>
24#include <kmessagebox.h> 24#include <kmessagebox.h>
25#include <kurl.h> 25#include <kurl.h>
26#include <kurlrequester.h> 26#include <kurlrequester.h>
27 27
28//US#include "configuretableviewdialog.h" 28//US#include "configuretableviewdialog.h"
29#include "contactlistview.h" 29#include "contactlistview.h"
30#include "kabprefs.h" 30#include "kabprefs.h"
31#include "undocmds.h" 31#include "undocmds.h"
32#include "viewmanager.h" 32#include "viewmanager.h"
33 33
34#include <qlayout.h> 34#include <qlayout.h>
35#include <qheader.h> 35#include <qheader.h>
36#include <qregexp.h> 36#include <qregexp.h>
37 37
38#include "kaddressbooktableview.h" 38#include "kaddressbooktableview.h"
39 39
40 40
41KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab, 41KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab,
42 QWidget *parent, const char *name ) 42 QWidget *parent, const char *name )
43 : KAddressBookView( ab, parent, name ) 43 : KAddressBookView( ab, parent, name )
44{ 44{
45 mainLayout = new QVBoxLayout( viewWidget(), 2 ); 45 mainLayout = new QVBoxLayout( viewWidget(), 2 );
46 46
47 // The list view will be created when the config is read. 47 // The list view will be created when the config is read.
48 mListView = 0; 48 mListView = 0;
49} 49}
50 50
51KAddressBookTableView::~KAddressBookTableView() 51KAddressBookTableView::~KAddressBookTableView()
52{ 52{
53} 53}
54void KAddressBookTableView::setFocusAV() 54void KAddressBookTableView::setFocusAV()
55{ 55{
56 if ( mListView ) 56 if ( mListView )
57 mListView->setFocus(); 57 mListView->setFocus();
58 58
59} 59}
60void KAddressBookTableView::scrollUP() 60void KAddressBookTableView::scrollUP()
61{ 61{
62 QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 ); 62 QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 );
63 QApplication::postEvent( mListView, ev ); 63 QApplication::postEvent( mListView, ev );
64 ev = new QKeyEvent ( QEvent::KeyRelease, Qt::Key_Up, 0,0 ); 64 ev = new QKeyEvent ( QEvent::KeyRelease, Qt::Key_Up, 0,0 );
65 QApplication::postEvent( mListView, ev ); 65 QApplication::postEvent( mListView, ev );
66} 66}
67void KAddressBookTableView::scrollDOWN() 67void KAddressBookTableView::scrollDOWN()
68{ 68{
69 QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 ); 69 QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 );
70 QApplication::postEvent( mListView, ev ); 70 QApplication::postEvent( mListView, ev );
71 ev = new QKeyEvent ( QEvent::KeyRelease, Qt::Key_Down, 0,0 ); 71 ev = new QKeyEvent ( QEvent::KeyRelease, Qt::Key_Down, 0,0 );
72 QApplication::postEvent( mListView, ev ); 72 QApplication::postEvent( mListView, ev );
73} 73}
74void KAddressBookTableView::reconstructListView() 74void KAddressBookTableView::reconstructListView()
75{ 75{
76 if (mListView) 76 if (mListView)
77 { 77 {
78 disconnect(mListView, SIGNAL(selectionChanged()), 78 disconnect(mListView, SIGNAL(selectionChanged()),
79 this, SLOT(addresseeSelected())); 79 this, SLOT(addresseeSelected()));
80 disconnect(mListView, SIGNAL(executed(QListViewItem*)), 80 disconnect(mListView, SIGNAL(executed(QListViewItem*)),
81 this, SLOT(addresseeExecuted(QListViewItem*))); 81 this, SLOT(addresseeExecuted(QListViewItem*)));
82 disconnect(mListView, SIGNAL(doubleClicked(QListViewItem*)), 82 disconnect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
83 this, SLOT(addresseeExecuted(QListViewItem*))); 83 this, SLOT(addresseeExecuted(QListViewItem*)));
84 disconnect(mListView, SIGNAL(startAddresseeDrag()), this, 84 disconnect(mListView, SIGNAL(startAddresseeDrag()), this,
85 SIGNAL(startDrag())); 85 SIGNAL(startDrag()));
86 disconnect(mListView, SIGNAL(returnPressed(QListViewItem*)), 86 disconnect(mListView, SIGNAL(returnPressed(QListViewItem*)),
87 this, SLOT(addresseeExecuted(QListViewItem*))); 87 this, SLOT(addresseeExecuted(QListViewItem*)));
88 88
89 disconnect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this, 89 disconnect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this,
90 SIGNAL(dropped(QDropEvent*))); 90 SIGNAL(dropped(QDropEvent*)));
91 delete mListView; 91 delete mListView;
92 } 92 }
93 93
94 mListView = new ContactListView( this, addressBook(), viewWidget() ); 94 mListView = new ContactListView( this, addressBook(), viewWidget() );
95 95
96 connect(this, SIGNAL(printView()), 96 connect(this, SIGNAL(printView()),
97 mListView , SLOT(printMe())); 97 mListView , SLOT(printMe()));
98 //US set singleClick manually, because it is no global configparameter in embedded space 98 //US set singleClick manually, because it is no global configparameter in embedded space
99 mListView->setSingleClick(KABPrefs::instance()->mHonorSingleClick); 99 mListView->setSingleClick(KABPrefs::instance()->mHonorSingleClick);
100 100
101 // Add the columns 101 // Add the columns
102 KABC::Field::List fieldList = fields(); 102 KABC::Field::List fieldList = fields();
103 KABC::Field::List::ConstIterator it; 103 KABC::Field::List::ConstIterator it;
104 104
105 int c = 0; 105 int c = 0;
106 for( it = fieldList.begin(); it != fieldList.end(); ++it ) { 106 for( it = fieldList.begin(); it != fieldList.end(); ++it ) {
107 mListView->addColumn( (*it)->label() ); 107 mListView->addColumn( (*it)->label() );
108 mListView->setColumnWidthMode(c++, QListView::Manual); 108 mListView->setColumnWidthMode(c++, QListView::Manual);
109//US 109//US
110 // qDebug("KAddressBookTableView::reconstructListView: field %s", (*it)->label().latin1()); 110 // qDebug("KAddressBookTableView::reconstructListView: field %s", (*it)->label().latin1());
111 } 111 }
112 112
113 connect(mListView, SIGNAL(selectionChanged()), 113 connect(mListView, SIGNAL(selectionChanged()),
114 this, SLOT(addresseeSelected())); 114 this, SLOT(addresseeSelected()));
115 connect(mListView, SIGNAL(startAddresseeDrag()), this, 115 connect(mListView, SIGNAL(startAddresseeDrag()), this,
116 SIGNAL(startDrag())); 116 SIGNAL(startDrag()));
117 connect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this, 117 connect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this,
118 SIGNAL(dropped(QDropEvent*))); 118 SIGNAL(dropped(QDropEvent*)));
119 119
120 if (KABPrefs::instance()->mHonorSingleClick) { 120 if (KABPrefs::instance()->mHonorSingleClick) {
121 // qDebug("KAddressBookTableView::reconstructListView single"); 121 // qDebug("KAddressBookTableView::reconstructListView single");
122 connect(mListView, SIGNAL(executed(QListViewItem*)), 122 connect(mListView, SIGNAL(executed(QListViewItem*)),
123 this, SLOT(addresseeExecuted(QListViewItem*))); 123 this, SLOT(addresseeExecuted(QListViewItem*)));
124 } else { 124 } else {
125 // qDebug("KAddressBookTableView::reconstructListView double"); 125 // qDebug("KAddressBookTableView::reconstructListView double");
126 connect(mListView, SIGNAL(doubleClicked(QListViewItem*)), 126 connect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
127 this, SLOT(addresseeExecuted(QListViewItem*))); 127 this, SLOT(addresseeExecuted(QListViewItem*)));
128 } 128 }
129 connect(mListView, SIGNAL(returnPressed(QListViewItem*)), 129 connect(mListView, SIGNAL(returnPressed(QListViewItem*)),
130 this, SLOT(addresseeExecuted(QListViewItem*))); 130 this, SLOT(addresseeExecuted(QListViewItem*)));
131 connect(mListView, SIGNAL(signalDelete()), 131 connect(mListView, SIGNAL(signalDelete()),
132 this, SLOT(addresseeDeleted())); 132 this, SLOT(addresseeDeleted()));
133 133
134//US performceimprovement. Refresh is done from the outside 134//US performceimprovement. Refresh is done from the outside
135//US refresh(); 135//US refresh();
136 136
137 mListView->setSorting( 0, true ); 137 mListView->setSorting( 0, true );
138 mainLayout->addWidget( mListView ); 138 mainLayout->addWidget( mListView );
139 mainLayout->activate(); 139 mainLayout->activate();
140 mListView->show(); 140 mListView->show();
141} 141}
142 142
143void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field ) 143void KAddressBookTableView::doSearch( const QString& s, KABC::Field *field )
144{ 144{
145 mListView->clear(); 145 mListView->clear();
146 if ( s.isEmpty() || s == "*" ) { 146 if ( s.isEmpty() || s == "*" ) {
147 refresh(); 147 refresh();
148 return; 148 return;
149 } 149 }
150 QRegExp re = getRegExp( s ); 150 QRegExp re = getRegExp( s );
151 if (!re.isValid()) 151 if (!re.isValid())
152 return; 152 return;
153 KABC::Addressee::List addresseeList = addressees(); 153 KABC::Addressee::List addresseeList = addressees();
154 KABC::Addressee::List::Iterator it; 154 KABC::Addressee::List::Iterator it;
155 if ( field ) { 155 if ( field ) {
156 for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { 156 for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
157 if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) 157 if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
158 continue; 158 continue;
159#if QT_VERSION >= 0x030000 159#if QT_VERSION >= 0x030000
160 if (re.search(field->value( *it ).lower()) == 0) 160 if (re.search(field->value( *it ).lower()) == 0)
161#else 161#else
162 if (re.match(field->value( *it ).lower()) == 0) 162 if (re.match(field->value( *it ).lower()) == 0)
163#endif 163#endif
164 ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); 164 ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
165 165
166 } 166 }
167 } else { 167 } else {
168 KABC::Field::List fieldList = allFields(); 168 KABC::Field::List fieldList = allFields();
169 KABC::Field::List::ConstIterator fieldIt; 169 KABC::Field::List::ConstIterator fieldIt;
170 for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { 170 for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
171 if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) 171 if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
172 continue; 172 continue;
173 bool match = false; 173 bool match = false;
174 for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) { 174 for ( fieldIt = fieldList.begin(); fieldIt != fieldList.end(); ++fieldIt ) {
175#if QT_VERSION >= 0x030000 175#if QT_VERSION >= 0x030000
176 if (re.search((*fieldIt)->value( *it ).lower()) == 0) 176 if (re.search((*fieldIt)->value( *it ).lower()) == 0)
177#else 177#else
178 if (re.match((*fieldIt)->value( *it ).lower()) == 0) 178 if (re.match((*fieldIt)->value( *it ).lower()) == 0)
179#endif 179#endif
180 { 180 {
181 //qDebug("match %s %s %s", pattern.latin1(), (*fieldIt)->value( *it ).latin1(), (*fieldIt)->label().latin1() ); 181 //qDebug("match %s %s %s", pattern.latin1(), (*fieldIt)->value( *it ).latin1(), (*fieldIt)->label().latin1() );
182 ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); 182 ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
183 match = true; 183 match = true;
184 break; 184 break;
185 } 185 }
186 } 186 }
187 if ( ! match ) { 187 if ( ! match ) {
188 if ( (*it).matchPhoneNumber( &re ) ) { 188 if ( (*it).matchPhoneNumber( &re ) ) {
189 ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); 189 ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
190 match = true; 190 match = true;
191 break; 191 break;
192 } 192 }
193 } 193 }
194 if ( ! match ) { 194 if ( ! match ) {
195 if ( (*it).matchAddress( &re ) ) { 195 if ( (*it).matchAddress( &re ) ) {
196 ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); 196 ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
197 match = true; 197 match = true;
198 break; 198 break;
199 } 199 }
200 } 200 }
201 } 201 }
202 } 202 }
203 // Sometimes the background pixmap gets messed up when we add lots 203 // Sometimes the background pixmap gets messed up when we add lots
204 // of items. 204 // of items.
205 //mListView->repaint(); 205 //mListView->repaint();
206 if ( mListView->firstChild() ) { 206 if ( mListView->firstChild() ) {
207 mListView->setCurrentItem ( mListView->firstChild() ); 207 mListView->setCurrentItem ( mListView->firstChild() );
208 mListView->setSelected ( mListView->firstChild(), true ); 208 mListView->setSelected ( mListView->firstChild(), true );
209 } 209 }
210 else 210 else
211 emit selected(QString::null); 211 emit selected(QString::null);
212 212
213} 213}
214void KAddressBookTableView::writeConfig(KConfig *config) 214void KAddressBookTableView::writeConfig(KConfig *config)
215{ 215{
216 KAddressBookView::writeConfig(config); 216 KAddressBookView::writeConfig(config);
217 217
218 mListView->saveLayout(config, config->group()); 218 mListView->saveLayout(config, config->group());
219} 219}
220 220
221void KAddressBookTableView::readConfig(KConfig *config) 221void KAddressBookTableView::readConfig(KConfig *config)
222{ 222{
223 KAddressBookView::readConfig( config ); 223 KAddressBookView::readConfig( config );
224 // The config could have changed the fields, so we need to reconstruct 224 // The config could have changed the fields, so we need to reconstruct
225 // the listview. 225 // the listview.
226 reconstructListView(); 226 reconstructListView();
227 227
228 // costum colors? 228 // costum colors?
229 if ( config->readBoolEntry( "EnableCustomColors", false ) ) 229 if ( config->readBoolEntry( "EnableCustomColors", false ) )
230 { 230 {
231 QPalette p( mListView->palette() ); 231 QPalette p( mListView->palette() );
232 QColor c = p.color(QPalette::Normal, QColorGroup::Base ); 232 QColor c = p.color(QPalette::Normal, QColorGroup::Base );
233 p.setColor( QPalette::Normal, QColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) ); 233 p.setColor( QPalette::Normal, QColorGroup::Base, config->readColorEntry( "BackgroundColor", &c ) );
234 c = p.color(QPalette::Normal, QColorGroup::Text ); 234 c = p.color(QPalette::Normal, QColorGroup::Text );
235 p.setColor( QPalette::Normal, QColorGroup::Text, config->readColorEntry( "TextColor", &c ) ); 235 p.setColor( QPalette::Normal, QColorGroup::Text, config->readColorEntry( "TextColor", &c ) );
236 c = p.color(QPalette::Normal, QColorGroup::Button ); 236 c = p.color(QPalette::Normal, QColorGroup::Button );
237 p.setColor( QPalette::Normal, QColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) ); 237 p.setColor( QPalette::Normal, QColorGroup::Button, config->readColorEntry( "HeaderColor", &c ) );
238 c = p.color(QPalette::Normal, QColorGroup::ButtonText ); 238 c = p.color(QPalette::Normal, QColorGroup::ButtonText );
239 p.setColor( QPalette::Normal, QColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) ); 239 p.setColor( QPalette::Normal, QColorGroup::ButtonText, config->readColorEntry( "HeaderTextColor", &c ) );
240 c = p.color(QPalette::Normal, QColorGroup::Highlight ); 240 c = p.color(QPalette::Normal, QColorGroup::Highlight );
241 p.setColor( QPalette::Normal, QColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) ); 241 p.setColor( QPalette::Normal, QColorGroup::Highlight, config->readColorEntry( "HighlightColor", &c ) );
242 c = p.color(QPalette::Normal, QColorGroup::HighlightedText ); 242 c = p.color(QPalette::Normal, QColorGroup::HighlightedText );
243 p.setColor( QPalette::Normal, QColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) ); 243 p.setColor( QPalette::Normal, QColorGroup::HighlightedText, config->readColorEntry( "HighlightedTextColor", &c ) );
244#ifndef KAB_EMBEDDED 244#ifndef KAB_EMBEDDED
245 c = KGlobalSettings::alternateBackgroundColor(); 245 c = KGlobalSettings::alternateBackgroundColor();
246#else //KAB_EMBEDDED 246#else //KAB_EMBEDDED
247 c = QColor(240, 240, 240); 247 c = QColor(240, 240, 240);
248#endif //KAB_EMBEDDED 248#endif //KAB_EMBEDDED
249 c = config->readColorEntry ("AlternatingBackgroundColor", &c); 249 c = config->readColorEntry ("AlternatingBackgroundColor", &c);
250 mListView->setAlternateColor(c); 250 mListView->setAlternateColor(c);
251 251
252 252
253 //US mListView->viewport()->setPalette( p ); 253 //US mListView->viewport()->setPalette( p );
254 mListView->setPalette( p ); 254 mListView->setPalette( p );
255 } 255 }
256 else 256 else
257 { 257 {
258 // needed if turned off during a session. 258 // needed if turned off during a session.
259 //US mListView->viewport()->setPalette( mListView->palette() ); 259 //US mListView->viewport()->setPalette( mListView->palette() );
260 mListView->setPalette( mListView->palette() ); 260 mListView->setPalette( mListView->palette() );
261 } 261 }
262 262
263 //custom fonts? 263 //custom fonts?
264 QFont f( font() ); 264 QFont f( font() );
265 if ( config->readBoolEntry( "EnableCustomFonts", false ) ) 265 if ( config->readBoolEntry( "EnableCustomFonts", false ) )
266 { 266 {
267 mListView->setFont( config->readFontEntry( "TextFont", &f) ); 267 mListView->setFont( config->readFontEntry( "TextFont", &f) );
268 f.setBold( true ); 268 f.setBold( true );
269 //US mListView->setHeaderFont( config->readFontEntry( "HeaderFont", &f ) ); 269 //US mListView->setHeaderFont( config->readFontEntry( "HeaderFont", &f ) );
270 mListView->header()->setFont( config->readFontEntry( "HeaderFont", &f ) ); 270 mListView->header()->setFont( config->readFontEntry( "HeaderFont", &f ) );
271 } 271 }
272 else 272 else
273 { 273 {
274 mListView->setFont( f ); 274 mListView->setFont( f );
275 f.setBold( true ); 275 f.setBold( true );
276 //US mListView->setHeaderFont( f ); 276 //US mListView->setHeaderFont( f );
277 mListView->header()->setFont( f ); 277 mListView->header()->setFont( f );
278 } 278 }
279 279
280 // Set the list view options 280 // Set the list view options
281 mListView->setAlternateBackgroundEnabled(config->readBoolEntry("ABackground", 281 mListView->setAlternateBackgroundEnabled(config->readBoolEntry("ABackground",
282 true)); 282 true));
283 mListView->setSingleLineEnabled(config->readBoolEntry("SingleLine", false)); 283 mListView->setSingleLineEnabled(config->readBoolEntry("SingleLine", false));
284 mListView->setToolTipsEnabled(config->readBoolEntry("ToolTips", true)); 284 mListView->setToolTipsEnabled(config->readBoolEntry("ToolTips", true));
285 285
286 if (config->readBoolEntry("Background", false)) 286 if (config->readBoolEntry("Background", false))
287 mListView->setBackgroundPixmap(config->readEntry("BackgroundName")); 287 mListView->setBackgroundPixmap(config->readEntry("BackgroundName"));
288 288
289 // Restore the layout of the listview 289 // Restore the layout of the listview
290 mListView->restoreLayout(config, config->group()); 290 mListView->restoreLayout(config, config->group());
291} 291}
292 292
293void KAddressBookTableView::refresh(QString uid) 293void KAddressBookTableView::refresh(QString uid)
294{ 294{
295 // For now just repopulate. In reality this method should 295 // For now just repopulate. In reality this method should
296 // check the value of uid, and if valid iterate through 296 // check the value of uid, and if valid iterate through
297 // the listview to find the entry, then tell it to refresh. 297 // the listview to find the entry, then tell it to refresh.
298 298
299 if (uid.isNull()) { 299 if (uid.isNull()) {
300 // Clear the list view 300 // Clear the list view
301 QString currentUID, nextUID; 301 QString currentUID, nextUID;
302#ifndef KAB_EMBEDDED 302#ifndef KAB_EMBEDDED
303 ContactListViewItem *currentItem = dynamic_cast<ContactListViewItem*>( mListView->currentItem() ); 303 ContactListViewItem *currentItem = dynamic_cast<ContactListViewItem*>( mListView->currentItem() );
304#else //KAB_EMBEDDED 304#else //KAB_EMBEDDED
305 ContactListViewItem *currentItem = (ContactListViewItem*)( mListView->currentItem() ); 305 ContactListViewItem *currentItem = (ContactListViewItem*)( mListView->currentItem() );
306#endif //KAB_EMBEDDED 306#endif //KAB_EMBEDDED
307 307
308 if ( currentItem ) { 308 if ( currentItem ) {
309#ifndef KAB_EMBEDDED 309#ifndef KAB_EMBEDDED
310 ContactListViewItem *nextItem = dynamic_cast<ContactListViewItem*>( currentItem->itemBelow() ); 310 ContactListViewItem *nextItem = dynamic_cast<ContactListViewItem*>( currentItem->itemBelow() );
311#else //KAB_EMBEDDED 311#else //KAB_EMBEDDED
312 ContactListViewItem *nextItem = (ContactListViewItem*)( currentItem->itemBelow() ); 312 ContactListViewItem *nextItem = (ContactListViewItem*)( currentItem->itemBelow() );
313#endif //KAB_EMBEDDED 313#endif //KAB_EMBEDDED
314 if ( nextItem ) 314 if ( nextItem )
315 nextUID = nextItem->addressee().uid(); 315 nextUID = nextItem->addressee().uid();
316 currentUID = currentItem->addressee().uid(); 316 currentUID = currentItem->addressee().uid();
317 } 317 }
318 318
319 mListView->clear(); 319 mListView->clear();
320 320
321 currentItem = 0; 321 currentItem = 0;
322 KABC::Addressee::List addresseeList = addressees(); 322 KABC::Addressee::List addresseeList = addressees();
323 KABC::Addressee::List::Iterator it; 323 KABC::Addressee::List::Iterator it;
324 for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { 324 for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
325 if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") ) 325 if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
326 continue; 326 continue;
327 ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields()); 327 ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
328 if ( (*it).uid() == currentUID ) 328 if ( (*it).uid() == currentUID )
329 currentItem = item; 329 currentItem = item;
330 else if ( (*it).uid() == nextUID && !currentItem ) 330 else if ( (*it).uid() == nextUID && !currentItem )
331 currentItem = item; 331 currentItem = item;
332 } 332 }
333 333
334 // Sometimes the background pixmap gets messed up when we add lots 334 // Sometimes the background pixmap gets messed up when we add lots
335 // of items. 335 // of items.
336 mListView->repaint(); 336 mListView->repaint();
337 337 if ( !currentItem )
338 currentItem = (ContactListViewItem *)mListView->firstChild();
338 if ( currentItem ) { 339 if ( currentItem ) {
339 mListView->setCurrentItem( currentItem ); 340 mListView->setCurrentItem( currentItem );
340 mListView->ensureItemVisible( currentItem ); 341 mListView->ensureItemVisible( currentItem );
342 mListView->setSelected( currentItem, true );
341 } 343 }
342 } else { 344 } else {
343 // Only need to update on entry. Iterate through and try to find it 345 // Only need to update on entry. Iterate through and try to find it
344 ContactListViewItem *ceItem; 346 ContactListViewItem *ceItem;
345 QListViewItemIterator it( mListView ); 347 QListViewItemIterator it( mListView );
346 while ( it.current() ) { 348 while ( it.current() ) {
347#ifndef KAB_EMBEDDED 349#ifndef KAB_EMBEDDED
348 ceItem = dynamic_cast<ContactListViewItem*>( it.current() ); 350 ceItem = dynamic_cast<ContactListViewItem*>( it.current() );
349#else //KAB_EMBEDDED 351#else //KAB_EMBEDDED
350 ceItem = (ContactListViewItem*)( it.current() ); 352 ceItem = (ContactListViewItem*)( it.current() );
351#endif //KAB_EMBEDDED 353#endif //KAB_EMBEDDED
352 354
353 if ( ceItem && ceItem->addressee().uid() == uid ) { 355 if ( ceItem && ceItem->addressee().uid() == uid ) {
354 ceItem->refresh(); 356 ceItem->refresh();
355 return; 357 return;
356 } 358 }
357 ++it; 359 ++it;
358 } 360 }
359 361
360 refresh( QString::null ); 362 refresh( QString::null );
361 } 363 }
362} 364}
363 365
364QStringList KAddressBookTableView::selectedUids() 366QStringList KAddressBookTableView::selectedUids()
365{ 367{
366 QStringList uidList; 368 QStringList uidList;
367 QListViewItem *item; 369 QListViewItem *item;
368 ContactListViewItem *ceItem; 370 ContactListViewItem *ceItem;
369 371
370 for(item = mListView->firstChild(); item; item = item->itemBelow()) 372 for(item = mListView->firstChild(); item; item = item->itemBelow())
371 { 373 {
372 if (mListView->isSelected( item )) 374 if (mListView->isSelected( item ))
373 { 375 {
374#ifndef KAB_EMBEDDED 376#ifndef KAB_EMBEDDED
375 ceItem = dynamic_cast<ContactListViewItem*>(item); 377 ceItem = dynamic_cast<ContactListViewItem*>(item);
376#else //KAB_EMBEDDED 378#else //KAB_EMBEDDED
377 ceItem = (ContactListViewItem*)(item); 379 ceItem = (ContactListViewItem*)(item);
378#endif //KAB_EMBEDDED 380#endif //KAB_EMBEDDED
379 381
380 if (ceItem != 0L) 382 if (ceItem != 0L)
381 uidList << ceItem->addressee().uid(); 383 uidList << ceItem->addressee().uid();
382 } 384 }
383 } 385 }
384 if ( uidList.count() == 0 ) 386 if ( uidList.count() == 0 )
385 if ( mListView->currentItem() ) { 387 if ( mListView->currentItem() ) {
386 ceItem = (ContactListViewItem*)(mListView->currentItem()) ; 388 ceItem = (ContactListViewItem*)(mListView->currentItem()) ;
387 uidList << ceItem->addressee().uid(); 389 uidList << ceItem->addressee().uid();
388 } 390 }
389 391
390 return uidList; 392 return uidList;
391} 393}
392 394
393void KAddressBookTableView::setSelected(QString uid, bool selected) 395void KAddressBookTableView::setSelected(QString uid, bool selected)
394{ 396{
395 QListViewItem *item; 397 QListViewItem *item;
396 ContactListViewItem *ceItem; 398 ContactListViewItem *ceItem;
397 399
398 if (uid.isNull()) 400 if (uid.isNull())
399 { 401 {
400 mListView->selectAll(selected); 402 mListView->selectAll(selected);
401 } 403 }
402 else 404 else
403 { 405 {
404 for(item = mListView->firstChild(); item; item = item->itemBelow()) 406 for(item = mListView->firstChild(); item; item = item->itemBelow())
405 { 407 {
406#ifndef KAB_EMBEDDED 408#ifndef KAB_EMBEDDED
407 ceItem = dynamic_cast<ContactListViewItem*>(item); 409 ceItem = dynamic_cast<ContactListViewItem*>(item);
408#else //KAB_EMBEDDED 410#else //KAB_EMBEDDED
409 ceItem = (ContactListViewItem*)(item); 411 ceItem = (ContactListViewItem*)(item);
410#endif //KAB_EMBEDDED 412#endif //KAB_EMBEDDED
411 413
412 414
413 if ((ceItem != 0L) && (ceItem->addressee().uid() == uid)) 415 if ((ceItem != 0L) && (ceItem->addressee().uid() == uid))
414 { 416 {
415 mListView->setSelected(item, selected); 417 mListView->setSelected(item, selected);
416 418
417 if (selected) 419 if (selected)
418 mListView->ensureItemVisible(item); 420 mListView->ensureItemVisible(item);
419 } 421 }
420 } 422 }
421 } 423 }
422} 424}
423 425
424void KAddressBookTableView::addresseeSelected() 426void KAddressBookTableView::addresseeSelected()
425{ 427{
426 // We need to try to find the first selected item. This might not be the 428 // We need to try to find the first selected item. This might not be the
427 // last selected item, but when QListView is in multiselection mode, 429 // last selected item, but when QListView is in multiselection mode,
428 // there is no way to figure out which one was 430 // there is no way to figure out which one was
429 // selected last. 431 // selected last.
430 QListViewItem *item; 432 QListViewItem *item;
431 bool found =false; 433 bool found =false;
432 for (item = mListView->firstChild(); item && !found; 434 for (item = mListView->firstChild(); item && !found;
433 item = item->nextSibling()) 435 item = item->nextSibling())
434 { 436 {
435 if (item->isSelected()) 437 if (item->isSelected())
436 { 438 {
437 found = true; 439 found = true;
438#ifndef KAB_EMBEDDED 440#ifndef KAB_EMBEDDED
439 ContactListViewItem *ceItem 441 ContactListViewItem *ceItem
440 = dynamic_cast<ContactListViewItem*>(item); 442 = dynamic_cast<ContactListViewItem*>(item);
441#else //KAB_EMBEDDED 443#else //KAB_EMBEDDED
442 ContactListViewItem *ceItem 444 ContactListViewItem *ceItem
443 = (ContactListViewItem*)(item); 445 = (ContactListViewItem*)(item);
444#endif //KAB_EMBEDDED 446#endif //KAB_EMBEDDED
445 447
446 if ( ceItem ) emit selected(ceItem->addressee().uid()); 448 if ( ceItem ) emit selected(ceItem->addressee().uid());
447 } 449 }
448 } 450 }
449 451
450 if (!found) 452 if (!found)
451 emit selected(QString::null); 453 emit selected(QString::null);
452} 454}
453 455
454void KAddressBookTableView::addresseeExecuted(QListViewItem *item) 456void KAddressBookTableView::addresseeExecuted(QListViewItem *item)
455{ 457{
456 if (item) 458 if (item)
457 { 459 {
458#ifndef KAB_EMBEDDED 460#ifndef KAB_EMBEDDED
459 ContactListViewItem *ceItem 461 ContactListViewItem *ceItem
460 = dynamic_cast<ContactListViewItem*>(item); 462 = dynamic_cast<ContactListViewItem*>(item);
461#else //KAB_EMBEDDED 463#else //KAB_EMBEDDED
462 ContactListViewItem *ceItem 464 ContactListViewItem *ceItem
463 = (ContactListViewItem*)(item); 465 = (ContactListViewItem*)(item);
464#endif //KAB_EMBEDDED 466#endif //KAB_EMBEDDED
465 467
466 if (ceItem) 468 if (ceItem)
467 { 469 {
468 emit executed(ceItem->addressee().uid()); 470 emit executed(ceItem->addressee().uid());
469 } 471 }
470 } 472 }
471 else 473 else
472 { 474 {
473 emit executed(QString::null); 475 emit executed(QString::null);
474 } 476 }
475} 477}
476 478
477void KAddressBookTableView::addresseeDeleted() 479void KAddressBookTableView::addresseeDeleted()
478{ 480{
479 481
480 emit deleteRequest(); 482 emit deleteRequest();
481 483
482} 484}
483 485
484 486
485 487
486 488
487 489
488#ifndef KAB_EMBEDDED 490#ifndef KAB_EMBEDDED
489#include "kaddressbooktableview.moc" 491#include "kaddressbooktableview.moc"
490#endif //KAB_EMBEDDED 492#endif //KAB_EMBEDDED
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 8c72d89..70baf5c 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1,1133 +1,1134 @@
1#include <stdlib.h> 1#include <stdlib.h>
2 2
3#include <qaction.h> 3#include <qaction.h>
4#include <qpopupmenu.h> 4#include <qpopupmenu.h>
5#include <qpainter.h> 5#include <qpainter.h>
6#include <qwhatsthis.h> 6#include <qwhatsthis.h>
7#include <qpushbutton.h> 7#include <qpushbutton.h>
8#include <qmessagebox.h> 8#include <qmessagebox.h>
9#include <qlineedit.h> 9#include <qlineedit.h>
10#include <qtextcodec.h> 10#include <qtextcodec.h>
11#include <qfile.h> 11#include <qfile.h>
12#include <qdir.h> 12#include <qdir.h>
13#include <qapp.h> 13#include <qapp.h>
14#include <qfileinfo.h> 14#include <qfileinfo.h>
15#include <qlabel.h> 15#include <qlabel.h>
16#include <qspinbox.h> 16#include <qspinbox.h>
17#include <qcheckbox.h> 17#include <qcheckbox.h>
18#include <qmap.h> 18#include <qmap.h>
19#include <qwmatrix.h> 19#include <qwmatrix.h>
20#include <qtextbrowser.h> 20#include <qtextbrowser.h>
21#include <qtextstream.h> 21#include <qtextstream.h>
22#ifndef DESKTOP_VERSION 22#ifndef DESKTOP_VERSION
23#include <qpe/global.h> 23#include <qpe/global.h>
24#include <qpe/qpetoolbar.h> 24#include <qpe/qpetoolbar.h>
25#include <qpe/resource.h> 25#include <qpe/resource.h>
26#include <qpe/qpeapplication.h> 26#include <qpe/qpeapplication.h>
27#include <qtopia/alarmserver.h> 27#include <qtopia/alarmserver.h>
28#include <qtopia/qcopenvelope_qws.h> 28#include <qtopia/qcopenvelope_qws.h>
29#include <unistd.h> // for sleep 29#include <unistd.h> // for sleep
30#else 30#else
31#include <qtoolbar.h> 31#include <qtoolbar.h>
32#include <qapplication.h> 32#include <qapplication.h>
33//#include <resource.h> 33//#include <resource.h>
34 34
35#endif 35#endif
36#include <libkcal/calendarlocal.h> 36#include <libkcal/calendarlocal.h>
37#include <libkcal/todo.h> 37#include <libkcal/todo.h>
38#include <libkcal/phoneformat.h> 38#include <libkcal/phoneformat.h>
39#include <libkdepim/ksyncprofile.h> 39#include <libkdepim/ksyncprofile.h>
40#include <libkdepim/phoneaccess.h> 40#include <libkdepim/phoneaccess.h>
41#include <libkcal/kincidenceformatter.h> 41#include <libkcal/kincidenceformatter.h>
42#include <libkdepim/kpimglobalprefs.h> 42#include <libkdepim/kpimglobalprefs.h>
43 43
44#include "calendarview.h" 44#include "calendarview.h"
45#include "koviewmanager.h" 45#include "koviewmanager.h"
46#include "datenavigator.h" 46#include "datenavigator.h"
47#include "koagendaview.h" 47#include "koagendaview.h"
48#include "kojournalview.h" 48#include "kojournalview.h"
49#include "koagenda.h" 49#include "koagenda.h"
50#include "kodialogmanager.h" 50#include "kodialogmanager.h"
51#include "kdialogbase.h" 51#include "kdialogbase.h"
52#include "kapplication.h" 52#include "kapplication.h"
53#include "kofilterview.h" 53#include "kofilterview.h"
54#include "kstandarddirs.h" 54#include "kstandarddirs.h"
55#include "koprefs.h" 55#include "koprefs.h"
56#include "kfiledialog.h" 56#include "kfiledialog.h"
57#include "koglobals.h" 57#include "koglobals.h"
58#include "kglobal.h" 58#include "kglobal.h"
59#include "ktoolbar.h" 59#include "ktoolbar.h"
60#include "klocale.h" 60#include "klocale.h"
61#include "kconfig.h" 61#include "kconfig.h"
62#include "externalapphandler.h" 62#include "externalapphandler.h"
63#include <kglobalsettings.h> 63#include <kglobalsettings.h>
64 64
65using namespace KCal; 65using namespace KCal;
66#ifndef _WIN32_ 66#ifndef _WIN32_
67#include <unistd.h> 67#include <unistd.h>
68#else 68#else
69#ifdef _OL_IMPORT_ 69#ifdef _OL_IMPORT_
70#include "koimportoldialog.h" 70#include "koimportoldialog.h"
71#endif 71#endif
72#endif 72#endif
73#include "mainwindow.h" 73#include "mainwindow.h"
74 74
75 75
76class KOex2phonePrefs : public QDialog 76class KOex2phonePrefs : public QDialog
77{ 77{
78 public: 78 public:
79 KOex2phonePrefs( QWidget *parent=0, const char *name=0 ) : 79 KOex2phonePrefs( QWidget *parent=0, const char *name=0 ) :
80 QDialog( parent, name, true ) 80 QDialog( parent, name, true )
81 { 81 {
82 setCaption( i18n("Export to phone options") ); 82 setCaption( i18n("Export to phone options") );
83 QVBoxLayout* lay = new QVBoxLayout( this ); 83 QVBoxLayout* lay = new QVBoxLayout( this );
84 lay->setSpacing( 3 ); 84 lay->setSpacing( 3 );
85 lay->setMargin( 3 ); 85 lay->setMargin( 3 );
86 QLabel *lab; 86 QLabel *lab;
87 lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) ); 87 lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) );
88 lab->setAlignment (AlignHCenter ); 88 lab->setAlignment (AlignHCenter );
89 QHBox* temphb; 89 QHBox* temphb;
90 temphb = new QHBox( this ); 90 temphb = new QHBox( this );
91 new QLabel( i18n("I/O device: "), temphb ); 91 new QLabel( i18n("I/O device: "), temphb );
92 mPhoneDevice = new QLineEdit( temphb); 92 mPhoneDevice = new QLineEdit( temphb);
93 lay->addWidget( temphb ); 93 lay->addWidget( temphb );
94 temphb = new QHBox( this ); 94 temphb = new QHBox( this );
95 new QLabel( i18n("Connection: "), temphb ); 95 new QLabel( i18n("Connection: "), temphb );
96 mPhoneConnection = new QLineEdit( temphb); 96 mPhoneConnection = new QLineEdit( temphb);
97 lay->addWidget( temphb ); 97 lay->addWidget( temphb );
98 temphb = new QHBox( this ); 98 temphb = new QHBox( this );
99 new QLabel( i18n("Model(opt.): "), temphb ); 99 new QLabel( i18n("Model(opt.): "), temphb );
100 mPhoneModel = new QLineEdit( temphb); 100 mPhoneModel = new QLineEdit( temphb);
101 lay->addWidget( temphb ); 101 lay->addWidget( temphb );
102 mWriteBackFuture= new QCheckBox( i18n("Write back events in future only"), this ); 102 mWriteBackFuture= new QCheckBox( i18n("Write back events in future only"), this );
103 mWriteBackFuture->setChecked( true ); 103 mWriteBackFuture->setChecked( true );
104 lay->addWidget( mWriteBackFuture ); 104 lay->addWidget( mWriteBackFuture );
105 temphb = new QHBox( this ); 105 temphb = new QHBox( this );
106 new QLabel( i18n("Max. weeks in future: ") , temphb ); 106 new QLabel( i18n("Max. weeks in future: ") , temphb );
107 mWriteBackFutureWeeks= new QSpinBox(1,104, 1, temphb); 107 mWriteBackFutureWeeks= new QSpinBox(1,104, 1, temphb);
108 mWriteBackFutureWeeks->setValue( 8 ); 108 mWriteBackFutureWeeks->setValue( 8 );
109 lay->addWidget( temphb ); 109 lay->addWidget( temphb );
110 lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ntodo/calendar data on phone!"), this ) ); 110 lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ntodo/calendar data on phone!"), this ) );
111 lab->setAlignment (AlignHCenter ); 111 lab->setAlignment (AlignHCenter );
112 QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this ); 112 QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
113 lay->addWidget( ok ); 113 lay->addWidget( ok );
114 QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); 114 QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
115 lay->addWidget( cancel ); 115 lay->addWidget( cancel );
116 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); 116 connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) );
117 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); 117 connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) );
118 resize( 220, 240 ); 118 resize( 220, 240 );
119 qApp->processEvents(); 119 qApp->processEvents();
120 int dw = QApplication::desktop()->width(); 120 int dw = QApplication::desktop()->width();
121 int dh = QApplication::desktop()->height(); 121 int dh = QApplication::desktop()->height();
122 move( (dw-width())/2, (dh - height() )/2 ); 122 move( (dw-width())/2, (dh - height() )/2 );
123 } 123 }
124 124
125public: 125public:
126 QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; 126 QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel;
127 QCheckBox* mWriteBackFuture; 127 QCheckBox* mWriteBackFuture;
128 QSpinBox* mWriteBackFutureWeeks; 128 QSpinBox* mWriteBackFutureWeeks;
129}; 129};
130 130
131QPixmap* sgListViewCompletedPix[6]; 131QPixmap* sgListViewCompletedPix[6];
132QPixmap* sgListViewJournalPix; 132QPixmap* sgListViewJournalPix;
133 133
134 134
135int globalFlagBlockStartup; 135int globalFlagBlockStartup;
136MainWindow::MainWindow( QWidget *parent, const char *name ) : 136MainWindow::MainWindow( QWidget *parent, const char *name ) :
137 QMainWindow( parent, name ) 137 QMainWindow( parent, name )
138{ 138{
139 sgListViewCompletedPix[5] = &listviewPix; 139 sgListViewCompletedPix[5] = &listviewPix;
140 sgListViewCompletedPix[0] = &listviewPix0; 140 sgListViewCompletedPix[0] = &listviewPix0;
141 sgListViewCompletedPix[1] = &listviewPix20; 141 sgListViewCompletedPix[1] = &listviewPix20;
142 sgListViewCompletedPix[2] = &listviewPix40; 142 sgListViewCompletedPix[2] = &listviewPix40;
143 sgListViewCompletedPix[3] = &listviewPix60; 143 sgListViewCompletedPix[3] = &listviewPix60;
144 sgListViewCompletedPix[4] = &listviewPix80; 144 sgListViewCompletedPix[4] = &listviewPix80;
145 //int size = 12; 145 //int size = 12;
146 { 146 {
147 sgListViewCompletedPix[5]->resize( 11, 11 ); 147 sgListViewCompletedPix[5]->resize( 11, 11 );
148 sgListViewCompletedPix[5]->fill( Qt::white ); 148 sgListViewCompletedPix[5]->fill( Qt::white );
149 QPainter p ( sgListViewCompletedPix[5] ); 149 QPainter p ( sgListViewCompletedPix[5] );
150 p.drawRect( 0,0,11,11); 150 p.drawRect( 0,0,11,11);
151 p.drawLine ( 2, 5, 4 , 7 ) ; 151 p.drawLine ( 2, 5, 4 , 7 ) ;
152 p.drawLine ( 4 , 7 , 8, 3) ; 152 p.drawLine ( 4 , 7 , 8, 3) ;
153 int iii = 0; 153 int iii = 0;
154 for ( iii = 0; iii < 5; ++iii ) { 154 for ( iii = 0; iii < 5; ++iii ) {
155 sgListViewCompletedPix[iii]->resize( 11, 11 ); 155 sgListViewCompletedPix[iii]->resize( 11, 11 );
156 sgListViewCompletedPix[iii]->fill( Qt::white ); 156 sgListViewCompletedPix[iii]->fill( Qt::white );
157 QPainter p ( sgListViewCompletedPix[iii] ); 157 QPainter p ( sgListViewCompletedPix[iii] );
158 p.drawRect( 0,0,11,11); 158 p.drawRect( 0,0,11,11);
159 if ( iii ) 159 if ( iii )
160 p.fillRect( 1,1,iii*2,9,Qt::gray ); 160 p.fillRect( 1,1,iii*2,9,Qt::gray );
161 } 161 }
162 sgListViewJournalPix = &journalPix; 162 sgListViewJournalPix = &journalPix;
163 sgListViewJournalPix->resize( 11, 11 ); 163 sgListViewJournalPix->resize( 11, 11 );
164 sgListViewJournalPix->fill( Qt::white ); 164 sgListViewJournalPix->fill( Qt::white );
165 { 165 {
166 QPainter p ( sgListViewJournalPix ); 166 QPainter p ( sgListViewJournalPix );
167 p.drawRect( 0,0,11,11); 167 p.drawRect( 0,0,11,11);
168 p.drawLine( 2,3,5,3); 168 p.drawLine( 2,3,5,3);
169 p.drawLine( 2,5,8,5); 169 p.drawLine( 2,5,8,5);
170 p.drawLine( 2,7,6,7); 170 p.drawLine( 2,7,6,7);
171 } 171 }
172 } 172 }
173 mClosed = false; 173 mClosed = false;
174 //QString confFile = KStandardDirs::appDir() + "config/korganizerrc"; 174 //QString confFile = KStandardDirs::appDir() + "config/korganizerrc";
175 QString confFile = locateLocal("config","korganizerrc"); 175 QString confFile = locateLocal("config","korganizerrc");
176 QFileInfo finf ( confFile ); 176 QFileInfo finf ( confFile );
177 bool showWarning = !finf.exists(); 177 bool showWarning = !finf.exists();
178 setIcon(SmallIcon( "ko24" ) ); 178 setIcon(SmallIcon( "ko24" ) );
179 mBlockAtStartup = true; 179 mBlockAtStartup = true;
180 mFlagKeyPressed = false; 180 mFlagKeyPressed = false;
181 setCaption("KO/Pi"); 181 setCaption("KO/Pi");
182 KOPrefs *p = KOPrefs::instance(); 182 KOPrefs *p = KOPrefs::instance();
183 //KPimGlobalPrefs::instance()->setGlobalConfig(); 183 //KPimGlobalPrefs::instance()->setGlobalConfig();
184 p->mCurrentDisplayedView = 0; 184 p->mCurrentDisplayedView = 0;
185 if ( p->mHourSize > 22 ) 185 if ( p->mHourSize > 22 )
186 p->mHourSize = 22; 186 p->mHourSize = 22;
187 QMainWindow::ToolBarDock tbd; 187 QMainWindow::ToolBarDock tbd;
188 if ( p->mToolBarHor ) { 188 if ( p->mToolBarHor ) {
189 if ( p->mToolBarUp ) 189 if ( p->mToolBarUp )
190 tbd = Bottom; 190 tbd = Bottom;
191 else 191 else
192 tbd = Top; 192 tbd = Top;
193 } 193 }
194 else { 194 else {
195 if ( p->mToolBarUp ) 195 if ( p->mToolBarUp )
196 tbd = Right; 196 tbd = Right;
197 else 197 else
198 tbd = Left; 198 tbd = Left;
199 } 199 }
200 if ( KOPrefs::instance()->mUseAppColors ) 200 if ( KOPrefs::instance()->mUseAppColors )
201 QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true ); 201 QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
202 globalFlagBlockStartup = 1; 202 globalFlagBlockStartup = 1;
203 iconToolBar = new QPEToolBar( this ); 203 iconToolBar = new QPEToolBar( this );
204 addToolBar (iconToolBar , tbd ); 204 addToolBar (iconToolBar , tbd );
205 205
206#ifdef DESKTOP_VERSION 206#ifdef DESKTOP_VERSION
207 if ( KOPrefs::instance()->mShowIconFilter ) 207 if ( KOPrefs::instance()->mShowIconFilter )
208#else 208#else
209 if ( KOPrefs::instance()->mShowIconFilter || ( !p->mShowIconOnetoolbar &&!p->mShowIconFilterview ) ) 209 if ( KOPrefs::instance()->mShowIconFilter || ( !p->mShowIconOnetoolbar &&!p->mShowIconFilterview ) )
210#endif 210#endif
211 211
212{ 212{
213 if ( p->mToolBarHorF ) { 213 if ( p->mToolBarHorF ) {
214 if ( p->mToolBarUpF ) 214 if ( p->mToolBarUpF )
215 tbd = Bottom; 215 tbd = Bottom;
216 else 216 else
217 tbd = Top; 217 tbd = Top;
218 } 218 }
219 else { 219 else {
220 if ( p->mToolBarUpF ) 220 if ( p->mToolBarUpF )
221 tbd = Right; 221 tbd = Right;
222 else 222 else
223 tbd = Left; 223 tbd = Left;
224 } 224 }
225 filterToolBar = new QPEToolBar ( this ); 225 filterToolBar = new QPEToolBar ( this );
226 filterMenubar = new KMenuBar( 0 ); 226 filterMenubar = new KMenuBar( 0 );
227 QFontMetrics fm ( filterMenubar->font() ); 227 QFontMetrics fm ( filterMenubar->font() );
228#ifndef DESKTOP_VERSION 228#ifndef DESKTOP_VERSION
229 filterToolBar->setFocusPolicy( NoFocus ); 229 filterToolBar->setFocusPolicy( NoFocus );
230 filterMenubar->setFocusPolicy( NoFocus ); 230 filterMenubar->setFocusPolicy( NoFocus );
231#endif 231#endif
232 filterPopupMenu = new QPopupMenu( this ); 232 filterPopupMenu = new QPopupMenu( this );
233 filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 ); 233 filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0 );
234 QString addTest = "A"; 234 QString addTest = "A";
235 filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) ); 235 filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) );
236#ifdef DESKTOP_VERSION 236#ifdef DESKTOP_VERSION
237 addTest = "AAAAAABBBCCCx"; 237 addTest = "AAAAAABBBCCCx";
238#else 238#else
239 addTest = "AAAAAx"; 239 addTest = "AAAAAx";
240#endif 240#endif
241 filterMenubar->setMaximumWidth( fm.width( i18n("No Filter")+addTest ) ); 241 filterMenubar->setMaximumWidth( fm.width( i18n("No Filter")+addTest ) );
242 addToolBar (filterToolBar , tbd ); 242 addToolBar (filterToolBar , tbd );
243 connect ( filterPopupMenu , SIGNAL( activated ( int ) ), this, SLOT (selectFilterPopup( int ) ) ); 243 connect ( filterPopupMenu , SIGNAL( activated ( int ) ), this, SLOT (selectFilterPopup( int ) ) );
244 connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) ); 244 connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) );
245 if ( !KOPrefs::instance()->mShowIconFilter && !p->mShowIconOnetoolbar ) 245 if ( !KOPrefs::instance()->mShowIconFilter && !p->mShowIconOnetoolbar )
246 filterToolBar->hide(); 246 filterToolBar->hide();
247 } else { 247 } else {
248 filterToolBar = 0; 248 filterToolBar = 0;
249 filterMenubar = 0; 249 filterMenubar = 0;
250 filterPopupMenu = 0; 250 filterPopupMenu = 0;
251 } 251 }
252 if ( p->mShowIconOnetoolbar ) { 252 if ( p->mShowIconOnetoolbar ) {
253 viewToolBar = iconToolBar ; 253 viewToolBar = iconToolBar ;
254 navigatorToolBar = iconToolBar ; 254 navigatorToolBar = iconToolBar ;
255 } else { 255 } else {
256#ifndef DESKTOP_VERSION 256#ifndef DESKTOP_VERSION
257 setToolBarsMovable( false ); 257 setToolBarsMovable( false );
258#endif 258#endif
259 if ( p->mToolBarHorV ) { 259 if ( p->mToolBarHorV ) {
260 if ( p->mToolBarUpV ) 260 if ( p->mToolBarUpV )
261 tbd = Bottom; 261 tbd = Bottom;
262 else 262 else
263 tbd = Top; 263 tbd = Top;
264 } 264 }
265 else { 265 else {
266 if ( p->mToolBarUpV ) 266 if ( p->mToolBarUpV )
267 tbd = Right; 267 tbd = Right;
268 else 268 else
269 tbd = Left; 269 tbd = Left;
270 } 270 }
271 viewToolBar = new QPEToolBar( this ); 271 viewToolBar = new QPEToolBar( this );
272 addToolBar (viewToolBar , tbd ); 272 addToolBar (viewToolBar , tbd );
273 if ( p->mToolBarHorN ) { 273 if ( p->mToolBarHorN ) {
274 if ( p->mToolBarUpN ) 274 if ( p->mToolBarUpN )
275 tbd = Bottom; 275 tbd = Bottom;
276 else 276 else
277 tbd = Top; 277 tbd = Top;
278 } 278 }
279 else { 279 else {
280 if ( p->mToolBarUpN ) 280 if ( p->mToolBarUpN )
281 tbd = Right; 281 tbd = Right;
282 else 282 else
283 tbd = Left; 283 tbd = Left;
284 } 284 }
285 navigatorToolBar = new QPEToolBar( this ); 285 navigatorToolBar = new QPEToolBar( this );
286 addToolBar (navigatorToolBar , tbd ); 286 addToolBar (navigatorToolBar , tbd );
287 } 287 }
288 288
289 289
290 290
291 mCalendarModifiedFlag = false; 291 mCalendarModifiedFlag = false;
292 QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this ); 292 // QLabel* splash = new QLabel(i18n("KO/Pi is starting ... "), this );
293 splash->setAlignment ( AlignCenter ); 293 //splash->setAlignment ( AlignCenter );
294 setCentralWidget( splash ); 294 //setCentralWidget( splash );
295#ifndef DESKTOP_VERSION 295#ifndef DESKTOP_VERSION
296 showMaximized(); 296 //showMaximized();
297#endif 297#endif
298 298
299 //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ()); 299 //qDebug("Mainwidget x %d y %d w %d h %d", x(), y(), width(), height ());
300 setDefaultPreferences(); 300 setDefaultPreferences();
301 mCalendar = new CalendarLocal(); 301 mCalendar = new CalendarLocal();
302 mView = new CalendarView( mCalendar, this,"mCalendar " ); 302 mView = new CalendarView( mCalendar, this,"mCalendar " );
303 mView->hide(); 303 setCentralWidget( mView );
304 //mView->hide();
304 //mView->resize(splash->size() ); 305 //mView->resize(splash->size() );
305 initActions(); 306 initActions();
306 mSyncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)mView, KSyncManager::KOPI, KOPrefs::instance(), syncMenu); 307 mSyncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)mView, KSyncManager::KOPI, KOPrefs::instance(), syncMenu);
307 mSyncManager->setBlockSave(false); 308 mSyncManager->setBlockSave(false);
308 mView->setSyncManager(mSyncManager); 309 mView->setSyncManager(mSyncManager);
309#ifndef DESKTOP_VERSION 310#ifndef DESKTOP_VERSION
310 iconToolBar->show(); 311 iconToolBar->show();
311 qApp->processEvents(); 312 qApp->processEvents();
312#endif 313#endif
313 //qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ()); 314 //qDebug("Splashwidget x %d y %d w %d h %d", splash-> x(), splash->y(), splash->width(),splash-> height ());
314 int vh = height() ; 315 int vh = height() ;
315 int vw = width(); 316 int vw = width();
316 //qDebug("Toolbar hei %d ",iconToolBar->height() ); 317 //qDebug("Toolbar hei %d ",iconToolBar->height() );
317 if ( iconToolBar->orientation () == Qt:: Horizontal ) { 318 if ( iconToolBar->orientation () == Qt:: Horizontal ) {
318 vh -= iconToolBar->height(); 319 vh -= iconToolBar->height();
319 } else { 320 } else {
320 vw -= iconToolBar->height(); 321 vw -= iconToolBar->height();
321 } 322 }
322 //mView->setMaximumSize( splash->size() ); 323 //mView->setMaximumSize( splash->size() );
323 //mView->resize( splash->size() ); 324 //mView->resize( splash->size() );
324 //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); 325 //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ());
325 mView->readSettings(); 326 mView->readSettings();
326 bool newFile = false; 327 bool newFile = false;
327 if( !QFile::exists( defaultFileName() ) ) { 328 if( !QFile::exists( defaultFileName() ) ) {
328 QFileInfo finfo ( defaultFileName() ); 329 QFileInfo finfo ( defaultFileName() );
329 QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); 330 QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics");
330 QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n"; 331 QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n";
331 finfo.setFile( oldFile ); 332 finfo.setFile( oldFile );
332 if (finfo.exists() ) { 333 if (finfo.exists() ) {
333 KMessageBox::information( this, message); 334 KMessageBox::information( this, message);
334 mView->openCalendar( oldFile ); 335 mView->openCalendar( oldFile );
335 qApp->processEvents(); 336 qApp->processEvents();
336 } else { 337 } else {
337 oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/korganizer/mycalendar.ics"); 338 oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/korganizer/mycalendar.ics");
338 finfo.setFile( oldFile ); 339 finfo.setFile( oldFile );
339 if (finfo.exists() ) { 340 if (finfo.exists() ) {
340 KMessageBox::information( this, message); 341 KMessageBox::information( this, message);
341 mView->openCalendar( oldFile ); 342 mView->openCalendar( oldFile );
342 qApp->processEvents(); 343 qApp->processEvents();
343 } 344 }
344 } 345 }
345 mView->saveCalendar( defaultFileName() ); 346 mView->saveCalendar( defaultFileName() );
346 newFile = true; 347 newFile = true;
347 } 348 }
348 349
349 //QTime neededSaveTime = QDateTime::currentDateTime().time(); 350 //QTime neededSaveTime = QDateTime::currentDateTime().time();
350 //mView->loadCalendars(); 351 //mView->loadCalendars();
351 //int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); 352 //int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
352 //qDebug("KO: Calendar loading time: %d ms",msNeeded ); 353 //qDebug("KO: Calendar loading time: %d ms",msNeeded );
353 354
354 if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) { 355 if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) {
355 KOPrefs::instance()->setAllDefaults(); 356 KOPrefs::instance()->setAllDefaults();
356 } 357 }
357 358
358 359
359 connect( mView, SIGNAL( tempDisableBR(bool) ), 360 connect( mView, SIGNAL( tempDisableBR(bool) ),
360 SLOT( disableBR(bool) ) ); 361 SLOT( disableBR(bool) ) );
361 connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) ); 362 connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) );
362 setCentralWidget( mView ); 363 setCentralWidget( mView );
363 globalFlagBlockStartup = 0; 364 globalFlagBlockStartup = 0;
364 mView->show(); 365 //mView->show();
365 delete splash; 366 //delete splash;
366 if ( newFile ) 367 if ( newFile )
367 mView->updateConfig(); 368 mView->updateConfig();
368 // qApp->processEvents(); 369 // qApp->processEvents();
369 //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); 370 //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ());
370 //fillSyncMenu(); 371 //fillSyncMenu();
371 372
372 373
373 connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) ); 374 connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) );
374 connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) ); 375 connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) );
375 connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); 376 connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
376 connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); 377 connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
377 mSyncManager->setDefaultFileName( sentSyncFile()); 378 mSyncManager->setDefaultFileName( sentSyncFile());
378 connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) ); 379 connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) );
379 mSyncManager->fillSyncMenu(); 380 mSyncManager->fillSyncMenu();
380 381
381 382
382 383
383 mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); 384 mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins );
384 if ( showWarning ) { 385 if ( showWarning ) {
385 KMessageBox::information( this, 386 KMessageBox::information( this,
386 "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information"); 387 "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information");
387 qApp->processEvents(); 388 qApp->processEvents();
388 mView->dialogManager()->showSyncOptions(); 389 mView->dialogManager()->showSyncOptions();
389 } 390 }
390 391
391 //US listen for result adressed from Ka/Pi 392 //US listen for result adressed from Ka/Pi
392 393
393#ifndef DESKTOP_VERSION 394#ifndef DESKTOP_VERSION
394 infrared = 0; 395 infrared = 0;
395#endif 396#endif
396 updateFilterToolbar(); 397 updateFilterToolbar();
397 updateWeek( mView->startDate() ); 398 updateWeek( mView->startDate() );
398 connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), 399 connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
399 SLOT( updateWeekNum( const KCal::DateList & ) ) ); 400 SLOT( updateWeekNum( const KCal::DateList & ) ) );
400 mBRdisabled = false; 401 mBRdisabled = false;
401 //toggleBeamReceive(); 402 //toggleBeamReceive();
402 403
403 setCaption(i18n("Loading calendar files ... please wait" )); 404 setCaption(i18n("Loading calendar files ... please wait" ));
404 QTimer::singleShot( 10, this, SLOT ( loadDataAfterStart() )); 405 QTimer::singleShot( 10, this, SLOT ( loadDataAfterStart() ));
405} 406}
406MainWindow::~MainWindow() 407MainWindow::~MainWindow()
407{ 408{
408 //qDebug("MainWindow::~MainWindow() "); 409 //qDebug("MainWindow::~MainWindow() ");
409 //save toolbar location 410 //save toolbar location
410 delete mCalendar; 411 delete mCalendar;
411 delete mSyncManager; 412 delete mSyncManager;
412#ifndef DESKTOP_VERSION 413#ifndef DESKTOP_VERSION
413 if ( infrared ) 414 if ( infrared )
414 delete infrared; 415 delete infrared;
415#endif 416#endif
416 417
417 418
418} 419}
419 420
420void MainWindow::loadDataAfterStart() 421void MainWindow::loadDataAfterStart()
421{ 422{
422 423
423 qDebug("KO: Start loading files..." ); 424 qDebug("KO: Start loading files..." );
424 QTime neededSaveTime = QDateTime::currentDateTime().time(); 425 QTime neededSaveTime = QDateTime::currentDateTime().time();
425 mView->loadCalendars(); 426 mView->loadCalendars();
426 int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); 427 int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
427 qDebug("KO: Calendar loading time: %d ms",msNeeded ); 428 qDebug("KO: Calendar loading time: %d ms",msNeeded );
428 //QTimer::singleShot( 1000, mView, SLOT ( checkFiles() )); 429 //QTimer::singleShot( 1000, mView, SLOT ( checkFiles() ));
429 mView->setModified( false ); 430 mView->setModified( false );
430 mBlockAtStartup = false; 431 mBlockAtStartup = false;
431 mView->setModified( false ); 432 mView->setModified( false );
432 connect(mView , SIGNAL( save() ), this, SLOT( save() ) ); 433 connect(mView , SIGNAL( save() ), this, SLOT( save() ) );
433 processIncidenceSelection( 0 ); 434 processIncidenceSelection( 0 );
434 connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), 435 connect( mView, SIGNAL( incidenceSelected( Incidence * ) ),
435 SLOT( processIncidenceSelection( Incidence * ) ) ); 436 SLOT( processIncidenceSelection( Incidence * ) ) );
436 connect( mView, SIGNAL( modifiedChanged( bool ) ), 437 connect( mView, SIGNAL( modifiedChanged( bool ) ),
437 SLOT( slotModifiedChanged( bool ) ) ); 438 SLOT( slotModifiedChanged( bool ) ) );
438 439
439#ifndef DESKTOP_VERSION 440#ifndef DESKTOP_VERSION
440 connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); 441 connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
441 connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve( const QCString&, const QByteArray& ))); 442 connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve( const QCString&, const QByteArray& )));
442 disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart( const QCString&, const QByteArray& ))); 443 disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart( const QCString&, const QByteArray& )));
443 if ( !mCStringMess.isEmpty() ) 444 if ( !mCStringMess.isEmpty() )
444 recieve( mCStringMess, mByteData ); 445 recieve( mCStringMess, mByteData );
445#endif 446#endif
446 447
447 448
448 QTimer::singleShot( 1000, mView, SLOT ( checkFiles() )); 449 QTimer::singleShot( 1000, mView, SLOT ( checkFiles() ));
449} 450}
450 451
451void MainWindow::slotResetFocus() 452void MainWindow::slotResetFocus()
452{ 453{
453 //qDebug(" CalendarView::slotResetFocus() %x %x %x %x", qApp->focusWidget(), menuBar1, mView,iconToolBar); 454 //qDebug(" CalendarView::slotResetFocus() %x %x %x %x", qApp->focusWidget(), menuBar1, mView,iconToolBar);
454 mFocusLoop = 3; 455 mFocusLoop = 3;
455 QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop() )); 456 QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop() ));
456} 457}
457void MainWindow::slotResetFocusLoop() 458void MainWindow::slotResetFocusLoop()
458{ 459{
459 --mFocusLoop; 460 --mFocusLoop;
460 QWidget* fw = mView->viewManager()->currentView(); 461 QWidget* fw = mView->viewManager()->currentView();
461 if ( fw ) { 462 if ( fw ) {
462 //qDebug("loop "); 463 //qDebug("loop ");
463 fw->setFocus(); 464 fw->setFocus();
464 if ( qApp->focusWidget() != fw && mFocusLoop > 0 ) 465 if ( qApp->focusWidget() != fw && mFocusLoop > 0 )
465 QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop() )); 466 QTimer::singleShot( 0, this, SLOT(slotResetFocusLoop() ));
466 } 467 }
467 468
468} 469}
469void MainWindow::disableBR(bool b) 470void MainWindow::disableBR(bool b)
470{ 471{
471#ifndef DESKTOP_VERSION 472#ifndef DESKTOP_VERSION
472 if ( b ) { 473 if ( b ) {
473 if ( infrared ) { 474 if ( infrared ) {
474 toggleBeamReceive(); 475 toggleBeamReceive();
475 mBRdisabled = true; 476 mBRdisabled = true;
476 } 477 }
477 mBRdisabled = true; 478 mBRdisabled = true;
478 } else { 479 } else {
479 if ( mBRdisabled ) { 480 if ( mBRdisabled ) {
480 mBRdisabled = false; 481 mBRdisabled = false;
481 //makes no sense,because other cal ap is probably running 482 //makes no sense,because other cal ap is probably running
482 // toggleBeamReceive(); 483 // toggleBeamReceive();
483 } 484 }
484 } 485 }
485#endif 486#endif
486 487
487} 488}
488bool MainWindow::beamReceiveEnabled() 489bool MainWindow::beamReceiveEnabled()
489{ 490{
490#ifndef DESKTOP_VERSION 491#ifndef DESKTOP_VERSION
491 return ( infrared != 0 ); 492 return ( infrared != 0 );
492#endif 493#endif
493 return false; 494 return false;
494} 495}
495 496
496void MainWindow::toggleBeamReceive() 497void MainWindow::toggleBeamReceive()
497{ 498{
498 if ( mBRdisabled ) 499 if ( mBRdisabled )
499 return; 500 return;
500#ifndef DESKTOP_VERSION 501#ifndef DESKTOP_VERSION
501 if ( infrared ) { 502 if ( infrared ) {
502 qDebug("KO: Disable BeamReceive "); 503 qDebug("KO: Disable BeamReceive ");
503 delete infrared; 504 delete infrared;
504 infrared = 0; 505 infrared = 0;
505 brAction->setOn(false); 506 brAction->setOn(false);
506 return; 507 return;
507 } 508 }
508 qDebug("KO: Enable BeamReceive "); 509 qDebug("KO: Enable BeamReceive ");
509 brAction->setOn(true); 510 brAction->setOn(true);
510 infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ; 511 infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ;
511 QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve( const QCString&, const QByteArray& ))); 512 QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve( const QCString&, const QByteArray& )));
512#endif 513#endif
513} 514}
514void MainWindow::showMaximized () 515void MainWindow::showMaximized ()
515{ 516{
516#ifndef DESKTOP_VERSION 517#ifndef DESKTOP_VERSION
517 if ( ! globalFlagBlockStartup ) 518 if ( ! globalFlagBlockStartup )
518 if ( mClosed ) 519 if ( mClosed )
519 mView->goToday(); 520 mView->goToday();
520#endif 521#endif
521 QWidget::showMaximized () ; 522 QWidget::showMaximized () ;
522 mClosed = false; 523 mClosed = false;
523} 524}
524void MainWindow::closeEvent( QCloseEvent* ce ) 525void MainWindow::closeEvent( QCloseEvent* ce )
525{ 526{
526 527
527 528
528 529
529 if ( ! KOPrefs::instance()->mAskForQuit ) { 530 if ( ! KOPrefs::instance()->mAskForQuit ) {
530 saveOnClose(); 531 saveOnClose();
531 if ( mCalendarModifiedFlag ) { 532 if ( mCalendarModifiedFlag ) {
532 ce->ignore(); 533 ce->ignore();
533 return; 534 return;
534 } 535 }
535 mClosed = true; 536 mClosed = true;
536 ce->accept(); 537 ce->accept();
537 return; 538 return;
538 539
539 } 540 }
540 541
541 switch( QMessageBox::information( this, "KO/Pi", 542 switch( QMessageBox::information( this, "KO/Pi",
542 i18n("Do you really want\nto close KO/Pi?"), 543 i18n("Do you really want\nto close KO/Pi?"),
543 i18n("Close"), i18n("No"), 544 i18n("Close"), i18n("No"),
544 0, 0 ) ) { 545 0, 0 ) ) {
545 case 0: 546 case 0:
546 saveOnClose(); 547 saveOnClose();
547 if ( mCalendarModifiedFlag ) { 548 if ( mCalendarModifiedFlag ) {
548 ce->ignore(); 549 ce->ignore();
549 return; 550 return;
550 } 551 }
551 mClosed = true; 552 mClosed = true;
552 ce->accept(); 553 ce->accept();
553 break; 554 break;
554 case 1: 555 case 1:
555 ce->ignore(); 556 ce->ignore();
556 break; 557 break;
557 case 2: 558 case 2:
558 559
559 default: 560 default:
560 break; 561 break;
561 } 562 }
562 563
563 564
564} 565}
565void MainWindow::receiveStart( const QCString& cmsg, const QByteArray& data ) 566void MainWindow::receiveStart( const QCString& cmsg, const QByteArray& data )
566{ 567{
567 qDebug("KO: QCOP start message received: %s ", cmsg.data() ); 568 qDebug("KO: QCOP start message received: %s ", cmsg.data() );
568 mCStringMess = cmsg; 569 mCStringMess = cmsg;
569 mByteData = data; 570 mByteData = data;
570} 571}
571void MainWindow::recieve( const QCString& cmsg, const QByteArray& data ) 572void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
572{ 573{
573 QDataStream stream( data, IO_ReadOnly ); 574 QDataStream stream( data, IO_ReadOnly );
574 // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" ); 575 // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" );
575 //QString datamess; 576 //QString datamess;
576 //qDebug("message "); 577 //qDebug("message ");
577 qDebug("KO: QCOP message received: %s ", cmsg.data() ); 578 qDebug("KO: QCOP message received: %s ", cmsg.data() );
578 579
579 if ( cmsg == "setDocument(QString)" ) { 580 if ( cmsg == "setDocument(QString)" ) {
580 QDataStream stream( data, IO_ReadOnly ); 581 QDataStream stream( data, IO_ReadOnly );
581 QString fileName; 582 QString fileName;
582 stream >> fileName; 583 stream >> fileName;
583 //qDebug("filename %s ", fileName.latin1()); 584 //qDebug("filename %s ", fileName.latin1());
584 showMaximized(); 585 showMaximized();
585 raise(); 586 raise();
586 KOPrefs::instance()->mLastSyncedLocalFile = fileName ; 587 KOPrefs::instance()->mLastSyncedLocalFile = fileName ;
587 mSyncManager->slotSyncMenu( 1002 ); 588 mSyncManager->slotSyncMenu( 1002 );
588 return; 589 return;
589 } 590 }
590 591
591 if ( cmsg == "-writeFile" ) { 592 if ( cmsg == "-writeFile" ) {
592 // I made from the "-writeFile" an "-writeAlarm" 593 // I made from the "-writeFile" an "-writeAlarm"
593 mView->viewManager()->showWhatsNextView(); 594 mView->viewManager()->showWhatsNextView();
594 mCalendar->checkAlarmForIncidence( 0, true); 595 mCalendar->checkAlarmForIncidence( 0, true);
595 showMaximized(); 596 showMaximized();
596 raise(); 597 raise();
597 return; 598 return;
598 599
599 } 600 }
600 if ( cmsg == "-writeFileSilent" ) { 601 if ( cmsg == "-writeFileSilent" ) {
601 // I made from the "-writeFile" an "-writeAlarm" 602 // I made from the "-writeFile" an "-writeAlarm"
602 // mView->viewManager()->showWhatsNextView(); 603 // mView->viewManager()->showWhatsNextView();
603 mCalendar->checkAlarmForIncidence( 0, true); 604 mCalendar->checkAlarmForIncidence( 0, true);
604 //showMaximized(); 605 //showMaximized();
605 //raise(); 606 //raise();
606 hide(); 607 hide();
607 return; 608 return;
608 } 609 }
609 if ( cmsg == "-newCountdown" ) { 610 if ( cmsg == "-newCountdown" ) {
610 qDebug("newCountdown "); 611 qDebug("newCountdown ");
611 612
612 } 613 }
613 QString msg ; 614 QString msg ;
614 QString allmsg = cmsg; 615 QString allmsg = cmsg;
615 while ( allmsg.length() > 0 ) { 616 while ( allmsg.length() > 0 ) {
616 int nextC = allmsg.find( "-", 1 ); 617 int nextC = allmsg.find( "-", 1 );
617 if ( nextC == -1 ) { 618 if ( nextC == -1 ) {
618 msg = allmsg; 619 msg = allmsg;
619 allmsg = ""; 620 allmsg = "";
620 } else{ 621 } else{
621 msg = allmsg.left( nextC ); 622 msg = allmsg.left( nextC );
622 allmsg = allmsg.mid( nextC, allmsg.length()-nextC ); 623 allmsg = allmsg.mid( nextC, allmsg.length()-nextC );
623 } 624 }
624 //qDebug("msg: %s all: %s ", msg.latin1(), allmsg.latin1() ); 625 //qDebug("msg: %s all: %s ", msg.latin1(), allmsg.latin1() );
625 if ( msg == "-newEvent" ) { 626 if ( msg == "-newEvent" ) {
626 QTimer::singleShot( 0, mView, SLOT ( newEvent())); 627 QTimer::singleShot( 0, mView, SLOT ( newEvent()));
627 } 628 }
628 if ( msg == "-newTodo" ) { 629 if ( msg == "-newTodo" ) {
629 QTimer::singleShot( 0, mView, SLOT ( newTodo())); 630 QTimer::singleShot( 0, mView, SLOT ( newTodo()));
630 } 631 }
631 if ( msg == "-showWN" ) { 632 if ( msg == "-showWN" ) {
632 mView->viewManager()->showWhatsNextView(); 633 mView->viewManager()->showWhatsNextView();
633 } 634 }
634 if ( msg == "-showTodo" ) { 635 if ( msg == "-showTodo" ) {
635 mView->viewManager()->showTodoView(); 636 mView->viewManager()->showTodoView();
636 } 637 }
637 if ( msg == "-showList" ) { 638 if ( msg == "-showList" ) {
638 mView->viewManager()->showListView(); 639 mView->viewManager()->showListView();
639 } 640 }
640 else if ( msg == "-showDay" ) { 641 else if ( msg == "-showDay" ) {
641 mView->viewManager()->showDayView(); 642 mView->viewManager()->showDayView();
642 } 643 }
643 else if ( msg == "-showWWeek" ) { 644 else if ( msg == "-showWWeek" ) {
644 mView->viewManager()->showWorkWeekView(); 645 mView->viewManager()->showWorkWeekView();
645 } 646 }
646 else if ( msg == "-ringSync" ) { 647 else if ( msg == "-ringSync" ) {
647 QTimer::singleShot( 0, this, SLOT (startMultiSync())); 648 QTimer::singleShot( 0, this, SLOT (startMultiSync()));
648 } 649 }
649 else if ( msg == "-showWeek" ) { 650 else if ( msg == "-showWeek" ) {
650 mView->viewManager()->showWeekView(); 651 mView->viewManager()->showWeekView();
651 } 652 }
652 else if ( msg == "-showTodo" ) { 653 else if ( msg == "-showTodo" ) {
653 mView->viewManager()->showTodoView(); 654 mView->viewManager()->showTodoView();
654 } 655 }
655 else if ( msg == "-showJournal" ) { 656 else if ( msg == "-showJournal" ) {
656 mView->dateNavigator()->selectDates( 1 ); 657 mView->dateNavigator()->selectDates( 1 );
657 mView->dateNavigator()->selectToday(); 658 mView->dateNavigator()->selectToday();
658 mView->viewManager()->showJournalView(); 659 mView->viewManager()->showJournalView();
659 } 660 }
660 else if ( msg == "-showKO" ) { 661 else if ( msg == "-showKO" ) {
661 mView->viewManager()->showNextXView(); 662 mView->viewManager()->showNextXView();
662 } 663 }
663 else if ( msg == "-showWNext" ) { 664 else if ( msg == "-showWNext" ) {
664 mView->viewManager()->showWhatsNextView(); 665 mView->viewManager()->showWhatsNextView();
665 } 666 }
666 else if ( msg == "nextView()" ) { 667 else if ( msg == "nextView()" ) {
667 mView->viewManager()->showNextView(); 668 mView->viewManager()->showNextView();
668 } 669 }
669 else if ( msg == "-showNextXView" ) { 670 else if ( msg == "-showNextXView" ) {
670 mView->viewManager()->showNextXView(); 671 mView->viewManager()->showNextXView();
671 } 672 }
672 673
673 674
674 } 675 }
675 676
676 showMaximized(); 677 showMaximized();
677 raise(); 678 raise();
678} 679}
679void MainWindow::startMultiSync() 680void MainWindow::startMultiSync()
680{ 681{
681 QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!"); 682 QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!");
682 if ( QMessageBox::information( this, i18n("KDE-Pim Sync"), 683 if ( QMessageBox::information( this, i18n("KDE-Pim Sync"),
683 question, 684 question,
684 i18n("Yes"), i18n("No"), 685 i18n("Yes"), i18n("No"),
685 0, 0 ) != 0 ) { 686 0, 0 ) != 0 ) {
686 setCaption(i18n("Aborted! Nothing synced!")); 687 setCaption(i18n("Aborted! Nothing synced!"));
687 return; 688 return;
688 } 689 }
689 mSyncManager->multiSync( false ); 690 mSyncManager->multiSync( false );
690#ifndef DESKTOP_VERSION 691#ifndef DESKTOP_VERSION
691 QCopEnvelope e("QPE/Application/kapi", "doRingSync"); 692 QCopEnvelope e("QPE/Application/kapi", "doRingSync");
692#endif 693#endif
693} 694}
694QPixmap MainWindow::loadPixmap( QString name ) 695QPixmap MainWindow::loadPixmap( QString name )
695{ 696{
696 return SmallIcon( name ); 697 return SmallIcon( name );
697 698
698} 699}
699void MainWindow::setUsesBigPixmaps ( bool b ) 700void MainWindow::setUsesBigPixmaps ( bool b )
700{ 701{
701 qDebug("KO: MainWindow::setUsesBigPixmaps %d called", b); 702 qDebug("KO: MainWindow::setUsesBigPixmaps %d called", b);
702 if ( b ) 703 if ( b )
703 qDebug("KO: BigPixmaps are not supported "); 704 qDebug("KO: BigPixmaps are not supported ");
704} 705}
705void MainWindow::initActions() 706void MainWindow::initActions()
706{ 707{
707 //KOPrefs::instance()->mShowFullMenu 708 //KOPrefs::instance()->mShowFullMenu
708 iconToolBar->clear(); 709 iconToolBar->clear();
709 KOPrefs *p = KOPrefs::instance(); 710 KOPrefs *p = KOPrefs::instance();
710 //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar ); 711 //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
711 712
712 QPopupMenu *viewMenu = new QPopupMenu( this ); 713 QPopupMenu *viewMenu = new QPopupMenu( this );
713 QPopupMenu *actionMenu = new QPopupMenu( this ); 714 QPopupMenu *actionMenu = new QPopupMenu( this );
714 mCurrentItemMenu = new QPopupMenu ( this ); 715 mCurrentItemMenu = new QPopupMenu ( this );
715 QPopupMenu *nextConflictMenu = new QPopupMenu ( this ); 716 QPopupMenu *nextConflictMenu = new QPopupMenu ( this );
716 QPopupMenu *importMenu = new QPopupMenu( this ); 717 QPopupMenu *importMenu = new QPopupMenu( this );
717 QPopupMenu *importMenu_X = new QPopupMenu( this ); 718 QPopupMenu *importMenu_X = new QPopupMenu( this );
718 QPopupMenu *exportMenu_X = new QPopupMenu( this ); 719 QPopupMenu *exportMenu_X = new QPopupMenu( this );
719 QPopupMenu *beamMenu_X = new QPopupMenu( this ); 720 QPopupMenu *beamMenu_X = new QPopupMenu( this );
720 selectFilterMenu = new QPopupMenu( this ); 721 selectFilterMenu = new QPopupMenu( this );
721 selectFilterMenu->setCheckable( true ); 722 selectFilterMenu->setCheckable( true );
722 syncMenu = new QPopupMenu( this ); 723 syncMenu = new QPopupMenu( this );
723 configureAgendaMenu = new QPopupMenu( this ); 724 configureAgendaMenu = new QPopupMenu( this );
724 configureToolBarMenu = new QPopupMenu( this ); 725 configureToolBarMenu = new QPopupMenu( this );
725 QPopupMenu *helpMenu = new QPopupMenu( this ); 726 QPopupMenu *helpMenu = new QPopupMenu( this );
726 QIconSet icon; 727 QIconSet icon;
727 int pixWid = 22, pixHei = 22; 728 int pixWid = 22, pixHei = 22;
728 QString pathString = ""; 729 QString pathString = "";
729 if ( !p->mToolBarMiniIcons ) { 730 if ( !p->mToolBarMiniIcons ) {
730 if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) { 731 if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) {
731 pathString += "icons16/"; 732 pathString += "icons16/";
732 pixWid = 18; pixHei = 16; 733 pixWid = 18; pixHei = 16;
733 } 734 }
734 } else { 735 } else {
735 pathString += "iconsmini/"; 736 pathString += "iconsmini/";
736 pixWid = 18; pixHei = 16; 737 pixWid = 18; pixHei = 16;
737 } 738 }
738 739
739 if ( KOPrefs::instance()->mShowFullMenu ) { 740 if ( KOPrefs::instance()->mShowFullMenu ) {
740 menuBar1 = new KMenuBar( this );//menuBar(); 741 menuBar1 = new KMenuBar( this );//menuBar();
741 //setMenuBar( menuBar1 ); 742 //setMenuBar( menuBar1 );
742 menuBar1->show(); 743 menuBar1->show();
743 menuBar1->insertItem( i18n("File"), importMenu ); 744 menuBar1->insertItem( i18n("File"), importMenu );
744 menuBar1->insertItem( i18n("View"), viewMenu ); 745 menuBar1->insertItem( i18n("View"), viewMenu );
745 menuBar1->insertItem( i18n("Edit"), mCurrentItemMenu ); 746 menuBar1->insertItem( i18n("Edit"), mCurrentItemMenu );
746 menuBar1->insertItem( i18n("Action"), actionMenu ); 747 menuBar1->insertItem( i18n("Action"), actionMenu );
747#ifdef DESKTOP_VERSION 748#ifdef DESKTOP_VERSION
748 menuBar1->insertItem( i18n("Synchronize"), syncMenu ); 749 menuBar1->insertItem( i18n("Synchronize"), syncMenu );
749 menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); 750 menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu );
750#else 751#else
751 menuBar1->insertItem( i18n("Sync"), syncMenu ); 752 menuBar1->insertItem( i18n("Sync"), syncMenu );
752 menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu ); 753 menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu );
753#endif 754#endif
754 //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu ); 755 //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu );
755 menuBar1->insertItem( i18n("Filter"),selectFilterMenu ); 756 menuBar1->insertItem( i18n("Filter"),selectFilterMenu );
756 menuBar1->insertItem( i18n("Help"), helpMenu ); 757 menuBar1->insertItem( i18n("Help"), helpMenu );
757 } else { 758 } else {
758 menuBar1 = new KMenuBar( iconToolBar ); 759 menuBar1 = new KMenuBar( iconToolBar );
759 QPopupMenu *menuBar = new QPopupMenu( this ); 760 QPopupMenu *menuBar = new QPopupMenu( this );
760 icon = loadPixmap( pathString + "z_menu" ); 761 icon = loadPixmap( pathString + "z_menu" );
761 menuBar1->insertItem( icon.pixmap(), menuBar); 762 menuBar1->insertItem( icon.pixmap(), menuBar);
762 //menuBar1->insertItem( i18n("ME"), menuBar); 763 //menuBar1->insertItem( i18n("ME"), menuBar);
763 menuBar->insertItem( i18n("File"), importMenu ); 764 menuBar->insertItem( i18n("File"), importMenu );
764 menuBar->insertItem( i18n("View"), viewMenu ); 765 menuBar->insertItem( i18n("View"), viewMenu );
765 menuBar->insertItem( i18n("Edit"), mCurrentItemMenu ); 766 menuBar->insertItem( i18n("Edit"), mCurrentItemMenu );
766 menuBar->insertItem( i18n("Action"), actionMenu ); 767 menuBar->insertItem( i18n("Action"), actionMenu );
767 menuBar->insertItem( i18n("Synchronize"), syncMenu ); 768 menuBar->insertItem( i18n("Synchronize"), syncMenu );
768 menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu ); 769 menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu );
769 menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu ); 770 menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu );
770 menuBar->insertItem( i18n("Filter"),selectFilterMenu ); 771 menuBar->insertItem( i18n("Filter"),selectFilterMenu );
771 menuBar->insertItem( i18n("Help"), helpMenu ); 772 menuBar->insertItem( i18n("Help"), helpMenu );
772 //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); 773 //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
773 menuBar1->setMaximumSize( menuBar1->sizeHint( )); 774 menuBar1->setMaximumSize( menuBar1->sizeHint( ));
774 connect ( menuBar, SIGNAL( aboutToHide () ), this, SLOT ( slotResetFocus() ) ); 775 connect ( menuBar, SIGNAL( aboutToHide () ), this, SLOT ( slotResetFocus() ) );
775 } 776 }
776 connect ( menuBar1, SIGNAL( lostFocus () ), this, SLOT ( slotResetFocus() ) ); 777 connect ( menuBar1, SIGNAL( lostFocus () ), this, SLOT ( slotResetFocus() ) );
777 //connect ( menuBar1, SIGNAL( lostFocus () ), this, SLOT ( slotResetFocus() ) ); 778 //connect ( menuBar1, SIGNAL( lostFocus () ), this, SLOT ( slotResetFocus() ) );
778 connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); 779 connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) );
779 connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); 780 connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) );
780 781
781 782
782 mWeekBgColor = iconToolBar->backgroundColor(); 783 mWeekBgColor = iconToolBar->backgroundColor();
783 mWeekPixmap.resize( pixWid , pixHei ); 784 mWeekPixmap.resize( pixWid , pixHei );
784 mWeekPixmap.fill( mWeekBgColor ); 785 mWeekPixmap.fill( mWeekBgColor );
785 icon = mWeekPixmap; 786 icon = mWeekPixmap;
786 mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this ); 787 mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
787 if ( p-> mShowIconWeekNum ) 788 if ( p-> mShowIconWeekNum )
788 mWeekAction->addTo( iconToolBar ); 789 mWeekAction->addTo( iconToolBar );
789 mWeekFont = font(); 790 mWeekFont = font();
790 791
791 int fontPoint = mWeekFont.pointSize(); 792 int fontPoint = mWeekFont.pointSize();
792 QFontMetrics f( mWeekFont ); 793 QFontMetrics f( mWeekFont );
793 int fontWid = f.width( "30" ); 794 int fontWid = f.width( "30" );
794 while ( fontWid > pixWid ) { 795 while ( fontWid > pixWid ) {
795 --fontPoint; 796 --fontPoint;
796 mWeekFont.setPointSize( fontPoint ); 797 mWeekFont.setPointSize( fontPoint );
797 QFontMetrics f( mWeekFont ); 798 QFontMetrics f( mWeekFont );
798 fontWid = f.width( "30" ); 799 fontWid = f.width( "30" );
799 //qDebug("dec-- "); 800 //qDebug("dec-- ");
800 } 801 }
801 802
802 connect( mWeekAction, SIGNAL( activated() ), 803 connect( mWeekAction, SIGNAL( activated() ),
803 this, SLOT( weekAction() ) ); 804 this, SLOT( weekAction() ) );
804 805
805 connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) ); 806 connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) );
806 if ( p->mShowIconFilterview ) { 807 if ( p->mShowIconFilterview ) {
807 icon = loadPixmap( pathString + "filter" ); 808 icon = loadPixmap( pathString + "filter" );
808 actionFilterMenuTB = new QAction( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this ); 809 actionFilterMenuTB = new QAction( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this );
809 connect( actionFilterMenuTB, SIGNAL( activated() ), 810 connect( actionFilterMenuTB, SIGNAL( activated() ),
810 this, SLOT( fillFilterMenuTB() ) ); 811 this, SLOT( fillFilterMenuTB() ) );
811 actionFilterMenuTB->addTo( iconToolBar ); 812 actionFilterMenuTB->addTo( iconToolBar );
812 selectFilterMenuTB = new QPopupMenu( this ); 813 selectFilterMenuTB = new QPopupMenu( this );
813 selectFilterMenuTB->setCheckable( true ); 814 selectFilterMenuTB->setCheckable( true );
814 connect ( selectFilterMenuTB, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); 815 connect ( selectFilterMenuTB, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) );
815 } 816 }
816 817
817 //#endif 818 //#endif
818 // ****************** 819 // ******************
819 QAction *action; 820 QAction *action;
820 // QPopupMenu *configureMenu= new QPopupMenu( menuBar ); 821 // QPopupMenu *configureMenu= new QPopupMenu( menuBar );
821 configureToolBarMenu->setCheckable( true ); 822 configureToolBarMenu->setCheckable( true );
822 823
823 824
824 configureAgendaMenu->setCheckable( true ); 825 configureAgendaMenu->setCheckable( true );
825 int iii ; 826 int iii ;
826 for ( iii = 1;iii<= 10 ;++iii ){ 827 for ( iii = 1;iii<= 10 ;++iii ){
827 configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 ); 828 configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 );
828 } 829 }
829 //configureMenu->insertItem( "AgendaSize",configureAgendaMenu ); 830 //configureMenu->insertItem( "AgendaSize",configureAgendaMenu );
830 831
831 connect( configureAgendaMenu, SIGNAL( aboutToShow()), 832 connect( configureAgendaMenu, SIGNAL( aboutToShow()),
832 this, SLOT( showConfigureAgenda( ) ) ); 833 this, SLOT( showConfigureAgenda( ) ) );
833 icon = loadPixmap( pathString + "today" ); 834 icon = loadPixmap( pathString + "today" );
834 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this ); 835 QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
835 today_action->addTo( actionMenu ); 836 today_action->addTo( actionMenu );
836 connect( today_action, SIGNAL( activated() ), 837 connect( today_action, SIGNAL( activated() ),
837 mView, SLOT( goToday() ) ); 838 mView, SLOT( goToday() ) );
838 839
839 icon = loadPixmap( pathString + "picker" ); 840 icon = loadPixmap( pathString + "picker" );
840 QAction* dPickerAction = new QAction( i18n("Select Date..."), icon, i18n("Select Date..."), 0, this ); 841 QAction* dPickerAction = new QAction( i18n("Select Date..."), icon, i18n("Select Date..."), 0, this );
841 dPickerAction->addTo( actionMenu ); 842 dPickerAction->addTo( actionMenu );
842 connect( dPickerAction, SIGNAL( activated() ), 843 connect( dPickerAction, SIGNAL( activated() ),
843 mView, SLOT( showDatePicker() ) ); 844 mView, SLOT( showDatePicker() ) );
844 845
845 icon = loadPixmap( pathString + "search" ); 846 icon = loadPixmap( pathString + "search" );
846 QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); 847 QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
847 search_action->addTo( actionMenu ); 848 search_action->addTo( actionMenu );
848 connect( search_action, SIGNAL( activated() ), 849 connect( search_action, SIGNAL( activated() ),
849 mView->dialogManager(), SLOT( showSearchDialog() ) ); 850 mView->dialogManager(), SLOT( showSearchDialog() ) );
850 actionMenu->insertItem( i18n("Show next conflict for"), nextConflictMenu ); 851 actionMenu->insertItem( i18n("Show next conflict for"), nextConflictMenu );
851 852
852 action = new QAction( "Undo Delete", i18n("All events"), 0, this ); 853 action = new QAction( "Undo Delete", i18n("All events"), 0, this );
853 action->addTo( nextConflictMenu ); 854 action->addTo( nextConflictMenu );
854 connect( action, SIGNAL( activated() ), 855 connect( action, SIGNAL( activated() ),
855 mView, SLOT( conflictAll() ) ); 856 mView, SLOT( conflictAll() ) );
856 857
857 action = new QAction( "Undo Delete", i18n("Allday events"), 0, this ); 858 action = new QAction( "Undo Delete", i18n("Allday events"), 0, this );
858 action->addTo( nextConflictMenu ); 859 action->addTo( nextConflictMenu );
859 connect( action, SIGNAL( activated() ), 860 connect( action, SIGNAL( activated() ),
860 mView, SLOT( conflictAllday() ) ); 861 mView, SLOT( conflictAllday() ) );
861 862
862 action = new QAction( "Undo Delete", i18n("Events with time"), 0, this ); 863 action = new QAction( "Undo Delete", i18n("Events with time"), 0, this );
863 action->addTo( nextConflictMenu ); 864 action->addTo( nextConflictMenu );
864 connect( action, SIGNAL( activated() ), 865 connect( action, SIGNAL( activated() ),
865 mView, SLOT( conflictNotAll() ) ); 866 mView, SLOT( conflictNotAll() ) );
866 867
867 actionMenu->insertSeparator(); 868 actionMenu->insertSeparator();
868 869
869 icon = loadPixmap( pathString + "newevent" ); 870 icon = loadPixmap( pathString + "newevent" );
870 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); 871 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
871 ne_action->addTo( mCurrentItemMenu ); 872 ne_action->addTo( mCurrentItemMenu );
872 connect( ne_action, SIGNAL( activated() ), 873 connect( ne_action, SIGNAL( activated() ),
873 mView, SLOT( newEvent() ) ); 874 mView, SLOT( newEvent() ) );
874 icon = loadPixmap( pathString + "newtodo" ); 875 icon = loadPixmap( pathString + "newtodo" );
875 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); 876 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
876 nt_action->addTo( mCurrentItemMenu ); 877 nt_action->addTo( mCurrentItemMenu );
877 connect( nt_action, SIGNAL( activated() ), 878 connect( nt_action, SIGNAL( activated() ),
878 mView, SLOT( newTodo() ) ); 879 mView, SLOT( newTodo() ) );
879 mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0, 880 mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0,
880 this ); 881 this );
881 mNewSubTodoAction->addTo( mCurrentItemMenu ); 882 mNewSubTodoAction->addTo( mCurrentItemMenu );
882 connect( mNewSubTodoAction, SIGNAL( activated() ), 883 connect( mNewSubTodoAction, SIGNAL( activated() ),
883 mView, SLOT( newSubTodo() ) ); 884 mView, SLOT( newSubTodo() ) );
884 885
885 mCurrentItemMenu->insertSeparator(); 886 mCurrentItemMenu->insertSeparator();
886 icon = loadPixmap( pathString + "newevent" ); 887 icon = loadPixmap( pathString + "newevent" );
887 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); 888 configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
888 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); 889 configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
889 configureToolBarMenu->insertSeparator(); 890 configureToolBarMenu->insertSeparator();
890 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); 891 configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 );
891 configureToolBarMenu->insertSeparator(); 892 configureToolBarMenu->insertSeparator();
892 configureToolBarMenu->insertItem(i18n("Week Number"), 400); 893 configureToolBarMenu->insertItem(i18n("Week Number"), 400);
893 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); 894 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
894 icon = loadPixmap( pathString + "newtodo" ); 895 icon = loadPixmap( pathString + "newtodo" );
895 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); 896 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
896 897
897 //actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); 898 //actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu);
898 mShowAction = new QAction( "show_incidence", i18n("Show"), 0, this ); 899 mShowAction = new QAction( "show_incidence", i18n("Show"), 0, this );
899 mShowAction->addTo( mCurrentItemMenu ); 900 mShowAction->addTo( mCurrentItemMenu );
900 connect( mShowAction, SIGNAL( activated() ), 901 connect( mShowAction, SIGNAL( activated() ),
901 mView, SLOT( showIncidence() ) ); 902 mView, SLOT( showIncidence() ) );
902 903
903 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); 904 mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
904 mEditAction->addTo( mCurrentItemMenu ); 905 mEditAction->addTo( mCurrentItemMenu );
905 connect( mEditAction, SIGNAL( activated() ), 906 connect( mEditAction, SIGNAL( activated() ),
906 mView, SLOT( editIncidence() ) ); 907 mView, SLOT( editIncidence() ) );
907 908
908 mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this ); 909 mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
909 mDeleteAction->addTo( mCurrentItemMenu ); 910 mDeleteAction->addTo( mCurrentItemMenu );
910 connect( mDeleteAction, SIGNAL( activated() ), 911 connect( mDeleteAction, SIGNAL( activated() ),
911 mView, SLOT( deleteIncidence() ) ); 912 mView, SLOT( deleteIncidence() ) );
912 913
913 914
914 mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this ); 915 mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
915 mCloneAction->addTo( mCurrentItemMenu ); 916 mCloneAction->addTo( mCurrentItemMenu );
916 connect( mCloneAction, SIGNAL( activated() ), 917 connect( mCloneAction, SIGNAL( activated() ),
917 mView, SLOT( cloneIncidence() ) ); 918 mView, SLOT( cloneIncidence() ) );
918 mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this ); 919 mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
919 mMoveAction->addTo( mCurrentItemMenu ); 920 mMoveAction->addTo( mCurrentItemMenu );
920 connect( mMoveAction, SIGNAL( activated() ), 921 connect( mMoveAction, SIGNAL( activated() ),
921 mView, SLOT( moveIncidence() ) ); 922 mView, SLOT( moveIncidence() ) );
922#ifndef DESKTOP_VERSION 923#ifndef DESKTOP_VERSION
923 mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this ); 924 mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
924 mBeamAction->addTo(mCurrentItemMenu ); 925 mBeamAction->addTo(mCurrentItemMenu );
925 connect( mBeamAction, SIGNAL( activated() ), 926 connect( mBeamAction, SIGNAL( activated() ),
926 mView, SLOT( beamIncidence() ) ); 927 mView, SLOT( beamIncidence() ) );
927#endif 928#endif
928 mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); 929 mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
929 mCancelAction->addTo( mCurrentItemMenu ); 930 mCancelAction->addTo( mCurrentItemMenu );
930 connect( mCancelAction, SIGNAL( activated() ), 931 connect( mCancelAction, SIGNAL( activated() ),
931 mView, SLOT( toggleCancelIncidence() ) ); 932 mView, SLOT( toggleCancelIncidence() ) );
932 933
933 934
934 mCurrentItemMenu->insertSeparator(); 935 mCurrentItemMenu->insertSeparator();
935 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); 936 action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
936 action->addTo( mCurrentItemMenu ); 937 action->addTo( mCurrentItemMenu );
937 connect( action, SIGNAL( activated() ), 938 connect( action, SIGNAL( activated() ),
938 mView, SLOT( undo_delete() ) ); 939 mView, SLOT( undo_delete() ) );
939 940
940 // *********************** 941 // ***********************
941 if ( KOPrefs::instance()->mVerticalScreen ) { 942 if ( KOPrefs::instance()->mVerticalScreen ) {
942 icon = SmallIcon( "1updownarrow" ); 943 icon = SmallIcon( "1updownarrow" );
943 } else { 944 } else {
944 icon = SmallIcon("1leftrightarrow" ); 945 icon = SmallIcon("1leftrightarrow" );
945 } 946 }
946 configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 ); 947 configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 );
947 QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this ); 948 QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this );
948 FSaction->addTo( viewMenu ); 949 FSaction->addTo( viewMenu );
949 connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() )); 950 connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() ));
950 951
951 952
952 icon = loadPixmap( pathString + "filter" ); 953 icon = loadPixmap( pathString + "filter" );
953 configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 ); 954 configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 );
954 icon = loadPixmap( pathString + "configure" ); 955 icon = loadPixmap( pathString + "configure" );
955 action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this ); 956 action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this );
956 action->addTo( viewMenu ); 957 action->addTo( viewMenu );
957 connect( action, SIGNAL( activated() ), 958 connect( action, SIGNAL( activated() ),
958 mView, SLOT( toggleFilter() ) ); 959 mView, SLOT( toggleFilter() ) );
959 mToggleFilter = action; 960 mToggleFilter = action;
960 icon = loadPixmap( pathString + "navi" ); 961 icon = loadPixmap( pathString + "navi" );
961 configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 ); 962 configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 );
962 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this ); 963 action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
963 action->addTo( viewMenu ); 964 action->addTo( viewMenu );
964 connect( action, SIGNAL( activated() ), 965 connect( action, SIGNAL( activated() ),
965 mView, SLOT( toggleDateNavigatorWidget() ) ); 966 mView, SLOT( toggleDateNavigatorWidget() ) );
966 mToggleNav = action ; 967 mToggleNav = action ;
967 icon = loadPixmap( pathString + "allday" ); 968 icon = loadPixmap( pathString + "allday" );
968 configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 ); 969 configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 );
969 action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this ); 970 action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
970 action->addTo( viewMenu ); 971 action->addTo( viewMenu );
971 connect( action, SIGNAL( activated() ), 972 connect( action, SIGNAL( activated() ),
972 mView, SLOT( toggleAllDaySize() ) ); 973 mView, SLOT( toggleAllDaySize() ) );
973 mToggleAllday = action; 974 mToggleAllday = action;
974 975
975 976
976 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), 977 connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
977 mToggleNav, SLOT( setEnabled ( bool ) ) ); 978 mToggleNav, SLOT( setEnabled ( bool ) ) );
978 //connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ), 979 //connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
979 // mToggleFilter, SLOT( setEnabled ( bool ) ) ); 980 // mToggleFilter, SLOT( setEnabled ( bool ) ) );
980 connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), 981 connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
981 mToggleAllday, SLOT( setEnabled ( bool ) ) ); 982 mToggleAllday, SLOT( setEnabled ( bool ) ) );
982 // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ), 983 // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
983 // configureAgendaMenu, SLOT( setEnabled ( bool ) ) ); 984 // configureAgendaMenu, SLOT( setEnabled ( bool ) ) );
984 985
985 986
986 dPickerAction->addTo( iconToolBar ); 987 dPickerAction->addTo( iconToolBar );
987 viewMenu->insertSeparator(); 988 viewMenu->insertSeparator();
988 989
989 if ( p-> mShowIconToggleFull ) 990 if ( p-> mShowIconToggleFull )
990 FSaction->addTo( iconToolBar ); 991 FSaction->addTo( iconToolBar );
991 if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar ); 992 if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar );
992 993
993 //******************** 994 //********************
994 if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar ); 995 if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar );
995 996
996 997
997 icon = loadPixmap( pathString + "whatsnext" ); 998 icon = loadPixmap( pathString + "whatsnext" );
998 configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 ); 999 configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 );
999 QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); 1000 QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
1000 whatsnext_action->addTo( viewMenu ); 1001 whatsnext_action->addTo( viewMenu );
1001 connect( whatsnext_action, SIGNAL( activated() ), 1002 connect( whatsnext_action, SIGNAL( activated() ),
1002 mView->viewManager(), SLOT( showWhatsNextView() ) ); 1003 mView->viewManager(), SLOT( showWhatsNextView() ) );
1003 1004
1004 icon = loadPixmap( pathString + "xdays" ); 1005 icon = loadPixmap( pathString + "xdays" );
1005 configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 ); 1006 configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 );
1006 QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this ); 1007 QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this );
1007 xdays_action->addTo( viewMenu ); 1008 xdays_action->addTo( viewMenu );
1008 connect( xdays_action, SIGNAL( activated() ), 1009 connect( xdays_action, SIGNAL( activated() ),
1009 mView->viewManager(), SLOT( showNextXView() ) ); 1010 mView->viewManager(), SLOT( showNextXView() ) );
1010 1011
1011 1012
1012 icon = loadPixmap( pathString + "journal" ); 1013 icon = loadPixmap( pathString + "journal" );
1013 configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 ); 1014 configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 );
1014 QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this ); 1015 QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this );
1015 viewjournal_action->addTo( viewMenu ); 1016 viewjournal_action->addTo( viewMenu );
1016 connect( viewjournal_action, SIGNAL( activated() ), 1017 connect( viewjournal_action, SIGNAL( activated() ),
1017 mView->viewManager(), SLOT( showJournalView() ) ); 1018 mView->viewManager(), SLOT( showJournalView() ) );
1018 1019
1019 1020
1020 icon = loadPixmap( pathString + "day" ); 1021 icon = loadPixmap( pathString + "day" );
1021 configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 ); 1022 configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 );
1022 QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this ); 1023 QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this );
1023 day1_action->addTo( viewMenu ); 1024 day1_action->addTo( viewMenu );
1024 // action->addTo( toolBar ); 1025 // action->addTo( toolBar );
1025 connect( day1_action, SIGNAL( activated() ), 1026 connect( day1_action, SIGNAL( activated() ),
1026 mView->viewManager(), SLOT( showDayView() ) ); 1027 mView->viewManager(), SLOT( showDayView() ) );
1027 1028
1028 icon = loadPixmap( pathString + "workweek" ); 1029 icon = loadPixmap( pathString + "workweek" );
1029 configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 ); 1030 configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 );
1030 QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this ); 1031 QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this );
1031 day5_action->addTo( viewMenu ); 1032 day5_action->addTo( viewMenu );
1032 connect( day5_action, SIGNAL( activated() ), 1033 connect( day5_action, SIGNAL( activated() ),
1033 mView->viewManager(), SLOT( showWorkWeekView() ) ); 1034 mView->viewManager(), SLOT( showWorkWeekView() ) );
1034 1035
1035 icon = loadPixmap( pathString + "week" ); 1036 icon = loadPixmap( pathString + "week" );
1036 configureToolBarMenu->insertItem(icon, i18n("Week"), 60 ); 1037 configureToolBarMenu->insertItem(icon, i18n("Week"), 60 );
1037 QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this ); 1038 QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this );
1038 day7_action->addTo( viewMenu ); 1039 day7_action->addTo( viewMenu );
1039 connect( day7_action, SIGNAL( activated() ), 1040 connect( day7_action, SIGNAL( activated() ),
1040 mView->viewManager(), SLOT( showWeekView() ) ); 1041 mView->viewManager(), SLOT( showWeekView() ) );
1041 1042
1042 icon = loadPixmap( pathString + "workweek2" ); 1043 icon = loadPixmap( pathString + "workweek2" );
1043 configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 ); 1044 configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 );
1044 QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this ); 1045 QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this );
1045 day6_action->addTo( viewMenu ); 1046 day6_action->addTo( viewMenu );
1046 connect( day6_action, SIGNAL( activated() ), 1047 connect( day6_action, SIGNAL( activated() ),
1047 mView->viewManager(), SLOT( showMonthViewWeek() ) ); 1048 mView->viewManager(), SLOT( showMonthViewWeek() ) );
1048 1049
1049 icon = loadPixmap( pathString + "month" ); 1050 icon = loadPixmap( pathString + "month" );
1050 configureToolBarMenu->insertItem(icon, i18n("Month"), 70 ); 1051 configureToolBarMenu->insertItem(icon, i18n("Month"), 70 );
1051 QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this ); 1052 QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this );
1052 month_action->addTo( viewMenu ); 1053 month_action->addTo( viewMenu );
1053 connect( month_action, SIGNAL( activated() ), 1054 connect( month_action, SIGNAL( activated() ),
1054 mView->viewManager(), SLOT( showMonthView() ) ); 1055 mView->viewManager(), SLOT( showMonthView() ) );
1055 1056
1056 icon = loadPixmap( pathString + "list" ); 1057 icon = loadPixmap( pathString + "list" );
1057 configureToolBarMenu->insertItem(icon, i18n("List View"), 30 ); 1058 configureToolBarMenu->insertItem(icon, i18n("List View"), 30 );
1058 QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this ); 1059 QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this );
1059 showlist_action->addTo( viewMenu ); 1060 showlist_action->addTo( viewMenu );
1060 connect( showlist_action, SIGNAL( activated() ), 1061 connect( showlist_action, SIGNAL( activated() ),
1061 mView->viewManager(), SLOT( showListView() ) ); 1062 mView->viewManager(), SLOT( showListView() ) );
1062 1063
1063 icon = loadPixmap( pathString + "todo" ); 1064 icon = loadPixmap( pathString + "todo" );
1064 configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 ); 1065 configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 );
1065 QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this ); 1066 QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
1066 todoview_action->addTo( viewMenu ); 1067 todoview_action->addTo( viewMenu );
1067 connect( todoview_action, SIGNAL( activated() ), 1068 connect( todoview_action, SIGNAL( activated() ),
1068 mView->viewManager(), SLOT( showTodoView() ) ); 1069 mView->viewManager(), SLOT( showTodoView() ) );
1069 1070
1070 1071
1071 1072
1072#if 0 1073#if 0
1073 action = new QAction( "view_timespan", "Time Span", 0, this ); 1074 action = new QAction( "view_timespan", "Time Span", 0, this );
1074 action->addTo( viewMenu ); 1075 action->addTo( viewMenu );
1075 connect( action, SIGNAL( activated() ), 1076 connect( action, SIGNAL( activated() ),
1076 mView->viewManager(), SLOT( showTimeSpanView() ) ); 1077 mView->viewManager(), SLOT( showTimeSpanView() ) );
1077#endif 1078#endif
1078 1079
1079 1080
1080 1081
1081 action = new QAction( "purge_completed", i18n("Purge Completed..."), 0, 1082 action = new QAction( "purge_completed", i18n("Purge Completed..."), 0,
1082 this ); 1083 this );
1083 action->addTo( actionMenu ); 1084 action->addTo( actionMenu );
1084 connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) ); 1085 connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) );
1085 1086
1086 1087
1087 icon = loadPixmap( pathString + "search" ); 1088 icon = loadPixmap( pathString + "search" );
1088 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5); 1089 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5);
1089 1090
1090 1091
1091 1092
1092 actionMenu->insertSeparator(); 1093 actionMenu->insertSeparator();
1093 action = new QAction( "manage cat", i18n("Edit category list..."), 0, 1094 action = new QAction( "manage cat", i18n("Edit category list..."), 0,
1094 this ); 1095 this );
1095 action->addTo( actionMenu ); 1096 action->addTo( actionMenu );
1096 connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) ); 1097 connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) );
1097 1098
1098 action = new QAction( "manage cat", i18n("Manage new categories..."), 0, 1099 action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
1099 this ); 1100 this );
1100 action->addTo( actionMenu ); 1101 action->addTo( actionMenu );
1101 connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) ); 1102 connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
1102 1103
1103 1104
1104 actionMenu->insertSeparator(); 1105 actionMenu->insertSeparator();
1105 icon = loadPixmap( pathString + "configure" ); 1106 icon = loadPixmap( pathString + "configure" );
1106 action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this ); 1107 action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
1107 action->addTo( actionMenu ); 1108 action->addTo( actionMenu );
1108 connect( action, SIGNAL( activated() ), 1109 connect( action, SIGNAL( activated() ),
1109 mView, SLOT( edit_options() ) ); 1110 mView, SLOT( edit_options() ) );
1110 action = new QAction( i18n("Configure"),icon, i18n("Configure Calendar Files..."), 0, this ); 1111 action = new QAction( i18n("Configure"),icon, i18n("Configure Calendar Files..."), 0, this );
1111 action->addTo( actionMenu ); 1112 action->addTo( actionMenu );
1112 connect( action, SIGNAL( activated() ), 1113 connect( action, SIGNAL( activated() ),
1113 this, SLOT( calHint() ) ); 1114 this, SLOT( calHint() ) );
1114 action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this ); 1115 action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
1115 action->addTo( actionMenu ); 1116 action->addTo( actionMenu );
1116 connect( action, SIGNAL( activated() ), 1117 connect( action, SIGNAL( activated() ),
1117 mView, SLOT( edit_global_options() ) ); 1118 mView, SLOT( edit_global_options() ) );
1118 if ( KOPrefs::instance()->mShowFullMenu ) { 1119 if ( KOPrefs::instance()->mShowFullMenu ) {
1119 actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); 1120 actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );
1120 1121
1121 } 1122 }
1122 // actionMenu->insertSeparator(); 1123 // actionMenu->insertSeparator();
1123 action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0, 1124 action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
1124 this ); 1125 this );
1125 action->addTo( importMenu_X ); 1126 action->addTo( importMenu_X );
1126 connect( action, SIGNAL( activated() ), SLOT( importIcal() ) ); 1127 connect( action, SIGNAL( activated() ), SLOT( importIcal() ) );
1127 action = new QAction( "import_quick", i18n("Import last file"), 0, 1128 action = new QAction( "import_quick", i18n("Import last file"), 0,
1128 this ); 1129 this );
1129 action->addTo( importMenu_X ); 1130 action->addTo( importMenu_X );
1130 connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) ); 1131 connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) );
1131 importMenu_X->insertSeparator(); 1132 importMenu_X->insertSeparator();
1132 action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0, 1133 action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
1133 this ); 1134 this );
diff --git a/microkde/kdeui/ktoolbar.cpp b/microkde/kdeui/ktoolbar.cpp
index 36ede81..df2aad8 100644
--- a/microkde/kdeui/ktoolbar.cpp
+++ b/microkde/kdeui/ktoolbar.cpp
@@ -650,1543 +650,1543 @@ void KToolBar::insertComboItem (int id, const QString& text, int index)
650 if ( it == id2widget.end() ) 650 if ( it == id2widget.end() )
651 return; 651 return;
652//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it ); 652//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it );
653 QComboBox * comboBox = (QComboBox *)( *it ); 653 QComboBox * comboBox = (QComboBox *)( *it );
654 if (comboBox) 654 if (comboBox)
655 comboBox->insertItem( text, index ); 655 comboBox->insertItem( text, index );
656} 656}
657 657
658void KToolBar::insertComboList (int id, const QStringList &list, int index) 658void KToolBar::insertComboList (int id, const QStringList &list, int index)
659{ 659{
660 Id2WidgetMap::Iterator it = id2widget.find( id ); 660 Id2WidgetMap::Iterator it = id2widget.find( id );
661 if ( it == id2widget.end() ) 661 if ( it == id2widget.end() )
662 return; 662 return;
663//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it ); 663//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it );
664 QComboBox * comboBox = (QComboBox *)( *it ); 664 QComboBox * comboBox = (QComboBox *)( *it );
665 if (comboBox) 665 if (comboBox)
666 comboBox->insertStringList( list, index ); 666 comboBox->insertStringList( list, index );
667} 667}
668 668
669 669
670void KToolBar::removeComboItem (int id, int index) 670void KToolBar::removeComboItem (int id, int index)
671{ 671{
672 Id2WidgetMap::Iterator it = id2widget.find( id ); 672 Id2WidgetMap::Iterator it = id2widget.find( id );
673 if ( it == id2widget.end() ) 673 if ( it == id2widget.end() )
674 return; 674 return;
675//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it ); 675//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it );
676 QComboBox * comboBox = (QComboBox *)( *it ); 676 QComboBox * comboBox = (QComboBox *)( *it );
677 if (comboBox) 677 if (comboBox)
678 comboBox->removeItem( index ); 678 comboBox->removeItem( index );
679} 679}
680 680
681 681
682void KToolBar::setCurrentComboItem (int id, int index) 682void KToolBar::setCurrentComboItem (int id, int index)
683{ 683{
684 Id2WidgetMap::Iterator it = id2widget.find( id ); 684 Id2WidgetMap::Iterator it = id2widget.find( id );
685 if ( it == id2widget.end() ) 685 if ( it == id2widget.end() )
686 return; 686 return;
687//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it ); 687//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it );
688 QComboBox * comboBox = (QComboBox *)( *it ); 688 QComboBox * comboBox = (QComboBox *)( *it );
689 if (comboBox) 689 if (comboBox)
690 comboBox->setCurrentItem( index ); 690 comboBox->setCurrentItem( index );
691} 691}
692 692
693 693
694void KToolBar::changeComboItem (int id, const QString& text, int index) 694void KToolBar::changeComboItem (int id, const QString& text, int index)
695{ 695{
696 Id2WidgetMap::Iterator it = id2widget.find( id ); 696 Id2WidgetMap::Iterator it = id2widget.find( id );
697 if ( it == id2widget.end() ) 697 if ( it == id2widget.end() )
698 return; 698 return;
699//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it ); 699//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it );
700 QComboBox * comboBox = (QComboBox *)( *it ); 700 QComboBox * comboBox = (QComboBox *)( *it );
701 if (comboBox) 701 if (comboBox)
702 comboBox->changeItem( text, index ); 702 comboBox->changeItem( text, index );
703} 703}
704 704
705 705
706void KToolBar::clearCombo (int id) 706void KToolBar::clearCombo (int id)
707{ 707{
708 Id2WidgetMap::Iterator it = id2widget.find( id ); 708 Id2WidgetMap::Iterator it = id2widget.find( id );
709 if ( it == id2widget.end() ) 709 if ( it == id2widget.end() )
710 return; 710 return;
711//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it ); 711//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it );
712 QComboBox * comboBox = (QComboBox *)( *it ); 712 QComboBox * comboBox = (QComboBox *)( *it );
713 if (comboBox) 713 if (comboBox)
714 comboBox->clear(); 714 comboBox->clear();
715} 715}
716 716
717 717
718QString KToolBar::getComboItem (int id, int index) const 718QString KToolBar::getComboItem (int id, int index) const
719{ 719{
720 Id2WidgetMap::ConstIterator it = id2widget.find( id ); 720 Id2WidgetMap::ConstIterator it = id2widget.find( id );
721 if ( it == id2widget.end() ) 721 if ( it == id2widget.end() )
722 return QString::null; 722 return QString::null;
723//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it ); 723//US QComboBox * comboBox = dynamic_cast<QComboBox *>( *it );
724 QComboBox * comboBox = (QComboBox *)( *it ); 724 QComboBox * comboBox = (QComboBox *)( *it );
725 return comboBox ? comboBox->text( index ) : QString::null; 725 return comboBox ? comboBox->text( index ) : QString::null;
726} 726}
727 727
728 728
729KComboBox * KToolBar::getCombo(int id) 729KComboBox * KToolBar::getCombo(int id)
730{ 730{
731 Id2WidgetMap::Iterator it = id2widget.find( id ); 731 Id2WidgetMap::Iterator it = id2widget.find( id );
732 if ( it == id2widget.end() ) 732 if ( it == id2widget.end() )
733 return 0; 733 return 0;
734//US return dynamic_cast<KComboBox *>( *it ); 734//US return dynamic_cast<KComboBox *>( *it );
735 return (KComboBox *)( *it ); 735 return (KComboBox *)( *it );
736} 736}
737 737
738 738
739KLineEdit * KToolBar::getLined (int id) 739KLineEdit * KToolBar::getLined (int id)
740{ 740{
741 Id2WidgetMap::Iterator it = id2widget.find( id ); 741 Id2WidgetMap::Iterator it = id2widget.find( id );
742 if ( it == id2widget.end() ) 742 if ( it == id2widget.end() )
743 return 0; 743 return 0;
744//US return dynamic_cast<KLineEdit *>( *it ); 744//US return dynamic_cast<KLineEdit *>( *it );
745 return (KLineEdit *)( *it ); 745 return (KLineEdit *)( *it );
746} 746}
747 747
748 748
749KToolBarButton * KToolBar::getButton (int id) 749KToolBarButton * KToolBar::getButton (int id)
750{ 750{
751 Id2WidgetMap::Iterator it = id2widget.find( id ); 751 Id2WidgetMap::Iterator it = id2widget.find( id );
752 if ( it == id2widget.end() ) 752 if ( it == id2widget.end() )
753 return 0; 753 return 0;
754//US return dynamic_cast<KToolBarButton *>( *it ); 754//US return dynamic_cast<KToolBarButton *>( *it );
755 return (KToolBarButton *)( *it ); 755 return (KToolBarButton *)( *it );
756} 756}
757 757
758 758
759void KToolBar::alignItemRight (int id, bool right ) 759void KToolBar::alignItemRight (int id, bool right )
760{ 760{
761 Id2WidgetMap::Iterator it = id2widget.find( id ); 761 Id2WidgetMap::Iterator it = id2widget.find( id );
762 if ( it == id2widget.end() ) 762 if ( it == id2widget.end() )
763 return; 763 return;
764 if ( rightAligned && !right && (*it) == rightAligned ) 764 if ( rightAligned && !right && (*it) == rightAligned )
765 rightAligned = 0; 765 rightAligned = 0;
766 if ( (*it) && right ) 766 if ( (*it) && right )
767 rightAligned = (*it); 767 rightAligned = (*it);
768} 768}
769 769
770 770
771QWidget *KToolBar::getWidget (int id) 771QWidget *KToolBar::getWidget (int id)
772{ 772{
773 Id2WidgetMap::Iterator it = id2widget.find( id ); 773 Id2WidgetMap::Iterator it = id2widget.find( id );
774 return ( it == id2widget.end() ) ? 0 : (*it); 774 return ( it == id2widget.end() ) ? 0 : (*it);
775} 775}
776 776
777 777
778void KToolBar::setItemAutoSized (int id, bool yes ) 778void KToolBar::setItemAutoSized (int id, bool yes )
779{ 779{
780 QWidget *w = getWidget(id); 780 QWidget *w = getWidget(id);
781 if ( w && yes ) 781 if ( w && yes )
782 setStretchableWidget( w ); 782 setStretchableWidget( w );
783} 783}
784 784
785 785
786void KToolBar::clear () 786void KToolBar::clear ()
787{ 787{
788 QToolBar::clear(); 788 QToolBar::clear();
789 widget2id.clear(); 789 widget2id.clear();
790 id2widget.clear(); 790 id2widget.clear();
791} 791}
792 792
793 793
794void KToolBar::removeItem(int id) 794void KToolBar::removeItem(int id)
795{ 795{
796 Id2WidgetMap::Iterator it = id2widget.find( id ); 796 Id2WidgetMap::Iterator it = id2widget.find( id );
797 if ( it == id2widget.end() ) 797 if ( it == id2widget.end() )
798 { 798 {
799 kdDebug(220) << "KToolBar::removeItem item " << id << " not found" << endl; 799 kdDebug(220) << "KToolBar::removeItem item " << id << " not found" << endl;
800 return; 800 return;
801 } 801 }
802 QWidget * w = (*it); 802 QWidget * w = (*it);
803 id2widget.remove( id ); 803 id2widget.remove( id );
804 widget2id.remove( w ); 804 widget2id.remove( w );
805 widgets.removeRef( w ); 805 widgets.removeRef( w );
806 delete w; 806 delete w;
807} 807}
808 808
809 809
810void KToolBar::removeItemDelayed(int id) 810void KToolBar::removeItemDelayed(int id)
811{ 811{
812 Id2WidgetMap::Iterator it = id2widget.find( id ); 812 Id2WidgetMap::Iterator it = id2widget.find( id );
813 if ( it == id2widget.end() ) 813 if ( it == id2widget.end() )
814 { 814 {
815 kdDebug(220) << "KToolBar::removeItem item " << id << " not found" << endl; 815 kdDebug(220) << "KToolBar::removeItem item " << id << " not found" << endl;
816 return; 816 return;
817 } 817 }
818 QWidget * w = (*it); 818 QWidget * w = (*it);
819 id2widget.remove( id ); 819 id2widget.remove( id );
820 widget2id.remove( w ); 820 widget2id.remove( w );
821 widgets.removeRef( w ); 821 widgets.removeRef( w );
822 822
823 w->blockSignals(true); 823 w->blockSignals(true);
824 d->idleButtons.append(w); 824 d->idleButtons.append(w);
825 layoutTimer->start( 50, TRUE ); 825 layoutTimer->start( 50, TRUE );
826} 826}
827 827
828 828
829void KToolBar::hideItem (int id) 829void KToolBar::hideItem (int id)
830{ 830{
831 QWidget *w = getWidget(id); 831 QWidget *w = getWidget(id);
832 if ( w ) 832 if ( w )
833 w->hide(); 833 w->hide();
834} 834}
835 835
836 836
837void KToolBar::showItem (int id) 837void KToolBar::showItem (int id)
838{ 838{
839 QWidget *w = getWidget(id); 839 QWidget *w = getWidget(id);
840 if ( w ) 840 if ( w )
841 w->show(); 841 w->show();
842} 842}
843 843
844 844
845int KToolBar::itemIndex (int id) 845int KToolBar::itemIndex (int id)
846{ 846{
847 QWidget *w = getWidget(id); 847 QWidget *w = getWidget(id);
848 return w ? widgets.findRef(w) : -1; 848 return w ? widgets.findRef(w) : -1;
849} 849}
850 850
851 851
852void KToolBar::setFullSize(bool flag ) 852void KToolBar::setFullSize(bool flag )
853{ 853{
854 setHorizontalStretchable( flag ); 854 setHorizontalStretchable( flag );
855 setVerticalStretchable( flag ); 855 setVerticalStretchable( flag );
856} 856}
857 857
858 858
859bool KToolBar::fullSize() const 859bool KToolBar::fullSize() const
860{ 860{
861 return isHorizontalStretchable() || isVerticalStretchable(); 861 return isHorizontalStretchable() || isVerticalStretchable();
862} 862}
863 863
864 864
865void KToolBar::enableMoving(bool flag ) 865void KToolBar::enableMoving(bool flag )
866{ 866{
867//US setMovingEnabled(flag); 867//US setMovingEnabled(flag);
868 this->mainWindow()->setToolBarsMovable(flag); 868 this->mainWindow()->setToolBarsMovable(flag);
869} 869}
870 870
871 871
872void KToolBar::setBarPos (BarPosition bpos) 872void KToolBar::setBarPos (BarPosition bpos)
873{ 873{
874 if ( !mainWindow() ) 874 if ( !mainWindow() )
875 return; 875 return;
876//US mainWindow()->moveDockWindow( this, (Dock)bpos ); 876//US mainWindow()->moveDockWindow( this, (Dock)bpos );
877 mainWindow()->moveToolBar( this, (QMainWindow::ToolBarDock)bpos ); 877 mainWindow()->moveToolBar( this, (QMainWindow::ToolBarDock)bpos );
878} 878}
879 879
880 880
881const KToolBar::BarPosition KToolBar::barPos() 881const KToolBar::BarPosition KToolBar::barPos()
882{ 882{
883 if ( !(QMainWindow*)mainWindow() ) 883 if ( !(QMainWindow*)mainWindow() )
884 return KToolBar::Top; 884 return KToolBar::Top;
885//US Dock dock; 885//US Dock dock;
886 QMainWindow::ToolBarDock dock; 886 QMainWindow::ToolBarDock dock;
887 int dm1, dm2; 887 int dm1, dm2;
888 bool dm3; 888 bool dm3;
889 ((QMainWindow*)mainWindow())->getLocation( (QToolBar*)this, dock, dm1, dm3, dm2 ); 889 ((QMainWindow*)mainWindow())->getLocation( (QToolBar*)this, dock, dm1, dm3, dm2 );
890//US if ( dock == DockUnmanaged ) { 890//US if ( dock == DockUnmanaged ) {
891 if ( dock == QMainWindow::Unmanaged ) { 891 if ( dock == QMainWindow::Unmanaged ) {
892 return (KToolBar::BarPosition)Top; 892 return (KToolBar::BarPosition)Top;
893 } 893 }
894 return (BarPosition)dock; 894 return (BarPosition)dock;
895} 895}
896 896
897 897
898bool KToolBar::enable(BarStatus stat) 898bool KToolBar::enable(BarStatus stat)
899{ 899{
900 bool mystat = isVisible(); 900 bool mystat = isVisible();
901 901
902 if ( (stat == Toggle && mystat) || stat == Hide ) 902 if ( (stat == Toggle && mystat) || stat == Hide )
903 hide(); 903 hide();
904 else 904 else
905 show(); 905 show();
906 906
907 return isVisible() == mystat; 907 return isVisible() == mystat;
908} 908}
909 909
910 910
911void KToolBar::setMaxHeight ( int h ) 911void KToolBar::setMaxHeight ( int h )
912{ 912{
913 setMaximumHeight( h ); 913 setMaximumHeight( h );
914} 914}
915 915
916int KToolBar::maxHeight() 916int KToolBar::maxHeight()
917{ 917{
918 return maximumHeight(); 918 return maximumHeight();
919} 919}
920 920
921 921
922void KToolBar::setMaxWidth (int dw) 922void KToolBar::setMaxWidth (int dw)
923{ 923{
924 setMaximumWidth( dw ); 924 setMaximumWidth( dw );
925} 925}
926 926
927 927
928int KToolBar::maxWidth() 928int KToolBar::maxWidth()
929{ 929{
930 return maximumWidth(); 930 return maximumWidth();
931} 931}
932 932
933 933
934void KToolBar::setTitle (const QString& _title) 934void KToolBar::setTitle (const QString& _title)
935{ 935{
936 setLabel( _title ); 936 setLabel( _title );
937} 937}
938 938
939 939
940void KToolBar::enableFloating (bool ) 940void KToolBar::enableFloating (bool )
941{ 941{
942} 942}
943 943
944 944
945void KToolBar::setIconText(IconText it) 945void KToolBar::setIconText(IconText it)
946{ 946{
947 setIconText( it, true ); 947 setIconText( it, true );
948} 948}
949 949
950 950
951void KToolBar::setIconText(IconText icontext, bool update) 951void KToolBar::setIconText(IconText icontext, bool update)
952{ 952{
953 bool doUpdate=false; 953 bool doUpdate=false;
954 954
955 if (icontext != d->m_iconText) { 955 if (icontext != d->m_iconText) {
956 d->m_iconText = icontext; 956 d->m_iconText = icontext;
957 doUpdate=true; 957 doUpdate=true;
958 } 958 }
959 959
960 if (update == false) 960 if (update == false)
961 return; 961 return;
962 962
963 if (doUpdate) 963 if (doUpdate)
964 emit modechange(); // tell buttons what happened 964 emit modechange(); // tell buttons what happened
965 965
966 // ugly hack to force a QMainWindow::triggerLayout( TRUE ) 966 // ugly hack to force a QMainWindow::triggerLayout( TRUE )
967 if ( mainWindow() ) { 967 if ( mainWindow() ) {
968 QMainWindow *mw = mainWindow(); 968 QMainWindow *mw = mainWindow();
969 mw->setUpdatesEnabled( FALSE ); 969 mw->setUpdatesEnabled( FALSE );
970 mw->setToolBarsMovable( !mw->toolBarsMovable() ); 970 mw->setToolBarsMovable( !mw->toolBarsMovable() );
971 mw->setToolBarsMovable( !mw->toolBarsMovable() ); 971 mw->setToolBarsMovable( !mw->toolBarsMovable() );
972 mw->setUpdatesEnabled( TRUE ); 972 mw->setUpdatesEnabled( TRUE );
973 } 973 }
974} 974}
975 975
976 976
977KToolBar::IconText KToolBar::iconText() const 977KToolBar::IconText KToolBar::iconText() const
978{ 978{
979 return d->m_iconText; 979 return d->m_iconText;
980} 980}
981 981
982 982
983void KToolBar::setIconSize(int size) 983void KToolBar::setIconSize(int size)
984{ 984{
985 setIconSize( size, true ); 985 setIconSize( size, true );
986} 986}
987 987
988void KToolBar::setIconSize(int size, bool update) 988void KToolBar::setIconSize(int size, bool update)
989{ 989{
990 bool doUpdate=false; 990 bool doUpdate=false;
991 991
992 if ( size != d->m_iconSize ) { 992 if ( size != d->m_iconSize ) {
993 d->m_iconSize = size; 993 d->m_iconSize = size;
994 doUpdate=true; 994 doUpdate=true;
995 } 995 }
996 996
997 if (update == false) 997 if (update == false)
998 return; 998 return;
999 999
1000 if (doUpdate) 1000 if (doUpdate)
1001 emit modechange(); // tell buttons what happened 1001 emit modechange(); // tell buttons what happened
1002 1002
1003 // ugly hack to force a QMainWindow::triggerLayout( TRUE ) 1003 // ugly hack to force a QMainWindow::triggerLayout( TRUE )
1004 if ( mainWindow() ) { 1004 if ( mainWindow() ) {
1005 QMainWindow *mw = mainWindow(); 1005 QMainWindow *mw = mainWindow();
1006 mw->setUpdatesEnabled( FALSE ); 1006 mw->setUpdatesEnabled( FALSE );
1007 mw->setToolBarsMovable( !mw->toolBarsMovable() ); 1007 mw->setToolBarsMovable( !mw->toolBarsMovable() );
1008 mw->setToolBarsMovable( !mw->toolBarsMovable() ); 1008 mw->setToolBarsMovable( !mw->toolBarsMovable() );
1009 mw->setUpdatesEnabled( TRUE ); 1009 mw->setUpdatesEnabled( TRUE );
1010 } 1010 }
1011} 1011}
1012 1012
1013 1013
1014int KToolBar::iconSize() const 1014int KToolBar::iconSize() const
1015{ 1015{
1016/*US 1016/*US
1017 if ( !d->m_iconSize ) // default value? 1017 if ( !d->m_iconSize ) // default value?
1018 { 1018 {
1019 if (!::qstrcmp(QObject::name(), "mainToolBar")) 1019 if (!::qstrcmp(QObject::name(), "mainToolBar"))
1020 return KGlobal::iconLoader()->currentSize(KIcon::MainToolbar); 1020 return KGlobal::iconLoader()->currentSize(KIcon::MainToolbar);
1021 else 1021 else
1022 return KGlobal::iconLoader()->currentSize(KIcon::Toolbar); 1022 return KGlobal::iconLoader()->currentSize(KIcon::Toolbar);
1023 } 1023 }
1024 return d->m_iconSize; 1024 return d->m_iconSize;
1025*/ 1025*/
1026 int ret = 18; 1026 int ret = 18;
1027 if ( QApplication::desktop()->width() > 320 ) 1027 if ( QApplication::desktop()->width() > 320 )
1028 ret = 30; 1028 ret = 30;
1029 return ret; 1029 return ret;
1030} 1030}
1031 1031
1032 1032
1033void KToolBar::setEnableContextMenu(bool enable ) 1033void KToolBar::setEnableContextMenu(bool enable )
1034{ 1034{
1035 d->m_enableContext = enable; 1035 d->m_enableContext = enable;
1036} 1036}
1037 1037
1038 1038
1039bool KToolBar::contextMenuEnabled() const 1039bool KToolBar::contextMenuEnabled() const
1040{ 1040{
1041 return d->m_enableContext; 1041 return d->m_enableContext;
1042} 1042}
1043 1043
1044 1044
1045void KToolBar::setItemNoStyle(int id, bool no_style ) 1045void KToolBar::setItemNoStyle(int id, bool no_style )
1046{ 1046{
1047 Id2WidgetMap::Iterator it = id2widget.find( id ); 1047 Id2WidgetMap::Iterator it = id2widget.find( id );
1048 if ( it == id2widget.end() ) 1048 if ( it == id2widget.end() )
1049 return; 1049 return;
1050//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it ); 1050//US KToolBarButton * button = dynamic_cast<KToolBarButton *>( *it );
1051 KToolBarButton * button = (KToolBarButton *)( *it ); 1051 KToolBarButton * button = (KToolBarButton *)( *it );
1052 if (button) 1052 if (button)
1053 button->setNoStyle( no_style ); 1053 button->setNoStyle( no_style );
1054} 1054}
1055 1055
1056 1056
1057void KToolBar::setFlat (bool flag) 1057void KToolBar::setFlat (bool flag)
1058{ 1058{
1059 if ( !mainWindow() ) 1059 if ( !mainWindow() )
1060 return; 1060 return;
1061 if ( flag ) 1061 if ( flag )
1062//US mainWindow()->moveDockWindow( this, DockMinimized ); 1062//US mainWindow()->moveDockWindow( this, DockMinimized );
1063 mainWindow()->moveToolBar( this, QMainWindow::Minimized ); 1063 mainWindow()->moveToolBar( this, QMainWindow::Minimized );
1064 else 1064 else
1065//US mainWindow()->moveDockWindow( this, DockTop ); 1065//US mainWindow()->moveDockWindow( this, DockTop );
1066 mainWindow()->moveToolBar( this, QMainWindow::Top ); 1066 mainWindow()->moveToolBar( this, QMainWindow::Top );
1067 // And remember to save the new look later 1067 // And remember to save the new look later
1068/*US 1068/*US
1069 if ( mainWindow()->inherits( "KMainWindow" ) ) 1069 if ( mainWindow()->inherits( "KMainWindow" ) )
1070 static_cast<KMainWindow *>(mainWindow())->setSettingsDirty(); 1070 static_cast<KMainWindow *>(mainWindow())->setSettingsDirty();
1071*/ 1071*/
1072} 1072}
1073 1073
1074 1074
1075int KToolBar::count() const 1075int KToolBar::count() const
1076{ 1076{
1077 return id2widget.count(); 1077 return id2widget.count();
1078} 1078}
1079 1079
1080 1080
1081void KToolBar::saveState() 1081void KToolBar::saveState()
1082{ 1082{
1083/*US 1083/*US
1084 // first, try to save to the xml file 1084 // first, try to save to the xml file
1085 if ( d->m_xmlguiClient && !d->m_xmlguiClient->xmlFile().isEmpty() ) { 1085 if ( d->m_xmlguiClient && !d->m_xmlguiClient->xmlFile().isEmpty() ) {
1086 // go down one level to get to the right tags 1086 // go down one level to get to the right tags
1087 QDomElement elem = d->m_xmlguiClient->domDocument().documentElement().toElement(); 1087 QDomElement elem = d->m_xmlguiClient->domDocument().documentElement().toElement();
1088 elem = elem.firstChild().toElement(); 1088 elem = elem.firstChild().toElement();
1089 QString barname(!::qstrcmp(name(), "unnamed") ? "mainToolBar" : name()); 1089 QString barname(!::qstrcmp(name(), "unnamed") ? "mainToolBar" : name());
1090 QDomElement current; 1090 QDomElement current;
1091 // now try to find our toolbar 1091 // now try to find our toolbar
1092 d->modified = false; 1092 d->modified = false;
1093 for( ; !elem.isNull(); elem = elem.nextSibling().toElement() ) { 1093 for( ; !elem.isNull(); elem = elem.nextSibling().toElement() ) {
1094 current = elem; 1094 current = elem;
1095 1095
1096 if ( current.tagName().lower() != "toolbar" ) 1096 if ( current.tagName().lower() != "toolbar" )
1097 continue; 1097 continue;
1098 1098
1099 QString curname(current.attribute( "name" )); 1099 QString curname(current.attribute( "name" ));
1100 1100
1101 if ( curname == barname ) { 1101 if ( curname == barname ) {
1102 saveState( current ); 1102 saveState( current );
1103 break; 1103 break;
1104 } 1104 }
1105 } 1105 }
1106 // if we didn't make changes, then just return 1106 // if we didn't make changes, then just return
1107 if ( !d->modified ) 1107 if ( !d->modified )
1108 return; 1108 return;
1109 1109
1110 // now we load in the (non-merged) local file 1110 // now we load in the (non-merged) local file
1111 QString local_xml(KXMLGUIFactory::readConfigFile(d->m_xmlguiClient->xmlFile(), true, d->m_xmlguiClient->instance())); 1111 QString local_xml(KXMLGUIFactory::readConfigFile(d->m_xmlguiClient->xmlFile(), true, d->m_xmlguiClient->instance()));
1112 QDomDocument local; 1112 QDomDocument local;
1113 local.setContent(local_xml); 1113 local.setContent(local_xml);
1114 1114
1115 // make sure we don't append if this toolbar already exists locally 1115 // make sure we don't append if this toolbar already exists locally
1116 bool just_append = true; 1116 bool just_append = true;
1117 elem = local.documentElement().toElement(); 1117 elem = local.documentElement().toElement();
1118 KXMLGUIFactory::removeDOMComments( elem ); 1118 KXMLGUIFactory::removeDOMComments( elem );
1119 elem = elem.firstChild().toElement(); 1119 elem = elem.firstChild().toElement();
1120 for( ; !elem.isNull(); elem = elem.nextSibling().toElement() ) { 1120 for( ; !elem.isNull(); elem = elem.nextSibling().toElement() ) {
1121 if ( elem.tagName().lower() != "toolbar" ) 1121 if ( elem.tagName().lower() != "toolbar" )
1122 continue; 1122 continue;
1123 1123
1124 QString curname(elem.attribute( "name" )); 1124 QString curname(elem.attribute( "name" ));
1125 1125
1126 if ( curname == barname ) { 1126 if ( curname == barname ) {
1127 just_append = false; 1127 just_append = false;
1128 local.documentElement().replaceChild( current, elem ); 1128 local.documentElement().replaceChild( current, elem );
1129 break; 1129 break;
1130 } 1130 }
1131 } 1131 }
1132 1132
1133 if (just_append) 1133 if (just_append)
1134 local.documentElement().appendChild( current ); 1134 local.documentElement().appendChild( current );
1135 1135
1136 KXMLGUIFactory::saveConfigFile(local, d->m_xmlguiClient->localXMLFile(), d->m_xmlguiClient->instance() ); 1136 KXMLGUIFactory::saveConfigFile(local, d->m_xmlguiClient->localXMLFile(), d->m_xmlguiClient->instance() );
1137 1137
1138 return; 1138 return;
1139 } 1139 }
1140*/ 1140*/
1141 // if that didn't work, we save to the config file 1141 // if that didn't work, we save to the config file
1142 KConfig *config = KGlobal::config(); 1142 KConfig *config = KGlobal::config();
1143 saveSettings(config, QString::null); 1143 saveSettings(config, QString::null);
1144 config->sync(); 1144 config->sync();
1145} 1145}
1146 1146
1147QString KToolBar::settingsGroup() 1147QString KToolBar::settingsGroup()
1148{ 1148{
1149 QString configGroup; 1149 QString configGroup;
1150 if (!::qstrcmp(name(), "unnamed") || !::qstrcmp(name(), "mainToolBar")) 1150 if (!::qstrcmp(name(), "unnamed") || !::qstrcmp(name(), "mainToolBar"))
1151 configGroup = "Toolbar style"; 1151 configGroup = "Toolbar style";
1152 else 1152 else
1153 configGroup = QString(name()) + " Toolbar style"; 1153 configGroup = QString(name()) + " Toolbar style";
1154 if ( this->mainWindow() ) 1154 if ( this->mainWindow() )
1155 { 1155 {
1156 configGroup.prepend(" "); 1156 configGroup.prepend(" ");
1157 configGroup.prepend( this->mainWindow()->name() ); 1157 configGroup.prepend( this->mainWindow()->name() );
1158 } 1158 }
1159 return configGroup; 1159 return configGroup;
1160} 1160}
1161 1161
1162void KToolBar::saveSettings(KConfig *config, const QString &_configGroup) 1162void KToolBar::saveSettings(KConfig *config, const QString &_configGroup)
1163{ 1163{
1164 return; 1164 return;
1165 QString configGroup = _configGroup; 1165 QString configGroup = _configGroup;
1166 if (configGroup.isEmpty()) 1166 if (configGroup.isEmpty())
1167 configGroup = settingsGroup(); 1167 configGroup = settingsGroup();
1168 //kdDebug(220) << "KToolBar::saveSettings group=" << _configGroup << " -> " << configGroup << endl; 1168 //kdDebug(220) << "KToolBar::saveSettings group=" << _configGroup << " -> " << configGroup << endl;
1169 1169
1170 QString position, icontext; 1170 QString position, icontext;
1171 int index; 1171 int index;
1172 getAttributes( position, icontext, index ); 1172 getAttributes( position, icontext, index );
1173 1173
1174 //kdDebug(220) << "KToolBar::saveSettings " << name() << " newLine=" << newLine << endl; 1174 //kdDebug(220) << "KToolBar::saveSettings " << name() << " newLine=" << newLine << endl;
1175 1175
1176 KConfigGroupSaver saver(config, configGroup); 1176 KConfigGroupSaver saver(config, configGroup);
1177 1177
1178 if ( position != d->PositionDefault ) 1178 if ( position != d->PositionDefault )
1179 config->writeEntry("Position", position); 1179 config->writeEntry("Position", position);
1180 else 1180 else
1181 config->deleteEntry("Position"); 1181 config->deleteEntry("Position");
1182 1182
1183 if ( icontext != d->IconTextDefault ) 1183 if ( icontext != d->IconTextDefault )
1184 config->writeEntry("IconText", icontext); 1184 config->writeEntry("IconText", icontext);
1185 else 1185 else
1186 config->deleteEntry("IconText"); 1186 config->deleteEntry("IconText");
1187 1187
1188 if ( iconSize() != d->IconSizeDefault ) 1188 if ( iconSize() != d->IconSizeDefault )
1189 config->writeEntry("IconSize", iconSize()); 1189 config->writeEntry("IconSize", iconSize());
1190 else 1190 else
1191 config->deleteEntry("IconSize"); 1191 config->deleteEntry("IconSize");
1192 1192
1193 if ( isHidden() != d->HiddenDefault ) 1193 if ( isHidden() != d->HiddenDefault )
1194 config->writeEntry("Hidden", isHidden()); 1194 config->writeEntry("Hidden", isHidden());
1195 else 1195 else
1196 config->deleteEntry("Hidden"); 1196 config->deleteEntry("Hidden");
1197 1197
1198 if ( index != d->IndexDefault ) 1198 if ( index != d->IndexDefault )
1199 config->writeEntry( "Index", index ); 1199 config->writeEntry( "Index", index );
1200 else 1200 else
1201 config->deleteEntry("Index"); 1201 config->deleteEntry("Index");
1202//US the older version of KDE (used on the Zaurus) has no Offset property 1202//US the older version of KDE (used on the Zaurus) has no Offset property
1203/* if ( offset() != d->OffsetDefault ) 1203/* if ( offset() != d->OffsetDefault )
1204 config->writeEntry( "Offset", offset() ); 1204 config->writeEntry( "Offset", offset() );
1205 else 1205 else
1206*/ 1206*/
1207 config->deleteEntry("Offset"); 1207 config->deleteEntry("Offset");
1208 1208
1209//US the older version of KDE (used on the Zaurus) has no NewLine property 1209//US the older version of KDE (used on the Zaurus) has no NewLine property
1210/* 1210/*
1211 if ( newLine() != d->NewLineDefault ) 1211 if ( newLine() != d->NewLineDefault )
1212 config->writeEntry( "NewLine", newLine() ); 1212 config->writeEntry( "NewLine", newLine() );
1213 else 1213 else
1214*/ 1214*/
1215 config->deleteEntry("NewLine"); 1215 config->deleteEntry("NewLine");
1216} 1216}
1217 1217
1218void KToolBar::setXMLGUIClient( KXMLGUIClient *client ) 1218void KToolBar::setXMLGUIClient( KXMLGUIClient *client )
1219{ 1219{
1220 d->m_xmlguiClient = client; 1220 d->m_xmlguiClient = client;
1221} 1221}
1222 1222
1223void KToolBar::setText( const QString & txt ) 1223void KToolBar::setText( const QString & txt )
1224{ 1224{
1225//US setLabel( txt + " ( " + kapp->caption() + " ) " ); 1225//US setLabel( txt + " ( " + kapp->caption() + " ) " );
1226 setLabel( txt + " ( " + KGlobal::getAppName() + " ) " ); 1226 setLabel( txt + " ( " + KGlobal::getAppName() + " ) " );
1227} 1227}
1228 1228
1229 1229
1230QString KToolBar::text() const 1230QString KToolBar::text() const
1231{ 1231{
1232 return label(); 1232 return label();
1233} 1233}
1234 1234
1235 1235
1236void KToolBar::doConnections( KToolBarButton *button ) 1236void KToolBar::doConnections( KToolBarButton *button )
1237{ 1237{
1238 connect(button, SIGNAL(clicked(int)), this, SIGNAL( clicked( int ) ) ); 1238 connect(button, SIGNAL(clicked(int)), this, SIGNAL( clicked( int ) ) );
1239 connect(button, SIGNAL(doubleClicked(int)), this, SIGNAL( doubleClicked( int ) ) ); 1239 connect(button, SIGNAL(doubleClicked(int)), this, SIGNAL( doubleClicked( int ) ) );
1240 connect(button, SIGNAL(released(int)), this, SIGNAL( released( int ) ) ); 1240 connect(button, SIGNAL(released(int)), this, SIGNAL( released( int ) ) );
1241 connect(button, SIGNAL(pressed(int)), this, SIGNAL( pressed( int ) ) ); 1241 connect(button, SIGNAL(pressed(int)), this, SIGNAL( pressed( int ) ) );
1242 connect(button, SIGNAL(toggled(int)), this, SIGNAL( toggled( int ) ) ); 1242 connect(button, SIGNAL(toggled(int)), this, SIGNAL( toggled( int ) ) );
1243 connect(button, SIGNAL(highlighted(int, bool)), this, SIGNAL( highlighted( int, bool ) ) ); 1243 connect(button, SIGNAL(highlighted(int, bool)), this, SIGNAL( highlighted( int, bool ) ) );
1244} 1244}
1245 1245
1246void KToolBar::mousePressEvent ( QMouseEvent *m ) 1246void KToolBar::mousePressEvent ( QMouseEvent *m )
1247{ 1247{
1248 if ( !mainWindow() ) 1248 if ( !mainWindow() )
1249 return; 1249 return;
1250 QMainWindow *mw = mainWindow(); 1250 QMainWindow *mw = mainWindow();
1251 if ( mw->toolBarsMovable() && d->m_enableContext ) { 1251 if ( mw->toolBarsMovable() && d->m_enableContext ) {
1252 if ( m->button() == RightButton ) { 1252 if ( m->button() == RightButton ) {
1253 int i = contextMenu()->exec( m->globalPos(), 0 ); 1253 int i = contextMenu()->exec( m->globalPos(), 0 );
1254 switch ( i ) { 1254 switch ( i ) {
1255 case -1: 1255 case -1:
1256 return; // popup cancelled 1256 return; // popup cancelled
1257 case CONTEXT_LEFT: 1257 case CONTEXT_LEFT:
1258//US mw->moveDockWindow( this, DockLeft ); 1258//US mw->moveDockWindow( this, DockLeft );
1259 mw->moveToolBar( this, QMainWindow::Left ); 1259 mw->moveToolBar( this, QMainWindow::Left );
1260 break; 1260 break;
1261 case CONTEXT_RIGHT: 1261 case CONTEXT_RIGHT:
1262//US mw->moveDockWindow( this, DockRight ); 1262//US mw->moveDockWindow( this, DockRight );
1263 mw->moveToolBar( this, QMainWindow::Right ); 1263 mw->moveToolBar( this, QMainWindow::Right );
1264 break; 1264 break;
1265 case CONTEXT_TOP: 1265 case CONTEXT_TOP:
1266//US mw->moveDockWindow( this, DockTop ); 1266//US mw->moveDockWindow( this, DockTop );
1267 mw->moveToolBar( this, QMainWindow::Top ); 1267 mw->moveToolBar( this, QMainWindow::Top );
1268 break; 1268 break;
1269 case CONTEXT_BOTTOM: 1269 case CONTEXT_BOTTOM:
1270//US mw->moveDockWindow( this, DockBottom ); 1270//US mw->moveDockWindow( this, DockBottom );
1271 mw->moveToolBar( this, QMainWindow::Bottom ); 1271 mw->moveToolBar( this, QMainWindow::Bottom );
1272 break; 1272 break;
1273 case CONTEXT_FLOAT: 1273 case CONTEXT_FLOAT:
1274 break; 1274 break;
1275 case CONTEXT_FLAT: 1275 case CONTEXT_FLAT:
1276//US mw->moveDockWindow( this, DockMinimized ); 1276//US mw->moveDockWindow( this, DockMinimized );
1277 mw->moveToolBar( this, QMainWindow::Minimized ); 1277 mw->moveToolBar( this, QMainWindow::Minimized );
1278 break; 1278 break;
1279 case CONTEXT_ICONS: 1279 case CONTEXT_ICONS:
1280 setIconText( IconOnly ); 1280 setIconText( IconOnly );
1281 break; 1281 break;
1282 case CONTEXT_TEXTRIGHT: 1282 case CONTEXT_TEXTRIGHT:
1283 setIconText( IconTextRight ); 1283 setIconText( IconTextRight );
1284 break; 1284 break;
1285 case CONTEXT_TEXT: 1285 case CONTEXT_TEXT:
1286 setIconText( TextOnly ); 1286 setIconText( TextOnly );
1287 break; 1287 break;
1288 case CONTEXT_TEXTUNDER: 1288 case CONTEXT_TEXTUNDER:
1289 setIconText( IconTextBottom ); 1289 setIconText( IconTextBottom );
1290 break; 1290 break;
1291 default: 1291 default:
1292 if ( i >= CONTEXT_ICONSIZES ) 1292 if ( i >= CONTEXT_ICONSIZES )
1293 setIconSize( i - CONTEXT_ICONSIZES ); 1293 setIconSize( i - CONTEXT_ICONSIZES );
1294 else 1294 else
1295 return; // assume this was an action handled elsewhere, no need for setSettingsDirty() 1295 return; // assume this was an action handled elsewhere, no need for setSettingsDirty()
1296 } 1296 }
1297/*US 1297/*US
1298 if ( mw->inherits("KMainWindow") ) 1298 if ( mw->inherits("KMainWindow") )
1299 static_cast<KMainWindow *>(mw)->setSettingsDirty(); 1299 static_cast<KMainWindow *>(mw)->setSettingsDirty();
1300*/ 1300*/
1301 } 1301 }
1302 } 1302 }
1303} 1303}
1304 1304
1305 1305
1306void KToolBar::rebuildLayout() 1306void KToolBar::rebuildLayout()
1307{ 1307{
1308 1308
1309 for(QWidget *w=d->idleButtons.first(); w; w=d->idleButtons.next()) 1309 for(QWidget *w=d->idleButtons.first(); w; w=d->idleButtons.next())
1310 w->blockSignals(false); 1310 w->blockSignals(false);
1311 d->idleButtons.clear(); 1311 d->idleButtons.clear();
1312 1312
1313 layoutTimer->stop(); 1313 layoutTimer->stop();
1314 QApplication::sendPostedEvents( this, QEvent::ChildInserted ); 1314 QApplication::sendPostedEvents( this, QEvent::ChildInserted );
1315 QBoxLayout *l = boxLayout(); 1315 QBoxLayout *l = boxLayout();
1316 l->setMargin( 1 ); 1316 l->setMargin( 1 );
1317 // clear the old layout 1317 // clear the old layout
1318 QLayoutIterator it = l->iterator(); 1318 QLayoutIterator it = l->iterator();
1319 1319
1320 while ( it.current() ) { 1320 while ( it.current() ) {
1321 it.deleteCurrent(); 1321 it.deleteCurrent();
1322 } 1322 }
1323 for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { 1323 for ( QWidget *w = widgets.first(); w; w = widgets.next() ) {
1324 if ( w == rightAligned ) { 1324 if ( w == rightAligned ) {
1325 continue; 1325 continue;
1326 } 1326 }
1327 if ( w->inherits( "KToolBarSeparator" ) && 1327 if ( w->inherits( "KToolBarSeparator" ) &&
1328 !( (KToolBarSeparator*)w )->showLine() ) { 1328 !( (KToolBarSeparator*)w )->showLine() ) {
1329 l->addSpacing( 6 ); 1329 l->addSpacing( 6 );
1330 w->hide(); 1330 w->hide();
1331 continue; 1331 continue;
1332 } 1332 }
1333 if ( w->inherits( "QPopupMenu" ) ) 1333 if ( w->inherits( "QPopupMenu" ) )
1334 continue; 1334 continue;
1335 l->addWidget( w ); 1335 l->addWidget( w );
1336 w->show(); 1336 w->show();
1337 } 1337 }
1338 if ( rightAligned ) { 1338 if ( rightAligned ) {
1339 l->addStretch(); 1339 l->addStretch();
1340 l->addWidget( rightAligned ); 1340 l->addWidget( rightAligned );
1341 rightAligned->show(); 1341 rightAligned->show();
1342 } 1342 }
1343 1343
1344 if ( fullSize() ) { 1344 if ( fullSize() ) {
1345 // This code sucks. It makes the last combo in a toolbar VERY big (e.g. zoom combo in kword). 1345 // This code sucks. It makes the last combo in a toolbar VERY big (e.g. zoom combo in kword).
1346 //if ( !stretchableWidget && widgets.last() && 1346 //if ( !stretchableWidget && widgets.last() &&
1347 // !widgets.last()->inherits( "QButton" ) && !widgets.last()->inherits( "KAnimWidget" ) ) 1347 // !widgets.last()->inherits( "QButton" ) && !widgets.last()->inherits( "KAnimWidget" ) )
1348 // setStretchableWidget( widgets.last() ); 1348 // setStretchableWidget( widgets.last() );
1349 if ( !rightAligned ) 1349 if ( !rightAligned )
1350 l->addStretch(); 1350 l->addStretch();
1351 if ( stretchableWidget ) 1351 if ( stretchableWidget )
1352 l->setStretchFactor( stretchableWidget, 10 ); 1352 l->setStretchFactor( stretchableWidget, 10 );
1353 } 1353 }
1354 l->invalidate(); 1354 l->invalidate();
1355 QApplication::postEvent( this, new QEvent( QEvent::LayoutHint ) ); 1355 QApplication::postEvent( this, new QEvent( QEvent::LayoutHint ) );
1356 //#endif //DESKTOP_VERSION 1356 //#endif //DESKTOP_VERSION
1357} 1357}
1358 1358
1359void KToolBar::childEvent( QChildEvent *e ) 1359void KToolBar::childEvent( QChildEvent *e )
1360{ 1360{
1361 1361
1362 if ( e->child()->isWidgetType() ) { 1362 if ( e->child()->isWidgetType() ) {
1363 QWidget * w = (QWidget*)e->child(); 1363 QWidget * w = (QWidget*)e->child();
1364 if ( e->type() == QEvent::ChildInserted ) { 1364 if ( e->type() == QEvent::ChildInserted ) {
1365 if ( !e->child()->inherits( "QPopupMenu" ) && 1365 if ( !e->child()->inherits( "QPopupMenu" ) &&
1366 ::qstrcmp( "qt_dockwidget_internal", e->child()->name() ) != 0 ) { 1366 ::qstrcmp( "qt_dockwidget_internal", e->child()->name() ) != 0 ) {
1367 1367
1368 // prevent items that have been explicitly inserted by insert*() from 1368 // prevent items that have been explicitly inserted by insert*() from
1369 // being inserted again 1369 // being inserted again
1370 if ( !widget2id.contains( w ) ) 1370 if ( !widget2id.contains( w ) )
1371 { 1371 {
1372 int dummy = -1; 1372 int dummy = -1;
1373 insertWidgetInternal( w, dummy, -1 ); 1373 insertWidgetInternal( w, dummy, -1 );
1374 } 1374 }
1375 } 1375 }
1376 } else { 1376 } else {
1377 removeWidgetInternal( w ); 1377 removeWidgetInternal( w );
1378 } 1378 }
1379 if ( isVisibleTo( 0 ) ) 1379 if ( isVisibleTo( 0 ) )
1380 { 1380 {
1381 QBoxLayout *l = boxLayout(); 1381 QBoxLayout *l = boxLayout();
1382 // QLayout *l = layout(); 1382 // QLayout *l = layout();
1383 1383
1384 // clear the old layout so that we don't get unnecassery layout 1384 // clear the old layout so that we don't get unnecassery layout
1385 // changes till we have rebuild the thing 1385 // changes till we have rebuild the thing
1386 QLayoutIterator it = l->iterator(); 1386 QLayoutIterator it = l->iterator();
1387 while ( it.current() ) { 1387 while ( it.current() ) {
1388 it.deleteCurrent(); 1388 it.deleteCurrent();
1389 } 1389 }
1390 layoutTimer->start( 50, TRUE ); 1390 layoutTimer->start( 50, TRUE );
1391 } 1391 }
1392 } 1392 }
1393 QToolBar::childEvent( e ); 1393 QToolBar::childEvent( e );
1394} 1394}
1395 1395
1396void KToolBar::insertWidgetInternal( QWidget *w, int &index, int id ) 1396void KToolBar::insertWidgetInternal( QWidget *w, int &index, int id )
1397{ 1397{
1398 // we can't have it in widgets, or something is really wrong 1398 // we can't have it in widgets, or something is really wrong
1399 //widgets.removeRef( w ); 1399 //widgets.removeRef( w );
1400 1400
1401 connect( w, SIGNAL( destroyed() ), 1401 connect( w, SIGNAL( destroyed() ),
1402 this, SLOT( widgetDestroyed() ) ); 1402 this, SLOT( widgetDestroyed() ) );
1403 if ( index == -1 || index > (int)widgets.count() ) { 1403 if ( index == -1 || index > (int)widgets.count() ) {
1404 widgets.append( w ); 1404 widgets.append( w );
1405 index = (int)widgets.count(); 1405 index = (int)widgets.count();
1406 } 1406 }
1407 else 1407 else
1408 widgets.insert( index, w ); 1408 widgets.insert( index, w );
1409 if ( id == -1 ) 1409 if ( id == -1 )
1410 id = id2widget.count(); 1410 id = id2widget.count();
1411 id2widget.insert( id, w ); 1411 id2widget.insert( id, w );
1412 widget2id.insert( w, id ); 1412 widget2id.insert( w, id );
1413} 1413}
1414void KToolBar::repaintMe() 1414void KToolBar::repaintMe()
1415{ 1415{
1416 setUpdatesEnabled( true ); 1416 setUpdatesEnabled( true );
1417 QToolBar::repaint( true ); 1417 QToolBar::repaint( true );
1418 //qDebug(" KToolBar::repaintMe() "); 1418 qDebug(" KToolBar::repaintMe() ");
1419} 1419}
1420 1420
1421void KToolBar::showEvent( QShowEvent *e ) 1421void KToolBar::showEvent( QShowEvent *e )
1422{ 1422{
1423 QToolBar::showEvent( e );
1424 rebuildLayout(); 1423 rebuildLayout();
1424 QToolBar::showEvent( e );
1425} 1425}
1426 1426
1427void KToolBar::setStretchableWidget( QWidget *w ) 1427void KToolBar::setStretchableWidget( QWidget *w )
1428{ 1428{
1429 QToolBar::setStretchableWidget( w ); 1429 QToolBar::setStretchableWidget( w );
1430 stretchableWidget = w; 1430 stretchableWidget = w;
1431} 1431}
1432 1432
1433QSizePolicy KToolBar::sizePolicy() const 1433QSizePolicy KToolBar::sizePolicy() const
1434{ 1434{
1435 if ( orientation() == Horizontal ) 1435 if ( orientation() == Horizontal )
1436 return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); 1436 return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
1437 else 1437 else
1438 return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Expanding ); 1438 return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Expanding );
1439} 1439}
1440 1440
1441QSize KToolBar::sizeHint() const 1441QSize KToolBar::sizeHint() const
1442{ 1442{
1443 return QToolBar::sizeHint(); 1443 return QToolBar::sizeHint();
1444#if 0 1444#if 0
1445 QWidget::polish(); 1445 QWidget::polish();
1446 static int iii = 0; 1446 static int iii = 0;
1447 ++iii; 1447 ++iii;
1448 qDebug("++++++++ KToolBar::sizeHint() %d ", iii ); 1448 qDebug("++++++++ KToolBar::sizeHint() %d ", iii );
1449 int margin = static_cast<QWidget*>(ncThis)->layout()->margin(); 1449 int margin = static_cast<QWidget*>(ncThis)->layout()->margin();
1450 switch( barPos() ) 1450 switch( barPos() )
1451 { 1451 {
1452 case KToolBar::Top: 1452 case KToolBar::Top:
1453 case KToolBar::Bottom: 1453 case KToolBar::Bottom:
1454 for ( QWidget *w = widgets.first(); w; w =widgets.next() ) 1454 for ( QWidget *w = widgets.first(); w; w =widgets.next() )
1455 { 1455 {
1456 if ( w->inherits( "KToolBarSeparator" ) && 1456 if ( w->inherits( "KToolBarSeparator" ) &&
1457 !( static_cast<KToolBarSeparator*>(w)->showLine() ) ) 1457 !( static_cast<KToolBarSeparator*>(w)->showLine() ) )
1458 { 1458 {
1459 minSize += QSize(6, 0); 1459 minSize += QSize(6, 0);
1460 } 1460 }
1461 else 1461 else
1462 { 1462 {
1463 QSize sh = w->sizeHint(); 1463 QSize sh = w->sizeHint();
1464 if (!sh.isValid()) 1464 if (!sh.isValid())
1465 sh = w->minimumSize(); 1465 sh = w->minimumSize();
1466 minSize = minSize.expandedTo(QSize(0, sh.height())); 1466 minSize = minSize.expandedTo(QSize(0, sh.height()));
1467 minSize += QSize(sh.width()+1, 0); 1467 minSize += QSize(sh.width()+1, 0);
1468 } 1468 }
1469 } 1469 }
1470/*US 1470/*US
1471 minSize += QSize(QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent ), 0); 1471 minSize += QSize(QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent ), 0);
1472*/ 1472*/
1473 minSize += QSize(margin*2, margin*2); 1473 minSize += QSize(margin*2, margin*2);
1474 break; 1474 break;
1475 1475
1476 case KToolBar::Left: 1476 case KToolBar::Left:
1477 case KToolBar::Right: 1477 case KToolBar::Right:
1478 for ( QWidget *w = widgets.first(); w; w = widgets.next() ) 1478 for ( QWidget *w = widgets.first(); w; w = widgets.next() )
1479 { 1479 {
1480 if ( w->inherits( "KToolBarSeparator" ) && 1480 if ( w->inherits( "KToolBarSeparator" ) &&
1481 !( static_cast<KToolBarSeparator*>(w)->showLine() ) ) 1481 !( static_cast<KToolBarSeparator*>(w)->showLine() ) )
1482 { 1482 {
1483 minSize += QSize(0, 6); 1483 minSize += QSize(0, 6);
1484 } 1484 }
1485 else 1485 else
1486 { 1486 {
1487 QSize sh = w->sizeHint(); 1487 QSize sh = w->sizeHint();
1488 if (!sh.isValid()) 1488 if (!sh.isValid())
1489 sh = w->minimumSize(); 1489 sh = w->minimumSize();
1490 minSize = minSize.expandedTo(QSize(sh.width(), 0)); 1490 minSize = minSize.expandedTo(QSize(sh.width(), 0));
1491 minSize += QSize(0, sh.height()+1); 1491 minSize += QSize(0, sh.height()+1);
1492 } 1492 }
1493 } 1493 }
1494/*US 1494/*US
1495 minSize += QSize(0, QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent )); 1495 minSize += QSize(0, QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent ));
1496*/ 1496*/
1497 minSize += QSize(margin*2, margin*2); 1497 minSize += QSize(margin*2, margin*2);
1498 break; 1498 break;
1499 1499
1500 default: 1500 default:
1501 minSize = QToolBar::sizeHint(); 1501 minSize = QToolBar::sizeHint();
1502 break; 1502 break;
1503 } 1503 }
1504 return minSize; 1504 return minSize;
1505#endif 1505#endif
1506} 1506}
1507 1507
1508QSize KToolBar::minimumSize() const 1508QSize KToolBar::minimumSize() const
1509{ 1509{
1510 return minimumSizeHint(); 1510 return minimumSizeHint();
1511} 1511}
1512 1512
1513QSize KToolBar::minimumSizeHint() const 1513QSize KToolBar::minimumSizeHint() const
1514{ 1514{
1515 return sizeHint(); 1515 return sizeHint();
1516} 1516}
1517 1517
1518bool KToolBar::highlight() const 1518bool KToolBar::highlight() const
1519{ 1519{
1520 return d->m_highlight; 1520 return d->m_highlight;
1521} 1521}
1522 1522
1523void KToolBar::hide() 1523void KToolBar::hide()
1524{ 1524{
1525 QToolBar::hide(); 1525 QToolBar::hide();
1526} 1526}
1527 1527
1528void KToolBar::show() 1528void KToolBar::show()
1529{ 1529{
1530 QToolBar::show(); 1530 QToolBar::show();
1531} 1531}
1532 1532
1533void KToolBar::resizeEvent( QResizeEvent *e ) 1533void KToolBar::resizeEvent( QResizeEvent *e )
1534{ 1534{
1535 bool b = isUpdatesEnabled(); 1535 bool b = isUpdatesEnabled();
1536 setUpdatesEnabled( FALSE ); 1536 setUpdatesEnabled( FALSE );
1537 QToolBar::resizeEvent( e ); 1537 QToolBar::resizeEvent( e );
1538 if (b) 1538 if (b)
1539 d->repaintTimer.start( 100, true ); 1539 d->repaintTimer.start( 100, true );
1540} 1540}
1541 1541
1542void KToolBar::slotIconChanged(int group) 1542void KToolBar::slotIconChanged(int group)
1543{ 1543{
1544 if ((group != KIcon::Toolbar) && (group != KIcon::MainToolbar)) 1544 if ((group != KIcon::Toolbar) && (group != KIcon::MainToolbar))
1545 return; 1545 return;
1546 if ((group == KIcon::MainToolbar) != !::qstrcmp(name(), "mainToolBar")) 1546 if ((group == KIcon::MainToolbar) != !::qstrcmp(name(), "mainToolBar"))
1547 return; 1547 return;
1548 1548
1549 emit modechange(); 1549 emit modechange();
1550 if (isVisible()) 1550 if (isVisible())
1551 updateGeometry(); 1551 updateGeometry();
1552} 1552}
1553 1553
1554void KToolBar::slotReadConfig() 1554void KToolBar::slotReadConfig()
1555{ 1555{
1556 //kdDebug(220) << "KToolBar::slotReadConfig" << endl; 1556 //kdDebug(220) << "KToolBar::slotReadConfig" << endl;
1557 // Read appearance settings (hmm, we used to do both here, 1557 // Read appearance settings (hmm, we used to do both here,
1558 // but a well behaved application will call applyMainWindowSettings 1558 // but a well behaved application will call applyMainWindowSettings
1559 // anyway, right ?) 1559 // anyway, right ?)
1560 applyAppearanceSettings(KGlobal::config(), QString::null ); 1560 applyAppearanceSettings(KGlobal::config(), QString::null );
1561} 1561}
1562 1562
1563void KToolBar::slotAppearanceChanged() 1563void KToolBar::slotAppearanceChanged()
1564{ 1564{
1565 // Read appearance settings from global file. 1565 // Read appearance settings from global file.
1566 applyAppearanceSettings(KGlobal::config(), QString::null, true /* lose local settings */ ); 1566 applyAppearanceSettings(KGlobal::config(), QString::null, true /* lose local settings */ );
1567 // And remember to save the new look later 1567 // And remember to save the new look later
1568/*US 1568/*US
1569 if ( mainWindow() && mainWindow()->inherits( "KMainWindow" ) ) 1569 if ( mainWindow() && mainWindow()->inherits( "KMainWindow" ) )
1570 static_cast<KMainWindow *>(mainWindow())->setSettingsDirty(); 1570 static_cast<KMainWindow *>(mainWindow())->setSettingsDirty();
1571*/ 1571*/
1572} 1572}
1573 1573
1574//static 1574//static
1575bool KToolBar::highlightSetting() 1575bool KToolBar::highlightSetting()
1576{ 1576{
1577 QString grpToolbar(QString::fromLatin1("Toolbar style")); 1577 QString grpToolbar(QString::fromLatin1("Toolbar style"));
1578 KConfigGroupSaver saver(KGlobal::config(), grpToolbar); 1578 KConfigGroupSaver saver(KGlobal::config(), grpToolbar);
1579 return KGlobal::config()->readBoolEntry(QString::fromLatin1("Highlighting"),true); 1579 return KGlobal::config()->readBoolEntry(QString::fromLatin1("Highlighting"),true);
1580} 1580}
1581 1581
1582//static 1582//static
1583bool KToolBar::transparentSetting() 1583bool KToolBar::transparentSetting()
1584{ 1584{
1585 QString grpToolbar(QString::fromLatin1("Toolbar style")); 1585 QString grpToolbar(QString::fromLatin1("Toolbar style"));
1586 KConfigGroupSaver saver(KGlobal::config(), grpToolbar); 1586 KConfigGroupSaver saver(KGlobal::config(), grpToolbar);
1587 return KGlobal::config()->readBoolEntry(QString::fromLatin1("TransparentMoving"),true); 1587 return KGlobal::config()->readBoolEntry(QString::fromLatin1("TransparentMoving"),true);
1588} 1588}
1589 1589
1590//static 1590//static
1591KToolBar::IconText KToolBar::iconTextSetting() 1591KToolBar::IconText KToolBar::iconTextSetting()
1592{ 1592{
1593 QString grpToolbar(QString::fromLatin1("Toolbar style")); 1593 QString grpToolbar(QString::fromLatin1("Toolbar style"));
1594 KConfigGroupSaver saver(KGlobal::config(), grpToolbar); 1594 KConfigGroupSaver saver(KGlobal::config(), grpToolbar);
1595 QString icontext = KGlobal::config()->readEntry(QString::fromLatin1("IconText"),QString::fromLatin1("IconOnly")); 1595 QString icontext = KGlobal::config()->readEntry(QString::fromLatin1("IconText"),QString::fromLatin1("IconOnly"));
1596 if ( icontext == "IconTextRight" ) 1596 if ( icontext == "IconTextRight" )
1597 return IconTextRight; 1597 return IconTextRight;
1598 else if ( icontext == "IconTextBottom" ) 1598 else if ( icontext == "IconTextBottom" )
1599 return IconTextBottom; 1599 return IconTextBottom;
1600 else if ( icontext == "TextOnly" ) 1600 else if ( icontext == "TextOnly" )
1601 return TextOnly; 1601 return TextOnly;
1602 else 1602 else
1603 return IconOnly; 1603 return IconOnly;
1604} 1604}
1605 1605
1606void KToolBar::applyAppearanceSettings(KConfig *config, const QString &_configGroup, bool forceGlobal) 1606void KToolBar::applyAppearanceSettings(KConfig *config, const QString &_configGroup, bool forceGlobal)
1607{ 1607{
1608 return; 1608 return;
1609 QString configGroup = _configGroup.isEmpty() ? settingsGroup() : _configGroup; 1609 QString configGroup = _configGroup.isEmpty() ? settingsGroup() : _configGroup;
1610 //kdDebug(220) << "KToolBar::applyAppearanceSettings: configGroup=" << configGroup << endl; 1610 //kdDebug(220) << "KToolBar::applyAppearanceSettings: configGroup=" << configGroup << endl;
1611 // We have application-specific settings in the XML file, 1611 // We have application-specific settings in the XML file,
1612 // and nothing in the application's config file 1612 // and nothing in the application's config file
1613 // -> don't apply the global defaults, the XML ones are preferred 1613 // -> don't apply the global defaults, the XML ones are preferred
1614 // See applySettings for a full explanation 1614 // See applySettings for a full explanation
1615/*US :we do not support xml files 1615/*US :we do not support xml files
1616 if ( d->m_xmlguiClient && !d->m_xmlguiClient->xmlFile().isEmpty() && 1616 if ( d->m_xmlguiClient && !d->m_xmlguiClient->xmlFile().isEmpty() &&
1617 !config->hasGroup(configGroup) ) 1617 !config->hasGroup(configGroup) )
1618 { 1618 {
1619 //kdDebug(220) << "skipping global defaults, using XML ones instead" << endl; 1619 //kdDebug(220) << "skipping global defaults, using XML ones instead" << endl;
1620 return; 1620 return;
1621 } 1621 }
1622*/ 1622*/
1623 if ( !config->hasGroup(configGroup) ) 1623 if ( !config->hasGroup(configGroup) )
1624 { 1624 {
1625 //kdDebug(220) << "skipping global defaults, using XML ones instead" << endl; 1625 //kdDebug(220) << "skipping global defaults, using XML ones instead" << endl;
1626 return; 1626 return;
1627 } 1627 }
1628 1628
1629 1629
1630 KConfig *gconfig = KGlobal::config(); 1630 KConfig *gconfig = KGlobal::config();
1631/*US 1631/*US
1632 static const QString &attrIconText = KGlobal::staticQString("IconText"); 1632 static const QString &attrIconText = KGlobal::staticQString("IconText");
1633 static const QString &attrHighlight = KGlobal::staticQString("Highlighting"); 1633 static const QString &attrHighlight = KGlobal::staticQString("Highlighting");
1634 static const QString &attrTrans = KGlobal::staticQString("TransparentMoving"); 1634 static const QString &attrTrans = KGlobal::staticQString("TransparentMoving");
1635 static const QString &attrSize = KGlobal::staticQString("IconSize"); 1635 static const QString &attrSize = KGlobal::staticQString("IconSize");
1636*/ 1636*/
1637 // we actually do this in two steps. 1637 // we actually do this in two steps.
1638 // First, we read in the global styles [Toolbar style] (from the KControl module). 1638 // First, we read in the global styles [Toolbar style] (from the KControl module).
1639 // Then, if the toolbar is NOT 'mainToolBar', we will also try to read in [barname Toolbar style] 1639 // Then, if the toolbar is NOT 'mainToolBar', we will also try to read in [barname Toolbar style]
1640 bool highlight; 1640 bool highlight;
1641 int transparent; 1641 int transparent;
1642 QString icontext; 1642 QString icontext;
1643 int iconsize = 0; 1643 int iconsize = 0;
1644 1644
1645 // this is the first iteration 1645 // this is the first iteration
1646 QString grpToolbar(QString::fromLatin1("Toolbar style")); 1646 QString grpToolbar(QString::fromLatin1("Toolbar style"));
1647 { // start block for KConfigGroupSaver 1647 { // start block for KConfigGroupSaver
1648 KConfigGroupSaver saver(gconfig, grpToolbar); 1648 KConfigGroupSaver saver(gconfig, grpToolbar);
1649 1649
1650 // first, get the generic settings 1650 // first, get the generic settings
1651//US highlight = gconfig->readBoolEntry(attrHighlight, true); 1651//US highlight = gconfig->readBoolEntry(attrHighlight, true);
1652 highlight = gconfig->readBoolEntry("Highlighting", true); 1652 highlight = gconfig->readBoolEntry("Highlighting", true);
1653//US transparent = gconfig->readBoolEntry(attrTrans, true); 1653//US transparent = gconfig->readBoolEntry(attrTrans, true);
1654 transparent = gconfig->readBoolEntry("TransparentMoving", true); 1654 transparent = gconfig->readBoolEntry("TransparentMoving", true);
1655 1655
1656 // we read in the IconText property *only* if we intend on actually 1656 // we read in the IconText property *only* if we intend on actually
1657 // honoring it 1657 // honoring it
1658 if (d->m_honorStyle) 1658 if (d->m_honorStyle)
1659//US d->IconTextDefault = gconfig->readEntry(attrIconText, d->IconTextDefault); 1659//US d->IconTextDefault = gconfig->readEntry(attrIconText, d->IconTextDefault);
1660 d->IconTextDefault = gconfig->readEntry("IconText", d->IconTextDefault); 1660 d->IconTextDefault = gconfig->readEntry("IconText", d->IconTextDefault);
1661 else 1661 else
1662 d->IconTextDefault = "IconOnly"; 1662 d->IconTextDefault = "IconOnly";
1663 1663
1664 // Use the default icon size for toolbar icons. 1664 // Use the default icon size for toolbar icons.
1665//US d->IconSizeDefault = gconfig->readNumEntry(attrSize, d->IconSizeDefault); 1665//US d->IconSizeDefault = gconfig->readNumEntry(attrSize, d->IconSizeDefault);
1666 d->IconSizeDefault = gconfig->readNumEntry("IconSize", d->IconSizeDefault); 1666 d->IconSizeDefault = gconfig->readNumEntry("IconSize", d->IconSizeDefault);
1667 1667
1668 if ( !forceGlobal && config->hasGroup(configGroup) ) 1668 if ( !forceGlobal && config->hasGroup(configGroup) )
1669 { 1669 {
1670 config->setGroup(configGroup); 1670 config->setGroup(configGroup);
1671 1671
1672 // first, get the generic settings 1672 // first, get the generic settings
1673//US highlight = config->readBoolEntry(attrHighlight, highlight); 1673//US highlight = config->readBoolEntry(attrHighlight, highlight);
1674 highlight = config->readBoolEntry("Highlighting", highlight); 1674 highlight = config->readBoolEntry("Highlighting", highlight);
1675//US transparent = config->readBoolEntry(attrTrans, transparent); 1675//US transparent = config->readBoolEntry(attrTrans, transparent);
1676 transparent = config->readBoolEntry("TransparentMoving", transparent); 1676 transparent = config->readBoolEntry("TransparentMoving", transparent);
1677 // now we always read in the IconText property 1677 // now we always read in the IconText property
1678//US icontext = config->readEntry(attrIconText, d->IconTextDefault); 1678//US icontext = config->readEntry(attrIconText, d->IconTextDefault);
1679 icontext = config->readEntry("IconText", d->IconTextDefault); 1679 icontext = config->readEntry("IconText", d->IconTextDefault);
1680 1680
1681 // now get the size 1681 // now get the size
1682//US iconsize = config->readNumEntry(attrSize, d->IconSizeDefault); 1682//US iconsize = config->readNumEntry(attrSize, d->IconSizeDefault);
1683 iconsize = config->readNumEntry("IconSize", d->IconSizeDefault); 1683 iconsize = config->readNumEntry("IconSize", d->IconSizeDefault);
1684 } 1684 }
1685 else 1685 else
1686 { 1686 {
1687 iconsize = d->IconSizeDefault; 1687 iconsize = d->IconSizeDefault;
1688 icontext = d->IconTextDefault; 1688 icontext = d->IconTextDefault;
1689 } 1689 }
1690 1690
1691 // revert back to the old group 1691 // revert back to the old group
1692 } // end block for KConfigGroupSaver 1692 } // end block for KConfigGroupSaver
1693 1693
1694 bool doUpdate = false; 1694 bool doUpdate = false;
1695 1695
1696 IconText icon_text; 1696 IconText icon_text;
1697 if ( icontext == "IconTextRight" ) 1697 if ( icontext == "IconTextRight" )
1698 icon_text = IconTextRight; 1698 icon_text = IconTextRight;
1699 else if ( icontext == "IconTextBottom" ) 1699 else if ( icontext == "IconTextBottom" )
1700 icon_text = IconTextBottom; 1700 icon_text = IconTextBottom;
1701 else if ( icontext == "TextOnly" ) 1701 else if ( icontext == "TextOnly" )
1702 icon_text = TextOnly; 1702 icon_text = TextOnly;
1703 else 1703 else
1704 icon_text = IconOnly; 1704 icon_text = IconOnly;
1705 1705
1706 // check if the icon/text has changed 1706 // check if the icon/text has changed
1707 if (icon_text != d->m_iconText) { 1707 if (icon_text != d->m_iconText) {
1708 //kdDebug(220) << "KToolBar::applyAppearanceSettings setIconText " << icon_text << endl; 1708 //kdDebug(220) << "KToolBar::applyAppearanceSettings setIconText " << icon_text << endl;
1709 setIconText(icon_text, false); 1709 setIconText(icon_text, false);
1710 doUpdate = true; 1710 doUpdate = true;
1711 } 1711 }
1712 1712
1713 // ...and check if the icon size has changed 1713 // ...and check if the icon size has changed
1714 if (iconsize != d->m_iconSize) { 1714 if (iconsize != d->m_iconSize) {
1715 setIconSize(iconsize, false); 1715 setIconSize(iconsize, false);
1716 doUpdate = true; 1716 doUpdate = true;
1717 } 1717 }
1718 1718
1719 QMainWindow *mw = mainWindow(); 1719 QMainWindow *mw = mainWindow();
1720 1720
1721 // ...and if we should highlight 1721 // ...and if we should highlight
1722 if ( highlight != d->m_highlight ) { 1722 if ( highlight != d->m_highlight ) {
1723 d->m_highlight = highlight; 1723 d->m_highlight = highlight;
1724 doUpdate = true; 1724 doUpdate = true;
1725 } 1725 }
1726 1726
1727 // ...and if we should move transparently 1727 // ...and if we should move transparently
1728 if ( mw && transparent != (!mw->opaqueMoving()) ) { 1728 if ( mw && transparent != (!mw->opaqueMoving()) ) {
1729 mw->setOpaqueMoving( !transparent ); 1729 mw->setOpaqueMoving( !transparent );
1730 } 1730 }
1731 1731
1732 if (doUpdate) 1732 if (doUpdate)
1733 emit modechange(); // tell buttons what happened 1733 emit modechange(); // tell buttons what happened
1734 if (isVisible ()) 1734 if (isVisible ())
1735 updateGeometry(); 1735 updateGeometry();
1736} 1736}
1737 1737
1738void KToolBar::applySettings(KConfig *config, const QString &_configGroup) 1738void KToolBar::applySettings(KConfig *config, const QString &_configGroup)
1739{ 1739{
1740 //kdDebug(220) << "KToolBar::applySettings group=" << _configGroup << endl; 1740 //kdDebug(220) << "KToolBar::applySettings group=" << _configGroup << endl;
1741 1741
1742 QString configGroup = _configGroup.isEmpty() ? settingsGroup() : _configGroup; 1742 QString configGroup = _configGroup.isEmpty() ? settingsGroup() : _configGroup;
1743 1743
1744 /* 1744 /*
1745 Let's explain this a bit more in details. 1745 Let's explain this a bit more in details.
1746 The order in which we apply settings is : 1746 The order in which we apply settings is :
1747 Global config / <appnamerc> user settings if no XMLGUI is used 1747 Global config / <appnamerc> user settings if no XMLGUI is used
1748 Global config / App-XML attributes / <appnamerc> user settings if XMLGUI is used 1748 Global config / App-XML attributes / <appnamerc> user settings if XMLGUI is used
1749 1749
1750 So in the first case, we simply read everything from KConfig as below, 1750 So in the first case, we simply read everything from KConfig as below,
1751 but in the second case we don't do anything here if there is no app-specific config, 1751 but in the second case we don't do anything here if there is no app-specific config,
1752 and the XMLGUI uses the static methods of this class to get the global defaults. 1752 and the XMLGUI uses the static methods of this class to get the global defaults.
1753 1753
1754 Global config doesn't include position (index, offset, newline and hidden/shown). 1754 Global config doesn't include position (index, offset, newline and hidden/shown).
1755 */ 1755 */
1756 1756
1757 // First the appearance stuff - the one which has a global config 1757 // First the appearance stuff - the one which has a global config
1758 applyAppearanceSettings( config, _configGroup ); 1758 applyAppearanceSettings( config, _configGroup );
1759 1759
1760 // ...and now the position stuff 1760 // ...and now the position stuff
1761 if ( config->hasGroup(configGroup) ) 1761 if ( config->hasGroup(configGroup) )
1762 { 1762 {
1763 KConfigGroupSaver cgs(config, configGroup); 1763 KConfigGroupSaver cgs(config, configGroup);
1764/*US 1764/*US
1765 static const QString &attrPosition = KGlobal::staticQString("Position"); 1765 static const QString &attrPosition = KGlobal::staticQString("Position");
1766 static const QString &attrIndex = KGlobal::staticQString("Index"); 1766 static const QString &attrIndex = KGlobal::staticQString("Index");
1767 static const QString &attrOffset = KGlobal::staticQString("Offset"); 1767 static const QString &attrOffset = KGlobal::staticQString("Offset");
1768 static const QString &attrNewLine = KGlobal::staticQString("NewLine"); 1768 static const QString &attrNewLine = KGlobal::staticQString("NewLine");
1769 static const QString &attrHidden = KGlobal::staticQString("Hidden"); 1769 static const QString &attrHidden = KGlobal::staticQString("Hidden");
1770 1770
1771 QString position = config->readEntry(attrPosition, d->PositionDefault); 1771 QString position = config->readEntry(attrPosition, d->PositionDefault);
1772 int index = config->readNumEntry(attrIndex, d->IndexDefault); 1772 int index = config->readNumEntry(attrIndex, d->IndexDefault);
1773 int offset = config->readNumEntry(attrOffset, d->OffsetDefault); 1773 int offset = config->readNumEntry(attrOffset, d->OffsetDefault);
1774 bool newLine = config->readBoolEntry(attrNewLine, d->NewLineDefault); 1774 bool newLine = config->readBoolEntry(attrNewLine, d->NewLineDefault);
1775 bool hidden = config->readBoolEntry(attrHidden, d->HiddenDefault); 1775 bool hidden = config->readBoolEntry(attrHidden, d->HiddenDefault);
1776*/ 1776*/
1777 1777
1778 QString position = config->readEntry("Position", d->PositionDefault); 1778 QString position = config->readEntry("Position", d->PositionDefault);
1779 int index = config->readNumEntry("Index", d->IndexDefault); 1779 int index = config->readNumEntry("Index", d->IndexDefault);
1780 int offset = config->readNumEntry("Offset", d->OffsetDefault); 1780 int offset = config->readNumEntry("Offset", d->OffsetDefault);
1781 bool newLine = config->readBoolEntry("NewLine", d->NewLineDefault); 1781 bool newLine = config->readBoolEntry("NewLine", d->NewLineDefault);
1782 bool hidden = config->readBoolEntry("Hidden", d->HiddenDefault); 1782 bool hidden = config->readBoolEntry("Hidden", d->HiddenDefault);
1783 1783
1784/*US Dock pos(DockTop); 1784/*US Dock pos(DockTop);
1785 if ( position == "Top" ) 1785 if ( position == "Top" )
1786 pos = DockTop; 1786 pos = DockTop;
1787 else if ( position == "Bottom" ) 1787 else if ( position == "Bottom" )
1788 pos = DockBottom; 1788 pos = DockBottom;
1789 else if ( position == "Left" ) 1789 else if ( position == "Left" )
1790 pos = DockLeft; 1790 pos = DockLeft;
1791 else if ( position == "Right" ) 1791 else if ( position == "Right" )
1792 pos = DockRight; 1792 pos = DockRight;
1793 else if ( position == "Floating" ) 1793 else if ( position == "Floating" )
1794 pos = DockTornOff; 1794 pos = DockTornOff;
1795 else if ( position == "Flat" ) 1795 else if ( position == "Flat" )
1796 pos = DockMinimized; 1796 pos = DockMinimized;
1797*/ 1797*/
1798 QMainWindow::ToolBarDock pos(QMainWindow::Top); 1798 QMainWindow::ToolBarDock pos(QMainWindow::Top);
1799 if ( position == "Top" ) 1799 if ( position == "Top" )
1800 pos = QMainWindow::Top; 1800 pos = QMainWindow::Top;
1801 else if ( position == "Bottom" ) 1801 else if ( position == "Bottom" )
1802 pos = QMainWindow::Bottom; 1802 pos = QMainWindow::Bottom;
1803 else if ( position == "Left" ) 1803 else if ( position == "Left" )
1804 pos = QMainWindow::Left; 1804 pos = QMainWindow::Left;
1805 else if ( position == "Right" ) 1805 else if ( position == "Right" )
1806 pos = QMainWindow::Right; 1806 pos = QMainWindow::Right;
1807 else if ( position == "Floating" ) 1807 else if ( position == "Floating" )
1808 pos = QMainWindow::TornOff; 1808 pos = QMainWindow::TornOff;
1809 else if ( position == "Flat" ) 1809 else if ( position == "Flat" )
1810 pos = QMainWindow::Minimized; 1810 pos = QMainWindow::Minimized;
1811 1811
1812 //kdDebug(220) << "KToolBar::applySettings hidden=" << hidden << endl; 1812 //kdDebug(220) << "KToolBar::applySettings hidden=" << hidden << endl;
1813 if (hidden) 1813 if (hidden)
1814 hide(); 1814 hide();
1815 else 1815 else
1816 show(); 1816 show();
1817 1817
1818 if ( mainWindow() ) 1818 if ( mainWindow() )
1819 { 1819 {
1820 QMainWindow *mw = mainWindow(); 1820 QMainWindow *mw = mainWindow();
1821 1821
1822 //kdDebug(220) << "KToolBar::applySettings updating ToolbarInfo" << endl; 1822 //kdDebug(220) << "KToolBar::applySettings updating ToolbarInfo" << endl;
1823 d->toolBarInfo = KToolBarPrivate::ToolBarInfo( pos, index, newLine, offset ); 1823 d->toolBarInfo = KToolBarPrivate::ToolBarInfo( pos, index, newLine, offset );
1824 1824
1825 // moveDockWindow calls QDockArea which does a reparent() on us with 1825 // moveDockWindow calls QDockArea which does a reparent() on us with
1826 // showIt = true, so we loose our visibility status 1826 // showIt = true, so we loose our visibility status
1827 bool doHide = isHidden(); 1827 bool doHide = isHidden();
1828 1828
1829//US mw->moveDockWindow( this, pos, newLine, index, offset ); 1829//US mw->moveDockWindow( this, pos, newLine, index, offset );
1830 mw->moveToolBar( this, pos, newLine, index, offset ); 1830 mw->moveToolBar( this, pos, newLine, index, offset );
1831 1831
1832 //kdDebug(220) << "KToolBar::applySettings " << name() << " moveDockWindow with pos=" << pos << " newLine=" << newLine << " idx=" << index << " offs=" << offset << endl; 1832 //kdDebug(220) << "KToolBar::applySettings " << name() << " moveDockWindow with pos=" << pos << " newLine=" << newLine << " idx=" << index << " offs=" << offset << endl;
1833 if ( doHide ) 1833 if ( doHide )
1834 hide(); 1834 hide();
1835 } 1835 }
1836 if (isVisible ()) 1836 if (isVisible ())
1837 updateGeometry(); 1837 updateGeometry();
1838 } 1838 }
1839} 1839}
1840 1840
1841bool KToolBar::event( QEvent *e ) 1841bool KToolBar::event( QEvent *e )
1842{ 1842{
1843 if ( (e->type() == QEvent::LayoutHint) && isUpdatesEnabled() ) 1843 if ( (e->type() == QEvent::LayoutHint) && isUpdatesEnabled() )
1844 d->repaintTimer.start( 100, true ); 1844 d->repaintTimer.start( 100, true );
1845 1845
1846 if (e->type() == QEvent::ChildInserted ) 1846 if (e->type() == QEvent::ChildInserted )
1847 { 1847 {
1848 // By pass QToolBar::event, 1848 // By pass QToolBar::event,
1849 // it will show() the inserted child and we don't want to 1849 // it will show() the inserted child and we don't want to
1850 // do that until we have rebuild the layout. 1850 // do that until we have rebuild the layout.
1851 childEvent((QChildEvent *)e); 1851 childEvent((QChildEvent *)e);
1852 return true; 1852 return true;
1853 } 1853 }
1854 1854
1855 return QToolBar::event( e ); 1855 return QToolBar::event( e );
1856} 1856}
1857 1857
1858void KToolBar::slotRepaint() 1858void KToolBar::slotRepaint()
1859{ 1859{
1860 setUpdatesEnabled( FALSE ); 1860 setUpdatesEnabled( FALSE );
1861 // Send a resizeEvent to update the "toolbar extension arrow" 1861 // Send a resizeEvent to update the "toolbar extension arrow"
1862 // (The button you get when your toolbar-items don't fit in 1862 // (The button you get when your toolbar-items don't fit in
1863 // the available space) 1863 // the available space)
1864 QResizeEvent ev(size(), size()); 1864 QResizeEvent ev(size(), size());
1865 resizeEvent(&ev); 1865 resizeEvent(&ev);
1866 //#ifdef DESKTOP_VERSION 1866 //#ifdef DESKTOP_VERSION
1867 QApplication::sendPostedEvents( this, QEvent::LayoutHint ); 1867 QApplication::sendPostedEvents( this, QEvent::LayoutHint );
1868 //#endif //DESKTOP_VERSION 1868 //#endif //DESKTOP_VERSION
1869 setUpdatesEnabled( TRUE ); 1869 setUpdatesEnabled( TRUE );
1870 repaint( TRUE ); 1870 repaint( TRUE );
1871} 1871}
1872 1872
1873void KToolBar::toolBarPosChanged( QToolBar *tb ) 1873void KToolBar::toolBarPosChanged( QToolBar *tb )
1874{ 1874{
1875 if ( tb != this ) 1875 if ( tb != this )
1876 return; 1876 return;
1877//US if ( d->oldPos == DockMinimized ) 1877//US if ( d->oldPos == DockMinimized )
1878 if ( d->oldPos == QMainWindow::Minimized ) 1878 if ( d->oldPos == QMainWindow::Minimized )
1879 rebuildLayout(); 1879 rebuildLayout();
1880 d->oldPos = (QMainWindow::ToolBarDock)barPos(); 1880 d->oldPos = (QMainWindow::ToolBarDock)barPos();
1881/*US 1881/*US
1882 if ( mainWindow() && mainWindow()->inherits( "KMainWindow" ) ) 1882 if ( mainWindow() && mainWindow()->inherits( "KMainWindow" ) )
1883 static_cast<KMainWindow *>(mainWindow())->setSettingsDirty(); 1883 static_cast<KMainWindow *>(mainWindow())->setSettingsDirty();
1884*/ 1884*/
1885} 1885}
1886 1886
1887/*US 1887/*US
1888void KToolBar::loadState( const QDomElement &element ) 1888void KToolBar::loadState( const QDomElement &element )
1889{ 1889{
1890 //kdDebug(220) << "KToolBar::loadState " << this << endl; 1890 //kdDebug(220) << "KToolBar::loadState " << this << endl;
1891 if ( !mainWindow() ) 1891 if ( !mainWindow() )
1892 return; 1892 return;
1893 1893
1894 { 1894 {
1895 QCString text = element.namedItem( "text" ).toElement().text().utf8(); 1895 QCString text = element.namedItem( "text" ).toElement().text().utf8();
1896 if ( text.isEmpty() ) 1896 if ( text.isEmpty() )
1897 text = element.namedItem( "Text" ).toElement().text().utf8(); 1897 text = element.namedItem( "Text" ).toElement().text().utf8();
1898 if ( !text.isEmpty() ) 1898 if ( !text.isEmpty() )
1899 setText( i18n( text ) ); 1899 setText( i18n( text ) );
1900 } 1900 }
1901 1901
1902 { 1902 {
1903 QCString attrFullWidth = element.attribute( "fullWidth" ).lower().latin1(); 1903 QCString attrFullWidth = element.attribute( "fullWidth" ).lower().latin1();
1904 if ( !attrFullWidth.isEmpty() ) 1904 if ( !attrFullWidth.isEmpty() )
1905 setFullSize( attrFullWidth == "true" ); 1905 setFullSize( attrFullWidth == "true" );
1906 } 1906 }
1907 1907
1908 Dock dock = DockTop; 1908 Dock dock = DockTop;
1909 { 1909 {
1910 QCString attrPosition = element.attribute( "position" ).lower().latin1(); 1910 QCString attrPosition = element.attribute( "position" ).lower().latin1();
1911 //kdDebug(220) << "KToolBar::loadState attrPosition=" << attrPosition << endl; 1911 //kdDebug(220) << "KToolBar::loadState attrPosition=" << attrPosition << endl;
1912 if ( !attrPosition.isEmpty() ) { 1912 if ( !attrPosition.isEmpty() ) {
1913 if ( attrPosition == "top" ) 1913 if ( attrPosition == "top" )
1914 dock = DockTop; 1914 dock = DockTop;
1915 else if ( attrPosition == "left" ) 1915 else if ( attrPosition == "left" )
1916 dock = DockLeft; 1916 dock = DockLeft;
1917 else if ( attrPosition == "right" ) 1917 else if ( attrPosition == "right" )
1918 dock = DockRight; 1918 dock = DockRight;
1919 else if ( attrPosition == "bottom" ) 1919 else if ( attrPosition == "bottom" )
1920 dock = DockBottom; 1920 dock = DockBottom;
1921 else if ( attrPosition == "floating" ) 1921 else if ( attrPosition == "floating" )
1922 dock = DockTornOff; 1922 dock = DockTornOff;
1923 else if ( attrPosition == "flat" ) 1923 else if ( attrPosition == "flat" )
1924 dock = DockMinimized; 1924 dock = DockMinimized;
1925 } 1925 }
1926 } 1926 }
1927 1927
1928 { 1928 {
1929 QCString attrIconText = element.attribute( "iconText" ).lower().latin1(); 1929 QCString attrIconText = element.attribute( "iconText" ).lower().latin1();
1930 if ( !attrIconText.isEmpty() ) { 1930 if ( !attrIconText.isEmpty() ) {
1931 //kdDebug(220) << "KToolBar::loadState attrIconText=" << attrIconText << endl; 1931 //kdDebug(220) << "KToolBar::loadState attrIconText=" << attrIconText << endl;
1932 if ( attrIconText == "icontextright" ) 1932 if ( attrIconText == "icontextright" )
1933 setIconText( KToolBar::IconTextRight ); 1933 setIconText( KToolBar::IconTextRight );
1934 else if ( attrIconText == "textonly" ) 1934 else if ( attrIconText == "textonly" )
1935 setIconText( KToolBar::TextOnly ); 1935 setIconText( KToolBar::TextOnly );
1936 else if ( attrIconText == "icontextbottom" ) 1936 else if ( attrIconText == "icontextbottom" )
1937 setIconText( KToolBar::IconTextBottom ); 1937 setIconText( KToolBar::IconTextBottom );
1938 else if ( attrIconText == "icononly" ) 1938 else if ( attrIconText == "icononly" )
1939 setIconText( KToolBar::IconOnly ); 1939 setIconText( KToolBar::IconOnly );
1940 } else 1940 } else
1941 // Use global setting 1941 // Use global setting
1942 setIconText( iconTextSetting() ); 1942 setIconText( iconTextSetting() );
1943 } 1943 }
1944 1944
1945 { 1945 {
1946 QString attrIconSize = element.attribute( "iconSize" ).lower(); 1946 QString attrIconSize = element.attribute( "iconSize" ).lower();
1947 if ( !attrIconSize.isEmpty() ) 1947 if ( !attrIconSize.isEmpty() )
1948 d->IconSizeDefault = attrIconSize.toInt(); 1948 d->IconSizeDefault = attrIconSize.toInt();
1949 setIconSize( d->IconSizeDefault ); 1949 setIconSize( d->IconSizeDefault );
1950 } 1950 }
1951 1951
1952 { 1952 {
1953 QString attrIndex = element.attribute( "index" ).lower(); 1953 QString attrIndex = element.attribute( "index" ).lower();
1954 if ( !attrIndex.isEmpty() ) 1954 if ( !attrIndex.isEmpty() )
1955 d->IndexDefault = attrIndex.toInt(); 1955 d->IndexDefault = attrIndex.toInt();
1956 } 1956 }
1957 1957
1958 { 1958 {
1959 QString attrOffset = element.attribute( "offset" ).lower(); 1959 QString attrOffset = element.attribute( "offset" ).lower();
1960 if ( !attrOffset.isEmpty() ) 1960 if ( !attrOffset.isEmpty() )
1961 d->OffsetDefault = attrOffset.toInt(); 1961 d->OffsetDefault = attrOffset.toInt();
1962 } 1962 }
1963 1963
1964 { 1964 {
1965 QString attrNewLine = element.attribute( "newline" ).lower(); 1965 QString attrNewLine = element.attribute( "newline" ).lower();
1966 if ( !attrNewLine.isEmpty() ) 1966 if ( !attrNewLine.isEmpty() )
1967 d->NewLineDefault = attrNewLine == "true"; 1967 d->NewLineDefault = attrNewLine == "true";
1968 } 1968 }
1969 1969
1970 { 1970 {
1971 QString attrHidden = element.attribute( "hidden" ).lower(); 1971 QString attrHidden = element.attribute( "hidden" ).lower();
1972 if ( !attrHidden.isEmpty() ) 1972 if ( !attrHidden.isEmpty() )
1973 d->HiddenDefault = attrHidden == "true"; 1973 d->HiddenDefault = attrHidden == "true";
1974 } 1974 }
1975 1975
1976 d->toolBarInfo = KToolBarPrivate::ToolBarInfo( dock, d->IndexDefault, d->NewLineDefault, d->OffsetDefault ); 1976 d->toolBarInfo = KToolBarPrivate::ToolBarInfo( dock, d->IndexDefault, d->NewLineDefault, d->OffsetDefault );
1977 mainWindow()->addDockWindow( this, dock, d->NewLineDefault ); 1977 mainWindow()->addDockWindow( this, dock, d->NewLineDefault );
1978//US mainWindow()->moveDockWindow( this, dock, d->NewLineDefault, d->IndexDefault, d->OffsetDefault ); 1978//US mainWindow()->moveDockWindow( this, dock, d->NewLineDefault, d->IndexDefault, d->OffsetDefault );
1979 mainWindow()->moveToolBar( this, dock, d->NewLineDefault, d->IndexDefault, d->OffsetDefault ); 1979 mainWindow()->moveToolBar( this, dock, d->NewLineDefault, d->IndexDefault, d->OffsetDefault );
1980 1980
1981 // Apply the highlight button setting 1981 // Apply the highlight button setting
1982 d->m_highlight = highlightSetting(); 1982 d->m_highlight = highlightSetting();
1983 1983
1984 // Apply transparent-toolbar-moving setting (ok, this is global to the mainwindow, 1984 // Apply transparent-toolbar-moving setting (ok, this is global to the mainwindow,
1985 // but we do it only if there are toolbars...) 1985 // but we do it only if there are toolbars...)
1986 if ( transparentSetting() != !mainWindow()->opaqueMoving() ) 1986 if ( transparentSetting() != !mainWindow()->opaqueMoving() )
1987 mainWindow()->setOpaqueMoving( !transparentSetting() ); 1987 mainWindow()->setOpaqueMoving( !transparentSetting() );
1988 1988
1989 if ( d->HiddenDefault ) 1989 if ( d->HiddenDefault )
1990 hide(); 1990 hide();
1991 else 1991 else
1992 show(); 1992 show();
1993 1993
1994 getAttributes( d->PositionDefault, d->IconTextDefault, d->IndexDefault ); 1994 getAttributes( d->PositionDefault, d->IconTextDefault, d->IndexDefault );
1995} 1995}
1996*/ 1996*/
1997 1997
1998void KToolBar::getAttributes( QString &position, QString &icontext, int &index ) 1998void KToolBar::getAttributes( QString &position, QString &icontext, int &index )
1999{ 1999{
2000 // get all of the stuff to save 2000 // get all of the stuff to save
2001 switch ( barPos() ) { 2001 switch ( barPos() ) {
2002 case KToolBar::Flat: 2002 case KToolBar::Flat:
2003 position = "Flat"; 2003 position = "Flat";
2004 break; 2004 break;
2005 case KToolBar::Bottom: 2005 case KToolBar::Bottom:
2006 position = "Bottom"; 2006 position = "Bottom";
2007 break; 2007 break;
2008 case KToolBar::Left: 2008 case KToolBar::Left:
2009 position = "Left"; 2009 position = "Left";
2010 break; 2010 break;
2011 case KToolBar::Right: 2011 case KToolBar::Right:
2012 position = "Right"; 2012 position = "Right";
2013 break; 2013 break;
2014 case KToolBar::Floating: 2014 case KToolBar::Floating:
2015 position = "Floating"; 2015 position = "Floating";
2016 break; 2016 break;
2017 case KToolBar::Top: 2017 case KToolBar::Top:
2018 default: 2018 default:
2019 position = "Top"; 2019 position = "Top";
2020 break; 2020 break;
2021 } 2021 }
2022 2022
2023 if ( mainWindow() ) { 2023 if ( mainWindow() ) {
2024 QMainWindow::ToolBarDock dock; 2024 QMainWindow::ToolBarDock dock;
2025 bool newLine; 2025 bool newLine;
2026 int offset; 2026 int offset;
2027 mainWindow()->getLocation( this, dock, index, newLine, offset ); 2027 mainWindow()->getLocation( this, dock, index, newLine, offset );
2028 } 2028 }
2029 2029
2030 switch (d->m_iconText) { 2030 switch (d->m_iconText) {
2031 case KToolBar::IconTextRight: 2031 case KToolBar::IconTextRight:
2032 icontext = "IconTextRight"; 2032 icontext = "IconTextRight";
2033 break; 2033 break;
2034 case KToolBar::IconTextBottom: 2034 case KToolBar::IconTextBottom:
2035 icontext = "IconTextBottom"; 2035 icontext = "IconTextBottom";
2036 break; 2036 break;
2037 case KToolBar::TextOnly: 2037 case KToolBar::TextOnly:
2038 icontext = "TextOnly"; 2038 icontext = "TextOnly";
2039 break; 2039 break;
2040 case KToolBar::IconOnly: 2040 case KToolBar::IconOnly:
2041 default: 2041 default:
2042 icontext = "IconOnly"; 2042 icontext = "IconOnly";
2043 break; 2043 break;
2044 } 2044 }
2045} 2045}
2046/*US 2046/*US
2047void KToolBar::saveState( QDomElement &current ) 2047void KToolBar::saveState( QDomElement &current )
2048{ 2048{
2049 QString position, icontext; 2049 QString position, icontext;
2050 int index = -1; 2050 int index = -1;
2051 getAttributes( position, icontext, index ); 2051 getAttributes( position, icontext, index );
2052 2052
2053 current.setAttribute( "noMerge", "1" ); 2053 current.setAttribute( "noMerge", "1" );
2054 current.setAttribute( "position", position ); 2054 current.setAttribute( "position", position );
2055 current.setAttribute( "iconText", icontext ); 2055 current.setAttribute( "iconText", icontext );
2056 current.setAttribute( "index", index ); 2056 current.setAttribute( "index", index );
2057 current.setAttribute( "offset", offset() ); 2057 current.setAttribute( "offset", offset() );
2058 current.setAttribute( "newline", newLine() ); 2058 current.setAttribute( "newline", newLine() );
2059 if ( isHidden() ) 2059 if ( isHidden() )
2060 current.setAttribute( "hidden", "true" ); 2060 current.setAttribute( "hidden", "true" );
2061 d->modified = true; 2061 d->modified = true;
2062} 2062}
2063*/ 2063*/
2064 2064
2065void KToolBar::positionYourself( bool force ) 2065void KToolBar::positionYourself( bool force )
2066{ 2066{
2067 if (force) 2067 if (force)
2068 d->positioned = false; 2068 d->positioned = false;
2069 2069
2070 if ( d->positioned || !mainWindow() ) 2070 if ( d->positioned || !mainWindow() )
2071 { 2071 {
2072 //kdDebug(220) << "KToolBar::positionYourself d->positioned=true ALREADY DONE" << endl; 2072 //kdDebug(220) << "KToolBar::positionYourself d->positioned=true ALREADY DONE" << endl;
2073 return; 2073 return;
2074 } 2074 }
2075 // we can't test for ForceHide after moveDockWindow because QDockArea 2075 // we can't test for ForceHide after moveDockWindow because QDockArea
2076 // does a reparent() with showIt == true 2076 // does a reparent() with showIt == true
2077 bool doHide = isHidden(); 2077 bool doHide = isHidden();
2078 //kdDebug(220) << "positionYourself " << name() << " dock=" << d->toolBarInfo.dock << " newLine=" << d->toolBarInfo.newline << " offset=" << d->toolBarInfo.offset << endl; 2078 //kdDebug(220) << "positionYourself " << name() << " dock=" << d->toolBarInfo.dock << " newLine=" << d->toolBarInfo.newline << " offset=" << d->toolBarInfo.offset << endl;
2079/*US mainWindow()->moveDockWindow( this, d->toolBarInfo.dock, 2079/*US mainWindow()->moveDockWindow( this, d->toolBarInfo.dock,
2080 d->toolBarInfo.newline, 2080 d->toolBarInfo.newline,
2081 d->toolBarInfo.index, 2081 d->toolBarInfo.index,
2082 d->toolBarInfo.offset ); 2082 d->toolBarInfo.offset );
2083*/ 2083*/
2084 mainWindow()->moveToolBar( this, d->toolBarInfo.dock, d->NewLineDefault, d->IndexDefault, d->OffsetDefault ); 2084 mainWindow()->moveToolBar( this, d->toolBarInfo.dock, d->NewLineDefault, d->IndexDefault, d->OffsetDefault );
2085 2085
2086 if ( doHide ) 2086 if ( doHide )
2087 hide(); 2087 hide();
2088 // This method can only have an effect once - unless force is set 2088 // This method can only have an effect once - unless force is set
2089 d->positioned = TRUE; 2089 d->positioned = TRUE;
2090} 2090}
2091 2091
2092//US KPopupMenu *KToolBar::contextMenu() 2092//US KPopupMenu *KToolBar::contextMenu()
2093QPopupMenu *KToolBar::contextMenu() 2093QPopupMenu *KToolBar::contextMenu()
2094{ 2094{
2095 if ( context ) 2095 if ( context )
2096 return context; 2096 return context;
2097 2097
2098 // Construct our context popup menu. Name it qt_dockwidget_internal so it 2098 // Construct our context popup menu. Name it qt_dockwidget_internal so it
2099 // won't be deleted by QToolBar::clear(). 2099 // won't be deleted by QToolBar::clear().
2100//US context = new KPopupMenu( this, "qt_dockwidget_internal" ); 2100//US context = new KPopupMenu( this, "qt_dockwidget_internal" );
2101 context = new QPopupMenu( this, "qt_dockwidget_internal" ); 2101 context = new QPopupMenu( this, "qt_dockwidget_internal" );
2102//US context->insertTitle(i18n("Toolbar Menu")); 2102//US context->insertTitle(i18n("Toolbar Menu"));
2103 2103
2104//US KPopupMenu *orient = new KPopupMenu( context, "orient" ); 2104//US KPopupMenu *orient = new KPopupMenu( context, "orient" );
2105 QPopupMenu *orient = new QPopupMenu( context, "orient" ); 2105 QPopupMenu *orient = new QPopupMenu( context, "orient" );
2106 orient->insertItem( i18n("toolbar position string","Top"), CONTEXT_TOP ); 2106 orient->insertItem( i18n("toolbar position string","Top"), CONTEXT_TOP );
2107 orient->insertItem( i18n("toolbar position string","Left"), CONTEXT_LEFT ); 2107 orient->insertItem( i18n("toolbar position string","Left"), CONTEXT_LEFT );
2108 orient->insertItem( i18n("toolbar position string","Right"), CONTEXT_RIGHT ); 2108 orient->insertItem( i18n("toolbar position string","Right"), CONTEXT_RIGHT );
2109 orient->insertItem( i18n("toolbar position string","Bottom"), CONTEXT_BOTTOM ); 2109 orient->insertItem( i18n("toolbar position string","Bottom"), CONTEXT_BOTTOM );
2110 orient->insertSeparator(-1); 2110 orient->insertSeparator(-1);
2111 //orient->insertItem( i18n("toolbar position string","Floating"), CONTEXT_FLOAT ); 2111 //orient->insertItem( i18n("toolbar position string","Floating"), CONTEXT_FLOAT );
2112 orient->insertItem( i18n("min toolbar", "Flat"), CONTEXT_FLAT ); 2112 orient->insertItem( i18n("min toolbar", "Flat"), CONTEXT_FLAT );
2113 2113
2114//US KPopupMenu *mode = new KPopupMenu( context, "mode" ); 2114//US KPopupMenu *mode = new KPopupMenu( context, "mode" );
2115 QPopupMenu *mode = new QPopupMenu( context, "mode" ); 2115 QPopupMenu *mode = new QPopupMenu( context, "mode" );
2116 mode->insertItem( i18n("Icons Only"), CONTEXT_ICONS ); 2116 mode->insertItem( i18n("Icons Only"), CONTEXT_ICONS );
2117 mode->insertItem( i18n("Text Only"), CONTEXT_TEXT ); 2117 mode->insertItem( i18n("Text Only"), CONTEXT_TEXT );
2118 mode->insertItem( i18n("Text Alongside Icons"), CONTEXT_TEXTRIGHT ); 2118 mode->insertItem( i18n("Text Alongside Icons"), CONTEXT_TEXTRIGHT );
2119 mode->insertItem( i18n("Text Under Icons"), CONTEXT_TEXTUNDER ); 2119 mode->insertItem( i18n("Text Under Icons"), CONTEXT_TEXTUNDER );
2120 2120
2121//US KPopupMenu *size = new KPopupMenu( context, "size" ); 2121//US KPopupMenu *size = new KPopupMenu( context, "size" );
2122 QPopupMenu *size = new QPopupMenu( context, "size" ); 2122 QPopupMenu *size = new QPopupMenu( context, "size" );
2123 size->insertItem( i18n("Default"), CONTEXT_ICONSIZES ); 2123 size->insertItem( i18n("Default"), CONTEXT_ICONSIZES );
2124 // Query the current theme for available sizes 2124 // Query the current theme for available sizes
2125 QValueList<int> avSizes; 2125 QValueList<int> avSizes;
2126/*US 2126/*US
2127 KIconTheme *theme = KGlobal::instance()->iconLoader()->theme(); 2127 KIconTheme *theme = KGlobal::instance()->iconLoader()->theme();
2128 if (!::qstrcmp(QObject::name(), "mainToolBar")) 2128 if (!::qstrcmp(QObject::name(), "mainToolBar"))
2129 avSizes = theme->querySizes( KIcon::MainToolbar); 2129 avSizes = theme->querySizes( KIcon::MainToolbar);
2130 else 2130 else
2131 avSizes = theme->querySizes( KIcon::Toolbar); 2131 avSizes = theme->querySizes( KIcon::Toolbar);
2132*/ 2132*/
2133 avSizes << 16; 2133 avSizes << 16;
2134 avSizes << 32; 2134 avSizes << 32;
2135 2135
2136 d->iconSizes = avSizes; 2136 d->iconSizes = avSizes;
2137 2137
2138 QValueList<int>::Iterator it; 2138 QValueList<int>::Iterator it;
2139 for (it=avSizes.begin(); it!=avSizes.end(); it++) { 2139 for (it=avSizes.begin(); it!=avSizes.end(); it++) {
2140 QString text; 2140 QString text;
2141 if ( *it < 19 ) 2141 if ( *it < 19 )
2142 text = i18n("Small (%1x%2)").arg(*it).arg(*it); 2142 text = i18n("Small (%1x%2)").arg(*it).arg(*it);
2143 else if (*it < 25) 2143 else if (*it < 25)
2144 text = i18n("Medium (%1x%2)").arg(*it).arg(*it); 2144 text = i18n("Medium (%1x%2)").arg(*it).arg(*it);
2145 else 2145 else
2146 text = i18n("Large (%1x%2)").arg(*it).arg(*it); 2146 text = i18n("Large (%1x%2)").arg(*it).arg(*it);
2147 //we use the size as an id, with an offset 2147 //we use the size as an id, with an offset
2148 size->insertItem( text, CONTEXT_ICONSIZES + *it ); 2148 size->insertItem( text, CONTEXT_ICONSIZES + *it );
2149 } 2149 }
2150 2150
2151 context->insertItem( i18n("Orientation"), orient ); 2151 context->insertItem( i18n("Orientation"), orient );
2152 orient->setItemChecked(CONTEXT_TOP, true); 2152 orient->setItemChecked(CONTEXT_TOP, true);
2153 context->insertItem( i18n("Text Position"), mode ); 2153 context->insertItem( i18n("Text Position"), mode );
2154 context->setItemChecked(CONTEXT_ICONS, true); 2154 context->setItemChecked(CONTEXT_ICONS, true);
2155 context->insertItem( i18n("Icon Size"), size ); 2155 context->insertItem( i18n("Icon Size"), size );
2156 2156
2157/*US 2157/*US
2158 if (mainWindow()->inherits("KMainWindow")) 2158 if (mainWindow()->inherits("KMainWindow"))
2159 { 2159 {
2160 if ( (static_cast<KMainWindow*>(mainWindow())->toolBarMenuAction()) && 2160 if ( (static_cast<KMainWindow*>(mainWindow())->toolBarMenuAction()) &&
2161 (static_cast<KMainWindow*>(mainWindow())->hasMenuBar()) ) 2161 (static_cast<KMainWindow*>(mainWindow())->hasMenuBar()) )
2162 2162
2163 (static_cast<KMainWindow*>(mainWindow()))->toolBarMenuAction()->plug(context); 2163 (static_cast<KMainWindow*>(mainWindow()))->toolBarMenuAction()->plug(context);
2164 } 2164 }
2165*/ 2165*/
2166 2166
2167 connect( context, SIGNAL( aboutToShow() ), this, SLOT( slotContextAboutToShow() ) ); 2167 connect( context, SIGNAL( aboutToShow() ), this, SLOT( slotContextAboutToShow() ) );
2168 return context; 2168 return context;
2169} 2169}
2170 2170
2171void KToolBar::slotContextAboutToShow() 2171void KToolBar::slotContextAboutToShow()
2172{ 2172{
2173 if (!d->m_configurePlugged) 2173 if (!d->m_configurePlugged)
2174 { 2174 {
2175 // try to find "configure toolbars" action 2175 // try to find "configure toolbars" action
2176 2176
2177 KXMLGUIClient *xmlGuiClient = d->m_xmlguiClient; 2177 KXMLGUIClient *xmlGuiClient = d->m_xmlguiClient;
2178 if ( !xmlGuiClient && mainWindow() && mainWindow()->inherits( "KMainWindow" ) ) 2178 if ( !xmlGuiClient && mainWindow() && mainWindow()->inherits( "KMainWindow" ) )
2179 xmlGuiClient = (KXMLGUIClient *)mainWindow(); 2179 xmlGuiClient = (KXMLGUIClient *)mainWindow();
2180 if ( xmlGuiClient ) 2180 if ( xmlGuiClient )
2181 { 2181 {
2182 KAction *configureAction = xmlGuiClient->actionCollection()->action(KStdAction::stdName(KStdAction::ConfigureToolbars)); 2182 KAction *configureAction = xmlGuiClient->actionCollection()->action(KStdAction::stdName(KStdAction::ConfigureToolbars));
2183 if ( configureAction ) 2183 if ( configureAction )
2184 { 2184 {
2185 configureAction->plug(context); 2185 configureAction->plug(context);
2186 d->m_configurePlugged = true; 2186 d->m_configurePlugged = true;
2187 } 2187 }
2188 } 2188 }
2189 } 2189 }
2190 2190
2191 for(int i = CONTEXT_ICONS; i <= CONTEXT_TEXTUNDER; ++i) 2191 for(int i = CONTEXT_ICONS; i <= CONTEXT_TEXTUNDER; ++i)
2192 context->setItemChecked(i, false); 2192 context->setItemChecked(i, false);