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

Revert "Few AfterCaptureJobsTemp changes"

Browse source 
This reverts commit c7baa45c3d.
This commit is contained in:
mcored 2014-05-11 19:40:39 +08:00
parent c7baa45c3d
commit 21fd7e8140
5 changed files with 102 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX/Forms/AutoCaptureForm.cs
View file

@ -108,7 +108,7 @@ private void TakeScreenshot()
{
TaskSettings taskSettings = TaskSettings.GetDefaultTaskSettings();
taskSettings.UseDefaultAfterCaptureJob = false;
taskSettings.SafeAfterTasks.AfterCaptureJobsTemp = taskSettings.SafeAfterTasks.AfterCaptureJobsTemp.Remove(AfterCaptureTasks.AnnotateImage);
taskSettings.SafeAfterTasks.AfterCaptureJobsTemp = taskSettings.SafeAfterTasks.AfterCaptureJob.Remove(AfterCaptureTasks.AnnotateImage);
taskSettings.UseDefaultAdvancedSettings = false;
taskSettings.SafeAdvancedSettings.DisableNotifications = true;

4
ShareX/Forms/MainForm_Capture.cs
View file

@ -245,12 +245,12 @@ private void AfterCapture(Image img, CaptureType captureType, TaskSettings taskS
if (taskSettings.SafeImageSettings.ImageEffectOnlyRegionCapture && !IsRegionCapture(captureType))
{
taskSettings.SafeAfterTasks.AfterCaptureJobsTemp = taskSettings.SafeAfterTasks.AfterCaptureJobsTemp.Remove(AfterCaptureTasks.AddImageEffects);
taskSettings.SafeAfterTasks.AfterCaptureJobsTemp = taskSettings.SafeAfterTasks.AfterCaptureJob.Remove(AfterCaptureTasks.AddImageEffects);
}
if (taskSettings.SafeGeneralSettings.ShowAfterCaptureTasksForm)
{
using (AfterCaptureForm afterCaptureForm = new AfterCaptureForm(img, taskSettings.SafeAfterTasks.AfterCaptureJobsTemp))
using (AfterCaptureForm afterCaptureForm = new AfterCaptureForm(img, taskSettings.SafeAfterTasks.AfterCaptureJob))
{
afterCaptureForm.ShowDialog();

2
ShareX/Program.cs
View file

@ -557,7 +557,7 @@ private static void uploaderConfigWatcher_Changed(object sender, FileSystemEvent
private static void ReloadUploadersConfig(string filePath)
{
UploadersConfig = UploadersConfig.Load(filePath);
UploadersConfig = UploadersLib.UploadersConfig.Load(filePath);
}
public async static void UploadersConfigSaveAsync()

179
ShareX/TaskSettings.cs
View file

@ -112,89 +112,11 @@ public bool IsUsingDefaultSettings
get
{
return UseDefaultAfterCaptureJob && UseDefaultAfterUploadJob && UseDefaultDestinations && UseDefaultGeneralSettings &&
UseDefaultImageSettings && UseDefaultCaptureSettings && UseDefaultUploadSettings && UseDefaultActions &&
UseDefaultIndexerSettings && UseDefaultAdvancedSettings && !WatchFolderEnabled;
UseDefaultImageSettings && UseDefaultCaptureSettings && UseDefaultUploadSettings && UseDefaultActions &&
UseDefaultIndexerSettings && UseDefaultAdvancedSettings && !WatchFolderEnabled;
}
}
public TaskSettingsAfterTasks SafeAfterTasks
{
get
{
return UseDefaultAfterCaptureJob && Program.DefaultTaskSettings != null ? Program.DefaultTaskSettings.TaskSettingsAfterTasks : TaskSettingsAfterTasks;
}
}
public TaskSettingsDestinations SafeDestinations
{
get
{
return UseDefaultDestinations && Program.DefaultTaskSettings != null ? Program.DefaultTaskSettings.TaskDestinations : TaskDestinations;
}
}
public TaskSettingsGeneral SafeGeneralSettings
{
get
{
return UseDefaultGeneralSettings && Program.DefaultTaskSettings != null ? Program.DefaultTaskSettings.GeneralSettings : GeneralSettings;
}
}
public TaskSettingsImage SafeImageSettings
{
get
{
return UseDefaultImageSettings && Program.DefaultTaskSettings != null ? Program.DefaultTaskSettings.ImageSettings : ImageSettings;
}
}
public TaskSettingsCapture SafeCaptureSettings
{
get
{
return UseDefaultCaptureSettings && Program.DefaultTaskSettings != null ? Program.DefaultTaskSettings.CaptureSettings : CaptureSettings;
}
}
public List<ExternalProgram> SafeActions
{
get
{
return UseDefaultActions && Program.DefaultTaskSettings != null ? Program.DefaultTaskSettings.ExternalPrograms : ExternalPrograms;
}
}
public TaskSettingsUpload SafeUploadSettings
{
get
{
return UseDefaultUploadSettings && Program.DefaultTaskSettings != null ? Program.DefaultTaskSettings.UploadSettings : UploadSettings;
}
}
public IndexerSettings SafeIndexerSettings
{
get
{
return UseDefaultIndexerSettings && Program.DefaultTaskSettings != null ? Program.DefaultTaskSettings.IndexerSettings : IndexerSettings;
}
}
public TaskSettingsAdvanced SafeAdvancedSettings
{
get
{
return UseDefaultAdvancedSettings && Program.DefaultTaskSettings != null ? Program.DefaultTaskSettings.AdvancedSettings : AdvancedSettings;
}
}
public static TaskSettings GetSafeTaskSettings(TaskSettings taskSettings)
{
taskSettings.SafeAfterTasks.AfterCaptureJobsTemp = taskSettings.SafeAfterTasks.AfterCaptureJob;
return taskSettings;
}
public static TaskSettings GetDefaultTaskSettings()
{
TaskSettings taskSettings = new TaskSettings();
@ -202,6 +124,101 @@ public static TaskSettings GetDefaultTaskSettings()
return taskSettings;
}
public TaskSettingsAfterTasks SafeAfterTasks
{
get
{
return UseDefaultAfterCaptureJob && Program.DefaultTaskSettings != null ?
Program.DefaultTaskSettings.TaskSettingsAfterTasks : TaskSettingsAfterTasks;
}
}
public TaskSettingsDestinations SafeDestinations
{
get
{
return UseDefaultDestinations && Program.DefaultTaskSettings != null ?
Program.DefaultTaskSettings.TaskDestinations : TaskDestinations;
}
}
public TaskSettingsGeneral SafeGeneralSettings
{
get
{
return UseDefaultGeneralSettings && Program.DefaultTaskSettings != null ?
Program.DefaultTaskSettings.GeneralSettings : GeneralSettings;
}
}
public TaskSettingsImage SafeImageSettings
{
get
{
return UseDefaultImageSettings && Program.DefaultTaskSettings != null ?
Program.DefaultTaskSettings.ImageSettings : ImageSettings;
}
}
public TaskSettingsCapture SafeCaptureSettings
{
get
{
return UseDefaultCaptureSettings && Program.DefaultTaskSettings != null ?
Program.DefaultTaskSettings.CaptureSettings : CaptureSettings;
}
}
public List<ExternalProgram> SafeActions
{
get
{
return UseDefaultActions && Program.DefaultTaskSettings != null ?
Program.DefaultTaskSettings.ExternalPrograms : ExternalPrograms;
}
}
public TaskSettingsUpload SafeUploadSettings
{
get
{
return UseDefaultUploadSettings && Program.DefaultTaskSettings != null ?
Program.DefaultTaskSettings.UploadSettings : UploadSettings;
}
}
public IndexerSettings SafeIndexerSettings
{
get
{
return UseDefaultIndexerSettings && Program.DefaultTaskSettings != null ?
Program.DefaultTaskSettings.IndexerSettings : IndexerSettings;
}
}
public TaskSettingsAdvanced SafeAdvancedSettings
{
get
{
return UseDefaultAdvancedSettings && Program.DefaultTaskSettings != null ?
Program.DefaultTaskSettings.AdvancedSettings : AdvancedSettings;
}
}
public static TaskSettings GetSafeTaskSettings(TaskSettings taskSettings)
{
if (taskSettings.IsUsingDefaultSettings && Program.DefaultTaskSettings != null)
{
Program.DefaultTaskSettings.SafeAfterTasks.AfterCaptureJobsTemp = Program.DefaultTaskSettings.SafeAfterTasks.AfterCaptureJob;
return Program.DefaultTaskSettings;
}
else
{
taskSettings.SafeAfterTasks.AfterCaptureJobsTemp = taskSettings.SafeAfterTasks.AfterCaptureJob;
return taskSettings;
}
}
private void SetDefaultSettings()
{
if (Program.DefaultTaskSettings != null)
@ -276,9 +293,7 @@ public string CaptureFolder
get
{
if (!string.IsNullOrEmpty(AdvancedSettings.CapturePath))
{
return AdvancedSettings.CapturePath;
}
return Program.ScreenshotsFolder;
}

2
ShareX/UploadTask.cs
View file

@ -230,7 +230,7 @@ private void ThreadDoWork()
MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
{
Program.Settings.ShowUploadWarning = false;
Program.DefaultTaskSettings.SafeAfterTasks.AfterCaptureJobsTemp = Program.DefaultTaskSettings.SafeAfterTasks.AfterCaptureJobsTemp.Remove(AfterCaptureTasks.UploadImageToHost);
Program.DefaultTaskSettings.SafeAfterTasks.AfterCaptureJobsTemp = Program.DefaultTaskSettings.SafeAfterTasks.AfterCaptureJob.Remove(AfterCaptureTasks.UploadImageToHost);
RequestSettingUpdate = true;
Stop();
}