-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 9 | ||||
-rw-r--r-- | korganizer/koagendaview.cpp | 5 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 12 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 3 |
4 files changed, 25 insertions, 4 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index bc5cbb7..a5e2597 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -1491,4 +1491,13 @@ | |||
1491 | { "Last Modified","Zuletzt geändert" }, | 1491 | { "Last Modified","Zuletzt geändert" }, |
1492 | { "Journal viewer","Journal Anzeige" }, | 1492 | { "Journal viewer","Journal Anzeige" }, |
1493 | { "Configure Calendar Files...","Konfiguriere Kalenderdateien..." }, | ||
1494 | { "You can use and display <b>more than one</b> calendar file in KO/Pi. A calendar file is called a <b>resource</b>. To add a calendar or change calendar settings please use menu: <b>View -> Toggle Resource View</b>.","Sie können <b>mehr als eine</b> Kalenderdatei in KO/Pi darstellen und benutzen. Eine Kalenderdatei wird <b>Resource</b> genannt. Um einen Kalender hinzuzufügen oder die Kalendereinstellungen zu ändern benutzen Sie bitte das Menu: <b>Ansicht -> Resourcenansicht umschalten</b>." }, | ||
1495 | { "","" }, | ||
1496 | { "","" }, | ||
1497 | { "","" }, | ||
1498 | { "","" }, | ||
1499 | { "","" }, | ||
1500 | { "","" }, | ||
1501 | { "","" }, | ||
1493 | { "","" }, | 1502 | { "","" }, |
1494 | { "","" }, | 1503 | { "","" }, |
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index ef5c4dd..131a345 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -837,5 +837,8 @@ void KOAgendaView::createDayLabels() | |||
837 | addString = i18n("Day after tomorrow"); | 837 | addString = i18n("Day after tomorrow"); |
838 | if ( !addString.isEmpty() ) { | 838 | if ( !addString.isEmpty() ) { |
839 | str = addString+", " + str; | 839 | if ( QApplication::desktop()->width() < 640 ) |
840 | str = addString+", " + str; | ||
841 | else | ||
842 | str = addString+", "+ KGlobal::locale()->formatDate( date, false); | ||
840 | } else { | 843 | } else { |
841 | str = KGlobal::locale()->formatDate( date, KOPrefs::instance()->mShortDateInViewer); | 844 | str = KGlobal::locale()->formatDate( date, KOPrefs::instance()->mShortDateInViewer); |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index cbf6096..e960424 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1020,5 +1020,8 @@ void MainWindow::initActions() | |||
1020 | connect( action, SIGNAL( activated() ), | 1020 | connect( action, SIGNAL( activated() ), |
1021 | mView, SLOT( edit_options() ) ); | 1021 | mView, SLOT( edit_options() ) ); |
1022 | icon = loadPixmap( pathString + "configure" ); | 1022 | action = new QAction( i18n("Configure"),icon, i18n("Configure Calendar Files..."), 0, this ); |
1023 | action->addTo( actionMenu ); | ||
1024 | connect( action, SIGNAL( activated() ), | ||
1025 | this, SLOT( calHint() ) ); | ||
1023 | action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this ); | 1026 | action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this ); |
1024 | action->addTo( actionMenu ); | 1027 | action->addTo( actionMenu ); |
@@ -1361,5 +1364,10 @@ void MainWindow::initActions() | |||
1361 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); | 1364 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); |
1362 | } | 1365 | } |
1363 | 1366 | void MainWindow::calHint() | |
1367 | { | ||
1368 | QString message = i18n("You can use and display <b>more than one</b> calendar file in KO/Pi. A calendar file is called a <b>resource</b>. To add a calendar or change calendar settings please use menu: <b>View -> Toggle Resource View</b>."); | ||
1369 | |||
1370 | KMessageBox::information( this, message); | ||
1371 | } | ||
1364 | void MainWindow::exportToPhone( int mode ) | 1372 | void MainWindow::exportToPhone( int mode ) |
1365 | { | 1373 | { |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index a948a52..adab95d 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -52,5 +52,6 @@ class MainWindow : public QMainWindow | |||
52 | void configureAgenda( int ); | 52 | void configureAgenda( int ); |
53 | void recieve( const QCString& msg, const QByteArray& data ); | 53 | void recieve( const QCString& msg, const QByteArray& data ); |
54 | protected slots: | 54 | protected slots: |
55 | void calHint(); | ||
55 | void startMultiSync(); | 56 | void startMultiSync(); |
56 | void setCaptionToDates(); | 57 | void setCaptionToDates(); |