Skip to content

Commit 495560d

Browse files
BornToBeRootBornToBeRoot
committed
UI unified
1 parent 30dc581 commit 495560d

16 files changed

+1176
-1226
lines changed

‎Source/NETworkManager/MainWindow.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
<ColumnDefinition Width="Auto" />
195195
</Grid.ColumnDefinitions>
196196
<Grid.RowDefinitions>
197-
<RowDefinition Height="48" />
197+
<RowDefinition Height="31" />
198198
</Grid.RowDefinitions>
199199
<Button Grid.Column="0" Command="{Binding OpenApplicationListCommand}" ToolTip="{x:Static localization:Strings.Search}">
200200
<Button.Style>
@@ -224,9 +224,9 @@
224224
</Style.Triggers>
225225
</Style>
226226
</Button.Style>
227-
<Rectangle Grid.Column="0" Width="24" Height="24" Margin="0,0,-2,0">
227+
<Rectangle Grid.Column="0" Width="16" Height="16" Margin="0,0,-2,0">
228228
<Rectangle.OpacityMask>
229-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:VaadinIcons Kind=Sitemap}" />
229+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:VaadinIcons Kind=AngleDoubleRight}" />
230230
</Rectangle.OpacityMask>
231231
<Rectangle.Style>
232232
<Style TargetType="{x:Type Rectangle}">

‎Source/NETworkManager/Resources/Styles/DragablzStyles.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<Setter.Value>
6161
<DataTemplate DataType="networkManagerControls:DragablzTabItem">
6262
<Border BorderBrush="{DynamicResource MahApps.Brushes.Gray8}" BorderThickness="0,0,1,0">
63-
<Grid Height="49">
63+
<Grid Height="32">
6464
<Grid.InputBindings>
6565
<MouseBinding Command="dragablz:TabablzControl.CloseItemCommand" Gesture="MiddleClick" />
6666
</Grid.InputBindings>

‎Source/NETworkManager/Resources/Styles/TabControlStyles.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Setter Property="Foreground" Value="{DynamicResource MahApps.Brushes.Gray3}" />
55
<Setter Property="Background" Value="Transparent" />
66
<Setter Property="BorderThickness" Value="0" />
7-
<Setter Property="Height" Value="51" />
7+
<Setter Property="Height" Value="34" />
88
<Setter Property="Margin" Value="0" />
99
<Setter Property="Padding" Value="10,0" />
1010
<Setter Property="MinWidth" Value="150" />

‎Source/NETworkManager/Views/DNSLookupHostView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<Grid>
107107
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
108108
<Grid.RowDefinitions>
109-
<RowDefinition Height="30" />
109+
<RowDefinition Height="Auto" />
110110
<RowDefinition Height="10" />
111111
<RowDefinition Height="*" />
112112
</Grid.RowDefinitions>

‎Source/NETworkManager/Views/IPScannerHostView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<Grid>
107107
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
108108
<Grid.RowDefinitions>
109-
<RowDefinition Height="30" />
109+
<RowDefinition Height="Auto" />
110110
<RowDefinition Height="10" />
111111
<RowDefinition Height="*" />
112112
</Grid.RowDefinitions>

‎Source/NETworkManager/Views/NetworkInterfaceView.xaml

Lines changed: 681 additions & 733 deletions
Large diffs are not rendered by default.

‎Source/NETworkManager/Views/PingMonitorHostView.xaml

Lines changed: 244 additions & 243 deletions
Large diffs are not rendered by default.

‎Source/NETworkManager/Views/PortScannerHostView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<Grid>
107107
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
108108
<Grid.RowDefinitions>
109-
<RowDefinition Height="30" />
109+
<RowDefinition Height="Auto" />
110110
<RowDefinition Height="10" />
111111
<RowDefinition Height="*" />
112112
</Grid.RowDefinitions>

‎Source/NETworkManager/Views/PowerShellHostView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
<Grid>
186186
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
187187
<Grid.RowDefinitions>
188-
<RowDefinition Height="30" />
188+
<RowDefinition Height="Auto" />
189189
<RowDefinition Height="10" />
190190
<RowDefinition Height="*" />
191191
</Grid.RowDefinitions>

‎Source/NETworkManager/Views/PuTTYHostView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
<Grid>
197197
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
198198
<Grid.RowDefinitions>
199-
<RowDefinition Height="30" />
199+
<RowDefinition Height="Auto" />
200200
<RowDefinition Height="10" />
201201
<RowDefinition Height="*" />
202202
</Grid.RowDefinitions>

‎Source/NETworkManager/Views/RemoteDesktopHostView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
<Grid>
215215
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
216216
<Grid.RowDefinitions>
217-
<RowDefinition Height="30" />
217+
<RowDefinition Height="Auto" />
218218
<RowDefinition Height="10" />
219219
<RowDefinition Height="*" />
220220
</Grid.RowDefinitions>

‎Source/NETworkManager/Views/TigerVNCHostView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
<Grid>
186186
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
187187
<Grid.RowDefinitions>
188-
<RowDefinition Height="30" />
188+
<RowDefinition Height="Auto" />
189189
<RowDefinition Height="10" />
190190
<RowDefinition Height="*" />
191191
</Grid.RowDefinitions>

‎Source/NETworkManager/Views/TracerouteHostView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<Grid>
107107
<Grid Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType= {x:Type mah:MetroWindow}}, Path=DataContext.IsProfileFileLocked, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
108108
<Grid.RowDefinitions>
109-
<RowDefinition Height="30" />
109+
<RowDefinition Height="Auto" />
110110
<RowDefinition Height="10" />
111111
<RowDefinition Height="*" />
112112
</Grid.RowDefinitions>

0 commit comments

Comments
 (0)