minor fixes

This commit is contained in:
2024-09-26 10:18:29 +02:00
parent a420e7bf74
commit 6f8ac996fd
4 changed files with 36 additions and 21 deletions

View File

@@ -192,6 +192,7 @@ partial class MainForm
// //
radMenuItem_SaveWorkspace.Name = "radMenuItem_SaveWorkspace"; radMenuItem_SaveWorkspace.Name = "radMenuItem_SaveWorkspace";
radMenuItem_SaveWorkspace.Text = "Save"; radMenuItem_SaveWorkspace.Text = "Save";
radMenuItem_SaveWorkspace.Click += RadMenuItem_SaveWorkspace_Click;
// //
// radMenuSeparatorItem1 // radMenuSeparatorItem1
// //

View File

@@ -169,7 +169,7 @@ public partial class MainForm : RadForm, IMainApi
item.Text = string.Format(GeneralLangRes.Node_Install, infos.Version.ToString()); item.Text = string.Format(GeneralLangRes.Node_Install, infos.Version.ToString());
else else
item.Text = infos.Version.ToString(); item.Text = infos.Version.ToString();
item.SvgImage = AppGlobals.Symbols.GetSvgImage(infos.IsPublic ? AppSymbols.eye : AppSymbols.invisible, SymbolSize.Small); item.SvgImage = AppGlobals.Symbols.GetSvgImage(infos.IsPublic ? AppSymbols.eye : AppSymbols.invisible, SymbolSize.Small);
} }
@@ -399,6 +399,11 @@ public partial class MainForm : RadForm, IMainApi
} }
} }
private void RadMenuItem_SaveWorkspace_Click(object sender, EventArgs e)
{
wsInfo?.Workspace.Save();
}
private void RadMenuItem_ToolsItem_Click(object? sender, EventArgs e) private void RadMenuItem_ToolsItem_Click(object? sender, EventArgs e)
{ {
if (sender is RadMenuItem item && item.Tag is PluginFunction func) if (sender is RadMenuItem item && item.Tag is PluginFunction func)
@@ -446,8 +451,25 @@ public partial class MainForm : RadForm, IMainApi
var newValue = e.Row.Cells[e.Column.Name].Value; var newValue = e.Row.Cells[e.Column.Name].Value;
var colName = e.Column.Name; var colName = e.Column.Name;
if (newValue is string valueStr) if (newValue is bool valueBool)
{ {
switch (colName)
{
case "iszip":
action.IsZip = valueBool;
break;
case "isextra":
action.IsExtra = valueBool;
break;
case "isdir":
if (uaction is not null)
uaction.IsDirectory = valueBool;
break;
}
}
else
{
var valueStr = newValue as string ?? string.Empty;
var valueNullStr = valueStr.Nullify(); var valueNullStr = valueStr.Nullify();
switch (colName) switch (colName)
@@ -477,7 +499,7 @@ public partial class MainForm : RadForm, IMainApi
action.SourceName = valueNullStr; action.SourceName = valueNullStr;
break; break;
case "srcregex": case "srcregex":
action.SourceTag = valueNullStr; action.SourceRegex = valueNullStr;
break; break;
case "srctag": case "srctag":
action.SourceTag = valueNullStr; action.SourceTag = valueNullStr;
@@ -499,22 +521,6 @@ public partial class MainForm : RadForm, IMainApi
break; break;
} }
} }
else if (newValue is bool valueBool)
{
switch (colName)
{
case "iszip":
action.IsZip = valueBool;
break;
case "isextra":
action.IsExtra = valueBool;
break;
case "isdir":
if (uaction is not null)
uaction.IsDirectory = valueBool;
break;
}
}
} }
private void RadMenuItem_Updates_DropDownOpening(object sender, System.ComponentModel.CancelEventArgs e) private void RadMenuItem_Updates_DropDownOpening(object sender, System.ComponentModel.CancelEventArgs e)

View File

@@ -22,6 +22,10 @@ public class InstallInfos : IActionSetInfos
public override string ToString() public override string ToString()
{ {
return JsonConvert.SerializeObject(this); return JsonConvert.SerializeObject(this, new JsonSerializerSettings
{
Formatting = Formatting.Indented,
DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate,
});
} }
} }

View File

@@ -13,6 +13,10 @@ public class UpdateInfos
public override string ToString() public override string ToString()
{ {
return JsonConvert.SerializeObject(this); return JsonConvert.SerializeObject(this, new JsonSerializerSettings
{
Formatting = Formatting.Indented,
DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate,
});
} }
} }