summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--gammu/emb/common/service/gsmcal.c15
-rw-r--r--gammu/emb/common/service/gsmcal.h1
-rw-r--r--kaddressbook/kabcore.cpp6
-rw-r--r--korganizer/calendarview.cpp12
-rw-r--r--microkde/kapplication.cpp22
-rw-r--r--microkde/kapplication.h1
6 files changed, 50 insertions, 7 deletions
diff --git a/gammu/emb/common/service/gsmcal.c b/gammu/emb/common/service/gsmcal.c
index 0ea8e06..0375fee 100644
--- a/gammu/emb/common/service/gsmcal.c
+++ b/gammu/emb/common/service/gsmcal.c
@@ -70,2 +70,5 @@ void GSM_CalendarFindDefaultTextTimeAlarmPhoneRecurrance(GSM_CalendarEntry *entr
case CAL_TEXT:
+ *Text = i;
+ break;
+ case CAL_DESCRIPTION:
if (*Text == -1) *Text = i;
@@ -199,5 +202,5 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
}
- SaveVCALText(Buffer, Length, buffer, "DESCRIPTION");
+ SaveVCALText(Buffer, Length, buffer, "SUMMARY");
} else {
- SaveVCALText(Buffer, Length, note->Entries[Text].Text, "DESCRIPTION");
+ SaveVCALText(Buffer, Length, note->Entries[Text].Text, "SUMMARY");
}
@@ -418,3 +421,4 @@ GSM_Error GSM_DecodeVCALENDAR_VTODO(unsigned char *Buffer, int *Pos, GSM_Calenda
}
- if ((ReadVCALText(Line, "SUMMARY", Buff)) || (ReadVCALText(Line, "DESCRIPTION", Buff))) {
+ // LR
+ if ((ReadVCALText(Line, "SUMMARY", Buff)) ) {
Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_TEXT;
@@ -423,2 +427,7 @@ GSM_Error GSM_DecodeVCALENDAR_VTODO(unsigned char *Buffer, int *Pos, GSM_Calenda
}
+ if (ReadVCALText(Line, "DESCRIPTION", Buff)) {
+ Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_DESCRIPTION;
+ CopyUnicodeString(Calendar->Entries[Calendar->EntriesNum].Text,Buff);
+ Calendar->EntriesNum++;
+ }
if (ReadVCALText(Line, "LOCATION", Buff)) {
diff --git a/gammu/emb/common/service/gsmcal.h b/gammu/emb/common/service/gsmcal.h
index 0a41b7b..c69fdbe 100644
--- a/gammu/emb/common/service/gsmcal.h
+++ b/gammu/emb/common/service/gsmcal.h
@@ -159,2 +159,3 @@ typedef enum {
CAL_TEXT,
+ CAL_DESCRIPTION, // LR added
/**
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 47ed858..dae9cd2 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -815,4 +815,5 @@ void KABCore::beamVCard(const QStringList& uids)
QTextStream t( &outFile ); // use a text stream
- t.setEncoding( QTextStream::UnicodeUTF8 );
- t <<datastream;
+ //t.setEncoding( QTextStream::UnicodeUTF8 );
+ t.setEncoding( QTextStream::Latin1 );
+ t <<datastream.latin1();
outFile.close();
@@ -834,2 +835,3 @@ void KABCore::beamDone( Ir *ir )
#endif
+ topLevelWidget()->raise();
}
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 1f2c6da..3e0a27d 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2325,2 +2325,8 @@ void CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
Incidence *in = incidence->clone();
+ if ( ! in->summary().isEmpty() ) {
+ in->setDescription("");
+ } else {
+ in->setSummary( in->description().left(20));
+ in->setDescription("");
+ }
if ( addText )
@@ -2341,4 +2347,4 @@ void CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
mes = i18n("KO/Pi: Ready for beaming");
- setCaption(mes);
-
+ topLevelWidget()->setCaption(mes);
+ KApplication::convert2latin1( fn );
#ifndef DESKTOP_VERSION
@@ -2355,2 +2361,4 @@ void CalendarView::beamDone( Ir *ir )
#endif
+ topLevelWidget()->setCaption( i18n("KO/Pi: Beaming done.") );
+ topLevelWidget()->raise();
}
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index 98ef2f2..56c01af 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -66,2 +66,24 @@ void KApplication::showFile(QString caption, QString fn)
+bool KApplication::convert2latin1(QString fileName)
+{
+ QString text;
+ QFile file( fileName );
+ if (!file.open( IO_ReadOnly ) ) {
+ return false;
+
+ }
+ QTextStream ts( &file );
+ ts.setEncoding( QTextStream::UnicodeUTF8 );
+ text = ts.read();
+ file.close();
+ if (!file.open( IO_WriteOnly ) ) {
+ return false;
+ }
+ QTextStream tsIn( &file );
+ tsIn.setEncoding( QTextStream::Latin1 );
+ tsIn << text.latin1();
+ file.close();
+
+
+}
void KApplication::showText(QString caption, QString text)
diff --git a/microkde/kapplication.h b/microkde/kapplication.h
index 79cdb33..41546a0 100644
--- a/microkde/kapplication.h
+++ b/microkde/kapplication.h
@@ -22,2 +22,3 @@ class KApplication
static void showText(QString caption, QString text);
+ static bool convert2latin1(QString file);
};