new icon background design to better introduce new way to handle variants + improved UX on twitter form
|
|
@ -269,6 +269,13 @@
|
|||
<Content Include="DLLs\csharp-wick.dll" />
|
||||
<Content Include="DLLs\ScintillaNET FindReplaceDialog.dll" />
|
||||
<Content Include="FModel.ico" />
|
||||
<None Include="Resources\U512.png" />
|
||||
<None Include="Resources\R512.png" />
|
||||
<None Include="Resources\Marvel512.png" />
|
||||
<None Include="Resources\M512.png" />
|
||||
<None Include="Resources\L512.png" />
|
||||
<None Include="Resources\E512.png" />
|
||||
<None Include="Resources\C512.png" />
|
||||
<None Include="Resources\twitter.ico" />
|
||||
<None Include="Resources\BurbankBigCondensed-Black-vJapanese.otf" />
|
||||
<None Include="Resources\reload64.png" />
|
||||
|
|
@ -281,7 +288,6 @@
|
|||
<None Include="Resources\T-FNBR-BattlePoints-L.png" />
|
||||
<None Include="Resources\BurbankBigCondensed-Black.ttf" />
|
||||
<None Include="Resources\BurbankBigCondensed-Bold.ttf" />
|
||||
<None Include="Resources\Marvel512.png" />
|
||||
<None Include="Resources\T-Icon-Pets-64.png" />
|
||||
<None Include="Resources\T-Icon-Quests-64.png" />
|
||||
<None Include="Resources\T-Icon-Variant-64.png" />
|
||||
|
|
@ -292,13 +298,7 @@
|
|||
<None Include="Resources\wTemplateF.png" />
|
||||
<None Include="Resources\wTemplate.png" />
|
||||
<None Include="Resources\unknown512.png" />
|
||||
<None Include="Resources\U512.png" />
|
||||
<None Include="Resources\T512.png" />
|
||||
<None Include="Resources\R512.png" />
|
||||
<None Include="Resources\M512.png" />
|
||||
<None Include="Resources\L512.png" />
|
||||
<None Include="Resources\E512.png" />
|
||||
<None Include="Resources\C512.png" />
|
||||
<None Include="Resources\properties_16xLG.png" />
|
||||
<None Include="Resources\StatusAnnotations_Information_16xLG_color.png" />
|
||||
<None Include="Resources\folder_Closed_16xLG.png" />
|
||||
|
|
|
|||
146
FModel/Forms/TweetForm.Designer.cs
generated
|
|
@ -31,19 +31,14 @@
|
|||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TweetForm));
|
||||
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
|
||||
this.groupBox1 = new System.Windows.Forms.GroupBox();
|
||||
this.textBox3 = new System.Windows.Forms.TextBox();
|
||||
this.label3 = new System.Windows.Forms.Label();
|
||||
this.textBox4 = new System.Windows.Forms.TextBox();
|
||||
this.label4 = new System.Windows.Forms.Label();
|
||||
this.textBox2 = new System.Windows.Forms.TextBox();
|
||||
this.label2 = new System.Windows.Forms.Label();
|
||||
this.textBox1 = new System.Windows.Forms.TextBox();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.pictureBox1 = new System.Windows.Forms.PictureBox();
|
||||
this.button1 = new System.Windows.Forms.Button();
|
||||
this.button2 = new System.Windows.Forms.Button();
|
||||
this.label5 = new System.Windows.Forms.Label();
|
||||
this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
|
||||
this.comboBox1 = new System.Windows.Forms.ComboBox();
|
||||
this.textBox5 = new System.Windows.Forms.TextBox();
|
||||
this.checkBox1 = new System.Windows.Forms.CheckBox();
|
||||
this.groupBox1.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
|
|
@ -53,7 +48,7 @@
|
|||
this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.richTextBox1.Location = new System.Drawing.Point(12, 90);
|
||||
this.richTextBox1.Location = new System.Drawing.Point(12, 66);
|
||||
this.richTextBox1.MaxLength = 280;
|
||||
this.richTextBox1.Name = "richTextBox1";
|
||||
this.richTextBox1.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical;
|
||||
|
|
@ -65,90 +60,21 @@
|
|||
//
|
||||
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.groupBox1.Controls.Add(this.textBox3);
|
||||
this.groupBox1.Controls.Add(this.label3);
|
||||
this.groupBox1.Controls.Add(this.textBox4);
|
||||
this.groupBox1.Controls.Add(this.label4);
|
||||
this.groupBox1.Controls.Add(this.textBox2);
|
||||
this.groupBox1.Controls.Add(this.label2);
|
||||
this.groupBox1.Controls.Add(this.textBox1);
|
||||
this.groupBox1.Controls.Add(this.label1);
|
||||
this.groupBox1.Controls.Add(this.checkBox1);
|
||||
this.groupBox1.Controls.Add(this.textBox5);
|
||||
this.groupBox1.Controls.Add(this.comboBox1);
|
||||
this.groupBox1.Location = new System.Drawing.Point(12, 12);
|
||||
this.groupBox1.Name = "groupBox1";
|
||||
this.groupBox1.Size = new System.Drawing.Size(570, 72);
|
||||
this.groupBox1.Size = new System.Drawing.Size(570, 48);
|
||||
this.groupBox1.TabIndex = 1;
|
||||
this.groupBox1.TabStop = false;
|
||||
this.groupBox1.Text = "Settings";
|
||||
//
|
||||
// textBox3
|
||||
//
|
||||
this.textBox3.Location = new System.Drawing.Point(363, 46);
|
||||
this.textBox3.Name = "textBox3";
|
||||
this.textBox3.Size = new System.Drawing.Size(201, 20);
|
||||
this.textBox3.TabIndex = 7;
|
||||
//
|
||||
// label3
|
||||
//
|
||||
this.label3.AutoSize = true;
|
||||
this.label3.Location = new System.Drawing.Point(282, 48);
|
||||
this.label3.Name = "label3";
|
||||
this.label3.Size = new System.Drawing.Size(75, 13);
|
||||
this.label3.TabIndex = 6;
|
||||
this.label3.Text = "Token Secret:";
|
||||
//
|
||||
// textBox4
|
||||
//
|
||||
this.textBox4.Location = new System.Drawing.Point(53, 45);
|
||||
this.textBox4.Name = "textBox4";
|
||||
this.textBox4.Size = new System.Drawing.Size(222, 20);
|
||||
this.textBox4.TabIndex = 5;
|
||||
//
|
||||
// label4
|
||||
//
|
||||
this.label4.AutoSize = true;
|
||||
this.label4.Location = new System.Drawing.Point(6, 48);
|
||||
this.label4.Name = "label4";
|
||||
this.label4.Size = new System.Drawing.Size(41, 13);
|
||||
this.label4.TabIndex = 4;
|
||||
this.label4.Text = "Token:";
|
||||
//
|
||||
// textBox2
|
||||
//
|
||||
this.textBox2.Location = new System.Drawing.Point(379, 19);
|
||||
this.textBox2.Name = "textBox2";
|
||||
this.textBox2.Size = new System.Drawing.Size(185, 20);
|
||||
this.textBox2.TabIndex = 3;
|
||||
//
|
||||
// label2
|
||||
//
|
||||
this.label2.AutoSize = true;
|
||||
this.label2.Location = new System.Drawing.Point(282, 22);
|
||||
this.label2.Name = "label2";
|
||||
this.label2.Size = new System.Drawing.Size(91, 13);
|
||||
this.label2.TabIndex = 2;
|
||||
this.label2.Text = "Consumer Secret:";
|
||||
//
|
||||
// textBox1
|
||||
//
|
||||
this.textBox1.Location = new System.Drawing.Point(90, 19);
|
||||
this.textBox1.Name = "textBox1";
|
||||
this.textBox1.Size = new System.Drawing.Size(185, 20);
|
||||
this.textBox1.TabIndex = 1;
|
||||
//
|
||||
// label1
|
||||
//
|
||||
this.label1.AutoSize = true;
|
||||
this.label1.Location = new System.Drawing.Point(6, 22);
|
||||
this.label1.Name = "label1";
|
||||
this.label1.Size = new System.Drawing.Size(78, 13);
|
||||
this.label1.TabIndex = 0;
|
||||
this.label1.Text = "Consumer Key:";
|
||||
//
|
||||
// pictureBox1
|
||||
//
|
||||
this.pictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.pictureBox1.Location = new System.Drawing.Point(404, 90);
|
||||
this.pictureBox1.Location = new System.Drawing.Point(404, 66);
|
||||
this.pictureBox1.Name = "pictureBox1";
|
||||
this.pictureBox1.Size = new System.Drawing.Size(178, 178);
|
||||
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
|
||||
|
|
@ -158,7 +84,7 @@
|
|||
// button1
|
||||
//
|
||||
this.button1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(101)))), ((int)(((byte)(214)))));
|
||||
this.button1.Location = new System.Drawing.Point(507, 274);
|
||||
this.button1.Location = new System.Drawing.Point(507, 250);
|
||||
this.button1.Name = "button1";
|
||||
this.button1.Size = new System.Drawing.Size(75, 23);
|
||||
this.button1.TabIndex = 3;
|
||||
|
|
@ -168,7 +94,7 @@
|
|||
//
|
||||
// button2
|
||||
//
|
||||
this.button2.Location = new System.Drawing.Point(404, 274);
|
||||
this.button2.Location = new System.Drawing.Point(404, 250);
|
||||
this.button2.Name = "button2";
|
||||
this.button2.Size = new System.Drawing.Size(75, 23);
|
||||
this.button2.TabIndex = 4;
|
||||
|
|
@ -179,7 +105,7 @@
|
|||
// label5
|
||||
//
|
||||
this.label5.AutoSize = true;
|
||||
this.label5.Location = new System.Drawing.Point(12, 279);
|
||||
this.label5.Location = new System.Drawing.Point(12, 255);
|
||||
this.label5.Name = "label5";
|
||||
this.label5.Size = new System.Drawing.Size(40, 13);
|
||||
this.label5.TabIndex = 5;
|
||||
|
|
@ -190,11 +116,46 @@
|
|||
this.backgroundWorker1.DoWork += new System.ComponentModel.DoWorkEventHandler(this.BackgroundWorker1_DoWork);
|
||||
this.backgroundWorker1.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.BackgroundWorker1_RunWorkerCompleted);
|
||||
//
|
||||
// comboBox1
|
||||
//
|
||||
this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.comboBox1.FormattingEnabled = true;
|
||||
this.comboBox1.Items.AddRange(new object[] {
|
||||
"Consumer API Key",
|
||||
"Consumer API Secret",
|
||||
"Access Token",
|
||||
"Access Token Secret"});
|
||||
this.comboBox1.Location = new System.Drawing.Point(6, 19);
|
||||
this.comboBox1.Name = "comboBox1";
|
||||
this.comboBox1.Size = new System.Drawing.Size(137, 21);
|
||||
this.comboBox1.TabIndex = 6;
|
||||
this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.ComboBox1_SelectedIndexChanged);
|
||||
//
|
||||
// textBox5
|
||||
//
|
||||
this.textBox5.Location = new System.Drawing.Point(149, 19);
|
||||
this.textBox5.Name = "textBox5";
|
||||
this.textBox5.Size = new System.Drawing.Size(349, 20);
|
||||
this.textBox5.TabIndex = 7;
|
||||
this.textBox5.UseSystemPasswordChar = true;
|
||||
this.textBox5.TextChanged += new System.EventHandler(this.TextBox5_TextChanged);
|
||||
//
|
||||
// checkBox1
|
||||
//
|
||||
this.checkBox1.AutoSize = true;
|
||||
this.checkBox1.Location = new System.Drawing.Point(504, 21);
|
||||
this.checkBox1.Name = "checkBox1";
|
||||
this.checkBox1.Size = new System.Drawing.Size(60, 17);
|
||||
this.checkBox1.TabIndex = 8;
|
||||
this.checkBox1.Text = "Reveal";
|
||||
this.checkBox1.UseVisualStyleBackColor = true;
|
||||
this.checkBox1.CheckedChanged += new System.EventHandler(this.CheckBox1_CheckedChanged);
|
||||
//
|
||||
// TweetForm
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(594, 304);
|
||||
this.ClientSize = new System.Drawing.Size(594, 282);
|
||||
this.Controls.Add(this.label5);
|
||||
this.Controls.Add(this.button2);
|
||||
this.Controls.Add(this.button1);
|
||||
|
|
@ -220,18 +181,13 @@
|
|||
|
||||
private System.Windows.Forms.RichTextBox richTextBox1;
|
||||
private System.Windows.Forms.GroupBox groupBox1;
|
||||
private System.Windows.Forms.TextBox textBox1;
|
||||
private System.Windows.Forms.Label label1;
|
||||
private System.Windows.Forms.TextBox textBox3;
|
||||
private System.Windows.Forms.Label label3;
|
||||
private System.Windows.Forms.TextBox textBox4;
|
||||
private System.Windows.Forms.Label label4;
|
||||
private System.Windows.Forms.TextBox textBox2;
|
||||
private System.Windows.Forms.Label label2;
|
||||
private System.Windows.Forms.PictureBox pictureBox1;
|
||||
private System.Windows.Forms.Button button1;
|
||||
private System.Windows.Forms.Button button2;
|
||||
private System.Windows.Forms.Label label5;
|
||||
private System.ComponentModel.BackgroundWorker backgroundWorker1;
|
||||
private System.Windows.Forms.ComboBox comboBox1;
|
||||
private System.Windows.Forms.TextBox textBox5;
|
||||
private System.Windows.Forms.CheckBox checkBox1;
|
||||
}
|
||||
}
|
||||
|
|
@ -16,11 +16,6 @@ namespace FModel.Forms
|
|||
public TweetForm()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
textBox1.Text = Properties.Settings.Default.tConsKey;
|
||||
textBox2.Text = Properties.Settings.Default.tConsSecret;
|
||||
textBox4.Text = Properties.Settings.Default.tToken;
|
||||
textBox3.Text = Properties.Settings.Default.tTokenSecret;
|
||||
}
|
||||
|
||||
private void Button2_Click(object sender, EventArgs e)
|
||||
|
|
@ -57,12 +52,6 @@ namespace FModel.Forms
|
|||
tweetText = richTextBox1.Text;
|
||||
}));
|
||||
|
||||
Properties.Settings.Default.tConsKey = textBox1.Text;
|
||||
Properties.Settings.Default.tConsSecret = textBox2.Text;
|
||||
Properties.Settings.Default.tToken = textBox4.Text;
|
||||
Properties.Settings.Default.tTokenSecret = textBox3.Text;
|
||||
Properties.Settings.Default.Save();
|
||||
|
||||
if (service == null)
|
||||
{
|
||||
service = new TwitterService(Properties.Settings.Default.tConsKey, Properties.Settings.Default.tConsSecret);
|
||||
|
|
@ -121,5 +110,52 @@ namespace FModel.Forms
|
|||
|
||||
label5.Text = "Status: " + text;
|
||||
}
|
||||
|
||||
private void ComboBox1_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (comboBox1.SelectedIndex == 0)
|
||||
{
|
||||
textBox5.Text = Properties.Settings.Default.tConsKey;
|
||||
}
|
||||
if (comboBox1.SelectedIndex == 1)
|
||||
{
|
||||
textBox5.Text = Properties.Settings.Default.tConsSecret;
|
||||
}
|
||||
if (comboBox1.SelectedIndex == 2)
|
||||
{
|
||||
textBox5.Text = Properties.Settings.Default.tToken;
|
||||
}
|
||||
if (comboBox1.SelectedIndex == 3)
|
||||
{
|
||||
textBox5.Text = Properties.Settings.Default.tTokenSecret;
|
||||
}
|
||||
}
|
||||
|
||||
private void CheckBox1_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
textBox5.UseSystemPasswordChar = !checkBox1.Checked;
|
||||
}
|
||||
|
||||
private void TextBox5_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (comboBox1.SelectedIndex == 0)
|
||||
{
|
||||
Properties.Settings.Default.tConsKey = textBox5.Text;
|
||||
}
|
||||
if (comboBox1.SelectedIndex == 1)
|
||||
{
|
||||
Properties.Settings.Default.tConsSecret = textBox5.Text;
|
||||
}
|
||||
if (comboBox1.SelectedIndex == 2)
|
||||
{
|
||||
Properties.Settings.Default.tToken = textBox5.Text;
|
||||
}
|
||||
if (comboBox1.SelectedIndex == 3)
|
||||
{
|
||||
Properties.Settings.Default.tTokenSecret = textBox5.Text;
|
||||
}
|
||||
|
||||
Properties.Settings.Default.Save();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1215,6 +1215,7 @@ namespace FModel
|
|||
Bitmap bmp = new Bitmap(522, 522);
|
||||
Graphics g = Graphics.FromImage(bmp);
|
||||
g.TextRenderingHint = TextRenderingHint.AntiAlias;
|
||||
g.SmoothingMode = SmoothingMode.HighQuality;
|
||||
|
||||
Rarity.DrawRarity(theItem, g, specialMode);
|
||||
|
||||
|
|
@ -1237,7 +1238,14 @@ namespace FModel
|
|||
|
||||
ItemIcon.DrawWatermark(g);
|
||||
|
||||
g.FillRectangle(new SolidBrush(Color.FromArgb(70, 0, 0, 50)), new Rectangle(5, 383, 512, 134));
|
||||
GraphicsPath p = new GraphicsPath();
|
||||
p.StartFigure();
|
||||
p.AddLine(4, 438, 517, 383);
|
||||
p.AddLine(517, 383, 517, 383 + 134);
|
||||
p.AddLine(4, 383 + 134, 4, 383 + 134);
|
||||
p.AddLine(4, 383 + 134, 4, 438);
|
||||
p.CloseFigure();
|
||||
g.FillPath(new SolidBrush(Color.FromArgb(70, 0, 0, 50)), p);
|
||||
|
||||
DrawText.DrawTexts(theItem, g, specialMode);
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ using Newtonsoft.Json;
|
|||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Drawing;
|
||||
using System.Drawing.Drawing2D;
|
||||
using System.IO;
|
||||
|
||||
namespace FModel
|
||||
|
|
@ -210,10 +211,7 @@ namespace FModel
|
|||
if (CosmeticUff != null)
|
||||
{
|
||||
if (CosmeticUff.Contains("Animated"))
|
||||
{
|
||||
pointCoords = new Point(6, -2);
|
||||
imageLogo = Resources.T_Icon_Animated_64;
|
||||
}
|
||||
else if (CosmeticUff.Contains("HasUpgradeQuests") && theItem.ExportType != "AthenaPetCarrierItemDefinition")
|
||||
imageLogo = Resources.T_Icon_Quests_64;
|
||||
else if (CosmeticUff.Contains("HasUpgradeQuests") && theItem.ExportType == "AthenaPetCarrierItemDefinition")
|
||||
|
|
@ -221,20 +219,14 @@ namespace FModel
|
|||
else if (CosmeticUff.Contains("HasVariants"))
|
||||
imageLogo = Resources.T_Icon_Variant_64;
|
||||
else if (CosmeticUff.Contains("Reactive"))
|
||||
{
|
||||
pointCoords = new Point(7, 7);
|
||||
imageLogo = Resources.T_Icon_Adaptive_64;
|
||||
}
|
||||
else if (CosmeticUff.Contains("Traversal"))
|
||||
{
|
||||
pointCoords = new Point(6, 3);
|
||||
imageLogo = Resources.T_Icon_Traversal_64;
|
||||
}
|
||||
}
|
||||
|
||||
if (imageLogo != null)
|
||||
{
|
||||
myGraphic.DrawImage(ImageUtilities.ResizeImage(imageLogo, 32, 32), pointCoords);
|
||||
myGraphic.DrawImage(ImageUtilities.ResizeImage(imageLogo, 28, 28), pointCoords);
|
||||
imageLogo.Dispose();
|
||||
}
|
||||
}
|
||||
|
|
@ -248,12 +240,12 @@ namespace FModel
|
|||
{
|
||||
if (theItem.DisplayName != null)
|
||||
{
|
||||
//myGraphic.DrawRectangle(new Pen(new SolidBrush(Color.Red)), new Rectangle(5, 395, 512, 49));
|
||||
//myGraphic.DrawRectangle(new Pen(new SolidBrush(Color.Red)), new Rectangle(5, 405, 512, 55));
|
||||
|
||||
string text = SearchResource.getTextByKey(theItem.DisplayName.Key, theItem.DisplayName.SourceString);
|
||||
|
||||
Font goodFont = FontUtilities.FindFont(myGraphic, text, new Rectangle(5, 395, 512, 49).Size, new Font(Settings.Default.IconLanguage == "Japanese" ? FontUtilities.pfc.Families[2] : FontUtilities.pfc.Families[0], 35));
|
||||
myGraphic.DrawString(text, goodFont, new SolidBrush(Color.White), new Point(522 / 2, 395), FontUtilities.centeredString);
|
||||
Font goodFont = FontUtilities.FindFont(myGraphic, text, new Rectangle(5, 405, 512, 55).Size, new Font(Settings.Default.IconLanguage == "Japanese" ? FontUtilities.pfc.Families[2] : FontUtilities.pfc.Families[0], 35));
|
||||
myGraphic.DrawString(text, goodFont, new SolidBrush(Color.White), new Point(522, 405), FontUtilities.rightString);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -266,8 +258,10 @@ namespace FModel
|
|||
{
|
||||
if (theItem.Description != null)
|
||||
{
|
||||
//myGraphic.DrawRectangle(new Pen(new SolidBrush(Color.Pink)), new Rectangle(5, 455, 512, 42));
|
||||
|
||||
string text = SearchResource.getTextByKey(theItem.Description.Key, theItem.Description.SourceString);
|
||||
myGraphic.DrawString(text, new Font("Arial", 10), new SolidBrush(Color.White), new RectangleF(5, 441, 512, 49), FontUtilities.centeredStringLine);
|
||||
myGraphic.DrawString(text, new Font("Arial", 9), new SolidBrush(Color.White), new RectangleF(5, 455, 512, 42), FontUtilities.rightString);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -278,7 +272,7 @@ namespace FModel
|
|||
/// <param name="myGraphic"></param>
|
||||
private static void DrawToRight(string text, Graphics myGraphic)
|
||||
{
|
||||
myGraphic.DrawString(text, new Font(FontUtilities.pfc.Families[0], 13), new SolidBrush(Color.White), new Point(522 - 5, 500), FontUtilities.rightString);
|
||||
myGraphic.DrawString(text, new Font(FontUtilities.pfc.Families[0], 11), new SolidBrush(Color.White), new Point(522 - 5, 503), FontUtilities.rightString);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -288,7 +282,7 @@ namespace FModel
|
|||
/// <param name="myGraphic"></param>
|
||||
private static void DrawToLeft(string text, Graphics myGraphic)
|
||||
{
|
||||
myGraphic.DrawString(text, new Font(FontUtilities.pfc.Families[0], 13), new SolidBrush(Color.White), new Point(5, 500));
|
||||
myGraphic.DrawString(text, new Font(FontUtilities.pfc.Families[0], 11), new SolidBrush(Color.White), new Point(5, 503));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -357,15 +351,15 @@ namespace FModel
|
|||
|
||||
Image bulletImage = Resources.dmg64;
|
||||
myGraphic.DrawImage(ImageUtilities.ResizeImage(bulletImage, 15, 15), new Point(5, 500));
|
||||
DrawToLeft(" " + statParsed.DmgPb, myGraphic); //damage per bullet
|
||||
DrawToLeft(" " + statParsed.DmgPb, myGraphic); //damage per bullet
|
||||
|
||||
Image clipSizeImage = Resources.clipSize64;
|
||||
myGraphic.DrawImage(ImageUtilities.ResizeImage(clipSizeImage, 15, 15), new Point(52, 500));
|
||||
myGraphic.DrawString(" " + statParsed.ClipSize, new Font(FontUtilities.pfc.Families[0], 13), new SolidBrush(Color.White), new Point(50, 500));
|
||||
myGraphic.DrawString(" " + statParsed.ClipSize, new Font(FontUtilities.pfc.Families[0], 11), new SolidBrush(Color.White), new Point(50, 503));
|
||||
|
||||
Image reload = Resources.reload64;
|
||||
myGraphic.DrawImage(ImageUtilities.ResizeImage(reload, 15, 15), new Point(50 + (statParsed.ClipSize.ToString().Length * 7) + 47, 500)); //50=clipsize text position | for each clipsize letter we add 7 to x | 47=difference between 2 icons
|
||||
myGraphic.DrawString(statParsed.ReloadTime + " " + SearchResource.getTextByKey("6BA53D764BA5CC13E821D2A807A72365", "seconds"), new Font(FontUtilities.pfc.Families[0], 13), new SolidBrush(Color.White), new Point(64 + (statParsed.ClipSize.ToString().Length * 7) + 47, 500)); //64=50+icon size (-1 because that wasn't perfectly at the position i wanted)
|
||||
myGraphic.DrawString(statParsed.ReloadTime + " " + SearchResource.getTextByKey("6BA53D764BA5CC13E821D2A807A72365", "seconds"), new Font(FontUtilities.pfc.Families[0], 11), new SolidBrush(Color.White), new Point(64 + (statParsed.ClipSize.ToString().Length * 7) + 47, 503)); //64=50+icon size (-1 because that wasn't perfectly at the position i wanted)
|
||||
|
||||
DrawToRight(weaponName, myGraphic);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -133,9 +133,6 @@
|
|||
<data name="C512" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\C512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="E512" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\E512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="L512" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\L512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
|
|
@ -223,4 +220,7 @@
|
|||
<data name="Twitter" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\twitter.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="E512" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\E512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
||||
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 77 KiB After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 73 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 71 KiB After Width: | Height: | Size: 3.9 KiB |