diff --git a/BluetoothDMM WPF/BluetoothDMM/BluetoothDMM.csproj b/BluetoothDMM WPF/BluetoothDMM/BluetoothDMM.csproj
index b1ae379..c12484a 100644
--- a/BluetoothDMM WPF/BluetoothDMM/BluetoothDMM.csproj
+++ b/BluetoothDMM WPF/BluetoothDMM/BluetoothDMM.csproj
@@ -146,16 +146,10 @@
Data Viewer.xaml
-
- Devices.xaml
-
MQTTDataFormat.xaml
-
- MQTT_Settings.xaml
-
True
True
@@ -166,9 +160,6 @@
True
MQTT.settings
-
- Settings.xaml
-
SettingsNew.xaml
@@ -185,10 +176,6 @@
MSBuild:Compile
Designer
-
- Designer
- MSBuild:Compile
-
MSBuild:Compile
Designer
@@ -208,14 +195,6 @@
Designer
MSBuild:Compile
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
Designer
MSBuild:Compile
diff --git a/BluetoothDMM WPF/BluetoothDMM/Devices.xaml b/BluetoothDMM WPF/BluetoothDMM/Devices.xaml
deleted file mode 100644
index bbe2c6a..0000000
--- a/BluetoothDMM WPF/BluetoothDMM/Devices.xaml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/BluetoothDMM WPF/BluetoothDMM/Devices.xaml.cs b/BluetoothDMM WPF/BluetoothDMM/Devices.xaml.cs
deleted file mode 100644
index 4ee129d..0000000
--- a/BluetoothDMM WPF/BluetoothDMM/Devices.xaml.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-
-namespace BluetoothDMM
-{
- ///
- /// Interaction logic for Devices.xaml
- ///
- public partial class Devices : Window
- {
- public Dictionary DeviceListC { get; set; }
-
- public Devices(Dictionary deviceListC)
- {
- InitializeComponent();
-
- //var mainWindow = Application.Current.MainWindow;
- //this.DataContext = mainWindow.DataContext;
- DeviceListC = deviceListC;
-
- this.DataContext = this;
- }
-
- private void Button1_Click(object sender, RoutedEventArgs e)
- {
- if (listBox.SelectedItems.Count > 0)
- {
- DeviceListC.Remove(((KeyValuePair)listBox.SelectedValue).Key);
- listBox.SelectedIndex = -1;
- listBox.Items.Refresh();
- //Debug.WriteLine(((System.Collections.Generic.KeyValuePair)listBox.SelectedValue).Key);
- }
- }
-
- private void Button2_Click(object sender, RoutedEventArgs e)
- {
- DeviceListC.Clear();
- listBox.SelectedIndex = -1;
- listBox.Items.Refresh();
- }
-
- private void Button_Click(object sender, RoutedEventArgs e)
- {
- if (listBox.SelectedItems.Count > 0)
- {
- var a = ((KeyValuePair)listBox.SelectedValue).Value;
- EditBox.Text = a;
- Key.Text = ((KeyValuePair)listBox.SelectedValue).Key;
- Renamer.IsOpen = true;
- }
- }
-
- private void Button_Click_1(object sender, RoutedEventArgs e)
- {
- if (EditBox.Text.Length > 0)
- {
- DeviceListC[Key.Text]=EditBox.Text;
- Key.Text = "";
- listBox.Items.Refresh();
- Renamer.IsOpen = false;
- }
- }
-
- private void Button3_Click(object sender, RoutedEventArgs e)
- {
- if (Properties.Settings.Default.ConnectOn)
- {
- Properties.Settings.Default.DeviceID.Clear();
- foreach (KeyValuePair items in DeviceListC)
- {
- Properties.Settings.Default.DeviceID.Add(items.Key + "\n" + items.Value);
- }
- Properties.Settings.Default.Save();
- }
- DialogResult = true;
- }
- }
-
-}
diff --git a/BluetoothDMM WPF/BluetoothDMM/MQTT_Settings.xaml b/BluetoothDMM WPF/BluetoothDMM/MQTT_Settings.xaml
deleted file mode 100644
index 314e7de..0000000
--- a/BluetoothDMM WPF/BluetoothDMM/MQTT_Settings.xaml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/BluetoothDMM WPF/BluetoothDMM/MQTT_Settings.xaml.cs b/BluetoothDMM WPF/BluetoothDMM/MQTT_Settings.xaml.cs
deleted file mode 100644
index ec8a57e..0000000
--- a/BluetoothDMM WPF/BluetoothDMM/MQTT_Settings.xaml.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-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 BluetoothDMM
-{
- ///
- /// Interaction logic for MQTT_Settings.xaml
- ///
- public partial class MQTT_Settings : Window
- {
- public MQTT_Settings()
- {
- InitializeComponent();
- DataContext = this;
- txtPasword.Password = Properties.MQTT.Default.Password;
- }
-
- private void Save_Click(object sender, RoutedEventArgs e)
- {
- Properties.MQTT.Default.Password = txtPasword.Password;
- Properties.MQTT.Default.Save();
- DialogResult = true;
- }
-
- private void button_Click(object sender, RoutedEventArgs e)
- {
- var datatypes = new MQTTDataFormat();
- datatypes.Topmost = this.Topmost;
- datatypes.ShowDialog();
- }
- }
-}
diff --git a/BluetoothDMM WPF/BluetoothDMM/MainWindow.xaml b/BluetoothDMM WPF/BluetoothDMM/MainWindow.xaml
index ba6ac82..62c4180 100644
--- a/BluetoothDMM WPF/BluetoothDMM/MainWindow.xaml
+++ b/BluetoothDMM WPF/BluetoothDMM/MainWindow.xaml
@@ -498,7 +498,7 @@
-
+