| -rw-r--r-- | korganizer/mainwindow.cpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 7faf675..7d5cf72 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -140,9 +140,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : bool showWarning = !finf.exists(); setIcon(SmallIcon( "ko24" ) ); mBlockAtStartup = true; mFlagKeyPressed = false; - setCaption("KOrganizer/Pi"); + setCaption("KO/Pi"); KOPrefs *p = KOPrefs::instance(); KPimGlobalPrefs::instance()->setGlobalConfig(); if ( p->mHourSize > 22 ) p->mHourSize = 22; @@ -1851,20 +1851,33 @@ void MainWindow::configureToolBar( int item ) p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 ); // initActions(); } - +void MainWindow::setCaption ( const QString & c ) +{ + QString cap = c; + cap.replace( QRegExp("\n"), " " ); + cap = cap.stripWhiteSpace(); + if ( cap.isEmpty() ) + cap = "KO/Pi"; + QWidget::setCaption( cap ); +} void MainWindow::setCaptionToDates() { QString selDates; - selDates = KGlobal::locale()->formatDate(mView->startDate(), true); + QDate date = mView->startDate(); + if ( ! date.isValid() ) { + setCaption(""); + return; + } + selDates = KGlobal::locale()->formatDate( date, true); if (mView->startDate() < mView->endDate() ) selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true); else { QString addString; - if ( mView->startDate() == QDateTime::currentDateTime().date() ) + if ( date == QDateTime::currentDateTime().date() ) addString = i18n("Today"); - else if ( mView->startDate() == QDateTime::currentDateTime().date().addDays(1) ) + else if ( date == QDateTime::currentDateTime().date().addDays(1) ) addString = i18n("Tomorrow"); if ( !addString.isEmpty() ) selDates = addString+", "+selDates ; } |