Fix Edit Description

mleeneg · Mar 6, 2019 · fb9218e · fb9218e
1 parent 86dffce
commit fb9218e
Show file tree

Hide file tree

Showing 16 changed files with 585 additions and 22 deletions.
diff --git a/.vs/SysNetCheatGUI/v15/.suo b/.vs/SysNetCheatGUI/v15/.suo
diff --git a/.vs/SysNetCheatGUI/v15/Server/sqlite3/storage.ide b/.vs/SysNetCheatGUI/v15/Server/sqlite3/storage.ide
diff --git a/.vs/SysNetCheatGUI/v15/Server/sqlite3/storage.ide-shm b/.vs/SysNetCheatGUI/v15/Server/sqlite3/storage.ide-shm
diff --git a/.vs/SysNetCheatGUI/v15/Server/sqlite3/storage.ide-wal b/.vs/SysNetCheatGUI/v15/Server/sqlite3/storage.ide-wal
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
@@ -4,6 +4,5 @@
     "\\SysNetCheatGUI",
     "\\SysNetCheatGUI\\Properties"
   ],
-  "SelectedNode": "\\SysNetCheatGUI.sln",
   "PreviewInSolutionExplorer": false
 }
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
diff --git a/SysNetCheatGUI/FrmMain.Designer.cs b/SysNetCheatGUI/FrmMain.Designer.cs
diff --git a/SysNetCheatGUI/Properties/AssemblyInfo.cs b/SysNetCheatGUI/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.14.0")]
+[assembly: AssemblyFileVersion("1.0.14.1")]
diff --git a/SysNetCheatGUI/SysNetCheatGUI.csproj.user b/SysNetCheatGUI/SysNetCheatGUI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PublishUrlHistory />
+    <PublishUrlHistory>publish\</PublishUrlHistory>
     <InstallUrlHistory />
     <SupportUrlHistory />
     <UpdateUrlHistory />

diff --git a/SysNetCheatGUI/bin/Debug/SysNetCheatGUI.exe b/SysNetCheatGUI/bin/Debug/SysNetCheatGUI.exe
diff --git a/SysNetCheatGUI/bin/Debug/SysNetCheatGUI.pdb b/SysNetCheatGUI/bin/Debug/SysNetCheatGUI.pdb
diff --git a/SysNetCheatGUI/frmEditDialog.cs b/SysNetCheatGUI/frmEditDialog.cs
@@ -10,11 +10,24 @@
 
 namespace SysNetCheatGUI
 {
+    public enum MessageType
+    {
+        Address= 0,
+        AddressValue = 1,
+        Description = 2
+    }
+
     public partial class FrmEditDialog : Form
     {
         private string _addressValue;
-        public string ValueType;
+        private string _address;
+        private string _description;
 
+        public MessageType MessageType;
+        public string OutputValue;
+        public string ValueType;
+        public string Address { get; set; }
+        public string Description { get; set; }
         public string AddressValue
         {
             get { return _addressValue; }
@@ -94,15 +107,69 @@ public string AddressValue
             }
         }
 
-        public FrmEditDialog(string labeltext)
+        public FrmEditDialog(MessageType messageType)
         {
             InitializeComponent();
-            lblText.Text = labeltext;
+            MessageType = messageType;
+            switch (MessageType)
+            {
+                case MessageType.Address:
+                    lblText.Text = "Edit Address";
+                    cbPoke.Visible = false;
+                    break;
+                case MessageType.AddressValue:
+                    lblText.Text = "Edit Address Value";
+                    cbPoke.Visible = true;
+                    break;
+                case MessageType.Description:
+                    lblText.Text = "Edit Description";
+                    cbPoke.Visible = false;
+                    break;
+            }
         }
 
+        public FrmEditDialog(MessageType messageType, string vType)
+        {
+            InitializeComponent();
+            MessageType = messageType;
+            ValueType = vType;
+            switch (MessageType)
+            {
+                case MessageType.Address:
+                    lblText.Text = "Edit Address";
+                    cbPoke.Visible = false;
+                    break;
+                case MessageType.AddressValue:
+                    lblText.Text = "Edit Address Value";
+                    cbPoke.Visible = true;
+                    break;
+                case MessageType.Description:
+                    lblText.Text = "Edit Description";
+                    cbPoke.Visible = false;
+                    break;
+            }
+        }
+
+
         private void btnOK_Click(object sender, EventArgs e)
         {
-            AddressValue = txtValue.Text;
+            //check value
+            switch (MessageType)
+            {
+                case MessageType.Address:
+                    Address = txtValue.Text;
+                    OutputValue = Address;
+                    break;
+                case MessageType.AddressValue:
+                    AddressValue = txtValue.Text;
+                    OutputValue = AddressValue;
+                    break;
+                case MessageType.Description:
+                    Description = txtValue.Text;
+                    OutputValue = Description;
+                    break;
+            }
+
             DialogResult = DialogResult.OK;
         }
 

diff --git a/SysNetCheatGUI/frmMain.cs b/SysNetCheatGUI/frmMain.cs
@@ -335,10 +335,8 @@ private void AddAddress()
         {
             var index = lvAddress.SelectedIndex();
 
-            using (var editValue = new FrmEditDialog(_editValue))
+            using (var editValue = new FrmEditDialog(MessageType.AddressValue, cbValueType.Text))
             {
-                editValue.ValueType = cbValueType.Text;
-                editValue.cbPoke.Visible = true;
                 if (editValue.ShowDialog() == DialogResult.OK)
                 {
                     //Check if address exist
@@ -359,29 +357,29 @@ private void AddAddress()
                             {
                                 found = true;
                                 //Edit Existing Address
-                                lvStoredAddresses.Items[i].SubItems[GetColumnID(lvStoredAddresses, "cValue")].Text = editValue.AddressValue;
+                                lvStoredAddresses.Items[i].SubItems[GetColumnID(lvStoredAddresses, "cValue")].Text = editValue.OutputValue;
                                 break;
                             }
                         }
 
                         if (!found)
                             lvStoredAddresses.Items.Add(AddListViewItem(
                                 lvAddress.Items[index].SubItems[GetColumnID(lvAddress, "colAddress")].Text, "", SearchSize,
-                                editValue.AddressValue));
+                                editValue.OutputValue));
                     }
                     else
                     {
                         //Else Add a new Address
                         lvStoredAddresses.Items.Add(AddListViewItem(lvAddress.Items[index].SubItems[GetColumnID(lvAddress, "colAddress")].Text, "",
-                            SearchSize, editValue.AddressValue));
+                            SearchSize, editValue.OutputValue));
                     }
                 }
 
                 if (editValue.cbPoke.Checked)
                 {
                     MySwitch.SendCommand(Commands.PokeAddress, "",
                         lvAddress.Items[index].SubItems[GetColumnID(lvAddress, "colAddress")].Text,
-                        SearchSize, editValue.AddressValue);
+                        SearchSize, editValue.OutputValue);
                 }
             }
         }
@@ -472,20 +470,18 @@ private void EditAddressValue()
             try
             {
                 if (lvStoredAddresses.Items[index].SubItems[GetColumnID(lvStoredAddresses, "cAddress")].Text == "") return;
-                using (var editValue = new FrmEditDialog(_editValue))
+                using (var editValue = new FrmEditDialog(MessageType.AddressValue, lvStoredAddresses.Items[index]
+                    .SubItems[GetColumnID(lvStoredAddresses, "cValueType")].Text))
                 {
-                    editValue.ValueType = lvStoredAddresses.Items[index]
-                        .SubItems[GetColumnID(lvStoredAddresses, "cValueType")].Text;
-                    editValue.cbPoke.Visible = true;
                     if (editValue.ShowDialog() != DialogResult.OK) return;
                     //Edit Existing Address
-                    lvStoredAddresses.Items[index].SubItems[GetColumnID(lvStoredAddresses, "cValue")].Text = editValue.AddressValue;
+                    lvStoredAddresses.Items[index].SubItems[GetColumnID(lvStoredAddresses, "cValue")].Text = editValue.OutputValue;
 
                     if (editValue.cbPoke.Checked)
                     {
                         MySwitch.SendCommand(Commands.PokeAddress, "",
                             lvStoredAddresses.Items[index].SubItems[GetColumnID(lvStoredAddresses, "cAddress")].Text,
-                            SearchSize, editValue.AddressValue);
+                            SearchSize, editValue.OutputValue);
                     }
                 }
             }
@@ -501,10 +497,10 @@ private void EditDescriptionValue()
             try
             {
                 if (lvStoredAddresses.Items[index].SubItems[GetColumnID(lvStoredAddresses, "cAddress")].Text == "") return;
-                using (var editValue = new FrmEditDialog(_editName))
+                using (var editValue = new FrmEditDialog(MessageType.Description))
                 {
                     if (editValue.ShowDialog() == DialogResult.OK)
-                        lvStoredAddresses.Items[index].SubItems[GetColumnID(lvStoredAddresses, "cDescription")].Text = editValue.AddressValue;
+                        lvStoredAddresses.Items[index].SubItems[GetColumnID(lvStoredAddresses, "cDescription")].Text = editValue.OutputValue;
                 }
             }
             catch (ArgumentOutOfRangeException)

diff --git a/SysNetCheatGUI/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/SysNetCheatGUI/obj/Debug/DesignTimeResolveAssemblyReferences.cache
diff --git a/SysNetCheatGUI/obj/Debug/SysNetCheatGUI.exe b/SysNetCheatGUI/obj/Debug/SysNetCheatGUI.exe
diff --git a/SysNetCheatGUI/obj/Debug/SysNetCheatGUI.pdb b/SysNetCheatGUI/obj/Debug/SysNetCheatGUI.pdb