minor kopi fixes

1 files changed, 17 insertions, 10 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 45775c5..94bc4c1 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -201,17 +201,17 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
         QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
     globalFlagBlockStartup = 1;
     iconToolBar = new QPEToolBar( this );
     addToolBar (iconToolBar , tbd );
 
 #ifdef DESKTOP_VERSION
     if ( KOPrefs::instance()->mShowIconFilter ) 
 #else
-    if ( KOPrefs::instance()->mShowIconFilter || !p->mShowIconOnetoolbar ) 
+        if ( KOPrefs::instance()->mShowIconFilter || ( !p->mShowIconOnetoolbar &&!p->mShowIconFilterview ) )
 #endif
 
 {
         if ( p->mToolBarHorF ) {
             if ( p->mToolBarUpF )
                 tbd = Bottom;
             else
                 tbd = Top;
@@ -229,19 +229,19 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
         filterToolBar->setFocusPolicy( NoFocus );
         filterMenubar->setFocusPolicy( NoFocus );
 #endif     
         filterPopupMenu = new QPopupMenu( this );
         filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0  );
         QString addTest = "A";  
         filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) );
 #ifdef DESKTOP_VERSION
-        addTest = "AAABBBCCCx"; 
+        addTest = "AAAAAABBBCCCx"; 
 #else
-        addTest = "AAx";  
+        addTest = "AAAAAx";  
 #endif 
         filterMenubar->setMaximumWidth( fm.width( i18n("No Filter")+addTest ) );
         addToolBar (filterToolBar , tbd );
         connect ( filterPopupMenu , SIGNAL( activated ( int )  ), this, SLOT (selectFilterPopup( int ) ) );
         connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) );
         if ( !KOPrefs::instance()->mShowIconFilter && !p->mShowIconOnetoolbar )
             filterToolBar->hide();
     } else {
@@ -832,17 +832,16 @@ void MainWindow::initActions()
     actionMenu->insertSeparator();
     
      icon = loadPixmap( pathString + "newevent" );
     QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
     ne_action->addTo( mCurrentItemMenu );
     connect( ne_action, SIGNAL( activated() ),
              mView, SLOT( newEvent() ) );
     icon = loadPixmap( pathString + "newtodo" );
-    configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
     QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
     nt_action->addTo( mCurrentItemMenu );
     connect( nt_action, SIGNAL( activated() ),
              mView, SLOT( newTodo() ) );
     mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0,
                                      this );
     mNewSubTodoAction->addTo(  mCurrentItemMenu );
     connect( mNewSubTodoAction, SIGNAL( activated() ),
@@ -852,16 +851,18 @@ void MainWindow::initActions()
     icon = loadPixmap( pathString + "newevent" );
     configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
     configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
     configureToolBarMenu->insertSeparator();
     configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 );
     configureToolBarMenu->insertSeparator();
     configureToolBarMenu->insertItem(i18n("Week Number"), 400);
     configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
+    icon = loadPixmap( pathString + "newtodo" );
+    configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
 
     //actionMenu->insertItem (  i18n("Selected Item"),  mCurrentItemMenu);
     mShowAction = new QAction( "show_incidence", i18n("Show"), 0, this );
     mShowAction->addTo( mCurrentItemMenu  );
     connect( mShowAction, SIGNAL( activated() ),
              mView, SLOT( showIncidence() ) );
 
     mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
@@ -1043,16 +1044,17 @@ void MainWindow::initActions()
  
 
     action = new QAction( "purge_completed", i18n("Purge Completed..."), 0,
                           this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) );
 
    
+    icon = loadPixmap( pathString + "search" );
     configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5);
 
 
 
     actionMenu->insertSeparator();
      action = new QAction( "manage cat", i18n("Edit category list..."), 0,
                           this );
     action->addTo(  actionMenu );
@@ -2320,17 +2322,20 @@ void MainWindow::selectFilter( int fil )
 void MainWindow::updateFilterToolbar()
 {
     if ( filterMenubar ) {
         if ( !mView->filterView()->filtersEnabled() ) {
             filterMenubar->changeItem( 0, i18n("No Filter") );
         } else {
             CalFilter *curfilter = mView->filterView()->selectedFilter();
             if ( curfilter ) {
-                filterMenubar->changeItem( 0, curfilter->name() );
+                QString name = curfilter->name();
+                if ( name.length() > 12 )
+                    name = name.left(10)+"...";
+                filterMenubar->changeItem( 0, name );
             }
         }
     }
 }
 void MainWindow::selectFilterPopup( int fil )
 {
     selectFilter( fil + 1 );
    
@@ -2657,17 +2662,19 @@ void  MainWindow::hideEvent ( QHideEvent * )
         message = i18n("%1 %2 - %3 (next event/todo with alarm)").arg( KGlobal::locale()->formatTime(nextA.time() , false)).arg(sum ).arg( KGlobal::locale()->formatDate(nextA.date() , false));
         setCaption( message );
     } 
 }
 
 void MainWindow::resizeEvent( QResizeEvent* e)
 {
 #ifndef DESKTOP_VERSION
-    if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar && QApplication::desktop()->width() > 320) {
-        if (QApplication::desktop()->width() > QApplication::desktop()->height()  )
-            filterToolBar->hide();
-        else
-            filterToolBar->show();
+    if ( filterToolBar ) {
+        if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar && QApplication::desktop()->width() > 320) {
+            if (QApplication::desktop()->width() > QApplication::desktop()->height()  )
+                filterToolBar->hide();
+            else
+                filterToolBar->show();
+        }
     }
 #endif
     QMainWindow::resizeEvent( e);
 }