| author | zautrix <zautrix> | 2005-08-17 16:19:18 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-08-17 16:19:18 (UTC) |
| commit | c21edc19916722f5dd4e939f1522d311a86411fd (patch) (side-by-side diff) | |
| tree | ed91c2cd9afb7d37c73f2056851c95293eff6038 | |
| parent | 9e6d1f7f45ef1444dc6ee96347a2dbd67a0d79dd (diff) | |
| download | kdepimpi-c21edc19916722f5dd4e939f1522d311a86411fd.zip kdepimpi-c21edc19916722f5dd4e939f1522d311a86411fd.tar.gz kdepimpi-c21edc19916722f5dd4e939f1522d311a86411fd.tar.bz2 | |
minor kopi fixes
| -rw-r--r-- | korganizer/mainwindow.cpp | 27 |
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 ) : #else - if ( KOPrefs::instance()->mShowIconFilter || !p->mShowIconOnetoolbar ) + if ( KOPrefs::instance()->mShowIconFilter || ( !p->mShowIconOnetoolbar &&!p->mShowIconFilterview ) ) #endif @@ -236,5 +236,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) : #ifdef DESKTOP_VERSION - addTest = "AAABBBCCCx"; + addTest = "AAAAAABBBCCCx"; #else - addTest = "AAx"; + addTest = "AAAAAx"; #endif @@ -839,3 +839,2 @@ void MainWindow::initActions() 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 ); @@ -859,2 +858,4 @@ void MainWindow::initActions() configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); + icon = loadPixmap( pathString + "newtodo" ); + configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); @@ -1050,2 +1051,3 @@ void MainWindow::initActions() + icon = loadPixmap( pathString + "search" ); configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5); @@ -2327,3 +2329,6 @@ void MainWindow::updateFilterToolbar() if ( curfilter ) { - filterMenubar->changeItem( 0, curfilter->name() ); + QString name = curfilter->name(); + if ( name.length() > 12 ) + name = name.left(10)+"..."; + filterMenubar->changeItem( 0, name ); } @@ -2664,7 +2669,9 @@ 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(); + } } |