key fix

1 files changed, 25 insertions, 1 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index ae03a09..09a0880 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -168,3 +168,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
 
-    if ( KOPrefs::instance()->mShowIconFilter ) {
+#ifdef DESKTOP_VERSION
+    if ( KOPrefs::instance()->mShowIconFilter ) 
+#else
+    if ( KOPrefs::instance()->mShowIconFilter || !p->mShowIconOnetoolbar ) 
+#endif
+
+{
         if ( p->mToolBarHorF ) {
@@ -195,2 +201,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
         connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) );
+        if ( !KOPrefs::instance()->mShowIconFilter && !p->mShowIconOnetoolbar )
+            filterToolBar->hide();
     } else {
@@ -204,2 +212,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     } else {
+#ifndef DESKTOP_VERSION
+        setToolBarsMovable( false );
+#endif
         if ( p->mToolBarHorV ) {
@@ -2412 +2423,14 @@ void  MainWindow::hideEvent ( QHideEvent * )
 }
+
+void MainWindow::resizeEvent( QResizeEvent* e)
+{
+#ifndef DESKTOP_VERSION
+    if ( !KOPrefs::instance()->mShowIconFilter && !KOPrefs::instance()->mShowIconOnetoolbar ) {
+        if (QApplication::desktop()->width() > QApplication::desktop()->height() )
+            filterToolBar->hide();
+        else
+            filterToolBar->show();
+    }
+#endif
+    QMainWindow::resizeEvent( e);
+}