Harden custom-settings UI gating; show controls only when enabled; fix resize controls enable/disable behavior

Author: fjb2020

piwigoPublish.lrplugin/PluginInfoDialogSections.lua

@@ -64,7 +64,9 @@ function PluginInfoDialogSections.startDialog(propertyTable)
     if prefs.debugToFile == nil then
         prefs.debugToFile = false
     end
-
+    if prefs.debugFailedUpload == nil then
+        prefs.debugFailedUpload = false
+    end
     -- Initialize update check preference
     if prefs.checkUpdatesOnStartup == nil then
         prefs.checkUpdatesOnStartup = true
@@ -84,6 +86,8 @@ function PluginInfoDialogSections.startDialog(propertyTable)
     propertyTable.debugEnabled = prefs.debugEnabled
     propertyTable.debugToFile = prefs.debugToFile
     propertyTable.checkUpdatesOnStartup = prefs.checkUpdatesOnStartup
+    propertyTable.debugFailedUpload = prefs.debugFailedUpload
+
 end
 
 -- *************************************************
@@ -125,7 +129,7 @@ function PluginInfoDialogSections.sectionsForTopOfDialog(f, propertyTable)
                                 title = "Piwigo Publisher",
                                 font = "<system/bold>",
                                 alignment = 'left',
-								width = 250,
+                                width = 250,
                             },
 
                             -- Version @ UpdateStatus on one line, red if not up to date
@@ -166,7 +170,7 @@ function PluginInfoDialogSections.sectionsForTopOfDialog(f, propertyTable)
                     f:row {
                         f:static_text {
                             title = "Made in England with cider and cheddar cheese in Somerset,\n" ..
-                                    "the Land of the Summer People.",
+                                "the Land of the Summer People.",
                             font = "<system/small>",
                             text_color = LrColor(0.5, 0.5, 0.5),
                             alignment = 'center',
@@ -289,7 +293,7 @@ function PluginInfoDialogSections.sectionsForTopOfDialog(f, propertyTable)
                     fill_horizontal = 1,
                     f:static_text {
                         title = "If you experience a problem, enable logging below and reproduce the issue.\n" ..
-                                "You can then share the log with support.",
+                            "You can then share the log with support.",
                         fill_horizontal = 1,
                         height_in_lines = 2,
                         alignment = 'left',
@@ -334,6 +338,21 @@ function PluginInfoDialogSections.sectionsForTopOfDialog(f, propertyTable)
                         width_in_chars = 40,
                     },
                 },
+
+                f:row {
+                    f:checkbox {
+                        value = bind 'debugFailedUpload',
+                        enabled = bind 'debugEnabled',
+                    },
+                    f:static_text {
+                        title = "Log extra information for failed uploads (creates PiwigoPublishDebug folder on your desktop)",
+                        alignment = 'left',
+                        fill_horizontal = 1,
+                        width_in_chars = 40,
+                    },
+                },
+
+
             },
 
             -- Unsafe / developer group box

piwigoPublish.lrplugin/PublishDialogSections.lua

@@ -801,7 +801,7 @@ local function prefsDialog(f, propertyTable)
 
 		f:spacer { height = 2 },
 		-- other settings (album descriptions and comments handling)
-		UIHelpers.createOtherSettingsGroupBox(f, bind),
+		UIHelpers.createOtherSettingsGroupBox(f, bind, propertyTable),
 
 	}
 end

piwigoPublish.lrplugin/PublishTask.lua

@@ -257,15 +257,24 @@ function PublishTask.viewForCollectionSettings(f, publishSettings, info)
     local pwAlbumUI, sortOrderUI, kwFilterUI = buildCommonCollectionUI(f, bind, share, collectionSettings,
         publishSettings)
 
-    local customSettingsUI = UIHelpers.createExportSettingsGroupBox(f, bind, collectionSettings, publishSettings)
-    local UI = f:column {
-        spacing = f:control_spacing(),
-        pwAlbumUI,
-        --    sortOrderUI, --todo
-        kwFilterUI,
-        customSettingsUI,
-
-    }
+    local allowCustomAlbumSettings = publishSettings and publishSettings.PWP_customAlbumSettings == true
+    local UI
+    if allowCustomAlbumSettings then
+        local customSettingsUI = UIHelpers.createExportSettingsGroupBox(f, bind, collectionSettings, publishSettings)
+        UI = f:column {
+            spacing = f:control_spacing(),
+            pwAlbumUI,
+            --    sortOrderUI, --todo
+            kwFilterUI,
+            customSettingsUI,
+        }
+    else
+        UI = f:column {
+            spacing = f:control_spacing(),
+            pwAlbumUI,
+            --    sortOrderUI, --todo
+        }
+    end
     return UI
 end
 
@@ -375,14 +384,24 @@ function PublishTask.viewForCollectionSetSettings(f, publishSettings, info)
     local pwAlbumUI, sortOrderUI, kwFilterUI = buildCommonCollectionUI(f, bind, share, collectionSettings,
         publishSettings)
 
-    local customSettingsUI = UIHelpers.createExportSettingsGroupBox(f, bind, collectionSettings, publishSettings)
-    local UI = f:column {
-        spacing = f:control_spacing(),
-        pwAlbumUI,
-        --    sortOrderUI, --todo
-        kwFilterUI,
-        customSettingsUI,
-    }
+    local allowCustomAlbumSettings = publishSettings and publishSettings.PWP_customAlbumSettings == true
+    local UI
+    if allowCustomAlbumSettings then
+        local customSettingsUI = UIHelpers.createExportSettingsGroupBox(f, bind, collectionSettings, publishSettings)
+        UI = f:column {
+            spacing = f:control_spacing(),
+            pwAlbumUI,
+            --    sortOrderUI, --todo
+            kwFilterUI,
+            customSettingsUI,
+        }
+    else
+        UI = f:column {
+            spacing = f:control_spacing(),
+            pwAlbumUI,
+            --    sortOrderUI, --todo
+        }
+    end
 
     return UI
 end