Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package svgpart for openSUSE:Factory checked in at 2022-04-23 19:46:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/svgpart (Old) and /work/SRC/openSUSE:Factory/.svgpart.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "svgpart" Sat Apr 23 19:46:50 2022 rev:121 rq:971611 version:22.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/svgpart/svgpart.changes 2022-03-04 20:20:42.160690649 +0100 +++ /work/SRC/openSUSE:Factory/.svgpart.new.1538/svgpart.changes 2022-04-23 19:48:48.575186161 +0200 @@ -1,0 +2,28 @@ +Mon Apr 18 07:52:53 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 22.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/22.04.0/ + +------------------------------------------------------------------- +Fri Apr 8 18:22:22 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 22.03.90 + * New feature release + +------------------------------------------------------------------- +Wed Mar 23 08:15:14 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 22.03.80 + * New feature release +- Changes since 21.12.3: + * Use less aggressive zoom factor of 1.2 + * Support zooming by scrollwheel + * install in kf<version> + * Add gitlab qt6 ci support + * Make it compile against qt6 + * It compiles fine without deprecated methods + * Remove unused include + +------------------------------------------------------------------- Old: ---- svgpart-21.12.3.tar.xz svgpart-21.12.3.tar.xz.sig New: ---- svgpart-22.04.0.tar.xz svgpart-22.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ svgpart.spec ++++++ --- /var/tmp/diff_new_pack.J7mSS9/_old 2022-04-23 19:48:49.019186689 +0200 +++ /var/tmp/diff_new_pack.J7mSS9/_new 2022-04-23 19:48:49.027186699 +0200 @@ -20,7 +20,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without released Name: svgpart -Version: 21.12.3 +Version: 22.04.0 Release: 0 Summary: SVG viewer component License: GPL-2.0-or-later ++++++ svgpart-21.12.3.tar.xz -> svgpart-22.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/svgpart-21.12.3/.gitlab-ci.yml new/svgpart-22.04.0/.gitlab-ci.yml --- old/svgpart-21.12.3/.gitlab-ci.yml 2022-02-27 19:11:29.000000000 +0100 +++ new/svgpart-22.04.0/.gitlab-ci.yml 2022-04-12 23:28:18.000000000 +0200 @@ -4,3 +4,4 @@ include: - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/svgpart-21.12.3/CMakeLists.txt new/svgpart-22.04.0/CMakeLists.txt --- old/svgpart-21.12.3/CMakeLists.txt 2022-02-27 19:11:29.000000000 +0100 +++ new/svgpart-22.04.0/CMakeLists.txt 2022-04-12 23:28:18.000000000 +0200 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.16) # Release Service version, managed by release script -set (RELEASE_SERVICE_VERSION_MAJOR "21") -set (RELEASE_SERVICE_VERSION_MINOR "12") -set (RELEASE_SERVICE_VERSION_MICRO "3") +set (RELEASE_SERVICE_VERSION_MAJOR "22") +set (RELEASE_SERVICE_VERSION_MINOR "04") +set (RELEASE_SERVICE_VERSION_MICRO "0") set (RELEASE_SERVICE_COMPACT_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}${RELEASE_SERVICE_VERSION_MINOR}${RELEASE_SERVICE_VERSION_MICRO}") # Bump SVGPART_BASE_VERSION once new features are added @@ -25,13 +25,18 @@ include(KDEClangFormat) include(KDEGitCommitHooks) -find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Svg) +find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Svg) +if (QT_MAJOR_VERSION STREQUAL "6") + find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS SvgWidgets) +endif() + + find_package(KF5 ${KF_MIN_VERSION} REQUIRED COMPONENTS CoreAddons Parts I18n) add_definitions( -DQT_DISABLE_DEPRECATED_BEFORE=0x050F00 -DQT_DEPRECATED_WARNINGS_SINCE=0x060000 - -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055400 + -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055A00 -DKF_DEPRECATED_WARNINGS_SINCE=0x060000 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/svgpart-21.12.3/CMakePresets.json new/svgpart-22.04.0/CMakePresets.json --- old/svgpart-21.12.3/CMakePresets.json 1970-01-01 01:00:00.000000000 +0100 +++ new/svgpart-22.04.0/CMakePresets.json 2022-04-12 23:28:18.000000000 +0200 @@ -0,0 +1,167 @@ +{ + "version": 3, + "configurePresets": [ + { + "name": "dev", + "displayName": "Build as debug", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" + }, + { + "name": "dev-disable-deprecated", + "displayName": "Build as without deprecated methods", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-disable-deprecated", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "CMAKE_CXX_FLAGS_INIT": "-DQT_DISABLE_DEPRECATED_BEFORE=0x060000 -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000" + }, + "installDir": "$env{KF5}" + }, + { + "name": "asan", + "displayName": "Build with Asan support.", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-asan", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "ECM_ENABLE_SANITIZERS" : "'address;undefined'", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" + }, + { + "name": "pch", + "displayName": "Build with PCH support.", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-pch", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "COMPILE_WITH_CMAKE_PCH_SUPPORT": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" + }, + { + "name": "dev-clang", + "displayName": "dev-clang", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-clang", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "environment": { + "CXX": "clang++", + "CCACHE_DISABLE": "ON" + }, + "installDir": "$env{KF5}" + }, + { + "name": "unity", + "displayName": "Build with CMake unity support.", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-unity", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "USE_UNITY_CMAKE_SUPPORT": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" + }, + { + "name": "release", + "displayName": "Build as release mode.", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-release", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release" + }, + "installDir": "$env{KF5}" + }, + { + "name": "profile", + "displayName": "profile", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-profile", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "RelWithDebInfo", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" + }, + { + "name": "clazy", + "displayName": "clazy", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-clazy", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug" + }, + "environment": { + "CXX": "clazy", + "CCACHE_DISABLE": "ON" + }, + "installDir": "$env{KF5}" + } + + ], + "buildPresets": [ + { + "name": "dev", + "configurePreset": "dev" + }, + { + "name": "dev-disable-deprecated", + "configurePreset": "dev-disable-deprecated" + }, + { + "name": "pch", + "configurePreset": "pch" + }, + { + "name": "release", + "configurePreset": "release" + }, + { + "name": "dev-clang", + "configurePreset": "dev-clang" + }, + { + "name": "asan", + "configurePreset": "asan" + }, + { + "name": "unity", + "configurePreset": "unity" + }, + { + "name": "clazy", + "configurePreset": "clazy", + "environment": { + "CLAZY_CHECKS" : "level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs,level2,detaching-member,heap-allocated-small-trivial-type,isempty-vs-count,qstring-varargs,qvariant-template-instantiation,raw-environment-function,reserve-candidates,signal-with-return-value,thread-with-slots,no-ctor-missing-parent-argument,no-missing-typeinfo", + "CCACHE_DISABLE" : "ON" + } + } + ], + "testPresets": [ + { + "name": "dev", + "configurePreset": "dev", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": false} + }, + { + "name": "asan", + "configurePreset": "asan", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": true} + } + ] +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/svgpart-21.12.3/po/id/svgpart.po new/svgpart-22.04.0/po/id/svgpart.po --- old/svgpart-21.12.3/po/id/svgpart.po 1970-01-01 01:00:00.000000000 +0100 +++ new/svgpart-22.04.0/po/id/svgpart.po 2022-04-15 02:11:23.000000000 +0200 @@ -0,0 +1,30 @@ +# Copyright (C) YEAR This file is copyright: +# This file is distributed under the same license as the svgpart package. +# Wantoy??k <[email protected]>, 2022. +# +msgid "" +msgstr "" +"Project-Id-Version: svgpart\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n"; +"POT-Creation-Date: 2021-05-17 00:18+0000\n" +"PO-Revision-Date: 2022-03-15 22:32+0700\n" +"Last-Translator: Wantoy??k <[email protected]>\n" +"Language-Team: Indonesian <[email protected]>\n" +"Language: id\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 21.12.3\n" + +#. i18n: ectx: Menu (view) +#: svgpart.rc:4 +#, kde-format +msgid "&View" +msgstr "&Tampilan" + +#. i18n: ectx: ToolBar (mainToolBar) +#: svgpart.rc:13 +#, kde-format +msgid "Main Toolbar" +msgstr "Toolbar Utama" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/svgpart-21.12.3/po/vi/svgpart.po new/svgpart-22.04.0/po/vi/svgpart.po --- old/svgpart-21.12.3/po/vi/svgpart.po 1970-01-01 01:00:00.000000000 +0100 +++ new/svgpart-22.04.0/po/vi/svgpart.po 2022-04-15 02:11:23.000000000 +0200 @@ -0,0 +1,30 @@ +# Copyright (C) YEAR This file is copyright: +# This file is distributed under the same license as the svgpart package. +# +# Phu Hung Nguyen <[email protected]>, 2021. +msgid "" +msgstr "" +"Project-Id-Version: svgpart\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n"; +"POT-Creation-Date: 2021-05-17 00:18+0000\n" +"PO-Revision-Date: 2021-12-22 12:04+0100\n" +"Last-Translator: Phu Hung Nguyen <[email protected]>\n" +"Language-Team: Vietnamese <[email protected]>\n" +"Language: vi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Lokalize 20.12.2\n" + +#. i18n: ectx: Menu (view) +#: svgpart.rc:4 +#, kde-format +msgid "&View" +msgstr "&Xem" + +#. i18n: ectx: ToolBar (mainToolBar) +#: svgpart.rc:13 +#, kde-format +msgid "Main Toolbar" +msgstr "Thanh c??ng c??? ch??nh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/svgpart-21.12.3/po/zh_CN/svgpart.po new/svgpart-22.04.0/po/zh_CN/svgpart.po --- old/svgpart-21.12.3/po/zh_CN/svgpart.po 2022-03-01 01:07:09.000000000 +0100 +++ new/svgpart-22.04.0/po/zh_CN/svgpart.po 2022-04-15 02:11:23.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-05-17 00:18+0000\n" -"PO-Revision-Date: 2022-02-26 05:19\n" +"PO-Revision-Date: 2022-04-14 15:36\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/svgpart-21.12.3/src/CMakeLists.txt new/svgpart-22.04.0/src/CMakeLists.txt --- old/svgpart-21.12.3/src/CMakeLists.txt 2022-02-27 19:11:29.000000000 +0100 +++ new/svgpart-22.04.0/src/CMakeLists.txt 2022-04-12 23:28:18.000000000 +0200 @@ -5,6 +5,7 @@ add_library(svgpart MODULE) target_sources(svgpart PRIVATE + svgview.cpp svgbrowserextension.cpp svgpart.cpp @@ -17,12 +18,17 @@ KF5::CoreAddons KF5::Parts KF5::I18n - Qt5::Widgets - Qt5::Svg + Qt${QT_MAJOR_VERSION}::Widgets + Qt${QT_MAJOR_VERSION}::Svg ) -install(TARGETS svgpart DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/parts) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/svgpart.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) +if (QT_MAJOR_VERSION STREQUAL "6") + target_link_libraries(svgpart Qt6::SvgWidgets) +endif() + + +install(TARGETS svgpart DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/parts) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/svgpart.desktop DESTINATION ${KDE_INSTALL_KSERVICESDIR}) install( FILES org.kde.svgpart.metainfo.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/svgpart-21.12.3/src/org.kde.svgpart.metainfo.xml new/svgpart-22.04.0/src/org.kde.svgpart.metainfo.xml --- old/svgpart-21.12.3/src/org.kde.svgpart.metainfo.xml 2022-02-27 19:11:29.000000000 +0100 +++ new/svgpart-22.04.0/src/org.kde.svgpart.metainfo.xml 2022-04-12 23:28:18.000000000 +0200 @@ -28,6 +28,7 @@ <name xml:lang="hi">?????????????????? ???????????????????????? ?????????????????????</name> <name xml:lang="hu">SVG-megjelen??t?? KPart</name> <name xml:lang="ia">KPart Visor de SVG</name> + <name xml:lang="id">SVG Viewer KPart</name> <name xml:lang="it">Visore KPart SVG</name> <name xml:lang="ko">SVG ?????? KPart</name> <name xml:lang="nl">SVG-viewer KPart</name> @@ -41,12 +42,13 @@ <name xml:lang="sv">SVG KPart-visning</name> <name xml:lang="tr">SVG G??r??nt??leyici KPart</name> <name xml:lang="uk">KPart ?????? ?????????????????? SVG</name> + <name xml:lang="vi">KPart tr??nh xem SVG</name> <name xml:lang="x-test">xxSVG Viewer KPartxx</name> <name xml:lang="zh-CN">SVG ????????? KPart ??????</name> <summary>Rendered display of SVG files in KParts-using software</summary> <summary xml:lang="ar">???????????? ?????? ???? ???? ???? SVG ???? ?????????????????? ???????? ???????????? ?????? ??</summary> <summary xml:lang="ca">Mostra renderitzats els fitxers SVG en el programari que utilitza les KParts</summary> - <summary xml:lang="ca-valencia">Mostra renderitzats els fitxers SVG en el programari que utilitza les KParts</summary> + <summary xml:lang="ca-valencia">Mostra renderitzats els fitxers SVG en el programari que utilitza KParts</summary> <summary xml:lang="cs">Zpracovan?? zobrazen?? SVG v aplikac??ch vyu????vaj??c??ch KParts</summary> <summary xml:lang="de">Anzeige von SVG-Dateien in Software, die KParts verwendet</summary> <summary xml:lang="el">?????????????????? SVG ?????????????? ???? ?????????????????? ???? KPart</summary> @@ -58,6 +60,7 @@ <summary xml:lang="hi">?????????????????????????????? ?????? ??????????????? ???????????? ????????????????????? ????????? ?????????????????? ????????????????????? ?????? ??????????????? ???????????? ????????? ????????????????????????</summary> <summary xml:lang="hu">SVG-f??jlok renderelt megjelen??t??se KPartot haszn??l?? szoftverekben</summary> <summary xml:lang="ia">Schermo rendite de files SVG in software usante KParts</summary> + <summary xml:lang="id">Tampilan ter-render pada file-file SVG dalam perangkat lunak menggunakan KPart</summary> <summary xml:lang="it">Visualizzazione renderizzata dei file SVG nel software che utilizza KParts</summary> <summary xml:lang="ko">KParts??? ???????????? ?????????????????? SVG ????????? ??????????????? ???????????????</summary> <summary xml:lang="nl">Toonbare weergave van SVG-bestanden in software die KParts gebruikt</summary> @@ -71,13 +74,14 @@ <summary xml:lang="sv">??tergiven vy f??r SVG-filer i programvara som anv??nder KParts</summary> <summary xml:lang="tr">SVG dosyalar??n??n KParts kullanan yaz??l??mda i??lenmi?? g??r??nt??s??</summary> <summary xml:lang="uk">?????????? ?????????????????????? ???????????? ???????????? SVG ?? ?????????????????????? ???????????????????????? ???? ???????????????????? KParts</summary> + <summary xml:lang="vi">B??? hi???n th??? k???t xu???t c??c t???p SVG trong c??c ph???n m???m d??ng KPart</summary> <summary xml:lang="x-test">xxRendered display of SVG files in KParts-using softwarexx</summary> <summary xml:lang="zh-CN">????????? KParts ???????????????????????? SVG ??????</summary> <description> <p>The SVG Viewer KPart allows KParts-using software to display SVG files in a rendered view.</p> <p xml:lang="ar">???????? ???????? ?????? ???? ???? ???? ?????????????????? ???????? ???????????? ?????? ?? ???? ?????????? ???????? ?????????? ???? ???? ????.</p> <p xml:lang="ca">La KPart del visor de SVG permet que el programari que utilitza les KParts, mostri els fitxers SVG en una vista renderitzada.</p> - <p xml:lang="ca-valencia">La KPart del visor de SVG permet que el programari que utilitza les KParts, mostre els fitxers SVG en una vista renderitzada.</p> + <p xml:lang="ca-valencia">KPart del visor de SVG permet que el programari que utilitza KParts, mostre els fitxers SVG en una vista renderitzada.</p> <p xml:lang="de">Die SVG-Betrachter-Komponente bef??higt Software, die KParts verwendet, zur Anzeige von Dateien im SVG-Format.</p> <p xml:lang="el">???? ?????????????????? KPart ???????????????? SVG ?????????????????? ???? ?????????????????? ???? KParts ???? ???????????????????? SVG ????????????.</p> <p xml:lang="en-GB">The SVG Viewer KPart allows KParts-using software to display SVG files in a rendered view.</p> @@ -88,6 +92,7 @@ <p xml:lang="hi">?????????????????? ?????????????????? ?????????????????????,???????????????????????????-??????????????? ???????????? ???????????? ?????????????????????????????? ?????? ?????????????????? ????????????????????? ?????? ??????????????? ????????? ?????? ??????????????? ????????? ??????????????????????????? ???????????? ?????? ????????? ?????????????????? ???????????? ????????? </p> <p xml:lang="hu">Az SVG-megjelen??t?? KPart lehet??v?? teszi az azt haszn??l?? alkalmaz??soknak SVG-f??jlok megjelen??t??s??t egy renderelt n??zetben.</p> <p xml:lang="ia">Le visor de SVG KPart permitte a software usante KParts de monstrar files SVG in un vista rendite.</p> + <p xml:lang="id">SVG Viewer KPart memungkinkan perangkat lunak menggunakan KPart untuk menampilkan file-file SVG dalam tampilan yang ter-render.</p> <p xml:lang="it">Il visore KPart SVG consente al software che utilizza KPart di visualizzare i file SVG in una vista renderizzata.</p> <p xml:lang="ko">SVG ?????? KPart??? ???????????? KParts??? ???????????? ????????????????????? SVG ????????? ??????????????? ??? ??? ????????????.</p> <p xml:lang="nl">De SVG-viewer van KPart stelt software die KParts gebruikt in staat SVG-bestanden in een toonbare weergave te tonen.</p> @@ -101,6 +106,7 @@ <p xml:lang="sv">SVG KPart-visning till??ter program som anv??nder KParts att visa filer med SVG-format i en ??tergiven vy.</p> <p xml:lang="tr">SVG G??r??nt??leyici KPart, KParts kullanan yaz??l??mlar??n SVG dosyalar??n?? i??lenmi?? bir g??r??n??mde g??r??nt??lemesine olanak tan??r.</p> <p xml:lang="uk">???????????? ?????????????????? ?????????? SVG ?????????? ?????????? ?????????????????????? ???????????????????? ?????????? ???????????? SVG ?? ????????-?????????? ?????????????????????? ???????????????????????? ???? ???????????????????? KParts.</p> + <p xml:lang="vi">KPart tr??nh xem SVG cho ph??p c??c ph???n m???m d??ng KPart c?? th??? hi???n th??? t???p SVG trong m???t khung xem k???t xu???t.</p> <p xml:lang="x-test">xxThe SVG Viewer KPart allows KParts-using software to display SVG files in a rendered view.xx</p> <p xml:lang="zh-CN">SVG ????????? KPart ??????????????? KParts ??????????????????????????????????????????????????? SVG ?????????</p> </description> @@ -118,9 +124,9 @@ </categories> <content_rating type="oars-1.1"/> <releases> + <release version="1.1.22040" date="2022-04-21"/> <release version="1.1.21123" date="2022-03-03"/> <release version="1.1.21122" date="2022-02-03"/> <release version="1.1.21121" date="2022-01-06"/> - <release version="1.1.21120" date="2021-12-09"/> </releases> </component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/svgpart-21.12.3/src/svgpart.cpp new/svgpart-22.04.0/src/svgpart.cpp --- old/svgpart-21.12.3/src/svgpart.cpp 2022-02-27 19:11:29.000000000 +0100 +++ new/svgpart-22.04.0/src/svgpart.cpp 2022-04-12 23:28:18.000000000 +0200 @@ -6,20 +6,19 @@ #include "svgpart.h" +// part #include "svgbrowserextension.h" +#include "svgview.h" // KF #include <KActionCollection> #include <KLocalizedString> #include <KPluginFactory> #include <KPluginMetaData> #include <KStandardAction> - // Qt #include <QGraphicsScene> #include <QGraphicsSvgItem> -#include <QGraphicsView> #include <QMimeDatabase> -#include <QScrollBar> #include <QSvgRenderer> #include <QTimer> #include <QTransform> @@ -36,14 +35,12 @@ mRenderer = new QSvgRenderer(this); mScene = new QGraphicsScene(this); - mView = new QGraphicsView(mScene, parentWidget); - mView->setFrameStyle(QFrame::NoFrame); - mView->setDragMode(QGraphicsView::ScrollHandDrag); + mView = new SvgView(mScene, parentWidget); setWidget(mView); - KStandardAction::actualSize(this, &SvgPart::zoomActualSize, actionCollection()); - KStandardAction::zoomIn(this, &SvgPart::zoomIn, actionCollection()); - KStandardAction::zoomOut(this, &SvgPart::zoomOut, actionCollection()); + KStandardAction::actualSize(mView, &SvgView::zoomActualSize, actionCollection()); + KStandardAction::zoomIn(mView, &SvgView::zoomIn, actionCollection()); + KStandardAction::zoomOut(mView, &SvgView::zoomOut, actionCollection()); setXMLFile(QStringLiteral("svgpart.rc")); } @@ -111,8 +108,8 @@ mPreviousUrl = currentUrl; mPreviousZoom = zoom(); - mPreviousHorizontalScrollPosition = mView->horizontalScrollBar()->value(); - mPreviousVerticalScrollPosition = mView->verticalScrollBar()->value(); + mPreviousHorizontalScrollPosition = mView->horizontalScrollPosition(); + mPreviousVerticalScrollPosition = mView->verticalScrollPosition(); } mView->resetTransform(); @@ -164,10 +161,10 @@ } // now restore view state - setZoom(zoomValue); + mView->setZoom(zoomValue); - mView->horizontalScrollBar()->setValue(args.xOffset()); - mView->verticalScrollBar()->setValue(args.yOffset()); + mView->setHorizontalScrollPosition(args.xOffset()); + mView->setVerticalScrollPosition(args.yOffset()); } void SvgPart::setExtendedRestoreArguments(qreal zoom) @@ -176,41 +173,20 @@ mRestoreZoom = zoom; } -void SvgPart::zoomIn() -{ - setZoom(zoom() * 2); -} - -void SvgPart::zoomOut() -{ - setZoom(zoom() / 2); -} - -void SvgPart::zoomActualSize() -{ - setZoom(1.0); -} qreal SvgPart::zoom() const { - return mView->transform().m11(); -} - -void SvgPart::setZoom(qreal value) -{ - QTransform matrix; - matrix.scale(value, value); - mView->setTransform(matrix); + return mView->zoom(); } int SvgPart::horizontalScrollPosition() const { - return mView->horizontalScrollBar()->value(); + return mView->horizontalScrollPosition(); } int SvgPart::verticalScrollPosition() const { - return mView->verticalScrollBar()->value(); + return mView->verticalScrollPosition(); } #include "svgpart.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/svgpart-21.12.3/src/svgpart.desktop.in new/svgpart-22.04.0/src/svgpart.desktop.in --- old/svgpart-21.12.3/src/svgpart.desktop.in 2022-02-27 19:11:29.000000000 +0100 +++ new/svgpart-22.04.0/src/svgpart.desktop.in 2022-04-12 23:28:18.000000000 +0200 @@ -24,6 +24,7 @@ Name[hr]=Svg Part Name[hu]=SVG objektum Name[ia]=Parte de SVG +Name[id]=Svg Part Name[is]=Svg hlutur Name[it]=Componente SVG Name[ja]=SVG ????????????????????? @@ -78,6 +79,7 @@ Comment[hi]=?????????????????? ?????????????????? ?????? ??????????????????????????? ???????????? ?????? ????????? ?????? ????????????????????? Comment[hu]=KPart SVG-k??pek megjelen??t??s??hez Comment[ia]=Un KPart pro monstrar imagines SVG +Comment[id]=Sebuah KPart untuk menampilkan citra-citra SVG Comment[it]=Un KPart per visualizzare immagini SVG Comment[ko]=SVG ???????????? ???????????? KPart Comment[nl]=Een KPart-component voor het weergeven van SVG-afbeeldingen @@ -96,7 +98,7 @@ Comment[zh_CN]=???????????? SVG ????????? KPart ?????? MimeType=image/svg+xml;image/svg+xml-compressed; ServiceTypes=KParts/ReadOnlyPart -X-KDE-Library=kf5/parts/svgpart +X-KDE-Library=kf@QT_MAJOR_VERSION@/parts/svgpart InitialPreference=12 Icon=image-svg+xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/svgpart-21.12.3/src/svgpart.h new/svgpart-22.04.0/src/svgpart.h --- old/svgpart-21.12.3/src/svgpart.h 2022-02-27 19:11:29.000000000 +0100 +++ new/svgpart-22.04.0/src/svgpart.h 2022-04-12 23:28:18.000000000 +0200 @@ -9,13 +9,12 @@ // KF #include <KParts/ReadOnlyPart> -#include <kcoreaddons_version.h> class SvgBrowserExtension; +class SvgView; class KPluginMetaData; class QGraphicsScene; class QGraphicsSvgItem; -class QGraphicsView; class QSvgRenderer; class SvgPart : public KParts::ReadOnlyPart @@ -41,20 +40,14 @@ bool doCloseStream() override; private Q_SLOTS: - void zoomActualSize(); - void zoomIn(); - void zoomOut(); - void delayedRestoreViewState(); private: - void setZoom(qreal value); - void createViewForDocument(); private: + SvgView *mView; QGraphicsScene *mScene; - QGraphicsView *mView; QGraphicsSvgItem *mItem; QSvgRenderer *mRenderer; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/svgpart-21.12.3/src/svgview.cpp new/svgpart-22.04.0/src/svgview.cpp --- old/svgpart-21.12.3/src/svgview.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/svgpart-22.04.0/src/svgview.cpp 2022-04-12 23:28:18.000000000 +0200 @@ -0,0 +1,85 @@ +/* + SPDX-FileCopyrightText: 2022 Friedrich W. H. Kossebau <[email protected]> + + SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "svgview.h" + +// Qt +#include <QScrollBar> +#include <QTransform> +#include <QWheelEvent> + +constexpr qreal zoomFactor = 1.2; + +SvgView::SvgView(QGraphicsScene *scene, QWidget *parent) + : QGraphicsView(scene, parent) +{ + setFrameStyle(QFrame::NoFrame); + setDragMode(QGraphicsView::ScrollHandDrag); +} + +void SvgView::zoomIn() +{ + setZoom(zoom() * zoomFactor); +} + +void SvgView::zoomOut() +{ + setZoom(zoom() / zoomFactor); +} + +void SvgView::zoomActualSize() +{ + setZoom(1.0); +} + +void SvgView::setZoom(qreal value) +{ + QTransform matrix; + matrix.scale(value, value); + setTransform(matrix); +} + +void SvgView::setHorizontalScrollPosition(int horizontalScrollPosition) +{ + horizontalScrollBar()->setValue(horizontalScrollPosition); +} + +void SvgView::setVerticalScrollPosition(int verticalScrollPosition) +{ + verticalScrollBar()->setValue(verticalScrollPosition); +} + +int SvgView::horizontalScrollPosition() const +{ + return horizontalScrollBar()->value(); +} + +int SvgView::verticalScrollPosition() const +{ + return verticalScrollBar()->value(); +} + +qreal SvgView::zoom() const +{ + return transform().m11(); +} + +void SvgView::wheelEvent(QWheelEvent *wheelEvent) +{ + if (wheelEvent->modifiers() & Qt::ControlModifier) { + const int delta = wheelEvent->angleDelta().y(); + if (delta > 0) { + zoomIn(); + } else if (delta < 0) { + zoomOut(); + } + + wheelEvent->accept(); + return; + } + + QGraphicsView::wheelEvent(wheelEvent); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/svgpart-21.12.3/src/svgview.h new/svgpart-22.04.0/src/svgview.h --- old/svgpart-21.12.3/src/svgview.h 1970-01-01 01:00:00.000000000 +0100 +++ new/svgpart-22.04.0/src/svgview.h 2022-04-12 23:28:18.000000000 +0200 @@ -0,0 +1,38 @@ +/* + SPDX-FileCopyrightText: 2022 Friedrich W. H. Kossebau <[email protected]> + + SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#ifndef SVGVIEW_H +#define SVGVIEW_H + +#include <QGraphicsView> + +class SvgView : public QGraphicsView +{ + Q_OBJECT + +public: + SvgView(QGraphicsScene *scene, QWidget *parent); + ~SvgView() = default; + +public: + qreal zoom() const; + int horizontalScrollPosition() const; + int verticalScrollPosition() const; + + void setHorizontalScrollPosition(int horizontalScrollPosition); + void setVerticalScrollPosition(int verticalScrollPosition); + void setZoom(qreal value); + +public Q_SLOTS: + void zoomActualSize(); + void zoomIn(); + void zoomOut(); + +protected: + void wheelEvent(QWheelEvent *wheelEvent) override; +}; + +#endif
