fixes umlaute in beaming

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
@@ -63,16 +63,19 @@ void GSM_CalendarFindDefaultTextTimeAlarmPhoneRecurrance(GSM_CalendarEntry *entr
 		case CAL_ALARM_DATETIME :
 		case CAL_SILENT_ALARM_DATETIME:
 			if (*Alarm == -1) *Alarm = i;
 			break;
 		case CAL_RECURRANCE:
 			if (*Recurrance == -1) *Recurrance = i;
 			break;
 		case CAL_TEXT:
+		    *Text = i;
+			break;
+		case CAL_DESCRIPTION:
 			if (*Text == -1) *Text = i;
 			break;
 		case CAL_PHONE:
 			if (*Phone == -1) *Phone = i;
 			break;
 		case CAL_LOCATION:
 			if (*Location == -1) *Location = i;
 			break;
@@ -192,19 +195,19 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
 		if (note->Type == GSM_CAL_CALL) {
 			buffer[0] = 0;
 			buffer[1] = 0;
 		 	if (Phone != -1) CopyUnicodeString(buffer,note->Entries[Phone].Text);
 			if (Text != -1)  {
 				if (Phone != -1) EncodeUnicode(buffer+UnicodeLength(buffer)*2," ",1);
 				CopyUnicodeString(buffer+UnicodeLength(buffer)*2,note->Entries[Text].Text);
 			}
-			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");
 		}
 	} else if (Version == SonyEricsson_VCalendar) {
 		*Length+=sprintf(Buffer+(*Length), "CATEGORIES:");
 		switch (note->Type) {
 		case GSM_CAL_MEETING:
 			*Length+=sprintf(Buffer+(*Length), "Meeting%c%c",13,10);
 			break;
 		case GSM_CAL_REMINDER:
@@ -411,21 +414,27 @@ GSM_Error GSM_DecodeVCALENDAR_VTODO(unsigned char *Buffer, int *Pos, GSM_Calenda
 				Calendar->Entries[Calendar->EntriesNum].Number    = 30*24;
 				Calendar->EntriesNum++;
 			}
 			if (strstr(Line,"RRULE:YD1")) {
 				Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_RECURRANCE;
 				Calendar->Entries[Calendar->EntriesNum].Number    = 365*24;
 				Calendar->EntriesNum++;
 			}
-			if ((ReadVCALText(Line, "SUMMARY", Buff)) || (ReadVCALText(Line, "DESCRIPTION", Buff))) {
+            // LR 
+			if ((ReadVCALText(Line, "SUMMARY", Buff)) ) {
 				Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_TEXT;
 				CopyUnicodeString(Calendar->Entries[Calendar->EntriesNum].Text,Buff);
 				Calendar->EntriesNum++;
 			}
+			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)) {
 				Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_LOCATION;
 				CopyUnicodeString(Calendar->Entries[Calendar->EntriesNum].Text,Buff);
 				Calendar->EntriesNum++;
 			}
 			if (ReadVCALText(Line, "DTSTART", Buff)) {
 				Calendar->Entries[Calendar->EntriesNum].EntryType = CAL_START_DATETIME;
 				ReadVCALDateTime(DecodeUnicodeString(Buff), &Calendar->Entries[Calendar->EntriesNum].Date);
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
@@ -152,16 +152,17 @@ typedef enum {
 	/**
 	 * Recurrance.
 	 */
 	CAL_RECURRANCE,
 	/**
 	 * Text.
 	 */
 	CAL_TEXT,
+	CAL_DESCRIPTION, // LR added
 	/**
 	 * Location.
 	 */
 	CAL_LOCATION,
 	/**
 	 * Phone number.
 	 */
 	CAL_PHONE,
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 47ed858..dae9cd2 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -808,18 +808,19 @@ void KABCore::beamVCard(const QStringList& uids)
       }
       datastream += vcard.mid( start,vcard.length() );
   }
 #ifndef DESKTOP_VERSION
   QFile outFile(fileName);
   if ( outFile.open(IO_WriteOnly) ) { 
       datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" );
       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();
       Ir *ir = new Ir( this );
       connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
       ir->send( fileName, description, "text/x-vCard" );
   } else {
       qDebug("Error open temp  beam file ");
       return;
   }
@@ -827,16 +828,17 @@ void KABCore::beamVCard(const QStringList& uids)
 
 }
 
 void KABCore::beamDone( Ir *ir )
 {
 #ifndef DESKTOP_VERSION
   delete ir;
 #endif
+  topLevelWidget()->raise();
 }
 
 
 void KABCore::browse( const QString& url )
 {
 #ifndef KAB_EMBEDDED
   kapp->invokeBrowser( url );
 #else //KAB_EMBEDDED
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 1f2c6da..3e0a27d 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2318,46 +2318,54 @@ void  CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
         bool addText = false;
         if ( delSel.count() < 10 )
             addText = true;
         else {
             description.sprintf(i18n("  %d items?"),delSel.count() );
         }
         while ( incidence ) {
             Incidence *in = incidence->clone();
+            if ( ! in->summary().isEmpty() ) {
+                in->setDescription("");
+            } else {
+                in->setSummary( in->description().left(20));
+                in->setDescription("");
+            }
             if ( addText )
                 description += in->summary() + "\n";
             cal->addIncidence( in );
             incidence = delSel.next();
         }
         if ( beamDialog->beamVcal() ) {
             fn += ".vcs";
             FileStorage storage( cal, fn, new VCalFormat );
             storage.save();
         } else {
             fn += ".ics";
             FileStorage storage( cal, fn, new ICalFormat( ) );
             storage.save();
         }
         delete cal;
         mes = i18n("KO/Pi: Ready for beaming");
-        setCaption(mes); 
-        
+        topLevelWidget()->setCaption(mes); 
+        KApplication::convert2latin1( fn );
 #ifndef DESKTOP_VERSION
         Ir *ir = new Ir( this ); 
         connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
         ir->send( fn, description, "text/x-vCalendar" );
 #endif
     }
 }
 void  CalendarView::beamDone( Ir *ir )
 {
 #ifndef DESKTOP_VERSION
     delete ir;
 #endif
+    topLevelWidget()->setCaption( i18n("KO/Pi: Beaming done.") ); 
+    topLevelWidget()->raise();
 }
 
 void CalendarView::moveIncidence(Incidence * inc ) 
 {
     if ( !inc ) return;
     // qDebug("showDatePickerForIncidence( ) ");
     if ( mDateFrame->isVisible() )
         mDateFrame->hide();
diff --git a/microkde/kapplication.cpp b/microkde/kapplication.cpp
index 98ef2f2..56c01af 100644
--- a/microkde/kapplication.cpp
+++ b/microkde/kapplication.cpp
@@ -59,16 +59,38 @@ void KApplication::showFile(QString caption, QString fn)
     } 
     QTextStream ts( &file );
     text = ts.read();
     file.close();
     KApplication::showText( caption, text );
   
 }
  
+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)
 {
     QDialog dia( 0, "name", true ); ;
     dia.setCaption( caption );
     QVBoxLayout* lay = new QVBoxLayout( &dia );
     lay->setSpacing( 3 );
     lay->setMargin( 3 );
     QTextBrowser tb ( &dia );
diff --git a/microkde/kapplication.h b/microkde/kapplication.h
index 79cdb33..41546a0 100644
--- a/microkde/kapplication.h
+++ b/microkde/kapplication.h
@@ -15,12 +15,13 @@ class KApplication
    * @param length Generate a string of this length.
    * @return the random string
    */
   static QString randomString(int length);
   static int execDialog( QDialog* ); 
   static void showLicence(); 
   static void showFile(QString caption, QString file); 
   static void showText(QString caption, QString text); 
+  static bool convert2latin1(QString file); 
 };
 
 
 #endif