Merge branch 'stable' into export-games

1 files changed, 132 insertions, 120 deletions

diff --git a/MainForm.resx b/MainForm.resx
index 0bf4bbb8..4a115dc5 100644
--- a/MainForm.resx
+++ b/MainForm.resx
@@ -120,17 +120,51 @@
   <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>315, 17</value>

   </metadata>

+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

+  <data name="menuStrip.Location" type="System.Drawing.Point, System.Drawing">

+    <value>0, 0</value>

+  </data>

+  <data name="menuStrip.Size" type="System.Drawing.Size, System.Drawing">

+    <value>609, 24</value>

+  </data>

+  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

+  <data name="menuStrip.TabIndex" type="System.Int32, mscorlib">

+    <value>1</value>

+  </data>

+  <data name="&gt;&gt;menuStrip.Name" xml:space="preserve">

+    <value>menuStrip</value>

+  </data>

+  <data name="&gt;&gt;menuStrip.Type" xml:space="preserve">

+    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </data>

+  <data name="&gt;&gt;menuStrip.Parent" xml:space="preserve">

+    <value>$this</value>

+  </data>

+  <data name="&gt;&gt;menuStrip.ZOrder" xml:space="preserve">

+    <value>5</value>

+  </data>

+  <data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+    <value>37, 20</value>

+  </data>

+  <data name="fileToolStripMenuItem.Text" xml:space="preserve">

+    <value>&amp;File</value>

+  </data>

   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

   <data name="addMoreGamesToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">

     <value>Ctrl+O</value>

   </data>

-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

   <data name="addMoreGamesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>208, 22</value>

   </data>

   <data name="addMoreGamesToolStripMenuItem.Text" xml:space="preserve">

     <value>Add more &amp;games</value>

   </data>

+  <data name="presetsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+    <value>208, 22</value>

+  </data>

+  <data name="presetsToolStripMenuItem.Text" xml:space="preserve">

+    <value>Selection presets</value>

+  </data>

   <data name="toolStripMenuItem2.Size" type="System.Drawing.Size, System.Drawing">

     <value>139, 6</value>

   </data>

@@ -146,12 +180,6 @@
   <data name="deletePresetToolStripMenuItem.Text" xml:space="preserve">

     <value>Delete preset</value>

   </data>

-  <data name="presetsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

-    <value>208, 22</value>

-  </data>

-  <data name="presetsToolStripMenuItem.Text" xml:space="preserve">

-    <value>Selection presets</value>

-  </data>

   <data name="synchronizeToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">

     <value>F5</value>

   </data>

@@ -179,11 +207,11 @@
   <data name="exitToolStripMenuItem.Text" xml:space="preserve">

     <value>&amp;Exit</value>

   </data>

-  <data name="fileToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

-    <value>37, 20</value>

+  <data name="kernelToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+    <value>52, 20</value>

   </data>

-  <data name="fileToolStripMenuItem.Text" xml:space="preserve">

-    <value>&amp;File</value>

+  <data name="kernelToolStripMenuItem.Text" xml:space="preserve">

+    <value>&amp;Kernel</value>

   </data>

   <data name="dumpKernelToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>276, 22</value>

@@ -233,7 +261,6 @@
   <data name="toolFlashTheWholeNANDStripMenuItem.Text" xml:space="preserve">

     <value>Flash the whole NAND (experts only!)</value>

   </data>

-  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

   <data name="toolFlashTheWholeNANDStripMenuItem.Visible" type="System.Boolean, mscorlib">

     <value>False</value>

   </data>

@@ -264,11 +291,11 @@
   <data name="uninstallToolStripMenuItem.Text" xml:space="preserve">

     <value>Uninstall</value>

   </data>

-  <data name="kernelToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

-    <value>52, 20</value>

+  <data name="modulesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+    <value>65, 20</value>

   </data>

-  <data name="kernelToolStripMenuItem.Text" xml:space="preserve">

-    <value>&amp;Kernel</value>

+  <data name="modulesToolStripMenuItem.Text" xml:space="preserve">

+    <value>&amp;Modules</value>

   </data>

   <data name="installModulesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>197, 22</value>

@@ -282,11 +309,11 @@
   <data name="uninstallModulesToolStripMenuItem.Text" xml:space="preserve">

     <value>Uninstall extra modules</value>

   </data>

-  <data name="modulesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

-    <value>65, 20</value>

+  <data name="settingsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+    <value>61, 20</value>

   </data>

-  <data name="modulesToolStripMenuItem.Text" xml:space="preserve">

-    <value>&amp;Modules</value>

+  <data name="settingsToolStripMenuItem.Text" xml:space="preserve">

+    <value>&amp;Settings</value>

   </data>

   <data name="languageToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

     <value>

@@ -314,6 +341,12 @@
   <data name="languageToolStripMenuItem.Text" xml:space="preserve">

     <value>Language</value>

   </data>

+  <data name="consoleTypeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+    <value>327, 22</value>

+  </data>

+  <data name="consoleTypeToolStripMenuItem.Text" xml:space="preserve">

+    <value>Console type</value>

+  </data>

   <data name="nESMiniToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>198, 22</value>

   </data>

@@ -338,11 +371,11 @@
   <data name="superFamicomMiniToolStripMenuItem.Text" xml:space="preserve">

     <value>Super Famicom (Japan)</value>

   </data>

-  <data name="consoleTypeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+  <data name="pagesfoldersTypeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>327, 22</value>

   </data>

-  <data name="consoleTypeToolStripMenuItem.Text" xml:space="preserve">

-    <value>Console type</value>

+  <data name="pagesfoldersTypeToolStripMenuItem.Text" xml:space="preserve">

+    <value>Pages/folders structure</value>

   </data>

   <data name="disablePagefoldersToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>356, 22</value>

@@ -422,11 +455,11 @@
   <data name="customToolStripMenuItem.Text" xml:space="preserve">

     <value>Custom - show Folders Manager every time</value>

   </data>

-  <data name="pagesfoldersTypeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+  <data name="cloverconHackToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>327, 22</value>

   </data>

-  <data name="pagesfoldersTypeToolStripMenuItem.Text" xml:space="preserve">

-    <value>Pages/folders structure</value>

+  <data name="cloverconHackToolStripMenuItem.Text" xml:space="preserve">

+    <value>Controller hacks</value>

   </data>

   <data name="resetUsingCombinationOfButtonsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>308, 22</value>

@@ -458,12 +491,6 @@
   <data name="upABStartOnSecondControllerToolStripMenuItem.Text" xml:space="preserve">

     <value>"Up+A+B = Start" on 2nd controller</value>

   </data>

-  <data name="cloverconHackToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

-    <value>327, 22</value>

-  </data>

-  <data name="cloverconHackToolStripMenuItem.Text" xml:space="preserve">

-    <value>Controller hacks</value>

-  </data>

   <data name="compressGamesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>327, 22</value>

   </data>

@@ -500,11 +527,11 @@
   <data name="saveSettingsToNESMiniNowToolStripMenuItem.Text" xml:space="preserve">

     <value>Save settings to NES/SNES Mini now</value>

   </data>

-  <data name="settingsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

-    <value>61, 20</value>

+  <data name="toolsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+    <value>47, 20</value>

   </data>

-  <data name="settingsToolStripMenuItem.Text" xml:space="preserve">

-    <value>&amp;Settings</value>

+  <data name="toolsToolStripMenuItem.Text" xml:space="preserve">

+    <value>&amp;Tools</value>

   </data>

   <data name="saveStateManagerToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>331, 22</value>

@@ -557,11 +584,11 @@
   <data name="takeScreenshotToolStripMenuItem.Text" xml:space="preserve">

     <value>Take screenshot</value>

   </data>

-  <data name="toolsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

-    <value>47, 20</value>

+  <data name="helpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

+    <value>44, 20</value>

   </data>

-  <data name="toolsToolStripMenuItem.Text" xml:space="preserve">

-    <value>&amp;Tools</value>

+  <data name="helpToolStripMenuItem.Text" xml:space="preserve">

+    <value>&amp;Help</value>

   </data>

   <data name="gitHubPageWithActualReleasesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>246, 22</value>

@@ -587,33 +614,6 @@
   <data name="aboutToolStripMenuItem.Text" xml:space="preserve">

     <value>About...</value>

   </data>

-  <data name="helpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

-    <value>44, 20</value>

-  </data>

-  <data name="helpToolStripMenuItem.Text" xml:space="preserve">

-    <value>&amp;Help</value>

-  </data>

-  <data name="menuStrip.Location" type="System.Drawing.Point, System.Drawing">

-    <value>0, 0</value>

-  </data>

-  <data name="menuStrip.Size" type="System.Drawing.Size, System.Drawing">

-    <value>609, 24</value>

-  </data>

-  <data name="menuStrip.TabIndex" type="System.Int32, mscorlib">

-    <value>1</value>

-  </data>

-  <data name="&gt;&gt;menuStrip.Name" xml:space="preserve">

-    <value>menuStrip</value>

-  </data>

-  <data name="&gt;&gt;menuStrip.Type" xml:space="preserve">

-    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </data>

-  <data name="&gt;&gt;menuStrip.Parent" xml:space="preserve">

-    <value>$this</value>

-  </data>

-  <data name="&gt;&gt;menuStrip.ZOrder" xml:space="preserve">

-    <value>5</value>

-  </data>

   <data name="groupBoxOptions.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">

     <value>None</value>

   </data>

@@ -858,7 +858,7 @@
     <value>8</value>

   </data>

   <data name="buttonGoogle.Location" type="System.Drawing.Point, System.Drawing">

-    <value>219, 427</value>

+    <value>224, 427</value>

   </data>

   <data name="buttonGoogle.Size" type="System.Drawing.Size, System.Drawing">

     <value>61, 23</value>

@@ -882,7 +882,7 @@
     <value>9</value>

   </data>

   <data name="buttonBrowseImage.Location" type="System.Drawing.Point, System.Drawing">

-    <value>219, 384</value>

+    <value>224, 384</value>

   </data>

   <data name="buttonBrowseImage.Size" type="System.Drawing.Size, System.Drawing">

     <value>61, 23</value>

@@ -906,7 +906,7 @@
     <value>10</value>

   </data>

   <data name="pictureBoxArt.Location" type="System.Drawing.Point, System.Drawing">

-    <value>71, 316</value>

+    <value>76, 316</value>

   </data>

   <data name="pictureBoxArt.Size" type="System.Drawing.Size, System.Drawing">

     <value>140, 204</value>

@@ -930,10 +930,10 @@
     <value>11</value>

   </data>

   <data name="label4.Location" type="System.Drawing.Point, System.Drawing">

-    <value>15, 316</value>

+    <value>5, 316</value>

   </data>

   <data name="label4.Size" type="System.Drawing.Size, System.Drawing">

-    <value>53, 204</value>

+    <value>69, 204</value>

   </data>

   <data name="label4.TabIndex" type="System.Int32, mscorlib">

     <value>11</value>

@@ -1265,27 +1265,6 @@
   <metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>407, 17</value>

   </metadata>

-  <data name="toolStripStatusConnectionIcon.AutoSize" type="System.Boolean, mscorlib">

-    <value>False</value>

-  </data>

-  <data name="toolStripStatusConnectionIcon.Size" type="System.Drawing.Size, System.Drawing">

-    <value>16, 17</value>

-  </data>

-  <data name="toolStripStatusLabelSelected.AutoSize" type="System.Boolean, mscorlib">

-    <value>False</value>

-  </data>

-  <data name="toolStripStatusLabelSelected.Size" type="System.Drawing.Size, System.Drawing">

-    <value>195, 17</value>

-  </data>

-  <data name="toolStripStatusLabelSize.AutoSize" type="System.Boolean, mscorlib">

-    <value>False</value>

-  </data>

-  <data name="toolStripStatusLabelSize.Size" type="System.Drawing.Size, System.Drawing">

-    <value>195, 17</value>

-  </data>

-  <data name="toolStripProgressBar.Size" type="System.Drawing.Size, System.Drawing">

-    <value>195, 16</value>

-  </data>

   <data name="statusStrip.Location" type="System.Drawing.Point, System.Drawing">

     <value>0, 614</value>

   </data>

@@ -1307,6 +1286,27 @@
   <data name="&gt;&gt;statusStrip.ZOrder" xml:space="preserve">

     <value>2</value>

   </data>

+  <data name="toolStripStatusConnectionIcon.AutoSize" type="System.Boolean, mscorlib">

+    <value>False</value>

+  </data>

+  <data name="toolStripStatusConnectionIcon.Size" type="System.Drawing.Size, System.Drawing">

+    <value>16, 17</value>

+  </data>

+  <data name="toolStripStatusLabelSelected.AutoSize" type="System.Boolean, mscorlib">

+    <value>False</value>

+  </data>

+  <data name="toolStripStatusLabelSelected.Size" type="System.Drawing.Size, System.Drawing">

+    <value>195, 17</value>

+  </data>

+  <data name="toolStripStatusLabelSize.AutoSize" type="System.Boolean, mscorlib">

+    <value>False</value>

+  </data>

+  <data name="toolStripStatusLabelSize.Size" type="System.Drawing.Size, System.Drawing">

+    <value>195, 17</value>

+  </data>

+  <data name="toolStripProgressBar.Size" type="System.Drawing.Size, System.Drawing">

+    <value>195, 16</value>

+  </data>

   <metadata name="openFileDialogNes.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>500, 17</value>

   </metadata>

@@ -1316,6 +1316,15 @@
   <metadata name="contextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>638, 17</value>

   </metadata>

+  <data name="contextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">

+    <value>270, 92</value>

+  </data>

+  <data name="&gt;&gt;contextMenuStrip.Name" xml:space="preserve">

+    <value>contextMenuStrip</value>

+  </data>

+  <data name="&gt;&gt;contextMenuStrip.Type" xml:space="preserve">

+    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </data>

   <data name="downloadBoxArtForSelectedGamesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">

     <value>269, 22</value>

   </data>

@@ -1343,15 +1352,6 @@
   <data name="deleteSelectedGamesToolStripMenuItem.Text" xml:space="preserve">

     <value>Delete selected games</value>

   </data>

-  <data name="contextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">

-    <value>270, 92</value>

-  </data>

-  <data name="&gt;&gt;contextMenuStrip.Name" xml:space="preserve">

-    <value>contextMenuStrip</value>

-  </data>

-  <data name="&gt;&gt;contextMenuStrip.Type" xml:space="preserve">

-    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </data>

   <metadata name="openFileDialogImage.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>17, 98</value>

   </metadata>

@@ -1391,18 +1391,6 @@
   <data name="groupBoxDefaultGames.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">

     <value>None</value>

   </data>

-  <data name="checkedListBoxDefaultGames.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">

-    <value>Top, Bottom, Left, Right</value>

-  </data>

-  <data name="checkedListBoxDefaultGames.Location" type="System.Drawing.Point, System.Drawing">

-    <value>5, 49</value>

-  </data>

-  <data name="checkedListBoxDefaultGames.Size" type="System.Drawing.Size, System.Drawing">

-    <value>282, 454</value>

-  </data>

-  <data name="checkedListBoxDefaultGames.TabIndex" type="System.Int32, mscorlib">

-    <value>3</value>

-  </data>

   <data name="&gt;&gt;checkedListBoxDefaultGames.Name" xml:space="preserve">

     <value>checkedListBoxDefaultGames</value>

   </data>

@@ -1442,6 +1430,30 @@
   <data name="&gt;&gt;groupBoxDefaultGames.ZOrder" xml:space="preserve">

     <value>7</value>

   </data>

+  <data name="checkedListBoxDefaultGames.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">

+    <value>Top, Bottom, Left, Right</value>

+  </data>

+  <data name="checkedListBoxDefaultGames.Location" type="System.Drawing.Point, System.Drawing">

+    <value>5, 49</value>

+  </data>

+  <data name="checkedListBoxDefaultGames.Size" type="System.Drawing.Size, System.Drawing">

+    <value>282, 454</value>

+  </data>

+  <data name="checkedListBoxDefaultGames.TabIndex" type="System.Int32, mscorlib">

+    <value>3</value>

+  </data>

+  <data name="&gt;&gt;checkedListBoxDefaultGames.Name" xml:space="preserve">

+    <value>checkedListBoxDefaultGames</value>

+  </data>

+  <data name="&gt;&gt;checkedListBoxDefaultGames.Type" xml:space="preserve">

+    <value>System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </data>

+  <data name="&gt;&gt;checkedListBoxDefaultGames.Parent" xml:space="preserve">

+    <value>groupBoxDefaultGames</value>

+  </data>

+  <data name="&gt;&gt;checkedListBoxDefaultGames.ZOrder" xml:space="preserve">

+    <value>0</value>

+  </data>

   <metadata name="timerCalculateGames.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>771, 17</value>

   </metadata>

@@ -1463,12 +1475,6 @@
   <data name="listViewGames.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">

     <value>None</value>

   </data>

-  <data name="gameName.Text" xml:space="preserve">

-    <value>Game name</value>

-  </data>

-  <data name="gameName.Width" type="System.Int32, mscorlib">

-    <value>253</value>

-  </data>

   <data name="listViewGames.Location" type="System.Drawing.Point, System.Drawing">

     <value>12, 57</value>

   </data>

@@ -1493,6 +1499,12 @@
   <metadata name="exportFolderDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>922, 17</value>

   </metadata>

+  <data name="gameName.Text" xml:space="preserve">

+    <value>Game name</value>

+  </data>

+  <data name="gameName.Width" type="System.Int32, mscorlib">

+    <value>253</value>

+  </data>

   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

     <value>True</value>

   </metadata>