- multipage creator: fix file selector throwing an error when setting…

… a file programatically - multipage creator: switched plugin directories constant to local UseGlobalAppData property
christophhart · Aug 17, 2024 · 2c28220 · 2c28220
1 parent 9947e60
commit 2c28220
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 21 deletions.
diff --git a/hi_tools/hi_multipage/ActionComponents.cpp b/hi_tools/hi_multipage/ActionComponents.cpp
@@ -350,14 +350,22 @@ Result JavascriptFunction::onAction()
 	{
 		auto fn = code.fromFirstOccurrenceOf("{BIND::", false, false).upToLastOccurrenceOf("}", false, false);
 
-		var thisObj(new DynamicObject());
-		var args[2];
-		args[0] = infoObject[mpid::ID];
-		args[1] = rootDialog.getState().globalState;
-		var::NativeFunctionArgs a(thisObj, args, 2);
+        try
+        {
+            var thisObj(new DynamicObject());
+            var args[2];
+            args[0] = infoObject[mpid::ID];
+            args[1] = rootDialog.getState().globalState;
+            var::NativeFunctionArgs a(thisObj, args, 2);
 
-		rootDialog.getState().callNativeFunction(fn, a, nullptr);
-		return Result::ok();
+            rootDialog.getState().callNativeFunction(fn, a, nullptr);
+
+            return Result::ok();
+        }
+        catch(Result& e)
+        {
+            return e;
+        }
 	}
 
 	if(code.startsWith("${"))
@@ -2411,7 +2419,7 @@ void PluginDirectories::loadConstants()
 {
 #if JUCE_MAC
 
-    auto useGlobal = rootDialog.useGlobalAppDataDirectory();
+    auto useGlobal = (bool)infoObject[mpid::UseGlobalAppData];
 
     String prefix = useGlobal ? "" : "~";
 
@@ -2440,6 +2448,24 @@ void PluginDirectories::loadConstants()
 #endif
 }
 
+#if HISE_MULTIPAGE_INCLUDE_EDIT
+void PluginDirectories::createEditor(Dialog::PageInfo& rootList)
+{
+    rootList.addChild<Type>({
+        { mpid::ID, "Type"},
+        { mpid::Type, PluginDirectories::getStaticId().toString() },
+        { mpid::Help, "Adding this will load the plugin directories as constant" }
+    });
+
+    rootList.addChild<Button>({
+        { mpid::ID, mpid::UseGlobalAppData.toString() },
+        { mpid::Text, mpid::UseGlobalAppData.toString() },
+        { mpid::Value, infoObject[mpid::UseGlobalAppData] },
+        { mpid::Help, "Whether to use the global or user plugin folder." }
+    });
+}
+#endif
+
 void OperatingSystem::loadConstants()
 {
 

diff --git a/hi_tools/hi_multipage/ActionComponents.h b/hi_tools/hi_multipage/ActionComponents.h
@@ -629,7 +629,7 @@ struct PluginDirectories: public Constants
 
     String getDescription() const override { return "Plugin Directories";}
 
-
+    CREATE_EDITOR_OVERRIDE;
 
 	void loadConstants() override;
 };

diff --git a/hi_tools/hi_multipage/InputComponents.cpp b/hi_tools/hi_multipage/InputComponents.cpp
@@ -1549,21 +1549,17 @@ Result FileSelector::checkGlobalState(var globalState)
 {
     auto& fileSelector = getComponent<BetterFileSelector>();
 	auto f = fileSelector.getCurrentFile();
-
+    
     if(f == File() && !fileSelector.fileLabel.isEmpty())
     {
-	    f = File(fileSelector.fileLabel.getText());
-
-        if(isDirectory && !f.isDirectory())
-        {
-            auto i = rootDialog.createModalPopup<MarkdownText>({
-                { mpid::Text, "Do you want to create the directory  \n> " + String(f.getFullPathName()) }
-            });
-
-	        rootDialog.showModalPopup(true, i);
-        }
+	    f = File(fileSelector.fileLabel.getText());    
     }
-
+
+    if(isDirectory && !f.isDirectory() && f != File())
+    {
+        f.createDirectory();
+    }
+
 	if(f != File() && !f.isRoot() && (f.isDirectory() || f.existsAsFile()))
 	{
         writeState(f.getFullPathName());