v2.37

- Added profile selection home page
- Fixed bug live edit hex values
- Changed FC tab order
- Fixed live edit binary values
- Fixed minor bugs like profile refresh, string datatypes, language translation

Author: fedeturco

ModBus_Client/DatabaseManager.xaml

@@ -5,19 +5,15 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:ModBus_Client"
         mc:Ignorable="d"
-        Title="DatabaseManager" Height="436.423" Width="417.127" Loaded="Window_Loaded" KeyUp="Window_KeyUp" Closing="Window_Closing">
+        Title="DatabaseManager" Height="462" Width="417.127" Loaded="Window_Loaded" KeyUp="Window_KeyUp" Closing="Window_Closing">
     <Grid>
-        <DataGrid x:Name="DataGridDb" Margin="10,5,10,72" SelectionMode="Single" AutoGenerateColumns="False" Width="Auto" SelectedCellsChanged="DataGridDb_SelectedCellsChanged" IsReadOnly="True" FontSize="14">
-            <DataGrid.Columns>
-                <DataGridTextColumn Header="Profile" Binding="{Binding name}" Width="400"/>
-            </DataGrid.Columns>
-        </DataGrid>
-        <Button x:Name="ButtonExportZip" Content="Export .zip" Margin="0,0,10.429,10" Click="ButtonExportZip_Click" Height="25" VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="75" IsEnabled="False"/>
-        <Button x:Name="ButtonImportZip" Content="Import .zip" Margin="0,0,90.286,10" Click="ButtonImportZip_Click" Height="25" VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="75" IsEnabled="True"/>
+        <Button x:Name="ButtonExportZip" Content="Export .zip" Margin="0,0,11,8" Click="ButtonExportZip_Click" Height="25" VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="75" IsEnabled="False"/>
+        <Button x:Name="ButtonImportZip" Content="Import .zip" Margin="0,0,91,8" Click="ButtonImportZip_Click" Height="25" VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="75" IsEnabled="True"/>
         <Button x:Name="buttonOpenFileLocation" Content="Open directory" HorizontalAlignment="Left" Margin="10,0,0,10" Width="104" Click="ButtonOpenFileLocation_Click" Height="25" VerticalAlignment="Bottom"/>
         <Button x:Name="ButtonRefresh" Content="Refresh" HorizontalAlignment="Left" Margin="119,0,0,10" Width="75" Click="ButtonRefresh_Click" Height="21" VerticalAlignment="Bottom" Visibility="Hidden"/>
         <Label x:Name="labelProfileSelected" Content="Profile" HorizontalAlignment="Left" Margin="10,0,0,35" Height="32" VerticalAlignment="Bottom" Visibility="Visible" FontSize="14"/>
-        <Button x:Name="ButtonDeleteProfile" Content="Delete" Margin="0,0,170,10" Height="25" VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="71" IsEnabled="False" Click="ButtonDeleteProfile_Click"/>
+        <Button x:Name="ButtonDeleteProfile" Content="Delete" Margin="0,0,11,42" Height="25" VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="72" IsEnabled="False" Click="ButtonDeleteProfile_Click"/>
+        <ListBox x:Name="ListBoxProfiles" d:ItemsSource="{d:SampleData ItemCount=5}" Margin="10,10,10,72" SelectionChanged="ListBoxProfiles_SelectionChanged" FontSize="14"/>
 
     </Grid>
 </Window>

ModBus_Client/DatabaseManager.xaml.cs

@@ -57,8 +57,6 @@ namespace ModBus_Client
     /// </summary>
     public partial class DatabaseManager : Window
     {
-        ObservableCollection<profile> db = new ObservableCollection<profile>();
-
         Language lang;
         public string SelectedProfile = "";
 
@@ -68,8 +66,6 @@ public DatabaseManager(MainWindow main_)
 
             lang = new Language(this);
 
-            DataGridDb.ItemsSource = db;
-
             // Centro la finestra
             double screenWidth = System.Windows.SystemParameters.PrimaryScreenWidth;
             double screenHeight = System.Windows.SystemParameters.PrimaryScreenHeight;
@@ -88,15 +84,11 @@ void LoadDb()
         {
             String[] subFolders = Directory.GetDirectories(System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) + "\\Json\\");
 
-            db.Clear();
+            ListBoxProfiles.Items.Clear();
 
             for (int i = 0; i < subFolders.Length; i++)
             {
-                profile tmp = new profile();
-
-                tmp.name = subFolders[i].Split('\\')[subFolders[i].Split('\\').Length - 1];
-
-                db.Add(tmp);
+                ListBoxProfiles.Items.Add(subFolders[i].Split('\\')[subFolders[i].Split('\\').Length - 1]);
             }
         }
 
@@ -125,21 +117,21 @@ private void ButtonOpenFileLocation_Click(object sender, RoutedEventArgs e)
 
         private void ButtonExportZip_Click(object sender, RoutedEventArgs e)
         {
-            profile currItem = (profile)DataGridDb.SelectedItem;
+            String currItem = ListBoxProfiles.SelectedItem.ToString();
 
             SaveFileDialog window = new SaveFileDialog();
 
             window.Filter = "Zip Files | *.zip";
             window.DefaultExt = ".zip";
-            window.FileName = currItem.name + ".zip";
+            window.FileName = currItem + ".zip";
 
             if ((bool)window.ShowDialog())
             {
                 // Se il file lo esiste gia' lo elimino
                 if (File.Exists(window.FileName))
                     File.Delete(window.FileName);
 
-                ZipFile.CreateFromDirectory("Json\\" + currItem.name, window.FileName);
+                ZipFile.CreateFromDirectory("Json\\" + currItem, window.FileName);
             }
         }
 
@@ -170,30 +162,6 @@ private void ButtonImportZip_Click(object sender, RoutedEventArgs e)
             LoadDb();
         }
 
-        private void DataGridDb_SelectedCellsChanged(object sender, SelectedCellsChangedEventArgs e)
-        {
-            try
-            {
-                if (DataGridDb.SelectedItem != null)
-                {
-                    profile selected = (profile)DataGridDb.SelectedItem;
-
-                    labelProfileSelected.Content = labelProfileSelected.Content.ToString().Split(':')[0] + ": " + selected.name;
-                    labelProfileSelected.Visibility = Visibility.Visible;
-
-                    ButtonExportZip.IsEnabled = true;
-                    //ButtonImportZip.IsEnabled = true;
-                    ButtonDeleteProfile.IsEnabled = true;
-                }
-            }
-            catch
-            {
-                ButtonExportZip.IsEnabled = false;
-                //ButtonImportZip.IsEnabled = false;
-                ButtonDeleteProfile.IsEnabled = false;
-            }
-        }
-
         private void Window_KeyUp(object sender, KeyEventArgs e)
         {
             if(e.Key == Key.Escape)
@@ -206,33 +174,32 @@ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs
         {
             this.DialogResult = false;
 
-            if (DataGridDb.SelectedItem != null)
+            if (ListBoxProfiles.SelectedItem != null)
             {
-                profile selected = (profile)DataGridDb.SelectedItem;
-                this.SelectedProfile = selected.name;
+                this.SelectedProfile = ListBoxProfiles.SelectedItem.ToString();
                 this.DialogResult = true;
 
                 // debug
-                Console.WriteLine("Selected: {0}", selected.name);
+                Console.WriteLine("Selected: {0}", this.SelectedProfile);
             }
         }
 
         private void ButtonDeleteProfile_Click(object sender, RoutedEventArgs e)
         {
             try
             {
-                if (DataGridDb.SelectedItem != null)
+                if (ListBoxProfiles.SelectedItem != null)
                 {
-                    profile selected = (profile)DataGridDb.SelectedItem;
+                    String selected = ListBoxProfiles.SelectedItem.ToString();
 
-                    labelProfileSelected.Content = labelProfileSelected.Content.ToString().Split(':')[0] + ": " + selected.name;
+                    labelProfileSelected.Content = labelProfileSelected.Content.ToString().Split(':')[0] + ": " + selected;
                     labelProfileSelected.Visibility = Visibility.Visible;
 
-                    if (Directory.Exists(System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) + "\\Json\\" + selected.name))
+                    if (Directory.Exists(System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) + "\\Json\\" + selected))
                     {
                         if (MessageBox.Show(lang.languageTemplate["strings"]["deleteProfile"], "Info", MessageBoxButton.YesNo, MessageBoxImage.Warning) == MessageBoxResult.Yes)
                         {
-                            Directory.Delete(System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) + "\\Json\\" + selected.name, true);
+                            Directory.Delete(System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) + "\\Json\\" + selected, true);
 
                             ButtonExportZip.IsEnabled = false;
                             ButtonDeleteProfile.IsEnabled = false;
@@ -251,10 +218,31 @@ private void ButtonDeleteProfile_Click(object sender, RoutedEventArgs e)
                 ButtonDeleteProfile.IsEnabled = false;
             }
         }
-    }
 
-    public class profile
-    {
-        public String name { get; set; }
+        private void ListBoxProfiles_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            try
+            {
+                if (ListBoxProfiles.SelectedItem != null)
+                {
+                    String selected = ListBoxProfiles.SelectedItem.ToString();
+
+                    labelProfileSelected.Content = labelProfileSelected.Content.ToString().Split(':')[0] + ": " + selected;
+                    labelProfileSelected.Visibility = Visibility.Visible;
+
+                    ButtonExportZip.IsEnabled = true;
+
+                    if (selected == "Default")
+                        ButtonDeleteProfile.IsEnabled = false;
+                    else
+                        ButtonDeleteProfile.IsEnabled = true;
+                }
+            }
+            catch
+            {
+                ButtonExportZip.IsEnabled = false;
+                ButtonDeleteProfile.IsEnabled = false;
+            }
+        }
     }
 }