Merge branch '2.1'

1 files changed, 40 insertions, 7 deletions

diff --git a/plugins/datetimestamps.lua b/plugins/datetimestamps.lua
index 51d698e..f16af83 100644
--- a/plugins/datetimestamps.lua
+++ b/plugins/datetimestamps.lua
@@ -1,7 +1,8 @@
--- mod-version:2 -- lite-xl 2.0
+-- mod-version:3
 local core = require "core"
 local config = require "core.config"
 local command = require "core.command"
+local common = require "core.common"
 
 --[[
 Date and time format placeholders
@@ -25,11 +26,36 @@ from https://www.lua.org/pil/22.1.html
 %y	two-digit year (98) [00-99]
 %%	the character `%´
 --]]
-config.plugins.datetimestamps = {
-  format_datestamp = "%Y%m%d"
-  format_datetimestamp = "%Y%m%d_%H%M%S"
-  format_timestamp = "%H%M%S"
-}
+config.plugins.datetimestamps = common.merge({
+  format_datestamp = "%Y%m%d",
+  format_datetimestamp = "%Y%m%d_%H%M%S",
+  format_timestamp = "%H%M%S",
+  -- The config specification used by the settings gui
+  config_spec = {
+    name = "Date and Time Stamps",
+    {
+      label = "Date",
+      description = "Date specification defined with Lua date/time place holders.",
+      path = "format_datestamp",
+      type = "string",
+      default = "%Y%m%d"
+    },
+    {
+      label = "Time",
+      description = "Time specification defined with Lua date/time place holders.",
+      path = "format_timestamp",
+      type = "string",
+      default = "%H%M%S"
+    },
+    {
+      label = "Date and Time",
+      description = "Date and time specification defined with Lua date/time place holders.",
+      path = "format_datetimestamp",
+      type = "string",
+      default = "%Y%m%d_%H%M%S"
+    }
+  }
+}, config.plugins.datetimestamps)
 
 local function datestamp()
   local sOut = os.date(config.plugins.datetimestamps.format_datestamp)
@@ -49,6 +75,13 @@ end
 command.add("core.docview", {
   ["datetimestamps:insert-datestamp"] = datestamp,
   ["datetimestamps:insert-timestamp"] = timestamp,
-  ["datetimestamps:insert-datetimestamp"] = datetimestamp
+  ["datetimestamps:insert-datetimestamp"] = datetimestamp,
+  ["datetimestamps:insert-custom"] = function()
+    core.command_view:enter("Date format eg: %H:%M:%S", {
+      submit = function(cmd)
+        core.active_view.doc:text_input(os.date(cmd) or "")
+      end
+    })
+  end,
 })