github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-20 21:43:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/release/1.3' into release/1.3

Browse source
This commit is contained in:
jklingen 2025-07-15 08:27:41 +02:00
commit 9030d1e2d4
19 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Greenshot.Editor/Forms/ImageEditorForm.cs
View file

@ -1023,6 +1023,9 @@ namespace Greenshot.Editor.Forms
case Keys.C: case Keys.C:
BtnCropClick(sender, e); BtnCropClick(sender, e);
break; break;
case Keys.Z:
BtnResizeClick(sender, e);
break;
} }
} }
else if (e.Modifiers.Equals(Keys.Control)) else if (e.Modifiers.Equals(Keys.Control))

2
src/Greenshot.Editor/Helpers/ScaleHelper.cs
View file

@ -202,7 +202,7 @@ namespace Greenshot.Editor.Helpers
{ {
// scaled rectangle (ratio) would be taller than original // scaled rectangle (ratio) would be taller than original
// keep width and tweak height to maintain aspect ratio // keep width and tweak height to maintain aspect ratio
newSize = newSize.ChangeWidth(selectedSize.Width / originalRatio * flippedRatioSign); newSize = newSize.ChangeHeight(selectedSize.Width / originalRatio * flippedRatioSign);
} }
return newSize; return newSize;

12
src/Greenshot.Plugin.Win10/ToastNotificationService.cs
View file

@ -95,7 +95,17 @@ namespace Greenshot.Plugin.Win10
} }
// Prepare the toast notifier. Be sure to specify the AppUserModelId on your application's shortcut! // Prepare the toast notifier. Be sure to specify the AppUserModelId on your application's shortcut!
var toastNotifier = ToastNotificationManagerCompat.CreateToastNotifier(); Microsoft.Toolkit.Uwp.Notifications.ToastNotifierCompat toastNotifier = null;
try
{
toastNotifier = ToastNotificationManagerCompat.CreateToastNotifier();
}
catch (Exception ex)
{
Log.Warn("Could not create a toast notifier.", ex);
return;
}
// Here is an interesting article on reading the settings: https://www.rudyhuyn.com/blog/2018/02/10/toastnotifier-and-settings-careful-with-non-uwp-applications/ // Here is an interesting article on reading the settings: https://www.rudyhuyn.com/blog/2018/02/10/toastnotifier-and-settings-careful-with-non-uwp-applications/
try try

2
src/Greenshot/Languages/language-ca-CA.xml
View file

@ -305,7 +305,7 @@ Malgrat això, encara es poden utilitzar totes les característiques de Greensho
<resource name="editor_counter">Afegeix un comptador (I)</resource> <resource name="editor_counter">Afegeix un comptador (I)</resource>
<resource name="editor_speechbubble">Afegeix una bafarada (S)</resource> <resource name="editor_speechbubble">Afegeix una bafarada (S)</resource>
<resource name="editor_resize">Canvia la mida</resource> <resource name="editor_resize">Canvia la mida (Z)</resource>
<resource name="editor_resize_settings">Configuració del canvi de mida</resource> <resource name="editor_resize_settings">Configuració del canvi de mida</resource>
<resource name="editor_resize_aspectratio">Manté la relació d'aspecte</resource> <resource name="editor_resize_aspectratio">Manté la relació d'aspecte</resource>
<resource name="editor_resize_width">Amplada</resource> <resource name="editor_resize_width">Amplada</resource>

2
src/Greenshot/Languages/language-cs-CZ.xml
View file

@ -308,7 +308,7 @@ Všechny funkce Greenshotu jsou stále dostupné přímo z místní nabídky bez
<resource name="editor_counter">Přidat počítadlo (I)</resource> <resource name="editor_counter">Přidat počítadlo (I)</resource>
<resource name="editor_speechbubble">Přidat textovou bublinu (S)</resource> <resource name="editor_speechbubble">Přidat textovou bublinu (S)</resource>
<resource name="editor_resize">Změnit velikost</resource> <resource name="editor_resize">Změnit velikost (Z)</resource>
<resource name="editor_resize_settings">Nastavení změny velikosti</resource> <resource name="editor_resize_settings">Nastavení změny velikosti</resource>
<resource name="editor_resize_aspectratio">Zachovat poměr stran</resource> <resource name="editor_resize_aspectratio">Zachovat poměr stran</resource>
<resource name="editor_resize_width">Šířka</resource> <resource name="editor_resize_width">Šířka</resource>

2
src/Greenshot/Languages/language-de-DE.xml
View file

@ -312,7 +312,7 @@ Sie können aber auch alle Greenshot-Funktionen über das Kontextmenü des Green
<resource name="editor_counter">Zähler hinzufügen (I)</resource> <resource name="editor_counter">Zähler hinzufügen (I)</resource>
<resource name="editor_speechbubble">Sprechblase hinzufügen (S)</resource> <resource name="editor_speechbubble">Sprechblase hinzufügen (S)</resource>
<resource name="editor_resize">Skalieren</resource> <resource name="editor_resize">Skalieren (Z)</resource>
<resource name="editor_resize_settings">Einstellungen für Skalierung</resource> <resource name="editor_resize_settings">Einstellungen für Skalierung</resource>
<resource name="editor_resize_aspectratio">Seitenverhältnis beibehalten</resource> <resource name="editor_resize_aspectratio">Seitenverhältnis beibehalten</resource>
<resource name="editor_resize_width">Breite</resource> <resource name="editor_resize_width">Breite</resource>

2
src/Greenshot/Languages/language-en-US.xml
View file

@ -312,7 +312,7 @@ All Greenshot features still work directly from the tray icon context menu witho
<resource name="editor_counter">Add counter (I)</resource> <resource name="editor_counter">Add counter (I)</resource>
<resource name="editor_speechbubble">Add speechbubble (S)</resource> <resource name="editor_speechbubble">Add speechbubble (S)</resource>
<resource name="editor_resize">Resize</resource> <resource name="editor_resize">Resize (Z)</resource>
<resource name="editor_resize_settings">Resize settings</resource> <resource name="editor_resize_settings">Resize settings</resource>
<resource name="editor_resize_aspectratio">Maintain aspect ratio</resource> <resource name="editor_resize_aspectratio">Maintain aspect ratio</resource>
<resource name="editor_resize_width">Width</resource> <resource name="editor_resize_width">Width</resource>

2
src/Greenshot/Languages/language-fr-FR.xml
View file

@ -144,7 +144,7 @@ De plus, nous apprécierions beaucoup que vous preniez la peine de vérifier si
<resource name="editor_print">Imprimer</resource> <resource name="editor_print">Imprimer</resource>
<resource name="editor_redo">Rétablir {0}</resource> <resource name="editor_redo">Rétablir {0}</resource>
<resource name="editor_resetsize">Réinitialiser la taille</resource> <resource name="editor_resetsize">Réinitialiser la taille</resource>
<resource name="editor_resize">Redimensionner</resource> <resource name="editor_resize">Redimensionner (Z)</resource>
<resource name="editor_resize_aspectratio">Maintenir le rapport L / H</resource> <resource name="editor_resize_aspectratio">Maintenir le rapport L / H</resource>
<resource name="editor_resize_height">Hauteur</resource> <resource name="editor_resize_height">Hauteur</resource>
<resource name="editor_resize_percent">Pourcentage</resource> <resource name="editor_resize_percent">Pourcentage</resource>

2
src/Greenshot/Languages/language-id-ID.xml
View file

@ -144,7 +144,7 @@ Juga, kami sangat terbantu apabila anda mengecek laporan lain yang sama dengan k
<resource name="editor_print">Cetak</resource> <resource name="editor_print">Cetak</resource>
<resource name="editor_redo">Ulang {0}</resource> <resource name="editor_redo">Ulang {0}</resource>
<resource name="editor_resetsize">Reset ukuran</resource> <resource name="editor_resetsize">Reset ukuran</resource>
<resource name="editor_resize">Ubah ukuran</resource> <resource name="editor_resize">Ubah ukuran (Z)</resource>
<resource name="editor_resize_aspectratio">Pertahankan aspek rasio</resource> <resource name="editor_resize_aspectratio">Pertahankan aspek rasio</resource>
<resource name="editor_resize_height">Tinggi</resource> <resource name="editor_resize_height">Tinggi</resource>
<resource name="editor_resize_percent">Persen</resource> <resource name="editor_resize_percent">Persen</resource>

2
src/Greenshot/Languages/language-it-IT.xml
View file

@ -322,7 +322,7 @@ In alternativa alle scorciatoie di tastiera, tutte le funzioni di Greenshot sono
<resource name="editor_counter">Aggiungi conteggio</resource> <resource name="editor_counter">Aggiungi conteggio</resource>
<resource name="editor_speechbubble">Aggiungi nuvoletta</resource> <resource name="editor_speechbubble">Aggiungi nuvoletta</resource>
<resource name="editor_resize">Ridimensiona</resource> <resource name="editor_resize">Ridimensiona (Z)</resource>
<resource name="editor_resize_settings">Impostazioni ridimensionamento</resource> <resource name="editor_resize_settings">Impostazioni ridimensionamento</resource>
<resource name="editor_resize_aspectratio">Mantieni rapporto dimensioni</resource> <resource name="editor_resize_aspectratio">Mantieni rapporto dimensioni</resource>
<resource name="editor_resize_width">Larghezza</resource> <resource name="editor_resize_width">Larghezza</resource>

2
src/Greenshot/Languages/language-ja-JP.xml
View file

@ -143,7 +143,7 @@ Greenshot には一切の保障がありません。GNU General Public License
<resource name="editor_print">印刷</resource> <resource name="editor_print">印刷</resource>
<resource name="editor_redo">やり直し{0}</resource> <resource name="editor_redo">やり直し{0}</resource>
<resource name="editor_resetsize">サイズをリセット</resource> <resource name="editor_resetsize">サイズをリセット</resource>
<resource name="editor_resize">リサイズ</resource> <resource name="editor_resize">リサイズ (Z)</resource>
<resource name="editor_resize_aspectratio">縦横比を維持する</resource> <resource name="editor_resize_aspectratio">縦横比を維持する</resource>
<resource name="editor_resize_height">高さ</resource> <resource name="editor_resize_height">高さ</resource>
<resource name="editor_resize_percent">パーセント</resource> <resource name="editor_resize_percent">パーセント</resource>

2
src/Greenshot/Languages/language-kab-DZ.xml
View file

@ -144,7 +144,7 @@ Rnu ɣur-s, nḥemmel aṭas ma yella tesneqdeḍ aneqqis igebren ugur-agi. (Tze
<resource name="editor_print">Siggez</resource> <resource name="editor_print">Siggez</resource>
<resource name="editor_redo">Err-d {0}</resource> <resource name="editor_redo">Err-d {0}</resource>
<resource name="editor_resetsize">Wennez teɣzi</resource> <resource name="editor_resetsize">Wennez teɣzi</resource>
<resource name="editor_resize">Snifel tahri/teɣzi</resource> <resource name="editor_resize">Snifel tahri/teɣzi (Z)</resource>
<resource name="editor_resize_aspectratio">Eǧǧ afmiḍi Teɣ / Teh</resource> <resource name="editor_resize_aspectratio">Eǧǧ afmiḍi Teɣ / Teh</resource>
<resource name="editor_resize_height">Awrir</resource> <resource name="editor_resize_height">Awrir</resource>
<resource name="editor_resize_percent">Afmiḍi</resource> <resource name="editor_resize_percent">Afmiḍi</resource>

2
src/Greenshot/Languages/language-ko-KR.xml
View file

@ -304,7 +304,7 @@ ${hostname} PC명
<resource name="editor_counter">카운터 더하기 (I)</resource> <resource name="editor_counter">카운터 더하기 (I)</resource>
<resource name="editor_speechbubble">설명선 더하기(S)</resource> <resource name="editor_speechbubble">설명선 더하기(S)</resource>
<resource name="editor_resize">크기조정</resource> <resource name="editor_resize">크기조정 (Z)</resource>
<resource name="editor_resize_settings">크기조정 설정</resource> <resource name="editor_resize_settings">크기조정 설정</resource>
<resource name="editor_resize_aspectratio">종횡비 유지</resource> <resource name="editor_resize_aspectratio">종횡비 유지</resource>
<resource name="editor_resize_width">너비</resource> <resource name="editor_resize_width">너비</resource>

2
src/Greenshot/Languages/language-lv-LV.xml
View file

@ -306,7 +306,7 @@ Arī bez karstiem taustiņiem visas darbības iespējams veikt izmantojot „Gre
<resource name="editor_counter">Pievienot skaitli (I)</resource> <resource name="editor_counter">Pievienot skaitli (I)</resource>
<resource name="editor_speechbubble">Pievienot teksta norādi (S)</resource> <resource name="editor_speechbubble">Pievienot teksta norādi (S)</resource>
<resource name="editor_resize">Mainīt izmēru</resource> <resource name="editor_resize">Mainīt izmēru (Z)</resource>
<resource name="editor_resize_settings">Izmēra maiņas iestatījumi</resource> <resource name="editor_resize_settings">Izmēra maiņas iestatījumi</resource>
<resource name="editor_resize_aspectratio">Saglabāt izmēru attiecības</resource> <resource name="editor_resize_aspectratio">Saglabāt izmēru attiecības</resource>
<resource name="editor_resize_width">Platums</resource> <resource name="editor_resize_width">Platums</resource>

2
src/Greenshot/Languages/language-nl-NL.xml
View file

@ -307,7 +307,7 @@ Alle Greenshot functies werken ook zonder sneltoetsen via het context menu.</res
<resource name="editor_counter">Teller toevoegen (I)</resource> <resource name="editor_counter">Teller toevoegen (I)</resource>
<resource name="editor_speechbubble">Tekstballon toevoegen (S)</resource> <resource name="editor_speechbubble">Tekstballon toevoegen (S)</resource>
<resource name="editor_resize">Grootte</resource> <resource name="editor_resize">Grootte (Z)</resource>
<resource name="editor_resize_settings">Vergrotingsinstellingen</resource> <resource name="editor_resize_settings">Vergrotingsinstellingen</resource>
<resource name="editor_resize_aspectratio">Verhouding behouden</resource> <resource name="editor_resize_aspectratio">Verhouding behouden</resource>
<resource name="editor_resize_width">Breedte</resource> <resource name="editor_resize_width">Breedte</resource>

2
src/Greenshot/Languages/language-pt-PT.xml
View file

@ -305,7 +305,7 @@ Todas as funcionalidades do Greenshot funcionam directamente através do menu de
<resource name="editor_counter">Adicionar contador (I)</resource> <resource name="editor_counter">Adicionar contador (I)</resource>
<resource name="editor_speechbubble">Adicionar balão de texto (S)</resource> <resource name="editor_speechbubble">Adicionar balão de texto (S)</resource>
<resource name="editor_resize">Redimensionar</resource> <resource name="editor_resize">Redimensionar (Z)</resource>
<resource name="editor_resize_settings">Definições de Redimensionamento</resource> <resource name="editor_resize_settings">Definições de Redimensionamento</resource>
<resource name="editor_resize_aspectratio">Manter proporções</resource> <resource name="editor_resize_aspectratio">Manter proporções</resource>
<resource name="editor_resize_width">Largura</resource> <resource name="editor_resize_width">Largura</resource>

2
src/Greenshot/Languages/language-sv-SE.xml
View file

@ -305,7 +305,7 @@ Alla Greenshots funktioner fungerar fortfarande från snabbmenyn i aktivitetsfä
<resource name="editor_counter">Lägg till räknare</resource> <resource name="editor_counter">Lägg till räknare</resource>
<resource name="editor_speechbubble">Lägg till pratbubbla</resource> <resource name="editor_speechbubble">Lägg till pratbubbla</resource>
<resource name="editor_resize">Anpassa storlek</resource> <resource name="editor_resize">Anpassa storlek (Z)</resource>
<resource name="editor_resize_settings">Storleksinställningar</resource> <resource name="editor_resize_settings">Storleksinställningar</resource>
<resource name="editor_resize_aspectratio">Behåll bildförhållande</resource> <resource name="editor_resize_aspectratio">Behåll bildförhållande</resource>
<resource name="editor_resize_width">Bredd</resource> <resource name="editor_resize_width">Bredd</resource>

2
src/Greenshot/Languages/language-uk-UA.xml
View file

@ -306,7 +306,7 @@ ${hostname} назва комп’ютера
<resource name="editor_counter">Додати лічильник (Ш)</resource> <resource name="editor_counter">Додати лічильник (Ш)</resource>
<resource name="editor_speechbubble">Додати словесну бульбашку (І)</resource> <resource name="editor_speechbubble">Додати словесну бульбашку (І)</resource>
<resource name="editor_resize">Змінити розмір</resource> <resource name="editor_resize">Змінити розмір (Z)</resource>
<resource name="editor_resize_settings">Параметри зміни розміру</resource> <resource name="editor_resize_settings">Параметри зміни розміру</resource>
<resource name="editor_resize_aspectratio">Зберігати пропорції</resource> <resource name="editor_resize_aspectratio">Зберігати пропорції</resource>
<resource name="editor_resize_width">Ширина</resource> <resource name="editor_resize_width">Ширина</resource>

2
src/Greenshot/Languages/language-zh-TW.xml
View file

@ -307,7 +307,7 @@ Greenshot 所有功能仍然可以直接從通知區圖示的內容功能表動
<resource name="editor_counter">加入計數器 (I)</resource> <resource name="editor_counter">加入計數器 (I)</resource>
<resource name="editor_speechbubble">加入對話框 (S)</resource> <resource name="editor_speechbubble">加入對話框 (S)</resource>
<resource name="editor_resize">縮放</resource> <resource name="editor_resize">縮放 (Z)</resource>
<resource name="editor_resize_settings">縮放設定</resource> <resource name="editor_resize_settings">縮放設定</resource>
<resource name="editor_resize_aspectratio">維持長寬比</resource> <resource name="editor_resize_aspectratio">維持長寬比</resource>
<resource name="editor_resize_width">長度</resource> <resource name="editor_resize_width">長度</resource>