[patch] setupwizard.cpp from 3.2.5 to cvs (yesterday)

setupwizard.diff (text/plain), 2.14 KB, created by Daniel Black (RETIRED) on 2006-11-21 22:29:46 UTC

--- modules/setup/setupwizard.cpp	2006-09-07 21:38:46.000000000 +1000
+++ ../../../../kvirc-9999/work/kvirccvs/kvirc/src/modules/setup/setupwizard.cpp	2006-11-21 21:58:30.000000000 +1100
@@ -274,7 +274,11 @@
 	
 	m_pDirUseNew->toggle();
 	newDirClicked();
-	
+
+#ifdef COMPILE_ON_WINDOWS
+	m_pDirMakePortable = new QRadioButton(__tr2qs("All settings in  shared program folder (portable)")
+			,m_pDirButtonGroup);
+#endif
 	m_pDirRestore = new QRadioButton(__tr2qs("Restore from backup archive"),m_pDirButtonGroup);
 	m_pDirRestore->setEnabled(FALSE);
 	
@@ -772,7 +776,15 @@
 		g_pApp->m_szLocalKvircDir =  m_pOldDataPathEdit->text();
 	} else {
 		bNeedToApplyDefaults=true;
-		szDir = m_pDataPathEdit->text();
+		if(m_pDirUseNew->isOn()) {
+			szDir = m_pDataPathEdit->text();
+		} 
+#ifdef COMPILE_ON_WINDOWS
+		else { //portable
+			szDir = g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"Settings";
+		}
+#endif
+
 		KviFileUtils::adjustFilePath(szDir);
 		KviQString::ensureLastCharIs(szDir,KVI_PATH_SEPARATOR_CHAR);
 		if(!KviFileUtils::directoryExists(szDir))
@@ -795,8 +807,16 @@
 	
 		g_pApp->m_szLocalKvircDir = szDir;
 		KviFileUtils::adjustFilePath(g_pApp->m_szLocalKvircDir);
-	
-		szDir = m_pIncomingPathEdit->text();
+
+		if(m_pDirUseNew->isOn()) {
+			szDir = m_pIncomingPathEdit->text();
+		} 
+#ifdef COMPILE_ON_WINDOWS
+		else { //portable
+			szDir = g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"Downloads";
+		}
+#endif
+
 		KviFileUtils::adjustFilePath(szDir);
 		if(!KviFileUtils::directoryExists(szDir))
 		{
@@ -809,7 +829,7 @@
 				return;
 			}
 		}
-	
+
 		g_szChoosenIncomingDirectory = szDir;
 	
 #ifndef COMPILE_ON_WINDOWS
@@ -824,7 +844,7 @@
 			makeLink();
 #endif
 	
-#ifndef COMPILE_ON_WINDOWS
+#ifdef COMPILE_ON_WINDOWS
 		if(m_pCreateUrlHandlers->isChecked())
 			setUrlHandlers();
 #endif
@@ -919,8 +939,15 @@
 			}
 		}
 	}
-	
-	g_pApp->saveKvircDirectory();
+#ifdef COMPILE_ON_WINDOWS
+	if(m_pDirMakePortable->isOn()) {
+		KviFileUtils::writeFile(g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"portable","true");
+	} else {
+#endif
+		g_pApp->saveKvircDirectory();
+#ifdef COMPILE_ON_WINDOWS
+	}
+#endif
 	QWizard::accept();
 }