diff options
author | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2017-02-22 12:47:48 +0300 |
---|---|---|
committer | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2017-02-22 12:47:48 +0300 |
commit | 229ab56f5b1c89b0c0b2bf31387ab664c054f3ff (patch) | |
tree | e507bbf5207fa3a589debfcdfd48b4087d1d77e9 | |
parent | 06de1bfbd1aa24c3076d135cbf615294ec35ec0c (diff) | |
parent | 6e409012ae553b27b69c786428c0124305ac2f43 (diff) |
Size stats + progress bar in main window. Finally.
-rw-r--r-- | Apps/NesMiniApplication.cs | 5 | ||||
-rw-r--r-- | MainForm.Designer.cs | 14 | ||||
-rw-r--r-- | MainForm.resx | 14 | ||||
-rw-r--r-- | MainForm.ru-RU.resx | 2 | ||||
-rw-r--r-- | WorkerForm.cs | 5 | ||||
-rw-r--r-- | hakchi_gui.csproj | 2 |
6 files changed, 31 insertions, 11 deletions
diff --git a/Apps/NesMiniApplication.cs b/Apps/NesMiniApplication.cs index 3142c6f9..5fc03bc7 100644 --- a/Apps/NesMiniApplication.cs +++ b/Apps/NesMiniApplication.cs @@ -199,7 +199,10 @@ namespace com.clusterrr.hakchi_gui break;
default:
prefixCode = Prefix;
- application = DefaultApp;
+ if (extension.Length > 1)
+ application = string.Format("/bin/{0}", extension.Substring(1));
+ else
+ application = DefaultApp;
defaultCover = DefaultCover;
break;
}
diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs index a8bddc3a..bdf7cb7a 100644 --- a/MainForm.Designer.cs +++ b/MainForm.Designer.cs @@ -37,7 +37,7 @@ this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
this.addPresetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.deletePresetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.syncronizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.synchronizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.searchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.downloadCoversForAllGamesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
@@ -155,7 +155,7 @@ this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.addMoreGamesToolStripMenuItem,
this.presetsToolStripMenuItem,
- this.syncronizeToolStripMenuItem,
+ this.synchronizeToolStripMenuItem,
this.searchToolStripMenuItem,
this.downloadCoversForAllGamesToolStripMenuItem,
this.toolStripMenuItem1,
@@ -194,11 +194,11 @@ this.deletePresetToolStripMenuItem.Name = "deletePresetToolStripMenuItem";
resources.ApplyResources(this.deletePresetToolStripMenuItem, "deletePresetToolStripMenuItem");
//
- // syncronizeToolStripMenuItem
+ // synchronizeToolStripMenuItem
//
- this.syncronizeToolStripMenuItem.Name = "syncronizeToolStripMenuItem";
- resources.ApplyResources(this.syncronizeToolStripMenuItem, "syncronizeToolStripMenuItem");
- this.syncronizeToolStripMenuItem.Click += new System.EventHandler(this.buttonStart_Click);
+ resources.ApplyResources(this.synchronizeToolStripMenuItem, "synchronizeToolStripMenuItem");
+ this.synchronizeToolStripMenuItem.Name = "synchronnizeToolStripMenuItem";
+ this.synchronizeToolStripMenuItem.Click += new System.EventHandler(this.buttonStart_Click);
//
// searchToolStripMenuItem
//
@@ -994,7 +994,7 @@ private System.Windows.Forms.ToolStripMenuItem modulesToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem installModulesToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem uninstallModulesToolStripMenuItem;
- private System.Windows.Forms.ToolStripMenuItem syncronizeToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem synchronizeToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem useXYOnClassicControllerAsAutofireABToolStripMenuItem;
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelSize;
private System.Windows.Forms.ToolStripProgressBar toolStripProgressBar;
diff --git a/MainForm.resx b/MainForm.resx index d7bd4cf3..b1f37218 100644 --- a/MainForm.resx +++ b/MainForm.resx @@ -183,7 +183,7 @@ <data name="deletePresetToolStripMenuItem.Text" xml:space="preserve">
<value>Delete preset</value>
</data>
- <data name="syncronizeToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
+ <data name="synchronizeToolStripMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
<value>F5</value>
</data>
<data name="syncronizeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
@@ -347,6 +347,9 @@ </data>
<data name="disablePagefoldersToolStripMenuItem.Text" xml:space="preserve">
<value>Disable page/folders</value>
+ </data>
+ <data name=">>synchronizeToolStripMenuItem.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="toolStripMenuItem3.Size" type="System.Drawing.Size, System.Drawing">
<value>353, 6</value>
@@ -875,6 +878,9 @@ </data>
<data name="label1.Text" xml:space="preserve">
<value>Release date (YYYY-MM-DD):</value>
+ </data>
+ <data name=">>synchronizeToolStripMenuItem.Name" xml:space="preserve">
+ <value>synchronizeToolStripMenuItem</value>
</data>
<data name=">>label1.Name" xml:space="preserve">
<value>label1</value>
@@ -1349,6 +1355,9 @@ </data>
<data name=">>label5.ZOrder" xml:space="preserve">
<value>4</value>
+ </data>
+ <data name="synchronizeToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+ <value>238, 22</value>
</data>
<data name="buttonAddGames.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>None</value>
@@ -1545,6 +1554,9 @@ <data name="checkedListBoxDefaultGames.Size" type="System.Drawing.Size, System.Drawing">
<value>282, 454</value>
</data>
+ <data name="synchronizeToolStripMenuItem.Text" xml:space="preserve">
+ <value>Synchronize</value>
+ </data>
<data name="checkedListBoxDefaultGames.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
</data>
diff --git a/MainForm.ru-RU.resx b/MainForm.ru-RU.resx index b105d39b..5c1f41cc 100644 --- a/MainForm.ru-RU.resx +++ b/MainForm.ru-RU.resx @@ -129,7 +129,7 @@ <data name="presetsToolStripMenuItem.Text" xml:space="preserve">
<value>Пресеты</value>
</data>
- <data name="syncronizeToolStripMenuItem.Text" xml:space="preserve">
+ <data name="synchronizeToolStripMenuItem.Text" xml:space="preserve">
<value>Синхронизация</value>
</data>
<data name="searchToolStripMenuItem.Text" xml:space="preserve">
diff --git a/WorkerForm.cs b/WorkerForm.cs index bfc766d2..3bdca51e 100644 --- a/WorkerForm.cs +++ b/WorkerForm.cs @@ -173,7 +173,10 @@ namespace com.clusterrr.hakchi_gui var form = new SelectFileForm(files);
TaskbarProgress.SetState(this.Handle, TaskbarProgress.TaskbarStates.Paused);
var result = form.ShowDialog();
- selectedFile = form.listBoxFiles.SelectedItem.ToString();
+ if (form.listBoxFiles.SelectedItem != null)
+ selectedFile = form.listBoxFiles.SelectedItem.ToString();
+ else
+ selectedFile = null;
TaskbarProgress.SetState(this.Handle, TaskbarProgress.TaskbarStates.Normal);
return result;
}
diff --git a/hakchi_gui.csproj b/hakchi_gui.csproj index 7d370bad..7739fbd3 100644 --- a/hakchi_gui.csproj +++ b/hakchi_gui.csproj @@ -277,9 +277,11 @@ </EmbeddedResource>
<EmbeddedResource Include="MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
+ <SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="MainForm.ru-RU.resx">
<DependentUpon>MainForm.cs</DependentUpon>
+ <SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="SelectModsForm.resx">
<DependentUpon>SelectModsForm.cs</DependentUpon>
|