div. Anpassungen

- Settings *.xml eingefügt
- div. Anwendungen eingefügt
- kleine Fehler behoben

automatische zentrieren der Maus entfernt

div. Anpassungen

Squashed 'FSI.Lib/' changes from 24aa22a..9a24247

9a24247 Version erhöht
9536f8a div. Anpassungen für FSI.BT.Tools

git-subtree-dir: FSI.Lib
git-subtree-split: 9a242472bc63c937efcdaaa4e391c5733abe2891

div. Anpassungen

div. Fehlerbehoben
This commit is contained in:
maier_S
2022-03-17 07:50:10 +01:00
parent e702335252
commit 15c25af4b8
46 changed files with 3031 additions and 544 deletions

View File

@@ -11,7 +11,7 @@ namespace FSI.BT.Tools.Commands
{
Lib.Guis.AutoPw.FrmMain frmMain = new()
{
CloseAtLostFocus = true,
CloseAtLostFocus = false,
WindowStartupLocation = WindowStartupLocation.CenterOwner,
};
frmMain.ShowDialog();
@@ -20,7 +20,6 @@ namespace FSI.BT.Tools.Commands
Global.AdminRights = frmMain.PwOk;
}
public override bool CanExecute(object parameter)
{
return true;

View File

@@ -20,36 +20,36 @@ namespace FSI.BT.Tools.Commands
switch ((string)parameter)
{
case "SimaticManager":
files = Global.Settings.Apps.SieSimaticManagerExe.Split(";");
files = Global.Settings.SieSimaticManagerExe;
break;
case "TIAv13":
files = Global.Settings.Apps.SieTiaV13Exe.Split(";");
files = Global.Settings.SieTiaV13Exe;
break;
case "TIAv14":
files = Global.Settings.Apps.SieTiaV14Exe.Split(";");
files = Global.Settings.SieTiaV14Exe;
break;
case "TIAv15":
files = Global.Settings.Apps.SieTiaV15Exe.Split(";");
files = Global.Settings.SieTiaV13Exe;
break;
case "TIAv16":
files = Global.Settings.Apps.SieTiaV16Exe.Split(";");
files = Global.Settings.SieTiaV16Exe;
break;
case "TIAv17":
files = Global.Settings.Apps.SieTiaV17Exe.Split(";");
files = Global.Settings.SieTiaV17Exe;
break;
case "Starter":
files = Global.Settings.Apps.SieTiaVStarterExe.Split(";");
files = Global.Settings.SieTiaVStarterExe;
break;
case "Epl":
files = Global.Settings.Apps.Epl.Exe.Split(";");
arguments = Global.Settings.Apps.Epl.Arguments;
files = Global.Settings.EplExe;
arguments = Global.Settings.EplArguments;
break;
case "EplPrj":
@@ -58,6 +58,8 @@ namespace FSI.BT.Tools.Commands
ShowPdf = false,
CloseAtLostFocus = true,
WindowStartupLocation = WindowStartupLocation.CenterOwner,
Path = Global.Settings.EplPrjPath,
EplExes = Global.Settings.EplExe,
};
frmMainEplPrj.Show();
return;
@@ -68,6 +70,7 @@ namespace FSI.BT.Tools.Commands
ShowPdf = true,
CloseAtLostFocus = true,
WindowStartupLocation = WindowStartupLocation.CenterOwner,
Path = Global.Settings.EplPdfPath,
};
frmMainEplPdf.Show();
return;
@@ -81,35 +84,35 @@ namespace FSI.BT.Tools.Commands
return;
case "Npp":
files = Global.Settings.Apps.NppExe.Split(";");
files = Global.Settings.NppExe;
break;
case "TotalCmd":
files = Global.Settings.Apps.TotalCmdExe.Split(";");
files = Global.Settings.TotalCmdExe;
break;
case "TeXstudio":
files = Global.Settings.Apps.TeXstudioExe.Split(";");
pathes = Global.Settings.Apps.TeXstudioPath.Split(";");
files = Global.Settings.TeXstudioExe;
pathes = Global.Settings.TeXstudioPath;
break;
case "VS":
files = Global.Settings.Apps.VsExe.Split(";");
files = Global.Settings.VsExe;
break;
case "VS.Code":
files = Global.Settings.Apps.VsCodeExe.Split(";");
files = Global.Settings.VsCodeExe;
break;
case "Rdp":
files = Global.Settings.Apps.RdpExe.Split(";"); ;
files = Global.Settings.RdpExe;
break;
case "DeEncrypt":
Lib.Guis.DeEncryptMessage.FrmMain frmMainDeEnCrypt = new()
{
Password = Global.Settings.General.DeEnCryptPasswort,
Password = GetType().Namespace.ToString(),
CloseAtLostFocus = true,
WindowStartupLocation = WindowStartupLocation.CenterOwner,
};
@@ -121,6 +124,54 @@ namespace FSI.BT.Tools.Commands
frmMain.Show();
return;
case "Admin":
Gui.FrmAdmin frmAdmin = new()
{
Admins = Global.Settings.Admins,
Users = Global.Settings.Users,
};
frmAdmin.ShowDialog();
if (frmAdmin.DialogResult.HasValue && frmAdmin.DialogResult.Value)
{
Global.Settings.Admins = frmAdmin.Admins;
Global.Settings.Users = frmAdmin.Users;
}
return;
case "Outlook":
files = Global.Settings.OutlookExe;
break;
case "Teams":
files = Global.Settings.TeamsExe;
arguments = Global.Settings.TeamsArg;
break;
case "Excel":
files = Global.Settings.ExcelExe;
break;
case "Word":
files = Global.Settings.WordExe;
break;
case "PaintNet":
files = Global.Settings.PaintNetExe;
break;
case "Gimp":
files = Global.Settings.GimpExe;
break;
case "Vnc":
files = Global.Settings.VncExe;
break;
case "VncAdrBook":
files = Global.Settings.VncAdrBookExe;
break;
}
string fileName = string.Empty;
@@ -177,35 +228,35 @@ namespace FSI.BT.Tools.Commands
switch ((string)parameter)
{
case "SimaticManager":
files = Global.Settings.Apps.SieSimaticManagerExe.Split(";");
files = Global.Settings.SieSimaticManagerExe;
break;
case "TIAv13":
files = Global.Settings.Apps.SieTiaV13Exe.Split(";");
files = Global.Settings.SieTiaV13Exe;
break;
case "TIAv14":
files = Global.Settings.Apps.SieTiaV14Exe.Split(";");
files = Global.Settings.SieTiaV14Exe;
break;
case "TIAv15":
files = Global.Settings.Apps.SieTiaV15Exe.Split(";");
files = Global.Settings.SieTiaV13Exe;
break;
case "TIAv16":
files = Global.Settings.Apps.SieTiaV16Exe.Split(";");
files = Global.Settings.SieTiaV16Exe;
break;
case "TIAv17":
files = Global.Settings.Apps.SieTiaV17Exe.Split(";");
files = Global.Settings.SieTiaV17Exe;
break;
case "Starter":
files = Global.Settings.Apps.SieTiaVStarterExe.Split(";");
files = Global.Settings.SieTiaVStarterExe;
break;
case "Epl":
files = Global.Settings.Apps.Epl.Exe.Split(";");
files = Global.Settings.EplExe;
break;
case "EplPrj":
@@ -218,27 +269,28 @@ namespace FSI.BT.Tools.Commands
return Global.AdminRights;
case "Npp":
files = Global.Settings.Apps.NppExe.Split(";");
files = Global.Settings.NppExe;
break;
case "TotalCmd":
files = Global.Settings.Apps.TotalCmdExe.Split(";");
files = Global.Settings.TotalCmdExe;
break;
case "TeXstudio":
files = Global.Settings.Apps.TeXstudioExe.Split(";");
files = Global.Settings.TeXstudioExe;
break;
case "VS":
files = Global.Settings.Apps.VsExe.Split(";");
files = Global.Settings.VsExe;
break;
case "VS.Code":
files = Global.Settings.Apps.VsCodeExe.Split(";");
files = Global.Settings.VsCodeExe;
break;
case "Rdp":
files = Global.Settings.Apps.RdpExe.Split(";"); ;
files = Global.Settings.RdpExe;
break;
case "DeEncrypt":
@@ -246,6 +298,42 @@ namespace FSI.BT.Tools.Commands
case "StarterCsvExporter":
return Global.AdminRights;
case "Admin":
return Global.SuperAdminRights;
case "Outlook":
files = Global.Settings.OutlookExe;
break;
case "Teams":
files = Global.Settings.TeamsExe;
break;
case "Excel":
files = Global.Settings.ExcelExe;
break;
case "Word":
files = Global.Settings.WordExe;
break;
case "PaintNet":
files = Global.Settings.PaintNetExe;
break;
case "Gimp":
files = Global.Settings.GimpExe;
break;
case "Vnc":
files = Global.Settings.VncExe;
break;
case "VncAdrBook":
files = Global.Settings.VncAdrBookExe;
break;
default: return false;
}

View File

@@ -16,43 +16,43 @@ namespace FSI.BT.Tools.Commands
switch ((string)parameter)
{
case "ZentralWeb":
url = Global.Settings.Urls.ZentralWeb;
url = Global.Settings.ZentralWebUrl;
break;
case "Schichtbuch":
url = Global.Settings.Urls.Schichtbuch;
url = Global.Settings.SchichtbuchUrl;
break;
case "SPS":
url = Global.Settings.Urls.SPS;
url = Global.Settings.SPSUrl;
break;
case "PL1.Pls":
url = Global.Settings.Urls.Pl1Pls;
url = Global.Settings.Pl1PlsUrl;
break;
case "PL2.Pls":
url = Global.Settings.Urls.Pl2Pls;
url = Global.Settings.Pl2PlsUrl;
break;
case "PL2.Als":
url = Global.Settings.Urls.Pl2Als;
url = Global.Settings.Pl2PlsAls;
break;
case "PL3.Pls":
url = Global.Settings.Urls.Pl3Pls;
url = Global.Settings.Pl3PlsUrl;
break;
case "FSI.Gitea":
url = Global.Settings.Urls.Gitea;
url = Global.Settings.GiteaUrl;
break;
case "FSI.Wiki":
url = Global.Settings.Urls.Wiki;
url = Global.Settings.WikiUrl;
break;
case "Erp":
url = Global.Settings.Urls.Erp;
url = Global.Settings.ErpUrl;
break;
}

View File

@@ -1,4 +1,5 @@
using System.Windows.Controls.Primitives;
using System;
using System.Windows.Controls.Primitives;
namespace FSI.BT.Tools.Commands
{
@@ -9,7 +10,7 @@ namespace FSI.BT.Tools.Commands
{
public override void Execute(object parameter)
{
System.Windows.Forms.Clipboard.SetDataObject(Global.Settings.General.TimeStampFormat);
System.Windows.Forms.Clipboard.SetDataObject(DateTime.Now.ToString(Global.Settings.TimeStampFormat));
var balloon = new ToolTip()
{
BalloonText = "Zeitstempel",