Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kollision for openSUSE:Factory checked in at 2021-12-13 20:43:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kollision (Old) and /work/SRC/openSUSE:Factory/.kollision.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kollision" Mon Dec 13 20:43:28 2021 rev:117 rq:937983 version:21.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kollision/kollision.changes 2021-11-06 18:20:25.412960291 +0100 +++ /work/SRC/openSUSE:Factory/.kollision.new.2520/kollision.changes 2021-12-13 20:48:47.260573171 +0100 @@ -1,0 +2,26 @@ +Fri Dec 3 19:22:20 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.12.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/21.12.0/ +- No code change since 21.11.90 + +------------------------------------------------------------------- +Sat Nov 27 10:11:15 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.11.90 + * New feature release +- No code change since 21.11.80 + +------------------------------------------------------------------- +Sat Nov 13 17:55:40 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.11.80 + * New feature release +- Changes since 21.08.3: + * kde-ci: use @same so that stable builds use stable libkdegames + * CI: Fix repo path for libkdegames + * Documentation updates + +------------------------------------------------------------------- Old: ---- kollision-21.08.3.tar.xz kollision-21.08.3.tar.xz.sig New: ---- kollision-21.12.0.tar.xz kollision-21.12.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kollision.spec ++++++ --- /var/tmp/diff_new_pack.Z38OrV/_old 2021-12-13 20:48:47.724573468 +0100 +++ /var/tmp/diff_new_pack.Z38OrV/_new 2021-12-13 20:48:47.728573471 +0100 @@ -16,12 +16,11 @@ # -%define kf5_version 5.60.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kollision -Version: 21.08.3 +Version: 21.12.0 Release: 0 Summary: Kollision game License: GPL-2.0-or-later ++++++ kollision-21.08.3.tar.xz -> kollision-21.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-21.08.3/.gitlab-ci.yml new/kollision-21.12.0/.gitlab-ci.yml --- old/kollision-21.08.3/.gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/kollision-21.12.0/.gitlab-ci.yml 2021-12-02 22:32:09.000000000 +0100 @@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: None +# SPDX-License-Identifier: CC0-1.0 + +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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-21.08.3/.kde-ci.yml new/kollision-21.12.0/.kde-ci.yml --- old/kollision-21.08.3/.kde-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/kollision-21.12.0/.kde-ci.yml 2021-12-02 22:32:09.000000000 +0100 @@ -0,0 +1,16 @@ +# SPDX-FileCopyrightText: None +# SPDX-License-Identifier: CC0-1.0 + +Dependencies: +- 'on': ['@all'] + 'require': + 'frameworks/extra-cmake-modules': '@stable' + 'games/libkdegames': '@same' + 'frameworks/kconfig': '@stable' + 'frameworks/kcoreaddons': '@stable' + 'frameworks/kcrash': '@stable' + 'frameworks/kdbusaddons': '@stable' + 'frameworks/kdoctools': '@stable' + 'frameworks/ki18n': '@stable' + 'frameworks/kwidgetsaddons': '@stable' + 'frameworks/kxmlgui': '@stable' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-21.08.3/CMakeLists.txt new/kollision-21.12.0/CMakeLists.txt --- old/kollision-21.08.3/CMakeLists.txt 2021-10-31 11:27:35.000000000 +0100 +++ new/kollision-21.12.0/CMakeLists.txt 2021-12-02 22:32:09.000000000 +0100 @@ -2,8 +2,8 @@ # Release Service version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "21") -set (RELEASE_SERVICE_VERSION_MINOR "08") -set (RELEASE_SERVICE_VERSION_MICRO "3") +set (RELEASE_SERVICE_VERSION_MINOR "12") +set (RELEASE_SERVICE_VERSION_MICRO "0") set (RELEASE_SERVICE_COMPACT_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}${RELEASE_SERVICE_VERSION_MINOR}${RELEASE_SERVICE_VERSION_MICRO}") # Bump KOLLISION_BASE_VERSION once new features are added @@ -13,11 +13,20 @@ project(kollision VERSION ${KOLLISION_VERSION}) set (QT_MIN_VERSION "5.15.0") -set (KF5_MIN_VERSION "5.83.0") +set (KF5_MIN_VERSION "5.85.0") find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) +include(KDEInstallDirs) +include(KDECMakeSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) + +include(ECMAddAppIcon) +include(ECMInstallIcons) +include(ECMSetupVersion) +include(FeatureSummary) + find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config @@ -32,28 +41,11 @@ find_package(KF5KDEGames 7.3.0 REQUIRED) -include(FeatureSummary) -include(ECMAddAppIcon) -include(ECMInstallIcons) -include(KDEInstallDirs) -include(KDECompilerSettings NO_POLICY_SCOPE) -include(KDECMakeSettings) -include(ECMSetupVersion) - add_definitions(-DTRANSLATION_DOMAIN="kollision") add_definitions( - -DQT_USE_QSTRINGBUILDER - -DQT_NO_CAST_FROM_ASCII - -DQT_NO_CAST_TO_ASCII - -DQT_NO_CAST_FROM_BYTEARRAY - -DQT_NO_URL_CAST_FROM_STRING - -DQT_STRICT_ITERATORS - -DQT_NO_KEYWORDS - -DQT_NO_FOREACH - -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DQT_DISABLE_DEPRECATED_BEFORE=0x050F00 -DQT_DEPRECATED_WARNINGS_SINCE=0x060000 - -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055200 + -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055600 -DKF_DEPRECATED_WARNINGS_SINCE=0x060000 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-21.08.3/CMakePresets.json new/kollision-21.12.0/CMakePresets.json --- old/kollision-21.08.3/CMakePresets.json 2021-10-31 11:27:35.000000000 +0100 +++ new/kollision-21.12.0/CMakePresets.json 2021-12-02 22:32:09.000000000 +0100 @@ -12,6 +12,17 @@ } }, { + "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" + } + }, + { "name": "asan", "displayName": "Build with Asan support.", "generator": "Ninja", @@ -72,6 +83,18 @@ "configurePreset": "dev" }, { + "name": "asan", + "configurePreset": "asan" + }, + { + "name": "dev-disable-deprecated", + "configurePreset": "dev-disable-deprecated" + }, + { + "name": "unity", + "configurePreset": "unity" + }, + { "name": "clazy", "configurePreset": "clazy", "environment": { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-21.08.3/doc/index.docbook new/kollision-21.12.0/doc/index.docbook --- old/kollision-21.08.3/doc/index.docbook 2021-10-31 11:27:35.000000000 +0100 +++ new/kollision-21.12.0/doc/index.docbook 2021-12-02 22:32:09.000000000 +0100 @@ -1,10 +1,9 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kollision "<application>Kollision</application>"> <!ENTITY % English "INCLUDE" > <!ENTITY % addindex "IGNORE"> ]> - + <book id="kollision" lang="&language;"> <bookinfo> <title>The &kollision; Handbook</title> @@ -19,13 +18,13 @@ <!-- TRANS:ROLES_OF_TRANSLATORS --> </authorgroup> <legalnotice>&FDLNotice;</legalnotice> - -<date>2016-05-10</date> -<releaseinfo>0.3 (applications 16.04)</releaseinfo> + +<date>2021-08-07</date> +<releaseinfo>0.3 (KDE Gear 21.08)</releaseinfo> <abstract> <para>This documentation describes the game of &kollision; version 0.3</para> </abstract> - + <keywordset> <keyword>KDE</keyword> <keyword>kdegames</keyword> @@ -39,10 +38,10 @@ <note><title>Gametype:</title><para>Arcade</para></note> <note><title>Number of possible players:</title><para>One</para></note> <para> - A simple ball dodging game + A simple ball dodging game. </para> </chapter> - + <chapter id="howto"><title>How to play</title> <note><title>Objective:</title><para>Let the blue ball move in the field without touching the red balls.</para></note> @@ -67,7 +66,7 @@ You can choose the game difficulty level on the right of the status bar. The higher the difficulty level, the faster red balls move, and the more balls will appear on the play field. </para> </chapter> - + <chapter id="rules_and_tips"><title>Game Rules, Strategies and Tips</title> <para>Game Rules, Strategies and Tips</para> <sect1 id="rules"><title>Game Rules</title> @@ -87,8 +86,8 @@ </itemizedlist> </sect1> </chapter> - - + + <chapter id="interface"><title>Interface Overview</title> <sect1 id="menu"> @@ -148,9 +147,17 @@ </varlistentry> <varlistentry> +<term><menuchoice> +<guimenu>Settings</guimenu> +<guimenuitem>Increase Ball Size</guimenuitem> +</menuchoice></term> +<listitem><para><action>Toggle to make the balls bigger.</action> The default is off.</para></listitem> +</varlistentry> + +<varlistentry> <term><menuchoice><guimenu>Settings</guimenu> <guisubmenu>Difficulty</guisubmenu></menuchoice></term> -<listitem><para>Allows you to select a difficulty <guilabel>Easy</guilabel>, <guilabel>Medium</guilabel>, +<listitem><para>Allows you to select a difficulty <guilabel>Easy</guilabel>, <guilabel>Medium</guilabel>, <guilabel>Hard</guilabel> for the game.</para></listitem> </varlistentry> @@ -166,7 +173,7 @@ </sect1> </chapter> - + <chapter id="faq"><title>Frequently asked questions</title> <qandaset> <qandaentry> @@ -187,7 +194,7 @@ </qandaentry> </qandaset> </chapter> - + <chapter id="credits"><title>Credits and License</title> <para> &kollision; @@ -206,10 +213,10 @@ &underFDL; &underGPL; - + </chapter> -&documentation.index; +&documentation.index; </book> <!-- Local Variables: Binary files old/kollision-21.08.3/po/ca/docs/kollision/gameboard.png and new/kollision-21.12.0/po/ca/docs/kollision/gameboard.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-21.08.3/po/ca/docs/kollision/index.docbook new/kollision-21.12.0/po/ca/docs/kollision/index.docbook --- old/kollision-21.08.3/po/ca/docs/kollision/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ new/kollision-21.12.0/po/ca/docs/kollision/index.docbook 2021-12-03 01:12:26.000000000 +0100 @@ -0,0 +1,401 @@ +<?xml version="1.0" ?> +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ + <!ENTITY % Catalan "INCLUDE"> + <!ENTITY % addindex "IGNORE"> +]> + +<book id="kollision" lang="&language;"> +<bookinfo> + <title +>El manual del &kollision;</title> +<authorgroup> + <author +><firstname +>Paolo</firstname +> <surname +>Capriotti</surname +> <affiliation +> <address +><email +>[email protected]</email +></address> + </affiliation> + </author> +&traductor.Antoni.Bella; +</authorgroup> +<legalnotice +>&FDLNotice;</legalnotice> + +<date +>7 d'agost de 2021</date> +<releaseinfo +>0.3 (KDE Gear 21.08)</releaseinfo> +<abstract> + <para +>Aquesta documentaci?? descriu el joc &kollision; versi?? 0.3</para> +</abstract> + +<keywordset> + <keyword +>KDE</keyword> + <keyword +>kdegames</keyword> + <keyword +>joc</keyword> + <keyword +>Kollision</keyword> + <keyword +>arcade</keyword> + <keyword +>un jugador</keyword> +</keywordset> +</bookinfo> +<chapter id="introduction" +><title +>Introducci??</title> + <note +><title +>Tipus de joc:</title +><para +>Arcade</para +></note> + <note +><title +>Nombre de possibles jugadors:</title +><para +>Un</para +></note> + <para +>Un joc senzill d'esquivar una pilota. </para> +</chapter> + +<chapter id="howto" +><title +>Com es juga</title> + <note +><title +>Objectiu:</title +><para +>Fer que la pilota blava es mogui pel camp sense tocar les pilotes vermelles.</para +></note> + +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="gameboard.png" format="PNG"/> +</imageobject> +<textobject> +<phrase +>Tauler de joc del &kollision;</phrase> +</textobject> +</mediaobject> +</screenshot> + + <para +>Feu clic sobre el camp buit per a iniciar una partida: una pilota blava substituir?? immediatament el cursor del ratol?? i diverses pilotes vermelles comen??aran a apar??ixer a dins del camp. </para> + <para +>Quan acabin de materialitzar-se les pilotes vermelles, es mouran a una velocitat i direcci?? aleat??ries, i haureu d'esquivar-les r??pidament amb el ratol?? fent de pilota blava dins el camp. Despr??s d'algun temps, apareixeran altres pilotes vermelles, apareixeran com abans i despr??s es comen??aran a moure. Esteu preparat per a evitar-les. </para> + <para +>Podeu triar el nivell de dificultat del joc a la dreta de la barra d'estat. Com m??s gran sigui el nivell de dificultat, les pilotes vermelles es mouran m??s r??pid i apareixeran m??s pilotes en el camp de joc. </para> +</chapter> + +<chapter id="rules_and_tips" +><title +>Les regles del joc, estrat??gies i consells</title> + <para +>Les regles del joc, estrat??gies i consells</para> + <sect1 id="rules" +><title +>Les regles del joc</title> + <itemizedlist> + <listitem +><para +>Les pilotes vermelles es mouen amb una velocitat constant en el camp de joc i van rebotant per les parets fins que xoquen amb una altra pilota, el qual fa que canvi?? la velocitat i la direcci?? d'ambdues pilotes.</para +></listitem> + <listitem +><para +>La pilota blava es pot moure lliurement amb el ratol?? dins el camp.</para +></listitem> + <listitem +><para +>La pilota blava no pot escapar del camp. Si es mou el cursor afora, la pilota romandr?? a la vora, fins que torni el cursor.</para +></listitem> + <listitem +><para +>La puntuaci?? ??s directament proporcional al temps que ha durat la partida.</para +></listitem> + <listitem +><para +>Fer una pausa en la partida restar?? (acumulatiu) 5 segons de penalitzaci?? del temps total.</para +></listitem> + </itemizedlist> + </sect1> + <sect1 id="strattips" +><title +>Les estrat??gies i consells</title> + <itemizedlist> + <listitem +><para +>Moveu la pilota blava amb suavitat i lentament. El balanceig a trav??s del camp far?? que siguin m??s probables les col??lisions amb les altres pilotes.</para +></listitem> + <listitem +><para +>Moure el cursor fora del camp es pot utilitzar com un truc elegant per a sortir d'una situaci?? dif??cil. Feu-ho servir amb saviesa.</para +></listitem> + <listitem +><para +>No feu una pausa en la partida si no ??s absolutament necessari.</para +></listitem> + </itemizedlist> + </sect1> +</chapter> + + +<chapter id="interface" +><title +>Resum de la interf??cie</title> + +<sect1 id="menu"> +<title +>Elements de men??</title> + +<variablelist> + +<varlistentry> +<term +><menuchoice +><guimenu +>Joc</guimenu +> <guimenuitem +>Finalitza la partida</guimenuitem +></menuchoice +></term> +<listitem +><para +>Acaba una partida i es torna a la pantalla de benvinguda.</para +></listitem> +</varlistentry> + +<varlistentry id="game-pause"> +<term> +<menuchoice +><shortcut +> <keycap +>P</keycap +> </shortcut +> <guimenu +>Joc</guimenu +> <guimenuitem +>Pausa</guimenuitem +> </menuchoice +></term> +<listitem> +<para +><action +>Posa en pausa o resumeix la partida.</action +></para> +</listitem> +</varlistentry> + +<varlistentry> +<term +><menuchoice +><shortcut +><keycombo action="simul" +>&Ctrl;<keycap +>H</keycap +></keycombo +></shortcut +> <guimenu +>Joc</guimenu +> <guimenuitem +>Mostra les puntuacions</guimenuitem +></menuchoice +></term> +<listitem +><para +>Mostrar?? les millors puntuacions per al nivell actual.</para +></listitem> +</varlistentry> + +<varlistentry> +<term +><menuchoice +><shortcut +><keycombo action="simul" +>&Ctrl;<keycap +>Q</keycap +></keycombo +> </shortcut +> <guimenu +>Joc</guimenu +> <guimenuitem +>Surt</guimenuitem +></menuchoice +></term> +<listitem +><para +>En seleccionar aquest element s'acabar?? la partida en joc i se sortir?? del &kollision;.</para +></listitem> +</varlistentry> + +<varlistentry> +<term> +<menuchoice +><guimenu +>Arranjament</guimenu +> <guimenuitem +>Reprodueix els sons</guimenuitem +> </menuchoice> +</term> +<listitem> +<para +><action +>Alterna si s'han de reproduir els efectes de so.</action +> El valor predeterminat ??s desactivada. </para> +</listitem> +</varlistentry> + +<varlistentry> +<term +><menuchoice +><guimenu +>Arranjament</guimenu +> <guimenuitem +>Augmenta la mida de la pilota</guimenuitem +> </menuchoice +></term> +<listitem +><para +><action +>Alterna si s'han de fer les pilotes m??s grans.</action +> El valor predeterminat ??s desactivada.</para +></listitem> +</varlistentry> + +<varlistentry> +<term +><menuchoice +><guimenu +>Arranjament</guimenu +> <guisubmenu +>Dificultat</guisubmenu +></menuchoice +></term> +<listitem +><para +>Permet seleccionar una dificultat <guilabel +>F??cil</guilabel +>, <guilabel +>Mitjana</guilabel +> i <guilabel +>Dif??cil</guilabel +> per a la partida.</para +></listitem> +</varlistentry> + +</variablelist> + +<para +>De manera addicional, el &kollision; t?? la configuraci?? comuna al &kde; i els elements dels men??s <guimenu +>Arranjament</guimenu +> i <guimenu +>Ajuda</guimenu +>. Per a obtenir m??s informaci??, llegiu les seccions sobre <ulink url="help:/fundamentals/menus.html#menus-settings" +>El men?? Arranjament</ulink +> i <ulink url="help:/fundamentals/menus.html#menus-help" +>El men?? Ajuda</ulink +> en els Fonaments del &kde;. </para> + +</sect1> + +</chapter> + +<chapter id="faq" +><title +>Preguntes m??s freq??ents</title> +<qandaset> +<qandaentry> + <question +><para +>Vull canviar l'aparen??a d'aquest joc. Puc fer-ho? </para +></question> + <answer +><para +>No.</para +></answer> +</qandaentry> +<qandaentry> + <question +><para +>Puc utilitzar el teclat per a jugar a aquest joc? </para +></question> + <answer +><para +>No. El &kollision; nom??s es pot jugar amb un ratol??.</para +></answer> +</qandaentry> +<qandaentry> + <question +><para +>No s?? qu?? fer aqu??! Hi ha cap consell? </para +></question> + <answer +><para +>El &kollision; no t?? una caracter??stica de pista.</para +></answer> +</qandaentry> +<qandaentry> + <question +><para +>He de sortir del joc ara, per?? encara no he acabat. Puc desar el meu progr??s?</para +></question> + <answer +><para +>En el &kollision; no es poden desar les partides.</para +></answer> +</qandaentry> +</qandaset> +</chapter> + +<chapter id="credits" +><title +>Cr??dits i llic??ncia</title> +<para +>&kollision; </para> +<para +>Copyright 2007-2008 Paolo Capriotti <email +>[email protected]</email +> </para> +<para +>Copyright 2007-2008 Dmitri Suzdalev <email +>[email protected]</email +> </para> +<para +>Copyright de la documentaci?? 2008 Paolo Capriotti <email +>[email protected]</email +> </para> + +<para +>Traductor de la documentaci??: &credits.Antoni.Bella;</para +> &underFDL; &underGPL; </chapter> + +&documentation.index; +</book> +<!-- +Local Variables: +mode: sgml +sgml-minimize-attributes:nil +sgml-general-insert-case:lower +sgml-omittag:t +sgml-shorttag:t +sgml-namecase-general:t +sgml-always-quote-attributes:t +sgml-indent-step:0 +sgml-indent-data:nil +sgml-parent-document:nil +sgml-exposed-tags:nil +sgml-local-catalogs:nil +sgml-local-ecat-files:nil +End: +--> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-21.08.3/po/ca@valencia/kollision.po new/kollision-21.12.0/po/ca@valencia/kollision.po --- old/kollision-21.08.3/po/ca@valencia/kollision.po 2021-11-02 01:12:16.000000000 +0100 +++ new/kollision-21.12.0/po/ca@valencia/kollision.po 2021-12-03 01:12:25.000000000 +0100 @@ -211,3 +211,6 @@ #, kde-format msgid "&Animation smoothness:" msgstr "Suavitat de l'&animaci??:" + +#~ msgid "Difficulty of the game." +#~ msgstr "Dificultat de la partida." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-21.08.3/po/es/docs/kollision/index.docbook new/kollision-21.12.0/po/es/docs/kollision/index.docbook --- old/kollision-21.08.3/po/es/docs/kollision/index.docbook 2021-11-02 01:12:16.000000000 +0100 +++ new/kollision-21.12.0/po/es/docs/kollision/index.docbook 2021-12-03 01:12:26.000000000 +0100 @@ -1,12 +1,9 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kollision "<application ->Kollision</application ->"> <!ENTITY % Spanish "INCLUDE"> <!ENTITY % addindex "IGNORE"> ]> - + <book id="kollision" lang="&language;"> <bookinfo> <title @@ -56,17 +53,16 @@ </authorgroup> <legalnotice >&FDLNotice;</legalnotice> - + <date ->2016-05-10</date> +>2021-08-07</date> <releaseinfo ->0.3 (Aplicaciones 16.04)</releaseinfo -> +>0.3 (KDE Gear 21.08)</releaseinfo> <abstract> <para >Esta documentaci??n describe el juego &kollision; versi??n 0.3</para> </abstract> - + <keywordset> <keyword >KDE</keyword> @@ -98,9 +94,9 @@ >Uno</para ></note> <para ->Un juego para esquivar bolas </para> +>Un sencillo juego de esquivar bolas. </para> </chapter> - + <chapter id="howto" ><title >C??mo jugar</title> @@ -130,7 +126,7 @@ <para >Puede elegir el nivel de dificultad del juego en la parte derecha de la barra >de estado. El nivel de dificultad m??s alto, mover?? las bolas rojas m??s >deprisa, y aparecer??n m??s bolas en el campo de juego. </para> </chapter> - + <chapter id="rules_and_tips" ><title >Reglas de juego, estrategias y trucos</title> @@ -181,8 +177,8 @@ </itemizedlist> </sect1> </chapter> - - + + <chapter id="interface" ><title >Visi??n general de la interfaz</title> @@ -293,6 +289,23 @@ ><menuchoice ><guimenu >Preferencias</guimenu +> <guimenuitem +>Aumentar el tama??o de las bolas</guimenuitem +> </menuchoice +></term> +<listitem +><para +><action +>Marcar para hacer que las bolas sean m??s grandes</action +> De forma predeterminada est?? desactivado.</para +></listitem> +</varlistentry> + +<varlistentry> +<term +><menuchoice +><guimenu +>Preferencias</guimenu > <guisubmenu >Dificultad</guisubmenu ></menuchoice @@ -325,7 +338,7 @@ </sect1> </chapter> - + <chapter id="faq" ><title >Preguntas frecuentes</title> @@ -372,7 +385,7 @@ </qandaentry> </qandaset> </chapter> - + <chapter id="credits" ><title >Cr??ditos y licencia</title> @@ -399,7 +412,7 @@ >.</para > &underFDL; &underGPL; </chapter> -&documentation.index; +&documentation.index; </book> <!-- Local Variables: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-21.08.3/po/it/docs/kollision/index.docbook new/kollision-21.12.0/po/it/docs/kollision/index.docbook --- old/kollision-21.08.3/po/it/docs/kollision/index.docbook 2021-11-02 01:12:16.000000000 +0100 +++ new/kollision-21.12.0/po/it/docs/kollision/index.docbook 2021-12-03 01:12:26.000000000 +0100 @@ -1,12 +1,9 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kollision "<application ->Kollision</application ->"> <!ENTITY % Italian "INCLUDE"> <!ENTITY % addindex "IGNORE"> ]> - + <book id="kollision" lang="&language;"> <bookinfo> <title @@ -42,17 +39,16 @@ </authorgroup> <legalnotice >&FDLNotice;</legalnotice> - + <date ->10/05/2016</date> +>07/08/2021</date> <releaseinfo ->0.3 (applications 16.04)</releaseinfo -> +>0.3 (KDE Gear 21.08)</releaseinfo> <abstract> <para >Questa documentazione descrive il gioco &kollision; versione 0.3</para> </abstract> - + <keywordset> <keyword >KDE</keyword> @@ -84,9 +80,9 @@ >Uno</para ></note> <para ->Un semplice gioco di destrezza </para> +>Un semplice gioco di destrezza. </para> </chapter> - + <chapter id="howto" ><title >Come si gioca</title> @@ -116,7 +112,7 @@ <para >Puoi scegliere il livello di difficolt?? del gioco sulla destra della barra >di stato. Pi?? alto ?? il livello di difficolt??, pi?? velocemente si muovono >le palline rosse, e pi?? palline rosse appariranno sul campo. </para> </chapter> - + <chapter id="rules_and_tips" ><title >Regole del gioco, strategie e suggerimenti</title> @@ -167,8 +163,8 @@ </itemizedlist> </sect1> </chapter> - - + + <chapter id="interface" ><title >Panoramica dell'interfaccia</title> @@ -279,6 +275,23 @@ ><menuchoice ><guimenu >Impostazioni</guimenu +> <guimenuitem +>Aumenta le dimensioni della palla</guimenuitem +> </menuchoice +></term> +<listitem +><para +><action +>Attivalo per rendere la palla pi?? grande.</action +> Per impostazione predefinita ?? disattivato.</para +></listitem> +</varlistentry> + +<varlistentry> +<term +><menuchoice +><guimenu +>Impostazioni</guimenu > <guisubmenu >Difficolt??</guisubmenu ></menuchoice @@ -311,7 +324,7 @@ </sect1> </chapter> - + <chapter id="faq" ><title >Domande ricorrenti</title> @@ -360,7 +373,7 @@ </qandaentry> </qandaset> </chapter> - + <chapter id="credits" ><title >Riconoscimenti e licenza</title> @@ -385,7 +398,7 @@ ></para > &underFDL; &underGPL; </chapter> -&documentation.index; +&documentation.index; </book> <!-- Local Variables: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-21.08.3/po/nl/docs/kollision/index.docbook new/kollision-21.12.0/po/nl/docs/kollision/index.docbook --- old/kollision-21.08.3/po/nl/docs/kollision/index.docbook 2021-11-02 01:12:16.000000000 +0100 +++ new/kollision-21.12.0/po/nl/docs/kollision/index.docbook 2021-12-03 01:12:26.000000000 +0100 @@ -1,12 +1,9 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kollision "<application ->Kollision</application ->"> <!ENTITY % Dutch "INCLUDE"> <!ENTITY % addindex "IGNORE"> ]> - + <book id="kollision" lang="&language;"> <bookinfo> <title @@ -28,17 +25,16 @@ </authorgroup> <legalnotice >&FDLNotice;</legalnotice> - + <date ->2016-05-10</date> +>2021-08-07</date> <releaseinfo ->0.3 (Applications 16.04)</releaseinfo -> +>0.3 (KDE Gear 21.08)</releaseinfo> <abstract> <para >Deze documentatie beschrijft het spel van &kollision; versie 0.3</para> </abstract> - + <keywordset> <keyword >KDE</keyword> @@ -70,9 +66,9 @@ >E??n</para ></note> <para ->Een eenvoudig balkaatsspel </para> +>Een eenvoudig balkaatsspel. </para> </chapter> - + <chapter id="howto" ><title >Hoe te spelen</title> @@ -102,7 +98,7 @@ <para >U kunt de moeilijkheidsgraag van het spel kiezen rechts van de statusbalk. >Hoe hoger de moeilijkheidsgraad, hoer sneller rode ballen bewegen en hoe meer >ballen er zullen verschijnen op het speelveld. </para> </chapter> - + <chapter id="rules_and_tips" ><title >Spelregels, strategie??n en tips</title> @@ -153,8 +149,8 @@ </itemizedlist> </sect1> </chapter> - - + + <chapter id="interface" ><title >Overzicht van het interface</title> @@ -266,6 +262,23 @@ ><guimenu >Instellingen</guimenu > <guimenuitem +>Balgrootte verhogen</guimenuitem +> </menuchoice +></term> +<listitem +><para +><action +>Omschakelen om de ballen groter te maken.</action +> De standaard is uit.</para +></listitem> +</varlistentry> + +<varlistentry> +<term +><menuchoice +><guimenu +>Instellingen</guimenu +> <guimenuitem >Geluiden afspelen</guimenuitem ></menuchoice ></term> @@ -297,7 +310,7 @@ </sect1> </chapter> - + <chapter id="faq" ><title >Veel voorkomende vragen</title> @@ -346,7 +359,7 @@ </qandaentry> </qandaset> </chapter> - + <chapter id="credits" ><title >Dankbetuiging en licentie</title> @@ -367,7 +380,7 @@ &meld.fouten;&vertaling.freek; &underFDL; &underGPL; </chapter> -&documentation.index; +&documentation.index; </book> <!-- Local Variables: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-21.08.3/po/sk/kollision.po new/kollision-21.12.0/po/sk/kollision.po --- old/kollision-21.08.3/po/sk/kollision.po 2021-11-02 01:12:16.000000000 +0100 +++ new/kollision-21.12.0/po/sk/kollision.po 2021-12-03 01:12:26.000000000 +0100 @@ -1,20 +1,20 @@ # translation of kollision.po to Slovak # Richard Fric <[email protected]>, 2009. # Michal Sulek <[email protected]>, 2010, 2011. -# Roman Paholik <[email protected]>, 2016. +# Roman Paholik <[email protected]>, 2016, 2021. msgid "" msgstr "" "Project-Id-Version: kollision\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-01-01 02:18+0100\n" -"PO-Revision-Date: 2016-02-01 20:18+0100\n" +"PO-Revision-Date: 2021-11-14 12:32+0100\n" "Last-Translator: Roman Paholik <[email protected]>\n" "Language-Team: Slovak <[email protected]>\n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 21.08.3\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #, kde-format @@ -53,7 +53,7 @@ #: main.cpp:34 #, kde-format msgid "Casual ball game" -msgstr "" +msgstr "Le????rna loptov?? hra" #: main.cpp:36 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-21.08.3/po/sv/docs/kollision/index.docbook new/kollision-21.12.0/po/sv/docs/kollision/index.docbook --- old/kollision-21.08.3/po/sv/docs/kollision/index.docbook 2021-11-02 01:12:16.000000000 +0100 +++ new/kollision-21.12.0/po/sv/docs/kollision/index.docbook 2021-12-03 01:12:26.000000000 +0100 @@ -1,12 +1,9 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kollision "<application ->Kollision</application ->"> <!ENTITY % Swedish "INCLUDE"> <!ENTITY % addindex "IGNORE"> ]> - + <book id="kollision" lang="&language;"> <bookinfo> <title @@ -42,17 +39,16 @@ </authorgroup> <legalnotice >&FDLNotice;</legalnotice> - + <date ->2016-05-10</date> +>2021-08-07</date> <releaseinfo ->0.3 (Program 16.04)</releaseinfo -> +>0.3 (KDE Gear 21.08)</releaseinfo> <abstract> <para >Denna dokumentation beskriver spelet &kollision;, version 0.3</para> </abstract> - + <keywordset> <keyword >KDE</keyword> @@ -84,9 +80,9 @@ >En</para ></note> <para ->Ett enkelt spel f??r att undvika bollar </para> +>Ett enkelt spel f??r att undvika bollar. </para> </chapter> - + <chapter id="howto" ><title >Hur man spelar</title> @@ -116,7 +112,7 @@ <para >Du kan v??lja spelets sv??righetsniv?? till h??ger om statusraden. Ju h??gre >sv??righetsniv??, desto snabbare r??r sig de r??da bollarna, och desto fler >bollar visas p?? spelf??ltet. </para> </chapter> - + <chapter id="rules_and_tips" ><title >Spelets regler, strategi och tips</title> @@ -167,8 +163,8 @@ </itemizedlist> </sect1> </chapter> - - + + <chapter id="interface" ><title >??versikt av gr??nssnittet</title> @@ -279,6 +275,23 @@ ><menuchoice ><guimenu >Inst??llningar</guimenu +> <guimenuitem +>??ka bollstorlek</guimenuitem +> </menuchoice +></term> +<listitem +><para +><action +>S??tt p?? f??r att g??ra bollarna st??rre.</action +> Normalv??rdet ??r av.</para +></listitem> +</varlistentry> + +<varlistentry> +<term +><menuchoice +><guimenu +>Inst??llningar</guimenu ><guisubmenu >Sv??righet</guisubmenu ></menuchoice @@ -311,7 +324,7 @@ </sect1> </chapter> - + <chapter id="faq" ><title >Vanliga fr??gor</title> @@ -360,7 +373,7 @@ </qandaentry> </qandaset> </chapter> - + <chapter id="credits" ><title >Tack till och licens</title> @@ -385,7 +398,7 @@ ></para > &underFDL; &underGPL; </chapter> -&documentation.index; +&documentation.index; </book> <!-- Local Variables: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-21.08.3/po/uk/docs/kollision/index.docbook new/kollision-21.12.0/po/uk/docs/kollision/index.docbook --- old/kollision-21.08.3/po/uk/docs/kollision/index.docbook 2021-11-02 01:12:16.000000000 +0100 +++ new/kollision-21.12.0/po/uk/docs/kollision/index.docbook 2021-12-03 01:12:26.000000000 +0100 @@ -1,12 +1,9 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kollision "<application ->Kollision</application ->"> <!ENTITY % Ukrainian "INCLUDE"> <!ENTITY % addindex "IGNORE"> ]> - + <book id="kollision" lang="&language;"> <bookinfo> <title @@ -42,17 +39,16 @@ </authorgroup> <legalnotice >&FDLNotice;</legalnotice> - + <date ->10 ???????????? 2016 ????????</date> +>7 ???????????? 2021 ????????</date> <releaseinfo ->0.3 (???????????????? 16.04)</releaseinfo -> +>0.3 (KDE Gear 21.08)</releaseinfo> <abstract> <para >?? ?????? ???????????????????????? ?????????????? ?????? &kollision; >???????????? 0.3.</para> </abstract> - + <keywordset> <keyword >KDE</keyword> @@ -84,9 +80,9 @@ >????????</para ></note> <para ->???????????? ?????? ?? ?????????????? </para> +>???????????? ?????? ?? ??????????????. </para> </chapter> - + <chapter id="howto" ><title >???? ??????????</title> @@ -116,7 +112,7 @@ <para >?? ???????????? ?????????????? ???????????? ?????????? ???? ?????????????? >???????????? ???????????? ???????????????????? ??????. ?????? ?????????? >???????? ???????????? ????????????????????, ?????? ???????????? >???????????????????????? ?????????????? ????????????, ?? ?????? ???????????? >???? ????????????????????????????? ???? ???????????????? ????????. </para> </chapter> - + <chapter id="rules_and_tips" ><title >?????????????? ??????, ?????????????????? ???? ????????????</title> @@ -167,8 +163,8 @@ </itemizedlist> </sect1> </chapter> - - + + <chapter id="interface" ><title >?????????? ????????????????????</title> @@ -279,6 +275,23 @@ ><menuchoice ><guimenu >??????????????????</guimenu +> <guimenuitem +>?????????????????????? ???????????? ????????????</guimenuitem +> </menuchoice +></term> +<listitem +><para +><action +>???????????? ?????? ?????????????? ???????????????????? ????????????.</action +> ????????????, ???????????????????? ????????????????.</para +></listitem> +</varlistentry> + +<varlistentry> +<term +><menuchoice +><guimenu +>??????????????????</guimenu > <guisubmenu >????????????????????</guisubmenu ></menuchoice @@ -311,7 +324,7 @@ </sect1> </chapter> - + <chapter id="faq" ><title >?????????? ??????????????????</title> @@ -360,7 +373,7 @@ </qandaentry> </qandaset> </chapter> - + <chapter id="credits" ><title >???????????? ?? ????????????????</title> @@ -383,10 +396,9 @@ >???????????????? ??????????????????????: ???????? ?????????????????? <email >[email protected]</email ></para -> -&underFDL; &underGPL; </chapter> +> &underFDL; &underGPL; </chapter> -&documentation.index; +&documentation.index; </book> <!-- Local Variables: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-21.08.3/po/zh_CN/kollision.po new/kollision-21.12.0/po/zh_CN/kollision.po --- old/kollision-21.08.3/po/zh_CN/kollision.po 2021-11-02 01:12:16.000000000 +0100 +++ new/kollision-21.12.0/po/zh_CN/kollision.po 2021-12-03 01:12:26.000000000 +0100 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-01-01 02:18+0100\n" -"PO-Revision-Date: 2021-10-29 13:27\n" +"PO-Revision-Date: 2021-11-30 15:23\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-21.08.3/src/CMakeLists.txt new/kollision-21.12.0/src/CMakeLists.txt --- old/kollision-21.08.3/src/CMakeLists.txt 2021-10-31 11:27:35.000000000 +0100 +++ new/kollision-21.12.0/src/CMakeLists.txt 2021-12-02 22:32:09.000000000 +0100 @@ -7,12 +7,20 @@ target_sources(kollision PRIVATE animation.cpp + animation.h animator.cpp + animator.h ball.cpp - main.cpp + ball.h mainarea.cpp + mainarea.h + main.cpp mainwindow.cpp + mainwindow.h message.cpp + message.h + spritefwd.h + sprite.h kollision.qrc ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-21.08.3/src/animation.cpp new/kollision-21.12.0/src/animation.cpp --- old/kollision-21.08.3/src/animation.cpp 2021-10-31 11:27:35.000000000 +0100 +++ new/kollision-21.12.0/src/animation.cpp 2021-12-02 22:32:09.000000000 +0100 @@ -110,7 +110,7 @@ void AnimationGroup::start(int t) { m_last = t; - for (Animation* a : qAsConst(m_animations)) { + for (Animation* a : std::as_const(m_animations)) { a->start(t); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kollision-21.08.3/src/mainarea.cpp new/kollision-21.12.0/src/mainarea.cpp --- old/kollision-21.08.3/src/mainarea.cpp 2021-10-31 11:27:35.000000000 +0100 +++ new/kollision-21.12.0/src/mainarea.cpp 2021-12-02 22:32:09.000000000 +0100 @@ -136,7 +136,7 @@ if (fade) { AnimationGroup* anim = new AnimationGroup; - for (const auto& message : qAsConst(m_welcomeMsg)) { + for (const auto& message : std::as_const(m_welcomeMsg)) { message->setOpacityF(0.0); anim->add(new FadeAnimation(message, 0.0, 1.0, 1000)); } @@ -216,10 +216,10 @@ } m_man->setVisible(!m_paused); - for (Ball* ball : qAsConst(m_balls)) { + for (Ball* ball : std::as_const(m_balls)) { ball->setVisible(!m_paused); } - for (Ball* ball : qAsConst(m_fading)) { + for (Ball* ball : std::as_const(m_fading)) { ball->setVisible(!m_paused); } @@ -298,7 +298,7 @@ done = true; pos = randomPoint().toPoint(); - for (Ball* ball : qAsConst(m_fading)) { + for (Ball* ball : std::as_const(m_fading)) { if (collide(pos, ball->position(), m_ballDiameter, m_ballDiameter, tmp)) { done = false; break; @@ -358,7 +358,7 @@ m_man = nullptr; Q_EMIT changeState(false); - for (Ball* fball : qAsConst(m_fading)) { + for (Ball* fball : std::as_const(m_fading)) { fball->setOpacityF(1.0); fball->setVelocity(QPointF(0.0, 0.0)); m_balls.push_back(fball); @@ -398,7 +398,7 @@ } // handle deadly collisions - for (Ball* ball : qAsConst(m_balls)) { + for (Ball* ball : std::as_const(m_balls)) { if (m_man && collide( ball->position(), m_man->position(), @@ -413,7 +413,7 @@ } // integrate - for (Ball* ball : qAsConst(m_balls)) { + for (Ball* ball : std::as_const(m_balls)) { // position ball->setPosition(ball->position() + ball->velocity() * t); @@ -519,7 +519,7 @@ if (m_increaseBallSize) { //increase ball size by 4 units setBallDiameter(m_ballDiameter + 4); - for (Ball* ball : qAsConst(m_balls)) { + for (Ball* ball : std::as_const(m_balls)) { ball->setRenderSize(QSize(m_ballDiameter, m_ballDiameter)); } }
