author | zautrix <zautrix> | 2005-01-17 15:26:56 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-17 15:26:56 (UTC) |
commit | 1525820e30e14de83a15533a3c67aa2756a544f4 (patch) (unidiff) | |
tree | cb8083c4675c874b5cac9355acc4d746077b6692 | |
parent | 214b82c86bd5365d7a5fc786c8c9c7231ec6dc77 (diff) | |
download | kdepimpi-1525820e30e14de83a15533a3c67aa2756a544f4.zip kdepimpi-1525820e30e14de83a15533a3c67aa2756a544f4.tar.gz kdepimpi-1525820e30e14de83a15533a3c67aa2756a544f4.tar.bz2 |
AB fixes
-rw-r--r-- | kaddressbook/kabcore.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/viewmanager.cpp | 9 | ||||
-rw-r--r-- | kaddressbook/viewmanager.h | 1 | ||||
-rw-r--r-- | microkde/kdeui/ktoolbar.cpp | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index a480baf..9526f23 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -24,930 +24,930 @@ | |||
24 | /*s | 24 | /*s |
25 | Enhanced Version of the file for platform independent KDE tools. | 25 | Enhanced Version of the file for platform independent KDE tools. |
26 | Copyright (c) 2004 Ulf Schenk | 26 | Copyright (c) 2004 Ulf Schenk |
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "kabcore.h" | 31 | #include "kabcore.h" |
32 | 32 | ||
33 | #include <stdaddressbook.h> | 33 | #include <stdaddressbook.h> |
34 | #include <klocale.h> | 34 | #include <klocale.h> |
35 | #include <kfiledialog.h> | 35 | #include <kfiledialog.h> |
36 | #include <qtimer.h> | 36 | #include <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 | 99 | ||
100 | 100 | ||
101 | //#include <qlabel.h> | 101 | //#include <qlabel.h> |
102 | 102 | ||
103 | 103 | ||
104 | #ifndef DESKTOP_VERSION | 104 | #ifndef DESKTOP_VERSION |
105 | #include <qpe/ir.h> | 105 | #include <qpe/ir.h> |
106 | #include <qpe/qpemenubar.h> | 106 | #include <qpe/qpemenubar.h> |
107 | #include <qtopia/qcopenvelope_qws.h> | 107 | #include <qtopia/qcopenvelope_qws.h> |
108 | #else | 108 | #else |
109 | 109 | ||
110 | #include <qmenubar.h> | 110 | #include <qmenubar.h> |
111 | #endif | 111 | #endif |
112 | 112 | ||
113 | #endif // KAB_EMBEDDED | 113 | #endif // KAB_EMBEDDED |
114 | #include "kcmconfigs/kcmkabconfig.h" | 114 | #include "kcmconfigs/kcmkabconfig.h" |
115 | #include "kcmconfigs/kcmkdepimconfig.h" | 115 | #include "kcmconfigs/kcmkdepimconfig.h" |
116 | #include "kpimglobalprefs.h" | 116 | #include "kpimglobalprefs.h" |
117 | #include "externalapphandler.h" | 117 | #include "externalapphandler.h" |
118 | #include "xxportselectdialog.h" | 118 | #include "xxportselectdialog.h" |
119 | 119 | ||
120 | 120 | ||
121 | #include <kresources/selectdialog.h> | 121 | #include <kresources/selectdialog.h> |
122 | #include <kmessagebox.h> | 122 | #include <kmessagebox.h> |
123 | 123 | ||
124 | #include <picture.h> | 124 | #include <picture.h> |
125 | #include <resource.h> | 125 | #include <resource.h> |
126 | 126 | ||
127 | //US#include <qsplitter.h> | 127 | //US#include <qsplitter.h> |
128 | #include <qmap.h> | 128 | #include <qmap.h> |
129 | #include <qdir.h> | 129 | #include <qdir.h> |
130 | #include <qfile.h> | 130 | #include <qfile.h> |
131 | #include <qvbox.h> | 131 | #include <qvbox.h> |
132 | #include <qlayout.h> | 132 | #include <qlayout.h> |
133 | #include <qclipboard.h> | 133 | #include <qclipboard.h> |
134 | #include <qtextstream.h> | 134 | #include <qtextstream.h> |
135 | #include <qradiobutton.h> | 135 | #include <qradiobutton.h> |
136 | #include <qbuttongroup.h> | 136 | #include <qbuttongroup.h> |
137 | 137 | ||
138 | #include <libkdepim/categoryselectdialog.h> | 138 | #include <libkdepim/categoryselectdialog.h> |
139 | #include <libkdepim/categoryeditdialog.h> | 139 | #include <libkdepim/categoryeditdialog.h> |
140 | #include <kabc/vcardconverter.h> | 140 | #include <kabc/vcardconverter.h> |
141 | 141 | ||
142 | 142 | ||
143 | #include "addresseeutil.h" | 143 | #include "addresseeutil.h" |
144 | #include "undocmds.h" | 144 | #include "undocmds.h" |
145 | #include "addresseeeditordialog.h" | 145 | #include "addresseeeditordialog.h" |
146 | #include "viewmanager.h" | 146 | #include "viewmanager.h" |
147 | #include "details/detailsviewcontainer.h" | 147 | #include "details/detailsviewcontainer.h" |
148 | #include "kabprefs.h" | 148 | #include "kabprefs.h" |
149 | #include "xxportmanager.h" | 149 | #include "xxportmanager.h" |
150 | #include "incsearchwidget.h" | 150 | #include "incsearchwidget.h" |
151 | #include "jumpbuttonbar.h" | 151 | #include "jumpbuttonbar.h" |
152 | #include "extensionmanager.h" | 152 | #include "extensionmanager.h" |
153 | #include "addresseeconfig.h" | 153 | #include "addresseeconfig.h" |
154 | #include "nameeditdialog.h" | 154 | #include "nameeditdialog.h" |
155 | #include <kcmultidialog.h> | 155 | #include <kcmultidialog.h> |
156 | 156 | ||
157 | #ifdef _WIN32_ | 157 | #ifdef _WIN32_ |
158 | 158 | ||
159 | #include "kaimportoldialog.h" | 159 | #include "kaimportoldialog.h" |
160 | #else | 160 | #else |
161 | #include <unistd.h> | 161 | #include <unistd.h> |
162 | #endif | 162 | #endif |
163 | // sync includes | 163 | // sync includes |
164 | #include <libkdepim/ksyncprofile.h> | 164 | #include <libkdepim/ksyncprofile.h> |
165 | #include <libkdepim/ksyncprefsdialog.h> | 165 | #include <libkdepim/ksyncprefsdialog.h> |
166 | 166 | ||
167 | 167 | ||
168 | class KABCatPrefs : public QDialog | 168 | class KABCatPrefs : public QDialog |
169 | { | 169 | { |
170 | public: | 170 | public: |
171 | KABCatPrefs( QWidget *parent=0, const char *name=0 ) : | 171 | KABCatPrefs( QWidget *parent=0, const char *name=0 ) : |
172 | QDialog( parent, name, true ) | 172 | QDialog( parent, name, true ) |
173 | { | 173 | { |
174 | setCaption( i18n("Manage new Categories") ); | 174 | setCaption( i18n("Manage new Categories") ); |
175 | QVBoxLayout* lay = new QVBoxLayout( this ); | 175 | QVBoxLayout* lay = new QVBoxLayout( this ); |
176 | lay->setSpacing( 3 ); | 176 | lay->setSpacing( 3 ); |
177 | lay->setMargin( 3 ); | 177 | lay->setMargin( 3 ); |
178 | 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 ); | 178 | 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 ); |
179 | lay->addWidget( lab ); | 179 | lay->addWidget( lab ); |
180 | QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this ); | 180 | QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this ); |
181 | lay->addWidget( format ); | 181 | lay->addWidget( format ); |
182 | format->setExclusive ( true ) ; | 182 | format->setExclusive ( true ) ; |
183 | addCatBut = new QRadioButton(i18n("Add to category list"), format ); | 183 | addCatBut = new QRadioButton(i18n("Add to category list"), format ); |
184 | new QRadioButton(i18n("Remove from addressees"), format ); | 184 | new QRadioButton(i18n("Remove from addressees"), format ); |
185 | addCatBut->setChecked( true ); | 185 | addCatBut->setChecked( true ); |
186 | QPushButton * ok = new QPushButton( i18n("OK"), this ); | 186 | QPushButton * ok = new QPushButton( i18n("OK"), this ); |
187 | lay->addWidget( ok ); | 187 | lay->addWidget( ok ); |
188 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); | 188 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); |
189 | lay->addWidget( cancel ); | 189 | lay->addWidget( cancel ); |
190 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); | 190 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); |
191 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); | 191 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); |
192 | resize( 200, 200 ); | 192 | resize( 200, 200 ); |
193 | } | 193 | } |
194 | 194 | ||
195 | bool addCat() { return addCatBut->isChecked(); } | 195 | bool addCat() { return addCatBut->isChecked(); } |
196 | private: | 196 | private: |
197 | QRadioButton* addCatBut; | 197 | QRadioButton* addCatBut; |
198 | }; | 198 | }; |
199 | 199 | ||
200 | class KABFormatPrefs : public QDialog | 200 | class KABFormatPrefs : public QDialog |
201 | { | 201 | { |
202 | public: | 202 | public: |
203 | KABFormatPrefs( QWidget *parent=0, const char *name=0 ) : | 203 | KABFormatPrefs( QWidget *parent=0, const char *name=0 ) : |
204 | QDialog( parent, name, true ) | 204 | QDialog( parent, name, true ) |
205 | { | 205 | { |
206 | setCaption( i18n("Set formatted name") ); | 206 | setCaption( i18n("Set formatted name") ); |
207 | QVBoxLayout* lay = new QVBoxLayout( this ); | 207 | QVBoxLayout* lay = new QVBoxLayout( this ); |
208 | lay->setSpacing( 3 ); | 208 | lay->setSpacing( 3 ); |
209 | lay->setMargin( 3 ); | 209 | lay->setMargin( 3 ); |
210 | QLabel * lab = new QLabel( i18n("You can set the formatted name\nfor a list of contacts in one go."), this ); | 210 | QLabel * lab = new QLabel( i18n("You can set the formatted name\nfor a list of contacts in one go."), this ); |
211 | lay->addWidget( lab ); | 211 | lay->addWidget( lab ); |
212 | QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("Set formatted name to:"), this ); | 212 | QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("Set formatted name to:"), this ); |
213 | lay->addWidget( format ); | 213 | lay->addWidget( format ); |
214 | format->setExclusive ( true ) ; | 214 | format->setExclusive ( true ) ; |
215 | simple = new QRadioButton(i18n("Simple: James Bond"), format ); | 215 | simple = new QRadioButton(i18n("Simple: James Bond"), format ); |
216 | full = new QRadioButton(i18n("Full: Mr. James 007 Bond I"), format ); | 216 | full = new QRadioButton(i18n("Full: Mr. James 007 Bond I"), format ); |
217 | reverse = new QRadioButton(i18n("Reverse: Bond, James"), format ); | 217 | reverse = new QRadioButton(i18n("Reverse: Bond, James"), format ); |
218 | company = new QRadioButton(i18n("Organization: MI6"), format ); | 218 | company = new QRadioButton(i18n("Organization: MI6"), format ); |
219 | simple->setChecked( true ); | 219 | simple->setChecked( true ); |
220 | setCompany = new QCheckBox(i18n("Set formatted name to\norganization, if name empty"), this); | 220 | setCompany = new QCheckBox(i18n("Set formatted name to\norganization, if name empty"), this); |
221 | lay->addWidget( setCompany ); | 221 | lay->addWidget( setCompany ); |
222 | QPushButton * ok = new QPushButton( i18n("Select contact list"), this ); | 222 | QPushButton * ok = new QPushButton( i18n("Select contact list"), this ); |
223 | lay->addWidget( ok ); | 223 | lay->addWidget( ok ); |
224 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); | 224 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); |
225 | lay->addWidget( cancel ); | 225 | lay->addWidget( cancel ); |
226 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); | 226 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); |
227 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); | 227 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); |
228 | resize( 200, 200 ); | 228 | resize( 200, 200 ); |
229 | } | 229 | } |
230 | public: | 230 | public: |
231 | QRadioButton* simple, *full, *reverse, *company; | 231 | QRadioButton* simple, *full, *reverse, *company; |
232 | QCheckBox* setCompany; | 232 | QCheckBox* setCompany; |
233 | }; | 233 | }; |
234 | 234 | ||
235 | 235 | ||
236 | 236 | ||
237 | class KAex2phonePrefs : public QDialog | 237 | class KAex2phonePrefs : public QDialog |
238 | { | 238 | { |
239 | public: | 239 | public: |
240 | KAex2phonePrefs( QWidget *parent=0, const char *name=0 ) : | 240 | KAex2phonePrefs( QWidget *parent=0, const char *name=0 ) : |
241 | QDialog( parent, name, true ) | 241 | QDialog( parent, name, true ) |
242 | { | 242 | { |
243 | setCaption( i18n("Export to phone options") ); | 243 | setCaption( i18n("Export to phone options") ); |
244 | QVBoxLayout* lay = new QVBoxLayout( this ); | 244 | QVBoxLayout* lay = new QVBoxLayout( this ); |
245 | lay->setSpacing( 3 ); | 245 | lay->setSpacing( 3 ); |
246 | lay->setMargin( 3 ); | 246 | lay->setMargin( 3 ); |
247 | QLabel *lab; | 247 | QLabel *lab; |
248 | lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) ); | 248 | lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) ); |
249 | lab->setAlignment (AlignHCenter ); | 249 | lab->setAlignment (AlignHCenter ); |
250 | QHBox* temphb; | 250 | QHBox* temphb; |
251 | temphb = new QHBox( this ); | 251 | temphb = new QHBox( this ); |
252 | new QLabel( i18n("I/O device: "), temphb ); | 252 | new QLabel( i18n("I/O device: "), temphb ); |
253 | mPhoneDevice = new QLineEdit( temphb); | 253 | mPhoneDevice = new QLineEdit( temphb); |
254 | lay->addWidget( temphb ); | 254 | lay->addWidget( temphb ); |
255 | temphb = new QHBox( this ); | 255 | temphb = new QHBox( this ); |
256 | new QLabel( i18n("Connection: "), temphb ); | 256 | new QLabel( i18n("Connection: "), temphb ); |
257 | mPhoneConnection = new QLineEdit( temphb); | 257 | mPhoneConnection = new QLineEdit( temphb); |
258 | lay->addWidget( temphb ); | 258 | lay->addWidget( temphb ); |
259 | temphb = new QHBox( this ); | 259 | temphb = new QHBox( this ); |
260 | new QLabel( i18n("Model(opt.): "), temphb ); | 260 | new QLabel( i18n("Model(opt.): "), temphb ); |
261 | mPhoneModel = new QLineEdit( temphb); | 261 | mPhoneModel = new QLineEdit( temphb); |
262 | lay->addWidget( temphb ); | 262 | lay->addWidget( temphb ); |
263 | // mWriteToSim = new QCheckBox( i18n("Write Contacts to SIM card\n(if not, write to phone memory)"), this ); | 263 | // mWriteToSim = new QCheckBox( i18n("Write Contacts to SIM card\n(if not, write to phone memory)"), this ); |
264 | // lay->addWidget( mWriteToSim ); | 264 | // lay->addWidget( mWriteToSim ); |
265 | lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ncontact data on phone!"), this ) ); | 265 | lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ncontact data on phone!"), this ) ); |
266 | lab->setAlignment (AlignHCenter); | 266 | lab->setAlignment (AlignHCenter); |
267 | QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this ); | 267 | QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this ); |
268 | lay->addWidget( ok ); | 268 | lay->addWidget( ok ); |
269 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); | 269 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); |
270 | lay->addWidget( cancel ); | 270 | lay->addWidget( cancel ); |
271 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); | 271 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); |
272 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); | 272 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); |
273 | resize( 220, 240 ); | 273 | resize( 220, 240 ); |
274 | 274 | ||
275 | } | 275 | } |
276 | 276 | ||
277 | public: | 277 | public: |
278 | QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; | 278 | QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; |
279 | QCheckBox* mWriteToSim; | 279 | QCheckBox* mWriteToSim; |
280 | }; | 280 | }; |
281 | 281 | ||
282 | 282 | ||
283 | bool pasteWithNewUid = true; | 283 | bool pasteWithNewUid = true; |
284 | 284 | ||
285 | #ifdef KAB_EMBEDDED | 285 | #ifdef KAB_EMBEDDED |
286 | KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name ) | 286 | KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name ) |
287 | : QWidget( parent, name ), KSyncInterface(), mGUIClient( client ), mViewManager( 0 ), | 287 | : QWidget( parent, name ), KSyncInterface(), mGUIClient( client ), mViewManager( 0 ), |
288 | mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US mLdapSearchDialog( 0 ),*/ | 288 | mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US mLdapSearchDialog( 0 ),*/ |
289 | mReadWrite( readWrite ), mModified( false ), mMainWindow(client) | 289 | mReadWrite( readWrite ), mModified( false ), mMainWindow(client) |
290 | #else //KAB_EMBEDDED | 290 | #else //KAB_EMBEDDED |
291 | KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name ) | 291 | KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name ) |
292 | : QWidget( parent, name ), KSyncInterface(), mGUIClient( client ), mViewManager( 0 ), | 292 | : QWidget( parent, name ), KSyncInterface(), mGUIClient( client ), mViewManager( 0 ), |
293 | mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ), | 293 | mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ), |
294 | mReadWrite( readWrite ), mModified( false ) | 294 | mReadWrite( readWrite ), mModified( false ) |
295 | #endif //KAB_EMBEDDED | 295 | #endif //KAB_EMBEDDED |
296 | { | 296 | { |
297 | // syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu); | 297 | // syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu); |
298 | // syncManager->setBlockSave(false); | 298 | // syncManager->setBlockSave(false); |
299 | mMiniSplitter = 0; | 299 | mMiniSplitter = 0; |
300 | mExtensionBarSplitter = 0; | 300 | mExtensionBarSplitter = 0; |
301 | mIsPart = !parent->inherits( "KAddressBookMain" ); | 301 | mIsPart = !parent->inherits( "KAddressBookMain" ); |
302 | mAddressBook = KABC::StdAddressBook::self(); | 302 | mAddressBook = KABC::StdAddressBook::self(); |
303 | KABC::StdAddressBook::setAutomaticSave( false ); | 303 | KABC::StdAddressBook::setAutomaticSave( false ); |
304 | 304 | ||
305 | #ifndef KAB_EMBEDDED | 305 | #ifndef KAB_EMBEDDED |
306 | mAddressBook->setErrorHandler( new KABC::GUIErrorHandler ); | 306 | mAddressBook->setErrorHandler( new KABC::GUIErrorHandler ); |
307 | #endif //KAB_EMBEDDED | 307 | #endif //KAB_EMBEDDED |
308 | 308 | ||
309 | connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook * ) ), | 309 | connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook * ) ), |
310 | SLOT( addressBookChanged() ) ); | 310 | SLOT( addressBookChanged() ) ); |
311 | 311 | ||
312 | #if 0 | 312 | #if 0 |
313 | // LP moved to addressbook init method | 313 | // LP moved to addressbook init method |
314 | mAddressBook->addCustomField( i18n( "Department" ), KABC::Field::Organization, | 314 | mAddressBook->addCustomField( i18n( "Department" ), KABC::Field::Organization, |
315 | "X-Department", "KADDRESSBOOK" ); | 315 | "X-Department", "KADDRESSBOOK" ); |
316 | mAddressBook->addCustomField( i18n( "Profession" ), KABC::Field::Organization, | 316 | mAddressBook->addCustomField( i18n( "Profession" ), KABC::Field::Organization, |
317 | "X-Profession", "KADDRESSBOOK" ); | 317 | "X-Profession", "KADDRESSBOOK" ); |
318 | mAddressBook->addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization, | 318 | mAddressBook->addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization, |
319 | "X-AssistantsName", "KADDRESSBOOK" ); | 319 | "X-AssistantsName", "KADDRESSBOOK" ); |
320 | mAddressBook->addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization, | 320 | mAddressBook->addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization, |
321 | "X-ManagersName", "KADDRESSBOOK" ); | 321 | "X-ManagersName", "KADDRESSBOOK" ); |
322 | mAddressBook->addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal, | 322 | mAddressBook->addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal, |
323 | "X-SpousesName", "KADDRESSBOOK" ); | 323 | "X-SpousesName", "KADDRESSBOOK" ); |
324 | mAddressBook->addCustomField( i18n( "Office" ), KABC::Field::Personal, | 324 | mAddressBook->addCustomField( i18n( "Office" ), KABC::Field::Personal, |
325 | "X-Office", "KADDRESSBOOK" ); | 325 | "X-Office", "KADDRESSBOOK" ); |
326 | mAddressBook->addCustomField( i18n( "IM Address" ), KABC::Field::Personal, | 326 | mAddressBook->addCustomField( i18n( "IM Address" ), KABC::Field::Personal, |
327 | "X-IMAddress", "KADDRESSBOOK" ); | 327 | "X-IMAddress", "KADDRESSBOOK" ); |
328 | mAddressBook->addCustomField( i18n( "Anniversary" ), KABC::Field::Personal, | 328 | mAddressBook->addCustomField( i18n( "Anniversary" ), KABC::Field::Personal, |
329 | "X-Anniversary", "KADDRESSBOOK" ); | 329 | "X-Anniversary", "KADDRESSBOOK" ); |
330 | 330 | ||
331 | //US added this field to become compatible with Opie/qtopia addressbook | 331 | //US added this field to become compatible with Opie/qtopia addressbook |
332 | // values can be "female" or "male" or "". An empty field represents undefined. | 332 | // values can be "female" or "male" or "". An empty field represents undefined. |
333 | mAddressBook->addCustomField( i18n( "Gender" ), KABC::Field::Personal, | 333 | mAddressBook->addCustomField( i18n( "Gender" ), KABC::Field::Personal, |
334 | "X-Gender", "KADDRESSBOOK" ); | 334 | "X-Gender", "KADDRESSBOOK" ); |
335 | mAddressBook->addCustomField( i18n( "Children" ), KABC::Field::Personal, | 335 | mAddressBook->addCustomField( i18n( "Children" ), KABC::Field::Personal, |
336 | "X-Children", "KADDRESSBOOK" ); | 336 | "X-Children", "KADDRESSBOOK" ); |
337 | mAddressBook->addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal, | 337 | mAddressBook->addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal, |
338 | "X-FreeBusyUrl", "KADDRESSBOOK" ); | 338 | "X-FreeBusyUrl", "KADDRESSBOOK" ); |
339 | #endif | 339 | #endif |
340 | initGUI(); | 340 | initGUI(); |
341 | 341 | ||
342 | mIncSearchWidget->setFocus(); | 342 | mIncSearchWidget->setFocus(); |
343 | 343 | ||
344 | 344 | ||
345 | connect( mViewManager, SIGNAL( selected( const QString& ) ), | 345 | connect( mViewManager, SIGNAL( selected( const QString& ) ), |
346 | SLOT( setContactSelected( const QString& ) ) ); | 346 | SLOT( setContactSelected( const QString& ) ) ); |
347 | connect( mViewManager, SIGNAL( executed( const QString& ) ), | 347 | connect( mViewManager, SIGNAL( executed( const QString& ) ), |
348 | SLOT( executeContact( const QString& ) ) ); | 348 | SLOT( executeContact( const QString& ) ) ); |
349 | 349 | ||
350 | connect( mViewManager, SIGNAL( deleteRequest( ) ), | 350 | connect( mViewManager, SIGNAL( deleteRequest( ) ), |
351 | SLOT( deleteContacts( ) ) ); | 351 | SLOT( deleteContacts( ) ) ); |
352 | connect( mViewManager, SIGNAL( modified() ), | 352 | connect( mViewManager, SIGNAL( modified() ), |
353 | SLOT( setModified() ) ); | 353 | SLOT( setModified() ) ); |
354 | 354 | ||
355 | connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) ); | 355 | connect( mExtensionManager, SIGNAL( modified( const KABC::Addressee::List& ) ), this, SLOT( extensionModified( const KABC::Addressee::List& ) ) ); |
356 | connect( mExtensionManager, SIGNAL( changedActiveExtension( int ) ), this, SLOT( extensionChanged( int ) ) ); | 356 | connect( mExtensionManager, SIGNAL( changedActiveExtension( int ) ), this, SLOT( extensionChanged( int ) ) ); |
357 | 357 | ||
358 | connect( mXXPortManager, SIGNAL( modified() ), | 358 | connect( mXXPortManager, SIGNAL( modified() ), |
359 | SLOT( setModified() ) ); | 359 | SLOT( setModified() ) ); |
360 | 360 | ||
361 | connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ), | 361 | connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ), |
362 | SLOT( incrementalSearch( const QString& ) ) ); | 362 | SLOT( incrementalSearch( const QString& ) ) ); |
363 | connect( mIncSearchWidget, SIGNAL( fieldChanged() ), | 363 | connect( mIncSearchWidget, SIGNAL( fieldChanged() ), |
364 | mJumpButtonBar, SLOT( recreateButtons() ) ); | 364 | mJumpButtonBar, SLOT( recreateButtons() ) ); |
365 | 365 | ||
366 | connect( mDetails, SIGNAL( sendEmail( const QString& ) ), | 366 | connect( mDetails, SIGNAL( sendEmail( const QString& ) ), |
367 | SLOT( sendMail( const QString& ) ) ); | 367 | SLOT( sendMail( const QString& ) ) ); |
368 | 368 | ||
369 | 369 | ||
370 | connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&))); | 370 | connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&))); |
371 | 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&))); | 371 | 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&))); |
372 | connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&))); | 372 | connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&))); |
373 | connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle())); | 373 | connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle())); |
374 | 374 | ||
375 | 375 | ||
376 | #ifndef KAB_EMBEDDED | 376 | #ifndef KAB_EMBEDDED |
377 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), | 377 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), |
378 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); | 378 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); |
379 | 379 | ||
380 | connect( mDetails, SIGNAL( browse( const QString& ) ), | 380 | connect( mDetails, SIGNAL( browse( const QString& ) ), |
381 | SLOT( browse( const QString& ) ) ); | 381 | SLOT( browse( const QString& ) ) ); |
382 | 382 | ||
383 | 383 | ||
384 | mAddressBookService = new KAddressBookService( this ); | 384 | mAddressBookService = new KAddressBookService( this ); |
385 | 385 | ||
386 | #endif //KAB_EMBEDDED | 386 | #endif //KAB_EMBEDDED |
387 | 387 | ||
388 | mMessageTimer = new QTimer( this ); | 388 | mMessageTimer = new QTimer( this ); |
389 | connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) ); | 389 | connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) ); |
390 | mEditorDialog = 0; | 390 | mEditorDialog = 0; |
391 | createAddresseeEditorDialog( this ); | 391 | createAddresseeEditorDialog( this ); |
392 | setModified( false ); | 392 | setModified( false ); |
393 | mBRdisabled = false; | 393 | mBRdisabled = false; |
394 | #ifndef DESKTOP_VERSION | 394 | #ifndef DESKTOP_VERSION |
395 | infrared = 0; | 395 | infrared = 0; |
396 | #endif | 396 | #endif |
397 | //toggleBeamReceive( ); | 397 | //toggleBeamReceive( ); |
398 | //mMainWindow->toolBar()->show(); | 398 | //mMainWindow->toolBar()->show(); |
399 | // we have a toolbar repainting error on the Zaurus when starting KA/Pi | 399 | // we have a toolbar repainting error on the Zaurus when starting KA/Pi |
400 | QTimer::singleShot( 10, this , SLOT ( updateToolBar())); | 400 | QTimer::singleShot( 10, this , SLOT ( updateToolBar())); |
401 | } | 401 | } |
402 | 402 | ||
403 | void KABCore::updateToolBar() | 403 | void KABCore::updateToolBar() |
404 | { | 404 | { |
405 | static int iii = 0; | 405 | static int iii = 0; |
406 | ++iii; | 406 | ++iii; |
407 | mMainWindow->toolBar()->repaintMe(); | 407 | mMainWindow->toolBar()->repaintMe(); |
408 | if ( iii < 5 ) | 408 | if ( iii < 3 ) |
409 | QTimer::singleShot( 10, this , SLOT ( updateToolBar())); | 409 | QTimer::singleShot( 10, this , SLOT ( updateToolBar())); |
410 | } | 410 | } |
411 | KABCore::~KABCore() | 411 | KABCore::~KABCore() |
412 | { | 412 | { |
413 | // save(); | 413 | // save(); |
414 | //saveSettings(); | 414 | //saveSettings(); |
415 | //KABPrefs::instance()->writeConfig(); | 415 | //KABPrefs::instance()->writeConfig(); |
416 | delete AddresseeConfig::instance(); | 416 | delete AddresseeConfig::instance(); |
417 | mAddressBook = 0; | 417 | mAddressBook = 0; |
418 | KABC::StdAddressBook::close(); | 418 | KABC::StdAddressBook::close(); |
419 | 419 | ||
420 | delete syncManager; | 420 | delete syncManager; |
421 | #ifndef DESKTOP_VERSION | 421 | #ifndef DESKTOP_VERSION |
422 | if ( infrared ) | 422 | if ( infrared ) |
423 | delete infrared; | 423 | delete infrared; |
424 | #endif | 424 | #endif |
425 | } | 425 | } |
426 | void KABCore::receive( const QCString& cmsg, const QByteArray& data ) | 426 | void KABCore::receive( const QCString& cmsg, const QByteArray& data ) |
427 | { | 427 | { |
428 | qDebug("KA: QCOP message received: %s ", cmsg.data() ); | 428 | qDebug("KA: QCOP message received: %s ", cmsg.data() ); |
429 | if ( cmsg == "setDocument(QString)" ) { | 429 | if ( cmsg == "setDocument(QString)" ) { |
430 | QDataStream stream( data, IO_ReadOnly ); | 430 | QDataStream stream( data, IO_ReadOnly ); |
431 | QString fileName; | 431 | QString fileName; |
432 | stream >> fileName; | 432 | stream >> fileName; |
433 | recieve( fileName ); | 433 | recieve( fileName ); |
434 | return; | 434 | return; |
435 | } | 435 | } |
436 | } | 436 | } |
437 | void KABCore::toggleBeamReceive( ) | 437 | void KABCore::toggleBeamReceive( ) |
438 | { | 438 | { |
439 | if ( mBRdisabled ) | 439 | if ( mBRdisabled ) |
440 | return; | 440 | return; |
441 | #ifndef DESKTOP_VERSION | 441 | #ifndef DESKTOP_VERSION |
442 | if ( infrared ) { | 442 | if ( infrared ) { |
443 | qDebug("AB disable BeamReceive "); | 443 | qDebug("AB disable BeamReceive "); |
444 | delete infrared; | 444 | delete infrared; |
445 | infrared = 0; | 445 | infrared = 0; |
446 | mActionBR->setChecked(false); | 446 | mActionBR->setChecked(false); |
447 | return; | 447 | return; |
448 | } | 448 | } |
449 | qDebug("AB enable BeamReceive "); | 449 | qDebug("AB enable BeamReceive "); |
450 | mActionBR->setChecked(true); | 450 | mActionBR->setChecked(true); |
451 | 451 | ||
452 | infrared = new QCopChannel("QPE/Application/addressbook",this, "channelAB" ) ; | 452 | infrared = new QCopChannel("QPE/Application/addressbook",this, "channelAB" ) ; |
453 | QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(receive( const QCString&, const QByteArray& ))); | 453 | QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(receive( const QCString&, const QByteArray& ))); |
454 | #endif | 454 | #endif |
455 | } | 455 | } |
456 | 456 | ||
457 | 457 | ||
458 | void KABCore::disableBR(bool b) | 458 | void KABCore::disableBR(bool b) |
459 | { | 459 | { |
460 | #ifndef DESKTOP_VERSION | 460 | #ifndef DESKTOP_VERSION |
461 | if ( b ) { | 461 | if ( b ) { |
462 | if ( infrared ) { | 462 | if ( infrared ) { |
463 | toggleBeamReceive( ); | 463 | toggleBeamReceive( ); |
464 | } | 464 | } |
465 | mBRdisabled = true; | 465 | mBRdisabled = true; |
466 | } else { | 466 | } else { |
467 | if ( mBRdisabled ) { | 467 | if ( mBRdisabled ) { |
468 | mBRdisabled = false; | 468 | mBRdisabled = false; |
469 | //toggleBeamReceive( ); | 469 | //toggleBeamReceive( ); |
470 | } | 470 | } |
471 | } | 471 | } |
472 | #endif | 472 | #endif |
473 | 473 | ||
474 | } | 474 | } |
475 | void KABCore::recieve( QString fn ) | 475 | void KABCore::recieve( QString fn ) |
476 | { | 476 | { |
477 | //qDebug("KABCore::recieve "); | 477 | //qDebug("KABCore::recieve "); |
478 | int count = mAddressBook->importFromFile( fn, true ); | 478 | int count = mAddressBook->importFromFile( fn, true ); |
479 | if ( count ) | 479 | if ( count ) |
480 | setModified( true ); | 480 | setModified( true ); |
481 | mViewManager->refreshView(); | 481 | mViewManager->refreshView(); |
482 | message(i18n("%1 contact(s) received!").arg( count )); | 482 | message(i18n("%1 contact(s) received!").arg( count )); |
483 | topLevelWidget()->showMaximized(); | 483 | topLevelWidget()->showMaximized(); |
484 | topLevelWidget()->raise(); | 484 | topLevelWidget()->raise(); |
485 | } | 485 | } |
486 | void KABCore::restoreSettings() | 486 | void KABCore::restoreSettings() |
487 | { | 487 | { |
488 | mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce; | 488 | mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce; |
489 | 489 | ||
490 | bool state; | 490 | bool state; |
491 | 491 | ||
492 | if (mMultipleViewsAtOnce) | 492 | if (mMultipleViewsAtOnce) |
493 | state = KABPrefs::instance()->mDetailsPageVisible; | 493 | state = KABPrefs::instance()->mDetailsPageVisible; |
494 | else | 494 | else |
495 | state = false; | 495 | state = false; |
496 | 496 | ||
497 | mActionDetails->setChecked( state ); | 497 | mActionDetails->setChecked( state ); |
498 | setDetailsVisible( state ); | 498 | setDetailsVisible( state ); |
499 | 499 | ||
500 | state = KABPrefs::instance()->mJumpButtonBarVisible; | 500 | state = KABPrefs::instance()->mJumpButtonBarVisible; |
501 | 501 | ||
502 | mActionJumpBar->setChecked( state ); | 502 | mActionJumpBar->setChecked( state ); |
503 | setJumpButtonBarVisible( state ); | 503 | setJumpButtonBarVisible( state ); |
504 | /*US | 504 | /*US |
505 | QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter; | 505 | QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter; |
506 | if ( splitterSize.count() == 0 ) { | 506 | if ( splitterSize.count() == 0 ) { |
507 | splitterSize.append( width() / 2 ); | 507 | splitterSize.append( width() / 2 ); |
508 | splitterSize.append( width() / 2 ); | 508 | splitterSize.append( width() / 2 ); |
509 | } | 509 | } |
510 | mMiniSplitter->setSizes( splitterSize ); | 510 | mMiniSplitter->setSizes( splitterSize ); |
511 | if ( mExtensionBarSplitter ) { | 511 | if ( mExtensionBarSplitter ) { |
512 | splitterSize = KABPrefs::instance()->mExtensionsSplitter; | 512 | splitterSize = KABPrefs::instance()->mExtensionsSplitter; |
513 | if ( splitterSize.count() == 0 ) { | 513 | if ( splitterSize.count() == 0 ) { |
514 | splitterSize.append( width() / 2 ); | 514 | splitterSize.append( width() / 2 ); |
515 | splitterSize.append( width() / 2 ); | 515 | splitterSize.append( width() / 2 ); |
516 | } | 516 | } |
517 | mExtensionBarSplitter->setSizes( splitterSize ); | 517 | mExtensionBarSplitter->setSizes( splitterSize ); |
518 | 518 | ||
519 | } | 519 | } |
520 | */ | 520 | */ |
521 | mViewManager->restoreSettings(); | 521 | mViewManager->restoreSettings(); |
522 | mIncSearchWidget->setCurrentItem( KABPrefs::instance()->mCurrentIncSearchField ); | 522 | mIncSearchWidget->setCurrentItem( KABPrefs::instance()->mCurrentIncSearchField ); |
523 | mExtensionManager->restoreSettings(); | 523 | mExtensionManager->restoreSettings(); |
524 | #ifdef DESKTOP_VERSION | 524 | #ifdef DESKTOP_VERSION |
525 | int wid = width(); | 525 | int wid = width(); |
526 | if ( wid < 10 ) | 526 | if ( wid < 10 ) |
527 | wid = 400; | 527 | wid = 400; |
528 | #else | 528 | #else |
529 | int wid = QApplication::desktop()->width(); | 529 | int wid = QApplication::desktop()->width(); |
530 | if ( wid < 640 ) | 530 | if ( wid < 640 ) |
531 | wid = QApplication::desktop()->height(); | 531 | wid = QApplication::desktop()->height(); |
532 | #endif | 532 | #endif |
533 | QValueList<int> splitterSize;// = KABPrefs::instance()->mDetailsSplitter; | 533 | QValueList<int> splitterSize;// = KABPrefs::instance()->mDetailsSplitter; |
534 | if ( true /*splitterSize.count() == 0*/ ) { | 534 | if ( true /*splitterSize.count() == 0*/ ) { |
535 | splitterSize.append( wid / 2 ); | 535 | splitterSize.append( wid / 2 ); |
536 | splitterSize.append( wid / 2 ); | 536 | splitterSize.append( wid / 2 ); |
537 | } | 537 | } |
538 | mMiniSplitter->setSizes( splitterSize ); | 538 | mMiniSplitter->setSizes( splitterSize ); |
539 | if ( mExtensionBarSplitter ) { | 539 | if ( mExtensionBarSplitter ) { |
540 | //splitterSize = KABPrefs::instance()->mExtensionsSplitter; | 540 | //splitterSize = KABPrefs::instance()->mExtensionsSplitter; |
541 | if ( true /*splitterSize.count() == 0*/ ) { | 541 | if ( true /*splitterSize.count() == 0*/ ) { |
542 | splitterSize.append( wid / 2 ); | 542 | splitterSize.append( wid / 2 ); |
543 | splitterSize.append( wid / 2 ); | 543 | splitterSize.append( wid / 2 ); |
544 | } | 544 | } |
545 | mExtensionBarSplitter->setSizes( splitterSize ); | 545 | mExtensionBarSplitter->setSizes( splitterSize ); |
546 | 546 | ||
547 | } | 547 | } |
548 | 548 | ||
549 | 549 | ||
550 | } | 550 | } |
551 | 551 | ||
552 | void KABCore::saveSettings() | 552 | void KABCore::saveSettings() |
553 | { | 553 | { |
554 | KABPrefs::instance()->mJumpButtonBarVisible = mActionJumpBar->isChecked(); | 554 | KABPrefs::instance()->mJumpButtonBarVisible = mActionJumpBar->isChecked(); |
555 | if ( mExtensionBarSplitter ) | 555 | if ( mExtensionBarSplitter ) |
556 | KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes(); | 556 | KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes(); |
557 | KABPrefs::instance()->mDetailsPageVisible = mActionDetails->isChecked(); | 557 | KABPrefs::instance()->mDetailsPageVisible = mActionDetails->isChecked(); |
558 | KABPrefs::instance()->mDetailsSplitter = mMiniSplitter->sizes(); | 558 | KABPrefs::instance()->mDetailsSplitter = mMiniSplitter->sizes(); |
559 | #ifndef KAB_EMBEDDED | 559 | #ifndef KAB_EMBEDDED |
560 | 560 | ||
561 | KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes(); | 561 | KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes(); |
562 | KABPrefs::instance()->mDetailsSplitter = mDetailsSplitter->sizes(); | 562 | KABPrefs::instance()->mDetailsSplitter = mDetailsSplitter->sizes(); |
563 | #endif //KAB_EMBEDDED | 563 | #endif //KAB_EMBEDDED |
564 | mExtensionManager->saveSettings(); | 564 | mExtensionManager->saveSettings(); |
565 | mViewManager->saveSettings(); | 565 | mViewManager->saveSettings(); |
566 | 566 | ||
567 | KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem(); | 567 | KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem(); |
568 | KABPrefs::instance()->writeConfig(); | 568 | KABPrefs::instance()->writeConfig(); |
569 | qDebug("KABPrefs::instance()->writeConfig() "); | 569 | qDebug("KABCore::saveSettings() "); |
570 | } | 570 | } |
571 | 571 | ||
572 | KABC::AddressBook *KABCore::addressBook() const | 572 | KABC::AddressBook *KABCore::addressBook() const |
573 | { | 573 | { |
574 | return mAddressBook; | 574 | return mAddressBook; |
575 | } | 575 | } |
576 | 576 | ||
577 | KConfig *KABCore::config() | 577 | KConfig *KABCore::config() |
578 | { | 578 | { |
579 | #ifndef KAB_EMBEDDED | 579 | #ifndef KAB_EMBEDDED |
580 | return KABPrefs::instance()->config(); | 580 | return KABPrefs::instance()->config(); |
581 | #else //KAB_EMBEDDED | 581 | #else //KAB_EMBEDDED |
582 | return KABPrefs::instance()->getConfig(); | 582 | return KABPrefs::instance()->getConfig(); |
583 | #endif //KAB_EMBEDDED | 583 | #endif //KAB_EMBEDDED |
584 | } | 584 | } |
585 | 585 | ||
586 | KActionCollection *KABCore::actionCollection() const | 586 | KActionCollection *KABCore::actionCollection() const |
587 | { | 587 | { |
588 | return mGUIClient->actionCollection(); | 588 | return mGUIClient->actionCollection(); |
589 | } | 589 | } |
590 | 590 | ||
591 | KABC::Field *KABCore::currentSearchField() const | 591 | KABC::Field *KABCore::currentSearchField() const |
592 | { | 592 | { |
593 | if (mIncSearchWidget) | 593 | if (mIncSearchWidget) |
594 | return mIncSearchWidget->currentField(); | 594 | return mIncSearchWidget->currentField(); |
595 | else | 595 | else |
596 | return 0; | 596 | return 0; |
597 | } | 597 | } |
598 | 598 | ||
599 | QStringList KABCore::selectedUIDs() const | 599 | QStringList KABCore::selectedUIDs() const |
600 | { | 600 | { |
601 | return mViewManager->selectedUids(); | 601 | return mViewManager->selectedUids(); |
602 | } | 602 | } |
603 | 603 | ||
604 | KABC::Resource *KABCore::requestResource( QWidget *parent ) | 604 | KABC::Resource *KABCore::requestResource( QWidget *parent ) |
605 | { | 605 | { |
606 | QPtrList<KABC::Resource> kabcResources = addressBook()->resources(); | 606 | QPtrList<KABC::Resource> kabcResources = addressBook()->resources(); |
607 | 607 | ||
608 | QPtrList<KRES::Resource> kresResources; | 608 | QPtrList<KRES::Resource> kresResources; |
609 | QPtrListIterator<KABC::Resource> resIt( kabcResources ); | 609 | QPtrListIterator<KABC::Resource> resIt( kabcResources ); |
610 | KABC::Resource *resource; | 610 | KABC::Resource *resource; |
611 | while ( ( resource = resIt.current() ) != 0 ) { | 611 | while ( ( resource = resIt.current() ) != 0 ) { |
612 | ++resIt; | 612 | ++resIt; |
613 | if ( !resource->readOnly() ) { | 613 | if ( !resource->readOnly() ) { |
614 | KRES::Resource *res = static_cast<KRES::Resource*>( resource ); | 614 | KRES::Resource *res = static_cast<KRES::Resource*>( resource ); |
615 | if ( res ) | 615 | if ( res ) |
616 | kresResources.append( res ); | 616 | kresResources.append( res ); |
617 | } | 617 | } |
618 | } | 618 | } |
619 | 619 | ||
620 | KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent ); | 620 | KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent ); |
621 | return static_cast<KABC::Resource*>( res ); | 621 | return static_cast<KABC::Resource*>( res ); |
622 | } | 622 | } |
623 | 623 | ||
624 | #ifndef KAB_EMBEDDED | 624 | #ifndef KAB_EMBEDDED |
625 | KAboutData *KABCore::createAboutData() | 625 | KAboutData *KABCore::createAboutData() |
626 | #else //KAB_EMBEDDED | 626 | #else //KAB_EMBEDDED |
627 | void KABCore::createAboutData() | 627 | void KABCore::createAboutData() |
628 | #endif //KAB_EMBEDDED | 628 | #endif //KAB_EMBEDDED |
629 | { | 629 | { |
630 | #ifndef KAB_EMBEDDED | 630 | #ifndef KAB_EMBEDDED |
631 | KAboutData *about = new KAboutData( "kaddressbook", I18N_NOOP( "KAddressBook" ), | 631 | KAboutData *about = new KAboutData( "kaddressbook", I18N_NOOP( "KAddressBook" ), |
632 | "3.1", I18N_NOOP( "The KDE Address Book" ), | 632 | "3.1", I18N_NOOP( "The KDE Address Book" ), |
633 | KAboutData::License_GPL_V2, | 633 | KAboutData::License_GPL_V2, |
634 | I18N_NOOP( "(c) 1997-2003, The KDE PIM Team" ) ); | 634 | I18N_NOOP( "(c) 1997-2003, The KDE PIM Team" ) ); |
635 | about->addAuthor( "Tobias Koenig", I18N_NOOP( "Current maintainer " ), "tokoe@kde.org" ); | 635 | about->addAuthor( "Tobias Koenig", I18N_NOOP( "Current maintainer " ), "tokoe@kde.org" ); |
636 | about->addAuthor( "Don Sanders", I18N_NOOP( "Original author " ) ); | 636 | about->addAuthor( "Don Sanders", I18N_NOOP( "Original author " ) ); |
637 | about->addAuthor( "Cornelius Schumacher", | 637 | about->addAuthor( "Cornelius Schumacher", |
638 | I18N_NOOP( "Co-maintainer, libkabc port, CSV import/export " ), | 638 | I18N_NOOP( "Co-maintainer, libkabc port, CSV import/export " ), |
639 | "schumacher@kde.org" ); | 639 | "schumacher@kde.org" ); |
640 | about->addAuthor( "Mike Pilone", I18N_NOOP( "GUI and framework redesign " ), | 640 | about->addAuthor( "Mike Pilone", I18N_NOOP( "GUI and framework redesign " ), |
641 | "mpilone@slac.com" ); | 641 | "mpilone@slac.com" ); |
642 | about->addAuthor( "Greg Stern", I18N_NOOP( "DCOP interface" ) ); | 642 | about->addAuthor( "Greg Stern", I18N_NOOP( "DCOP interface" ) ); |
643 | about->addAuthor( "Mark Westcott", I18N_NOOP( "Contact pinning" ) ); | 643 | about->addAuthor( "Mark Westcott", I18N_NOOP( "Contact pinning" ) ); |
644 | about->addAuthor( "Michel Boyer de la Giroday", I18N_NOOP( "LDAP Lookup\n" ), | 644 | about->addAuthor( "Michel Boyer de la Giroday", I18N_NOOP( "LDAP Lookup\n" ), |
645 | "michel@klaralvdalens-datakonsult.se" ); | 645 | "michel@klaralvdalens-datakonsult.se" ); |
646 | about->addAuthor( "Steffen Hansen", I18N_NOOP( "LDAP Lookup " ), | 646 | about->addAuthor( "Steffen Hansen", I18N_NOOP( "LDAP Lookup " ), |
647 | "hansen@kde.org" ); | 647 | "hansen@kde.org" ); |
648 | 648 | ||
649 | return about; | 649 | return about; |
650 | #endif //KAB_EMBEDDED | 650 | #endif //KAB_EMBEDDED |
651 | 651 | ||
652 | QString version; | 652 | QString version; |
653 | #include <../version> | 653 | #include <../version> |
654 | QMessageBox::about( this, "About KAddressbook/Pi", | 654 | QMessageBox::about( this, "About KAddressbook/Pi", |
655 | "KAddressbook/Platform-independent\n" | 655 | "KAddressbook/Platform-independent\n" |
656 | "(KA/Pi) " +version + " - " + | 656 | "(KA/Pi) " +version + " - " + |
657 | #ifdef DESKTOP_VERSION | 657 | #ifdef DESKTOP_VERSION |
658 | "Desktop Edition\n" | 658 | "Desktop Edition\n" |
659 | #else | 659 | #else |
660 | "PDA-Edition\n" | 660 | "PDA-Edition\n" |
661 | "for: Zaurus 5500 / 7x0 / 8x0\n" | 661 | "for: Zaurus 5500 / 7x0 / 8x0\n" |
662 | #endif | 662 | #endif |
663 | 663 | ||
664 | "(c) 2004 Ulf Schenk\n" | 664 | "(c) 2004 Ulf Schenk\n" |
665 | "(c) 2004 Lutz Rogowski\n" | 665 | "(c) 2004 Lutz Rogowski\n" |
666 | "(c) 1997-2003, The KDE PIM Team\n" | 666 | "(c) 1997-2003, The KDE PIM Team\n" |
667 | "Tobias Koenig Current maintainer\ntokoe@kde.org\n" | 667 | "Tobias Koenig Current maintainer\ntokoe@kde.org\n" |
668 | "Don Sanders Original author\n" | 668 | "Don Sanders Original author\n" |
669 | "Cornelius Schumacher Co-maintainer\nschumacher@kde.org\n" | 669 | "Cornelius Schumacher Co-maintainer\nschumacher@kde.org\n" |
670 | "Mike Pilone GUI and framework redesign\nmpilone@slac.com\n" | 670 | "Mike Pilone GUI and framework redesign\nmpilone@slac.com\n" |
671 | "Greg Stern DCOP interface\n" | 671 | "Greg Stern DCOP interface\n" |
672 | "Mark Westcot Contact pinning\n" | 672 | "Mark Westcot Contact pinning\n" |
673 | "Michel Boyer de la Giroday LDAP Lookup\n" "michel@klaralvdalens-datakonsult.se\n" | 673 | "Michel Boyer de la Giroday LDAP Lookup\n" "michel@klaralvdalens-datakonsult.se\n" |
674 | "Steffen Hansen LDAP Lookup\nhansen@kde.org\n" | 674 | "Steffen Hansen LDAP Lookup\nhansen@kde.org\n" |
675 | #ifdef _WIN32_ | 675 | #ifdef _WIN32_ |
676 | "(c) 2004 Lutz Rogowski Import from OL\nrogowski@kde.org\n" | 676 | "(c) 2004 Lutz Rogowski Import from OL\nrogowski@kde.org\n" |
677 | #endif | 677 | #endif |
678 | ); | 678 | ); |
679 | } | 679 | } |
680 | 680 | ||
681 | void KABCore::setContactSelected( const QString &uid ) | 681 | void KABCore::setContactSelected( const QString &uid ) |
682 | { | 682 | { |
683 | KABC::Addressee addr = mAddressBook->findByUid( uid ); | 683 | KABC::Addressee addr = mAddressBook->findByUid( uid ); |
684 | if ( !mDetails->isHidden() ) | 684 | if ( !mDetails->isHidden() ) |
685 | mDetails->setAddressee( addr ); | 685 | mDetails->setAddressee( addr ); |
686 | 686 | ||
687 | if ( !addr.isEmpty() ) { | 687 | if ( !addr.isEmpty() ) { |
688 | emit contactSelected( addr.formattedName() ); | 688 | emit contactSelected( addr.formattedName() ); |
689 | KABC::Picture pic = addr.photo(); | 689 | KABC::Picture pic = addr.photo(); |
690 | if ( pic.isIntern() ) { | 690 | if ( pic.isIntern() ) { |
691 | //US emit contactSelected( pic.data() ); | 691 | //US emit contactSelected( pic.data() ); |
692 | //US instead use: | 692 | //US instead use: |
693 | QPixmap px; | 693 | QPixmap px; |
694 | if (pic.data().isNull() != true) | 694 | if (pic.data().isNull() != true) |
695 | { | 695 | { |
696 | px.convertFromImage(pic.data()); | 696 | px.convertFromImage(pic.data()); |
697 | } | 697 | } |
698 | 698 | ||
699 | emit contactSelected( px ); | 699 | emit contactSelected( px ); |
700 | } | 700 | } |
701 | } | 701 | } |
702 | 702 | ||
703 | 703 | ||
704 | mExtensionManager->setSelectionChanged(); | 704 | mExtensionManager->setSelectionChanged(); |
705 | 705 | ||
706 | // update the actions | 706 | // update the actions |
707 | bool selected = !uid.isEmpty(); | 707 | bool selected = !uid.isEmpty(); |
708 | 708 | ||
709 | if ( mReadWrite ) { | 709 | if ( mReadWrite ) { |
710 | mActionCut->setEnabled( selected ); | 710 | mActionCut->setEnabled( selected ); |
711 | mActionPaste->setEnabled( selected ); | 711 | mActionPaste->setEnabled( selected ); |
712 | } | 712 | } |
713 | 713 | ||
714 | mActionCopy->setEnabled( selected ); | 714 | mActionCopy->setEnabled( selected ); |
715 | mActionDelete->setEnabled( selected ); | 715 | mActionDelete->setEnabled( selected ); |
716 | mActionEditAddressee->setEnabled( selected ); | 716 | mActionEditAddressee->setEnabled( selected ); |
717 | mActionMail->setEnabled( selected ); | 717 | mActionMail->setEnabled( selected ); |
718 | mActionMailVCard->setEnabled( selected ); | 718 | mActionMailVCard->setEnabled( selected ); |
719 | //if (mActionBeam) | 719 | //if (mActionBeam) |
720 | //mActionBeam->setEnabled( selected ); | 720 | //mActionBeam->setEnabled( selected ); |
721 | mActionWhoAmI->setEnabled( selected ); | 721 | mActionWhoAmI->setEnabled( selected ); |
722 | } | 722 | } |
723 | 723 | ||
724 | void KABCore::sendMail() | 724 | void KABCore::sendMail() |
725 | { | 725 | { |
726 | sendMail( mViewManager->selectedEmails().join( ", " ) ); | 726 | sendMail( mViewManager->selectedEmails().join( ", " ) ); |
727 | } | 727 | } |
728 | 728 | ||
729 | void KABCore::sendMail( const QString& emaillist ) | 729 | void KABCore::sendMail( const QString& emaillist ) |
730 | { | 730 | { |
731 | // the parameter has the form "name1 <abc@aol.com>,name2 <abc@aol.com>;... " | 731 | // the parameter has the form "name1 <abc@aol.com>,name2 <abc@aol.com>;... " |
732 | if (emaillist.contains(",") > 0) | 732 | if (emaillist.contains(",") > 0) |
733 | ExternalAppHandler::instance()->mailToMultipleContacts( emaillist, QString::null ); | 733 | ExternalAppHandler::instance()->mailToMultipleContacts( emaillist, QString::null ); |
734 | else | 734 | else |
735 | ExternalAppHandler::instance()->mailToOneContact( emaillist ); | 735 | ExternalAppHandler::instance()->mailToOneContact( emaillist ); |
736 | } | 736 | } |
737 | 737 | ||
738 | 738 | ||
739 | 739 | ||
740 | void KABCore::mailVCard() | 740 | void KABCore::mailVCard() |
741 | { | 741 | { |
742 | QStringList uids = mViewManager->selectedUids(); | 742 | QStringList uids = mViewManager->selectedUids(); |
743 | if ( !uids.isEmpty() ) | 743 | if ( !uids.isEmpty() ) |
744 | mailVCard( uids ); | 744 | mailVCard( uids ); |
745 | } | 745 | } |
746 | 746 | ||
747 | void KABCore::mailVCard( const QStringList& uids ) | 747 | void KABCore::mailVCard( const QStringList& uids ) |
748 | { | 748 | { |
749 | QStringList urls; | 749 | QStringList urls; |
750 | 750 | ||
751 | // QString tmpdir = locateLocal("tmp", KGlobal::getAppName()); | 751 | // QString tmpdir = locateLocal("tmp", KGlobal::getAppName()); |
752 | 752 | ||
753 | QString dirName = "/tmp/" + KApplication::randomString( 8 ); | 753 | QString dirName = "/tmp/" + KApplication::randomString( 8 ); |
754 | 754 | ||
755 | 755 | ||
756 | 756 | ||
757 | QDir().mkdir( dirName, true ); | 757 | QDir().mkdir( dirName, true ); |
758 | 758 | ||
759 | for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) { | 759 | for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) { |
760 | KABC::Addressee a = mAddressBook->findByUid( *it ); | 760 | KABC::Addressee a = mAddressBook->findByUid( *it ); |
761 | 761 | ||
762 | if ( a.isEmpty() ) | 762 | if ( a.isEmpty() ) |
763 | continue; | 763 | continue; |
764 | 764 | ||
765 | QString name = a.givenName() + "_" + a.familyName() + ".vcf"; | 765 | QString name = a.givenName() + "_" + a.familyName() + ".vcf"; |
766 | 766 | ||
767 | QString fileName = dirName + "/" + name; | 767 | QString fileName = dirName + "/" + name; |
768 | 768 | ||
769 | QFile outFile(fileName); | 769 | QFile outFile(fileName); |
770 | 770 | ||
771 | if ( outFile.open(IO_WriteOnly) ) { // file opened successfully | 771 | if ( outFile.open(IO_WriteOnly) ) { // file opened successfully |
772 | KABC::VCardConverter converter; | 772 | KABC::VCardConverter converter; |
773 | QString vcard; | 773 | QString vcard; |
774 | 774 | ||
775 | converter.addresseeToVCard( a, vcard ); | 775 | converter.addresseeToVCard( a, vcard ); |
776 | 776 | ||
777 | QTextStream t( &outFile ); // use a text stream | 777 | QTextStream t( &outFile ); // use a text stream |
778 | t.setEncoding( QTextStream::UnicodeUTF8 ); | 778 | t.setEncoding( QTextStream::UnicodeUTF8 ); |
779 | t << vcard; | 779 | t << vcard; |
780 | 780 | ||
781 | outFile.close(); | 781 | outFile.close(); |
782 | 782 | ||
783 | urls.append( fileName ); | 783 | urls.append( fileName ); |
784 | } | 784 | } |
785 | } | 785 | } |
786 | 786 | ||
787 | bool result = ExternalAppHandler::instance()->mailToMultipleContacts( QString::null, urls.join(", ") ); | 787 | bool result = ExternalAppHandler::instance()->mailToMultipleContacts( QString::null, urls.join(", ") ); |
788 | 788 | ||
789 | 789 | ||
790 | /*US | 790 | /*US |
791 | kapp->invokeMailer( QString::null, QString::null, QString::null, | 791 | kapp->invokeMailer( QString::null, QString::null, QString::null, |
792 | QString::null, // subject | 792 | QString::null, // subject |
793 | QString::null, // body | 793 | QString::null, // body |
794 | QString::null, | 794 | QString::null, |
795 | urls ); // attachments | 795 | urls ); // attachments |
796 | */ | 796 | */ |
797 | 797 | ||
798 | } | 798 | } |
799 | 799 | ||
800 | /** | 800 | /** |
801 | Beams the "WhoAmI contact. | 801 | Beams the "WhoAmI contact. |
802 | */ | 802 | */ |
803 | void KABCore::beamMySelf() | 803 | void KABCore::beamMySelf() |
804 | { | 804 | { |
805 | KABC::Addressee a = KABC::StdAddressBook::self()->whoAmI(); | 805 | KABC::Addressee a = KABC::StdAddressBook::self()->whoAmI(); |
806 | if (!a.isEmpty()) | 806 | if (!a.isEmpty()) |
807 | { | 807 | { |
808 | QStringList uids; | 808 | QStringList uids; |
809 | uids << a.uid(); | 809 | uids << a.uid(); |
810 | 810 | ||
811 | beamVCard(uids); | 811 | beamVCard(uids); |
812 | } else { | 812 | } else { |
813 | KMessageBox::information( this, i18n( "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n" ) ); | 813 | KMessageBox::information( this, i18n( "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n" ) ); |
814 | 814 | ||
815 | 815 | ||
816 | } | 816 | } |
817 | } | 817 | } |
818 | void KABCore::updateMainWindow() | 818 | void KABCore::updateMainWindow() |
819 | { | 819 | { |
820 | 820 | ||
821 | mMainWindow->showMaximized(); | 821 | mMainWindow->showMaximized(); |
822 | mMainWindow->update(); | 822 | mMainWindow->update(); |
823 | } | 823 | } |
824 | void KABCore::resizeEvent(QResizeEvent* e ) | 824 | void KABCore::resizeEvent(QResizeEvent* e ) |
825 | { | 825 | { |
826 | if ( !mMiniSplitter ) | 826 | if ( !mMiniSplitter ) |
827 | return; | 827 | return; |
828 | //qDebug("KABCore::resizeEvent(QResizeEvent* e ) "); | 828 | //qDebug("KABCore::resizeEvent(QResizeEvent* e ) "); |
829 | if ( QApplication::desktop()->width() >= 480 ) { | 829 | if ( QApplication::desktop()->width() >= 480 ) { |
830 | if (QApplication::desktop()->width() == 640 ) { // e.g. 640x480 | 830 | if (QApplication::desktop()->width() == 640 ) { // e.g. 640x480 |
831 | if ( mMiniSplitter->orientation() == Qt::Vertical ) { | 831 | if ( mMiniSplitter->orientation() == Qt::Vertical ) { |
832 | mMiniSplitter->setOrientation( Qt::Horizontal); | 832 | mMiniSplitter->setOrientation( Qt::Horizontal); |
833 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 833 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); |
834 | if ( QApplication::desktop()->width() <= 640 ) { | 834 | if ( QApplication::desktop()->width() <= 640 ) { |
835 | //mMainWindow->setMaximumSize( QApplication::desktop()->size() ); | 835 | //mMainWindow->setMaximumSize( QApplication::desktop()->size() ); |
836 | mViewManager->getFilterAction()->setComboWidth( 150 ); | 836 | mViewManager->getFilterAction()->setComboWidth( 150 ); |
837 | QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); | 837 | QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); |
838 | } | 838 | } |
839 | } | 839 | } |
840 | } else if (QApplication::desktop()->width() == 480 ){// e.g. 480x640 | 840 | } else if (QApplication::desktop()->width() == 480 ){// e.g. 480x640 |
841 | if ( mMiniSplitter->orientation() == Qt::Horizontal ) { | 841 | if ( mMiniSplitter->orientation() == Qt::Horizontal ) { |
842 | mMiniSplitter->setOrientation( Qt::Vertical ); | 842 | mMiniSplitter->setOrientation( Qt::Vertical ); |
843 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); | 843 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); |
844 | if ( QApplication::desktop()->width() <= 640 ) { | 844 | if ( QApplication::desktop()->width() <= 640 ) { |
845 | //mMainWindow->setMaximumSize( QApplication::desktop()->size() ); | 845 | //mMainWindow->setMaximumSize( QApplication::desktop()->size() ); |
846 | mMainWindow->showMinimized(); | 846 | mMainWindow->showMinimized(); |
847 | mViewManager->getFilterAction()->setComboWidth( 0 ); | 847 | mViewManager->getFilterAction()->setComboWidth( 0 ); |
848 | QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); | 848 | QTimer::singleShot( 1, this , SLOT ( updateMainWindow())); |
849 | } | 849 | } |
850 | } | 850 | } |
851 | } | 851 | } |
852 | } | 852 | } |
853 | 853 | ||
854 | } | 854 | } |
855 | void KABCore::export2phone() | 855 | void KABCore::export2phone() |
856 | { | 856 | { |
857 | 857 | ||
858 | QStringList uids; | 858 | QStringList uids; |
859 | XXPortSelectDialog dlg( this, false, this ); | 859 | XXPortSelectDialog dlg( this, false, this ); |
860 | if ( dlg.exec() ) | 860 | if ( dlg.exec() ) |
861 | uids = dlg.uids(); | 861 | uids = dlg.uids(); |
862 | else | 862 | else |
863 | return; | 863 | return; |
864 | if ( uids.isEmpty() ) | 864 | if ( uids.isEmpty() ) |
865 | return; | 865 | return; |
866 | // qDebug("count %d ", uids.count()); | 866 | // qDebug("count %d ", uids.count()); |
867 | 867 | ||
868 | KAex2phonePrefs ex2phone; | 868 | KAex2phonePrefs ex2phone; |
869 | ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); | 869 | ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection ); |
870 | ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); | 870 | ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice ); |
871 | ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); | 871 | ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel ); |
872 | 872 | ||
873 | if ( !ex2phone.exec() ) { | 873 | if ( !ex2phone.exec() ) { |
874 | return; | 874 | return; |
875 | } | 875 | } |
876 | KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); | 876 | KPimGlobalPrefs::instance()->mEx2PhoneConnection = ex2phone.mPhoneConnection->text(); |
877 | KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); | 877 | KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text(); |
878 | KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); | 878 | KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text(); |
879 | 879 | ||
880 | 880 | ||
881 | PhoneAccess::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice, | 881 | PhoneAccess::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice, |
882 | KPimGlobalPrefs::instance()->mEx2PhoneConnection, | 882 | KPimGlobalPrefs::instance()->mEx2PhoneConnection, |
883 | KPimGlobalPrefs::instance()->mEx2PhoneModel ); | 883 | KPimGlobalPrefs::instance()->mEx2PhoneModel ); |
884 | 884 | ||
885 | QString fileName = getPhoneFile(); | 885 | QString fileName = getPhoneFile(); |
886 | if ( ! mAddressBook->export2PhoneFormat( uids ,fileName ) ) | 886 | if ( ! mAddressBook->export2PhoneFormat( uids ,fileName ) ) |
887 | return; | 887 | return; |
888 | 888 | ||
889 | message(i18n("Exporting to phone...")); | 889 | message(i18n("Exporting to phone...")); |
890 | QTimer::singleShot( 1, this , SLOT ( writeToPhone())); | 890 | QTimer::singleShot( 1, this , SLOT ( writeToPhone())); |
891 | 891 | ||
892 | } | 892 | } |
893 | QString KABCore::getPhoneFile() | 893 | QString KABCore::getPhoneFile() |
894 | { | 894 | { |
895 | #ifdef DESKTOP_VERSION | 895 | #ifdef DESKTOP_VERSION |
896 | return locateLocal("tmp", "phonefile.vcf"); | 896 | return locateLocal("tmp", "phonefile.vcf"); |
897 | #else | 897 | #else |
898 | return "/tmp/phonefile.vcf"; | 898 | return "/tmp/phonefile.vcf"; |
899 | #endif | 899 | #endif |
900 | 900 | ||
901 | } | 901 | } |
902 | void KABCore::writeToPhone( ) | 902 | void KABCore::writeToPhone( ) |
903 | { | 903 | { |
904 | if ( PhoneAccess::writeToPhone( getPhoneFile() ) ) | 904 | if ( PhoneAccess::writeToPhone( getPhoneFile() ) ) |
905 | message(i18n("Export to phone finished!")); | 905 | message(i18n("Export to phone finished!")); |
906 | else | 906 | else |
907 | qDebug(i18n("Error exporting to phone")); | 907 | qDebug(i18n("Error exporting to phone")); |
908 | } | 908 | } |
909 | void KABCore::beamVCard() | 909 | void KABCore::beamVCard() |
910 | { | 910 | { |
911 | QStringList uids; | 911 | QStringList uids; |
912 | XXPortSelectDialog dlg( this, false, this ); | 912 | XXPortSelectDialog dlg( this, false, this ); |
913 | if ( dlg.exec() ) | 913 | if ( dlg.exec() ) |
914 | uids = dlg.uids(); | 914 | uids = dlg.uids(); |
915 | else | 915 | else |
916 | return; | 916 | return; |
917 | if ( uids.isEmpty() ) | 917 | if ( uids.isEmpty() ) |
918 | return; | 918 | return; |
919 | beamVCard( uids ); | 919 | beamVCard( uids ); |
920 | } | 920 | } |
921 | 921 | ||
922 | 922 | ||
923 | void KABCore::beamVCard(const QStringList& uids) | 923 | void KABCore::beamVCard(const QStringList& uids) |
924 | { | 924 | { |
925 | 925 | ||
926 | // LR: we should use the /tmp dir on the Zaurus, | 926 | // LR: we should use the /tmp dir on the Zaurus, |
927 | // because: /tmp = RAM, (HOME)/kdepim = flash memory | 927 | // because: /tmp = RAM, (HOME)/kdepim = flash memory |
928 | 928 | ||
929 | #ifdef DESKTOP_VERSION | 929 | #ifdef DESKTOP_VERSION |
930 | QString fileName = locateLocal("tmp", "kapibeamfile.vcf"); | 930 | QString fileName = locateLocal("tmp", "kapibeamfile.vcf"); |
931 | #else | 931 | #else |
932 | QString fileName = "/tmp/kapibeamfile.vcf"; | 932 | QString fileName = "/tmp/kapibeamfile.vcf"; |
933 | #endif | 933 | #endif |
934 | 934 | ||
935 | KABC::VCardConverter converter; | 935 | KABC::VCardConverter converter; |
936 | QString description; | 936 | QString description; |
937 | QString datastream; | 937 | QString datastream; |
938 | for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) { | 938 | for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) { |
939 | KABC::Addressee a = mAddressBook->findByUid( *it ); | 939 | KABC::Addressee a = mAddressBook->findByUid( *it ); |
940 | 940 | ||
941 | if ( a.isEmpty() ) | 941 | if ( a.isEmpty() ) |
942 | continue; | 942 | continue; |
943 | 943 | ||
944 | if (description.isEmpty()) | 944 | if (description.isEmpty()) |
945 | description = a.formattedName(); | 945 | description = a.formattedName(); |
946 | 946 | ||
947 | QString vcard; | 947 | QString vcard; |
948 | converter.addresseeToVCard( a, vcard ); | 948 | converter.addresseeToVCard( a, vcard ); |
949 | int start = 0; | 949 | int start = 0; |
950 | int next; | 950 | int next; |
951 | while ( (next = vcard.find("TYPE=", start) )>= 0 ) { | 951 | while ( (next = vcard.find("TYPE=", start) )>= 0 ) { |
952 | int semi = vcard.find(";", next); | 952 | int semi = vcard.find(";", next); |
953 | int dopp = vcard.find(":", next); | 953 | int dopp = vcard.find(":", next); |
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 4be860e..04759a7 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp | |||
@@ -1,734 +1,737 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KAddressBook. | 2 | This file is part of KAddressBook. |
3 | Copyright (c) 2002 Mike Pilone <mpilone@slac.com> | 3 | Copyright (c) 2002 Mike Pilone <mpilone@slac.com> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | /* | 24 | /* |
25 | Enhanced Version of the file for platform independent KDE tools. | 25 | Enhanced Version of the file for platform independent KDE tools. |
26 | Copyright (c) 2004 Ulf Schenk | 26 | Copyright (c) 2004 Ulf Schenk |
27 | 27 | ||
28 | $Id$ | 28 | $Id$ |
29 | */ | 29 | */ |
30 | 30 | ||
31 | 31 | ||
32 | #ifndef KAB_EMBEDDED | 32 | #ifndef KAB_EMBEDDED |
33 | #include <libkdepim/kvcarddrag.h> | 33 | #include <libkdepim/kvcarddrag.h> |
34 | #include <kabc/vcardconverter.h> | 34 | #include <kabc/vcardconverter.h> |
35 | #include <kconfig.h> | 35 | #include <kconfig.h> |
36 | #include <kdeversion.h> | 36 | #include <kdeversion.h> |
37 | #include <kiconloader.h> | 37 | #include <kiconloader.h> |
38 | #include <klocale.h> | 38 | #include <klocale.h> |
39 | #include <kmessagebox.h> | 39 | #include <kmessagebox.h> |
40 | #include <kmultipledrag.h> | 40 | #include <kmultipledrag.h> |
41 | #include <ktrader.h> | 41 | #include <ktrader.h> |
42 | #include <kurldrag.h> | 42 | #include <kurldrag.h> |
43 | 43 | ||
44 | #include "addresseeutil.h" | 44 | #include "addresseeutil.h" |
45 | #else //KAB_EMBEDDED | 45 | #else //KAB_EMBEDDED |
46 | #include "views/kaddressbookiconview.h" | 46 | #include "views/kaddressbookiconview.h" |
47 | #include "views/kaddressbooktableview.h" | 47 | #include "views/kaddressbooktableview.h" |
48 | #include "views/kaddressbookcardview.h" | 48 | #include "views/kaddressbookcardview.h" |
49 | #include "kaddressbookview.h" | 49 | #include "kaddressbookview.h" |
50 | 50 | ||
51 | #include <qaction.h> | 51 | #include <qaction.h> |
52 | #include <qmessagebox.h> | 52 | #include <qmessagebox.h> |
53 | #include <qpopupmenu.h> | 53 | #include <qpopupmenu.h> |
54 | #include <kconfigbase.h> | 54 | #include <kconfigbase.h> |
55 | 55 | ||
56 | #endif //KAB_EMBEDDED | 56 | #endif //KAB_EMBEDDED |
57 | 57 | ||
58 | 58 | ||
59 | #include <kdebug.h> | 59 | #include <kdebug.h> |
60 | #include <kactionclasses.h> | 60 | #include <kactionclasses.h> |
61 | 61 | ||
62 | #include <qlayout.h> | 62 | #include <qlayout.h> |
63 | #include <qapplication.h> | 63 | #include <qapplication.h> |
64 | #include <qwidgetstack.h> | 64 | #include <qwidgetstack.h> |
65 | 65 | ||
66 | #include <kabc/addressbook.h> | 66 | #include <kabc/addressbook.h> |
67 | #include "filtereditdialog.h" | 67 | #include "filtereditdialog.h" |
68 | #include "addviewdialog.h" | 68 | #include "addviewdialog.h" |
69 | #include "kabcore.h" | 69 | #include "kabcore.h" |
70 | #include "kabprefs.h" | 70 | #include "kabprefs.h" |
71 | #include "viewmanager.h" | 71 | #include "viewmanager.h" |
72 | 72 | ||
73 | ViewManager::ViewManager( KABCore *core, QWidget *parent, const char *name ) | 73 | ViewManager::ViewManager( KABCore *core, QWidget *parent, const char *name ) |
74 | : QWidget( parent, name ), mCore( core ), mActiveView( 0 ) | 74 | : QWidget( parent, name ), mCore( core ), mActiveView( 0 ) |
75 | { | 75 | { |
76 | initGUI(); | 76 | initGUI(); |
77 | initActions(); | 77 | initActions(); |
78 | 78 | ||
79 | mViewDict.setAutoDelete( true ); | 79 | mViewDict.setAutoDelete( true ); |
80 | 80 | ||
81 | createViewFactories(); | 81 | createViewFactories(); |
82 | } | 82 | } |
83 | 83 | ||
84 | ViewManager::~ViewManager() | 84 | ViewManager::~ViewManager() |
85 | { | 85 | { |
86 | unloadViews(); | 86 | unloadViews(); |
87 | mViewFactoryDict.clear(); | 87 | mViewFactoryDict.clear(); |
88 | } | 88 | } |
89 | void ViewManager::scrollUP() | 89 | void ViewManager::scrollUP() |
90 | { | 90 | { |
91 | if ( mActiveView ) | 91 | if ( mActiveView ) |
92 | mActiveView->scrollUP(); | 92 | mActiveView->scrollUP(); |
93 | } | 93 | } |
94 | void ViewManager::scrollDOWN() | 94 | void ViewManager::scrollDOWN() |
95 | { | 95 | { |
96 | if ( mActiveView ) | 96 | if ( mActiveView ) |
97 | mActiveView->scrollDOWN(); | 97 | mActiveView->scrollDOWN(); |
98 | } | 98 | } |
99 | void ViewManager::restoreSettings() | 99 | void ViewManager::restoreSettings() |
100 | { | 100 | { |
101 | mViewNameList = KABPrefs::instance()->mViewNames; | 101 | mViewNameList = KABPrefs::instance()->mViewNames; |
102 | QString activeViewName = KABPrefs::instance()->mCurrentView; | 102 | QString activeViewName = KABPrefs::instance()->mCurrentView; |
103 | 103 | ||
104 | mActionSelectView->setItems( mViewNameList ); | 104 | mActionSelectView->setItems( mViewNameList ); |
105 | 105 | ||
106 | // Filter | 106 | // Filter |
107 | mFilterList = Filter::restore( mCore->config(), "Filter" ); | 107 | mFilterList = Filter::restore( mCore->config(), "Filter" ); |
108 | mActionSelectFilter->setItems( filterNames() ); | 108 | mActionSelectFilter->setItems( filterNames() ); |
109 | mActionSelectFilter->setCurrentItem( KABPrefs::instance()->mCurrentFilter ); | 109 | mActionSelectFilter->setCurrentItem( KABPrefs::instance()->mCurrentFilter ); |
110 | int cw = 150; | 110 | int cw = 150; |
111 | if (QApplication::desktop()->width() == 480 ) | 111 | if (QApplication::desktop()->width() == 480 ) |
112 | cw = 0; | 112 | cw = 0; |
113 | mActionSelectFilter->setComboWidth( cw ); | 113 | mActionSelectFilter->setComboWidth( cw ); |
114 | // Tell the views to reread their config, since they may have | 114 | // Tell the views to reread their config, since they may have |
115 | // been modified by global settings | 115 | // been modified by global settings |
116 | QString _oldgroup = mCore->config()->group(); | 116 | QString _oldgroup = mCore->config()->group(); |
117 | 117 | ||
118 | QDictIterator<KAddressBookView> it( mViewDict ); | 118 | QDictIterator<KAddressBookView> it( mViewDict ); |
119 | for ( it.toFirst(); it.current(); ++it ) { | 119 | for ( it.toFirst(); it.current(); ++it ) { |
120 | KConfigGroupSaver saver( mCore->config(), it.currentKey() ); | 120 | KConfigGroupSaver saver( mCore->config(), it.currentKey() ); |
121 | it.current()->readConfig( mCore->config() ); | 121 | it.current()->readConfig( mCore->config() ); |
122 | } | 122 | } |
123 | setActiveView( activeViewName ); | 123 | setActiveView( activeViewName ); |
124 | 124 | ||
125 | mActionDeleteView->setEnabled( mViewNameList.count() > 1 ); | 125 | mActionDeleteView->setEnabled( mViewNameList.count() > 1 ); |
126 | } | 126 | } |
127 | 127 | ||
128 | void ViewManager::saveSettings() | 128 | void ViewManager::saveSettings() |
129 | { | 129 | { |
130 | QString _oldgroup = mCore->config()->group(); | 130 | QString _oldgroup = mCore->config()->group(); |
131 | 131 | ||
132 | QDictIterator<KAddressBookView> it( mViewDict ); | 132 | QDictIterator<KAddressBookView> it( mViewDict ); |
133 | for ( it.toFirst(); it.current(); ++it ) { | 133 | for ( it.toFirst(); it.current(); ++it ) { |
134 | KConfigGroupSaver saver( mCore->config(), it.currentKey() ); | 134 | KConfigGroupSaver saver( mCore->config(), it.currentKey() ); |
135 | #ifdef DESKTOP_VERSION | 135 | #ifdef DESKTOP_VERSION |
136 | (*it)->writeConfig( mCore->config() ); | 136 | (*it)->writeConfig( mCore->config() ); |
137 | #else | 137 | #else |
138 | (*it).writeConfig( mCore->config() ); | 138 | (*it).writeConfig( mCore->config() ); |
139 | #endif | 139 | #endif |
140 | } | 140 | } |
141 | 141 | ||
142 | Filter::save( mCore->config(), "Filter", mFilterList ); | 142 | Filter::save( mCore->config(), "Filter", mFilterList ); |
143 | KABPrefs::instance()->mCurrentFilter = mActionSelectFilter->currentItem(); | 143 | KABPrefs::instance()->mCurrentFilter = mActionSelectFilter->currentItem(); |
144 | 144 | ||
145 | // write the view name list | 145 | // write the view name list |
146 | KABPrefs::instance()->mViewNames = mViewNameList; | 146 | KABPrefs::instance()->mViewNames = mViewNameList; |
147 | KABPrefs::instance()->mCurrentView = mActiveView->caption(); | 147 | KABPrefs::instance()->mCurrentView = mActiveView->caption(); |
148 | 148 | ||
149 | } | 149 | } |
150 | 150 | ||
151 | QStringList ViewManager::selectedUids() const | 151 | QStringList ViewManager::selectedUids() const |
152 | { | 152 | { |
153 | if ( mActiveView ) | 153 | if ( mActiveView ) |
154 | return mActiveView->selectedUids(); | 154 | return mActiveView->selectedUids(); |
155 | else | 155 | else |
156 | return QStringList(); | 156 | return QStringList(); |
157 | } | 157 | } |
158 | 158 | ||
159 | QStringList ViewManager::selectedEmails() const | 159 | QStringList ViewManager::selectedEmails() const |
160 | { | 160 | { |
161 | if ( mActiveView ) | 161 | if ( mActiveView ) |
162 | return mActiveView->selectedEmails(); | 162 | return mActiveView->selectedEmails(); |
163 | else | 163 | else |
164 | return QStringList(); | 164 | return QStringList(); |
165 | } | 165 | } |
166 | 166 | ||
167 | KABC::Addressee::List ViewManager::selectedAddressees() const | 167 | KABC::Addressee::List ViewManager::selectedAddressees() const |
168 | { | 168 | { |
169 | KABC::Addressee::List list; | 169 | KABC::Addressee::List list; |
170 | if ( mActiveView ) { | 170 | if ( mActiveView ) { |
171 | QStringList uids = mActiveView->selectedUids(); | 171 | QStringList uids = mActiveView->selectedUids(); |
172 | QStringList::Iterator it; | 172 | QStringList::Iterator it; |
173 | for ( it = uids.begin(); it != uids.end(); ++it ) { | 173 | for ( it = uids.begin(); it != uids.end(); ++it ) { |
174 | KABC::Addressee addr = mCore->addressBook()->findByUid( *it ); | 174 | KABC::Addressee addr = mCore->addressBook()->findByUid( *it ); |
175 | if ( !addr.isEmpty() ) | 175 | if ( !addr.isEmpty() ) |
176 | list.append( addr ); | 176 | list.append( addr ); |
177 | } | 177 | } |
178 | } | 178 | } |
179 | 179 | ||
180 | return list; | 180 | return list; |
181 | } | 181 | } |
182 | //US added another method with no parameter, since my moc compiler does not support default parameters. | 182 | //US added another method with no parameter, since my moc compiler does not support default parameters. |
183 | void ViewManager::setSelected() | 183 | void ViewManager::setSelected() |
184 | { | 184 | { |
185 | setSelected( QString::null, true ); | 185 | setSelected( QString::null, true ); |
186 | } | 186 | } |
187 | 187 | ||
188 | void ViewManager::setSelected( const QString &uid, bool selected ) | 188 | void ViewManager::setSelected( const QString &uid, bool selected ) |
189 | { | 189 | { |
190 | if ( mActiveView ) | 190 | if ( mActiveView ) |
191 | mActiveView->setSelected( uid, selected ); | 191 | mActiveView->setSelected( uid, selected ); |
192 | } | 192 | } |
193 | 193 | ||
194 | void ViewManager::setListSelected(QStringList list) | 194 | void ViewManager::setListSelected(QStringList list) |
195 | { | 195 | { |
196 | int i, count = list.count(); | 196 | int i, count = list.count(); |
197 | for ( i = 0; i < count;++i ) | 197 | for ( i = 0; i < count;++i ) |
198 | setSelected( list[i], true ); | 198 | setSelected( list[i], true ); |
199 | 199 | ||
200 | } | 200 | } |
201 | void ViewManager::unloadViews() | 201 | void ViewManager::unloadViews() |
202 | { | 202 | { |
203 | mViewDict.clear(); | 203 | mViewDict.clear(); |
204 | mActiveView = 0; | 204 | mActiveView = 0; |
205 | } | 205 | } |
206 | 206 | ||
207 | void ViewManager::selectView( const QString &name ) | ||
208 | { | ||
209 | setActiveView( name ); | ||
210 | mCore->saveSettings(); | ||
211 | } | ||
207 | void ViewManager::setActiveView( const QString &name ) | 212 | void ViewManager::setActiveView( const QString &name ) |
208 | { | 213 | { |
209 | KAddressBookView *view = 0; | 214 | KAddressBookView *view = 0; |
210 | 215 | ||
211 | // Check that this isn't the same as the current active view | 216 | // Check that this isn't the same as the current active view |
212 | if ( mActiveView && ( mActiveView->caption() == name ) ) | 217 | if ( mActiveView && ( mActiveView->caption() == name ) ) |
213 | return; | 218 | return; |
214 | 219 | ||
215 | // At this point we know the view that should be active is not | 220 | // At this point we know the view that should be active is not |
216 | // currently active. We will try to find the new on in the list. If | 221 | // currently active. We will try to find the new on in the list. If |
217 | // we can't find it, it means it hasn't been instantiated, so we will | 222 | // we can't find it, it means it hasn't been instantiated, so we will |
218 | // create it on demand. | 223 | // create it on demand. |
219 | 224 | ||
220 | view = mViewDict.find( name ); | 225 | view = mViewDict.find( name ); |
221 | 226 | ||
222 | // Check if we found the view. If we didn't, then we need to create it | 227 | // Check if we found the view. If we didn't, then we need to create it |
223 | if ( view == 0 ) { | 228 | if ( view == 0 ) { |
224 | KConfig *config = mCore->config(); | 229 | KConfig *config = mCore->config(); |
225 | 230 | ||
226 | KConfigGroupSaver saver( config, name ); | 231 | KConfigGroupSaver saver( config, name ); |
227 | 232 | ||
228 | QString type = config->readEntry( "Type", "Table" ); | 233 | QString type = config->readEntry( "Type", "Table" ); |
229 | 234 | ||
230 | kdDebug(5720) << "ViewManager::setActiveView: creating view - " << name << endl; | 235 | kdDebug(5720) << "ViewManager::setActiveView: creating view - " << name << endl; |
231 | 236 | ||
232 | ViewFactory *factory = mViewFactoryDict.find( type ); | 237 | ViewFactory *factory = mViewFactoryDict.find( type ); |
233 | if ( factory ) | 238 | if ( factory ) |
234 | view = factory->view( mCore->addressBook(), mViewWidgetStack ); | 239 | view = factory->view( mCore->addressBook(), mViewWidgetStack ); |
235 | 240 | ||
236 | if ( view ) { | 241 | if ( view ) { |
237 | view->setCaption( name ); | 242 | view->setCaption( name ); |
238 | mViewDict.insert( name, view ); | 243 | mViewDict.insert( name, view ); |
239 | //US my version needs an int as second parameter to addWidget | 244 | //US my version needs an int as second parameter to addWidget |
240 | mViewWidgetStack->addWidget( view, -1 ); | 245 | mViewWidgetStack->addWidget( view, -1 ); |
241 | view->readConfig( config ); | 246 | view->readConfig( config ); |
242 | 247 | ||
243 | // The manager just relays the signals | 248 | // The manager just relays the signals |
244 | connect( view, SIGNAL( selected( const QString& ) ), | 249 | connect( view, SIGNAL( selected( const QString& ) ), |
245 | SIGNAL( selected( const QString & ) ) ); | 250 | SIGNAL( selected( const QString & ) ) ); |
246 | connect( view, SIGNAL( executed( const QString& ) ), | 251 | connect( view, SIGNAL( executed( const QString& ) ), |
247 | SIGNAL( executed( const QString& ) ) ); | 252 | SIGNAL( executed( const QString& ) ) ); |
248 | 253 | ||
249 | connect( view, SIGNAL( deleteRequest( ) ), | 254 | connect( view, SIGNAL( deleteRequest( ) ), |
250 | SIGNAL( deleteRequest( ) ) ); | 255 | SIGNAL( deleteRequest( ) ) ); |
251 | 256 | ||
252 | connect( view, SIGNAL( modified() ), SIGNAL( modified() ) ); | 257 | connect( view, SIGNAL( modified() ), SIGNAL( modified() ) ); |
253 | connect( view, SIGNAL( dropped( QDropEvent* ) ), | 258 | connect( view, SIGNAL( dropped( QDropEvent* ) ), |
254 | SLOT( dropped( QDropEvent* ) ) ); | 259 | SLOT( dropped( QDropEvent* ) ) ); |
255 | connect( view, SIGNAL( startDrag() ), SLOT( startDrag() ) ); | 260 | connect( view, SIGNAL( startDrag() ), SLOT( startDrag() ) ); |
256 | } | 261 | } |
257 | } | 262 | } |
258 | 263 | ||
259 | // If we found or created the view, raise it and refresh it | 264 | // If we found or created the view, raise it and refresh it |
260 | if ( view ) { | 265 | if ( view ) { |
261 | mActiveView = view; | 266 | mActiveView = view; |
262 | mViewWidgetStack->raiseWidget( view ); | 267 | mViewWidgetStack->raiseWidget( view ); |
263 | // Set the proper filter in the view. By setting the combo | 268 | // Set the proper filter in the view. By setting the combo |
264 | // box, the activated slot will be called, which will push | 269 | // box, the activated slot will be called, which will push |
265 | // the filter to the view and refresh it. | 270 | // the filter to the view and refresh it. |
266 | 271 | ||
267 | if ( view->defaultFilterType() == KAddressBookView::None ) { | 272 | if ( view->defaultFilterType() == KAddressBookView::None ) { |
268 | 273 | ||
269 | mActionSelectFilter->setCurrentItem( 0 ); | 274 | mActionSelectFilter->setCurrentItem( 0 ); |
270 | setActiveFilter( 0 ); | 275 | setActiveFilter( 0 ); |
271 | } else if ( view->defaultFilterType() == KAddressBookView::Active ) { | 276 | } else if ( view->defaultFilterType() == KAddressBookView::Active ) { |
272 | setActiveFilter( mActionSelectFilter->currentItem() ); | 277 | setActiveFilter( mActionSelectFilter->currentItem() ); |
273 | } else { | 278 | } else { |
274 | uint pos = filterPosition( view->defaultFilterName() ); | 279 | uint pos = filterPosition( view->defaultFilterName() ); |
275 | mActionSelectFilter->setCurrentItem( pos ); | 280 | mActionSelectFilter->setCurrentItem( pos ); |
276 | setActiveFilter( pos ); | 281 | setActiveFilter( pos ); |
277 | } | 282 | } |
278 | //US qDebug("ViewManager::setActiveView 6" ); | 283 | //US qDebug("ViewManager::setActiveView 6" ); |
279 | 284 | ||
280 | // Update the inc search widget to show the fields in the new active | 285 | // Update the inc search widget to show the fields in the new active |
281 | // view. | 286 | // view. |
282 | mCore->setSearchFields( mActiveView->fields() ); | 287 | mCore->setSearchFields( mActiveView->fields() ); |
283 | 288 | ||
284 | //US performance optimization. setActiveFilter calls also mActiveView->refresh() | 289 | //US performance optimization. setActiveFilter calls also mActiveView->refresh() |
285 | //US mActiveView->refresh(); | 290 | //US mActiveView->refresh(); |
286 | mCore->saveSettings(); | ||
287 | } | 291 | } |
288 | else | 292 | else |
289 | { | 293 | { |
290 | qDebug("ViewManager::setActiveView: unable to find view" ); | 294 | qDebug("ViewManager::setActiveView: unable to find view" ); |
291 | } | 295 | } |
292 | } | 296 | } |
293 | 297 | ||
294 | //US added another method with no parameter, since my moc compiler does not support default parameters. | 298 | //US added another method with no parameter, since my moc compiler does not support default parameters. |
295 | void ViewManager::refreshView() | 299 | void ViewManager::refreshView() |
296 | { | 300 | { |
297 | refreshView( QString::null ); | 301 | refreshView( QString::null ); |
298 | } | 302 | } |
299 | 303 | ||
300 | void ViewManager::refreshView( const QString &uid ) | 304 | void ViewManager::refreshView( const QString &uid ) |
301 | { | 305 | { |
302 | if ( mActiveView ) | 306 | if ( mActiveView ) |
303 | mActiveView->refresh( uid ); | 307 | mActiveView->refresh( uid ); |
304 | } | 308 | } |
305 | 309 | ||
306 | void ViewManager::setFocusAV() | 310 | void ViewManager::setFocusAV() |
307 | { | 311 | { |
308 | if ( mActiveView ) | 312 | if ( mActiveView ) |
309 | mActiveView->setFocusAV(); | 313 | mActiveView->setFocusAV(); |
310 | } | 314 | } |
311 | void ViewManager::editView() | 315 | void ViewManager::editView() |
312 | { | 316 | { |
313 | if ( !mActiveView ) | 317 | if ( !mActiveView ) |
314 | return; | 318 | return; |
315 | 319 | ||
316 | ViewFactory *factory = mViewFactoryDict.find( mActiveView->type() ); | 320 | ViewFactory *factory = mViewFactoryDict.find( mActiveView->type() ); |
317 | ViewConfigureWidget *wdg = 0; | 321 | ViewConfigureWidget *wdg = 0; |
318 | ViewConfigureDialog* dlg = 0; | 322 | ViewConfigureDialog* dlg = 0; |
319 | if ( factory ) { | 323 | if ( factory ) { |
320 | // Save the filters so the dialog has the latest set | 324 | // Save the filters so the dialog has the latest set |
321 | Filter::save( mCore->config(), "Filter", mFilterList ); | 325 | Filter::save( mCore->config(), "Filter", mFilterList ); |
322 | dlg = new ViewConfigureDialog( 0, mActiveView->caption(), this, "conf_dlg" ); | 326 | dlg = new ViewConfigureDialog( 0, mActiveView->caption(), this, "conf_dlg" ); |
323 | wdg = factory->configureWidget( mCore->addressBook(), dlg,"conf_wid" ); | 327 | wdg = factory->configureWidget( mCore->addressBook(), dlg,"conf_wid" ); |
324 | } else { | 328 | } else { |
325 | qDebug("ViewManager::editView()::cannot find viewfactory "); | 329 | qDebug("ViewManager::editView()::cannot find viewfactory "); |
326 | return; | 330 | return; |
327 | } | 331 | } |
328 | if ( wdg ) { | 332 | if ( wdg ) { |
329 | dlg->setWidget( wdg ); | 333 | dlg->setWidget( wdg ); |
330 | 334 | ||
331 | #ifndef DESKTOP_VERSION | 335 | #ifndef DESKTOP_VERSION |
332 | //dlg.setMaximumSize( 640, 480 ); | 336 | //dlg.setMaximumSize( 640, 480 ); |
333 | //dlg->setGeometry( 40,40, 400, 300); | 337 | //dlg->setGeometry( 40,40, 400, 300); |
334 | dlg->showMaximized(); | 338 | dlg->showMaximized(); |
335 | #endif | 339 | #endif |
336 | 340 | ||
337 | KConfigGroupSaver saver( mCore->config(), mActiveView->caption() ); | 341 | KConfigGroupSaver saver( mCore->config(), mActiveView->caption() ); |
338 | 342 | ||
339 | dlg->restoreSettings( mCore->config() ); | 343 | dlg->restoreSettings( mCore->config() ); |
340 | 344 | ||
341 | if ( dlg->exec() ) { | 345 | if ( dlg->exec() ) { |
342 | dlg->saveSettings( mCore->config() ); | 346 | dlg->saveSettings( mCore->config() ); |
343 | mActiveView->readConfig( mCore->config() ); | 347 | mActiveView->readConfig( mCore->config() ); |
344 | 348 | ||
345 | // Set the proper filter in the view. By setting the combo | 349 | // Set the proper filter in the view. By setting the combo |
346 | // box, the activated slot will be called, which will push | 350 | // box, the activated slot will be called, which will push |
347 | // the filter to the view and refresh it. | 351 | // the filter to the view and refresh it. |
348 | if ( mActiveView->defaultFilterType() == KAddressBookView::None ) { | 352 | if ( mActiveView->defaultFilterType() == KAddressBookView::None ) { |
349 | mActionSelectFilter->setCurrentItem( 0 ); | 353 | mActionSelectFilter->setCurrentItem( 0 ); |
350 | setActiveFilter( 0 ); | 354 | setActiveFilter( 0 ); |
351 | } else if ( mActiveView->defaultFilterType() == KAddressBookView::Active ) { | 355 | } else if ( mActiveView->defaultFilterType() == KAddressBookView::Active ) { |
352 | setActiveFilter( mActionSelectFilter->currentItem() ); | 356 | setActiveFilter( mActionSelectFilter->currentItem() ); |
353 | } else { | 357 | } else { |
354 | uint pos = filterPosition( mActiveView->defaultFilterName() ); | 358 | uint pos = filterPosition( mActiveView->defaultFilterName() ); |
355 | mActionSelectFilter->setCurrentItem( pos ); | 359 | mActionSelectFilter->setCurrentItem( pos ); |
356 | setActiveFilter( pos ); | 360 | setActiveFilter( pos ); |
357 | } | 361 | } |
358 | mCore->setSearchFields( mActiveView->fields() ); | 362 | mCore->setSearchFields( mActiveView->fields() ); |
359 | //US performance optimization. setActiveFilter calls also mActiveView->refresh() | 363 | //US performance optimization. setActiveFilter calls also mActiveView->refresh() |
360 | //US mActiveView->refresh(); | 364 | //US mActiveView->refresh(); |
361 | 365 | ||
362 | 366 | ||
363 | //US this is a bugfix, that we get notified if we change a views configuration | 367 | //US this is a bugfix, that we get notified if we change a views configuration |
364 | emit modified(); | 368 | emit modified(); |
365 | 369 | ||
366 | } | 370 | } |
367 | 371 | ||
368 | } | 372 | } |
369 | delete dlg; | 373 | delete dlg; |
370 | } | 374 | } |
371 | 375 | ||
372 | void ViewManager::deleteView() | 376 | void ViewManager::deleteView() |
373 | { | 377 | { |
374 | QString text = i18n( "<qt>Are you sure that you want to delete the view <b>%1</b>?</qt>" ) | 378 | QString text = i18n( "<qt>Are you sure that you want to delete the view <b>%1</b>?</qt>" ) |
375 | .arg( mActiveView->caption() ); | 379 | .arg( mActiveView->caption() ); |
376 | QString caption = i18n( "Confirm Delete" ); | 380 | QString caption = i18n( "Confirm Delete" ); |
377 | 381 | ||
378 | 382 | ||
379 | if (QMessageBox::information( this, caption, | 383 | if (QMessageBox::information( this, caption, |
380 | text, | 384 | text, |
381 | i18n("Yes!"), i18n("No"), 0, 0 ) == 0) | 385 | i18n("Yes!"), i18n("No"), 0, 0 ) == 0) |
382 | { | 386 | { |
383 | mViewNameList.remove( mActiveView->caption() ); | 387 | mViewNameList.remove( mActiveView->caption() ); |
384 | 388 | ||
385 | // remove the view from the config file | 389 | // remove the view from the config file |
386 | KConfig *config = mCore->config(); | 390 | KConfig *config = mCore->config(); |
387 | config->deleteGroup( mActiveView->caption() ); | 391 | config->deleteGroup( mActiveView->caption() ); |
388 | 392 | ||
389 | mViewDict.remove( mActiveView->caption() ); | 393 | mViewDict.remove( mActiveView->caption() ); |
390 | mActiveView = 0; | 394 | mActiveView = 0; |
391 | 395 | ||
392 | // we are in an invalid state now, but that should be fixed after | 396 | // we are in an invalid state now, but that should be fixed after |
393 | // we emit the signal | 397 | // we emit the signal |
394 | mActionSelectView->setItems( mViewNameList ); | 398 | mActionSelectView->setItems( mViewNameList ); |
395 | if ( mViewNameList.count() > 0 ) { | 399 | if ( mViewNameList.count() > 0 ) { |
396 | mActionSelectView->setCurrentItem( 0 ); | 400 | mActionSelectView->setCurrentItem( 0 ); |
397 | setActiveView( mViewNameList[ 0 ] ); | 401 | setActiveView( mViewNameList[ 0 ] ); |
398 | } | 402 | } |
399 | mActionDeleteView->setEnabled( mViewNameList.count() > 1 ); | 403 | mActionDeleteView->setEnabled( mViewNameList.count() > 1 ); |
400 | } | 404 | } |
401 | } | 405 | } |
402 | 406 | ||
403 | void ViewManager::addView() | 407 | void ViewManager::addView() |
404 | { | 408 | { |
405 | AddViewDialog dialog( &mViewFactoryDict, this ); | 409 | AddViewDialog dialog( &mViewFactoryDict, this ); |
406 | 410 | ||
407 | if ( dialog.exec() ) { | 411 | if ( dialog.exec() ) { |
408 | QString newName = dialog.viewName(); | 412 | QString newName = dialog.viewName(); |
409 | QString type = dialog.viewType(); | 413 | QString type = dialog.viewType(); |
410 | 414 | ||
411 | // Check for name conflicts | 415 | // Check for name conflicts |
412 | bool firstConflict = true; | 416 | bool firstConflict = true; |
413 | int numTries = 1; | 417 | int numTries = 1; |
414 | while ( mViewNameList.contains( newName ) > 0 ) { | 418 | while ( mViewNameList.contains( newName ) > 0 ) { |
415 | if ( !firstConflict ) { | 419 | if ( !firstConflict ) { |
416 | newName = newName.left( newName.length() - 4 ); | 420 | newName = newName.left( newName.length() - 4 ); |
417 | firstConflict = false; | 421 | firstConflict = false; |
418 | } | 422 | } |
419 | 423 | ||
420 | newName = QString( "%1 <%2>" ).arg( newName ).arg( numTries ); | 424 | newName = QString( "%1 <%2>" ).arg( newName ).arg( numTries ); |
421 | numTries++; | 425 | numTries++; |
422 | } | 426 | } |
423 | 427 | ||
424 | // Add the new one to the list | 428 | // Add the new one to the list |
425 | mViewNameList.append( newName ); | 429 | mViewNameList.append( newName ); |
426 | 430 | ||
427 | // write the view to the config file, | 431 | // write the view to the config file, |
428 | KConfig *config = mCore->config(); | 432 | KConfig *config = mCore->config(); |
429 | 433 | ||
430 | config->deleteGroup( newName ); | 434 | config->deleteGroup( newName ); |
431 | 435 | ||
432 | KConfigGroupSaver saver( config, newName ); | 436 | KConfigGroupSaver saver( config, newName ); |
433 | 437 | ||
434 | config->writeEntry( "Type", type ); | 438 | config->writeEntry( "Type", type ); |
435 | 439 | ||
436 | // try to set the active view | 440 | // try to set the active view |
437 | mActionSelectView->setItems( mViewNameList ); | 441 | mActionSelectView->setItems( mViewNameList ); |
438 | mActionSelectView->setCurrentItem( mViewNameList.findIndex( newName ) ); | 442 | mActionSelectView->setCurrentItem( mViewNameList.findIndex( newName ) ); |
439 | setActiveView( newName ); | 443 | setActiveView( newName ); |
440 | 444 | ||
441 | editView(); | 445 | editView(); |
442 | 446 | ||
443 | mActionDeleteView->setEnabled( mViewNameList.count() > 1 ); | 447 | mActionDeleteView->setEnabled( mViewNameList.count() > 1 ); |
444 | } | 448 | } |
445 | } | 449 | } |
446 | 450 | ||
447 | void ViewManager::createViewFactories() | 451 | void ViewManager::createViewFactories() |
448 | { | 452 | { |
449 | #ifndef KAB_EMBEDDED | 453 | #ifndef KAB_EMBEDDED |
450 | KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/View" ); | 454 | KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/View" ); |
451 | KTrader::OfferList::ConstIterator it; | 455 | KTrader::OfferList::ConstIterator it; |
452 | for ( it = plugins.begin(); it != plugins.end(); ++it ) { | 456 | for ( it = plugins.begin(); it != plugins.end(); ++it ) { |
453 | if ( !(*it)->hasServiceType( "KAddressBook/View" ) ) | 457 | if ( !(*it)->hasServiceType( "KAddressBook/View" ) ) |
454 | continue; | 458 | continue; |
455 | 459 | ||
456 | KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().latin1() ); | 460 | KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().latin1() ); |
457 | 461 | ||
458 | if ( !factory ) { | 462 | if ( !factory ) { |
459 | kdDebug(5720) << "ViewManager::createViewFactories(): Factory creation failed" << endl; | 463 | kdDebug(5720) << "ViewManager::createViewFactories(): Factory creation failed" << endl; |
460 | continue; | 464 | continue; |
461 | } | 465 | } |
462 | 466 | ||
463 | ViewFactory *viewFactory = static_cast<ViewFactory*>( factory ); | 467 | ViewFactory *viewFactory = static_cast<ViewFactory*>( factory ); |
464 | 468 | ||
465 | if ( !viewFactory ) { | 469 | if ( !viewFactory ) { |
466 | kdDebug(5720) << "ViewManager::createViewFactories(): Cast failed" << endl; | 470 | kdDebug(5720) << "ViewManager::createViewFactories(): Cast failed" << endl; |
467 | continue; | 471 | continue; |
468 | } | 472 | } |
469 | 473 | ||
470 | mViewFactoryDict.insert( viewFactory->type(), viewFactory ); | 474 | mViewFactoryDict.insert( viewFactory->type(), viewFactory ); |
471 | } | 475 | } |
472 | 476 | ||
473 | #else //KAB_EMBEDDED | 477 | #else //KAB_EMBEDDED |
474 | ViewFactory* viewFactory = new IconViewFactory(); | 478 | ViewFactory* viewFactory = new IconViewFactory(); |
475 | mViewFactoryDict.insert( viewFactory->type(), viewFactory ); | 479 | mViewFactoryDict.insert( viewFactory->type(), viewFactory ); |
476 | // qDebug("ViewManager::createViewFactories() Loading factory: %s", viewFactory->type().latin1()); | 480 | // qDebug("ViewManager::createViewFactories() Loading factory: %s", viewFactory->type().latin1()); |
477 | 481 | ||
478 | viewFactory = new TableViewFactory(); | 482 | viewFactory = new TableViewFactory(); |
479 | mViewFactoryDict.insert( viewFactory->type(), viewFactory ); | 483 | mViewFactoryDict.insert( viewFactory->type(), viewFactory ); |
480 | // qDebug("ViewManager::createViewFactories() Loading factory: %s", viewFactory->type().latin1()); | 484 | // qDebug("ViewManager::createViewFactories() Loading factory: %s", viewFactory->type().latin1()); |
481 | 485 | ||
482 | viewFactory = new CardViewFactory(); | 486 | viewFactory = new CardViewFactory(); |
483 | mViewFactoryDict.insert( viewFactory->type(), viewFactory ); | 487 | mViewFactoryDict.insert( viewFactory->type(), viewFactory ); |
484 | // qDebug("ViewManager::createViewFactories() Loading factory: %s", viewFactory->type().latin1()); | 488 | // qDebug("ViewManager::createViewFactories() Loading factory: %s", viewFactory->type().latin1()); |
485 | 489 | ||
486 | #endif //KAB_EMBEDDED | 490 | #endif //KAB_EMBEDDED |
487 | 491 | ||
488 | } | 492 | } |
489 | 493 | ||
490 | void ViewManager::dropped( QDropEvent *e ) | 494 | void ViewManager::dropped( QDropEvent *e ) |
491 | { | 495 | { |
492 | kdDebug(5720) << "ViewManager::dropped: got a drop event" << endl; | ||
493 | 496 | ||
494 | #ifndef KAB_EMBEDDED | 497 | #ifndef KAB_EMBEDDED |
495 | 498 | ||
496 | QString clipText, vcards; | 499 | QString clipText, vcards; |
497 | KURL::List urls; | 500 | KURL::List urls; |
498 | 501 | ||
499 | if ( KURLDrag::decode( e, urls) ) { | 502 | if ( KURLDrag::decode( e, urls) ) { |
500 | KURL::List::Iterator it = urls.begin(); | 503 | KURL::List::Iterator it = urls.begin(); |
501 | int c = urls.count(); | 504 | int c = urls.count(); |
502 | if ( c > 1 ) { | 505 | if ( c > 1 ) { |
503 | QString questionString = i18n( "Import one contact into your addressbook?", "Import %n contacts into your addressbook?", c ); | 506 | QString questionString = i18n( "Import one contact into your addressbook?", "Import %n contacts into your addressbook?", c ); |
504 | if ( KMessageBox::questionYesNo( this, questionString, i18n( "Import Contacts?" ) ) == KMessageBox::Yes ) { | 507 | if ( KMessageBox::questionYesNo( this, questionString, i18n( "Import Contacts?" ) ) == KMessageBox::Yes ) { |
505 | for ( ; it != urls.end(); ++it ) | 508 | for ( ; it != urls.end(); ++it ) |
506 | emit urlDropped( *it ); | 509 | emit urlDropped( *it ); |
507 | } | 510 | } |
508 | } else if ( c == 1 ) | 511 | } else if ( c == 1 ) |
509 | emit urlDropped( *it ); | 512 | emit urlDropped( *it ); |
510 | } else if ( KVCardDrag::decode( e, vcards ) ) { | 513 | } else if ( KVCardDrag::decode( e, vcards ) ) { |
511 | KABC::Addressee addr; | 514 | KABC::Addressee addr; |
512 | KABC::VCardConverter converter; | 515 | KABC::VCardConverter converter; |
513 | QStringList list = QStringList::split( "\r\n\r\n", vcards ); | 516 | QStringList list = QStringList::split( "\r\n\r\n", vcards ); |
514 | QStringList::Iterator it; | 517 | QStringList::Iterator it; |
515 | for ( it = list.begin(); it != list.end(); ++it ) { | 518 | for ( it = list.begin(); it != list.end(); ++it ) { |
516 | if ( converter.vCardToAddressee( (*it).stripWhiteSpace(), addr ) ) { | 519 | if ( converter.vCardToAddressee( (*it).stripWhiteSpace(), addr ) ) { |
517 | KABC::Addressee a = mCore->addressBook()->findByUid( addr.uid() ); | 520 | KABC::Addressee a = mCore->addressBook()->findByUid( addr.uid() ); |
518 | if ( a.isEmpty() ) { | 521 | if ( a.isEmpty() ) { |
519 | mCore->addressBook()->insertAddressee( addr ); | 522 | mCore->addressBook()->insertAddressee( addr ); |
520 | emit modified(); | 523 | emit modified(); |
521 | } | 524 | } |
522 | } | 525 | } |
523 | } | 526 | } |
524 | 527 | ||
525 | mActiveView->refresh(); | 528 | mActiveView->refresh(); |
526 | } | 529 | } |
527 | #else //KAB_EMBEDDED | 530 | #else //KAB_EMBEDDED |
528 | qDebug("ViewManager::dropped() has to be changed!!" ); | 531 | qDebug("ViewManager::dropped() has to be changed!!" ); |
529 | #endif //KAB_EMBEDDED | 532 | #endif //KAB_EMBEDDED |
530 | 533 | ||
531 | } | 534 | } |
532 | 535 | ||
533 | void ViewManager::startDrag() | 536 | void ViewManager::startDrag() |
534 | { | 537 | { |
535 | kdDebug(5720) << "ViewManager::startDrag: starting to drag" << endl; | 538 | kdDebug(5720) << "ViewManager::startDrag: starting to drag" << endl; |
536 | 539 | ||
537 | #ifndef KAB_EMBEDDED | 540 | #ifndef KAB_EMBEDDED |
538 | 541 | ||
539 | // Get the list of all the selected addressees | 542 | // Get the list of all the selected addressees |
540 | KABC::Addressee::List addrList; | 543 | KABC::Addressee::List addrList; |
541 | QStringList uidList = selectedUids(); | 544 | QStringList uidList = selectedUids(); |
542 | QStringList::Iterator iter; | 545 | QStringList::Iterator iter; |
543 | for ( iter = uidList.begin(); iter != uidList.end(); ++iter ) | 546 | for ( iter = uidList.begin(); iter != uidList.end(); ++iter ) |
544 | addrList.append( mCore->addressBook()->findByUid( *iter ) ); | 547 | addrList.append( mCore->addressBook()->findByUid( *iter ) ); |
545 | 548 | ||
546 | KMultipleDrag *drag = new KMultipleDrag( this ); | 549 | KMultipleDrag *drag = new KMultipleDrag( this ); |
547 | drag->addDragObject( new QTextDrag( AddresseeUtil::addresseesToClipboard(addrList), this ) ); | 550 | drag->addDragObject( new QTextDrag( AddresseeUtil::addresseesToClipboard(addrList), this ) ); |
548 | KABC::Addressee::List::Iterator it; | 551 | KABC::Addressee::List::Iterator it; |
549 | QStringList vcards; | 552 | QStringList vcards; |
550 | for ( it = addrList.begin(); it != addrList.end(); ++it ) { | 553 | for ( it = addrList.begin(); it != addrList.end(); ++it ) { |
551 | QString vcard = QString::null; | 554 | QString vcard = QString::null; |
552 | KABC::VCardConverter converter; | 555 | KABC::VCardConverter converter; |
553 | if ( converter.addresseeToVCard( *it, vcard ) ) | 556 | if ( converter.addresseeToVCard( *it, vcard ) ) |
554 | vcards.append( vcard ); | 557 | vcards.append( vcard ); |
555 | } | 558 | } |
556 | drag->addDragObject( new KVCardDrag( vcards.join( "\r\n" ), this ) ); | 559 | drag->addDragObject( new KVCardDrag( vcards.join( "\r\n" ), this ) ); |
557 | 560 | ||
558 | drag->setPixmap( KGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) ); | 561 | drag->setPixmap( KGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) ); |
559 | drag->dragCopy(); | 562 | drag->dragCopy(); |
560 | 563 | ||
561 | #else //KAB_EMBEDDED | 564 | #else //KAB_EMBEDDED |
562 | qDebug("ViewManager::startDrag() has to be changed!!" ); | 565 | qDebug("ViewManager::startDrag() has to be changed!!" ); |
563 | #endif //KAB_EMBEDDED | 566 | #endif //KAB_EMBEDDED |
564 | 567 | ||
565 | } | 568 | } |
566 | void ViewManager::doSearch( const QString& s,KABC::Field *field ) | 569 | void ViewManager::doSearch( const QString& s,KABC::Field *field ) |
567 | { | 570 | { |
568 | if ( mActiveView ) | 571 | if ( mActiveView ) |
569 | mActiveView->doSearch( s, field ); | 572 | mActiveView->doSearch( s, field ); |
570 | 573 | ||
571 | } | 574 | } |
572 | void ViewManager::setActiveFilter( int index ) | 575 | void ViewManager::setActiveFilter( int index ) |
573 | { | 576 | { |
574 | Filter currentFilter; | 577 | Filter currentFilter; |
575 | 578 | ||
576 | if ( ( index - 1 ) < 0 ) | 579 | if ( ( index - 1 ) < 0 ) |
577 | currentFilter = Filter(); | 580 | currentFilter = Filter(); |
578 | else | 581 | else |
579 | currentFilter = mFilterList[ index - 1 ]; | 582 | currentFilter = mFilterList[ index - 1 ]; |
580 | 583 | ||
581 | // Check if we have a view. Since the filter combo is created before | 584 | // Check if we have a view. Since the filter combo is created before |
582 | // the view, this slot could be called before there is a valid view. | 585 | // the view, this slot could be called before there is a valid view. |
583 | if ( mActiveView ) { | 586 | if ( mActiveView ) { |
584 | mActiveView->setFilter( currentFilter ); | 587 | mActiveView->setFilter( currentFilter ); |
585 | mActiveView->refresh(); | 588 | mActiveView->refresh(); |
586 | emit selected( QString::null ); | 589 | emit selected( QString::null ); |
587 | } | 590 | } |
588 | } | 591 | } |
589 | 592 | ||
590 | void ViewManager::configureFilters() | 593 | void ViewManager::configureFilters() |
591 | { | 594 | { |
592 | FilterDialog dlg( this ); | 595 | FilterDialog dlg( this ); |
593 | 596 | ||
594 | dlg.setFilters( mFilterList ); | 597 | dlg.setFilters( mFilterList ); |
595 | 598 | ||
596 | if ( dlg.exec() ) | 599 | if ( dlg.exec() ) |
597 | mFilterList = dlg.filters(); | 600 | mFilterList = dlg.filters(); |
598 | 601 | ||
599 | uint pos = mActionSelectFilter->currentItem(); | 602 | uint pos = mActionSelectFilter->currentItem(); |
600 | mActionSelectFilter->setItems( filterNames() ); | 603 | mActionSelectFilter->setItems( filterNames() ); |
601 | mActionSelectFilter->setCurrentItem( pos ); | 604 | mActionSelectFilter->setCurrentItem( pos ); |
602 | setActiveFilter( pos ); | 605 | setActiveFilter( pos ); |
603 | int cw = 150; | 606 | int cw = 150; |
604 | if (QApplication::desktop()->width() == 480 ) | 607 | if (QApplication::desktop()->width() == 480 ) |
605 | cw = 0; | 608 | cw = 0; |
606 | mActionSelectFilter->setComboWidth( cw ); | 609 | mActionSelectFilter->setComboWidth( cw ); |
607 | saveSettings(); | 610 | saveSettings(); |
608 | } | 611 | } |
609 | 612 | ||
610 | QStringList ViewManager::filterNames() const | 613 | QStringList ViewManager::filterNames() const |
611 | { | 614 | { |
612 | QStringList names( i18n( "No Filter" ) ); | 615 | QStringList names( i18n( "No Filter" ) ); |
613 | 616 | ||
614 | Filter::List::ConstIterator it; | 617 | Filter::List::ConstIterator it; |
615 | for ( it = mFilterList.begin(); it != mFilterList.end(); ++it ) | 618 | for ( it = mFilterList.begin(); it != mFilterList.end(); ++it ) |
616 | names.append( (*it).name() ); | 619 | names.append( (*it).name() ); |
617 | 620 | ||
618 | return names; | 621 | return names; |
619 | } | 622 | } |
620 | Filter ViewManager::getFilterByName( const QString &name ) const | 623 | Filter ViewManager::getFilterByName( const QString &name ) const |
621 | { | 624 | { |
622 | Filter::List::ConstIterator it; | 625 | Filter::List::ConstIterator it; |
623 | for ( it = mFilterList.begin(); it != mFilterList.end(); ++it ) | 626 | for ( it = mFilterList.begin(); it != mFilterList.end(); ++it ) |
624 | if ( name == (*it).name() ) | 627 | if ( name == (*it).name() ) |
625 | return (*it); | 628 | return (*it); |
626 | 629 | ||
627 | return Filter(); | 630 | return Filter(); |
628 | } | 631 | } |
629 | 632 | ||
630 | int ViewManager::filterPosition( const QString &name ) const | 633 | int ViewManager::filterPosition( const QString &name ) const |
631 | { | 634 | { |
632 | int pos = 0; | 635 | int pos = 0; |
633 | 636 | ||
634 | Filter::List::ConstIterator it; | 637 | Filter::List::ConstIterator it; |
635 | for ( it = mFilterList.begin(); it != mFilterList.end(); ++it, ++pos ) | 638 | for ( it = mFilterList.begin(); it != mFilterList.end(); ++it, ++pos ) |
636 | if ( name == (*it).name() ) | 639 | if ( name == (*it).name() ) |
637 | return pos + 1; | 640 | return pos + 1; |
638 | 641 | ||
639 | return 0; | 642 | return 0; |
640 | } | 643 | } |
641 | 644 | ||
642 | void ViewManager::initActions() | 645 | void ViewManager::initActions() |
643 | { | 646 | { |
644 | //US <ActionList name="view_loadedviews"/> | 647 | //US <ActionList name="view_loadedviews"/> |
645 | //US <Separator/> | 648 | //US <Separator/> |
646 | 649 | ||
647 | #ifdef KAB_EMBEDDED | 650 | #ifdef KAB_EMBEDDED |
648 | QPopupMenu *viewmenu = (QPopupMenu*)mCore->getViewMenu(); | 651 | QPopupMenu *viewmenu = (QPopupMenu*)mCore->getViewMenu(); |
649 | QPopupMenu *settingsmenu = (QPopupMenu*)mCore->getSettingsMenu(); | 652 | QPopupMenu *settingsmenu = (QPopupMenu*)mCore->getSettingsMenu(); |
650 | QPopupMenu *filtermenu = (QPopupMenu*)mCore->getFilterMenu(); | 653 | QPopupMenu *filtermenu = (QPopupMenu*)mCore->getFilterMenu(); |
651 | #endif //KAB_EMBEDDED | 654 | #endif //KAB_EMBEDDED |
652 | 655 | ||
653 | mActionSelectView = new KSelectAction( i18n( "Select View" ), 0, mCore->actionCollection(), "select_view" ); | 656 | mActionSelectView = new KSelectAction( i18n( "Select View" ), 0, mCore->actionCollection(), "select_view" ); |
654 | #if KDE_VERSION >= 309 | 657 | #if KDE_VERSION >= 309 |
655 | mActionSelectView->setMenuAccelsEnabled( false ); | 658 | mActionSelectView->setMenuAccelsEnabled( false ); |
656 | #endif | 659 | #endif |
657 | connect( mActionSelectView, SIGNAL( activated( const QString& ) ), | 660 | connect( mActionSelectView, SIGNAL( activated( const QString& ) ), |
658 | SLOT( setActiveView( const QString& ) ) ); | 661 | SLOT( selectView( const QString& ) ) ); |
659 | 662 | ||
660 | 663 | ||
661 | #ifdef KAB_EMBEDDED | 664 | #ifdef KAB_EMBEDDED |
662 | mActionSelectView->plug(viewmenu); | 665 | mActionSelectView->plug(viewmenu); |
663 | viewmenu->insertSeparator(); | 666 | viewmenu->insertSeparator(); |
664 | #endif //KAB_EMBEDDED | 667 | #endif //KAB_EMBEDDED |
665 | 668 | ||
666 | KAction *action; | 669 | KAction *action; |
667 | 670 | ||
668 | action = new KAction( i18n( "Modify View..." ), "configure", 0, this, | 671 | action = new KAction( i18n( "Modify View..." ), "configure", 0, this, |
669 | SLOT( editView() ), mCore->actionCollection(), "view_modify" ); | 672 | SLOT( editView() ), mCore->actionCollection(), "view_modify" ); |
670 | #ifndef KAB_EMBEDDED | 673 | #ifndef KAB_EMBEDDED |
671 | action->setWhatsThis( i18n( "By pressing this button a dialog opens that allows you to modify the view of the addressbook. There you can add or remove fields that you want to be shown or hidden in the addressbook like the name for example." ) ); | 674 | action->setWhatsThis( i18n( "By pressing this button a dialog opens that allows you to modify the view of the addressbook. There you can add or remove fields that you want to be shown or hidden in the addressbook like the name for example." ) ); |
672 | #else //KAB_EMBEDDED | 675 | #else //KAB_EMBEDDED |
673 | action->plug(viewmenu); | 676 | action->plug(viewmenu); |
674 | #endif //KAB_EMBEDDED | 677 | #endif //KAB_EMBEDDED |
675 | 678 | ||
676 | action = new KAction( i18n( "Add View..." ), "window_new", 0, this, | 679 | action = new KAction( i18n( "Add View..." ), "window_new", 0, this, |
677 | SLOT( addView() ), mCore->actionCollection(), "view_add" ); | 680 | SLOT( addView() ), mCore->actionCollection(), "view_add" ); |
678 | #ifndef KAB_EMBEDDED | 681 | #ifndef KAB_EMBEDDED |
679 | action->setWhatsThis( i18n( "You can add a new view by choosing one of the dialog that appears after pressing the button. You have to give the view a name, so that you can distinguish between the different views." ) ); | 682 | action->setWhatsThis( i18n( "You can add a new view by choosing one of the dialog that appears after pressing the button. You have to give the view a name, so that you can distinguish between the different views." ) ); |
680 | #else //KAB_EMBEDDED | 683 | #else //KAB_EMBEDDED |
681 | action->plug(viewmenu); | 684 | action->plug(viewmenu); |
682 | #endif //KAB_EMBEDDED | 685 | #endif //KAB_EMBEDDED |
683 | 686 | ||
684 | mActionDeleteView = new KAction( i18n( "Delete View" ), "view_remove", 0, | 687 | mActionDeleteView = new KAction( i18n( "Delete View" ), "view_remove", 0, |
685 | this, SLOT( deleteView() ), | 688 | this, SLOT( deleteView() ), |
686 | mCore->actionCollection(), "view_delete" ); | 689 | mCore->actionCollection(), "view_delete" ); |
687 | #ifndef KAB_EMBEDDED | 690 | #ifndef KAB_EMBEDDED |
688 | mActionDeleteView->setWhatsThis( i18n( "By pressing this button you can delete the actual view, which you have added before." ) ); | 691 | mActionDeleteView->setWhatsThis( i18n( "By pressing this button you can delete the actual view, which you have added before." ) ); |
689 | #else //KAB_EMBEDDED | 692 | #else //KAB_EMBEDDED |
690 | mActionDeleteView->plug(viewmenu); | 693 | mActionDeleteView->plug(viewmenu); |
691 | viewmenu->insertSeparator(); | 694 | viewmenu->insertSeparator(); |
692 | #endif //KAB_EMBEDDED | 695 | #endif //KAB_EMBEDDED |
693 | 696 | ||
694 | #ifndef KAB_EMBEDDED | 697 | #ifndef KAB_EMBEDDED |
695 | action = new KAction( i18n( "Refresh View" ), "reload", 0, this, | 698 | action = new KAction( i18n( "Refresh View" ), "reload", 0, this, |
696 | SLOT( refreshView(const QString &) ), mCore->actionCollection(), | 699 | SLOT( refreshView(const QString &) ), mCore->actionCollection(), |
697 | "view_refresh" ); | 700 | "view_refresh" ); |
698 | action->setWhatsThis( i18n( "The view will be refreshed by pressing this button." ) ); | 701 | action->setWhatsThis( i18n( "The view will be refreshed by pressing this button." ) ); |
699 | #else //KAB_EMBEDDED | 702 | #else //KAB_EMBEDDED |
700 | action = new KAction( i18n( "Refresh View" ), "reload", 0, this, | 703 | action = new KAction( i18n( "Refresh View" ), "reload", 0, this, |
701 | SLOT( refreshView()), mCore->actionCollection(), | 704 | SLOT( refreshView()), mCore->actionCollection(), |
702 | "view_refresh" ); | 705 | "view_refresh" ); |
703 | action->plug(viewmenu); | 706 | action->plug(viewmenu); |
704 | viewmenu->insertSeparator(); | 707 | viewmenu->insertSeparator(); |
705 | #endif //KAB_EMBEDDED | 708 | #endif //KAB_EMBEDDED |
706 | 709 | ||
707 | action = new KAction( i18n( "Edit &Filters..." ), "filter", 0, this, | 710 | action = new KAction( i18n( "Edit &Filters..." ), "filter", 0, this, |
708 | SLOT( configureFilters() ), mCore->actionCollection(), | 711 | SLOT( configureFilters() ), mCore->actionCollection(), |
709 | "options_edit_filters" ); | 712 | "options_edit_filters" ); |
710 | 713 | ||
711 | mActionSelectFilter = new KSelectAction( i18n( "Select Filter" ), "filter", mCore->actionCollection(), "select_filter" ); | 714 | mActionSelectFilter = new KSelectAction( i18n( "Select Filter" ), "filter", mCore->actionCollection(), "select_filter" ); |
712 | #if KDE_VERSION >= 309 | 715 | #if KDE_VERSION >= 309 |
713 | mActionSelectFilter->setMenuAccelsEnabled( false ); | 716 | mActionSelectFilter->setMenuAccelsEnabled( false ); |
714 | #endif | 717 | #endif |
715 | connect( mActionSelectFilter, SIGNAL( activated( int ) ), | 718 | connect( mActionSelectFilter, SIGNAL( activated( int ) ), |
716 | SLOT( setActiveFilter( int ) ) ); | 719 | SLOT( setActiveFilter( int ) ) ); |
717 | 720 | ||
718 | #ifdef KAB_EMBEDDED | 721 | #ifdef KAB_EMBEDDED |
719 | action->plug(settingsmenu); | 722 | action->plug(settingsmenu); |
720 | mActionSelectFilter->plug(viewmenu); | 723 | mActionSelectFilter->plug(viewmenu); |
721 | #endif //KAB_EMBEDDED | 724 | #endif //KAB_EMBEDDED |
722 | 725 | ||
723 | } | 726 | } |
724 | 727 | ||
725 | void ViewManager::initGUI() | 728 | void ViewManager::initGUI() |
726 | { | 729 | { |
727 | QHBoxLayout *layout = new QHBoxLayout( this, 0, 0 ); | 730 | QHBoxLayout *layout = new QHBoxLayout( this, 0, 0 ); |
728 | mViewWidgetStack = new QWidgetStack( this ); | 731 | mViewWidgetStack = new QWidgetStack( this ); |
729 | layout->addWidget( mViewWidgetStack ); | 732 | layout->addWidget( mViewWidgetStack ); |
730 | } | 733 | } |
731 | 734 | ||
732 | #ifndef KAB_EMBEDDED | 735 | #ifndef KAB_EMBEDDED |
733 | #include "viewmanager.moc" | 736 | #include "viewmanager.moc" |
734 | #endif //KAB_EMBEDDED | 737 | #endif //KAB_EMBEDDED |
diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h index dff9998..ab5d372 100644 --- a/kaddressbook/viewmanager.h +++ b/kaddressbook/viewmanager.h | |||
@@ -1,160 +1,161 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KAddressBook. | 2 | This file is part of KAddressBook. |
3 | Copyright (c) 2002 Mike Pilone <mpilone@slac.com> | 3 | Copyright (c) 2002 Mike Pilone <mpilone@slac.com> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #ifndef VIEWMANAGER_H | 24 | #ifndef VIEWMANAGER_H |
25 | #define VIEWMANAGER_H | 25 | #define VIEWMANAGER_H |
26 | 26 | ||
27 | #include <qwidget.h> | 27 | #include <qwidget.h> |
28 | #include <qstringlist.h> | 28 | #include <qstringlist.h> |
29 | #include <kaddressbookview.h> | 29 | #include <kaddressbookview.h> |
30 | #include <qdict.h> | 30 | #include <qdict.h> |
31 | #include "filter.h" | 31 | #include "filter.h" |
32 | 32 | ||
33 | class KAction; | 33 | class KAction; |
34 | class KSelectAction; | 34 | class KSelectAction; |
35 | 35 | ||
36 | class KABCore; | 36 | class KABCore; |
37 | class QWidgetStack; | 37 | class QWidgetStack; |
38 | class QDropEvent; | 38 | class QDropEvent; |
39 | 39 | ||
40 | namespace KABC { class AddressBook; } | 40 | namespace KABC { class AddressBook; } |
41 | 41 | ||
42 | /** | 42 | /** |
43 | The view manager manages the views and everything related to them. The | 43 | The view manager manages the views and everything related to them. The |
44 | manager will load the views at startup and display a view when told to | 44 | manager will load the views at startup and display a view when told to |
45 | make one active. | 45 | make one active. |
46 | 46 | ||
47 | The view manager will also create and manage all dialogs directly related to | 47 | The view manager will also create and manage all dialogs directly related to |
48 | views (ie: AddView, ConfigureView, DeleteView, etc). | 48 | views (ie: AddView, ConfigureView, DeleteView, etc). |
49 | */ | 49 | */ |
50 | class ViewManager : public QWidget | 50 | class ViewManager : public QWidget |
51 | { | 51 | { |
52 | Q_OBJECT | 52 | Q_OBJECT |
53 | public: | 53 | public: |
54 | ViewManager( KABCore *core, QWidget *parent, const char *name = 0 ); | 54 | ViewManager( KABCore *core, QWidget *parent, const char *name = 0 ); |
55 | ~ViewManager(); | 55 | ~ViewManager(); |
56 | 56 | ||
57 | void restoreSettings(); | 57 | void restoreSettings(); |
58 | void saveSettings(); | 58 | void saveSettings(); |
59 | void doSearch( const QString& s ,KABC::Field *field ); | 59 | void doSearch( const QString& s ,KABC::Field *field ); |
60 | 60 | ||
61 | void unloadViews(); | 61 | void unloadViews(); |
62 | KSelectAction * getFilterAction() { return mActionSelectFilter; } | 62 | KSelectAction * getFilterAction() { return mActionSelectFilter; } |
63 | Filter getFilterByName( const QString &name ) const; | 63 | Filter getFilterByName( const QString &name ) const; |
64 | 64 | ||
65 | QStringList selectedUids() const; | 65 | QStringList selectedUids() const; |
66 | QStringList selectedEmails() const; | 66 | QStringList selectedEmails() const; |
67 | KABC::Addressee::List selectedAddressees() const; | 67 | KABC::Addressee::List selectedAddressees() const; |
68 | void setListSelected(QStringList); | 68 | void setListSelected(QStringList); |
69 | void setFocusAV(); | 69 | void setFocusAV(); |
70 | 70 | ||
71 | public slots: | 71 | public slots: |
72 | void printView() { if (mActiveView) mActiveView->printMyView() ;} | 72 | void printView() { if (mActiveView) mActiveView->printMyView() ;} |
73 | void scrollUP(); | 73 | void scrollUP(); |
74 | void scrollDOWN(); | 74 | void scrollDOWN(); |
75 | 75 | ||
76 | //US void setSelected( const QString &uid = QString::null, bool selected = true ); | 76 | //US void setSelected( const QString &uid = QString::null, bool selected = true ); |
77 | void setSelected( const QString &uid, bool); | 77 | void setSelected( const QString &uid, bool); |
78 | //US added another method with no parameter, since my moc compiler does not support default parameters. | 78 | //US added another method with no parameter, since my moc compiler does not support default parameters. |
79 | void setSelected(); | 79 | void setSelected(); |
80 | 80 | ||
81 | 81 | ||
82 | 82 | ||
83 | //US added another method with no parameter, since my moc compiler does not support default parameters. | 83 | //US added another method with no parameter, since my moc compiler does not support default parameters. |
84 | void refreshView(); | 84 | void refreshView(); |
85 | void refreshView( const QString &uid); | 85 | void refreshView( const QString &uid); |
86 | 86 | ||
87 | void editView(); | 87 | void editView(); |
88 | void deleteView(); | 88 | void deleteView(); |
89 | void addView(); | 89 | void addView(); |
90 | 90 | ||
91 | protected slots: | 91 | protected slots: |
92 | /** | 92 | /** |
93 | Called whenever the user drops something in the active view. | 93 | Called whenever the user drops something in the active view. |
94 | This method will try to decode what was dropped, and if it was | 94 | This method will try to decode what was dropped, and if it was |
95 | a valid addressee, add it to the addressbook. | 95 | a valid addressee, add it to the addressbook. |
96 | */ | 96 | */ |
97 | void dropped( QDropEvent* ); | 97 | void dropped( QDropEvent* ); |
98 | 98 | ||
99 | /** | 99 | /** |
100 | Called whenever the user attempts to start a drag in the view. | 100 | Called whenever the user attempts to start a drag in the view. |
101 | This method will convert all the selected addressees into text (vcard) | 101 | This method will convert all the selected addressees into text (vcard) |
102 | and create a drag object. | 102 | and create a drag object. |
103 | */ | 103 | */ |
104 | void startDrag(); | 104 | void startDrag(); |
105 | 105 | ||
106 | signals: | 106 | signals: |
107 | /** | 107 | /** |
108 | Emitted whenever the user selects an entry in the view. | 108 | Emitted whenever the user selects an entry in the view. |
109 | */ | 109 | */ |
110 | void selected( const QString &uid ); | 110 | void selected( const QString &uid ); |
111 | void deleteRequest( ); | 111 | void deleteRequest( ); |
112 | 112 | ||
113 | /** | 113 | /** |
114 | Emitted whenever the user activates an entry in the view. | 114 | Emitted whenever the user activates an entry in the view. |
115 | */ | 115 | */ |
116 | void executed( const QString &uid ); | 116 | void executed( const QString &uid ); |
117 | 117 | ||
118 | /** | 118 | /** |
119 | Emitted whenever the address book is modified in some way. | 119 | Emitted whenever the address book is modified in some way. |
120 | */ | 120 | */ |
121 | void modified(); | 121 | void modified(); |
122 | 122 | ||
123 | /** | 123 | /** |
124 | Emitted whenever a url is dragged on a view. | 124 | Emitted whenever a url is dragged on a view. |
125 | */ | 125 | */ |
126 | void urlDropped( const KURL& ); | 126 | void urlDropped( const KURL& ); |
127 | 127 | ||
128 | private slots: | 128 | private slots: |
129 | void selectView( const QString &name ); | ||
129 | void setActiveView( const QString &name ); | 130 | void setActiveView( const QString &name ); |
130 | void setActiveFilter( int index ); | 131 | void setActiveFilter( int index ); |
131 | void configureFilters(); | 132 | void configureFilters(); |
132 | 133 | ||
133 | private: | 134 | private: |
134 | void createViewFactories(); | 135 | void createViewFactories(); |
135 | QStringList filterNames() const; | 136 | QStringList filterNames() const; |
136 | int filterPosition( const QString &name ) const; | 137 | int filterPosition( const QString &name ) const; |
137 | QStringList viewNames() const; | 138 | QStringList viewNames() const; |
138 | int viewPosition( const QString &name ) const; | 139 | int viewPosition( const QString &name ) const; |
139 | void initActions(); | 140 | void initActions(); |
140 | void initGUI(); | 141 | void initGUI(); |
141 | 142 | ||
142 | KABCore *mCore; | 143 | KABCore *mCore; |
143 | 144 | ||
144 | Filter mCurrentFilter; | 145 | Filter mCurrentFilter; |
145 | Filter::List mFilterList; | 146 | Filter::List mFilterList; |
146 | 147 | ||
147 | QDict<KAddressBookView> mViewDict; | 148 | QDict<KAddressBookView> mViewDict; |
148 | QDict<ViewFactory> mViewFactoryDict; | 149 | QDict<ViewFactory> mViewFactoryDict; |
149 | QStringList mViewNameList; | 150 | QStringList mViewNameList; |
150 | 151 | ||
151 | QWidgetStack *mViewWidgetStack; | 152 | QWidgetStack *mViewWidgetStack; |
152 | KAddressBookView *mActiveView; | 153 | KAddressBookView *mActiveView; |
153 | 154 | ||
154 | KAction *mActionDeleteView; | 155 | KAction *mActionDeleteView; |
155 | KSelectAction *mActionSelectFilter; | 156 | KSelectAction *mActionSelectFilter; |
156 | KSelectAction *mActionSelectView; | 157 | KSelectAction *mActionSelectView; |
157 | 158 | ||
158 | }; | 159 | }; |
159 | 160 | ||
160 | #endif | 161 | #endif |
diff --git a/microkde/kdeui/ktoolbar.cpp b/microkde/kdeui/ktoolbar.cpp index e9226c0..1ad1728 100644 --- a/microkde/kdeui/ktoolbar.cpp +++ b/microkde/kdeui/ktoolbar.cpp | |||
@@ -1033,769 +1033,769 @@ int KToolBar::iconSize() const | |||
1033 | void KToolBar::setEnableContextMenu(bool enable ) | 1033 | void KToolBar::setEnableContextMenu(bool enable ) |
1034 | { | 1034 | { |
1035 | d->m_enableContext = enable; | 1035 | d->m_enableContext = enable; |
1036 | } | 1036 | } |
1037 | 1037 | ||
1038 | 1038 | ||
1039 | bool KToolBar::contextMenuEnabled() const | 1039 | bool KToolBar::contextMenuEnabled() const |
1040 | { | 1040 | { |
1041 | return d->m_enableContext; | 1041 | return d->m_enableContext; |
1042 | } | 1042 | } |
1043 | 1043 | ||
1044 | 1044 | ||
1045 | void KToolBar::setItemNoStyle(int id, bool no_style ) | 1045 | void 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 | ||
1057 | void KToolBar::setFlat (bool flag) | 1057 | void 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 | ||
1075 | int KToolBar::count() const | 1075 | int KToolBar::count() const |
1076 | { | 1076 | { |
1077 | return id2widget.count(); | 1077 | return id2widget.count(); |
1078 | } | 1078 | } |
1079 | 1079 | ||
1080 | 1080 | ||
1081 | void KToolBar::saveState() | 1081 | void 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 | ||
1147 | QString KToolBar::settingsGroup() | 1147 | QString 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 | ||
1162 | void KToolBar::saveSettings(KConfig *config, const QString &_configGroup) | 1162 | void KToolBar::saveSettings(KConfig *config, const QString &_configGroup) |
1163 | { | 1163 | { |
1164 | QString configGroup = _configGroup; | 1164 | QString configGroup = _configGroup; |
1165 | if (configGroup.isEmpty()) | 1165 | if (configGroup.isEmpty()) |
1166 | configGroup = settingsGroup(); | 1166 | configGroup = settingsGroup(); |
1167 | //kdDebug(220) << "KToolBar::saveSettings group=" << _configGroup << " -> " << configGroup << endl; | 1167 | //kdDebug(220) << "KToolBar::saveSettings group=" << _configGroup << " -> " << configGroup << endl; |
1168 | 1168 | ||
1169 | QString position, icontext; | 1169 | QString position, icontext; |
1170 | int index; | 1170 | int index; |
1171 | getAttributes( position, icontext, index ); | 1171 | getAttributes( position, icontext, index ); |
1172 | 1172 | ||
1173 | //kdDebug(220) << "KToolBar::saveSettings " << name() << " newLine=" << newLine << endl; | 1173 | //kdDebug(220) << "KToolBar::saveSettings " << name() << " newLine=" << newLine << endl; |
1174 | 1174 | ||
1175 | KConfigGroupSaver saver(config, configGroup); | 1175 | KConfigGroupSaver saver(config, configGroup); |
1176 | 1176 | ||
1177 | if ( position != d->PositionDefault ) | 1177 | if ( position != d->PositionDefault ) |
1178 | config->writeEntry("Position", position); | 1178 | config->writeEntry("Position", position); |
1179 | else | 1179 | else |
1180 | config->deleteEntry("Position"); | 1180 | config->deleteEntry("Position"); |
1181 | 1181 | ||
1182 | if ( icontext != d->IconTextDefault ) | 1182 | if ( icontext != d->IconTextDefault ) |
1183 | config->writeEntry("IconText", icontext); | 1183 | config->writeEntry("IconText", icontext); |
1184 | else | 1184 | else |
1185 | config->deleteEntry("IconText"); | 1185 | config->deleteEntry("IconText"); |
1186 | 1186 | ||
1187 | if ( iconSize() != d->IconSizeDefault ) | 1187 | if ( iconSize() != d->IconSizeDefault ) |
1188 | config->writeEntry("IconSize", iconSize()); | 1188 | config->writeEntry("IconSize", iconSize()); |
1189 | else | 1189 | else |
1190 | config->deleteEntry("IconSize"); | 1190 | config->deleteEntry("IconSize"); |
1191 | 1191 | ||
1192 | if ( isHidden() != d->HiddenDefault ) | 1192 | if ( isHidden() != d->HiddenDefault ) |
1193 | config->writeEntry("Hidden", isHidden()); | 1193 | config->writeEntry("Hidden", isHidden()); |
1194 | else | 1194 | else |
1195 | config->deleteEntry("Hidden"); | 1195 | config->deleteEntry("Hidden"); |
1196 | 1196 | ||
1197 | if ( index != d->IndexDefault ) | 1197 | if ( index != d->IndexDefault ) |
1198 | config->writeEntry( "Index", index ); | 1198 | config->writeEntry( "Index", index ); |
1199 | else | 1199 | else |
1200 | config->deleteEntry("Index"); | 1200 | config->deleteEntry("Index"); |
1201 | //US the older version of KDE (used on the Zaurus) has no Offset property | 1201 | //US the older version of KDE (used on the Zaurus) has no Offset property |
1202 | /* if ( offset() != d->OffsetDefault ) | 1202 | /* if ( offset() != d->OffsetDefault ) |
1203 | config->writeEntry( "Offset", offset() ); | 1203 | config->writeEntry( "Offset", offset() ); |
1204 | else | 1204 | else |
1205 | */ | 1205 | */ |
1206 | config->deleteEntry("Offset"); | 1206 | config->deleteEntry("Offset"); |
1207 | 1207 | ||
1208 | //US the older version of KDE (used on the Zaurus) has no NewLine property | 1208 | //US the older version of KDE (used on the Zaurus) has no NewLine property |
1209 | /* | 1209 | /* |
1210 | if ( newLine() != d->NewLineDefault ) | 1210 | if ( newLine() != d->NewLineDefault ) |
1211 | config->writeEntry( "NewLine", newLine() ); | 1211 | config->writeEntry( "NewLine", newLine() ); |
1212 | else | 1212 | else |
1213 | */ | 1213 | */ |
1214 | config->deleteEntry("NewLine"); | 1214 | config->deleteEntry("NewLine"); |
1215 | } | 1215 | } |
1216 | 1216 | ||
1217 | void KToolBar::setXMLGUIClient( KXMLGUIClient *client ) | 1217 | void KToolBar::setXMLGUIClient( KXMLGUIClient *client ) |
1218 | { | 1218 | { |
1219 | d->m_xmlguiClient = client; | 1219 | d->m_xmlguiClient = client; |
1220 | } | 1220 | } |
1221 | 1221 | ||
1222 | void KToolBar::setText( const QString & txt ) | 1222 | void KToolBar::setText( const QString & txt ) |
1223 | { | 1223 | { |
1224 | //US setLabel( txt + " ( " + kapp->caption() + " ) " ); | 1224 | //US setLabel( txt + " ( " + kapp->caption() + " ) " ); |
1225 | setLabel( txt + " ( " + KGlobal::getAppName() + " ) " ); | 1225 | setLabel( txt + " ( " + KGlobal::getAppName() + " ) " ); |
1226 | } | 1226 | } |
1227 | 1227 | ||
1228 | 1228 | ||
1229 | QString KToolBar::text() const | 1229 | QString KToolBar::text() const |
1230 | { | 1230 | { |
1231 | return label(); | 1231 | return label(); |
1232 | } | 1232 | } |
1233 | 1233 | ||
1234 | 1234 | ||
1235 | void KToolBar::doConnections( KToolBarButton *button ) | 1235 | void KToolBar::doConnections( KToolBarButton *button ) |
1236 | { | 1236 | { |
1237 | connect(button, SIGNAL(clicked(int)), this, SIGNAL( clicked( int ) ) ); | 1237 | connect(button, SIGNAL(clicked(int)), this, SIGNAL( clicked( int ) ) ); |
1238 | connect(button, SIGNAL(doubleClicked(int)), this, SIGNAL( doubleClicked( int ) ) ); | 1238 | connect(button, SIGNAL(doubleClicked(int)), this, SIGNAL( doubleClicked( int ) ) ); |
1239 | connect(button, SIGNAL(released(int)), this, SIGNAL( released( int ) ) ); | 1239 | connect(button, SIGNAL(released(int)), this, SIGNAL( released( int ) ) ); |
1240 | connect(button, SIGNAL(pressed(int)), this, SIGNAL( pressed( int ) ) ); | 1240 | connect(button, SIGNAL(pressed(int)), this, SIGNAL( pressed( int ) ) ); |
1241 | connect(button, SIGNAL(toggled(int)), this, SIGNAL( toggled( int ) ) ); | 1241 | connect(button, SIGNAL(toggled(int)), this, SIGNAL( toggled( int ) ) ); |
1242 | connect(button, SIGNAL(highlighted(int, bool)), this, SIGNAL( highlighted( int, bool ) ) ); | 1242 | connect(button, SIGNAL(highlighted(int, bool)), this, SIGNAL( highlighted( int, bool ) ) ); |
1243 | } | 1243 | } |
1244 | 1244 | ||
1245 | void KToolBar::mousePressEvent ( QMouseEvent *m ) | 1245 | void KToolBar::mousePressEvent ( QMouseEvent *m ) |
1246 | { | 1246 | { |
1247 | if ( !mainWindow() ) | 1247 | if ( !mainWindow() ) |
1248 | return; | 1248 | return; |
1249 | QMainWindow *mw = mainWindow(); | 1249 | QMainWindow *mw = mainWindow(); |
1250 | if ( mw->toolBarsMovable() && d->m_enableContext ) { | 1250 | if ( mw->toolBarsMovable() && d->m_enableContext ) { |
1251 | if ( m->button() == RightButton ) { | 1251 | if ( m->button() == RightButton ) { |
1252 | int i = contextMenu()->exec( m->globalPos(), 0 ); | 1252 | int i = contextMenu()->exec( m->globalPos(), 0 ); |
1253 | switch ( i ) { | 1253 | switch ( i ) { |
1254 | case -1: | 1254 | case -1: |
1255 | return; // popup cancelled | 1255 | return; // popup cancelled |
1256 | case CONTEXT_LEFT: | 1256 | case CONTEXT_LEFT: |
1257 | //US mw->moveDockWindow( this, DockLeft ); | 1257 | //US mw->moveDockWindow( this, DockLeft ); |
1258 | mw->moveToolBar( this, QMainWindow::Left ); | 1258 | mw->moveToolBar( this, QMainWindow::Left ); |
1259 | break; | 1259 | break; |
1260 | case CONTEXT_RIGHT: | 1260 | case CONTEXT_RIGHT: |
1261 | //US mw->moveDockWindow( this, DockRight ); | 1261 | //US mw->moveDockWindow( this, DockRight ); |
1262 | mw->moveToolBar( this, QMainWindow::Right ); | 1262 | mw->moveToolBar( this, QMainWindow::Right ); |
1263 | break; | 1263 | break; |
1264 | case CONTEXT_TOP: | 1264 | case CONTEXT_TOP: |
1265 | //US mw->moveDockWindow( this, DockTop ); | 1265 | //US mw->moveDockWindow( this, DockTop ); |
1266 | mw->moveToolBar( this, QMainWindow::Top ); | 1266 | mw->moveToolBar( this, QMainWindow::Top ); |
1267 | break; | 1267 | break; |
1268 | case CONTEXT_BOTTOM: | 1268 | case CONTEXT_BOTTOM: |
1269 | //US mw->moveDockWindow( this, DockBottom ); | 1269 | //US mw->moveDockWindow( this, DockBottom ); |
1270 | mw->moveToolBar( this, QMainWindow::Bottom ); | 1270 | mw->moveToolBar( this, QMainWindow::Bottom ); |
1271 | break; | 1271 | break; |
1272 | case CONTEXT_FLOAT: | 1272 | case CONTEXT_FLOAT: |
1273 | break; | 1273 | break; |
1274 | case CONTEXT_FLAT: | 1274 | case CONTEXT_FLAT: |
1275 | //US mw->moveDockWindow( this, DockMinimized ); | 1275 | //US mw->moveDockWindow( this, DockMinimized ); |
1276 | mw->moveToolBar( this, QMainWindow::Minimized ); | 1276 | mw->moveToolBar( this, QMainWindow::Minimized ); |
1277 | break; | 1277 | break; |
1278 | case CONTEXT_ICONS: | 1278 | case CONTEXT_ICONS: |
1279 | setIconText( IconOnly ); | 1279 | setIconText( IconOnly ); |
1280 | break; | 1280 | break; |
1281 | case CONTEXT_TEXTRIGHT: | 1281 | case CONTEXT_TEXTRIGHT: |
1282 | setIconText( IconTextRight ); | 1282 | setIconText( IconTextRight ); |
1283 | break; | 1283 | break; |
1284 | case CONTEXT_TEXT: | 1284 | case CONTEXT_TEXT: |
1285 | setIconText( TextOnly ); | 1285 | setIconText( TextOnly ); |
1286 | break; | 1286 | break; |
1287 | case CONTEXT_TEXTUNDER: | 1287 | case CONTEXT_TEXTUNDER: |
1288 | setIconText( IconTextBottom ); | 1288 | setIconText( IconTextBottom ); |
1289 | break; | 1289 | break; |
1290 | default: | 1290 | default: |
1291 | if ( i >= CONTEXT_ICONSIZES ) | 1291 | if ( i >= CONTEXT_ICONSIZES ) |
1292 | setIconSize( i - CONTEXT_ICONSIZES ); | 1292 | setIconSize( i - CONTEXT_ICONSIZES ); |
1293 | else | 1293 | else |
1294 | return; // assume this was an action handled elsewhere, no need for setSettingsDirty() | 1294 | return; // assume this was an action handled elsewhere, no need for setSettingsDirty() |
1295 | } | 1295 | } |
1296 | /*US | 1296 | /*US |
1297 | if ( mw->inherits("KMainWindow") ) | 1297 | if ( mw->inherits("KMainWindow") ) |
1298 | static_cast<KMainWindow *>(mw)->setSettingsDirty(); | 1298 | static_cast<KMainWindow *>(mw)->setSettingsDirty(); |
1299 | */ | 1299 | */ |
1300 | } | 1300 | } |
1301 | } | 1301 | } |
1302 | } | 1302 | } |
1303 | 1303 | ||
1304 | 1304 | ||
1305 | void KToolBar::rebuildLayout() | 1305 | void KToolBar::rebuildLayout() |
1306 | { | 1306 | { |
1307 | 1307 | ||
1308 | for(QWidget *w=d->idleButtons.first(); w; w=d->idleButtons.next()) | 1308 | for(QWidget *w=d->idleButtons.first(); w; w=d->idleButtons.next()) |
1309 | w->blockSignals(false); | 1309 | w->blockSignals(false); |
1310 | d->idleButtons.clear(); | 1310 | d->idleButtons.clear(); |
1311 | 1311 | ||
1312 | layoutTimer->stop(); | 1312 | layoutTimer->stop(); |
1313 | QApplication::sendPostedEvents( this, QEvent::ChildInserted ); | 1313 | QApplication::sendPostedEvents( this, QEvent::ChildInserted ); |
1314 | QBoxLayout *l = boxLayout(); | 1314 | QBoxLayout *l = boxLayout(); |
1315 | l->setMargin( 1 ); | 1315 | l->setMargin( 1 ); |
1316 | // clear the old layout | 1316 | // clear the old layout |
1317 | QLayoutIterator it = l->iterator(); | 1317 | QLayoutIterator it = l->iterator(); |
1318 | 1318 | ||
1319 | while ( it.current() ) { | 1319 | while ( it.current() ) { |
1320 | it.deleteCurrent(); | 1320 | it.deleteCurrent(); |
1321 | } | 1321 | } |
1322 | for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { | 1322 | for ( QWidget *w = widgets.first(); w; w = widgets.next() ) { |
1323 | if ( w == rightAligned ) { | 1323 | if ( w == rightAligned ) { |
1324 | continue; | 1324 | continue; |
1325 | } | 1325 | } |
1326 | if ( w->inherits( "KToolBarSeparator" ) && | 1326 | if ( w->inherits( "KToolBarSeparator" ) && |
1327 | !( (KToolBarSeparator*)w )->showLine() ) { | 1327 | !( (KToolBarSeparator*)w )->showLine() ) { |
1328 | l->addSpacing( 6 ); | 1328 | l->addSpacing( 6 ); |
1329 | w->hide(); | 1329 | w->hide(); |
1330 | continue; | 1330 | continue; |
1331 | } | 1331 | } |
1332 | if ( w->inherits( "QPopupMenu" ) ) | 1332 | if ( w->inherits( "QPopupMenu" ) ) |
1333 | continue; | 1333 | continue; |
1334 | l->addWidget( w ); | 1334 | l->addWidget( w ); |
1335 | w->show(); | 1335 | w->show(); |
1336 | } | 1336 | } |
1337 | if ( rightAligned ) { | 1337 | if ( rightAligned ) { |
1338 | l->addStretch(); | 1338 | l->addStretch(); |
1339 | l->addWidget( rightAligned ); | 1339 | l->addWidget( rightAligned ); |
1340 | rightAligned->show(); | 1340 | rightAligned->show(); |
1341 | } | 1341 | } |
1342 | 1342 | ||
1343 | if ( fullSize() ) { | 1343 | if ( fullSize() ) { |
1344 | // This code sucks. It makes the last combo in a toolbar VERY big (e.g. zoom combo in kword). | 1344 | // This code sucks. It makes the last combo in a toolbar VERY big (e.g. zoom combo in kword). |
1345 | //if ( !stretchableWidget && widgets.last() && | 1345 | //if ( !stretchableWidget && widgets.last() && |
1346 | // !widgets.last()->inherits( "QButton" ) && !widgets.last()->inherits( "KAnimWidget" ) ) | 1346 | // !widgets.last()->inherits( "QButton" ) && !widgets.last()->inherits( "KAnimWidget" ) ) |
1347 | // setStretchableWidget( widgets.last() ); | 1347 | // setStretchableWidget( widgets.last() ); |
1348 | if ( !rightAligned ) | 1348 | if ( !rightAligned ) |
1349 | l->addStretch(); | 1349 | l->addStretch(); |
1350 | if ( stretchableWidget ) | 1350 | if ( stretchableWidget ) |
1351 | l->setStretchFactor( stretchableWidget, 10 ); | 1351 | l->setStretchFactor( stretchableWidget, 10 ); |
1352 | } | 1352 | } |
1353 | l->invalidate(); | 1353 | l->invalidate(); |
1354 | QApplication::postEvent( this, new QEvent( QEvent::LayoutHint ) ); | 1354 | QApplication::postEvent( this, new QEvent( QEvent::LayoutHint ) ); |
1355 | //#endif //DESKTOP_VERSION | 1355 | //#endif //DESKTOP_VERSION |
1356 | } | 1356 | } |
1357 | 1357 | ||
1358 | void KToolBar::childEvent( QChildEvent *e ) | 1358 | void KToolBar::childEvent( QChildEvent *e ) |
1359 | { | 1359 | { |
1360 | 1360 | ||
1361 | if ( e->child()->isWidgetType() ) { | 1361 | if ( e->child()->isWidgetType() ) { |
1362 | QWidget * w = (QWidget*)e->child(); | 1362 | QWidget * w = (QWidget*)e->child(); |
1363 | if ( e->type() == QEvent::ChildInserted ) { | 1363 | if ( e->type() == QEvent::ChildInserted ) { |
1364 | if ( !e->child()->inherits( "QPopupMenu" ) && | 1364 | if ( !e->child()->inherits( "QPopupMenu" ) && |
1365 | ::qstrcmp( "qt_dockwidget_internal", e->child()->name() ) != 0 ) { | 1365 | ::qstrcmp( "qt_dockwidget_internal", e->child()->name() ) != 0 ) { |
1366 | 1366 | ||
1367 | // prevent items that have been explicitly inserted by insert*() from | 1367 | // prevent items that have been explicitly inserted by insert*() from |
1368 | // being inserted again | 1368 | // being inserted again |
1369 | if ( !widget2id.contains( w ) ) | 1369 | if ( !widget2id.contains( w ) ) |
1370 | { | 1370 | { |
1371 | int dummy = -1; | 1371 | int dummy = -1; |
1372 | insertWidgetInternal( w, dummy, -1 ); | 1372 | insertWidgetInternal( w, dummy, -1 ); |
1373 | } | 1373 | } |
1374 | } | 1374 | } |
1375 | } else { | 1375 | } else { |
1376 | removeWidgetInternal( w ); | 1376 | removeWidgetInternal( w ); |
1377 | } | 1377 | } |
1378 | if ( isVisibleTo( 0 ) ) | 1378 | if ( isVisibleTo( 0 ) ) |
1379 | { | 1379 | { |
1380 | QBoxLayout *l = boxLayout(); | 1380 | QBoxLayout *l = boxLayout(); |
1381 | // QLayout *l = layout(); | 1381 | // QLayout *l = layout(); |
1382 | 1382 | ||
1383 | // clear the old layout so that we don't get unnecassery layout | 1383 | // clear the old layout so that we don't get unnecassery layout |
1384 | // changes till we have rebuild the thing | 1384 | // changes till we have rebuild the thing |
1385 | QLayoutIterator it = l->iterator(); | 1385 | QLayoutIterator it = l->iterator(); |
1386 | while ( it.current() ) { | 1386 | while ( it.current() ) { |
1387 | it.deleteCurrent(); | 1387 | it.deleteCurrent(); |
1388 | } | 1388 | } |
1389 | layoutTimer->start( 50, TRUE ); | 1389 | layoutTimer->start( 50, TRUE ); |
1390 | } | 1390 | } |
1391 | } | 1391 | } |
1392 | QToolBar::childEvent( e ); | 1392 | QToolBar::childEvent( e ); |
1393 | } | 1393 | } |
1394 | 1394 | ||
1395 | void KToolBar::insertWidgetInternal( QWidget *w, int &index, int id ) | 1395 | void KToolBar::insertWidgetInternal( QWidget *w, int &index, int id ) |
1396 | { | 1396 | { |
1397 | // we can't have it in widgets, or something is really wrong | 1397 | // we can't have it in widgets, or something is really wrong |
1398 | //widgets.removeRef( w ); | 1398 | //widgets.removeRef( w ); |
1399 | 1399 | ||
1400 | connect( w, SIGNAL( destroyed() ), | 1400 | connect( w, SIGNAL( destroyed() ), |
1401 | this, SLOT( widgetDestroyed() ) ); | 1401 | this, SLOT( widgetDestroyed() ) ); |
1402 | if ( index == -1 || index > (int)widgets.count() ) { | 1402 | if ( index == -1 || index > (int)widgets.count() ) { |
1403 | widgets.append( w ); | 1403 | widgets.append( w ); |
1404 | index = (int)widgets.count(); | 1404 | index = (int)widgets.count(); |
1405 | } | 1405 | } |
1406 | else | 1406 | else |
1407 | widgets.insert( index, w ); | 1407 | widgets.insert( index, w ); |
1408 | if ( id == -1 ) | 1408 | if ( id == -1 ) |
1409 | id = id2widget.count(); | 1409 | id = id2widget.count(); |
1410 | id2widget.insert( id, w ); | 1410 | id2widget.insert( id, w ); |
1411 | widget2id.insert( w, id ); | 1411 | widget2id.insert( w, id ); |
1412 | } | 1412 | } |
1413 | void KToolBar::repaintMe() | 1413 | void KToolBar::repaintMe() |
1414 | { | 1414 | { |
1415 | setUpdatesEnabled( true ); | 1415 | setUpdatesEnabled( true ); |
1416 | QToolBar::repaint( true ); | 1416 | QToolBar::repaint( true ); |
1417 | qDebug(" KToolBar::repaintMe() "); | 1417 | //qDebug(" KToolBar::repaintMe() "); |
1418 | } | 1418 | } |
1419 | 1419 | ||
1420 | void KToolBar::showEvent( QShowEvent *e ) | 1420 | void KToolBar::showEvent( QShowEvent *e ) |
1421 | { | 1421 | { |
1422 | QToolBar::showEvent( e ); | 1422 | QToolBar::showEvent( e ); |
1423 | rebuildLayout(); | 1423 | rebuildLayout(); |
1424 | } | 1424 | } |
1425 | 1425 | ||
1426 | void KToolBar::setStretchableWidget( QWidget *w ) | 1426 | void KToolBar::setStretchableWidget( QWidget *w ) |
1427 | { | 1427 | { |
1428 | QToolBar::setStretchableWidget( w ); | 1428 | QToolBar::setStretchableWidget( w ); |
1429 | stretchableWidget = w; | 1429 | stretchableWidget = w; |
1430 | } | 1430 | } |
1431 | 1431 | ||
1432 | QSizePolicy KToolBar::sizePolicy() const | 1432 | QSizePolicy KToolBar::sizePolicy() const |
1433 | { | 1433 | { |
1434 | if ( orientation() == Horizontal ) | 1434 | if ( orientation() == Horizontal ) |
1435 | return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); | 1435 | return QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); |
1436 | else | 1436 | else |
1437 | return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Expanding ); | 1437 | return QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Expanding ); |
1438 | } | 1438 | } |
1439 | 1439 | ||
1440 | QSize KToolBar::sizeHint() const | 1440 | QSize KToolBar::sizeHint() const |
1441 | { | 1441 | { |
1442 | return QToolBar::sizeHint(); | 1442 | return QToolBar::sizeHint(); |
1443 | #if 0 | 1443 | #if 0 |
1444 | QWidget::polish(); | 1444 | QWidget::polish(); |
1445 | static int iii = 0; | 1445 | static int iii = 0; |
1446 | ++iii; | 1446 | ++iii; |
1447 | qDebug("++++++++ KToolBar::sizeHint() %d ", iii ); | 1447 | qDebug("++++++++ KToolBar::sizeHint() %d ", iii ); |
1448 | int margin = static_cast<QWidget*>(ncThis)->layout()->margin(); | 1448 | int margin = static_cast<QWidget*>(ncThis)->layout()->margin(); |
1449 | switch( barPos() ) | 1449 | switch( barPos() ) |
1450 | { | 1450 | { |
1451 | case KToolBar::Top: | 1451 | case KToolBar::Top: |
1452 | case KToolBar::Bottom: | 1452 | case KToolBar::Bottom: |
1453 | for ( QWidget *w = widgets.first(); w; w =widgets.next() ) | 1453 | for ( QWidget *w = widgets.first(); w; w =widgets.next() ) |
1454 | { | 1454 | { |
1455 | if ( w->inherits( "KToolBarSeparator" ) && | 1455 | if ( w->inherits( "KToolBarSeparator" ) && |
1456 | !( static_cast<KToolBarSeparator*>(w)->showLine() ) ) | 1456 | !( static_cast<KToolBarSeparator*>(w)->showLine() ) ) |
1457 | { | 1457 | { |
1458 | minSize += QSize(6, 0); | 1458 | minSize += QSize(6, 0); |
1459 | } | 1459 | } |
1460 | else | 1460 | else |
1461 | { | 1461 | { |
1462 | QSize sh = w->sizeHint(); | 1462 | QSize sh = w->sizeHint(); |
1463 | if (!sh.isValid()) | 1463 | if (!sh.isValid()) |
1464 | sh = w->minimumSize(); | 1464 | sh = w->minimumSize(); |
1465 | minSize = minSize.expandedTo(QSize(0, sh.height())); | 1465 | minSize = minSize.expandedTo(QSize(0, sh.height())); |
1466 | minSize += QSize(sh.width()+1, 0); | 1466 | minSize += QSize(sh.width()+1, 0); |
1467 | } | 1467 | } |
1468 | } | 1468 | } |
1469 | /*US | 1469 | /*US |
1470 | minSize += QSize(QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent ), 0); | 1470 | minSize += QSize(QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent ), 0); |
1471 | */ | 1471 | */ |
1472 | minSize += QSize(margin*2, margin*2); | 1472 | minSize += QSize(margin*2, margin*2); |
1473 | break; | 1473 | break; |
1474 | 1474 | ||
1475 | case KToolBar::Left: | 1475 | case KToolBar::Left: |
1476 | case KToolBar::Right: | 1476 | case KToolBar::Right: |
1477 | for ( QWidget *w = widgets.first(); w; w = widgets.next() ) | 1477 | for ( QWidget *w = widgets.first(); w; w = widgets.next() ) |
1478 | { | 1478 | { |
1479 | if ( w->inherits( "KToolBarSeparator" ) && | 1479 | if ( w->inherits( "KToolBarSeparator" ) && |
1480 | !( static_cast<KToolBarSeparator*>(w)->showLine() ) ) | 1480 | !( static_cast<KToolBarSeparator*>(w)->showLine() ) ) |
1481 | { | 1481 | { |
1482 | minSize += QSize(0, 6); | 1482 | minSize += QSize(0, 6); |
1483 | } | 1483 | } |
1484 | else | 1484 | else |
1485 | { | 1485 | { |
1486 | QSize sh = w->sizeHint(); | 1486 | QSize sh = w->sizeHint(); |
1487 | if (!sh.isValid()) | 1487 | if (!sh.isValid()) |
1488 | sh = w->minimumSize(); | 1488 | sh = w->minimumSize(); |
1489 | minSize = minSize.expandedTo(QSize(sh.width(), 0)); | 1489 | minSize = minSize.expandedTo(QSize(sh.width(), 0)); |
1490 | minSize += QSize(0, sh.height()+1); | 1490 | minSize += QSize(0, sh.height()+1); |
1491 | } | 1491 | } |
1492 | } | 1492 | } |
1493 | /*US | 1493 | /*US |
1494 | minSize += QSize(0, QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent )); | 1494 | minSize += QSize(0, QApplication::style().pixelMetric( QStyle::PM_DockWindowHandleExtent )); |
1495 | */ | 1495 | */ |
1496 | minSize += QSize(margin*2, margin*2); | 1496 | minSize += QSize(margin*2, margin*2); |
1497 | break; | 1497 | break; |
1498 | 1498 | ||
1499 | default: | 1499 | default: |
1500 | minSize = QToolBar::sizeHint(); | 1500 | minSize = QToolBar::sizeHint(); |
1501 | break; | 1501 | break; |
1502 | } | 1502 | } |
1503 | return minSize; | 1503 | return minSize; |
1504 | #endif | 1504 | #endif |
1505 | } | 1505 | } |
1506 | 1506 | ||
1507 | QSize KToolBar::minimumSize() const | 1507 | QSize KToolBar::minimumSize() const |
1508 | { | 1508 | { |
1509 | return minimumSizeHint(); | 1509 | return minimumSizeHint(); |
1510 | } | 1510 | } |
1511 | 1511 | ||
1512 | QSize KToolBar::minimumSizeHint() const | 1512 | QSize KToolBar::minimumSizeHint() const |
1513 | { | 1513 | { |
1514 | return sizeHint(); | 1514 | return sizeHint(); |
1515 | } | 1515 | } |
1516 | 1516 | ||
1517 | bool KToolBar::highlight() const | 1517 | bool KToolBar::highlight() const |
1518 | { | 1518 | { |
1519 | return d->m_highlight; | 1519 | return d->m_highlight; |
1520 | } | 1520 | } |
1521 | 1521 | ||
1522 | void KToolBar::hide() | 1522 | void KToolBar::hide() |
1523 | { | 1523 | { |
1524 | QToolBar::hide(); | 1524 | QToolBar::hide(); |
1525 | } | 1525 | } |
1526 | 1526 | ||
1527 | void KToolBar::show() | 1527 | void KToolBar::show() |
1528 | { | 1528 | { |
1529 | QToolBar::show(); | 1529 | QToolBar::show(); |
1530 | } | 1530 | } |
1531 | 1531 | ||
1532 | void KToolBar::resizeEvent( QResizeEvent *e ) | 1532 | void KToolBar::resizeEvent( QResizeEvent *e ) |
1533 | { | 1533 | { |
1534 | bool b = isUpdatesEnabled(); | 1534 | bool b = isUpdatesEnabled(); |
1535 | setUpdatesEnabled( FALSE ); | 1535 | setUpdatesEnabled( FALSE ); |
1536 | QToolBar::resizeEvent( e ); | 1536 | QToolBar::resizeEvent( e ); |
1537 | if (b) | 1537 | if (b) |
1538 | d->repaintTimer.start( 100, true ); | 1538 | d->repaintTimer.start( 100, true ); |
1539 | } | 1539 | } |
1540 | 1540 | ||
1541 | void KToolBar::slotIconChanged(int group) | 1541 | void KToolBar::slotIconChanged(int group) |
1542 | { | 1542 | { |
1543 | if ((group != KIcon::Toolbar) && (group != KIcon::MainToolbar)) | 1543 | if ((group != KIcon::Toolbar) && (group != KIcon::MainToolbar)) |
1544 | return; | 1544 | return; |
1545 | if ((group == KIcon::MainToolbar) != !::qstrcmp(name(), "mainToolBar")) | 1545 | if ((group == KIcon::MainToolbar) != !::qstrcmp(name(), "mainToolBar")) |
1546 | return; | 1546 | return; |
1547 | 1547 | ||
1548 | emit modechange(); | 1548 | emit modechange(); |
1549 | if (isVisible()) | 1549 | if (isVisible()) |
1550 | updateGeometry(); | 1550 | updateGeometry(); |
1551 | } | 1551 | } |
1552 | 1552 | ||
1553 | void KToolBar::slotReadConfig() | 1553 | void KToolBar::slotReadConfig() |
1554 | { | 1554 | { |
1555 | //kdDebug(220) << "KToolBar::slotReadConfig" << endl; | 1555 | //kdDebug(220) << "KToolBar::slotReadConfig" << endl; |
1556 | // Read appearance settings (hmm, we used to do both here, | 1556 | // Read appearance settings (hmm, we used to do both here, |
1557 | // but a well behaved application will call applyMainWindowSettings | 1557 | // but a well behaved application will call applyMainWindowSettings |
1558 | // anyway, right ?) | 1558 | // anyway, right ?) |
1559 | applyAppearanceSettings(KGlobal::config(), QString::null ); | 1559 | applyAppearanceSettings(KGlobal::config(), QString::null ); |
1560 | } | 1560 | } |
1561 | 1561 | ||
1562 | void KToolBar::slotAppearanceChanged() | 1562 | void KToolBar::slotAppearanceChanged() |
1563 | { | 1563 | { |
1564 | // Read appearance settings from global file. | 1564 | // Read appearance settings from global file. |
1565 | applyAppearanceSettings(KGlobal::config(), QString::null, true /* lose local settings */ ); | 1565 | applyAppearanceSettings(KGlobal::config(), QString::null, true /* lose local settings */ ); |
1566 | // And remember to save the new look later | 1566 | // And remember to save the new look later |
1567 | /*US | 1567 | /*US |
1568 | if ( mainWindow() && mainWindow()->inherits( "KMainWindow" ) ) | 1568 | if ( mainWindow() && mainWindow()->inherits( "KMainWindow" ) ) |
1569 | static_cast<KMainWindow *>(mainWindow())->setSettingsDirty(); | 1569 | static_cast<KMainWindow *>(mainWindow())->setSettingsDirty(); |
1570 | */ | 1570 | */ |
1571 | } | 1571 | } |
1572 | 1572 | ||
1573 | //static | 1573 | //static |
1574 | bool KToolBar::highlightSetting() | 1574 | bool KToolBar::highlightSetting() |
1575 | { | 1575 | { |
1576 | QString grpToolbar(QString::fromLatin1("Toolbar style")); | 1576 | QString grpToolbar(QString::fromLatin1("Toolbar style")); |
1577 | KConfigGroupSaver saver(KGlobal::config(), grpToolbar); | 1577 | KConfigGroupSaver saver(KGlobal::config(), grpToolbar); |
1578 | return KGlobal::config()->readBoolEntry(QString::fromLatin1("Highlighting"),true); | 1578 | return KGlobal::config()->readBoolEntry(QString::fromLatin1("Highlighting"),true); |
1579 | } | 1579 | } |
1580 | 1580 | ||
1581 | //static | 1581 | //static |
1582 | bool KToolBar::transparentSetting() | 1582 | bool KToolBar::transparentSetting() |
1583 | { | 1583 | { |
1584 | QString grpToolbar(QString::fromLatin1("Toolbar style")); | 1584 | QString grpToolbar(QString::fromLatin1("Toolbar style")); |
1585 | KConfigGroupSaver saver(KGlobal::config(), grpToolbar); | 1585 | KConfigGroupSaver saver(KGlobal::config(), grpToolbar); |
1586 | return KGlobal::config()->readBoolEntry(QString::fromLatin1("TransparentMoving"),true); | 1586 | return KGlobal::config()->readBoolEntry(QString::fromLatin1("TransparentMoving"),true); |
1587 | } | 1587 | } |
1588 | 1588 | ||
1589 | //static | 1589 | //static |
1590 | KToolBar::IconText KToolBar::iconTextSetting() | 1590 | KToolBar::IconText KToolBar::iconTextSetting() |
1591 | { | 1591 | { |
1592 | QString grpToolbar(QString::fromLatin1("Toolbar style")); | 1592 | QString grpToolbar(QString::fromLatin1("Toolbar style")); |
1593 | KConfigGroupSaver saver(KGlobal::config(), grpToolbar); | 1593 | KConfigGroupSaver saver(KGlobal::config(), grpToolbar); |
1594 | QString icontext = KGlobal::config()->readEntry(QString::fromLatin1("IconText"),QString::fromLatin1("IconOnly")); | 1594 | QString icontext = KGlobal::config()->readEntry(QString::fromLatin1("IconText"),QString::fromLatin1("IconOnly")); |
1595 | if ( icontext == "IconTextRight" ) | 1595 | if ( icontext == "IconTextRight" ) |
1596 | return IconTextRight; | 1596 | return IconTextRight; |
1597 | else if ( icontext == "IconTextBottom" ) | 1597 | else if ( icontext == "IconTextBottom" ) |
1598 | return IconTextBottom; | 1598 | return IconTextBottom; |
1599 | else if ( icontext == "TextOnly" ) | 1599 | else if ( icontext == "TextOnly" ) |
1600 | return TextOnly; | 1600 | return TextOnly; |
1601 | else | 1601 | else |
1602 | return IconOnly; | 1602 | return IconOnly; |
1603 | } | 1603 | } |
1604 | 1604 | ||
1605 | void KToolBar::applyAppearanceSettings(KConfig *config, const QString &_configGroup, bool forceGlobal) | 1605 | void KToolBar::applyAppearanceSettings(KConfig *config, const QString &_configGroup, bool forceGlobal) |
1606 | { | 1606 | { |
1607 | QString configGroup = _configGroup.isEmpty() ? settingsGroup() : _configGroup; | 1607 | QString configGroup = _configGroup.isEmpty() ? settingsGroup() : _configGroup; |
1608 | //kdDebug(220) << "KToolBar::applyAppearanceSettings: configGroup=" << configGroup << endl; | 1608 | //kdDebug(220) << "KToolBar::applyAppearanceSettings: configGroup=" << configGroup << endl; |
1609 | // We have application-specific settings in the XML file, | 1609 | // We have application-specific settings in the XML file, |
1610 | // and nothing in the application's config file | 1610 | // and nothing in the application's config file |
1611 | // -> don't apply the global defaults, the XML ones are preferred | 1611 | // -> don't apply the global defaults, the XML ones are preferred |
1612 | // See applySettings for a full explanation | 1612 | // See applySettings for a full explanation |
1613 | /*US :we do not support xml files | 1613 | /*US :we do not support xml files |
1614 | if ( d->m_xmlguiClient && !d->m_xmlguiClient->xmlFile().isEmpty() && | 1614 | if ( d->m_xmlguiClient && !d->m_xmlguiClient->xmlFile().isEmpty() && |
1615 | !config->hasGroup(configGroup) ) | 1615 | !config->hasGroup(configGroup) ) |
1616 | { | 1616 | { |
1617 | //kdDebug(220) << "skipping global defaults, using XML ones instead" << endl; | 1617 | //kdDebug(220) << "skipping global defaults, using XML ones instead" << endl; |
1618 | return; | 1618 | return; |
1619 | } | 1619 | } |
1620 | */ | 1620 | */ |
1621 | if ( !config->hasGroup(configGroup) ) | 1621 | if ( !config->hasGroup(configGroup) ) |
1622 | { | 1622 | { |
1623 | //kdDebug(220) << "skipping global defaults, using XML ones instead" << endl; | 1623 | //kdDebug(220) << "skipping global defaults, using XML ones instead" << endl; |
1624 | return; | 1624 | return; |
1625 | } | 1625 | } |
1626 | 1626 | ||
1627 | 1627 | ||
1628 | KConfig *gconfig = KGlobal::config(); | 1628 | KConfig *gconfig = KGlobal::config(); |
1629 | /*US | 1629 | /*US |
1630 | static const QString &attrIconText = KGlobal::staticQString("IconText"); | 1630 | static const QString &attrIconText = KGlobal::staticQString("IconText"); |
1631 | static const QString &attrHighlight = KGlobal::staticQString("Highlighting"); | 1631 | static const QString &attrHighlight = KGlobal::staticQString("Highlighting"); |
1632 | static const QString &attrTrans = KGlobal::staticQString("TransparentMoving"); | 1632 | static const QString &attrTrans = KGlobal::staticQString("TransparentMoving"); |
1633 | static const QString &attrSize = KGlobal::staticQString("IconSize"); | 1633 | static const QString &attrSize = KGlobal::staticQString("IconSize"); |
1634 | */ | 1634 | */ |
1635 | // we actually do this in two steps. | 1635 | // we actually do this in two steps. |
1636 | // First, we read in the global styles [Toolbar style] (from the KControl module). | 1636 | // First, we read in the global styles [Toolbar style] (from the KControl module). |
1637 | // Then, if the toolbar is NOT 'mainToolBar', we will also try to read in [barname Toolbar style] | 1637 | // Then, if the toolbar is NOT 'mainToolBar', we will also try to read in [barname Toolbar style] |
1638 | bool highlight; | 1638 | bool highlight; |
1639 | int transparent; | 1639 | int transparent; |
1640 | QString icontext; | 1640 | QString icontext; |
1641 | int iconsize = 0; | 1641 | int iconsize = 0; |
1642 | 1642 | ||
1643 | // this is the first iteration | 1643 | // this is the first iteration |
1644 | QString grpToolbar(QString::fromLatin1("Toolbar style")); | 1644 | QString grpToolbar(QString::fromLatin1("Toolbar style")); |
1645 | { // start block for KConfigGroupSaver | 1645 | { // start block for KConfigGroupSaver |
1646 | KConfigGroupSaver saver(gconfig, grpToolbar); | 1646 | KConfigGroupSaver saver(gconfig, grpToolbar); |
1647 | 1647 | ||
1648 | // first, get the generic settings | 1648 | // first, get the generic settings |
1649 | //US highlight = gconfig->readBoolEntry(attrHighlight, true); | 1649 | //US highlight = gconfig->readBoolEntry(attrHighlight, true); |
1650 | highlight = gconfig->readBoolEntry("Highlighting", true); | 1650 | highlight = gconfig->readBoolEntry("Highlighting", true); |
1651 | //US transparent = gconfig->readBoolEntry(attrTrans, true); | 1651 | //US transparent = gconfig->readBoolEntry(attrTrans, true); |
1652 | transparent = gconfig->readBoolEntry("TransparentMoving", true); | 1652 | transparent = gconfig->readBoolEntry("TransparentMoving", true); |
1653 | 1653 | ||
1654 | // we read in the IconText property *only* if we intend on actually | 1654 | // we read in the IconText property *only* if we intend on actually |
1655 | // honoring it | 1655 | // honoring it |
1656 | if (d->m_honorStyle) | 1656 | if (d->m_honorStyle) |
1657 | //US d->IconTextDefault = gconfig->readEntry(attrIconText, d->IconTextDefault); | 1657 | //US d->IconTextDefault = gconfig->readEntry(attrIconText, d->IconTextDefault); |
1658 | d->IconTextDefault = gconfig->readEntry("IconText", d->IconTextDefault); | 1658 | d->IconTextDefault = gconfig->readEntry("IconText", d->IconTextDefault); |
1659 | else | 1659 | else |
1660 | d->IconTextDefault = "IconOnly"; | 1660 | d->IconTextDefault = "IconOnly"; |
1661 | 1661 | ||
1662 | // Use the default icon size for toolbar icons. | 1662 | // Use the default icon size for toolbar icons. |
1663 | //US d->IconSizeDefault = gconfig->readNumEntry(attrSize, d->IconSizeDefault); | 1663 | //US d->IconSizeDefault = gconfig->readNumEntry(attrSize, d->IconSizeDefault); |
1664 | d->IconSizeDefault = gconfig->readNumEntry("IconSize", d->IconSizeDefault); | 1664 | d->IconSizeDefault = gconfig->readNumEntry("IconSize", d->IconSizeDefault); |
1665 | 1665 | ||
1666 | if ( !forceGlobal && config->hasGroup(configGroup) ) | 1666 | if ( !forceGlobal && config->hasGroup(configGroup) ) |
1667 | { | 1667 | { |
1668 | config->setGroup(configGroup); | 1668 | config->setGroup(configGroup); |
1669 | 1669 | ||
1670 | // first, get the generic settings | 1670 | // first, get the generic settings |
1671 | //US highlight = config->readBoolEntry(attrHighlight, highlight); | 1671 | //US highlight = config->readBoolEntry(attrHighlight, highlight); |
1672 | highlight = config->readBoolEntry("Highlighting", highlight); | 1672 | highlight = config->readBoolEntry("Highlighting", highlight); |
1673 | //US transparent = config->readBoolEntry(attrTrans, transparent); | 1673 | //US transparent = config->readBoolEntry(attrTrans, transparent); |
1674 | transparent = config->readBoolEntry("TransparentMoving", transparent); | 1674 | transparent = config->readBoolEntry("TransparentMoving", transparent); |
1675 | // now we always read in the IconText property | 1675 | // now we always read in the IconText property |
1676 | //US icontext = config->readEntry(attrIconText, d->IconTextDefault); | 1676 | //US icontext = config->readEntry(attrIconText, d->IconTextDefault); |
1677 | icontext = config->readEntry("IconText", d->IconTextDefault); | 1677 | icontext = config->readEntry("IconText", d->IconTextDefault); |
1678 | 1678 | ||
1679 | // now get the size | 1679 | // now get the size |
1680 | //US iconsize = config->readNumEntry(attrSize, d->IconSizeDefault); | 1680 | //US iconsize = config->readNumEntry(attrSize, d->IconSizeDefault); |
1681 | iconsize = config->readNumEntry("IconSize", d->IconSizeDefault); | 1681 | iconsize = config->readNumEntry("IconSize", d->IconSizeDefault); |
1682 | } | 1682 | } |
1683 | else | 1683 | else |
1684 | { | 1684 | { |
1685 | iconsize = d->IconSizeDefault; | 1685 | iconsize = d->IconSizeDefault; |
1686 | icontext = d->IconTextDefault; | 1686 | icontext = d->IconTextDefault; |
1687 | } | 1687 | } |
1688 | 1688 | ||
1689 | // revert back to the old group | 1689 | // revert back to the old group |
1690 | } // end block for KConfigGroupSaver | 1690 | } // end block for KConfigGroupSaver |
1691 | 1691 | ||
1692 | bool doUpdate = false; | 1692 | bool doUpdate = false; |
1693 | 1693 | ||
1694 | IconText icon_text; | 1694 | IconText icon_text; |
1695 | if ( icontext == "IconTextRight" ) | 1695 | if ( icontext == "IconTextRight" ) |
1696 | icon_text = IconTextRight; | 1696 | icon_text = IconTextRight; |
1697 | else if ( icontext == "IconTextBottom" ) | 1697 | else if ( icontext == "IconTextBottom" ) |
1698 | icon_text = IconTextBottom; | 1698 | icon_text = IconTextBottom; |
1699 | else if ( icontext == "TextOnly" ) | 1699 | else if ( icontext == "TextOnly" ) |
1700 | icon_text = TextOnly; | 1700 | icon_text = TextOnly; |
1701 | else | 1701 | else |
1702 | icon_text = IconOnly; | 1702 | icon_text = IconOnly; |
1703 | 1703 | ||
1704 | // check if the icon/text has changed | 1704 | // check if the icon/text has changed |
1705 | if (icon_text != d->m_iconText) { | 1705 | if (icon_text != d->m_iconText) { |
1706 | //kdDebug(220) << "KToolBar::applyAppearanceSettings setIconText " << icon_text << endl; | 1706 | //kdDebug(220) << "KToolBar::applyAppearanceSettings setIconText " << icon_text << endl; |
1707 | setIconText(icon_text, false); | 1707 | setIconText(icon_text, false); |
1708 | doUpdate = true; | 1708 | doUpdate = true; |
1709 | } | 1709 | } |
1710 | 1710 | ||
1711 | // ...and check if the icon size has changed | 1711 | // ...and check if the icon size has changed |
1712 | if (iconsize != d->m_iconSize) { | 1712 | if (iconsize != d->m_iconSize) { |
1713 | setIconSize(iconsize, false); | 1713 | setIconSize(iconsize, false); |
1714 | doUpdate = true; | 1714 | doUpdate = true; |
1715 | } | 1715 | } |
1716 | 1716 | ||
1717 | QMainWindow *mw = mainWindow(); | 1717 | QMainWindow *mw = mainWindow(); |
1718 | 1718 | ||
1719 | // ...and if we should highlight | 1719 | // ...and if we should highlight |
1720 | if ( highlight != d->m_highlight ) { | 1720 | if ( highlight != d->m_highlight ) { |
1721 | d->m_highlight = highlight; | 1721 | d->m_highlight = highlight; |
1722 | doUpdate = true; | 1722 | doUpdate = true; |
1723 | } | 1723 | } |
1724 | 1724 | ||
1725 | // ...and if we should move transparently | 1725 | // ...and if we should move transparently |
1726 | if ( mw && transparent != (!mw->opaqueMoving()) ) { | 1726 | if ( mw && transparent != (!mw->opaqueMoving()) ) { |
1727 | mw->setOpaqueMoving( !transparent ); | 1727 | mw->setOpaqueMoving( !transparent ); |
1728 | } | 1728 | } |
1729 | 1729 | ||
1730 | if (doUpdate) | 1730 | if (doUpdate) |
1731 | emit modechange(); // tell buttons what happened | 1731 | emit modechange(); // tell buttons what happened |
1732 | if (isVisible ()) | 1732 | if (isVisible ()) |
1733 | updateGeometry(); | 1733 | updateGeometry(); |
1734 | } | 1734 | } |
1735 | 1735 | ||
1736 | void KToolBar::applySettings(KConfig *config, const QString &_configGroup) | 1736 | void KToolBar::applySettings(KConfig *config, const QString &_configGroup) |
1737 | { | 1737 | { |
1738 | //kdDebug(220) << "KToolBar::applySettings group=" << _configGroup << endl; | 1738 | //kdDebug(220) << "KToolBar::applySettings group=" << _configGroup << endl; |
1739 | 1739 | ||
1740 | QString configGroup = _configGroup.isEmpty() ? settingsGroup() : _configGroup; | 1740 | QString configGroup = _configGroup.isEmpty() ? settingsGroup() : _configGroup; |
1741 | 1741 | ||
1742 | /* | 1742 | /* |
1743 | Let's explain this a bit more in details. | 1743 | Let's explain this a bit more in details. |
1744 | The order in which we apply settings is : | 1744 | The order in which we apply settings is : |
1745 | Global config / <appnamerc> user settings if no XMLGUI is used | 1745 | Global config / <appnamerc> user settings if no XMLGUI is used |
1746 | Global config / App-XML attributes / <appnamerc> user settings if XMLGUI is used | 1746 | Global config / App-XML attributes / <appnamerc> user settings if XMLGUI is used |
1747 | 1747 | ||
1748 | So in the first case, we simply read everything from KConfig as below, | 1748 | So in the first case, we simply read everything from KConfig as below, |
1749 | but in the second case we don't do anything here if there is no app-specific config, | 1749 | but in the second case we don't do anything here if there is no app-specific config, |
1750 | and the XMLGUI uses the static methods of this class to get the global defaults. | 1750 | and the XMLGUI uses the static methods of this class to get the global defaults. |
1751 | 1751 | ||
1752 | Global config doesn't include position (index, offset, newline and hidden/shown). | 1752 | Global config doesn't include position (index, offset, newline and hidden/shown). |
1753 | */ | 1753 | */ |
1754 | 1754 | ||
1755 | // First the appearance stuff - the one which has a global config | 1755 | // First the appearance stuff - the one which has a global config |
1756 | applyAppearanceSettings( config, _configGroup ); | 1756 | applyAppearanceSettings( config, _configGroup ); |
1757 | 1757 | ||
1758 | // ...and now the position stuff | 1758 | // ...and now the position stuff |
1759 | if ( config->hasGroup(configGroup) ) | 1759 | if ( config->hasGroup(configGroup) ) |
1760 | { | 1760 | { |
1761 | KConfigGroupSaver cgs(config, configGroup); | 1761 | KConfigGroupSaver cgs(config, configGroup); |
1762 | /*US | 1762 | /*US |
1763 | static const QString &attrPosition = KGlobal::staticQString("Position"); | 1763 | static const QString &attrPosition = KGlobal::staticQString("Position"); |
1764 | static const QString &attrIndex = KGlobal::staticQString("Index"); | 1764 | static const QString &attrIndex = KGlobal::staticQString("Index"); |
1765 | static const QString &attrOffset = KGlobal::staticQString("Offset"); | 1765 | static const QString &attrOffset = KGlobal::staticQString("Offset"); |
1766 | static const QString &attrNewLine = KGlobal::staticQString("NewLine"); | 1766 | static const QString &attrNewLine = KGlobal::staticQString("NewLine"); |
1767 | static const QString &attrHidden = KGlobal::staticQString("Hidden"); | 1767 | static const QString &attrHidden = KGlobal::staticQString("Hidden"); |
1768 | 1768 | ||
1769 | QString position = config->readEntry(attrPosition, d->PositionDefault); | 1769 | QString position = config->readEntry(attrPosition, d->PositionDefault); |
1770 | int index = config->readNumEntry(attrIndex, d->IndexDefault); | 1770 | int index = config->readNumEntry(attrIndex, d->IndexDefault); |
1771 | int offset = config->readNumEntry(attrOffset, d->OffsetDefault); | 1771 | int offset = config->readNumEntry(attrOffset, d->OffsetDefault); |
1772 | bool newLine = config->readBoolEntry(attrNewLine, d->NewLineDefault); | 1772 | bool newLine = config->readBoolEntry(attrNewLine, d->NewLineDefault); |
1773 | bool hidden = config->readBoolEntry(attrHidden, d->HiddenDefault); | 1773 | bool hidden = config->readBoolEntry(attrHidden, d->HiddenDefault); |
1774 | */ | 1774 | */ |
1775 | 1775 | ||
1776 | QString position = config->readEntry("Position", d->PositionDefault); | 1776 | QString position = config->readEntry("Position", d->PositionDefault); |
1777 | int index = config->readNumEntry("Index", d->IndexDefault); | 1777 | int index = config->readNumEntry("Index", d->IndexDefault); |
1778 | int offset = config->readNumEntry("Offset", d->OffsetDefault); | 1778 | int offset = config->readNumEntry("Offset", d->OffsetDefault); |
1779 | bool newLine = config->readBoolEntry("NewLine", d->NewLineDefault); | 1779 | bool newLine = config->readBoolEntry("NewLine", d->NewLineDefault); |
1780 | bool hidden = config->readBoolEntry("Hidden", d->HiddenDefault); | 1780 | bool hidden = config->readBoolEntry("Hidden", d->HiddenDefault); |
1781 | 1781 | ||
1782 | /*US Dock pos(DockTop); | 1782 | /*US Dock pos(DockTop); |
1783 | if ( position == "Top" ) | 1783 | if ( position == "Top" ) |
1784 | pos = DockTop; | 1784 | pos = DockTop; |
1785 | else if ( position == "Bottom" ) | 1785 | else if ( position == "Bottom" ) |
1786 | pos = DockBottom; | 1786 | pos = DockBottom; |
1787 | else if ( position == "Left" ) | 1787 | else if ( position == "Left" ) |
1788 | pos = DockLeft; | 1788 | pos = DockLeft; |
1789 | else if ( position == "Right" ) | 1789 | else if ( position == "Right" ) |
1790 | pos = DockRight; | 1790 | pos = DockRight; |
1791 | else if ( position == "Floating" ) | 1791 | else if ( position == "Floating" ) |
1792 | pos = DockTornOff; | 1792 | pos = DockTornOff; |
1793 | else if ( position == "Flat" ) | 1793 | else if ( position == "Flat" ) |
1794 | pos = DockMinimized; | 1794 | pos = DockMinimized; |
1795 | */ | 1795 | */ |
1796 | QMainWindow::ToolBarDock pos(QMainWindow::Top); | 1796 | QMainWindow::ToolBarDock pos(QMainWindow::Top); |
1797 | if ( position == "Top" ) | 1797 | if ( position == "Top" ) |
1798 | pos = QMainWindow::Top; | 1798 | pos = QMainWindow::Top; |
1799 | else if ( position == "Bottom" ) | 1799 | else if ( position == "Bottom" ) |
1800 | pos = QMainWindow::Bottom; | 1800 | pos = QMainWindow::Bottom; |
1801 | else if ( position == "Left" ) | 1801 | else if ( position == "Left" ) |