CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-05 20:54:31 +13:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'refs/remotes/ShareX/master'

Browse source
This commit is contained in:
Jevan Pipitone 2016-01-30 16:17:57 +11:00
commit b433995a1d
17 changed files with 324 additions and 334 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ShareX.HelpersLib/Native/NativeMethods_Helpers.cs
View file

@ -465,19 +465,13 @@ private static bool Is32BitProcessOn64BitProcessor()
return retVal;
}
/// <summary>
/// Flashes a window until the window comes to the foreground
/// Receives the form that will flash
/// </summary>
/// <param name="hWnd">The handle to the window to flash</param>
/// <returns>whether or not the window needed flashing</returns>
public static bool FlashWindowEx(Form frm)
public static bool FlashWindowEx(Form frm, uint flashCount = uint.MaxValue)
{
FLASHWINFO fInfo = new FLASHWINFO();
fInfo.cbSize = Convert.ToUInt32(Marshal.SizeOf(fInfo));
fInfo.hwnd = frm.Handle;
fInfo.dwFlags = (uint)FlashWindow.FLASHW_ALL | (uint)FlashWindow.FLASHW_TIMERNOFG;
fInfo.uCount = uint.MaxValue;
fInfo.uCount = flashCount;
fInfo.dwTimeout = 0;
return FlashWindowEx(ref fInfo);

3
ShareX.HelpersLib/Properties/Resources.ru.resx
View file

@ -835,4 +835,7 @@
<data name="AfterCaptureTasks_ShowBeforeUploadWindow" xml:space="preserve">
<value>Показать окно «Перед загрузкой»</value>
</data>
<data name="AfterCaptureTasks_ShowInExplorer" xml:space="preserve">
<value>Показать файл в проводнике</value>
</data>
</root>

149
ShareX.HelpersLib/SettingsBase.cs
View file

@ -23,6 +23,8 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3)
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using System;
using System.ComponentModel;
using System.IO;
@ -30,11 +32,8 @@ You should have received a copy of the GNU General Public License
namespace ShareX.HelpersLib
{
[Serializable]
public abstract class SettingsBase<T> where T : SettingsBase<T>, new()
{
private static readonly SerializationType SerializationType = SerializationType.Json;
[Browsable(false)]
public string FilePath { get; private set; }
@ -59,29 +58,17 @@ public bool IsUpgrade
}
}
public static T Load(string filePath)
{
T setting = SettingsHelper.Load<T>(filePath, SerializationType);
if (setting != null) setting.FilePath = filePath;
return setting;
}
public static T Load(Stream stream)
{
T setting = SettingsHelper.Load<T>(stream, SerializationType);
return setting;
}
public bool Save(string filePath)
{
FilePath = filePath;
ApplicationVersion = Application.ProductVersion;
return SettingsHelper.Save(this, FilePath, SerializationType);
return SaveInternal(this, FilePath, true);
}
public void Save()
public bool Save()
{
Save(FilePath);
return Save(FilePath);
}
public void SaveAsync(string filePath)
@ -94,9 +81,129 @@ public void SaveAsync()
SaveAsync(FilePath);
}
public void Save(Stream stream)
public static T Load(string filePath)
{
SettingsHelper.Save(this, stream, SerializationType);
T setting = LoadInternal(filePath, true);
if (setting != null)
{
setting.FilePath = filePath;
}
return setting;
}
private static bool SaveInternal(object obj, string filePath, bool createBackup)
{
string typeName = obj.GetType().Name;
DebugHelper.WriteLine("{0} save started: {1}", typeName, filePath);
bool isSuccess = false;
try
{
if (!string.IsNullOrEmpty(filePath))
{
lock (obj)
{
Helpers.CreateDirectoryIfNotExist(filePath);
string tempFilePath = filePath + ".temp";
using (FileStream fileStream = new FileStream(tempFilePath, FileMode.Create, FileAccess.Write, FileShare.Read))
using (StreamWriter streamWriter = new StreamWriter(fileStream))
using (JsonTextWriter jsonWriter = new JsonTextWriter(streamWriter))
{
jsonWriter.Formatting = Formatting.Indented;
JsonSerializer serializer = new JsonSerializer();
serializer.ContractResolver = new WritablePropertiesOnlyResolver();
serializer.Converters.Add(new StringEnumConverter());
serializer.Serialize(jsonWriter, obj);
jsonWriter.Flush();
}
if (File.Exists(filePath))
{
if (createBackup)
{
File.Copy(filePath, filePath + ".bak", true);
}
File.Delete(filePath);
}
File.Move(tempFilePath, filePath);
isSuccess = true;
}
}
}
catch (Exception e)
{
DebugHelper.WriteException(e);
}
finally
{
DebugHelper.WriteLine("{0} save {1}: {2}", typeName, isSuccess ? "successful" : "failed", filePath);
}
return isSuccess;
}
private static T LoadInternal(string filePath, bool checkBackup)
{
string typeName = typeof(T).Name;
if (!string.IsNullOrEmpty(filePath))
{
DebugHelper.WriteLine("{0} load started: {1}", typeName, filePath);
try
{
if (File.Exists(filePath))
{
using (FileStream fileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read))
{
if (fileStream.Length > 0)
{
T settings;
using (StreamReader streamReader = new StreamReader(fileStream))
using (JsonTextReader jsonReader = new JsonTextReader(streamReader))
{
JsonSerializer serializer = new JsonSerializer();
serializer.Converters.Add(new StringEnumConverter());
serializer.ObjectCreationHandling = ObjectCreationHandling.Replace;
serializer.Error += (sender, e) => e.ErrorContext.Handled = true;
settings = serializer.Deserialize<T>(jsonReader);
}
if (settings == null)
{
throw new Exception(typeName + " object is null.");
}
DebugHelper.WriteLine("{0} load finished: {1}", typeName, filePath);
return settings;
}
}
}
}
catch (Exception e)
{
DebugHelper.WriteException(e, typeName + " load failed: " + filePath);
}
if (checkBackup)
{
return LoadInternal(filePath + ".bak", false);
}
}
DebugHelper.WriteLine("{0} not found. Loading new instance.", typeName);
return new T();
}
}
}

199
ShareX.HelpersLib/SettingsHelper.cs
View file

@ -1,199 +0,0 @@
#region License Information (GPL v3)
/*
ShareX - A program that allows you to take screenshots and share any file type
Copyright (c) 2007-2016 ShareX Team
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 <http://www.gnu.org/licenses/>.
*/
#endregion License Information (GPL v3)
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Serialization;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.Serialization.Formatters.Binary;
using System.Xml.Serialization;
namespace ShareX.HelpersLib
{
public enum SerializationType
{
Binary,
Xml,
Json
}
public static class SettingsHelper
{
public static bool Save(object obj, string filePath, SerializationType type, bool createBackup = true)
{
string typeName = obj.GetType().Name;
DebugHelper.WriteLine("{0} save started: {1}", typeName, filePath);
bool isSuccess = false;
try
{
if (!string.IsNullOrEmpty(filePath))
{
lock (obj)
{
string tempFilePath = filePath + ".temp";
using (FileStream fs = new FileStream(tempFilePath, FileMode.Create, FileAccess.Write, FileShare.Read))
{
Save(obj, fs, type);
}
if (File.Exists(filePath))
{
if (createBackup)
{
File.Copy(filePath, filePath + ".bak", true);
}
File.Delete(filePath);
}
File.Move(tempFilePath, filePath);
isSuccess = true;
}
}
}
catch (Exception e)
{
DebugHelper.WriteException(e);
}
finally
{
DebugHelper.WriteLine("{0} save {1}: {2}", typeName, isSuccess ? "successful" : "failed", filePath);
}
return isSuccess;
}
public static void Save(object obj, Stream stream, SerializationType type)
{
switch (type)
{
case SerializationType.Binary:
new BinaryFormatter().Serialize(stream, obj);
break;
case SerializationType.Xml:
Type t = obj.GetType();
new XmlSerializer(t).Serialize(stream, obj);
break;
case SerializationType.Json:
StreamWriter streamWriter = new StreamWriter(stream);
JsonTextWriter jsonWriter = new JsonTextWriter(streamWriter);
jsonWriter.Formatting = Formatting.Indented;
JsonSerializer serializer = new JsonSerializer();
serializer.ContractResolver = new WritablePropertiesOnlyResolver();
serializer.Converters.Add(new StringEnumConverter());
serializer.Serialize(jsonWriter, obj);
jsonWriter.Flush();
break;
}
}
public static T Load<T>(string path, SerializationType type, bool checkBackup = true) where T : new()
{
string typeName = typeof(T).Name;
if (!string.IsNullOrEmpty(path))
{
DebugHelper.WriteLine("{0} load started: {1}", typeName, path);
try
{
if (File.Exists(path))
{
using (FileStream fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read))
{
if (fs.Length > 0)
{
T settings = Load<T>(fs, type);
if (settings == null) throw new Exception(typeName + " object is null.");
DebugHelper.WriteLine("{0} load finished: {1}", typeName, path);
return settings;
}
}
}
}
catch (Exception e)
{
DebugHelper.WriteException(e, typeName + " load failed");
}
if (checkBackup)
{
return Load<T>(path + ".bak", type, false);
}
}
DebugHelper.WriteLine("{0} not found. Loading new instance.", typeName);
return new T();
}
public static T Load<T>(Stream stream, SerializationType type)
{
T settings;
switch (type)
{
case SerializationType.Binary:
settings = (T)new BinaryFormatter().Deserialize(stream);
break;
default:
case SerializationType.Xml:
settings = (T)new XmlSerializer(typeof(T)).Deserialize(stream);
break;
case SerializationType.Json:
using (StreamReader streamReader = new StreamReader(stream))
using (JsonReader jsonReader = new JsonTextReader(streamReader))
{
JsonSerializer serializer = new JsonSerializer();
serializer.Converters.Add(new StringEnumConverter());
serializer.Error += (sender, e) => e.ErrorContext.Handled = true;
serializer.ObjectCreationHandling = ObjectCreationHandling.Replace;
settings = serializer.Deserialize<T>(jsonReader);
}
break;
}
return settings;
}
}
internal class WritablePropertiesOnlyResolver : DefaultContractResolver
{
protected override IList<JsonProperty> CreateProperties(Type type, MemberSerialization memberSerialization)
{
IList<JsonProperty> props = base.CreateProperties(type, memberSerialization);
return props.Where(p => p.Writable).ToList();
}
}
}

2
ShareX.HelpersLib/ShareX.HelpersLib.csproj
View file

@ -356,7 +356,6 @@
</Compile>
<Compile Include="Printer\PrintTextHelper.cs" />
<Compile Include="Helpers\RegistryHelpers.cs" />
<Compile Include="SettingsHelper.cs" />
<Compile Include="SingleInstanceApplication\ApplicationInstanceManager.cs" />
<Compile Include="SingleInstanceApplication\InstanceProxy.cs" />
<Compile Include="DebugHelper.cs" />
@ -404,6 +403,7 @@
<Compile Include="Links.cs" />
<Compile Include="Vector2.cs" />
<Compile Include="WindowState.cs" />
<Compile Include="WritablePropertiesOnlyResolver.cs" />
<Compile Include="XmlColor.cs" />
<Compile Include="XmlFont.cs" />
<EmbeddedResource Include="Automate\AutomateForm.de.resx">

2
ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs
View file

@ -43,7 +43,7 @@ public UpdateMessageBox(bool activateWindow, bool isPortable = false)
if (!ActivateWindow)
{
WindowState = FormWindowState.Minimized;
NativeMethods.FlashWindowEx(this);
NativeMethods.FlashWindowEx(this, 10);
}
Text = Resources.UpdateMessageBox_UpdateMessageBox_update_is_available;

42
ShareX.HelpersLib/WritablePropertiesOnlyResolver.cs Normal file
View file

@ -0,0 +1,42 @@
#region License Information (GPL v3)
/*
ShareX - A program that allows you to take screenshots and share any file type
Copyright (c) 2007-2016 ShareX Team
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 <http://www.gnu.org/licenses/>.
*/
#endregion License Information (GPL v3)
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
using System;
using System.Collections.Generic;
using System.Linq;
namespace ShareX.HelpersLib
{
internal class WritablePropertiesOnlyResolver : DefaultContractResolver
{
protected override IList<JsonProperty> CreateProperties(Type type, MemberSerialization memberSerialization)
{
IList<JsonProperty> props = base.CreateProperties(type, memberSerialization);
return props.Where(p => p.Writable).ToList();
}
}
}

1
ShareX/ApplicationConfig.cs
View file

@ -52,6 +52,7 @@ public ApplicationConfig()
#region Main Form
public bool ShowMenu = true;
public bool ShowColumns = true;
public ImagePreviewVisibility ImagePreview = ImagePreviewVisibility.Automatic;
public int PreviewSplitterDistance = 335;

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

@ -156,6 +156,7 @@ private void InitializeComponent()
this.tsmiClearList = new System.Windows.Forms.ToolStripMenuItem();
this.tssUploadInfo1 = new System.Windows.Forms.ToolStripSeparator();
this.tsmiHideMenu = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiHideColumns = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiImagePreview = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiImagePreviewShow = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiImagePreviewHide = new System.Windows.Forms.ToolStripMenuItem();
@ -884,6 +885,7 @@ private void InitializeComponent()
this.tsmiClearList,
this.tssUploadInfo1,
this.tsmiHideMenu,
this.tsmiHideColumns,
this.tsmiImagePreview});
this.cmsTaskInfo.Name = "cmsHistory";
resources.ApplyResources(this.cmsTaskInfo, "cmsTaskInfo");
@ -1200,6 +1202,13 @@ private void InitializeComponent()
resources.ApplyResources(this.tsmiHideMenu, "tsmiHideMenu");
this.tsmiHideMenu.Click += new System.EventHandler(this.tsmiHideMenu_Click);
//
// tsmiHideColumns
//
this.tsmiHideColumns.Image = global::ShareX.Properties.Resources.layout_select;
this.tsmiHideColumns.Name = "tsmiHideColumns";
resources.ApplyResources(this.tsmiHideColumns, "tsmiHideColumns");
this.tsmiHideColumns.Click += new System.EventHandler(this.tsmiHideColumns_Click);
//
// tsmiImagePreview
//
this.tsmiImagePreview.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -2037,5 +2046,6 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripMenuItem tsmiTrayTestFileUpload;
private System.Windows.Forms.ToolStripMenuItem tsmiTrayTestURLShortener;
private System.Windows.Forms.ToolStripMenuItem tsmiTrayTestURLSharing;
private System.Windows.Forms.ToolStripMenuItem tsmiHideColumns;
}
}

19
ShareX/Forms/MainForm.cs
View file

@ -853,6 +853,19 @@ private void UpdateMenu()
}
tsMain.Visible = lblSplitter.Visible = Program.Settings.ShowMenu;
// TODO: Translate
if (Program.Settings.ShowColumns)
{
tsmiHideColumns.Text = "Hide columns";
}
else
{
tsmiHideColumns.Text = "Show columns";
}
lvUploads.HeaderStyle = Program.Settings.ShowColumns ? ColumnHeaderStyle.Nonclickable : ColumnHeaderStyle.None;
Refresh();
}
@ -1552,6 +1565,12 @@ private void tsmiHideMenu_Click(object sender, EventArgs e)
UpdateMenu();
}
private void tsmiHideColumns_Click(object sender, EventArgs e)
{
Program.Settings.ShowColumns = !Program.Settings.ShowColumns;
UpdateMenu();
}
private void tsmiImagePreviewShow_Click(object sender, EventArgs e)
{
Program.Settings.ImagePreview = ImagePreviewVisibility.Show;

26
ShareX/Forms/MainForm.resx
View file

@ -1092,20 +1092,26 @@
<data name="tsmiHideMenu.Text" xml:space="preserve">
<value>Hide menu</value>
</data>
<data name="tsmiHideColumns.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
<data name="tsmiHideColumns.Text" xml:space="preserve">
<value>Hide columns</value>
</data>
<data name="tsmiImagePreviewShow.Size" type="System.Drawing.Size, System.Drawing">
<value>130, 22</value>
<value>152, 22</value>
</data>
<data name="tsmiImagePreviewShow.Text" xml:space="preserve">
<value>Show</value>
</data>
<data name="tsmiImagePreviewHide.Size" type="System.Drawing.Size, System.Drawing">
<value>130, 22</value>
<value>152, 22</value>
</data>
<data name="tsmiImagePreviewHide.Text" xml:space="preserve">
<value>Hide</value>
</data>
<data name="tsmiImagePreviewAutomatic.Size" type="System.Drawing.Size, System.Drawing">
<value>130, 22</value>
<value>152, 22</value>
</data>
<data name="tsmiImagePreviewAutomatic.Text" xml:space="preserve">
<value>Automatic</value>
@ -1117,7 +1123,7 @@
<value>Image preview</value>
</data>
<data name="cmsTaskInfo.Size" type="System.Drawing.Size, System.Drawing">
<value>173, 318</value>
<value>173, 340</value>
</data>
<data name="&gt;&gt;cmsTaskInfo.Name" xml:space="preserve">
<value>cmsTaskInfo</value>
@ -1549,7 +1555,7 @@
<value>Exit</value>
</data>
<data name="cmsTray.Size" type="System.Drawing.Size, System.Drawing">
<value>189, 484</value>
<value>189, 462</value>
</data>
<data name="&gt;&gt;cmsTray.Name" xml:space="preserve">
<value>cmsTray</value>
@ -1559,7 +1565,7 @@
</data>
<data name="niTray.Text" xml:space="preserve">
<value>ShareX</value>
<comment>@Invariant</comment></data>
</data>
<metadata name="timerTraySingleClick.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>405, 17</value>
</metadata>
@ -2295,6 +2301,12 @@
<data name="&gt;&gt;tsmiHideMenu.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiHideColumns.Name" xml:space="preserve">
<value>tsmiHideColumns</value>
</data>
<data name="&gt;&gt;tsmiHideColumns.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsmiImagePreview.Name" xml:space="preserve">
<value>tsmiImagePreview</value>
</data>
@ -2761,6 +2773,6 @@
<value>MainForm</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>ShareX.HotkeyForm, ShareX, Version=10.6.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HotkeyForm, ShareX, Version=10.6.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

3
ShareX/Forms/TaskSettingsForm.ru.resx
View file

@ -456,4 +456,7 @@
<data name="cbRegionCaptureUseWindowPattern.Text" xml:space="preserve">
<value>Использовать шаблон имени окна и для захвата области (ShareX угадывает окно за выделенем)</value>
</data>
<data name="tpFileNaming.Text" xml:space="preserve">
<value>Имена файлов</value>
</data>
</root>

16
ShareX/Program.cs
View file

@ -385,22 +385,6 @@ public static void LoadProgramSettings()
{
Settings = ApplicationConfig.Load(ApplicationConfigFilePath);
DefaultTaskSettings = Settings.DefaultTaskSettings;
SettingsBackwardCompatibility();
}
// TODO: Remove this method next version
private static void SettingsBackwardCompatibility()
{
if (Settings.IsUpgrade)
{
Settings.UseDefaultClipboardCopyImage = true;
if (DefaultTaskSettings.UploadSettings.NameFormatPatternActiveWindow.Equals("%t_%y-%mo-%d_%h-%mi-%s", StringComparison.InvariantCultureIgnoreCase))
{
DefaultTaskSettings.UploadSettings.NameFormatPatternActiveWindow = "%pn_%y-%mo-%d_%h-%mi-%s";
}
}
}
public static void LoadUploadersConfig()

26
ShareX/Properties/Resources.Designer.cs generated
View file

@ -251,7 +251,7 @@ public static string ApplicationSettingsForm_btnBrowsePersonalFolderPath_Click_C
}
/// <summary>
/// Looks up a localized string similar to ShareX need to be restarted for language changes to apply.
/// Looks up a localized string similar to ShareX needs to be restarted for the language changes to apply.
///Would you like to restart ShareX?.
/// </summary>
public static string ApplicationSettingsForm_cbLanguage_SelectedIndexChanged_Language_Restart {
@ -636,7 +636,7 @@ public static System.Drawing.Bitmap Diamond {
/// </summary>
public static System.Drawing.Bitmap document_break {
get {
object obj = ResourceManager.GetObject("document-break", resourceCulture);
object obj = ResourceManager.GetObject("document_break", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -964,7 +964,7 @@ public static string HotkeyManager_ShowFailedHotkeys_hotkeys {
}
/// <summary>
/// Looks up a localized string similar to These applications could be conflicting:.
/// Looks up a localized string similar to There may be an application conflict:.
/// </summary>
public static string HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_ {
get {
@ -1213,6 +1213,16 @@ public static System.Drawing.Bitmap layers_ungroup {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap layout_select {
get {
object obj = ResourceManager.GetObject("layout_select", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -1622,7 +1632,7 @@ public static string ScreenRecordForm_StartRecording_FFmpeg_error {
}
/// <summary>
/// Looks up a localized string similar to FFmpeg video and audio source both can&apos;t be &quot;None&quot;..
/// Looks up a localized string similar to FFmpeg video and audio source can&apos;t both be &quot;None&quot;..
/// </summary>
public static string ScreenRecordForm_StartRecording_FFmpeg_video_and_audio_source_both_can_t_be__None__ {
get {
@ -1687,7 +1697,7 @@ public static string TaskHelpers_OpenFTPClient_FTP_client_only_supports_FTP_or_F
}
/// <summary>
/// Looks up a localized string similar to Unable to find valid FTP account..
/// Looks up a localized string similar to Unable to find a valid FTP account..
/// </summary>
public static string TaskHelpers_OpenFTPClient_Unable_to_find_valid_FTP_account_ {
get {
@ -1705,7 +1715,7 @@ public static string TaskHelpers_OpenImageEditor_Image_editor___How_to_load_imag
}
/// <summary>
/// Looks up a localized string similar to Your clipboard contains image, would you like to open it in image editor?
/// Looks up a localized string similar to Your clipboard contains an image, would you like to open it in the image editor?
///
///Press yes to open image from clipboard. Alternatively, press no to open image file dialog box..
/// </summary>
@ -1752,7 +1762,7 @@ public static string TaskHelpers_TweetMessage_Tweet_successfully_sent_ {
}
/// <summary>
/// Looks up a localized string similar to Unable to find valid Twitter account..
/// Looks up a localized string similar to Unable to find a valid Twitter account..
/// </summary>
public static string TaskHelpers_TweetMessage_Unable_to_find_valid_Twitter_account_ {
get {
@ -2040,7 +2050,7 @@ public static string UploadManager_UploadFolder_Folder_upload {
}
/// <summary>
/// Looks up a localized string similar to URL to download from and upload.
/// Looks up a localized string similar to URL to download and upload.
/// </summary>
public static string UploadManager_UploadURL_URL_to_download_from_and_upload {
get {

149
ShareX/Properties/Resources.resx
View file

@ -122,8 +122,8 @@
Are you sure you want to continue?</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="layer_shape_round" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-shape-round.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="ui_scroll_pane_image" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ui-scroll-pane-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ScreenRecordForm_StartRecording_Encoding___" xml:space="preserve">
<value>Encoding...</value>
@ -138,9 +138,6 @@ Are you sure you want to continue?</value>
<data name="UploadTask_CreateURLShortenerTask_Shorten_URL___0__" xml:space="preserve">
<value>Shorten URL ({0})</value>
</data>
<data name="layer_transparent" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-transparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ScreenRecordForm_StartRecording_There_is_no_valid_CLI_video_encoder_selected_" xml:space="preserve">
<value>There is no valid CLI video encoder selected.</value>
</data>
@ -166,15 +163,18 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading.</
<data name="google_plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\google_plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="toolbox" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\toolbox.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="vn" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\vn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="au" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\au.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ScreenRecordForm_StartRecording_FFmpeg_error" xml:space="preserve">
<value>FFmpeg error</value>
</data>
<data name="checkbox_check" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox_check.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ScreenRecordForm_DownloaderForm_InstallRequested_FFmpeg_successfully_downloaded_" xml:space="preserve">
<value>FFmpeg successfully downloaded.</value>
</data>
@ -223,9 +223,6 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading.</
<data name="folder_open_image" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\folder-open-image.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ui_scroll_pane_image" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ui-scroll-pane-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="camcorder_pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\camcorder--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -266,9 +263,6 @@ Please select a different hotkey or quit the conflicting application and reopen
<data name="AutoCaptureForm_Execute_Stop" xml:space="preserve">
<value>Stop</value>
</data>
<data name="RecentManager_UpdateRecentMenu_Left_click_to_copy_URL_to_clipboard__Right_click_to_open_URL_" xml:space="preserve">
<value>Left click to copy URL to clipboard. Right click to open URL.</value>
</data>
<data name="robot" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\robot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -311,6 +305,9 @@ Please select a different hotkey or quit the conflicting application and reopen
<data name="MainForm_AfterShownJobs_You_can_single_left_click_the_ShareX_tray_icon_to_start_region_capture_" xml:space="preserve">
<value>You can single left click the ShareX tray icon to start region capture.</value>
</data>
<data name="application_task" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-task.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="TaskSettingsForm_UpdateWindowTitle_Task_settings" xml:space="preserve">
<value>Task settings</value>
</data>
@ -328,9 +325,6 @@ Would you like to automatically download it?</value>
<data name="application_block" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-block.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="AboutForm_AboutForm_Translators" xml:space="preserve">
<value>Translators</value>
</data>
<data name="image_export" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image-export.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -358,6 +352,9 @@ Press yes to open image from clipboard. Alternatively, press no to open image fi
<data name="TaskSettingsForm_UpdateUploaderMenuNames_Image_uploader___0_" xml:space="preserve">
<value>Image uploader: {0}</value>
</data>
<data name="document_break" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\document-break.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Polygon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Polygon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -370,8 +367,8 @@ Press yes to open image from clipboard. Alternatively, press no to open image fi
<data name="MainForm_UpdateMenu_Hide_menu" xml:space="preserve">
<value>Hide menu</value>
</data>
<data name="monitor" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="TaskSettingsForm_UpdateWindowTitle_Task_settings_for__0_" xml:space="preserve">
<value>Task settings for {0}</value>
</data>
<data name="WebpageCaptureForm_UpdateControls_Capture" xml:space="preserve">
<value>Capture</value>
@ -424,6 +421,9 @@ Press yes to open image from clipboard. Alternatively, press no to open image fi
<data name="kr" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\kr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="TaskManager_task_UploadCompleted_Error" xml:space="preserve">
<value>Error</value>
</data>
@ -446,6 +446,9 @@ here</value>
<data name="HotkeyManager_ShowFailedHotkeys_hotkeys" xml:space="preserve">
<value>hotkeys</value>
</data>
<data name="arrow_270" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow-270.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="drive" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\drive.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -458,6 +461,9 @@ here</value>
<data name="traffic_cone" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\traffic-cone.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="AboutForm_AboutForm_Issues" xml:space="preserve">
<value>Issues</value>
</data>
<data name="EncoderProgramForm_btnOK_Click_Path_can_t_be_empty_" xml:space="preserve">
<value>Path can't be empty.</value>
</data>
@ -505,8 +511,8 @@ Please run ShareX as administrator to change personal folder path.</value>
<data name="TaskHelpers_OpenFTPClient_FTP_client_only_supports_FTP_or_FTPS_" xml:space="preserve">
<value>FTP client only supports FTP or FTPS.</value>
</data>
<data name="layers_arrange" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layers-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="arrow_090" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow-090.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="WatchFolderForm_btnPathBrowse_Click_Choose_folder_path" xml:space="preserve">
<value>Choose folder path</value>
@ -514,6 +520,9 @@ Please run ShareX as administrator to change personal folder path.</value>
<data name="Rectangle" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Rectangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ImageData_Write_Error" xml:space="preserve">
<value>Could not write image to path {0}.</value>
</data>
<data name="ApplicationSettingsForm_cbLanguage_SelectedIndexChanged_Language_Restart" xml:space="preserve">
<value>ShareX needs to be restarted for the language changes to apply.
Would you like to restart ShareX?</value>
@ -521,9 +530,6 @@ Would you like to restart ShareX?</value>
<data name="layer_shape" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-shape.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="eraser" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="image_pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\image--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -536,9 +542,6 @@ Would you like to restart ShareX?</value>
<data name="cn" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="categories" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\categories.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="FileExistForm_txtNewName_TextChanged_Use_new_name__" xml:space="preserve">
<value>Use new name: </value>
</data>
@ -575,8 +578,8 @@ Would you like to restart ShareX?</value>
<data name="folder_tree" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\folder-tree.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="arrow_270" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow-270.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="AboutForm_AboutForm_Translators" xml:space="preserve">
<value>Translators</value>
</data>
<data name="layer" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -608,6 +611,9 @@ Would you like to restart ShareX?</value>
<data name="clipboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clipboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="barcode_2d" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\barcode-2d.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Program_Run_Unable_to_create_folder_" xml:space="preserve">
<value>Unable to create folder:</value>
</data>
@ -620,8 +626,14 @@ Would you like to restart ShareX?</value>
<data name="film" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\film.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="arrow_090" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\arrow-090.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="ScreenColorPicker_ScreenColorPicker_Close" xml:space="preserve">
<value>Close</value>
</data>
<data name="RecentManager_UpdateRecentMenu_Left_click_to_copy_URL_to_clipboard__Right_click_to_open_URL_" xml:space="preserve">
<value>Left click to copy URL to clipboard. Right click to open URL.</value>
</data>
<data name="ScreenRecordForm_DownloaderForm_InstallRequested_Download_of_FFmpeg_failed_" xml:space="preserve">
<value>Download of FFmpeg failed.</value>
</data>
<data name="clipboard_list" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clipboard-list.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -638,8 +650,11 @@ Would you like to restart ShareX?</value>
<data name="UploadManager_UploadFile_File_upload" xml:space="preserve">
<value>File upload</value>
</data>
<data name="cross" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>There may be an application conflict:</value>
</data>
<data name="ScreenColorPicker_UpdateControls_Start_screen_color_picker" xml:space="preserve">
<value>Start screen color picker</value>
</data>
<data name="navigation_000_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\navigation-000-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -654,6 +669,9 @@ Would you like to restart ShareX?</value>
<value>Download failed:
{0}</value>
</data>
<data name="TaskSettingsForm_UpdateUploaderMenuNames_After_upload___0_" xml:space="preserve">
<value>After upload: {0}</value>
</data>
<data name="layer_shape_ellipse" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-shape-ellipse.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -684,8 +702,8 @@ Would you like to restart ShareX?</value>
<data name="layer_shape_polygon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-shape-polygon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="toolbox" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\toolbox.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="checkbox_check" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox_check.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="UploadTask_OnUploadCompleted_Stopped" xml:space="preserve">
<value>Stopped</value>
@ -702,21 +720,18 @@ Would you like to restart ShareX?</value>
<data name="ChromeForm_btnUnregister_Click_Chrome_support_disabled_" xml:space="preserve">
<value>Chrome support disabled.</value>
</data>
<data name="AboutForm_AboutForm_Issues" xml:space="preserve">
<value>Issues</value>
<data name="cross" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ChromeForm_btnRegister_Click_Chrome_support_enabled_" xml:space="preserve">
<value>Chrome support enabled.</value>
</data>
<data name="ScreenColorPicker_ScreenColorPicker_Close" xml:space="preserve">
<value>Close</value>
<data name="layer_transparent" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-transparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wrench_screwdriver" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wrench-screwdriver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="application_browser" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-browser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ErrorSound" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ErrorSound.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@ -726,8 +741,8 @@ Would you like to restart ShareX?</value>
<data name="MainForm_tsmiTestTextUpload_Click_Text_upload_test" xml:space="preserve">
<value>Text upload test</value>
</data>
<data name="application_task" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-task.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="application_browser" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application-browser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="notebook" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\notebook.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -735,8 +750,8 @@ Would you like to restart ShareX?</value>
<data name="Twitter" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Twitter.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="TaskSettingsForm_UpdateWindowTitle_Task_settings_for__0_" xml:space="preserve">
<value>Task settings for {0}</value>
<data name="layer_shape_round" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layer-shape-round.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="color" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\color.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -768,23 +783,20 @@ Would you like to restart ShareX?</value>
<data name="RoundedRectangle" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\RoundedRectangle.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="TaskHelpers_TweetMessage_Unable_to_find_valid_Twitter_account_" xml:space="preserve">
<value>Unable to find a valid Twitter account.</value>
</data>
<data name="BeforeUploadForm_BeforeUploadForm__0__is_about_to_be_uploaded_to__1___You_may_choose_a_different_destination_" xml:space="preserve">
<value>{0} is about to be uploaded to {1}. You may choose a different destination.</value>
<data name="monitor" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="AboutForm_AboutForm_Website" xml:space="preserve">
<value>Website</value>
</data>
<data name="pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="categories" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\categories.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="TaskSettingsForm_UpdateUploaderMenuNames_After_upload___0_" xml:space="preserve">
<value>After upload: {0}</value>
<data name="layers_arrange" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layers-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="barcode_2d" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\barcode-2d.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="eraser" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Fullscreen" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Fullscreen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -799,22 +811,13 @@ Would you like to restart ShareX?</value>
<value>Click to start recording.</value>
<comment>Text must be equal to or lower than 54 characters because of tray icon text length limit.</comment>
</data>
<data name="ScreenRecordForm_DownloaderForm_InstallRequested_Download_of_FFmpeg_failed_" xml:space="preserve">
<value>Download of FFmpeg failed.</value>
<data name="BeforeUploadForm_BeforeUploadForm__0__is_about_to_be_uploaded_to__1___You_may_choose_a_different_destination_" xml:space="preserve">
<value>{0} is about to be uploaded to {1}. You may choose a different destination.</value>
</data>
<data name="ScreenColorPicker_UpdateControls_Start_screen_color_picker" xml:space="preserve">
<value>Start screen color picker</value>
<data name="TaskHelpers_TweetMessage_Unable_to_find_valid_Twitter_account_" xml:space="preserve">
<value>Unable to find a valid Twitter account.</value>
</data>
<data name="document-break" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\document-break.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="layout_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\layout-select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="vn" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\vn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ImageData_Write_Error" xml:space="preserve">
<value>Could not write image to path {0}.</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>There may be an application conflict:</value>
</data>
</root>
</root>

BIN
ShareX/Resources/layout-select.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 392 B

1
ShareX/ShareX.csproj
View file

@ -1247,6 +1247,7 @@
<None Include="Resources\ui-scroll-pane-image.png" />
<None Include="Resources\document-break.png" />
<None Include="Resources\vn.png" />
<None Include="Resources\layout-select.png" />
<Content Include="ShareX_Icon.ico" />
<None Include="Resources\globe--pencil.png" />
<None Include="Resources\camcorder--pencil.png" />