diff options
| author |  Fabio Bas | 2009-12-31 00:06:59 +0000 |
|---|---|---|
| committer | Fabio Bas | 2009-12-31 00:06:59 +0000 |
| commit | f09892ee6fd36d40905f9842256a07b96ea1e6e7 (patch) | |
| tree | 2e8adcd313fbe590f1681a35c91a87189653442b /src | |
| parent | userdoc generation script: made output more cmake-friendly (diff) | |
| download | KVIrc-f09892ee6fd36d40905f9842256a07b96ea1e6e7.tar.gz KVIrc-f09892ee6fd36d40905f9842256a07b96ea1e6e7.tar.bz2 KVIrc-f09892ee6fd36d40905f9842256a07b96ea1e6e7.zip | |
fixed "download" folder in portable mode #676
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3770 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/kernel/kvi_app_fs.cpp | 21 | ||||
| -rw-r--r-- | src/modules/setup/setupwizard.cpp | 11 |
2 files changed, 25 insertions, 7 deletions
diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp index 05642f648..b9bb75df2 100644 --- a/src/kvirc/kernel/kvi_app_fs.cpp +++ b/src/kvirc/kernel/kvi_app_fs.cpp @@ -140,15 +140,24 @@ void KviApp::getLocalKvircDirectory(QString &szData,KvircSubdir dir,const QStrin // we should take special care here // the user is likely to mess the path behind our back // try to recover from most common problems - while(KviQString::lastCharIs(szData,KVI_PATH_SEPARATOR_CHAR)) + while(szData.endsWith(KVI_PATH_SEPARATOR_CHAR)) szData = szData.remove(szData.length()-1,1); if(szData.isEmpty()) { - // unset ? - KVI_OPTION_STRING(KviOption_stringIncomingPath) = QDir::homePath(); - if(!KVI_OPTION_STRING(KviOption_stringIncomingPath).endsWith(QString(QChar(KVI_PATH_SEPARATOR_CHAR)))) - KVI_OPTION_STRING(KviOption_stringIncomingPath).append(KVI_PATH_SEPARATOR_CHAR); - KVI_OPTION_STRING(KviOption_stringIncomingPath).append(KVI_DEFAULT_INCOMING_SUBDIRECTORY_NAME); +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) + if(m_bPortable) + { + szData = m_szLocalKvircDir; + } else { +#endif + szData = QDir::homePath(); +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) + } +#endif + if(!szData.endsWith(QString(QChar(KVI_PATH_SEPARATOR_CHAR)))) + szData.append(KVI_PATH_SEPARATOR_CHAR); + szData.append(KVI_DEFAULT_INCOMING_SUBDIRECTORY_NAME); + KVI_OPTION_STRING(KviOption_stringLogsPath) = szData; } break; case Help : diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index b23a934c0..742a945e7 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -287,7 +287,16 @@ KviSetupWizard::KviSetupWizard() m_pNewIncomingBox->setSpacing(3); m_pNewIncomingBox->setStretchFactor(m_pIncomingPathEdit,1); - tmp = QDir::homePath(); +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) + if(((KviApp*) qApp)->m_bPortable) + { + tmp = m_szLocalKvircDir; + } else { +#endif + tmp = QDir::homePath(); +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) + } +#endif KviQString::ensureLastCharIs(tmp,KVI_PATH_SEPARATOR_CHAR); tmp.append(KVI_DEFAULT_INCOMING_SUBDIRECTORY_NAME); KviFileUtils::adjustFilePath(tmp); |