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

23
FSI.BT.Tools/App.xaml.cs
View File

@@ -11,8 +11,8 @@ namespace FSI.BT.Tools
/// </summary>
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)

90
FSI.BT.Tools/AppSettings.cs
View File

@@ -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; }
}
}

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;
}
}
}

15
FSI.BT.Tools/FSI.BT.Tools.csproj
View File

@@ -3,14 +3,22 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
<OutputType>WinExe</OutputType>
<Nullable>enable</Nullable>
<OutputType>WinExe</OutputType>
<UseWPF>true</UseWPF>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
<ApplicationIcon>Icons\FondiumU.ico</ApplicationIcon>
<AssemblyVersion>1.1</AssemblyVersion>
<AssemblyVersion>2.0</AssemblyVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
<None Remove="Icons\Iba.jpg" />
</ItemGroup>
<ItemGroup>
<Resource Remove="Icons\Admin.jpg" />
<Resource Remove="Icons\Apps.png" />
@@ -71,6 +79,7 @@
<Resource Include="Icons\FU.png" />
<Resource Include="Icons\Gimp.png" />
<Resource Include="Icons\Gitea.png" />
<Resource Include="Icons\Iba.jpg" />
<Resource Include="Icons\Info.png" />
<Resource Include="Icons\Links.png" />
<Resource Include="Icons\NPP.png" />

6
FSI.BT.Tools/FSI.BT.Tools.xml
View File

@@ -2,7 +2,6 @@
<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>
@@ -29,6 +28,7 @@
<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>
<IbaAnalyzerExe>C:\Program Files\iba\ibaAnalyzer\ibaAnalyzer.exe</IbaAnalyzerExe>
<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>
@@ -43,7 +43,7 @@
<EplPrjPath>\\fondium.org\DESI$\AUG_Abteilung\Betriebstechnik\EPL\P8\Data\Projekte\FSI\</EplPrjPath>
<SieTiaWinCCMsgMgtAutostart>true</SieTiaWinCCMsgMgtAutostart>
<SieTiaWinCCMsgMgtUpdateIntervall>10</SieTiaWinCCMsgMgtUpdateIntervall>
<SieTiaWinCCMsgMgtWindowsName>#32770</SieTiaWinCCMsgMgtWindowsName>
<SieTiaWinCCMsgMgtClassName>10</SieTiaWinCCMsgMgtClassName>
<SieTiaWinCCMsgMgtWindowsName></SieTiaWinCCMsgMgtWindowsName>
<SieTiaWinCCMsgMgtClassName>#32770</SieTiaWinCCMsgMgtClassName>
<SieTiaWinCCMsgMgtBtnName>Zur Kenntnis genommen</SieTiaWinCCMsgMgtBtnName>
</Settings>

16
FSI.BT.Tools/FrmRadialMenu.xaml
View File

@@ -804,6 +804,22 @@
Gimp
</TextBlock>
</WrapPanel>
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{commands:OpenAppCommand}"
CommandParameter="IbaAnalyzer">
<WrapPanel Orientation="Vertical">
<Rectangle Width="30"
Height="30">
<Rectangle.Fill>
<ImageBrush ImageSource="../../Icons/Iba.jpg" />
</Rectangle.Fill>
</Rectangle>
<TextBlock FontSize="14"
TextAlignment="Center">
Iba<LineBreak />Analyser
</TextBlock>
</WrapPanel>
</RadialMenu:RadialMenuItem>
<RadialMenu:RadialMenuItem Command="{Binding OpenRadialMenuAppsVncRdp}">

4
FSI.BT.Tools/FrmRadialMenu.xaml.cs
View File

@@ -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));
}

6
FSI.BT.Tools/Global.cs
View File

@@ -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; }

5
FSI.BT.Tools/Gui/FrmAdmin.xaml.cs
View File

@@ -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();
}

BIN
FSI.BT.Tools/Icons/Iba.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB