Skip to content

Commit

Permalink
Added new Custom Inlay Creator (starting as Guitar Inlay first) [than…
Browse files Browse the repository at this point in the history
…ks to Cozy, he started the development of this feature];

* Added new RS1 and RS2014 path definition (for future automatic copy packages to game dlc folder) (#130);
* Fixed default album art creation is not correctly created when is not defined by the user;
* Added package author (charter name) to file version inside the package, can be defined in Config (fixes #159);
* Change way how the Config tab is displayed, now have a button to access configuration;
* Refactoring of some codes that will allow to create another types of packages in a near future (#118);
* Some minor improvements and changes;
  • Loading branch information
fabianosan committed Apr 2, 2014
1 parent ef1e4f2 commit 5dfd19d
Show file tree
Hide file tree
Showing 39 changed files with 11,925 additions and 585 deletions.
336 changes: 229 additions & 107 deletions RocksmithTookitGUI/Config/GeneralConfig.Designer.cs

Large diffs are not rendered by default.

34 changes: 33 additions & 1 deletion RocksmithTookitGUI/Config/GeneralConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Text;
using System.Windows.Forms;
using System.IO;
using Ookii.Dialogs;
using RocksmithToolkitLib;
using RocksmithToolkitLib.Extensions;
using RocksmithToolkitLib.DLCPackage;
Expand All @@ -23,7 +24,7 @@ public GeneralConfig()
SetupStoredConfigValues();
PopulateAppIdCombo(general_defaultappid_RS2012, GameVersion.RS2012);
PopulateAppIdCombo(general_defaultappid_RS2014, GameVersion.RS2014);
PopulateEnumCombo(creator_gameversion, typeof(GameVersion));
PopulateEnumCombo(general_defaultgameversion, typeof(GameVersion));
PopulateEnumCombo(converter_source, typeof(GamePlatform));
PopulateEnumCombo(converter_target, typeof(GamePlatform));
PopulateRampUp();
Expand All @@ -33,6 +34,9 @@ public GeneralConfig()

private void SetupStoredConfigValues() {
general_usebeta.Checked = ConfigRepository.Instance().GetBoolean(general_usebeta.Name);
general_defaultauthor.Text = ConfigRepository.Instance()[general_defaultauthor.Name];
general_rs1path.Text = ConfigRepository.Instance()[general_rs1path.Name];
general_rs2014path.Text = ConfigRepository.Instance()[general_rs2014path.Name];
creator_structured.Checked = ConfigRepository.Instance().GetBoolean(creator_structured.Name);
creator_scrollspeed.Value = ConfigRepository.Instance().GetDecimal(creator_scrollspeed.Name);
ddc_phraselength.Value = ConfigRepository.Instance().GetDecimal(ddc_phraselength.Name);
Expand Down Expand Up @@ -90,5 +94,33 @@ private void ConfigurationChanged(object sender, EventArgs e) {
ConfigRepository.Instance()[key] = value;
}
}

private void closeConfigButton_Click(object sender, EventArgs e) {
((MainForm)ParentForm).EnableConfig = false;
}

private void rs1PathButton_Click(object sender, EventArgs e)
{
using (var fbd = new VistaFolderBrowserDialog())
{
if (fbd.ShowDialog() != DialogResult.OK)
return;
var rs1Path = fbd.SelectedPath;
general_rs1path.Text = rs1Path;
ConfigRepository.Instance()[general_rs1path.Name] = rs1Path;
}
}

private void rs2014PathButton_Click(object sender, EventArgs e)
{
using (var fbd = new VistaFolderBrowserDialog())
{
if (fbd.ShowDialog() != DialogResult.OK)
return;
var rs2014Path = fbd.SelectedPath;
general_rs2014path.Text = rs2014Path;
ConfigRepository.Instance()[general_rs2014path.Name] = rs2014Path;
}
}
}
}
7 changes: 4 additions & 3 deletions RocksmithTookitGUI/DDC/DDC.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,10 @@ private void DDC_Load(object sender, EventArgs e)
ddcVersion.Text = String.Format("v{0}", vi.ProductVersion);
}

PopMDLs();

SetDefaultFromConfig();
try {
PopMDLs();
SetDefaultFromConfig();
} catch { /*For mono compatibility*/ }
}

private void SetDefaultFromConfig() {
Expand Down
443 changes: 443 additions & 0 deletions RocksmithTookitGUI/DLCInlayCreator/DLCInlayCreator.Designer.cs

Large diffs are not rendered by default.

Loading

0 comments on commit 5dfd19d

Please sign in to comment.