Skip to content

Commit

Permalink
feat: remember FTP column size, close #640
Browse files Browse the repository at this point in the history
  • Loading branch information
@VShawn
VShawn committed Apr 6, 2024
1 parent 12efea1 commit abe48b6
Show file tree
Hide file tree
Showing 3 changed files with 117 additions and 5 deletions.
57 changes: 57 additions & 0 deletions Ui/Service/Locality/LocalityService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ internal class LocalitySettings
public double TabWindowHeight = 600;
public WindowState TabWindowState = WindowState.Normal;
public WindowStyle TabWindowStyle = WindowStyle.SingleBorderWindow;
public int FtpColumnFileNameLength = -1;
public int FtpColumnFileTimeLength = -1;
public int FtpColumnFileTypeLength = -1;
public int FtpColumnFileSizeLength = -1;
}

public sealed class LocalityService
Expand Down Expand Up @@ -183,5 +187,58 @@ public WindowStyle TabWindowStyle
}
}
}

public int FtpColumnFileNameLength
{
get => _localitySettings.FtpColumnFileNameLength;
set
{
if (_localitySettings.FtpColumnFileNameLength != value)
{
_localitySettings.FtpColumnFileNameLength = value;
Save();
}
}
}

public int FtpColumnFileTimeLength
{
get => _localitySettings.FtpColumnFileTimeLength;
set
{
if (_localitySettings.FtpColumnFileTimeLength != value)
{
_localitySettings.FtpColumnFileTimeLength = value;
Save();
}
}
}

public int FtpColumnFileTypeLength
{
get => _localitySettings.FtpColumnFileTypeLength;
set
{
if (_localitySettings.FtpColumnFileTypeLength != value)
{
_localitySettings.FtpColumnFileTypeLength = value;
Save();
}
}
}
public int FtpColumnFileSizeLength
{
get => _localitySettings.FtpColumnFileSizeLength;
set
{
if (_localitySettings.FtpColumnFileSizeLength != value)
{
_localitySettings.FtpColumnFileSizeLength = value;
Save();
}
}
}


}
}
11 changes: 7 additions & 4 deletions Ui/View/Host/ProtocolHosts/FileTransmitHost.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@

<ListView.View>
<GridView ColumnHeaderTemplate="{StaticResource HeaderTemplateDefault}">
<GridViewColumn Width="Auto">
<GridViewColumn Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=protocolHosts1:FileTransmitHost}, Path=DataContext.ColumnFileNameLength, Mode=TwoWay}">
<GridViewColumnHeader Content="{DynamicResource 'File Name'}" HorizontalContentAlignment="Left">
<GridViewColumnHeader.Style>
<Style TargetType="GridViewColumnHeader" BasedOn="{StaticResource GridViewColumnHeaderBaseStyle}">
Expand Down Expand Up @@ -318,7 +318,8 @@



<GridViewColumn Header="{DynamicResource file_transmit_host_list_header_last_update}" Width="Auto">
<GridViewColumn Header="{DynamicResource file_transmit_host_list_header_last_update}"
Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=protocolHosts1:FileTransmitHost}, Path=DataContext.ColumnFileTimeLength, Mode=TwoWay}">
<GridViewColumn.HeaderContainerStyle>
<Style TargetType="GridViewColumnHeader" BasedOn="{StaticResource GridViewColumnHeaderBaseStyle}">
<Setter Property="HorizontalContentAlignment" Value="Left"/>
Expand Down Expand Up @@ -351,7 +352,8 @@



<GridViewColumn Header="{DynamicResource Type}" Width="Auto">
<GridViewColumn Header="{DynamicResource Type}"
Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=protocolHosts1:FileTransmitHost}, Path=DataContext.ColumnFileTypeLength, Mode=TwoWay}">
<GridViewColumn.HeaderContainerStyle>
<Style TargetType="GridViewColumnHeader" BasedOn="{StaticResource GridViewColumnHeaderBaseStyle}">
<Setter Property="CommandParameter" Value="6"/>
Expand Down Expand Up @@ -380,7 +382,8 @@



<GridViewColumn Header="{DynamicResource file_transmit_host_list_header_size}">
<GridViewColumn Header="{DynamicResource file_transmit_host_list_header_size}"
Width="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=protocolHosts1:FileTransmitHost}, Path=DataContext.ColumnFileSizeLength, Mode=TwoWay}">
<GridViewColumn.HeaderContainerStyle>
<Style TargetType="GridViewColumnHeader" BasedOn="{StaticResource GridViewColumnHeaderBaseStyle}">
<Setter Property="CommandParameter" Value="2"/>
Expand Down
54 changes: 53 additions & 1 deletion Ui/View/Host/ProtocolHosts/VmFileTransmitHost.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
using _1RM.Model.Protocol.FileTransmit.Transmitters;
using _1RM.Model.Protocol.FileTransmit.Transmitters.TransmissionController;
using _1RM.Service;
using _1RM.Service.Locality;
using _1RM.Utils;
using Dapper;
using Shawn.Utils;
Expand Down Expand Up @@ -952,7 +953,58 @@ public string IoMessage
set => SetAndNotifyIfChanged(ref _ioMessage, value);
}


public double ColumnFileNameLength
{
get
{
var w = IoC.Get<LocalityService>().FtpColumnFileNameLength;
if (w > 50)
{
return w;
}
return -1;
}
set => IoC.Get<LocalityService>().FtpColumnFileNameLength = (int) value;
}
public double ColumnFileTimeLength
{
get
{
var w = IoC.Get<LocalityService>().FtpColumnFileTimeLength;
if (w > 50)
{
return w;
}
return -1;
}
set => IoC.Get<LocalityService>().FtpColumnFileTimeLength = (int) value;
}
public double ColumnFileTypeLength
{
get
{
var w = IoC.Get<LocalityService>().FtpColumnFileTypeLength;
if (w > 50)
{
return w;
}
return -1;
}
set => IoC.Get<LocalityService>().FtpColumnFileTypeLength = (int) value;
}
public double ColumnFileSizeLength
{
get
{
var w = IoC.Get<LocalityService>().FtpColumnFileSizeLength;
if (w > 50)
{
return w;
}
return -1;
}
set => IoC.Get<LocalityService>().FtpColumnFileSizeLength = (int) value;
}


#region Path conrol
Expand Down

0 comments on commit abe48b6

Please sign in to comment.