From 43297bb259f93dd0bd8dbccd14e7853ae75b14f0 Mon Sep 17 00:00:00 2001 From: Maier Stephan SI Date: Tue, 3 Jan 2023 18:31:05 +0100 Subject: [PATCH] Sicherung --- FSI.BT.Tools/FrmRadialMenu.xaml | 33 ++-- FSI.BT.Tools/FrmRadialMenu.xaml.cs | 4 +- .../Guis/Folder.Mgt/_ViewModel/ViewModel.cs | 181 ------------------ FSI.Lib/FSI.Lib/Guis/IbaDirSync/Model/Iba.cs | 8 +- .../Guis/IbaDirSync/ViewModel/ViewModelIba.cs | 4 - .../ViewModel/ViewModelWindow.cs | 3 - 6 files changed, 21 insertions(+), 212 deletions(-) delete mode 100644 FSI.Lib/FSI.Lib/Guis/Folder.Mgt/_ViewModel/ViewModel.cs diff --git a/FSI.BT.Tools/FrmRadialMenu.xaml b/FSI.BT.Tools/FrmRadialMenu.xaml index 1e8fc04..9a9a5fd 100644 --- a/FSI.BT.Tools/FrmRadialMenu.xaml +++ b/FSI.BT.Tools/FrmRadialMenu.xaml @@ -21,7 +21,8 @@ @@ -64,6 +65,21 @@ + + + + + + + + + Apps + + + + - - - - - - - - - Apps - - - - diff --git a/FSI.BT.Tools/FrmRadialMenu.xaml.cs b/FSI.BT.Tools/FrmRadialMenu.xaml.cs index a077c8a..d563003 100644 --- a/FSI.BT.Tools/FrmRadialMenu.xaml.cs +++ b/FSI.BT.Tools/FrmRadialMenu.xaml.cs @@ -18,7 +18,7 @@ namespace FSI.BT.Tools InitializeComponent(); DataContext = this; _isOpenHome = true; - tbversion.Text = "v" + Assembly.GetExecutingAssembly().GetName().Version.Major + "." + Assembly.GetExecutingAssembly().GetName().Version.Minor + "b"; + //tbversion.Text = "v" + Assembly.GetExecutingAssembly().GetName().Version.Major + "." + Assembly.GetExecutingAssembly().GetName().Version.Minor + "b"; } #region Home @@ -55,6 +55,7 @@ namespace FSI.BT.Tools IsOpenTools = IsOpenSie = IsOpenApps = + IsOpenAppsVncRdp = IsOpenLinks = false; }); } @@ -290,6 +291,7 @@ namespace FSI.BT.Tools IsOpenSie = IsOpenLinks = IsOpenApps = + IsOpenAppsVncRdp = IsOpenPlantLinks = false; } } diff --git a/FSI.Lib/FSI.Lib/Guis/Folder.Mgt/_ViewModel/ViewModel.cs b/FSI.Lib/FSI.Lib/Guis/Folder.Mgt/_ViewModel/ViewModel.cs deleted file mode 100644 index f40978a..0000000 --- a/FSI.Lib/FSI.Lib/Guis/Folder.Mgt/_ViewModel/ViewModel.cs +++ /dev/null @@ -1,181 +0,0 @@ -//using FSI.Lib.Guis.Folder.Mgt.Model; -//using FSI.Lib.MVVM; -//using System; -//using System.Collections.Generic; -//using System.Collections.ObjectModel; -//using System.ComponentModel; -//using System.Diagnostics; -//using System.Linq; -//using System.Windows.Data; -//using System.Windows.Input; -//using System.IO; - -//namespace FSI.Lib.Guis.Folder.Mgt.ViewModel -//{ -// public class ViewModel : MVVM.ViewModelBase -// { -// readonly IDataProvider _dataProvider; -// private string _search; -// private ICollectionView _collView; - -// public ICommand RefreshCommand => new DelegateCommand(RefreshData); -// private ICommand _cmdQuickSearch; -// private ICommand _cmdOpen; -// private ICommand _cmdCopyToClip; - -// public ViewModel(IDataProvider dataProvider) -// { -// Datas = new ObservableCollection(); -// _dataProvider = dataProvider; - -// _cmdQuickSearch = new RelayCommand(ExecuteQuickSearch, CanExecuteQuickSearch); -// _cmdOpen = new RelayCommand(ExecuteOpen, CanExecuteOpen); -// _cmdCopyToClip = new RelayCommand(ExecuteCopyToClip, CanExecuteCopyToClip); -// } - -// public ObservableCollection Datas { get; } -// public ObservableCollection FilteredData { get; set; } - -// public Model.Model SeletctedData { get; set; } - -// public IEnumerable InputData { get; set; } - -// public void Load() -// { -// var datas = _dataProvider.Load(InputData); -// Datas.Clear(); - -// if (datas != null) -// { -// foreach (Model.Model data in datas) -// { -// Datas.Add(data); -// } -// } - -// FilteredData = new ObservableCollection(Datas); -// _collView = CollectionViewSource.GetDefaultView(FilteredData); -// } - -// public string Search -// { -// get => _search; -// set -// { -// _search = value; - -// _collView.Filter = e => -// { -// var item = (Model.Model)e; - -// return ((item.Plant?.StartsWith(_search, StringComparison.OrdinalIgnoreCase) ?? false) -// || (item.SubPlant?.StartsWith(_search, StringComparison.OrdinalIgnoreCase) ?? false) -//#if NET472 -// || (item.Path?.Contains(_search) ?? false) -// || (item.DescriptionDtl?.Contains(_search) ?? false) -//#elif NET6_0 -// || (item.Path?.Contains(_search, StringComparison.OrdinalIgnoreCase) ?? false) -// || (item.DescriptionDtl?.Contains(_search, StringComparison.OrdinalIgnoreCase) ?? false) -//#endif -// ); -// }; - -// _collView.Refresh(); -// FilteredData = new ObservableCollection(_collView.OfType().ToList()); -// OnPropertyChanged(); -// } -// } - -// public void QuickSearch(string search) -// { -// Search = search + " "; -// } - -// private void RefreshData(object obj) -// { -// Search = string.Empty; -// } - -// private bool CanExecuteQuickSearch(object obj) -// { -// return true; -// } - -// private void ExecuteQuickSearch(object obj) -// { -// QuickSearch(obj.ToString()); -// } - -// public ICommand CmdQuickSearch -// { -// get { return _cmdQuickSearch; } -// set => _cmdQuickSearch = value; -// } - -// private bool CanExecuteOpen(object obj) -// { -// if (Directory.Exists(SeletctedData.Path)) -// return true; -// else -// return false; -// } - -// private void ExecuteOpen(object obj) -// { -// new Process -// { -// StartInfo = new ProcessStartInfo() -// { -// FileName = "explorer.exe", -// Arguments = SeletctedData.Path -// } -// }.Start(); -// } - -// public ICommand CmdOpen -// { -// get { return _cmdOpen; } -// set => _cmdOpen = value; -// } - -// private bool CanExecuteCopyToClip(object obj) -// { -// if (Directory.Exists(SeletctedData.Path)) -// return true; -// else -// return false; -// } - -// private void ExecuteCopyToClip(object obj) -// { -// TextCopy.ClipboardService.SetText(SeletctedData.Path); -// } - -// public ICommand CmdCopyToClip -// { -// get { return _cmdCopyToClip; } -// set => _cmdCopyToClip = value; -// } -// } - -// public class DataProvider : IDataProvider -// { -// public IEnumerable Load(IEnumerable folders) -// { -// var newDatas = new ObservableCollection(); - -// foreach (IInterface folder in folders) -// { -// Model.Model newData = new(); -// newData.Plant = folder.Plant; -// newData.SubPlant = folder.SubPlant; -// newData.Name = folder.Name; -// newData.Description = folder.Description; -// newData.Path = folder.Path; - -// newDatas.Add(newData); -// } -// return newDatas; -// } -// } -//} diff --git a/FSI.Lib/FSI.Lib/Guis/IbaDirSync/Model/Iba.cs b/FSI.Lib/FSI.Lib/Guis/IbaDirSync/Model/Iba.cs index bd2d440..aaa43ee 100644 --- a/FSI.Lib/FSI.Lib/Guis/IbaDirSync/Model/Iba.cs +++ b/FSI.Lib/FSI.Lib/Guis/IbaDirSync/Model/Iba.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace FSI.Lib.Guis.IbaDirSync.Model +namespace FSI.Lib.Guis.IbaDirSync.Model { public class Iba { diff --git a/FSI.Lib/FSI.Lib/Guis/IbaDirSync/ViewModel/ViewModelIba.cs b/FSI.Lib/FSI.Lib/Guis/IbaDirSync/ViewModel/ViewModelIba.cs index 62d124e..06a9d3e 100644 --- a/FSI.Lib/FSI.Lib/Guis/IbaDirSync/ViewModel/ViewModelIba.cs +++ b/FSI.Lib/FSI.Lib/Guis/IbaDirSync/ViewModel/ViewModelIba.cs @@ -1,11 +1,7 @@ using FSI.Lib.Guis.IbaDirSync.Model; using FSI.Lib.MVVM; using RoboSharp; -using System; -using System.Collections.Generic; -using System.Linq; using System.Text; -using System.Threading.Tasks; using System.Windows.Input; namespace FSI.Lib.Guis.IbaDirSync.ViewModel diff --git a/FSI.Lib/FSI.Lib/Guis/SetSizePosExWindow/ViewModel/ViewModelWindow.cs b/FSI.Lib/FSI.Lib/Guis/SetSizePosExWindow/ViewModel/ViewModelWindow.cs index a0cecce..b54cf42 100644 --- a/FSI.Lib/FSI.Lib/Guis/SetSizePosExWindow/ViewModel/ViewModelWindow.cs +++ b/FSI.Lib/FSI.Lib/Guis/SetSizePosExWindow/ViewModel/ViewModelWindow.cs @@ -1,12 +1,9 @@ using FSI.Lib.Guis.SetSizePosExWindow.Model; using FSI.Lib.MVVM; using System; -using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel; -using System.Linq; using System.Runtime.InteropServices; -using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Input;