[PTRun]Improve copying error handling on plugins (#35459)
This commit is contained in:
Родитель
5d2bb16e92
Коммит
db3c8e621e
|
@ -14,6 +14,7 @@ using System.Windows.Input;
|
|||
|
||||
using ManagedCommon;
|
||||
using Wox.Plugin;
|
||||
using Wox.Plugin.Logger;
|
||||
|
||||
namespace Community.PowerToys.Run.Plugin.UnitConverter
|
||||
{
|
||||
|
@ -75,9 +76,10 @@ namespace Community.PowerToys.Run.Plugin.UnitConverter
|
|||
Clipboard.SetText(result.ConvertedValue.ToString(UnitConversionResult.CopyFormat, CultureInfo.CurrentCulture));
|
||||
ret = true;
|
||||
}
|
||||
catch (ExternalException)
|
||||
catch (ExternalException ex)
|
||||
{
|
||||
MessageBox.Show(Properties.Resources.copy_failed);
|
||||
Log.Exception("Copy failed", ex, GetType());
|
||||
MessageBox.Show(ex.Message, Properties.Resources.copy_failed);
|
||||
}
|
||||
});
|
||||
thread.SetApartmentState(ApartmentState.STA);
|
||||
|
@ -107,9 +109,10 @@ namespace Community.PowerToys.Run.Plugin.UnitConverter
|
|||
Clipboard.SetText(result.ConvertedValue.ToString(UnitConversionResult.CopyFormat, CultureInfo.CurrentCulture));
|
||||
ret = true;
|
||||
}
|
||||
catch (ExternalException)
|
||||
catch (ExternalException ex)
|
||||
{
|
||||
MessageBox.Show(Properties.Resources.copy_failed);
|
||||
Log.Exception("Copy failed", ex, GetType());
|
||||
MessageBox.Show(ex.Message, Properties.Resources.copy_failed);
|
||||
}
|
||||
});
|
||||
thread.SetApartmentState(ApartmentState.STA);
|
||||
|
|
|
@ -184,9 +184,10 @@ namespace Community.PowerToys.Run.Plugin.ValueGenerator
|
|||
Clipboard.SetText(request.ResultToString());
|
||||
ret = true;
|
||||
}
|
||||
catch (ExternalException)
|
||||
catch (ExternalException ex)
|
||||
{
|
||||
MessageBox.Show(Properties.Resources.copy_failed);
|
||||
Log.Exception("Copy failed", ex, GetType());
|
||||
MessageBox.Show(ex.Message, Properties.Resources.copy_failed);
|
||||
}
|
||||
});
|
||||
thread.SetApartmentState(ApartmentState.STA);
|
||||
|
|
|
@ -8,6 +8,7 @@ using System.Threading;
|
|||
using System.Windows;
|
||||
|
||||
using Wox.Plugin;
|
||||
using Wox.Plugin.Logger;
|
||||
|
||||
namespace Microsoft.PowerToys.Run.Plugin.Calculator
|
||||
{
|
||||
|
@ -51,9 +52,10 @@ namespace Microsoft.PowerToys.Run.Plugin.Calculator
|
|||
Clipboard.SetText(roundedResult?.ToString(culture));
|
||||
ret = true;
|
||||
}
|
||||
catch (ExternalException)
|
||||
catch (ExternalException ex)
|
||||
{
|
||||
MessageBox.Show(Properties.Resources.wox_plugin_calculator_copy_failed);
|
||||
Log.Exception("Copy failed", ex, typeof(ResultHelper));
|
||||
MessageBox.Show(ex.Message, Properties.Resources.wox_plugin_calculator_copy_failed);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
@ -50,13 +50,13 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeDate.Components
|
|||
{
|
||||
try
|
||||
{
|
||||
Clipboard.Clear();
|
||||
Clipboard.SetText(text);
|
||||
return true;
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
Log.Exception("Can't copy to clipboard", exception, typeof(ResultHelper));
|
||||
MessageBox.Show(exception.Message, Resources.Microsoft_plugin_timedate_copy_failed);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -60,6 +60,15 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeDate.Properties {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Copy failed.
|
||||
/// </summary>
|
||||
internal static string Microsoft_plugin_timedate_copy_failed {
|
||||
get {
|
||||
return ResourceManager.GetString("Microsoft_plugin_timedate_copy_failed", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Copy value (Ctrl+C).
|
||||
/// </summary>
|
||||
|
|
|
@ -121,6 +121,9 @@
|
|||
<value>Copy value (Ctrl+C)</value>
|
||||
<comment>'Ctrl+C' is a shortcut</comment>
|
||||
</data>
|
||||
<data name="Microsoft_plugin_timedate_copy_failed" xml:space="preserve">
|
||||
<value>Copy failed</value>
|
||||
</data>
|
||||
<data name="Microsoft_plugin_timedate_Date" xml:space="preserve">
|
||||
<value>Date</value>
|
||||
</data>
|
||||
|
|
Загрузка…
Ссылка в новой задаче