From ca47896204482bf4a6979e3838bf7f09f61cebeb Mon Sep 17 00:00:00 2001
From: giy <giy@omp-system.ru>
Date: Fri, 02 Sep 2022 14:16:56 +0300
Subject: [PATCH] Обновление до версии 2.9.0
---
QtVsTools.Package/Options/QtVersionsTable.xaml | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/QtVsTools.Package/Options/QtVersionsTable.xaml b/QtVsTools.Package/Options/QtVersionsTable.xaml
index 1b147ff..9f85dc3 100644
--- a/QtVsTools.Package/Options/QtVersionsTable.xaml
+++ b/QtVsTools.Package/Options/QtVersionsTable.xaml
@@ -1,7 +1,7 @@
<!--
/****************************************************************************
**
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt VS Tools.
@@ -32,7 +32,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:local="clr-namespace:QtVsTools.Options"
mc:Ignorable="d"
d:DesignHeight="450"
d:DesignWidth="800">
@@ -58,7 +57,13 @@
Color="Transparent" />
<SolidColorBrush x:Key="{x:Static SystemColors.ControlBrushKey}"
Color="Transparent" />
+ <BooleanToVisibilityConverter x:Key="b2v" />
</DataGrid.Resources>
+ <DataGrid.RowStyle>
+ <Style TargetType="{x:Type DataGridRow}">
+ <Setter Property="Visibility" Value="{Binding RowVisible, Converter={StaticResource b2v}}"/>
+ </Style>
+ </DataGrid.RowStyle>
<DataGrid.CellStyle>
<Style TargetType="DataGridCell">
<Setter Property="BorderThickness"
@@ -76,8 +81,7 @@
<CheckBox x:Name="IsDefault"
IsChecked="{Binding IsDefault}"
Focusable="{Binding DefaultEnabled}"
- IsHitTestVisible="{Binding DefaultEnabled}"
- Visibility="{Binding RowVisibility}"
+ Visibility="{Binding RowContentVisibility}"
BorderThickness="1"
Background="Transparent"
VerticalAlignment="Center"
@@ -94,7 +98,7 @@
<!--//// Name ////-->
<Grid>
<Button Cursor="Hand"
- Visibility="{Binding RowVisibility}"
+ Visibility="{Binding RowContentVisibility}"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Click="Remove_Click">
@@ -153,7 +157,7 @@
</Button>
<TextBox x:Name="VersionName"
Text="{Binding VersionName}"
- Visibility="{Binding RowVisibility}"
+ Visibility="{Binding RowContentVisibility}"
IsEnabled="{Binding NameEnabled}"
FontWeight="{Binding FontWeight}"
Margin="20,4,2,4"
@@ -166,7 +170,7 @@
LostFocus="Control_LostFocus"
TextChanged="TextBox_TextChanged"
SelectionChanged="TextBox_SelectionChanged"
- ToolTip="{Binding FieldName.ToolTip}">
+ ToolTip="{Binding FieldVersionName.ToolTip}">
<TextBox.Resources>
<SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}"
Color="LimeGreen" />
@@ -181,7 +185,7 @@
<DataTemplate>
<!--//// Host ////-->
<ComboBox x:Name="Host"
- Visibility="{Binding RowVisibility}"
+ Visibility="{Binding RowContentVisibility}"
IsEditable="True"
IsReadOnly="True"
BorderThickness="0"
@@ -233,7 +237,7 @@
</Button>
<TextBox x:Name="Path"
Text="{Binding Path}"
- Visibility="{Binding RowVisibility}"
+ Visibility="{Binding RowContentVisibility}"
BorderThickness="0"
Background="Transparent"
Margin="{Binding PathMargin}"
@@ -260,7 +264,7 @@
<!--//// Compiler ////-->
<TextBox x:Name="Compiler"
Text="{Binding Compiler}"
- Visibility="{Binding RowVisibility}"
+ Visibility="{Binding RowContentVisibility}"
IsEnabled="{Binding CompilerEnabled}"
BorderThickness="0"
Background="Transparent"
--
Gitblit v1.9.1