CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-04 22:21:23 +12:00
Code Issues Packages Projects Releases Wiki Activity

Preparation for next release

Browse source
This commit is contained in:
Jaex 2015-01-18 21:01:22 +02:00
parent cdcf009186
commit e5da7e3a5b
6 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ShareX.UploadersLib/Enums.cs
View file

@ -88,8 +88,8 @@ public enum FileDestination
GoogleDrive, GoogleDrive,
[Description("Copy")] [Description("Copy")]
Copy, Copy,
[Description("hubiC")] //[Description("hubiC")]
Hubic, //Hubic,
[Description("Box")] [Description("Box")]
Box, Box,
[Description("MEGA")] [Description("MEGA")]

2
ShareX.UploadersLib/Forms/UploadersConfigForm.cs
View file

@ -113,6 +113,8 @@ private void FormSettings()
AddIconToTab(tpUpaste, Resources.Upaste); AddIconToTab(tpUpaste, Resources.Upaste);
AddIconToTab(tpYourls, Resources.Yourls); AddIconToTab(tpYourls, Resources.Yourls);
tcFileUploaders.TabPages.Remove(tpHubic);
ttlvMain.ImageList = uploadersImageList; ttlvMain.ImageList = uploadersImageList;
ttlvMain.MainTabControl = tcUploaders; ttlvMain.MainTabControl = tcUploaders;
ttlvMain.FocusListView(); ttlvMain.FocusListView();

11
ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs
View file

@ -778,17 +778,8 @@ public void BoxAuthOpen()
if (!string.IsNullOrEmpty(url)) if (!string.IsNullOrEmpty(url))
{ {
Config.BoxOAuth2Info = oauth; Config.BoxOAuth2Info = oauth;
//Helpers.LoadBrowserAsync(url); URLHelpers.OpenURL(url);
DebugHelper.WriteLine("BoxAuthOpen - Authorization URL is opened: " + url); DebugHelper.WriteLine("BoxAuthOpen - Authorization URL is opened: " + url);
// Workaround for authorization because we don't have callback url which starts with https://
using (OAuthWebForm oauthForm = new OAuthWebForm(url, "https://www.box.com/home/"))
{
if (oauthForm.ShowDialog() == DialogResult.OK)
{
BoxAuthComplete(oauthForm.Code);
}
}
} }
else else
{ {

1
ShareX/Forms/AboutForm.cs
View file

@ -61,7 +61,6 @@ public AboutForm()
AdFly support: https://github.com/LRNAB AdFly support: https://github.com/LRNAB
MediaFire support: https://github.com/michalx2 MediaFire support: https://github.com/michalx2
Pushbullet support: https://github.com/BallisticLingonberries Pushbullet support: https://github.com/BallisticLingonberries
hubiC support: https://github.com/Kouga-
{1}: {1}:

2
ShareX/Program.cs
View file

@ -39,7 +39,7 @@ namespace ShareX
{ {
internal static class Program internal static class Program
{ {
public static bool IsBeta = true; public static bool IsBeta = false;
public static string Title public static string Title
{ {

4
ShareX/UploadTask.cs
View file

@ -850,13 +850,13 @@ public UploadResult UploadFile(Stream stream, string fileName)
URLType = Program.UploadersConfig.CopyURLType URLType = Program.UploadersConfig.CopyURLType
}; };
break; break;
case FileDestination.Hubic: /*case FileDestination.Hubic:
fileUploader = new Hubic(Program.UploadersConfig.HubicOAuth2Info, Program.UploadersConfig.HubicOpenstackAuthInfo) fileUploader = new Hubic(Program.UploadersConfig.HubicOAuth2Info, Program.UploadersConfig.HubicOpenstackAuthInfo)
{ {
SelectedFolder = Program.UploadersConfig.HubicSelectedFolder, SelectedFolder = Program.UploadersConfig.HubicSelectedFolder,
Publish = Program.UploadersConfig.HubicPublish Publish = Program.UploadersConfig.HubicPublish
}; };
break; break;*/
case FileDestination.RapidShare: case FileDestination.RapidShare:
fileUploader = new RapidShare(Program.UploadersConfig.RapidShareUsername, Program.UploadersConfig.RapidSharePassword, Program.UploadersConfig.RapidShareFolderID); fileUploader = new RapidShare(Program.UploadersConfig.RapidShareUsername, Program.UploadersConfig.RapidSharePassword, Program.UploadersConfig.RapidShareFolderID);
break; break;