diff --git a/RFiDGear/3rdParty/RedCell/RedCell.Diagnostics.Update/Updater.cs b/RFiDGear/3rdParty/RedCell/RedCell.Diagnostics.Update/Updater.cs index e0fed6e..f496dac 100644 --- a/RFiDGear/3rdParty/RedCell/RedCell.Diagnostics.Update/Updater.cs +++ b/RFiDGear/3rdParty/RedCell/RedCell.Diagnostics.Update/Updater.cs @@ -12,7 +12,7 @@ namespace RedCell.Diagnostics.Update { - public class Updater + public class Updater : IDisposable { #region Constants @@ -338,5 +338,11 @@ public void Update() } } #endregion + + public void Dispose() + { + this.Dispose(); + } + } } diff --git a/RFiDGear/DataAccessLayer/Local/Constants.cs b/RFiDGear/DataAccessLayer/Local/Constants.cs index 38e8841..97664a0 100644 --- a/RFiDGear/DataAccessLayer/Local/Constants.cs +++ b/RFiDGear/DataAccessLayer/Local/Constants.cs @@ -21,8 +21,8 @@ namespace RFiDGear.DataAccessLayer public static class Constants { - public const int MAX_WAIT_INSERTION = 200; //timeout for chip response in ms - public const string TITLE_SUFFIX = ""; //turns out special app versions + public static readonly int MAX_WAIT_INSERTION = 200; //timeout for chip response in ms + public static readonly string TITLE_SUFFIX = ""; //turns out special app versions //public const string TITLE_SUFFIX = "DEVELOPER PREVIEW"; //turns out special app versions } @@ -310,57 +310,5 @@ public MifareClassicDefaultKeys(int _keyNumber, string _accessBits) public int KeyNumber; public string AccessBits { get => accessBits; set => accessBits = value; } } - - #region LibLogicalAccess enums - - /* - /// - /// - /// - [Flags] - public enum DESFireKeyType - { - DF_KEY_3K3DES, - DF_KEY_AES, - DF_KEY_DES - } - - /// - /// - /// - [Flags] - public enum TaskAccessRights - { - AR_KEY0 = 0, - AR_KEY1 = 1, - AR_KEY2 = 2, - AR_KEY3 = 3, - AR_KEY4 = 4, - AR_KEY5 = 5, - AR_KEY6 = 6, - AR_KEY7 = 7, - AR_KEY8 = 8, - AR_KEY9 = 9, - AR_KEY10 = 10, - AR_KEY11 = 11, - AR_KEY12 = 12, - AR_KEY13 = 13, - AR_FREE = 14, - AR_NEVER = 15 - } - - /// - /// - /// - [Flags] - public enum EncryptionMode - { - CM_ENCRYPT = 3, - CM_MAC = 1, - CM_PLAIN = 0, - CM_UNKNOWN = 255 - } - */ - #endregion } diff --git a/RFiDGear/DataAccessLayer/Local/CustomConverter.cs b/RFiDGear/DataAccessLayer/Local/CustomConverter.cs index 2fdb929..956e4ab 100644 --- a/RFiDGear/DataAccessLayer/Local/CustomConverter.cs +++ b/RFiDGear/DataAccessLayer/Local/CustomConverter.cs @@ -258,13 +258,14 @@ public static int GetChipBasedDataBlockNumber(CARD_TYPE _cardType, int _sectorNu break; case CARD_TYPE.Mifare2K: - break; case CARD_TYPE.Mifare4K: blockCount = (_sectorNumber <= 31 ? 4 : 16); break; + default: + throw new InvalidOperationException("Unexpected Card Type"); } diff --git a/RFiDGear/DataAccessLayer/Remote/FromIO/RFiDDevice.cs b/RFiDGear/DataAccessLayer/Remote/FromIO/RFiDDevice.cs index bdd5b5a..1c1593a 100644 --- a/RFiDGear/DataAccessLayer/Remote/FromIO/RFiDDevice.cs +++ b/RFiDGear/DataAccessLayer/Remote/FromIO/RFiDDevice.cs @@ -182,7 +182,6 @@ public ERROR ReadChipPublic() if (readerUnit.Connect()) { ReaderUnitName = readerUnit.ConnectedName; - //string readerSerialNumber = readerUnit.GetReaderSerialNumber(); //-> ERROR with OmniKey (and some others?) Reader when card isnt removed before recalling! card = readerUnit.GetSingleChip(); @@ -190,8 +189,6 @@ public ERROR ReadChipPublic() { try { - //CardInfo = new CARD_INFO((CARD_TYPE)Enum.Parse(typeof(CARD_TYPE), card.Type), card.ChipIdentifier); - //readerUnit.Disconnect(); GenericChip = new GenericChipModel(card.ChipIdentifier, (CARD_TYPE)Enum.Parse(typeof(CARD_TYPE), card.Type)); if (card.Type == "DESFire" || card.Type == "DESFireEV1") @@ -213,9 +210,7 @@ public ERROR ReadChipPublic() GenericChip.CardType = CARD_TYPE.DESFire; } } - //ISO15693Commands commands = card.Commands as ISO15693Commands; - //SystemInformation si = commands.GetSystemInformation(); - //var block=commands.ReadBlock(21, 4); + readerUnit.Disconnect(); return ERROR.NoError; } @@ -1197,6 +1192,8 @@ public ERROR CreateMifareDesfireFile(string _appMasterKey, DESFireKeyType _keyTy case FileType_MifareDesfireFileType.LinearRecordFile: cmd.CreateLinearRecordFile((byte)_fileNo, _encMode, accessRights, (uint)_fileSize, (uint)_maxNbOfRecords); break; + default: + throw new InvalidOperationException("Unexpected FileTypeSelection"); } return ERROR.NoError; @@ -1723,7 +1720,6 @@ public ERROR GetMifareDesfireAppSettings(string _applicationMasterKey, DESFireKe { var cmd = card.Commands as IDESFireCommands; ReaderUnitName = readerUnit.ConnectedName; - //readerSerialNumber = readerUnit.GetReaderSerialNumber(); try { @@ -1791,7 +1787,6 @@ public ERROR GetMifareDesfireAppSettings(string _applicationMasterKey, DESFireKe { var cmd = card.Commands as IDESFireEV1Commands; ReaderUnitName = readerUnit.ConnectedName; - //readerSerialNumber = readerUnit.GetReaderSerialNumber(); try { @@ -1897,7 +1892,6 @@ public ERROR CreateMifareDesfireApplication(string _piccMasterKey, DESFireKeySet SecurityLevel = EncryptionMode.CM_ENCRYPT }; - // IDESFireEV1Commands cmd; // Keys to use for authentication IDESFireAccessInfo aiToUse = new DESFireAccessInfo(); CustomConverter.FormatMifareDesfireKeyStringWithSpacesEachByte(_piccMasterKey); @@ -2030,7 +2024,6 @@ public ERROR ChangeMifareDesfireApplicationKey(string _applicationMasterKeyCurre if (readerUnit.Connect()) { ReaderUnitName = readerUnit.ConnectedName; - //readerSerialNumber = readerUnit.GetReaderSerialNumber(); card = readerUnit.GetSingleChip(); @@ -2182,7 +2175,6 @@ public ERROR DeleteMifareDesfireApplication(string _applicationMasterKey, DESFir SecurityLevel = EncryptionMode.CM_ENCRYPT }; - // IDESFireEV1Commands cmd; // Keys to use for authentication IDESFireAccessInfo aiToUse = new DESFireAccessInfo(); CustomConverter.FormatMifareDesfireKeyStringWithSpacesEachByte(_applicationMasterKey); @@ -2196,7 +2188,6 @@ public ERROR DeleteMifareDesfireApplication(string _applicationMasterKey, DESFir if (readerUnit.Connect()) { ReaderUnitName = readerUnit.ConnectedName; - //readerSerialNumber = readerUnit.GetReaderSerialNumber(); card = readerUnit.GetSingleChip(); @@ -2278,7 +2269,6 @@ public ERROR DeleteMifareDesfireFile(string _applicationMasterKey, DESFireKeyTyp if (readerUnit.Connect()) { ReaderUnitName = readerUnit.ConnectedName; - //readerSerialNumber = readerUnit.GetReaderSerialNumber(); card = readerUnit.GetSingleChip(); @@ -2363,7 +2353,6 @@ public ERROR FormatDesfireCard(string _applicationMasterKey, DESFireKeyType _key if (readerUnit.Connect()) { ReaderUnitName = readerUnit.ConnectedName; - //readerSerialNumber = readerUnit.GetReaderSerialNumber(); card = readerUnit.GetSingleChip(); @@ -2425,7 +2414,6 @@ public ERROR GetMifareDesfireFileList(string _applicationMasterKey, DESFireKeyTy SecurityLevel = EncryptionMode.CM_ENCRYPT }; - //IDESFireEV1Commands cmd; // Keys to use for authentication IDESFireAccessInfo aiToUse = new DESFireAccessInfo(); CustomConverter.FormatMifareDesfireKeyStringWithSpacesEachByte(_applicationMasterKey); @@ -2441,7 +2429,6 @@ public ERROR GetMifareDesfireFileList(string _applicationMasterKey, DESFireKeyTy if (readerUnit.Connect()) { ReaderUnitName = readerUnit.ConnectedName; - //readerSerialNumber = readerUnit.GetReaderSerialNumber(); card = readerUnit.GetSingleChip(); @@ -2522,7 +2509,6 @@ public ERROR GetMifareDesfireFileSettings(string _applicationMasterKey, DESFireK { try { - // IDESFireEV1Commands cmd; // Keys to use for authentication IDESFireAccessInfo aiToUse = new DESFireAccessInfo(); CustomConverter.FormatMifareDesfireKeyStringWithSpacesEachByte(_applicationMasterKey); @@ -2628,7 +2614,6 @@ public ERROR ReadISO15693Chip() if (readerUnit.Connect()) { ReaderUnitName = readerUnit.ConnectedName; - //readerSerialNumber = readerUnit.GetReaderSerialNumber(); card = readerUnit.GetSingleChip(); @@ -2638,9 +2623,7 @@ public ERROR ReadISO15693Chip() var cmd = card.Commands as ISO15693Commands;// IMifareUltralightCommands; object t = cmd.GetSystemInformation(); - //object res = cmd.ReadPage(4); - //appIDs = (appIDsObject as UInt32[]); } return ERROR.NoError; @@ -2671,17 +2654,14 @@ public ERROR ReadEM4135ChipPublic() if (readerUnit.Connect()) { ReaderUnitName = readerUnit.ConnectedName; - //readerSerialNumber = readerUnit.GetReaderSerialNumber(); card = readerUnit.GetSingleChip(); - if (true) //card.Type == "ISO15693" + if (true) { var cmd = (card as EM4135Chip).ChipIdentifier;// IMifareUltralightCommands; - //object res = cmd.ReadPage(4); - //appIDs = (appIDsObject as UInt32[]); } return ERROR.NoError; diff --git a/RFiDGear/Model/CheckpointModel.cs b/RFiDGear/Model/CheckpointModel.cs deleted file mode 100644 index 402ef71..0000000 --- a/RFiDGear/Model/CheckpointModel.cs +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Created by SharpDevelop. - * User: c3rebro - * Date: 02.03.2018 - * Time: 23:21 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ - -using RFiDGear.DataAccessLayer; - -namespace RFiDGear.Model -{ - /// - /// Description of Checkpoint. - /// - public class CheckpointModel - { - public CheckpointModel() - { - ErrorLevel = ERROR.Empty; - ContentSelector = CONTENT_CREATION_STATE.FIXED; - ContentGroup = "NoGroup"; - } - - public CONTENT_CREATION_STATE ContentSelector{ get; set; } - - public ERROR ErrorLevel { get; set; } - - public string TaskIndex { get; set; } - - public string ContentGroup { get; set; } - - public string Content { get; set; } - - public string TemplateField { get; set; } - } -} diff --git a/RFiDGear/Model/MifareDESFireKeySetup.cs b/RFiDGear/Model/MifareDESFireKeySetup.cs deleted file mode 100644 index e75af0b..0000000 --- a/RFiDGear/Model/MifareDESFireKeySetup.cs +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Created by SharpDevelop. - * User: rotts - * Date: 18.11.2016 - * Time: 21:15 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ -using System; -using System.Drawing; -using System.Windows.Forms; - -namespace RFiDGear -{ - - - - /// - /// Description of Form1. - /// - public partial class MifareDESFireKeySetupForm : Form - { - public event DesfireKeySetupChanged desfireKeySetupChanged; - - SettingsReaderWriter settings; - helperClass converter; - - public string desFireCardCardMasterKey { get; set; } - public string desFireCardApplicationMasterKey { get; set; } - public string desFireCardReadKey { get; set; } - public string desFireCardWriteKey { get; set; } - - public string desFireCardCardMasterKeyType { get; set; } - public string desFireCardApplicationMasterKeyType { get; set; } - public string desFireCardReadKeyType { get; set; } - public string desFireCardWriteKeyType { get; set; } - - public MifareDESFireKeySetupForm() - { - // - // The InitializeComponent() call is required for Windows Forms designer support. - // - InitializeComponent(); - - - settings = new SettingsReaderWriter(); - converter = new helperClass(); - - settings.readSettings(); - - desFireCardCardMasterKeyType = settings._defaultDesfireCardCardMasterKeyType; - desFireCardApplicationMasterKeyType = settings._defaultDesfireCardApplicationMasterKeyType; - desFireCardReadKeyType = settings._defaultDesfireCardReadKeyType; - desFireCardWriteKeyType = settings._defaultDesfireCardWriteKeyType; - - } - - void KeySetupFormLoad(object sender, EventArgs e) - { - textBoxCardMasterKey.Text = settings._defaultDesfireCardCardMasterKey; - comboBoxCardMasterKeyType.SelectedIndex = Array.IndexOf(converter._constDesfireCardKeyType, desFireCardCardMasterKeyType); - - textBoxApplicationMasterKey.Text = settings._defaultDesfireCardApplicationMasterKey; - comboBoxApplicationMasterKeyType.SelectedIndex = Array.IndexOf(converter._constDesfireCardKeyType, desFireCardApplicationMasterKeyType); - - textBoxReadKey.Text = settings._defaultDesfireCardReadKey; - comboBoxReadKeyType.SelectedIndex = Array.IndexOf(converter._constDesfireCardKeyType, desFireCardReadKeyType); - - textBoxWriteKey.Text = settings._defaultDesfireCardWriteKey; - comboBoxWriteKeyType.SelectedIndex = Array.IndexOf(converter._constDesfireCardKeyType, desFireCardWriteKeyType); - } - - void ButtonSaveAndExitClick(object sender, EventArgs e) - { - if (converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxCardMasterKey.Text) == KEY_ERROR.KEY_IS_EMPTY - || converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxApplicationMasterKey.Text) == KEY_ERROR.KEY_IS_EMPTY - || converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxReadKey.Text) == KEY_ERROR.KEY_IS_EMPTY - || converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxWriteKey.Text) == KEY_ERROR.KEY_IS_EMPTY) - MessageBox.Show("empty keys are not allowed", "wrong key settings detected", MessageBoxButtons.OK, MessageBoxIcon.Information); - else if (converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxCardMasterKey.Text) == KEY_ERROR.KEY_HAS_WRONG_FORMAT - || converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxApplicationMasterKey.Text) == KEY_ERROR.KEY_HAS_WRONG_FORMAT - || converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxReadKey.Text) == KEY_ERROR.KEY_HAS_WRONG_FORMAT - || converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxWriteKey.Text) == KEY_ERROR.KEY_HAS_WRONG_FORMAT) - MessageBox.Show("key must contain of hex characters only", "wrong key settings detected", MessageBoxButtons.OK, MessageBoxIcon.Information); - else if (converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxCardMasterKey.Text) == KEY_ERROR.KEY_HAS_WRONG_LENGTH - || converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxApplicationMasterKey.Text) == KEY_ERROR.KEY_HAS_WRONG_LENGTH - || converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxReadKey.Text) == KEY_ERROR.KEY_HAS_WRONG_LENGTH - || converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxWriteKey.Text) == KEY_ERROR.KEY_HAS_WRONG_LENGTH) - MessageBox.Show("please enter a key of 32 characters length", "wrong key settings detected", MessageBoxButtons.OK, MessageBoxIcon.Information); - else if (converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxCardMasterKey.Text) == KEY_ERROR.NO_ERROR - || converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxApplicationMasterKey.Text) == KEY_ERROR.NO_ERROR - || converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxReadKey.Text) == KEY_ERROR.NO_ERROR - || converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxWriteKey.Text) == KEY_ERROR.NO_ERROR) { - - converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxCardMasterKey.Text); - desFireCardCardMasterKey = converter.desFireKeyToEdit; - - converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxApplicationMasterKey.Text); - desFireCardApplicationMasterKey = converter.desFireKeyToEdit; - - converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxReadKey.Text); - desFireCardReadKey = converter.desFireKeyToEdit; - - converter.FormatMifareDesfireKeyStringWithSpacesEachByte(textBoxWriteKey.Text); - desFireCardWriteKey = converter.desFireKeyToEdit; - - desFireCardCardMasterKeyType = converter._constDesfireCardKeyType[comboBoxCardMasterKeyType.SelectedIndex]; - desFireCardApplicationMasterKeyType = converter._constDesfireCardKeyType[comboBoxApplicationMasterKeyType.SelectedIndex]; - desFireCardWriteKeyType = converter._constDesfireCardKeyType[comboBoxReadKeyType.SelectedIndex]; - desFireCardWriteKeyType = converter._constDesfireCardKeyType[comboBoxWriteKeyType.SelectedIndex]; - - this.Hide(); - desfireKeySetupChanged(); - - } - } - - void ButtonAbortClick(object sender, EventArgs e) - { - this.Hide(); - } - - - - } -} diff --git a/RFiDGear/Model/MifarePlusChipModel.cs b/RFiDGear/Model/MifarePlusChipModel.cs deleted file mode 100644 index a6e77cb..0000000 --- a/RFiDGear/Model/MifarePlusChipModel.cs +++ /dev/null @@ -1,32 +0,0 @@ -using RFiDGear.DataAccessLayer; -using System.Collections.Generic; - -namespace RFiDGear.Model -{ - /// - /// Description of chipUid. - /// - public class MifarePlusChipModel - { - private readonly List _appList = new List(); - - public List AppList - { - get { return _appList; } - } - - public MifarePlusChipModel() - { - } - - public MifarePlusChipModel(string uid, CARD_TYPE cardType) - { - UidNumber = uid; - CardType = cardType; - } - - public string UidNumber { get; set; } - - public CARD_TYPE CardType { get; set; } - } -} \ No newline at end of file diff --git a/RFiDGear/Model/ReaderModel.cs b/RFiDGear/Model/ReaderModel.cs deleted file mode 100644 index 613b9d3..0000000 --- a/RFiDGear/Model/ReaderModel.cs +++ /dev/null @@ -1,55 +0,0 @@ -using RFiDGear.DataAccessLayer; - -using System; - -namespace RFiDGear -{ - /// - /// Description of RFiDReaderSetup. - /// - /// - - public class ReaderModel : RFiDDevice - { - private RFiDDevice rfidDevice; - private SettingsReaderWriter settings = new SettingsReaderWriter(); - - public ReaderModel(ReaderTypes readerProviderByName = ReaderTypes.PCSC) - { - base.ReaderProvider = readerProviderByName; - } - - public ReaderTypes SelectedReader { - get { - return settings.defaultSpecification.DefaultReaderProvider; - } - set { - if (settings.defaultSpecification.DefaultReaderProvider != value) { - if (rfidDevice == null) - rfidDevice = new RFiDDevice(value); - else { - rfidDevice = null; - rfidDevice = new RFiDDevice(value); - } - settings.defaultSpecification.DefaultReaderProvider = value; - settings.defaultSpecification.DefaultReaderName = rfidDevice.CurrentReaderUnitName; - } - } - } - - public CARD_INFO GetChipInfo { - get { - return rfidDevice.CardInfo; - } - } - - public string GetReaderName { - get { - if(rfidDevice.IsChipPresent) - return rfidDevice.CurrentReaderUnitName; - else - return "not connected"; - } - } - } -} diff --git a/RFiDGear/View/OptionsViews/ExtraViewTabPages/TabPageMiscReaderSettingsView.xaml b/RFiDGear/View/OptionsViews/ExtraViewTabPages/TabPageMiscReaderSettingsView.xaml deleted file mode 100644 index 61f7659..0000000 --- a/RFiDGear/View/OptionsViews/ExtraViewTabPages/TabPageMiscReaderSettingsView.xaml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RFiDGear/View/OptionsViews/ExtraViewTabPages/TabPageMiscReaderSettingsView.xaml.cs b/RFiDGear/View/OptionsViews/ExtraViewTabPages/TabPageMiscReaderSettingsView.xaml.cs deleted file mode 100644 index 14952b7..0000000 --- a/RFiDGear/View/OptionsViews/ExtraViewTabPages/TabPageMiscReaderSettingsView.xaml.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Created by SharpDevelop. - * Date: 10/10/2017 - * Time: 20:19 - * - */ - -using System.Windows.Controls; - -namespace RFiDGear.View -{ - /// - /// Interaction logic for TabPageReaderSettingsView.xaml - /// - public partial class TabPageMiscReaderSettingsView : UserControl - { - public TabPageMiscReaderSettingsView() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/RFiDGear/View/OptionsViews/ExtraViewTabPages/TabPageReaderSettingsView.xaml b/RFiDGear/View/OptionsViews/ExtraViewTabPages/TabPageReaderSettingsView.xaml deleted file mode 100644 index 435c315..0000000 --- a/RFiDGear/View/OptionsViews/ExtraViewTabPages/TabPageReaderSettingsView.xaml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/RFiDGear/View/OptionsViews/ExtraViewTabPages/TabPageReaderSettingsView.xaml.cs b/RFiDGear/View/OptionsViews/ExtraViewTabPages/TabPageReaderSettingsView.xaml.cs deleted file mode 100644 index 56cd325..0000000 --- a/RFiDGear/View/OptionsViews/ExtraViewTabPages/TabPageReaderSettingsView.xaml.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Created by SharpDevelop. - * Date: 10/10/2017 - * Time: 20:19 - * - */ - -using System.Windows.Controls; - -namespace RFiDGear.View -{ - /// - /// Interaction logic for TabPageReaderSettingsView.xaml - /// - public partial class TabPageReaderSettingsView : UserControl - { - public TabPageReaderSettingsView() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/RFiDGear/View/OptionsViews/SetupView.xaml b/RFiDGear/View/OptionsViews/SetupView.xaml deleted file mode 100644 index 2c77e9c..0000000 --- a/RFiDGear/View/OptionsViews/SetupView.xaml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - -