Permalink
Browse files

a logo!

  • Loading branch information...
wfraser committed Feb 28, 2012
1 parent c2ac93d commit 8be76530d0c4c45731236201cd6ebb17754483f6
@@ -1,18 +1,27 @@
<Window x:Class="FooSync.WPFApp.AboutWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- Title="About FooSync" Height="475" Width="370"
+ xmlns:foo="clr-namespace:FooSync.WPFApp"
+ Title="About FooSync" Height="500" Width="370"
>
<Window.Resources>
<Style TargetType="Hyperlink">
<EventSetter Event="RequestNavigate" Handler="Hyperlink_RequestNavigate"/>
</Style>
+ <foo:VersionToDateTimeConverter x:Key="VersionToDateTimeConverter"/>
</Window.Resources>
<StackPanel HorizontalAlignment="Center">
<TextBlock FontSize="60" FontWeight="Bold" FontFamily="Segoe UI" HorizontalAlignment="Center">FooSync</TextBlock>
- <Image Source="/FooSync;component/Resources/loki_128.png" Width="200" Height="200" Margin="10"/>
- <TextBlock FontSize="18" HorizontalAlignment="Center" Text="{Binding StringFormat=Version: {0}}" x:Name="VersionText"/>
- <TextBlock FontSize="20" HorizontalAlignment="Center">Copyright © 2012 William R. Fraser</TextBlock>
+ <Image Source="/FooSync;component/Resources/FSLogo200glow.png" Width="200" Height="200" Margin="10"/>
+
+ <TextBlock FontSize="18" HorizontalAlignment="Center" x:Name="WPFAppVersionText"
+ Text="{Binding StringFormat=UI Version: {0}}"
+ ToolTip="{Binding Converter={StaticResource VersionToDateTimeConverter}, TargetNullValue=(no build date info)}"/>
+ <TextBlock FontSize="18" HorizontalAlignment="Center" x:Name="FooSyncEngineVersionText"
+ Text="{Binding StringFormat=FooSync Engine Version: {0}}"
+ ToolTip="{Binding Converter={StaticResource VersionToDateTimeConverter}, TargetNullValue=(no build date info)}"/>
+
+ <TextBlock FontSize="20" HorizontalAlignment="Center" Padding="0,15,0,0">Copyright © 2012 William R. Fraser</TextBlock>
<TextBlock FontSize="20" HorizontalAlignment="Center"><Hyperlink NavigateUri="http://www.codewise.org/">www.codewise.org</Hyperlink></TextBlock>
<TextBlock FontSize="20" HorizontalAlignment="Center"><Hyperlink NavigateUri="https://github.com/wfraser/FooSync">github.com/wfraser/FooSync</Hyperlink></TextBlock>
</StackPanel>
@@ -22,7 +22,8 @@ public partial class AboutWindow : Window
public AboutWindow()
{
InitializeComponent();
- VersionText.DataContext = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+ WPFAppVersionText.DataContext = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+ FooSyncEngineVersionText.DataContext = typeof(FooSyncEngine).Assembly.GetName().Version;
}
private void Hyperlink_RequestNavigate(object sender, System.Windows.Navigation.RequestNavigateEventArgs e)
Binary file not shown.
@@ -36,6 +36,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup>
+ <ApplicationIcon>FSLogo128glow.ico</ApplicationIcon>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -62,6 +65,7 @@
<DependentUpon>AboutWindow.xaml</DependentUpon>
</Compile>
<Compile Include="BindableChangeSet.cs" />
+ <Compile Include="VersionToDateTimeConverter.cs" />
<Compile Include="CreateRepositoryWindow.xaml.cs">
<DependentUpon>CreateRepositoryWindow.xaml</DependentUpon>
</Compile>
@@ -168,6 +172,21 @@
<ItemGroup>
<Resource Include="Resources\folder_open_16x16x32.png" />
</ItemGroup>
+ <ItemGroup>
+ <Resource Include="FSLogo128glow.ico" />
+ </ItemGroup>
+ <ItemGroup>
+ <Resource Include="Resources\FSLogo32glow.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <Resource Include="Resources\FSLogo128glow.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <Resource Include="Resources\FSLogo16glow.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <Resource Include="Resources\FSLogo200glow.png" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:foo="clr-namespace:FooSync.WPFApp"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
- Title="FooSync" Height="430" Width="700" Icon="/FooSync;component/Resources/loki_128.png"
+ Title="FooSync" Height="430" Width="700" Icon="/FooSync;component/Resources/FSLogo128glow.png"
Closed="Window_Closed">
<Window.Resources>
<foo:FileOperationValueConverter x:Key="FileOperationValueConverter"/>
@@ -187,7 +187,7 @@
</Button>
<Button ToolTip="About" ToolBar.OverflowMode="Always" Click="ShowAboutWindow">
<StackPanel Orientation="Horizontal">
- <Image Source="/FooSync;component/Resources/loki_128.png" Width="16" Height="16" Margin="2" VerticalAlignment="Center"/>
+ <Image Source="/FooSync;component/Resources/FSLogo16glow.png" Width="16" Height="16" Margin="2" VerticalAlignment="Center"/>
<TextBlock VerticalAlignment="Center">About</TextBlock>
</StackPanel>
</Button>
@@ -246,26 +246,7 @@
Text="{Binding Summary, Mode=OneWay, StringFormat=Delete from Source: {0}}"/>
<TextBlock x:Name="StatsConflict" Grid.Row="0" Grid.Column="2" TextWrapping="Wrap" Binding.SourceUpdated="StatsConflict_SourceUpdated"
- Text="{Binding Summary, Mode=OneWay, StringFormat=Conflicts: {0}}"/>
- <x:Code><![CDATA[
- private void StatsConflict_SourceUpdated(object sender, DataTransferEventArgs e)
- {
- var tb = sender as TextBlock;
- if (tb != null)
- {
- if (tb.DataContext != null && tb.DataContext is BindableChangeSet && ((BindableChangeSet)tb.DataContext).Count > 0)
- {
- tb.Foreground = new System.Windows.Media.SolidColorBrush(System.Windows.Media.Colors.Crimson);
- tb.FontWeight = System.Windows.FontWeights.Bold;
- }
- else
- {
- tb.Foreground = System.Windows.SystemColors.WindowTextBrush;
- tb.FontWeight = System.Windows.FontWeights.Normal;
- }
- }
- }
- ]]></x:Code>
+ Text="{Binding Summary, Mode=OneWay, StringFormat=Conflicts: {0}, NotifyOnSourceUpdated=True}"/>
<TextBlock x:Name="StatsNoOp" Grid.Row="1" Grid.Column="2" TextWrapping="Wrap"
Text="{Binding Summary, Mode=OneWay, StringFormat=Do Nothing: {0}}"/>
@@ -601,6 +601,24 @@ private void DoActionsButton_Click(object sender, RoutedEventArgs e)
EnableControls(true);
}
+ private void StatsConflict_SourceUpdated(object sender, DataTransferEventArgs e)
+ {
+ var tb = sender as TextBlock;
+ if (tb != null)
+ {
+ if (tb.DataContext != null && tb.DataContext is BindableChangeSet && ((BindableChangeSet)tb.DataContext).Count > 0)
+ {
+ tb.Foreground = new System.Windows.Media.SolidColorBrush(System.Windows.Media.Colors.Crimson);
+ tb.FontWeight = System.Windows.FontWeights.Bold;
+ }
+ else
+ {
+ tb.Foreground = System.Windows.SystemColors.WindowTextBrush;
+ tb.FontWeight = System.Windows.FontWeights.Normal;
+ }
+ }
+ }
+
private void OpenExplorerAt(string filename)
{
System.Diagnostics.Process.Start("explorer.exe", "/select," + filename);

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -117,8 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="Loki" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\loki_128.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
</root>
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="100"
+ height="100"
+ id="svg2985"
+ version="1.1"
+ inkscape:version="0.48.2 r9819"
+ sodipodi:docname="FSLogo.svg"
+ inkscape:export-filename="D:\FooSync\FooSync.WPFApp\Resources\FSLogo128.png"
+ inkscape:export-xdpi="115.2"
+ inkscape:export-ydpi="115.2">
+ <defs
+ id="defs2987">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient6494"
+ osb:paint="gradient">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop6496" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop6498" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4887"
+ osb:paint="solid">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop4889" />
+ </linearGradient>
+ <marker
+ inkscape:stockid="Arrow1Sstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Sstart"
+ style="overflow:visible">
+ <path
+ id="path3890"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.2,0,0,0.2,1.2,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Lstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow2Lstart"
+ style="overflow:visible">
+ <path
+ id="path3896"
+ style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+ d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+ transform="matrix(1.1,0,0,1.1,1.1,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lstart"
+ style="overflow:visible">
+ <path
+ id="path3878"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.8,0,0,0.8,10,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="7.7781746"
+ inkscape:cx="65.424819"
+ inkscape:cy="49.183232"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:document-units="px"
+ inkscape:grid-bbox="true"
+ showguides="false"
+ inkscape:window-width="1920"
+ inkscape:window-height="1138"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3001"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ spacingx="0.5px"
+ spacingy="0.5px" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2990">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(0,36)">
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,20 z"
+ id="path6364"
+ inkscape:connector-curvature="0"
+ transform="translate(0,-36)" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,20 z"
+ id="path6374"
+ inkscape:connector-curvature="0"
+ transform="translate(0,-36)" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,49 z"
+ id="path6364-5"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 0,49 z"
+ id="path6374-5"
+ inkscape:connector-curvature="0" />
+ <text
+ xml:space="preserve"
+ style="font-size:41.79581833px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="20.897909"
+ y="22.968805"
+ id="text6420"
+ sodipodi:linespacing="125%"
+ transform="scale(0.95703358,1.0448954)"><tspan
+ sodipodi:role="line"
+ id="tspan6422"
+ x="20.897909"
+ y="22.968805"
+ style="font-size:27.1672802px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;letter-spacing:0px;font-family:Tahoma;-inkscape-font-specification:Tahoma Bold">F S</tspan></text>
+ <path
+ sodipodi:nodetypes="ccccccc"
+ inkscape:connector-curvature="0"
+ id="path6428"
+ d="m 50,4 50,0 C 45,-21 45,-21 45,-21 55,-16 60,-8.5 60,-1 L 0,-1 15,4 z"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-rule:nonzero" />
+ <path
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 50,24 0,24 C 55,49 55,49 55,49 45,44 40,36.5 40,29 l 60,0 -15,-5 z"
+ id="path6456"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ </g>
+</svg>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 8be7653

Please sign in to comment.