Skip to content

Commit e5f8a79

Browse files
BornToBeRootBornToBeRoot
committed
Refresh command fixed
1 parent b1199e8 commit e5f8a79

File tree

4 files changed

+84
-3
lines changed

4 files changed

+84
-3
lines changed

‎Source/NETworkManager/Controls/DragablzTabHostWindow.xaml

+68
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,74 @@
358358
</Setter>
359359
</DataTrigger.Setters>
360360
</DataTrigger>
361+
<!-- Add ContextMenu for WebConsole -->
362+
<DataTrigger Binding="{Binding ApplicationName}" Value="{x:Static networkManager:ApplicationViewManager+Name.WebConsole}">
363+
<DataTrigger.Setters>
364+
<Setter Property="HeaderItemTemplate">
365+
<Setter.Value>
366+
<DataTemplate DataType="controls:DragablzTabItem">
367+
<Border BorderBrush="{DynamicResource GrayBrush8}" BorderThickness="0,0,1,0">
368+
<Grid>
369+
<Grid.ContextMenu>
370+
<ContextMenu>
371+
<MenuItem Header="{x:Static localization:Strings.Refresh}" Command="{Binding Data.WebConsole_RefreshCommand, Source={StaticResource BindingProxy}}" CommandParameter="{Binding View}">
372+
<MenuItem.Icon>
373+
<Rectangle Width="16" Height="16" Fill="{DynamicResource GrayBrush3}">
374+
<Rectangle.OpacityMask>
375+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Restart}" />
376+
</Rectangle.OpacityMask>
377+
</Rectangle>
378+
</MenuItem.Icon>
379+
</MenuItem>
380+
</ContextMenu>
381+
</Grid.ContextMenu>
382+
<Grid.InputBindings>
383+
<MouseBinding Command="dragablz:TabablzControl.CloseItemCommand" Gesture="MiddleClick" />
384+
</Grid.InputBindings>
385+
<StackPanel Orientation="Horizontal">
386+
<Grid ToolTip="{Binding Header}">
387+
<TextBlock Text="{Binding Header}" VerticalAlignment="Center" Width="150" Margin="10">
388+
<TextBlock.Style>
389+
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource HeaderTextBlock}">
390+
<Setter Property="Foreground" Value="{DynamicResource GrayBrush3}" />
391+
<Style.Triggers>
392+
<DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type dragablz:DragablzItem}}, Path=IsMouseOver}" Value="True">
393+
<Setter Property="Foreground" Value="{DynamicResource GrayBrush5}" />
394+
</DataTrigger>
395+
<DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type dragablz:DragablzItem}}, Path=IsSelected}" Value="True">
396+
<Setter Property="Foreground" Value="{DynamicResource AccentColorBrush}" />
397+
</DataTrigger>
398+
</Style.Triggers>
399+
</Style>
400+
</TextBlock.Style>
401+
</TextBlock>
402+
<Thumb Style="{DynamicResource InvisibleThumbStyle}" dragablz:DragablzItem.IsCustomThumb="True" />
403+
</Grid>
404+
<Button Style="{StaticResource CleanButton}" Command="dragablz:TabablzControl.CloseItemCommand" ToolTip="{x:Static localization:Strings.Close}" Margin="0,0,10,0">
405+
<Rectangle Width="16" Height="16">
406+
<Rectangle.OpacityMask>
407+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=WindowClose}" />
408+
</Rectangle.OpacityMask>
409+
<Rectangle.Style>
410+
<Style TargetType="{x:Type Rectangle}">
411+
<Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
412+
<Style.Triggers>
413+
<DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
414+
<Setter Property="Fill" Value="Red" />
415+
</DataTrigger>
416+
</Style.Triggers>
417+
</Style>
418+
</Rectangle.Style>
419+
</Rectangle>
420+
</Button>
421+
</StackPanel>
422+
</Grid>
423+
</Border>
424+
</DataTemplate>
425+
</Setter.Value>
426+
</Setter>
427+
</DataTrigger.Setters>
428+
</DataTrigger>
361429
</Style.Triggers>
362430
</Style>
363431
</dragablz:TabablzControl.Style>

‎Source/NETworkManager/Controls/DragablzTabHostWindow.xaml.cs

+13
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,19 @@ private void TigerVNC_ReconnectAction(object view)
266266
}
267267
}
268268
#endregion
269+
270+
#region WebConsole Commands
271+
public ICommand WebConsole_RefreshCommand => new RelayCommand(WebConsole_RefreshAction);
272+
273+
private void WebConsole_RefreshAction(object view)
274+
{
275+
if (view is WebConsoleControl control)
276+
{
277+
if (control.RefreshCommand.CanExecute(null))
278+
control.RefreshCommand.Execute(null);
279+
}
280+
}
281+
#endregion
269282
#endregion
270283

271284
#region Events

‎Source/NETworkManager/ViewModels/WebConsoleHostViewModel.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ private void CloseItemAction(ItemActionCallbackArgs<TabablzControl> args)
207207
((args.DragablzItem.Content as DragablzTabItem)?.View as WebConsoleControl)?.CloseTab();
208208
}
209209

210-
public ICommand WebConsole_RefreshCommand => new RelayCommand(WebConsole_ReloadAction);
210+
public ICommand WebConsole_RefreshCommand => new RelayCommand(WebConsole_RefreshAction);
211211

212-
private void WebConsole_ReloadAction(object view)
212+
private void WebConsole_RefreshAction(object view)
213213
{
214214
if (view is WebConsoleControl control)
215215
{

‎Source/NETworkManager/Views/WebConsoleHostView.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<Grid>
6767
<Grid.ContextMenu>
6868
<ContextMenu>
69-
<MenuItem Header="{x:Static localization:Strings.Reload}" Command="{Binding Data.WebConsole_ReloadCommand, Source={StaticResource BindingProxy}}" CommandParameter="{Binding View}">
69+
<MenuItem Header="{x:Static localization:Strings.Refresh}" Command="{Binding Data.WebConsole_RefreshCommand, Source={StaticResource BindingProxy}}" CommandParameter="{Binding View}">
7070
<MenuItem.Icon>
7171
<Rectangle Width="16" Height="16" Fill="{DynamicResource GrayBrush3}">
7272
<Rectangle.OpacityMask>

0 commit comments

Comments
 (0)