CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-29 17:02:05 +13:00
Code Issues Projects Releases Packages Wiki Activity

About window updated, naming changes

Browse source
This commit is contained in:
Jaex 2014-07-13 23:59:17 +03:00
parent 5076db7a61
commit e39db41daa
16 changed files with 80 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
HelpersLib/Links.cs
View file

@ -36,6 +36,6 @@ public static class Links
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_MIKE_GOOGLE_PLUS = "https://plus.google.com/u/0/b/110225361399361277394/+MichaelDelpach";
}
}

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

@ -38,15 +38,15 @@ private void InitializeComponent()
this.rtbCredits = new System.Windows.Forms.RichTextBox();
this.rtbShareXInfo = new System.Windows.Forms.RichTextBox();
this.lblOwners = new System.Windows.Forms.Label();
this.pbMikeSteamURL = new System.Windows.Forms.PictureBox();
this.cLogo = new HelpersLib.Canvas();
this.uclUpdate = new HelpersLib.UpdateCheckerLabel();
this.pbMikeGooglePlus = new System.Windows.Forms.PictureBox();
this.pbBerkSteamURL = new System.Windows.Forms.PictureBox();
this.pbMikeURL = new System.Windows.Forms.PictureBox();
this.pbAU = new System.Windows.Forms.PictureBox();
this.pbBerkURL = new System.Windows.Forms.PictureBox();
this.pbTR = new System.Windows.Forms.PictureBox();
this.cLogo = new HelpersLib.Canvas();
this.uclUpdate = new HelpersLib.UpdateCheckerLabel();
((System.ComponentModel.ISupportInitialize)(this.pbMikeSteamURL)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pbMikeGooglePlus)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pbBerkSteamURL)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pbMikeURL)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pbAU)).BeginInit();
@ -93,15 +93,13 @@ 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, 200);
this.rtbCredits.Name = "rtbCredits";
this.rtbCredits.ReadOnly = true;
this.rtbCredits.Size = new System.Drawing.Size(411, 240);
this.rtbCredits.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical;
this.rtbCredits.Size = new System.Drawing.Size(409, 234);
this.rtbCredits.TabIndex = 6;
this.rtbCredits.Text = resources.GetString("rtbCredits.Text");
this.rtbCredits.WordWrap = false;
@ -129,18 +127,35 @@ private void InitializeComponent()
this.lblOwners.TabIndex = 3;
this.lblOwners.Text = "Owners:";
//
// pbMikeSteamURL
// cLogo
//
this.pbMikeSteamURL.BackColor = System.Drawing.Color.Transparent;
this.pbMikeSteamURL.Cursor = System.Windows.Forms.Cursors.Hand;
this.pbMikeSteamURL.Image = global::ShareX.Properties.Resources.steam;
this.pbMikeSteamURL.Location = new System.Drawing.Point(65, 166);
this.pbMikeSteamURL.Name = "pbMikeSteamURL";
this.pbMikeSteamURL.Size = new System.Drawing.Size(16, 16);
this.pbMikeSteamURL.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.pbMikeSteamURL.TabIndex = 34;
this.pbMikeSteamURL.TabStop = false;
this.pbMikeSteamURL.Click += new System.EventHandler(this.pbMikeSteamURL_Click);
this.cLogo.Interval = 100;
this.cLogo.Location = new System.Drawing.Point(240, -8);
this.cLogo.Name = "cLogo";
this.cLogo.Size = new System.Drawing.Size(200, 200);
this.cLogo.TabIndex = 7;
this.cLogo.Draw += new HelpersLib.Canvas.DrawEventHandler(this.cLogo_Draw);
this.cLogo.MouseDown += new System.Windows.Forms.MouseEventHandler(this.cLogo_MouseDown);
//
// uclUpdate
//
this.uclUpdate.Location = new System.Drawing.Point(13, 36);
this.uclUpdate.Name = "uclUpdate";
this.uclUpdate.Size = new System.Drawing.Size(224, 24);
this.uclUpdate.TabIndex = 1;
//
// pbMikeGooglePlus
//
this.pbMikeGooglePlus.BackColor = System.Drawing.Color.Transparent;
this.pbMikeGooglePlus.Cursor = System.Windows.Forms.Cursors.Hand;
this.pbMikeGooglePlus.Image = global::ShareX.Properties.Resources.google_plus;
this.pbMikeGooglePlus.Location = new System.Drawing.Point(64, 166);
this.pbMikeGooglePlus.Name = "pbMikeGooglePlus";
this.pbMikeGooglePlus.Size = new System.Drawing.Size(16, 16);
this.pbMikeGooglePlus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pbMikeGooglePlus.TabIndex = 22;
this.pbMikeGooglePlus.TabStop = false;
this.pbMikeGooglePlus.Click += new System.EventHandler(this.pbMikeGooglePlus_Click);
//
// pbBerkSteamURL
//
@ -203,30 +218,13 @@ private void InitializeComponent()
this.pbTR.TabIndex = 8;
this.pbTR.TabStop = false;
//
// cLogo
//
this.cLogo.Interval = 100;
this.cLogo.Location = new System.Drawing.Point(240, -8);
this.cLogo.Name = "cLogo";
this.cLogo.Size = new System.Drawing.Size(200, 200);
this.cLogo.TabIndex = 7;
this.cLogo.Draw += new HelpersLib.Canvas.DrawEventHandler(this.cLogo_Draw);
this.cLogo.MouseDown += new System.Windows.Forms.MouseEventHandler(this.cLogo_MouseDown);
//
// uclUpdate
//
this.uclUpdate.Location = new System.Drawing.Point(13, 36);
this.uclUpdate.Name = "uclUpdate";
this.uclUpdate.Size = new System.Drawing.Size(224, 24);
this.uclUpdate.TabIndex = 1;
//
// 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(435, 449);
this.Controls.Add(this.pbMikeSteamURL);
this.ClientSize = new System.Drawing.Size(433, 446);
this.Controls.Add(this.pbMikeGooglePlus);
this.Controls.Add(this.lblOwners);
this.Controls.Add(this.rtbShareXInfo);
this.Controls.Add(this.rtbCredits);
@ -240,12 +238,13 @@ private void InitializeComponent()
this.Controls.Add(this.pbBerkURL);
this.Controls.Add(this.pbTR);
this.Controls.Add(this.lblProductName);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.MaximizeBox = false;
this.Name = "AboutForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "ShareX - About";
this.Shown += new System.EventHandler(this.AboutForm_Shown);
((System.ComponentModel.ISupportInitialize)(this.pbMikeSteamURL)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pbMikeGooglePlus)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pbBerkSteamURL)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pbMikeURL)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pbAU)).EndInit();
@ -271,6 +270,6 @@ private void InitializeComponent()
private System.Windows.Forms.RichTextBox rtbShareXInfo;
private System.Windows.Forms.Label lblOwners;
private HelpersLib.UpdateCheckerLabel uclUpdate;
private System.Windows.Forms.PictureBox pbMikeSteamURL;
private System.Windows.Forms.PictureBox pbMikeGooglePlus;
}
}

4
ShareX/Forms/AboutForm.cs
View file

@ -72,9 +72,9 @@ private void pbMikeURL_Click(object sender, EventArgs e)
URLHelpers.OpenURL(Links.URL_MIKE);
}
private void pbMikeSteamURL_Click(object sender, EventArgs e)
private void pbMikeGooglePlus_Click(object sender, EventArgs e)
{
URLHelpers.OpenURL(Links.URL_MIKE_STEAM);
URLHelpers.OpenURL(Links.URL_MIKE_GOOGLE_PLUS);
}
private void rtb_LinkClicked(object sender, LinkClickedEventArgs e)

9
ShareX/Forms/AboutForm.resx
View file

@ -120,13 +120,14 @@
<data name="rtbCredits.Text" xml:space="preserve">
<value>Contributors:
Logo and icon: https://github.com/mopquill - http://mpql.net
Logo and icon: https://github.com/mopquill
Jira, Gist and Mega support: https://github.com/gpailler
Web site: https://github.com/dmxt
MediaCrush support: https://github.com/SirCmpwn - http://drewdevault.com
Amazon S3 and DreamObjects support: https://github.com/alanedwardes - http://alanedwardes.com
Gfycat support: https://github.com/Dinnerbone - http://dinnerbone.com
MediaCrush support: https://github.com/SirCmpwn
Amazon S3 and DreamObjects support: https://github.com/alanedwardes
Gfycat support: https://github.com/Dinnerbone
Copy support: https://github.com/KamilKZ
AdFly support: https://github.com/LRNAB
External libraries:

12
ShareX/Forms/MainForm.cs
View file

@ -109,7 +109,7 @@ private void InitControls()
}, tsmiTextFileUploaders, tsmiTrayTextFileUploaders);
AddEnumItems<FileDestination>(x => Program.DefaultTaskSettings.FileDestination = x, tsmiFileUploaders, tsmiTrayFileUploaders);
AddEnumItems<UrlShortenerType>(x => Program.DefaultTaskSettings.URLShortenerDestination = x, tsmiURLShorteners, tsmiTrayURLShorteners);
AddEnumItems<URLSharingServices>(x => Program.DefaultTaskSettings.SocialNetworkingServiceDestination = x, tsmiURLSharingServices, tsmiTrayURLSharingServices);
AddEnumItems<URLSharingServices>(x => Program.DefaultTaskSettings.URLSharingServiceDestination = x, tsmiURLSharingServices, tsmiTrayURLSharingServices);
foreach (UrlShortenerType urlShortener in Helpers.GetEnums<UrlShortenerType>())
{
@ -118,10 +118,10 @@ private void InitControls()
tsmiShortenSelectedURL.DropDownItems.Add(tsmi);
}
foreach (URLSharingServices socialNetworkingService in Helpers.GetEnums<URLSharingServices>())
foreach (URLSharingServices urlSharingService in Helpers.GetEnums<URLSharingServices>())
{
ToolStripMenuItem tsmi = new ToolStripMenuItem(socialNetworkingService.GetDescription());
tsmi.Click += (sender, e) => uim.ShareURL(socialNetworkingService);
ToolStripMenuItem tsmi = new ToolStripMenuItem(urlSharingService.GetDescription());
tsmi.Click += (sender, e) => uim.ShareURL(urlSharingService);
tsmiShareSelectedURL.DropDownItems.Add(tsmi);
}
@ -497,7 +497,7 @@ public void UpdateMainFormSettings()
SetEnumChecked(Program.DefaultTaskSettings.TextFileDestination, tsmiTextFileUploaders, tsmiTrayTextFileUploaders);
SetEnumChecked(Program.DefaultTaskSettings.FileDestination, tsmiFileUploaders, tsmiTrayFileUploaders);
SetEnumChecked(Program.DefaultTaskSettings.URLShortenerDestination, tsmiURLShorteners, tsmiTrayURLShorteners);
SetEnumChecked(Program.DefaultTaskSettings.SocialNetworkingServiceDestination, tsmiURLSharingServices, tsmiTrayURLSharingServices);
SetEnumChecked(Program.DefaultTaskSettings.URLSharingServiceDestination, tsmiURLSharingServices, tsmiTrayURLSharingServices);
}
private void UpdateUploaderMenuNames()
@ -514,7 +514,7 @@ private void UpdateUploaderMenuNames()
tsmiURLShorteners.Text = tsmiTrayURLShorteners.Text = "URL shortener: " + Program.DefaultTaskSettings.URLShortenerDestination.GetDescription();
tsmiURLSharingServices.Text = tsmiTrayURLSharingServices.Text = "URL sharing service: " + Program.DefaultTaskSettings.SocialNetworkingServiceDestination.GetDescription();
tsmiURLSharingServices.Text = tsmiTrayURLSharingServices.Text = "URL sharing service: " + Program.DefaultTaskSettings.URLSharingServiceDestination.GetDescription();
}
private void AutoCheckUpdate()

2
ShareX/Forms/TaskSettingsForm.Designer.cs generated
View file

@ -1739,7 +1739,7 @@ private void InitializeComponent()
this.cbClipboardUploadShareURL.Name = "cbClipboardUploadShareURL";
this.cbClipboardUploadShareURL.Size = new System.Drawing.Size(366, 17);
this.cbClipboardUploadShareURL.TabIndex = 3;
this.cbClipboardUploadShareURL.Text = "If clipboard contains a URL then share it using social networking service";
this.cbClipboardUploadShareURL.Text = "If clipboard contains a URL then share it using URL sharing service";
this.cbClipboardUploadShareURL.UseVisualStyleBackColor = true;
this.cbClipboardUploadShareURL.CheckedChanged += new System.EventHandler(this.cbClipboardUploadShareURL_CheckedChanged);
//

6
ShareX/Forms/TaskSettingsForm.cs
View file

@ -87,7 +87,7 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false)
AddEnumItems<FileDestination>(x => TaskSettings.TextFileDestination = x, tsmiTextFileUploaders);
AddEnumItems<FileDestination>(x => TaskSettings.FileDestination = x, tsmiFileUploaders);
AddEnumItems<UrlShortenerType>(x => TaskSettings.URLShortenerDestination = x, tsmiURLShorteners);
AddEnumItems<URLSharingServices>(x => TaskSettings.SocialNetworkingServiceDestination = x, tsmiURLSharingServices);
AddEnumItems<URLSharingServices>(x => TaskSettings.URLSharingServiceDestination = x, tsmiURLSharingServices);
SetEnumCheckedContextMenu(TaskSettings.Job, cmsTask);
SetMultiEnumCheckedContextMenu(TaskSettings.AfterCaptureJob, cmsAfterCapture);
@ -98,7 +98,7 @@ public TaskSettingsForm(TaskSettings hotkeySetting, bool isDefault = false)
SetEnumChecked(TaskSettings.TextFileDestination, tsmiTextFileUploaders);
SetEnumChecked(TaskSettings.FileDestination, tsmiFileUploaders);
SetEnumChecked(TaskSettings.URLShortenerDestination, tsmiURLShorteners);
SetEnumChecked(TaskSettings.SocialNetworkingServiceDestination, tsmiURLSharingServices);
SetEnumChecked(TaskSettings.URLSharingServiceDestination, tsmiURLSharingServices);
// FTP
if (Program.UploadersConfig != null && Program.UploadersConfig.FTPAccountList.Count > 1)
@ -430,7 +430,7 @@ private void UpdateUploaderMenuNames()
tsmiURLShorteners.Text = "URL shortener: " + TaskSettings.URLShortenerDestination.GetDescription();
tsmiURLSharingServices.Text = "URL sharing service: " + TaskSettings.SocialNetworkingServiceDestination.GetDescription();
tsmiURLSharingServices.Text = "URL sharing service: " + TaskSettings.URLSharingServiceDestination.GetDescription();
}
private void tbDescription_TextChanged(object sender, EventArgs e)

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

@ -449,6 +449,16 @@ public static System.Drawing.Bitmap globe_share {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap google_plus {
get {
object obj = ResourceManager.GetObject("google_plus", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

3
ShareX/Properties/Resources.resx
View file

@ -346,4 +346,7 @@
<data name="globe_share" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\globe-share.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="google_plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\google_plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

1
ShareX/ShareX.csproj
View file

@ -475,6 +475,7 @@
<None Include="Resources\crown.png" />
<None Include="Resources\layer--pencil.png" />
<None Include="Resources\globe-share.png" />
<None Include="Resources\google_plus.png" />
<Content Include="ShareX_Icon.ico" />
<None Include="Resources\globe--pencil.png" />
<None Include="Resources\camcorder--pencil.png" />

2
ShareX/TaskInfo.cs
View file

@ -108,7 +108,7 @@ public string UploaderHost
case EDataType.URL:
if (Job == TaskJob.ShareURL)
{
return TaskSettings.SocialNetworkingServiceDestination.GetDescription();
return TaskSettings.URLSharingServiceDestination.GetDescription();
}
return TaskSettings.URLShortenerDestination.GetDescription();

4
ShareX/TaskSettings.cs
View file

@ -67,7 +67,7 @@ public string Description
public FileDestination TextFileDestination = FileDestination.Dropbox;
public FileDestination FileDestination = FileDestination.Dropbox;
public UrlShortenerType URLShortenerDestination = UrlShortenerType.BITLY;
public URLSharingServices SocialNetworkingServiceDestination = URLSharingServices.Twitter;
public URLSharingServices URLSharingServiceDestination = URLSharingServices.Twitter;
public bool OverrideFTP = false;
public int FTPIndex = 0;
@ -185,7 +185,7 @@ private void SetDefaultSettings()
TextFileDestination = defaultTaskSettings.TextFileDestination;
FileDestination = defaultTaskSettings.FileDestination;
URLShortenerDestination = defaultTaskSettings.URLShortenerDestination;
SocialNetworkingServiceDestination = defaultTaskSettings.SocialNetworkingServiceDestination;
URLSharingServiceDestination = defaultTaskSettings.URLSharingServiceDestination;
}
if (UseDefaultGeneralSettings)

4
ShareX/UploadInfoManager.cs
View file

@ -287,9 +287,9 @@ public void ShortenURL(UrlShortenerType urlShortener)
if (IsItemSelected && SelectedItem.IsURLExist) UploadManager.ShortenURL(SelectedItem.Info.Result.ToString(), urlShortener);
}
public void ShareURL(URLSharingServices socialNetworkingService)
public void ShareURL(URLSharingServices urlSharingService)
{
if (IsItemSelected && SelectedItem.IsURLExist) UploadManager.ShareURL(SelectedItem.Info.Result.ToString(), socialNetworkingService);
if (IsItemSelected && SelectedItem.IsURLExist) UploadManager.ShareURL(SelectedItem.Info.Result.ToString(), urlSharingService);
}
public void ShowQRCode()

4
ShareX/UploadManager.cs
View file

@ -376,12 +376,12 @@ public static void ShareURL(string url, TaskSettings taskSettings = null)
}
}
public static void ShareURL(string url, URLSharingServices socialNetworkingService)
public static void ShareURL(string url, URLSharingServices urlSharingService)
{
if (!string.IsNullOrEmpty(url))
{
TaskSettings taskSettings = TaskSettings.GetDefaultTaskSettings();
taskSettings.SocialNetworkingServiceDestination = socialNetworkingService;
taskSettings.URLSharingServiceDestination = urlSharingService;
UploadTask task = UploadTask.CreateShareURLTask(url, taskSettings);
TaskManager.Start(task);

4
ShareX/UploadTask.cs
View file

@ -156,7 +156,7 @@ public static UploadTask CreateShareURLTask(string url, TaskSettings taskSetting
UploadTask task = new UploadTask(taskSettings);
task.Info.Job = TaskJob.ShareURL;
task.Info.DataType = EDataType.URL;
task.Info.FileName = "Share URL (" + taskSettings.SocialNetworkingServiceDestination.GetDescription() + ")";
task.Info.FileName = "Share URL (" + taskSettings.URLSharingServiceDestination.GetDescription() + ")";
task.Info.Result.URL = url;
return task;
}
@ -1004,7 +1004,7 @@ public void ShareURL(string url)
{
string encodedUrl = URLHelpers.URLEncode(url);
switch (Info.TaskSettings.SocialNetworkingServiceDestination)
switch (Info.TaskSettings.URLSharingServiceDestination)
{
case URLSharingServices.Email:
if (Program.UploadersConfig.IsValid(URLSharingServices.Email))