Qt: set LDrawZip path after library download

pbartfai · pbartfai · commit 71d2ef91035a · 2025-06-08T20:41:16.000+02:00
diff --git a/QT/ModelViewerWidget.cpp b/QT/ModelViewerWidget.cpp
@@ -1092,12 +1092,15 @@ bool ModelViewerWidget::installLDraw(void)
 	{
 		char *ldrawParentDir = getLDrawDir();
 		char *ldrawDir = copyString(ldrawParentDir, 255);
+		char *ldrawZip = copyString(ldrawParentDir, 255);
+
 		QDir originalDir = QDir::current();
 		bool progressDialogClosed = false;
 
 		libraryUpdateFinished = false;
 		strcat(ldrawDir, "/ldraw");
-		
+		strcat(ldrawZip, "/ldraw/complete.zip");
+
 		QDir dir(ldrawDir);
 		if (!dir.exists())
 		{
@@ -1157,6 +1160,8 @@ bool ModelViewerWidget::installLDraw(void)
 		{
 			LDLModel::setLDrawDir(ldrawDir);
 			preferences->setLDrawDir(ldrawDir);
+			LDLModel::setLDrawZipPath(ldrawZip);
+			preferences->setLDrawZipPath(ldrawZip);
 		}
 		delete ldrawDir;
 		return libraryUpdateFinished;
diff --git a/QT/Preferences.cpp b/QT/Preferences.cpp
@@ -1209,6 +1209,11 @@ char *Preferences::getLDrawZipPath(void)
 	return TCUserDefaults::stringForKey(LDRAWZIP_KEY, NULL, false);
 }
 
+void Preferences::setLDrawZipPath(const char *path)
+{
+	TCUserDefaults::setStringForKey(path, LDRAWZIP_KEY, false);
+}
+
 long Preferences::getMaxRecentFiles(void)
 {
 	return TCUserDefaults::longForKey(MAX_RECENT_FILES_KEY, 10, false);
diff --git a/QT/Preferences.h b/QT/Preferences.h
@@ -87,6 +87,7 @@ class Preferences : public QDialog, Ui::PreferencesPanel
 	static char *getLDrawDir(void);
 	static void setLDrawDir(const char *path);
 	static char *getLDrawZipPath(void);
+	static void setLDrawZipPath(const char *path);
 	static long getMaxRecentFiles(void);
 	static char *getRecentFile(int index);
 	static void setRecentFile(int index, char *filename);

Original file line number	Diff line number	Diff line change
`@@ -1092,12 +1092,15 @@ bool ModelViewerWidget::installLDraw(void)`
`1092`	`1092`	`{`
`1093`	`1093`	`char *ldrawParentDir = getLDrawDir();`
`1094`	`1094`	`char *ldrawDir = copyString(ldrawParentDir, 255);`
	`1095`	`+ char *ldrawZip = copyString(ldrawParentDir, 255);`
	`1096`	`+`
`1095`	`1097`	`QDir originalDir = QDir::current();`
`1096`	`1098`	`bool progressDialogClosed = false;`
`1097`	`1099`
`1098`	`1100`	`libraryUpdateFinished = false;`
`1099`	`1101`	`strcat(ldrawDir, "/ldraw");`
`1100`		`-`
	`1102`	`+ strcat(ldrawZip, "/ldraw/complete.zip");`
	`1103`	`+`
`1101`	`1104`	`QDir dir(ldrawDir);`
`1102`	`1105`	`if (!dir.exists())`
`1103`	`1106`	`{`
`@@ -1157,6 +1160,8 @@ bool ModelViewerWidget::installLDraw(void)`
`1157`	`1160`	`{`
`1158`	`1161`	`LDLModel::setLDrawDir(ldrawDir);`
`1159`	`1162`	`preferences->setLDrawDir(ldrawDir);`
	`1163`	`+ LDLModel::setLDrawZipPath(ldrawZip);`
	`1164`	`+ preferences->setLDrawZipPath(ldrawZip);`
`1160`	`1165`	`}`
`1161`	`1166`	`delete ldrawDir;`
`1162`	`1167`	`return libraryUpdateFinished;`
Original file line number	Diff line number	Diff line change
`@@ -1209,6 +1209,11 @@ char *Preferences::getLDrawZipPath(void)`
`1209`	`1209`	`return TCUserDefaults::stringForKey(LDRAWZIP_KEY, NULL, false);`
`1210`	`1210`	`}`
`1211`	`1211`
	`1212`	`+void Preferences::setLDrawZipPath(const char *path)`
	`1213`	`+{`
	`1214`	`+ TCUserDefaults::setStringForKey(path, LDRAWZIP_KEY, false);`
	`1215`	`+}`
	`1216`	`+`
`1212`	`1217`	`long Preferences::getMaxRecentFiles(void)`
`1213`	`1218`	`{`
`1214`	`1219`	`return TCUserDefaults::longForKey(MAX_RECENT_FILES_KEY, 10, false);`