-rw-r--r-- | korganizer/koimportoldialog.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/korganizer/koimportoldialog.cpp b/korganizer/koimportoldialog.cpp index 7aa6076..2af436c 100644 --- a/korganizer/koimportoldialog.cpp +++ b/korganizer/koimportoldialog.cpp | |||
@@ -17,24 +17,25 @@ | |||
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <qtooltip.h> | 24 | #include <qtooltip.h> |
25 | #include <qframe.h> | 25 | #include <qframe.h> |
26 | #include <qpixmap.h> | 26 | #include <qpixmap.h> |
27 | #include <qlayout.h> | 27 | #include <qlayout.h> |
28 | #include <qprogressbar.h> | 28 | #include <qprogressbar.h> |
29 | #include <qprogressdialog.h> | ||
29 | #include <qwidgetstack.h> | 30 | #include <qwidgetstack.h> |
30 | #include <qdatetime.h> | 31 | #include <qdatetime.h> |
31 | #include <qdir.h> | 32 | #include <qdir.h> |
32 | #include <qapplication.h> | 33 | #include <qapplication.h> |
33 | #include <qhbox.h> | 34 | #include <qhbox.h> |
34 | #include <qregexp.h> | 35 | #include <qregexp.h> |
35 | #include <qheader.h> | 36 | #include <qheader.h> |
36 | #include <qdatetime.h> | 37 | #include <qdatetime.h> |
37 | #include <qlistview.h> | 38 | #include <qlistview.h> |
38 | 39 | ||
39 | #include <kdebug.h> | 40 | #include <kdebug.h> |
40 | #include <klocale.h> | 41 | #include <klocale.h> |
@@ -202,38 +203,39 @@ void KOImportOLdialog::slotApply() | |||
202 | void KOImportOLdialog::readCalendarData( DWORD folder ) | 203 | void KOImportOLdialog::readCalendarData( DWORD folder ) |
203 | { | 204 | { |
204 | 205 | ||
205 | LPDISPATCH dispItem = (LPDISPATCH)folder; | 206 | LPDISPATCH dispItem = (LPDISPATCH)folder; |
206 | dispItem->AddRef(); | 207 | dispItem->AddRef(); |
207 | MAPIFolder mf(dispItem); | 208 | MAPIFolder mf(dispItem); |
208 | mf.m_lpDispatch->AddRef(); | 209 | mf.m_lpDispatch->AddRef(); |
209 | _Items folderItems; | 210 | _Items folderItems; |
210 | _variant_t indx((long)0); | 211 | _variant_t indx((long)0); |
211 | LPDISPATCH itm; | 212 | LPDISPATCH itm; |
212 | int i; | 213 | int i; |
213 | folderItems = mf.GetItems(); | 214 | folderItems = mf.GetItems(); |
214 | QProgressBar bar( folderItems.GetCount(),0 ); | 215 | QProgressDialog bar( i18n("Importing calendar data"),i18n("Abort"), folderItems.GetCount(),this ); |
215 | bar.setCaption (i18n("Importing - close to abort!") ); | 216 | bar.setCaption (i18n("Importing!") ); |
216 | int h = bar.sizeHint().height() ; | 217 | int h = bar.sizeHint().height() ; |
217 | int w = 300; | 218 | int w = 300; |
218 | int dw = QApplication::desktop()->width(); | 219 | int dw = QApplication::desktop()->width(); |
219 | int dh = QApplication::desktop()->height(); | 220 | int dh = QApplication::desktop()->height(); |
220 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 221 | //bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
221 | bar.show(); | 222 | bar.show(); |
222 | for(i=1; i <= folderItems.GetCount(); ++i) | 223 | for(i=1; i <= folderItems.GetCount(); ++i) |
223 | { | 224 | { |
224 | qApp->processEvents(); | 225 | qApp->processEvents(); |
225 | if ( ! bar.isVisible() ) | 226 | if ( ! bar.isVisible() ) |
226 | return ; | 227 | return ; |
227 | bar.setProgress( i ); | 228 | bar.setProgress( i ); |
229 | bar.raise(); | ||
228 | indx = (long)i; | 230 | indx = (long)i; |
229 | itm = folderItems.Item(indx.Detach()); | 231 | itm = folderItems.Item(indx.Detach()); |
230 | _AppointmentItem * pItem = (_AppointmentItem *)&itm; | 232 | _AppointmentItem * pItem = (_AppointmentItem *)&itm; |
231 | ol2kopiCalendar( pItem ); | 233 | ol2kopiCalendar( pItem ); |
232 | itm->Release(); | 234 | itm->Release(); |
233 | } | 235 | } |
234 | } | 236 | } |
235 | void KOImportOLdialog::slotOk() | 237 | void KOImportOLdialog::slotOk() |
236 | { | 238 | { |
237 | QDialog::accept(); | 239 | QDialog::accept(); |
238 | } | 240 | } |
239 | 241 | ||