misc small updates

updated apple example project- src files had somehow become relocated :: fixed a bug with the qt/c++ isf editor, which was inserting 'null' values for empty fields :: updated ISF-Files repos to latest version :: version bump for isf editor installer (2.9.13) & isf files installer (1.0.5)
mrRay · Nov 20, 2019 · 67c0219 · 67c0219
1 parent db62dfa
commit 67c0219
Show file tree

Hide file tree

Showing 8 changed files with 699 additions and 690 deletions.
diff --git a/examples/ISF-files b/examples/ISF-files
diff --git a/examples/Qt/ISFEditor/ISFEditor_app/ISFEditor_app.pro b/examples/Qt/ISFEditor/ISFEditor_app/ISFEditor_app.pro
@@ -22,7 +22,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 CONFIG += c++14
 
-VERSION = 2.9.12
+VERSION = 2.9.13
 mac	{
 	ICON = ISFEditorAppIcon.icns
 }

diff --git a/examples/Qt/ISFEditor/ISFEditor_app/JSONGUI/JSONGUIBasicInfoWidget.cpp b/examples/Qt/ISFEditor/ISFEditor_app/JSONGUI/JSONGUIBasicInfoWidget.cpp
@@ -36,30 +36,46 @@ JSONGUIBasicInfoWidget::JSONGUIBasicInfoWidget(const JGMTopRef & inTop, QWidget
 	QJsonValue			tmpVal;
 	QString				tmpString;
 
-	tmpVal = isfDict["DESCRIPTION"];
-	tmpString = (tmpVal.isString()) ? tmpVal.toString() : QString("");
+	if (isfDict.contains("DESCRIPTION"))	{
+		tmpVal = isfDict["DESCRIPTION"];
+		tmpString = (tmpVal.isString()) ? tmpVal.toString() : QString("");
+	}
+	else
+		tmpString = QString("");
 	ui->descriptionEdit->setText(tmpString);
 
-	tmpVal = isfDict["CREDIT"];
-	tmpString = (tmpVal.isString()) ? tmpVal.toString() : QString("");
+	if (isfDict.contains("CREDIT"))	{
+		tmpVal = isfDict["CREDIT"];
+		tmpString = (tmpVal.isString()) ? tmpVal.toString() : QString("");
+	}
+	else
+		tmpString = QString("");
 	ui->creditEdit->setText(tmpString);
 
 	tmpString = QString("");
-	tmpVal = isfDict["CATEGORIES"];
-	if (tmpVal.isArray())	{
-		for (const auto & catVal : tmpVal.toArray())	{
-			if (!catVal.isString())
-				continue;
-			if (tmpString.length() < 1)
-				tmpString = catVal.toString();
-			else
-				tmpString.append( QString(", %1").arg(catVal.toString()) );
+	if (isfDict.contains("CATEGORIES"))	{
+		tmpVal = isfDict["CATEGORIES"];
+		if (tmpVal.isArray())	{
+			for (const auto & catVal : tmpVal.toArray())	{
+				if (!catVal.isString())
+					continue;
+				if (tmpString.length() < 1)
+					tmpString = catVal.toString();
+				else
+					tmpString.append( QString(", %1").arg(catVal.toString()) );
+			}
 		}
 	}
+	else
+		tmpString = QString("");
 	ui->categoriesEdit->setText(tmpString);
 
-	tmpVal = isfDict["VSN"];
-	tmpString = (tmpVal.isString()) ? tmpVal.toString() : QString("");
+	if (isfDict.contains("VSN"))	{
+		tmpVal = isfDict["VSN"];
+		tmpString = (tmpVal.isString()) ? tmpVal.toString() : QString("");
+	}
+	else
+		tmpString = QString("");
 	ui->vsnEdit->setText(tmpString);
 
 	connect(ui->descriptionEdit, &QLineEdit::editingFinished, this, &JSONGUIBasicInfoWidget::descriptionFieldUsed);

diff --git a/...s/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFEditor.mac/meta/package.xml b/...s/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFEditor.mac/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>The ISF Editor app</DisplayName>
     <Description>Install the ISF Editor application.</Description>
-	<Version>2.9.12</Version>
-	<ReleaseDate>2019-08-22</ReleaseDate>
+	<Version>2.9.13</Version>
+	<ReleaseDate>2019-11-20</ReleaseDate>
     <Default>true</Default>
     <SortingPriority>10</SortingPriority>
 </Package>
diff --git a/...es/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFFiles.mac/meta/package.xml b/...es/Qt/ISFEditor/ISFEditor_installer_mac/packages/com.vidvox.ISFFiles.mac/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>ISF Sample Files</DisplayName>
     <Description>Hundreds of sample ISF generators and filters.  These will be installed in /Library/Graphics/ISF, where they can be accessed by all users and applications on this machine.</Description>
-	<Version>1.0.4</Version>
-	<ReleaseDate>2019-08-22</ReleaseDate>
+	<Version>1.0.5</Version>
+	<ReleaseDate>2019-11-20</ReleaseDate>
     <RequiresAdminRights>true</RequiresAdminRights>
     <Script>installscript.js</Script>
     <Default>true</Default>

diff --git a/...s/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFEditor.win/meta/package.xml b/...s/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFEditor.win/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>The ISF Editor app</DisplayName>
     <Description>Install the ISF Editor application.</Description>
-	<Version>2.9.12</Version>
-	<ReleaseDate>2019-08-22</ReleaseDate>
+	<Version>2.9.13</Version>
+	<ReleaseDate>2019-11-20</ReleaseDate>
     <Default>true</Default>
     <SortingPriority>10</SortingPriority>
 	<Script>installscript.js</Script>

diff --git a/...es/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFFiles.win/meta/package.xml b/...es/Qt/ISFEditor/ISFEditor_installer_win/packages/com.vidvox.ISFFiles.win/meta/package.xml
@@ -2,8 +2,8 @@
 <Package>
     <DisplayName>ISF Sample Files</DisplayName>
 	<Description>Hundreds of sample ISF generators and filters.  These will be installed in the root "ProgramDirectory" on the target drive (usually C:\\ProgramData\\ISF).</Description>
-	<Version>1.0.4</Version>
-	<ReleaseDate>2019-08-22</ReleaseDate>
+	<Version>1.0.5</Version>
+	<ReleaseDate>2019-11-20</ReleaseDate>
     <RequiresAdminRights>true</RequiresAdminRights>
     <Script>installscript.js</Script>
     <Default>true</Default>

diff --git a/examples/apple/ISFSandbox.xcodeproj/project.pbxproj b/examples/apple/ISFSandbox.xcodeproj/project.pbxproj