summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-14 09:28:50 (UTC)
committer zautrix <zautrix>2004-10-14 09:28:50 (UTC)
commit3d79ab275374292196c7d032ffd2e321841c8cb0 (patch) (side-by-side diff)
tree6ceaba2a5f375cfebc88189000221fe456e6f9d2
parent57bd80b04dddd40a897dce8b6902d1046d71c631 (diff)
downloadkdepimpi-3d79ab275374292196c7d032ffd2e321841c8cb0.zip
kdepimpi-3d79ab275374292196c7d032ffd2e321841c8cb0.tar.gz
kdepimpi-3d79ab275374292196c7d032ffd2e321841c8cb0.tar.bz2
umlaute phone fixes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--gammu/emb/common/service/gsmmisc.c5
-rw-r--r--kabc/addressbook.cpp3
-rw-r--r--kabc/addressbook.h2
-rw-r--r--kabc/plugins/sharpdtm/resourcesharpdtm.cpp4
-rw-r--r--kaddressbook/kabcore.cpp31
-rw-r--r--kaddressbook/kabcore.h3
6 files changed, 27 insertions, 21 deletions
diff --git a/gammu/emb/common/service/gsmmisc.c b/gammu/emb/common/service/gsmmisc.c
index 1c6ec8b..486d136 100644
--- a/gammu/emb/common/service/gsmmisc.c
+++ b/gammu/emb/common/service/gsmmisc.c
@@ -223,3 +223,6 @@ bool ReadVCALText(char *Buffer, char *Start, char *Value)
if (!strncmp(Buffer,buff,strlen(buff))) {
- EncodeUnicode(Value,Buffer+strlen(Start)+1,strlen(Buffer)-(strlen(Start)+1));
+
+ // LR original :EncodeUnicode(Value,Buffer+strlen(Start)+1,strlen(Buffer)-(strlen(Start)+1));
+ // LR we have utf8 as default
+ DecodeUTF8(Value,Buffer+strlen(Start)+1,strlen(Buffer)-(strlen(Start)+1));
dbgprintf("ReadVCalText is \"%s\"\n",DecodeUnicodeConsole(Value));
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index c584c35..3641c0c 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -479,3 +479,3 @@ bool AddressBook::export2PhoneFormat( QStringList uids ,QString fileName )
}
-void AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld )
+int AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld )
{
@@ -512,2 +512,3 @@ void AddressBook::importFromFile( QString fileName, bool replaceLabel, bool rem
removeUntagged();
+ return list.count();
}
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index 23bba02..5edca06 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -149,3 +149,3 @@ class AddressBook : public QObject
bool export2PhoneFormat( QStringList uids ,QString fileName );
- void importFromFile( QString fileName, bool replaceLabel = false, bool removeOld = false );
+ int importFromFile( QString fileName, bool replaceLabel = false, bool removeOld = false );
void setUntagged( bool setNonSyncTagged = false );
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
index 2cdf4bf..ba17c50 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
@@ -74,4 +74,4 @@ ResourceSharpDTM::ResourceSharpDTM( const KConfig *config )
-ResourceSharpDTM::ResourceSharpDTM( const QString &fileName, bool syncable )
- : Resource( 0, syncable )
+ResourceSharpDTM::ResourceSharpDTM( const QString &fileName )
+ : Resource( 0 )
{
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();