Permalink
Browse files

- Applied a perma fix to prevent creating property values in the desi…

…gner when the CDLC Creator GUI design is modified (fixes empty PackageVersion and Platform issues)
  • Loading branch information...
cozy1 committed Nov 5, 2018
1 parent 769dc50 commit e38678baa849809c401be7d37c9cf7cccc4d679a

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -91,35 +91,43 @@ public DLCPackageCreator()
ReadConfigSettings();
PopulateAppIdCombo();
PopulateTonesLB();
}
catch
{
/*For mono compatibility*/
}
var debugMe = PlatformPC;
}
//dirty implementation, it's always true, consider undo\redo manager for actions made+logging maybe?
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] // perma fix to prevent creating a property value in designer
public bool IsDirty { get; set; }
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] // perma fix to prevent creating a property value in designer
public string UnpackedDir { get; set; }
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] // perma fix to prevent creating a property value in designer
public string DestPath { get; set; }
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] // perma fix to prevent creating a property value in designer
public bool PlatformPC
{
get { return chkPlatformPC.Checked; }
set { chkPlatformPC.Checked = value; }
}
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] // perma fix to prevent creating a property value in designer
public bool PlatformMAC
{
get { return chkPlatformMAC.Checked; }
set { chkPlatformMAC.Checked = value; }
}
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] // perma fix to prevent creating a property value in designer
public bool PlatformXBox360
{
get { return chkPlatformXBox360.Checked; }
set { chkPlatformXBox360.Checked = value; }
}
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] // perma fix to prevent creating a property value in designer
public bool PlatformPS3
{
get { return chkPlatformPS3.Checked; }
@@ -144,7 +152,7 @@ public string AlbumYear
set { txtYear.Text = value.GetValidYear(); }
}
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] // perma fix to prevent an empty AppId
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] // perma fix to prevent creating a property value in designer
public string AppId
{
get { return txtAppId.Text; }
@@ -169,8 +177,10 @@ public string AverageTempo
set { txtTempo.Text = value.GetValidTempo(); }
}
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] // perma fix to prevent creating a property value in designer
public GameVersion PreviousGameVersion { get; set; }
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] // perma fix to prevent creating a property value in designer
public GameVersion CurrentGameVersion
{
get
@@ -201,7 +211,7 @@ public GameVersion CurrentGameVersion
}
}
public string CurrentOFDPackageFilter
public string CurrentOFDPackageFilter
{
get
{
@@ -233,12 +243,18 @@ public string CurrentOFDPackageFilter
set { txtDlcKey.Text = value.GetValidKey(); }
}
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] // perma fix to prevent creating a property value in designer
public bool JavaBool { get; set; }
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] // perma fix to prevent creating a property value in designer
public string LyricArtPath { get; set; }
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] // perma fix to prevent creating a property value in designer
public string ToolkitVers { get; set; }
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] // perma fix to prevent creating a property value in designer
public string PackageAuthor { get; set; }
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] // perma fix to prevent creating a property value in designer
public string PackageRating { get; set; }
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] // perma fix to prevent creating a property value in designer
public string PackageComment
{
get
@@ -287,12 +303,14 @@ public string SongTitleSort
set { txtSongTitleSort.Text = String.IsNullOrEmpty(value) ? SongTitle.GetValidSortableName() : value.GetValidSortableName(); }
}
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] // perma fix to prevent creating a property value in designer
private string AlbumArtPath // 512 (RS1)
{
get { return txtAlbumArtPath.Text; }
set { txtAlbumArtPath.Text = value; }
}
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] // perma fix to prevent creating a property value in designer
private string AudioPath
{
get { return txtAudioPath.Text; }

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -16,10 +16,6 @@
// Modify the RocksmithToolkitLib prebuild event which will update
// PatchAssemblyVersion.ps1 file '$AssemblyVersion' and '$AssemblyConfiguration' values
//
// MS VS2010 IDE has periodic glitch that adds values to dlcPackageCreator1 in MainForm.designer.cs
// This prevents the Platform or GameVersion from being set correctly by GeneralConfig.cs
//
namespace RocksmithToolkitGUI
{
public partial class MainForm : Form
@@ -117,9 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>180, 17</value>
</metadata>
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.1.0")]
[assembly: AssemblyInformationalVersion("eb773e1e")]
[assembly: AssemblyInformationalVersion("769dc502")]
[assembly: AssemblyConfiguration("BETA")]
@@ -27,5 +27,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.1.0")]
[assembly: AssemblyInformationalVersion("eb773e1e")]
[assembly: AssemblyInformationalVersion("769dc502")]
[assembly: AssemblyConfiguration("BETA")]
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.1.0")]
[assembly: AssemblyInformationalVersion("eb773e1e")]
[assembly: AssemblyInformationalVersion("769dc502")]
[assembly: AssemblyConfiguration("BETA")]
@@ -1,3 +1,3 @@
2.9.1.0
eb773e1e
769dc502
BETA

0 comments on commit e38678b

Please sign in to comment.