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/Package/QtHelpLinkChooser.xaml | 60 ++++++++++++++++++++++++------------------------------------
1 files changed, 24 insertions(+), 36 deletions(-)
diff --git a/QtVsTools.Package/Package/QtHelpLinkChooser.xaml b/QtVsTools.Package/Package/QtHelpLinkChooser.xaml
index d901292..adfa3d6 100644
--- a/QtVsTools.Package/Package/QtHelpLinkChooser.xaml
+++ b/QtVsTools.Package/Package/QtHelpLinkChooser.xaml
@@ -1,7 +1,7 @@
<!--
*****************************************************************************
**
- ** Copyright (C) 2016 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.
@@ -28,33 +28,31 @@
*****************************************************************************
-->
-<local:VsToolsDialogWindow x:Class="QtVsTools.QtHelpLinkChooser"
- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:local="clr-namespace:QtVsTools"
- Width="400"
- Height="250"
- MinWidth="400"
- MinHeight="250"
- mc:Ignorable="d"
- Title="Choose Topic"
- ShowInTaskbar="False"
- HasHelpButton="False"
- HasMinimizeButton="False"
- ResizeMode="CanResizeWithGrip"
- WindowStartupLocation="CenterOwner">
- <local:VsToolsDialogWindow.Resources>
- <BooleanToVisibilityConverter x:Key="b2v" />
+<vsui:DialogWindow x:Class="QtVsTools.QtHelpLinkChooser"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:vsui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
+ Width="400"
+ Height="250"
+ MinWidth="400"
+ MinHeight="250"
+ mc:Ignorable="d"
+ Title="Choose Topic"
+ ShowInTaskbar="False"
+ HasHelpButton="False"
+ HasMinimizeButton="False"
+ ResizeMode="CanResizeWithGrip"
+ WindowStartupLocation="CenterOwner">
+ <vsui:DialogWindow.Resources>
<Style x:Key="ListBoxDoubleClickStyle"
TargetType="ListBoxItem">
<EventSetter Event="MouseDoubleClick"
Handler="OnListBoxItem_DoubleClick" />
</Style>
- </local:VsToolsDialogWindow.Resources>
- <Grid Margin="10"
- FocusManager.FocusedElement="{Binding ElementName=searchBox}">
+ </vsui:DialogWindow.Resources>
+ <Grid Margin="10">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
@@ -68,18 +66,8 @@
Text="{Binding Path=Keyword}" />
<Run Text=":" />
</TextBlock>
- <Grid Grid.Row="1"
- MinHeight="22"
- Background="White">
- <TextBlock Text=" Filter..."
- Foreground="LightSteelBlue"
- VerticalAlignment="Center"
- Visibility="{Binding ElementName=searchBox,
- Path=Text.IsEmpty, Converter={StaticResource b2v}}" />
- <TextBox Name="searchBox"
- Background="Transparent"
- TextChanged="OnSearchBox_TextChanged"
- VerticalContentAlignment="Center" />
+ <Grid Grid.Row="1">
+ <Grid Name="searchControlHost" />
</Grid>
<ListBox Grid.Row="2"
Margin="0,10,0,0"
@@ -104,4 +92,4 @@
Margin="0,10,0,0" />
</StackPanel>
</Grid>
-</local:VsToolsDialogWindow>
+</vsui:DialogWindow>
--
Gitblit v1.9.1