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 @@
+
@@ -57,6 +58,10 @@
+
+
+
+
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 @@
-
+
- Verzeichnisse
+ Txt-Vorlagen
diff --git a/FSI.BT.Tools/Icons/txt.png b/FSI.BT.Tools/Icons/txt.png
new file mode 100644
index 0000000..0ca1de9
Binary files /dev/null and b/FSI.BT.Tools/Icons/txt.png differ
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 Folders { get; }
- // IEnumerable TxtToClip { get; }
-
- [Option(Alias = "Folders")]
- string GetFolderByName(string fodlerName, string keyName);
-
+ IEnumerable TxtToClip { get; }
+ //[Option(Alias = "Folders")]
+ //string GetFolderByName(string fodlerName, string keyName);
}
public static (string path, string description) GetFolderByName(IEnumerable 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 @@
-
-
-
-
-
-
-
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 Load(IEnumerable folders);
+ IEnumerable Load(IEnumerable 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
///
public partial class FrmMain : Window
{
- public ViewModelTxtToClip Folder { get; set; }
+ public ViewModel Folder { get; set; }
public bool CloseAtLostFocus { get; set; }
- public IEnumerable Data { get; set; }
+ public IEnumerable 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 Load(IEnumerable folders);
+ IEnumerable Load(IEnumerable 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();
+ Datas = new ObservableCollection();
_dataProvider = dataProvider;
- _cmdQuickSearch = new RelayCommand