CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-28 11:10:23 +12:00
Code Issues Packages Projects Releases Wiki Activity

About form changes, updated links

Browse source
This commit is contained in:
Jaex 2013-11-04 15:46:49 +02:00
parent 908b561939
commit 9427131b88
13 changed files with 224 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
HelpersLib/Links.cs
View file

@ -27,14 +27,17 @@ namespace HelpersLib
{
public static class Links
{
public const string URL_WEBSITE = "https://code.google.com/p/sharex";
public const string URL_ISSUES = URL_WEBSITE + "/issues/entry";
public const string URL_WEBSITE = "http://getsharex.com";
public const string URL_PROJECT = "https://github.com/ShareX/ShareX";
public const string URL_ISSUES = "https://github.com/ShareX/ShareX/issues";
public const string URL_UPDATE = "http://sharex.googlecode.com/svn/trunk/Update.xml";
public const string URL_BERK = "https://code.google.com/u/106036753829849735903";
public const string URL_BERK_STEAM = "http://steamcommunity.com/id/ww";
public const string URL_MIKE = "https://code.google.com/u/mcored";
public const string URL_GREGOIRE = "https://github.com/gpailler";
public const string URL_DONATE = "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=8DSJ2WNEHHDJJ&lc=US&item_name=ShareX&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted";
public const string URL_WIKI_FTPAccounts = URL_WEBSITE + "/wiki/FTPAccounts";
public const string URL_BERK = "https://github.com/Jaex";
public const string URL_BERK_STEAM = "http://steamcommunity.com/id/ww";
public const string URL_MIKE = "https://github.com/McoreD";
public const string URL_MIKE_STEAM = "http://steamcommunity.com/profiles/76561198018560325";
public const string URL_GREGOIRE = "https://github.com/gpailler";
public const string URL_DANA = "https://github.com/dmxt";
public const string URL_DANA_STEAM = "http://steamcommunity.com/profiles/76561198021718265";
}
}

6
HelpersLib/UserControls/Canvas.cs
View file

@ -56,6 +56,12 @@ public void Start()
timer.Start();
}
public void Start(int interval)
{
Interval = interval;
Start();
}
public void Stop()
{
if (timer != null)

181
ShareX/Forms/AboutForm.Designer.cs generated
View file

@ -30,8 +30,6 @@ private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutForm));
this.lblProductName = new System.Windows.Forms.Label();
this.lblProjectPage = new System.Windows.Forms.Label();
this.lblBugs = new System.Windows.Forms.Label();
this.lblBerk = new System.Windows.Forms.Label();
this.pbTR = new System.Windows.Forms.PictureBox();
this.pbBerkURL = new System.Windows.Forms.PictureBox();
@ -44,8 +42,15 @@ private void InitializeComponent()
this.pbGregoire = new System.Windows.Forms.PictureBox();
this.lblCommitters = new System.Windows.Forms.Label();
this.pbFR = new System.Windows.Forms.PictureBox();
this.lblWebSite = new System.Windows.Forms.Label();
this.pbRU = new System.Windows.Forms.PictureBox();
this.pbDana = new System.Windows.Forms.PictureBox();
this.lblDana = new System.Windows.Forms.Label();
this.pbDanaSteamURL = new System.Windows.Forms.PictureBox();
this.rtbShareXInfo = new System.Windows.Forms.RichTextBox();
this.cLogo = new HelpersLib.Canvas();
this.uclUpdate = new UpdateCheckerLib.UpdateCheckerLabel();
this.lblOwners = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pbTR)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pbBerkURL)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pbMikeURL)).BeginInit();
@ -53,6 +58,9 @@ private void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.pbBerkSteamURL)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pbGregoire)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pbFR)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pbRU)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pbDana)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pbDanaSteamURL)).BeginInit();
this.SuspendLayout();
//
// lblProductName
@ -61,57 +69,29 @@ private void InitializeComponent()
this.lblProductName.BackColor = System.Drawing.Color.Transparent;
this.lblProductName.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(162)));
this.lblProductName.ForeColor = System.Drawing.Color.Black;
this.lblProductName.Location = new System.Drawing.Point(16, 8);
this.lblProductName.Location = new System.Drawing.Point(15, 9);
this.lblProductName.Name = "lblProductName";
this.lblProductName.Size = new System.Drawing.Size(134, 24);
this.lblProductName.TabIndex = 0;
this.lblProductName.Text = "ShareX 1.0.0.0";
this.lblProductName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// lblProjectPage
//
this.lblProjectPage.AutoSize = true;
this.lblProjectPage.BackColor = System.Drawing.Color.Transparent;
this.lblProjectPage.Cursor = System.Windows.Forms.Cursors.Hand;
this.lblProjectPage.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(162)));
this.lblProjectPage.ForeColor = System.Drawing.Color.Black;
this.lblProjectPage.Location = new System.Drawing.Point(16, 64);
this.lblProjectPage.Name = "lblProjectPage";
this.lblProjectPage.Size = new System.Drawing.Size(67, 13);
this.lblProjectPage.TabIndex = 4;
this.lblProjectPage.Text = "Project page";
this.lblProjectPage.Click += new System.EventHandler(this.lblProjectPage_Click);
//
// lblBugs
//
this.lblBugs.AutoSize = true;
this.lblBugs.BackColor = System.Drawing.Color.Transparent;
this.lblBugs.Cursor = System.Windows.Forms.Cursors.Hand;
this.lblBugs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(162)));
this.lblBugs.ForeColor = System.Drawing.Color.Black;
this.lblBugs.Location = new System.Drawing.Point(88, 64);
this.lblBugs.Name = "lblBugs";
this.lblBugs.Size = new System.Drawing.Size(100, 13);
this.lblBugs.TabIndex = 5;
this.lblBugs.Text = "Bugs / Suggestions";
this.lblBugs.Click += new System.EventHandler(this.lblBugs_Click);
//
// lblBerk
//
this.lblBerk.AutoSize = true;
this.lblBerk.BackColor = System.Drawing.Color.Transparent;
this.lblBerk.ForeColor = System.Drawing.Color.Black;
this.lblBerk.Location = new System.Drawing.Point(91, 88);
this.lblBerk.Location = new System.Drawing.Point(87, 144);
this.lblBerk.Name = "lblBerk";
this.lblBerk.Size = new System.Drawing.Size(108, 13);
this.lblBerk.Size = new System.Drawing.Size(60, 13);
this.lblBerk.TabIndex = 1;
this.lblBerk.Text = "Jaex (flexy123) - Berk";
this.lblBerk.Text = "Jaex - Berk";
//
// pbTR
//
this.pbTR.BackColor = System.Drawing.Color.Transparent;
this.pbTR.Image = global::ShareX.Properties.Resources.tr;
this.pbTR.Location = new System.Drawing.Point(19, 88);
this.pbTR.Location = new System.Drawing.Point(15, 142);
this.pbTR.Name = "pbTR";
this.pbTR.Size = new System.Drawing.Size(16, 16);
this.pbTR.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@ -123,7 +103,7 @@ private void InitializeComponent()
this.pbBerkURL.BackColor = System.Drawing.Color.Transparent;
this.pbBerkURL.Cursor = System.Windows.Forms.Cursors.Hand;
this.pbBerkURL.Image = global::ShareX.Properties.Resources.application_browser;
this.pbBerkURL.Location = new System.Drawing.Point(43, 88);
this.pbBerkURL.Location = new System.Drawing.Point(39, 142);
this.pbBerkURL.Name = "pbBerkURL";
this.pbBerkURL.Size = new System.Drawing.Size(16, 16);
this.pbBerkURL.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@ -136,7 +116,7 @@ private void InitializeComponent()
this.pbMikeURL.BackColor = System.Drawing.Color.Transparent;
this.pbMikeURL.Cursor = System.Windows.Forms.Cursors.Hand;
this.pbMikeURL.Image = global::ShareX.Properties.Resources.application_browser;
this.pbMikeURL.Location = new System.Drawing.Point(43, 112);
this.pbMikeURL.Location = new System.Drawing.Point(39, 166);
this.pbMikeURL.Name = "pbMikeURL";
this.pbMikeURL.Size = new System.Drawing.Size(16, 16);
this.pbMikeURL.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@ -148,7 +128,7 @@ private void InitializeComponent()
//
this.pbAU.BackColor = System.Drawing.Color.Transparent;
this.pbAU.Image = global::ShareX.Properties.Resources.au;
this.pbAU.Location = new System.Drawing.Point(19, 112);
this.pbAU.Location = new System.Drawing.Point(15, 166);
this.pbAU.Name = "pbAU";
this.pbAU.Size = new System.Drawing.Size(16, 16);
this.pbAU.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@ -160,7 +140,7 @@ private void InitializeComponent()
this.lblMike.AutoSize = true;
this.lblMike.BackColor = System.Drawing.Color.Transparent;
this.lblMike.ForeColor = System.Drawing.Color.Black;
this.lblMike.Location = new System.Drawing.Point(67, 112);
this.lblMike.Location = new System.Drawing.Point(64, 168);
this.lblMike.Name = "lblMike";
this.lblMike.Size = new System.Drawing.Size(131, 13);
this.lblMike.TabIndex = 6;
@ -171,7 +151,7 @@ private void InitializeComponent()
this.pbBerkSteamURL.BackColor = System.Drawing.Color.Transparent;
this.pbBerkSteamURL.Cursor = System.Windows.Forms.Cursors.Hand;
this.pbBerkSteamURL.Image = global::ShareX.Properties.Resources.steam;
this.pbBerkSteamURL.Location = new System.Drawing.Point(67, 88);
this.pbBerkSteamURL.Location = new System.Drawing.Point(63, 142);
this.pbBerkSteamURL.Name = "pbBerkSteamURL";
this.pbBerkSteamURL.Size = new System.Drawing.Size(16, 16);
this.pbBerkSteamURL.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@ -183,17 +163,17 @@ private void InitializeComponent()
//
this.rtbCredits.BackColor = System.Drawing.Color.WhiteSmoke;
this.rtbCredits.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.rtbCredits.Location = new System.Drawing.Point(16, 192);
this.rtbCredits.Location = new System.Drawing.Point(15, 295);
this.rtbCredits.Name = "rtbCredits";
this.rtbCredits.Size = new System.Drawing.Size(328, 152);
this.rtbCredits.Size = new System.Drawing.Size(367, 152);
this.rtbCredits.TabIndex = 22;
this.rtbCredits.Text = resources.GetString("rtbCredits.Text");
this.rtbCredits.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.rtbCredits_LinkClicked);
this.rtbCredits.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.rtb_LinkClicked);
//
// lblGregoire
//
this.lblGregoire.AutoSize = true;
this.lblGregoire.Location = new System.Drawing.Point(67, 160);
this.lblGregoire.Location = new System.Drawing.Point(64, 216);
this.lblGregoire.Name = "lblGregoire";
this.lblGregoire.Size = new System.Drawing.Size(120, 13);
this.lblGregoire.TabIndex = 23;
@ -204,7 +184,7 @@ private void InitializeComponent()
this.pbGregoire.BackColor = System.Drawing.Color.Transparent;
this.pbGregoire.Cursor = System.Windows.Forms.Cursors.Hand;
this.pbGregoire.Image = global::ShareX.Properties.Resources.application_browser;
this.pbGregoire.Location = new System.Drawing.Point(43, 160);
this.pbGregoire.Location = new System.Drawing.Point(39, 214);
this.pbGregoire.Name = "pbGregoire";
this.pbGregoire.Size = new System.Drawing.Size(16, 16);
this.pbGregoire.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@ -215,7 +195,7 @@ private void InitializeComponent()
// lblCommitters
//
this.lblCommitters.AutoSize = true;
this.lblCommitters.Location = new System.Drawing.Point(16, 136);
this.lblCommitters.Location = new System.Drawing.Point(15, 190);
this.lblCommitters.Name = "lblCommitters";
this.lblCommitters.Size = new System.Drawing.Size(61, 13);
this.lblCommitters.TabIndex = 25;
@ -225,38 +205,120 @@ private void InitializeComponent()
//
this.pbFR.BackColor = System.Drawing.Color.Transparent;
this.pbFR.Image = global::ShareX.Properties.Resources.fr;
this.pbFR.Location = new System.Drawing.Point(19, 160);
this.pbFR.Location = new System.Drawing.Point(15, 214);
this.pbFR.Name = "pbFR";
this.pbFR.Size = new System.Drawing.Size(16, 16);
this.pbFR.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.pbFR.TabIndex = 26;
this.pbFR.TabStop = false;
//
// lblWebSite
//
this.lblWebSite.AutoSize = true;
this.lblWebSite.Location = new System.Drawing.Point(15, 241);
this.lblWebSite.Name = "lblWebSite";
this.lblWebSite.Size = new System.Drawing.Size(76, 13);
this.lblWebSite.TabIndex = 27;
this.lblWebSite.Text = "Web designer:";
//
// pbRU
//
this.pbRU.BackColor = System.Drawing.Color.Transparent;
this.pbRU.Image = global::ShareX.Properties.Resources.ru;
this.pbRU.Location = new System.Drawing.Point(15, 265);
this.pbRU.Name = "pbRU";
this.pbRU.Size = new System.Drawing.Size(16, 16);
this.pbRU.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.pbRU.TabIndex = 30;
this.pbRU.TabStop = false;
//
// pbDana
//
this.pbDana.BackColor = System.Drawing.Color.Transparent;
this.pbDana.Cursor = System.Windows.Forms.Cursors.Hand;
this.pbDana.Image = global::ShareX.Properties.Resources.application_browser;
this.pbDana.Location = new System.Drawing.Point(39, 265);
this.pbDana.Name = "pbDana";
this.pbDana.Size = new System.Drawing.Size(16, 16);
this.pbDana.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.pbDana.TabIndex = 29;
this.pbDana.TabStop = false;
this.pbDana.Click += new System.EventHandler(this.pbDana_Click);
//
// lblDana
//
this.lblDana.AutoSize = true;
this.lblDana.Location = new System.Drawing.Point(87, 267);
this.lblDana.Name = "lblDana";
this.lblDana.Size = new System.Drawing.Size(64, 13);
this.lblDana.TabIndex = 28;
this.lblDana.Text = "dmxt - Dana";
//
// pbDanaSteamURL
//
this.pbDanaSteamURL.BackColor = System.Drawing.Color.Transparent;
this.pbDanaSteamURL.Cursor = System.Windows.Forms.Cursors.Hand;
this.pbDanaSteamURL.Image = global::ShareX.Properties.Resources.steam;
this.pbDanaSteamURL.Location = new System.Drawing.Point(63, 265);
this.pbDanaSteamURL.Name = "pbDanaSteamURL";
this.pbDanaSteamURL.Size = new System.Drawing.Size(16, 16);
this.pbDanaSteamURL.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.pbDanaSteamURL.TabIndex = 31;
this.pbDanaSteamURL.TabStop = false;
this.pbDanaSteamURL.Click += new System.EventHandler(this.pbDanaSteamURL_Click);
//
// rtbShareXInfo
//
this.rtbShareXInfo.BackColor = System.Drawing.Color.WhiteSmoke;
this.rtbShareXInfo.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.rtbShareXInfo.Location = new System.Drawing.Point(15, 66);
this.rtbShareXInfo.Name = "rtbShareXInfo";
this.rtbShareXInfo.Size = new System.Drawing.Size(247, 48);
this.rtbShareXInfo.TabIndex = 32;
this.rtbShareXInfo.Text = "Web page: http://getsharex.com\nProject page: https://github.com/ShareX/ShareX\nIss" +
"ues: https://github.com/ShareX/ShareX/issues";
this.rtbShareXInfo.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.rtb_LinkClicked);
//
// cLogo
//
this.cLogo.Interval = 100;
this.cLogo.Location = new System.Drawing.Point(209, 0);
this.cLogo.Location = new System.Drawing.Point(210, -8);
this.cLogo.Name = "cLogo";
this.cLogo.Size = new System.Drawing.Size(200, 200);
this.cLogo.TabIndex = 2;
this.cLogo.Draw += new HelpersLib.Canvas.DrawEventHandler(this.cLogo_Draw);
this.cLogo.MouseDown += new System.Windows.Forms.MouseEventHandler(this.cLogo_MouseDown);
this.cLogo.MouseLeave += new System.EventHandler(this.cLogo_MouseLeave);
this.cLogo.MouseMove += new System.Windows.Forms.MouseEventHandler(this.cLogo_MouseMove);
//
// uclUpdate
//
this.uclUpdate.Location = new System.Drawing.Point(16, 35);
this.uclUpdate.Location = new System.Drawing.Point(15, 36);
this.uclUpdate.Name = "uclUpdate";
this.uclUpdate.Size = new System.Drawing.Size(224, 24);
this.uclUpdate.TabIndex = 3;
//
// lblOwners
//
this.lblOwners.AutoSize = true;
this.lblOwners.Location = new System.Drawing.Point(15, 117);
this.lblOwners.Name = "lblOwners";
this.lblOwners.Size = new System.Drawing.Size(46, 13);
this.lblOwners.TabIndex = 33;
this.lblOwners.Text = "Owners:";
//
// AboutForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.WhiteSmoke;
this.ClientSize = new System.Drawing.Size(395, 350);
this.ClientSize = new System.Drawing.Size(400, 451);
this.Controls.Add(this.lblOwners);
this.Controls.Add(this.rtbShareXInfo);
this.Controls.Add(this.pbDanaSteamURL);
this.Controls.Add(this.pbRU);
this.Controls.Add(this.pbDana);
this.Controls.Add(this.lblDana);
this.Controls.Add(this.lblWebSite);
this.Controls.Add(this.rtbCredits);
this.Controls.Add(this.pbFR);
this.Controls.Add(this.lblCommitters);
this.Controls.Add(this.pbGregoire);
@ -270,10 +332,7 @@ private void InitializeComponent()
this.Controls.Add(this.pbAU);
this.Controls.Add(this.pbBerkURL);
this.Controls.Add(this.pbTR);
this.Controls.Add(this.lblBugs);
this.Controls.Add(this.lblProjectPage);
this.Controls.Add(this.lblProductName);
this.Controls.Add(this.rtbCredits);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false;
this.Name = "AboutForm";
@ -288,6 +347,9 @@ private void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.pbBerkSteamURL)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pbGregoire)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pbFR)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pbRU)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pbDana)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pbDanaSteamURL)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@ -296,8 +358,6 @@ private void InitializeComponent()
#endregion Windows Form Designer generated code
private System.Windows.Forms.Label lblProductName;
private System.Windows.Forms.Label lblProjectPage;
private System.Windows.Forms.Label lblBugs;
private System.Windows.Forms.Label lblBerk;
private System.Windows.Forms.PictureBox pbTR;
private System.Windows.Forms.PictureBox pbBerkURL;
@ -312,5 +372,12 @@ private void InitializeComponent()
private System.Windows.Forms.PictureBox pbGregoire;
private System.Windows.Forms.Label lblCommitters;
private System.Windows.Forms.PictureBox pbFR;
private System.Windows.Forms.Label lblWebSite;
private System.Windows.Forms.PictureBox pbRU;
private System.Windows.Forms.PictureBox pbDana;
private System.Windows.Forms.Label lblDana;
private System.Windows.Forms.PictureBox pbDanaSteamURL;
private System.Windows.Forms.RichTextBox rtbShareXInfo;
private System.Windows.Forms.Label lblOwners;
}
}

53
ShareX/Forms/AboutForm.cs
View file

@ -40,10 +40,9 @@ public partial class AboutForm : Form
public AboutForm()
{
InitializeComponent();
Text = Program.FullTitle;
Icon = Resources.ShareX_Icon;
Text = Program.FullTitle;
lblProductName.Text = Program.FullTitle;
rtbCredits.Text += Program.AssemblyCopyright;
UpdateChecker updateChecker = new UpdateChecker(Links.URL_UPDATE, Application.ProductName, Program.AssemblyVersion,
ReleaseChannelType.Stable, Uploader.ProxyInfo.GetWebProxy());
@ -55,8 +54,7 @@ private void AboutForm_Shown(object sender, EventArgs e)
BringToFront();
Activate();
cLogo.Interval = 50;
cLogo.Start();
cLogo.Start(50);
}
private void AboutForm_FormClosing(object sender, FormClosingEventArgs e)
@ -64,16 +62,6 @@ private void AboutForm_FormClosing(object sender, FormClosingEventArgs e)
cLogo.Stop();
}
private void lblProjectPage_Click(object sender, EventArgs e)
{
Helpers.LoadBrowserAsync(Links.URL_WEBSITE);
}
private void lblBugs_Click(object sender, EventArgs e)
{
Helpers.LoadBrowserAsync(Links.URL_ISSUES);
}
private void pbBerkURL_Click(object sender, EventArgs e)
{
Helpers.LoadBrowserAsync(Links.URL_BERK);
@ -94,7 +82,17 @@ private void pbGregoire_Click(object sender, EventArgs e)
Helpers.LoadBrowserAsync(Links.URL_GREGOIRE);
}
private void rtbCredits_LinkClicked(object sender, LinkClickedEventArgs e)
private void pbDana_Click(object sender, EventArgs e)
{
Helpers.LoadBrowserAsync(Links.URL_DANA);
}
private void pbDanaSteamURL_Click(object sender, EventArgs e)
{
Helpers.LoadBrowserAsync(Links.URL_DANA_STEAM);
}
private void rtb_LinkClicked(object sender, LinkClickedEventArgs e)
{
Process.Start(e.LinkText);
}
@ -110,7 +108,7 @@ private void rtbCredits_LinkClicked(object sender, LinkClickedEventArgs e)
private const int speed = 1;
private int step = 10;
private int direction = speed;
private Color lineColor = Color.Black;
private Color lineColor = new HSB(0d, 1d, 0.9d);
private bool isPaused;
private void cLogo_Draw(Graphics g)
@ -151,6 +149,19 @@ private void cLogo_Draw(Graphics g)
}
step += direction;
HSB hsb = lineColor;
if (hsb.Hue >= 1)
{
hsb.Hue = 0;
}
else
{
hsb.Hue += 0.01;
}
lineColor = hsb;
}
}
@ -159,16 +170,6 @@ private void cLogo_MouseDown(object sender, MouseEventArgs e)
isPaused = !isPaused;
}
private void cLogo_MouseMove(object sender, MouseEventArgs e)
{
lineColor = new HSB((double)e.X / (w - 1), 1, 1.0 - (double)e.Y / (h - 1));
}
private void cLogo_MouseLeave(object sender, EventArgs e)
{
lineColor = Color.Black;
}
#endregion Animation
}
}

4
ShareX/Forms/AboutForm.resx
View file

@ -119,6 +119,7 @@
</resheader>
<data name="rtbCredits.Text" xml:space="preserve">
<value>Logo &amp; Icon: Mopsy - http://mpql.net
Greenshot Image Editor: http://sourceforge.net/projects/greenshot
FTP Library: http://biko.codeplex.com
Json.NET: http://json.codeplex.com
SSH.NET: http://sshnet.codeplex.com
@ -126,8 +127,7 @@ Icons: http://p.yusukekamiyamane.com
ImageListView: http://code.google.com/p/imagelistview
AviWriter: https://code.google.com/p/aforge
AsyncBridge: http://omermor.github.com/AsyncBridge
Greenshot Image Editor: http://sourceforge.net/projects/greenshot
</value>
Copyright © 2008 - 2013 ShareX Developers</value>
</data>
</root>

2
ShareX/Program.cs
View file

@ -55,7 +55,7 @@ public static string FullTitle
{
get
{
string title = string.Format("{0} {1}.{2}.{3} r{4}", ApplicationName, AssemblyVersion.Major, AssemblyVersion.Minor, AssemblyVersion.Build, AssemblyVersion.Revision);
string title = string.Format("{0} {1}.{2}.{3}", ApplicationName, AssemblyVersion.Major, AssemblyVersion.Minor, AssemblyVersion.Build);
if (IsPortable) title += " Portable";
return title;
}

12
ShareX/Properties/Resources.Designer.cs generated
View file

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18052
// Runtime Version:4.0.30319.34003
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -699,6 +699,16 @@ public class Resources {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap ru {
get {
object obj = ResourceManager.GetObject("ru", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
/// </summary>

64
ShareX/Properties/Resources.resx
View file

@ -117,7 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="layer" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -133,9 +133,6 @@
<data name="camcorder__pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\camcorder--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="clock_plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clock--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="application_icon_large" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-icon-large.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -187,12 +184,12 @@
<data name="hammer_screwdriver" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\hammer-screwdriver.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="image_saturation" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image-saturation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="image_export" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image-export.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="au" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\au.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="keyboard_pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\keyboard--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -214,8 +211,8 @@
<data name="present" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\present.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="application_monitor" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="tr" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tr.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="image" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -223,9 +220,6 @@
<data name="control_record_yellow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\control-record-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="application_blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-blue.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="layer_shape_round" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-shape-round.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -238,6 +232,9 @@
<data name="address_book_blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\address-book-blue.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShareX_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ShareX_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="block" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\block.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -259,8 +256,11 @@
<data name="monitor" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="control_record" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\control-record.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="clock_plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clock--plus.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="navigation_090_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\navigation-090-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="upload_cloud" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\upload-cloud.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -277,18 +277,21 @@
<data name="Diamond" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\diamond.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="application_blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-blue.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="gear" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\gear.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="color" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\color.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="control_record" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\control-record.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="drive_globe" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\drive-globe.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="tr" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tr.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="application_browser" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-browser.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -304,14 +307,20 @@
<data name="fr" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fr.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShareX_Logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ShareX_Logo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="application_pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="pipette" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pipette.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="navigation_090_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\navigation-090-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="au" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\au.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="layer_shape_polygon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-shape-polygon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -319,22 +328,17 @@
<data name="CameraSound" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Camera.wav;System.IO.MemoryStream, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="application_monitor" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="document_arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\document--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="application_task" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-task.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="image_saturation" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image-saturation.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="pipette" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pipette.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShareX_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ShareX_Icon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ShareX_Logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ShareX_Logo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="ru" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ru.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
ShareX/Resources/ru.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 420 B

1
ShareX/ShareX.csproj
View file

@ -418,6 +418,7 @@
<None Include="Resources\bug.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\ru.png" />
<None Include="Resources\ShareX_Icon.ico" />
<None Include="Resources\ShareX_Logo.png" />
<None Include="Resources\keyboard--pencil.png" />

7
UploadersLib/GUI/UploadersConfigForm.Designer.cs generated
View file

@ -1678,7 +1678,7 @@ private void InitializeComponent()
//
// btnFtpClient
//
this.btnFtpClient.Location = new System.Drawing.Point(376, 8);
this.btnFtpClient.Location = new System.Drawing.Point(448, 7);
this.btnFtpClient.Name = "btnFtpClient";
this.btnFtpClient.Size = new System.Drawing.Size(64, 24);
this.btnFtpClient.TabIndex = 2;
@ -1706,7 +1706,7 @@ private void InitializeComponent()
this.btnFTPImport.AutoSize = true;
this.btnFTPImport.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.btnFTPImport.ImeMode = System.Windows.Forms.ImeMode.NoControl;
this.btnFTPImport.Location = new System.Drawing.Point(514, 8);
this.btnFTPImport.Location = new System.Drawing.Point(518, 8);
this.btnFTPImport.Name = "btnFTPImport";
this.btnFTPImport.Size = new System.Drawing.Size(126, 23);
this.btnFTPImport.TabIndex = 3;
@ -1716,12 +1716,13 @@ private void InitializeComponent()
//
// btnFtpHelp
//
this.btnFtpHelp.Location = new System.Drawing.Point(304, 8);
this.btnFtpHelp.Location = new System.Drawing.Point(378, 7);
this.btnFtpHelp.Name = "btnFtpHelp";
this.btnFtpHelp.Size = new System.Drawing.Size(64, 24);
this.btnFtpHelp.TabIndex = 1;
this.btnFtpHelp.Text = "Help...";
this.btnFtpHelp.UseVisualStyleBackColor = true;
this.btnFtpHelp.Visible = false;
this.btnFtpHelp.Click += new System.EventHandler(this.btnFtpHelp_Click);
//
// ucFTPAccounts

2
UploadersLib/GUI/UploadersConfigForm.cs
View file

@ -582,7 +582,7 @@ private void cboFtpFiles_SelectedIndexChanged(object sender, EventArgs e)
private void btnFtpHelp_Click(object sender, EventArgs e)
{
Helpers.LoadBrowserAsync(Links.URL_WIKI_FTPAccounts);
//Helpers.LoadBrowserAsync(Links.URL_WIKI_FTPAccounts);
}
private void btnFtpClient_Click(object sender, EventArgs e)

3
UploadersLib/GUI/UploadersConfigForm.resx
View file

@ -261,4 +261,7 @@ For example, if the argument name is 'pastebin_text' then a value of '%input' wi
replaced with the text you're going to upload. Same thing applies for url shortener; '%input'
will be replaced with the url in the argument.</value>
</data>
<metadata name="ttHelpTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>