| author | zautrix <zautrix> | 2005-03-15 10:59:28 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-03-15 10:59:28 (UTC) |
| commit | f695ed8bf462bab5df0f6b41d3d3e6ed5b803484 (patch) (side-by-side diff) | |
| tree | 993f48f8048eb37354c3326ee8fc998afc598f81 | |
| 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 @@ -86,8 +86,9 @@ void KOEventViewerDialog::showMe() #endif raise(); setActiveWindow(); mEventViewer->setFocus(); + //raise(); } void KOEventViewerDialog::setSyncMode( bool b ) { @@ -288,8 +289,11 @@ void KOEventViewerDialog::hideEvent ( QHideEvent * e ) } void KOEventViewerDialog::slotViewerClosed() { + if ( mSyncMode ) + return; + if ( sendSignalViewerClosed ) { //qDebug("KOEventViewerDialog::hideEvent "); emit signalViewerClosed(); } |