CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-28 11:10:23 +12:00
Code Issues Packages Projects Releases Wiki Activity

Code refactoring

Browse source
This commit is contained in:
Jaex 2023-04-15 00:55:04 +03:00
parent e814747957
commit 1031e0b462
4 changed files with 20 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX.HelpersLib/Controls/ExportImportControl.cs
View file

@ -239,7 +239,7 @@ private void tsmiImportFile_Click(object sender, EventArgs e)
private async void tsmiImportURL_Click(object sender, EventArgs e)
{
string url = InputBox.GetInputText(Resources.ExportImportControl_tsmiImportURL_Click_URL_to_download_settings_from);
string url = InputBox.Show(Resources.ExportImportControl_tsmiImportURL_Click_URL_to_download_settings_from);
if (!string.IsNullOrEmpty(url))
{

30
ShareX.HelpersLib/Forms/InputBox.cs
View file

@ -33,19 +33,32 @@ public class InputBox : Form
{
public string InputText { get; private set; }
public InputBox(string title = null, string inputText = null, string okText = null, string cancelText = null)
private InputBox(string title, string inputText = null, string okText = null, string cancelText = null)
{
InitializeComponent();
ShareXResources.ApplyTheme(this);
InputText = inputText;
if (!string.IsNullOrEmpty(title)) Text = title;
Text = "ShareX - " + title;
if (!string.IsNullOrEmpty(InputText)) txtInputText.Text = InputText;
if (!string.IsNullOrEmpty(okText)) btnOK.Text = okText;
if (!string.IsNullOrEmpty(cancelText)) btnCancel.Text = cancelText;
}
public static string Show(string title, string inputText = null, string okText = null, string cancelText = null)
{
using (InputBox form = new InputBox(title, inputText, okText, cancelText))
{
if (form.ShowDialog() == DialogResult.OK)
{
return form.InputText;
}
return null;
}
}
private void InputBox_Shown(object sender, EventArgs e)
{
this.ForceActivate();
@ -69,19 +82,6 @@ private void btnCancel_Click(object sender, EventArgs e)
Close();
}
public static string GetInputText(string title = null, string inputText = null, string okText = null, string cancelText = null)
{
using (InputBox form = new InputBox(title, inputText, okText, cancelText))
{
if (form.ShowDialog() == DialogResult.OK)
{
return form.InputText;
}
return null;
}
}
#region Windows Form Designer generated code
private System.ComponentModel.IContainer components = null;

13
ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionInputBox.cs
View file

@ -24,7 +24,6 @@
#endregion License Information (GPL v3)
using ShareX.HelpersLib;
using System.Windows.Forms;
namespace ShareX.UploadersLib
{
@ -42,7 +41,7 @@ public override string Call(ShareXCustomUploaderSyntaxParser parser, string[] pa
string title = "Input";
string defaultText = "";
if (parameters.Length > 0)
if (parameters != null && parameters.Length > 0)
{
title = parameters[0];
@ -52,15 +51,7 @@ public override string Call(ShareXCustomUploaderSyntaxParser parser, string[] pa
}
}
using (InputBox inputBox = new InputBox(title, defaultText))
{
if (inputBox.ShowDialog() == DialogResult.OK)
{
return inputBox.InputText;
}
}
return defaultText;
return InputBox.Show(title, defaultText);
}
}
}

4
ShareX/UploadManager.cs
View file

@ -334,7 +334,7 @@ public static void UploadURL(TaskSettings taskSettings = null)
inputText = text;
}
string url = InputBox.GetInputText("ShareX - " + Resources.UploadManager_UploadURL_URL_to_download_from_and_upload, inputText);
string url = InputBox.Show(Resources.UploadManager_UploadURL_URL_to_download_from_and_upload, inputText);
if (!string.IsNullOrEmpty(url))
{
@ -355,7 +355,7 @@ public static void ShowShortenURLDialog(TaskSettings taskSettings = null)
inputText = text;
}
string url = InputBox.GetInputText("ShareX - " + Resources.UploadManager_ShowShortenURLDialog_ShortenURL, inputText,
string url = InputBox.Show(Resources.UploadManager_ShowShortenURLDialog_ShortenURL, inputText,
Resources.UploadManager_ShowShortenURLDialog_Shorten);
if (!string.IsNullOrEmpty(url))