mirror of
https://github.com/4sval/FModel.git
synced 2026-04-20 00:27:43 -05:00
in case we add more rarity design + updated challenges in README.md
This commit is contained in:
parent
5ffdf1568a
commit
1f2f2b4753
|
|
@ -73,9 +73,6 @@
|
|||
<setting name="tTokenSecret" serializeAs="String">
|
||||
<value />
|
||||
</setting>
|
||||
<setting name="rarityNew" serializeAs="String">
|
||||
<value>False</value>
|
||||
</setting>
|
||||
<setting name="UMParameters" serializeAs="String">
|
||||
<value />
|
||||
</setting>
|
||||
|
|
@ -91,6 +88,9 @@
|
|||
<setting name="challengesColors" serializeAs="String">
|
||||
<value>50,50,50</value>
|
||||
</setting>
|
||||
<setting name="rarityDesign" serializeAs="String">
|
||||
<value>Default</value>
|
||||
</setting>
|
||||
</FModel.Properties.Settings>
|
||||
</userSettings>
|
||||
<runtime>
|
||||
|
|
|
|||
12
FModel/Forms/MergeImages.Designer.cs
generated
12
FModel/Forms/MergeImages.Designer.cs
generated
|
|
@ -54,7 +54,7 @@ namespace FModel.Forms
|
|||
this.listBox1.Location = new System.Drawing.Point(6, 48);
|
||||
this.listBox1.Name = "listBox1";
|
||||
this.listBox1.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;
|
||||
this.listBox1.Size = new System.Drawing.Size(251, 264);
|
||||
this.listBox1.Size = new System.Drawing.Size(307, 238);
|
||||
this.listBox1.TabIndex = 0;
|
||||
//
|
||||
// button1
|
||||
|
|
@ -80,7 +80,7 @@ namespace FModel.Forms
|
|||
//
|
||||
// button3
|
||||
//
|
||||
this.button3.Location = new System.Drawing.Point(95, 19);
|
||||
this.button3.Location = new System.Drawing.Point(122, 19);
|
||||
this.button3.Name = "button3";
|
||||
this.button3.Size = new System.Drawing.Size(75, 23);
|
||||
this.button3.TabIndex = 3;
|
||||
|
|
@ -91,7 +91,7 @@ namespace FModel.Forms
|
|||
// button4
|
||||
//
|
||||
this.button4.ForeColor = System.Drawing.Color.Red;
|
||||
this.button4.Location = new System.Drawing.Point(182, 19);
|
||||
this.button4.Location = new System.Drawing.Point(238, 19);
|
||||
this.button4.Name = "button4";
|
||||
this.button4.Size = new System.Drawing.Size(75, 23);
|
||||
this.button4.TabIndex = 4;
|
||||
|
|
@ -112,11 +112,11 @@ namespace FModel.Forms
|
|||
this.groupBox1.Size = new System.Drawing.Size(319, 320);
|
||||
this.groupBox1.TabIndex = 7;
|
||||
this.groupBox1.TabStop = false;
|
||||
this.groupBox1.Text = "Settings";
|
||||
this.groupBox1.Text = "List";
|
||||
//
|
||||
// button7
|
||||
//
|
||||
this.button7.Location = new System.Drawing.Point(262, 153);
|
||||
this.button7.Location = new System.Drawing.Point(202, 291);
|
||||
this.button7.Name = "button7";
|
||||
this.button7.Size = new System.Drawing.Size(51, 23);
|
||||
this.button7.TabIndex = 6;
|
||||
|
|
@ -126,7 +126,7 @@ namespace FModel.Forms
|
|||
//
|
||||
// button6
|
||||
//
|
||||
this.button6.Location = new System.Drawing.Point(262, 113);
|
||||
this.button6.Location = new System.Drawing.Point(66, 291);
|
||||
this.button6.Name = "button6";
|
||||
this.button6.Size = new System.Drawing.Size(51, 23);
|
||||
this.button6.TabIndex = 5;
|
||||
|
|
|
|||
67
FModel/Forms/Settings.Designer.cs
generated
67
FModel/Forms/Settings.Designer.cs
generated
|
|
@ -38,7 +38,6 @@ namespace FModel.Forms
|
|||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.OKButton = new System.Windows.Forms.Button();
|
||||
this.groupBox4 = new System.Windows.Forms.GroupBox();
|
||||
this.checkBox1 = new System.Windows.Forms.CheckBox();
|
||||
this.comboBox1 = new System.Windows.Forms.ComboBox();
|
||||
this.label10 = new System.Windows.Forms.Label();
|
||||
this.checkBox8 = new System.Windows.Forms.CheckBox();
|
||||
|
|
@ -61,6 +60,8 @@ namespace FModel.Forms
|
|||
this.pictureBox1 = new System.Windows.Forms.PictureBox();
|
||||
this.textBox6 = new System.Windows.Forms.TextBox();
|
||||
this.label12 = new System.Windows.Forms.Label();
|
||||
this.comboBox2 = new System.Windows.Forms.ComboBox();
|
||||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.groupBox3.SuspendLayout();
|
||||
this.groupBox2.SuspendLayout();
|
||||
this.groupBox4.SuspendLayout();
|
||||
|
|
@ -143,7 +144,7 @@ namespace FModel.Forms
|
|||
//
|
||||
this.OKButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.OKButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.OKButton.Location = new System.Drawing.Point(475, 493);
|
||||
this.OKButton.Location = new System.Drawing.Point(475, 486);
|
||||
this.OKButton.Name = "OKButton";
|
||||
this.OKButton.Size = new System.Drawing.Size(97, 21);
|
||||
this.OKButton.TabIndex = 15;
|
||||
|
|
@ -153,7 +154,8 @@ namespace FModel.Forms
|
|||
//
|
||||
// groupBox4
|
||||
//
|
||||
this.groupBox4.Controls.Add(this.checkBox1);
|
||||
this.groupBox4.Controls.Add(this.comboBox2);
|
||||
this.groupBox4.Controls.Add(this.label2);
|
||||
this.groupBox4.Controls.Add(this.comboBox1);
|
||||
this.groupBox4.Controls.Add(this.label10);
|
||||
this.groupBox4.Controls.Add(this.checkBox8);
|
||||
|
|
@ -167,22 +169,11 @@ namespace FModel.Forms
|
|||
this.groupBox4.Controls.Add(this.wPictureBox);
|
||||
this.groupBox4.Location = new System.Drawing.Point(12, 122);
|
||||
this.groupBox4.Name = "groupBox4";
|
||||
this.groupBox4.Size = new System.Drawing.Size(560, 195);
|
||||
this.groupBox4.Size = new System.Drawing.Size(560, 190);
|
||||
this.groupBox4.TabIndex = 16;
|
||||
this.groupBox4.TabStop = false;
|
||||
this.groupBox4.Text = "Icon Creation";
|
||||
//
|
||||
// checkBox1
|
||||
//
|
||||
this.checkBox1.AutoSize = true;
|
||||
this.checkBox1.Location = new System.Drawing.Point(244, 54);
|
||||
this.checkBox1.Name = "checkBox1";
|
||||
this.checkBox1.Size = new System.Drawing.Size(139, 17);
|
||||
this.checkBox1.TabIndex = 30;
|
||||
this.checkBox1.Text = "New Rarity Background";
|
||||
this.checkBox1.UseVisualStyleBackColor = true;
|
||||
this.checkBox1.CheckedChanged += new System.EventHandler(this.CheckBox1_CheckedChanged);
|
||||
//
|
||||
// comboBox1
|
||||
//
|
||||
this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
|
|
@ -220,7 +211,7 @@ namespace FModel.Forms
|
|||
// checkBox8
|
||||
//
|
||||
this.checkBox8.AutoSize = true;
|
||||
this.checkBox8.Location = new System.Drawing.Point(6, 54);
|
||||
this.checkBox8.Location = new System.Drawing.Point(206, 167);
|
||||
this.checkBox8.Name = "checkBox8";
|
||||
this.checkBox8.Size = new System.Drawing.Size(177, 17);
|
||||
this.checkBox8.TabIndex = 26;
|
||||
|
|
@ -231,7 +222,7 @@ namespace FModel.Forms
|
|||
// checkBox7
|
||||
//
|
||||
this.checkBox7.AutoSize = true;
|
||||
this.checkBox7.Location = new System.Drawing.Point(6, 90);
|
||||
this.checkBox7.Location = new System.Drawing.Point(6, 87);
|
||||
this.checkBox7.Name = "checkBox7";
|
||||
this.checkBox7.Size = new System.Drawing.Size(15, 14);
|
||||
this.checkBox7.TabIndex = 25;
|
||||
|
|
@ -242,7 +233,7 @@ namespace FModel.Forms
|
|||
//
|
||||
this.filenameLabel.AutoEllipsis = true;
|
||||
this.filenameLabel.AutoSize = true;
|
||||
this.filenameLabel.Location = new System.Drawing.Point(115, 91);
|
||||
this.filenameLabel.Location = new System.Drawing.Point(115, 88);
|
||||
this.filenameLabel.MaximumSize = new System.Drawing.Size(260, 13);
|
||||
this.filenameLabel.Name = "filenameLabel";
|
||||
this.filenameLabel.Size = new System.Drawing.Size(60, 13);
|
||||
|
|
@ -251,7 +242,7 @@ namespace FModel.Forms
|
|||
//
|
||||
// trackBar1
|
||||
//
|
||||
this.trackBar1.Location = new System.Drawing.Point(58, 144);
|
||||
this.trackBar1.Location = new System.Drawing.Point(58, 141);
|
||||
this.trackBar1.Maximum = 100;
|
||||
this.trackBar1.Name = "trackBar1";
|
||||
this.trackBar1.Size = new System.Drawing.Size(325, 45);
|
||||
|
|
@ -262,7 +253,7 @@ namespace FModel.Forms
|
|||
// label9
|
||||
//
|
||||
this.label9.AutoSize = true;
|
||||
this.label9.Location = new System.Drawing.Point(22, 115);
|
||||
this.label9.Location = new System.Drawing.Point(22, 112);
|
||||
this.label9.Name = "label9";
|
||||
this.label9.Size = new System.Drawing.Size(30, 13);
|
||||
this.label9.TabIndex = 23;
|
||||
|
|
@ -270,7 +261,7 @@ namespace FModel.Forms
|
|||
//
|
||||
// trackBar2
|
||||
//
|
||||
this.trackBar2.Location = new System.Drawing.Point(58, 115);
|
||||
this.trackBar2.Location = new System.Drawing.Point(58, 112);
|
||||
this.trackBar2.Maximum = 1000;
|
||||
this.trackBar2.Minimum = 1;
|
||||
this.trackBar2.Name = "trackBar2";
|
||||
|
|
@ -284,7 +275,7 @@ namespace FModel.Forms
|
|||
// label8
|
||||
//
|
||||
this.label8.AutoSize = true;
|
||||
this.label8.Location = new System.Drawing.Point(6, 147);
|
||||
this.label8.Location = new System.Drawing.Point(6, 144);
|
||||
this.label8.Name = "label8";
|
||||
this.label8.Size = new System.Drawing.Size(46, 13);
|
||||
this.label8.TabIndex = 21;
|
||||
|
|
@ -292,7 +283,7 @@ namespace FModel.Forms
|
|||
//
|
||||
// button1
|
||||
//
|
||||
this.button1.Location = new System.Drawing.Point(27, 84);
|
||||
this.button1.Location = new System.Drawing.Point(27, 81);
|
||||
this.button1.Name = "button1";
|
||||
this.button1.Size = new System.Drawing.Size(82, 24);
|
||||
this.button1.TabIndex = 19;
|
||||
|
|
@ -302,6 +293,7 @@ namespace FModel.Forms
|
|||
//
|
||||
// wPictureBox
|
||||
//
|
||||
this.wPictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.wPictureBox.Image = global::FModel.Properties.Resources.wTemplatev1;
|
||||
this.wPictureBox.Location = new System.Drawing.Point(389, 19);
|
||||
this.wPictureBox.Name = "wPictureBox";
|
||||
|
|
@ -322,7 +314,7 @@ namespace FModel.Forms
|
|||
this.groupBox6.Controls.Add(this.pictureBox1);
|
||||
this.groupBox6.Controls.Add(this.textBox6);
|
||||
this.groupBox6.Controls.Add(this.label12);
|
||||
this.groupBox6.Location = new System.Drawing.Point(12, 323);
|
||||
this.groupBox6.Location = new System.Drawing.Point(12, 318);
|
||||
this.groupBox6.Name = "groupBox6";
|
||||
this.groupBox6.Size = new System.Drawing.Size(560, 158);
|
||||
this.groupBox6.TabIndex = 19;
|
||||
|
|
@ -430,11 +422,33 @@ namespace FModel.Forms
|
|||
this.label12.TabIndex = 9;
|
||||
this.label12.Text = "Watermark:";
|
||||
//
|
||||
// comboBox2
|
||||
//
|
||||
this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.comboBox2.FormattingEnabled = true;
|
||||
this.comboBox2.Items.AddRange(new object[] {
|
||||
"Default",
|
||||
"Flat"});
|
||||
this.comboBox2.Location = new System.Drawing.Point(85, 48);
|
||||
this.comboBox2.Name = "comboBox2";
|
||||
this.comboBox2.Size = new System.Drawing.Size(294, 21);
|
||||
this.comboBox2.TabIndex = 31;
|
||||
this.comboBox2.SelectedIndexChanged += new System.EventHandler(this.ComboBox2_SelectedIndexChanged);
|
||||
//
|
||||
// label2
|
||||
//
|
||||
this.label2.AutoSize = true;
|
||||
this.label2.Location = new System.Drawing.Point(6, 51);
|
||||
this.label2.Name = "label2";
|
||||
this.label2.Size = new System.Drawing.Size(73, 13);
|
||||
this.label2.TabIndex = 30;
|
||||
this.label2.Text = "Rarity Design:";
|
||||
//
|
||||
// Settings
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(584, 526);
|
||||
this.ClientSize = new System.Drawing.Size(584, 519);
|
||||
this.Controls.Add(this.groupBox6);
|
||||
this.Controls.Add(this.groupBox4);
|
||||
this.Controls.Add(this.OKButton);
|
||||
|
|
@ -490,7 +504,6 @@ namespace FModel.Forms
|
|||
private System.Windows.Forms.TextBox textBox6;
|
||||
private System.Windows.Forms.Label label12;
|
||||
private System.Windows.Forms.CheckBox checkBox_tryToOpen;
|
||||
private System.Windows.Forms.CheckBox checkBox1;
|
||||
private System.Windows.Forms.PictureBox pictureBox1;
|
||||
private System.Windows.Forms.Button button2;
|
||||
private System.Windows.Forms.CheckBox checkBox2;
|
||||
|
|
@ -499,5 +512,7 @@ namespace FModel.Forms
|
|||
private System.Windows.Forms.Button button3;
|
||||
private System.Windows.Forms.Button button4;
|
||||
private System.Windows.Forms.Label label7;
|
||||
private System.Windows.Forms.ComboBox comboBox2;
|
||||
private System.Windows.Forms.Label label2;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,8 +29,6 @@ namespace FModel.Forms
|
|||
textBox2.Text = Properties.Settings.Default.PAKsPath;
|
||||
textBox1.Text = Properties.Settings.Default.ExtractOutput;
|
||||
|
||||
checkBox1.Checked = Properties.Settings.Default.rarityNew;
|
||||
|
||||
textBox6.Text = Properties.Settings.Default.challengesWatermark;
|
||||
if (string.IsNullOrWhiteSpace(textBox6.Text))
|
||||
{
|
||||
|
|
@ -51,6 +49,8 @@ namespace FModel.Forms
|
|||
trackBar1.Value = Properties.Settings.Default.wOpacity;
|
||||
trackBar2.Value = Properties.Settings.Default.wSize;
|
||||
|
||||
comboBox2.SelectedIndex = comboBox2.FindStringExact(Properties.Settings.Default.rarityDesign);
|
||||
|
||||
//CHALLENGES
|
||||
button3.Enabled = Properties.Settings.Default.isChallengesTheme;
|
||||
button4.Enabled = Properties.Settings.Default.isChallengesTheme;
|
||||
|
|
@ -71,11 +71,11 @@ namespace FModel.Forms
|
|||
Bitmap bmp = null;
|
||||
if (Properties.Settings.Default.loadFeaturedImage)
|
||||
{
|
||||
bmp = new Bitmap(Properties.Settings.Default.rarityNew ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1));
|
||||
bmp = new Bitmap(string.Equals(Properties.Settings.Default.rarityDesign, "Flat") ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1));
|
||||
}
|
||||
else
|
||||
{
|
||||
bmp = new Bitmap(Properties.Settings.Default.rarityNew ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1));
|
||||
bmp = new Bitmap(string.Equals(Properties.Settings.Default.rarityDesign, "Flat") ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1));
|
||||
}
|
||||
Graphics g = Graphics.FromImage(bmp);
|
||||
|
||||
|
|
@ -121,7 +121,7 @@ namespace FModel.Forms
|
|||
|
||||
Properties.Settings.Default.tryToOpenAssets = checkBox_tryToOpen.Checked;
|
||||
|
||||
Properties.Settings.Default.rarityNew = checkBox1.Checked;
|
||||
Properties.Settings.Default.rarityDesign = comboBox2.SelectedItem.ToString();
|
||||
|
||||
//WATERMARK
|
||||
Properties.Settings.Default.isWatermark = checkBox7.Checked;
|
||||
|
|
@ -216,7 +216,7 @@ namespace FModel.Forms
|
|||
{
|
||||
if (!checkBox8.Checked)
|
||||
{
|
||||
Bitmap bmp = checkBox1.Checked ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1);
|
||||
Bitmap bmp = string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1);
|
||||
Graphics g = Graphics.FromImage(bmp);
|
||||
if (File.Exists(Properties.Settings.Default.wFilename))
|
||||
{
|
||||
|
|
@ -228,7 +228,7 @@ namespace FModel.Forms
|
|||
}
|
||||
if (checkBox8.Checked)
|
||||
{
|
||||
Bitmap bmp = checkBox1.Checked ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1);
|
||||
Bitmap bmp = string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1);
|
||||
Graphics g = Graphics.FromImage(bmp);
|
||||
if (File.Exists(Properties.Settings.Default.wFilename))
|
||||
{
|
||||
|
|
@ -240,9 +240,9 @@ namespace FModel.Forms
|
|||
}
|
||||
}
|
||||
|
||||
private void CheckBox1_CheckedChanged(object sender, EventArgs e)
|
||||
private void ComboBox2_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (!checkBox1.Checked)
|
||||
if (string.Equals(comboBox2.SelectedItem.ToString(), "Default"))
|
||||
{
|
||||
Bitmap bmp = checkBox8.Checked ? new Bitmap(Resources.wTemplateFv1) : new Bitmap(Resources.wTemplatev1);
|
||||
Graphics g = Graphics.FromImage(bmp);
|
||||
|
|
@ -254,7 +254,7 @@ namespace FModel.Forms
|
|||
}
|
||||
wPictureBox.Image = bmp;
|
||||
}
|
||||
if (checkBox1.Checked)
|
||||
if (string.Equals(comboBox2.SelectedItem.ToString(), "Flat"))
|
||||
{
|
||||
Bitmap bmp = checkBox8.Checked ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplate);
|
||||
Graphics g = Graphics.FromImage(bmp);
|
||||
|
|
|
|||
363
FModel/Forms/UpdateModeSettings.Designer.cs
generated
363
FModel/Forms/UpdateModeSettings.Designer.cs
generated
|
|
@ -32,8 +32,12 @@ namespace FModel.Forms
|
|||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.optionsOKButton = new System.Windows.Forms.Button();
|
||||
this.checkedListBox1 = new System.Windows.Forms.CheckedListBox();
|
||||
this.checkedListBox2 = new System.Windows.Forms.CheckedListBox();
|
||||
this.groupBox1 = new System.Windows.Forms.GroupBox();
|
||||
this.groupBox4 = new System.Windows.Forms.GroupBox();
|
||||
this.checkBox1 = new System.Windows.Forms.CheckBox();
|
||||
this.comboBox2 = new System.Windows.Forms.ComboBox();
|
||||
this.label3 = new System.Windows.Forms.Label();
|
||||
this.comboBox1 = new System.Windows.Forms.ComboBox();
|
||||
this.label10 = new System.Windows.Forms.Label();
|
||||
this.checkBox8 = new System.Windows.Forms.CheckBox();
|
||||
|
|
@ -45,14 +49,11 @@ namespace FModel.Forms
|
|||
this.label8 = new System.Windows.Forms.Label();
|
||||
this.button1 = new System.Windows.Forms.Button();
|
||||
this.wPictureBox = new System.Windows.Forms.PictureBox();
|
||||
this.checkedListBox1 = new System.Windows.Forms.CheckedListBox();
|
||||
this.checkedListBox2 = new System.Windows.Forms.CheckedListBox();
|
||||
this.groupBox1 = new System.Windows.Forms.GroupBox();
|
||||
this.groupBox1.SuspendLayout();
|
||||
this.groupBox4.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.trackBar1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.trackBar2)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.wPictureBox)).BeginInit();
|
||||
this.groupBox1.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// label2
|
||||
|
|
@ -60,7 +61,7 @@ namespace FModel.Forms
|
|||
this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.label2.AutoSize = true;
|
||||
this.label2.ForeColor = System.Drawing.Color.Red;
|
||||
this.label2.Location = new System.Drawing.Point(149, 443);
|
||||
this.label2.Location = new System.Drawing.Point(149, 436);
|
||||
this.label2.Name = "label2";
|
||||
this.label2.Size = new System.Drawing.Size(320, 13);
|
||||
this.label2.TabIndex = 20;
|
||||
|
|
@ -71,7 +72,7 @@ namespace FModel.Forms
|
|||
this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.label1.AutoSize = true;
|
||||
this.label1.ForeColor = System.Drawing.Color.Red;
|
||||
this.label1.Location = new System.Drawing.Point(133, 442);
|
||||
this.label1.Location = new System.Drawing.Point(133, 435);
|
||||
this.label1.Name = "label1";
|
||||
this.label1.Size = new System.Drawing.Size(19, 13);
|
||||
this.label1.TabIndex = 19;
|
||||
|
|
@ -81,7 +82,7 @@ namespace FModel.Forms
|
|||
//
|
||||
this.optionsOKButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.optionsOKButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.optionsOKButton.Location = new System.Drawing.Point(475, 439);
|
||||
this.optionsOKButton.Location = new System.Drawing.Point(475, 432);
|
||||
this.optionsOKButton.Name = "optionsOKButton";
|
||||
this.optionsOKButton.Size = new System.Drawing.Size(97, 21);
|
||||
this.optionsOKButton.TabIndex = 18;
|
||||
|
|
@ -89,167 +90,6 @@ namespace FModel.Forms
|
|||
this.optionsOKButton.UseVisualStyleBackColor = true;
|
||||
this.optionsOKButton.Click += new System.EventHandler(this.optionsOKButton_Click);
|
||||
//
|
||||
// groupBox4
|
||||
//
|
||||
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.groupBox4.Controls.Add(this.checkBox1);
|
||||
this.groupBox4.Controls.Add(this.comboBox1);
|
||||
this.groupBox4.Controls.Add(this.label10);
|
||||
this.groupBox4.Controls.Add(this.checkBox8);
|
||||
this.groupBox4.Controls.Add(this.checkBox7);
|
||||
this.groupBox4.Controls.Add(this.filenameLabel);
|
||||
this.groupBox4.Controls.Add(this.trackBar1);
|
||||
this.groupBox4.Controls.Add(this.label9);
|
||||
this.groupBox4.Controls.Add(this.trackBar2);
|
||||
this.groupBox4.Controls.Add(this.label8);
|
||||
this.groupBox4.Controls.Add(this.button1);
|
||||
this.groupBox4.Controls.Add(this.wPictureBox);
|
||||
this.groupBox4.Location = new System.Drawing.Point(12, 232);
|
||||
this.groupBox4.Name = "groupBox4";
|
||||
this.groupBox4.Size = new System.Drawing.Size(560, 195);
|
||||
this.groupBox4.TabIndex = 21;
|
||||
this.groupBox4.TabStop = false;
|
||||
this.groupBox4.Text = "Icon Creation";
|
||||
//
|
||||
// checkBox1
|
||||
//
|
||||
this.checkBox1.AutoSize = true;
|
||||
this.checkBox1.Location = new System.Drawing.Point(244, 54);
|
||||
this.checkBox1.Name = "checkBox1";
|
||||
this.checkBox1.Size = new System.Drawing.Size(139, 17);
|
||||
this.checkBox1.TabIndex = 30;
|
||||
this.checkBox1.Text = "New Rarity Background";
|
||||
this.checkBox1.UseVisualStyleBackColor = true;
|
||||
this.checkBox1.CheckedChanged += new System.EventHandler(this.CheckBox1_CheckedChanged);
|
||||
//
|
||||
// comboBox1
|
||||
//
|
||||
this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.comboBox1.FormattingEnabled = true;
|
||||
this.comboBox1.Items.AddRange(new object[] {
|
||||
"English",
|
||||
"French",
|
||||
"German",
|
||||
"Italian",
|
||||
"Spanish",
|
||||
"Spanish (LA)",
|
||||
"Arabic",
|
||||
"Japanese",
|
||||
"Korean",
|
||||
"Polish",
|
||||
"Portuguese (Brazil)",
|
||||
"Russian",
|
||||
"Turkish",
|
||||
"Chinese (S)",
|
||||
"Traditional Chinese"});
|
||||
this.comboBox1.Location = new System.Drawing.Point(70, 19);
|
||||
this.comboBox1.Name = "comboBox1";
|
||||
this.comboBox1.Size = new System.Drawing.Size(309, 21);
|
||||
this.comboBox1.TabIndex = 29;
|
||||
//
|
||||
// label10
|
||||
//
|
||||
this.label10.AutoSize = true;
|
||||
this.label10.Location = new System.Drawing.Point(6, 22);
|
||||
this.label10.Name = "label10";
|
||||
this.label10.Size = new System.Drawing.Size(58, 13);
|
||||
this.label10.TabIndex = 28;
|
||||
this.label10.Text = "Language:";
|
||||
//
|
||||
// checkBox8
|
||||
//
|
||||
this.checkBox8.AutoSize = true;
|
||||
this.checkBox8.Location = new System.Drawing.Point(6, 54);
|
||||
this.checkBox8.Name = "checkBox8";
|
||||
this.checkBox8.Size = new System.Drawing.Size(177, 17);
|
||||
this.checkBox8.TabIndex = 26;
|
||||
this.checkBox8.Text = "Use Featured Image If Available";
|
||||
this.checkBox8.UseVisualStyleBackColor = true;
|
||||
this.checkBox8.CheckedChanged += new System.EventHandler(this.checkBox8_CheckedChanged);
|
||||
//
|
||||
// checkBox7
|
||||
//
|
||||
this.checkBox7.AutoSize = true;
|
||||
this.checkBox7.Location = new System.Drawing.Point(6, 90);
|
||||
this.checkBox7.Name = "checkBox7";
|
||||
this.checkBox7.Size = new System.Drawing.Size(15, 14);
|
||||
this.checkBox7.TabIndex = 25;
|
||||
this.checkBox7.UseVisualStyleBackColor = true;
|
||||
this.checkBox7.CheckedChanged += new System.EventHandler(this.checkBox7_CheckedChanged);
|
||||
//
|
||||
// filenameLabel
|
||||
//
|
||||
this.filenameLabel.AutoEllipsis = true;
|
||||
this.filenameLabel.AutoSize = true;
|
||||
this.filenameLabel.Location = new System.Drawing.Point(115, 91);
|
||||
this.filenameLabel.MaximumSize = new System.Drawing.Size(260, 13);
|
||||
this.filenameLabel.Name = "filenameLabel";
|
||||
this.filenameLabel.Size = new System.Drawing.Size(60, 13);
|
||||
this.filenameLabel.TabIndex = 24;
|
||||
this.filenameLabel.Text = "File Name: ";
|
||||
//
|
||||
// trackBar1
|
||||
//
|
||||
this.trackBar1.Location = new System.Drawing.Point(58, 144);
|
||||
this.trackBar1.Maximum = 100;
|
||||
this.trackBar1.Name = "trackBar1";
|
||||
this.trackBar1.Size = new System.Drawing.Size(325, 45);
|
||||
this.trackBar1.TabIndex = 20;
|
||||
this.trackBar1.TickStyle = System.Windows.Forms.TickStyle.None;
|
||||
this.trackBar1.ValueChanged += new System.EventHandler(this.trackBar1_ValueChanged);
|
||||
//
|
||||
// label9
|
||||
//
|
||||
this.label9.AutoSize = true;
|
||||
this.label9.Location = new System.Drawing.Point(22, 115);
|
||||
this.label9.Name = "label9";
|
||||
this.label9.Size = new System.Drawing.Size(30, 13);
|
||||
this.label9.TabIndex = 23;
|
||||
this.label9.Text = "Size:";
|
||||
//
|
||||
// trackBar2
|
||||
//
|
||||
this.trackBar2.Location = new System.Drawing.Point(58, 115);
|
||||
this.trackBar2.Maximum = 1000;
|
||||
this.trackBar2.Minimum = 1;
|
||||
this.trackBar2.Name = "trackBar2";
|
||||
this.trackBar2.Size = new System.Drawing.Size(325, 45);
|
||||
this.trackBar2.TabIndex = 22;
|
||||
this.trackBar2.TickFrequency = 25;
|
||||
this.trackBar2.TickStyle = System.Windows.Forms.TickStyle.None;
|
||||
this.trackBar2.Value = 1;
|
||||
this.trackBar2.ValueChanged += new System.EventHandler(this.trackBar2_ValueChanged);
|
||||
//
|
||||
// label8
|
||||
//
|
||||
this.label8.AutoSize = true;
|
||||
this.label8.Location = new System.Drawing.Point(6, 147);
|
||||
this.label8.Name = "label8";
|
||||
this.label8.Size = new System.Drawing.Size(46, 13);
|
||||
this.label8.TabIndex = 21;
|
||||
this.label8.Text = "Opacity:";
|
||||
//
|
||||
// button1
|
||||
//
|
||||
this.button1.Location = new System.Drawing.Point(27, 84);
|
||||
this.button1.Name = "button1";
|
||||
this.button1.Size = new System.Drawing.Size(82, 24);
|
||||
this.button1.TabIndex = 19;
|
||||
this.button1.Text = "Watermark";
|
||||
this.button1.UseVisualStyleBackColor = true;
|
||||
this.button1.Click += new System.EventHandler(this.button1_Click);
|
||||
//
|
||||
// wPictureBox
|
||||
//
|
||||
this.wPictureBox.Image = global::FModel.Properties.Resources.wTemplate;
|
||||
this.wPictureBox.Location = new System.Drawing.Point(389, 19);
|
||||
this.wPictureBox.Name = "wPictureBox";
|
||||
this.wPictureBox.Size = new System.Drawing.Size(165, 165);
|
||||
this.wPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
|
||||
this.wPictureBox.TabIndex = 18;
|
||||
this.wPictureBox.TabStop = false;
|
||||
//
|
||||
// checkedListBox1
|
||||
//
|
||||
this.checkedListBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
|
||||
|
|
@ -308,12 +148,184 @@ namespace FModel.Forms
|
|||
this.groupBox1.TabStop = false;
|
||||
this.groupBox1.Text = "Icon Creation " +
|
||||
" Texture";
|
||||
//
|
||||
// groupBox4
|
||||
//
|
||||
this.groupBox4.Controls.Add(this.comboBox2);
|
||||
this.groupBox4.Controls.Add(this.label3);
|
||||
this.groupBox4.Controls.Add(this.comboBox1);
|
||||
this.groupBox4.Controls.Add(this.label10);
|
||||
this.groupBox4.Controls.Add(this.checkBox8);
|
||||
this.groupBox4.Controls.Add(this.checkBox7);
|
||||
this.groupBox4.Controls.Add(this.filenameLabel);
|
||||
this.groupBox4.Controls.Add(this.trackBar1);
|
||||
this.groupBox4.Controls.Add(this.label9);
|
||||
this.groupBox4.Controls.Add(this.trackBar2);
|
||||
this.groupBox4.Controls.Add(this.label8);
|
||||
this.groupBox4.Controls.Add(this.button1);
|
||||
this.groupBox4.Controls.Add(this.wPictureBox);
|
||||
this.groupBox4.Location = new System.Drawing.Point(12, 232);
|
||||
this.groupBox4.Name = "groupBox4";
|
||||
this.groupBox4.Size = new System.Drawing.Size(560, 190);
|
||||
this.groupBox4.TabIndex = 25;
|
||||
this.groupBox4.TabStop = false;
|
||||
this.groupBox4.Text = "Icon Creation";
|
||||
//
|
||||
// comboBox2
|
||||
//
|
||||
this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.comboBox2.FormattingEnabled = true;
|
||||
this.comboBox2.Items.AddRange(new object[] {
|
||||
"Default",
|
||||
"Flat"});
|
||||
this.comboBox2.Location = new System.Drawing.Point(85, 48);
|
||||
this.comboBox2.Name = "comboBox2";
|
||||
this.comboBox2.Size = new System.Drawing.Size(294, 21);
|
||||
this.comboBox2.TabIndex = 31;
|
||||
this.comboBox2.SelectedIndexChanged += new System.EventHandler(this.ComboBox2_SelectedIndexChanged);
|
||||
//
|
||||
// label3
|
||||
//
|
||||
this.label3.AutoSize = true;
|
||||
this.label3.Location = new System.Drawing.Point(6, 51);
|
||||
this.label3.Name = "label3";
|
||||
this.label3.Size = new System.Drawing.Size(73, 13);
|
||||
this.label3.TabIndex = 30;
|
||||
this.label3.Text = "Rarity Design:";
|
||||
//
|
||||
// comboBox1
|
||||
//
|
||||
this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.comboBox1.FormattingEnabled = true;
|
||||
this.comboBox1.Items.AddRange(new object[] {
|
||||
"English",
|
||||
"French",
|
||||
"German",
|
||||
"Italian",
|
||||
"Spanish",
|
||||
"Spanish (LA)",
|
||||
"Arabic",
|
||||
"Japanese",
|
||||
"Korean",
|
||||
"Polish",
|
||||
"Portuguese (Brazil)",
|
||||
"Russian",
|
||||
"Turkish",
|
||||
"Chinese (S)",
|
||||
"Traditional Chinese"});
|
||||
this.comboBox1.Location = new System.Drawing.Point(70, 19);
|
||||
this.comboBox1.Name = "comboBox1";
|
||||
this.comboBox1.Size = new System.Drawing.Size(309, 21);
|
||||
this.comboBox1.TabIndex = 29;
|
||||
//
|
||||
// label10
|
||||
//
|
||||
this.label10.AutoSize = true;
|
||||
this.label10.Location = new System.Drawing.Point(6, 22);
|
||||
this.label10.Name = "label10";
|
||||
this.label10.Size = new System.Drawing.Size(58, 13);
|
||||
this.label10.TabIndex = 28;
|
||||
this.label10.Text = "Language:";
|
||||
//
|
||||
// checkBox8
|
||||
//
|
||||
this.checkBox8.AutoSize = true;
|
||||
this.checkBox8.Location = new System.Drawing.Point(206, 167);
|
||||
this.checkBox8.Name = "checkBox8";
|
||||
this.checkBox8.Size = new System.Drawing.Size(177, 17);
|
||||
this.checkBox8.TabIndex = 26;
|
||||
this.checkBox8.Text = "Use Featured Image If Available";
|
||||
this.checkBox8.UseVisualStyleBackColor = true;
|
||||
this.checkBox8.CheckedChanged += new System.EventHandler(this.checkBox8_CheckedChanged);
|
||||
//
|
||||
// checkBox7
|
||||
//
|
||||
this.checkBox7.AutoSize = true;
|
||||
this.checkBox7.Location = new System.Drawing.Point(6, 87);
|
||||
this.checkBox7.Name = "checkBox7";
|
||||
this.checkBox7.Size = new System.Drawing.Size(15, 14);
|
||||
this.checkBox7.TabIndex = 25;
|
||||
this.checkBox7.UseVisualStyleBackColor = true;
|
||||
this.checkBox7.CheckedChanged += new System.EventHandler(this.checkBox7_CheckedChanged);
|
||||
//
|
||||
// filenameLabel
|
||||
//
|
||||
this.filenameLabel.AutoEllipsis = true;
|
||||
this.filenameLabel.AutoSize = true;
|
||||
this.filenameLabel.Location = new System.Drawing.Point(115, 88);
|
||||
this.filenameLabel.MaximumSize = new System.Drawing.Size(260, 13);
|
||||
this.filenameLabel.Name = "filenameLabel";
|
||||
this.filenameLabel.Size = new System.Drawing.Size(60, 13);
|
||||
this.filenameLabel.TabIndex = 24;
|
||||
this.filenameLabel.Text = "File Name: ";
|
||||
//
|
||||
// trackBar1
|
||||
//
|
||||
this.trackBar1.Location = new System.Drawing.Point(58, 141);
|
||||
this.trackBar1.Maximum = 100;
|
||||
this.trackBar1.Name = "trackBar1";
|
||||
this.trackBar1.Size = new System.Drawing.Size(325, 45);
|
||||
this.trackBar1.TabIndex = 20;
|
||||
this.trackBar1.TickStyle = System.Windows.Forms.TickStyle.None;
|
||||
this.trackBar1.ValueChanged += new System.EventHandler(this.trackBar1_ValueChanged);
|
||||
//
|
||||
// label9
|
||||
//
|
||||
this.label9.AutoSize = true;
|
||||
this.label9.Location = new System.Drawing.Point(22, 112);
|
||||
this.label9.Name = "label9";
|
||||
this.label9.Size = new System.Drawing.Size(30, 13);
|
||||
this.label9.TabIndex = 23;
|
||||
this.label9.Text = "Size:";
|
||||
//
|
||||
// trackBar2
|
||||
//
|
||||
this.trackBar2.Location = new System.Drawing.Point(58, 112);
|
||||
this.trackBar2.Maximum = 1000;
|
||||
this.trackBar2.Minimum = 1;
|
||||
this.trackBar2.Name = "trackBar2";
|
||||
this.trackBar2.Size = new System.Drawing.Size(325, 45);
|
||||
this.trackBar2.TabIndex = 22;
|
||||
this.trackBar2.TickFrequency = 25;
|
||||
this.trackBar2.TickStyle = System.Windows.Forms.TickStyle.None;
|
||||
this.trackBar2.Value = 1;
|
||||
this.trackBar2.ValueChanged += new System.EventHandler(this.trackBar2_ValueChanged);
|
||||
//
|
||||
// label8
|
||||
//
|
||||
this.label8.AutoSize = true;
|
||||
this.label8.Location = new System.Drawing.Point(6, 144);
|
||||
this.label8.Name = "label8";
|
||||
this.label8.Size = new System.Drawing.Size(46, 13);
|
||||
this.label8.TabIndex = 21;
|
||||
this.label8.Text = "Opacity:";
|
||||
//
|
||||
// button1
|
||||
//
|
||||
this.button1.Location = new System.Drawing.Point(27, 81);
|
||||
this.button1.Name = "button1";
|
||||
this.button1.Size = new System.Drawing.Size(82, 24);
|
||||
this.button1.TabIndex = 19;
|
||||
this.button1.Text = "Watermark";
|
||||
this.button1.UseVisualStyleBackColor = true;
|
||||
this.button1.Click += new System.EventHandler(this.button1_Click);
|
||||
//
|
||||
// wPictureBox
|
||||
//
|
||||
this.wPictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.wPictureBox.Image = global::FModel.Properties.Resources.wTemplatev1;
|
||||
this.wPictureBox.Location = new System.Drawing.Point(389, 19);
|
||||
this.wPictureBox.Name = "wPictureBox";
|
||||
this.wPictureBox.Size = new System.Drawing.Size(165, 165);
|
||||
this.wPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
|
||||
this.wPictureBox.TabIndex = 18;
|
||||
this.wPictureBox.TabStop = false;
|
||||
//
|
||||
// UpdateModeSettings
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(584, 472);
|
||||
this.ClientSize = new System.Drawing.Size(584, 465);
|
||||
this.Controls.Add(this.groupBox4);
|
||||
this.Controls.Add(this.label2);
|
||||
this.Controls.Add(this.label1);
|
||||
|
|
@ -326,12 +338,12 @@ namespace FModel.Forms
|
|||
this.Name = "UpdateModeSettings";
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
|
||||
this.Text = "Update Mode Settings";
|
||||
this.groupBox1.ResumeLayout(false);
|
||||
this.groupBox4.ResumeLayout(false);
|
||||
this.groupBox4.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.trackBar1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.trackBar2)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.wPictureBox)).EndInit();
|
||||
this.groupBox1.ResumeLayout(false);
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
|
|
@ -341,8 +353,12 @@ namespace FModel.Forms
|
|||
private System.Windows.Forms.Label label2;
|
||||
private System.Windows.Forms.Label label1;
|
||||
private System.Windows.Forms.Button optionsOKButton;
|
||||
private System.Windows.Forms.CheckedListBox checkedListBox1;
|
||||
private System.Windows.Forms.CheckedListBox checkedListBox2;
|
||||
private System.Windows.Forms.GroupBox groupBox1;
|
||||
private System.Windows.Forms.GroupBox groupBox4;
|
||||
private System.Windows.Forms.CheckBox checkBox1;
|
||||
private System.Windows.Forms.ComboBox comboBox2;
|
||||
private System.Windows.Forms.Label label3;
|
||||
private System.Windows.Forms.ComboBox comboBox1;
|
||||
private System.Windows.Forms.Label label10;
|
||||
private System.Windows.Forms.CheckBox checkBox8;
|
||||
|
|
@ -354,8 +370,5 @@ namespace FModel.Forms
|
|||
private System.Windows.Forms.Label label8;
|
||||
private System.Windows.Forms.Button button1;
|
||||
private System.Windows.Forms.PictureBox wPictureBox;
|
||||
private System.Windows.Forms.CheckedListBox checkedListBox1;
|
||||
private System.Windows.Forms.CheckedListBox checkedListBox2;
|
||||
private System.Windows.Forms.GroupBox groupBox1;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ namespace FModel.Forms
|
|||
setCheckListBoxItemChecked(parameters);
|
||||
}
|
||||
|
||||
checkBox1.Checked = Properties.Settings.Default.rarityNew;
|
||||
comboBox2.SelectedIndex = comboBox2.FindStringExact(Properties.Settings.Default.rarityDesign);
|
||||
|
||||
//WATERMARK
|
||||
button1.Enabled = Properties.Settings.Default.UMWatermark;
|
||||
|
|
@ -45,11 +45,11 @@ namespace FModel.Forms
|
|||
Bitmap bmp = null;
|
||||
if (Properties.Settings.Default.UMFeatured)
|
||||
{
|
||||
bmp = new Bitmap(Properties.Settings.Default.rarityNew ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1));
|
||||
bmp = new Bitmap(string.Equals(Properties.Settings.Default.rarityDesign, "Flat") ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1));
|
||||
}
|
||||
else
|
||||
{
|
||||
bmp = new Bitmap(Properties.Settings.Default.rarityNew ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1));
|
||||
bmp = new Bitmap(string.Equals(Properties.Settings.Default.rarityDesign, "Flat") ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1));
|
||||
}
|
||||
Graphics g = Graphics.FromImage(bmp);
|
||||
|
||||
|
|
@ -71,7 +71,7 @@ namespace FModel.Forms
|
|||
|
||||
Properties.Settings.Default.UMFeatured = checkBox8.Checked;
|
||||
Properties.Settings.Default.UMWatermark = checkBox7.Checked;
|
||||
Properties.Settings.Default.rarityNew = checkBox1.Checked;
|
||||
Properties.Settings.Default.rarityDesign = comboBox2.SelectedItem.ToString();
|
||||
|
||||
Properties.Settings.Default.UMSize = trackBar2.Value;
|
||||
Properties.Settings.Default.UMOpacity = trackBar1.Value;
|
||||
|
|
@ -269,7 +269,7 @@ namespace FModel.Forms
|
|||
{
|
||||
if (!checkBox8.Checked)
|
||||
{
|
||||
Bitmap bmp = checkBox1.Checked ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1);
|
||||
Bitmap bmp = string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplate) : new Bitmap(Resources.wTemplatev1);
|
||||
Graphics g = Graphics.FromImage(bmp);
|
||||
if (File.Exists(Properties.Settings.Default.UMFilename))
|
||||
{
|
||||
|
|
@ -281,7 +281,7 @@ namespace FModel.Forms
|
|||
}
|
||||
if (checkBox8.Checked)
|
||||
{
|
||||
Bitmap bmp = checkBox1.Checked ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1);
|
||||
Bitmap bmp = string.Equals(comboBox2.SelectedItem.ToString(), "Flat") ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplateFv1);
|
||||
Graphics g = Graphics.FromImage(bmp);
|
||||
if (File.Exists(Properties.Settings.Default.UMFilename))
|
||||
{
|
||||
|
|
@ -293,9 +293,9 @@ namespace FModel.Forms
|
|||
}
|
||||
}
|
||||
|
||||
private void CheckBox1_CheckedChanged(object sender, EventArgs e)
|
||||
private void ComboBox2_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (!checkBox1.Checked)
|
||||
if (string.Equals(comboBox2.SelectedItem.ToString(), "Default"))
|
||||
{
|
||||
Bitmap bmp = checkBox8.Checked ? new Bitmap(Resources.wTemplateFv1) : new Bitmap(Resources.wTemplatev1);
|
||||
Graphics g = Graphics.FromImage(bmp);
|
||||
|
|
@ -307,7 +307,7 @@ namespace FModel.Forms
|
|||
}
|
||||
wPictureBox.Image = bmp;
|
||||
}
|
||||
if (checkBox1.Checked)
|
||||
if (string.Equals(comboBox2.SelectedItem.ToString(), "Flat"))
|
||||
{
|
||||
Bitmap bmp = checkBox8.Checked ? new Bitmap(Resources.wTemplateF) : new Bitmap(Resources.wTemplate);
|
||||
Graphics g = Graphics.FromImage(bmp);
|
||||
|
|
|
|||
|
|
@ -988,7 +988,7 @@ namespace FModel
|
|||
|
||||
ItemIcon.DrawWatermark(g);
|
||||
|
||||
if (Settings.Default.rarityNew)
|
||||
if (string.Equals(Settings.Default.rarityDesign, "Flat"))
|
||||
{
|
||||
GraphicsPath p = new GraphicsPath();
|
||||
p.StartFigure();
|
||||
|
|
|
|||
|
|
@ -331,7 +331,8 @@ namespace FModel
|
|||
}
|
||||
|
||||
drawQuestBackground(myBitmap, false);
|
||||
toDrawOn.DrawString(count == "-1" ? all : any, new Font(Settings.Default.IconLanguage == "Japanese" ? FontUtilities.pfc.Families[2] : FontUtilities.pfc.Families[1], 25), new SolidBrush(Color.White), new Point(55, theY + 15));
|
||||
Font goodFont = FontUtilities.FindFont(toDrawOn, count == "-1" ? all : any, new Rectangle(57, theY + 7, myBitmap.Width - 227, 45).Size, new Font(Settings.Default.IconLanguage == "Japanese" ? FontUtilities.pfc.Families[2] : FontUtilities.pfc.Families[1], 30)); //size in "new Font()" is never check
|
||||
toDrawOn.DrawString(count == "-1" ? all : any, goodFont, new SolidBrush(Color.White), new Point(55, theY + 15));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -281,7 +281,7 @@ namespace FModel
|
|||
Font goodFont = FontUtilities.FindFont(
|
||||
myGraphic,
|
||||
text,
|
||||
Settings.Default.rarityNew ? new Rectangle(5, 405, 512, 55).Size : new Rectangle(5, 395, 512, 49).Size,
|
||||
string.Equals(Settings.Default.rarityDesign, "Flat") ? new Rectangle(5, 405, 512, 55).Size : new Rectangle(5, 395, 512, 49).Size,
|
||||
new Font(Settings.Default.IconLanguage == "Japanese" ? FontUtilities.pfc.Families[2] : Settings.Default.IconLanguage == "Russian" || Settings.Default.IconLanguage == "Chinese (S)" ? FontUtilities.pfc.Families[1] : FontUtilities.pfc.Families[0], 35)
|
||||
);
|
||||
|
||||
|
|
@ -289,8 +289,8 @@ namespace FModel
|
|||
text,
|
||||
goodFont,
|
||||
new SolidBrush(Color.White),
|
||||
Settings.Default.rarityNew ? new Point(522, 405) : new Point(522 / 2, 395),
|
||||
Settings.Default.rarityNew ? FontUtilities.rightString : FontUtilities.centeredString
|
||||
string.Equals(Settings.Default.rarityDesign, "Flat") ? new Point(522, 405) : new Point(522 / 2, 395),
|
||||
string.Equals(Settings.Default.rarityDesign, "Flat") ? FontUtilities.rightString : FontUtilities.centeredString
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -348,10 +348,10 @@ namespace FModel
|
|||
{
|
||||
myGraphic.DrawString(
|
||||
descriptionText,
|
||||
new Font("Arial", Settings.Default.rarityNew ? 9 : 10),
|
||||
new Font("Arial", string.Equals(Settings.Default.rarityDesign, "Flat") ? 9 : 10),
|
||||
new SolidBrush(Color.White),
|
||||
new RectangleF(5, Settings.Default.rarityNew ? 455 : 441, 512, Settings.Default.rarityNew ? 42 : 49),
|
||||
Settings.Default.rarityNew ? FontUtilities.rightString : FontUtilities.centeredStringLine
|
||||
new RectangleF(5, string.Equals(Settings.Default.rarityDesign, "Flat") ? 455 : 441, 512, string.Equals(Settings.Default.rarityDesign, "Flat") ? 42 : 49),
|
||||
string.Equals(Settings.Default.rarityDesign, "Flat") ? FontUtilities.rightString : FontUtilities.centeredStringLine
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,20 +17,20 @@ namespace FModel
|
|||
switch (raritiesToken != null ? raritiesToken.Value<string>() : "")
|
||||
{
|
||||
case "EFortRarity::Transcendent":
|
||||
return Settings.Default.rarityNew ? Resources.T512 : Resources.T512v1;
|
||||
return string.Equals(Settings.Default.rarityDesign, "Flat") ? Resources.T512 : Resources.T512v1;
|
||||
case "EFortRarity::Mythic":
|
||||
return Settings.Default.rarityNew ? Resources.M512 : Resources.M512v1;
|
||||
return string.Equals(Settings.Default.rarityDesign, "Flat") ? Resources.M512 : Resources.M512v1;
|
||||
case "EFortRarity::Legendary":
|
||||
return Settings.Default.rarityNew ? Resources.L512 : Resources.L512v1;
|
||||
return string.Equals(Settings.Default.rarityDesign, "Flat") ? Resources.L512 : Resources.L512v1;
|
||||
case "EFortRarity::Epic":
|
||||
case "EFortRarity::Quality":
|
||||
return Settings.Default.rarityNew ? Resources.E512 : Resources.E512v1;
|
||||
return string.Equals(Settings.Default.rarityDesign, "Flat") ? Resources.E512 : Resources.E512v1;
|
||||
case "EFortRarity::Rare":
|
||||
return Settings.Default.rarityNew ? Resources.R512 : Resources.R512v1;
|
||||
return string.Equals(Settings.Default.rarityDesign, "Flat") ? Resources.R512 : Resources.R512v1;
|
||||
case "EFortRarity::Common":
|
||||
return Settings.Default.rarityNew ? Resources.C512 : Resources.C512v1;
|
||||
return string.Equals(Settings.Default.rarityDesign, "Flat") ? Resources.C512 : Resources.C512v1;
|
||||
default:
|
||||
return Settings.Default.rarityNew ? Resources.U512 : Resources.U512v1;
|
||||
return string.Equals(Settings.Default.rarityDesign, "Flat") ? Resources.U512 : Resources.U512v1;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -44,7 +44,7 @@ namespace FModel
|
|||
{
|
||||
if (theSeries.Equals("MarvelSeries"))
|
||||
{
|
||||
return Settings.Default.rarityNew ? Resources.Marvel512 : Resources.Marvel512v1;
|
||||
return string.Equals(Settings.Default.rarityDesign, "Flat") ? Resources.Marvel512 : Resources.Marvel512v1;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -63,7 +63,7 @@ namespace FModel
|
|||
{
|
||||
if (specialMode == "ammo")
|
||||
{
|
||||
return Settings.Default.rarityNew ? Resources.C512 : Resources.C512v1;
|
||||
return string.Equals(Settings.Default.rarityDesign, "Flat") ? Resources.C512 : Resources.C512v1;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ namespace FModel
|
|||
toDrawOn.DrawImage(itemIcon, new Point(0, 0));
|
||||
}
|
||||
|
||||
if (Settings.Default.rarityNew)
|
||||
if (string.Equals(Properties.Settings.Default.rarityDesign, "Flat"))
|
||||
{
|
||||
GraphicsPath p = new GraphicsPath();
|
||||
p.StartFigure();
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ namespace FModel
|
|||
catch (Exception ex)
|
||||
{
|
||||
if (string.Equals(ex.Message, "Extraction failed")) { new UpdateMyConsole("0x" + pakKey + " doesn't work with " + ThePak.dynamicPaksList[i].thePak, Color.Red, true).AppendToConsole(); }
|
||||
else { new UpdateMyConsole("Message: " + ex.Message + "\nSource: " + ex.Source + "\nTarget: " + ex.TargetSite, Color.Red, true).AppendToConsole(); }
|
||||
else { new UpdateMyConsole("Message: " + ex.Message + "\nSource: " + ex.Source + "\nTarget: " + ex.TargetSite + "\n\nContact me: @AsvalFN on Twitter", Color.Red, true).AppendToConsole(); return; }
|
||||
|
||||
if (theExtractor != null) { theExtractor.Dispose(); }
|
||||
continue;
|
||||
|
|
|
|||
24
FModel/Properties/Settings.Designer.cs
generated
24
FModel/Properties/Settings.Designer.cs
generated
|
|
@ -275,18 +275,6 @@ namespace FModel.Properties {
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.UserScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("False")]
|
||||
public bool rarityNew {
|
||||
get {
|
||||
return ((bool)(this["rarityNew"]));
|
||||
}
|
||||
set {
|
||||
this["rarityNew"] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.UserScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("")]
|
||||
|
|
@ -346,5 +334,17 @@ namespace FModel.Properties {
|
|||
this["challengesColors"] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.UserScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("Default")]
|
||||
public string rarityDesign {
|
||||
get {
|
||||
return ((string)(this["rarityDesign"]));
|
||||
}
|
||||
set {
|
||||
this["rarityDesign"] = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,9 +65,6 @@
|
|||
<Setting Name="tTokenSecret" Type="System.String" Scope="User">
|
||||
<Value Profile="(Default)" />
|
||||
</Setting>
|
||||
<Setting Name="rarityNew" Type="System.Boolean" Scope="User">
|
||||
<Value Profile="(Default)">False</Value>
|
||||
</Setting>
|
||||
<Setting Name="UMParameters" Type="System.String" Scope="User">
|
||||
<Value Profile="(Default)" />
|
||||
</Setting>
|
||||
|
|
@ -83,5 +80,8 @@
|
|||
<Setting Name="challengesColors" Type="System.String" Scope="User">
|
||||
<Value Profile="(Default)">50,50,50</Value>
|
||||
</Setting>
|
||||
<Setting Name="rarityDesign" Type="System.String" Scope="User">
|
||||
<Value Profile="(Default)">Default</Value>
|
||||
</Setting>
|
||||
</Settings>
|
||||
</SettingsFile>
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
- if the Asset is an **_Item Definition_**:
|
||||
- Try to create an [Icon](https://i.imgur.com/8hxXSsA.png) with **Name**, **Description**, **Rarity**, **Type**, **Cosmetic Source** and the **Cosmetic Set**
|
||||
- if the Asset is a **_Bundle Of Challenges_**:
|
||||
- Try to create an [Icon](https://i.imgur.com/pUVxUih.png) with all **Challenges' Description**, **Count** and the **Reward**
|
||||
- Try to create an [Icon](https://i.imgur.com/SzW11Kk.png) with all **Challenges' Description**, **Count**, **Reward** and more. You can also add your own banner and overwrite the default color to make the icon more unique
|
||||
- if the Asset is a **_Texture_**:
|
||||
- Try to display the Asset as PNG
|
||||
- if the Asset is a **_Sound_**:
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user