diff --git a/FSI.BT.Tools/App.xaml.cs b/FSI.BT.Tools/App.xaml.cs
index 9497b17..2aaef5a 100644
--- a/FSI.BT.Tools/App.xaml.cs
+++ b/FSI.BT.Tools/App.xaml.cs
@@ -11,8 +11,8 @@ namespace FSI.BT.Tools
///
public partial class App : System.Windows.Application
{
- private static readonly KeyGesture RadialMenu = new(Key.OemBackslash, ModifierKeys.Control);
- private static readonly KeyGesture TimeStamp = new(Key.C, ModifierKeys.Control | ModifierKeys.Alt);
+ private static readonly KeyGesture RadialMenu = new KeyGesture(Key.OemBackslash, ModifierKeys.Control);
+ private static readonly KeyGesture TimeStamp = new KeyGesture(Key.C, ModifierKeys.Control | ModifierKeys.Alt);
public void Application_Startup(object sender, StartupEventArgs e)
{
@@ -20,7 +20,6 @@ namespace FSI.BT.Tools
Global.Settings = new AppSettings(GetType().Namespace.ToString() + ".xml");
Global.Settings.Load();
-
Global.TaskbarIcon = (TaskbarIcon)FindResource("FSINotifyIcon");
Global.AdminRights = Admin.CheckAdminRight();
@@ -28,19 +27,17 @@ namespace FSI.BT.Tools
Global.UserRights = Admin.CheckUserRight();
HotkeyManager.Current.AddOrReplace("RadialMenu", RadialMenu, ShowRadialMenu);
-
HotkeyManager.Current.AddOrReplace("TimeStampToClipboard", TimeStamp, TimeStampToClipboard);
- Global.FrmRadialMenu = new();
+ Global.FrmRadialMenu = new FrmRadialMenu();
- Global.WinCC = new()
- {
- AutoStart = Global.Settings.SieTiaWinCCMsgMgtAutostart,
- UpdateIntervall = Global.Settings.SieTiaWinCCMsgMgtUpdateIntervall,
- WindowsName = Global.Settings.SieTiaWinCCMsgMgtWindowsName,
- WindowsClassName = Global.Settings.SieTiaWinCCMsgMgtClassName,
- ButtonName = Global.Settings.SieTiaWinCCMsgMgtBtnName,
- };
+ Global.WinCC = new Lib.Guis.SieTiaWinCCMsgMgt.WinCC(
+ Global.Settings.SieTiaWinCCMsgMgtAutostart,
+ Global.Settings.SieTiaWinCCMsgMgtUpdateIntervall,
+ Global.Settings.SieTiaWinCCMsgMgtWindowsName,
+ Global.Settings.SieTiaWinCCMsgMgtClassName,
+ 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 75055b2..ba48a98 100644
--- a/FSI.BT.Tools/AppSettings.cs
+++ b/FSI.BT.Tools/AppSettings.cs
@@ -13,52 +13,54 @@ namespace FSI.BT.Tools
}
[EncryptedSetting]
- public string[]? Users { get; set; }
+ 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? Pl2Als { 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; }
+ public string[] Admins{ get; set; }
+ [EncryptedSetting]
+ 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[] IbaAnalyzerExe { 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 Pl2Als { 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; }
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; }
+ public string SieTiaWinCCMsgMgtWindowsName { get; set; }
+ public string SieTiaWinCCMsgMgtClassName { get; set; }
+ public string SieTiaWinCCMsgMgtBtnName { get; set; }
}
}
diff --git a/FSI.BT.Tools/Commands/CommandBase.cs b/FSI.BT.Tools/Commands/CommandBase.cs
index c17b044..08c81ea 100644
--- a/FSI.BT.Tools/Commands/CommandBase.cs
+++ b/FSI.BT.Tools/Commands/CommandBase.cs
@@ -19,7 +19,7 @@ namespace FSI.BT.Tools.Commands
///
/// A singleton instance.
///
- private static T? command;
+ private static T command;
///
/// Gets a shared command instance.
@@ -83,7 +83,7 @@ namespace FSI.BT.Tools.Commands
///
///
/// Window
- protected Window? GetTaskbarWindow(object commandParameter)
+ protected Window GetTaskbarWindow(object commandParameter)
{
if (IsDesignMode)
return null;
@@ -104,7 +104,7 @@ namespace FSI.BT.Tools.Commands
/// The first parent item that matches the submitted
/// type parameter. If not matching item can be found, a null
/// reference is being returned.
- public static TParent? TryFindParent(DependencyObject child) where TParent : DependencyObject
+ public static TParent TryFindParent(DependencyObject child) where TParent : DependencyObject
{
//get parent item
DependencyObject parentObject = GetParentObject(child);
@@ -131,7 +131,7 @@ namespace FSI.BT.Tools.Commands
/// The item to be processed.
/// The submitted item's parent, if available. Otherwise
/// null.
- 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;
}
diff --git a/FSI.BT.Tools/Commands/LoginCommand.cs b/FSI.BT.Tools/Commands/LoginCommand.cs
index 762eea4..23bdb5d 100644
--- a/FSI.BT.Tools/Commands/LoginCommand.cs
+++ b/FSI.BT.Tools/Commands/LoginCommand.cs
@@ -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,
diff --git a/FSI.BT.Tools/Commands/OpenAppCommand.cs b/FSI.BT.Tools/Commands/OpenAppCommand.cs
index 9784668..9eb8988 100644
--- a/FSI.BT.Tools/Commands/OpenAppCommand.cs
+++ b/FSI.BT.Tools/Commands/OpenAppCommand.cs
@@ -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;
}
diff --git a/FSI.BT.Tools/Commands/ProcessCommand.cs b/FSI.BT.Tools/Commands/ProcessCommand.cs
index e1a38f2..560e282 100644
--- a/FSI.BT.Tools/Commands/ProcessCommand.cs
+++ b/FSI.BT.Tools/Commands/ProcessCommand.cs
@@ -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();
}
diff --git a/FSI.BT.Tools/Commands/RadialMenuCommand.cs b/FSI.BT.Tools/Commands/RadialMenuCommand.cs
index d6267de..703e027 100644
--- a/FSI.BT.Tools/Commands/RadialMenuCommand.cs
+++ b/FSI.BT.Tools/Commands/RadialMenuCommand.cs
@@ -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;
}
}
}
\ 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 9026225..67b80ce 100644
--- a/FSI.BT.Tools/FSI.BT.Tools.csproj
+++ b/FSI.BT.Tools/FSI.BT.Tools.csproj
@@ -3,14 +3,22 @@
WinExe
net472;net6.0-windows
- WinExe
- enable
+ WinExe
true
true
Icons\FondiumU.ico
- 1.1
+ 2.0
+
+
+
+
+
+
+
+
+
@@ -71,6 +79,7 @@
+
diff --git a/FSI.BT.Tools/FSI.BT.Tools.xml b/FSI.BT.Tools/FSI.BT.Tools.xml
index 07b32f0..9a29e0e 100644
--- a/FSI.BT.Tools/FSI.BT.Tools.xml
+++ b/FSI.BT.Tools/FSI.BT.Tools.xml
@@ -2,7 +2,6 @@
+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
@@ -29,6 +28,7 @@
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
+ C:\Program Files\iba\ibaAnalyzer\ibaAnalyzer.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
@@ -43,7 +43,7 @@
\\fondium.org\DESI$\AUG_Abteilung\Betriebstechnik\EPL\P8\Data\Projekte\FSI\
true
10
- #32770
- 10
+
+ #32770
Zur Kenntnis genommen
\ No newline at end of file
diff --git a/FSI.BT.Tools/FrmRadialMenu.xaml b/FSI.BT.Tools/FrmRadialMenu.xaml
index e109709..0f1cb00 100644
--- a/FSI.BT.Tools/FrmRadialMenu.xaml
+++ b/FSI.BT.Tools/FrmRadialMenu.xaml
@@ -804,6 +804,22 @@
Gimp
+
+
+
+
+
+
+
+
+
+
+ IbaAnalyser
+
+
diff --git a/FSI.BT.Tools/FrmRadialMenu.xaml.cs b/FSI.BT.Tools/FrmRadialMenu.xaml.cs
index 4fcd918..9c564b0 100644
--- a/FSI.BT.Tools/FrmRadialMenu.xaml.cs
+++ b/FSI.BT.Tools/FrmRadialMenu.xaml.cs
@@ -2,9 +2,7 @@
using System.ComponentModel;
using System.Reflection;
using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
using System.Windows;
-using System.Windows.Forms;
using System.Windows.Input;
namespace FSI.BT.Tools
@@ -277,7 +275,7 @@ namespace FSI.BT.Tools
public event PropertyChangedEventHandler PropertyChanged;
- void RaisePropertyChanged([CallerMemberName] string? propertyName = null)
+ void RaisePropertyChanged([CallerMemberName] string propertyName = null)
{
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}
diff --git a/FSI.BT.Tools/Global.cs b/FSI.BT.Tools/Global.cs
index 31d6787..0feecf0 100644
--- a/FSI.BT.Tools/Global.cs
+++ b/FSI.BT.Tools/Global.cs
@@ -6,10 +6,10 @@ namespace FSI.BT.Tools
{
internal static class Global
{
- public static FrmRadialMenu? FrmRadialMenu { get; set; }
- public static TaskbarIcon? TaskbarIcon { get; set; }
+ 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 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/FrmAdmin.xaml.cs b/FSI.BT.Tools/Gui/FrmAdmin.xaml.cs
index 870aeae..ac21e76 100644
--- a/FSI.BT.Tools/Gui/FrmAdmin.xaml.cs
+++ b/FSI.BT.Tools/Gui/FrmAdmin.xaml.cs
@@ -30,8 +30,13 @@ namespace FSI.BT.Tools.Gui
private void btnOk_Click(object sender, RoutedEventArgs e)
{
+#if NET472
+ Admins = tbAdmins.Text.Split(new string[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
+ Users = tbUsers.Text.Split(new string[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
+#elif NET6_0
Admins = tbAdmins.Text.Split(Environment.NewLine);
Users = tbUsers.Text.Split(Environment.NewLine);
+#endif
DialogResult = true;
Close();
}
diff --git a/FSI.BT.Tools/Icons/Iba.jpg b/FSI.BT.Tools/Icons/Iba.jpg
new file mode 100644
index 0000000..3b955b7
Binary files /dev/null and b/FSI.BT.Tools/Icons/Iba.jpg differ
diff --git a/FSI.Lib/FSI.Lib/Guis/SieTiaWinCCMsgMgt/WinCC.cs b/FSI.Lib/FSI.Lib/Guis/SieTiaWinCCMsgMgt/WinCC.cs
index 4492bed..9ae9cac 100644
--- a/FSI.Lib/FSI.Lib/Guis/SieTiaWinCCMsgMgt/WinCC.cs
+++ b/FSI.Lib/FSI.Lib/Guis/SieTiaWinCCMsgMgt/WinCC.cs
@@ -59,6 +59,25 @@ namespace FSI.Lib.Guis.SieTiaWinCCMsgMgt
backgroundWorker.DoWork += BackgroundWorker_DoWork;
backgroundWorker.ProgressChanged += BackgroundWorker_ProgressChanged;
+
+ }
+
+ public WinCC(bool autoStart, int updateIntervall, string windowsName, string windowsClassName, string buttonName)
+ {
+ AutoStart = autoStart;
+ UpdateIntervall = updateIntervall;
+ WindowsName = windowsName;
+ WindowsClassName = windowsClassName;
+ ButtonName = buttonName;
+
+ backgroundWorker = new BackgroundWorker
+ {
+ WorkerReportsProgress = true,
+ WorkerSupportsCancellation = true
+ };
+ backgroundWorker.DoWork += BackgroundWorker_DoWork;
+ backgroundWorker.ProgressChanged += BackgroundWorker_ProgressChanged;
+
if (AutoStart)
{
Start();
diff --git a/NotifyIconWpf/NotifyIconWpf/NotifyIconWpf.csproj b/NotifyIconWpf/NotifyIconWpf/NotifyIconWpf.csproj
index 793229c..58e4426 100644
--- a/NotifyIconWpf/NotifyIconWpf/NotifyIconWpf.csproj
+++ b/NotifyIconWpf/NotifyIconWpf/NotifyIconWpf.csproj
@@ -18,6 +18,10 @@
NotifyIcon WPF
+
+
+
+