From ccc6b164742abf5b49613b1278b5bd0801c4fab8 Mon Sep 17 00:00:00 2001 From: Jaex Date: Sun, 18 May 2014 12:11:22 +0300 Subject: [PATCH] Credits updated --- HelpersLib/Links.cs | 2 - ShareX/Forms/AboutForm.Designer.cs | 134 +++-------------------------- ShareX/Forms/AboutForm.cs | 10 --- ShareX/Forms/AboutForm.resx | 20 +++-- 4 files changed, 24 insertions(+), 142 deletions(-) diff --git a/HelpersLib/Links.cs b/HelpersLib/Links.cs index 15dfb825c..35ac23ec3 100644 --- a/HelpersLib/Links.cs +++ b/HelpersLib/Links.cs @@ -37,8 +37,6 @@ public static class Links 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_DOCS_CUSTOM_UPLOADER = "https://docs.google.com/document/d/1TSttAfH-1970JNsu3i9tl6UY0a8KNbUCeGri0Fs-jcU/edit?usp=sharing"; } } \ No newline at end of file diff --git a/ShareX/Forms/AboutForm.Designer.cs b/ShareX/Forms/AboutForm.Designer.cs index 5262fbe56..14b41a318 100644 --- a/ShareX/Forms/AboutForm.Designer.cs +++ b/ShareX/Forms/AboutForm.Designer.cs @@ -38,14 +38,6 @@ private void InitializeComponent() this.lblMike = new System.Windows.Forms.Label(); this.pbBerkSteamURL = new System.Windows.Forms.PictureBox(); this.rtbCredits = new System.Windows.Forms.RichTextBox(); - this.lblGregoire = new System.Windows.Forms.Label(); - 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.rtbShareXInfo = new System.Windows.Forms.RichTextBox(); this.lblOwners = new System.Windows.Forms.Label(); this.pbMikeSteamURL = new System.Windows.Forms.PictureBox(); @@ -56,10 +48,6 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.pbMikeURL)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pbAU)).BeginInit(); ((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.pbMikeSteamURL)).BeginInit(); this.SuspendLayout(); // @@ -70,7 +58,7 @@ private void InitializeComponent() this.lblProductName.Cursor = System.Windows.Forms.Cursors.Hand; 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.RoyalBlue; - this.lblProductName.Location = new System.Drawing.Point(11, 8); + this.lblProductName.Location = new System.Drawing.Point(12, 8); this.lblProductName.Name = "lblProductName"; this.lblProductName.Size = new System.Drawing.Size(134, 24); this.lblProductName.TabIndex = 0; @@ -87,7 +75,7 @@ private void InitializeComponent() this.lblBerk.Name = "lblBerk"; this.lblBerk.Size = new System.Drawing.Size(60, 13); this.lblBerk.TabIndex = 4; - this.lblBerk.Text = "Jaex - Berk"; + this.lblBerk.Text = "Jaex (Berk)"; // // pbTR // @@ -146,7 +134,7 @@ private void InitializeComponent() this.lblMike.Name = "lblMike"; this.lblMike.Size = new System.Drawing.Size(131, 13); this.lblMike.TabIndex = 6; - this.lblMike.Text = "mcored - Michael Delpach"; + this.lblMike.Text = "mcored (Michael Delpach)"; // // pbBerkSteamURL // @@ -163,100 +151,19 @@ private void InitializeComponent() // // rtbCredits // + this.rtbCredits.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.rtbCredits.BackColor = System.Drawing.Color.WhiteSmoke; this.rtbCredits.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.rtbCredits.Location = new System.Drawing.Point(15, 295); + this.rtbCredits.Location = new System.Drawing.Point(15, 200); this.rtbCredits.Name = "rtbCredits"; this.rtbCredits.ReadOnly = true; - this.rtbCredits.Size = new System.Drawing.Size(369, 143); + this.rtbCredits.Size = new System.Drawing.Size(409, 248); this.rtbCredits.TabIndex = 11; this.rtbCredits.Text = resources.GetString("rtbCredits.Text"); this.rtbCredits.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.rtb_LinkClicked); // - // lblGregoire - // - this.lblGregoire.AutoSize = true; - this.lblGregoire.Location = new System.Drawing.Point(89, 216); - this.lblGregoire.Name = "lblGregoire"; - this.lblGregoire.Size = new System.Drawing.Size(120, 13); - this.lblGregoire.TabIndex = 8; - this.lblGregoire.Text = "gpailler - Grégoire Pailler"; - // - // pbGregoire - // - 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(41, 214); - this.pbGregoire.Name = "pbGregoire"; - this.pbGregoire.Size = new System.Drawing.Size(16, 16); - this.pbGregoire.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.pbGregoire.TabIndex = 24; - this.pbGregoire.TabStop = false; - this.pbGregoire.Click += new System.EventHandler(this.pbGregoire_Click); - // - // lblCommitters - // - this.lblCommitters.AutoSize = true; - this.lblCommitters.Location = new System.Drawing.Point(14, 190); - this.lblCommitters.Name = "lblCommitters"; - this.lblCommitters.Size = new System.Drawing.Size(61, 13); - this.lblCommitters.TabIndex = 7; - this.lblCommitters.Text = "Committers:"; - // - // pbFR - // - this.pbFR.BackColor = System.Drawing.Color.Transparent; - this.pbFR.Image = global::ShareX.Properties.Resources.fr; - this.pbFR.Location = new System.Drawing.Point(17, 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(14, 241); - this.lblWebSite.Name = "lblWebSite"; - this.lblWebSite.Size = new System.Drawing.Size(76, 13); - this.lblWebSite.TabIndex = 9; - 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(17, 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(41, 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(89, 267); - this.lblDana.Name = "lblDana"; - this.lblDana.Size = new System.Drawing.Size(64, 13); - this.lblDana.TabIndex = 10; - this.lblDana.Text = "dmxt - Dana"; - // // rtbShareXInfo // this.rtbShareXInfo.BackColor = System.Drawing.Color.WhiteSmoke; @@ -295,7 +202,7 @@ private void InitializeComponent() // cLogo // this.cLogo.Interval = 100; - this.cLogo.Location = new System.Drawing.Point(210, -8); + this.cLogo.Location = new System.Drawing.Point(224, -8); this.cLogo.Name = "cLogo"; this.cLogo.Size = new System.Drawing.Size(200, 200); this.cLogo.TabIndex = 5; @@ -314,19 +221,11 @@ private void InitializeComponent() 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(400, 451); + this.ClientSize = new System.Drawing.Size(433, 457); this.Controls.Add(this.pbMikeSteamURL); this.Controls.Add(this.lblOwners); this.Controls.Add(this.rtbShareXInfo); - 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); - this.Controls.Add(this.lblGregoire); this.Controls.Add(this.pbBerkSteamURL); this.Controls.Add(this.lblBerk); this.Controls.Add(this.lblMike); @@ -337,7 +236,6 @@ private void InitializeComponent() this.Controls.Add(this.pbBerkURL); this.Controls.Add(this.pbTR); this.Controls.Add(this.lblProductName); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.MaximizeBox = false; this.Name = "AboutForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; @@ -348,10 +246,6 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.pbMikeURL)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pbAU)).EndInit(); ((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.pbMikeSteamURL)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -370,14 +264,6 @@ private void InitializeComponent() private HelpersLib.Canvas cLogo; private System.Windows.Forms.PictureBox pbBerkSteamURL; private System.Windows.Forms.RichTextBox rtbCredits; - private System.Windows.Forms.Label lblGregoire; - 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.RichTextBox rtbShareXInfo; private System.Windows.Forms.Label lblOwners; private HelpersLib.UpdateCheckerLabel uclUpdate; diff --git a/ShareX/Forms/AboutForm.cs b/ShareX/Forms/AboutForm.cs index 696255814..ca459593e 100644 --- a/ShareX/Forms/AboutForm.cs +++ b/ShareX/Forms/AboutForm.cs @@ -79,16 +79,6 @@ private void pbMikeSteamURL_Click(object sender, EventArgs e) Helpers.OpenURL(Links.URL_MIKE_STEAM); } - private void pbGregoire_Click(object sender, EventArgs e) - { - Helpers.OpenURL(Links.URL_GREGOIRE); - } - - private void pbDana_Click(object sender, EventArgs e) - { - Helpers.OpenURL(Links.URL_DANA); - } - private void rtb_LinkClicked(object sender, LinkClickedEventArgs e) { Helpers.OpenURL(e.LinkText); diff --git a/ShareX/Forms/AboutForm.resx b/ShareX/Forms/AboutForm.resx index 59a159c81..8914e5935 100644 --- a/ShareX/Forms/AboutForm.resx +++ b/ShareX/Forms/AboutForm.resx @@ -118,9 +118,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Copyright © 2007 - 2014 ShareX Developers + Contributors: + +Logo and icon: Mopsy - http://mpql.net +Jira, Gist and Mega support: gpailler (Grégoire Pailler) +Web site: dmxt (Dana) +Amazon S3 and DreamObjects support: Alan Edwardes - http://alan.edward.es + +External libraries: -Logo & 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 @@ -129,9 +135,11 @@ 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 -FFmpeg: http://www.ffmpeg.org/ -7-Zip: http://www.7-zip.org/ -DirectShow video & audio device: -https://github.com/rdp/screen-capture-recorder-to-video-windows-free +FFmpeg Windows builds: http://ffmpeg.zeranoe.com/builds +7-Zip: http://www.7-zip.org +SevenZipSharp: http://sevenzipsharp.codeplex.com +DirectShow video and audio device: https://github.com/rdp/screen-capture-recorder-to-video-windows-free + +Copyright © 2007 - 2014 ShareX Developers \ No newline at end of file