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

Removed conflicting application suggestions

Browse source
This commit is contained in:
Jaex 2023-07-01 13:42:05 +03:00
parent c4dde0c3a0
commit 1b0c100b3b
22 changed files with 1 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ShareX/HotkeyManager.cs
View file

@ -25,9 +25,7 @@
using ShareX.HelpersLib;
using ShareX.Properties;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Windows.Forms;
@ -191,21 +189,10 @@ public void ShowFailedHotkeys()
if (failedHotkeysList.Count > 0)
{
string failedHotkeys = string.Join("\r\n", failedHotkeysList.Select(x => x.TaskSettings.ToString() + ": " + x.HotkeyInfo.ToString()));
string failedHotkeys = string.Join("\r\n", failedHotkeysList.Select(x => $"[{x.HotkeyInfo}] {x.TaskSettings}"));
string hotkeyText = failedHotkeysList.Count > 1 ? Resources.HotkeyManager_ShowFailedHotkeys_hotkeys : Resources.HotkeyManager_ShowFailedHotkeys_hotkey;
string text = string.Format(Resources.HotkeyManager_ShowFailedHotkeys_Unable_to_register_hotkey, hotkeyText, failedHotkeys);
string[] processNames = new string[] { "ShareX", "OneDrive", "Dropbox", "Greenshot", "ScreenshotCaptor", "FSCapture", "Snagit32", "puush", "Lightshot" };
int ignoreProcess = Process.GetCurrentProcess().Id;
List<string> conflictProcessNames = Process.GetProcesses().Where(x => x.Id != ignoreProcess && !string.IsNullOrEmpty(x.ProcessName) &&
processNames.Any(x2 => x.ProcessName.Equals(x2, StringComparison.OrdinalIgnoreCase))).
Select(x => string.Format("{0} ({1})", x.MainModule.FileVersionInfo.ProductName, x.MainModule.ModuleName)).Distinct().ToList();
if (conflictProcessNames != null && conflictProcessNames.Count > 0)
{
text += "\r\n\r\n" + Resources.HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_ + "\r\n\r\n" + string.Join("\r\n", conflictProcessNames);
}
MessageBox.Show(text, "ShareX - " + Resources.HotkeyManager_ShowFailedHotkeys_Hotkey_registration_failed, MessageBoxButtons.OK, MessageBoxIcon.Warning);
}
}

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

@ -1683,15 +1683,6 @@ public class Resources {
}
}
/// <summary>
/// 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 {
return ResourceManager.GetString("HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Unable to register {0}:
///

3
ShareX/Properties/Resources.de.resx
View file

@ -141,9 +141,6 @@
<data name="UploadManager_IsUploadConfirmed_Upload_files" xml:space="preserve">
<value>Dateien hochladen</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>Diese Anwendungen könnten die Benutzung vom ShareX stören:</value>
</data>
<data name="TaskManager_task_UploadCompleted_Error" xml:space="preserve">
<value>Fehler</value>
</data>

3
ShareX/Properties/Resources.es-MX.resx
View file

@ -265,9 +265,6 @@ Por favor seleccione un atajo de teclado diferente o salga de la aplicación que
<data name="AboutForm_AboutForm_Language_ko_KR" xml:space="preserve">
<value>Coreano</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>Alguna aplicación podría estar interfiriendo:</value>
</data>
<data name="ActionsToolbarEditForm_Separator" xml:space="preserve">
<value>Separador</value>
</data>

3
ShareX/Properties/Resources.fr.resx
View file

@ -160,9 +160,6 @@ Cliquez sur « Non » pour annuler la mise en ligne et désactiver la mise en li
<data name="UploadManager_IsUploadConfirmed_Upload_files" xml:space="preserve">
<value>Mise en ligne de fichiers</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>Ces applications pourraient être en conflit :</value>
</data>
<data name="TaskManager_task_UploadCompleted_Error" xml:space="preserve">
<value>Erreur</value>
</data>

3
ShareX/Properties/Resources.he-IL.resx
View file

@ -577,9 +577,6 @@
לחץ מקש ימני בעכבר כדי לפתוח את התפריט
לחץ אמצעי לסגירה</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>ייתכן שיש התנגשות באפליקציה:</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_Hotkey_registration_failed" xml:space="preserve">
<value>רישום מקשי קיצור נכשל</value>
</data>

3
ShareX/Properties/Resources.id-ID.resx
View file

@ -266,9 +266,6 @@ Silakan pilih tombol cepat yang berbeda atau keluar dari aplikasi yang bertentan
<data name="AboutForm_AboutForm_Language_ko_KR" xml:space="preserve">
<value>Bahasa Korea</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>Mungkin ada konflik aplikasi:</value>
</data>
<data name="ActionsToolbarEditForm_Separator" xml:space="preserve">
<value>Pemisah</value>
</data>

3
ShareX/Properties/Resources.it-IT.resx
View file

@ -262,9 +262,6 @@ Qui</value>
<data name="HotkeySelectionControl_StartEditing_Select_a_hotkey___" xml:space="preserve">
<value>Seleziona una Scorciatoia...</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>Potrebbe esserci un conflitto tra applicazioni:</value>
</data>
<data name="Program_WritePersonalPathConfig_Cant_access_to_file" xml:space="preserve">
<value>Impossibile accedere al file "{0}".
Esegui ShareX come amministratore per cambiare il percorso della cartella personale.</value>

3
ShareX/Properties/Resources.ja-JP.resx
View file

@ -272,9 +272,6 @@
<data name="ApplicationSettingsForm_cbStartWithWindows_DisabledByUser_Text" xml:space="preserve">
<value>スタートアップの設定はタスクマネージャーで無効にされています</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>アプリケーションの競合:</value>
</data>
<data name="ActionsToolbarEditForm_Separator" xml:space="preserve">
<value>区切り線</value>
</data>

3
ShareX/Properties/Resources.ko-KR.resx
View file

@ -404,9 +404,6 @@ ShareX를 재시작할까요?</value>
<data name="ActionsToolbar_Edit" xml:space="preserve">
<value>편집...</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>다른 어플리케이션과 단축키가 충돌하는 것 같습니다:</value>
</data>
<data name="AboutForm_AboutForm_Language_pt_BR" xml:space="preserve">
<value>포르투갈어 (브라질)</value>
</data>

3
ShareX/Properties/Resources.nl-NL.resx
View file

@ -291,9 +291,6 @@ Wil je ShareX opnieuw opstarten?</value>
<data name="UploadManager_IsUploadConfirmed_Upload_files" xml:space="preserve">
<value>Upload bestanden</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>Deze programma's kunnen conflicten veroorzaken:</value>
</data>
<data name="TaskManager_task_UploadCompleted_Error" xml:space="preserve">
<value>Fout</value>
</data>

3
ShareX/Properties/Resources.pl.resx
View file

@ -542,9 +542,6 @@ Czy chcesz ponownie uruchomić ShareX?</value>
<data name="ShareXIsMinimizedToTheSystemTray" xml:space="preserve">
<value>ShareX jest zminimalizowany do zasobnika systemowego.</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>Może wystąpić konflikt aplikacji:</value>
</data>
<data name="TaskHelpers_TweetMessage_Tweet_successfully_sent_" xml:space="preserve">
<value>Tweet pomyślnie wysłany.</value>
</data>

3
ShareX/Properties/Resources.pt-BR.resx
View file

@ -291,9 +291,6 @@ Gostaria de reiniciar agora?</value>
<data name="UploadManager_IsUploadConfirmed_Upload_files" xml:space="preserve">
<value>Enviar arquivos</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>Estes aplicativos podem causar conflitos:</value>
</data>
<data name="TaskManager_task_UploadCompleted_Error" xml:space="preserve">
<value>Erro</value>
</data>

3
ShareX/Properties/Resources.pt-PT.resx
View file

@ -233,9 +233,6 @@ aqui</value>
<data name="HotkeyManager_ShowFailedHotkeys_hotkeys" xml:space="preserve">
<value>teclas de atalho</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>Estas aplicações podem causar conflitos:</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_Unable_to_register_hotkey" xml:space="preserve">
<value>Não foi possivel registar {0}:

3
ShareX/Properties/Resources.resx
View file

@ -1055,9 +1055,6 @@ Middle click to close</value>
<data name="disk_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\disk-small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>There may be an application conflict:</value>
</data>
<data name="id" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\id.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

3
ShareX/Properties/Resources.ro.resx
View file

@ -335,9 +335,6 @@ aici</value>
<data name="HotkeyManager_ShowFailedHotkeys_hotkeys" xml:space="preserve">
<value>taste rapide</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>Este posibil să existe un conflict între aplicații:</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_Unable_to_register_hotkey" xml:space="preserve">
<value>Nu se poate înregistra {0}:

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

@ -145,9 +145,6 @@
<data name="UploadManager_IsUploadConfirmed_Upload_files" xml:space="preserve">
<value>Загрузить файлы</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>Эти приложения могут быть причиной конфликта:</value>
</data>
<data name="TaskManager_task_UploadCompleted_Error" xml:space="preserve">
<value>Ошибка</value>
</data>

3
ShareX/Properties/Resources.tr.resx
View file

@ -160,9 +160,6 @@
<data name="UploadManager_IsUploadConfirmed_Upload_files" xml:space="preserve">
<value>Dosyaları yükle</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>Bu uygulamalar çakışıyor olabilir:</value>
</data>
<data name="TaskManager_task_UploadCompleted_Error" xml:space="preserve">
<value>Hata</value>
</data>

3
ShareX/Properties/Resources.uk.resx
View file

@ -290,9 +290,6 @@
<data name="AboutForm_AboutForm_Language_ko_KR" xml:space="preserve">
<value>Корейська</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>Можливий конфлікт програми:</value>
</data>
<data name="ActionsToolbarEditForm_Separator" xml:space="preserve">
<value>Роздільник</value>
</data>

3
ShareX/Properties/Resources.vi-VN.resx
View file

@ -457,9 +457,6 @@ Nhấn "Không" để hủy tiến trình tải lên hiện tại và tắt ch
<data name="ApplicationSettingsForm_cbStartWithWindows_DisabledByUser_Text" xml:space="preserve">
<value>Tự khởi động đã bị vô hiệu trong Task Manager</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>Có thể đã có mâu thuẫn với một ứng dụng:</value>
</data>
<data name="ActionsToolbar_Tip" xml:space="preserve">
<value>Nhấn chuột trái để kéo
Nhấn chuột phải để mở menu

3
ShareX/Properties/Resources.zh-CN.resx
View file

@ -291,9 +291,6 @@
<data name="UploadManager_IsUploadConfirmed_Upload_files" xml:space="preserve">
<value>上传文件</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>可能存在程序冲突：</value>
</data>
<data name="TaskManager_task_UploadCompleted_Error" xml:space="preserve">
<value>错误</value>
</data>

3
ShareX/Properties/Resources.zh-TW.resx
View file

@ -291,9 +291,6 @@
<data name="UploadManager_IsUploadConfirmed_Upload_files" xml:space="preserve">
<value>上傳檔案</value>
</data>
<data name="HotkeyManager_ShowFailedHotkeys_These_applications_could_be_conflicting_" xml:space="preserve">
<value>可能有應用程式衝突：</value>
</data>
<data name="TaskManager_task_UploadCompleted_Error" xml:space="preserve">
<value>錯誤</value>
</data>