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

Added resx fields

Browse source
This commit is contained in:
Jaex 2015-11-15 11:16:21 +02:00
parent 265eeaad85
commit 58e9db8cf8
6 changed files with 137 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ShareX.HelpersLib/Properties/Resources.Designer.cs generated
View file

@ -2226,6 +2226,16 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to A newer version of {0} is available.
///Would you like to download it?.
/// </summary>
internal static string UpdateMessageBox_UpdateMessageBox_Portable {
get {
return ResourceManager.GetString("UpdateMessageBox_UpdateMessageBox_Portable", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Update is available.
/// </summary>

4
ShareX.HelpersLib/Properties/Resources.resx
View file

@ -847,4 +847,8 @@ Would you like to download and install it?</value>
<data name="ResponseType_LocationHeader" xml:space="preserve">
<value>Location header</value>
</data>
<data name="UpdateMessageBox_UpdateMessageBox_Portable" xml:space="preserve">
<value>A newer version of {0} is available.
Would you like to download it?</value>
</data>
</root>

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

@ -35,7 +35,7 @@ public partial class UpdateMessageBox : BlackStyleForm
public bool ActivateWindow { get; private set; }
public UpdateMessageBox(bool activateWindow)
public UpdateMessageBox(bool activateWindow, bool isPortable = false)
{
ActivateWindow = activateWindow;
InitializeComponent();
@ -47,7 +47,15 @@ public UpdateMessageBox(bool activateWindow)
}
Text = Resources.UpdateMessageBox_UpdateMessageBox_update_is_available;
lblText.Text = string.Format(Resources.UpdateMessageBox_UpdateMessageBox_, Application.ProductName);
if (isPortable)
{
lblText.Text = string.Format(Resources.UpdateMessageBox_UpdateMessageBox_Portable, Application.ProductName);
}
else
{
lblText.Text = string.Format(Resources.UpdateMessageBox_UpdateMessageBox_, Application.ProductName);
}
}
public static void Start(UpdateChecker updateChecker, bool activateWindow = true)
@ -60,7 +68,7 @@ public static void Start(UpdateChecker updateChecker, bool activateWindow = true
{
DialogResult result;
using (UpdateMessageBox messageBox = new UpdateMessageBox(activateWindow))
using (UpdateMessageBox messageBox = new UpdateMessageBox(activateWindow, updateChecker.IsPortable))
{
result = messageBox.ShowDialog();
}

32
ShareX.ScreenCaptureLib/Forms/RectangleAnnotate.cs
View file

@ -93,7 +93,7 @@ public Point PreviousMousePosition0Based
private Point positionOnClick;
private bool isMouseDown, isBusy;
private Stopwatch penTimer;
private Font infoFont, tipFont;
private Font infoFont;
public RectangleAnnotate(RectangleAnnotateOptions options)
{
@ -107,7 +107,6 @@ public RectangleAnnotate(RectangleAnnotateOptions options)
textBackgroundPenWhite = new Pen(Color.FromArgb(50, Color.White));
textBackgroundPenBlack = new Pen(Color.FromArgb(150, Color.Black));
infoFont = new Font("Verdana", 9);
tipFont = new Font("Arial", 13);
penTimer = Stopwatch.StartNew();
ScreenRectangle = CaptureHelpers.GetScreenBounds();
@ -163,7 +162,6 @@ protected override void Dispose(bool disposing)
if (textBackgroundPenWhite != null) textBackgroundPenWhite.Dispose();
if (textBackgroundPenBlack != null) textBackgroundPenBlack.Dispose();
if (infoFont != null) infoFont.Dispose();
if (tipFont != null) tipFont.Dispose();
base.Dispose(disposing);
}
@ -340,10 +338,6 @@ protected override void OnPaintBackground(PaintEventArgs e)
protected override void OnPaint(PaintEventArgs e)
{
Graphics g = e.Graphics;
g.InterpolationMode = InterpolationMode.NearestNeighbor;
g.SmoothingMode = SmoothingMode.HighQuality;
if (Mode == RegionAnnotateMode.Pen && isMouseDown)
{
using (Graphics gImage = Graphics.FromImage(backgroundImage))
@ -353,12 +347,17 @@ protected override void OnPaint(PaintEventArgs e)
}
}
Graphics g = e.Graphics;
g.InterpolationMode = InterpolationMode.NearestNeighbor;
g.SmoothingMode = SmoothingMode.HighQuality;
g.CompositingMode = CompositingMode.SourceCopy;
g.DrawImage(backgroundImage, ScreenRectangle0Based);
g.CompositingMode = CompositingMode.SourceOver;
if (Mode == RegionAnnotateMode.Rectangle)
{
g.SmoothingMode = SmoothingMode.HighSpeed;
if (isMouseDown)
{
DrawRectangle(g);
@ -367,6 +366,8 @@ protected override void OnPaint(PaintEventArgs e)
{
DrawRectangleMarker(g);
}
g.SmoothingMode = SmoothingMode.HighQuality;
}
else if (Mode == RegionAnnotateMode.Pen)
{
@ -427,27 +428,26 @@ protected virtual void WriteTips(StringBuilder sb)
{
sb.AppendLine(Resources.RectangleRegion_WriteTips__F1__Hide_tips);
// TODO: Add resources
sb.AppendLine();
sb.AppendLine("[Mouse wheel] Swap modes");
sb.AppendLine(Resources.RectangleAnnotate_WriteTips__Mouse_wheel__Swap_modes);
if (Mode == RegionAnnotateMode.Capture) sb.Append("-> ");
sb.AppendLine("[1] Select capture mode");
sb.AppendLine(Resources.RectangleAnnotate_WriteTips__1__Select_capture_mode);
if (Mode == RegionAnnotateMode.Rectangle) sb.Append("-> ");
sb.AppendLine("[2] Select rectangle drawing mode");
sb.AppendLine(Resources.RectangleAnnotate_WriteTips__2__Select_rectangle_drawing_mode);
if (Mode == RegionAnnotateMode.Pen) sb.Append("-> ");
sb.AppendLine("[3] Select pen drawing mode");
sb.AppendLine(Resources.RectangleAnnotate_WriteTips__3__Select_pen_drawing_mode);
switch (Mode)
{
case RegionAnnotateMode.Rectangle:
sb.AppendLine();
sb.AppendLine("[Shift] Change border color");
sb.AppendLine("[Ctrl + Mouse wheel] Change border size");
sb.AppendLine(Resources.RectangleAnnotate_WriteTips__Shift__Change_border_color);
sb.AppendLine(Resources.RectangleAnnotate_WriteTips__Ctrl___Mouse_wheel__Change_border_size);
break;
case RegionAnnotateMode.Pen:
sb.AppendLine();
sb.AppendLine("[Shift] Change pen color");
sb.AppendLine("[Ctrl + Mouse wheel] Change pen size");
sb.AppendLine(Resources.RectangleAnnotate_WriteTips__Shift__Change_pen_color);
sb.AppendLine(Resources.RectangleAnnotate_WriteTips__Ctrl___Mouse_wheel__Change_pen_size);
break;
}

72
ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs generated
View file

@ -144,6 +144,78 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to [1] Select capture mode.
/// </summary>
internal static string RectangleAnnotate_WriteTips__1__Select_capture_mode {
get {
return ResourceManager.GetString("RectangleAnnotate_WriteTips__1__Select_capture_mode", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to [2] Select rectangle drawing mode.
/// </summary>
internal static string RectangleAnnotate_WriteTips__2__Select_rectangle_drawing_mode {
get {
return ResourceManager.GetString("RectangleAnnotate_WriteTips__2__Select_rectangle_drawing_mode", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to [3] Select pen drawing mode.
/// </summary>
internal static string RectangleAnnotate_WriteTips__3__Select_pen_drawing_mode {
get {
return ResourceManager.GetString("RectangleAnnotate_WriteTips__3__Select_pen_drawing_mode", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to [Ctrl + Mouse wheel] Change border size.
/// </summary>
internal static string RectangleAnnotate_WriteTips__Ctrl___Mouse_wheel__Change_border_size {
get {
return ResourceManager.GetString("RectangleAnnotate_WriteTips__Ctrl___Mouse_wheel__Change_border_size", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to [Ctrl + Mouse wheel] Change pen size.
/// </summary>
internal static string RectangleAnnotate_WriteTips__Ctrl___Mouse_wheel__Change_pen_size {
get {
return ResourceManager.GetString("RectangleAnnotate_WriteTips__Ctrl___Mouse_wheel__Change_pen_size", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to [Mouse wheel] Swap modes.
/// </summary>
internal static string RectangleAnnotate_WriteTips__Mouse_wheel__Swap_modes {
get {
return ResourceManager.GetString("RectangleAnnotate_WriteTips__Mouse_wheel__Swap_modes", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to [Shift] Change border color.
/// </summary>
internal static string RectangleAnnotate_WriteTips__Shift__Change_border_color {
get {
return ResourceManager.GetString("RectangleAnnotate_WriteTips__Shift__Change_border_color", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to [Shift] Change pen color.
/// </summary>
internal static string RectangleAnnotate_WriteTips__Shift__Change_pen_color {
get {
return ResourceManager.GetString("RectangleAnnotate_WriteTips__Shift__Change_pen_color", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Rectangle capture light.
/// </summary>

24
ShareX.ScreenCaptureLib/Properties/Resources.resx
View file

@ -300,4 +300,28 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
<data name="exclamation_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\exclamation-button.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="RectangleAnnotate_WriteTips__Mouse_wheel__Swap_modes" xml:space="preserve">
<value>[Mouse wheel] Swap modes</value>
</data>
<data name="RectangleAnnotate_WriteTips__1__Select_capture_mode" xml:space="preserve">
<value>[1] Select capture mode</value>
</data>
<data name="RectangleAnnotate_WriteTips__2__Select_rectangle_drawing_mode" xml:space="preserve">
<value>[2] Select rectangle drawing mode</value>
</data>
<data name="RectangleAnnotate_WriteTips__3__Select_pen_drawing_mode" xml:space="preserve">
<value>[3] Select pen drawing mode</value>
</data>
<data name="RectangleAnnotate_WriteTips__Shift__Change_border_color" xml:space="preserve">
<value>[Shift] Change border color</value>
</data>
<data name="RectangleAnnotate_WriteTips__Ctrl___Mouse_wheel__Change_border_size" xml:space="preserve">
<value>[Ctrl + Mouse wheel] Change border size</value>
</data>
<data name="RectangleAnnotate_WriteTips__Shift__Change_pen_color" xml:space="preserve">
<value>[Shift] Change pen color</value>
</data>
<data name="RectangleAnnotate_WriteTips__Ctrl___Mouse_wheel__Change_pen_size" xml:space="preserve">
<value>[Ctrl + Mouse wheel] Change pen size</value>
</data>
</root>