summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/kotodoview.cpp6
-rw-r--r--korganizer/mainwindow.cpp43
-rw-r--r--korganizer/mainwindow.h1
3 files changed, 15 insertions, 35 deletions
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 5d7b066..97b4a03 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -1078,7 +1078,11 @@ void KOTodoView::keyPressEvent ( QKeyEvent * e )
e->ignore();
break;
case Qt::Key_S:
- if ( e->state() == Qt::ControlButton|| e->state() == Qt::ShiftButton ) {
+ if ( e->state() == Qt::ControlButton ) {
+ e->ignore();
+ break;
+ }
+ if ( e->state() == Qt::ShiftButton ) {
mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
reparentTodo();
e->accept();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a652c05..6bc5b3a 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -558,8 +558,6 @@ void MainWindow::initActions()
} else
pathString += "iconsmini/";
configureAgendaMenu->setCheckable( true );
- configureAgendaMenu->insertItem(i18n("Toggle Allday"), 1 );
- configureAgendaMenu->insertSeparator();
configureAgendaMenu->insertItem(i18n("Tiny"), 4 );
configureAgendaMenu->insertItem(i18n("Small"), 6 );
configureAgendaMenu->insertItem(i18n("Medium"), 8 );
@@ -607,7 +605,10 @@ void MainWindow::initActions()
action->addTo( viewMenu );
connect( action, SIGNAL( activated() ),
mView, SLOT( toggleFilter() ) );
-
+ action = new QAction( i18n("Toggle Allday"), i18n("Toggle Allday"), 0, this );
+ action->addTo( viewMenu );
+ connect( action, SIGNAL( activated() ),
+ mView, SLOT( toggleAllDaySize() ) );
viewMenu->insertSeparator();
icon = loadPixmap( pathString + "picker" );
@@ -1138,30 +1139,17 @@ void MainWindow::displayText( QString text ,QString cap )
#endif
dia.exec();
}
-void MainWindow::displayFile( QString fn, QString cap )
-{
- QString fileName = resourcePath() + fn;
- QString text;
- QFile file( fileName );
- if (!file.open( IO_ReadOnly ) ) {
- return ;
- }
- QTextStream ts( &file );
- text = ts.read();
- file.close();
- displayText( text, cap);
-}
void MainWindow::features()
{
- displayFile( "featuresKOPI.txt",i18n("KO/Pi Features and hints") );
+ KApplication::showFile( i18n("KO/Pi Features and hints"), "kdepim/korganizer/featuresKOPI.txt" );
}
void MainWindow::usertrans()
{
- displayFile( "usertranslationHOWTO.txt",i18n("KO/Pi User translation HowTo") );
+ KApplication::showFile( i18n("KO/Pi User translation HowTo"), "kdepim/korganizer/usertranslationHOWTO.txt" );
}
void MainWindow::kdesynchowto()
@@ -1178,7 +1166,7 @@ void MainWindow::synchowto()
}
void MainWindow::faq()
{
- displayFile( "kopiFAQ.txt",i18n("KO/Pi FAQ") );
+ KApplication::showFile( i18n("KO/Pi FAQ"), "kdepim/korganizer/kopiFAQ.txt" );
}
void MainWindow::whatsNew()
@@ -1208,7 +1196,7 @@ void MainWindow::about()
}
void MainWindow::keyBindings()
{
- QString cap = i18n("Key bindings KOrganizer/Pi");
+ QString cap = i18n("KO/Pi Keys + Colors");
QString text = i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") +
i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+
i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") +
@@ -1261,19 +1249,12 @@ void MainWindow::keyBindings()
i18n("<p><b>Dark yellow</b>: Event/todo with attendees.</p>\n") +
i18n("<p><b>White</b>: Item readonly</p>\n");
displayText( text, cap);
-
}
void MainWindow::aboutAutoSaving()
{
- QMessageBox* msg;
- msg = new QMessageBox( i18n("Auto Saving in KOrganizer/Pi"),
- i18n("After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configureable) three minutes.\nFor safety reasons there is one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n"), QMessageBox::NoIcon,
- QMessageBox::Ok,
- QMessageBox::NoButton,
- QMessageBox::NoButton);
- msg->exec();
- delete msg;
+ QString text = i18n("After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configureable) three minutes.\nFor safety reasons there is one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n");
+ KApplication::showText( i18n("Auto Saving in KOrganizer/Pi"), text);
}
void MainWindow::aboutKnownBugs()
@@ -1726,10 +1707,6 @@ void MainWindow::configureAgenda( int item )
KOPrefs *p = KOPrefs::instance();
int i;
- if ( item == 1 ) {
- mView->toggleAllDaySize();
- return;
- }
// do not allow 4 for widgets higher than 480
// if ( QApplication::desktop()->height() > 480 ) {
// if ( item == 4 )
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index ed65d36..96e627e 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -87,7 +87,6 @@ class MainWindow : public QMainWindow
protected:
void displayText( QString, QString);
- void displayFile( QString, QString);
void enableIncidenceActions( bool );