Skip to content

Commit cc1d9ca

Browse files
zdimensionzdimension
committed
MAJOR UPDATE - Added Custom Entry form (DOS, ReactOS, Grub entry, etc), fixed lots of translations and bugs, version 4.0
1 parent d70b54f commit cc1d9ca

File tree

123 files changed

+5442
-3811
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+5442
-3811
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SharpBoot is a program for creating multiboot ISOs or USB keys by choosing other ISO files and putting them in categories.
33
You can choose between Syslinux and Grub4DOS, you can choose filesystem (when making an USB key) between FAT12, FAT16 or FAT32, you can choose resolution between 640x480, 800x600 and 1024x768.
44
You can also pick a custom background image (automatically resized to chosen resolution).
5-
![SharpBoot 3.7](http://i.imgur.com/mvxdshD.png)
5+
![SharpBoot 4.0](http://i.imgur.com/EDbrYOx.png)
66

77
# Translators
88
<table>

‎SharpBoot/About.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SharpBoot/About.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,42 @@
33
using System.Diagnostics;
44
using System.Drawing;
55
using System.Linq;
6-
using System.Runtime.InteropServices;
76
using System.Windows.Forms;
87

98
namespace SharpBoot
109
{
1110
public partial class About : Form
1211
{
13-
public static List<Image> Flags => new About().ilTranslators.Images.Cast<Image>().ToList();
12+
public static List<Image> Flags => new About().ilTranslators.Images.Cast<Image>().ToList();
1413

1514

1615
public About()
1716
{
1817
InitializeComponent();
19-
richTextBox1.Text = richTextBox1.Text.Insert(9, " " + Program.GetVersion()).Replace("{0}", Strings.SharpBootUsesSoft);
20-
if(Program.IsWin) Utils.SetWindowTheme(lvTranslators.Handle, "explorer", null);
18+
richTextBox1.Text = richTextBox1.Text.Insert(9, " " + Program.GetVersion())
19+
.Replace("{0}", Strings.SharpBootUsesSoft);
20+
if (Program.IsWin) Utils.SetWindowTheme(lvTranslators.Handle, "explorer", null);
2121
rtbMyWebsite.SelectAll();
2222
rtbMyWebsite.SelectionAlignment = HorizontalAlignment.Right;
2323
rtbMyWebsite.DeselectAll();
24-
2524
}
2625

2726
private void lvTranslators_DoubleClick(object sender, EventArgs e)
2827
{
29-
if(lvTranslators.SelectedItems.Count == 1)
28+
if (lvTranslators.SelectedItems.Count == 1)
3029
{
3130
var it = lvTranslators.SelectedItems[0];
3231
var url = "";
3332
if (it.SubItems.Count > 1) url = it.SubItems[1].Text;
34-
if(!string.IsNullOrEmpty(url)) Process.Start(url);
33+
if (!string.IsNullOrEmpty(url)) Process.Start(url);
3534
lvTranslators.SelectedIndices.Clear();
3635
}
3736
}
3837

3938
private void richTextBox1_LinkClicked(object sender, LinkClickedEventArgs e)
4039
{
41-
if(e.LinkText != "")
40+
if (e.LinkText != "")
4241
Process.Start(e.LinkText);
4342
}
4443
}
45-
}
44+
}

‎SharpBoot/AddIso.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SharpBoot/AddIso.cs‎

Lines changed: 43 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,37 @@ public AddIso()
2222
InitializeComponent();
2323
ISOPath = "";
2424
Closing += AddIso_Closing;
25+
btnOK.Text = Strings.OK;
26+
btnAnnul.Text = Strings.Cancel;
27+
while (ISOInfo.ISOs.Count == 0) Thread.Sleep(50);
28+
while (cbxDetIso.Items.Count < 2)
29+
{
30+
var isos =
31+
ISOInfo.ISOs.Where(x => !x.NoDL)
32+
.Select(x => new {Val = x, x.Name, Category = x.CategoryTxt, x.LatestVersion.Hash});
33+
34+
cbxISOS.DataSource = isos;
35+
var iso2 = isos.ToList();
36+
iso2.Insert(0,
37+
new
38+
{
39+
Val = new ISOInfo("", new Dictionary<CultureInfo, string>(), IsoCategory.None),
40+
Name = Strings.Other,
41+
Category = "",
42+
Hash = ""
43+
});
44+
iso2.AddRange(
45+
ISOInfo.ISOs.Where(x => x.NoDL)
46+
.Select(x => new {Val = x, x.Name, Category = x.CategoryTxt, Hash = ""})
47+
.ToList());
48+
cbxDetIso.DataSource = iso2;
49+
cbxDetIso.DisplayMember = "Name";
50+
fempty = true;
51+
cbxDetIso.SelectedItem = null;
52+
cbxISOS.SelectedItem = null;
53+
cbxVersion.SelectedItem = null;
54+
}
55+
rtbIsoDesc.Text = "";
2556
}
2657

2758
private void AddIso_Closing(object sender, CancelEventArgs e)
@@ -33,19 +64,6 @@ private void AddIso_Closing(object sender, CancelEventArgs e)
3364

3465
private void AddIso_Load(object sender, EventArgs e)
3566
{
36-
var isos = ISOInfo.ISOs.Where(x => !x.NoDL).Select(x => new { Val = x, x.Name, Category = x.CategoryTxt, x.LatestVersion.Hash });
37-
38-
cbxISOS.DataSource = isos;
39-
var iso2 = isos.ToList();
40-
iso2.Insert(0, new { Val = new ISOInfo("", new Dictionary<CultureInfo, string>(), IsoCategory.None), Name = Strings.Other, Category = "", Hash = "" });
41-
iso2.AddRange(ISOInfo.ISOs.Where(x => x.NoDL).Select(x => new { Val = x, x.Name, Category = x.CategoryTxt, Hash = "" }).ToList());
42-
cbxDetIso.DataSource = iso2;
43-
cbxDetIso.DisplayMember = "Name";
44-
fempty = true;
45-
cbxDetIso.SelectedItem = null;
46-
cbxISOS.SelectedItem = null;
47-
cbxVersion.SelectedItem = null;
48-
rtbIsoDesc.Text = "";
4967
}
5068

5169
private void rbnFile_CheckedChanged(object sender, EventArgs e)
@@ -85,7 +103,7 @@ private void txtFile_TextChanged(object sender, EventArgs e)
85103

86104
private ISOInfo selinfo => cbxISOS.SelectedItem == null ? null : ((dynamic) cbxISOS.SelectedItem).Val;
87105

88-
private ISOInfo selinfo2 => cbxDetIso.SelectedItem == null ? null : ((dynamic)cbxDetIso.SelectedItem).Val;
106+
private ISOInfo selinfo2 => cbxDetIso.SelectedItem == null ? null : ((dynamic) cbxDetIso.SelectedItem).Val;
89107

90108
private ISOV selinfoversion()
91109
{
@@ -105,7 +123,7 @@ private void cbxISOS_SelectedIndexChanged(object sender, EventArgs e)
105123
cbxVersion.DataSource = ds;
106124
var latest = selinfo.LatestVersion;
107125
cbxVersion.SelectedIndex = 0;
108-
for (int i = 0; i < ds.Count; i++)
126+
for (var i = 0; i < ds.Count; i++)
109127
{
110128
if (ds[i].Value == latest)
111129
{
@@ -204,14 +222,14 @@ private void md5stuff()
204222
else
205223
{
206224
IsoV = resk;
207-
for (int index = 0; index < cbxDetIso.Items.Count; index++)
225+
for (var index = 0; index < cbxDetIso.Items.Count; index++)
208226
{
209227
dynamic it = cbxDetIso.Items[index];
210228
if (it.Val == resk.Parent)
211229
{
212230
changing = true;
213231
cbxDetIso.SelectedIndex = index;
214-
232+
215233
break;
216234
}
217235
}
@@ -225,7 +243,6 @@ private void md5stuff()
225243
CurrentUICulture = CultureInfo.CurrentUICulture
226244
};
227245
th.Start();
228-
229246
}
230247

231248
public ISOV IsoV;
@@ -235,7 +252,7 @@ private void btnOK_Click(object sender, EventArgs e)
235252
if (IsDownload)
236253
{
237254
IsoV = selinfoversion();
238-
if(IsoV != null && IsoV.DownloadLink != "")
255+
if (IsoV != null && IsoV.DownloadLink != "")
239256
{
240257
sfdIso.FileName = Path.GetFileName(IsoV.DownloadLink);
241258
}
@@ -266,14 +283,18 @@ private void btnAnnul_Click(object sender, EventArgs e)
266283
client?.CancelAsync();
267284
}
268285

269-
270286

271287
private void cbxDetIso_SelectedIndexChanged(object sender, EventArgs e)
272288
{
273289
if (changing) return;
274-
if(cbxDetIso.SelectedIndex != -1 && cbxDetIso.SelectedItem != null)
290+
if (cbxDetIso.SelectedIndex != -1 && cbxDetIso.SelectedItem != null)
275291
{
276-
IsoV = cbxDetIso.SelectedIndex == 0 ? new ISOV("other", "") : (selinfo2 == null ? null : (selinfo2.LatestVersion ?? new ISOV("nover", selinfo2.Name, "", selinfo2.Filename, true) {Parent=selinfo2}));
292+
IsoV = cbxDetIso.SelectedIndex == 0
293+
? new ISOV("other", "")
294+
: (selinfo2 == null
295+
? null
296+
: (selinfo2.LatestVersion ??
297+
new ISOV("nover", selinfo2.Name, "", selinfo2.Filename, true) {Parent = selinfo2}));
277298
}
278299
}
279300
}

‎SharpBoot/AddIso.de.resx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="btnAnnul.Text" xml:space="preserve">
121-
<value>Abbrechen</value>
122-
</data>
123120
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
124121
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
125122
<value>212, 30</value>

‎SharpBoot/AddIso.es.resx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="btnAnnul.Text" xml:space="preserve">
121-
<value>Cancelar</value>
122-
</data>
123120
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
124121
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
125122
<value>229, 30</value>

‎SharpBoot/AddIso.fr.resx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="btnAnnul.Text" xml:space="preserve">
121-
<value>Annuler</value>
122-
</data>
123120
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
124121
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
125122
<value>213, 30</value>

‎SharpBoot/AddIso.it.resx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="btnAnnul.Text" xml:space="preserve">
121-
<value>Cancella</value>
122-
</data>
123120
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
124121
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
125122
<value>136, 30</value>

‎SharpBoot/AddIso.ro.resx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="btnAnnul.Text" xml:space="preserve">
121-
<value>Anulează</value>
122-
</data>
123120
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
124121
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
125122
<value>204, 30</value>

0 commit comments

Comments
 (0)