author | zautrix <zautrix> | 2005-04-05 23:31:44 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-05 23:31:44 (UTC) |
commit | cf4848d972efe96640f2d5f5d52704306d0cbe4c (patch) (side-by-side diff) | |
tree | 123a2075927def5f7f59a20949d6b59174ae79b6 /korganizer | |
parent | 6add774cf9841377f32613c7aa23161a823aa1da (diff) | |
download | kdepimpi-cf4848d972efe96640f2d5f5d52704306d0cbe4c.zip kdepimpi-cf4848d972efe96640f2d5f5d52704306d0cbe4c.tar.gz kdepimpi-cf4848d972efe96640f2d5f5d52704306d0cbe4c.tar.bz2 |
fixes
-rw-r--r-- | korganizer/datenavigatorcontainer.cpp | 3 | ||||
-rw-r--r-- | korganizer/kodaymatrix.cpp | 8 | ||||
-rw-r--r-- | korganizer/koeventviewerdialog.cpp | 16 | ||||
-rw-r--r-- | korganizer/koeventviewerdialog.h | 1 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 3 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 4 |
6 files changed, 18 insertions, 17 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index e57daa4..f9c8b73 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -120,5 +120,5 @@ void DateNavigatorContainer::slotMonthSelected( int month ) void DateNavigatorContainer::computeMonthSelected( int month , bool forceEmit ) { - //qDebug("slotMonthSelected %d ", month); + //qDebug("slotMonthSelected %d ", month); QDate baseDate = mNavigatorView->baseDate(); if ( baseDate.month() == month ) @@ -133,5 +133,4 @@ void DateNavigatorContainer::computeMonthSelected( int month , bool forceEmit ) QDate last = lastAvailableDate(); QDate first = firstAvailableDate(); - QDate selFirst = mFirstSelectedDate; QDate selLast = selFirst.addDays( mSelectedDateCount-1 ); diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 322131f..ecca374 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -341,8 +341,8 @@ void KODayMatrix::repaintViewTimed() { mRedrawNeeded = true; - bDays.fill( false); - pDays.fill( false); - hDays.fill( false); - eDays.fill( false); + // bDays.fill( false); + //pDays.fill( false); + //hDays.fill( false); + //eDays.fill( false); mRepaintTimer->stop(); int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index 35d084d..1dce841 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp @@ -83,13 +83,18 @@ void KOEventViewerDialog::showMe() show(); setGeometry(x,y,w,h); + raise(); #else showMaximized(); #endif - raise(); - setActiveWindow(); - mEventViewer->setFocus(); - //raise(); + QTimer::singleShot( 1, this, SLOT ( setMyFocus() ) ); } +void KOEventViewerDialog::setMyFocus() +{ + + setActiveWindow(); + mEventViewer->setFocus(); + +} void KOEventViewerDialog::print() { @@ -213,5 +218,6 @@ void KOEventViewerDialog::editIncidence() if ( mIncidence ){ #ifndef DESKTOP_VERSION - hide(); + //hide(); + close(); #endif emit editIncidence( mIncidence ); diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h index 8e1cd44..29fee49 100644 --- a/korganizer/koeventviewerdialog.h +++ b/korganizer/koeventviewerdialog.h @@ -53,4 +53,5 @@ class KOEventViewerDialog : public KDialogBase { void updateConfig(); void print(); + void setMyFocus(); signals: void editIncidence( Incidence* ); diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index e72f94b..0bbb3bf 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -76,5 +76,5 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : { - setFont( KGlobalSettings::generalFont() ); + setFont( KGlobalSettings::generalMaxFont() ); setCaption( i18n("Preferences - some settings need a restart (nr)")); mCategoryDict.setAutoDelete(true); @@ -720,5 +720,4 @@ void KOPrefsDialog::setupViewsTab() topLayout->setSpacing(mSpacingHint); topLayout->setMargin(mMarginHint); - qDebug("%d %d ",mSpacingHint, mMarginHint ); ii = 0; QLabel *lab; diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 9505d06..94f4677 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -1775,8 +1775,4 @@ void MainWindow::saveStopTimer() { mSaveTimer.stop(); - if (mSaveTimer.isActive() ) - qDebug("ti active "); - else - qDebug("KO: Save timer stopped"); } void MainWindow::save() |