Merge branch 'release/4.6.20'

pyrevitlabs · May 12, 2019 · b0688f4 · b0688f4
2 parents a6f2ce8 + 3742e6a
commit b0688f4
Show file tree

Hide file tree

Showing 66 changed files with 873 additions and 195 deletions.
diff --git a/Pipfile b/Pipfile
@@ -9,6 +9,8 @@ pygments = "*"
 sphinx = "*"
 readthedocs-sphinx-ext = "*"
 "doc8" = "*"
+urllib3 = "==1.24.2"
+jinja2 = "==2.10.1"
 
 [dev-packages]
 pylint = "<2.0.0"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/bin/ControlzEx.pdb b/bin/ControlzEx.pdb
diff --git a/bin/DocoptNet.pdb b/bin/DocoptNet.pdb
diff --git a/bin/LibGit2Sharp.pdb b/bin/LibGit2Sharp.pdb
diff --git a/bin/MahApps.Metro.pdb b/bin/MahApps.Metro.pdb
diff --git a/bin/Nett.pdb b/bin/Nett.pdb
diff --git a/bin/Newtonsoft.Json.pdb b/bin/Newtonsoft.Json.pdb
diff --git a/bin/git2-4aecb64.pdb b/bin/git2-4aecb64.pdb
diff --git a/bin/pyRevitLabs.Common.dll b/bin/pyRevitLabs.Common.dll
diff --git a/bin/pyRevitLabs.Common.pdb b/bin/pyRevitLabs.Common.pdb
diff --git a/bin/pyRevitLabs.CommonCLI.dll b/bin/pyRevitLabs.CommonCLI.dll
diff --git a/bin/pyRevitLabs.CommonCLI.pdb b/bin/pyRevitLabs.CommonCLI.pdb
diff --git a/bin/pyRevitLabs.CommonWPF.dll b/bin/pyRevitLabs.CommonWPF.dll
diff --git a/bin/pyRevitLabs.CommonWPF.pdb b/bin/pyRevitLabs.CommonWPF.pdb
diff --git a/bin/pyRevitLabs.Language.dll b/bin/pyRevitLabs.Language.dll
diff --git a/bin/pyRevitLabs.Language.pdb b/bin/pyRevitLabs.Language.pdb
diff --git a/bin/pyRevitLabs.TargetApps.Revit.dll b/bin/pyRevitLabs.TargetApps.Revit.dll
diff --git a/bin/pyRevitLabs.TargetApps.Revit.pdb b/bin/pyRevitLabs.TargetApps.Revit.pdb
diff --git a/bin/pyRevitUpdater.exe b/bin/pyRevitUpdater.exe
diff --git a/bin/pyrevit.exe b/bin/pyrevit.exe
diff --git a/bin/pyrevit.pdb b/bin/pyrevit.pdb
diff --git a/dev/WPFEdit/WPFEdit/WPFEdit.csproj b/dev/WPFEdit/WPFEdit/WPFEdit.csproj
@@ -192,6 +192,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="..\..\..\pyrevitlib\pyrevit\forms\ParameterItemStyle.xaml">
+      <Link>Forms\ParameterItemStyle.xaml</Link>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="..\..\..\pyrevitlib\pyrevit\forms\ProgressBar.xaml">
       <Link>Forms\ProgressBar.xaml</Link>
       <Generator>MSBuild:Compile</Generator>

diff --git a/dev/pyRevitLabs/pyRevitLabs.Common/pyRevitLabs.Common.csproj b/dev/pyRevitLabs/pyRevitLabs.Common/pyRevitLabs.Common.csproj
@@ -29,10 +29,11 @@
     <DebugType>none</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>
   <PropertyGroup>
@@ -103,7 +104,6 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent>copy "$(TargetPath)" "$(TargetDir)..\..\..\..\..\bin"</PostBuildEvent>
   </PropertyGroup>
 </Project>
diff --git a/dev/pyRevitLabs/pyRevitLabs.CommonCLI/pyRevitLabs.CommonCLI.csproj b/dev/pyRevitLabs/pyRevitLabs.CommonCLI/pyRevitLabs.CommonCLI.csproj
@@ -27,10 +27,11 @@
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -64,7 +65,6 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent>copy "$(TargetPath)" "$(TargetDir)..\..\..\..\..\bin"</PostBuildEvent>
   </PropertyGroup>
 </Project>
diff --git a/dev/pyRevitLabs/pyRevitLabs.CommonWPF/pyRevitLabs.CommonWPF.csproj b/dev/pyRevitLabs/pyRevitLabs.CommonWPF/pyRevitLabs.CommonWPF.csproj
@@ -27,10 +27,11 @@
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
@@ -103,7 +104,6 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent>copy "$(TargetPath)" "$(TargetDir)..\..\..\..\..\bin"</PostBuildEvent>
   </PropertyGroup>
 </Project>
diff --git a/dev/pyRevitLabs/pyRevitLabs.DeffrelDB/pyRevitLabs.DeffrelDB.csproj b/dev/pyRevitLabs/pyRevitLabs.DeffrelDB/pyRevitLabs.DeffrelDB.csproj
@@ -27,9 +27,11 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

diff --git a/dev/pyRevitLabs/pyRevitLabs.Language/pyRevitLabs.Language.csproj b/dev/pyRevitLabs/pyRevitLabs.Language/pyRevitLabs.Language.csproj
@@ -27,9 +27,11 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -64,4 +66,7 @@
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>copy "$(TargetPath)" "$(TargetDir)..\..\..\..\..\bin"</PostBuildEvent>
+  </PropertyGroup>
 </Project>
diff --git a/dev/pyRevitLabs/pyRevitLabs.TargetApps.AutoCAD/pyRevitLabs.TargetApps.AutoCAD.csproj b/dev/pyRevitLabs/pyRevitLabs.TargetApps.AutoCAD/pyRevitLabs.TargetApps.AutoCAD.csproj
@@ -27,9 +27,11 @@
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

diff --git a/dev/pyRevitLabs/pyRevitLabs.TargetApps.Navisworks/pyRevitLabs.TargetApps.Navisworks.csproj b/dev/pyRevitLabs/pyRevitLabs.TargetApps.Navisworks/pyRevitLabs.TargetApps.Navisworks.csproj
@@ -27,9 +27,11 @@
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

diff --git a/dev/pyRevitLabs/pyRevitLabs.TargetApps.Revit/Properties/AssemblyInfo.cs b/dev/pyRevitLabs/pyRevitLabs.TargetApps.Revit/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.8.8.0")]
-[assembly: AssemblyFileVersion("0.8.8.0")]
+[assembly: AssemblyVersion("0.8.9.0")]
+[assembly: AssemblyFileVersion("0.8.9.0")]
diff --git a/dev/pyRevitLabs/pyRevitLabs.TargetApps.Revit/RevitController.cs b/dev/pyRevitLabs/pyRevitLabs.TargetApps.Revit/RevitController.cs
@@ -421,6 +421,10 @@ public class RevitProduct {
             {"20181217_1515", ("19.2.0.65",     "2019.2 (Update)")},
             {"20190108_1515", ("19.2.1.1",      "2019.2 (Full Install)")}, // reported by: https://twitter.com/JarodJSchultz/status/1100459171491676160
             {"20190225_1515", ("19.2.10.7",     "2019.2.1")}, // release notes https://up.autodesk.com/2019/RVT/Autodesk_Revit_2019_2_1_Readme.html
+
+            // 2020
+            {"20190327_2315", ("20.0.0.377",    "2020 First Customer Ship")},
+            {"20190412_1200", ("20.0.1.2",      "2020.0.1")},
         };
 
         private static Regex BuildNumberFinder = new Regex(@".*(?<build>\d{8}_\d{4}).*");

diff --git a/dev/pyRevitLabs/pyRevitLabs.TargetApps.Revit/pyRevitLabs.TargetApps.Revit.csproj b/dev/pyRevitLabs/pyRevitLabs.TargetApps.Revit/pyRevitLabs.TargetApps.Revit.csproj
@@ -29,9 +29,11 @@
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -40,12 +42,10 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="RevitAPI">
-      <HintPath>..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2019\RevitAPI.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2020\RevitAPI.dll</HintPath>
     </Reference>
     <Reference Include="RevitAPIUI">
-      <HintPath>..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2019\RevitAPIUI.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2020\RevitAPIUI.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/dev/pyRevitLabs/pyRevitManager/Properties/AssemblyInfo.cs b/dev/pyRevitLabs/pyRevitManager/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.7.0")]
-[assembly: AssemblyFileVersion("0.9.7.0")]
+[assembly: AssemblyVersion("0.9.8.0")]
+[assembly: AssemblyFileVersion("0.9.8.0")]
diff --git a/dev/pyRevitLabs/pyRevitManager/pyRevitManager.csproj b/dev/pyRevitLabs/pyRevitManager/pyRevitManager.csproj
@@ -44,11 +44,12 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -132,19 +133,26 @@
     <ProjectReference Include="..\pyRevitLabs.CommonCLI\pyRevitLabs.CommonCLI.csproj">
       <Project>{614720ba-c0e3-4199-9a5e-d2468ffcbfe5}</Project>
       <Name>pyRevitLabs.CommonCLI</Name>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\pyRevitLabs.Common\pyRevitLabs.Common.csproj">
       <Project>{c5a03112-6ee1-415f-b53d-5d732d9f47ad}</Project>
       <Name>pyRevitLabs.Common</Name>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\pyRevitLabs.Language\pyRevitLabs.Language.csproj">
       <Project>{269fe01f-093a-4774-8017-fefc2342abf5}</Project>
       <Name>pyRevitLabs.Language</Name>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\pyRevitLabs.TargetApps.Revit\pyRevitLabs.TargetApps.Revit.csproj">
       <Project>{ed0fb7a2-e4a8-4490-a020-73140bfbce0b}</Project>
       <Name>pyRevitLabs.TargetApps.Revit</Name>
       <Private>False</Private>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -172,6 +180,9 @@
     <PackageReference Include="Expression.Blend.Sdk">
       <Version>1.0.2</Version>
     </PackageReference>
+    <PackageReference Include="LibGit2Sharp">
+      <Version>0.25.4</Version>
+    </PackageReference>
     <PackageReference Include="NETStandard.Library">
       <Version>2.0.3</Version>
     </PackageReference>
@@ -186,9 +197,9 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy "$(TargetDir)lib\win32\x64\git2-8e0b172.dll" "$(TargetDir)git2-8e0b172.dll"
+    <PostBuildEvent>copy "$(TargetDir)lib\win32\x64\git2-4aecb64.dll" "$(TargetDir)git2-4aecb64.dll"
 rd /S /Q "$(TargetDir)lib"
-REM del /Q "$(TargetDir)*.pdb"
+del /Q "$(TargetDir)*.pdb"
 REM del /Q "$(TargetDir)*.config"
 REM del /Q "$(TargetDir)*.xml"
 signtool sign /n "Ehsan Iran Nejad" /t http://timestamp.digicert.com /fd sha256 "$(TargetPath)"</PostBuildEvent>

diff --git a/dev/pyRevitLabs/pyRevitUpdater/pyRevitUpdater.csproj b/dev/pyRevitLabs/pyRevitUpdater/pyRevitUpdater.csproj
@@ -40,13 +40,15 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>pyRevit.ico</ApplicationIcon>

diff --git a/.../pyRevitCore.extension/pyRevit.tab/pyRevit.panel/Settings.smartbutton/SettingsWindow.xaml b/.../pyRevitCore.extension/pyRevit.tab/pyRevit.panel/Settings.smartbutton/SettingsWindow.xaml
@@ -375,6 +375,9 @@
                             Revit versions from here. This effectively removes the
                             pyRevit.addin manifest file from %appdata%/Autodesk/Revit/Addins folders.
                         </TextBlock>
+                        <CheckBox x:Name="revit2020_cb" Style="{StaticResource RevitCheckbox}" Margin="0,10,0,0" IsChecked="False" IsEnabled="False">
+                            Autodesk Revit 2020
+                        </CheckBox>
                         <CheckBox x:Name="revit2019_cb" Style="{StaticResource RevitCheckbox}" Margin="0,10,0,0" IsChecked="False" IsEnabled="False">
                             Autodesk Revit 2019
                         </CheckBox>

diff --git a/extensions/pyRevitCore.extension/pyRevit.tab/pyRevit.panel/Settings.smartbutton/script.py b/extensions/pyRevitCore.extension/pyRevit.tab/pyRevit.panel/Settings.smartbutton/script.py
@@ -80,7 +80,8 @@ def __init__(self, xaml_file_name):
                                    '2016': self.revit2016_cb,
                                    '2017': self.revit2017_cb,
                                    '2018': self.revit2018_cb,
-                                   '2019': self.revit2019_cb}
+                                   '2019': self.revit2019_cb,
+                                   '2020': self.revit2020_cb}
 
         self.set_image_source(self.lognone, 'lognone.png')
         self.set_image_source(self.logverbose, 'logverbose.png')

diff --git a/...Analysis.panel/Tools.stack2/Inspect.pulldown/Find Referencing Sheets.pushbutton/script.py b/...Analysis.panel/Tools.stack2/Inspect.pulldown/Find Referencing Sheets.pushbutton/script.py
@@ -1,36 +1,35 @@
+"""Find all sheets referencing the current view.
+Especially useful for finding legends.
+"""
+#pylint: disable=import-error,invalid-name,broad-except
 from pyrevit import revit, DB
+from pyrevit import forms
+from pyrevit import script
 
+__author__ = "{{author}}"
 
-__doc__ = 'Find all sheets referencing the current view.'\
-          ' Especially useful for finding legends.'
-
-
-cl_views = DB.FilteredElementCollector(revit.doc)
-shts = cl_views.OfCategory(DB.BuiltInCategory.OST_Sheets)\
-               .WhereElementIsNotElementType()\
-               .ToElements()
-
-sheets = sorted(shts, key=lambda x: x.SheetNumber)
+output = script.get_output()
 
 curview = revit.activeview
 count = 0
 
-print('Searching All Sheets for {0} ID:{1}\n'.format(curview.Name, curview.Id))
-for s in sheets:
-    vpsIds = [revit.doc.GetElement(x).ViewId for x in s.GetAllViewports()]
+
+print('Searching All Sheets for {} {}\n'
+      .format(curview.Name, output.linkify(curview.Id)))
+
+for sheet in revit.query.get_sheets(include_placeholders=False):
+    vps_ids = [revit.doc.GetElement(x).ViewId for x in sheet.GetAllViewports()]
     curviewelements = DB.FilteredElementCollector(revit.doc)\
-                        .OwnedByView(s.Id)\
+                        .OwnedByView(sheet.Id)\
                         .WhereElementIsNotElementType()\
                         .ToElements()
 
     for el in curviewelements:
         if isinstance(el, DB.ScheduleSheetInstance):
-            vpsIds.append(el.ScheduleId)
+            vps_ids.append(el.ScheduleId)
 
-    if curview.Id in vpsIds:
+    if curview.Id in vps_ids:
         count += 1
-        print('NUMBER: {0}   NAME:{1}'
-              .format(s.Parameter[DB.BuiltInParameter.SHEET_NUMBER].AsString().rjust(10),
-                      s.Parameter[DB.BuiltInParameter.SHEET_NAME].AsString().ljust(50)))
+        revit.report.print_sheet(sheet)
 
 print('\n\nView is referenced on {0} sheets.'.format(count))
diff --git a/...ns/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/Keynotes.pushbutton/keynotesdb.py b/...ns/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/Keynotes.pushbutton/keynotesdb.py
@@ -363,9 +363,14 @@ def get_keynotes_tree(conn):
 
     for catroot_rkey in keynote_records:
         if catroot_rkey.key in parents:
-            catroot_rkey.children.extend(parents[catroot_rkey.key])
+            catroot_rkey.children.extend(
+                natsorted(
+                    parents[catroot_rkey.key],
+                    key=lambda x: x.key
+                )
+            )
 
-    return sorted(cat_roots, key=lambda x: x.key)
+    return natsorted(cat_roots, key=lambda x: x.key)
 
 
 def find(conn, key):

diff --git a/...tension/pyRevit.tab/Drawing Set.panel/Sheets.pulldown/ReOrder Sheets.pushbutton/script.py b/...tension/pyRevit.tab/Drawing Set.panel/Sheets.pulldown/ReOrder Sheets.pushbutton/script.py
@@ -37,7 +37,7 @@ def __init__(self, xaml_file_name):
 
     @property
     def items_list(self):
-        return self.items_dg.ItemsSource
+        return self.items_dg.ItemsSource or []
 
     @items_list.setter
     def items_list(self, value):

diff --git a/...t.panel/views.stack3/Views.pulldown/Create Parallel Section.pushbutton/icon.png b/...t.panel/views.stack3/Views.pulldown/Create Parallel Section.pushbutton/icon.png