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

@@ -6,21 +6,30 @@ namespace FSI.BT.Tools
{
internal class Admin
{
public static bool CheckSuperAdminRight()
{
if (Global.Settings.SuperAdmin == null)
{
return false;
}
System.Security.Principal.WindowsIdentity windowsIdentity = System.Security.Principal.WindowsIdentity.GetCurrent();
if (string.Equals(Global.Settings.SuperAdmin, windowsIdentity.ShortName(), StringComparison.OrdinalIgnoreCase))
return true;
return false;
}
public static bool CheckAdminRight()
{
string adminsSettings = Lib.Settings.Setting<string>("AdminUsers", Lib.Settings.Mode.ExeSetttings);
string[] adminsCrypt = adminsSettings.Split(";;");
List<string> admins = new List<string>();
foreach (string admin in adminsCrypt)
if (Global.Settings.Admins == null)
{
try
{
admins.Add(Lib.DeEncryptString.DeEncrypt.DecryptString(Lib.DeEncryptString.DeEncrypt.DecryptString(admin, Lib.Settings.Setting<string>("DeEnCryptPasswort", Lib.Settings.Mode.ExeSetttings)), Lib.Settings.Setting<string>("DeEnCryptPasswort", Lib.Settings.Mode.ExeSetttings)));
}
catch { }
return false;
}
List<string> admins = new List<string>(Global.Settings.Admins);
System.Security.Principal.WindowsIdentity windowsIdentity = System.Security.Principal.WindowsIdentity.GetCurrent();
foreach (string admin in admins)
@@ -31,5 +40,25 @@ namespace FSI.BT.Tools
return false;
}
public static bool CheckUserRight()
{
if (Global.Settings.Users == null)
{
return false;
}
List<string> users = new List<string>(Global.Settings.Users);
System.Security.Principal.WindowsIdentity windowsIdentity = System.Security.Principal.WindowsIdentity.GetCurrent();
foreach (string user in users)
{
if (string.Equals(user, windowsIdentity.ShortName(), StringComparison.OrdinalIgnoreCase))
return true;
}
return false;
}
}
}

View File

@@ -1,80 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<appSettings>
<add key="DeEnCryptPasswort"
value="Fondium Singen GmbH"/>
<add key="Users"
value="x27xm8kujBnjlCVaIcoTTg=="/>
<add key="AdminUsers"
value="hU4oePJDurXlIZUL4WLIRTt7LoEhVS//rfdZH3O2QVsUPPJL62dqKOCbXZMDdCRih884NktbdDHgRSzsN7wjkQ=="/>
<add key="TimeStamp.Format"
value="_yyyyMMdd_HHmmss"/>
<add key="SIE.Simatic.Manager.Exe"
value="C:\Program Files (x86)\Siemens\Step7\S7BIN\S7tgtopx.exe"/>
<add key="SIE.TIA.V13.Exe"
value="C:\Program Files (x86)\Siemens\Automation\Portal V13\Bin\Siemens.Automation.Portal.exe"/>
<add key="SIE.TIA.V14.Exe"
value="C:\Program Files\Siemens\Automation\Portal V14\Bin\Siemens.Automation.Portal.exe"/>
<add key="SIE.TIA.V15.Exe"
value="C:\Program Files\Siemens\Automation\Portal V15\Bin\Siemens.Automation.Portal.exe;
C:\Program Files\Siemens\Automation\Portal V15_1\Bin\Siemens.Automation.Portal.exe"/>
<add key="SIE.TIA.V16.Exe"
value="C:\Program Files\Siemens\Automation\Portal V16\Bin\Siemens.Automation.Portal.exe"/>
<add key="SIE.TIA.V17.Exe"
value="C:\Program Files\Siemens\Automation\Portal V17\Bin\Siemens.Automation.Portal.exe"/>
<add key="SIE.Starter.Exe"
value="C:\Program Files (x86)\Siemens\Step7\S7BIN\u7wdrfax.exe"/>
<add key="Epl.Exe"
value="C:\Program Files\EPLAN\Platform\2.9.4\Bin\EPLAN.exe;
C:\Program Files\EPLAN\Platform\2022.0.3\Bin\Eplan.exe"/>
<add key="Npp.Exe"
value="C:\Windows\system32\notepad.exe;
C:\Program Files\Notepad++\notepad++.exe"/>
<add key="TeXstudio.Exe"
value="C:\Program Files\texstudio\texstudio.exe"/>
<add key="TeXstudio.Path"
value="C:\Program Files\texstudio\dictionaries"/>
<add key="TotalCmd.Exe"
value="C:\Program Files\totalcmd\TOTALCMD.EXE;
C:\Program Files\totalcmd\TOTALCMD64.EXE;
C:\totalcmd\TOTALCMD64.EXE;
C:\totalcmd\TOTALCMD.EXE"/>
<add key="VS.Exe"
value="C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\devenv.exe"/>
<add key="VS.Code.Exe"
value="%USERPROFILE%\AppData\Local\Programs\Microsoft VS Code\Code.exe"/>
<add key="Rdp.Exe"
value="%windir%\system32\mstsc.exe"/>
<add key="ZentralWeb.Url"
value="http://desiaugetwf/web/?AspxAutoDetectCookieSupport=1"/>
<add key="Schichtbuch.Url"
value="http://10.10.1.42/SKSchichtbuchWeb/de-DE/Plugin/ShiftBook/ShiftBook/IR"/>
<add key="SPS.Url"
value="http://10.10.1.42/SKChangeTrackerWeb/de-DE/Plugin/ChangeTracker"/>
<add key="PL1.PLS.Url"
value="http://10.10.200.2/SKPL1Web/index.aspx"/>
<add key="PL2.PLS.Url"
value="http://10.10.213.4/SKPL2Web/index.aspx"/>
<add key="PL2.ALS.Url"
value="http://10.10.213.234:84/emb_1/index.html"/>
<add key="PL3.PLS.Url"
value="http://10.10.202.10/SKPL3Web/index.aspx"/>
<add key="FSI.Gitea.Url"
value="http://desiaugetc7-088:3000/"/>
<add key="FSI.Wiki.Url"
value="http://desiaugetc7-088:3001/en/home"/>
<add key="Erp.Url"
value="https://mingle-portal.eu1.inforcloudsuite.com/FONDIUM_prd"/>
</appSettings>
</configuration>

View File

@@ -2,7 +2,8 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:tb="http://www.hardcodet.net/taskbar"
Startup="InitApplication">
Startup="Application_Startup"
Exit="Application_Exit">
<Application.Resources>

View File

@@ -3,10 +3,6 @@ using NHotkey;
using NHotkey.Wpf;
using System.Windows;
using System.Windows.Input;
using FSI.Lib.Wpf.ExtensionMethods;
using System.IO;
using System.Diagnostics;
using System;
namespace FSI.BT.Tools
{
@@ -18,11 +14,18 @@ namespace FSI.BT.Tools
private static readonly KeyGesture RadialMenu = new(Key.OemBackslash, ModifierKeys.Control);
private static readonly KeyGesture TimeStamp = new(Key.C, ModifierKeys.Control | ModifierKeys.Alt);
public void InitApplication(object sender, StartupEventArgs e)
public void Application_Startup(object sender, StartupEventArgs e)
{
Global.Settings = new AppSettings(GetType().Namespace.ToString() + ".xml");
Global.Settings.Load();
Global.TaskbarIcon = (TaskbarIcon)FindResource("FSINotifyIcon");
Global.AdminRights = Admin.CheckAdminRight();
Global.SuperAdminRights = Admin.CheckSuperAdminRight();
Global.UserRights = Admin.CheckUserRight();
HotkeyManager.Current.AddOrReplace("RadialMenu", RadialMenu, ShowRadialMenu);
@@ -34,7 +37,9 @@ namespace FSI.BT.Tools
private void ShowRadialMenu(object sender, HotkeyEventArgs e)
{
var cmd = new Commands.RadialMenuCommand();
cmd.Execute(null);
if (cmd.CanExecute(null))
cmd.Execute(null);
e.Handled = true;
}
@@ -47,5 +52,9 @@ namespace FSI.BT.Tools
e.Handled = true;
}
private void Application_Exit(object sender, ExitEventArgs e)
{
Global.Settings.Save();
}
}
}

View File

@@ -0,0 +1,61 @@
using FSI.Lib.WinSettings;
namespace FSI.BT.Tools
{
public class AppSettings : XmlSettings
{
public AppSettings(string fileName) : base(fileName)
{
TimeStampFormat = "_yyyyMMdd_HHmmss";
EplArguments = "/Variant:\"Electric P8\"";
SuperAdmin = "maier_s";
}
[EncryptedSetting]
public string[]? Users { get; set; }
[EncryptedSetting]
public string[]? Admins{ get; set; }
public string? SuperAdmin{ get; set; }
public string? TimeStampFormat { get; set; }
public string[]? SieSimaticManagerExe { get; set; }
public string[]? SieTiaV13Exe { get; set; }
public string[]? SieTiaV14Exe { get; set; }
public string[]? SieTiaV15Exe { get; set; }
public string[]? SieTiaV16Exe { get; set; }
public string[]? SieTiaV17Exe { get; set; }
public string[]? SieTiaVStarterExe { get; set; }
public string[]? EplExe { get; set; }
public string? EplArguments { get; set; }
public string[]? NppExe { get; set; }
public string[]? TotalCmdExe { get; set; }
public string[]? TeXstudioExe { get; set; }
public string[]? TeXstudioPath { get; set; }
public string[]? VsExe { get; set; }
public string[]? VsCodeExe { get; set; }
public string[]? RdpExe { get; set; }
public string[]? OutlookExe { get; set; }
public string[]? TeamsExe { get; set; }
public string? TeamsArg { get; set; }
public string[]? ExcelExe { get; set; }
public string[]? WordExe { get; set; }
public string[]? PaintNetExe { get; set; }
public string[]? GimpExe { get; set; }
public string[]? VncExe { get; set; }
public string[]? VncAdrBookExe { get; set; }
public string? ZentralWebUrl { get; set; }
public string? SchichtbuchUrl { get; set; }
public string? SPSUrl { get; set; }
public string? Pl1PlsUrl { get; set; }
public string? Pl2PlsUrl { get; set; }
public string? Pl2PlsAls { get; set; }
public string? Pl3PlsUrl { get; set; }
public string? GiteaUrl { get; set; }
public string? WikiUrl { get; set; }
public string? ErpUrl { get; set; }
public string? EplPdfPath { get; set; }
public string? EplPrjPath { get; set; }
}
}

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",

View File

@@ -8,13 +8,46 @@
<UseWPF>true</UseWPF>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
<ApplicationIcon>Icons\FondiumU.ico</ApplicationIcon>
<AssemblyVersion>0.1</AssemblyVersion>
<AssemblyVersion>2.0</AssemblyVersion>
</PropertyGroup>
<ItemGroup>
<None Remove="Icons\Erp.png" />
<None Remove="Icons\Plc.jpg" />
<None Remove="Icons\Rdp.png" />
<Resource Remove="Icons\Admin.jpg" />
<Resource Remove="Icons\Apps.png" />
<Resource Remove="Icons\Circuit.png" />
<Resource Remove="Icons\Close.png" />
<Resource Remove="Icons\Crypt.jpg" />
<Resource Remove="Icons\EplP8.png" />
<Resource Remove="Icons\Erp.png" />
<Resource Remove="Icons\Excel.png" />
<Resource Remove="Icons\FondiumU.ico" />
<Resource Remove="Icons\FU.png" />
<Resource Remove="Icons\Gimp.png" />
<Resource Remove="Icons\Gitea.png" />
<Resource Remove="Icons\Info.png" />
<Resource Remove="Icons\Links.png" />
<Resource Remove="Icons\NPP.png" />
<Resource Remove="Icons\Outlook.png" />
<Resource Remove="Icons\Paint.png" />
<Resource Remove="Icons\Pdf.png" />
<Resource Remove="Icons\Plc.jpg" />
<Resource Remove="Icons\Rdp.png" />
<Resource Remove="Icons\SIE.png" />
<Resource Remove="Icons\STEP7.png" />
<Resource Remove="Icons\Teams.png" />
<Resource Remove="Icons\TIAv13.jpg" />
<Resource Remove="Icons\TIAv14.jpg" />
<Resource Remove="Icons\TIAv15.jpg" />
<Resource Remove="Icons\TIAv16.jpg" />
<Resource Remove="Icons\TIAv17.jpg" />
<Resource Remove="Icons\Tools.png" />
<Resource Remove="Icons\TotalCmd.jfif" />
<Resource Remove="Icons\Vnc.png" />
<Resource Remove="Icons\VncAdrBook.png" />
<Resource Remove="Icons\Vs.png" />
<Resource Remove="Icons\VsCode.png" />
<Resource Remove="Icons\TeXstudio.png" />
<Resource Remove="Icons\Word.png" />
</ItemGroup>
<ItemGroup>
@@ -26,22 +59,29 @@
<ItemGroup>
<Resource Include="Icons\1087815.png" />
<Resource Include="Icons\Admin.jpg" />
<Resource Include="Icons\Apps.png" />
<Resource Include="Icons\Circuit.png" />
<Resource Include="Icons\Close.png" />
<Resource Include="Icons\Crypt.jpg" />
<Resource Include="Icons\EplP8.png" />
<Resource Include="Icons\Erp.png" />
<Resource Include="Icons\Excel.png" />
<Resource Include="Icons\FondiumU.ico" />
<Resource Include="Icons\FU.png" />
<Resource Include="Icons\Gimp.png" />
<Resource Include="Icons\Gitea.png" />
<Resource Include="Icons\Info.png" />
<Resource Include="Icons\Links.png" />
<Resource Include="Icons\NPP.png" />
<Resource Include="Icons\Outlook.png" />
<Resource Include="Icons\Paint.png" />
<Resource Include="Icons\Pdf.png" />
<Resource Include="Icons\Plc.jpg" />
<Resource Include="Icons\Rdp.png" />
<Resource Include="Icons\SIE.png" />
<Resource Include="Icons\STEP7.png" />
<Resource Include="Icons\Teams.png" />
<Resource Include="Icons\TIAv13.jpg" />
<Resource Include="Icons\TIAv14.jpg" />
<Resource Include="Icons\TIAv15.jpg" />
@@ -49,9 +89,18 @@
<Resource Include="Icons\TIAv17.jpg" />
<Resource Include="Icons\Tools.png" />
<Resource Include="Icons\TotalCmd.jfif" />
<Resource Include="Icons\Vnc.png" />
<Resource Include="Icons\VncAdrBook.png" />
<Resource Include="Icons\Vs.png" />
<Resource Include="Icons\VsCode.png" />
<Resource Include="Icons\TeXstudio.png" />
<Resource Include="Icons\Word.png" />
</ItemGroup>
<ItemGroup>
<None Update="FSI.BT.Tools.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>

View File

@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<Settings>
<Users>+I945AMzKKYBAAAAB21haWVyX3M=</Users>
<Admins>e+Dt7FRUDDoBAAAAB21haWVyX3M=</Admins>
<SuperAdmin>maier_s</SuperAdmin>
<TimeStampFormat>_yyyyMMdd_HHmmss</TimeStampFormat>
<SieSimaticManagerExe>C:\Program Files (x86)\Siemens\Step7\S7BIN\S7tgtopx.exe</SieSimaticManagerExe>
<SieTiaV13Exe>C:\Program Files (x86)\Siemens\Automation\Portal V13\Bin\Siemens.Automation.Portal.exe</SieTiaV13Exe>
<SieTiaV14Exe>C:\Program Files\Siemens\Automation\Portal V14\Bin\Siemens.Automation.Portal.exe</SieTiaV14Exe>
<SieTiaV15Exe>C:\Program Files\Siemens\Automation\Portal V15\Bin\Siemens.Automation.Portal.exe,c:\Program Files\Siemens\Automation\Portal V15_1\Bin\Siemens.Automation.Portal.exe</SieTiaV15Exe>
<SieTiaV16Exe>C:\Program Files\Siemens\Automation\Portal V16\Bin\Siemens.Automation.Portal.exe</SieTiaV16Exe>
<SieTiaV17Exe>C:\Program Files\Siemens\Automation\Portal V17\Bin\Siemens.Automation.Portal.exe</SieTiaV17Exe>
<SieTiaVStarterExe>C:\Program Files (x86)\Siemens\Step7\S7BIN\u7wdrfax.exe</SieTiaVStarterExe>
<EplExe>C:\Program Files\EPLAN\Platform\2.9.4\Bin\EPLAN.exe,C:\Program Files\EPLAN\Platform\2022.0.3\Bin\Eplan.exe</EplExe>
<EplArguments>/Variant:"Electric P8"</EplArguments>
<NppExe>C:\Windows\system32\notepad.exe,c:\Program Files\Notepad++\notepad++.exe</NppExe>
<TotalCmdExe>C:\Program Files\totalcmd\TOTALCMD.EXE,C:\Program Files\totalcmd\TOTALCMD64.EXE,C:\totalcmd\TOTALCMD64.EXE,C:\totalcmd\TOTALCMD.EXE</TotalCmdExe>
<TeXstudioExe>C:\Program Files\texstudio\texstudio.exe</TeXstudioExe>
<TeXstudioPath>C:\Program Files\texstudio\dictionaries</TeXstudioPath>
<VsExe>C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\devenv.exe</VsExe>
<VsCodeExe>%USERPROFILE%\AppData\Local\Programs\Microsoft VS Code\Code.exe</VsCodeExe>
<RdpExe>%windir%\system32\mstsc.exe</RdpExe>
<OutlookExe>C:\Program Files (x86)\Microsoft Office\root\Office16\OUTLOOK.EXE</OutlookExe>
<TeamsExe>C:\Users\maier_s\AppData\Local\Microsoft\Teams\Update.exe</TeamsExe>
<TeamsArg>--processStart ""Teams.exe""</TeamsArg>
<ExcelExe>C:\Program Files (x86)\Microsoft Office\root\Office16\EXCEL.EXE</ExcelExe>
<WordExe>C:\Program Files (x86)\Microsoft Office\root\Office16\WINWORD.EXE</WordExe>
<PaintNetExe>C:\Program Files\paint.net\paintdotnet.exe</PaintNetExe>
<GimpExe>C:\Program Files\GIMP 2\bin\gimp-2.10.exe</GimpExe>
<VncExe>C:\Program Files\RealVNC\VNC Viewer\vncviewer.exe,c:\Users\maier_s\OneDrive - Fondium Group GmbH\Documents\Apps\VNC-Viewer-6.20.113-Windows-64bit.exe</VncExe>
<VncAdrBookExe>C:\Program Files\RealVNC\VNC Viewer\vncaddrbook.exe</VncAdrBookExe>
<ZentralWebUrl>http://desiaugetwf/web/?AspxAutoDetectCookieSupport=1</ZentralWebUrl>
<SchichtbuchUrl>http://10.10.1.42/SKSchichtbuchWeb/de-DE/Plugin/ShiftBook/ShiftBook/IR</SchichtbuchUrl>
<SPSUrl>http://10.10.1.42/SKChangeTrackerWeb/de-DE/Plugin/ChangeTracker</SPSUrl>
<Pl1PlsUrl>http://10.10.200.2/SKPL1Web/index.aspx</Pl1PlsUrl>
<Pl2PlsUrl>http://10.10.213.4/SKPL2Web/index.aspx</Pl2PlsUrl>
<Pl2PlsAls>http://10.10.213.234:84/emb_1/index.html</Pl2PlsAls>
<Pl3PlsUrl>http://10.10.202.10/SKPL3Web/index.aspx</Pl3PlsUrl>
<GiteaUrl>http://desiaugetc7-088:3000/</GiteaUrl>
<WikiUrl>http://desiaugetc7-088:3001/en/home</WikiUrl>
<ErpUrl>https://mingle-portal.eu1.inforcloudsuite.com/FONDIUM_prd</ErpUrl>
<EplPdfPath>\\10.10.1.40\Betriebstechnik\Eplan</EplPdfPath>
<EplPrjPath>\\fondium.org\DESI$\AUG_Abteilung\Betriebstechnik\EPL\P8\Data\Projekte\FSI\</EplPrjPath>
</Settings>

View File

@@ -39,7 +39,7 @@
<RadialMenu:RadialMenu IsOpen="{Binding IsOpenHome}">
<RadialMenu:RadialMenu.CentralItem>
<RadialMenu:RadialMenuCentralItem Command="{Binding CloseRadialMenuHome}" >
<RadialMenu:RadialMenuCentralItem Command="{Binding CloseRadialMenuHome}">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
@@ -49,11 +49,10 @@
</RadialMenu:RadialMenuCentralItem>
</RadialMenu:RadialMenu.CentralItem>
<RadialMenu:RadialMenuItem Command="{Binding OpenRadialMenuEpl}"
Click="RadialMenuItem_Click">
<RadialMenu:RadialMenuItem Command="{Binding OpenRadialMenuEpl}">
<WrapPanel Orientation="Vertical">
<Rectangle Width="40"
Height="40">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
<ImageBrush ImageSource="../../Icons/EplP8.png" />
</Rectangle.Fill>
@@ -65,11 +64,10 @@
</WrapPanel>
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{Binding OpenRadialMenuTools}"
Click="RadialMenuItem_Click">
<RadialMenu:RadialMenuItem Command="{Binding OpenRadialMenuTools}">
<WrapPanel Orientation="Vertical">
<Rectangle Width="40"
Height="40">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
<ImageBrush ImageSource="../../Icons/Tools.png" />
</Rectangle.Fill>
@@ -81,11 +79,10 @@
</WrapPanel>
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{Binding OpenRadialMenuSie}"
Click="RadialMenuItem_Click">
<RadialMenu:RadialMenuItem Command="{Binding OpenRadialMenuSie}">
<WrapPanel Orientation="Vertical">
<Rectangle Width="40"
Height="40">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
<ImageBrush ImageSource="../../Icons/SIE.png" />
</Rectangle.Fill>
@@ -98,11 +95,10 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="TotalCmd"
Click="RadialMenuItem_Click">
CommandParameter="TotalCmd">
<WrapPanel Orientation="Vertical">
<Rectangle Width="35"
Height="35">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
<ImageBrush ImageSource="../../Icons/TotalCmd.jfif" />
</Rectangle.Fill>
@@ -115,27 +111,25 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="Npp"
Click="RadialMenuItem_Click">
CommandParameter="Npp">
<WrapPanel Orientation="Vertical">
<Rectangle Width="35"
Height="35">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
<ImageBrush ImageSource="../../Icons/NPP.png" />
</Rectangle.Fill>
</Rectangle>
<TextBlock FontSize="14"
TextAlignment="Center">
Notepad++
N++
</TextBlock>
</WrapPanel>
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{Binding OpenRadialMenuLinks}"
Click="RadialMenuItem_Click">
<RadialMenu:RadialMenuItem Command="{Binding OpenRadialMenuLinks}">
<WrapPanel Orientation="Vertical">
<Rectangle Width="35"
Height="35">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
<ImageBrush ImageSource="../../Icons/Links.png" />
</Rectangle.Fill>
@@ -147,6 +141,53 @@
</WrapPanel>
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="Outlook">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
<ImageBrush ImageSource="../../Icons/Outlook.png" />
</Rectangle.Fill>
</Rectangle>
<TextBlock FontSize="14"
TextAlignment="Center">
Outlook
</TextBlock>
</WrapPanel>
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="Teams">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
<ImageBrush ImageSource="../../Icons/Teams.png" />
</Rectangle.Fill>
</Rectangle>
<TextBlock FontSize="14"
TextAlignment="Center">
Teams
</TextBlock>
</WrapPanel>
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{Binding OpenRadialMenuApps}">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
<ImageBrush ImageSource="../../Icons/Apps.png" />
</Rectangle.Fill>
</Rectangle>
<TextBlock FontSize="14"
TextAlignment="Center">
Apps
</TextBlock>
</WrapPanel>
</RadialMenu:RadialMenuItem>
</RadialMenu:RadialMenu>
<RadialMenu:RadialMenu IsOpen="{Binding IsOpenEpl}">
@@ -163,8 +204,7 @@
</RadialMenu:RadialMenu.CentralItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="Epl"
Click="RadialMenuItem_Click">
CommandParameter="Epl">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -180,8 +220,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="EplPrj"
Click="RadialMenuItem_Click">
CommandParameter="EplPrj">
<WrapPanel Orientation="Vertical">
<Rectangle Width="35"
Height="35">
@@ -197,8 +236,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="EplPdf"
Click="RadialMenuItem_Click">
CommandParameter="EplPdf">
<WrapPanel Orientation="Vertical">
<Rectangle Width="35"
Height="35">
@@ -213,8 +251,8 @@
</WrapPanel>
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{Binding OpenEplPdfMgt}"
Click="RadialMenuItem_Click">
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="EplPdfMgt">
<WrapPanel Orientation="Vertical">
<Rectangle Width="35"
Height="35">
@@ -234,8 +272,7 @@
<RadialMenu:RadialMenu IsOpen="{Binding IsOpenTools}">
<RadialMenu:RadialMenu.CentralItem>
<RadialMenu:RadialMenuCentralItem Command="{Binding OpenRadialMenuHome}"
Click="RadialMenuItem_Click">
<RadialMenu:RadialMenuCentralItem Command="{Binding OpenRadialMenuHome}">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
@@ -246,8 +283,7 @@
</RadialMenu:RadialMenu.CentralItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="DeEncrypt"
Click="RadialMenuItem_Click">
CommandParameter="DeEncrypt">
<WrapPanel Orientation="Vertical">
<Rectangle Width="40"
Height="40">
@@ -263,8 +299,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="Rdp"
Click="RadialMenuItem_Click">
CommandParameter="Rdp">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -280,8 +315,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="VS"
Click="RadialMenuItem_Click">
CommandParameter="VS">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -297,8 +331,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="VS.Code"
Click="RadialMenuItem_Click">
CommandParameter="VS.Code">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -315,8 +348,7 @@
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="TeXstudio"
Click="RadialMenuItem_Click">
CommandParameter="TeXstudio">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -332,8 +364,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="StarterCsvExporter"
Click="RadialMenuItem_Click">
CommandParameter="StarterCsvExporter">
<WrapPanel Orientation="Vertical">
<Rectangle Width="40"
Height="40">
@@ -348,6 +379,22 @@
</WrapPanel>
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="Admin">
<WrapPanel Orientation="Vertical">
<Rectangle Width="40"
Height="40">
<Rectangle.Fill>
<ImageBrush ImageSource="../../Icons/Admin.jpg" />
</Rectangle.Fill>
</Rectangle>
<TextBlock FontSize="14"
TextAlignment="Center">
Admin
</TextBlock>
</WrapPanel>
</RadialMenu:RadialMenuItem>
</RadialMenu:RadialMenu>
<RadialMenu:RadialMenu IsOpen="{Binding IsOpenSie}">
@@ -364,8 +411,7 @@
</RadialMenu:RadialMenu.CentralItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="SimaticManager"
Click="RadialMenuItem_Click">
CommandParameter="SimaticManager">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -381,8 +427,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="TIAv13"
Click="RadialMenuItem_Click">
CommandParameter="TIAv13">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -398,8 +443,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="TIAv14"
Click="RadialMenuItem_Click">
CommandParameter="TIAv14">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -415,8 +459,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="TIAv15"
Click="RadialMenuItem_Click">
CommandParameter="TIAv15">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -432,8 +475,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="TIAv16"
Click="RadialMenuItem_Click">
CommandParameter="TIAv16">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -449,8 +491,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="TIAv17"
Click="RadialMenuItem_Click">
CommandParameter="TIAv17">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -466,8 +507,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="Starter"
Click="RadialMenuItem_Click">
CommandParameter="Starter">
<WrapPanel Orientation="Vertical">
<Rectangle Width="50"
Height="50">
@@ -487,8 +527,7 @@
<RadialMenu:RadialMenu IsOpen="{Binding IsOpenLinks}">
<RadialMenu:RadialMenu.CentralItem>
<RadialMenu:RadialMenuCentralItem Command="{Binding OpenRadialMenuHome}"
Click="RadialMenuItem_Click">
<RadialMenu:RadialMenuCentralItem Command="{Binding OpenRadialMenuHome}">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
@@ -498,8 +537,7 @@
</RadialMenu:RadialMenuCentralItem>
</RadialMenu:RadialMenu.CentralItem>
<RadialMenu:RadialMenuItem Command="{Binding OpenRadialMenuPlantLinks}"
Click="RadialMenuItem_Click">
<RadialMenu:RadialMenuItem Command="{Binding OpenRadialMenuPlantLinks}">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -515,8 +553,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenLinkCommand}"
CommandParameter="Erp"
Click="RadialMenuItem_Click">
CommandParameter="Erp">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -531,10 +568,9 @@
</WrapPanel>
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenLinkCommand}"
CommandParameter="ZentralWeb"
Click="RadialMenuItem_Click">
CommandParameter="ZentralWeb">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -550,8 +586,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenLinkCommand}"
CommandParameter="Schichtbuch"
Click="RadialMenuItem_Click">
CommandParameter="Schichtbuch">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -567,8 +602,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenLinkCommand}"
CommandParameter="SPS"
Click="RadialMenuItem_Click">
CommandParameter="SPS">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -584,8 +618,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenLinkCommand}"
CommandParameter="FSI.Gitea"
Click="RadialMenuItem_Click">
CommandParameter="FSI.Gitea">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -595,14 +628,13 @@
</Rectangle>
<TextBlock FontSize="14"
TextAlignment="Center">
FSI<LineBreak />Gitea
Gitea
</TextBlock>
</WrapPanel>
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenLinkCommand}"
CommandParameter="FSI.Wiki"
Click="RadialMenuItem_Click">
CommandParameter="FSI.Wiki">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -632,8 +664,7 @@
</RadialMenu:RadialMenu.CentralItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenLinkCommand}"
CommandParameter="ZentralWeb"
Click="RadialMenuItem_Click">
CommandParameter="ZentralWeb">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -649,8 +680,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenLinkCommand}"
CommandParameter="PL1.PLS"
Click="RadialMenuItem_Click">
CommandParameter="PL1.PLS">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -666,8 +696,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenLinkCommand}"
CommandParameter="PL2.PLS"
Click="RadialMenuItem_Click">
CommandParameter="PL2.PLS">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -683,8 +712,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenLinkCommand}"
CommandParameter="PL2.Als"
Click="RadialMenuItem_Click">
CommandParameter="PL2.Als">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -700,8 +728,7 @@
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenLinkCommand}"
CommandParameter="PL3.Pls"
Click="RadialMenuItem_Click">
CommandParameter="PL3.Pls">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
@@ -718,6 +745,117 @@
</RadialMenu:RadialMenu>
<RadialMenu:RadialMenu IsOpen="{Binding IsOpenApps}">
<RadialMenu:RadialMenu.CentralItem>
<RadialMenu:RadialMenuCentralItem Command="{Binding OpenRadialMenuHome}">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
<ImageBrush ImageSource="../../Icons/FondiumU.ico" />
</Rectangle.Fill>
</Rectangle>
</RadialMenu:RadialMenuCentralItem>
</RadialMenu:RadialMenu.CentralItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="Excel">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
<ImageBrush ImageSource="../../Icons/Excel.png" />
</Rectangle.Fill>
</Rectangle>
<TextBlock FontSize="14"
TextAlignment="Center">
Excel
</TextBlock>
</WrapPanel>
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="Word">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
<ImageBrush ImageSource="../../Icons/Word.png" />
</Rectangle.Fill>
</Rectangle>
<TextBlock FontSize="14"
TextAlignment="Center">
Word
</TextBlock>
</WrapPanel>
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="PaintNet">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
<ImageBrush ImageSource="../../Icons/Paint.png" />
</Rectangle.Fill>
</Rectangle>
<TextBlock FontSize="14"
TextAlignment="Center">
Paint.Net
</TextBlock>
</WrapPanel>
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="Gimp">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
<ImageBrush ImageSource="../../Icons/Gimp.png" />
</Rectangle.Fill>
</Rectangle>
<TextBlock FontSize="14"
TextAlignment="Center">
Gimp
</TextBlock>
</WrapPanel>
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="Vnc">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
<ImageBrush ImageSource="../../Icons/Vnc.png" />
</Rectangle.Fill>
</Rectangle>
<TextBlock FontSize="14"
TextAlignment="Center">
VNC
</TextBlock>
</WrapPanel>
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="VncAdrBook">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
<ImageBrush ImageSource="../../Icons/VncAdrBook.png" />
</Rectangle.Fill>
</Rectangle>
<TextBlock FontSize="14"
TextAlignment="Center">
VNC<LineBreak />Adressbuch
</TextBlock>
</WrapPanel>
</RadialMenu:RadialMenuItem>
</RadialMenu:RadialMenu>
</Grid>
</Canvas>

View File

@@ -56,6 +56,7 @@ namespace FSI.BT.Tools
IsOpenEpl =
IsOpenTools =
IsOpenSie =
IsOpenApps =
IsOpenLinks = false;
});
}
@@ -213,6 +214,36 @@ namespace FSI.BT.Tools
#endregion
#region Apps
private bool _isOpenApps = false;
public bool IsOpenApps
{
get
{
return _isOpenApps;
}
set
{
_isOpenApps = value;
RaisePropertyChanged();
}
}
public ICommand OpenRadialMenuApps
{
get
{
return new RelayCommand(() =>
{
IsOpenApps = true;
IsOpenHome = false;
});
}
}
#endregion
public event PropertyChangedEventHandler PropertyChanged;
void RaisePropertyChanged([CallerMemberName] string? propertyName = null)
@@ -229,38 +260,8 @@ namespace FSI.BT.Tools
IsOpenTools =
IsOpenSie =
IsOpenLinks =
IsOpenApps =
IsOpenPlantLinks = false;
}
private void RadialMenuItem_Click(object sender, RoutedEventArgs e)
{
int left = Convert.ToInt32(GetActualLeft() + this.ActualWidth / 2);
int top = Convert.ToInt32(GetActuaTop() + this.ActualHeight / 2);
System.Windows.Forms.Cursor.Position = new System.Drawing.Point(left, top);
}
private double GetActualLeft()
{
if (this.WindowState == WindowState.Maximized)
{
var leftField = typeof(Window).GetField("_actualLeft", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
return (double)leftField.GetValue(this);
}
else
return this.Left;
}
private double GetActuaTop()
{
if (this.WindowState == WindowState.Maximized)
{
var topField = typeof(Window).GetField("_actualTop", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
return (double)topField.GetValue(this);
}
else
return this.Top;
}
}
}

View File

@@ -1,4 +1,5 @@
using Hardcodet.Wpf.TaskbarNotification;
using FSI.Lib.WinSettings;
using Hardcodet.Wpf.TaskbarNotification;
namespace FSI.BT.Tools
{
@@ -9,171 +10,12 @@ namespace FSI.BT.Tools
public static TaskbarIcon? TaskbarIcon { get; set; }
public static AppSettings? Settings { get; set; }
public static bool UserRights { get; set; }
public static bool AdminRights { get; set; }
public static class Settings
{
public static class General
{
public static string DeEnCryptPasswort
{
get
{
return FSI.Lib.Settings.Setting<string>("DeEnCryptPasswort", Lib.Settings.Mode.ExeSetttings);
}
}
public static string TimeStampFormat
{
get
{
return FSI.Lib.Settings.Setting<string>("TimeStamp.Format", Lib.Settings.Mode.ExeSetttings);
}
}
}
public static class Apps
{
public static string SieSimaticManagerExe
{
get { return FSI.Lib.Settings.Setting<string>("SIE.Simatic.Manager.Exe", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string SieTiaV13Exe
{
get { return FSI.Lib.Settings.Setting<string>("SIE.TIA.V13.Exe", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string SieTiaV14Exe
{
get { return FSI.Lib.Settings.Setting<string>("SIE.TIA.V14.Exe", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string SieTiaV15Exe
{
get { return FSI.Lib.Settings.Setting<string>("SIE.TIA.V15.Exe", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string SieTiaV16Exe
{
get { return FSI.Lib.Settings.Setting<string>("SIE.TIA.V16.Exe", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string SieTiaV17Exe
{
get { return FSI.Lib.Settings.Setting<string>("SIE.TIA.V17.Exe", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string SieTiaVStarterExe
{
get { return FSI.Lib.Settings.Setting<string>("SIE.Starter.Exe", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static class Epl
{
public static string Exe
{
get { return FSI.Lib.Settings.Setting<string>("Epl.Exe", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string Arguments
{
get { return "/Variant:\"Electric P8\""; }
}
}
public static string NppExe
{
get { return FSI.Lib.Settings.Setting<string>("Npp.Exe", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string TotalCmdExe
{
get { return FSI.Lib.Settings.Setting<string>("TotalCmd.Exe", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string TeXstudioExe
{
get { return FSI.Lib.Settings.Setting<string>("TeXstudio.Exe", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string TeXstudioPath
{
get { return FSI.Lib.Settings.Setting<string>("TeXstudio.Path", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string VsExe
{
get { return FSI.Lib.Settings.Setting<string>("VS.Exe", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static bool SuperAdminRights { get; set; }
public static string VsCodeExe
{
get { return FSI.Lib.Settings.Setting<string>("VS.Code.Exe", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string RdpExe
{
get { return FSI.Lib.Settings.Setting<string>("Rdp.Exe", FSI.Lib.Settings.Mode.ExeSetttings); }
}
}
public static class Urls
{
public static string ZentralWeb
{
get { return FSI.Lib.Settings.Setting<string>("ZentralWeb.Url", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string Schichtbuch
{
get { return FSI.Lib.Settings.Setting<string>("Schichtbuch.Url", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string SPS
{
get { return FSI.Lib.Settings.Setting<string>("SPS.Url", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string Pl1Pls
{
get { return FSI.Lib.Settings.Setting<string>("PL1.Pls.Url", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string Pl2Pls
{
get { return FSI.Lib.Settings.Setting<string>("PL2.Pls.Url", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string Pl2Als
{
get { return FSI.Lib.Settings.Setting<string>("PL2.Als.Url", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string Pl3Pls
{
get { return FSI.Lib.Settings.Setting<string>("PL3.Pls.Url", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string Gitea
{
get { return FSI.Lib.Settings.Setting<string>("FSI.Gitea.Url", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string Wiki
{
get { return FSI.Lib.Settings.Setting<string>("FSI.Gitea.Url", FSI.Lib.Settings.Mode.ExeSetttings); }
}
public static string Erp
{
get { return FSI.Lib.Settings.Setting<string>("Erp.Url", FSI.Lib.Settings.Mode.ExeSetttings); }
}
}
}
}
}

View File

@@ -0,0 +1,48 @@
<Window x:Class="FSI.BT.Tools.Gui.FrmAdmin"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:FSI.BT.Tools.Gui"
mc:Ignorable="d"
Title="Admin-/Benutzerverwaltung"
SizeToContent="WidthAndHeight"
Height="Auto"
MinWidth="800"
Loaded="Window_Loaded">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="200" />
<RowDefinition Height="Auto" />
<RowDefinition Height="200" />
<RowDefinition Height="30" />
</Grid.RowDefinitions>
<Label Content="Benutzer:" />
<TextBox x:Name="tbUsers"
Grid.Row="1"
AcceptsReturn="true"
VerticalScrollBarVisibility="Visible"
HorizontalScrollBarVisibility="Visible" />
<Label Grid.Row="2"
Content="Admins:" />
<TextBox x:Name="tbAdmins"
Grid.Row="3"
AcceptsReturn="true"
VerticalScrollBarVisibility="Visible"
HorizontalScrollBarVisibility="Visible" />
<StackPanel Grid.Row="4" Orientation="Horizontal">
<Button x:Name="btnOk"
Margin="5 5 5 5"
Content="Speichern"
Click="btnOk_Click" />
<Button x:Name="btnCancel"
Margin="5 5 5 5 "
Content="Abbruch"
Click="btnCancel_Click" />
</StackPanel>
</Grid>
</Window>

View File

@@ -0,0 +1,51 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace FSI.BT.Tools.Gui
{
/// <summary>
/// Interaktionslogik für FrmAdmin.xaml
/// </summary>
public partial class FrmAdmin : Window
{
public string[] Admins { get; set; }
public string[] Users { get; set; }
public FrmAdmin()
{
InitializeComponent();
}
private void btnOk_Click(object sender, RoutedEventArgs e)
{
Admins = tbAdmins.Text.Split(Environment.NewLine);
Users = tbUsers.Text.Split(Environment.NewLine);
DialogResult = true;
Close();
}
private void btnCancel_Click(object sender, RoutedEventArgs e)
{
DialogResult = false;
Close();
}
private void Window_Loaded(object sender, RoutedEventArgs e)
{
tbAdmins.Text = String.Join(Environment.NewLine, Admins);
tbUsers.Text = String.Join(Environment.NewLine, Users);
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 658 KiB

BIN
FSI.BT.Tools/Icons/Apps.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

BIN
FSI.BT.Tools/Icons/Gimp.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 76 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

BIN
FSI.BT.Tools/Icons/Vnc.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

BIN
FSI.BT.Tools/Icons/Word.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB