summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt2
-rw-r--r--kabc/addresseedialog.cpp2
-rw-r--r--kaddressbook/kabcore.cpp40
-rw-r--r--kaddressbook/kabcore.h4
-rw-r--r--korganizer/mainwindow.cpp13
-rw-r--r--libkdepim/externalapphandler.cpp9
-rw-r--r--libkdepim/externalapphandler.h1
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
@@ -1326,5 +1326,5 @@
{ "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" },
{ "","" },
{ "","" },
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index b3429e3..648e780 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -65,4 +65,5 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
Ok|Cancel, No, parent ), mMultiple( multiple )
{
+ qDebug("NEW AddresseeDialog ");
QWidget *topWidget = plainPage();
@@ -138,4 +139,5 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
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
@@ -375,4 +375,5 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
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()));
@@ -836,4 +837,5 @@ void KABCore::resizeEvent(QResizeEvent* e )
}
if ( QApplication::desktop()->width() <= 640 ) {
+ mMainWindow->showMinimized();
//mMainWindow->setMaximumSize( QApplication::desktop()->size() );
mViewManager->getFilterAction()->setComboWidth( 150 );
@@ -862,4 +864,5 @@ void KABCore::resizeEvent(QResizeEvent* e )
}
}
+ QWidget::resizeEvent( e );
}
@@ -2506,15 +2509,21 @@ void KABCore::configureResources()
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;
}
@@ -2522,5 +2531,20 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt
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;
@@ -2531,9 +2555,9 @@ void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QSt
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.
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index c185117..47ea152 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -369,4 +369,7 @@ class KABCore : public QWidget, public KSyncInterface
void setJumpButtonBar( bool visible );
void setCaptionBack();
+ void resizeAndCallContactdialog();
+ void callContactdialog();
+
void importFromOL();
void extensionModified( const KABC::Addressee::List &list );
@@ -386,4 +389,5 @@ class KABCore : public QWidget, public KSyncInterface
private:
+ QString mEmailSourceChannel;
void resizeEvent(QResizeEvent* e );
bool mBRdisabled;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 8a4c7eb..6ddced0 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -745,5 +745,5 @@ void MainWindow::initActions()
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 );
@@ -779,5 +779,14 @@ void MainWindow::initActions()
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 );
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index f8f4c8a..0d66a5a 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -1136,5 +1136,10 @@ void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& dat
return;
}
-
+ if ( cmsg == "callContactdialog()" ) {
+ qDebug("callContactdialog()");
+ emit callContactdialog();
+ return;
+ }
+
bool res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data );
if (!res)
@@ -1156,5 +1161,7 @@ bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceCh
// 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);
}
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h
index 52a64e1..097f306 100644
--- a/libkdepim/externalapphandler.h
+++ b/libkdepim/externalapphandler.h
@@ -234,4 +234,5 @@ class ExternalAppHandler : public QObject
signals:
+ void callContactdialog();
void nextView();
// Emmitted when the target app receives a request from the source app