pyrevitlabs · jmcouffin · Dec 19, 2023 · Dec 19, 2023
diff --git a/bin/ControlzEx.dll b/bin/ControlzEx.dll
diff --git a/bin/IxMilia.Dxf.dll b/bin/IxMilia.Dxf.dll
diff --git a/bin/Microsoft.WindowsAPICodePack.Shell.dll b/bin/Microsoft.WindowsAPICodePack.Shell.dll
diff --git a/bin/Microsoft.WindowsAPICodePack.dll b/bin/Microsoft.WindowsAPICodePack.dll
diff --git a/bin/Microsoft.Xaml.Behaviors.dll b/bin/Microsoft.Xaml.Behaviors.dll
diff --git a/bin/pyRevitLabs.Common.dll b/bin/pyRevitLabs.Common.dll
diff --git a/bin/pyRevitLabs.CommonCLI.dll b/bin/pyRevitLabs.CommonCLI.dll
diff --git a/bin/pyRevitLabs.CommonWPF.dll b/bin/pyRevitLabs.CommonWPF.dll
diff --git a/bin/pyRevitLabs.DeffrelDB.dll b/bin/pyRevitLabs.DeffrelDB.dll
diff --git a/bin/pyRevitLabs.Emojis.dll b/bin/pyRevitLabs.Emojis.dll
diff --git a/bin/pyRevitLabs.Json.dll b/bin/pyRevitLabs.Json.dll
diff --git a/bin/pyRevitLabs.Language.dll b/bin/pyRevitLabs.Language.dll
diff --git a/bin/pyRevitLabs.MahAppsMetro.dll b/bin/pyRevitLabs.MahAppsMetro.dll
diff --git a/bin/pyRevitLabs.NLog.dll b/bin/pyRevitLabs.NLog.dll
diff --git a/bin/pyRevitLabs.PyRevit.Runtime.Shared.dll b/bin/pyRevitLabs.PyRevit.Runtime.Shared.dll
diff --git a/bin/pyRevitLabs.PyRevit.dll b/bin/pyRevitLabs.PyRevit.dll
diff --git a/bin/pyRevitLabs.TargetApps.AutoCAD.dll b/bin/pyRevitLabs.TargetApps.AutoCAD.dll
diff --git a/bin/pyRevitLabs.TargetApps.Navisworks.dll b/bin/pyRevitLabs.TargetApps.Navisworks.dll
diff --git a/bin/pyRevitLabs.TargetApps.Revit.dll b/bin/pyRevitLabs.TargetApps.Revit.dll
diff --git a/bin/pyRevitLabs.UnitTests.dll b/bin/pyRevitLabs.UnitTests.dll
diff --git a/bin/pyrevit-doctor.exe b/bin/pyrevit-doctor.exe
diff --git a/bin/pyrevit.exe b/bin/pyrevit.exe
diff --git a/dev/libs/ControlzEx.dll b/dev/libs/ControlzEx.dll
diff --git a/dev/libs/FileFormatWavefront.XML b/dev/libs/FileFormatWavefront.XML
diff --git a/dev/libs/IxMilia.Dxf.dll b/dev/libs/IxMilia.Dxf.dll
diff --git a/dev/libs/IxMilia.Dxf.xml b/dev/libs/IxMilia.Dxf.xml
diff --git a/dev/libs/Microsoft.WindowsAPICodePack.Shell.dll b/dev/libs/Microsoft.WindowsAPICodePack.Shell.dll
diff --git a/dev/libs/Microsoft.WindowsAPICodePack.Shell.xml b/dev/libs/Microsoft.WindowsAPICodePack.Shell.xml
diff --git a/dev/libs/Microsoft.WindowsAPICodePack.dll b/dev/libs/Microsoft.WindowsAPICodePack.dll
diff --git a/dev/libs/Microsoft.WindowsAPICodePack.xml b/dev/libs/Microsoft.WindowsAPICodePack.xml
diff --git a/dev/libs/Microsoft.Xaml.Behaviors.dll b/dev/libs/Microsoft.Xaml.Behaviors.dll
diff --git a/dev/libs/Revit/2024/AdWindows.dll b/dev/libs/Revit/2024/AdWindows.dll
diff --git a/dev/libs/Revit/2024/RevitAPI.dll b/dev/libs/Revit/2024/RevitAPI.dll
diff --git a/dev/libs/Revit/2024/RevitAPIUI.dll b/dev/libs/Revit/2024/RevitAPIUI.dll
diff --git a/dev/libs/Revit/2024/UIFramework.dll b/dev/libs/Revit/2024/UIFramework.dll
diff --git a/dev/libs/Revit/2024/Xceed.Wpf.AvalonDock.dll b/dev/libs/Revit/2024/Xceed.Wpf.AvalonDock.dll
diff --git a/dev/libs/pyRevitLabs.Json.dll b/dev/libs/pyRevitLabs.Json.dll
diff --git a/dev/libs/pyRevitLabs.Json.xml b/dev/libs/pyRevitLabs.Json.xml
diff --git a/dev/libs/pyRevitLabs.MahAppsMetro.dll b/dev/libs/pyRevitLabs.MahAppsMetro.dll
diff --git a/dev/libs/pyRevitLabs.MahAppsMetro.xml b/dev/libs/pyRevitLabs.MahAppsMetro.xml
diff --git a/dev/libs/pyRevitLabs.NLog.dll b/dev/libs/pyRevitLabs.NLog.dll
diff --git a/dev/libs/pyRevitLabs.NLog.xml b/dev/libs/pyRevitLabs.NLog.xml
diff --git a/dev/pyRevitLabs/pyRevitLabs.PyRevit/pyRevitLabs.PyRevit.csproj b/dev/pyRevitLabs/pyRevitLabs.PyRevit/pyRevitLabs.PyRevit.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Expression.Blend.Sdk" Version="1.0.2" />
-    <PackageReference Include="LibGit2Sharp" Version="0.26.2" />
+    <PackageReference Include="LibGit2Sharp" Version="0.29.0" />
     <PackageReference Include="MadMilkman.Ini" Version="1.0.6" />
     <PackageReference Include="Nett" Version="0.15.0" />
     <Reference Include="PresentationCore" />

diff --git a/pyrevitlib/pyrevit/runtime/ScriptConsole.cs b/pyrevitlib/pyrevit/runtime/ScriptConsole.cs
@@ -123,32 +123,24 @@ private void SetupDynamicResources() {
             });
 
             Resources.MergedDictionaries.Add(new ResourceDictionary() {
-                Source = new Uri("pack://application:,,,/pyRevitLabs.MahAppsMetro;component/Styles/Colors.xaml")
+                Source = new Uri("pack://application:,,,/pyRevitLabs.MahAppsMetro;component/Styles/Themes/Light.Blue.xaml")
             });
 
-            Resources.MergedDictionaries.Add(new ResourceDictionary() {
-                Source = new Uri("pack://application:,,,/pyRevitLabs.MahAppsMetro;component/Styles/FlatButton.xaml")
-            });
-
-            var accentResDict = new ResourceDictionary() {
-                Source = new Uri("pack://application:,,,/pyRevitLabs.MahAppsMetro;component/Styles/Accents/Steel.xaml")
-            };
+            var accentResDict = Resources;
 
             var pyrevitHighlightColor = Color.FromArgb(0xFF, 0xf3, 0x9c, 0x12);
             var pyrevitBackground = new SolidColorBrush() { Color = Color.FromArgb(0xFF, 0x2c, 0x3e, 0x50) };
             var pyrevitHighlight = new SolidColorBrush() { Color = pyrevitHighlightColor };
-            accentResDict["AccentColorBrush"] = pyrevitBackground;
-            accentResDict["WindowTitleColorBrush"] = pyrevitBackground;
+            accentResDict["MahApps.Brushes.Accent"] = pyrevitBackground;
+            accentResDict["MahApps.Brushes.WindowTitle"] = pyrevitBackground;
 
             // overriding colors on the progressbar control
             var progressBarOverlay = Color.FromArgb(0x66, 0xFF, 0xFF, 0xFF);
-            accentResDict["ProgressBrush"] = pyrevitHighlight;
-            accentResDict["ProgressIndeterminateColor1"] = progressBarOverlay;
-            accentResDict["ProgressIndeterminateColor2"] = progressBarOverlay;
-            accentResDict["ProgressIndeterminateColor3"] = pyrevitHighlightColor;
-            accentResDict["ProgressIndeterminateColor4"] = pyrevitHighlightColor;
-
-            Resources.MergedDictionaries.Add(accentResDict);
+            accentResDict["MahApps.Brushes.Progress"] = pyrevitHighlight;
+            accentResDict["MahApps.Colors.ProgressIndeterminate1"] = progressBarOverlay;
+            accentResDict["MahApps.Colors.ProgressIndeterminate2"] = progressBarOverlay;
+            accentResDict["MahApps.Colors.ProgressIndeterminate3"] = pyrevitHighlightColor;
+            accentResDict["MahApps.Colors.ProgressIndeterminate4"] = pyrevitHighlightColor;
         }
 
         private void ScriptOutput_SizeChanged(object sender, SizeChangedEventArgs e) {
@@ -346,7 +338,7 @@ public void InitializeComponent() {
             #endregion
 
             this.Width = 900; this.MinWidth = 700;
-            this.Height = 600; this.MinHeight = this.TitlebarHeight;
+            this.Height = 600; this.MinHeight = this.TitleBarHeight;
             this.ResizeMode = ResizeMode.CanResize;
 
             // setup auto-collapse
@@ -926,7 +918,7 @@ private void CopyButton_Click(object sender, RoutedEventArgs e) {
 
         private void CollapseWindow() {
             prevHeight = Height;
-            Height = TitlebarHeight;
+            Height = TitleBarHeight;
             //ResizeBorderThickness = new Thickness(0);
             IsCollapsed = true;
         }