New config options, again. Also some fixes.

1 files changed, 24 insertions, 3 deletions

diff --git a/MainForm.cs b/MainForm.cs
index 888b9304..3c72f0a3 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -173,6 +173,8 @@ namespace com.clusterrr.hakchi_gui
                 FTPToolStripMenuItem_Click(null, null);

             if (ConfigIni.TelnetServer)

                 Clovershell.ShellEnabled = shellToolStripMenuItem.Checked = true;

+            alwaysWriteGamesToUSBDriveToolStripMenuItem.Checked = ConfigIni.AlwaysWriteToUSB;

+            buttonStart.Text = (Control.ModifierKeys == Keys.Shift) ^ ConfigIni.AlwaysWriteToUSB ? Resources.SyncronizeUSB : Resources.Syncronize;

         }

 

         void FormInitialize()

@@ -805,7 +807,7 @@ namespace com.clusterrr.hakchi_gui
 

         private void buttonStart_Click(object sender, EventArgs e)

         {

-            bool exportGames = (Control.ModifierKeys == Keys.Shift);

+            bool exportGames = (Control.ModifierKeys == Keys.Shift) ^ ConfigIni.AlwaysWriteToUSB;

             SaveConfig();

 

             var stats = RecalculateSelectedGames();

@@ -1245,6 +1247,12 @@ namespace com.clusterrr.hakchi_gui
             ConfigIni.UsbHost = enableUSBHostToolStripMenuItem.Checked;

         }

 

+        private void alwaysWriteGamesToUSBDriveToolStripMenuItem_Click(object sender, EventArgs e)

+        {

+            ConfigIni.AlwaysWriteToUSB = alwaysWriteGamesToUSBDriveToolStripMenuItem.Checked;

+            buttonStart.Text = (Control.ModifierKeys == Keys.Shift) ^ ConfigIni.AlwaysWriteToUSB ? Resources.SyncronizeUSB : Resources.Syncronize;

+        }

+

         private void selectButtonCombinationToolStripMenuItem_Click(object sender, EventArgs e)

         {

             switch (ConfigIni.ConsoleType)

@@ -1585,8 +1593,8 @@ namespace com.clusterrr.hakchi_gui
                     WorkerForm.SyncConfig(out customFirmware, out realConsoleType, true);

                     if (!customFirmware)

                         MessageBox.Show(Resources.Done, Resources.Wow, MessageBoxButtons.OK, MessageBoxIcon.Information);

-                    else // TODO: Add translation

-                        MessageBox.Show(string.Format("Config saved. Please note that configuration for real console ({0}) was used, not for selected console ({1}).",

+                    else

+                        MessageBox.Show(string.Format(Resources.ConfigSavedNote,

                             GetConsoleName(realConsoleType), GetConsoleName(ConfigIni.ConsoleType)),

                             Resources.Done, MessageBoxButtons.OK, MessageBoxIcon.Information);

                 }

@@ -1893,6 +1901,8 @@ namespace com.clusterrr.hakchi_gui
 

         private void MainForm_KeyDown(object sender, KeyEventArgs e)

         {

+            if (e.KeyCode == Keys.ShiftKey)

+                buttonStart.Text = !ConfigIni.AlwaysWriteToUSB ? Resources.SyncronizeUSB : Resources.Syncronize;

             if (listViewGames.SelectedItems.Count != 1) return;

             var selected = listViewGames.SelectedItems[0].Tag;

             if ((e.KeyCode == Keys.E) && (e.Modifiers == (Keys.Alt | Keys.Control)) && (selected is SnesGame))

@@ -1902,6 +1912,17 @@ namespace com.clusterrr.hakchi_gui
             }

         }

 

+        private void MainForm_KeyUp(object sender, KeyEventArgs e)

+        {

+            if (e.KeyCode == Keys.ShiftKey)

+                buttonStart.Text = ConfigIni.AlwaysWriteToUSB ? Resources.SyncronizeUSB : Resources.Syncronize;

+        }

+

+        private void MainForm_Activated(object sender, EventArgs e)

+        {

+            buttonStart.Text = (Control.ModifierKeys == Keys.Shift) ^ ConfigIni.AlwaysWriteToUSB ? Resources.SyncronizeUSB : Resources.Syncronize;

+        }

+

         private void createCustomCommandToolStripMenuItem_Click(object sender, EventArgs e)

         {

             try