diff options
| -rw-r--r-- | src/kvirc/kernel/kvi_app.h | 3 | ||||
| -rw-r--r-- | src/kvirc/kernel/kvi_app_setup.cpp | 21 | ||||
| -rw-r--r-- | src/modules/setup/setupwizard.cpp | 1 |
3 files changed, 18 insertions, 7 deletions
diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h index f26742502..1510686b8 100644 --- a/src/kvirc/kernel/kvi_app.h +++ b/src/kvirc/kernel/kvi_app.h @@ -302,7 +302,8 @@ private: void findGlobalKvircDirectory(); bool findLocalKvircDirectory(); bool checkGlobalKvircDirectory(const QString); - bool checkLocalKvircDirectory(const QString); + bool checkLocalKvircDirectory(const QString &szSpecificPath); + bool checkLocalKvircDirectory(); // check the m_szLocalKvircDirectory path bool checkFileAssociations(); void setupFileAssociations(); diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp index cab70eb40..973bd6247 100644 --- a/src/kvirc/kernel/kvi_app_setup.cpp +++ b/src/kvirc/kernel/kvi_app_setup.cpp @@ -87,12 +87,21 @@ bool KviApp::checkGlobalKvircDirectory(const QString szDir) return KviFileUtils::isReadable(szPicsDir); } -bool KviApp::checkLocalKvircDirectory(const QString szDir) +bool KviApp::checkLocalKvircDirectory(const QString &szSpecificPath) +{ + QString szSavedLocalKvircDir = m_szLocalKvircDir; + m_szLocalKvircDir = szSpecificPath; + bool bRet = checkLocalKvircDirectory(); + m_szLocalKvircDir = szSavedLocalKvircDir; + return bRet; +} + +bool KviApp::checkLocalKvircDirectory() { //First check if the dir exists - if(!KviFileUtils::directoryExists(szDir)) + if(!KviFileUtils::directoryExists(m_szLocalKvircDir)) return false; - if(!QFileInfo(szDir).isWritable()) + if(!QFileInfo(m_szLocalKvircDir).isWritable()) return false; QString szBuff; @@ -726,7 +735,7 @@ bool KviApp::findLocalKvircDirectory() } // If we have it , ok...done - if(checkLocalKvircDirectory(m_szLocalKvircDir)) + if(checkLocalKvircDirectory()) return true; } } @@ -737,7 +746,7 @@ bool KviApp::findLocalKvircDirectory() if(m_bPortable) { m_szLocalKvircDir = g_pApp->applicationDirPath() + KVI_PATH_SEPARATOR_CHAR + "Settings"; - if(checkLocalKvircDirectory(m_szLocalKvircDir)) + if(checkLocalKvircDirectory()) return true; } #endif @@ -770,7 +779,7 @@ bool KviApp::findLocalKvircDirectory() return false; // we force a setup anyway // If we have it , ok...done - if(checkLocalKvircDirectory(m_szLocalKvircDir)) + if(checkLocalKvircDirectory()) return true; return false; } diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index c81ca4799..d2e1fa466 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -742,6 +742,7 @@ void KviSetupWizard::portableClicked() void KviSetupWizard::chooseOldDataPath() { + // FIXME: We'd like to show hidden directories here ($HOME/.kvirc is hidden)... QString szBuffer = KviTalFileDialog::getExistingDirectoryPath(m_pDataPathEdit->text(),__tr2qs("Choose an Old Configuration Folder - KVIrc Setup"),0); KviFileUtils::adjustFilePath(szBuffer); if(!szBuffer.isEmpty()) |