[neon/backports-jammy/kimageannotator/Neon/release] /: New upstream version 0.3.2
Boyuan Yang
null at kde.org
Tue Jan 16 14:14:15 GMT 2024
Git commit 38814fc57578c3d4b1f29aefba4d12e3f6b1500c by Boyuan Yang.
Committed on 05/08/2020 at 04:08.
Pushed by jriddell into branch 'Neon/release'.
New upstream version 0.3.2
M +4 -1 CHANGELOG.md
M +5 -5 CMakeLists.txt
M +1 -1 README.md
M +1 -0 tests/annotations/core/AnnotationAreaTest.cpp
M +19 -19 translations/kImageAnnotator_de.ts
C +54 -54 translations/kImageAnnotator_hr.ts [from: translations/kImageAnnotator_de.ts - 061% similarity]
M +2 -2 translations/kImageAnnotator_ru.ts
M +28 -28 translations/kImageAnnotator_zh_Hans.ts
https://invent.kde.org/neon/backports-jammy/kimageannotator/-/commit/38814fc57578c3d4b1f29aefba4d12e3f6b1500c
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c08a75..443b525 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,10 @@
# Change log
+## Release 0.3.2
+* Fixed: Tests fail to build with shared library. ([#128](https://github.com/ksnip/kImageAnnotator/issues/128))
+
## Release 0.3.1
-* Fixed: Crashes after undoing a number annotation. ([#106](https://github.com/ksnip/kImageAnnotator/issues/114))
+* Fixed: Crashes after undoing a number annotation. ([#114](https://github.com/ksnip/kImageAnnotator/issues/114))
* Fixed: Text overlapping when resizing text box. ([#53](https://github.com/ksnip/kImageAnnotator/issues/53))
* Fixed: Snap lines to degrees not working when CTRL pressed before clicking annotation area. ([#113](https://github.com/ksnip/kImageAnnotator/issues/113))
* Fixed: "Border and Fill" submenu cutting off text under windows. ([#117](https://github.com/ksnip/kImageAnnotator/issues/117))
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8e61bf..999ee84 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5)
-project(kImageAnnotator LANGUAGES CXX VERSION 0.3.1)
+project(kImageAnnotator LANGUAGES CXX VERSION 0.3.2)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -25,7 +25,7 @@ endif ()
set(QT_MIN_VERSION "5.9.4")
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED Widgets Svg)
-if (UNIX)
+if (UNIX AND NOT APPLE)
find_package(X11 REQUIRED)
endif ()
@@ -67,10 +67,10 @@ target_include_directories(kImageAnnotator
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
-target_link_libraries(kImageAnnotator PUBLIC Qt5::Widgets Qt5::Svg PRIVATE kColorPicker::kColorPicker)
+target_link_libraries(kImageAnnotator PUBLIC Qt5::Widgets Qt5::Svg kColorPicker::kColorPicker)
-if (UNIX)
- target_link_libraries(kImageAnnotator PRIVATE X11)
+if (UNIX AND NOT APPLE)
+ target_link_libraries(kImageAnnotator PUBLIC X11)
endif ()
target_compile_definitions(kImageAnnotator PRIVATE KIMAGEANNOTATOR_LIB)
diff --git a/README.md b/README.md
index 8992118..3e6c588 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# kImageAnnotator [![Build Status][travis-badge]][travis-url] [![Translation status][weblate-badge]][weblate-url]
Tool for annotating images
-Version 0.3.1
+Version 0.3.2
diff --git a/tests/annotations/core/AnnotationAreaTest.cpp b/tests/annotations/core/AnnotationAreaTest.cpp
index ed8898a..079ec0b 100644
--- a/tests/annotations/core/AnnotationAreaTest.cpp
+++ b/tests/annotations/core/AnnotationAreaTest.cpp
@@ -60,6 +60,7 @@ void AnnotationAreaTest::TestExportAsImage_Should_ExportScaledImage_When_Scaling
auto resultImage = annotationArea.image();
auto expectedImage = pixmap.scaled(pixmap.size() * scaleFactor).toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied);
+ expectedImage.setDevicePixelRatio(scaleFactor);
QCOMPARE(resultImage, expectedImage);
}
diff --git a/translations/kImageAnnotator_de.ts b/translations/kImageAnnotator_de.ts
index f5f038b..ab4209c 100644
--- a/translations/kImageAnnotator_de.ts
+++ b/translations/kImageAnnotator_de.ts
@@ -9,19 +9,19 @@
</message>
<message>
<source>Bring to Front</source>
- <translation type="unfinished"></translation>
+ <translation>Nach vorne bringen</translation>
</message>
<message>
<source>Bring Forward</source>
- <translation type="unfinished"></translation>
+ <translation>Nach vorne bringen</translation>
</message>
<message>
<source>Send Backward</source>
- <translation type="unfinished"></translation>
+ <translation>Nach hinten schicken</translation>
</message>
<message>
<source>Send to Back</source>
- <translation type="unfinished"></translation>
+ <translation>Nach hinten schicken</translation>
</message>
<message>
<source>Select This</source>
@@ -64,15 +64,15 @@
</message>
<message>
<source>Border And Fill Visibility</source>
- <translation type="unfinished"></translation>
+ <translation>Sichtbarkeit von Rahmen und Füllungen</translation>
</message>
<message>
<source>Starting Number</source>
- <translation type="unfinished"></translation>
+ <translation>Anfangsnummer</translation>
</message>
<message>
<source>Blur Radius</source>
- <translation type="unfinished"></translation>
+ <translation>Unschärferadius</translation>
</message>
<message>
<source>Sticker</source>
@@ -87,7 +87,7 @@
</message>
<message>
<source>Close Other</source>
- <translation type="unfinished"></translation>
+ <translation>Andere schließen</translation>
</message>
<message>
<source>Close All</source>
@@ -95,18 +95,18 @@
</message>
<message>
<source>Close All to the Left</source>
- <translation type="unfinished"></translation>
+ <translation>Alle nach links schließen</translation>
</message>
<message>
<source>Close All to the Right</source>
- <translation type="unfinished"></translation>
+ <translation>Alle nach rechts schließen</translation>
</message>
</context>
<context>
<name>kImageAnnotator::CropWidget</name>
<message>
<source>Crop</source>
- <translation type="unfinished"></translation>
+ <translation>Ausschneiden</translation>
</message>
<message>
<source>Cancel</source>
@@ -133,26 +133,26 @@
<name>kImageAnnotator::FillTypePicker</name>
<message>
<source>No Border and No Fill</source>
- <translation type="unfinished"></translation>
+ <translation>Kein Rahmen und keine Füllung</translation>
</message>
<message>
<source>Border and Fill</source>
- <translation type="unfinished"></translation>
+ <translation>Rahmen und Füllung</translation>
</message>
<message>
<source>Border and No Fill</source>
- <translation type="unfinished"></translation>
+ <translation>Rahmen und keine Füllung</translation>
</message>
</context>
<context>
<name>kImageAnnotator::ScaleDialog</name>
<message>
<source>Scale Image</source>
- <translation type="unfinished"></translation>
+ <translation>Bild skalieren</translation>
</message>
<message>
<source>Keep Aspect Ratio</source>
- <translation type="unfinished"></translation>
+ <translation>Seitenverhältnis beibehalten</translation>
</message>
<message>
<source>Width:</source>
@@ -195,15 +195,15 @@
</message>
<message>
<source>Marker Rectangle</source>
- <translation type="unfinished"></translation>
+ <translation>Markierungsrechteck</translation>
</message>
<message>
<source>Marker Ellipse</source>
- <translation type="unfinished"></translation>
+ <translation>Markierungsellipse</translation>
</message>
<message>
<source>Marker Pen</source>
- <translation type="unfinished"></translation>
+ <translation>Markierungsstift</translation>
</message>
<message>
<source>Text</source>
diff --git a/translations/kImageAnnotator_de.ts b/translations/kImageAnnotator_hr.ts
similarity index 61%
copy from translations/kImageAnnotator_de.ts
copy to translations/kImageAnnotator_hr.ts
index f5f038b..6ccb3d0 100644
--- a/translations/kImageAnnotator_de.ts
+++ b/translations/kImageAnnotator_hr.ts
@@ -1,116 +1,116 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.1" language="de_DE">
+<TS version="2.1" language="hr">
<context>
<name>kImageAnnotator::AnnotationContextMenu</name>
<message>
<source>Arrange</source>
- <translation>Anordnen</translation>
+ <translation>Rasporedi</translation>
</message>
<message>
<source>Bring to Front</source>
- <translation type="unfinished"></translation>
+ <translation>Postavi ispred</translation>
</message>
<message>
<source>Bring Forward</source>
- <translation type="unfinished"></translation>
+ <translation>Postavi ispred</translation>
</message>
<message>
<source>Send Backward</source>
- <translation type="unfinished"></translation>
+ <translation>Postavi iza</translation>
</message>
<message>
<source>Send to Back</source>
- <translation type="unfinished"></translation>
+ <translation>Postavi iza</translation>
</message>
<message>
<source>Select This</source>
- <translation>Dieses auswählen</translation>
+ <translation>Odaberi ovo</translation>
</message>
<message>
<source>Copy</source>
- <translation>Kopieren</translation>
+ <translation>Kopiraj</translation>
</message>
<message>
<source>Paste</source>
- <translation>Einfügen</translation>
+ <translation>Umetni</translation>
</message>
<message>
<source>Edit</source>
- <translation>Ändern</translation>
+ <translation>Uredi</translation>
</message>
<message>
<source>Delete</source>
- <translation>Löschen</translation>
+ <translation>Izbriši</translation>
</message>
</context>
<context>
<name>kImageAnnotator::AnnotationSettings</name>
<message>
<source>Color</source>
- <translation>Farbe</translation>
+ <translation>Kolor</translation>
</message>
<message>
<source>Width</source>
- <translation>Breite</translation>
+ <translation>Širina</translation>
</message>
<message>
<source>Text Color</source>
- <translation>Textfarbe</translation>
+ <translation>Boja teksta</translation>
</message>
<message>
<source>Font Size</source>
- <translation>Schriftgröße</translation>
+ <translation>Veličina fonta</translation>
</message>
<message>
<source>Border And Fill Visibility</source>
- <translation type="unfinished"></translation>
+ <translation>Vidljivost ruba i ispune</translation>
</message>
<message>
<source>Starting Number</source>
- <translation type="unfinished"></translation>
+ <translation>Početni broj</translation>
</message>
<message>
<source>Blur Radius</source>
- <translation type="unfinished"></translation>
+ <translation>Radijus mutnoće</translation>
</message>
<message>
<source>Sticker</source>
- <translation>Aufkleber</translation>
+ <translation>Naljepnica</translation>
</message>
</context>
<context>
<name>kImageAnnotator::AnnotationTabContextMenu</name>
<message>
<source>Close</source>
- <translation>Schließen</translation>
+ <translation>Zatvori</translation>
</message>
<message>
<source>Close Other</source>
- <translation type="unfinished"></translation>
+ <translation>zatvori ostale</translation>
</message>
<message>
<source>Close All</source>
- <translation>Alles schließen</translation>
+ <translation>Zatvori sve</translation>
</message>
<message>
<source>Close All to the Left</source>
- <translation type="unfinished"></translation>
+ <translation>Zatvori sve na lijevo</translation>
</message>
<message>
<source>Close All to the Right</source>
- <translation type="unfinished"></translation>
+ <translation>Zatvori sve na desno</translation>
</message>
</context>
<context>
<name>kImageAnnotator::CropWidget</name>
<message>
<source>Crop</source>
- <translation type="unfinished"></translation>
+ <translation>Obreži</translation>
</message>
<message>
<source>Cancel</source>
- <translation>Abbrechen</translation>
+ <translation>Prekini</translation>
</message>
<message>
<source>X:</source>
@@ -122,124 +122,124 @@
</message>
<message>
<source>W:</source>
- <translation>B:</translation>
+ <translation>Š:</translation>
</message>
<message>
<source>H:</source>
- <translation>H:</translation>
+ <translation>V:</translation>
</message>
</context>
<context>
<name>kImageAnnotator::FillTypePicker</name>
<message>
<source>No Border and No Fill</source>
- <translation type="unfinished"></translation>
+ <translation>Bez ruba i bez ispune</translation>
</message>
<message>
<source>Border and Fill</source>
- <translation type="unfinished"></translation>
+ <translation>Rub i ispuna</translation>
</message>
<message>
<source>Border and No Fill</source>
- <translation type="unfinished"></translation>
+ <translation>Rub i bez ispune</translation>
</message>
</context>
<context>
<name>kImageAnnotator::ScaleDialog</name>
<message>
<source>Scale Image</source>
- <translation type="unfinished"></translation>
+ <translation>Skaliraj sliku</translation>
</message>
<message>
<source>Keep Aspect Ratio</source>
- <translation type="unfinished"></translation>
+ <translation>Zadrži omjer</translation>
</message>
<message>
<source>Width:</source>
- <translation>Breite:</translation>
+ <translation>Širina:</translation>
</message>
<message>
<source>Height:</source>
- <translation>Höhe:</translation>
+ <translation>Visina:</translation>
</message>
<message>
<source>OK</source>
- <translation>OK</translation>
+ <translation>U redu</translation>
</message>
<message>
<source>Cancel</source>
- <translation>Abbrechen</translation>
+ <translation>Prekini</translation>
</message>
<message>
<source>Pixel</source>
- <translation>Pixel</translation>
+ <translation>Piksel</translation>
</message>
<message>
<source>Percent</source>
- <translation>Prozentzahl</translation>
+ <translation>Postotak</translation>
</message>
</context>
<context>
<name>kImageAnnotator::ToolPicker</name>
<message>
<source>Select</source>
- <translation>Auswählen</translation>
+ <translation>Odaberi</translation>
</message>
<message>
<source>Pen</source>
- <translation>Stift</translation>
+ <translation>Pero</translation>
</message>
<message>
<source>Number</source>
- <translation>Nummer</translation>
+ <translation>Broj</translation>
</message>
<message>
<source>Marker Rectangle</source>
- <translation type="unfinished"></translation>
+ <translation>Marker pravokutnik</translation>
</message>
<message>
<source>Marker Ellipse</source>
- <translation type="unfinished"></translation>
+ <translation>Marker elipsa</translation>
</message>
<message>
<source>Marker Pen</source>
- <translation type="unfinished"></translation>
+ <translation>Marker olovka</translation>
</message>
<message>
<source>Text</source>
- <translation>Text</translation>
+ <translation>Tekst</translation>
</message>
<message>
<source>Arrow</source>
- <translation>Pfeil</translation>
+ <translation>Strelica</translation>
</message>
<message>
<source>Double Arrow</source>
- <translation>Doppelpfeil</translation>
+ <translation>dvostruka strelica</translation>
</message>
<message>
<source>Line</source>
- <translation>Strich</translation>
+ <translation>Crta</translation>
</message>
<message>
<source>Blur</source>
- <translation>Verschwommenheit</translation>
+ <translation>Mutnoća</translation>
</message>
<message>
<source>Rectangle</source>
- <translation>Rechteck</translation>
+ <translation>Pravokutnik</translation>
</message>
<message>
<source>Ellipse</source>
- <translation>Ellipse</translation>
+ <translation>Elipsa</translation>
</message>
<message>
<source>Number Pointer</source>
- <translation>Anzahlzeiger</translation>
+ <translation>Označivač brojeva</translation>
</message>
<message>
<source>Sticker</source>
- <translation>Aufkleber</translation>
+ <translation>Naljepnica</translation>
</message>
</context>
</TS>
diff --git a/translations/kImageAnnotator_ru.ts b/translations/kImageAnnotator_ru.ts
index eb80209..003daec 100644
--- a/translations/kImageAnnotator_ru.ts
+++ b/translations/kImageAnnotator_ru.ts
@@ -110,7 +110,7 @@
</message>
<message>
<source>Cancel</source>
- <translation>Отменить</translation>
+ <translation>Отмена</translation>
</message>
<message>
<source>X:</source>
@@ -168,7 +168,7 @@
</message>
<message>
<source>Cancel</source>
- <translation>Отменить</translation>
+ <translation>Отмена</translation>
</message>
<message>
<source>Pixel</source>
diff --git a/translations/kImageAnnotator_zh_Hans.ts b/translations/kImageAnnotator_zh_Hans.ts
index 074fa05..d585d55 100644
--- a/translations/kImageAnnotator_zh_Hans.ts
+++ b/translations/kImageAnnotator_zh_Hans.ts
@@ -29,42 +29,42 @@
</message>
<message>
<source>Copy</source>
- <translation type="unfinished"></translation>
+ <translation>复制</translation>
</message>
<message>
<source>Paste</source>
- <translation type="unfinished"></translation>
+ <translation>粘贴</translation>
</message>
<message>
<source>Edit</source>
- <translation type="unfinished"></translation>
+ <translation>编辑</translation>
</message>
<message>
<source>Delete</source>
- <translation type="unfinished"></translation>
+ <translation>删除</translation>
</message>
</context>
<context>
<name>kImageAnnotator::AnnotationSettings</name>
<message>
<source>Color</source>
- <translation type="unfinished"></translation>
+ <translation>颜色</translation>
</message>
<message>
<source>Width</source>
- <translation type="unfinished"></translation>
+ <translation>宽度</translation>
</message>
<message>
<source>Text Color</source>
- <translation type="unfinished"></translation>
+ <translation>文本颜色</translation>
</message>
<message>
<source>Font Size</source>
- <translation type="unfinished"></translation>
+ <translation>字体大小</translation>
</message>
<message>
<source>Border And Fill Visibility</source>
- <translation type="unfinished"></translation>
+ <translation>边框和填充可见性</translation>
</message>
<message>
<source>Starting Number</source>
@@ -83,15 +83,15 @@
<name>kImageAnnotator::AnnotationTabContextMenu</name>
<message>
<source>Close</source>
- <translation type="unfinished"></translation>
+ <translation>关闭</translation>
</message>
<message>
<source>Close Other</source>
- <translation type="unfinished"></translation>
+ <translation>关闭其它</translation>
</message>
<message>
<source>Close All</source>
- <translation type="unfinished"></translation>
+ <translation>关闭全部</translation>
</message>
<message>
<source>Close All to the Left</source>
@@ -106,11 +106,11 @@
<name>kImageAnnotator::CropWidget</name>
<message>
<source>Crop</source>
- <translation type="unfinished"></translation>
+ <translation>裁切</translation>
</message>
<message>
<source>Cancel</source>
- <translation type="unfinished"></translation>
+ <translation>取消</translation>
</message>
<message>
<source>X:</source>
@@ -133,50 +133,50 @@
<name>kImageAnnotator::FillTypePicker</name>
<message>
<source>No Border and No Fill</source>
- <translation type="unfinished"></translation>
+ <translation>无边框且无填充</translation>
</message>
<message>
<source>Border and Fill</source>
- <translation type="unfinished"></translation>
+ <translation>有边框且有填充</translation>
</message>
<message>
<source>Border and No Fill</source>
- <translation type="unfinished"></translation>
+ <translation>有边框且无填充</translation>
</message>
</context>
<context>
<name>kImageAnnotator::ScaleDialog</name>
<message>
<source>Scale Image</source>
- <translation type="unfinished"></translation>
+ <translation>缩放图像</translation>
</message>
<message>
<source>Keep Aspect Ratio</source>
- <translation type="unfinished"></translation>
+ <translation>保持长宽比</translation>
</message>
<message>
<source>Width:</source>
- <translation type="unfinished"></translation>
+ <translation>宽度：</translation>
</message>
<message>
<source>Height:</source>
- <translation type="unfinished"></translation>
+ <translation>高度：</translation>
</message>
<message>
<source>OK</source>
- <translation type="unfinished"></translation>
+ <translation>确定</translation>
</message>
<message>
<source>Cancel</source>
- <translation type="unfinished"></translation>
+ <translation>取消</translation>
</message>
<message>
<source>Pixel</source>
- <translation type="unfinished"></translation>
+ <translation>像素</translation>
</message>
<message>
<source>Percent</source>
- <translation type="unfinished"></translation>
+ <translation>百分比</translation>
</message>
</context>
<context>
@@ -207,15 +207,15 @@
</message>
<message>
<source>Text</source>
- <translation type="unfinished"></translation>
+ <translation>文本</translation>
</message>
<message>
<source>Arrow</source>
- <translation type="unfinished"></translation>
+ <translation>箭头</translation>
</message>
<message>
<source>Double Arrow</source>
- <translation type="unfinished"></translation>
+ <translation>双箭头</translation>
</message>
<message>
<source>Line</source>
More information about the Neon-commits
mailing list