Skip to content

Commit cf4bcf2

Browse files
thumDerthumDer
committed
Merge branch 'develop' of https://github.com/pyrevitlabs/pyRevit into develop
2 parents 12be564 + 6421f8d commit cf4bcf2

File tree

13 files changed

+282
-92
lines changed

13 files changed

+282
-92
lines changed

‎.github/workflows/main.yml‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -79,35 +79,6 @@ jobs:
7979
if: (github.repository == env.MainRepo)
8080
uses: fregante/setup-git-user@v2
8181

82-
- name: Download/Install Inno Setup
83-
run: |
84-
echo "Checking pre-installation..."
85-
86-
set "ISCC_PATH=%programfiles(x86)%\Inno Setup 6\ISCC.exe"
87-
88-
if exist "%ISCC_PATH%" (
89-
echo ::warning::Inno Setup is already installed
90-
exit /b 0
91-
)
92-
93-
echo "Downloading Inno Setup..."
94-
95-
set "_url_=https://jrsoftware.org/download.php/is.exe?site=1"
96-
set "_file_=innosetup.exe"
97-
98-
curl -L -o "%tmp%\%_file_%" "%_url_%"
99-
100-
echo "Installing Inno Setup..."
101-
"%tmp%\%_file_%" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
102-
103-
if not exist "%ISCC_PATH%" (
104-
echo "::error::Inno Setup installation failed"
105-
exit 1
106-
)
107-
108-
echo ::warning::Inno Setup installed successfully!
109-
shell: cmd
110-
11182
- name: Check Build Environment
11283
if: (github.repository == env.MainRepo)
11384
run: pipenv run pyrevit check

‎dev/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</PropertyGroup>
2020

2121
<PropertyGroup>
22-
<Version>5.2.0.25181+1425</Version>
22+
<Version>5.3.0.25307+2146</Version>
2323
<Copyright>Copyright © 2014-2025</Copyright>
2424
<Company>pyRevitLabs.io</Company>
2525
</PropertyGroup>

‎extensions/pyRevitTools.extension/pyRevit.tab/Drawing Set.panel/Print Sheets.pushbutton/PrintSheets.xaml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
Title="Print Sheets" Height="800" Width="1000" ShowInTaskbar="False" ResizeMode="CanResizeWithGrip"
3+
Title="Print Sheets" Height="800" Width="1500" ShowInTaskbar="False" ResizeMode="CanResizeWithGrip"
44
WindowStartupLocation="CenterScreen" HorizontalContentAlignment="Center">
55
<Window.Resources>
66
<SolidColorBrush x:Key="RevBGColor" Color="#FFEEEEEE"/>
@@ -37,13 +37,13 @@
3737
<DataTemplate x:Key="RevisionCell">
3838
<StackPanel x:Name="revinfo" VerticalAlignment="Center" Orientation="Horizontal">
3939
<Border Background="{StaticResource RevBGColor}" CornerRadius="3,0,0,3" MinWidth="16" Margin="2,2,0,2" Padding="5,0,5,0">
40-
<TextBlock Text="{Binding revision.number}" Foreground="Black" VerticalAlignment="Center" HorizontalAlignment="Center"/>
40+
<TextBlock Text="{Binding revision.date}" Foreground="Black" VerticalAlignment="Center" HorizontalAlignment="Center"/>
4141
</Border>
4242
<Border Background="{StaticResource RevBGColor}" MinWidth="16" Margin="0,2,0,2" Padding="5,0,5,0" BorderBrush="LightGray" BorderThickness="1,0,1,0">
43-
<TextBlock Text="{Binding revision.desc}" Foreground="Black" VerticalAlignment="Center" HorizontalAlignment="Left"/>
43+
<TextBlock Text="{Binding revision.number}" Foreground="Black" VerticalAlignment="Center" HorizontalAlignment="Left"/>
4444
</Border>
4545
<Border Background="{StaticResource RevBGColor}" CornerRadius="0,3,3,0" MinWidth="16" Padding="5,0,5,0" Margin="0,2,0,2">
46-
<TextBlock Text="{Binding revision.date}" Foreground="Black" VerticalAlignment="Center" HorizontalAlignment="Left"/>
46+
<TextBlock Text="{Binding revision.desc}" Foreground="Black" VerticalAlignment="Center" HorizontalAlignment="Left"/>
4747
</Border>
4848
</StackPanel>
4949
<DataTemplate.Triggers>
@@ -179,7 +179,10 @@
179179
<GroupBox Header="Sheet Printing" Grid.Column="1" Margin="0,10,5,0" Padding="8">
180180
<DockPanel>
181181
<StackPanel DockPanel.Dock="Left">
182-
<CheckBox x:Name="combine_cb" DockPanel.Dock="Right" Margin="0,0,0,10" IsChecked="False" IsEnabled="True" Checked="options_changed" Unchecked="options_changed">Combine Into One PDF</CheckBox>
182+
<StackPanel Orientation="Horizontal" Margin="0,0,0,10">
183+
<CheckBox x:Name="combine_cb" DockPanel.Dock="Right" Margin="0,0,50,0" IsChecked="False" IsEnabled="True" Checked="options_changed" Unchecked="options_changed">Combine Into One PDF</CheckBox>
184+
<CheckBox x:Name="export_dwg" DockPanel.Dock="Right" Margin="0,0,0,0" IsChecked="False" IsEnabled="True" Checked="options_changed" Unchecked="options_changed">Export DWG</CheckBox>
185+
</StackPanel>
183186
<DockPanel x:Name="namingformat_dp" Margin="0,5,0,0" Height="24" >
184187
<TextBlock Text="Naming Format" VerticalAlignment="Center" Margin="0,0,10,0"/>
185188
<Button Content="Edit Formats" DockPanel.Dock="Right" Width="100" BorderThickness="0,1,1,1" BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Click="edit_formats"/>
@@ -263,9 +266,9 @@
263266
<DataGrid.Columns>
264267
<DataGridTextColumn Header="Print Index" Binding="{Binding print_index}" MinWidth="70" Width="70" IsReadOnly="True" CellStyle="{StaticResource IndexColumnStyle}"/>
265268
<DataGridTextColumn Header="Sheet Number" Binding="{Binding number}" MinWidth="100" Width="100" IsReadOnly="True" CellStyle="{StaticResource DefaultColumnStyle}"/>
266-
<DataGridTextColumn Header="Sheet Name" Binding="{Binding name}" MinWidth="50" Width="2*" IsReadOnly="True" CellStyle="{StaticResource DefaultColumnStyle}"/>
267-
<DataGridTemplateColumn Header="Sheet Revision" MinWidth="50" Width="1*" IsReadOnly="True"
268-
CellTemplate="{StaticResource RevisionCell}" SortMemberPath="revision.number" />
269+
<DataGridTextColumn Header="Sheet Name" Binding="{Binding name}" MinWidth="400" Width="400" IsReadOnly="True" CellStyle="{StaticResource DefaultColumnStyle}"/>
270+
<DataGridTemplateColumn Header="Sheet Revision (Sort By Date)" MinWidth="50" Width="1*" IsReadOnly="True"
271+
CellTemplate="{StaticResource RevisionCell}" SortMemberPath="revision_date_sortable" />
269272
<DataGridTemplateColumn x:Name="psettingcol" Header="Print Setting" MinWidth="50" Width="*" IsReadOnly="True" CellTemplate="{StaticResource PrintSettingCell}" Visibility="Collapsed"/>
270273
<DataGridTextColumn x:Name="pfilename" Header="File Name" FontFamily="Consolas" Binding="{Binding print_filename}" MinWidth="50" Width="2*" IsReadOnly="True" CellStyle="{StaticResource DefaultColumnStyle}" Visibility="Collapsed"/>
271274
</DataGrid.Columns>

0 commit comments

Comments
 (0)