diff options
| author | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2017-05-08 16:29:21 +0300 |
|---|---|---|
| committer | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2017-05-08 16:29:21 +0300 |
| commit | 22d083f658eace13e1277ec8b4301d0101e10d0e (patch) | |
| tree | 5b1fd1f077d6bc1387155a6e5cad5e687290eb26 | |
| parent | fc499717e24b1d6b2a22b35a979336c7a230d8f9 (diff) | |
Minor fixes
| -rw-r--r-- | MainForm.Designer.cs | 8 | ||||
| -rw-r--r-- | MainForm.cs | 15 | ||||
| -rw-r--r-- | MainForm.resx | 506 | ||||
| -rw-r--r-- | Program.cs | 8 | ||||
| -rw-r--r-- | Properties/AssemblyInfo.cs | 4 | ||||
| -rw-r--r-- | Properties/Resources.resx | 4 | ||||
| -rw-r--r-- | WorkerForm.cs | 2 | ||||
| -rw-r--r-- | hakchi_gui.csproj | 4 |
8 files changed, 404 insertions, 147 deletions
diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs index 234d813b..de6de7ec 100644 --- a/MainForm.Designer.cs +++ b/MainForm.Designer.cs @@ -893,17 +893,23 @@ //
resources.ApplyResources(this.toolStripStatusConnectionIcon, "toolStripStatusConnectionIcon");
this.toolStripStatusConnectionIcon.Image = global::com.clusterrr.hakchi_gui.Properties.Resources.red;
- this.toolStripStatusConnectionIcon.Margin = new System.Windows.Forms.Padding(2, 3, 0, 2);
+ this.toolStripStatusConnectionIcon.Margin = new System.Windows.Forms.Padding(2, 3, 2, 2);
this.toolStripStatusConnectionIcon.Name = "toolStripStatusConnectionIcon";
//
// toolStripStatusLabelSelected
//
resources.ApplyResources(this.toolStripStatusLabelSelected, "toolStripStatusLabelSelected");
+ this.toolStripStatusLabelSelected.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top)
+ | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)
+ | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
this.toolStripStatusLabelSelected.Name = "toolStripStatusLabelSelected";
//
// toolStripStatusLabelSize
//
resources.ApplyResources(this.toolStripStatusLabelSize, "toolStripStatusLabelSize");
+ this.toolStripStatusLabelSize.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top)
+ | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)
+ | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom)));
this.toolStripStatusLabelSize.Name = "toolStripStatusLabelSize";
//
// toolStripProgressBar
diff --git a/MainForm.cs b/MainForm.cs index e45633ce..1520b314 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -95,18 +95,6 @@ namespace com.clusterrr.hakchi_gui public MainForm()
{
- Program.BaseDirectoryInternal = Path.GetDirectoryName(Application.ExecutablePath);
- if (ApplicationDeployment.IsNetworkDeployed)
- Program.BaseDirectoryExternal = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "hakchi2");
- else
- Program.BaseDirectoryExternal = Program.BaseDirectoryInternal;
- ConfigIni.Load();
- try
- {
- if (!string.IsNullOrEmpty(ConfigIni.Language))
- Thread.CurrentThread.CurrentUICulture = new CultureInfo(ConfigIni.Language);
- }
- catch { }
InitializeComponent();
FormInitialize();
Clovershell = new ClovershellConnection() { AutoReconnect = true, Enabled = true };
@@ -136,7 +124,7 @@ namespace com.clusterrr.hakchi_gui LoadLanguages();
var version = Assembly.GetExecutingAssembly().GetName().Version;
Text = string.Format("hakchi2 - v{0}.{1:D2}{2}", version.Major, version.Build, (version.Revision < 10) ?
- ("rc" + version.Revision.ToString()) : (version.Revision > 10 ? ((char)('a' + version.Revision - 10)).ToString() : ""))
+ ("rc" + version.Revision.ToString()) : (version.Revision > 20 ? ((char)('a' + (version.Revision - 20) / 10)).ToString() : ""))
#if DEBUG
+ " (debug version"
#if VERY_DEBUG
@@ -435,6 +423,7 @@ namespace com.clusterrr.hakchi_gui this.Controls.Clear();
this.InitializeComponent();
FormInitialize();
+ this.Invalidate(true);
};
item.Checked = Thread.CurrentThread.CurrentUICulture.Name == langCodes[language];
found |= item.Checked;
diff --git a/MainForm.resx b/MainForm.resx index e4a54160..3f29e4a8 100644 --- a/MainForm.resx +++ b/MainForm.resx @@ -120,17 +120,54 @@ <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 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="menuStrip.Text" xml:space="preserve">
+ <value>menuStrip</value>
+ </data>
+ <data name=">>menuStrip.Name" xml:space="preserve">
+ <value>menuStrip</value>
+ </data>
+ <data name=">>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=">>menuStrip.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>menuStrip.ZOrder" xml:space="preserve">
+ <value>6</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>&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>238, 22</value>
</data>
<data name="addMoreGamesToolStripMenuItem.Text" xml:space="preserve">
<value>Add more &games</value>
</data>
+ <data name="presetsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>238, 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 +183,6 @@ <data name="deletePresetToolStripMenuItem.Text" xml:space="preserve">
<value>Delete preset</value>
</data>
- <data name="presetsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>238, 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>
@@ -185,11 +216,11 @@ <data name="exitToolStripMenuItem.Text" xml:space="preserve">
<value>&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>&File</value>
+ <data name="kernelToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Kernel</value>
</data>
<data name="dumpKernelToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>179, 22</value>
@@ -215,11 +246,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>&Kernel</value>
+ <data name="modulesToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Modules</value>
</data>
<data name="installModulesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>197, 22</value>
@@ -233,11 +264,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>&Modules</value>
+ <data name="settingsToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Settings</value>
</data>
<data name="languageToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -265,6 +296,12 @@ <data name="languageToolStripMenuItem.Text" xml:space="preserve">
<value>Language</value>
</data>
+ <data name="consoleTypeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>376, 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>151, 22</value>
</data>
@@ -277,11 +314,11 @@ <data name="famicomMiniToolStripMenuItem.Text" xml:space="preserve">
<value>Famicom Mini</value>
</data>
- <data name="consoleTypeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="cloverconHackToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>376, 22</value>
</data>
- <data name="consoleTypeToolStripMenuItem.Text" xml:space="preserve">
- <value>Console type</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>
@@ -313,12 +350,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>376, 22</value>
- </data>
- <data name="cloverconHackToolStripMenuItem.Text" xml:space="preserve">
- <value>Controller hacks</value>
- </data>
<data name="useExtendedFontToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>376, 22</value>
</data>
@@ -337,6 +368,12 @@ <data name="compressGamesIfPossibleToolStripMenuItem.Text" xml:space="preserve">
<value>Compress non-NES games (for additional emulator mod)</value>
</data>
+ <data name="pagesfoldersTypeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>376, 22</value>
+ </data>
+ <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>
</data>
@@ -400,6 +437,12 @@ <data name="foldersSplitByFirstLetterOriginalToolStripMenuItem.Text" xml:space="preserve">
<value>Original games in root -> Folders, split by first letter</value>
</data>
+ <data name="maximumGamesPerFolderToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>356, 22</value>
+ </data>
+ <data name="maximumGamesPerFolderToolStripMenuItem.Text" xml:space="preserve">
+ <value>Maximum games per page/folder</value>
+ </data>
<data name="max20toolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>92, 22</value>
</data>
@@ -472,12 +515,6 @@ <data name="max100toolStripMenuItem.Text" xml:space="preserve">
<value>100</value>
</data>
- <data name="maximumGamesPerFolderToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>356, 22</value>
- </data>
- <data name="maximumGamesPerFolderToolStripMenuItem.Text" xml:space="preserve">
- <value>Maximum games per page/folder</value>
- </data>
<data name="toolStripMenuItem4.Size" type="System.Drawing.Size, System.Drawing">
<value>353, 6</value>
</data>
@@ -487,12 +524,6 @@ <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">
- <value>376, 22</value>
- </data>
- <data name="pagesfoldersTypeToolStripMenuItem.Text" xml:space="preserve">
- <value>Pages/folders structure</value>
- </data>
<data name="globalCommandLineArgumentsexpertsOnluToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>376, 22</value>
</data>
@@ -511,11 +542,11 @@ <data name="saveSettingsToNESMiniNowToolStripMenuItem.Text" xml:space="preserve">
<value>Save settings to NES 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>48, 20</value>
</data>
- <data name="settingsToolStripMenuItem.Text" xml:space="preserve">
- <value>&Settings</value>
+ <data name="toolsToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Tools</value>
</data>
<data name="saveStateManagerToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>331, 22</value>
@@ -532,7 +563,6 @@ <data name="FTPToolStripMenuItem.Text" xml:space="preserve">
<value>FTP server on ftp://root:clover@127.0.0.1:1021</value>
</data>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="openFTPInExplorerToolStripMenuItem.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
@@ -569,11 +599,11 @@ <data name="takeScreenshotToolStripMenuItem.Text" xml:space="preserve">
<value>Take screenshot</value>
</data>
- <data name="toolsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>48, 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>&Tools</value>
+ <data name="helpToolStripMenuItem.Text" xml:space="preserve">
+ <value>&Help</value>
</data>
<data name="gitHubPageWithActualReleasesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>246, 22</value>
@@ -593,36 +623,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>&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="menuStrip.Text" xml:space="preserve">
- <value>menuStrip</value>
- </data>
- <data name=">>menuStrip.Name" xml:space="preserve">
- <value>menuStrip</value>
- </data>
- <data name=">>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=">>menuStrip.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>menuStrip.ZOrder" xml:space="preserve">
- <value>6</value>
- </data>
<data name="checkedListBoxGames.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>None</value>
</data>
@@ -650,6 +650,270 @@ <data name="groupBoxOptions.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>None</value>
</data>
+ <data name=">>buttonShowGameGenieDatabase.Name" xml:space="preserve">
+ <value>buttonShowGameGenieDatabase</value>
+ </data>
+ <data name=">>buttonShowGameGenieDatabase.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>buttonShowGameGenieDatabase.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>buttonShowGameGenieDatabase.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name=">>maskedTextBoxReleaseDate.Name" xml:space="preserve">
+ <value>maskedTextBoxReleaseDate</value>
+ </data>
+ <data name=">>maskedTextBoxReleaseDate.Type" xml:space="preserve">
+ <value>System.Windows.Forms.MaskedTextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>maskedTextBoxReleaseDate.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>maskedTextBoxReleaseDate.ZOrder" xml:space="preserve">
+ <value>1</value>
+ </data>
+ <data name=">>label1.Name" xml:space="preserve">
+ <value>label1</value>
+ </data>
+ <data name=">>label1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label1.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>label1.ZOrder" xml:space="preserve">
+ <value>2</value>
+ </data>
+ <data name=">>textBoxGameGenie.Name" xml:space="preserve">
+ <value>textBoxGameGenie</value>
+ </data>
+ <data name=">>textBoxGameGenie.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>textBoxGameGenie.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>textBoxGameGenie.ZOrder" xml:space="preserve">
+ <value>3</value>
+ </data>
+ <data name=">>label7.Name" xml:space="preserve">
+ <value>label7</value>
+ </data>
+ <data name=">>label7.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label7.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>label7.ZOrder" xml:space="preserve">
+ <value>4</value>
+ </data>
+ <data name=">>label6.Name" xml:space="preserve">
+ <value>label6</value>
+ </data>
+ <data name=">>label6.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label6.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>label6.ZOrder" xml:space="preserve">
+ <value>5</value>
+ </data>
+ <data name=">>radioButtonTwoSim.Name" xml:space="preserve">
+ <value>radioButtonTwoSim</value>
+ </data>
+ <data name=">>radioButtonTwoSim.Type" xml:space="preserve">
+ <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>radioButtonTwoSim.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>radioButtonTwoSim.ZOrder" xml:space="preserve">
+ <value>6</value>
+ </data>
+ <data name=">>buttonGoogle.Name" xml:space="preserve">
+ <value>buttonGoogle</value>
+ </data>
+ <data name=">>buttonGoogle.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>buttonGoogle.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>buttonGoogle.ZOrder" xml:space="preserve">
+ <value>7</value>
+ </data>
+ <data name=">>buttonBrowseImage.Name" xml:space="preserve">
+ <value>buttonBrowseImage</value>
+ </data>
+ <data name=">>buttonBrowseImage.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>buttonBrowseImage.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>buttonBrowseImage.ZOrder" xml:space="preserve">
+ <value>8</value>
+ </data>
+ <data name=">>pictureBoxArt.Name" xml:space="preserve">
+ <value>pictureBoxArt</value>
+ </data>
+ <data name=">>pictureBoxArt.Type" xml:space="preserve">
+ <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>pictureBoxArt.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>pictureBoxArt.ZOrder" xml:space="preserve">
+ <value>9</value>
+ </data>
+ <data name=">>label4.Name" xml:space="preserve">
+ <value>label4</value>
+ </data>
+ <data name=">>label4.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label4.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>label4.ZOrder" xml:space="preserve">
+ <value>10</value>
+ </data>
+ <data name=">>textBoxArguments.Name" xml:space="preserve">
+ <value>textBoxArguments</value>
+ </data>
+ <data name=">>textBoxArguments.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>textBoxArguments.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>textBoxArguments.ZOrder" xml:space="preserve">
+ <value>11</value>
+ </data>
+ <data name=">>label3.Name" xml:space="preserve">
+ <value>label3</value>
+ </data>
+ <data name=">>label3.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label3.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>label3.ZOrder" xml:space="preserve">
+ <value>12</value>
+ </data>
+ <data name=">>textBoxPublisher.Name" xml:space="preserve">
+ <value>textBoxPublisher</value>
+ </data>
+ <data name=">>textBoxPublisher.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>textBoxPublisher.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>textBoxPublisher.ZOrder" xml:space="preserve">
+ <value>13</value>
+ </data>
+ <data name=">>label2.Name" xml:space="preserve">
+ <value>label2</value>
+ </data>
+ <data name=">>label2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label2.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>label2.ZOrder" xml:space="preserve">
+ <value>14</value>
+ </data>
+ <data name=">>radioButtonTwo.Name" xml:space="preserve">
+ <value>radioButtonTwo</value>
+ </data>
+ <data name=">>radioButtonTwo.Type" xml:space="preserve">
+ <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>radioButtonTwo.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>radioButtonTwo.ZOrder" xml:space="preserve">
+ <value>15</value>
+ </data>
+ <data name=">>radioButtonOne.Name" xml:space="preserve">
+ <value>radioButtonOne</value>
+ </data>
+ <data name=">>radioButtonOne.Type" xml:space="preserve">
+ <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>radioButtonOne.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>radioButtonOne.ZOrder" xml:space="preserve">
+ <value>16</value>
+ </data>
+ <data name=">>textBoxName.Name" xml:space="preserve">
+ <value>textBoxName</value>
+ </data>
+ <data name=">>textBoxName.Type" xml:space="preserve">
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>textBoxName.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>textBoxName.ZOrder" xml:space="preserve">
+ <value>17</value>
+ </data>
+ <data name=">>labelName.Name" xml:space="preserve">
+ <value>labelName</value>
+ </data>
+ <data name=">>labelName.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>labelName.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>labelName.ZOrder" xml:space="preserve">
+ <value>18</value>
+ </data>
+ <data name=">>labelID.Name" xml:space="preserve">
+ <value>labelID</value>
+ </data>
+ <data name=">>labelID.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>labelID.Parent" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>labelID.ZOrder" xml:space="preserve">
+ <value>19</value>
+ </data>
+ <data name="groupBoxOptions.Location" type="System.Drawing.Point, System.Drawing">
+ <value>306, 27</value>
+ </data>
+ <data name="groupBoxOptions.Size" type="System.Drawing.Size, System.Drawing">
+ <value>293, 529</value>
+ </data>
+ <data name="groupBoxOptions.TabIndex" type="System.Int32, mscorlib">
+ <value>4</value>
+ </data>
+ <data name="groupBoxOptions.Text" xml:space="preserve">
+ <value>Game options</value>
+ </data>
+ <data name=">>groupBoxOptions.Name" xml:space="preserve">
+ <value>groupBoxOptions</value>
+ </data>
+ <data name=">>groupBoxOptions.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>groupBoxOptions.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>groupBoxOptions.ZOrder" xml:space="preserve">
+ <value>7</value>
+ </data>
<data name="buttonShowGameGenieDatabase.Location" type="System.Drawing.Point, System.Drawing">
<value>252, 286</value>
</data>
@@ -1157,30 +1421,6 @@ <data name=">>labelID.ZOrder" xml:space="preserve">
<value>19</value>
</data>
- <data name="groupBoxOptions.Location" type="System.Drawing.Point, System.Drawing">
- <value>306, 27</value>
- </data>
- <data name="groupBoxOptions.Size" type="System.Drawing.Size, System.Drawing">
- <value>293, 529</value>
- </data>
- <data name="groupBoxOptions.TabIndex" type="System.Int32, mscorlib">
- <value>4</value>
- </data>
- <data name="groupBoxOptions.Text" xml:space="preserve">
- <value>Game options</value>
- </data>
- <data name=">>groupBoxOptions.Name" xml:space="preserve">
- <value>groupBoxOptions</value>
- </data>
- <data name=">>groupBoxOptions.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>groupBoxOptions.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>groupBoxOptions.ZOrder" xml:space="preserve">
- <value>7</value>
- </data>
<data name="label5.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>None</value>
</data>
@@ -1251,16 +1491,16 @@ <value>False</value>
</data>
<data name="toolStripStatusLabelSelected.Size" type="System.Drawing.Size, System.Drawing">
- <value>150, 17</value>
+ <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>150, 17</value>
+ <value>195, 17</value>
</data>
<data name="toolStripProgressBar.Size" type="System.Drawing.Size, System.Drawing">
- <value>285, 16</value>
+ <value>195, 16</value>
</data>
<data name="statusStrip.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 615</value>
@@ -1295,6 +1535,15 @@ <metadata name="contextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>340, 17</value>
</metadata>
+ <data name="contextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
+ <value>141, 70</value>
+ </data>
+ <data name=">>contextMenuStrip.Name" xml:space="preserve">
+ <value>contextMenuStrip</value>
+ </data>
+ <data name=">>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="selectAllToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>140, 22</value>
</data>
@@ -1313,15 +1562,6 @@ <data name="deleteGameToolStripMenuItem.Text" xml:space="preserve">
<value>Delete game</value>
</data>
- <data name="contextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
- <value>141, 70</value>
- </data>
- <data name=">>contextMenuStrip.Name" xml:space="preserve">
- <value>contextMenuStrip</value>
- </data>
- <data name=">>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>624, 17</value>
</metadata>
@@ -1361,18 +1601,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=">>checkedListBoxDefaultGames.Name" xml:space="preserve">
<value>checkedListBoxDefaultGames</value>
</data>
@@ -1412,6 +1640,30 @@ <data name=">>groupBoxDefaultGames.ZOrder" xml:space="preserve">
<value>8</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=">>checkedListBoxDefaultGames.Name" xml:space="preserve">
+ <value>checkedListBoxDefaultGames</value>
+ </data>
+ <data name=">>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=">>checkedListBoxDefaultGames.Parent" xml:space="preserve">
+ <value>groupBoxDefaultGames</value>
+ </data>
+ <data name=">>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>473, 17</value>
</metadata>
@@ -3,6 +3,7 @@ using com.clusterrr.hakchi_gui.Properties; using System;
using System.Deployment.Application;
using System.Diagnostics;
+using System.Globalization;
using System.IO;
using System.Reflection;
using System.Runtime.InteropServices;
@@ -63,6 +64,13 @@ namespace com.clusterrr.hakchi_gui BaseDirectoryExternal = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "hakchi2");
else
BaseDirectoryExternal = BaseDirectoryInternal;
+ ConfigIni.Load();
+ try
+ {
+ if (!string.IsNullOrEmpty(ConfigIni.Language))
+ Thread.CurrentThread.CurrentUICulture = new CultureInfo(ConfigIni.Language);
+ }
+ catch { }
// There are some folders which should be accessed by user
// Moving them to "My documents"
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 3fed75f2..ad421da2 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -33,6 +33,6 @@ using System.Resources; // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.17.10")]
-[assembly: AssemblyFileVersion("2.0.17.10")]
+[assembly: AssemblyVersion("2.0.17.13")]
+[assembly: AssemblyFileVersion("2.0.17.13")]
[assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/Properties/Resources.resx b/Properties/Resources.resx index dc93a097..d21259ac 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -205,7 +205,7 @@ <value>Press OK to continue.</value>
</data>
<data name="ReplaceKernelQ" xml:space="preserve">
- <value>You already have the kernel dump. If you REALLY want to replace the backup of your kernel and you REALLY understand what you are doing, delete the "dump" folder manually.</value>
+ <value>You already have the kernel dump. If you REALLY want to replace the backup of your kernel and you REALLY understand what you are doing, delete the "hakchi2\dump" folder manually.</value>
</data>
<data name="SelectAtLeast" xml:space="preserve">
<value>Select at least one game.</value>
@@ -247,7 +247,7 @@ <value>Hello</value>
</data>
<data name="KernelDumped" xml:space="preserve">
- <value>Your original kernel is saved in the "dump" folder. Do not lose it. </value>
+ <value>Your original kernel is saved in the "hakchi2\dump" folder. Do not lose it. </value>
</data>
<data name="DeletePreset" xml:space="preserve">
<value>Do you really want to delete the "{0}" preset?</value>
diff --git a/WorkerForm.cs b/WorkerForm.cs index e6e5fc55..de17240f 100644 --- a/WorkerForm.cs +++ b/WorkerForm.cs @@ -8,6 +8,7 @@ using System.Collections.Generic; using System.Diagnostics;
using System.Drawing;
using System.Drawing.Imaging;
+using System.Globalization;
using System.IO;
using System.Linq;
using System.Text;
@@ -206,6 +207,7 @@ namespace com.clusterrr.hakchi_gui public void StartThread()
{
+ Thread.CurrentThread.CurrentUICulture = new CultureInfo(ConfigIni.Language);
SetProgress(0, 1);
try
{
diff --git a/hakchi_gui.csproj b/hakchi_gui.csproj index 0626fb0d..1b82fc72 100644 --- a/hakchi_gui.csproj +++ b/hakchi_gui.csproj @@ -31,8 +31,8 @@ <PublisherName>Alexey %27Cluster%27 Avdyukhin</PublisherName>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>index.html</WebPage>
- <ApplicationRevision>10</ApplicationRevision>
- <ApplicationVersion>2.0.17.10</ApplicationVersion>
+ <ApplicationRevision>13</ApplicationRevision>
+ <ApplicationVersion>2.0.17.13</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>
|