Skip to content

Commit de7bbe1

Browse files
author
Tudi20
committed
Add GUI button for favouriting
Reorder code
1 parent af1c746 commit de7bbe1

File tree

10 files changed

+536
-495
lines changed

10 files changed

+536
-495
lines changed

Universal THCRAP Launcher/MainForm.Designer.cs

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Universal THCRAP Launcher/MainForm.cs

Lines changed: 466 additions & 478 deletions
Large diffs are not rendered by default.

Universal THCRAP Launcher/Properties/Resources.Designer.cs

Lines changed: 14 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Universal THCRAP Launcher/Properties/Resources.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@
127127
<data name="Custom" type="System.Resources.ResXFileRef, System.Windows.Forms">
128128
<value>..\Resources\Custom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
129129
</data>
130+
<data name="Favorite" type="System.Resources.ResXFileRef, System.Windows.Forms">
131+
<value>..\Resources\Favorite.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
132+
</data>
130133
<data name="Game" type="System.Resources.ResXFileRef, System.Windows.Forms">
131134
<value>..\Resources\Game.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
132135
</data>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
2019. 05. 29. 20:55:54,25
1+
2019. 05. 29. 23:28:49,28
22
Central Europe Standard Time
5.01 KB
Loading

Universal THCRAP Launcher/SettingsForm.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ private void LoadLangs()
5757
catch (Exception ex)
5858
{
5959
Trace.WriteLine($"Exception while parsing language file {file}\nException: {ex.ToString()}");
60-
MessageBox.Show(I18N.LangResource.errors.oops.ToString() + Environment.CurrentDirectory, I18N.LangResource.errors.error.ToString(), MessageBoxButtons.OK, MessageBoxIcon.Error);
60+
MessageBox.Show(I18N.LangResource.errors.oops?.ToString() + Environment.CurrentDirectory, I18N.LangResource.errors.error?.ToString(), MessageBoxButtons.OK, MessageBoxIcon.Error);
6161
}
6262
}
6363
#endregion
@@ -74,27 +74,27 @@ private void LoadLangs()
7474

7575
private void UpdateLang()
7676
{
77-
Text = I18N.LangResource.settingsForm.settings.ToString();
78-
languageLabel.Text = I18N.LangResource.settingsForm.language.ToString() + ':';
79-
closeOnExitCheckBox.Text = I18N.LangResource.settingsForm.closeOnExit.ToString();
80-
btn_dwnlAllLangs.Text = I18N.LangResource.settingsForm.downloadAll.ToString();
81-
cB_hidePatchExtension.Text = I18N.LangResource.settingsForm.hidePatchExtension.ToString();
77+
Text = I18N.LangResource.settingsForm.settings?.ToString();
78+
languageLabel.Text = I18N.LangResource.settingsForm.language?.ToString() + ':';
79+
closeOnExitCheckBox.Text = I18N.LangResource.settingsForm.closeOnExit?.ToString();
80+
btn_dwnlAllLangs.Text = I18N.LangResource.settingsForm.downloadAll?.ToString();
81+
cB_hidePatchExtension.Text = I18N.LangResource.settingsForm.hidePatchExtension?.ToString();
8282
}
8383

8484
private void UpdateCredits()
8585
{
8686
string credits = "";
8787
foreach (var author in I18N.LangResource.metadata.authors)
8888
{
89-
credits += author + ", ";
89+
credits += author?.ToString() + ", ";
9090
}
9191
credits = credits.TrimEnd(' ', ',');
9292
int place = credits.LastIndexOf(',');
9393
if (place != -1)
9494
{
95-
credits = credits.Remove(place, 1).Insert(place, " " + I18N.LangResource.settingsForm.and);
95+
credits = credits.Remove(place, 1).Insert(place, " " + I18N.LangResource.settingsForm.and?.ToString());
9696
}
97-
langCreditsLabel.Text = string.Format(I18N.LangResource.settingsForm.langCredits.ToString(), credits);
97+
langCreditsLabel.Text = string.Format(I18N.LangResource.settingsForm.langCredits?.ToString(), credits);
9898
}
9999

100100
private void closeOnExitCheckBox_CheckedChanged(object sender, EventArgs e) =>
@@ -141,9 +141,9 @@ private void Btn_dwnlAllLangs_Click(object sender, EventArgs e)
141141
catch (Exception ex)
142142
{
143143
Trace.WriteLine($"[{DateTime.Now.ToShortTimeString()}] Couldn't connect to GitHub for pulling down languages.\nReason: {ex.ToString()}");
144-
MessageBox.Show(I18N.LangResource.error.downloadError.ToString(),I18N.LangResource.errors.error.ToString(), MessageBoxButtons.OK, MessageBoxIcon.Error);
144+
MessageBox.Show(I18N.LangResource.error.downloadError?.ToString(),I18N.LangResource.errors.error?.ToString(), MessageBoxButtons.OK, MessageBoxIcon.Error);
145145
}
146-
btn_dwnlAllLangs.Text = I18N.LangResource.settingsForm.downloadAll.ToString();
146+
btn_dwnlAllLangs.Text = I18N.LangResource.settingsForm.downloadAll?.ToString();
147147
btn_dwnlAllLangs.Enabled = true;
148148

149149
LoadLangs();

Universal THCRAP Launcher/Universal THCRAP Launcher.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,9 @@
169169
<ItemGroup>
170170
<None Include="Resources\BuildUser.txt" />
171171
</ItemGroup>
172+
<ItemGroup>
173+
<None Include="Resources\Favorite.png" />
174+
</ItemGroup>
172175
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
173176
<PropertyGroup>
174177
<PreBuildEvent>echo %25date%25 %25time%25&gt; "$(ProjectDir)\Resources\BuildDate.txt"

langs/en.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@
8282
"filterFav": "Filter by favourites",
8383
"filterByType": "Filter by Type",
8484
"patchLB": "Choose the run configuration (patch stack)",
85-
"gameLB": "Choose the game (executable)"
85+
"gameLB": "Choose the game (executable)",
86+
"patchFav": "Add patch to favourites",
87+
"gamesFav": "Add game or exe to favourites"
8688
}
8789
}
8890
}

langs/hu.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@
8383
"filterFav": "Szűrés kedvencek alapján",
8484
"filterByType": "Szűrés típus alapján",
8585
"patchLB": "Futtatási konfiguráció kiválasztása (patch stack)",
86-
"gameLB": "Játék kiválasztása (executable)"
86+
"gameLB": "Játék kiválasztása (executable)",
87+
"patchFav": "Patch hozzáadása a kedvencekhez",
88+
"gamesFav": "Játék vagy futtatható hozzáadása a kedvencekhez"
8789
}
8890
}
8991
}

0 commit comments

Comments
 (0)