Skip to content

Commit 6410628

Browse files
committed
Design improved
1 parent 1a2489e commit 6410628

File tree

4 files changed

+7
-18
lines changed

4 files changed

+7
-18
lines changed

Source/NETworkManager/MainWindow.xaml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,6 @@
5353
<mahAppsControls:MetroWindow.WindowButtonCommands>
5454
<mahAppsControls:WindowButtonCommands Template="{DynamicResource MahApps.Metro.Templates.WindowButtonCommands.Win10}" />
5555
</mahAppsControls:MetroWindow.WindowButtonCommands>
56-
<mahAppsControls:MetroWindow.IconTemplate>
57-
<DataTemplate>
58-
<Rectangle Width="20" Height="20" Fill="{DynamicResource GrayBrush3}" >
59-
<Rectangle.LayoutTransform>
60-
<RotateTransform Angle="-90"/>
61-
</Rectangle.LayoutTransform>
62-
<Rectangle.OpacityMask>
63-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Sitemap}" />
64-
</Rectangle.OpacityMask>
65-
</Rectangle>
66-
</DataTemplate>
67-
</mahAppsControls:MetroWindow.IconTemplate>
6856
<mahAppsControls:MetroWindow.RightWindowCommands>
6957
<mahAppsControls:WindowCommands>
7058
<Button Focusable="False" Command="{Binding OpenWebsiteCommand}" Foreground="{DynamicResource AccentColorBrush}" Visibility="{Binding UpdateAvailable, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" CommandParameter="{x:Static resources:Resources.NETworkManager_LatestReleaseURL}" Cursor="Hand">
@@ -203,7 +191,7 @@
203191
</Rectangle.Style>
204192
</Rectangle>
205193
</Button>
206-
<TextBox x:Name="TextBoxSearch" Grid.Column="0" VerticalAlignment="Center" Text="{Binding Search, UpdateSourceTrigger=PropertyChanged}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.Search}" mahAppsControls:TextBoxHelper.ClearTextButton="True">
194+
<TextBox x:Name="TextBoxSearch" Grid.Column="0" VerticalAlignment="Center" Text="{Binding Search, UpdateSourceTrigger=PropertyChanged}" mah:TextBoxHelper.Watermark="{x:Static localization:Strings.SearchDots}" mahAppsControls:TextBoxHelper.ClearTextButton="True">
207195
<TextBox.Style>
208196
<Style BasedOn="{StaticResource SearchTextBox}" TargetType="{x:Type TextBox}">
209197
<Setter Property="Visibility" Value="Hidden" />

Source/NETworkManager/Resources/Styles/TextBoxStyles.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
<Style x:Key="SearchTextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource SearchMetroTextBox}">
2323
<Setter Property="FontSize" Value="14" />
24+
<Setter Property="BorderThickness" Value="0,0,0,1"></Setter>
2425
<Setter Property="BorderBrush" Value="{DynamicResource GrayBrush8}" />
2526
<Setter Property="VerticalContentAlignment" Value="Center" />
2627
<Setter Property="ContextMenu" Value="{StaticResource CutCopyPasteContextMenu}" />

Source/NETworkManager/ViewModels/AboutViewModel.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,23 +186,23 @@ public void OpenLicenseFolder()
186186
#region Events
187187
private void Updater_UpdateAvailable(object sender, UpdateAvailableArgs e)
188188
{
189-
UpdateText = string.Format(Resources.Localization.Strings.VersionxxIsAvailable, e.Version);
189+
UpdateText = string.Format(Strings.VersionxxIsAvailable, e.Version);
190190

191191
IsUpdateCheckRunning = false;
192192
UpdateAvailable = true;
193193
}
194194

195195
private void Updater_NoUpdateAvailable(object sender, EventArgs e)
196196
{
197-
UpdaterMessage = Resources.Localization.Strings.NoUpdateAvailable;
197+
UpdaterMessage = Strings.NoUpdateAvailable;
198198

199199
IsUpdateCheckRunning = false;
200200
ShowUpdaterMessage = true;
201201
}
202202

203203
private void Updater_Error(object sender, EventArgs e)
204204
{
205-
UpdaterMessage = Resources.Localization.Strings.ErrorCheckingApiGithubComVerifyYourNetworkConnection;
205+
UpdaterMessage = Strings.ErrorCheckingApiGithubComVerifyYourNetworkConnection;
206206

207207
IsUpdateCheckRunning = false;
208208
ShowUpdaterMessage = true;

Source/NETworkManager/Views/WakeOnLANView.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
<Grid.ColumnDefinitions>
3838
<ColumnDefinition Width="Auto" />
3939
<ColumnDefinition Width="10" />
40-
<ColumnDefinition Width="*" />
40+
<ColumnDefinition Width="*" MaxWidth="200" />
4141
<ColumnDefinition Width="10" />
42-
<ColumnDefinition Width="Auto" />
42+
<ColumnDefinition Width="*" />
4343
</Grid.ColumnDefinitions>
4444
<Grid.RowDefinitions>
4545
<RowDefinition Height="Auto" />

0 commit comments

Comments
 (0)