From 8d78ce028a1bfcfdd6bbbf1383d647b0766c06e2 Mon Sep 17 00:00:00 2001
From: Andy McFadden <fadden@fadden.com>
Date: Fri, 5 Jul 2019 16:20:31 -0700
Subject: [PATCH] Implement remaining properties tabs ("Symbol Files",
 "Extension Scripts")

Simple ListBox controls with strings.
---
 SourceGenWPF/Res/Strings.xaml                 |   3 +
 SourceGenWPF/Res/Strings.xaml.cs              |   6 +
 .../WpfGui/EditProjectProperties.xaml         |  34 +--
 .../WpfGui/EditProjectProperties.xaml.cs      | 207 +++++++-----------
 4 files changed, 108 insertions(+), 142 deletions(-)

diff --git a/SourceGenWPF/Res/Strings.xaml b/SourceGenWPF/Res/Strings.xaml
index 16bcfc0..5878b3a 100644
--- a/SourceGenWPF/Res/Strings.xaml
+++ b/SourceGenWPF/Res/Strings.xaml
@@ -53,6 +53,8 @@ limitations under the License.
     <system:String x:Key="str_ErrProjectLoadFail">Unable to load project file</system:String>
     <system:String x:Key="str_ErrProjectSaveFail">Unable to save project file</system:String>
     <system:String x:Key="str_ErrTooLargeForPreview">[File was too large for preview window]</system:String>
+    <system:String x:Key="str_ExternalFileBadDirFmt" xml:space="preserve">Symbol files and extension scripts must live in the application runtime directory ({0}) or project directory ({1}).&#x0d;&#x0d;File {2} lives elsewhere.</system:String>
+    <system:String x:Key="str_ExternalFileBadDirCaption">File Not In Runtime Directory</system:String>
     <system:String x:Key="str_FileFilterAll">All files (*.*)|*.*</system:String>
     <system:String x:Key="str_FileFilterCs">C# Source Files(*.cs)|*.cs</system:String>
     <system:String x:Key="str_FileFilterDis65">SourceGen projects(*.dis65)|*.dis65</system:String>
@@ -102,4 +104,5 @@ limitations under the License.
     <system:String x:Key="str_SymbolImportCaption">Symbol Import</system:String>
     <system:String x:Key="str_SymbolImportGoodFmt">Imported {0} global symbols.</system:String>
     <system:String x:Key="str_SymbolImportNone">No global+export symbols were found.</system:String>
+    <system:String x:Key="str_Unset">[unset]</system:String>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/SourceGenWPF/Res/Strings.xaml.cs b/SourceGenWPF/Res/Strings.xaml.cs
index c8dacb5..74dddbf 100644
--- a/SourceGenWPF/Res/Strings.xaml.cs
+++ b/SourceGenWPF/Res/Strings.xaml.cs
@@ -91,6 +91,10 @@ namespace SourceGenWPF.Res {
             (string)Application.Current.FindResource("str_ErrProjectSaveFail");
         public static string ERR_TOO_LARGE_FOR_PREVIEW =
             (string)Application.Current.FindResource("str_ErrTooLargeForPreview");
+        public static string EXTERNAL_FILE_BAD_DIR_FMT =
+            (string)Application.Current.FindResource("str_ExternalFileBadDirFmt");
+        public static string EXTERNAL_FILE_BAD_DIR_CAPTION =
+            (string)Application.Current.FindResource("str_ExternalFileBadDirCaption");
         public static string FILE_FILTER_ALL =
             (string)Application.Current.FindResource("str_FileFilterAll");
         public static string FILE_FILTER_CS =
@@ -189,5 +193,7 @@ namespace SourceGenWPF.Res {
             (string)Application.Current.FindResource("str_SymbolImportGoodFmt");
         public static string SYMBOL_IMPORT_NONE =
             (string)Application.Current.FindResource("str_SymbolImportNone");
+        public static string UNSET =
+            (string)Application.Current.FindResource("str_Unset");
     }
 }
diff --git a/SourceGenWPF/WpfGui/EditProjectProperties.xaml b/SourceGenWPF/WpfGui/EditProjectProperties.xaml
index 981426c..7d9a84c 100644
--- a/SourceGenWPF/WpfGui/EditProjectProperties.xaml
+++ b/SourceGenWPF/WpfGui/EditProjectProperties.xaml
@@ -124,7 +124,7 @@ limitations under the License.
                               FontFamily="{StaticResource GeneralMonoFont}"
                               ItemsSource="{Binding ProjectSymbols}"
                               SnapsToDevicePixels="True" SelectionMode="Single"
-                              SelectionChanged="ProjectSymbolsListView_SelectionChanged"
+                              SelectionChanged="List_SelectionChanged"
                               MouseDoubleClick="ProjectSymbolsListView_MouseDoubleClick">
                         <ListView.Resources>
                             <Style TargetType="TextBlock">
@@ -170,17 +170,22 @@ limitations under the License.
                     <TextBlock Grid.Column="0" Grid.Row="0" Margin="4,0,0,0"
                                Text="Currently configured symbol files:"/>
 
-                    <ListBox Name="symbolFilesListBox" Grid.Column="0" Grid.Row="1" Margin="4">
-
-                    </ListBox>
+                    <ListBox Name="symbolFilesListBox" Grid.Column="0" Grid.Row="1" Margin="4"
+                             SelectionMode="Extended"
+                             ItemsSource="{Binding PlatformSymbolIdentifiers}"
+                             SelectionChanged="List_SelectionChanged"/>
 
                     <Button Grid.Column="0" Grid.Row="2" Width="120" HorizontalAlignment="Left"
-                            Margin="4" Content="Add Symbol Files..."/>
+                            Margin="4" Content="Add Symbol Files..."
+                            Click="AddSymbolFilesButton_Click"/>
 
                     <StackPanel Grid.Column="2" Grid.Row="1">
-                        <Button Name="symbolFileUpButton" Width="75" Margin="4" Content="_Up"/>
-                        <Button Name="symbolFileDownButton" Width="75" Margin="4,4" Content="_Down"/>
-                        <Button Name="symbolFileRemoveButton" Width="75" Margin="4,20,4,0" Content="_Remove"/>
+                        <Button Name="symbolFileUpButton" Width="75" Margin="4" Content="_Up"
+                                Click="SymbolFileUpButton_Click"/>
+                        <Button Name="symbolFileDownButton" Width="75" Margin="4,4" Content="_Down"
+                                Click="SymbolFileDownButton_Click"/>
+                        <Button Name="symbolFileRemoveButton" Width="75" Margin="4,20,4,0" Content="_Remove"
+                                Click="SymbolFileRemoveButton_Click"/>
                     </StackPanel>
                 </Grid>
             </TabItem>
@@ -201,15 +206,18 @@ limitations under the License.
                     <TextBlock Grid.Column="0" Grid.Row="0" Margin="4,0,0,0"
                                Text="Currently configured symbol files:"/>
 
-                    <ListBox Name="extensionScriptsListBox" Grid.Column="0" Grid.Row="1" Margin="4">
-
-                    </ListBox>
+                    <ListBox Name="extensionScriptsListBox" Grid.Column="0" Grid.Row="1" Margin="4"
+                             SelectionMode="Extended"
+                             ItemsSource="{Binding ExtensionScriptIdentifiers}"
+                             SelectionChanged="List_SelectionChanged"/>
 
                     <Button Grid.Column="0" Grid.Row="3" Width="120" HorizontalAlignment="Left"
-                            Margin="4" Content="Add Scripts..."/>
+                            Margin="4" Content="Add Scripts..."
+                            Click="AddExtensionScriptsButton_Click"/>
 
                     <StackPanel Grid.Column="1" Grid.Row="1">
-                        <Button Name="extensionScriptRemoveButton" Width="75" Margin="4" Content="_Remove"/>
+                        <Button Name="extensionScriptRemoveButton" Width="75" Margin="4" Content="_Remove"
+                                Click="ExtensionScriptRemoveButton_Click"/>
                     </StackPanel>
                 </Grid>
             </TabItem>
diff --git a/SourceGenWPF/WpfGui/EditProjectProperties.xaml.cs b/SourceGenWPF/WpfGui/EditProjectProperties.xaml.cs
index 47e0039..585cfd8 100644
--- a/SourceGenWPF/WpfGui/EditProjectProperties.xaml.cs
+++ b/SourceGenWPF/WpfGui/EditProjectProperties.xaml.cs
@@ -102,6 +102,8 @@ namespace SourceGenWPF.WpfGui {
             LoadProjectSymbols();
             LoadPlatformSymbolFiles();
             LoadExtensionScriptNames();
+
+            UpdateControls();
         }
 
         private void ApplyButton_Click(object sender, RoutedEventArgs e) {
@@ -127,14 +129,38 @@ namespace SourceGenWPF.WpfGui {
             //
             // Project symbols tab
             //
-
             // Enable or disable the edit/remove buttons based on how many items are selected.
             // (We're currently configured for single-select, so this is really just a != 0 test.)
             int symSelCount = projectSymbolsListView.SelectedItems.Count;
             removeSymbolButton.IsEnabled = (symSelCount == 1);
             editSymbolButton.IsEnabled = (symSelCount == 1);
+
+            //
+            // Platform symbol files tab
+            //
+            int fileSelCount = symbolFilesListBox.SelectedItems.Count;
+            symbolFileRemoveButton.IsEnabled = (fileSelCount != 0);
+            symbolFileUpButton.IsEnabled = (fileSelCount == 1 &&
+                symbolFilesListBox.SelectedIndex != 0);
+            symbolFileDownButton.IsEnabled = (fileSelCount == 1 &&
+                symbolFilesListBox.SelectedIndex != symbolFilesListBox.Items.Count - 1);
+
+            //
+            // Extension Scripts tab
+            //
+            fileSelCount = extensionScriptsListBox.SelectedItems.Count;
+            extensionScriptRemoveButton.IsEnabled = (fileSelCount != 0);
         }
 
+        /// <summary>
+        /// Handles a change in the selection of any of the lists.
+        /// </summary>
+        private void List_SelectionChanged(object sender, SelectionChangedEventArgs e) {
+            // Enable/disable buttons as the selection changes.
+            UpdateControls();
+        }
+
+
         #region General
 
         // CPU combo box items
@@ -486,41 +512,29 @@ namespace SourceGenWPF.WpfGui {
 
         #endregion Project Symbols
 
-
         #region Platform symbol files
 
+        public ObservableCollection<string> PlatformSymbolIdentifiers { get; private set; } =
+            new ObservableCollection<string>();
+
         /// <summary>
         /// Loads the platform symbol file names into the list control.
         /// </summary>
         private void LoadPlatformSymbolFiles() {
-#if false
-            symbolFilesListBox.BeginUpdate();
-            symbolFilesListBox.Items.Clear();
-
+            PlatformSymbolIdentifiers.Clear();
             foreach (string fileName in mWorkProps.PlatformSymbolFileIdentifiers) {
-                symbolFilesListBox.Items.Add(fileName);
+                PlatformSymbolIdentifiers.Add(fileName);
             }
-
-            symbolFilesListBox.EndUpdate();
-#endif
         }
 
-        private void ProjectSymbolsListView_SelectionChanged(object sender,
-                SelectionChangedEventArgs e) {
-            // Enable/disable buttons as the selection changes.
-            UpdateControls();
-        }
-
-#if false
-
-        private void addSymbolFilesButton_Click(object sender, EventArgs e) {
+        private void AddSymbolFilesButton_Click(object sender, RoutedEventArgs e) {
             OpenFileDialog fileDlg = new OpenFileDialog() {
                 Filter = PlatformSymbols.FILENAME_FILTER,
                 Multiselect = true,
                 InitialDirectory = RuntimeDataAccess.GetDirectory(),
                 RestoreDirectory = true     // doesn't seem to work?
             };
-            if (fileDlg.ShowDialog() != DialogResult.OK) {
+            if (fileDlg.ShowDialog() != true) {
                 return;
             }
 
@@ -533,12 +547,12 @@ namespace SourceGenWPF.WpfGui {
                     // Files not found in runtime or project directory.
                     string projDir = mProjectDir;
                     if (string.IsNullOrEmpty(projDir)) {
-                        projDir = Properties.Resources.UNSET;
+                        projDir = Res.Strings.UNSET;
                     }
-                    string msg = string.Format(Properties.Resources.EXTERNAL_FILE_BAD_DIR,
+                    string msg = string.Format(Res.Strings.EXTERNAL_FILE_BAD_DIR_FMT,
                             RuntimeDataAccess.GetDirectory(), projDir, pathName);
-                    MessageBox.Show(this, msg, Properties.Resources.EXTERNAL_FILE_BAD_DIR_CAPTION,
-                        MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    MessageBox.Show(msg, Res.Strings.EXTERNAL_FILE_BAD_DIR_CAPTION,
+                        MessageBoxButton.OK, MessageBoxImage.Error);
                     return;
                 }
 
@@ -551,149 +565,85 @@ namespace SourceGenWPF.WpfGui {
 
                 Debug.WriteLine("Adding symbol file: " + ident);
                 mWorkProps.PlatformSymbolFileIdentifiers.Add(ident);
-                mDirty = true;
+                IsDirty = true;
             }
 
-            if (mDirty) {
+            if (IsDirty) {
                 LoadPlatformSymbolFiles();
                 UpdateControls();
             }
         }
 
-        private void symbolFileUpButton_Click(object sender, EventArgs e) {
-            Debug.Assert(symbolFilesListBox.SelectedIndices.Count == 1);
-            int selIndex = symbolFilesListBox.SelectedIndices[0];
+        private void SymbolFileUpButton_Click(object sender, EventArgs e) {
+            Debug.Assert(symbolFilesListBox.SelectedItems.Count == 1);
+            int selIndex = symbolFilesListBox.SelectedIndex;
             Debug.Assert(selIndex > 0);
 
             MoveSingleItem(selIndex, symbolFilesListBox.SelectedItem, -1);
         }
 
-        private void symbolFileDownButton_Click(object sender, EventArgs e) {
-            Debug.Assert(symbolFilesListBox.SelectedIndices.Count == 1);
-            int selIndex = symbolFilesListBox.SelectedIndices[0];
+        private void SymbolFileDownButton_Click(object sender, EventArgs e) {
+            Debug.Assert(symbolFilesListBox.SelectedItems.Count == 1);
+            int selIndex = symbolFilesListBox.SelectedIndex;
             Debug.Assert(selIndex < symbolFilesListBox.Items.Count - 1);
 
             MoveSingleItem(selIndex, symbolFilesListBox.SelectedItem, +1);
         }
 
         private void MoveSingleItem(int selIndex, object selectedItem, int adj) {
-            object selected = symbolFilesListBox.SelectedItem;
-            symbolFilesListBox.Items.Remove(selected);
-            symbolFilesListBox.Items.Insert(selIndex + adj, selected);
-            symbolFilesListBox.SetSelected(selIndex + adj, true);
+            string selected = (string)symbolFilesListBox.SelectedItem;
+            PlatformSymbolIdentifiers.Remove(selected);
+            PlatformSymbolIdentifiers.Insert(selIndex + adj, selected);
+            symbolFilesListBox.SelectedIndex = selIndex + adj;
 
             // do the same operation in the file name list
             string str = mWorkProps.PlatformSymbolFileIdentifiers[selIndex];
             mWorkProps.PlatformSymbolFileIdentifiers.RemoveAt(selIndex);
             mWorkProps.PlatformSymbolFileIdentifiers.Insert(selIndex + adj, str);
 
-            mDirty = true;
+            IsDirty = true;
             UpdateControls();
         }
 
-        private void symbolFileRemoveButton_Click(object sender, EventArgs e) {
-            Debug.Assert(symbolFilesListBox.SelectedIndices.Count > 0);
-            for (int i = symbolFilesListBox.SelectedIndices.Count - 1; i >= 0; i--) {
-                int index = symbolFilesListBox.SelectedIndices[i];
-                symbolFilesListBox.Items.RemoveAt(index);
-                mWorkProps.PlatformSymbolFileIdentifiers.RemoveAt(index);
+        private void SymbolFileRemoveButton_Click(object sender, EventArgs e) {
+            Debug.Assert(symbolFilesListBox.SelectedItems.Count > 0);
+            for (int i = symbolFilesListBox.SelectedItems.Count - 1; i >= 0; i--) {
+                string selItem = (string)symbolFilesListBox.SelectedItems[i];
+                PlatformSymbolIdentifiers.Remove(selItem);
+                mWorkProps.PlatformSymbolFileIdentifiers.Remove(selItem);
             }
 
-            mDirty = true;
+            IsDirty = true;
             UpdateControls();
         }
 
-        private void importSymbolsButton_Click(object sender, EventArgs e) {
-            OpenFileDialog fileDlg = new OpenFileDialog() {
-                Filter = ProjectFile.FILENAME_FILTER + "|" + Properties.Resources.FILE_FILTER_ALL,
-                FilterIndex = 1
-            };
-            if (fileDlg.ShowDialog() != DialogResult.OK) {
-                return;
-            }
-            string projPathName = Path.GetFullPath(fileDlg.FileName);
-
-            DisasmProject newProject = new DisasmProject();
-            if (!ProjectFile.DeserializeFromFile(projPathName, newProject,
-                    out FileLoadReport report)) {
-                // Unable to open project file.  Report error and bail.
-                ProjectLoadIssues dlg = new ProjectLoadIssues(report.Format(),
-                    ProjectLoadIssues.Buttons.Cancel);
-                dlg.ShowDialog();
-                // ignore dlg.DialogResult
-                dlg.Dispose();
-                return;
-            }
-
-            // Import all user labels that were marked as "global export".  These become
-            // external-address project symbols.
-            int foundCount = 0;
-            foreach (KeyValuePair<int, Symbol> kvp in newProject.UserLabels) {
-                if (kvp.Value.SymbolType == Symbol.Type.GlobalAddrExport) {
-                    Symbol sym = kvp.Value;
-                    DefSymbol defSym = new DefSymbol(sym.Label, sym.Value, Symbol.Source.Project,
-                        Symbol.Type.ExternalAddr, FormatDescriptor.SubType.None,
-                        string.Empty, string.Empty);
-                    mWorkProps.ProjectSyms[defSym.Label] = defSym;
-                    foundCount++;
-                }
-            }
-            if (foundCount != 0) {
-                mDirty = true;
-                LoadProjectSymbols();
-                UpdateControls();
-            }
-
-            newProject.Cleanup();
-
-            // Tell the user we did something.  Might be nice to tell them how many weren't
-            // already present.
-            string msg;
-            if (foundCount == 0) {
-                msg = Properties.Resources.SYMBOL_IMPORT_NONE;
-            } else {
-                msg = string.Format(Properties.Resources.SYMBOL_IMPORT_GOOD, foundCount);
-            }
-            MessageBox.Show(this, msg, Properties.Resources.SYMBOL_IMPORT_CAPTION,
-                MessageBoxButtons.OK, MessageBoxIcon.Information);
-        }
-#endif
-
         #endregion Platform symbol files
 
 
         #region Extension scripts
 
+        public ObservableCollection<string> ExtensionScriptIdentifiers { get; private set; } =
+            new ObservableCollection<string>();
+
         /// <summary>
         /// Loads the extension script file names into the list control.
         /// </summary>
         private void LoadExtensionScriptNames() {
-#if false
-            extensionScriptsListBox.BeginUpdate();
-            extensionScriptsListBox.Items.Clear();
+            ExtensionScriptIdentifiers.Clear();
 
             foreach (string fileName in mWorkProps.ExtensionScriptFileIdentifiers) {
-                extensionScriptsListBox.Items.Add(fileName);
+                ExtensionScriptIdentifiers.Add(fileName);
             }
-
-            extensionScriptsListBox.EndUpdate();
-#endif
         }
 
-#if false
-        private void extensionScriptsListBox_SelectedIndexChanged(object sender, EventArgs e) {
-            // Enable/disable buttons as the selection changes.
-            UpdateControls();
-        }
-
-        private void addExtensionScriptsButton_Click(object sender, EventArgs e) {
+        private void AddExtensionScriptsButton_Click(object sender, EventArgs e) {
             OpenFileDialog fileDlg = new OpenFileDialog() {
                 Filter = Sandbox.ScriptManager.FILENAME_FILTER,
                 Multiselect = true,
                 InitialDirectory = RuntimeDataAccess.GetDirectory(),
                 RestoreDirectory = true     // doesn't seem to work?
             };
-            if (fileDlg.ShowDialog() != DialogResult.OK) {
+            if (fileDlg.ShowDialog() != true) {
                 return;
             }
 
@@ -706,12 +656,12 @@ namespace SourceGenWPF.WpfGui {
                     // Files not found in runtime or project directory.
                     string projDir = mProjectDir;
                     if (string.IsNullOrEmpty(projDir)) {
-                        projDir = Properties.Resources.UNSET;
+                        projDir = Res.Strings.UNSET;
                     }
-                    string msg = string.Format(Properties.Resources.EXTERNAL_FILE_BAD_DIR,
+                    string msg = string.Format(Res.Strings.EXTERNAL_FILE_BAD_DIR_FMT,
                             RuntimeDataAccess.GetDirectory(), projDir, pathName);
-                    MessageBox.Show(this, msg, Properties.Resources.EXTERNAL_FILE_BAD_DIR_CAPTION,
-                        MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    MessageBox.Show(this, msg, Res.Strings.EXTERNAL_FILE_BAD_DIR_CAPTION,
+                        MessageBoxButton.OK, MessageBoxImage.Error);
                     return;
                 }
 
@@ -724,27 +674,26 @@ namespace SourceGenWPF.WpfGui {
 
                 Debug.WriteLine("Adding extension script: " + ident);
                 mWorkProps.ExtensionScriptFileIdentifiers.Add(ident);
-                mDirty = true;
+                IsDirty = true;
             }
 
-            if (mDirty) {
+            if (IsDirty) {
                 LoadExtensionScriptNames();
                 UpdateControls();
             }
         }
 
-        private void extensionScriptRemoveButton_Click(object sender, EventArgs e) {
-            Debug.Assert(extensionScriptsListBox.SelectedIndices.Count > 0);
-            for (int i = extensionScriptsListBox.SelectedIndices.Count - 1; i >= 0; i--) {
-                int index = extensionScriptsListBox.SelectedIndices[i];
-                extensionScriptsListBox.Items.RemoveAt(index);
-                mWorkProps.ExtensionScriptFileIdentifiers.RemoveAt(index);
+        private void ExtensionScriptRemoveButton_Click(object sender, EventArgs e) {
+            Debug.Assert(extensionScriptsListBox.SelectedItems.Count > 0);
+            for (int i = extensionScriptsListBox.SelectedItems.Count - 1; i >= 0; i--) {
+                string selItem = (string)extensionScriptsListBox.SelectedItems[i];
+                ExtensionScriptIdentifiers.Remove(selItem);
+                mWorkProps.ExtensionScriptFileIdentifiers.Remove(selItem);
             }
 
-            mDirty = true;
+            IsDirty = true;
             UpdateControls();
         }
-#endif
 
         #endregion Extension scripts
     }