Permalink
Browse files

Apply WPF style changes donated by Nick Harewood

Prevent Installer from being built in debug mode.
  • Loading branch information...
1 parent 276c9b6 commit d2d0763819247bcfbea6637571e0a67d44331434 @HowardvanRooijen HowardvanRooijen committed Sep 28, 2010
@@ -6,13 +6,13 @@
xmlns:tb="clr-namespace:Hardcodet.Wpf.TaskbarNotification;assembly=Hardcodet.Wpf.TaskbarNotification" Title="Templify - powered by endjin"
Background="{DynamicResource WindowBackgroundBrush}"
Icon="/Resources/app-icon.ico"
- Width="300"
- Height="220"
+ Width="360"
+ Height="260"
mc:Ignorable="d">
<Window.Resources>
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
</Window.Resources>
- <StackPanel>
+ <StackPanel Margin="10">
<tb:TaskbarIcon
x:Name="NotifyIcon"
IconSource="/Resources/app-icon.ico"
@@ -29,57 +29,73 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
- <Label Grid.Row="0" Grid.Column="0" Width="Auto">Name</Label>
+ <Label Grid.Row="0" Grid.Column="0" Width="Auto" VerticalAlignment="Center" Margin="0,0,0,5">Name</Label>
<fwk:HintTextDecorator
HintText="Please enter a name for your new template"
Padding="3"
Grid.Row="0"
- Grid.Column="1">
+ Grid.Column="1" Margin="0,0,0,5" VerticalAlignment="Center">
<TextBox x:Name="Name" Width="Auto" />
</fwk:HintTextDecorator>
- <Label Grid.Row="1" Grid.Column="0" Width="Auto">Token</Label>
+ <Label Grid.Row="1" Grid.Column="0" Width="Auto" VerticalAlignment="Center" Margin="0,0,0,5">Token</Label>
<fwk:HintTextDecorator
HintText="Please enter the phrase to tokenise"
Padding="3"
Grid.Row="1"
- Grid.Column="1">
+ Grid.Column="1" Margin="0,0,0,5" VerticalAlignment="Center">
<TextBox x:Name="Token" Width="Auto" />
</fwk:HintTextDecorator>
- <Label Grid.Row="2" Grid.Column="0" Width="Auto">Author</Label>
+ <Label Grid.Row="2" Grid.Column="0" Width="Auto" VerticalAlignment="Center" Margin="0,0,0,5">Author</Label>
<fwk:HintTextDecorator
HintText="Please enter the name of the template author"
Padding="3"
Grid.Row="2"
- Grid.Column="1">
+ Grid.Column="1" Margin="0,0,0,5" VerticalAlignment="Center">
<TextBox x:Name="Author" Width="Auto" />
</fwk:HintTextDecorator>
- <Label Grid.Row="3" Grid.Column="0" Width="Auto">Version</Label>
+ <Label Grid.Row="3" Grid.Column="0" Width="Auto" VerticalAlignment="Center" Margin="0,0,0,5">Version</Label>
<fwk:HintTextDecorator
HintText="Please enter the template version"
Padding="3"
Grid.Row="3"
- Grid.Column="1">
+ Grid.Column="1" Margin="0,0,0,5" VerticalAlignment="Center">
<TextBox x:Name="Version" Width="Auto" />
</fwk:HintTextDecorator>
</Grid>
- <ProgressBar
- x:Name="progress"
- Width="Auto"
- Height="20"
- Minimum="0"
- Maximum="{Binding Path=MaxProgress}"
- Value="{Binding Path=CurrentProgress}"
- Visibility="{Binding Path=CreatingPackage, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+ <Grid d:LayoutOverrides="Width" Margin="0,5">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto"/>
+ <ColumnDefinition/>
+ </Grid.ColumnDefinitions>
+ <ProgressBar
+ x:Name="progress"
+ Width="215"
+ Height="20"
+ Minimum="0"
+ Maximum="{Binding MaxProgress}"
+ Value="{Binding CurrentProgress}"
+ Visibility="{Binding CreatingPackage, Converter={StaticResource BooleanToVisibilityConverter}}" VerticalAlignment="Center" Margin="0,0,10,0" BorderBrush="Black"/>
+ <Button x:Name="CreatePackage" Padding="5" Content="Templify!" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="1" Width="100"/>
+ </Grid>
<TextBlock
x:Name="StatusText"
Foreground="White"
Text="{Binding Path=ProgressStatus}"
- Visibility="{Binding Path=CreatingPackage, Converter={StaticResource BooleanToVisibilityConverter}}"/>
- <Button x:Name="CreatePackage">Templify!</Button>
- <Button x:Name="ManageExclusions">Manage Exclusions</Button>
- <Button x:Name="Exit">Exit</Button>
+ Visibility="{Binding Path=CreatingPackage, Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0,0,0,5"/>
+ <Grid Margin="0,5,0,0" >
+ <Button x:Name="ManageExclusions" Padding="5" Content="Manage Exclusions" VerticalAlignment="Top" HorizontalAlignment="Left" Width="120" HorizontalContentAlignment="Center" Margin="0,7,0,0"/>
+ <Button x:Name="Exit" Padding="5" Content="Exit" VerticalAlignment="Bottom" HorizontalContentAlignment="Center" HorizontalAlignment="Right" Margin="110.14,7,0,0" Width="100"/>
+ <Rectangle VerticalAlignment="Top" Height="2" Grid.Row="9" Opacity="0.5">
+ <Rectangle.Fill>
+ <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+ <GradientStop Color="Black" Offset="0"/>
+ <GradientStop Color="White" Offset="1"/>
+ </LinearGradientBrush>
+ </Rectangle.Fill>
+ </Rectangle>
+ </Grid>
</StackPanel>
</Window>
@@ -6,13 +6,13 @@
xmlns:tb="clr-namespace:Hardcodet.Wpf.TaskbarNotification;assembly=Hardcodet.Wpf.TaskbarNotification" Title="Templify - powered by endjin"
Background="{DynamicResource WindowBackgroundBrush}"
Icon="/Resources/app-icon.ico"
- Width="350"
- Height="170"
+ Width="360"
+ Height="260"
mc:Ignorable="d">
<Window.Resources>
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
</Window.Resources>
- <StackPanel>
+ <StackPanel Margin="10">
<tb:TaskbarIcon
x:Name="NotifyIcon"
IconSource="/Resources/app-icon.ico"
@@ -29,45 +29,61 @@
</Grid.ColumnDefinitions>
<Label Grid.Row="0"
Grid.Column="0"
- Width="Auto">Template</Label>
+ Width="Auto" VerticalAlignment="Center" Margin="0,0,0,5">Template</Label>
<fwk:HintTextDecorator
HintText="Please select a template"
Padding="3"
Grid.Row="0"
- Grid.Column="1">
+ Grid.Column="1" VerticalAlignment="Center" Margin="0,0,0,5">
<ComboBox x:Name="PackageList"
ItemsSource="{Binding Path=Packages}"
DisplayMemberPath="Manifest.Title"
SelectedValuePath="Manifest.Id"
SelectedItem="{Binding Path=SelectedPackage}"
- Width="Auto" />
+ Width="Auto" BorderBrush="Black" />
</fwk:HintTextDecorator>
<Label Grid.Row="1"
Grid.Column="0"
- Width="Auto">Name</Label>
+ Width="Auto" VerticalAlignment="Center" Margin="0,0,0,5">Name</Label>
<fwk:HintTextDecorator
HintText="Please enter the new name for your solution"
Padding="3"
Grid.Row="1"
- Grid.Column="1" >
+ Grid.Column="1" VerticalAlignment="Center" Margin="0,0,0,5" >
<TextBox x:Name="Name" Width="Auto" />
</fwk:HintTextDecorator>
</Grid>
- <ProgressBar
- x:Name="progress"
- Width="Auto"
- Height="20"
- Minimum="0"
- Maximum="{Binding Path=MaxProgress}"
- Value="{Binding Path=CurrentProgress}"
- Visibility="{Binding Path=DeployingPackage, Converter={StaticResource BooleanToVisibilityConverter}}" />
+ <Grid Margin="0,5">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto"/>
+ <ColumnDefinition/>
+ </Grid.ColumnDefinitions>
+ <ProgressBar
+ x:Name="progress"
+ Width="215"
+ Height="20"
+ Minimum="0"
+ Maximum="{Binding MaxProgress}"
+ Value="{Binding CurrentProgress}"
+ Visibility="{Binding DeployingPackage, Converter={StaticResource BooleanToVisibilityConverter}}" VerticalAlignment="Center" Margin="0,0,10,0" BorderBrush="Black" />
+ <Button x:Name="DeployPackage" Content="Deploy Template" VerticalAlignment="Center" Grid.Column="1" Padding="5" HorizontalAlignment="Center" Width="100"/>
+ </Grid>
<TextBlock
x:Name="StatusText"
Foreground="White"
Text="{Binding Path=ProgressStatus}"
- Visibility="{Binding Path=DeployingPackage, Converter={StaticResource BooleanToVisibilityConverter}}"/>
- <Button x:Name="DeployPackage">Deploy Template</Button>
- <Button x:Name="Manage">Manage Templates</Button>
- <Button x:Name="Exit">Exit</Button>
+ Visibility="{Binding Path=DeployingPackage, Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0,0,0,5"/>
+ <Grid VerticalAlignment="Bottom" Margin="0,5,0,0">
+ <Button x:Name="Manage" Content="Manage Templates" VerticalAlignment="Top" HorizontalAlignment="Left" Padding="5" Width="120" Margin="0,7,0,0"/>
+ <Button x:Name="Exit" Content="Exit" VerticalAlignment="Top" HorizontalAlignment="Right" Padding="5" Width="100" Margin="0,7,0,0"/>
+ <Rectangle VerticalAlignment="Top" Height="2" Grid.Row="9" Opacity="0.5">
+ <Rectangle.Fill>
+ <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+ <GradientStop Color="Black" Offset="0"/>
+ <GradientStop Color="White" Offset="1"/>
+ </LinearGradientBrush>
+ </Rectangle.Fill>
+ </Rectangle>
+ </Grid>
</StackPanel>
</Window>
@@ -7,10 +7,10 @@
xmlns:cal="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro" Title="Templify - powered by endjin"
Background="{DynamicResource WindowBackgroundBrush}"
Icon="/Resources/app-icon.ico"
- Width="400"
- Height="100"
+ Width="360"
+ Height="160"
mc:Ignorable="d">
- <StackPanel>
+ <StackPanel Margin="10">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
@@ -21,21 +21,21 @@
<ColumnDefinition Width="110" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
- <Label Grid.Row="0" Grid.Column="0" Width="Auto">File Exclusions</Label>
+ <Label Grid.Row="0" Grid.Column="0" Width="Auto" VerticalAlignment="Center" Margin="0,0,0,5">File Exclusions</Label>
<TextBox x:Name="FileExclusions"
Grid.Row="0"
Grid.Column="1"
Width="Auto"
- HorizontalAlignment="Stretch" />
+ HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,5" />
<Label
Grid.Row="1"
Grid.Column="0"
- Width="Auto">Directory Exclusions</Label>
+ Width="Auto" VerticalAlignment="Center" Margin="0,0,0,5">Directory Exclusions</Label>
<TextBox x:Name="DirectoryExclusions"
Grid.Row="1"
Grid.Column="1"
- Width="Auto" />
+ Width="Auto" VerticalAlignment="Center" Margin="0,0,0,5" />
</Grid>
- <Button x:Name="Save">Save</Button>
+ <Button x:Name="Save" HorizontalContentAlignment="Center" HorizontalAlignment="Right" Padding="5" Width="50">Save</Button>
</StackPanel>
</Window>
@@ -7,29 +7,20 @@
xmlns:cal="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro" Title="Templify - powered by endjin"
Background="{DynamicResource WindowBackgroundBrush}"
Icon="/Resources/app-icon.ico"
- Width="300"
- Height="200"
+ Width="360"
+ Height="260"
SizeToContent="WidthAndHeight"
mc:Ignorable="d">
- <StackPanel>
- <Grid>
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="*" />
- </Grid.ColumnDefinitions>
+ <Grid Margin="10">
<ListBox x:Name="Packages"
- Grid.Row="0"
- Grid.Column="0"
- ItemsSource="{Binding Path=Packages}">
+ ItemsSource="{Binding Path=Packages}" Padding="3" BorderBrush="Black">
<ListBox.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal"
CanVerticallyScroll="True">
<TextBlock Text="{Binding Path=Manifest.Title}"
HorizontalAlignment="Left"
- VerticalAlignment="Center" />
+ VerticalAlignment="Center" Margin="0,0,5,0" />
<Button x:Name="Remove"
HorizontalAlignment="Right"
VerticalAlignment="Center"
@@ -41,5 +32,4 @@
</ListBox.ItemTemplate>
</ListBox>
</Grid>
- </StackPanel>
</Window>
@@ -36,7 +36,6 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{56BE3D9C-686D-426A-A49C-BC83FCAB670E}.Debug|Any CPU.ActiveCfg = Debug
{56BE3D9C-686D-426A-A49C-BC83FCAB670E}.Debug|Mixed Platforms.ActiveCfg = Debug
- {56BE3D9C-686D-426A-A49C-BC83FCAB670E}.Debug|Mixed Platforms.Build.0 = Debug
{56BE3D9C-686D-426A-A49C-BC83FCAB670E}.Debug|x86.ActiveCfg = Debug
{56BE3D9C-686D-426A-A49C-BC83FCAB670E}.Debug|x86.Build.0 = Debug
{56BE3D9C-686D-426A-A49C-BC83FCAB670E}.Release|Any CPU.ActiveCfg = Release

0 comments on commit d2d0763

Please sign in to comment.