author | zautrix <zautrix> | 2005-03-15 10:59:28 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-15 10:59:28 (UTC) |
commit | f695ed8bf462bab5df0f6b41d3d3e6ed5b803484 (patch) (unidiff) | |
tree | 993f48f8048eb37354c3326ee8fc998afc598f81 /korganizer | |
parent | efa425789895481dd918a55af27895a7917d2a20 (diff) | |
download | kdepimpi-f695ed8bf462bab5df0f6b41d3d3e6ed5b803484.zip kdepimpi-f695ed8bf462bab5df0f6b41d3d3e6ed5b803484.tar.gz kdepimpi-f695ed8bf462bab5df0f6b41d3d3e6ed5b803484.tar.bz2 |
sync conflict dialog fix
-rw-r--r-- | korganizer/koeventviewerdialog.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index f606124..f734696 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp | |||
@@ -87,6 +87,7 @@ void KOEventViewerDialog::showMe() | |||
87 | raise(); | 87 | raise(); |
88 | setActiveWindow(); | 88 | setActiveWindow(); |
89 | mEventViewer->setFocus(); | 89 | mEventViewer->setFocus(); |
90 | //raise(); | ||
90 | 91 | ||
91 | } | 92 | } |
92 | void KOEventViewerDialog::setSyncMode( bool b ) | 93 | void KOEventViewerDialog::setSyncMode( bool b ) |
@@ -289,6 +290,9 @@ void KOEventViewerDialog::hideEvent ( QHideEvent * e ) | |||
289 | 290 | ||
290 | void KOEventViewerDialog::slotViewerClosed() | 291 | void KOEventViewerDialog::slotViewerClosed() |
291 | { | 292 | { |
293 | if ( mSyncMode ) | ||
294 | return; | ||
295 | |||
292 | if ( sendSignalViewerClosed ) { | 296 | if ( sendSignalViewerClosed ) { |
293 | //qDebug("KOEventViewerDialog::hideEvent "); | 297 | //qDebug("KOEventViewerDialog::hideEvent "); |
294 | emit signalViewerClosed(); | 298 | emit signalViewerClosed(); |