Skip to content

Commit 7855c87

Browse files
committed
Fixed #10
- Changed: Fixed date problem for date after 29th Feb (Mar 01) - Changed: Optimized display of file size - Removed: Convert button, since it has no function yet
1 parent c5bb992 commit 7855c87

File tree

5 files changed

+35
-30
lines changed

5 files changed

+35
-30
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## v1.0.6.3
4+
* Changed: Fixed date problem for date after 29th Feb (Mar 01) https://github.com/mr-manuel/Loxone_LoxStatEdit/issues/10
5+
* Changed: Optimized display of file size
6+
* Removed: Convert button, since it has no function yet
37

48
## v1.0.6.2
59
* Added: Button to convert a file (not ready yet)

MiniserverForm.Designer.cs

Lines changed: 22 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

MiniserverForm.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ public DateTime DateModified
111111
}
112112
}
113113

114-
public long Size
114+
public string Size
115115
{
116116
get
117117
{
118-
return (FileInfo != null) ? FileInfo.Length : MsFileInfo.Size;
118+
return (((FileInfo != null) ? FileInfo.Length : MsFileInfo.Size) / 1024).ToString() + " KB";
119119
}
120120
}
121121

@@ -392,12 +392,14 @@ private void RefreshGridView()
392392
Width = 60,
393393
ToolTipText = "Copy a file from local file system (FS) to Loxone MS."
394394
});
395+
/*
395396
_dataGridView.Columns.Add(new DataGridViewButtonColumn {
396397
DataPropertyName = "Convert",
397398
HeaderText = "Convert",
398399
Width = 60,
399400
ToolTipText = "Convert data from old meter function block to new style.\n\nNOTE: UNDER CONSTRUCTION, not working yet!"
400401
});
402+
*/
401403
_dataGridView.Columns.Add(new DataGridViewButtonColumn {
402404
DataPropertyName = "Delete",
403405
HeaderText = "Delete",
@@ -825,8 +827,8 @@ private void DataGridView_CellValueNeeded(object sender, DataGridViewCellValueEv
825827
case 6: e.Value = "Download"; break;
826828
case 7: e.Value = "Edit"; break;
827829
case 8: e.Value = "Upload"; break;
828-
case 9: e.Value = "Convert"; break;
829-
case 10: e.Value = "Delete"; break;
830+
// case 9: e.Value = "Convert"; break;
831+
case 9: e.Value = "Delete"; break;
830832
default: e.Value = null; break;
831833
}
832834
}

MsFileInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public static IList<MsFileInfo> Load(Uri uri)
6565
if (dateString.StartsWith("Feb 29"))
6666
{
6767
dateString = $"Mar 01 {groups[2].Value.Substring(7)}";
68+
dateString = Regex.Replace(dateString, @"\s+", " ");
6869
isFeb29 = true;
6970
}
7071

Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.0.6.2")]
35-
[assembly: AssemblyFileVersion("1.0.6.2")]
34+
[assembly: AssemblyVersion("1.0.6.3")]
35+
[assembly: AssemblyFileVersion("1.0.6.3")]

0 commit comments

Comments
 (0)