CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 09:47:22 +13:00
Code Issues Projects Releases Packages Wiki Activity

Credits updated

Browse source
This commit is contained in:
Jaex 2014-09-04 22:58:44 +03:00
parent 2537048a3c
commit 5ceda757f3
4 changed files with 11 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ShareX/Forms/AboutForm.resx
View file

@ -120,7 +120,7 @@
<data name="rtbCredits.Text" xml:space="preserve">
<value>Contributors:
Jira, Gist and Mega support: https://github.com/gpailler
Mega, Gist and Jira support: https://github.com/gpailler
Web site: https://github.com/dmxt
MediaCrush support: https://github.com/SirCmpwn
Amazon S3 and DreamObjects support: https://github.com/alanedwardes
@ -128,6 +128,7 @@ Gfycat support: https://github.com/Dinnerbone
Copy support: https://github.com/KamilKZ
AdFly support: https://github.com/LRNAB
MediaFire support: https://github.com/michalx2
Pushbullet support: https://github.com/BallisticLingonberries
External libraries:

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

@ -905,7 +905,7 @@ private void InitializeComponent()
this.lblDragAndDropTip.BackColor = System.Drawing.Color.White;
this.lblDragAndDropTip.Dock = System.Windows.Forms.DockStyle.Bottom;
this.lblDragAndDropTip.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(162)));
this.lblDragAndDropTip.ForeColor = System.Drawing.Color.DimGray;
this.lblDragAndDropTip.ForeColor = System.Drawing.Color.DarkGray;
this.lblDragAndDropTip.Location = new System.Drawing.Point(0, 280);
this.lblDragAndDropTip.Name = "lblDragAndDropTip";
this.lblDragAndDropTip.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0);

6
UploadersLib/FileUploaders/Pushbullet.cs
View file

@ -47,9 +47,7 @@ public Pushbullet(PushbulletSettings config)
private const string
wwwPushesURL = "https://www.pushbullet.com/pushes",
apiURL = "https://api.pushbullet.com/v2";
private readonly string
apiURL = "https://api.pushbullet.com/v2",
apiGetDevicesURL = apiURL + "/devices",
apiSendPushURL = apiURL + "/pushes",
apiRequestFileUploadURL = apiURL + "/upload-request";
@ -148,7 +146,7 @@ public override UploadResult Upload(Stream stream, string fileName)
if (Config.CurrentDevice == null) throw new Exception("No device set to push to.");
if (string.IsNullOrEmpty(Config.CurrentDevice.Key)) throw new Exception("Missing device key.");
return PushFile(stream, fileName);//, fileType);
return PushFile(stream, fileName);
}
public List<PushbulletDevice> GetDeviceList()

33
UploadersLib/Forms/UploadersConfigFormHelper.cs
View file

@ -889,7 +889,6 @@ public void OneDriveAuthOpen()
try
{
OAuth2Info oauth = new OAuth2Info(APIKeys.OneDriveClientID, APIKeys.OneDriveClientSecret);
string url = new OneDrive(oauth).GetAuthorizationURL();
if (!string.IsNullOrEmpty(url))
@ -905,7 +904,7 @@ public void OneDriveAuthOpen()
}
catch (Exception ex)
{
MessageBox.Show(ex.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBox.Show(ex.ToString(), "ShareX - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
@ -916,45 +915,25 @@ public void OneDriveAuthComplete(string code)
if (!string.IsNullOrEmpty(code) && Config.OneDriveOAuth2Info != null)
{
OneDrive onedrive = new OneDrive(Config.OneDriveOAuth2Info);
bool result = onedrive.GetAccessToken(code);
if (result)
if (onedrive.GetAccessToken(code))
{
Config.OneDriveOAuth2Info = onedrive.AuthInfo;
UpdateOneDriveStatus();
oAuth2OneDrive.Status = OAuthLoginStatus.LoginSuccessful;
MessageBox.Show("Login successful.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
MessageBox.Show("OneDrive login successful.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Information);
}
else
{
Config.OneDriveOAuth2Info = null;
oAuth2OneDrive.Status = OAuthLoginStatus.LoginFailed;
MessageBox.Show("Login failed.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBox.Show("OneDrive login failed.", Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
catch (Exception ex)
{
DebugHelper.WriteException(ex);
MessageBox.Show(ex.ToString(), Application.ProductName + " - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void UpdateOneDriveStatus()
{
if (OAuth2Info.CheckOAuth(Config.OneDriveOAuth2Info) && Config.OneDriveOAuth2Info != null)
{
StringBuilder sb = new StringBuilder();
sb.AppendLine("Client ID: " + Config.OneDriveOAuth2Info.Client_ID);
lblDropboxStatus.Text = sb.ToString();
btnDropboxShowFiles.Enabled = true;
}
else
{
lblDropboxStatus.Text = string.Empty;
MessageBox.Show(ex.ToString(), "ShareX - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}