Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package frameworkintegration for openSUSE:Factory checked in at 2022-11-15 13:16:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/frameworkintegration (Old) and /work/SRC/openSUSE:Factory/.frameworkintegration.new.1597 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "frameworkintegration" Tue Nov 15 13:16:55 2022 rev:114 rq:1035365 version:5.100.0 Changes: -------- --- /work/SRC/openSUSE:Factory/frameworkintegration/frameworkintegration.changes 2022-10-11 18:01:07.309655321 +0200 +++ /work/SRC/openSUSE:Factory/.frameworkintegration.new.1597/frameworkintegration.changes 2022-11-15 13:18:46.468356124 +0100 @@ -1,0 +2,9 @@ +Tue Nov 8 08:34:50 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.100.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.100.0 +- No code change since 5.99.0 + +------------------------------------------------------------------- Old: ---- frameworkintegration-5.99.0.tar.xz frameworkintegration-5.99.0.tar.xz.sig New: ---- frameworkintegration-5.100.0.tar.xz frameworkintegration-5.100.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ frameworkintegration.spec ++++++ --- /var/tmp/diff_new_pack.ehTW36/_old 2022-11-15 13:18:47.012355603 +0100 +++ /var/tmp/diff_new_pack.ehTW36/_new 2022-11-15 13:18:47.016355599 +0100 @@ -17,7 +17,7 @@ %define lname libKF5Style5 -%define _tar_path 5.99 +%define _tar_path 5.100 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -25,7 +25,7 @@ # Only needed for the package signature condition %bcond_without released Name: frameworkintegration -Version: 5.99.0 +Version: 5.100.0 Release: 0 Summary: Plugins responsible for better integration of Qt applications in KDE Workspace License: LGPL-2.1-or-later ++++++ frameworkintegration-5.99.0.tar.xz -> frameworkintegration-5.100.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.99.0/CMakeLists.txt new/frameworkintegration-5.100.0/CMakeLists.txt --- old/frameworkintegration-5.99.0/CMakeLists.txt 2022-10-01 15:12:04.000000000 +0200 +++ new/frameworkintegration-5.100.0/CMakeLists.txt 2022-11-05 13:22:41.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.99.0") # handled by release scripts -set(KF_DEP_VERSION "5.99.0") # handled by release scripts +set(KF_VERSION "5.100.0") # handled by release scripts +set(KF_DEP_VERSION "5.100.0") # handled by release scripts project(FrameworkIntegration VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.99.0 NO_MODULE) +find_package(ECM 5.100.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.99.0/plasma_workspace.notifyrc new/frameworkintegration-5.100.0/plasma_workspace.notifyrc --- old/frameworkintegration-5.99.0/plasma_workspace.notifyrc 2022-10-01 15:12:04.000000000 +0200 +++ new/frameworkintegration-5.100.0/plasma_workspace.notifyrc 2022-11-05 13:22:41.000000000 +0100 @@ -2,7 +2,6 @@ IconName=start-here-kde-plasma Comment=Plasma Workspace Comment[ar]=Ù Ø³Ø§ØØ© Ø¹Ù Ù Ø¨ÙØ§Ø²Ù ا -Comment[ast]=Estaya de trabayu de Plasma Comment[az]=Plasma İŠmasası Comment[bg]=РабоÑна ÑÑеда Plasma Comment[bs]=Plazma radni prostor @@ -56,7 +55,6 @@ [Event/Trash: emptied] Name=Trash: Emptied Name[ar]=اÙÙ ÙÙ ÙØ§Øª: Ø£ÙÙØ±ØºØª -Name[ast]=Papelera balerada Name[az]=SÉbÉt: BoÅaldılıb Name[bg]=ÐоÑÑе: изпÑазнено Name[bs]=SmeÄe: ispražnjeno @@ -108,7 +106,6 @@ Name[zh_TW]=å徿¡¶ï¼å·²æ¸ 空 Comment=The trash has been emptied Comment[ar]=Ø£ÙÙØ±ØºØª اÙÙ ÙÙ ÙØ§Øª -Comment[ast]=La papelera baleróse Comment[az]=SÉbÉt boÅaldıldı Comment[bg]=ÐоÑÑеÑо беÑе изпÑазнено. Comment[bs]=SmeÄe je ispražnjeno @@ -214,7 +211,6 @@ Name[zh_TW]=æåè£å®ï¼å¾ªç° Comment=The end of the list of matches has been reached Comment[ar]=ÙØµÙت٠إÙÙ ÙÙØ§ÙØ© ÙØ§Ø¦Ù Ø© Ø§ÙØªØ·Ø§Ø¨Ùات -Comment[ast]=Algamóse la fin de la llista de coincidencies Comment[az]=UyÄun gÉlÉnlÉrin siyahısı sona çatdı Comment[bg]=ÐÑаÑÑ Ð½Ð° ÑпиÑÑка ÑÑÑ ÑÑÐ²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ðµ доÑÑÐ¸Ð³Ð½Ð°Ñ Comment[bs]=Dostignut je kraj spiska poklapanja @@ -269,7 +265,6 @@ [Event/Textcompletion: no match] Name=Textcompletion: No Match Name[ar]=Ø¥Ù٠ا٠اÙÙØµ: ÙØ§ تطاب٠-Name[ast]=Completáu de testu: Ensin coincidencies Name[az]=MÉtn doldurma: UyÄun gÉlÉn yoxdur Name[bg]=ÐавÑÑÑване на ÑекÑÑ: ÐÑма ÑÑÐ²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Name[bs]=Dopuna teksta: nema poklapanja @@ -320,7 +315,6 @@ Name[zh_TW]=æåè£å®ï¼æ²æç¬¦å Comment=No matching completion was found Comment[ar]=ÙÙ ØªÙØ¬Ø¯ ØªØ·Ø§Ø¨ÙØ§Øª Ø¥Ù٠ا٠-Comment[ast]=Nun s'atopó nenguna coincidencia que concasare Comment[az]=UyÄun bir nÉticÉ tapılmadı Comment[bg]=Ðе Ñа намеÑени ÑÑÐ²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð·Ð° завÑÑÑване Comment[bs]=Nije naÄeno nijedno poklapanje za dopunu @@ -375,7 +369,6 @@ [Event/Textcompletion: partial match] Name=Textcompletion: Partial Match Name[ar]=Ø¥Ù٠ا٠اÙÙØµ: تطاب٠جزئ٠-Name[ast]=Completáu de testu: Coincidencia parcial Name[az]=MÉtn doldurma: QismÉn uyÄunlaÅma Name[bg]=ÐавÑÑÑване на ÑекÑÑ: ЧаÑÑиÑно ÑÑвпадение Name[bs]=Dopuna teksta: delimiÄno poklapanje @@ -426,7 +419,6 @@ Name[zh_TW]=æåè£å®ï¼é¨ä»½ç¬¦å Comment=There is more than one possible match Comment[ar]=ÙÙØ§Ù Ø£ÙØ«Ø± Ù Ù ØªØ·Ø§Ø¨Ù ÙØ§ØØ¯ Ù Ù ÙÙ -Comment[ast]=Hai más d'una coincidencia posible Comment[az]=BirdÉn çox uyÄunluq mövcuddur Comment[bg]=Ðма повеÑе Ð¾Ñ ÐµÐ´Ð½Ð¾ ÑÑвпадение Comment[bs]=Postoji viÅ¡e od jednog moguÄeg poklapanja @@ -481,7 +473,6 @@ [Event/fatalerror] Name=Fatal Error Name[ar]=خطأ ÙØ§Ø¯Ø -Name[ast]=Fallu fatal Name[az]=Ciddi XÉta Name[bg]=ФаÑална гÑеÑка Name[bs]=Kobna greÅ¡ka @@ -533,7 +524,6 @@ Name[zh_TW]=å´éé¯èª¤ Comment=There was a serious error causing the program to exit Comment[ar]=ØØ¯Ø« خطأ جاد Ø³Ø¨ÙØ¨ ÙÙØ¨Ø±Ùا٠ج Ø¨Ø¥ØºÙØ§ÙÙ -Comment[ast]=Hebo un fallu grave que fizo que'l programa colare Comment[az]=Proqramın baÄlanmasına sÉbÉb olan ciddi xÉta baÅ verdi Comment[bg]=ÐÑзникна ÑеÑиозна гÑеÑка, коеÑо доведе до заÑваÑÑнеÑо на пÑогÑамаÑа Comment[bs]=DoÅ¡lo je do ozbiljne greÅ¡ke zbog koje je program obustavljen @@ -589,7 +579,6 @@ [Event/notification] Name=Notification Name[ar]=إخطار -Name[ast]=Avisu Name[az]=BildiriÅ Name[bg]=ÐзвеÑÑие Name[bs]=ObavjeÅ¡tenje @@ -641,7 +630,6 @@ Name[zh_TW]=éç¥ Comment=Something special happened in the program Comment[ar]=ØØ¯Ø« Ø´ÙØ¡ خاص ÙÙ Ø§ÙØ¨Ø±Ùا٠ج -Comment[ast]=Asocedió daqué especial nel programa Comment[az]=Proqramda qeyri-adi nÉsÉ baÅ verdi Comment[bg]=ÐеÑо оÑобено Ñе ÑлÑÑи в пÑогÑамаÑа Comment[bs]=NeÅ¡to posebno se dogodilo u programu @@ -696,7 +684,6 @@ [Event/warning] Name=Warning Name[ar]=ØªØØ°Ùر -Name[ast]=Alvertencia Name[az]=GözlÉmÉ Name[bg]=ÐÑедÑпÑеждение Name[bs]=Upozorenje @@ -748,7 +735,6 @@ Name[zh_TW]=è¦å Comment=There was an error in the program which may cause problems Comment[ar]=ØØ¯Ø« خطأ ÙÙ Ø§ÙØ¨Ø±Ùا٠ج ٠٠ا ØªØ³Ø¨ÙØ¨ ب٠شاÙÙ -Comment[ast]=Hebo un fallu nel programa que podrÃa causar problemes Comment[az]=Proqramda problem yaradacaq xÉta baÅ verdi Comment[bg]=ÐмаÑе гÑеÑка в пÑогÑамаÑа, коÑÑо може да доведе до пÑоблеми Comment[bs]=DoÅ¡lo je do greÅ¡ke u programu koja može izazvati probleme @@ -803,7 +789,6 @@ [Event/catastrophe] Name=Catastrophe Name[ar]=ÙØ§Ø±Ø«Ø© -Name[ast]=Catástrofe Name[az]=FÉlakÉt Name[bg]=СÑив Name[bs]=Katastrofa @@ -854,7 +839,6 @@ Name[zh_TW]=ç¼ç大ç½é£ Comment=A very serious error occurred, at least causing the program to exit Comment[ar]=ØØ¯Ø« خطأ جاد Ø¬Ø¯ÙØ§Ø ØªØ³Ø¨ÙØ¨ ÙÙØ¨Ø±Ùا٠ج بإÙÙØ§Ø¦Ù عÙ٠أÙÙ ØªÙØ¯Ùر -Comment[ast]=Asocedió un fallu pergrave que causó que, polo menos, el programa colara Comment[az]=Æn azından proqramın baÄlanmasına sÉbÉb olan çox ciddi xÉta baÅ verdi Comment[bg]=ÐÑзникна много ÑеÑиозна гÑеÑка, коÑÑо доведе до пÑекÑаÑÑване на пÑогÑамаÑа Comment[bs]=DoÅ¡lo je do vrlo ozbiljne greÅ¡ke, zbog koje je bar program obustavljen @@ -909,7 +893,6 @@ [Event/applicationcrash] Name=Application Crash Name[ar]=اÙÙØ§Ø± تطبÙÙ -Name[ast]=Casque d'una aplicación Name[az]=TÉtbiq QÉzası Name[bg]=СÑив на пÑогÑамаÑа Name[ca]=Fallada d'aplicació @@ -958,7 +941,6 @@ Name[zh_TW]=æç¨ç¨å¼ç¶æ Comment=An application just closed unexpectedly Comment[ar]=Ø£ÙØºÙ٠تطبÙ٠٠ا ÙÙØªÙ بشÙÙ ØºÙØ± ٠تÙÙØ¹ -Comment[ast]=Una aplicación ta acabante de zarrase inesperadamente Comment[az]=TÉtbiq gözlÉnilmÉdÉn baÄlandı Comment[bg]=ÐÑиложение Ñе заÑвоÑи неоÑаквано. Comment[ca]=Una aplicació s'ha tancat inesperadament @@ -1009,7 +991,6 @@ [Event/startkde] Name=Login Name[ar]=ÙÙÙØ¬ -Name[ast]=Aniciu de sesión Name[az]=SistemÉ GiriÅ Name[bg]=ÐÑ Ð¾Ð´ Name[bs]=Prijava @@ -1061,7 +1042,6 @@ Name[zh_TW]=ç»å ¥ Comment=A new session is starting Comment[ar]=Ø¬ÙØ³Ø© Ø¬Ø¯ÙØ¯Ø© تبدأ -Comment[ast]=Ta aniciándose una sesión nueva Comment[az]=Yeni sesiya baÅlanır Comment[bg]=СÑаÑÑиÑа Ñе нова ÑеÑÐ¸Ñ Comment[bs]=Nova sesija zapoÄinje @@ -1116,7 +1096,6 @@ [Event/exitkde] Name=Logout Name[ar]=Ø®Ø±ÙØ¬ -Name[ast]=Zarru de sesión Name[az]=SistemdÉn ÃıxıŠName[bg]=Ðзлизане Ð¾Ñ ÑеÑÐ¸Ñ Name[bs]=Odjavi se @@ -1168,7 +1147,6 @@ Name[zh_TW]=ç»åº Comment=Session is exiting Comment[ar]=Ø§ÙØ¬Ùسة تخرج -Comment[ast]=La sesión ta colando Comment[az]=Sesiyadan çıxılır Comment[bg]=СеÑиÑÑа Ñе заÑваÑÑ Comment[bs]=Izlaz iz sesije @@ -1224,7 +1202,6 @@ [Event/cancellogout] Name=Logout Canceled Name[ar]=Ø£ÙÙØºÙÙ Ø§ÙØ®Ø±Ùج -Name[ast]=Zarru de sesión encaboxáu Name[az]=ÃıxıÅdan imtina edildi Name[bg]=ÐзлизанеÑо Ð¾Ñ ÑеÑÐ¸Ñ Ðµ оÑменено Name[bs]=Odjava otkazana @@ -1276,7 +1253,6 @@ Name[zh_TW]=ç»åºå·²åæ¶ Comment=Plasma logout was canceled Comment[ar]=Ø£ÙÙØºÙÙ Ø§ÙØ®Ø±Ùج Ù Ù Ø¨ÙØ§Ø²Ù ا -Comment[ast]=Encaboxóse'l zarru de sesión de Plasma Comment[az]=Plasma seansından çıxıŠlÉÄv edildi Comment[bg]=ÐзлизанеÑо Ð¾Ñ Plasma е оÑменено Comment[bs]=Plazma odjava je prekinuta @@ -1331,7 +1307,6 @@ [Event/printerror] Name=Print Error Name[ar]=خطأ طباعة -Name[ast]=Fallu d'imprentación Name[az]=Ãap XÉtası Name[bg]=ÐеÑаÑна гÑеÑка Name[bs]=GreÅ¡ka Å¡tampanja @@ -1383,7 +1358,6 @@ Name[zh_TW]=åå°é¯èª¤ Comment=A print error has occurred Comment[ar]=ØØ¯Ø« خطأ ÙÙ Ø§ÙØ·Ø¨Ø§Ø¹Ø© -Comment[ast]=Asocedió un fallu d'imprentación Comment[az]=Ãap prosesindÉ xÉta baÅ verdi Comment[bg]=ÐÑзникна пеÑаÑна гÑеÑка. Comment[bs]=DoÅ¡lo je do greÅ¡ke pri Å¡tampanju @@ -1438,7 +1412,6 @@ [Event/messageInformation] Name=Information Message Name[ar]=Ø±Ø³Ø§ÙØ© ٠عÙÙ٠ات -Name[ast]=Mensaxe d'información Name[az]=MÉlumat Mesajı Name[bg]=ÐнÑоÑмаÑивно ÑÑобÑение Name[bs]=Informativna poruka @@ -1490,7 +1463,6 @@ Name[zh_TW]=è³è¨è¨æ¯ Comment=An information message is being shown Comment[ar]=Ø±Ø³Ø§ÙØ© ٠عÙÙ٠ات ØªØ¸ÙØ± -Comment[ast]=Ta amosándose un mensaxe d'información Comment[az]=MÉlumat mesajı göstÉrilir Comment[bg]=Ðоказва Ñе инÑоÑмаÑивно ÑÑобÑение Comment[bs]=Prikazana je informativna poruka @@ -1545,7 +1517,6 @@ [Event/messageWarning] Name=Warning Message Name[ar]=Ø±Ø³Ø§ÙØ© ØªØØ°Ùر -Name[ast]=Mensaxe d'alvertencia Name[az]=XÉbÉrdarlıq mesajı Name[bg]=ÐÑедÑпÑедиÑелно ÑÑобÑение Name[bs]=UpozoravajuÄa poruka @@ -1597,7 +1568,6 @@ Name[zh_TW]=è¦åè¨æ¯ Comment=A warning message is being shown Comment[ar]=Ø±Ø³Ø§ÙØ© ØªØØ°Ùر ØªØ¸ÙØ± -Comment[ast]=Ta amosándose un mensaxe d'alvertencia Comment[az]=XÉbÉrdarlıq mesajı göstÉrilir Comment[bg]=Ðоказва Ñе пÑедÑпÑедиÑелно ÑÑобÑение Comment[bs]=Prikazana je upozoravajuÄa poruka @@ -1652,7 +1622,6 @@ [Event/messageCritical] Name=Critical Message Name[ar]=Ø±Ø³Ø§ÙØ© ØØ±Ø¬Ø© -Name[ast]=Mensaxe crÃticu Name[az]=Kritik Mesaj Name[bg]=ÐÑиÑиÑно ÑÑобÑение Name[bs]=KritiÄna poruka @@ -1704,7 +1673,6 @@ Name[zh_TW]=å´éè¨æ¯ Comment=A critical message is being shown Comment[ar]=Ø±Ø³Ø§ÙØ© ØØ±Ø¬Ø© ØªØ¸ÙØ± -Comment[ast]=Ta amosándose un mensaxe crÃticu Comment[az]=Kritik mesaj göstÉrilir Comment[bg]=Ðоказва Ñе кÑиÑиÑно ÑÑобÑение Comment[bs]=Prikazana je kritiÄna poruka @@ -1759,7 +1727,6 @@ [Event/messageboxQuestion] Name=Question Name[ar]=سؤا٠-Name[ast]=Entruga Name[az]=Sual Name[bg]=ÐÑпÑÐ¾Ñ Name[bs]=Pitanje @@ -1811,7 +1778,6 @@ Name[zh_TW]=è©¢å Comment=A question is being asked Comment[ar]=سؤا٠ÙÙØ·Ø±Ø -Comment[ast]=Ta entrugándose daqué Comment[az]=Sual verildi Comment[bg]=Ðададен е вÑпÑÐ¾Ñ Comment[bs]=NeÅ¡to ste upitani @@ -1867,7 +1833,6 @@ [Event/beep] Name=Beep Name[ar]=جرس -Name[ast]=Pip Name[az]=Siqnal Name[bg]=Сигнал Name[bs]=Bip @@ -1919,7 +1884,6 @@ Name[zh_TW]=å¶è² Comment=Sound bell Comment[ar]=جرس ØµÙØª -Comment[ast]=Un pitÃu Comment[az]=SÉs zÉngi Comment[bg]=ÐвÑков Ñигнал Comment[bs]=ZvuÄno zvono @@ -1974,7 +1938,6 @@ [Event/plasmoidInstallationFailed] Name=Widget failed to install Name[ar]=ÙØ´Ù ØªØ«Ø¨ÙØª اÙÙØ¯Ø¬Ø§Øª -Name[ast]=Falló la instalación Name[az]=Vidjet quraÅdırılmasında xÉta Name[bg]=УиджеÑÑÑ Ð½Ðµ ÑÑÐ¿Ñ Ð´Ð° Ñе инÑÑалиÑа Name[ca]=Ha fallat en instal·lar el giny @@ -2023,7 +1986,6 @@ Name[zh_TW]=Widget å®è£å¤±æ Comment=A widget could not be installed Comment[ar]=تعذر ØªØ«Ø¨ÙØª Ø£ØØ¯ اÙÙØ¯Ø¬Ø§Øª -Comment[ast]=Un widget nun pudo instalase Comment[az]=Vidjet quraÅdırıla bilmÉdi Comment[bg]=Ð£Ð¸Ð´Ð¶ÐµÑ Ð½Ðµ можа да бÑде инÑÑалиÑан Comment[ca]=No s'ha pogut instal·lar un giny @@ -2075,7 +2037,6 @@ [Event/plasmoidDeleted] Name=Widget deleted Name[ar]=ØÙØ°ÙØª ÙØ¯Ø¬Ø© -Name[ast]=Widget desaniciáu Name[az]=Vidjetin silinmÉsi Name[bg]=УиджеÑÑÑ Ðµ изÑÑÐ¸Ñ Name[ca]=Giny suprimit @@ -2125,7 +2086,6 @@ Name[zh_TW]=å ä»¶å·²åªé¤ Comment=A widget has been deleted Comment[ar]=ØÙØ°ÙØª Ø¥ØØ¯Ù اÙÙØ¯Ø¬Ø§Øª -Comment[ast]=Desanicióse un widget Comment[az]=Vidjet silindi Comment[bg]=УиджеÑи беÑе изÑÑÐ¸Ñ Comment[ca]=S'ha suprimit un giny diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.99.0/src/integrationplugin/frameworkintegrationplugin.cpp new/frameworkintegration-5.100.0/src/integrationplugin/frameworkintegrationplugin.cpp --- old/frameworkintegration-5.99.0/src/integrationplugin/frameworkintegrationplugin.cpp 2022-10-01 15:12:04.000000000 +0200 +++ new/frameworkintegration-5.100.0/src/integrationplugin/frameworkintegrationplugin.cpp 2022-11-05 13:22:41.000000000 +0100 @@ -13,16 +13,20 @@ #include <QDebug> #include <qplugin.h> +#if KWIDGETSADDONS_BUILD_DEPRECATED_SINCE(5, 100) bool KMessageBoxDontAskAgainConfigStorage::shouldBeShownYesNo(const QString &dontShowAgainName, KMessageBox::ButtonCode &result) +#else +bool KMessageBoxDontAskAgainConfigStorage::shouldBeShownTwoActions(const QString &dontShowAgainName, KMessageBox::ButtonCode &result) +#endif { KConfigGroup cg(KMessageBox_againConfig ? KMessageBox_againConfig : KSharedConfig::openConfig().data(), "Notification Messages"); const QString dontAsk = cg.readEntry(dontShowAgainName, QString()).toLower(); if (dontAsk == QLatin1String("yes") || dontAsk == QLatin1String("true")) { - result = KMessageBox::Yes; + result = KMessageBox::PrimaryAction; return false; } if (dontAsk == QLatin1String("no") || dontAsk == QLatin1String("false")) { - result = KMessageBox::No; + result = KMessageBox::SecondaryAction; return false; } return true; @@ -34,14 +38,18 @@ return cg.readEntry(dontShowAgainName, true); } +#if KWIDGETSADDONS_BUILD_DEPRECATED_SINCE(5, 100) void KMessageBoxDontAskAgainConfigStorage::saveDontShowAgainYesNo(const QString &dontShowAgainName, KMessageBox::ButtonCode result) +#else +void KMessageBoxDontAskAgainConfigStorage::saveDontShowAgainTwoActions(const QString &dontShowAgainName, KMessageBox::ButtonCode result) +#endif { KConfigGroup::WriteConfigFlags flags = KConfig::Persistent; if (dontShowAgainName[0] == QLatin1Char(':')) { flags |= KConfigGroup::Global; } KConfigGroup cg(KMessageBox_againConfig ? KMessageBox_againConfig : KSharedConfig::openConfig().data(), "Notification Messages"); - cg.writeEntry(dontShowAgainName, result == KMessageBox::Yes, flags); + cg.writeEntry(dontShowAgainName, result == KMessageBox::PrimaryAction, flags); cg.sync(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.99.0/src/integrationplugin/frameworkintegrationplugin.h new/frameworkintegration-5.100.0/src/integrationplugin/frameworkintegrationplugin.h --- old/frameworkintegration-5.99.0/src/integrationplugin/frameworkintegrationplugin.h 2022-10-01 15:12:04.000000000 +0200 +++ new/frameworkintegration-5.100.0/src/integrationplugin/frameworkintegrationplugin.h 2022-11-05 13:22:41.000000000 +0100 @@ -25,9 +25,17 @@ { } +#if KWIDGETSADDONS_BUILD_DEPRECATED_SINCE(5, 100) bool shouldBeShownYesNo(const QString &dontShowAgainName, KMessageBox::ButtonCode &result) override; +#else + bool shouldBeShownTwoActions(const QString &dontShowAgainName, KMessageBox::ButtonCode &result) override; +#endif bool shouldBeShownContinue(const QString &dontShowAgainName) override; +#if KWIDGETSADDONS_BUILD_DEPRECATED_SINCE(5, 100) void saveDontShowAgainYesNo(const QString &dontShowAgainName, KMessageBox::ButtonCode result) override; +#else + void saveDontShowAgainTwoActions(const QString &dontShowAgainName, KMessageBox::ButtonCode result) override; +#endif void saveDontShowAgainContinue(const QString &dontShowAgainName) override; void enableAllMessages() override; void enableMessage(const QString &dontShowAgainName) override;