Merge remote-tracking branch 'origin/frank' into kenric

InABox.Database/DataUpdater.cs

@@ -203,35 +203,14 @@ public static class DataUpdater
         newVersion = toVersion;
         return true;
     }
-
-    private static DatabaseVersion GetVersionSettings()
-    {
-        var result = DbFactory.NewProvider(Logger.Main).Query(new Filter<GlobalSettings>(x => x.Section).IsEqualTo(nameof(DatabaseVersion)))
-            .Rows.FirstOrDefault()?.ToObject<GlobalSettings>();
-        if(result != null)
-        {
-            return Serialization.Deserialize<DatabaseVersion>(result.Contents);
-        }
-        var settings = new GlobalSettings() { Section = nameof(DatabaseVersion), Key = "" };
-        var dbVersion = new DatabaseVersion() { Version = "6.30b" };
-        settings.Contents = Serialization.Serialize(dbVersion);
-        DbFactory.NewProvider(Logger.Main).Save(settings);
-        return dbVersion;
-    }
-
-    private static VersionNumber GetDatabaseVersion()
-    {
-        var dbVersion = GetVersionSettings();
-        return VersionNumber.Parse(dbVersion.Version);
-    }
-
+    
     private static void UpdateVersionNumber(VersionNumber version)
     {
         if (version.IsDevelopmentVersion)
         {
             return;
         }
-        var dbVersion = GetVersionSettings();
+        var dbVersion = DbFactory.GetVersionSettings();
         dbVersion.Version = version.ToString();
 
         var result = DbFactory.NewProvider(Logger.Main).Query(new Filter<GlobalSettings>(x => x.Section).IsEqualTo(nameof(DatabaseVersion)))
@@ -249,7 +228,7 @@ public static class DataUpdater
     {
         try
         {
-            var from = GetDatabaseVersion();
+            var from = DbFactory.GetDatabaseVersion();
             var to = VersionNumber.Parse(CoreUtils.GetVersion());
 
             var success = MigrateDatabase(from, to, out var newVersion);

InABox.Database/DbFactory.cs

@@ -112,7 +112,41 @@ public static class DbFactory
 
         LoadScripts();
     }
+    
+    public static DatabaseVersion GetVersionSettings()
+    {
+        var provider = ProviderFactory.NewProvider(Logger.New());
+        var result = provider.Query(new Filter<GlobalSettings>(x => x.Section).IsEqualTo(nameof(DatabaseVersion)))
+            .Rows.FirstOrDefault()?.ToObject<GlobalSettings>();
+        if(result != null)
+        {
+            return Serialization.Deserialize<DatabaseVersion>(result.Contents);
+        }
+        var settings = new GlobalSettings() { Section = nameof(DatabaseVersion), Key = "" };
+        var dbVersion = new DatabaseVersion() { Version = "6.30b" };
+        settings.Contents = Serialization.Serialize(dbVersion);
+        DbFactory.NewProvider(Logger.Main).Save(settings);
+        return dbVersion;
+    }
+
+    public static VersionNumber GetDatabaseVersion()
+    {
+        var dbVersion = GetVersionSettings();
+        return VersionNumber.Parse(dbVersion.Version);
+    }
 
+    private static VersionNumber? _versionNumber;
+    
+    public static VersionNumber VersionNumber 
+    {
+        get
+        {
+            _versionNumber ??= GetDatabaseVersion();
+            return _versionNumber;
+        }
+    }
+
+    
     #region MetaData
 
     private static void SaveMetadata()
@@ -265,6 +299,9 @@ public static class DbFactory
     
     public static void AssertLicense()
     {
+        if (VersionNumber.IsDevelopmentVersion)
+            return;
+        
         var result = CheckLicenseValidity(out DateTime expiry);
         switch (result)
         {

inabox.wpf/DynamicGrid/DynamicEditorForm/EmbeddedDynamicEditorForm.xaml.cs

@@ -59,12 +59,25 @@ namespace InABox.DynamicGrid
             get => Editor.ReadOnly;
             set
             {
-                OKButton.IsEnabled = !value;
-                CancelButton.IsEnabled = !value;
+                OKButton.IsEnabled = !DisableButtons && !value;
+                CancelButton.IsEnabled = !DisableButtons && !value;
                 Editor.ReadOnly = value;
             }
         }
 
+        private bool _disableButtons = false;
+
+        public bool DisableButtons
+        {
+            get => _disableButtons;
+            set
+            {
+                _disableButtons = value;
+                OKButton.IsEnabled = !ReadOnly && !value; 
+                CancelButton.IsEnabled = !ReadOnly && !value;
+            }
+        }
+        
         private bool _hideButtons = false;
 
         public bool HideButtons
@@ -75,7 +88,6 @@ namespace InABox.DynamicGrid
                 _hideButtons = value;
                 OKButton.Visibility = value ? Visibility.Collapsed : Visibility.Visible;
                 CancelButton.Visibility = value ? Visibility.Collapsed : Visibility.Visible;
-
             }
         }
 

inabox.wpf/DynamicGrid/DynamicGrid.cs

@@ -887,7 +887,7 @@ public abstract class DynamicGrid<T> : DynamicGrid, IDynamicGridUIComponentParen
     }
 
     #endregion
-
+    
     protected virtual DynamicGridColumns LoadColumns()
     {
         return GenerateColumns();
@@ -964,6 +964,25 @@ public abstract class DynamicGrid<T> : DynamicGrid, IDynamicGridUIComponentParen
     protected virtual void ConfigureColumns(DynamicGridColumns columns)
     {
     }
+
+    public class ColumnsLoadedEventArgs : EventArgs
+    {
+        public DynamicGridColumns VisibleColumns { get; private set; }
+        public DynamicActionColumns ActionColumns { get; private set; }
+        public DynamicGridColumnGroupings ColumnGroupings { get; private set; }
+
+        public ColumnsLoadedEventArgs(DynamicGridColumns visibleColumns, DynamicActionColumns actionColumns,
+            DynamicGridColumnGroupings columnGroupings)
+        {
+            VisibleColumns = visibleColumns;
+            ActionColumns = actionColumns;
+            ColumnGroupings = columnGroupings;
+        }
+    }
+    
+    public delegate void ColumnsLoadedEvent(DynamicGrid sender, ColumnsLoadedEventArgs args);
+
+    public event ColumnsLoadedEvent ColumnsLoaded;
     
     private void ReloadColumns()
     {
@@ -975,6 +994,8 @@ public abstract class DynamicGrid<T> : DynamicGrid, IDynamicGridUIComponentParen
         ColumnGroupings.Clear();
         ConfigureColumnGroups();
 
+        ColumnsLoaded?.Invoke(this,new ColumnsLoadedEventArgs(VisibleColumns, ActionColumns, ColumnGroupings));
+        
         UIComponent.RefreshColumns(VisibleColumns, ActionColumns, ColumnGroupings);
     }