-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 | |||
@@ -138,13 +138,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
138 | QString confFile = locateLocal("config","korganizerrc"); | 138 | QString confFile = locateLocal("config","korganizerrc"); |
139 | QFileInfo finf ( confFile ); | 139 | QFileInfo finf ( confFile ); |
140 | bool showWarning = !finf.exists(); | 140 | bool showWarning = !finf.exists(); |
141 | setIcon(SmallIcon( "ko24" ) ); | 141 | setIcon(SmallIcon( "ko24" ) ); |
142 | mBlockAtStartup = true; | 142 | mBlockAtStartup = true; |
143 | mFlagKeyPressed = false; | 143 | mFlagKeyPressed = false; |
144 | setCaption("KOrganizer/Pi"); | 144 | setCaption("KO/Pi"); |
145 | KOPrefs *p = KOPrefs::instance(); | 145 | KOPrefs *p = KOPrefs::instance(); |
146 | KPimGlobalPrefs::instance()->setGlobalConfig(); | 146 | KPimGlobalPrefs::instance()->setGlobalConfig(); |
147 | if ( p->mHourSize > 22 ) | 147 | if ( p->mHourSize > 22 ) |
148 | p->mHourSize = 22; | 148 | p->mHourSize = 22; |
149 | QMainWindow::ToolBarDock tbd; | 149 | QMainWindow::ToolBarDock tbd; |
150 | if ( p->mToolBarHor ) { | 150 | if ( p->mToolBarHor ) { |
@@ -1849,24 +1849,37 @@ void MainWindow::configureToolBar( int item ) | |||
1849 | p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); | 1849 | p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 ); |
1850 | p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 ); | 1850 | p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 ); |
1851 | p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); | 1851 | p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); |
1852 | p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 ); | 1852 | p-> mShowIconWeekNum= configureToolBarMenu->isItemChecked( 400 ); |
1853 | // initActions(); | 1853 | // initActions(); |
1854 | } | 1854 | } |
1855 | 1855 | void MainWindow::setCaption ( const QString & c ) | |
1856 | { | ||
1857 | QString cap = c; | ||
1858 | cap.replace( QRegExp("\n"), " " ); | ||
1859 | cap = cap.stripWhiteSpace(); | ||
1860 | if ( cap.isEmpty() ) | ||
1861 | cap = "KO/Pi"; | ||
1862 | QWidget::setCaption( cap ); | ||
1863 | } | ||
1856 | void MainWindow::setCaptionToDates() | 1864 | void MainWindow::setCaptionToDates() |
1857 | { | 1865 | { |
1858 | QString selDates; | 1866 | QString selDates; |
1859 | selDates = KGlobal::locale()->formatDate(mView->startDate(), true); | 1867 | QDate date = mView->startDate(); |
1868 | if ( ! date.isValid() ) { | ||
1869 | setCaption(""); | ||
1870 | return; | ||
1871 | } | ||
1872 | selDates = KGlobal::locale()->formatDate( date, true); | ||
1860 | if (mView->startDate() < mView->endDate() ) | 1873 | if (mView->startDate() < mView->endDate() ) |
1861 | selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true); | 1874 | selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true); |
1862 | else { | 1875 | else { |
1863 | QString addString; | 1876 | QString addString; |
1864 | if ( mView->startDate() == QDateTime::currentDateTime().date() ) | 1877 | if ( date == QDateTime::currentDateTime().date() ) |
1865 | addString = i18n("Today"); | 1878 | addString = i18n("Today"); |
1866 | else if ( mView->startDate() == QDateTime::currentDateTime().date().addDays(1) ) | 1879 | else if ( date == QDateTime::currentDateTime().date().addDays(1) ) |
1867 | addString = i18n("Tomorrow"); | 1880 | addString = i18n("Tomorrow"); |
1868 | if ( !addString.isEmpty() ) | 1881 | if ( !addString.isEmpty() ) |
1869 | selDates = addString+", "+selDates ; | 1882 | selDates = addString+", "+selDates ; |
1870 | } | 1883 | } |
1871 | setCaption( i18n("Dates: ") + selDates ); | 1884 | setCaption( i18n("Dates: ") + selDates ); |
1872 | 1885 | ||