Merge pull request #600 from mbbsemu/ui-cleanup

UI Cleanup
mbbsemu · Nov 22, 2023 · dd9c93a · dd9c93a
2 parents b2a8435 + c5298e9
commit dd9c93a
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/MBBSEmu/UI/Main/MainView.cs b/MBBSEmu/UI/Main/MainView.cs
@@ -74,8 +74,6 @@ public override void Setup()
                         "https://www.mbbsemu.com", "OK")),
                 })
             });
-            menu.Text = "Test";
-            menu.TextAlignment = TextAlignment.Right;
             MainWindow.Add(menu);
 
             //Audit Log Window
@@ -102,6 +100,17 @@ public override void Setup()
                 PreserveTrailingSpaces = false,
                 Style = new TableView.TableStyle { AlwaysShowHeaders = true }
             };
+
+            //Use local Function to return new ColumnStyle with specified MinWidth and MaxWidth
+            TableView.ColumnStyle GetAuditLogStyle(int minWidth, int maxWidth) => new()
+            {
+                MinWidth = minWidth,
+                MaxWidth = maxWidth
+            };
+
+            _auditLogTableView.Style.ColumnStyles.Add(_auditLogTableView.Table.Columns["Summary"], GetAuditLogStyle(20, 20));
+            _auditLogTableView.Style.ColumnStyles.Add(_auditLogTableView.Table.Columns["Detail"], GetAuditLogStyle(50, 50));
+
             auditLogContainer.Add(_auditLogTableView);
             MainWindow.Add(auditLogContainer);
 
@@ -264,9 +273,22 @@ private void UpdateApplicationLog()
                 {
                     var logDate = ((DateTime)entry[0]).ToString("HH:mm:ss.fff");
                     var logClass = (entry[1].ToString())?[8..];
-                    var logLevel = ((LogLevel)entry[2]).ToString();
+                    var logLevel = string.Empty;
                     var logMessage = (string)entry[3];
 
+                    //Evaluate message LogLevel and set string to be the level name up to 5 characters
+                    logLevel = (LogLevel)entry[2] switch
+                    {
+                        LogLevel.Trace => "TRACE",
+                        LogLevel.Debug => "DEBUG",
+                        LogLevel.Information => "INFO",
+                        LogLevel.Warning => "WARN",
+                        LogLevel.Error => "ERROR",
+                        LogLevel.Critical => "CRIT",
+                        LogLevel.None => "NONE",
+                        _ => logLevel
+                    };
+
                     _logTable.Rows.Add(
                         logDate, logClass, logLevel, logMessage);
                 }

diff --git a/MBBSEmu/UI/Setup/SetupView.cs b/MBBSEmu/UI/Setup/SetupView.cs
@@ -34,6 +34,21 @@ public SetupView() : base()
 
         public override void Setup()
         {
+            //Setup an outer view for the Initial Setup Wizard
+            var outerView = new Window()
+            {
+                X = 0,
+                Y = 0,
+                Width = Dim.Fill(),
+                Height = Dim.Fill(),
+                Border = new Border
+                {
+                    BorderStyle = BorderStyle.Double, 
+                    BorderBrush = Color.BrightCyan, 
+                    Title= "MBBSEmu Initial Setup" 
+                },
+            };
+            MainWindow.Add(outerView);
 
             var wizard = new Wizard("Initial Setup Wizard")
             {