Hello community, here is the log from the commit of package sonnet for openSUSE:Factory checked in at 2017-11-16 14:42:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sonnet (Old) and /work/SRC/openSUSE:Factory/.sonnet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sonnet" Thu Nov 16 14:42:18 2017 rev:49 rq:541701 version:5.40.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sonnet/sonnet.changes 2017-10-27 13:59:41.004891866 +0200 +++ /work/SRC/openSUSE:Factory/.sonnet.new/sonnet.changes 2017-11-16 14:42:19.391821473 +0100 @@ -1,0 +2,14 @@ +Mon Nov 13 07:01:18 CET 2017 - lbeltr...@kde.org + +- Update to 5.40.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.40.0.php +- Changes since 5.39.0: + * Add assignByDictionnary method + * Signal if we are able to assign dictionnary + * Remove extra ';'. Add explicit keyword + * Make sure that all value is initialized + * Be sure that it's not null + +------------------------------------------------------------------- Old: ---- sonnet-5.39.0.tar.xz New: ---- sonnet-5.40.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sonnet.spec ++++++ --- /var/tmp/diff_new_pack.bGhHEP/_old 2017-11-16 14:42:20.091796069 +0100 +++ /var/tmp/diff_new_pack.bGhHEP/_new 2017-11-16 14:42:20.091796069 +0100 @@ -18,13 +18,13 @@ %bcond_without lang %define sonum 5 -%define _tar_path 5.39 +%define _tar_path 5.40 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: sonnet -Version: 5.39.0 +Version: 5.40.0 Release: 0 #BuildRequires: aspell-devel BuildRequires: cmake >= 3.0 ++++++ sonnet-5.39.0.tar.xz -> sonnet-5.40.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.39.0/CMakeLists.txt new/sonnet-5.40.0/CMakeLists.txt --- old/sonnet-5.39.0/CMakeLists.txt 2017-10-07 21:29:19.000000000 +0200 +++ new/sonnet-5.40.0/CMakeLists.txt 2017-11-05 09:43:46.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.39.0") # handled by release scripts +set(KF5_VERSION "5.40.0") # handled by release scripts project(Sonnet VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.39.0 NO_MODULE) +find_package(ECM 5.40.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/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/sonnet-5.39.0/po/gl/sonnet5_qt.po new/sonnet-5.40.0/po/gl/sonnet5_qt.po --- old/sonnet-5.39.0/po/gl/sonnet5_qt.po 2017-10-07 21:29:19.000000000 +0200 +++ new/sonnet-5.40.0/po/gl/sonnet5_qt.po 2017-11-05 09:43:46.000000000 +0100 @@ -16,7 +16,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2017-09-29 21:20+0100\n" +"PO-Revision-Date: 2017-10-27 08:00+0100\n" "Last-Translator: Adrián Chaves (Gallaecio) <adr...@chaves.io>\n" "Language-Team: Galician <kde-i18n-...@kde.org>\n" "Language: gl\n" @@ -192,7 +192,7 @@ #: ui/configui.ui:95 msgctxt "SonnetConfigUI|" msgid "Ignored Words:" -msgstr "Palabras ignoradas" +msgstr "Palabras ignoradas:" #: ui/configui.ui:109 msgctxt "SonnetConfigUI|" @@ -330,7 +330,7 @@ "<p>Aquí pode ver un fragmento de texto que mostra a palabra descoñecida no " "seu contexto. Se esta información non resulta de abondo para escoller a " "substitución axeitada, pode premer o documento que está a corrixir, ler unha " -"parte máis ampla do texto e voltar despois aquí para continuar a corrección." +"parte máis ampla do texto e volver despois aquí para continuar a corrección." "</p>\n" "</qt>" @@ -355,7 +355,7 @@ "<p>A palabra descoñecida foi detectada e considerada como descoñecida porque " "non está no dicionario.<br>\n" "Prema aquí se considera que a palabra descoñecida non é incorrecta e quere " -"evitar que volte ser considerada como errada. Se quere que quede como está, " +"evitar que volva ser considerada como errada. Se quere que quede como está, " "pero non quere engadila ao dicionario, prema <b>Ignorar</b> ou <b>Ignorar " "todas</b> no seu canto.</p>\n" "</qt>" @@ -404,7 +404,7 @@ "occurrences.</p>\n" "</qt>" msgstr "" -"<qt\n" +"<qt>\n" "<p>Se a palabra descoñecida está mal escrita, debería escribir aquí o termo " "correcto ou escollelo na lista en baixo.</p>\n" "<p>Pode entón premer <b>Substituír</b> se quere corrixir só este caso " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.39.0/src/core/tokenizer.cpp new/sonnet-5.40.0/src/core/tokenizer.cpp --- old/sonnet-5.39.0/src/core/tokenizer.cpp 2017-10-07 21:29:19.000000000 +0200 +++ new/sonnet-5.40.0/src/core/tokenizer.cpp 2017-11-05 09:43:46.000000000 +0100 @@ -108,12 +108,14 @@ if ( !breakFinder || buffer.isEmpty() ) cachedBreaks = TextBreaks::Positions(); - breakFinder->setText(buffer); + if (breakFinder) { + breakFinder->setText(buffer); - if (type == Sentences) { - cachedBreaks = breakFinder->sentenceBreaks(); - } else if (type == Words) { - cachedBreaks = breakFinder->wordBreaks(); + if (type == Sentences) { + cachedBreaks = breakFinder->sentenceBreaks(); + } else if (type == Words) { + cachedBreaks = breakFinder->wordBreaks(); + } } cacheValid = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.39.0/src/ui/configdialog.cpp new/sonnet-5.40.0/src/ui/configdialog.cpp --- old/sonnet-5.39.0/src/ui/configdialog.cpp 2017-10-07 21:29:19.000000000 +0200 +++ new/sonnet-5.40.0/src/ui/configdialog.cpp 2017-11-05 09:43:46.000000000 +0100 @@ -31,7 +31,7 @@ public: ConfigDialogPrivate(ConfigDialog *parent) : q(parent) {} - ConfigWidget *ui; + ConfigWidget *ui = nullptr; ConfigDialog *q; void slotConfigChanged(); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.39.0/src/ui/dictionarycombobox.cpp new/sonnet-5.40.0/src/ui/dictionarycombobox.cpp --- old/sonnet-5.39.0/src/ui/dictionarycombobox.cpp 2017-10-07 21:29:19.000000000 +0200 +++ new/sonnet-5.40.0/src/ui/dictionarycombobox.cpp 2017-11-05 09:43:46.000000000 +0100 @@ -30,7 +30,7 @@ class DictionaryComboBoxPrivate { public: - DictionaryComboBoxPrivate(DictionaryComboBox *combo) : q(combo) {}; + explicit DictionaryComboBoxPrivate(DictionaryComboBox *combo) : q(combo) {} DictionaryComboBox *q; void slotDictionaryChanged(int idx); }; @@ -65,36 +65,48 @@ return itemData(currentIndex()).toString(); } -void DictionaryComboBox::setCurrentByDictionaryName(const QString &name) +bool DictionaryComboBox::assignDictionnaryName(const QString &name) { if (name.isEmpty() || name == currentText()) { - return; + return false; } int idx = findText(name); if (idx == -1) { qCDebug(SONNET_LOG_UI) << "name not found" << name; - return; + return false; } setCurrentIndex(idx); d->slotDictionaryChanged(idx); + return true; } -void DictionaryComboBox::setCurrentByDictionary(const QString &dictionary) +void DictionaryComboBox::setCurrentByDictionaryName(const QString &name) +{ + assignDictionnaryName(name); +} + +bool DictionaryComboBox::assignByDictionnary(const QString &dictionary) { if (dictionary.isEmpty() || dictionary == itemData(currentIndex()).toString()) { - return; + return false; } int idx = findData(dictionary); if (idx == -1) { qCDebug(SONNET_LOG_UI) << "dictionary not found" << dictionary; - return; + return false; } setCurrentIndex(idx); d->slotDictionaryChanged(idx); + return true; +} + +void DictionaryComboBox::setCurrentByDictionary(const QString &dictionary) +{ + assignByDictionnary(dictionary); } void DictionaryComboBox::reloadCombo() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.39.0/src/ui/dictionarycombobox.h new/sonnet-5.40.0/src/ui/dictionarycombobox.h --- old/sonnet-5.39.0/src/ui/dictionarycombobox.h 2017-10-07 21:29:19.000000000 +0200 +++ new/sonnet-5.40.0/src/ui/dictionarycombobox.h 2017-11-05 09:43:46.000000000 +0100 @@ -72,10 +72,27 @@ void setCurrentByDictionaryName(const QString &dictionaryName); /** + * Sets the current dictionary to the given dictionary + * Return true if dictionnary was found. + * @since 5.40 + * TODO merge with previous method in kf6 + */ + bool assignByDictionnary(const QString &dictionary); + + /** + * Sets the current dictionaryName to the given dictionaryName + * Return true if dictionnary was found. + * @since 5.40 + * TODO merge with previous method in kf6 + */ + bool assignDictionnaryName(const QString &name); + + /** * Sets the current dictionary to the given dictionary. */ void setCurrentByDictionary(const QString &dictionary); + Q_SIGNALS: /** * @em Emitted whenever the current dictionary changes. Either diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sonnet-5.39.0/src/ui/highlighter.cpp new/sonnet-5.40.0/src/ui/highlighter.cpp --- old/sonnet-5.39.0/src/ui/highlighter.cpp 2017-10-07 21:29:19.000000000 +0200 +++ new/sonnet-5.40.0/src/ui/highlighter.cpp 2017-11-05 09:43:46.000000000 +0100 @@ -115,10 +115,10 @@ bool intraWordEditing; bool spellCheckerFound; //cached d->dict->isValid() value bool connected; - int disablePercentage; - int disableWordCount; + int disablePercentage = 0; + int disableWordCount = 0; int wordCount, errorCount; - QTimer *rehighlightRequest; + QTimer *rehighlightRequest = nullptr; QColor spellColor; Highlighter *q; };
