Skip to content

RevitParamsChecker: Обновлен UI #441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dosymep merged 7 commits into from
May 13, 2026
Merged

RevitParamsChecker: Обновлен UI #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c293b8e
Переставить группировку по chunk в конец
vlastroG May 12, 2026
33a48d6
Скорректировать столбцы в анализе
vlastroG May 12, 2026
2091325
Скорректировать стиль сообщения о сохранении
vlastroG May 12, 2026
b205c0e
Сделать панель страниц сверху
vlastroG May 12, 2026
248ff6e
Скорректировать margin и размер текста заголовка page
vlastroG May 12, 2026
fc69699
Заменить цвет текста заголовков в datagrid на LabelForeground
vlastroG May 13, 2026
009e21a
Сделать иконку экспандера слева
vlastroG May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/RevitParamsChecker/Resources/CustomDataGrid.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@
x:Key="CustomDataGridColumnHeaderStyle"
BasedOn="{StaticResource DefaultUiDataGridColumnHeaderStyle}"
TargetType="DataGridColumnHeader">
<Setter
Property="Foreground"
Value="{DynamicResource LabelForeground}" />
<Setter
Property="Template">
<Setter.Value>
Expand Down
20 changes: 10 additions & 10 deletions src/RevitParamsChecker/Resources/CustomExpanderStyle.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,25 +54,25 @@
Background="Transparent">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition
Width="*" />
<ColumnDefinition
Width="Auto" />
<ColumnDefinition
Width="*" />
</Grid.ColumnDefinitions>
<ContentPresenter
x:Name="ContentPresenter"
Grid.Column="0"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding Content}" />
<ui:SymbolIcon
x:Name="ControlChevronIcon"
Grid.Column="1"
Margin="0"
Grid.Column="0"
Margin="0 0 8 0"
VerticalAlignment="Center"
FontSize="16"
Foreground="{TemplateBinding Foreground}"
Symbol="ChevronDown24" />
<ContentPresenter
x:Name="ContentPresenter"
Grid.Column="1"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding Content}" />
</Grid>
</Border>
</ControlTemplate>
Expand Down
9 changes: 4 additions & 5 deletions src/RevitParamsChecker/ViewModels/Results/CheckResultViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ internal class CheckResultViewModel : BaseViewModel {
private readonly DelayAction _refreshViewDelay;
private readonly RevitRepository _revitRepo;
private readonly ObservableCollection<ElementResultViewModel> _allElementResults;
private readonly PropertyGroupDescription _defaultGroupDescription;
private readonly PropertyGroupDescription _chunkGroupDescription;
private string _elementsFilter;
private ElementResultViewModel _selectedElementResult;
private RuleViewModel _selectedRuleStamp;
Expand All @@ -47,13 +47,13 @@ public CheckResultViewModel(ILocalizationService localization, CheckResult check
_refreshViewDelay = new DelayAction(300, () => ElementResults.View.Refresh());
var availableProperties = GetEditableGroupProperties(_localization);
GroupingProperties = new GroupDescriptionsViewModel(availableProperties, [availableProperties.First()]);
_defaultGroupDescription = new PropertyGroupDescription(nameof(ElementResultViewModel.ChunkName));
_chunkGroupDescription = new PropertyGroupDescription(nameof(ElementResultViewModel.ChunkName));
if(_allElementResults.Count <= _chunkSize) {
ResetGrouping(ElementResults, [availableProperties.First().PropertyGroupDescription]);
} else {
ResetGrouping(
ElementResults,
[_defaultGroupDescription, availableProperties.First().PropertyGroupDescription]);
[availableProperties.First().PropertyGroupDescription, _chunkGroupDescription]);
}

PropertyChanged += ElementsFilterPropertyChanged;
Expand Down Expand Up @@ -121,7 +121,6 @@ private void ElementResultsFilterHandler(object sender, FilterEventArgs e) {
|| result.RuleName?.IndexOf(filter, StringComparison.CurrentCultureIgnoreCase) >= 0
|| result.Status?.IndexOf(filter, StringComparison.CurrentCultureIgnoreCase) >= 0
|| result.Error?.IndexOf(filter, StringComparison.CurrentCultureIgnoreCase) >= 0
|| result.UserMark?.IndexOf(filter, StringComparison.CurrentCultureIgnoreCase) >= 0
|| result.CategoryName?.IndexOf(filter, StringComparison.CurrentCultureIgnoreCase) >= 0;
}
}
Expand Down Expand Up @@ -196,7 +195,7 @@ private void RegroupElements() {
if(_allElementResults.Count <= _chunkSize) {
ResetGrouping(ElementResults, groups);
} else {
ResetGrouping(ElementResults, [_defaultGroupDescription, .. groups]);
ResetGrouping(ElementResults, [.. groups, _chunkGroupDescription]);
}
}
}
6 changes: 0 additions & 6 deletions src/RevitParamsChecker/ViewModels/Results/ElementResultViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ internal class ElementResultViewModel : BaseViewModel {
private readonly ILocalizationService _localization;
private string _chunkName;
private int _itemNumber;
private string _userMark;

public ElementResultViewModel(ILocalizationService localization, ElementResult elementResult) {
_localization = localization ?? throw new ArgumentNullException(nameof(localization));
Expand All @@ -39,11 +38,6 @@ public int ItemNumber {
set => RaiseAndSetIfChanged(ref _itemNumber, value);
}

public string UserMark {
get => _userMark;
set => RaiseAndSetIfChanged(ref _userMark, value);
}

public string CategoryName { get; }

public string FileName { get; }
Expand Down
2 changes: 1 addition & 1 deletion src/RevitParamsChecker/Views/Controls/EditableListControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<DataTemplate>
<DockPanel
Height="20"
Margin="10 4"
Margin="8 4"
VerticalAlignment="Center">
<ui:TextBlock
VerticalAlignment="Center"
Expand Down
5 changes: 3 additions & 2 deletions src/RevitParamsChecker/Views/Controls/PageMenuControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,14 @@
ToolTip="{me:LocalizationSource PageMenu.Tooltip.Export}"
Command="{Binding ExportButtonCommand, ElementName=_this}"
Content="{ui:SymbolIcon Symbol=ArrowExportUp20}" />
<Label
<ui:TextBlock
Margin="8 0 0 0"
VerticalAlignment="Center"
Padding="0"
FontWeight="Bold"
FontSize="{DynamicResource ControlContentThemeFontSize}"
Visibility="{Binding ShowSaveChangesPrompt, ElementName=_this, Converter={StaticResource BoolToVisibilityConverter}}"
Content="{me:LocalizationSource PageMenu.SaveChangesPrompt}" />
Text="{me:LocalizationSource PageMenu.SaveChangesPrompt}" />
<ui:TextBlock
Margin="8 0 0 0"
HorizontalAlignment="Left"
Expand Down
25 changes: 18 additions & 7 deletions src/RevitParamsChecker/Views/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
</i:Interaction.Behaviors>
<Grid>
<Grid.RowDefinitions>
<RowDefinition
Height="Auto" />
<RowDefinition
Height="*" />
<RowDefinition
Expand All @@ -57,12 +59,13 @@
Title="{me:LocalizationSource MainWindow.Title}" />

<ui:NavigationView
Grid.Row="0"
Grid.Row="1"
x:Name="_rootNavigationView"
FrameMargin="0"
Margin="8 0"
OpenPaneLength="200"
IsPaneOpen="True"
PaneDisplayMode="Left"
PaneDisplayMode="Top"
IsBackButtonVisible="Visible"
IsPaneVisible="True"
IsPaneToggleVisible="True"
Expand All @@ -71,9 +74,17 @@

<ui:NavigationView.Header>
<StackPanel
Margin="42 20 42 20">
Margin="4 8 0 8">
<ui:BreadcrumbBar
x:Name="_breadcrumbBar" />
x:Name="_breadcrumbBar">
<ui:BreadcrumbBar.ItemTemplate>
<DataTemplate>
<ui:TextBlock
FontTypography="Subtitle"
Text="{Binding Content}" />
</DataTemplate>
</ui:BreadcrumbBar.ItemTemplate>
</ui:BreadcrumbBar>
</StackPanel>
</ui:NavigationView.Header>

Expand Down Expand Up @@ -106,18 +117,18 @@
x:Name="_rootContentDialog" />

<StackPanel
Grid.Row="1"
Grid.Row="2"
Orientation="Horizontal"
HorizontalAlignment="Right">

<ui:TextBlock
Margin="10"
Margin="8"
Foreground="Orange"
VerticalAlignment="Center"
Text="{Binding ErrorText}" />

<ui:Button
Margin="10"
Margin="8"
Width="80"
Content="{me:LocalizationSource Close}"
IsCancel="True"
Expand Down
29 changes: 4 additions & 25 deletions src/RevitParamsChecker/Views/Results/CheckResultControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,16 +157,6 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>

<DataGridTextColumn
MinWidth="50"
Width="150"
IsReadOnly="True"
Binding="{Binding FileName}">
<DataGridTextColumn.Header>
<ui:TextBlock
Text="{DynamicResource ResultsPage.FileNameHeader}" />
</DataGridTextColumn.Header>
</DataGridTextColumn>
<DataGridTextColumn
MinWidth="50"
Width="150"
Expand All @@ -189,17 +179,6 @@
</DataGridTextColumn.Header>
</DataGridTextColumn>

<DataGridTextColumn
MinWidth="50"
Width="150"
IsReadOnly="True"
Binding="{Binding RuleName}">
<DataGridTextColumn.Header>
<ui:TextBlock
Text="{DynamicResource ResultsPage.RuleNameHeader}" />
</DataGridTextColumn.Header>
</DataGridTextColumn>

<DataGridTextColumn
MinWidth="50"
Width="Auto"
Expand All @@ -210,14 +189,14 @@
Text="{DynamicResource ResultsPage.StatusHeader}" />
</DataGridTextColumn.Header>
</DataGridTextColumn>

<DataGridTextColumn
MinWidth="50"
Width="100"
Binding="{Binding UserMark, UpdateSourceTrigger=PropertyChanged}">
Width="150"
IsReadOnly="True"
Binding="{Binding FileName}">
<DataGridTextColumn.Header>
<ui:TextBlock
Text="{DynamicResource ResultsPage.UserMarkHeader}" />
Text="{DynamicResource ResultsPage.FileNameHeader}" />
</DataGridTextColumn.Header>
</DataGridTextColumn>
</ui:DataGrid.Columns>
Expand Down
2 changes: 1 addition & 1 deletion src/RevitParamsChecker/Views/Results/CheckResultsListControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<DataTemplate>
<DockPanel
Height="20"
Margin="10 4"
Margin="8 4"
VerticalAlignment="Center">
<ui:TextBlock
VerticalAlignment="Center"
Expand Down
10 changes: 5 additions & 5 deletions src/RevitParamsChecker/Views/Utils/NameEditorWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@

<DockPanel
Grid.Row="1"
Margin="10 0"
Margin="8 0"
LastChildFill="True">
<Label
DockPanel.Dock="Left"
VerticalAlignment="Center"
Margin="10 0"
Margin="8 0"
FontSize="{DynamicResource ControlContentThemeFontSize}"
Content="{me:LocalizationSource NameEditor.Label}" />
<ui:TextBox
Expand All @@ -65,19 +65,19 @@
Orientation="Horizontal"
HorizontalAlignment="Right">
<ui:TextBlock
Margin="10"
Margin="8"
Text="{Binding ErrorText}"
Style="{StaticResource CustomErrorText}" />
<ui:Button
Width="80"
Margin="10"
Margin="8"
IsDefault="True"
Appearance="Info"
Click="ButtonOk_Click"
Content="{me:LocalizationSource Ok}"
Command="{Binding Create}" />
<ui:Button
Margin="10"
Margin="8"
Width="80"
IsCancel="true"
Click="ButtonCancel_Click"
Expand Down
Loading