-rw-r--r-- | kaddressbook/kabcore.cpp | 31 |
1 files changed, 16 insertions, 15 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: | |||
206 | 206 | ||
207 | |||
207 | bool pasteWithNewUid = true; | 208 | bool pasteWithNewUid = true; |
@@ -224,3 +225,2 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
224 | mIsPart = !parent->inherits( "KAddressBookMain" ); | 225 | mIsPart = !parent->inherits( "KAddressBookMain" ); |
225 | |||
226 | mAddressBook = KABC::StdAddressBook::self(); | 226 | mAddressBook = KABC::StdAddressBook::self(); |
@@ -309,2 +309,5 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
309 | #endif //KAB_EMBEDDED | 309 | #endif //KAB_EMBEDDED |
310 | |||
311 | mMessageTimer = new QTimer( this ); | ||
312 | connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) ); | ||
310 | mEditorDialog = 0; | 313 | mEditorDialog = 0; |
@@ -330,4 +333,5 @@ void KABCore::recieve( QString fn ) | |||
330 | //qDebug("KABCore::recieve "); | 333 | //qDebug("KABCore::recieve "); |
331 | mAddressBook->importFromFile( fn, true ); | 334 | int count = mAddressBook->importFromFile( fn, true ); |
332 | mViewManager->refreshView(); | 335 | mViewManager->refreshView(); |
336 | message(i18n("%1 contact(s) received!").arg( count )); | ||
333 | topLevelWidget()->raise(); | 337 | topLevelWidget()->raise(); |
@@ -699,2 +703,3 @@ void KABCore::export2phone() | |||
699 | 703 | ||
704 | message(i18n("Exporting to phone...")); | ||
700 | QTimer::singleShot( 1, this , SLOT ( writeToPhone())); | 705 | QTimer::singleShot( 1, this , SLOT ( writeToPhone())); |
@@ -714,5 +719,5 @@ void KABCore::writeToPhone( ) | |||
714 | if ( PhoneAccess::writeToPhone( getPhoneFile() ) ) | 719 | if ( PhoneAccess::writeToPhone( getPhoneFile() ) ) |
715 | qDebug("Export okay "); | 720 | message(i18n("Export to phone finished!")); |
716 | else | 721 | else |
717 | qDebug("Error export contacts "); | 722 | qDebug(i18n("Error exporting to phone")); |
718 | } | 723 | } |
@@ -833,3 +838,3 @@ void KABCore::beamDone( Ir *ir ) | |||
833 | topLevelWidget()->raise(); | 838 | topLevelWidget()->raise(); |
834 | message( i18n("Beaming successful!") ); | 839 | message( i18n("Beaming finished!") ); |
835 | } | 840 | } |
@@ -1197,3 +1202,3 @@ void KABCore::save() | |||
1197 | "not using it. " ); | 1202 | "not using it. " ); |
1198 | statusMessage(i18n("Saving addressbook ... ")); | 1203 | message(i18n("Saving addressbook ... ")); |
1199 | #ifndef KAB_EMBEDDED | 1204 | #ifndef KAB_EMBEDDED |
@@ -1210,3 +1215,3 @@ void KABCore::save() | |||
1210 | 1215 | ||
1211 | statusMessage(i18n("Addressbook saved!")); | 1216 | message(i18n("Addressbook saved!")); |
1212 | setModified( false ); | 1217 | setModified( false ); |
@@ -1215,7 +1220,3 @@ void KABCore::save() | |||
1215 | 1220 | ||
1216 | void KABCore::statusMessage(QString mess , int time ) | 1221 | |
1217 | { | ||
1218 | //topLevelWidget()->setCaption( mess ); | ||
1219 | // pending setting timer to revome message | ||
1220 | } | ||
1221 | void KABCore::undo() | 1222 | void KABCore::undo() |
@@ -2157,3 +2158,3 @@ void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString | |||
2157 | bar.show(); | 2158 | bar.show(); |
2158 | bar.setCaption (i18n("collecting birthdays - close to abort!") ); | 2159 | bar.setCaption (i18n("Collecting birthdays - close to abort!") ); |
2159 | qApp->processEvents(); | 2160 | qApp->processEvents(); |
@@ -2811,5 +2812,4 @@ void KABCore::message( QString m ) | |||
2811 | { | 2812 | { |
2812 | |||
2813 | topLevelWidget()->setCaption( m ); | 2813 | topLevelWidget()->setCaption( m ); |
2814 | QTimer::singleShot( 15000, this , SLOT ( setCaptionBack())); | 2814 | mMessageTimer->start( 15000, true ); |
2815 | } | 2815 | } |
@@ -2872,2 +2872,3 @@ void KABCore::setCaptionBack() | |||
2872 | { | 2872 | { |
2873 | mMessageTimer->stop(); | ||
2873 | topLevelWidget()->setCaption( i18n("KAddressbook/Pi") ); | 2874 | topLevelWidget()->setCaption( i18n("KAddressbook/Pi") ); |