summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt1
-rw-r--r--korganizer/kofilterview.cpp7
-rw-r--r--korganizer/koprefs.cpp8
-rw-r--r--korganizer/mainwindow.cpp6
4 files changed, 12 insertions, 10 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 944ee1e..0160dbe 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -8,4 +8,5 @@ Fixed a problem with the default settings for new todos.
Added an error message dialog if saving of calendar files is not possible.
Made it impossible to close KO/Pi if saving fails.
+Fixed a problem adding calendars on windows such that these calendars can be used on the memory stick.
KA/Pi:
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index e86ec95..ef25fd0 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -31,4 +31,5 @@
#include <qtextcodec.h>
#include <qwhatsthis.h>
+#include <qdir.h>
@@ -408,5 +409,5 @@ void KOCalEditView::addCal()
int KOCalEditView::addCalendar( QString name, QString file, bool ask )
{
-
+ file = QDir::convertSeparators( file );
QFileInfo fi ( file );
QString absFile = file;
@@ -414,8 +415,8 @@ int KOCalEditView::addCalendar( QString name, QString file, bool ask )
if ( fi.isRelative() ) {
isRelative = true;
- absFile = KGlobalSettings::calendarDir()+file;
+ absFile = QDir::convertSeparators( KGlobalSettings::calendarDir()+file );
fi.setFile( absFile );
} else {
- QString cd = KGlobalSettings::calendarDir();
+ QString cd = QDir::convertSeparators( KGlobalSettings::calendarDir() );
if ( file.left( cd.length() ) == cd ) {
isRelative = true;
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index eb997f5..77f572c 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -450,5 +450,5 @@ void KOPrefs::usrReadConfig()
kkf->isStandard = true;
kkf->mName = i18n("Standard");
- kkf->mFileName = locateLocal( "data", "korganizer/mycalendar.ics" );
+ kkf->mFileName = QDir::convertSeparators( locateLocal( "data", "korganizer/mycalendar.ics" ) );
}
while ( mNextAvailableCalendar <= numCals ) {
@@ -462,6 +462,6 @@ void KOPrefs::usrReadConfig()
kkf->isReadOnly = fc.readBoolEntry( prefix+"_isReadOnly", false);
kkf->mName = fc.readEntry( prefix+"_Name", "Calendar");
- kkf->mFileName = fc.readEntry( prefix+"_FileName", kkf->mFileName);
- kkf->mSavedFileName = fc.readEntry( prefix+"_SavedFileName", kkf->mFileName);
+ kkf->mFileName = QDir::convertSeparators( fc.readEntry( prefix+"_FileName", kkf->mFileName) );
+ kkf->mSavedFileName = QDir::convertSeparators( fc.readEntry( prefix+"_SavedFileName", kkf->mFileName) );
kkf->mDefaultColor = fc.readColorEntry( prefix+"_Color",&mEventColor);
if ( kkf->mCalNumber == 1 ) {
@@ -473,5 +473,5 @@ void KOPrefs::usrReadConfig()
}
if ( kkf->isRelative )
- kkf->mFileName = KGlobalSettings::calendarDir() + kkf->mSavedFileName;
+ kkf->mFileName = QDir::convertSeparators( KGlobalSettings::calendarDir() + kkf->mSavedFileName );
}
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 9c55e9f..9ae393d 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1693,10 +1693,10 @@ void MainWindow::aboutKnownBugs()
QString MainWindow::defaultFileName()
{
- return locateLocal( "data", "korganizer/mycalendar.ics" );
+ return QDir::convertSeparators( locateLocal( "data", "korganizer/mycalendar.ics" ) );
}
QString MainWindow::syncFileName()
{
#ifdef DESKTOP_VERSION
- return locateLocal( "tmp", "synccalendar.ics" );
+ return QDir::convertSeparators( locateLocal( "tmp", "synccalendar.ics" ) );
#else
return QString( "/tmp/synccalendar.ics" );
@@ -2566,5 +2566,5 @@ QString MainWindow::sentSyncFile()
{
#ifdef DESKTOP_VERSION
- return locateLocal( "tmp", "copysynccal.ics" );
+ return QDir::convertSeparators( locateLocal( "tmp", "copysynccal.ics" ) );
#else
return QString( "/tmp/copysynccal.ics" );