fixes

7 files changed, 59 insertions, 12 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index b3a406c..1a045f3 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1327,3 +1327,3 @@
 { "Printout Mode","Druck Modus" },
-{ "","" },
+{ "Filter menu icon","Filtermenu Icon" },
 { "","" },
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index b3429e3..648e780 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -66,2 +66,3 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
 {
+    qDebug("NEW AddresseeDialog ");
   QWidget *topWidget = plainPage();
@@ -139,2 +140,3 @@ AddresseeDialog::~AddresseeDialog()
 {
+    qDebug("DELETE AddresseeDialog ");
 }
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 27aca2d..3f9b546 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -376,2 +376,3 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
   connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle()));
+  connect( ExternalAppHandler::instance(), SIGNAL (callContactdialog()),this, SLOT(callContactdialog()));
 
@@ -837,2 +838,3 @@ void KABCore::resizeEvent(QResizeEvent* e )
             if ( QApplication::desktop()->width() <= 640 ) {
+                mMainWindow->showMinimized();
                 //mMainWindow->setMaximumSize( QApplication::desktop()->size()  );
@@ -863,2 +865,3 @@ void KABCore::resizeEvent(QResizeEvent* e )
     }
+    QWidget::resizeEvent( e );
 
@@ -2507,7 +2510,7 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt
 {
-  QStringList nameList;
-  QStringList emailList;
-  QStringList uidList;
+
   bool ok = false;
+  mEmailSourceChannel = sourceChannel;
   int wid = uid.toInt( &ok );
+  qDebug("UID %s ", uid.latin1());
   if ( ok ) {
@@ -2516,4 +2519,10 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt
           message( i18n("Resizing, please wait...") );
-          raise();
-          qApp->processEvents();
+          mMainWindow->showMinimized();
+          /*
+          {
+              QCopEnvelope e("QPE/Application/kapi", "callContactdialog()");
+          }
+          */
+          QTimer::singleShot( 1,this, SLOT ( resizeAndCallContactdialog() ) );
+          return;
       }
@@ -2523,3 +2532,18 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt
   }
- 
+  callContactdialog();
+  //QCopEnvelope e("QPE/Application/kapi", "callContactdialog()");
+
+}
+void KABCore::resizeAndCallContactdialog()
+{
+    updateMainWindow();
+    QTimer::singleShot( 100,this, SLOT ( callContactdialog() ) );
+}
+
+void KABCore::callContactdialog()
+{
+    QStringList nameList;
+  QStringList emailList;
+  QStringList uidList; 
+  qDebug("WIDTH %d ",   QApplication::desktop()->width()       );
   KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this);
@@ -2532,7 +2556,7 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt
   }
+  QString uid = "unnamed";
   //qDebug("%s %s ", sourceChannel.latin1(), uid.latin1());
-  bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(sourceChannel, uid, nameList, emailList, uidList);
+  bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(mEmailSourceChannel, uid, nameList, emailList, uidList);
 
 }
-
 /* this method will be called through the QCop interface from Ko/Pi to select birthdays
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index c185117..47ea152 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -370,2 +370,5 @@ class KABCore : public QWidget, public KSyncInterface
     void setCaptionBack();
+    void resizeAndCallContactdialog();
+    void callContactdialog();
+
   void importFromOL();
@@ -387,2 +390,3 @@ class KABCore : public QWidget, public KSyncInterface
   private:
+    QString mEmailSourceChannel;
     void resizeEvent(QResizeEvent* e );
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 8a4c7eb..6ddced0 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -746,3 +746,3 @@ void MainWindow::initActions()
     icon = loadPixmap( pathString + "filter" );
-    configureToolBarMenu->insertItem(icon, i18n("Toggle FilterView"), 26 );
+    configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 );
     action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this );
@@ -780,3 +780,12 @@ void MainWindow::initActions()
     if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar );
-    if ( p->mShowIconFilterview ) mToggleFilter->addTo( iconToolBar );
+    if ( p->mShowIconFilterview ) {
+        icon = loadPixmap( pathString + "filter" );
+        QPEMenuBar *menuBar111 = new QPEMenuBar( iconToolBar );
+        menuBar111->insertItem( icon.pixmap(), selectFilterMenu);
+        int isi = 24;
+        if ( QApplication::desktop()->width() < 480 )
+            isi = 18;
+        menuBar111->setFixedSize( QSize( isi, isi  )) ;
+    }
+    //********************
     if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar );
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index f8f4c8a..0d66a5a 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -1137,3 +1137,8 @@ void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& dat
     }
-        
+    if ( cmsg == "callContactdialog()" ) {
+        qDebug("callContactdialog()");
+        emit callContactdialog();
+        return;
+    }
+    
   bool res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data );
@@ -1157,3 +1162,5 @@ bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceCh
   // for that reason we send the current QApplication::desktop()->width() to KA/Pi
+  //qDebug("UID %s ", sessionuid.latin1());
   return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(QString::number ( QApplication::desktop()->width() ));
+  //return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(sessionuid);
 }
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h
index 52a64e1..097f306 100644
--- a/libkdepim/externalapphandler.h
+++ b/libkdepim/externalapphandler.h
@@ -235,2 +235,3 @@ class ExternalAppHandler : public QObject
  signals:
+    void callContactdialog();
     void nextView();