From 306f4824a8f945dd9a62d6008be4a2fd79a77d13 Mon Sep 17 00:00:00 2001
From: Maier Stephan SI <stephan.maier@fondium.eu>
Date: Mon, 2 Jan 2023 06:39:20 +0100
Subject: [PATCH] Sicherung

---
 FSI.BT.Tools/Commands/OpenAppCommand.cs       |  21 +++++-----
 FSI.BT.Tools/FSI.BT.Tools.csproj              |   5 +++
 FSI.BT.Tools/FrmRadialMenu.xaml               |   4 +-
 FSI.BT.Tools/Icons/txt.png                    | Bin 0 -> 1313 bytes
 FSI.BT.Tools/Settings/IAppSettings.cs         |   8 ++--
 FSI.BT.Tools/Settings/ITxtToClip.cs           |   2 +-
 FSI.BT.Tools/config.json                      |   7 ++++
 FSI.Lib/FSI.Lib/FSI.Lib.csproj                |   7 ----
 FSI.Lib/FSI.Lib/Guis/Folder.Mgt/Model.cs      |   4 +-
 .../FSI.Lib/Guis/TxtToClip.Mgt/FrmMain.xaml   |   5 +--
 .../Guis/TxtToClip.Mgt/FrmMain.xaml.cs        |  21 +++-------
 .../{Model/TxtToClip.cs => Model.cs}          |   6 +--
 .../ViewModelTxtToClip.cs => ViewModel.cs}    |  39 +++++++++---------
 13 files changed, 59 insertions(+), 70 deletions(-)
 create mode 100644 FSI.BT.Tools/Icons/txt.png
 rename FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/{Model/TxtToClip.cs => Model.cs} (85%)
 rename FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/{ViewModel/ViewModelTxtToClip.cs => ViewModel.cs} (73%)

diff --git a/FSI.BT.Tools/Commands/OpenAppCommand.cs b/FSI.BT.Tools/Commands/OpenAppCommand.cs
index c123e23..66a86f6 100644
--- a/FSI.BT.Tools/Commands/OpenAppCommand.cs
+++ b/FSI.BT.Tools/Commands/OpenAppCommand.cs
@@ -105,7 +105,6 @@ namespace FSI.BT.Tools.Commands
                     files = Global.AppSettings.Apps.VsCode;
                     break;
 
-
                 case "Rdp":
                     files = Global.AppSettings.Apps.Rdp;
                     break;
@@ -149,14 +148,14 @@ namespace FSI.BT.Tools.Commands
                     frmFolderMgtMain.Show();
                     return;
 
-                //case "TxtToClip":
-                //    Lib.Guis.TxtToClip.Mgt.FrmMain frmTxtToClipMain = new Lib.Guis.TxtToClip.Mgt.FrmMain()
-                //    {
-                //        CloseAtLostFocus = false,
-                //        Data = Global.AppSettings.TxtToClip
-                //    };
-                //    frmTxtToClipMain.Show();
-                //    return;
+                case "TxtToClip":
+                    Lib.Guis.TxtToClip.Mgt.FrmMain frmTxtToClipMain = new Lib.Guis.TxtToClip.Mgt.FrmMain()
+                    {
+                        CloseAtLostFocus = true,
+                        InputData = Global.AppSettings.TxtToClip
+                    };
+                    frmTxtToClipMain.Show();
+                    return;
 
                 case "Outlook":
                     files = Global.AppSettings.Apps.Outlook;
@@ -314,8 +313,8 @@ namespace FSI.BT.Tools.Commands
                 case "Folder":
                     return Global.AppSettings.Folders != null;
 
-                //case "TxtToClip":
-                //    return Global.AppSettings.TxtToClip != null;
+                case "TxtToClip":
+                    return Global.AppSettings.TxtToClip != null;
 
                 case "Outlook":
                     files = Global.AppSettings.Apps.Outlook;
diff --git a/FSI.BT.Tools/FSI.BT.Tools.csproj b/FSI.BT.Tools/FSI.BT.Tools.csproj
index 2b3ac7e..19375b4 100644
--- a/FSI.BT.Tools/FSI.BT.Tools.csproj
+++ b/FSI.BT.Tools/FSI.BT.Tools.csproj
@@ -16,6 +16,7 @@
 	<ItemGroup>
 	  <None Remove="Icons\Folders.png" />
 	  <None Remove="Icons\Iba.jpg" />
+	  <None Remove="Icons\txt.png" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -57,6 +58,10 @@
 		<Resource Remove="Icons\Word.png" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Resource Include="Icons\txt.png" />
+	</ItemGroup>
+
 	<ItemGroup>
 	  <PackageReference Include="NLog.Extensions.Logging" Version="5.2.0" />
 	</ItemGroup>
diff --git a/FSI.BT.Tools/FrmRadialMenu.xaml b/FSI.BT.Tools/FrmRadialMenu.xaml
index 0106939..1e8fc04 100644
--- a/FSI.BT.Tools/FrmRadialMenu.xaml
+++ b/FSI.BT.Tools/FrmRadialMenu.xaml
@@ -385,12 +385,12 @@
                         <Rectangle Width="40"
                                    Height="40">
                             <Rectangle.Fill>
-                                <ImageBrush ImageSource="../../Icons/Folders.png" />
+                                <ImageBrush ImageSource="../../Icons/txt.png" />
                             </Rectangle.Fill>
                         </Rectangle>
                         <TextBlock FontSize="14"
                                    TextAlignment="Center">
-                            Verzeichnisse
+                            Txt-Vorlagen
                         </TextBlock>
                     </WrapPanel>
                 </RadialMenu:RadialMenuItem>
diff --git a/FSI.BT.Tools/Icons/txt.png b/FSI.BT.Tools/Icons/txt.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ca1de9e280037c898b66c089c38c6a41bec84be
GIT binary patch
literal 1313
zcmV++1>X9JP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00009a7bBm000XU
z000XU0RWnu7ytkS(@8`@RCt{2oj=SCK@h+fA)z4=iD*PcNGKE%I#Eef5{*PnCpuAl
zD=LXbp%opSsDy@4sC1twL_<S^hWHbI?j<gHk-OR5yPe%R_xmMN+1Z)d8ME(u?{3#Q
z000000001hetuV$e|a7lzjs8e`vP-6@6fTfKH0Gr;JLtfKO$BinEPypj<xm4j<o<c
zH}Y8+|8hjEFNAr&G_s{b$J+X2$6|oD0y;ysfl&Lu*`sH1eX?RPz#{=2KOjyYnDcOt
zp2hXaiq!z6c0FVp2+g;qN6+f|WW#EJ7Xo@I+d!!OpBHqku1_|s2Dr76uY#UWh|vr4
zd~0Nzplfw~s!`J6JA$2*Z9r=Ow=??d1UqIEno7w4j|FVSYy+Y8e>Aht6hKB6AIx3}
zwtU1KUeJHt$lA<4QvjK{B-o1C2Bh|XQNdpdAT!$=`7YR#wgIXA|7c`~g1;1i0`~-a
zUeNP`-d!bMDF6jd2==6HKx+TTm3*ZD6j;~D8^LDRHXybCw}0o<fC5nBieS@sjQ7I$
z%Zh$d07~p?<Y$k~u5F;N{V(R&spuyKpvXhP?(#Muwg3CdK2iXRoD%H%rEy*ucT(9$
z3P6z!jlA!%ySxqbwf}dGtXKAt0#N3fV0*C*NbUb>0sm^Rk2<vj+}+5p9^2l@?SD@J
z|7x#~Iu-(a(qsFD>u>*$3;AYYeN?d!;F$<N{*}{(e6z4Vs#pkcV<R6Td}-xlBby5O
zW?_9)u@c~o2wz&cUeGTq>!XI10QX1u(#nB?epy)`HLL_k0aU_DfNTMkun-_00xM!6
zK>iG@h=l;3_Sjx^{a*w<D&(7m^--mEfYMjND~_*%)u|m|=*OTv!oTxlPzGuSDE%C~
zx-^cTgB7V6p!7h<%F;M5jN^fjk<<(@_K`4Y8{m<!k<<!MdMI?YV>}OqDp4yy>9O#Y
zj`3a?&tu^us1e|h7el0NfEPnXP$NL;)v&Ji-@>b53e*TtdO5VK{kM2QkC#ISQaZpf
zuZK(90I!D+q;!DN0TELBZ{dK5%#;i;bVQ8Q{#(4D&k->LC>damL!zW@U?Ch5l}O0|
zrDNh^+J6hj#AT#ZfT4pTW7>a<7v>2a6qyPIkcpf}#fG*4>8RLLD1b~zZ9Ap?$IK@k
z7M%(Okb%%~@hR=U#Rul>J1#yI3Lpcw0yc(R7!leA`Ywz}g#s8!=*pNO?Z0Knl`*MM
z03!)q8a1T-xA?%^U6)3sLII3K^V+!3Hqdo#Tq^&40RR91000000000000000!1M?`
z(4Z|)846(LPyjQB0+=}zz|5flW)1}~b0`29%|VxTqXz}>A2BBR6u`t8n|umj!sJLk
z1u#)^C7%MAAcq?H<l>SWGY%$1%K!XD@()FfgNZOC`7UBCOn{-ucM;>kIAfCUB6Pqo
zW0UV9^uQ=NlJ6pP!63Pk?;`ZU7&(*gBIW=?<W9bem<NoYk$e|17Z^Y*`7UBUsElUv
zUBsMF5$)u=h<TwBC6ezV=7tKCO1_Jj9|}`4`7Xi+6r^<WU4$JdM2+OT2wPBqTFD0k
zko=kRz>)k}v$&P(nIrkLMk)f5KNGr&faK4N<su;YGi6Z(iw}k*9{>OV00000U_$%>
X2$lv`Aaoj800000NkvXXu0mjf<yTGB

literal 0
HcmV?d00001

diff --git a/FSI.BT.Tools/Settings/IAppSettings.cs b/FSI.BT.Tools/Settings/IAppSettings.cs
index cc9efb2..08d708c 100644
--- a/FSI.BT.Tools/Settings/IAppSettings.cs
+++ b/FSI.BT.Tools/Settings/IAppSettings.cs
@@ -18,12 +18,10 @@ namespace FSI.BT.Tools.Settings
 
             IEnumerable<Folder.IFolder> Folders { get; }
 
-         //   IEnumerable<TxtToClip.ITxtToClip> TxtToClip { get; }
-
-            [Option(Alias = "Folders")]
-            string GetFolderByName(string fodlerName, string keyName);
-
+            IEnumerable<TxtToClip.ITxtToClip> TxtToClip { get; }
 
+            //[Option(Alias = "Folders")]
+            //string GetFolderByName(string fodlerName, string keyName);
         }
 
         public static (string path, string description) GetFolderByName(IEnumerable<Folder.IFolder> folders, string name)
diff --git a/FSI.BT.Tools/Settings/ITxtToClip.cs b/FSI.BT.Tools/Settings/ITxtToClip.cs
index b82f326..02fe3b2 100644
--- a/FSI.BT.Tools/Settings/ITxtToClip.cs
+++ b/FSI.BT.Tools/Settings/ITxtToClip.cs
@@ -8,6 +8,6 @@ namespace FSI.BT.Tools.Settings
 {
     public class TxtToClip
     {
-     //   public interface ITxtToClip : Lib.Guis.TxtToClip.Mgt.Model.IInterface { }
+        public interface ITxtToClip : Lib.Guis.TxtToClip.Mgt.IInterface { }
     }
 }
diff --git a/FSI.BT.Tools/config.json b/FSI.BT.Tools/config.json
index fdc3c94..e0d529b 100644
--- a/FSI.BT.Tools/config.json
+++ b/FSI.BT.Tools/config.json
@@ -170,6 +170,13 @@
     "Erp": "https://mingle-portal.eu1.inforcloudsuite.com/FONDIUM_prd"
   },
   "Folders": [
+    {
+      "Plant": "Alg",
+      "SubPlant": "Alg",
+      "Name": "Wrkdir",
+      "Description": "Arbeitsverzeichnis",
+      "Path": "d:\\WrkDir"
+    },
     {
       "Plant": "Alg",
       "SubPlant": "Alg",
diff --git a/FSI.Lib/FSI.Lib/FSI.Lib.csproj b/FSI.Lib/FSI.Lib/FSI.Lib.csproj
index 2478b21..24af52c 100644
--- a/FSI.Lib/FSI.Lib/FSI.Lib.csproj
+++ b/FSI.Lib/FSI.Lib/FSI.Lib.csproj
@@ -14,13 +14,6 @@
 		<Reference Include="System.Windows.Forms" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Compile Remove="Guis\TxtToClip.Mgt\**" />
-	  <EmbeddedResource Remove="Guis\TxtToClip.Mgt\**" />
-	  <None Remove="Guis\TxtToClip.Mgt\**" />
-	  <Page Remove="Guis\TxtToClip.Mgt\**" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<None Remove="Icons\Cross.png" />
 		<None Remove="Icons\FondiumU.ico" />
diff --git a/FSI.Lib/FSI.Lib/Guis/Folder.Mgt/Model.cs b/FSI.Lib/FSI.Lib/Guis/Folder.Mgt/Model.cs
index d043f45..d12d213 100644
--- a/FSI.Lib/FSI.Lib/Guis/Folder.Mgt/Model.cs
+++ b/FSI.Lib/FSI.Lib/Guis/Folder.Mgt/Model.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 
 
-namespace FSI.Lib.Guis.Folder.Mgt//.Model
+namespace FSI.Lib.Guis.Folder.Mgt
 {
     public interface IInterface
     {
@@ -33,6 +33,6 @@ namespace FSI.Lib.Guis.Folder.Mgt//.Model
 
     public interface IDataProvider
     {
-        IEnumerable<Model> Load(IEnumerable<IInterface> folders);
+        IEnumerable<Model> Load(IEnumerable<IInterface> datas);
     }
 }
diff --git a/FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/FrmMain.xaml b/FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/FrmMain.xaml
index e45d83f..c849f9d 100644
--- a/FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/FrmMain.xaml
+++ b/FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/FrmMain.xaml
@@ -5,9 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:FSI.Lib.Guis.TxtToClip.Mgt"        
         xmlns:diagnostics="clr-namespace:System.Diagnostics;assembly=WindowsBase"        
-        xmlns:control="clr-namespace:FSI.Lib.Wpf.Ctrls.FilterDataGrid"
-        xmlns:viewmodel="clr-namespace:FSI.Lib.Guis.Folder.Mgt.ViewModel"
-        d:DataContext="{d:DesignInstance Type=viewmodel:ViewModel}"
+        xmlns:control="clr-namespace:FSI.Lib.Wpf.Ctrls.FilterDataGrid"       
+        d:DataContext="{d:DesignInstance Type=local:ViewModel}"
         mc:Ignorable="d"
         SizeToContent="Width"
         Height="800"
diff --git a/FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/FrmMain.xaml.cs b/FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/FrmMain.xaml.cs
index ce80f03..1c80de0 100644
--- a/FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/FrmMain.xaml.cs
+++ b/FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/FrmMain.xaml.cs
@@ -1,18 +1,7 @@
-using FSI.Lib.Guis.TxtToClip.Mgt.ViewModel;
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 using System.Reflection;
-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.Lib.Guis.TxtToClip.Mgt
 {
@@ -21,9 +10,9 @@ namespace FSI.Lib.Guis.TxtToClip.Mgt
     /// </summary>
     public partial class FrmMain : Window
     {
-        public ViewModelTxtToClip Folder { get; set; }
+        public ViewModel Folder { get; set; }
         public bool CloseAtLostFocus { get; set; }
-        public IEnumerable<Model.IInterface> Data { get; set; }
+        public IEnumerable<IInterface> InputData { get; set; }
 
         public FrmMain()
         {
@@ -44,9 +33,9 @@ namespace FSI.Lib.Guis.TxtToClip.Mgt
             Title = "FSI Text in die Zwischenablage kopieren";
             Title += " v" + Assembly.GetExecutingAssembly().GetName().Version; // Version in Titel eintragen
 
-            Folder = new ViewModelTxtToClip(new DataProvider())
+            Folder = new ViewModel(new DataProvider())
             {
-                InputData = Data
+                InputData = InputData
             };
             DataContext = Folder;
 
diff --git a/FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/Model/TxtToClip.cs b/FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/Model.cs
similarity index 85%
rename from FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/Model/TxtToClip.cs
rename to FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/Model.cs
index 9edea85..92d54ae 100644
--- a/FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/Model/TxtToClip.cs
+++ b/FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/Model.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace FSI.Lib.Guis.TxtToClip.Mgt.Model
+namespace FSI.Lib.Guis.TxtToClip.Mgt
 {
     public interface IInterface
     {
@@ -14,7 +14,7 @@ namespace FSI.Lib.Guis.TxtToClip.Mgt.Model
         string Txt { get; set; }
     }
 
-    public struct Interface : IInterface
+    public struct Model : IInterface
     {
         private string _plant;
         private string _subPlant;        
@@ -29,6 +29,6 @@ namespace FSI.Lib.Guis.TxtToClip.Mgt.Model
 
     public interface IDataProvider
     {
-        IEnumerable<Interface> Load(IEnumerable<IInterface> folders);
+        IEnumerable<Model> Load(IEnumerable<IInterface> datas);
     }
 }
diff --git a/FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/ViewModel/ViewModelTxtToClip.cs b/FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/ViewModel.cs
similarity index 73%
rename from FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/ViewModel/ViewModelTxtToClip.cs
rename to FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/ViewModel.cs
index aae6759..a995ae9 100644
--- a/FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/ViewModel/ViewModelTxtToClip.cs
+++ b/FSI.Lib/FSI.Lib/Guis/TxtToClip.Mgt/ViewModel.cs
@@ -1,5 +1,4 @@
-using FSI.Lib.Guis.TxtToClip.Mgt.Model;
-using FSI.Lib.MVVM;
+using FSI.Lib.MVVM;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -8,33 +7,33 @@ using System.Linq;
 using System.Windows.Data;
 using System.Windows.Input;
 
-namespace FSI.Lib.Guis.TxtToClip.Mgt.ViewModel
+namespace FSI.Lib.Guis.TxtToClip.Mgt
 {
-    public  class ViewModelTxtToClip : MVVM.ViewModelBase
+    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 _cmdQuickSearch;
         private ICommand _cmdCopyToClip;
 
-        public ViewModelTxtToClip(IDataProvider dataProvider)
+        public ViewModel(IDataProvider dataProvider)
         {
-            Datas = new ObservableCollection<Model.Interface>();
+            Datas = new ObservableCollection<Model>();
             _dataProvider = dataProvider;
 
-            _cmdQuickSearch = new RelayCommand<object>(ExecuteQuickSearch, CanExecuteQuickSearch);            
+            _cmdQuickSearch = new RelayCommand<object>(ExecuteQuickSearch, CanExecuteQuickSearch);
             _cmdCopyToClip = new RelayCommand<object>(ExecuteCopyToClip, CanExecuteCopyToClip);
         }
 
-        public ObservableCollection<Model.Interface> Datas { get; }
-        public ObservableCollection<Model.Interface> FilteredData { get; set; }
+        public ObservableCollection<Model> Datas { get; }
+        public ObservableCollection<Model> FilteredData { get; set; }
 
-        public Model.Interface SeletctedData { get; set; }
+        public Model SeletctedData { get; set; }
 
-        public IEnumerable<Model.IInterface> InputData { get; set; }
+        public IEnumerable<IInterface> InputData { get; set; }
 
         public void Load()
         {
@@ -43,13 +42,13 @@ namespace FSI.Lib.Guis.TxtToClip.Mgt.ViewModel
 
             if (datas != null)
             {
-                foreach (Model.Interface data in datas)
+                foreach (Model data in datas)
                 {
                     Datas.Add(data);
                 }
             }
 
-            FilteredData = new ObservableCollection<Model.Interface>(Datas);
+            FilteredData = new ObservableCollection<Model>(Datas);
             _collView = CollectionViewSource.GetDefaultView(FilteredData);
         }
 
@@ -62,7 +61,7 @@ namespace FSI.Lib.Guis.TxtToClip.Mgt.ViewModel
 
                 _collView.Filter = e =>
                 {
-                    var item = (Model.Interface)e;
+                    var item = (Model)e;
 
                     return ((item.Plant?.StartsWith(_search, StringComparison.OrdinalIgnoreCase) ?? false)
                                                 || (item.SubPlant?.StartsWith(_search, StringComparison.OrdinalIgnoreCase) ?? false)
@@ -77,7 +76,7 @@ namespace FSI.Lib.Guis.TxtToClip.Mgt.ViewModel
                 };
 
                 _collView.Refresh();
-                FilteredData = new ObservableCollection<Model.Interface>(_collView.OfType<Model.Interface>().ToList());
+                FilteredData = new ObservableCollection<Model>(_collView.OfType<Model>().ToList());
                 OnPropertyChanged();
             }
         }
@@ -130,15 +129,15 @@ namespace FSI.Lib.Guis.TxtToClip.Mgt.ViewModel
 
     public class DataProvider : IDataProvider
     {
-        public IEnumerable<Model.Interface> Load(IEnumerable<IInterface> datas)
+        public IEnumerable<Model> Load(IEnumerable<IInterface> datas)
         {
-            var newDatas = new ObservableCollection<Model.Interface>();
+            var newDatas = new ObservableCollection<Model>();
 
             foreach (IInterface data in datas)
             {
-                Model.Interface newData = new();
+                Model newData = new();
                 newData.Plant = data.Plant;
-                newData.SubPlant = data.SubPlant;                
+                newData.SubPlant = data.SubPlant;
                 newData.Description = data.Description;
                 newData.Txt = data.Txt;