summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-08-17 16:19:18 (UTC)
committer zautrix <zautrix>2005-08-17 16:19:18 (UTC)
commitc21edc19916722f5dd4e939f1522d311a86411fd (patch) (unidiff)
treeed91c2cd9afb7d37c73f2056851c95293eff6038
parent9e6d1f7f45ef1444dc6ee96347a2dbd67a0d79dd (diff)
downloadkdepimpi-c21edc19916722f5dd4e939f1522d311a86411fd.zip
kdepimpi-c21edc19916722f5dd4e939f1522d311a86411fd.tar.gz
kdepimpi-c21edc19916722f5dd4e939f1522d311a86411fd.tar.bz2
minor kopi fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp27
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
@@ -208,3 +208,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
208#else 208#else
209 if ( KOPrefs::instance()->mShowIconFilter || !p->mShowIconOnetoolbar ) 209 if ( KOPrefs::instance()->mShowIconFilter || ( !p->mShowIconOnetoolbar &&!p->mShowIconFilterview ) )
210#endif 210#endif
@@ -236,5 +236,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
236#ifdef DESKTOP_VERSION 236#ifdef DESKTOP_VERSION
237 addTest = "AAABBBCCCx"; 237 addTest = "AAAAAABBBCCCx";
238#else 238#else
239 addTest = "AAx"; 239 addTest = "AAAAAx";
240#endif 240#endif
@@ -839,3 +839,2 @@ void MainWindow::initActions()
839 icon = loadPixmap( pathString + "newtodo" ); 839 icon = loadPixmap( pathString + "newtodo" );
840 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
841 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); 840 QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
@@ -859,2 +858,4 @@ void MainWindow::initActions()
859 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); 858 configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
859 icon = loadPixmap( pathString + "newtodo" );
860 configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
860 861
@@ -1050,2 +1051,3 @@ void MainWindow::initActions()
1050 1051
1052 icon = loadPixmap( pathString + "search" );
1051 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5); 1053 configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5);
@@ -2327,3 +2329,6 @@ void MainWindow::updateFilterToolbar()
2327 if ( curfilter ) { 2329 if ( curfilter ) {
2328 filterMenubar->changeItem( 0, curfilter->name() ); 2330 QString name = curfilter->name();
2331 if ( name.length() > 12 )
2332 name = name.left(10)+"...";
2333 filterMenubar->changeItem( 0, name );
2329 } 2334 }
@@ -2664,7 +2669,9 @@ void MainWindow::resizeEvent( QResizeEvent* e)
2664#ifndef DESKTOP_VERSION 2669#ifndef DESKTOP_VERSION
2665 if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar && QApplication::desktop()->width() > 320) { 2670 if ( filterToolBar ) {
2666 if (QApplication::desktop()->width() > QApplication::desktop()->height() ) 2671 if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar && QApplication::desktop()->width() > 320) {
2667 filterToolBar->hide(); 2672 if (QApplication::desktop()->width() > QApplication::desktop()->height() )
2668 else 2673 filterToolBar->hide();
2669 filterToolBar->show(); 2674 else
2675 filterToolBar->show();
2676 }
2670 } 2677 }