fixxx

5 files changed, 26 insertions, 30 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index eac2f29..d25f632 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -4028,3 +4028,7 @@ void CalendarView::toggleFilter()
 {
-    showFilter(! mCalEditView->isVisible());
+    if ( mLeftFrame->isHidden() ) {
+        toggleExpand();
+        showFilter( true );
+    } else 
+        showFilter(! mCalEditView->isVisible());
 }
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index e4dc751..bb88386 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -197,3 +197,3 @@ void KOCalEditView::deleteCal( int id )
     QString name = kkf->mName;
-    QString file = kkf->mFileName;
+    QString file = KGlobal::formatMessage ( kkf->mFileName ,0 );
     if ( KMessageBox::warningContinueCancel( this,  i18n("The calendar <b>%1</b> is displaying file <b>%2</b>. Do you want to remove this calendar from KO/Pi? (The file is not removed!)").arg(name).arg(file) ) != KMessageBox::Continue ) return;
@@ -209,3 +209,3 @@ void KOCalEditView::infoCal( int id )
     QString name = KOPrefs::instance()->getCalendar( id )->mName;
-    QString file = KOPrefs::instance()->getCalendar( id )->mFileName;
+    QString file = KGlobal::formatMessage ( KOPrefs::instance()->getCalendar( id )->mFileName, 0 );
     if ( KOPrefs::instance()->getCalendar( id )->mErrorOnLoad ) {
@@ -362,3 +362,3 @@ void KOCalEditView::addCal()
             if ( kkf->mFileName == file ) {
-                KMessageBox::information( this,  i18n("Sorry, the file \n%1\nis already loaded!\nPlease choose another file!").arg( file) ); 
+                KMessageBox::information( this,  i18n("Sorry, the file \n%1\nis already loaded!\nPlease choose another file!").arg(  KGlobal::formatMessage (file, 0 )) ); 
                 tryagain = true;  
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 13e88ef..926a136 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -98,2 +98,3 @@ KOStopTodoPrefs::KOStopTodoPrefs( Todo* todo, QWidget *parent, const char *name
     lay->addWidget( ok );
+    ok->setDefault( true );
     QPushButton * cancel = new QPushButton( i18n("Continue running"), this );
@@ -1204,22 +1205,5 @@ void KOTodoView::toggleRunningItem()
     if ( t->isRunning() ) {
-
-
         KOStopTodoPrefs tp ( t, this );
         tp.exec();
-
-
-#if 0
-        int result = KMessageBox::warningYesNoCancel(this,
-                                                        i18n("The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?").arg(mActiveItem->text(0).left( 25 ) ),i18n("Todo is started"),i18n("Stop"),i18n("Stop+note"));
-        if (result == KMessageBox::Cancel) return;
-        if ( result == KMessageBox::No ) {
-            QString comment = QInputDialog::getText(mActiveItem->text(0).left( 25 ),i18n("Comment for todo:") );
-            t->setRunningFalse( comment );
-        } else {
-            t->setRunning( false );
-        }
         mActiveItem->construct();
-
-
-#endif
     } else {
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 13e186d..f945383 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -780,9 +780,3 @@ void MainWindow::initActions()
 
-    icon = loadPixmap( pathString + "navi" );
-    configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 );
-    action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
-    action->addTo( viewMenu );
-    connect( action, SIGNAL( activated() ),
-             mView, SLOT( toggleDateNavigatorWidget() ) );
-    mToggleNav = action ;
+   
     icon = loadPixmap( pathString + "filter" );
@@ -795,2 +789,9 @@ void MainWindow::initActions()
     mToggleFilter = action;
+    icon = loadPixmap( pathString + "navi" );
+    configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 );
+    action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
+    action->addTo( viewMenu );
+    connect( action, SIGNAL( activated() ),
+             mView, SLOT( toggleDateNavigatorWidget() ) );
+    mToggleNav = action ;
     icon = loadPixmap( pathString + "allday" );
@@ -806,4 +807,4 @@ void MainWindow::initActions()
              mToggleNav, SLOT( setEnabled ( bool ) ) );
-    connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
-             mToggleFilter, SLOT( setEnabled ( bool ) ) );
+    //connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
+    //       mToggleFilter, SLOT( setEnabled ( bool ) ) );
     connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
diff --git a/microkde/kglobal.cpp b/microkde/kglobal.cpp
index bf7e238..53edd08 100644
--- a/microkde/kglobal.cpp
+++ b/microkde/kglobal.cpp
@@ -101,2 +101,9 @@ QString KGlobal::formatMessage ( QString mess, int maxlen  )
     //int maxlen = 80;
+    if ( maxlen == 0 ) {
+        maxlen =  QApplication::desktop()->width()/10;
+        if ( maxlen > 32 )
+            maxlen = (maxlen * 3) / 4;
+        if ( maxlen > 100 )
+            maxlen = 100;
+    }
     int start = 0;