| -rw-r--r-- | kaddressbook/kabcore.cpp | 31 | ||||
| -rw-r--r-- | kaddressbook/kabcore.h | 3 |
2 files changed, 18 insertions, 16 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 087e9e3..3ab06c4 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -206,2 +206,3 @@ public: + bool pasteWithNewUid = true; @@ -224,3 +225,2 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const mIsPart = !parent->inherits( "KAddressBookMain" ); - mAddressBook = KABC::StdAddressBook::self(); @@ -309,2 +309,5 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const #endif //KAB_EMBEDDED + + mMessageTimer = new QTimer( this ); + connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) ); mEditorDialog = 0; @@ -330,4 +333,5 @@ void KABCore::recieve( QString fn ) //qDebug("KABCore::recieve "); - mAddressBook->importFromFile( fn, true ); + int count = mAddressBook->importFromFile( fn, true ); mViewManager->refreshView(); + message(i18n("%1 contact(s) received!").arg( count )); topLevelWidget()->raise(); @@ -699,2 +703,3 @@ void KABCore::export2phone() + message(i18n("Exporting to phone...")); QTimer::singleShot( 1, this , SLOT ( writeToPhone())); @@ -714,5 +719,5 @@ void KABCore::writeToPhone( ) if ( PhoneAccess::writeToPhone( getPhoneFile() ) ) - qDebug("Export okay "); + message(i18n("Export to phone finished!")); else - qDebug("Error export contacts "); + qDebug(i18n("Error exporting to phone")); } @@ -833,3 +838,3 @@ void KABCore::beamDone( Ir *ir ) topLevelWidget()->raise(); - message( i18n("Beaming successful!") ); + message( i18n("Beaming finished!") ); } @@ -1197,3 +1202,3 @@ void KABCore::save() "not using it. " ); - statusMessage(i18n("Saving addressbook ... ")); + message(i18n("Saving addressbook ... ")); #ifndef KAB_EMBEDDED @@ -1210,3 +1215,3 @@ void KABCore::save() - statusMessage(i18n("Addressbook saved!")); + message(i18n("Addressbook saved!")); setModified( false ); @@ -1215,7 +1220,3 @@ void KABCore::save() -void KABCore::statusMessage(QString mess , int time ) -{ - //topLevelWidget()->setCaption( mess ); - // pending setting timer to revome message -} + void KABCore::undo() @@ -2157,3 +2158,3 @@ void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString bar.show(); - bar.setCaption (i18n("collecting birthdays - close to abort!") ); + bar.setCaption (i18n("Collecting birthdays - close to abort!") ); qApp->processEvents(); @@ -2811,5 +2812,4 @@ void KABCore::message( QString m ) { - topLevelWidget()->setCaption( m ); - QTimer::singleShot( 15000, this , SLOT ( setCaptionBack())); + mMessageTimer->start( 15000, true ); } @@ -2872,2 +2872,3 @@ void KABCore::setCaptionBack() { + mMessageTimer->stop(); topLevelWidget()->setCaption( i18n("KAddressbook/Pi") ); diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 5871d39..c7be343 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -31,2 +31,3 @@ #include <qdict.h> +#include <qtimer.h> @@ -145,3 +146,2 @@ class KABCore : public QWidget, public KSyncInterface - void statusMessage(QString, int time = 0 ); void showLicence(); @@ -372,2 +372,3 @@ class KABCore : public QWidget, public KSyncInterface private: + QTimer *mMessageTimer; void initGUI(); |