diff --git a/HelpersLib/UserControls/BlackStyle/BlackStyleLabel.cs b/HelpersLib/UserControls/BlackStyle/BlackStyleLabel.cs
index 6e17a4b80..443e677a9 100644
--- a/HelpersLib/UserControls/BlackStyle/BlackStyleLabel.cs
+++ b/HelpersLib/UserControls/BlackStyle/BlackStyleLabel.cs
@@ -98,6 +98,7 @@ public BlackStyleLabel()
private void Prepare()
{
+ TextAlign = ContentAlignment.TopLeft;
BackColor = Color.Transparent;
ForeColor = Color.White;
Font = new Font("Arial", 12);
diff --git a/ShareX/Controls/TaskInfoControl.Designer.cs b/ShareX/Controls/TaskInfoControl.Designer.cs
deleted file mode 100644
index b8e876cfb..000000000
--- a/ShareX/Controls/TaskInfoControl.Designer.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-namespace ShareX.Controls
-{
- partial class TaskInfoControl
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Component Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- this.SuspendLayout();
- //
- // TaskInfoControl
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.BackColor = System.Drawing.Color.Black;
- this.Name = "TaskInfoControl";
- this.Size = new System.Drawing.Size(463, 34);
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
- }
-}
diff --git a/ShareX/Controls/TaskInfoControl.cs b/ShareX/Controls/TaskInfoControl.cs
deleted file mode 100644
index ad3d1192b..000000000
--- a/ShareX/Controls/TaskInfoControl.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-#region License Information (GPL v3)
-
-/*
- ShareX - A program that allows you to take screenshots and share any file type
- Copyright (C) 2007-2014 ShareX Developers
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- Optionally you can also view the license at .
-*/
-
-#endregion License Information (GPL v3)
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-
-namespace ShareX.Controls
-{
- public partial class TaskInfoControl : UserControl
- {
- public TaskInfoControl()
- {
- InitializeComponent();
- }
-
- protected override void OnPaint(PaintEventArgs e)
- {
- }
-
- protected override void OnPaintBackground(PaintEventArgs e)
- {
- Graphics g = e.Graphics;
-
- using (LinearGradientBrush brush = new LinearGradientBrush(ClientRectangle, Color.FromArgb(80, 80, 80), Color.FromArgb(50, 50, 50), LinearGradientMode.Vertical))
- {
- g.FillRectangle(brush, ClientRectangle);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/ShareX/Controls/TaskInfoControl.resx b/ShareX/Controls/TaskInfoControl.resx
deleted file mode 100644
index 1af7de150..000000000
--- a/ShareX/Controls/TaskInfoControl.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj
index 956e483f3..86fb2ea35 100644
--- a/ShareX/ShareX.csproj
+++ b/ShareX/ShareX.csproj
@@ -94,12 +94,6 @@
BeforeUploadControl.cs
-
- UserControl
-
-
- TaskInfoControl.cs
-
Form
@@ -254,9 +248,6 @@
BeforeUploadControl.cs
-
- TaskInfoControl.cs
-
AboutForm.cs
Designer
diff --git a/ShareX/UploadTask.cs b/ShareX/UploadTask.cs
index 487691a65..f6bc5606e 100644
--- a/ShareX/UploadTask.cs
+++ b/ShareX/UploadTask.cs
@@ -1006,20 +1006,29 @@ public UploadResult ShortenURL(string url)
public void DoSocialNetworkingService()
{
- switch (Info.TaskSettings.SocialNetworkingServiceDestination)
- {
- case SocialNetworkingService.Twitter:
- OAuthInfo twitterOAuth = Program.UploadersConfig.TwitterOAuthInfoList.ReturnIfValidIndex(Program.UploadersConfig.TwitterSelectedAccount);
+ string url = Info.Result.ToString();
- if (twitterOAuth != null)
- {
- using (TwitterTweetForm twitter = new TwitterTweetForm(twitterOAuth))
+ if (!string.IsNullOrEmpty(url))
+ {
+ switch (Info.TaskSettings.SocialNetworkingServiceDestination)
+ {
+ case SocialNetworkingService.Twitter:
+ OAuthInfo twitterOAuth = Program.UploadersConfig.TwitterOAuthInfoList.ReturnIfValidIndex(Program.UploadersConfig.TwitterSelectedAccount);
+
+ if (twitterOAuth != null)
{
- twitter.Message = Info.Result.ToString();
- twitter.ShowDialog();
+ using (TwitterTweetForm twitter = new TwitterTweetForm(twitterOAuth))
+ {
+ twitter.Message = url;
+ twitter.ShowDialog();
+ }
}
- }
- break;
+ break;
+ case SocialNetworkingService.GooglePlus:
+ // The Google+ API currently provides read-only access to public data. So sharing with API not possible yet.
+ Helpers.OpenURL("https://plus.google.com/share?url=" + url);
+ break;
+ }
}
}
diff --git a/UploadersLib/Enums.cs b/UploadersLib/Enums.cs
index 331fae12e..5b5cdb06b 100644
--- a/UploadersLib/Enums.cs
+++ b/UploadersLib/Enums.cs
@@ -141,7 +141,9 @@ public enum UrlShortenerType
public enum SocialNetworkingService
{
[Description("twitter.com")]
- Twitter
+ Twitter,
+ [Description("plus.google.com")]
+ GooglePlus
}
public enum HttpMethod