diff --git a/FSI.BT.Tools/App.xaml.cs b/FSI.BT.Tools/App.xaml.cs index 26bdd63..9497b17 100644 --- a/FSI.BT.Tools/App.xaml.cs +++ b/FSI.BT.Tools/App.xaml.cs @@ -32,6 +32,15 @@ namespace FSI.BT.Tools HotkeyManager.Current.AddOrReplace("TimeStampToClipboard", TimeStamp, TimeStampToClipboard); Global.FrmRadialMenu = new(); + + Global.WinCC = new() + { + AutoStart = Global.Settings.SieTiaWinCCMsgMgtAutostart, + UpdateIntervall = Global.Settings.SieTiaWinCCMsgMgtUpdateIntervall, + WindowsName = Global.Settings.SieTiaWinCCMsgMgtWindowsName, + WindowsClassName = Global.Settings.SieTiaWinCCMsgMgtClassName, + ButtonName = Global.Settings.SieTiaWinCCMsgMgtBtnName, + }; } private void ShowRadialMenu(object sender, HotkeyEventArgs e) diff --git a/FSI.BT.Tools/AppSettings.cs b/FSI.BT.Tools/AppSettings.cs index 1bb85f8..75055b2 100644 --- a/FSI.BT.Tools/AppSettings.cs +++ b/FSI.BT.Tools/AppSettings.cs @@ -55,5 +55,10 @@ namespace FSI.BT.Tools public string? ErpUrl { get; set; } public string? EplPdfPath { get; set; } public string? EplPrjPath { get; set; } + public bool SieTiaWinCCMsgMgtAutostart { get; set; } + public int SieTiaWinCCMsgMgtUpdateIntervall { get; set; } + public string? SieTiaWinCCMsgMgtWindowsName { get; set; } + public string? SieTiaWinCCMsgMgtClassName { get; set; } + public string? SieTiaWinCCMsgMgtBtnName { get; set; } } } diff --git a/FSI.BT.Tools/Commands/OpenAppCommand.cs b/FSI.BT.Tools/Commands/OpenAppCommand.cs index e532dc0..9784668 100644 --- a/FSI.BT.Tools/Commands/OpenAppCommand.cs +++ b/FSI.BT.Tools/Commands/OpenAppCommand.cs @@ -32,7 +32,7 @@ namespace FSI.BT.Tools.Commands break; case "TIAv15": - files = Global.Settings.SieTiaV13Exe; + files = Global.Settings.SieTiaV15Exe; break; case "TIAv16": diff --git a/FSI.BT.Tools/Commands/ProcessCommand.cs b/FSI.BT.Tools/Commands/ProcessCommand.cs new file mode 100644 index 0000000..e1a38f2 --- /dev/null +++ b/FSI.BT.Tools/Commands/ProcessCommand.cs @@ -0,0 +1,21 @@ +using System.Windows; + +namespace FSI.BT.Tools.Commands +{ + /// + /// Shows the main window. + /// + public class ProcessCommand : CommandBase + { + public override void Execute(object parameter) + { + Gui.FrmProcesses frm = new(); + frm.ShowDialog(); + } + + public override bool CanExecute(object parameter) + { + return Global.AdminRights; + } + } +} \ No newline at end of file diff --git a/FSI.BT.Tools/FSI.BT.Tools.csproj b/FSI.BT.Tools/FSI.BT.Tools.csproj index e0c5057..01b9afe 100644 --- a/FSI.BT.Tools/FSI.BT.Tools.csproj +++ b/FSI.BT.Tools/FSI.BT.Tools.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows + net6.0-windows;net472 WinExe enable true diff --git a/FSI.BT.Tools/FSI.BT.Tools.xml b/FSI.BT.Tools/FSI.BT.Tools.xml index 4857dc0..07b32f0 100644 --- a/FSI.BT.Tools/FSI.BT.Tools.xml +++ b/FSI.BT.Tools/FSI.BT.Tools.xml @@ -1,44 +1,49 @@  - +I945AMzKKYBAAAAB21haWVyX3M= - e+Dt7FRUDDoBAAAAB21haWVyX3M= - maier_s - _yyyyMMdd_HHmmss - C:\Program Files (x86)\Siemens\Step7\S7BIN\S7tgtopx.exe - C:\Program Files (x86)\Siemens\Automation\Portal V13\Bin\Siemens.Automation.Portal.exe - C:\Program Files\Siemens\Automation\Portal V14\Bin\Siemens.Automation.Portal.exe - 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 - C:\Program Files\Siemens\Automation\Portal V16\Bin\Siemens.Automation.Portal.exe - C:\Program Files\Siemens\Automation\Portal V17\Bin\Siemens.Automation.Portal.exe - C:\Program Files (x86)\Siemens\Step7\S7BIN\u7wdrfax.exe - C:\Program Files\EPLAN\Platform\2.9.4\Bin\EPLAN.exe,C:\Program Files\EPLAN\Platform\2022.0.3\Bin\Eplan.exe - /Variant:"Electric P8" - C:\Windows\system32\notepad.exe,c:\Program Files\Notepad++\notepad++.exe - C:\Program Files\totalcmd\TOTALCMD.EXE,C:\Program Files\totalcmd\TOTALCMD64.EXE,C:\totalcmd\TOTALCMD64.EXE,C:\totalcmd\TOTALCMD.EXE - C:\Program Files\texstudio\texstudio.exe - C:\Program Files\texstudio\dictionaries - C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\devenv.exe - %USERPROFILE%\AppData\Local\Programs\Microsoft VS Code\Code.exe - %windir%\system32\mstsc.exe - C:\Program Files (x86)\Microsoft Office\root\Office16\OUTLOOK.EXE - C:\Users\maier_s\AppData\Local\Microsoft\Teams\Update.exe - --processStart ""Teams.exe"" - C:\Program Files (x86)\Microsoft Office\root\Office16\EXCEL.EXE - C:\Program Files (x86)\Microsoft Office\root\Office16\WINWORD.EXE - C:\Program Files\paint.net\paintdotnet.exe - C:\Program Files\GIMP 2\bin\gimp-2.10.exe - 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 - C:\Program Files\RealVNC\VNC Viewer\vncaddrbook.exe - http://desiaugetwf/web/?AspxAutoDetectCookieSupport=1 - http://10.10.1.42/SKSchichtbuchWeb/de-DE/Plugin/ShiftBook/ShiftBook/IR - http://10.10.1.42/SKChangeTrackerWeb/de-DE/Plugin/ChangeTracker - http://10.10.200.2/SKPL1Web/index.aspx - http://10.10.213.4/SKPL2Web/index.aspx - http://10.10.213.234:84/emb_1/index.html - http://10.10.202.10/SKPL3Web/index.aspx - http://desiaugetc7-088:3000/ - http://desiaugetc7-088:3001/en/home - https://mingle-portal.eu1.inforcloudsuite.com/FONDIUM_prd - \\10.10.1.40\Betriebstechnik\Eplan - \\fondium.org\DESI$\AUG_Abteilung\Betriebstechnik\EPL\P8\Data\Projekte\FSI\ + +I945AMzKKYBAAAAB21haWVyX3M= + e+Dt7FRUDDoBAAAAB21haWVyX3M= + maier_s + _yyyyMMdd_HHmmss + C:\Program Files (x86)\Siemens\Step7\S7BIN\S7tgtopx.exe + C:\Program Files (x86)\Siemens\Automation\Portal V13\Bin\Siemens.Automation.Portal.exe + C:\Program Files\Siemens\Automation\Portal V14\Bin\Siemens.Automation.Portal.exe + 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 + C:\Program Files\Siemens\Automation\Portal V16\Bin\Siemens.Automation.Portal.exe + C:\Program Files\Siemens\Automation\Portal V17\Bin\Siemens.Automation.Portal.exe + C:\Program Files (x86)\Siemens\Step7\S7BIN\u7wdrfax.exe + C:\Program Files\EPLAN\Platform\2.9.4\Bin\EPLAN.exe,C:\Program Files\EPLAN\Platform\2022.0.3\Bin\Eplan.exe + /Variant:"Electric P8" + C:\Windows\system32\notepad.exe,c:\Program Files\Notepad++\notepad++.exe + C:\Program Files\totalcmd\TOTALCMD.EXE,C:\Program Files\totalcmd\TOTALCMD64.EXE,C:\totalcmd\TOTALCMD64.EXE,C:\totalcmd\TOTALCMD.EXE + C:\Program Files\texstudio\texstudio.exe + C:\Program Files\texstudio\dictionaries + C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\devenv.exe + %USERPROFILE%\AppData\Local\Programs\Microsoft VS Code\Code.exe + %windir%\system32\mstsc.exe + C:\Program Files (x86)\Microsoft Office\root\Office16\OUTLOOK.EXE + C:\Users\maier_s\AppData\Local\Microsoft\Teams\Update.exe + --processStart ""Teams.exe"" + C:\Program Files (x86)\Microsoft Office\root\Office16\EXCEL.EXE + C:\Program Files (x86)\Microsoft Office\root\Office16\WINWORD.EXE + C:\Program Files\paint.net\paintdotnet.exe + C:\Program Files\GIMP 2\bin\gimp-2.10.exe + 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 + C:\Program Files\RealVNC\VNC Viewer\vncaddrbook.exe + http://desiaugetwf/web/?AspxAutoDetectCookieSupport=1 + http://10.10.1.42/SKSchichtbuchWeb/de-DE/Plugin/ShiftBook/ShiftBook/IR + http://10.10.1.42/SKChangeTrackerWeb/de-DE/Plugin/ChangeTracker + http://10.10.200.2/SKPL1Web/index.aspx + http://10.10.213.4/SKPL2Web/index.aspx + http://10.10.213.234:84/emb_1/index.html + http://10.10.202.10/SKPL3Web/index.aspx + http://desiaugetc7-088:3000/ + http://desiaugetc7-088:3001/en/home + https://mingle-portal.eu1.inforcloudsuite.com/FONDIUM_prd + \\10.10.1.40\Betriebstechnik\Eplan + \\fondium.org\DESI$\AUG_Abteilung\Betriebstechnik\EPL\P8\Data\Projekte\FSI\ + true + 10 + #32770 + 10 + Zur Kenntnis genommen \ No newline at end of file diff --git a/FSI.BT.Tools/FrmRadialMenu.xaml b/FSI.BT.Tools/FrmRadialMenu.xaml index 87bae03..e109709 100644 --- a/FSI.BT.Tools/FrmRadialMenu.xaml +++ b/FSI.BT.Tools/FrmRadialMenu.xaml @@ -109,23 +109,7 @@ - - - - - - - - - - N++ - - - - + - - - - - - - - - - RemoteDesktop - - - - + @@ -758,6 +726,22 @@ + + + + + + + + + N++ + + + + @@ -822,6 +806,52 @@ + + + + + + + + + RDP/VNC + + + + + + + + + + + + + + + + + + + + + + + + + + + RemoteDesktop + + + + diff --git a/FSI.BT.Tools/FrmRadialMenu.xaml.cs b/FSI.BT.Tools/FrmRadialMenu.xaml.cs index c613733..4fcd918 100644 --- a/FSI.BT.Tools/FrmRadialMenu.xaml.cs +++ b/FSI.BT.Tools/FrmRadialMenu.xaml.cs @@ -237,6 +237,7 @@ namespace FSI.BT.Tools return new RelayCommand(() => { IsOpenApps = true; + IsOpenAppsVncRdp = IsOpenHome = false; }); } @@ -244,6 +245,36 @@ namespace FSI.BT.Tools #endregion + #region Apps RDP VNC + + private bool _isOpenAppsVncRdp = false; + public bool IsOpenAppsVncRdp + { + get + { + return _isOpenAppsVncRdp; + } + set + { + _isOpenAppsVncRdp = value; + RaisePropertyChanged(); + } + } + + public ICommand OpenRadialMenuAppsVncRdp + { + get + { + return new RelayCommand(() => + { + IsOpenAppsVncRdp = true; + IsOpenApps = false; + }); + } + } + + #endregion + public event PropertyChangedEventHandler PropertyChanged; void RaisePropertyChanged([CallerMemberName] string? propertyName = null) diff --git a/FSI.BT.Tools/Global.cs b/FSI.BT.Tools/Global.cs index 1f76397..31d6787 100644 --- a/FSI.BT.Tools/Global.cs +++ b/FSI.BT.Tools/Global.cs @@ -1,21 +1,17 @@ -using FSI.Lib.WinSettings; +using FSI.Lib.Guis.SieTiaWinCCMsgMgt; +using FSI.Lib.WinSettings; using Hardcodet.Wpf.TaskbarNotification; namespace FSI.BT.Tools { internal static class Global { - public static FrmRadialMenu? FrmRadialMenu { get; set; } - public static TaskbarIcon? TaskbarIcon { get; set; } - + public static WinCC WinCC { get; set; } public static AppSettings? Settings { get; set; } public static bool UserRights { get; set; } - public static bool AdminRights { get; set; } public static bool SuperAdminRights { get; set; } - - } } diff --git a/FSI.BT.Tools/Gui/FrmProcesses.xaml b/FSI.BT.Tools/Gui/FrmProcesses.xaml new file mode 100644 index 0000000..9b123f6 --- /dev/null +++ b/FSI.BT.Tools/Gui/FrmProcesses.xaml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FSI.BT.Tools/Gui/FrmProcesses.xaml.cs b/FSI.BT.Tools/Gui/FrmProcesses.xaml.cs new file mode 100644 index 0000000..ae3e2cd --- /dev/null +++ b/FSI.BT.Tools/Gui/FrmProcesses.xaml.cs @@ -0,0 +1,27 @@ +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 +{ + /// + /// Interaktionslogik für FrmProcesses.xaml + /// + public partial class FrmProcesses : Window + { + public FrmProcesses() + { + InitializeComponent(); + } + } +} diff --git a/FSI.BT.Tools/NotifyIconResources.xaml b/FSI.BT.Tools/NotifyIconResources.xaml index e728892..79102be 100644 --- a/FSI.BT.Tools/NotifyIconResources.xaml +++ b/FSI.BT.Tools/NotifyIconResources.xaml @@ -23,6 +23,9 @@ + + diff --git a/FSI.Lib/FSI.Lib/FSI.Lib.csproj b/FSI.Lib/FSI.Lib/FSI.Lib.csproj index c42e331..66ac4dd 100644 --- a/FSI.Lib/FSI.Lib/FSI.Lib.csproj +++ b/FSI.Lib/FSI.Lib/FSI.Lib.csproj @@ -1,7 +1,7 @@  - net6.0-windows + net472;net6.0-windows Library true true diff --git a/NHotkey/NHotkey.Wpf/NHotkey.Wpf.csproj b/NHotkey/NHotkey.Wpf/NHotkey.Wpf.csproj index 6b122cf..b87e572 100644 --- a/NHotkey/NHotkey.Wpf/NHotkey.Wpf.csproj +++ b/NHotkey/NHotkey.Wpf/NHotkey.Wpf.csproj @@ -1,6 +1,6 @@  - net40;net45;netcoreapp3.0;net6.0-windows + net40;net45;net472;netcoreapp3.0;net6.0-windows true diff --git a/RadialMenu/RadialMenu.csproj b/RadialMenu/RadialMenu.csproj index c45c61b..518f3ea 100644 --- a/RadialMenu/RadialMenu.csproj +++ b/RadialMenu/RadialMenu.csproj @@ -1,6 +1,6 @@  - net6.0-windows + net6.0-windows;net472 Library false true