ApplyTmTemplate -> button turns green when pressed

cold11 · Apr 22, 2019 · c098723 · c098723
1 parent 9862a2c
commit c098723
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 11 deletions.
diff --git a/ApplyTMTemplate/Sdl.Community.ApplyTMTemplate/PluginResources.Designer.cs b/ApplyTMTemplate/Sdl.Community.ApplyTMTemplate/PluginResources.Designer.cs
diff --git a/ApplyTMTemplate/Sdl.Community.ApplyTMTemplate/PluginResources.resx b/ApplyTMTemplate/Sdl.Community.ApplyTMTemplate/PluginResources.resx
@@ -235,6 +235,9 @@
   <data name="Browse_button_Tooltip" xml:space="preserve">
     <value>Choose a template...</value>
   </data>
+  <data name="DropDownTriangle" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>resources\dropdowntriangle.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="GreenDropDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\GreenDropDown.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

diff --git a/ApplyTMTemplate/Sdl.Community.ApplyTMTemplate/Resources/DropDownTriangle.ico b/ApplyTMTemplate/Sdl.Community.ApplyTMTemplate/Resources/DropDownTriangle.ico
diff --git a/ApplyTMTemplate/Sdl.Community.ApplyTMTemplate/Sdl.Community.ApplyTMTemplate.csproj b/ApplyTMTemplate/Sdl.Community.ApplyTMTemplate/Sdl.Community.ApplyTMTemplate.csproj
@@ -176,6 +176,7 @@
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\GreenDropDown.ico" />
+    <Resource Include="Resources\DropDownTriangle.ico" />
     <Resource Include="Resources\Error.ico" />
     <Resource Include="Resources\Download.ico" />
     <Resource Include="Resources\Question.ico" />

diff --git a/ApplyTMTemplate/Sdl.Community.ApplyTMTemplate/UI/MainWindow.xaml b/ApplyTMTemplate/Sdl.Community.ApplyTMTemplate/UI/MainWindow.xaml
@@ -25,9 +25,9 @@
 				<ResourceDictionary Source="../UiHelpers/ButtonsStyle.xaml" />
 				<ResourceDictionary Source="../UiHelpers/TextBlockStyle.xaml" />
 				<ResourceDictionary Source="../UiHelpers/TextBoxStyle.xaml" />
-				<ResourceDictionary Source="../UiHelpers/DataGridStyle.xaml" />
+				<ResourceDictionary Source="../UiHelpers/DataGridStyle.xaml"/>
+				<ResourceDictionary Source="../UiHelpers/DataGridStyle2.xaml"/>
 				<ResourceDictionary Source="../UiHelpers/Buttons.xaml" />
-				<ResourceDictionary Source="../UiHelpers/DataGridStyle2.xaml" />
 			</ResourceDictionary.MergedDictionaries>
 			<Style TargetType="Button" x:Key="SdlWizardStyleButton" BasedOn="{StaticResource SdlSecondaryButtonStyle}">
 				<Setter Property="MinWidth" Value="70"></Setter>
@@ -138,7 +138,7 @@
 			</DataGrid.RowStyle>
 
 			<DataGrid.Resources>
-				<Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource DgcHeaderStyle}" />
+				<Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource DgcHeaderStyle2}" />
 			</DataGrid.Resources>
 
 			<DataGrid.Columns>
@@ -187,7 +187,7 @@
 			</DataGrid.Columns>
 		</DataGrid>
 
-		<StackPanel Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Left" Orientation="Horizontal">
+		<StackPanel Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Left" Orientation="Horizontal">
 
 			<Button Margin="10,10,10,0" Style="{StaticResource SdlWizardStyleButtonGreen}" Command="{Binding ImportCommand}"
 			        IsEnabled="{Binding CanExecuteImport, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"

diff --git a/ApplyTMTemplate/Sdl.Community.ApplyTMTemplate/UI/TimedTextBox.xaml b/ApplyTMTemplate/Sdl.Community.ApplyTMTemplate/UI/TimedTextBox.xaml
@@ -7,19 +7,33 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
 	<UserControl.Resources>
-		<ResourceDictionary Source="../UiHelpers/TextBoxStyle.xaml"></ResourceDictionary>
+			<ControlTemplate x:Key="Unpressed">
+				<Image Source="../Resources/DropDownTriangle.ico"/>
+			</ControlTemplate>
+			<ControlTemplate x:Key="Pressed">
+				<Image Source="../Resources/GreenDropDown.ico"/>
+			</ControlTemplate>
 	</UserControl.Resources>
 	<Border BorderBrush="Black"
 	        BorderThickness="1"
 	        VerticalAlignment="Center"
-	        CornerRadius="5"
 	        Height="32">
 		<DockPanel>
-			<Button DockPanel.Dock="Right"
-			        Height="20"
+			<Button Name="Button" DockPanel.Dock="Right"
+			        Height="15"
 			        Background="White" BorderBrush="White"
-			        Command="{Binding Command}">
-				<Image DockPanel.Dock="Right" Source="../Resources/GreenDropDown.ico"></Image>
+			        Command="{Binding Command}"
+			        Margin="0,0,8,0">
+				<Button.Style>
+					<Style TargetType="{x:Type Button}">
+						<Setter Property="Template" Value="{StaticResource Unpressed}"/>
+						<Style.Triggers>
+							<Trigger Property="IsPressed" Value="True">
+								<Setter Property="Template" Value="{StaticResource Pressed}"/>
+							</Trigger>
+						</Style.Triggers>
+					</Style>
+				</Button.Style>
 			</Button>
 			<TextBox BorderBrush="White"
 					 VerticalAlignment="Center" VerticalContentAlignment="Center"

diff --git a/ApplyTMTemplate/Sdl.Community.ApplyTMTemplate/UiHelpers/DataGridStyle2.xaml b/ApplyTMTemplate/Sdl.Community.ApplyTMTemplate/UiHelpers/DataGridStyle2.xaml
@@ -5,7 +5,7 @@
 		<Setter Property="ColumnHeaderStyle" Value="{DynamicResource DgcHeaderStyle}" />
 	</Style>
 
-	<Style x:Key="DgcHeaderStyle" TargetType="DataGridColumnHeader">
+	<Style x:Key="DgcHeaderStyle2" TargetType="DataGridColumnHeader">
 		<Setter Property="Height" Value="30" />
 		<Setter Property="Background" Value="#3EA691" />
 		<Setter Property="Foreground" Value="White" />