some fixes

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
@@ -1075,13 +1075,17 @@ void KOTodoView::keyPressEvent ( QKeyEvent * e )
             unparentTodo();
             e->accept();
         } else
             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();
         } else
             e->ignore();
         break; 
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a652c05..6bc5b3a 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -555,14 +555,12 @@ void MainWindow::initActions()
     if ( !p->mToolBarMiniIcons ) {
     if ( QApplication::desktop()->width() < 480 )
         pathString += "icons16/";
     } 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 );
     configureAgendaMenu->insertItem(i18n("Normal"), 10 );
     configureAgendaMenu->insertItem(i18n("Large"), 12 );
     configureAgendaMenu->insertItem(i18n("Big"), 14 );
@@ -604,13 +602,16 @@ void MainWindow::initActions()
              mView, SLOT( toggleDateNavigatorWidget() ) );
     icon = loadPixmap( pathString + "filter" );
     action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this );
     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" );
     action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
@@ -1135,36 +1136,23 @@ void MainWindow::displayText( QString text ,QString cap  )
     dia.resize( 640, 480);
 #else
     dia.showMaximized();
 #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()
 {
     KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" );
 }
@@ -1175,13 +1163,13 @@ void MainWindow::multisynchowto()
 void MainWindow::synchowto()
 {
     KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" );
 }
 void  MainWindow::faq()
 {
-    displayFile( "kopiFAQ.txt",i18n("KO/Pi FAQ") );
+    KApplication::showFile( i18n("KO/Pi FAQ"), "kdepim/korganizer/kopiFAQ.txt" );
 
 }
 void  MainWindow::whatsNew()
 {
     KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" );
 
@@ -1205,13 +1193,13 @@ void MainWindow::about()
                         i18n("PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n") +
 #endif
                         i18n("(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi is based on KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi is licensed\nunder the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.korganizer.org\nwww.pi-sync.net\n") );
 }
 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") +
         i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+
         i18n("<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n")+
         i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+
@@ -1258,25 +1246,18 @@ void MainWindow::keyBindings()
         i18n("<p><b>Blue</b>: Recurrent event.([r] in Whats'Next view)</p>\n")+
         i18n("<p><b>Dark green</b>: Information(description) available.([i] in WN view)</p>\n")+
         i18n("<p><b>Black</b>: Event/todo with attendees. You are the organizer!</p>\n")+
         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()
 {
     QMessageBox* msg;
     msg = new QMessageBox(  i18n("Known Problems in  KOrganizer/Pi"),
@@ -1723,16 +1704,12 @@ void MainWindow::setCaptionToDates()
 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 )
 //             item = 6;
 //     }
     for ( i = 4; i <= 18; i= i+2 )
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index ed65d36..96e627e 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -84,13 +84,12 @@ class MainWindow : public QMainWindow
     void toggleBeamReceive();
     void disableBR(bool);
 
     
   protected:
     void displayText( QString, QString);
-    void displayFile( QString, QString);
     
     void enableIncidenceActions( bool );
     
   private slots:
     QSocket* piSocket;
     QString  piFileString;