summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-07-06 19:14:52 (UTC)
committer zautrix <zautrix>2005-07-06 19:14:52 (UTC)
commitc79a8a4950c098fa6f5a7ae8396feb4dd3a91577 (patch) (side-by-side diff)
tree7c6e03165f85a4bb42c8a20f6090fc533f3133f0 /korganizer
parent2038f7363c31e1a0ab139a1184cbed10086e1862 (diff)
downloadkdepimpi-c79a8a4950c098fa6f5a7ae8396feb4dd3a91577.zip
kdepimpi-c79a8a4950c098fa6f5a7ae8396feb4dd3a91577.tar.gz
kdepimpi-c79a8a4950c098fa6f5a7ae8396feb4dd3a91577.tar.bz2
fixes
Diffstat (limited to 'korganizer') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp3
-rw-r--r--korganizer/mainwindow.cpp10
-rw-r--r--korganizer/mainwindow.h1
3 files changed, 13 insertions, 1 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index ef5c4dd..131a345 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -836,7 +836,10 @@ void KOAgendaView::createDayLabels()
else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) )
addString = i18n("Day after tomorrow");
if ( !addString.isEmpty() ) {
+ if ( QApplication::desktop()->width() < 640 )
str = addString+", " + str;
+ else
+ str = addString+", "+ KGlobal::locale()->formatDate( date, false);
} else {
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
@@ -1019,7 +1019,10 @@ void MainWindow::initActions()
action->addTo( actionMenu );
connect( action, SIGNAL( activated() ),
mView, SLOT( edit_options() ) );
- icon = loadPixmap( pathString + "configure" );
+ action = new QAction( i18n("Configure"),icon, i18n("Configure Calendar Files..."), 0, this );
+ action->addTo( actionMenu );
+ connect( action, SIGNAL( activated() ),
+ this, SLOT( calHint() ) );
action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
action->addTo( actionMenu );
connect( action, SIGNAL( activated() ),
@@ -1360,7 +1363,12 @@ void MainWindow::initActions()
configureAgenda( p->mHourSize );
connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) );
}
+void MainWindow::calHint()
+{
+ 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>.");
+ KMessageBox::information( this, message);
+}
void MainWindow::exportToPhone( int mode )
{
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index a948a52..adab95d 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -52,6 +52,7 @@ class MainWindow : public QMainWindow
void configureAgenda( int );
void recieve( const QCString& msg, const QByteArray& data );
protected slots:
+ void calHint();
void startMultiSync();
void setCaptionToDates();
void weekAction();