FSI.BT.IR/FSI.BT.IR.Tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Sicherung

Browse Source
This commit is contained in:
maier_S
2022-03-23 14:16:48 +01:00
parent fef3fa4274
commit ede0ae35bd
16 changed files with 152 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
FSI.BT.Tools/Commands/CommandBase.cs
View File

@@ -19,7 +19,7 @@ namespace FSI.BT.Tools.Commands
/// <summary>
/// A singleton instance.
/// </summary>
private static T? command;
private static T command;
/// <summary>
/// Gets a shared command instance.
@@ -83,7 +83,7 @@ namespace FSI.BT.Tools.Commands
/// </summary>
/// <param name="commandParameter"></param>
/// <returns>Window</returns>
protected Window? GetTaskbarWindow(object commandParameter)
protected Window GetTaskbarWindow(object commandParameter)
{
if (IsDesignMode)
return null;
@@ -104,7 +104,7 @@ namespace FSI.BT.Tools.Commands
/// <returns>The first parent item that matches the submitted
/// type parameter. If not matching item can be found, a null
/// reference is being returned.</returns>
public static TParent? TryFindParent<TParent>(DependencyObject child) where TParent : DependencyObject
public static TParent TryFindParent<TParent>(DependencyObject child) where TParent : DependencyObject
{
//get parent item
DependencyObject parentObject = GetParentObject(child);
@@ -131,7 +131,7 @@ namespace FSI.BT.Tools.Commands
/// <param name="child">The item to be processed.</param>
/// <returns>The submitted item's parent, if available. Otherwise
/// null.</returns>
public static DependencyObject? GetParentObject(DependencyObject child)
public static DependencyObject GetParentObject(DependencyObject child)
{
if (child == null) return null;
@@ -140,7 +140,7 @@ namespace FSI.BT.Tools.Commands
DependencyObject parent = ContentOperations.GetParent(contentElement);
if (parent != null) return parent;
FrameworkContentElement? fce = contentElement as FrameworkContentElement;
FrameworkContentElement fce = contentElement as FrameworkContentElement;
return fce?.Parent;
}

2
FSI.BT.Tools/Commands/LoginCommand.cs
View File

@@ -9,7 +9,7 @@ namespace FSI.BT.Tools.Commands
{
public override void Execute(object parameter)
{
Lib.Guis.AutoPw.FrmMain frmMain = new()
Lib.Guis.AutoPw.FrmMain frmMain = new Lib.Guis.AutoPw.FrmMain()
{
CloseAtLostFocus = false,
WindowStartupLocation = WindowStartupLocation.CenterOwner,

37
FSI.BT.Tools/Commands/OpenAppCommand.cs
View File

@@ -53,7 +53,7 @@ namespace FSI.BT.Tools.Commands
break;
case "EplPrj":
Lib.Guis.Prj.Mgt.FrmMain frmMainEplPrj = new()
Lib.Guis.Prj.Mgt.FrmMain frmMainEplPrj = new Lib.Guis.Prj.Mgt.FrmMain()
{
ShowPdf = false,
CloseAtLostFocus = true,
@@ -65,7 +65,7 @@ namespace FSI.BT.Tools.Commands
return;
case "EplPdf":
Lib.Guis.Prj.Mgt.FrmMain frmMainEplPdf = new()
Lib.Guis.Prj.Mgt.FrmMain frmMainEplPdf = new Lib.Guis.Prj.Mgt.FrmMain()
{
ShowPdf = true,
CloseAtLostFocus = true,
@@ -76,7 +76,7 @@ namespace FSI.BT.Tools.Commands
return;
case "EplPdfMgt":
Lib.Guis.Pdf.Mgt.FrmMain frmMainEplPdfMgt = new()
Lib.Guis.Pdf.Mgt.FrmMain frmMainEplPdfMgt = new Lib.Guis.Pdf.Mgt.FrmMain()
{
CloseAtLostFocus = true
};
@@ -110,7 +110,7 @@ namespace FSI.BT.Tools.Commands
break;
case "DeEncrypt":
Lib.Guis.DeEncryptMessage.FrmMain frmMainDeEnCrypt = new()
Lib.Guis.DeEncryptMessage.FrmMain frmMainDeEnCrypt = new Lib.Guis.DeEncryptMessage.FrmMain()
{
Password = GetType().Namespace.ToString(),
CloseAtLostFocus = true,
@@ -120,12 +120,12 @@ namespace FSI.BT.Tools.Commands
return;
case "StarterCsvExporter":
Lib.Guis.SieStarterCsvExporter.FrmMain frmMain = new();
Lib.Guis.SieStarterCsvExporter.FrmMain frmMain = new Lib.Guis.SieStarterCsvExporter.FrmMain();
frmMain.Show();
return;
case "Admin":
Gui.FrmAdmin frmAdmin = new()
Gui.FrmAdmin frmAdmin = new Gui.FrmAdmin()
{
Admins = Global.Settings.Admins,
Users = Global.Settings.Users,
@@ -149,7 +149,7 @@ namespace FSI.BT.Tools.Commands
break;
case "Excel":
files = Global.Settings.ExcelExe;
files = Global.Settings.ExcelExe;
break;
case "Word":
@@ -159,19 +159,23 @@ namespace FSI.BT.Tools.Commands
case "PaintNet":
files = Global.Settings.PaintNetExe;
break;
case "Gimp":
files = Global.Settings.GimpExe;
break;
break;
case "Vnc":
files = Global.Settings.VncExe;
break;
case "VncAdrBook":
files = Global.Settings.VncAdrBookExe;
break;
case "IbaAnalyzer":
files = Global.Settings.VncAdrBookExe;
break;
}
string fileName = string.Empty;
@@ -179,10 +183,15 @@ namespace FSI.BT.Tools.Commands
for (int i = 0; i <= files.Length - 1; i++)
{
var test = Environment.ExpandEnvironmentVariables(files[i].Trim());
if (File.Exists(Environment.ExpandEnvironmentVariables(files[i].Trim())))
{
fileName = Environment.ExpandEnvironmentVariables(files[i].Trim());
}
else
{
continue;
}
if (pathes.Length == 0)
{
@@ -200,7 +209,7 @@ namespace FSI.BT.Tools.Commands
}
else
{
Process process = new();
Process process = new Process();
process.StartInfo.FileName = fileName;
process.StartInfo.WorkingDirectory = path;
process.StartInfo.Arguments = arguments;
@@ -334,6 +343,10 @@ namespace FSI.BT.Tools.Commands
files = Global.Settings.VncAdrBookExe;
break;
case "IbaAnalyzer":
files = Global.Settings.VncAdrBookExe;
break;
default: return false;
}

2
FSI.BT.Tools/Commands/ProcessCommand.cs
View File

@@ -9,7 +9,7 @@ namespace FSI.BT.Tools.Commands
{
public override void Execute(object parameter)
{
Gui.FrmProcesses frm = new();
Gui.FrmProcesses frm = new Gui.FrmProcesses();
frm.ShowDialog();
}

2
FSI.BT.Tools/Commands/RadialMenuCommand.cs
View File

@@ -31,7 +31,7 @@ namespace FSI.BT.Tools.Commands
public override bool CanExecute(object parameter)
{
return Global.AdminRights || Global.UserRights;
return Global.UserRights || Global.AdminRights;
}
}
}