Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kImageAnnotator for openSUSE:Factory
checked in at 2021-12-06 23:59:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kImageAnnotator (Old)
and /work/SRC/openSUSE:Factory/.kImageAnnotator.new.31177 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kImageAnnotator"
Mon Dec 6 23:59:22 2021 rev:13 rq:935191 version:0.5.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/kImageAnnotator/kImageAnnotator.changes
2021-09-26 21:48:05.430733339 +0200
+++
/work/SRC/openSUSE:Factory/.kImageAnnotator.new.31177/kImageAnnotator.changes
2021-12-07 00:00:25.376343565 +0100
@@ -1,0 +2,7 @@
+Thu Nov 25 23:10:08 UTC 2021 - Martin Hauke <[email protected]>
+
+- Update to version 0.5.3
+ * Fixed: Crash while typing text on wayland.
+ * Changed: Show scrollbar when not all tools visible.
+
+-------------------------------------------------------------------
Old:
----
kImageAnnotator-0.5.2.tar.gz
New:
----
kImageAnnotator-0.5.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kImageAnnotator.spec ++++++
--- /var/tmp/diff_new_pack.LkMJLf/_old 2021-12-07 00:00:26.044341202 +0100
+++ /var/tmp/diff_new_pack.LkMJLf/_new 2021-12-07 00:00:26.048341188 +0100
@@ -19,7 +19,7 @@
%define sover 0
%define libname libkImageAnnotator%{sover}
Name: kImageAnnotator
-Version: 0.5.2
+Version: 0.5.3
Release: 0
Summary: Tool for annotating images
License: GPL-2.0-or-later
++++++ kImageAnnotator-0.5.2.tar.gz -> kImageAnnotator-0.5.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kImageAnnotator-0.5.2/CHANGELOG.md
new/kImageAnnotator-0.5.3/CHANGELOG.md
--- old/kImageAnnotator-0.5.2/CHANGELOG.md 2021-09-12 06:33:31.000000000
+0200
+++ new/kImageAnnotator-0.5.3/CHANGELOG.md 2021-11-14 18:40:20.000000000
+0100
@@ -1,5 +1,9 @@
# Change log
+## Release 0.5.3
+* Fixed: Crash while typing text on wayland.
([#256](https://github.com/ksnip/kImageAnnotator/issues/256))
+* Changed: Show scrollbar when not all tools visible.
([#258](https://github.com/ksnip/kImageAnnotator/issues/258))
+
## Release 0.5.2
* Fixed: Memory leaks caught by ASAN.
([#243](https://github.com/ksnip/kImageAnnotator/issues/243))
* Changed: Use system font provided by QGuiApplication as default for text
tool. ([#247](https://github.com/ksnip/kImageAnnotator/issues/247))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kImageAnnotator-0.5.2/CMakeLists.txt
new/kImageAnnotator-0.5.3/CMakeLists.txt
--- old/kImageAnnotator-0.5.2/CMakeLists.txt 2021-09-12 06:33:31.000000000
+0200
+++ new/kImageAnnotator-0.5.3/CMakeLists.txt 2021-11-14 18:40:20.000000000
+0100
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5)
-project(kImageAnnotator LANGUAGES CXX VERSION 0.5.2)
+project(kImageAnnotator LANGUAGES CXX VERSION 0.5.3)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kImageAnnotator-0.5.2/README.md
new/kImageAnnotator-0.5.3/README.md
--- old/kImageAnnotator-0.5.2/README.md 2021-09-12 06:33:31.000000000 +0200
+++ new/kImageAnnotator-0.5.3/README.md 2021-11-14 18:40:20.000000000 +0100
@@ -1,7 +1,7 @@
# kImageAnnotator [![Build Status][github-badge]][github-url] [![Translation
status][weblate-badge]][weblate-url]
Tool for annotating images
-Version 0.5.2
+Version 0.5.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kImageAnnotator-0.5.2/src/CMakeLists.txt
new/kImageAnnotator-0.5.3/src/CMakeLists.txt
--- old/kImageAnnotator-0.5.2/src/CMakeLists.txt 2021-09-12
06:33:31.000000000 +0200
+++ new/kImageAnnotator-0.5.3/src/CMakeLists.txt 2021-11-14
18:40:20.000000000 +0100
@@ -128,6 +128,7 @@
${CMAKE_CURRENT_SOURCE_DIR}/common/helper/PathHelper.cpp
${CMAKE_CURRENT_SOURCE_DIR}/common/filter/IgnoreShortcutsFilter.cpp
${CMAKE_CURRENT_SOURCE_DIR}/common/filter/KeyEventListener.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/common/platform/PlatformChecker.cpp
${CMAKE_CURRENT_SOURCE_DIR}/widgets/ToolPicker.cpp
${CMAKE_CURRENT_SOURCE_DIR}/widgets/CustomFontComboBox.cpp
${CMAKE_CURRENT_SOURCE_DIR}/widgets/CustomSpinBox.cpp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kImageAnnotator-0.5.2/src/annotations/items/AnnotationPixelate.cpp
new/kImageAnnotator-0.5.3/src/annotations/items/AnnotationPixelate.cpp
--- old/kImageAnnotator-0.5.2/src/annotations/items/AnnotationPixelate.cpp
2021-09-12 06:33:31.000000000 +0200
+++ new/kImageAnnotator-0.5.3/src/annotations/items/AnnotationPixelate.cpp
2021-11-14 18:40:20.000000000 +0100
@@ -39,18 +39,15 @@
QImage AnnotationPixelate::obfuscateBackground(const QImage &sceneBehindItem)
const
{
- auto width = sceneBehindItem.width();
- auto factor = obfuscateProperties()->factor();
- auto intensity = abs(factor - 21) * 0.01;
- auto scaledWidth = width * intensity;
+ auto result = sceneBehindItem.convertToFormat(
QImage::Format_ARGB32_Premultiplied );
+ auto factor = obfuscateProperties()->factor();
- if(scaledWidth < 1) {
- return sceneBehindItem;
- }
+ int width = sceneBehindItem.width() * (0.5 / qMax(1, factor));
+ int height = sceneBehindItem.height() * (0.5 / qMax(1, factor));
+ QSize size = QSize(qMax(width, 1), qMax(height, 1));
- auto result = sceneBehindItem.convertToFormat(
QImage::Format_ARGB32_Premultiplied );
- result = result.scaledToWidth(scaledWidth, Qt::FastTransformation );
- result = result.scaledToWidth(width, Qt::FastTransformation );
+ result = result.scaled(size, Qt::IgnoreAspectRatio,
Qt::SmoothTransformation);
+ result = result.scaled(sceneBehindItem.width(), sceneBehindItem.height());
return result;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kImageAnnotator-0.5.2/src/annotations/items/text/CapsLockStatusChecker.cpp
new/kImageAnnotator-0.5.3/src/annotations/items/text/CapsLockStatusChecker.cpp
---
old/kImageAnnotator-0.5.2/src/annotations/items/text/CapsLockStatusChecker.cpp
2021-09-12 06:33:31.000000000 +0200
+++
new/kImageAnnotator-0.5.3/src/annotations/items/text/CapsLockStatusChecker.cpp
2021-11-14 18:40:20.000000000 +0100
@@ -19,13 +19,13 @@
#include "CapsLockStatusChecker.h"
-/*
- * Currently we need to keep the x11 include in the definition
- * file as x11 and qt::cursor don't work together and we fail
- * to compile
- */
+#if defined(_WIN32)
+#include <Windows.h>
+#endif
#if defined(__linux__)
+#include "src/common/platform/PlatformChecker.h"
+
#include <X11/Xlib.h>
#include <X11/XKBlib.h>
#endif
@@ -37,15 +37,19 @@
#if defined(_WIN32)
return GetKeyState(VK_CAPITAL) == 1;
#elif defined(__linux__)
- auto display = XOpenDisplay(nullptr);
- auto capsState = false;
- if (display) {
- unsigned n;
- XkbGetIndicatorState(display, XkbUseCoreKbd, &n);
- capsState = (n & 0x01) == 1;
+ if (PlatformChecker::instance()->isWayland()) {
+ return false;
+ } else {
+ auto display = XOpenDisplay(nullptr);
+ auto capsState = false;
+ if (display) {
+ unsigned n;
+ XkbGetIndicatorState(display, XkbUseCoreKbd, &n);
+ capsState = (n & 0x01) == 1;
+ }
+ XCloseDisplay(display);
+ return capsState;
}
- XCloseDisplay(display);
- return capsState;
#else
return false;
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kImageAnnotator-0.5.2/src/annotations/items/text/CapsLockStatusChecker.h
new/kImageAnnotator-0.5.3/src/annotations/items/text/CapsLockStatusChecker.h
---
old/kImageAnnotator-0.5.2/src/annotations/items/text/CapsLockStatusChecker.h
2021-09-12 06:33:31.000000000 +0200
+++
new/kImageAnnotator-0.5.3/src/annotations/items/text/CapsLockStatusChecker.h
2021-11-14 18:40:20.000000000 +0100
@@ -20,10 +20,6 @@
#ifndef KIMAGEANNOTATOR_CAPSLOCKSTATUSCHECKER_H
#define KIMAGEANNOTATOR_CAPSLOCKSTATUSCHECKER_H
-#if defined(_WIN32)
-#include <Windows.h>
-#endif
-
namespace kImageAnnotator {
class CapsLockStatusChecker
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kImageAnnotator-0.5.2/src/annotations/items/text/KeyInputHelper.cpp
new/kImageAnnotator-0.5.3/src/annotations/items/text/KeyInputHelper.cpp
--- old/kImageAnnotator-0.5.2/src/annotations/items/text/KeyInputHelper.cpp
2021-09-12 06:33:31.000000000 +0200
+++ new/kImageAnnotator-0.5.3/src/annotations/items/text/KeyInputHelper.cpp
2021-11-14 18:40:20.000000000 +0100
@@ -21,7 +21,7 @@
namespace kImageAnnotator {
-void KeyInputHelper::handleKeyPress(const QKeyEvent *event)
+void KeyInputHelper::handleKeyPress(const QKeyEvent *event) const
{
switch (event->key()) {
case Qt::Key_Backspace:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kImageAnnotator-0.5.2/src/annotations/items/text/KeyInputHelper.h
new/kImageAnnotator-0.5.3/src/annotations/items/text/KeyInputHelper.h
--- old/kImageAnnotator-0.5.2/src/annotations/items/text/KeyInputHelper.h
2021-09-12 06:33:31.000000000 +0200
+++ new/kImageAnnotator-0.5.3/src/annotations/items/text/KeyInputHelper.h
2021-11-14 18:40:20.000000000 +0100
@@ -33,7 +33,7 @@
public:
explicit KeyInputHelper() = default;
~KeyInputHelper() override = default;
- void handleKeyPress(const QKeyEvent *event);
+ void handleKeyPress(const QKeyEvent *event) const;
bool isShiftPressed(const QKeyEvent *event) const;
bool isControlPressed(const QKeyEvent *event) const;
QString getTextWithCorrectCase(const QKeyEvent *event) const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kImageAnnotator-0.5.2/src/common/platform/PlatformChecker.cpp
new/kImageAnnotator-0.5.3/src/common/platform/PlatformChecker.cpp
--- old/kImageAnnotator-0.5.2/src/common/platform/PlatformChecker.cpp
1970-01-01 01:00:00.000000000 +0100
+++ new/kImageAnnotator-0.5.3/src/common/platform/PlatformChecker.cpp
2021-11-14 18:40:20.000000000 +0100
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2021 Damir Porobic <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "PlatformChecker.h"
+
+namespace kImageAnnotator {
+
+PlatformChecker *PlatformChecker::instance()
+{
+ static PlatformChecker instance;
+ return &instance;
+}
+
+bool PlatformChecker::isWayland() const
+{
+ return mIsWayland;
+}
+
+PlatformChecker::PlatformChecker()
+{
+ auto output = qgetenv("XDG_CURRENT_DESKTOP");
+ mIsWayland = output.contains("wayland");
+}
+
+} // namespace kImageAnnotator
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kImageAnnotator-0.5.2/src/common/platform/PlatformChecker.h
new/kImageAnnotator-0.5.3/src/common/platform/PlatformChecker.h
--- old/kImageAnnotator-0.5.2/src/common/platform/PlatformChecker.h
1970-01-01 01:00:00.000000000 +0100
+++ new/kImageAnnotator-0.5.3/src/common/platform/PlatformChecker.h
2021-11-14 18:40:20.000000000 +0100
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2021 Damir Porobic <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef KIMAGEANNOTATOR_PLATFORMCHECKER_H
+#define KIMAGEANNOTATOR_PLATFORMCHECKER_H
+
+#include <QString>
+
+namespace kImageAnnotator {
+
+class PlatformChecker
+{
+public:
+ virtual ~PlatformChecker() = default;
+
+ static PlatformChecker *instance();
+
+ bool isWayland() const;
+
+private:
+ bool mIsWayland;
+
+ PlatformChecker();
+};
+
+} // namespace kImageAnnotator
+
+#endif //KIMAGEANNOTATOR_PLATFORMCHECKER_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kImageAnnotator-0.5.2/src/gui/annotator/docks/AbstractAnnotationDockWidgetContent.h
new/kImageAnnotator-0.5.3/src/gui/annotator/docks/AbstractAnnotationDockWidgetContent.h
---
old/kImageAnnotator-0.5.2/src/gui/annotator/docks/AbstractAnnotationDockWidgetContent.h
2021-09-12 06:33:31.000000000 +0200
+++
new/kImageAnnotator-0.5.3/src/gui/annotator/docks/AbstractAnnotationDockWidgetContent.h
2021-11-14 18:40:20.000000000 +0100
@@ -23,6 +23,7 @@
#include <QWidget>
#include <QBoxLayout>
#include <QList>
+#include <QScrollArea>
#include "src/widgets/misc/AbstractExpandingWidget.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kImageAnnotator-0.5.2/src/gui/annotator/settings/AnnotationToolSelection.cpp
new/kImageAnnotator-0.5.3/src/gui/annotator/settings/AnnotationToolSelection.cpp
---
old/kImageAnnotator-0.5.2/src/gui/annotator/settings/AnnotationToolSelection.cpp
2021-09-12 06:33:31.000000000 +0200
+++
new/kImageAnnotator-0.5.3/src/gui/annotator/settings/AnnotationToolSelection.cpp
2021-11-14 18:40:20.000000000 +0100
@@ -23,9 +23,13 @@
AnnotationToolSelection::AnnotationToolSelection() :
mMainLayout(new QVBoxLayout),
- mToolPicker(new ToolPicker(this))
+ mToolPicker(new ToolPicker(this)),
+ mScrollAreaToolPicker(new QScrollArea(this))
{
- mMainLayout->addWidget(mToolPicker);
+ mScrollAreaToolPicker->setWidgetResizable(true);
+ mScrollAreaToolPicker->setFrameShape(QFrame::NoFrame);
+ mScrollAreaToolPicker->setWidget(mToolPicker);
+ mMainLayout->addWidget(mScrollAreaToolPicker);
mMainLayout->setContentsMargins(0, 0, 0, 0);
setLayout(mMainLayout);
@@ -60,4 +64,4 @@
return tr("Tool Selection");
}
-} // namespace kImageAnnotator
\ No newline at end of file
+} // namespace kImageAnnotator
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kImageAnnotator-0.5.2/src/gui/annotator/settings/AnnotationToolSelection.h
new/kImageAnnotator-0.5.3/src/gui/annotator/settings/AnnotationToolSelection.h
---
old/kImageAnnotator-0.5.2/src/gui/annotator/settings/AnnotationToolSelection.h
2021-09-12 06:33:31.000000000 +0200
+++
new/kImageAnnotator-0.5.3/src/gui/annotator/settings/AnnotationToolSelection.h
2021-11-14 18:40:20.000000000 +0100
@@ -42,6 +42,7 @@
private:
QVBoxLayout *mMainLayout;
ToolPicker *mToolPicker;
+ QScrollArea *mScrollAreaToolPicker;
};
} // namespace kImageAnnotator
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kImageAnnotator-0.5.2/translations/kImageAnnotator_el.ts
new/kImageAnnotator-0.5.3/translations/kImageAnnotator_el.ts
--- old/kImageAnnotator-0.5.2/translations/kImageAnnotator_el.ts
2021-09-12 06:33:31.000000000 +0200
+++ new/kImageAnnotator-0.5.3/translations/kImageAnnotator_el.ts
2021-11-14 18:40:20.000000000 +0100
@@ -74,7 +74,7 @@
</message>
<message>
<source>Number Seed</source>
- <translation type="unfinished"></translation>
+ <translation>?????????????? ??????????????</translation>
</message>
<message>
<source>Obfuscation Factor</source>
@@ -82,11 +82,11 @@
</message>
<message>
<source>Item Shadow</source>
- <translation type="unfinished"></translation>
+ <translation>???????? ????????????????????????</translation>
</message>
<message>
<source>Item Settings</source>
- <translation type="unfinished"></translation>
+ <translation>?????????????????? ????????????????????????</translation>
</message>
</context>
<context>
@@ -207,11 +207,11 @@
</message>
<message>
<source>Drop Shadow</source>
- <translation type="unfinished"></translation>
+ <translation>????????????</translation>
</message>
<message>
<source>Grayscale</source>
- <translation type="unfinished">???????????????????????? ??????
????????</translation>
+ <translation>???????????????????????? ?????? ????????</translation>
</message>
<message>
<source>Border</source>
@@ -231,15 +231,16 @@
<message>
<source>When enabled enforces the canvas
to include the background image.</source>
- <translation type="unfinished"></translation>
+ <translation>???????? ?????????? ????????????????????????????,
?????????????????????? ?????? ??????????
+???? ???????????????????????? ?????? ????????????
??????????????????????.</translation>
</message>
<message>
<source>X:</source>
- <translation type="unfinished">x</translation>
+ <translation>X:</translation>
</message>
<message>
<source>Y:</source>
- <translation type="unfinished">Y:</translation>
+ <translation>Y:</translation>
</message>
<message>
<source>W:</source>
@@ -263,7 +264,7 @@
</message>
<message>
<source>Canvas Background Color</source>
- <translation type="unfinished"></translation>
+ <translation>?????????? ?????????????????????? ??????
??????????</translation>
</message>
</context>
<context>
@@ -282,16 +283,17 @@
</message>
<message>
<source>90?? Counter Clockwise</source>
- <translation type="unfinished"></translation>
+ <translation>90?? ????????????????????????????</translation>
</message>
<message>
<source>Arbitrary</source>
- <translation type="unfinished"></translation>
+ <translation>??????????????????</translation>
</message>
<message>
<source>Positive values rotate clockwise, negative values counter
clockwise.
Rotating by non 90?? multipliers might introduce loss of quality.</source>
- <translation type="unfinished"></translation>
+ <translation>???? ?????????????? ?????????? ????????????????????????
?????????????? ???? ???????? ?????????????? ?????? ????????????????, ??????
???? ?????????????????? ?????????? ????????????????????.
+?? ???????????????????? ???? ??????????????????????????????
?????????????????????????? ?????? 90?? ???????????? ???? ????????????????????
?????????????? ???????? ????????????????.</translation>
</message>
<message>
<source>Horizontal</source>
@@ -357,7 +359,7 @@
<name>kImageAnnotator::StickerPicker</name>
<message>
<source>Sticker</source>
- <translation type="unfinished"></translation>
+ <translation>??????????????????????</translation>
</message>
</context>
<context>
@@ -416,27 +418,27 @@
</message>
<message>
<source>Number Pointer</source>
- <translation type="unfinished"></translation>
+ <translation>?????????????? ??????????????</translation>
</message>
<message>
<source>Sticker</source>
- <translation type="unfinished"></translation>
+ <translation>??????????????????????</translation>
</message>
<message>
<source>Pixelate</source>
- <translation type="unfinished"></translation>
+ <translation>??????????????????????
??????????????????????????????</translation>
</message>
<message>
<source>Text Pointer</source>
- <translation type="unfinished"></translation>
+ <translation>?????????????? ????????????????</translation>
</message>
<message>
<source>Text Arrow</source>
- <translation type="unfinished"></translation>
+ <translation>?????????? ????????????????</translation>
</message>
<message>
<source>Number Arrow</source>
- <translation type="unfinished"></translation>
+ <translation>?????????? ??????????????</translation>
</message>
<message>
<source>Duplicate</source>
