7 files changed, 57 insertions, 10 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
@@ -1322,10 +1322,10 @@
 { "This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.\n","Dies druckt die Ansicht wie man sie sieht.\n(Mit dem kompletten Inhalt natürlich.)\nMan kann das Layout ändern durch ändern der Fenstergröße.\nDrucke unskaliert druckt ggf. mehrere Seiten\nabhängig von der Menge der Daten.\nDrucke runterskaliert um auf eine Seite zu passen\ndruckt alles auf eine Seite.\nDrucke hoch/runterskaliert um genau auf eine Seite zu passen\nvergrößert den Text gegebenenfalls.\nDas Seitenlayout kann im nächsten Dialog gewählt werden.\n" },
 { "KO/Pi Printout","KO/Pi Ausdruck" },
 { "Print unscaled","Drucke unskaliert" },
 { "Print scaled down to fit one page","Drucke runterskaliert um auf eine Seite zu passen." },
 { "Print scaled up/down to fit one page","Drucke hoch/runterskaliert um genau auf eine Seite zu passen." },
 { "Printout Mode","Druck Modus" },
-{ "","" },
+{ "Filter menu icon","Filtermenu Icon" },
 { "","" },
 { "","" },
 { "","" },
\ No newline at end of file
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index b3429e3..648e780 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -61,12 +61,13 @@ QString AddresseeItem::key( int column, bool ) const
 }
 
 AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
   KDialogBase( KDialogBase::Plain, i18n("Select Addressee"),
                Ok|Cancel, No, parent ), mMultiple( multiple )
 {
+    qDebug("NEW AddresseeDialog ");
   QWidget *topWidget = plainPage();
 
   QBoxLayout *topLayout = new QHBoxLayout( topWidget );
 
 
   KDGanttMinimizeSplitter* mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, topWidget);
@@ -134,12 +135,13 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
   splitterSize.append( ( width() / 5 ) *2 );
   mMiniSplitter->setSizes( splitterSize );
 }
 
 AddresseeDialog::~AddresseeDialog()
 {
+    qDebug("DELETE AddresseeDialog ");
 }
 
 void AddresseeDialog::loadAddressBook()
 {
   mAddresseeList->clear();
   mItemDict.clear();
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 27aca2d..3f9b546 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -371,12 +371,13 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
 
 
   connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&)));
   connect( ExternalAppHandler::instance(), SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)),this, SLOT(requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)));
   connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&)));
   connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle()));
+  connect( ExternalAppHandler::instance(), SIGNAL (callContactdialog()),this, SLOT(callContactdialog()));
 
 
 #ifndef KAB_EMBEDDED
   connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ),
            mXXPortManager, SLOT( importVCard( const KURL& ) ) );
 
@@ -832,12 +833,13 @@ void KABCore::resizeEvent(QResizeEvent* e )
         if (QApplication::desktop()->width() == 640 ) { // e.g. 640x480
             if ( mMiniSplitter->orientation() == Qt::Vertical ) {
                 mMiniSplitter->setOrientation(  Qt::Horizontal);
                 mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
             }
             if ( QApplication::desktop()->width() <= 640 ) {
+                mMainWindow->showMinimized();
                 //mMainWindow->setMaximumSize( QApplication::desktop()->size()  );
                 mViewManager->getFilterAction()->setComboWidth( 150 );
                 if ( mIncSearchWidget )
                     mIncSearchWidget->setSize();
                 QTimer::singleShot( 1, this , SLOT ( updateMainWindow()));
             }
@@ -858,12 +860,13 @@ void KABCore::resizeEvent(QResizeEvent* e )
                     mViewManager->getFilterAction()->setComboWidth( 0 );
                 }
                 QTimer::singleShot( 1, this , SLOT ( updateMainWindow()));
             }
         }
     }
+    QWidget::resizeEvent( e );
 
 }
 void KABCore::export2phone()
 {
 
     QStringList uids;
@@ -2502,42 +2505,63 @@ void KABCore::configureResources()
 
 /* this method will be called through the QCop interface from Ko/Pi to select addresses
  * for the attendees list of an event.
  */
 void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid)
 {
-  QStringList nameList;
-  QStringList emailList;
-  QStringList uidList;
+
   bool ok = false;
+  mEmailSourceChannel = sourceChannel;
   int wid = uid.toInt( &ok );
+  qDebug("UID %s ", uid.latin1());
   if ( ok ) {
       if ( wid != QApplication::desktop()->width() ) {
           qDebug("KA/Pi: Request from different desktop geometry. Resizing ...");
           message( i18n("Resizing, please wait...") );
-          raise();
-          qApp->processEvents();
+          mMainWindow->showMinimized();
+          /*
+          {
+              QCopEnvelope e("QPE/Application/kapi", "callContactdialog()");
+          }
+          */
+          QTimer::singleShot( 1,this, SLOT ( resizeAndCallContactdialog() ) );
+          return;
       }
 
   } else {
       qDebug("KABCore::requestForNameEmailUidList:: Got invalid uid ");
   }
+  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);
   uint i=0;
   for (i=0; i < list.count(); i++)
   {
         nameList.append(list[i].realName());
         emailList.append(list[i].preferredEmail());
         uidList.append(list[i].uid());
   }
+  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
  * to put them into the calendar.
  */
 void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString& uid)
 {
   //  qDebug("KABCore::requestForBirthdayList");
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index c185117..47ea152 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -365,12 +365,15 @@ class KABCore : public QWidget, public KSyncInterface
     void receive( const QCString& cmsg, const QByteArray& data );
     void toggleBeamReceive( );
     void disableBR(bool);
     void setJumpButtonBarVisible( bool visible );
     void setJumpButtonBar( bool visible );
     void setCaptionBack();
+    void resizeAndCallContactdialog();
+    void callContactdialog();
+
   void importFromOL();
     void extensionModified( const KABC::Addressee::List &list );
     void extensionChanged( int id );
     void clipboardDataChanged();
     void updateActionMenu();
     void configureKeyBindings();
@@ -382,12 +385,13 @@ class KABCore : public QWidget, public KSyncInterface
 
     void slotEditorDestroyed( const QString &uid );
     void configurationChanged();
     void addressBookChanged();
 
   private:
+    QString mEmailSourceChannel;
     void resizeEvent(QResizeEvent* e );
     bool mBRdisabled;
 #ifndef DESKTOP_VERSION
     QCopChannel* infrared;
 #endif
     QTimer *mMessageTimer;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 8a4c7eb..6ddced0 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -741,13 +741,13 @@ void MainWindow::initActions()
     action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( toggleDateNavigatorWidget() ) );
     mToggleNav = action ;
     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 );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( toggleFilter() ) );
     mToggleFilter = action;
     icon = loadPixmap( pathString + "allday" );
@@ -775,13 +775,22 @@ void MainWindow::initActions()
     action->addTo( iconToolBar  );
     viewMenu->insertSeparator();
 
     if ( p-> mShowIconToggleFull )
         FSaction->addTo( iconToolBar );
     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 );
 
 
     icon = loadPixmap( pathString + "whatsnext" );
     configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 );
     QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index f8f4c8a..0d66a5a 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -1132,12 +1132,17 @@ void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& dat
 
     if ( cmsg == "nextView()" ) {
         qDebug("nextView()");
         emit nextView();
         return;
     }
+    if ( cmsg == "callContactdialog()" ) {
+        qDebug("callContactdialog()");
+        emit callContactdialog();
+        return;
+    }
         
   bool res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data );
   if (!res)
     res = mBirthdayListFromKAPITransfer->appMessage( cmsg, data );
 
   if (!res)
@@ -1152,13 +1157,15 @@ void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& dat
 bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid)
 {
   mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel);
   // maybe we are sending to KA/Pi fom a different worldd...
   // it may be that the QAplication::desktop()->width() values in KA/Pi are not the same as in our application
   // 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);
 }
 
 bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3)
 {
   QStringList list4, list5, list6;
 
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h
index 52a64e1..097f306 100644
--- a/libkdepim/externalapphandler.h
+++ b/libkdepim/externalapphandler.h
@@ -230,12 +230,13 @@ class ExternalAppHandler : public QObject
 
  public  slots:
     void appMessage( const QCString& msg, const QByteArray& data );
 
 
  signals:
+    void callContactdialog();
     void nextView();
     // Emmitted when the target app receives a request from the source app
     void requestForNameEmailUidList(const QString& sourceChannel, const QString& uid);
 
     // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi
     // The first parameter is a uniqueid. It can be used to identify the event