diff --git a/App.config b/App.config index 2bf60bc..56efbc7 100644 --- a/App.config +++ b/App.config @@ -3,7 +3,4 @@ - - - \ No newline at end of file diff --git a/App.xaml.cs b/App.xaml.cs index c7fb8ee..36f4a71 100644 --- a/App.xaml.cs +++ b/App.xaml.cs @@ -20,6 +20,8 @@ namespace DyeingComputer { this.Startup += new StartupEventHandler(App_Startup); this.DispatcherUnhandledException += new System.Windows.Threading.DispatcherUnhandledExceptionEventHandler(App_DispatcherUnhandledException); + + //DyeingComputer.Properties.Resources.Culture = new System.Globalization.CultureInfo("en-US");//设定语言 } System.Threading.Mutex mutex; void App_Startup(object sender, StartupEventArgs e) //程序只允许启动一次 diff --git a/MainWindow.xaml b/MainWindow.xaml index fbae483..b7cbde3 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -36,12 +36,12 @@ Text="{TemplateBinding Tag}" FontFamily="Fonts/#FontAwesome" HorizontalAlignment="Left" - Width="40" FontSize="30" Margin="10,10,0,0"/> + Width="30" FontSize="20" Margin="5,10,0,0"/> + Width="NaN" FontSize="20" Margin="40,10,0,0"/> @@ -60,24 +60,24 @@ - - - - - - - + + + + + + + - - - - - - + + + + + + - +