author | zautrix <zautrix> | 2004-10-20 09:45:16 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-20 09:45:16 (UTC) |
commit | b3662915cb2c966ed7b5c563b8e840ae5b82d4e6 (patch) (unidiff) | |
tree | bc09d046e1d47fe94acb538af88458f716993dfc /korganizer/calendarview.cpp | |
parent | 40eaafc9e008dc004b6ebc65fae8d89c8883ee8b (diff) | |
download | kdepimpi-b3662915cb2c966ed7b5c563b8e840ae5b82d4e6.zip kdepimpi-b3662915cb2c966ed7b5c563b8e840ae5b82d4e6.tar.gz kdepimpi-b3662915cb2c966ed7b5c563b8e840ae5b82d4e6.tar.bz2 |
fixed br for kopi
-rw-r--r-- | korganizer/calendarview.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 884c61a..0306e07 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1231,12 +1231,13 @@ void CalendarView::syncExternal( int mode ) | |||
1231 | qApp->processEvents(); | 1231 | qApp->processEvents(); |
1232 | CalendarLocal* calendar = new CalendarLocal(); | 1232 | CalendarLocal* calendar = new CalendarLocal(); |
1233 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); | 1233 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); |
1234 | bool syncOK = false; | 1234 | bool syncOK = false; |
1235 | bool loadSuccess = false; | 1235 | bool loadSuccess = false; |
1236 | PhoneFormat* phoneFormat = 0; | 1236 | PhoneFormat* phoneFormat = 0; |
1237 | emit tempDisableBR(true); | ||
1237 | #ifndef DESKTOP_VERSION | 1238 | #ifndef DESKTOP_VERSION |
1238 | SharpFormat* sharpFormat = 0; | 1239 | SharpFormat* sharpFormat = 0; |
1239 | if ( mode == 0 ) { // sharp | 1240 | if ( mode == 0 ) { // sharp |
1240 | sharpFormat = new SharpFormat () ; | 1241 | sharpFormat = new SharpFormat () ; |
1241 | loadSuccess = sharpFormat->load( calendar, mCalendar ); | 1242 | loadSuccess = sharpFormat->load( calendar, mCalendar ); |
1242 | 1243 | ||
@@ -1246,14 +1247,16 @@ void CalendarView::syncExternal( int mode ) | |||
1246 | phoneFormat = new PhoneFormat (mCurrentSyncDevice, | 1247 | phoneFormat = new PhoneFormat (mCurrentSyncDevice, |
1247 | mSyncManager->mPhoneDevice, | 1248 | mSyncManager->mPhoneDevice, |
1248 | mSyncManager->mPhoneConnection, | 1249 | mSyncManager->mPhoneConnection, |
1249 | mSyncManager->mPhoneModel); | 1250 | mSyncManager->mPhoneModel); |
1250 | loadSuccess = phoneFormat->load( calendar,mCalendar); | 1251 | loadSuccess = phoneFormat->load( calendar,mCalendar); |
1251 | 1252 | ||
1252 | } else | 1253 | } else { |
1253 | return; | 1254 | emit tempDisableBR(false); |
1255 | return; | ||
1256 | } | ||
1254 | if ( loadSuccess ) { | 1257 | if ( loadSuccess ) { |
1255 | getEventViewerDialog()->setSyncMode( true ); | 1258 | getEventViewerDialog()->setSyncMode( true ); |
1256 | syncOK = synchronizeCalendar( mCalendar, calendar, mSyncManager->mSyncAlgoPrefs ); | 1259 | syncOK = synchronizeCalendar( mCalendar, calendar, mSyncManager->mSyncAlgoPrefs ); |
1257 | getEventViewerDialog()->setSyncMode( false ); | 1260 | getEventViewerDialog()->setSyncMode( false ); |
1258 | qApp->processEvents(); | 1261 | qApp->processEvents(); |
1259 | if ( syncOK ) { | 1262 | if ( syncOK ) { |
@@ -1300,12 +1303,13 @@ void CalendarView::syncExternal( int mode ) | |||
1300 | QMessageBox::information( 0, i18n("KO/Pi Import - ERROR"), | 1303 | QMessageBox::information( 0, i18n("KO/Pi Import - ERROR"), |
1301 | question, i18n("Ok")) ; | 1304 | question, i18n("Ok")) ; |
1302 | 1305 | ||
1303 | } | 1306 | } |
1304 | delete calendar; | 1307 | delete calendar; |
1305 | updateView(); | 1308 | updateView(); |
1309 | emit tempDisableBR(false); | ||
1306 | return ;//syncOK; | 1310 | return ;//syncOK; |
1307 | 1311 | ||
1308 | } | 1312 | } |
1309 | 1313 | ||
1310 | bool CalendarView::importBday() | 1314 | bool CalendarView::importBday() |
1311 | { | 1315 | { |