ntminer %!s(int64=5) %!d(string=hai) anos
pai
achega
99556e8055

+ 5 - 2
src/MinerClientFinder/MainWindow.xaml

@@ -12,7 +12,7 @@
         d:DataContext="{d:DesignData Source=/Design/MainWindowViewModel.xaml}"
         WindowStartupLocation="CenterScreen"
 		MouseDown="Window_MouseDown"
-        Title="扫描矿机 - 开源矿工" Height="800" Width="600">
+        Title="矿机扫描(敖江) - 开源矿工" Height="800" Width="600">
     <blankWindow:BlankWindow.DataContext>
         <vm:MainWindowViewModel></vm:MainWindowViewModel>
     </blankWindow:BlankWindow.DataContext>
@@ -24,7 +24,10 @@
             <RowDefinition Height="Auto"></RowDefinition>
         </Grid.RowDefinitions>
         <DockPanel Grid.Row="0">
-            <TextBlock DockPanel.Dock="Left" Margin="4 0 0 0" VerticalAlignment="Center" Foreground="{StaticResource ThemeForeground}">扫描矿机 - 开源矿工</TextBlock>
+            <WrapPanel DockPanel.Dock="Left" VerticalAlignment="Center" Margin="4 0 0 0">
+                <Image Width="17" Height="18" Source="/NTMinerWpf;component/Styles/Images/aojiang.png"></Image>
+                <TextBlock Margin="2 0 0 0" Foreground="{StaticResource ThemeForeground}">矿机扫描(敖江) - 开源矿工</TextBlock>
+            </WrapPanel>
             <WrapPanel DockPanel.Dock="Right" HorizontalAlignment="Right">
                 <controls:KbSystemMinButton Height="32" />
                 <controls:KbSystemMaxButton Height="32" />

+ 6 - 0
src/MinerClientFinder/MinerClientFinder.csproj

@@ -37,6 +37,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>logo.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Costura, Version=4.0.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Costura.Fody.4.0.0\lib\net40\Costura.dll</HintPath>
@@ -124,6 +127,9 @@
       <Name>NTMinerWpf</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="logo.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\packages\Fody.5.0.0\build\Fody.targets" Condition="Exists('..\..\packages\Fody.5.0.0\build\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

BIN=BIN
src/MinerClientFinder/logo.ico


+ 3 - 0
src/NTMinerWpf/NTMinerWpf.csproj

@@ -267,5 +267,8 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </COMReference>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Styles\Images\aojiang.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

BIN=BIN
src/NTMinerWpf/Styles/Images/aojiang.png