August 2016 - openSUSE Commits - openSUSE Mailing Lists

commit poxml for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package poxml for openSUSE:Factory checked in at 2016-08-31 00:09:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poxml (Old) and /work/SRC/openSUSE:Factory/.poxml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "poxml" Changes: -------- --- /work/SRC/openSUSE:Factory/poxml/poxml.changes 2016-07-24 19:49:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.poxml.new/poxml.changes 2016-08-31 00:09:25.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:32:08 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:54:34 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- poxml-16.04.3.tar.xz New: ---- poxml-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poxml.spec ++++++ --- /var/tmp/diff_new_pack.wRrpPK/_old 2016-08-31 00:09:27.000000000 +0200 +++ /var/tmp/diff_new_pack.wRrpPK/_new 2016-08-31 00:09:27.000000000 +0200 @@ -28,7 +28,7 @@ License: GPL-2.0 and GFDL-1.2 Group: System/GUI/KDE Url: http://www.kde.org/ -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ poxml-16.04.3.tar.xz -> poxml-16.08.0.tar.xz ++++++

1 0

commit picmi for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package picmi for openSUSE:Factory checked in at 2016-08-31 00:09:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/picmi (Old) and /work/SRC/openSUSE:Factory/.picmi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "picmi" Changes: -------- --- /work/SRC/openSUSE:Factory/picmi/picmi.changes 2016-07-24 19:49:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.picmi.new/picmi.changes 2016-08-31 00:09:20.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:31:58 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:53:48 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- picmi-16.04.3.tar.xz New: ---- picmi-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ picmi.spec ++++++ --- /var/tmp/diff_new_pack.PKgVG7/_old 2016-08-31 00:09:21.000000000 +0200 +++ /var/tmp/diff_new_pack.PKgVG7/_new 2016-08-31 00:09:21.000000000 +0200 @@ -36,7 +36,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Logic Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: picmi-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -69,7 +69,7 @@ %dir %{_kf5_iconsdir}/hicolor/256x256/apps %{_kf5_iconsdir}/hicolor/*/apps/picmi.* %{_kf5_appsdir}/picmi/ -%_kf5_kxmlguidir/picmi/ -%{_datadir}/appdata/ +%{_kf5_kxmlguidir}/picmi/ +%{_kf5_appstreamdir}/ %changelog ++++++ picmi-16.04.3.tar.xz -> picmi-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-16.04.3/CMakeLists.txt new/picmi-16.08.0/CMakeLists.txt --- old/picmi-16.04.3/CMakeLists.txt 2016-04-12 14:33:30.000000000 +0200 +++ new/picmi-16.08.0/CMakeLists.txt 2016-06-12 09:38:25.000000000 +0200 @@ -28,7 +28,7 @@ find_package(KF5KDEGames 5.2.0 REQUIRED) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(FeatureSummary) include(ECMAddAppIcon) Files old/picmi-16.04.3/doc/gameboard.png and new/picmi-16.08.0/doc/gameboard.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-16.04.3/doc/index.docbook new/picmi-16.08.0/doc/index.docbook --- old/picmi-16.04.3/doc/index.docbook 2016-04-12 14:33:30.000000000 +0200 +++ new/picmi-16.08.0/doc/index.docbook 2016-06-12 09:38:25.000000000 +0200 @@ -1,8 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ -<!ENTITY picmi "<application>Picmi</application>"> -<!ENTITY kappname "&picmi;"> -<!ENTITY package "kdegames"> <!ENTITY % English "INCLUDE"> <!ENTITY % addindex "IGNORE"> ]> @@ -27,8 +24,8 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2012-02-24</date> -<releaseinfo>2.0.0</releaseinfo> +<date>2016-05-13</date> +<releaseinfo>2.0.0 (Applications 16.04)</releaseinfo> <abstract> <para> @@ -51,6 +48,17 @@ &picmi; is a single player puzzle game. </para> +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="gameboard.png" format="PNG"/> +</imageobject> +<textobject> +<phrase>&picmi; gameboard</phrase> +</textobject> +</mediaobject> +</screenshot> + <para> The object of the game is to color cells according to numbers given at the side of the board. </para> @@ -135,6 +143,21 @@ <varlistentry> <term><menuchoice> +<shortcut> +<keycap>F5</keycap> +</shortcut> +<guimenu>Game</guimenu> +<guimenuitem>Restart</guimenuitem> +</menuchoice></term> +<listitem> +<para> +  +</para> +</listitem> +</varlistentry> + +<varlistentry> +<term><menuchoice> <shortcut><keycap>P</keycap></shortcut> <guimenu>Game</guimenu> <guimenuitem>Pause</guimenuitem></menuchoice></term> @@ -192,14 +215,26 @@ <varlistentry> <term><menuchoice> <shortcut> -<keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo> +<keycombo action="simul">&Ctrl;<keycap>I</keycap></keycombo> </shortcut> <guimenu>Move</guimenu> -<guimenuitem>Load Position</guimenuitem> +<guimenuitem>Hint</guimenuitem> </menuchoice></term> <listitem> <para> -Loads the most recently saved position. +Marks a cell as occupied or empty. +</para> +</listitem> +</varlistentry> + +<varlistentry> +<term><menuchoice> +<guimenu>Move</guimenu> +<guimenuitem>Solve</guimenuitem> +</menuchoice></term> +<listitem> +<para> +Play a demo game. </para> </listitem> </varlistentry> @@ -207,14 +242,14 @@ <varlistentry> <term><menuchoice> <shortcut> -<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo> +<keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo> </shortcut> <guimenu>Move</guimenu> -<guimenuitem>Save Position</guimenuitem> +<guimenuitem>Load Position</guimenuitem> </menuchoice></term> <listitem> <para> -Saves the current board position. +Loads the most recently saved position. </para> </listitem> </varlistentry> @@ -222,14 +257,14 @@ <varlistentry> <term><menuchoice> <shortcut> -<keycombo action="simul">&Ctrl;&Shift;<keycap>F</keycap></keycombo> +<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo> </shortcut> -<guimenu>Settings</guimenu> -<guimenuitem>Full Screen Mode</guimenuitem> +<guimenu>Move</guimenu> +<guimenuitem>Save Position</guimenuitem> </menuchoice></term> <listitem> <para> -Switches into full screen mode. +Saves the current board position. </para> </listitem> </varlistentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-16.04.3/org.kde.picmi.appdata.xml new/picmi-16.08.0/org.kde.picmi.appdata.xml --- old/picmi-16.04.3/org.kde.picmi.appdata.xml 2016-04-12 14:33:30.000000000 +0200 +++ new/picmi-16.08.0/org.kde.picmi.appdata.xml 2016-06-12 09:38:25.000000000 +0200 @@ -13,6 +13,7 @@ <summary xml:lang="ca-valencia">Joc de puzle basat en lògica de nombres</summary> <summary xml:lang="cs">Hra puzzle založená na číselné logice</summary> <summary xml:lang="de">Rätselspiel auf der Grundlage von Zahlenlogik</summary> + <summary xml:lang="el">Παιχνίδι γρίφος με βάση τη λογική των αριθμών</summary> <summary xml:lang="en-GB">Puzzle game based on number logic</summary> <summary xml:lang="es">Juego de rompecabezas basado en lógica numérica</summary> <summary xml:lang="fi">Lukulogiikkaan perustuva arvoituspeli</summary> @@ -31,7 +32,6 @@ <summary xml:lang="sv">Pusselspel baserat på sifferlogik</summary> <summary xml:lang="uk">Гра-головоломка, заснована на інтерпретації чисел</summary> <summary xml:lang="x-test">xxPuzzle game based on number logicxx</summary> - <summary xml:lang="zh-TW">數字邏輯的解謎遊戲</summary> <description> The goal is to reveal the hidden pattern in the board by coloring or @@ -43,6 +43,7 @@ L'objectiu és descobrir el patró ocult en el taulell acolorint o deixant en blanc les cel·les en una quadrícula d'acord amb els nombres indicats en el lateral de la quadrícula. És un joc d'un jugador. L'objectiu és descobrir el patró ocult en el taulell acolorint o deixant en blanc les cel·les en una quadrícula d'acord amb els nombres indicats en el lateral de la quadrícula. És un joc d'un jugador. Das Ziel ist, das verborgene Muster zu enthüllen, indem Sie Zellen einfärben oder leer lassen. Hinweise geben die Zahlen am Rand des Rasters. Dieses Spiel ist für einen Spieler. + Ο στόχος είναι να αποκαλυφθεί το κρυμμένο μοτίβο στον πίνακα χρωματίζοντας ή αφήνοντας κενά τα κελιά ενός καννάβου σύμφωνα με αριθμούς που δίνονται στο περιθώριο του καννάβου. Είναι παιχνίδι για έναν παίκτη. The goal is to reveal the hidden pattern in the board by coloring or leaving blank the cells in a grid according to numbers given at the side of the grid. This is a single player game. El objetivo consiste en revelar el patrón oculto en el tablero coloreando o dejando en blanco las casillas de una rejilla según los números que se muestran al lado de la rejilla. Este juego es para un único jugador. Tavoitteena on paljastaa laudan salainen hahmo värittämällä tai jättämällä tyhjiksi ruudukon soluja sen sivulla annettujen lukujen mukaan. Tämä on yksinpeli. @@ -61,7 +62,6 @@ Målet är att avslöja det dolda mönstret på spelbrädet genom att färglägga eller lämna rutorna tomma i ett rutmönster enligt de tal som anges vid sidan om rutmönstret. Detta är ett spel för en ensam spelare. Метою гри є визначення прихованого візерунка у полі для гри зафарбовуванням комірок поля відповідно до чисел, які наведено за бічною рискою поля. Грати у гру одночасно можна лише один гравець. xxThe goal is to reveal the hidden pattern in the board by coloring or leaving blank the cells in a grid according to numbers given at the side of the grid. This is a single player game.xx - 單人遊戲，依據棋盤側邊的數字來標記或留白棋盤上的每一格。 </description> <url type="homepage">https://projects.kde.org/projects/kde/kdegames/picmi</url> <screenshots>

1 0

commit parley for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package parley for openSUSE:Factory checked in at 2016-08-31 00:09:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/parley (Old) and /work/SRC/openSUSE:Factory/.parley.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "parley" Changes: -------- --- /work/SRC/openSUSE:Factory/parley/parley.changes 2016-07-24 19:49:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.parley.new/parley.changes 2016-08-31 00:09:18.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:31:47 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:53:30 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- parley-16.04.3.tar.xz New: ---- parley-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ parley.spec ++++++ --- /var/tmp/diff_new_pack.0jTIJ4/_old 2016-08-31 00:09:19.000000000 +0200 +++ /var/tmp/diff_new_pack.0jTIJ4/_new 2016-08-31 00:09:19.000000000 +0200 @@ -17,7 +17,7 @@ Name: parley -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Vocabulary Trainer License: GPL-2.0+ ++++++ parley-16.04.3.tar.xz -> parley-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/CMakeLists.txt new/parley-16.08.0/CMakeLists.txt --- old/parley-16.04.3/CMakeLists.txt 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/CMakeLists.txt 2016-07-28 15:11:23.000000000 +0200 @@ -13,6 +13,7 @@ #Allows QString concatenation to use a single memory allocation per source line. add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) set(REQUIRED_QT_VERSION "5.2") find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED @@ -22,7 +23,7 @@ Multimedia ) -find_package(KF5 5.15 MODULE REQUIRED COMPONENTS +find_package(KF5 5.22 MODULE REQUIRED COMPONENTS DocTools #to produce the docbook CoreAddons Config diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/autotests/parleyunittestutilities.cpp new/parley-16.08.0/autotests/parleyunittestutilities.cpp --- old/parley-16.04.3/autotests/parleyunittestutilities.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/autotests/parleyunittestutilities.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -51,7 +51,7 @@ doc->setAuthor( author ); doc->appendIdentifier( lang0 ); doc->setGenerator(generator); - doc->saveAs(this->fileName(), KEduVocDocument::Kvtml); + doc->saveAs(QUrl::fromLocalFile(fileName()), KEduVocDocument::Kvtml); delete doc; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/plugins/wiktionary/wiktionary_sound.py new/parley-16.08.0/plugins/wiktionary/wiktionary_sound.py --- old/parley-16.04.3/plugins/wiktionary/wiktionary_sound.py 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/plugins/wiktionary/wiktionary_sound.py 2016-07-28 15:11:23.000000000 +0200 @@ -17,9 +17,19 @@ from os import path import string import Kross +import urllib T = Kross.module("kdetranslation") +# fetch http_content +def fetch_http_content(url, params, method): + params = urllib.urlencode(params) + if method=='POST': + f = urllib.urlopen(url, params) + else: + f = urllib.urlopen(url+'?'+params) + return (f.read(), f.code) + # Connected to the action menu def fetchSound(): print "fetching sound" @@ -95,8 +105,16 @@ filename = filesdir + wikiObject.name.encode('utf-8') print filename saveas = open(filename,'w') - remote = wikiObject.download() - saveas.write(remote.read()) +# remote = wikiObject.download() +# workaround: because download method results with http response code 404 + content, response_code = fetch_http_content( + wikiObject.imageinfo['url'], + {}, + 'GET' + ) + print 'HTTP Response code: ', response_code + if(response_code == 200): + saveas.write(content) saveas.close() return filename diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/collection/collection.cpp new/parley-16.08.0/src/collection/collection.cpp --- old/parley-16.04.3/src/collection/collection.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/collection/collection.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -15,59 +15,19 @@ #include "collection.h" -#include <QTimer> -#include <QLocale> - -// KDE -#include <KEMailSettings> -#include <klocalizedstring.h> -//#include <KLocale> - // KEduVocDocument library #include <keduvocdocument.h> -#include <keduvoclesson.h> -#include <keduvocleitnerbox.h> -#include <keduvocexpression.h> -#include <keduvocwordtype.h> // Parley -#include "../config-parley.h" #include "../utils.h" -#include "prefs.h" #include "entryfilter.h" // ---------------------------------------------------------------- - -void fetchGrammar(KEduVocDocument* doc, int languageIndex) -{ - QString locale = doc->identifier(languageIndex).locale(); - - QUrl location(QStringLiteral("http://edu.kde.org/parley/locale/") + locale.split('_').at(0).toLower() + QStringLiteral(".kvtml")); - - KEduVocDocument grammarDoc; - if (grammarDoc.open(location) == KEduVocDocument::NoError) { - doc->identifier(languageIndex).setArticle(grammarDoc.identifier(0).article()); - doc->identifier(languageIndex).setPersonalPronouns(grammarDoc.identifier(0).personalPronouns()); - // @todo m_doc->identifier(index).setDeclension(grammarDoc.identifier(0).declension()); - doc->identifier(languageIndex).setTenseList(grammarDoc.identifier(0).tenseList()); - } else { - qDebug() << "Download of " << location.url() << " failed."; - } -} - -Collection::Collection(KEduVocDocument *doc, QObject* parent) - : QObject(parent) - , m_doc(doc) - , m_backupTimer(0) -{ -} - Collection::Collection(QUrl *url, QObject* parent) : QObject(parent) , m_doc(new KEduVocDocument(this)) - , m_backupTimer(0) { // We ignore file locks here because we open the file for readonly // purposes only. @@ -76,52 +36,13 @@ Collection::~Collection() { - close(); - - // NOTE: No saving here because at this point the Collection class is a - // read-only wrapper around KEduVocDocument. - if (m_doc) { - emit documentChanged(0); - m_doc->deleteLater(); - m_doc = 0; - } - - delete m_backupTimer; } - KEduVocDocument *Collection::eduVocDocument() { - // If there is no present vocabulary document, create an empty one. - if (!m_doc) { - m_doc = new KEduVocDocument(); - } - return m_doc; } -void Collection::setTitle(const QString& title) -{ - m_doc->setTitle(title); -} - - - -void Collection::enableAutoBackup(bool enable) -{ - if (!enable) { - if (m_backupTimer) { - m_backupTimer->stop(); - } - } else { - if (!m_backupTimer) { - m_backupTimer = new QTimer(this); - connect(m_backupTimer, SIGNAL(timeout()), this, SLOT(save())); - } - m_backupTimer->start(Prefs::backupTime() * 60 * 1000); - } -} - void Collection::numDueWords(WordCount &wc) { // Get the entries from the collection. Cache them for future use. @@ -131,7 +52,6 @@ } // Count the number of words due for each grade level. - // TODO: Also take into account pregrades. foreach (const TestEntry *entry, m_allTestEntries) { int languageTo = entry->languageTo(); KEduVocExpression *exp = entry->entry(); @@ -155,81 +75,3 @@ //kDebug() << m_doc->title() << wc.totalWords << "entries"; } - -// Slots - - -void Collection::close() -{ - enableAutoBackup(false); - m_doc->close(); -} - - -// ---------------------------------------------------------------- -// private functions - - -void Collection::setDefaultDocumentProperties(KEduVocDocument *doc) -{ - KEMailSettings emailSettings; - emailSettings.setProfile(emailSettings.defaultProfileName()); - doc->setAuthor(emailSettings.getSetting(KEMailSettings::RealName)); - doc->setAuthorContact(emailSettings.getSetting(KEMailSettings::EmailAddress)); - - doc->setLicense(i18n("Public Domain")); - doc->setCategory(i18n("Languages")); - - QString locale = QLocale().name(); - - doc->appendIdentifier(); - doc->appendIdentifier(); - doc->identifier(0).setName(QLocale(locale).nativeLanguageName()); - doc->identifier(0).setLocale(locale); - doc->identifier(1).setName(i18n("A Second Language")); - doc->identifier(1).setLocale(locale); - - KEduVocLesson* lesson = new KEduVocLesson(i18n("Lesson 1"), doc->lesson()); - doc->lesson()->appendChildContainer(lesson); - - // add some entries - for (int i = 0; i < 15 ; i++) { - lesson->appendEntry(new KEduVocExpression()); - } - - doc->setModified(false); -} - -void Collection::initializeDefaultGrammar(KEduVocDocument *doc) -{ - KEduVocWordType *root = doc->wordTypeContainer(); - KEduVocWordType *noun = new KEduVocWordType(i18n("Noun"), root); - noun->setWordType(KEduVocWordFlag::Noun); - root->appendChildContainer(noun); - - KEduVocWordType *nounChild = new KEduVocWordType(i18n("Masculine"), noun); - nounChild->setWordType(KEduVocWordFlag::Noun | KEduVocWordFlag::Masculine); - noun->appendChildContainer(nounChild); - nounChild = new KEduVocWordType(i18n("Feminine"), noun); - nounChild->setWordType(KEduVocWordFlag::Noun | KEduVocWordFlag::Feminine); - noun->appendChildContainer(nounChild); - nounChild = new KEduVocWordType(i18n("Neuter"), noun); - nounChild->setWordType(KEduVocWordFlag::Noun | KEduVocWordFlag::Neuter); - noun->appendChildContainer(nounChild); - - KEduVocWordType *verb = new KEduVocWordType(i18n("Verb"), root); - verb->setWordType(KEduVocWordFlag::Verb); - root->appendChildContainer(verb); - - KEduVocWordType *adjective = new KEduVocWordType(i18n("Adjective"), root); - adjective->setWordType(KEduVocWordFlag::Adjective); - root->appendChildContainer(adjective); - - KEduVocWordType *adverb = new KEduVocWordType(i18n("Adverb"), root); - adverb->setWordType(KEduVocWordFlag::Adverb); - root->appendChildContainer(adverb); - - KEduVocWordType *conjunction = new KEduVocWordType(i18n("Conjunction"), root); - conjunction->setWordType(KEduVocWordFlag::Conjunction); - root->appendChildContainer(conjunction); -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/collection/collection.h new/parley-16.08.0/src/collection/collection.h --- old/parley-16.04.3/src/collection/collection.h 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/collection/collection.h 2016-07-28 15:11:23.000000000 +0200 @@ -27,7 +27,6 @@ #include "testentry.h" -class QTimer; class WordCount; @@ -36,43 +35,15 @@ Q_OBJECT public: - Collection(KEduVocDocument *doc, QObject* parent = 0); Collection(QUrl *url, QObject* parent = 0); ~Collection(); - KEduVocDocument *eduVocDocument(); - - void setTitle(const QString& title); - void numDueWords(WordCount &wc); - - /** Enable/disable the timed auto backup - */ - void enableAutoBackup(bool enable); - -public Q_SLOTS: - - /** close the document*/ - void close(); - -Q_SIGNALS: - /** Emitted when the document pointer is changed. - @todo Stop using documentChanged(0) as a replacement for destoyed in editor classes.**/ - void documentChanged(KEduVocDocument *newDocument); - void languagesChanged(); - void statesNeedSaving(); - -private: - void initializeDefaultGrammar(KEduVocDocument *doc); - void setDefaultDocumentProperties(KEduVocDocument *doc); - private: // The contents of the document KEduVocDocument *m_doc; - - QTimer *m_backupTimer; // Timer for next autosave QList<TestEntry*> m_allTestEntries; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/collection/entryfilter.cpp new/parley-16.08.0/src/collection/entryfilter.cpp --- old/parley-16.04.3/src/collection/entryfilter.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/collection/entryfilter.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -335,9 +335,9 @@ { foreach(const QString & tense, translation->conjugationTenses()) { if (m_tenses.contains(tense)) { - QList<KEduVocWordFlags> pronouns = translation->conjugation(tense).keys(); + QList<KEduVocWordFlags> pronouns = translation->getConjugation(tense).keys(); foreach(const KEduVocWordFlags & pronoun, pronouns) { - KEduVocText grade = translation->conjugation(tense).conjugation(pronoun); + KEduVocText grade = translation->getConjugation(tense).conjugation(pronoun); if (!isBlocked(&(grade))) { // just need to find any form that is not blocked for generating test entries // exact filtering is done later in conjugationTestEntries @@ -523,7 +523,7 @@ QSet<QString> practice_tenses = QSet<QString>::fromList(m_tenses); QSet<QString> existing_tenses; foreach(const QString & tense, translation->conjugationTenses()) { - if (!translation->conjugation(tense).isEmpty()) { + if (!translation->getConjugation(tense).isEmpty()) { existing_tenses << tense; } } @@ -563,7 +563,7 @@ if (!m_tenses.contains(tense)) { continue; } - KEduVocConjugation& conjugation = entry->translation(m_toTranslation)->conjugation(tense); + KEduVocConjugation conjugation = entry->translation(m_toTranslation)->getConjugation(tense); if (conjugation.isEmpty()) { continue; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/dashboard/barwidget.cpp new/parley-16.08.0/src/dashboard/barwidget.cpp --- old/parley-16.04.3/src/dashboard/barwidget.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/dashboard/barwidget.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -70,7 +70,7 @@ QPainter painter(this); painter.setRenderHint(QPainter::Antialiasing, true); const int legendWidth = COLLWIDTH - 10; - const int legendHeight = 20; + const int legendHeight = 45; const int legendOffsetY = 0; const int legendOffsetX = 0; //const int alphaValueIncrement = 35; @@ -133,10 +133,10 @@ //QPen pen(QColor(0, 0, 0)); painter.setPen(pen); if (m_percentageCompleted < 100) { - painter.drawText(0, 0, legendWidth, 20, Qt::AlignCenter, + painter.drawText(0, 0, legendWidth, legendHeight, Qt::AlignCenter | Qt::TextWordWrap, i18np("%1 word due", "%1 words due", m_totalDueWords)); } else { - painter.drawText(0, 0, legendWidth, 20, Qt::AlignCenter, i18n("Fully learned")); + painter.drawText(0, 0, legendWidth, legendHeight, Qt::AlignCenter | Qt::TextWordWrap, i18n("Fully learned")); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/dashboard/collectionwidget.cpp new/parley-16.08.0/src/dashboard/collectionwidget.cpp --- old/parley-16.04.3/src/dashboard/collectionwidget.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/dashboard/collectionwidget.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -36,10 +36,10 @@ // Size constants for the collection widgets -int COLLWIDTH = 140; // Width in pixels of a collection widget +int COLLWIDTH = 155; // Width in pixels of a collection widget //int COLLHEIGHT1 = 250; // Height in pixels of a collection widget not yet fully learned -int COLLHEIGHT1 = 150; // Height in pixels of a collection widget not yet fully learned -int COLLHEIGHT2 = 100; // Height in pixels of a collection widget fully learned +int COLLHEIGHT1 = 175; // Height in pixels of a collection widget not yet fully learned +int COLLHEIGHT2 = 125; // Height in pixels of a collection widget fully learned // ================================================================ @@ -81,20 +81,6 @@ painter.drawText(2, 1, height() - 2, height() - 1, Qt::AlignCenter, QStringLiteral("x")); } - -// ---------------------------------------------------------------- - - -static int randInt(int low, int high) -{ - // Random number between low and high - return qrand() % ((high + 1) - low) + low; -} - - -// ---------------------------------------------------------------- - - CollectionWidget::CollectionWidget(Collection *collection, WordCount *dueWords, QWidget *parent) : QWidget(parent) , m_collection(collection) @@ -178,10 +164,13 @@ } m_barWidget = new BarWidget(dueWords, this); - m_barWidget->setFixedSize(COLLWIDTH - 10, 20); + m_barWidget->setFixedSize(COLLWIDTH - 10, 45); mainLayout->addWidget(m_barWidget); m_practiceButton = new QPushButton(this); - m_practiceButton->setStyleSheet(QStringLiteral("QPushButton {border: none; margin: 0px; padding: 0px;}")); + QString buttonStyleSheet = "QPushButton { border: none; margin: 0px; padding: 0px; color: " + + palette.color(QPalette::Active, QPalette::ButtonText).name()+ "; background-color: " + + palette.color(QPalette::Active, QPalette::Button).name() + "; border-radius: 3px;}"; + m_practiceButton->setStyleSheet(buttonStyleSheet); // buttonLayout is the horizontal layout for the bottom line in the // collection widget: delete button, practice button, etc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/dashboard/dashboard.cpp new/parley-16.08.0/src/dashboard/dashboard.cpp --- old/parley-16.04.3/src/dashboard/dashboard.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/dashboard/dashboard.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -38,14 +38,6 @@ #include "gradereferencewidget.h" -// ---------------------------------------------------------------- - -static int randInt(int low, int high) -{ - // Random number between low and high - return qrand() % ((high + 1) - low) + low; -} - // ================================================================ // class Dashboard @@ -213,7 +205,6 @@ QUrl url(QUrl::fromLocalFile(urlString)); Collection *collection = new Collection(&url, this); - collection->close(); // We just want to look at it, not own it, so release the lock. WordCount dueWords; int percentageCompleted = dueWords.percentageCompleted(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/editor/audiowidget.cpp new/parley-16.08.0/src/editor/audiowidget.cpp --- old/parley-16.04.3/src/editor/audiowidget.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/editor/audiowidget.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -48,7 +48,7 @@ if (m_entry) { recordButton->setEnabled(true); audioUrlRequester->setEnabled(true); - audioUrlRequester->setUrl(m_entry->translation(m_currentTranslation)->soundUrl().toLocalFile()); + audioUrlRequester->setUrl(m_entry->translation(m_currentTranslation)->soundUrl()); } else { recordButton->setEnabled(false); audioUrlRequester->setEnabled(false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/editor/conjugationwidget.cpp new/parley-16.08.0/src/editor/conjugationwidget.cpp --- old/parley-16.04.3/src/editor/conjugationwidget.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/editor/conjugationwidget.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -78,7 +78,10 @@ { int valueIndex = m_conjugationLineEdits.values().indexOf(qobject_cast<QLineEdit*>(sender())); int key = m_conjugationLineEdits.keys().value(valueIndex); - m_entry->translation(m_identifier)->conjugation(tenseComboBox->currentText()).setConjugation(text, (KEduVocWordFlag::Flags)key); + KEduVocTranslation *translation = m_entry->translation(m_identifier); + KEduVocConjugation conjugation = translation->getConjugation(tenseComboBox->currentText()); + conjugation.setConjugation(text, (KEduVocWordFlag::Flags)key); + translation->setConjugation(tenseComboBox->currentText(), conjugation); } @@ -92,7 +95,7 @@ void ConjugationWidget::updateEntries() { m_lastTenseSelection = tenseComboBox->currentText(); - KEduVocConjugation& conjugation = m_entry->translation(m_identifier)->conjugation(m_lastTenseSelection); + KEduVocConjugation conjugation = m_entry->translation(m_identifier)->getConjugation(m_lastTenseSelection); foreach(KEduVocWordFlags flags, m_conjugationLineEdits.keys()) { QString text; if (conjugation.keys().contains(flags)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/editor/imagechooserwidget.cpp new/parley-16.08.0/src/editor/imagechooserwidget.cpp --- old/parley-16.04.3/src/editor/imagechooserwidget.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/editor/imagechooserwidget.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -42,7 +42,7 @@ if (m_entry) { setEnabled(true); - imageUrlRequester->setUrl(m_entry->translation(m_currentTranslation)->imageUrl().toLocalFile()); + imageUrlRequester->setUrl(m_entry->translation(m_currentTranslation)->imageUrl()); // slotImageChanged( m_entry->translation(m_currentTranslation)->imageUrl().toLocalFile() ); } else { setEnabled(false); @@ -52,10 +52,11 @@ } } -void ImageChooserWidget::slotImageChanged(const QString & url) +void ImageChooserWidget::slotImageChanged(const QString & urlStr) { - if (!url.isEmpty()) { - QPixmap pixmap(url); + QUrl url = QUrl::fromUserInput(urlStr); + if (!url.isEmpty() && url.isLocalFile()) { + QPixmap pixmap(url.toLocalFile()); imageWidget->setPixmap(pixmap); } else { // imageLabel->setText(i18nc("@label image preview is empty", "No Image")); @@ -63,7 +64,7 @@ } if (m_entry) { - m_entry->translation(m_currentTranslation)->setImageUrl( QUrl::fromLocalFile(url)); + m_entry->translation(m_currentTranslation)->setImageUrl(url); foreach(int j, m_entry->translationIndices()) { if (m_entry->translation(j)->imageUrl().isEmpty()) { m_entry->translation(j)->setImageUrl(imageUrlRequester->url()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/editor/multiplechoicewidget.cpp new/parley-16.08.0/src/editor/multiplechoicewidget.cpp --- old/parley-16.04.3/src/editor/multiplechoicewidget.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/editor/multiplechoicewidget.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -28,14 +28,16 @@ using namespace Editor; -MultipleChoiceWidget::MultipleChoiceWidget(QWidget *parent) : QWidget(parent) +MultipleChoiceWidget::MultipleChoiceWidget(QWidget *parent) + : QWidget(parent) + , m_translation(Q_NULLPTR) + , m_choicesModel(new QStringListModel(this)) { setupUi(this); connect(addChoiceButton, &QPushButton::clicked, this, &MultipleChoiceWidget::slotAddChoiceButton); connect(removeChoiceButton, &QPushButton::clicked, this, &MultipleChoiceWidget::slotRemoveChoiceButton); - m_choicesModel = new QStringListModel(this); multipleChoiceListView->setModel(m_choicesModel); connect(m_choicesModel, &QStringListModel::dataChanged, this, &MultipleChoiceWidget::slotDataChanged); @@ -47,16 +49,20 @@ } -void MultipleChoiceWidget::slotDataChanged(const QModelIndex & topLeft, const QModelIndex & bottomRight) +void MultipleChoiceWidget::slotDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) { Q_UNUSED(topLeft) Q_UNUSED(bottomRight) - m_translation->multipleChoice() = m_choicesModel->stringList(); - removeChoiceButton->setEnabled(m_translation && m_translation->multipleChoice().count() > 0); + if (m_translation) { + m_translation->setMultipleChoice(m_choicesModel->stringList()); + removeChoiceButton->setEnabled(m_translation->getMultipleChoice().count() > 0); + } else { + removeChoiceButton->setEnabled(false); + } } -void MultipleChoiceWidget::setTranslation(KEduVocExpression * entry, int translation) +void MultipleChoiceWidget::setTranslation(KEduVocExpression *entry, int translation) { if (entry) { m_translation = entry->translation(translation); @@ -66,12 +72,12 @@ if (m_translation) { setEnabled(true); - m_choicesModel->setStringList(m_translation->multipleChoice()); - removeChoiceButton->setEnabled(m_translation->multipleChoice().count() > 0); + m_choicesModel->setStringList(m_translation->getMultipleChoice()); + removeChoiceButton->setEnabled(m_translation->getMultipleChoice().count() > 0); } else { setEnabled(false); } - removeChoiceButton->setEnabled(m_translation && m_translation->multipleChoice().count() > 0); + removeChoiceButton->setEnabled(m_translation && m_translation->getMultipleChoice().count() > 0); } @@ -94,12 +100,16 @@ } else { m_choicesModel->removeRows(m_choicesModel->rowCount(QModelIndex()) - 1, 1, QModelIndex()); } - m_translation->multipleChoice() = m_choicesModel->stringList(); - removeChoiceButton->setEnabled(m_translation && m_translation->multipleChoice().count() > 0); + if (m_translation) { + m_translation->setMultipleChoice(m_choicesModel->stringList()); + removeChoiceButton->setEnabled(m_translation->getMultipleChoice().count() > 0); + } else { + removeChoiceButton->setEnabled(false); + } } -bool MultipleChoiceWidget::eventFilter(QObject * obj, QEvent * event) +bool MultipleChoiceWidget::eventFilter(QObject *obj, QEvent *event) { if (obj == multipleChoiceListView) { if (event->type() == QEvent::DragEnter) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/editor/multiplechoicewidget.h new/parley-16.08.0/src/editor/multiplechoicewidget.h --- old/parley-16.04.3/src/editor/multiplechoicewidget.h 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/editor/multiplechoicewidget.h 2016-07-28 15:11:23.000000000 +0200 @@ -45,19 +45,19 @@ explicit MultipleChoiceWidget(QWidget *parent = 0); public slots: - void setTranslation(KEduVocExpression* entry, int translation); + void setTranslation(KEduVocExpression *entry, int translation); protected: bool eventFilter(QObject *obj, QEvent *event); private slots: - void slotDataChanged(const QModelIndex & topLeft, const QModelIndex & bottomRight); + void slotDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); void slotAddChoiceButton(); void slotRemoveChoiceButton(); private: - KEduVocTranslation* m_translation; - QStringListModel * m_choicesModel; + KEduVocTranslation *m_translation; + QStringListModel *m_choicesModel; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/org.kde.parley.desktop new/parley-16.08.0/src/org.kde.parley.desktop --- old/parley-16.04.3/src/org.kde.parley.desktop 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/org.kde.parley.desktop 2016-07-28 15:11:23.000000000 +0200 @@ -68,6 +68,7 @@ Comment[el]=Πρόγραμμα που θα σας βοηθήσει στην απομνημόνευση πραγμάτων. Comment[en_GB]=A program to help you memorise things. Comment[es]=Un programa para ayudarle a memorizar cosas. +Comment[et]=Rakendus meeldejätmise hõlbustamiseks ja harjutamiseks. Comment[fi]=Ohjelma asioiden ulkoa opettelemiseen. Comment[gl]=Un programa para axudalo a memorizar cousas. Comment[it]=Un programma per aiutarti a memorizzare le cose. @@ -80,7 +81,6 @@ Comment[sv]=Ett program som hjälper dig memorera saker. Comment[uk]=Програма, яка допоможе вам запам’ятовувати знання. Comment[x-test]=xxA program to help you memorize things.xx -Comment[zh_TW]=訓練記憶力的程式。 X-DBUS-ServiceName=org.kde.parley GenericName=Vocabulary Trainer GenericName[af]=Woordeskat-afrigter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/parleydocument.cpp new/parley-16.08.0/src/parleydocument.cpp --- old/parley-16.04.3/src/parleydocument.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/parleydocument.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -562,7 +562,7 @@ QMimeType mimeType = db.mimeTypeForFile(file); qDebug() << "KNS2 file of mime type:" << db.mimeTypeForFile(file).name(); if (mimeType.inherits(QStringLiteral("application/x-kvtml"))) { - ParleyMainWindow::instance()->addRecentFile(file, QString()); ///@todo: title! + ParleyMainWindow::instance()->addRecentFile(QUrl::fromLocalFile(file), QString()); ///@todo: title! fileName = file; } } @@ -574,7 +574,7 @@ if (numberInstalled > 1) { openGHNS(); } else if (numberInstalled == 1) { - if (open(QUrl::fromUserInput(fileName))) + if (open(QUrl::fromLocalFile(fileName))) m_parleyApp->showPracticeConfiguration(); else KMessageBox::error(m_parleyApp, i18n("Could not open vocabulary collection \"%1\"", entries.first().name())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/configure/blockoptions.cpp new/parley-16.08.0/src/practice/configure/blockoptions.cpp --- old/parley-16.04.3/src/practice/configure/blockoptions.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/configure/blockoptions.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -206,6 +206,9 @@ block5->setEnabled(state); block6->setEnabled(state); block7->setEnabled(state); + if (state) { + checkValidity(); + } } void BlockOptions::slotExpireToggled(bool state) @@ -217,6 +220,9 @@ expire5->setEnabled(state); expire6->setEnabled(state); expire7->setEnabled(state); + if (state) { + checkValidity(); + } } void BlockOptions::slotComboBoxActivated(int) @@ -229,16 +235,12 @@ void BlockOptions::checkValidity() { QString message; - bool found = false; - for (int i = 1; i <= 6; i++) { - if (kcfg_Block->isChecked()) { - /*if (Prefs::blockItem(i-1) != 0 && - Prefs::blockItem(i) != 0 && - Prefs::blockItem(i-1) >= Prefs::blockItem(i))*/ + if (kcfg_Block->isChecked()) { + bool found = false; + for (int i = 1; i <= 6; i++) { if (date_itemlist[m_blockComboList[i - 1]->currentIndex()].num != 0 && date_itemlist[m_blockComboList[i]->currentIndex()].num != 0 && date_itemlist[m_blockComboList[i - 1]->currentIndex()].num >= date_itemlist[m_blockComboList[i]->currentIndex()].num) { - QString format; if (!found) message.append(i18n("Illogical blocking times.\n")); found = true; @@ -247,14 +249,13 @@ } } - for (int i = 1; i <= 6; i++) { - found = false; - if (kcfg_Expire->isChecked()) { + if (kcfg_Expire->isChecked()) { + bool found = false; + for (int i = 1; i <= 6; i++) { if (date_itemlist[m_expireComboList[i - 1]->currentIndex()].num != 0 && date_itemlist[m_expireComboList[i]->currentIndex()].num != 0 && date_itemlist[m_expireComboList[i - 1]->currentIndex()].num >= date_itemlist[m_expireComboList[i]->currentIndex()].num) { - QString format; if (!found) message.append(i18n("\nIllogical expiration times.\n")); found = true; @@ -263,17 +264,14 @@ } } - if (message.length() == 0) { - found = false; + if ((message.length() == 0) && kcfg_Block->isChecked() && kcfg_Expire->isChecked()) { + bool found = false; for (int i = 0; i <= 6; i++) { - if (kcfg_Block->isChecked() && - kcfg_Expire->isChecked() && - m_expireComboList[i]->currentIndex() >= 0 && + if (m_expireComboList[i]->currentIndex() >= 0 && m_blockComboList[i]->currentIndex() >= 0 && date_itemlist[m_expireComboList[i]->currentIndex()].num != 0 && date_itemlist[m_blockComboList[i]->currentIndex()].num != 0 && date_itemlist[m_blockComboList[i]->currentIndex()].num >= date_itemlist[m_expireComboList[i]->currentIndex()].num) { - QString format; if (!found) message.append(i18n("\nIllogical blocking vs. expiration times.\n")); found = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/configure/generalpracticeoptions.cpp new/parley-16.08.0/src/practice/configure/generalpracticeoptions.cpp --- old/parley-16.04.3/src/practice/configure/generalpracticeoptions.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/configure/generalpracticeoptions.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -34,7 +34,4 @@ setupUi(this); //connect(kcfg_ShowSolutionAfterAnswer, SIGNAL(toggled(bool)), kcfg_ShowSolutionAfterAnswerTime, SLOT(setEnabled(bool))); - - I18N_NOOP("Limit the number of words in the initial phase"); - I18N_NOOP("Max number of words in the initial phase"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/conjugationbackendmode.cpp new/parley-16.08.0/src/practice/conjugationbackendmode.cpp --- old/parley-16.04.3/src/practice/conjugationbackendmode.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/conjugationbackendmode.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -46,7 +46,7 @@ } data.tense = m_currentTense; - m_conjugation = m_current->entry()->translation(m_current->languageTo())->conjugation(m_currentTense); + m_conjugation = m_current->entry()->translation(m_current->languageTo())->getConjugation(m_currentTense); m_pronounFlags = current->conjugationPronouns(); data.questionInfinitive = m_current->entry()->translation(m_current->languageFrom())->text(); @@ -119,7 +119,7 @@ { Q_ASSERT(m_current != 0); KEduVocTranslation* trans = m_current->entry()->translation(m_current->languageTo()); - KEduVocConjugation& conj = trans->conjugation(m_current->conjugationTense()); + KEduVocConjugation conj = trans->getConjugation(m_current->conjugationTense()); QList<KEduVocWordFlags> keys = conj.keys(); grade_t min_grade = KV_MAX_GRADE; @@ -134,7 +134,7 @@ { Q_ASSERT(m_current != 0); KEduVocTranslation* trans = m_current->entry()->translation(m_current->languageTo()); - KEduVocConjugation& conj = trans->conjugation(m_current->conjugationTense()); + KEduVocConjugation conj = trans->getConjugation(m_current->conjugationTense()); QList<KEduVocWordFlags> keys = conj.keys(); grade_t min_grade = KV_MAX_GRADE; @@ -150,14 +150,18 @@ qDebug() << "Grading conjugations"; foreach(const KEduVocWordFlags & key, m_pronounFlags) { - KEduVocText& text = m_current->entry()->translation(m_current->languageTo())-> - conjugation(m_currentTense).conjugation(key); + KEduVocTranslation *translation = m_current->entry()->translation(m_current->languageTo()); + if (translation) { + KEduVocConjugation conjugationToUpdate = translation->getConjugation(m_currentTense); + conjugationToUpdate.conjugation(key).incPracticeCount(); + conjugationToUpdate.conjugation(key).setPracticeDate(QDateTime::currentDateTime()); + + updateGrade(conjugationToUpdate.conjugation(key), + m_frontend->resultState() == AbstractFrontend::AnswerCorrect, + m_current->statisticBadCount() == 0); - text.incPracticeCount(); - text.setPracticeDate(QDateTime::currentDateTime()); - - updateGrade(text, m_frontend->resultState() == AbstractFrontend::AnswerCorrect, - m_current->statisticBadCount() == 0); + translation->setConjugation(m_currentTense, conjugationToUpdate); + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/guifrontend.cpp new/parley-16.08.0/src/practice/guifrontend.cpp --- old/parley-16.04.3/src/practice/guifrontend.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/guifrontend.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -32,20 +32,25 @@ using namespace Practice; -GuiFrontend::GuiFrontend(QWidget* parent) - : AbstractFrontend(parent), m_modeWidget(0), m_lastImage(QStringLiteral("invalid")), m_currentBox(0), m_newBoxIfCorrect(0), m_newBoxIfWrong(0) +GuiFrontend::GuiFrontend(QWidget *parent) + : AbstractFrontend(parent) + , m_widget(new ImageWidget()) + , m_ui(new Ui::PracticeMainWindow()) + , m_modeWidget(nullptr) + , m_resultState(AbstractFrontend::AnswerWrong) + , m_feedbackState(AbstractFrontend::AnswerWrong) + , m_currentBox(0) + , m_newBoxIfCorrect(0) + , m_newBoxIfWrong(0) + , m_themedBackgroundRenderer(new ThemedBackgroundRenderer(this, QStringLiteral("practicethemecache.bin"))) { - m_widget = new ImageWidget(); m_widget->setScalingEnabled(false, false); m_widget->setKeepAspectRatio(Qt::IgnoreAspectRatio); m_widget->setFadingEnabled(false); - m_ui = new Ui::PracticeMainWindow(); m_ui->setupUi(m_widget); m_ui->centralPracticeWidget->setLayout(new QHBoxLayout()); - m_themedBackgroundRenderer = new ThemedBackgroundRenderer(this, QStringLiteral("practicethemecache.bin")); - connect(Prefs::self(), &Prefs::configChanged, this, &GuiFrontend::setTheme); setTheme(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/guifrontend.h new/parley-16.08.0/src/practice/guifrontend.h --- old/parley-16.04.3/src/practice/guifrontend.h 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/guifrontend.h 2016-07-28 15:11:23.000000000 +0200 @@ -39,7 +39,7 @@ Q_OBJECT public: - GuiFrontend(QWidget* parent = 0); + GuiFrontend(QWidget *parent = 0); virtual ~GuiFrontend(); virtual QVariant userInput(); @@ -103,9 +103,9 @@ private: void setImage(const QUrl& image); - ImageWidget* m_widget; - Ui::PracticeMainWindow* m_ui; - AbstractModeWidget* m_modeWidget; + ImageWidget *m_widget; + Ui::PracticeMainWindow *m_ui; + AbstractModeWidget *m_modeWidget; ResultState m_resultState; ResultState m_feedbackState; QUrl m_lastImage; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/imagecache.cpp new/parley-16.08.0/src/practice/imagecache.cpp --- old/parley-16.04.3/src/practice/imagecache.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/imagecache.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -14,6 +14,7 @@ #include "imagecache.h" #include <QFileInfo> +#include <QDir> #include <QDataStream> #include <QDebug> @@ -57,10 +58,23 @@ return m_images.value(id); } +void ImageCache::setSaveFilename(const QString &filename) +{ + m_saveFilename = filename; + QDir fileDir = QFileInfo(filename).absoluteDir(); + if (!fileDir.exists() && !fileDir.mkpath(QStringLiteral("."))) { + qWarning() << QStringLiteral("Couldn't create image cache path: ") << fileDir.absolutePath(); + } +} + void ImageCache::openCache() { QFile file(m_saveFilename); - file.open(QIODevice::ReadOnly); + if (!file.open(QIODevice::ReadOnly)) { + // If cache is used for the first time it's normal to fail here, + // because cache file doesn't exist at this time. + return; + } QDataStream stream(&file); // check identifier QString temp; @@ -112,3 +126,4 @@ dbg.nospace() << "\n\ttotal pixel count: " << pixels << " (approx. " << double(pixels) * 4 / 1024 / 1024 << " MiB)"; return dbg.space(); } + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/imagecache.h new/parley-16.08.0/src/practice/imagecache.h --- old/parley-16.04.3/src/practice/imagecache.h 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/imagecache.h 2016-07-28 15:11:23.000000000 +0200 @@ -39,9 +39,7 @@ return m_images.isEmpty(); } - void setSaveFilename(const QString& filename) { - m_saveFilename = filename; - } + void setSaveFilename(const QString &filename); void openCache(); void saveCache(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/practicemainwindow.cpp new/parley-16.08.0/src/practice/practicemainwindow.cpp --- old/parley-16.04.3/src/practice/practicemainwindow.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/practicemainwindow.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -59,8 +59,6 @@ KConfigGroup cfg(KSharedConfig::openConfig(QStringLiteral("parleyrc")), objectName()); applyMainWindowSettings(cfg); - - I18N_NOOP("I knew it well"); } PracticeMainWindow::~PracticeMainWindow() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/practicestatemachine.cpp new/parley-16.08.0/src/practice/practicestatemachine.cpp --- old/parley-16.04.3/src/practice/practicestatemachine.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/practicestatemachine.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -221,8 +221,8 @@ m_frontend->setBoxes(grade, goodGrade, KV_LEV1_GRADE); - QString imgFrom = m_current->entry()->translation(m_current->languageFrom())->imageUrl().url(); - QString imgTo = m_current->entry()->translation(m_current->languageTo())->imageUrl().url(); + QUrl imgFrom = m_current->entry()->translation(m_current->languageFrom())->imageUrl(); + QUrl imgTo = m_current->entry()->translation(m_current->languageTo())->imageUrl(); if (imgFrom.isEmpty()) { imgFrom = imgTo; } @@ -232,12 +232,12 @@ if (Prefs::flashcardsFrontImage()) { m_frontend->setQuestionImage(imgFrom); } else { - m_frontend->setQuestionImage(QString()); + m_frontend->setQuestionImage(QUrl()); } if (Prefs::flashcardsBackImage()) { m_frontend->setSolutionImage(imgTo); } else { - m_frontend->setSolutionImage(QString()); + m_frontend->setSolutionImage(QUrl()); } m_frontend->showQuestion(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/sessionmanagerbase.cpp new/parley-16.08.0/src/practice/sessionmanagerbase.cpp --- old/parley-16.04.3/src/practice/sessionmanagerbase.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/sessionmanagerbase.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -251,7 +251,7 @@ // if the current entry has predefined multiple choice entries definied, use them first TestEntry *currentEntry = m_currentEntries.at(m_currentEntry); - QStringList predefinedChoices = currentEntry->entry()->translation(currentEntry->languageTo())->multipleChoice(); + QStringList predefinedChoices = currentEntry->entry()->translation(currentEntry->languageTo())->getMultipleChoice(); while (!predefinedChoices.isEmpty() && count > 0) { choices.append(predefinedChoices.takeAt(KRandom::random() % predefinedChoices.count())); count--; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/practice/themedbackgroundrenderer.cpp new/parley-16.08.0/src/practice/themedbackgroundrenderer.cpp --- old/parley-16.04.3/src/practice/themedbackgroundrenderer.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/practice/themedbackgroundrenderer.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -29,7 +29,7 @@ : QObject(parent), m_haveCache(true), m_queuedRequest(false), m_isFastScaledRender(true) { m_theme = new KGameTheme(); - m_cache.setSaveFilename(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + '/' + cacheFilename); + m_cache.setSaveFilename(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + '/' + cacheFilename); m_timer.setSingleShot(true); m_timer.setInterval(1000); connect(&m_timer, &QTimer::timeout, this, &ThemedBackgroundRenderer::updateBackgroundTimeout); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/scripts/scripting/container.h new/parley-16.08.0/src/scripts/scripting/container.h --- old/parley-16.04.3/src/scripts/scripting/container.h 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/scripts/scripting/container.h 2016-07-28 15:11:23.000000000 +0200 @@ -130,7 +130,7 @@ * @param url url of the image */ void setImageUrl(const QString & url) { - m_container->setImageUrl(url); + m_container->setImageUrl(QUrl(url)); } /* finds the container with the given name */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/scripts/scripting/document.h new/parley-16.08.0/src/scripts/scripting/document.h --- old/parley-16.04.3/src/scripts/scripting/document.h 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/scripts/scripting/document.h 2016-07-28 15:11:23.000000000 +0200 @@ -261,12 +261,12 @@ * Sets the URL of the XML file */ void setUrl(const QString& url) { - m_doc->setUrl(url); + m_doc->setUrl(QUrl(url)); } /* @returns the URL of the XML file */ QString url() const { - return m_doc->url().path(); + return m_doc->url().toString(); } public slots: @@ -390,7 +390,7 @@ */ int saveAs(const QString & url, KEduVocDocument::FileType ft = KEduVocDocument::Automatic, const QString & generator = QStringLiteral("Parley")) { m_doc->setGenerator(generator); - return m_doc->saveAs(url, ft); + return m_doc->saveAs(QUrl(url), ft); } // QByteArray toByteArray ( const QString &generator ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/scripts/scripting/translation.cpp new/parley-16.08.0/src/scripts/scripting/translation.cpp --- old/parley-16.04.3/src/scripts/scripting/translation.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/scripts/scripting/translation.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -46,14 +46,14 @@ void Translation::setConjugationText(const QString& conjugation, const QString& tense, const KEduVocWordFlags& flags) { - KEduVocConjugation & conjug = m_translation->conjugation(tense); + KEduVocConjugation conjug = m_translation->getConjugation(tense); conjug.setConjugation(conjugation, flags); m_translation->setConjugation(tense, conjug); } QObject * Translation::conjugation(const QString & tense, const KEduVocWordFlags& flags) { - KEduVocConjugation conjug = m_translation->conjugation(tense); + KEduVocConjugation conjug = m_translation->getConjugation(tense); return new Text(conjug.conjugation(flags)); } @@ -61,7 +61,7 @@ { Text * txt = dynamic_cast<Text*>(conjugation); if (txt) { - KEduVocConjugation & conjug = m_translation->conjugation(tense); + KEduVocConjugation conjug = m_translation->getConjugation(tense); conjug.setConjugation(*(txt->kEduVocText()), flags); m_translation->setConjugation(tense, conjug); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/scripts/scripting/translation.h new/parley-16.08.0/src/scripts/scripting/translation.h --- old/parley-16.04.3/src/scripts/scripting/translation.h 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/scripts/scripting/translation.h 2016-07-28 15:11:23.000000000 +0200 @@ -206,25 +206,25 @@ /* get the sound url for this translation if it exists */ QString soundUrl() { - return m_translation->soundUrl().path(); + return m_translation->soundUrl().toString(); } /* set the sound url for this translation * @param url url of the sound file */ void setSoundUrl(const QString &url) { - m_translation->setSoundUrl(url); + m_translation->setSoundUrl(QUrl(url)); } /* get the image url for this translation if it exists */ QString imageUrl() { - return m_translation->soundUrl().path(); + return m_translation->soundUrl().toString(); } /* set the image url for this translation * @param url url of the image */ void setImageUrl(const QString &url) { - m_translation->setImageUrl(url); + m_translation->setImageUrl(QUrl(url)); } /* @@ -321,7 +321,7 @@ /** returns multiple choice if available */ QStringList multipleChoice() { - return m_translation->multipleChoice(); + return m_translation->getMultipleChoice(); } /** returns a string list with the available conjugation tenses */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/scripts/translator.cpp new/parley-16.08.0/src/scripts/translator.cpp --- old/parley-16.04.3/src/scripts/translator.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/scripts/translator.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -18,6 +18,7 @@ #include <QDebug> Translator::Translator() + : m_parent(nullptr) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/settings/kgametheme/kgamethemeselector.cpp new/parley-16.08.0/src/settings/kgametheme/kgamethemeselector.cpp --- old/parley-16.04.3/src/settings/kgametheme/kgamethemeselector.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/settings/kgametheme/kgamethemeselector.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -48,7 +48,7 @@ // private slots void _k_updatePreview(); - void _k_updateThemeList(const QString& strTheme); + void _k_updateThemeList(const QString &strTheme); void _k_openKNewStuffDialog(); }; @@ -186,13 +186,23 @@ ui.themePreview->setPixmap(pix.scaled(ui.themePreview->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation)); } -void KGameThemeSelectorPrivate::_k_updateThemeList(const QString& strTheme) +void KGameThemeSelectorPrivate::_k_updateThemeList(const QString &strTheme) { //find theme and set selection to the current theme; happens when pressing "Default" - QListWidgetItem * currentItem = ui.themeList->currentItem(); - if (!currentItem || themeMap.value(currentItem->text())->fileName() != strTheme) { + QListWidgetItem *currentItem = ui.themeList->currentItem(); + + QString currentGameThemeFileName; + if (currentItem) { + KGameTheme *currentGameTheme = themeMap.value(currentItem->text()); + if (currentGameTheme) { + currentGameThemeFileName = currentGameTheme->fileName(); + } + } + + if (!currentItem || (currentGameThemeFileName != strTheme)) { for (int i = 0; i < ui.themeList->count(); i++) { - if (themeMap.value(ui.themeList->item(i)->text())->fileName() == strTheme) { + KGameTheme *listItemGameTheme = themeMap.value(ui.themeList->item(i)->text()); + if (listItemGameTheme && (listItemGameTheme->fileName() == strTheme)) { ui.themeList->setCurrentItem(ui.themeList->item(i)); break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/parley-16.04.3/src/statistics/statisticslegendwidget.cpp new/parley-16.08.0/src/statistics/statisticslegendwidget.cpp --- old/parley-16.04.3/src/statistics/statisticslegendwidget.cpp 2016-06-18 18:29:44.000000000 +0200 +++ new/parley-16.08.0/src/statistics/statisticslegendwidget.cpp 2016-07-28 15:11:23.000000000 +0200 @@ -67,11 +67,6 @@ QString rightString = i18nc("adjective, The word has not even been practiced once by the user","Not practiced"); QFontMetrics fontMetrics(painter.font()); - I18N_NOOP("Initial phase"); - I18N_NOOP("Long term phase"); - I18N_NOOP("Invalid entry"); - I18N_NOOP("Newly started"); - // Calculate the size and position of the rectangle that will contain the // string on the left side of the legend. QRect leftRect = fontMetrics.boundingRect(leftString);

1 0

commit palapeli for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package palapeli for openSUSE:Factory checked in at 2016-08-31 00:09:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/palapeli (Old) and /work/SRC/openSUSE:Factory/.palapeli.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "palapeli" Changes: -------- --- /work/SRC/openSUSE:Factory/palapeli/palapeli.changes 2016-07-24 19:49:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.palapeli.new/palapeli.changes 2016-08-31 00:09:12.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:31:37 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:51:20 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- palapeli-16.04.3.tar.xz New: ---- palapeli-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ palapeli.spec ++++++ --- /var/tmp/diff_new_pack.I5Udmn/_old 2016-08-31 00:09:13.000000000 +0200 +++ /var/tmp/diff_new_pack.I5Udmn/_new 2016-08-31 00:09:13.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: palapeli-%{version}.tar.xz BuildRequires: libkdegames4-devel ++++++ palapeli-16.04.3.tar.xz -> palapeli-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-16.04.3/src/palapeli.desktop new/palapeli-16.08.0/src/palapeli.desktop --- old/palapeli-16.04.3/src/palapeli.desktop 2016-01-14 04:32:39.000000000 +0100 +++ new/palapeli-16.08.0/src/palapeli.desktop 2016-08-02 09:20:36.000000000 +0200 @@ -49,8 +49,8 @@ Name[zh_TW]=Palapeli GenericName=Jigsaw puzzle game GenericName[bs]=Igra slagalica -GenericName[ca]=Joc de trencaclosques Jigsaw -GenericName[ca@valencia]=Joc de trencaclosques Jigsaw +GenericName[ca]=Joc de trencaclosques +GenericName[ca@valencia]=Joc de trencaclosques GenericName[cs]=Hra se skládáním puzzle GenericName[da]=Puslespil GenericName[de]=Bilderpuzzle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-16.04.3/src/palapeli.notifyrc new/palapeli-16.08.0/src/palapeli.notifyrc --- old/palapeli-16.04.3/src/palapeli.notifyrc 2016-01-14 04:32:39.000000000 +0100 +++ new/palapeli-16.08.0/src/palapeli.notifyrc 2016-08-02 09:20:36.000000000 +0200 @@ -1,8 +1,8 @@ [Global] Comment=Palapeli Jigsaw Puzzle Comment[bs]=Palapeli testerasta slagalica -Comment[ca]=Trencaclosques Jigsaw Palapeli -Comment[ca@valencia]=Trencaclosques Jigsaw Palapeli +Comment[ca]=Trencaclosques Palapeli +Comment[ca@valencia]=Trencaclosques Palapeli Comment[da]=Palapeli puslespil Comment[de]=Palapeli-Bilderpuzzle Comment[el]=Palapeli Jigsaw Puzzle

1 0

commit okteta for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package okteta for openSUSE:Factory checked in at 2016-08-31 00:09:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/okteta (Old) and /work/SRC/openSUSE:Factory/.okteta.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "okteta" Changes: -------- --- /work/SRC/openSUSE:Factory/okteta/okteta.changes 2016-07-24 19:49:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.okteta.new/okteta.changes 2016-08-31 00:09:09.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:31:16 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:50:28 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- okteta-16.04.3.tar.xz New: ---- okteta-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ okteta.spec ++++++ --- /var/tmp/diff_new_pack.4aN5k4/_old 2016-08-31 00:09:10.000000000 +0200 +++ /var/tmp/diff_new_pack.4aN5k4/_new 2016-08-31 00:09:10.000000000 +0200 @@ -39,7 +39,7 @@ License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other Url: http://www.kde.org/ -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: okteta-%{version}.tar.xz Obsoletes: %{name}5 < %{version} @@ -87,7 +87,7 @@ %{_kf5_sharedir}/icons/hicolor/*/*/*.* %{_kf5_sharedir}/okteta*/ %{_kf5_sharedir}/kxmlgui5/ -%{_kf5_sharedir}/appdata/ +%{_kf5_appstreamdir}/ %{_kf5_plugindir}/ %{_kf5_libdir}/libkasten*.so.* %{_kf5_libdir}/libokteta*.so.* ++++++ okteta-16.04.3.tar.xz -> okteta-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/CMakeLists.txt new/okteta-16.08.0/CMakeLists.txt --- old/okteta-16.04.3/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,44 +1,64 @@ -project( okteta ) - cmake_minimum_required(VERSION 2.8.12) -set(QT_MIN_VERSION "5.2.0") + +project( okteta ) find_package(ECM 1.7.0 REQUIRED NO_MODULE) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +# ECM KDE macros (include first, to have their policies and settings effect all other macros) +include(KDEInstallDirs) +include(KDECMakeSettings NO_POLICY_SCOPE) +include(KDECompilerSettings NO_POLICY_SCOPE) +# ECM macros include(ECMInstallIcons) include(ECMGenerateHeaders) include(ECMSetupVersion) include(ECMPackageConfigHelpers) include(ECMAddAppIcon) - +# CMake macros include(FeatureSummary) include(GenerateExportHeader) -include(KDEInstallDirs) -include(KDECMakeSettings) -include(KDECompilerSettings) -find_package(Qt5 REQUIRED NO_MODULE +set(REQUIRED_QT_VERSION "5.2.0") +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED COMPONENTS Core Network - Designer PrintSupport Script ScriptTools Widgets Xml ) -find_package(Qt5Test QUIET) +find_package(Qt5Test ${REQUIRED_QT_VERSION} CONFIG QUIET) if (NOT Qt5Test_FOUND) message(STATUS "Qt5Test not found, unit tests will not be built.") endif() +find_package(Qt5Designer ${REQUIRED_QT_VERSION} CONFIG QUIET) +set_package_properties(Qt5Designer PROPERTIES TYPE OPTIONAL + PURPOSE "Required to build Qt Designer plugins" +) +if(NOT Qt5Designer_VERSION_STRING VERSION_LESS 5.5.0) + find_package(Qt5UiPlugin ${REQUIRED_QT_VERSION} CONFIG QUIET) + set_package_properties(Qt5UiPlugin PROPERTIES TYPE OPTIONAL + PURPOSE "Required to build Qt Designer plugins" + ) + if (Qt5UiPlugin_FOUND) + # for some reason, Qt5UiPlugin does not set its _INCLUDE_DIRS variable. Fill it manually + get_target_property(Qt5UiPlugin_INCLUDE_DIRS Qt5::UiPlugin INTERFACE_INCLUDE_DIRECTORIES) + endif() + set(DesignerPluginDeps_FOUND ${Qt5UiPlugin_FOUND}) +else() + set(DesignerPluginDeps_FOUND ${Qt5Designer_FOUND}) +endif() + -find_package(KF5 REQUIRED +set(REQUIRED_KF5_VERSION "5.7.0") +find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED COMPONENTS Bookmarks Codecs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/core/CMakeLists.txt new/okteta-16.08.0/core/CMakeLists.txt --- old/okteta-16.04.3/core/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/core/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,5 +1,3 @@ -project( oktetacore ) - ecm_setup_version( ${OKTETALIBS_LIB_VERSION} VARIABLE_PREFIX OKTETACORE SOVERSION ${OKTETALIBS_LIB_SOVERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/designer/CMakeLists.txt new/okteta-16.08.0/designer/CMakeLists.txt --- old/okteta-16.04.3/designer/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/designer/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,4 +1,6 @@ -project( oktetadesignerplugin ) +if (NOT DesignerPluginDeps_FOUND) + return() +endif() set( oktetadesignerplugin_SRCS bytearraycolumnviewdesignerfactory.cpp @@ -14,7 +16,11 @@ OktetaGui OktetaCore Qt5::Widgets - Qt5::Designer +) +target_include_directories( oktetadesignerplugin + PRIVATE + ${Qt5UiPlugin_INCLUDE_DIRS} + ${Qt5Designer_INCLUDE_DIRS} ) install( TARGETS oktetadesignerplugin DESTINATION ${QT_PLUGIN_INSTALL_DIR}/designer ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/designer/examples/CMakeLists.txt new/okteta-16.08.0/designer/examples/CMakeLists.txt --- old/okteta-16.04.3/designer/examples/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/designer/examples/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,5 +1,3 @@ -project( oktetadesignerexamples ) - set( oktetadesignerexamplewidget_SRCS main.cpp ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/doc/index.docbook new/okteta-16.08.0/doc/index.docbook --- old/okteta-16.04.3/doc/index.docbook 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/doc/index.docbook 2016-08-09 02:30:36.000000000 +0200 @@ -8,7 +8,7 @@ <!ENTITY Friedrich.Kossebau.email "<email>kossebau(a)kde.org</email>"> <!ENTITY Alex.Richardson "<personname><firstname>Alex</firstname><surname>Richardson</surname></personname>"> - <!ENTITY Alex.Richardson.email "<email>alex.richardson(a)gmx.de</email>"> + <!ENTITY Alex.Richardson.email "<email>arichardson.kde(a)gmail.com</email>"> <!ENTITY % English "INCLUDE"> <!ENTITY % addindex "IGNORE"> ]> @@ -371,6 +371,11 @@ <sect2> <title>Creating structure definitions</title> + + <note><para>A more up to date, but not completed guide to writing structure definitions can be found + <ulink url="https://userbase.kde.org/Okteta/Writing_structure_definitions">on the KDE UserBase Wiki</ulink>. + </para></note> + <para>There are two different ways of creating structure definitions. The first is writing the definition in &XML; the other is using JavaScript. The JavaScript approach allows you to create more complex structures with features like &eg; validating the structure. Using &XML; gives you @@ -385,6 +390,9 @@ <sect2> <title>Structure definition &XML; file format</title> + <note><para>A more up to date, but not completed guide to writing structure definitions can be found + <ulink url="https://userbase.kde.org/Okteta/Writing_structure_definitions">on the KDE UserBase Wiki</ulink>. + </para></note> <para>  The <literal role="extension">.osd</literal> &XML; file has one root element: <emphasis><data></emphasis> with no @@ -560,6 +568,10 @@ <sect2> <title>An example structure definition in both &XML; and JavaScript</title> + <note><para>A more up to date, but not completed guide to writing structure definitions can be found + <ulink url="https://userbase.kde.org/Okteta/Writing_structure_definitions">on the KDE UserBase Wiki</ulink>. + </para></note> + <sect3> <title>The common step shared by both approaches</title> <para> @@ -633,7 +645,8 @@ <sect3> <title>The simple structure in JavaScript</title> <para> - To implement the structure above in JavaScript, create a file named <filename>main.js</filename> instead of <filename>simplestruct.osd</filename>. + To implement the structure above in JavaScript, create a file named <filename>main.js</filename> instead of <filename>simplestruct.osd</filename> + and change X-KDE-PluginInfo-Category=structure to X-KDE-PluginInfo-Category=structure/js. The contents of that file should be: <screen> function init() { @@ -709,9 +722,9 @@ <sect3> <title>Further information</title> <para> - A few example structure definitions can be found in the <ulink url="https://projects.kde.org/projects/kde/kdesdk/okteta/repository/revisions/ma…">Git repository.</ulink> + A few example structure definitions can be found in the <ulink url="https://commits.kde.org/okteta?path=kasten/controllers/view/structures/exam…">Git repository.</ulink> This includes for example the file header for PNG files and the ELF file header. - An &XML; schema describing the structure of the <literal role="extension">.osd</literal> file can be found <ulink url="https://projects.kde.org/projects/kde/kdesdk/okteta/repository/revisions/ma…">here.</ulink> + An &XML; schema describing the structure of the <literal role="extension">.osd</literal> file can be found <ulink url="https://commits.kde.org/okteta?path=kasten/controllers/view/structures/sche…">here.</ulink> If more information is needed feel free to contact me at &Alex.Richardson.email; </para> </sect3> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/gui/CMakeLists.txt new/okteta-16.08.0/gui/CMakeLists.txt --- old/okteta-16.04.3/gui/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/gui/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,5 +1,3 @@ -project( oktetagui ) - ecm_setup_version( ${OKTETALIBS_LIB_VERSION} VARIABLE_PREFIX OKTETAGUI SOVERSION ${OKTETALIBS_LIB_SOVERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/kasten/CMakeLists.txt new/okteta-16.08.0/kasten/CMakeLists.txt --- old/okteta-16.04.3/kasten/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/kasten/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,6 +1,3 @@ -project( oktetakasten ) -cmake_minimum_required(VERSION 2.8.8) - set( KASTEN_LIB_VERSION 0.3.0 ) set( KASTEN_ABI_VERSION 3 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/kasten/controllers/CMakeLists.txt new/okteta-16.08.0/kasten/controllers/CMakeLists.txt --- old/okteta-16.04.3/kasten/controllers/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/kasten/controllers/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -494,25 +494,26 @@ add_library( poddecoder-typeeditors STATIC ${PODDECODER_TYPEEDITOR_SRCS} ) set_target_properties( poddecoder-typeeditors PROPERTIES POSITION_INDEPENDENT_CODE TRUE ) target_link_libraries( poddecoder-typeeditors -PRIVATE +PUBLIC OktetaGui - OktetaCore +PRIVATE KF5::Completion ) add_library( structview-tested-srcs STATIC ${STRUCTVIEW_TESTED_SRCS} ) set_target_properties( structview-tested-srcs PROPERTIES POSITION_INDEPENDENT_CODE TRUE ) target_link_libraries( structview-tested-srcs -PRIVATE +PUBLIC OktetaCore KF5::ConfigGui - KF5::ConfigWidgets KF5::I18n - KF5::Completion KF5::Service Qt5::Script Qt5::Xml Qt5::Widgets +PRIVATE + KF5::Completion + KF5::ConfigWidgets ) set( OKTETA_KASTEN_CONTROLLERS_SRCS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/kasten/core/io/tests/bytearrayrawfilesynchronizerfactorytest.cpp new/okteta-16.08.0/kasten/core/io/tests/bytearrayrawfilesynchronizerfactorytest.cpp --- old/okteta-16.04.3/kasten/core/io/tests/bytearrayrawfilesynchronizerfactorytest.cpp 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/kasten/core/io/tests/bytearrayrawfilesynchronizerfactorytest.cpp 2016-08-09 02:30:36.000000000 +0200 @@ -43,7 +43,6 @@ static const char TestFileName[] = "test.data"; #if 0 static const char NotExistingUrl[] = "notexisting://"; -static const char FileProtocolName[] = "file://"; #endif static const int TestDataSize = 50; static const char TestDataChar = 0; @@ -95,7 +94,7 @@ #if 0 void ByteArrayRawFileSynchronizerFactoryTest::testLoadFromUrl() { - const QUrl fileUrl = mFileSystem->createFilePath( QStringLiteral(TestFileName) ).prepend( FileProtocolName ); + const QUrl fileUrl = QUrl::fromLocalFile( mFileSystem->createFilePath( QStringLiteral(TestFileName) ) ); Kasten::ByteArrayRawFileSynchronizerFactory *factory = new Kasten::ByteArrayRawFileSynchronizerFactory(); AbstractDocument* document = factory->loadNewDocument( fileUrl ); @@ -115,7 +114,7 @@ void ByteArrayRawFileSynchronizerFactoryTest::testLoadFromNotExistingUrl() { - const QUrl fileUrl = mFileSystem->createFilePath( QStringLiteral(NotExistingUrl) ); + const QUrl fileUrl = QUrl( QStringLiteral(NotExistingUrl) ); Kasten::ByteArrayRawFileSynchronizerFactory *factory = new Kasten::ByteArrayRawFileSynchronizerFactory(); AbstractDocument* document = factory->loadNewDocument( fileUrl ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/kasten/core/io/tests/bytearrayrawfilesynchronizertest.cpp new/okteta-16.08.0/kasten/core/io/tests/bytearrayrawfilesynchronizertest.cpp --- old/okteta-16.04.3/kasten/core/io/tests/bytearrayrawfilesynchronizertest.cpp 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/kasten/core/io/tests/bytearrayrawfilesynchronizertest.cpp 2016-08-09 02:30:36.000000000 +0200 @@ -50,7 +50,6 @@ static const char TestDirectory[] = "bytearrayrawfilesynchronizertest"; static const char TestFileName[] = "test.data"; static const char NotExistingUrl[] = "notexisting://"; -static const char FileProtocolName[] = "file://"; static const int TestDataSize = 50; static const char TestDataChar = 0; @@ -93,7 +92,7 @@ void ByteArrayRawFileSynchronizerTest::testLoadFromUrl() { - const QUrl fileUrl = QUrl( mFileSystem->createFilePath( QLatin1String(TestFileName) ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl = QUrl::fromLocalFile( mFileSystem->createFilePath( QLatin1String(TestFileName) ) ); ByteArrayRawFileSynchronizer* synchronizer = new ByteArrayRawFileSynchronizer(); synchronizer->startLoad( fileUrl )->exec(); AbstractDocument* document = synchronizer->document(); @@ -115,7 +114,7 @@ void ByteArrayRawFileSynchronizerTest::testLoadFromNotExistingUrl() { - const QUrl fileUrl = QUrl( mFileSystem->createFilePath( QLatin1String(NotExistingUrl) ) ); + const QUrl fileUrl = QUrl( QLatin1String(NotExistingUrl) ); ByteArrayRawFileSynchronizer* synchronizer = new ByteArrayRawFileSynchronizer(); synchronizer->startLoad( fileUrl )->exec(); @@ -127,7 +126,7 @@ void ByteArrayRawFileSynchronizerTest::testNewSaveAsToUrl() { - const QUrl fileUrl = QUrl( mFileSystem->createFilePath( QLatin1String(TestFileName) ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl = QUrl::fromLocalFile( mFileSystem->createFilePath( QLatin1String(TestFileName) ) ); ByteArrayDocument* document = new Kasten::ByteArrayDocument(QStringLiteral("New created for test.")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/libs/kasten/CMakeLists.txt new/okteta-16.08.0/libs/kasten/CMakeLists.txt --- old/okteta-16.04.3/libs/kasten/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/libs/kasten/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,5 +1,3 @@ -project( kasten ) - set( KASTEN_MAJOR_VERSION 0 ) set( KASTEN_MINOR_VERSION 3 ) set( KASTEN_PATCHLEVEL_VERSION 0 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/libs/kasten/controllers/CMakeLists.txt new/okteta-16.08.0/libs/kasten/controllers/CMakeLists.txt --- old/okteta-16.04.3/libs/kasten/controllers/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/libs/kasten/controllers/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,5 +1,3 @@ -project( kastencontrollers ) - ecm_setup_version( ${KASTEN_LIB_VERSION} VARIABLE_PREFIX KASTENCONTROLLERS SOVERSION ${KASTEN_LIB_SOVERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/libs/kasten/core/CMakeLists.txt new/okteta-16.08.0/libs/kasten/core/CMakeLists.txt --- old/okteta-16.04.3/libs/kasten/core/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/libs/kasten/core/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,5 +1,3 @@ -project( kastencore ) - ecm_setup_version( ${KASTEN_LIB_VERSION} VARIABLE_PREFIX KASTENCORE SOVERSION ${KASTEN_LIB_SOVERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/libs/kasten/core/tests/testdocumentfilesynchronizerfactorytest.cpp new/okteta-16.08.0/libs/kasten/core/tests/testdocumentfilesynchronizerfactorytest.cpp --- old/okteta-16.04.3/libs/kasten/core/tests/testdocumentfilesynchronizerfactorytest.cpp 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/libs/kasten/core/tests/testdocumentfilesynchronizerfactorytest.cpp 2016-08-09 02:30:36.000000000 +0200 @@ -42,7 +42,6 @@ #if 0 static const char TestFileName2[] = "test2.data"; static const char NotExistingFileName[] = "not.existing"; -static const char FileProtocolName[] = "file://"; static const char NotExistingUrlName[] = "not://existing"; #endif static const char TestData1[] = "TestData1"; @@ -114,7 +113,7 @@ void TestDocumentFileSynchronizerFactoryTest::testLoadFromFile() { const QByteArray testData( TestData1 ); - const QUrl fileUrl = mFileSystem->createFilePath( QStringLiteral(TestFileName1) ).prepend( FileProtocolName ); + const QUrl fileUrl = QUrl::fromLocalFile( mFileSystem->createFilePath( QStringLiteral(TestFileName1) ) ); Kasten::TestDocumentFileSynchronizerFactory* factory = new Kasten::TestDocumentFileSynchronizerFactory(); AbstractDocument* document = factory->loadNewDocument( fileUrl ); @@ -146,7 +145,7 @@ void TestDocumentFileSynchronizerFactoryTest::testLoadFromNotExistingFile() { - const QUrl fileUrl = mFileSystem->createFilePath( QStringLiteral(NotExistingFileName) ).prepend( FileProtocolName ); + const QUrl fileUrl = QUrl::fromLocalFile( mFileSystem->createFilePath( QStringLiteral(NotExistingFileName) ) ); Kasten::TestDocumentFileSynchronizerFactory* factory = new Kasten::TestDocumentFileSynchronizerFactory(); AbstractDocument* document = factory->loadNewDocument( fileUrl ); @@ -157,7 +156,7 @@ void TestDocumentFileSynchronizerFactoryTest::testLoadSaveFile() { const QByteArray otherData( TestData2 ); - const QUrl fileUrl = mFileSystem->createFilePath( QStringLiteral(TestFileName1) ).prepend( FileProtocolName ); + const QUrl fileUrl = QUrl::fromLocalFile( mFileSystem->createFilePath( QStringLiteral(TestFileName1) ) ); Kasten::TestDocumentFileSynchronizerFactory* factory = new Kasten::TestDocumentFileSynchronizerFactory(); AbstractDocument* document = factory->loadNewDocument( fileUrl ); @@ -179,7 +178,7 @@ { const QByteArray otherData( TestData2 ); const QString filePath = mFileSystem->createFilePath( QStringLiteral(TestFileName1) ); - const QUrl fileUrl = QString( filePath ).prepend( FileProtocolName ); + const QUrl fileUrl = QUrl::fromLocalFile( filePath ); Kasten::TestDocumentFileSynchronizerFactory* factory = new Kasten::TestDocumentFileSynchronizerFactory(); AbstractDocument* document = factory->loadNewDocument( fileUrl ); @@ -203,9 +202,9 @@ void TestDocumentFileSynchronizerFactoryTest::testConnectToFile() { const QByteArray otherData( TestData2 ); - const QUrl fileUrl1 = mFileSystem->createFilePath( QStringLiteral(TestFileName1) ).prepend( FileProtocolName ); + const QUrl fileUrl1 = QUrl::::fromLocalFile( mFileSystem->createFilePath( QStringLiteral(TestFileName1) ) ); const QString filePath2 = mFileSystem->createFilePath( QStringLiteral(TestFileName2) ); - const QUrl fileUrl2 = QString( filePath2 ).prepend( FileProtocolName ); + const QUrl fileUrl2 = QUrl::fromLocalFile( filePath2 ); Kasten::TestDocumentFileSynchronizerFactory* factory = new Kasten::TestDocumentFileSynchronizerFactory(); Kasten::TestDocument* testDocument = new Kasten::TestDocument(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/libs/kasten/core/tests/testdocumentfilesynchronizertest.cpp new/okteta-16.08.0/libs/kasten/core/tests/testdocumentfilesynchronizertest.cpp --- old/okteta-16.04.3/libs/kasten/core/tests/testdocumentfilesynchronizertest.cpp 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/libs/kasten/core/tests/testdocumentfilesynchronizertest.cpp 2016-08-09 02:30:36.000000000 +0200 @@ -46,7 +46,6 @@ static const char TestFileName1[] = "test1.data"; static const char TestFileName2[] = "test2.data"; static const char NotExistingFileName[] = "not.existing"; -static const char FileProtocolName[] = "file://"; static const char NotExistingUrlName[] = "not://existing"; static const char TestData1[] = "TestData1"; static const char TestData2[] = "TestData2"; @@ -105,7 +104,7 @@ void TestDocumentFileSynchronizerTest::testLoadFromFile() { const QByteArray testData( TestData1 ); - const QUrl fileUrl = QUrl( mFileSystem->createFilePath( QLatin1String(TestFileName1) ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl = QUrl::fromLocalFile( mFileSystem->createFilePath( QLatin1String(TestFileName1) ) ); Kasten::TestDocumentFileSynchronizer* synchronizer = new Kasten::TestDocumentFileSynchronizer(); synchronizer->startLoad( fileUrl )->exec(); @@ -139,7 +138,7 @@ void TestDocumentFileSynchronizerTest::testLoadFromNotExistingFile() { - const QUrl fileUrl = QUrl( mFileSystem->createFilePath( QLatin1String(NotExistingFileName) ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl = QUrl::fromLocalFile( mFileSystem->createFilePath( QLatin1String(NotExistingFileName) ) ); Kasten::TestDocumentFileSynchronizer* synchronizer = new Kasten::TestDocumentFileSynchronizer(); synchronizer->startLoad( fileUrl )->exec(); Kasten::AbstractDocument* document = synchronizer->document(); @@ -151,7 +150,7 @@ void TestDocumentFileSynchronizerTest::testLoadSaveFile() { const QByteArray otherData( TestData2 ); - const QUrl fileUrl = QUrl( mFileSystem->createFilePath( QLatin1String(TestFileName1) ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl = QUrl::fromLocalFile( mFileSystem->createFilePath( QLatin1String(TestFileName1) ) ); Kasten::TestDocumentFileSynchronizer* synchronizer = new Kasten::TestDocumentFileSynchronizer(); synchronizer->startLoad( fileUrl )->exec(); Kasten::AbstractDocument* document = synchronizer->document(); @@ -172,7 +171,7 @@ { const QByteArray otherData( TestData2 ); const QString filePath = mFileSystem->createFilePath( QLatin1String(TestFileName1) ); - const QUrl fileUrl = QUrl( QString( filePath ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl = QUrl::fromLocalFile( QString( filePath ) ); Kasten::TestDocumentFileSynchronizer* synchronizer = new Kasten::TestDocumentFileSynchronizer(); synchronizer->startLoad( fileUrl )->exec(); @@ -197,9 +196,9 @@ { const QByteArray data( TestData1 ); const QByteArray otherData( TestData2 ); - const QUrl fileUrl1 = QUrl( mFileSystem->createFilePath( QLatin1String(TestFileName1) ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl1 = QUrl::fromLocalFile( mFileSystem->createFilePath( QLatin1String(TestFileName1) ) ); const QString filePath2 = mFileSystem->createFilePath( QLatin1String(TestFileName2) ); - const QUrl fileUrl2 = QUrl( QString( filePath2 ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl2 = QUrl::fromLocalFile( filePath2 ); // load from 1 Kasten::TestDocumentFileSynchronizer* synchronizer = new Kasten::TestDocumentFileSynchronizer(); @@ -219,9 +218,9 @@ void TestDocumentFileSynchronizerTest::testConnectToFile() { const QByteArray otherData( TestData2 ); - const QUrl fileUrl1 = QUrl( mFileSystem->createFilePath( QLatin1String(TestFileName1) ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl1 = QUrl::fromLocalFile( mFileSystem->createFilePath( QLatin1String(TestFileName1) ) ); const QString filePath2 = mFileSystem->createFilePath( QLatin1String(TestFileName2) ); - const QUrl fileUrl2 = QUrl( QString( filePath2 ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl2 = QUrl::fromLocalFile( QString( filePath2 ) ); Kasten::TestDocument* testDocument = new Kasten::TestDocument(); Kasten::AbstractDocument* document = testDocument; @@ -251,7 +250,7 @@ const QByteArray header( Header1); const QByteArray otherData( TestData2 ); const QString filePath = mFileSystem->createFilePath( QLatin1String(TestFileName1) ); - const QUrl fileUrl = QUrl( QString( filePath ).prepend( QLatin1String(FileProtocolName) ) ); + const QUrl fileUrl = QUrl::fromLocalFile( filePath ); // TODO: failing calls in AbstractDocumentFileSystemSynchronizer trigger GUI here, so far it worked ;) #if 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/libs/kasten/gui/CMakeLists.txt new/okteta-16.08.0/libs/kasten/gui/CMakeLists.txt --- old/okteta-16.04.3/libs/kasten/gui/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/libs/kasten/gui/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,5 +1,3 @@ -project( kastengui ) - ecm_setup_version( ${KASTEN_LIB_VERSION} VARIABLE_PREFIX KASTENGUI SOVERSION ${KASTEN_LIB_SOVERSION} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/mimetypes/XmlMessages.sh new/okteta-16.08.0/mimetypes/XmlMessages.sh --- old/okteta-16.04.3/mimetypes/XmlMessages.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/okteta-16.08.0/mimetypes/XmlMessages.sh 2016-08-09 02:30:36.000000000 +0200 @@ -0,0 +1,22 @@ +function get_files +{ + echo okteta.xml +} + +function po_for_file +{ + case "$1" in + okteta.xml) + echo okteta_xml_mimetypes.po + ;; + esac +} + +function tags_for_file +{ + case "$1" in + okteta.xml) + echo comment + ;; + esac +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/mimetypes/okteta.xml new/okteta-16.08.0/mimetypes/okteta.xml --- old/okteta-16.04.3/mimetypes/okteta.xml 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/mimetypes/okteta.xml 2016-08-09 02:30:36.000000000 +0200 @@ -19,6 +19,22 @@ <sub-class-of type="text/plain"/> <generic-icon name="text-x-hex"/> <comment>Motorola S-Records</comment> + <comment xml:lang="ca">Registres S de Motorola</comment> + <comment xml:lang="ca@valencia">Registres S de Motorola</comment> + <comment xml:lang="en_GB">Motorola S-Records</comment> + <comment xml:lang="es">Motorola S-Records</comment> + <comment xml:lang="it">S-Records Motorola</comment> + <comment xml:lang="nl">Motorola S-records</comment> + <comment xml:lang="pl">Motorola S-Records</comment> + <comment xml:lang="pt">Registos-S da Motorola</comment> + <comment xml:lang="sk">Motorola S-Records</comment> + <comment xml:lang="sl">Motorola S-Records</comment> + <comment xml:lang="sr">Моторолин с‑рекорд</comment> + <comment xml:lang="sr@ijekavian">Моторолин с‑рекорд</comment> + <comment xml:lang="sr@ijekavianlatin">Motorolin S‑Record</comment> + <comment xml:lang="sr@latin">Motorolin S‑Record</comment> + <comment xml:lang="sv">Motorola S-Records</comment> + <comment xml:lang="uk">S-записи Motorola</comment> <magic priority="70"> <match offset="0" value="S0" type="string"> <match offset="4" value="0000" type="string"/> @@ -36,6 +52,22 @@ <generic-icon name="text-x-hex"/>  <comment>Intel hexadecimal object file</comment> + <comment xml:lang="ca">Fitxer objecte hexadecimal d'Intel</comment> + <comment xml:lang="ca@valencia">Fitxer objecte hexadecimal d'Intel</comment> + <comment xml:lang="en_GB">Intel hexadecimal object file</comment> + <comment xml:lang="es">Archivo objeto hexadecimal de Intel</comment> + <comment xml:lang="it">File oggetto esadecimale Intel</comment> + <comment xml:lang="nl">Intel hexadecimaal objectbestand</comment> + <comment xml:lang="pl">Plik obiektu szesnastkowego Intel</comment> + <comment xml:lang="pt">Ficheiro de objectos em hexadecimal da Intel</comment> + <comment xml:lang="sk">Intel hexadecimálny objektový súbor</comment> + <comment xml:lang="sl">Intelova šestnajstiška predmetna datoteka</comment> + <comment xml:lang="sr">Интелов хексадекадни објектни фајл</comment> + <comment xml:lang="sr@ijekavian">Интелов хексадекадни објектни фајл</comment> + <comment xml:lang="sr@ijekavianlatin">Intelov heksadekadni objektni fajl</comment> + <comment xml:lang="sr@latin">Intelov heksadekadni objektni fajl</comment> + <comment xml:lang="sv">Intel hexadecimal objektfil</comment> + <comment xml:lang="uk">шістнадцятковий об’єктний файл Intel®</comment>  <magic priority="70"> <match type="string" offset="0" value=":"> @@ -50,6 +82,22 @@ <sub-class-of type="text/plain"/> <generic-icon name="text-x-hex"/> <comment>Base64 encoded data</comment> + <comment xml:lang="ca">Dades codificades en Base64</comment> + <comment xml:lang="ca@valencia">Dades codificades en Base64</comment> + <comment xml:lang="en_GB">Base64 encoded data</comment> + <comment xml:lang="es">Datos codificados en Base64</comment> + <comment xml:lang="it">Dati codificati in Base64</comment> + <comment xml:lang="nl">Base64 gecodeerde gegevens</comment> + <comment xml:lang="pl">Dane zakodowane Base64</comment> + <comment xml:lang="pt">Dados codificados em Base64</comment> + <comment xml:lang="sk">Dáta zakódované Base64</comment> + <comment xml:lang="sl">Podatki kodirani z Base64</comment> + <comment xml:lang="sr">база64 кодирани подаци</comment> + <comment xml:lang="sr@ijekavian">база64 кодирани подаци</comment> + <comment xml:lang="sr@ijekavianlatin">base64 kodirani podaci</comment> + <comment xml:lang="sr@latin">base64 kodirani podaci</comment> + <comment xml:lang="sv">Base64-kodad data</comment> + <comment xml:lang="uk">дані у кодуванні Base64</comment> <glob pattern="*.base64"/> <glob pattern="*.b64"/> </mime-type> @@ -58,6 +106,22 @@ <sub-class-of type="text/plain"/> <generic-icon name="text-x-hex"/> <comment>Base32 encoded data</comment> + <comment xml:lang="ca">Dades codificades en Base32</comment> + <comment xml:lang="ca@valencia">Dades codificades en Base32</comment> + <comment xml:lang="en_GB">Base32 encoded data</comment> + <comment xml:lang="es">Datos codificados en Base32</comment> + <comment xml:lang="it">Dati codificati in Base32</comment> + <comment xml:lang="nl">Base32 gecodeerde gegevens</comment> + <comment xml:lang="pl">Dane zakodowane Base32</comment> + <comment xml:lang="pt">Dados codificados em Base32</comment> + <comment xml:lang="sk">Dáta zakódované Base32</comment> + <comment xml:lang="sl">Podatki kodirani z Base32</comment> + <comment xml:lang="sr">база32 кодирани подаци</comment> + <comment xml:lang="sr@ijekavian">база32 кодирани подаци</comment> + <comment xml:lang="sr@ijekavianlatin">base32 kodirani podaci</comment> + <comment xml:lang="sr@latin">base32 kodirani podaci</comment> + <comment xml:lang="sv">Base32-kodad data</comment> + <comment xml:lang="uk">дані у кодуванні Base32</comment> <glob pattern="*.base32"/> </mime-type> @@ -65,6 +129,22 @@ <sub-class-of type="text/plain"/> <generic-icon name="text-x-hex"/> <comment>Btoa Encoded File</comment> + <comment xml:lang="ca">Fitxer BTOA codificat</comment> + <comment xml:lang="ca@valencia">Fitxer BTOA codificat</comment> + <comment xml:lang="en_GB">Btoa Encoded File</comment> + <comment xml:lang="es">Archivo codificado en Btoa</comment> + <comment xml:lang="it">File codificato in Btoa</comment> + <comment xml:lang="nl">Btoa gecodeerd bestand</comment> + <comment xml:lang="pl">Dane zakodowane Btoa</comment> + <comment xml:lang="pt">Dados codificados em Btoa</comment> + <comment xml:lang="sk">Súbor zakódovaný Btoa</comment> + <comment xml:lang="sl">Datoteka kodirana z Btoa</comment> + <comment xml:lang="sr">бтоа кодирани подаци</comment> + <comment xml:lang="sr@ijekavian">бтоа кодирани подаци</comment> + <comment xml:lang="sr@ijekavianlatin">btoa kodirani podaci</comment> + <comment xml:lang="sr@latin">btoa kodirani podaci</comment> + <comment xml:lang="sv">BTOA-kodad data</comment> + <comment xml:lang="uk">файл у кодуванні Btoa</comment> <magic priority="50"> <match type="string" offset="0" value="xbtoa Begin"/> </magic> @@ -76,6 +156,22 @@ <sub-class-of type="text/plain"/> <generic-icon name="text-x-hex"/> <comment>Ascii85 encoded data</comment> + <comment xml:lang="ca">Dades codificades en ASCII85</comment> + <comment xml:lang="ca@valencia">Dades codificades en ASCII85</comment> + <comment xml:lang="en_GB">Ascii85 encoded data</comment> + <comment xml:lang="es">Datos codificados en Ascii85</comment> + <comment xml:lang="it">File codificato in Ascii85</comment> + <comment xml:lang="nl">Ascii85 gecodeerde gegevens</comment> + <comment xml:lang="pl">Dane zakodowane Ascii85</comment> + <comment xml:lang="pt">Dados codificados em Ascii85</comment> + <comment xml:lang="sk">Dáta zakódované Ascii85</comment> + <comment xml:lang="sl">Podatki kodirani z Ascii85</comment> + <comment xml:lang="sr">аски‑85 кодирани подаци</comment> + <comment xml:lang="sr@ijekavian">аски‑85 кодирани подаци</comment> + <comment xml:lang="sr@ijekavianlatin">ASCII‑85 kodirani podaci</comment> + <comment xml:lang="sr@latin">ASCII‑85 kodirani podaci</comment> + <comment xml:lang="sv">ASCII85-kodad data</comment> + <comment xml:lang="uk">дані у кодуванні Ascii85</comment> <magic priority="50"> <match type="string" offset="0" value="$lt;~"/> </magic> @@ -86,6 +182,22 @@ <sub-class-of type="text/plain"/> <generic-icon name="text-x-hex"/> <comment>Uuencoded file</comment> + <comment xml:lang="ca">Fitxer «uuencoded»</comment> + <comment xml:lang="ca@valencia">Fitxer «uuencoded»</comment> + <comment xml:lang="en_GB">Uuencoded file</comment> + <comment xml:lang="es">Archivo codificado con Uuencode</comment> + <comment xml:lang="it">File con codifica UUencode</comment> + <comment xml:lang="nl">Uuencoded bestand</comment> + <comment xml:lang="pl">Plik Uuencoded</comment> + <comment xml:lang="pt">Ficheiro codificado com UUencode</comment> + <comment xml:lang="sk">Uuencoded súbor</comment> + <comment xml:lang="sl">Datoteka Uuencoded</comment> + <comment xml:lang="sr">уу‑кодни фајл</comment> + <comment xml:lang="sr@ijekavian">уу‑кодни фајл</comment> + <comment xml:lang="sr@ijekavianlatin">Uuencoding fajl</comment> + <comment xml:lang="sr@latin">Uuencoding fajl</comment> + <comment xml:lang="sv">Uuencoded fil</comment> + <comment xml:lang="uk">файл даних у форматі UUE</comment> <magic priority="50"> <match type="string" offset="0" value="begin"/> <match type="string" offset="0" value="begin-base64"/> @@ -99,6 +211,22 @@ <sub-class-of type="text/plain"/> <generic-icon name="text-x-hex"/> <comment>Xxencoded file</comment> + <comment xml:lang="ca">Fitxer «xxencoded»</comment> + <comment xml:lang="ca@valencia">Fitxer «xxencoded»</comment> + <comment xml:lang="en_GB">Xxencoded file</comment> + <comment xml:lang="es">Archivo codificado con Xxencode</comment> + <comment xml:lang="it">File con codifica Xxencoded</comment> + <comment xml:lang="nl">Xxencoded bestand</comment> + <comment xml:lang="pl">Plik Xxencoded</comment> + <comment xml:lang="pt">Ficheiro codificado com Xxencode</comment> + <comment xml:lang="sk">Xxencoded súbor</comment> + <comment xml:lang="sl">Datoteka Xxencoded</comment> + <comment xml:lang="sr">иксикс-кодни фајл</comment> + <comment xml:lang="sr@ijekavian">иксикс-кодни фајл</comment> + <comment xml:lang="sr@ijekavianlatin">Xxencoding fajl</comment> + <comment xml:lang="sr@latin">Xxencoding fajl</comment> + <comment xml:lang="sv">Xxencoded fil</comment> + <comment xml:lang="uk">файл даних у форматі xxe</comment> <magic priority="50"> <match type="string" offset="0" value="begin"/> </magic> @@ -108,6 +236,22 @@ <mime-type type="application/x-vnd.kde.okteta.structure"> <sub-class-of type="application/xml"/> <comment>Okteta Structure definition</comment> + <comment xml:lang="ca">Definició d'estructura de l'Okteta</comment> + <comment xml:lang="ca@valencia">Definició d'estructura de l'Okteta</comment> + <comment xml:lang="en_GB">Okteta Structure definition</comment> + <comment xml:lang="es">Definición de estructura de Okteta</comment> + <comment xml:lang="it">Definizione di struttura di Okteta</comment> + <comment xml:lang="nl">Okteta structuurdefinitie</comment> + <comment xml:lang="pl">Definicja struktury Okteta</comment> + <comment xml:lang="pt">Definição de estrutura do Okteta</comment> + <comment xml:lang="sk">Definícia štruktúry Okteta</comment> + <comment xml:lang="sl">Določilo zgradbe za Okteto</comment> + <comment xml:lang="sr">Октетина дефиниција структуре</comment> + <comment xml:lang="sr@ijekavian">Октетина дефиниција структуре</comment> + <comment xml:lang="sr@ijekavianlatin">Oktetina definicija strukture</comment> + <comment xml:lang="sr@latin">Oktetina definicija strukture</comment> + <comment xml:lang="sv">Okteta strukturdefinition</comment> + <comment xml:lang="uk">визначення структури Okteta</comment> <glob pattern="*.osd"/> </mime-type> </mime-info> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/parts/kpart/CMakeLists.txt new/okteta-16.08.0/parts/kpart/CMakeLists.txt --- old/okteta-16.04.3/parts/kpart/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/parts/kpart/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,8 +1,5 @@ -project( oktetapart ) - add_definitions(-DTRANSLATION_DOMAIN=\"oktetapart\") - set( oktetapart_SRCS part.cpp browserextension.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/program/CMakeLists.txt new/okteta-16.08.0/program/CMakeLists.txt --- old/okteta-16.04.3/program/CMakeLists.txt 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/program/CMakeLists.txt 2016-08-09 02:30:36.000000000 +0200 @@ -1,5 +1,3 @@ -project( oktetaprogram ) - set( okteta_SRCS main.cpp program.cpp @@ -34,7 +32,7 @@ install( PROGRAMS org.kde.okteta.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES oktetaui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/okteta ) -install( FILES org.kde.okteta.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata ) +install( FILES org.kde.okteta.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} ) ecm_install_icons( ICONS 16-apps-okteta.png 32-apps-okteta.png 48-apps-okteta.png diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/okteta-16.04.3/program/about.cpp new/okteta-16.08.0/program/about.cpp --- old/okteta-16.04.3/program/about.cpp 2016-06-18 15:58:11.000000000 +0200 +++ new/okteta-16.08.0/program/about.cpp 2016-08-09 02:30:36.000000000 +0200 @@ -29,7 +29,7 @@ OktetaAboutData::OktetaAboutData() : KAboutData( QStringLiteral("okteta"), i18n("Okteta"), // name - QStringLiteral("0.19.3"), + QStringLiteral("0.20.0"), i18n("Hex editor"), // description KAboutLicense::GPL_V2, i18n("Copyright 2006-2016 Friedrich W. H. Kossebau"), //copyright

1 0

commit lskat for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package lskat for openSUSE:Factory checked in at 2016-08-31 00:09:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lskat (Old) and /work/SRC/openSUSE:Factory/.lskat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lskat" Changes: -------- --- /work/SRC/openSUSE:Factory/lskat/lskat.changes 2016-07-24 19:49:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lskat.new/lskat.changes 2016-08-31 00:09:06.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:30:18 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:48:03 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- lskat-16.04.3.tar.xz New: ---- lskat-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lskat.spec ++++++ --- /var/tmp/diff_new_pack.GlZptd/_old 2016-08-31 00:09:07.000000000 +0200 +++ /var/tmp/diff_new_pack.GlZptd/_new 2016-08-31 00:09:07.000000000 +0200 @@ -23,7 +23,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Card Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: lskat-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ lskat-16.04.3.tar.xz -> lskat-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lskat-16.04.3/grafix/blue.svg new/lskat-16.08.0/grafix/blue.svg --- old/lskat-16.04.3/grafix/blue.svg 2015-11-30 01:21:32.000000000 +0100 +++ new/lskat-16.08.0/grafix/blue.svg 2016-05-09 05:41:21.000000000 +0200 @@ -917,7 +917,6 @@ x1="78.195801" gradientUnits="userSpaceOnUse" id="linearGradient40474" - xlink:href="#XMLID_143_" inkscape:collect="always" /> <linearGradient y2="83.815903" @@ -926,7 +925,6 @@ x1="73.767097" gradientUnits="userSpaceOnUse" id="linearGradient40472" - xlink:href="#XMLID_142_" inkscape:collect="always" /> <linearGradient y2="83.835403" @@ -935,7 +933,6 @@ x1="69.441902" gradientUnits="userSpaceOnUse" id="linearGradient40470" - xlink:href="#XMLID_141_" inkscape:collect="always" /> <linearGradient y2="83.835403" @@ -944,7 +941,6 @@ x1="65.102997" gradientUnits="userSpaceOnUse" id="linearGradient40468" - xlink:href="#XMLID_140_" inkscape:collect="always" /> <linearGradient y2="83.835403" @@ -953,7 +949,6 @@ x1="60.764599" gradientUnits="userSpaceOnUse" id="linearGradient40466" - xlink:href="#XMLID_139_" inkscape:collect="always" /> <linearGradient y2="83.815903" @@ -962,7 +957,6 @@ x1="56.440399" gradientUnits="userSpaceOnUse" id="linearGradient40464" - xlink:href="#XMLID_138_" inkscape:collect="always" /> <linearGradient y2="83.806198" @@ -971,7 +965,6 @@ x1="52.0107" gradientUnits="userSpaceOnUse" id="linearGradient40462" - xlink:href="#XMLID_137_" inkscape:collect="always" /> <linearGradient y2="83.903801" @@ -980,7 +973,6 @@ x1="94.716301" gradientUnits="userSpaceOnUse" id="linearGradient40460" - xlink:href="#XMLID_136_" inkscape:collect="always" /> <linearGradient y2="83.903801" @@ -989,7 +981,6 @@ x1="28.855" gradientUnits="userSpaceOnUse" id="linearGradient40458" - xlink:href="#XMLID_135_" inkscape:collect="always" /> <linearGradient y2="83.903801" @@ -998,7 +989,6 @@ x1="88.983902" gradientUnits="userSpaceOnUse" id="linearGradient40456" - xlink:href="#XMLID_134_" inkscape:collect="always" /> <linearGradient y2="83.903801" @@ -1007,7 +997,6 @@ x1="40.589802" gradientUnits="userSpaceOnUse" id="linearGradient40454" - xlink:href="#XMLID_133_" inkscape:collect="always" /> <linearGradient y2="83.903801" @@ -1016,7 +1005,6 @@ x1="82.985802" gradientUnits="userSpaceOnUse" id="linearGradient40452" - xlink:href="#XMLID_132_" inkscape:collect="always" /> <linearGradient y2="83.903801" @@ -1025,7 +1013,6 @@ x1="34.857399" gradientUnits="userSpaceOnUse" id="linearGradient40450" - xlink:href="#XMLID_131_" inkscape:collect="always" /> <linearGradient y2="83.903801" @@ -1034,7 +1021,6 @@ x1="100.7192" gradientUnits="userSpaceOnUse" id="linearGradient40448" - xlink:href="#XMLID_130_" inkscape:collect="always" /> <linearGradient y2="83.903801" @@ -1043,7 +1029,6 @@ x1="46.587898" gradientUnits="userSpaceOnUse" id="linearGradient40446" - xlink:href="#XMLID_129_" inkscape:collect="always" /> <linearGradient y2="81.1772" @@ -1052,7 +1037,6 @@ x1="75.829597" gradientUnits="userSpaceOnUse" id="linearGradient40442" - xlink:href="#XMLID_127_" inkscape:collect="always" /> <linearGradient y2="81.186996" @@ -1061,7 +1045,6 @@ x1="71.399902" gradientUnits="userSpaceOnUse" id="linearGradient40440" - xlink:href="#XMLID_126_" inkscape:collect="always" /> <linearGradient y2="81.204597" @@ -1070,7 +1053,6 @@ x1="67.075699" gradientUnits="userSpaceOnUse" id="linearGradient40438" - xlink:href="#XMLID_125_" inkscape:collect="always" /> <linearGradient y2="81.204597" @@ -1079,7 +1061,6 @@ x1="62.737301" gradientUnits="userSpaceOnUse" id="linearGradient40436" - xlink:href="#XMLID_124_" inkscape:collect="always" /> <linearGradient y2="81.204597" @@ -1088,7 +1069,6 @@ x1="58.398399" gradientUnits="userSpaceOnUse" id="linearGradient40434" - xlink:href="#XMLID_123_" inkscape:collect="always" /> <linearGradient y2="81.186996" @@ -1097,7 +1077,6 @@ x1="54.0732" gradientUnits="userSpaceOnUse" id="linearGradient40432" - xlink:href="#XMLID_122_" inkscape:collect="always" /> <linearGradient y2="81.1772" @@ -1106,7 +1085,6 @@ x1="49.644001" gradientUnits="userSpaceOnUse" id="linearGradient40430" - xlink:href="#XMLID_121_" inkscape:collect="always" /> <linearGradient y2="81.274902" @@ -1115,7 +1093,6 @@ x1="92.349098" gradientUnits="userSpaceOnUse" id="linearGradient40428" - xlink:href="#XMLID_120_" inkscape:collect="always" /> <linearGradient y2="81.274902" @@ -1124,7 +1101,6 @@ x1="27.540001" gradientUnits="userSpaceOnUse" id="linearGradient40426" - xlink:href="#XMLID_119_" inkscape:collect="always" /> <linearGradient y2="81.274902" @@ -1133,7 +1109,6 @@ x1="86.616699" gradientUnits="userSpaceOnUse" id="linearGradient40424" - xlink:href="#XMLID_118_" inkscape:collect="always" /> <linearGradient y2="81.274902" @@ -1142,7 +1117,6 @@ x1="38.223598" gradientUnits="userSpaceOnUse" id="linearGradient40422" - xlink:href="#XMLID_117_" inkscape:collect="always" /> <linearGradient y2="81.274902" @@ -1151,7 +1125,6 @@ x1="80.619598" gradientUnits="userSpaceOnUse" id="linearGradient40420" - xlink:href="#XMLID_116_" inkscape:collect="always" /> <linearGradient y2="81.274902" @@ -1160,7 +1133,6 @@ x1="32.4902" gradientUnits="userSpaceOnUse" id="linearGradient40418" - xlink:href="#XMLID_115_" inkscape:collect="always" /> <linearGradient y2="81.274902" @@ -1169,7 +1141,6 @@ x1="97.300301" gradientUnits="userSpaceOnUse" id="linearGradient40416" - xlink:href="#XMLID_114_" inkscape:collect="always" /> <linearGradient y2="81.274902" @@ -1178,7 +1149,6 @@ x1="44.220699" gradientUnits="userSpaceOnUse" id="linearGradient40414" - xlink:href="#XMLID_113_" inkscape:collect="always" /> <linearGradient y2="86.181198" @@ -1187,7 +1157,6 @@ x1="76.0923" gradientUnits="userSpaceOnUse" id="linearGradient40412" - xlink:href="#XMLID_112_" inkscape:collect="always" /> <linearGradient y2="86.190903" @@ -1196,7 +1165,6 @@ x1="71.663597" gradientUnits="userSpaceOnUse" id="linearGradient40410" - xlink:href="#XMLID_111_" inkscape:collect="always" /> <linearGradient y2="86.210403" @@ -1205,7 +1173,6 @@ x1="67.338402" gradientUnits="userSpaceOnUse" id="linearGradient40408" - xlink:href="#XMLID_110_" inkscape:collect="always" /> <linearGradient y2="86.210403" @@ -1214,7 +1181,6 @@ x1="63" gradientUnits="userSpaceOnUse" id="linearGradient40406" - xlink:href="#XMLID_109_" inkscape:collect="always" /> <linearGradient y2="86.210403" @@ -1223,7 +1189,6 @@ x1="58.661098" gradientUnits="userSpaceOnUse" id="linearGradient40404" - xlink:href="#XMLID_108_" inkscape:collect="always" /> <linearGradient y2="86.190903" @@ -1232,7 +1197,6 @@ x1="54.336399" gradientUnits="userSpaceOnUse" id="linearGradient40402" - xlink:href="#XMLID_107_" inkscape:collect="always" /> <linearGradient y2="86.181198" @@ -1241,7 +1205,6 @@ x1="49.9067" gradientUnits="userSpaceOnUse" id="linearGradient40400" - xlink:href="#XMLID_106_" inkscape:collect="always" /> <linearGradient y2="86.278801" @@ -1250,7 +1213,6 @@ x1="92.612801" gradientUnits="userSpaceOnUse" id="linearGradient40398" - xlink:href="#XMLID_105_" inkscape:collect="always" /> <linearGradient y2="86.278801" @@ -1259,7 +1221,6 @@ x1="26.750999" gradientUnits="userSpaceOnUse" id="linearGradient40396" - xlink:href="#XMLID_104_" inkscape:collect="always" /> <linearGradient y2="86.278801" @@ -1268,7 +1229,6 @@ x1="86.880402" gradientUnits="userSpaceOnUse" id="linearGradient40394" - xlink:href="#XMLID_103_" inkscape:collect="always" /> <linearGradient y2="86.278801" @@ -1277,7 +1237,6 @@ x1="38.486301" gradientUnits="userSpaceOnUse" id="linearGradient40392" - xlink:href="#XMLID_102_" inkscape:collect="always" /> <linearGradient y2="86.278801" @@ -1286,7 +1245,6 @@ x1="80.882301" gradientUnits="userSpaceOnUse" id="linearGradient40390" - xlink:href="#XMLID_101_" inkscape:collect="always" /> <linearGradient y2="86.278801" @@ -1295,7 +1253,6 @@ x1="32.753899" gradientUnits="userSpaceOnUse" id="linearGradient40388" - xlink:href="#XMLID_100_" inkscape:collect="always" /> <linearGradient y2="86.278801" @@ -1304,7 +1261,6 @@ x1="98.6157" gradientUnits="userSpaceOnUse" id="linearGradient40386" - xlink:href="#XMLID_99_" inkscape:collect="always" /> <linearGradient y2="86.278801" @@ -1313,7 +1269,6 @@ x1="44.484402" gradientUnits="userSpaceOnUse" id="linearGradient40384" - xlink:href="#XMLID_98_" inkscape:collect="always" /> <linearGradient y2="103.3413" @@ -1322,7 +1277,6 @@ x1="91.617699" gradientUnits="userSpaceOnUse" id="linearGradient40372" - xlink:href="#XMLID_92_" inkscape:collect="always" /> <linearGradient y2="103.3413" @@ -1331,7 +1285,6 @@ x1="34.381802" gradientUnits="userSpaceOnUse" id="linearGradient40370" - xlink:href="#XMLID_91_" inkscape:collect="always" /> <linearGradient y2="99.370796" @@ -1340,7 +1293,6 @@ x1="58.837898" gradientUnits="userSpaceOnUse" id="linearGradient40368" - xlink:href="#XMLID_90_" inkscape:collect="always" /> <linearGradient y2="99.603996" @@ -1349,7 +1301,6 @@ x1="64.893097" gradientUnits="userSpaceOnUse" id="linearGradient40366" - xlink:href="#XMLID_89_" inkscape:collect="always" /> <linearGradient y2="1.728" @@ -1358,7 +1309,6 @@ x1="86.1558" gradientUnits="userSpaceOnUse" id="linearGradient40354" - xlink:href="#XMLID_83_" inkscape:collect="always" /> <linearGradient y2="1.728" @@ -1367,7 +1317,6 @@ x1="39.8442" gradientUnits="userSpaceOnUse" id="linearGradient40352" - xlink:href="#XMLID_82_" inkscape:collect="always" /> <linearGradient y2="68.678101" @@ -1376,7 +1325,6 @@ x1="114.6655" gradientUnits="userSpaceOnUse" id="linearGradient40346" - xlink:href="#XMLID_79_" inkscape:collect="always" /> <linearGradient y2="64.543701" @@ -1385,7 +1333,6 @@ x1="3.8773999" gradientUnits="userSpaceOnUse" id="linearGradient40344" - xlink:href="#XMLID_78_" inkscape:collect="always" /> <radialGradient r="3.691133" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lskat-16.04.3/grafix/egyptian.svg new/lskat-16.08.0/grafix/egyptian.svg --- old/lskat-16.04.3/grafix/egyptian.svg 2015-11-30 01:21:32.000000000 +0100 +++ new/lskat-16.08.0/grafix/egyptian.svg 2016-05-09 05:41:21.000000000 +0200 @@ -223,7 +223,6 @@ x2="78.195801" y2="83.806198" id="linearGradient40474" - xlink:href="#XMLID_143_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="73.767097" @@ -231,7 +230,6 @@ x2="73.767097" y2="83.815903" id="linearGradient40472" - xlink:href="#XMLID_142_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="69.441902" @@ -239,7 +237,6 @@ x2="69.441902" y2="83.835403" id="linearGradient40470" - xlink:href="#XMLID_141_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="65.102997" @@ -247,7 +244,6 @@ x2="65.102997" y2="83.835403" id="linearGradient40468" - xlink:href="#XMLID_140_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="60.764599" @@ -255,7 +251,6 @@ x2="60.764599" y2="83.835403" id="linearGradient40466" - xlink:href="#XMLID_139_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="56.440399" @@ -263,7 +258,6 @@ x2="56.440399" y2="83.815903" id="linearGradient40464" - xlink:href="#XMLID_138_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="52.0107" @@ -271,7 +265,6 @@ x2="52.0107" y2="83.806198" id="linearGradient40462" - xlink:href="#XMLID_137_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="94.716301" @@ -279,7 +272,6 @@ x2="94.716301" y2="83.903801" id="linearGradient40460" - xlink:href="#XMLID_136_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="28.855" @@ -287,7 +279,6 @@ x2="28.855" y2="83.903801" id="linearGradient40458" - xlink:href="#XMLID_135_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="88.983902" @@ -295,7 +286,6 @@ x2="88.983902" y2="83.903801" id="linearGradient40456" - xlink:href="#XMLID_134_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="40.589802" @@ -303,7 +293,6 @@ x2="40.589802" y2="83.903801" id="linearGradient40454" - xlink:href="#XMLID_133_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="82.985802" @@ -311,7 +300,6 @@ x2="82.985802" y2="83.903801" id="linearGradient40452" - xlink:href="#XMLID_132_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="34.857399" @@ -319,7 +307,6 @@ x2="34.857399" y2="83.903801" id="linearGradient40450" - xlink:href="#XMLID_131_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="100.7192" @@ -327,7 +314,6 @@ x2="100.7192" y2="83.903801" id="linearGradient40448" - xlink:href="#XMLID_130_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="46.587898" @@ -335,7 +321,6 @@ x2="46.587898" y2="83.903801" id="linearGradient40446" - xlink:href="#XMLID_129_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="75.829597" @@ -343,7 +328,6 @@ x2="75.829597" y2="81.1772" id="linearGradient40442" - xlink:href="#XMLID_127_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="71.399902" @@ -351,7 +335,6 @@ x2="71.399902" y2="81.186996" id="linearGradient40440" - xlink:href="#XMLID_126_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="67.075699" @@ -359,7 +342,6 @@ x2="67.075699" y2="81.204597" id="linearGradient40438" - xlink:href="#XMLID_125_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="62.737301" @@ -367,7 +349,6 @@ x2="62.737301" y2="81.204597" id="linearGradient40436" - xlink:href="#XMLID_124_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="58.398399" @@ -375,7 +356,6 @@ x2="58.398399" y2="81.204597" id="linearGradient40434" - xlink:href="#XMLID_123_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="54.0732" @@ -383,7 +363,6 @@ x2="54.0732" y2="81.186996" id="linearGradient40432" - xlink:href="#XMLID_122_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="49.644001" @@ -391,7 +370,6 @@ x2="49.644001" y2="81.1772" id="linearGradient40430" - xlink:href="#XMLID_121_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="92.349098" @@ -399,7 +377,6 @@ x2="92.349098" y2="81.274902" id="linearGradient40428" - xlink:href="#XMLID_120_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="27.540001" @@ -407,7 +384,6 @@ x2="27.540001" y2="81.274902" id="linearGradient40426" - xlink:href="#XMLID_119_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="86.616699" @@ -415,7 +391,6 @@ x2="86.616699" y2="81.274902" id="linearGradient40424" - xlink:href="#XMLID_118_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="38.223598" @@ -423,7 +398,6 @@ x2="38.223598" y2="81.274902" id="linearGradient40422" - xlink:href="#XMLID_117_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="80.619598" @@ -431,7 +405,6 @@ x2="80.619598" y2="81.274902" id="linearGradient40420" - xlink:href="#XMLID_116_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="32.4902" @@ -439,7 +412,6 @@ x2="32.4902" y2="81.274902" id="linearGradient40418" - xlink:href="#XMLID_115_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="97.300301" @@ -447,7 +419,6 @@ x2="97.300301" y2="81.274902" id="linearGradient40416" - xlink:href="#XMLID_114_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="44.220699" @@ -455,7 +426,6 @@ x2="44.220699" y2="81.274902" id="linearGradient40414" - xlink:href="#XMLID_113_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="76.0923" @@ -463,7 +433,6 @@ x2="76.0923" y2="86.181198" id="linearGradient40412" - xlink:href="#XMLID_112_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="71.663597" @@ -471,7 +440,6 @@ x2="71.663597" y2="86.190903" id="linearGradient40410" - xlink:href="#XMLID_111_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="67.338402" @@ -479,7 +447,6 @@ x2="67.338402" y2="86.210403" id="linearGradient40408" - xlink:href="#XMLID_110_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="63" @@ -487,7 +454,6 @@ x2="63" y2="86.210403" id="linearGradient40406" - xlink:href="#XMLID_109_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="58.661098" @@ -495,7 +461,6 @@ x2="58.661098" y2="86.210403" id="linearGradient40404" - xlink:href="#XMLID_108_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="54.336399" @@ -503,7 +468,6 @@ x2="54.336399" y2="86.190903" id="linearGradient40402" - xlink:href="#XMLID_107_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="49.9067" @@ -511,7 +475,6 @@ x2="49.9067" y2="86.181198" id="linearGradient40400" - xlink:href="#XMLID_106_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="92.612801" @@ -519,7 +482,6 @@ x2="92.612801" y2="86.278801" id="linearGradient40398" - xlink:href="#XMLID_105_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="26.750999" @@ -527,7 +489,6 @@ x2="26.750999" y2="86.278801" id="linearGradient40396" - xlink:href="#XMLID_104_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="86.880402" @@ -535,7 +496,6 @@ x2="86.880402" y2="86.278801" id="linearGradient40394" - xlink:href="#XMLID_103_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="38.486301" @@ -543,7 +503,6 @@ x2="38.486301" y2="86.278801" id="linearGradient40392" - xlink:href="#XMLID_102_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="80.882301" @@ -551,7 +510,6 @@ x2="80.882301" y2="86.278801" id="linearGradient40390" - xlink:href="#XMLID_101_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="32.753899" @@ -559,7 +517,6 @@ x2="32.753899" y2="86.278801" id="linearGradient40388" - xlink:href="#XMLID_100_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="98.6157" @@ -567,7 +524,6 @@ x2="98.6157" y2="86.278801" id="linearGradient40386" - xlink:href="#XMLID_99_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="44.484402" @@ -575,7 +531,6 @@ x2="44.484402" y2="86.278801" id="linearGradient40384" - xlink:href="#XMLID_98_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="91.617699" @@ -583,7 +538,6 @@ x2="91.617699" y2="103.3413" id="linearGradient40372" - xlink:href="#XMLID_92_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="34.381802" @@ -591,7 +545,6 @@ x2="34.381802" y2="103.3413" id="linearGradient40370" - xlink:href="#XMLID_91_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="58.837898" @@ -599,7 +552,6 @@ x2="61.340599" y2="99.370796" id="linearGradient40368" - xlink:href="#XMLID_90_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="64.893097" @@ -607,7 +559,6 @@ x2="66.9282" y2="99.603996" id="linearGradient40366" - xlink:href="#XMLID_89_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="86.1558" @@ -615,7 +566,6 @@ x2="86.1558" y2="1.728" id="linearGradient40354" - xlink:href="#XMLID_83_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="39.8442" @@ -623,7 +573,6 @@ x2="39.8442" y2="1.728" id="linearGradient40352" - xlink:href="#XMLID_82_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="114.6655" @@ -631,7 +580,6 @@ x2="123.1426" y2="68.678101" id="linearGradient40346" - xlink:href="#XMLID_79_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="3.8773999" @@ -639,7 +587,6 @@ x2="14.1946" y2="64.543701" id="linearGradient40344" - xlink:href="#XMLID_78_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="68.067902" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lskat-16.04.3/grafix/oxygen.svg new/lskat-16.08.0/grafix/oxygen.svg --- old/lskat-16.04.3/grafix/oxygen.svg 2015-11-30 01:21:32.000000000 +0100 +++ new/lskat-16.08.0/grafix/oxygen.svg 2016-05-09 05:41:21.000000000 +0200 @@ -507,7 +507,6 @@ x2="78.195801" y2="83.806198" id="linearGradient40474" - xlink:href="#XMLID_143_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="73.767097" @@ -515,7 +514,6 @@ x2="73.767097" y2="83.815903" id="linearGradient40472" - xlink:href="#XMLID_142_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="69.441902" @@ -523,7 +521,6 @@ x2="69.441902" y2="83.835403" id="linearGradient40470" - xlink:href="#XMLID_141_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="65.102997" @@ -531,7 +528,6 @@ x2="65.102997" y2="83.835403" id="linearGradient40468" - xlink:href="#XMLID_140_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="60.764599" @@ -539,7 +535,6 @@ x2="60.764599" y2="83.835403" id="linearGradient40466" - xlink:href="#XMLID_139_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="56.440399" @@ -547,7 +542,6 @@ x2="56.440399" y2="83.815903" id="linearGradient40464" - xlink:href="#XMLID_138_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="52.0107" @@ -555,7 +549,6 @@ x2="52.0107" y2="83.806198" id="linearGradient40462" - xlink:href="#XMLID_137_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="94.716301" @@ -563,7 +556,6 @@ x2="94.716301" y2="83.903801" id="linearGradient40460" - xlink:href="#XMLID_136_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="28.855" @@ -571,7 +563,6 @@ x2="28.855" y2="83.903801" id="linearGradient40458" - xlink:href="#XMLID_135_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="88.983902" @@ -579,7 +570,6 @@ x2="88.983902" y2="83.903801" id="linearGradient40456" - xlink:href="#XMLID_134_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="40.589802" @@ -587,7 +577,6 @@ x2="40.589802" y2="83.903801" id="linearGradient40454" - xlink:href="#XMLID_133_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="82.985802" @@ -595,7 +584,6 @@ x2="82.985802" y2="83.903801" id="linearGradient40452" - xlink:href="#XMLID_132_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="34.857399" @@ -603,7 +591,6 @@ x2="34.857399" y2="83.903801" id="linearGradient40450" - xlink:href="#XMLID_131_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="100.7192" @@ -611,7 +598,6 @@ x2="100.7192" y2="83.903801" id="linearGradient40448" - xlink:href="#XMLID_130_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="46.587898" @@ -619,7 +605,6 @@ x2="46.587898" y2="83.903801" id="linearGradient40446" - xlink:href="#XMLID_129_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="75.829597" @@ -627,7 +612,6 @@ x2="75.829597" y2="81.1772" id="linearGradient40442" - xlink:href="#XMLID_127_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="71.399902" @@ -635,7 +619,6 @@ x2="71.399902" y2="81.186996" id="linearGradient40440" - xlink:href="#XMLID_126_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="67.075699" @@ -643,7 +626,6 @@ x2="67.075699" y2="81.204597" id="linearGradient40438" - xlink:href="#XMLID_125_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="62.737301" @@ -651,7 +633,6 @@ x2="62.737301" y2="81.204597" id="linearGradient40436" - xlink:href="#XMLID_124_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="58.398399" @@ -659,7 +640,6 @@ x2="58.398399" y2="81.204597" id="linearGradient40434" - xlink:href="#XMLID_123_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="54.0732" @@ -667,7 +647,6 @@ x2="54.0732" y2="81.186996" id="linearGradient40432" - xlink:href="#XMLID_122_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="49.644001" @@ -675,7 +654,6 @@ x2="49.644001" y2="81.1772" id="linearGradient40430" - xlink:href="#XMLID_121_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="92.349098" @@ -683,7 +661,6 @@ x2="92.349098" y2="81.274902" id="linearGradient40428" - xlink:href="#XMLID_120_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="27.540001" @@ -691,7 +668,6 @@ x2="27.540001" y2="81.274902" id="linearGradient40426" - xlink:href="#XMLID_119_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="86.616699" @@ -699,7 +675,6 @@ x2="86.616699" y2="81.274902" id="linearGradient40424" - xlink:href="#XMLID_118_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="38.223598" @@ -707,7 +682,6 @@ x2="38.223598" y2="81.274902" id="linearGradient40422" - xlink:href="#XMLID_117_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="80.619598" @@ -715,7 +689,6 @@ x2="80.619598" y2="81.274902" id="linearGradient40420" - xlink:href="#XMLID_116_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="32.4902" @@ -723,7 +696,6 @@ x2="32.4902" y2="81.274902" id="linearGradient40418" - xlink:href="#XMLID_115_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="97.300301" @@ -731,7 +703,6 @@ x2="97.300301" y2="81.274902" id="linearGradient40416" - xlink:href="#XMLID_114_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="44.220699" @@ -739,7 +710,6 @@ x2="44.220699" y2="81.274902" id="linearGradient40414" - xlink:href="#XMLID_113_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="76.0923" @@ -747,7 +717,6 @@ x2="76.0923" y2="86.181198" id="linearGradient40412" - xlink:href="#XMLID_112_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="71.663597" @@ -755,7 +724,6 @@ x2="71.663597" y2="86.190903" id="linearGradient40410" - xlink:href="#XMLID_111_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="67.338402" @@ -763,7 +731,6 @@ x2="67.338402" y2="86.210403" id="linearGradient40408" - xlink:href="#XMLID_110_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="63" @@ -771,7 +738,6 @@ x2="63" y2="86.210403" id="linearGradient40406" - xlink:href="#XMLID_109_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="58.661098" @@ -779,7 +745,6 @@ x2="58.661098" y2="86.210403" id="linearGradient40404" - xlink:href="#XMLID_108_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="54.336399" @@ -787,7 +752,6 @@ x2="54.336399" y2="86.190903" id="linearGradient40402" - xlink:href="#XMLID_107_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="49.9067" @@ -795,7 +759,6 @@ x2="49.9067" y2="86.181198" id="linearGradient40400" - xlink:href="#XMLID_106_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="92.612801" @@ -803,7 +766,6 @@ x2="92.612801" y2="86.278801" id="linearGradient40398" - xlink:href="#XMLID_105_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="26.750999" @@ -811,7 +773,6 @@ x2="26.750999" y2="86.278801" id="linearGradient40396" - xlink:href="#XMLID_104_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="86.880402" @@ -819,7 +780,6 @@ x2="86.880402" y2="86.278801" id="linearGradient40394" - xlink:href="#XMLID_103_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="38.486301" @@ -827,7 +787,6 @@ x2="38.486301" y2="86.278801" id="linearGradient40392" - xlink:href="#XMLID_102_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="80.882301" @@ -835,7 +794,6 @@ x2="80.882301" y2="86.278801" id="linearGradient40390" - xlink:href="#XMLID_101_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="32.753899" @@ -843,7 +801,6 @@ x2="32.753899" y2="86.278801" id="linearGradient40388" - xlink:href="#XMLID_100_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="98.6157" @@ -851,7 +808,6 @@ x2="98.6157" y2="86.278801" id="linearGradient40386" - xlink:href="#XMLID_99_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="44.484402" @@ -859,7 +815,6 @@ x2="44.484402" y2="86.278801" id="linearGradient40384" - xlink:href="#XMLID_98_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="91.617699" @@ -867,7 +822,6 @@ x2="91.617699" y2="103.3413" id="linearGradient40372" - xlink:href="#XMLID_92_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="34.381802" @@ -875,7 +829,6 @@ x2="34.381802" y2="103.3413" id="linearGradient40370" - xlink:href="#XMLID_91_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="58.837898" @@ -883,7 +836,6 @@ x2="61.340599" y2="99.370796" id="linearGradient40368" - xlink:href="#XMLID_90_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="64.893097" @@ -891,7 +843,6 @@ x2="66.9282" y2="99.603996" id="linearGradient40366" - xlink:href="#XMLID_89_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="86.1558" @@ -899,7 +850,6 @@ x2="86.1558" y2="1.728" id="linearGradient40354" - xlink:href="#XMLID_83_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="39.8442" @@ -907,7 +857,6 @@ x2="39.8442" y2="1.728" id="linearGradient40352" - xlink:href="#XMLID_82_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="114.6655" @@ -915,7 +864,6 @@ x2="123.1426" y2="68.678101" id="linearGradient40346" - xlink:href="#XMLID_79_" gradientUnits="userSpaceOnUse" /> <linearGradient x1="3.8773999" @@ -923,7 +871,6 @@ x2="14.1946" y2="64.543701" id="linearGradient40344" - xlink:href="#XMLID_78_" gradientUnits="userSpaceOnUse" /> <radialGradient cx="44.539673"

1 0

commit lokalize for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package lokalize for openSUSE:Factory checked in at 2016-08-31 00:09:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lokalize (Old) and /work/SRC/openSUSE:Factory/.lokalize.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lokalize" Changes: -------- --- /work/SRC/openSUSE:Factory/lokalize/lokalize.changes 2016-07-24 19:49:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lokalize.new/lokalize.changes 2016-08-31 00:09:05.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:30:09 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:47:42 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- lokalize-16.04.3.tar.xz New: ---- lokalize-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lokalize.spec ++++++ --- /var/tmp/diff_new_pack.pTfa2t/_old 2016-08-31 00:09:06.000000000 +0200 +++ /var/tmp/diff_new_pack.pTfa2t/_new 2016-08-31 00:09:06.000000000 +0200 @@ -17,7 +17,7 @@ Name: lokalize -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: KDE Translation Editor License: GPL-2.0+ ++++++ lokalize-16.04.3.tar.xz -> lokalize-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/lokalize.appdata.xml new/lokalize-16.08.0/lokalize.appdata.xml --- old/lokalize-16.04.3/lokalize.appdata.xml 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/lokalize.appdata.xml 2016-07-27 14:33:40.000000000 +0200 @@ -19,6 +19,7 @@ <name xml:lang="lt">Lokalize</name> <name xml:lang="nl">Lokalize</name> <name xml:lang="nn">Lokalize</name> + <name xml:lang="pa">ਲੋਕਾਲਾਈਜ਼</name> <name xml:lang="pl">Lokalize</name> <name xml:lang="pt">Lokalize</name> <name xml:lang="pt-BR">Lokalize</name> @@ -39,6 +40,7 @@ <summary xml:lang="ca">Sistema de traducció assistida per ordinador</summary> <summary xml:lang="ca-valencia">Sistema de traducció assistida per ordinador</summary> <summary xml:lang="cs">Systém pro překlad pomocí počítače</summary> + <summary xml:lang="da">Computerassisteret oversættelsessystem (CAT)</summary> <summary xml:lang="de">Computergestütztes Übersetzungssystem</summary> <summary xml:lang="en-GB">Computer-aided translation system</summary> <summary xml:lang="es">Sistema de traducción asistido por computador</summary> @@ -49,6 +51,7 @@ <summary xml:lang="lt">Kompiuterizuota vertimo sistema</summary> <summary xml:lang="nl">Computerondersteund vertaalsysteem</summary> <summary xml:lang="nn">Dataassistert omsetjing</summary> + <summary xml:lang="pa">ਕੰਪਿਊਟਰ-ਸਹਾਇਕ ਅਨੁਵਾਦ ਸਿਸਟਮ</summary> <summary xml:lang="pl">System tłumaczeń wspomagany komputerowo</summary> <summary xml:lang="pt">Sistema de traduções auxiliado por computador</summary> <summary xml:lang="pt-BR">Sistema de tradução auxiliado pelo computador</summary> @@ -69,6 +72,7 @@ Lokalize ye la ferramienta de llocalización pa KDE y otru software de códigu llibre. Ye tamién un sistema de traducción asistíu per ordenador (CAT) col que pues traducir ficheros OpenDocument (*.odt). Internamente úsase Translate-Toolkit pa estrayer el testu pa la traducción de ficheros El Lokalize és l'eina de traducció pel KDE i altre programari de codi lliure. També és un sistema de traducció assistit per ordinador (CAT) general que amb el que es poden traduir fitxers OpenDocument (*.odt). Internament s'utilitza el Translate-Toolkit per extreure text per a la traducció des de fitxers .odt a .xliff i per tornar a fusionar la traducció al fitxer .odt. El Lokalize és l'eina de traducció pel KDE i altre programari de codi lliure. També és un sistema de traducció assistit per ordinador (CAT) general que amb el que es poden traduir fitxers OpenDocument (*.odt). Internament s'utilitza el Translate-Toolkit per extreure text per a la traducció des de fitxers .odt a .xliff i per tornar a fusionar la traducció al fitxer .odt. + Lokalize er oversættelsesværktøjet til KDE og anden open source software. Den er også et generet computerassisteret oversættelsessystem (CAT), hvormed du kan oversætte OpenDocument-filer (*.odt). Translate-Toolkit bruges internt til at udtrække tekst til oversættelse fra .odt til .xliff-filer og til at flette oversættelsen tilbage til .odt-filen. Lokalize ist ein Lokalisierungs-Programm für KDE und andere quelloffene Software. Es ist außerdem ein rechnergestütztes Übersetzungssystem (CAT), mit dem Sie auch OpenDocument-Dateien (odt) übersetzen können. Intern wird „Translate-Toolkit“ zum Extrahieren von Text für die Übersetzung aus „odt“- in „xliff“-Dateien und für das Einfügen der Übersetzung zurück in „odt“-Dateien verwendet. Lokalize is the localisation tool for KDE and other open source software. It is also a general computer-aided translation system (CAT) with which you can translate OpenDocument files (*.odt). Translate-Toolkit is used internally to extract text for translation from .odt to .xliff files and to merge translation back into .odt file. Lokalize es la herramienta de traducción para KDE y para otros proyectos de software de código abierto. También es un sistema de traducción asistido por computador (CAT) de uso general con el que puede traducir archivos OpenDocument (*.odt). «Translate-Toolkit» se usa internamente para extraer el texto para la traducción de archivos .odt en .xliff y para volver a fusionar de nuevo las traducciones en los archivos .odt. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/src/binunitsview.cpp new/lokalize-16.08.0/src/binunitsview.cpp --- old/lokalize-16.04.3/src/binunitsview.cpp 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/src/binunitsview.cpp 2016-07-27 14:33:40.000000000 +0200 @@ -226,6 +226,6 @@ #ifndef NOKDE //FIXME child processes don't notify us about changes ;( if (item.column()<BinUnitsModel::Approved) - new KRun(Project::instance()->absolutePath(item.data().toString()),this); + new KRun(QUrl::fromLocalFile(Project::instance()->absolutePath(item.data().toString())), this); #endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/src/catalog/catalog.cpp new/lokalize-16.08.0/src/catalog/catalog.cpp --- old/lokalize-16.04.3/src/catalog/catalog.cpp 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/src/catalog/catalog.cpp 2016-07-27 14:33:40.000000000 +0200 @@ -629,7 +629,7 @@ d._autoSave->close(); } else - d._autoSave->setManagedFile(d._filePath); + d._autoSave->setManagedFile(QUrl::fromLocalFile(d._filePath)); } #endif @@ -680,7 +680,7 @@ { d._filePath=localFilePath; #ifndef NOKDE - d._autoSave->setManagedFile(localFilePath); + d._autoSave->setManagedFile(QUrl::fromLocalFile(localFilePath)); #endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/src/lokalize.notifyrc new/lokalize-16.08.0/src/lokalize.notifyrc --- old/lokalize-16.04.3/src/lokalize.notifyrc 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/src/lokalize.notifyrc 2016-07-27 14:33:40.000000000 +0200 @@ -238,9 +238,11 @@ Name[ast]=Escaniando carpetes con ficheros fonte... Name[ca]=S'estan explorant les carpetes amb els fitxers de codi font... Name[ca@valencia]=S'estan explorant les carpetes amb els fitxers de codi font... +Name[da]=Scanner mapper med kildefiler... Name[de]=Ordner mit Quelldateien wird durchsucht ... Name[en_GB]=Scanning folders with source files... Name[es]=Explorando carpetas con archivos de código fuente... +Name[et]=Lähtekoodifailidega kataloogide uurimine ... Name[fi]=Etsitään lähdekoodikansiosta… Name[gl]=Examinando os cartafoles con ficheiros fonte… Name[it]=Ricerca di cartelle contenenti file sorgente... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/src/nokde-stubs/kmessagebox.h new/lokalize-16.08.0/src/nokde-stubs/kmessagebox.h --- old/lokalize-16.04.3/src/nokde-stubs/kmessagebox.h 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/src/nokde-stubs/kmessagebox.h 2016-07-27 14:33:40.000000000 +0200 @@ -7,8 +7,12 @@ { static inline int save(){return 0;} static inline int discard(){return 0;} + static inline int yes(){return 0;} + static inline int no(){return 0;} }; +#define KGuiItem(x) 0 + class KMessageBox: public QMessageBox { public: @@ -23,6 +27,17 @@ Q_UNUSED(y) Q_UNUSED(n) Q_UNUSED(c) Q_UNUSED(dontAskAgainName) return warning(parent, caption, text, Yes|No|Cancel, Yes); } + static QMessageBox::StandardButton questionYesNoCancel(QWidget *parent, const QString &text, + const QString &caption, + int y=0, + int n=0, + int c=0, + const QString &dontAskAgainName=QString()) + { + Q_UNUSED(y) Q_UNUSED(n) Q_UNUSED(c) Q_UNUSED(dontAskAgainName) + return question(parent, caption, text, Yes|No|Cancel, Yes); + } + static QMessageBox::StandardButton questionYesNo(QWidget *parent, const QString &text, const QString &caption, int y=0, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/src/nokde-stubs/prefs.cpp new/lokalize-16.08.0/src/nokde-stubs/prefs.cpp --- old/lokalize-16.04.3/src/nokde-stubs/prefs.cpp 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/src/nokde-stubs/prefs.cpp 2016-07-27 14:33:40.000000000 +0200 @@ -141,12 +141,14 @@ { QSettings s; mRole = s.value("Project/AuthorRole", mRole).toInt(); + mSourceDir = s.value("Project/SourceDir", mSourceDir).toString(); } void ProjectLocal::save() { QSettings s; s.setValue(QStringLiteral("Project/AuthorRole"), mRole); + s.setValue(QStringLiteral("Project/SourceDir"), mSourceDir); } EditorTab* ProjectBase::fileOpen(QString filePath, int entry, bool setAsActive, const QString& mergeFile, bool silent) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/src/nokde-stubs/projectlocal.h new/lokalize-16.08.0/src/nokde-stubs/projectlocal.h --- old/lokalize-16.04.3/src/nokde-stubs/projectlocal.h 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/src/nokde-stubs/projectlocal.h 2016-07-27 14:33:40.000000000 +0200 @@ -22,6 +22,9 @@ void setFirstRun( bool v ){mFirstRun = v;} bool firstRun() const{return mFirstRun;} + void setSourceDir( const QString& s){mSourceDir = s;} + QString sourceDir() const{return mSourceDir;} + void save(); void setDefaults(){} protected: @@ -29,6 +32,7 @@ // Personal int mRole; bool mFirstRun; + QString mSourceDir; private: }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/src/prefs/prefs.cpp new/lokalize-16.08.0/src/prefs/prefs.cpp --- old/lokalize-16.04.3/src/prefs/prefs.cpp 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/src/prefs/prefs.cpp 2016-07-27 14:33:40.000000000 +0200 @@ -282,8 +282,8 @@ ui_prefs_projectmain.kcfg_PoBaseDir,SLOT(setText(QString))); connect(ui_prefs_projectmain.glossaryTbx,SIGNAL(textChanged(QString)), ui_prefs_projectmain.kcfg_GlossaryTbx,SLOT(setText(QString))); - ui_prefs_projectmain.poBaseDir->setUrl(p.poDir()); - ui_prefs_projectmain.glossaryTbx->setUrl(p.glossaryPath()); + ui_prefs_projectmain.poBaseDir->setUrl(QUrl::fromLocalFile(p.poDir())); + ui_prefs_projectmain.glossaryTbx->setUrl(QUrl::fromLocalFile(p.glossaryPath())); @@ -302,9 +302,9 @@ connect(ui_project_advanced.potBaseDir,SIGNAL(textChanged(QString)), ui_project_advanced.kcfg_PotBaseDir,SLOT(setText(QString))); connect(ui_project_advanced.branchDir,SIGNAL(textChanged(QString)), ui_project_advanced.kcfg_BranchDir,SLOT(setText(QString))); connect(ui_project_advanced.altDir,SIGNAL(textChanged(QString)), ui_project_advanced.kcfg_AltDir,SLOT(setText(QString))); - ui_project_advanced.potBaseDir->setUrl(p.potDir()); - ui_project_advanced.branchDir->setUrl(p.branchDir()); - ui_project_advanced.altDir->setUrl(p.altTransDir()); + ui_project_advanced.potBaseDir->setUrl(QUrl::fromLocalFile(p.potDir())); + ui_project_advanced.branchDir->setUrl(QUrl::fromLocalFile(p.branchDir())); + ui_project_advanced.altDir->setUrl(QUrl::fromLocalFile(p.altTransDir())); dialog->addPage(w, i18nc("@title:tab","Advanced"), "applications-development-translation"); //Scripts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/src/project/project.cpp new/lokalize-16.08.0/src/project/project.cpp --- old/lokalize-16.04.3/src/project/project.cpp 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/src/project/project.cpp 2016-07-27 14:33:40.000000000 +0200 @@ -37,7 +37,6 @@ #include <klocalizedstring.h> #include <kmessagebox.h> -#include <knotification.h> #include <QLocale> #include <QTimer> @@ -51,6 +50,8 @@ #include "projectmodel.h" #include "webquerycontroller.h" +#include <knotification.h> + #include <kio/global.h> #include <kjob.h> #include <kjobtrackerinterface.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lokalize-16.04.3/src/project/projectmodel.cpp new/lokalize-16.08.0/src/project/projectmodel.cpp --- old/lokalize-16.04.3/src/project/projectmodel.cpp 2016-05-16 15:11:11.000000000 +0200 +++ new/lokalize-16.08.0/src/project/projectmodel.cpp 2016-07-27 14:33:40.000000000 +0200 @@ -1111,7 +1111,7 @@ } const FileMetaData& info=job->m_info.first(); - QModelIndex index = indexForUrl(info.filePath); + QModelIndex index = indexForUrl(QUrl::fromLocalFile(info.filePath)); if (!index.isValid()) return;

1 0

commit libkmahjongg for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package libkmahjongg for openSUSE:Factory checked in at 2016-08-31 00:09:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkmahjongg (Old) and /work/SRC/openSUSE:Factory/.libkmahjongg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkmahjongg" Changes: -------- --- /work/SRC/openSUSE:Factory/libkmahjongg/libkmahjongg.changes 2016-07-24 19:49:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkmahjongg.new/libkmahjongg.changes 2016-08-31 00:09:03.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:29:46 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:44:48 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- libkmahjongg-16.04.3.tar.xz New: ---- libkmahjongg-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkmahjongg.spec ++++++ --- /var/tmp/diff_new_pack.0Hrqfg/_old 2016-08-31 00:09:04.000000000 +0200 +++ /var/tmp/diff_new_pack.0Hrqfg/_new 2016-08-31 00:09:04.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: libkmahjongg-%{version}.tar.xz BuildRequires: fdupes ++++++ libkmahjongg-16.04.3.tar.xz -> libkmahjongg-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/.clang-format new/libkmahjongg-16.08.0/.clang-format --- old/libkmahjongg-16.04.3/.clang-format 1970-01-01 01:00:00.000000000 +0100 +++ new/libkmahjongg-16.08.0/.clang-format 2016-08-07 14:15:56.000000000 +0200 @@ -0,0 +1,85 @@ +--- +Language: Cpp +# BasedOnStyle: WebKit +AccessModifierOffset: -4 +AlignAfterOpenBracket: Align +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +AlignEscapedNewlinesLeft: false +AlignOperands: false +AlignTrailingComments: false +AllowAllParametersOfDeclarationOnNextLine: true +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: None +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: false +BinPackArguments: true +BinPackParameters: true +BraceWrapping: + AfterClass: true + AfterControlStatement: false + AfterEnum: false + AfterFunction: true + AfterNamespace: true + AfterStruct: true + AfterUnion: true + BeforeCatch: false + BeforeElse: false + IndentBraces: false +BreakBeforeBinaryOperators: All +BreakBeforeBraces: Custom +BreakBeforeTernaryOperators: true +BreakConstructorInitializersBeforeComma: true +ColumnLimit: 0 +CommentPragmas: '' +ConstructorInitializerAllOnOneLineOrOnePerLine: false +ConstructorInitializerIndentWidth: 4 +ContinuationIndentWidth: 4 +Cpp11BracedListStyle: true +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +ForEachMacros: [ foreach, Q_FOREACH ] +IncludeCategories: + - Regex: '^<Q' + Priority: 1 + - Regex: '^<K' + Priority: 2 + - Regex: '^"' + Priority: 3 +IndentCaseLabels: true +IndentWidth: 4 +IndentWrappedFunctionNames: false +KeepEmptyLinesAtTheStartOfBlocks: false +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 2 +NamespaceIndentation: Inner +PenaltyBreakBeforeFirstCallParameter: 19 +PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 120 +PenaltyBreakString: 1000 +PenaltyExcessCharacter: 1000000 +PenaltyReturnTypeOnItsOwnLine: 60 +SortIncludes: true +PointerAlignment: Middle +SpaceAfterCStyleCast: false +SpaceBeforeAssignmentOperators: true +SpaceBeforeParens: ControlStatements +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: true +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Cpp11 +TabWidth: 8 +UseTab: Never +#ForceEmptyLineAtEOF: true +... + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/.gitignore new/libkmahjongg-16.08.0/.gitignore --- old/libkmahjongg-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/libkmahjongg-16.08.0/.gitignore 2016-08-07 14:15:56.000000000 +0200 @@ -0,0 +1,3 @@ +.kdev4/ +build/ +*.kdev4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/CMakeLists.txt new/libkmahjongg-16.08.0/CMakeLists.txt --- old/libkmahjongg-16.04.3/CMakeLists.txt 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/CMakeLists.txt 2016-08-07 14:15:56.000000000 +0200 @@ -6,10 +6,21 @@ find_package(ECM 1.3.0 REQUIRED NO_MODULE) +#if(ENABLE_CLAZY) +# set(CMAKE_CXX_COMPILER clazy) +#endif() + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Gui Test Svg) -find_package(KF5 REQUIRED COMPONENTS CoreAddons Config ConfigWidgets WidgetsAddons Completion I18n) +find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Gui Svg) +find_package(KF5 REQUIRED COMPONENTS + CoreAddons + Config + ConfigWidgets + WidgetsAddons + Completion + I18n +) include(FeatureSummary) include(GenerateExportHeader) @@ -18,7 +29,7 @@ include(ECMGenerateHeaders) include(ECMMarkNonGuiExecutable) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) @@ -26,8 +37,8 @@ include_directories(${CMAKE_SOURCE_DIR}/includes) -add_subdirectory( tilesets ) -add_subdirectory( backgrounds ) +add_subdirectory(tilesets) +add_subdirectory(backgrounds) ########### next target ############### @@ -36,24 +47,35 @@ set(kmahjongg_LIB_SRCS libkmahjongg_debug.cpp - kmahjonggtileset.cpp - kmahjonggbackground.cpp - kmahjonggtilesetselector.cpp - kmahjonggbackgroundselector.cpp - kmahjonggconfigdialog.cpp ) + kmahjonggtileset.cpp + kmahjonggbackground.cpp + kmahjonggtilesetselector.cpp + kmahjonggbackgroundselector.cpp + kmahjonggconfigdialog.cpp +) ki18n_wrap_ui(kmahjongg_LIB_SRCS kmahjonggtilesetselector.ui kmahjonggbackgroundselector.ui ) add_library(KF5KMahjongglib SHARED ${kmahjongg_LIB_SRCS}) generate_export_header(KF5KMahjongglib BASE_NAME libkmahjongg) -target_link_libraries(KF5KMahjongglib PRIVATE Qt5::Core Qt5::Svg KF5::WidgetsAddons KF5::I18n KF5::Completion KF5::ConfigGui - PUBLIC Qt5::Gui KF5::ConfigWidgets) +target_link_libraries(KF5KMahjongglib + PRIVATE + Qt5::Core + Qt5::Svg + KF5::WidgetsAddons + KF5::I18n + KF5::Completion + KF5::ConfigGui + PUBLIC + Qt5::Gui + KF5::ConfigWidgets +) target_include_directories(KF5KMahjongglib INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/KF5KMahjongg>" INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}>") -set_target_properties(KF5KMahjongglib PROPERTIES VERSION ${KMAHJONGGLIB_VERSION} - SOVERSION ${KMAHJONGGLIB_SOVERSION} +set_target_properties(KF5KMahjongglib PROPERTIES VERSION ${KMAHJONGGLIB_VERSION} + SOVERSION ${KMAHJONGGLIB_SOVERSION} EXPORT_NAME KF5KMahjongglib) ecm_setup_version(${KMAHJONGGLIB_VERSION} VARIABLE_PREFIX KF5KMAHJONGGLIB @@ -61,18 +83,19 @@ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfigVersion.cmake" SOVERSION 6) - + install(TARGETS KF5KMahjongglib EXPORT KF5KMahjonggLibraryDepends ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/libkmahjongg_export.h - kmahjonggtileset.h - kmahjonggbackground.h - kmahjonggconfigdialog.h -DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KF5KMahjongg COMPONENT Devel) + ${CMAKE_CURRENT_BINARY_DIR}/libkmahjongg_export.h + kmahjonggtileset.h + kmahjonggbackground.h + kmahjonggconfigdialog.h + DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KF5KMahjongg COMPONENT Devel +) ########### generate exports ############### @@ -84,23 +107,28 @@ set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5KMahjongglib") # create the Config.cmake and ConfigVersion.cmake files -ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5KMahjongglibConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} - ) - -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfigVersion.cmake" - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - COMPONENT Devel ) +ecm_configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KF5KMahjongglibConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} +) + +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel +) # install the export set for use with the install-tree -install(EXPORT KF5KMahjonggLibraryDepends DESTINATION - ${CMAKECONFIG_INSTALL_DIR} COMPONENT Devel) - -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kmahjongglib_version.h - DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KF5KMahjongg - COMPONENT Devel) +install(EXPORT KF5KMahjonggLibraryDepends + DESTINATION ${CMAKECONFIG_INSTALL_DIR} + COMPONENT Devel +) + +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kmahjongglib_version.h + DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KF5KMahjongg + COMPONENT Devel +) ########### Display Summary ############### feature_summary(WHAT ALL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/backgrounds/CMakeLists.txt new/libkmahjongg-16.08.0/backgrounds/CMakeLists.txt --- old/libkmahjongg-16.04.3/backgrounds/CMakeLists.txt 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/backgrounds/CMakeLists.txt 2016-08-07 14:15:56.000000000 +0200 @@ -1,28 +1,29 @@ ##default -install( FILES default.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES default.svg DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES default.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) +install(FILES default.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES default.svg DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES default.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) ##chinese landscape -install( FILES chinese_landscape.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES chinese_landscape.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES chinese_landscape.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) +install(FILES chinese_landscape.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES chinese_landscape.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES chinese_landscape.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) ##wood light -install( FILES wood_light.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES wood_light.svg DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES wood_light.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) +install(FILES wood_light.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES wood_light.svg DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES wood_light.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) ##summertime greens -install( FILES summerfield.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES summerfield.svg DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES summerfield.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) +install(FILES summerfield.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES summerfield.svg DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES summerfield.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) ##plain color -install( FILES color_plain.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) +install(FILES color_plain.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) ##egyptian -install( FILES egyptian.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES egyptian.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) -install( FILES egyptian.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/ ) +install(FILES egyptian.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES egyptian.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) +install(FILES egyptian.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/backgrounds/) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/backgrounds/color_plain.desktop new/libkmahjongg-16.08.0/backgrounds/color_plain.desktop --- old/libkmahjongg-16.04.3/backgrounds/color_plain.desktop 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/backgrounds/color_plain.desktop 2016-08-07 14:15:56.000000000 +0200 @@ -4,7 +4,7 @@ Name[be]=Проста колер Name[bs]=Boja ravnice Name[ca]=Color llis -Name[ca@valencia]=Color pla +Name[ca@valencia]=Color llis Name[cs]=Prostá barva Name[da]=Almindelig farve Name[de]=Einfache Farbe diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggbackground.cpp new/libkmahjongg-16.08.0/kmahjonggbackground.cpp --- old/libkmahjongg-16.04.3/kmahjonggbackground.cpp 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggbackground.cpp 2016-08-07 14:15:56.000000000 +0200 @@ -17,30 +17,41 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +// own #include "kmahjonggbackground.h" -#include "libkmahjongg_debug.h" -#include <KLocalizedString> -#include <kconfig.h> -#include <kconfiggroup.h> -#include <qsvgrenderer.h> -#include <QImage> +// Qt #include <QFile> +#include <QImage> #include <QMap> +#include <QPainter> #include <QPixmap> #include <QPixmapCache> -#include <QPainter> +#include <QSvgRenderer> + +// KDE +#include <KConfig> +#include <KConfigGroup> +#include <KLocalizedString> + +// LibKMahjongg +#include "libkmahjongg_debug.h" class KMahjonggBackgroundPrivate { - public: +public: KMahjonggBackgroundPrivate() - : w(1), h(1), graphicsLoaded(false), isTiled(true), isSVG(false) + : w(1) + , h(1) + , graphicsLoaded(false) + , isPlain(false) + , isTiled(true) + , isSVG(false) { } QMap<QString, QString> authorproperties; - QString pixmapCacheNameFromElementId(const QString &elementid); + QString pixmapCacheNameFromElementId(const QString & elementid); QPixmap renderBG(short width, short height); QPixmap backgroundPixmap; @@ -62,19 +73,21 @@ : d(new KMahjonggBackgroundPrivate) { static bool _inited = false; - if (_inited) + if (_inited) { return; + } _inited = true; } -KMahjonggBackground::~KMahjonggBackground() { +KMahjonggBackground::~KMahjonggBackground() +{ delete d; } bool KMahjonggBackground::loadDefault() { // Set default background here. - QLatin1String idx( "egyptian.desktop" ); + QLatin1String idx("egyptian.desktop"); QString bgPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kmahjongglib/backgrounds/" + idx); qCDebug(LIBKMAHJONGG_LOG) << "Inside LoadDefault(), located background at" << bgPath; @@ -86,7 +99,8 @@ #define kBGVersionFormat 1 -bool KMahjonggBackground::load(const QString &file, short width, short height) { +bool KMahjonggBackground::load(const QString & file, short width, short height) +{ //qCDebug(LIBKMAHJONGG_LOG) << "Background loading"; d->isSVG = false; @@ -95,23 +109,23 @@ // verify if it is a valid file first and if we can open it QFile bgfile(file); if (!bgfile.open(QIODevice::ReadOnly)) { - return (false); + return false; } bgfile.close(); KConfig bgconfig(file, KConfig::SimpleConfig); KConfigGroup group = bgconfig.group("KMahjonggBackground"); - d->authorproperties.insert(QLatin1String( "Name" ), group.readEntry("Name"));// Returns translated data - d->authorproperties.insert(QLatin1String( "Author" ), group.readEntry("Author")); - d->authorproperties.insert(QLatin1String( "Description" ), group.readEntry("Description")); - d->authorproperties.insert(QLatin1String( "AuthorEmail" ), group.readEntry("AuthorEmail")); + d->authorproperties.insert(QLatin1String("Name"), group.readEntry("Name")); // Returns translated data + d->authorproperties.insert(QLatin1String("Author"), group.readEntry("Author")); + d->authorproperties.insert(QLatin1String("Description"), group.readEntry("Description")); + d->authorproperties.insert(QLatin1String("AuthorEmail"), group.readEntry("AuthorEmail")); //The "Plain" key is set to 1 by the color_plain background. d->isPlain = group.readEntry("Plain", 0) != 0; - d->authorproperties.insert(QLatin1String( "Plain" ), d->isPlain ? QLatin1String("1") : QLatin1String("0")); + d->authorproperties.insert(QLatin1String("Plain"), d->isPlain ? QLatin1String("1") : QLatin1String("0")); //Version control - int bgversion = group.readEntry("VersionFormat",0); + int bgversion = group.readEntry("VersionFormat", 0); //Format is increased when we have incompatible changes, meaning that older clients are not able to use the remaining information safely if (bgversion > kBGVersionFormat) { return false; @@ -130,11 +144,13 @@ qCDebug(LIBKMAHJONGG_LOG) << "Using background at" << d->graphicspath; - if (d->graphicspath.isEmpty()) return (false); + if (d->graphicspath.isEmpty()) { + return false; + } - if (group.readEntry("Tiled",0)) { - d->w = group.readEntry("Width",0); - d->h = group.readEntry("Height",0); + if (group.readEntry("Tiled", 0) != 0) { + d->w = group.readEntry("Width", 0); + d->h = group.readEntry("Height", 0); d->isTiled = true; } else { d->w = width; @@ -146,35 +162,44 @@ return true; } -bool KMahjonggBackground::loadGraphics() { - if (d->graphicsLoaded || d->isPlain) return (true) ; +bool KMahjonggBackground::loadGraphics() +{ + if (d->graphicsLoaded || d->isPlain) { + return true; + } d->svg.load(d->graphicspath); if (d->svg.isValid()) { d->isSVG = true; } else { //qCDebug(LIBKMAHJONGG_LOG) << "could not load svg"; - return( false ); + return false; } - return (true); + return true; } -void KMahjonggBackground::sizeChanged(int newW, int newH) { +void KMahjonggBackground::sizeChanged(int newW, int newH) +{ //in tiled mode we do not care about the whole field size - if (d->isTiled || d->isPlain) return; + if (d->isTiled || d->isPlain) { + return; + } - if (newW == d->w && newH == d->h) + if (newW == d->w && newH == d->h) { return; + } d->w = newW; d->h = newH; } -QString KMahjonggBackgroundPrivate::pixmapCacheNameFromElementId(const QString &elementid) { - return authorproperties[QLatin1String( "Name" )]+ elementid+QString::fromLatin1( "W%1H%2").arg(w).arg(h); +QString KMahjonggBackgroundPrivate::pixmapCacheNameFromElementId(const QString & elementid) +{ + return authorproperties[QLatin1String("Name")] + elementid + QString::fromLatin1("W%1H%2").arg(w).arg(h); } -QPixmap KMahjonggBackgroundPrivate::renderBG(short width, short height) { - QImage qiRend(QSize(width, height),QImage::Format_ARGB32_Premultiplied); +QPixmap KMahjonggBackgroundPrivate::renderBG(short width, short height) +{ + QImage qiRend(QSize(width, height), QImage::Format_ARGB32_Premultiplied); qiRend.fill(0); if (svg.isValid()) { @@ -184,7 +209,8 @@ return QPixmap::fromImage(qiRend); } -QBrush & KMahjonggBackground::getBackground() { +QBrush & KMahjonggBackground::getBackground() +{ if (d->isPlain) { d->backgroundBrush = QBrush(QPixmap()); } else { @@ -197,11 +223,12 @@ return d->backgroundBrush; } -QString KMahjonggBackground::path() const { +QString KMahjonggBackground::path() const +{ return d->filename; } -QString KMahjonggBackground::authorProperty(const QString &key) const { +QString KMahjonggBackground::authorProperty(const QString & key) const +{ return d->authorproperties[key]; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggbackground.h new/libkmahjongg-16.08.0/kmahjonggbackground.h --- old/libkmahjongg-16.04.3/kmahjonggbackground.h 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggbackground.h 2016-08-07 14:15:56.000000000 +0200 @@ -17,11 +17,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _KMAHJONGGBACKGROUND_H_ -#define _KMAHJONGGBACKGROUND_H_ +#ifndef KMAHJONGGBACKGROUND_H +#define KMAHJONGGBACKGROUND_H -#include <QtGui/QBrush> +// Qt +#include <QBrush> +// LibKMahjongg #include "libkmahjongg_export.h" class KMahjonggBackgroundPrivate; @@ -47,4 +49,4 @@ Q_DISABLE_COPY(KMahjonggBackground) }; -#endif +#endif // KMAHJONGGBACKGROUND_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggbackgroundselector.cpp new/libkmahjongg-16.08.0/kmahjonggbackgroundselector.cpp --- old/libkmahjongg-16.04.3/kmahjonggbackgroundselector.cpp 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggbackgroundselector.cpp 2016-08-07 14:15:56.000000000 +0200 @@ -16,15 +16,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +// own #include "kmahjonggbackgroundselector.h" -#include <KLocalizedString> +// Qt +#include <QDir> #include <QPainter> + +// KDE +#include <KLocalizedString> + +// LibKMahjongg #include "kmahjonggbackground.h" -#include <QDir> -KMahjonggBackgroundSelector::KMahjonggBackgroundSelector( QWidget* parent, KConfigSkeleton * aconfig ) - : QWidget( parent ) +KMahjonggBackgroundSelector::KMahjonggBackgroundSelector(QWidget * parent, KConfigSkeleton * aconfig) + : QWidget(parent) { setupUi(this); setupData(aconfig); @@ -50,24 +56,23 @@ //Now get our backgrounds into a list QStringList bgsAvailable; const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "kmahjongglib/backgrounds", QStandardPaths::LocateDirectory); - Q_FOREACH (const QString& dir, dirs) { + Q_FOREACH (const QString & dir, dirs) { const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.desktop")); - Q_FOREACH (const QString& file, fileNames) { + Q_FOREACH (const QString & file, fileNames) { bgsAvailable.append(dir + '/' + file); - } + } } QLatin1String namestr("Name"); int numvalidentries = 0; - for (int i = 0; i < bgsAvailable.size(); ++i) - { + for (int i = 0; i < bgsAvailable.size(); ++i) { KMahjonggBackground * abg = new KMahjonggBackground(); QString bgpath = bgsAvailable.at(i); - if (abg->load(bgpath,backgroundPreview->width(),backgroundPreview->height())) { + if (abg->load(bgpath, backgroundPreview->width(), backgroundPreview->height())) { backgroundMap.insert(abg->authorProperty(namestr), abg); backgroundList->addItem(abg->authorProperty(namestr)); //Find if this is our currently configured background - if (bgpath==initialGroup) { + if (bgpath == initialGroup) { //Select current entry backgroundList->setCurrentRow(numvalidentries); backgroundChanged(); @@ -85,8 +90,10 @@ { KMahjonggBackground * selBG = backgroundMap.value(backgroundList->currentItem()->text()); //Sanity checkings. Should not happen. - if (!selBG) return; - if (selBG->path()==kcfg_Background->text()) { + if (selBG == nullptr) { + return; + } + if (selBG->path() == kcfg_Background->text()) { return; } QLatin1String authstr("Author"); @@ -97,23 +104,22 @@ backgroundContact->setText(selBG->authorProperty(contactstr)); backgroundDescription->setText(selBG->authorProperty(descstr)); - if (selBG->authorProperty(QLatin1String( "Plain" )) == QLatin1String("1")) { + if (selBG->authorProperty(QLatin1String("Plain")) == QLatin1String("1")) { backgroundPreview->setPixmap(QPixmap()); return; } //Make sure SVG is loaded when graphics is selected - if (!selBG->loadGraphics()) return; + if (!selBG->loadGraphics()) { + return; + } //Draw the preview //TODO here: add code to load and keep proportions for non-tiled content? - QImage qiRend(backgroundPreview->size(),QImage::Format_ARGB32_Premultiplied); + QImage qiRend(backgroundPreview->size(), QImage::Format_ARGB32_Premultiplied); qiRend.fill(0); QPainter p(&qiRend); - p.fillRect(p.viewport(), selBG->getBackground() ); + p.fillRect(p.viewport(), selBG->getBackground()); p.end(); backgroundPreview->setPixmap(QPixmap::fromImage(qiRend)); - } - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggbackgroundselector.h new/libkmahjongg-16.08.0/kmahjonggbackgroundselector.h --- old/libkmahjongg-16.04.3/kmahjonggbackgroundselector.h 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggbackgroundselector.h 2016-08-07 14:15:56.000000000 +0200 @@ -16,11 +16,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __LIB_KMAHJONGGBACKGROUNDSELECTOR_H_ -#define __LIB_KMAHJONGGBACKGROUNDSELECTOR_H_ +#ifndef KMAHJONGGBACKGROUNDSELECTOR_H +#define KMAHJONGGBACKGROUNDSELECTOR_H +// Qt #include <QMap> + +// KDE #include <KConfigSkeleton> + +// LibKMahjongg #include "ui_kmahjonggbackgroundselector.h" class KMahjonggBackground; @@ -29,13 +34,13 @@ { Q_OBJECT public: - explicit KMahjonggBackgroundSelector( QWidget* parent, KConfigSkeleton * config ); + explicit KMahjonggBackgroundSelector( QWidget* parent, KConfigSkeleton * aconfig ); ~KMahjonggBackgroundSelector(); - void setupData(KConfigSkeleton * config); + void setupData(KConfigSkeleton * aconfig); QMap<QString, KMahjonggBackground *> backgroundMap; public slots: void backgroundChanged(); }; -#endif // __LIB_KMAHJONGGBACKGROUNDSELECTOR_H_ +#endif // KMAHJONGGBACKGROUNDSELECTOR_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggconfigdialog.cpp new/libkmahjongg-16.08.0/kmahjonggconfigdialog.cpp --- old/libkmahjongg-16.04.3/kmahjonggconfigdialog.cpp 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggconfigdialog.cpp 2016-08-07 14:15:56.000000000 +0200 @@ -15,40 +15,45 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kmahjonggconfigdialog.h" - -#include "kmahjonggtilesetselector.h" -#include "kmahjonggbackgroundselector.h" -#include "libkmahjongg_debug.h" -#include <kconfigdialogmanager.h> -#include <kstandardguiitem.h> -#include <KLocalizedString> -#include <krandom.h> -#include <kconfig.h> -#include <KConfigGroup> +// own +#include "kmahjonggconfigdialog.h" +// Qt #include <QDialog> #include <QDialogButtonBox> #include <QPushButton> #include <QVBoxLayout> +// KDE +#include <KConfig> +#include <KConfigDialogManager> +#include <KConfigGroup> +#include <KLocalizedString> +#include <KRandom> +#include <KStandardGuiItem> + +// LibKMahjongg +#include "kmahjonggbackgroundselector.h" +#include "kmahjonggtilesetselector.h" +#include "libkmahjongg_debug.h" + class KMahjonggConfigDialogPrivate { public: KConfigSkeleton * m_config; }; -KMahjonggConfigDialog::KMahjonggConfigDialog( QWidget *parent, const QString& name, - KConfigSkeleton *config) - : KConfigDialog(parent, name, config), - d(new KMahjonggConfigDialogPrivate) +KMahjonggConfigDialog::KMahjonggConfigDialog(QWidget * parent, const QString & name, + KConfigSkeleton * config) + : KConfigDialog(parent, name, config) + , d(new KMahjonggConfigDialogPrivate) { setFaceType(List); - QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Apply); - QVBoxLayout *mainLayout = new QVBoxLayout; + QDialogButtonBox * buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Help | QDialogButtonBox::Apply); + QVBoxLayout * mainLayout = new QVBoxLayout; setLayout(mainLayout); - QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); + QPushButton * okButton = buttonBox->button(QDialogButtonBox::Ok); okButton->setDefault(true); okButton->setShortcut(Qt::CTRL | Qt::Key_Return); connect(buttonBox, &QDialogButtonBox::accepted, this, &KMahjonggConfigDialog::accept); @@ -68,27 +73,17 @@ { KMahjonggTilesetSelector * ts = new KMahjonggTilesetSelector(this, d->m_config); //TODO: Use the cards icon for our page for now, need to get one for tilesets made - addPage(ts, i18n("Tiles"), QLatin1String( "games-config-tiles" )); + addPage(ts, i18n("Tiles"), QLatin1String("games-config-tiles")); } void KMahjonggConfigDialog::addBackgroundPage() { KMahjonggBackgroundSelector * ts = new KMahjonggBackgroundSelector(this, d->m_config); //TODO: need icon - addPage(ts, i18n("Background"), QLatin1String( "games-config-background" )); + addPage(ts, i18n("Background"), QLatin1String("games-config-background")); } void KMahjonggConfigDialog::updateWidgetsDefault() { //qCDebug(LIBKMAHJONGG_LOG) << "updateWidgetsDefault"; } -/*void KMahjonggConfigDialog::updateWidgets() -{ - //qCDebug(LIBKMAHJONGG_LOG) << "updateWidgets"; -} -void KMahjonggConfigDialog::updateSettings() -{ - //qCDebug(LIBKMAHJONGG_LOG) << "updateSettings"; -}*/ - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggconfigdialog.h new/libkmahjongg-16.08.0/kmahjonggconfigdialog.h --- old/libkmahjongg-16.04.3/kmahjonggconfigdialog.h 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggconfigdialog.h 2016-08-07 14:15:56.000000000 +0200 @@ -16,14 +16,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __LIBKMAHJONGGCONFIGDIALOG_H_ -#define __LIBKMAHJONGGCONFIGDIALOG_H_ - -#include <kconfigdialog.h> -#include <libkmahjongg_export.h> +#ifndef KMAHJONGGCONFIGDIALOG_H +#define KMAHJONGGCONFIGDIALOG_H +// KDE +#include <KConfigDialog> #include <KConfigSkeleton> +// LibKMahjongg +#include <libkmahjongg_export.h> + class KMahjonggConfigDialogPrivate; class LIBKMAHJONGG_EXPORT KMahjonggConfigDialog : public KConfigDialog @@ -38,8 +40,6 @@ protected Q_SLOTS: void updateWidgetsDefault(); - //void updateWidgets(); - //void updateSettings(); private: friend class KMahjonggConfigDialogPrivate; @@ -48,4 +48,4 @@ Q_DISABLE_COPY(KMahjonggConfigDialog) }; -#endif +#endif // KMAHJONGGCONFIGDIALOG_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggtileset.cpp new/libkmahjongg-16.08.0/kmahjonggtileset.cpp --- old/libkmahjongg-16.04.3/kmahjonggtileset.cpp 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggtileset.cpp 2016-08-07 14:15:56.000000000 +0200 @@ -17,47 +17,64 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +// own #include "kmahjonggtileset.h" -#include "libkmahjongg_debug.h" -#include <KLocalizedString> -#include <kconfig.h> -#include <kconfiggroup.h> -#include <qimage.h> -#include <qsvgrenderer.h> -#include <QPainter> -#include <QPixmapCache> +// STL +#include <cstdlib> + +// Qt #include <QFile> +#include <QImage> #include <QMap> +#include <QPainter> +#include <QPixmapCache> #include <QStandardPaths> +#include <QSvgRenderer> -#include <stdlib.h> +// KDE +#include <KConfig> +#include <KConfigGroup> +#include <KLocalizedString> + +// LibKMahjongg +#include "libkmahjongg_debug.h" class KMahjonggTilesetMetricsData { - public: - short lvloffx; // used for 3D indentation, x value - short lvloffy; // used for 3D indentation, y value - short w; // tile width ( +border +shadow) - short h; // tile height ( +border +shadow) - short fw; // face width - short fh; // face height +public: + short lvloffx; // used for 3D indentation, x value + short lvloffy; // used for 3D indentation, y value + short w; // tile width ( +border +shadow) + short h; // tile height ( +border +shadow) + short fw; // face width + short fh; // face height KMahjonggTilesetMetricsData() - : lvloffx(0), lvloffy(0), w(0), h(0), fw(0), fh(0) - {} + : lvloffx(0) + , lvloffy(0) + , w(0) + , h(0) + , fw(0) + , fh(0) + { + } }; class KMahjonggTilesetPrivate { - public: - KMahjonggTilesetPrivate() : isSVG(false), graphicsLoaded(false) {} +public: + KMahjonggTilesetPrivate() + : isSVG(false) + , graphicsLoaded(false) + { + } QList<QString> elementIdTable; QMap<QString, QString> authorproperties; KMahjonggTilesetMetricsData originaldata; KMahjonggTilesetMetricsData scaleddata; - QString filename; // cache the last file loaded to save reloading it + QString filename; // cache the last file loaded to save reloading it QString graphicspath; QSvgRenderer svg; @@ -73,14 +90,16 @@ buildElementIdTable(); static bool _inited = false; - if (_inited) + if (_inited) { return; + } _inited = true; } // --------------------------------------------------------- -KMahjonggTileset::~KMahjonggTileset() { +KMahjonggTileset::~KMahjonggTileset() +{ delete d; } @@ -88,11 +107,11 @@ { d->scaleddata.w = tilew; d->scaleddata.h = tileh; - double ratio = ((qreal) d->scaleddata.w) / ((qreal) d->originaldata.w); - d->scaleddata.lvloffx = (short) (d->originaldata.lvloffx * ratio); - d->scaleddata.lvloffy = (short) (d->originaldata.lvloffy * ratio); - d->scaleddata.fw = (short) (d->originaldata.fw * ratio); - d->scaleddata.fh = (short) (d->originaldata.fh * ratio); + double ratio = (static_cast<qreal>(d->scaleddata.w)) / (static_cast<qreal>(d->originaldata.w)); + d->scaleddata.lvloffx = static_cast<short>(d->originaldata.lvloffx * ratio); + d->scaleddata.lvloffy = static_cast<short>(d->originaldata.lvloffy * ratio); + d->scaleddata.fw = static_cast<short>(d->originaldata.fw * ratio); + d->scaleddata.fh = static_cast<short>(d->originaldata.fh * ratio); } QSize KMahjonggTileset::preferredTileSize(const QSize & boardsize, int horizontalCells, int verticalCells) @@ -108,20 +127,20 @@ qreal floatw = d->originaldata.w; qreal floath = d->originaldata.h; - if ((fullw/fullh)>(bw/bh)) { + if ((fullw / fullh) > (bw / bh)) { //space will be left on height, use width as limit - aspectratio = bw/fullw; + aspectratio = bw / fullw; } else { - aspectratio = bh/fullh; + aspectratio = bh / fullh; } newtilew = aspectratio * floatw; newtileh = aspectratio * floath; - return QSize((short)newtilew, (short)newtileh); + return QSize(static_cast<short>(newtilew), static_cast<short>(newtileh)); } bool KMahjonggTileset::loadDefault() { - QString idx = QLatin1String( "default.desktop" ); + QString idx = QLatin1String("default.desktop"); QString tilesetPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kmahjongglib/tilesets/" + idx); qCDebug(LIBKMAHJONGG_LOG) << "Inside LoadDefault(), located path at" << tilesetPath; @@ -131,7 +150,7 @@ return loadTileset(tilesetPath); } -QString KMahjonggTileset::authorProperty(const QString &key) const +QString KMahjonggTileset::authorProperty(const QString & key) const { return d->authorproperties[key]; } @@ -158,12 +177,12 @@ short KMahjonggTileset::qWidth() const { - return (short) (d->scaleddata.fw / 2.0); + return static_cast<short>(d->scaleddata.fw / 2.0); } short KMahjonggTileset::qHeight() const { - return (short) (d->scaleddata.fh / 2.0); + return static_cast<short>(d->scaleddata.fh / 2.0); } QString KMahjonggTileset::path() const @@ -174,10 +193,8 @@ #define kTilesetVersionFormat 1 // --------------------------------------------------------- -bool KMahjonggTileset::loadTileset( const QString & tilesetPath) +bool KMahjonggTileset::loadTileset(const QString & tilesetPath) { - - QImage qiTiles; //qCDebug(LIBKMAHJONGG_LOG) << "Attempting to load .desktop at" << tilesetPath; //clear our properties map @@ -186,20 +203,20 @@ // verify if it is a valid file first and if we can open it QFile tilesetfile(tilesetPath); if (!tilesetfile.open(QIODevice::ReadOnly)) { - return (false); + return false; } tilesetfile.close(); KConfig tileconfig(tilesetPath, KConfig::SimpleConfig); KConfigGroup group = tileconfig.group("KMahjonggTileset"); - d->authorproperties.insert(QLatin1String( "Name" ), group.readEntry("Name"));// Returns translated data - d->authorproperties.insert(QLatin1String( "Author" ), group.readEntry("Author")); - d->authorproperties.insert(QLatin1String( "Description" ), group.readEntry("Description")); - d->authorproperties.insert(QLatin1String( "AuthorEmail" ), group.readEntry("AuthorEmail")); + d->authorproperties.insert(QLatin1String("Name"), group.readEntry("Name")); // Returns translated data + d->authorproperties.insert(QLatin1String("Author"), group.readEntry("Author")); + d->authorproperties.insert(QLatin1String("Description"), group.readEntry("Description")); + d->authorproperties.insert(QLatin1String("AuthorEmail"), group.readEntry("AuthorEmail")); //Version control - int tileversion = group.readEntry("VersionFormat",0); + int tileversion = group.readEntry("VersionFormat", 0); //Format is increased when we have incompatible changes, meaning that older clients are not able to use the remaining information safely if (tileversion > kTilesetVersionFormat) { return false; @@ -209,11 +226,12 @@ d->graphicspath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kmahjongglib/tilesets/" + graphName); //qCDebug(LIBKMAHJONGG_LOG) << "Using tileset at" << d->graphicspath; - //d->filename = graphicsPath; //only SVG for now d->isSVG = true; - if (d->graphicspath.isEmpty()) return (false); + if (d->graphicspath.isEmpty()) { + return false; + } d->originaldata.w = group.readEntry("TileWidth", 30); d->originaldata.h = group.readEntry("TileHeight", 50); @@ -226,31 +244,15 @@ d->graphicsLoaded = false; d->filename = tilesetPath; - /* if (d->isSVG) { - //really? - d->svg.load(graphicsPath); - if (d->svg.isValid()) { - d->filename = tilesetPath; - //invalidate our global cache - QPixmapCache::clear(); - - d->isSVG = true; - reloadTileset(QSize(d->originaldata.w, d->originaldata.h)); - } else { - return( false ); - } - } else { - //TODO add support for png?? - return false; - }*/ - - return( true ); + return true; } // --------------------------------------------------------- bool KMahjonggTileset::loadGraphics() { - if (d->graphicsLoaded == true) return (true) ; + if (d->graphicsLoaded) { + return true; + } if (d->isSVG) { //really? d->svg.load(d->graphicspath); @@ -260,79 +262,82 @@ d->graphicsLoaded = true; reloadTileset(QSize(d->originaldata.w, d->originaldata.h)); } else { - return( false ); + return false; } } else { //TODO add support for png?? return false; } - return( true ); + return true; } // --------------------------------------------------------- -bool KMahjonggTileset::reloadTileset( const QSize & newTilesize) +bool KMahjonggTileset::reloadTileset(const QSize & newTilesize) { - QString tilesetPath = d->filename; - - if (QSize(d->scaleddata.w, d->scaleddata.h) == newTilesize) return false; + if (QSize(d->scaleddata.w, d->scaleddata.h) == newTilesize) { + return false; + } if (d->isSVG) { if (d->svg.isValid()) { updateScaleInfo(newTilesize.width(), newTilesize.height()); //rendering will be done when needed, automatically using the global cache } else { - return( false ); + return false; } } else { //TODO add support for png??? return false; } - return( true ); + return true; } -void KMahjonggTileset::buildElementIdTable() { +void KMahjonggTileset::buildElementIdTable() +{ //Build a list for faster lookup of element ids, mapped to the enumeration used by GameData and BoardWidget //Unselected tiles - for (short idx=1; idx<=4; idx++) { - d->elementIdTable.append(QString::fromLatin1( "TILE_%1").arg(idx)); + for (short idx = 1; idx <= 4; idx++) { + d->elementIdTable.append(QString::fromLatin1("TILE_%1").arg(idx)); } //Selected tiles - for (short idx=1; idx<=4; idx++) { - d->elementIdTable.append(QString::fromLatin1( "TILE_%1_SEL").arg(idx)); + for (short idx = 1; idx <= 4; idx++) { + d->elementIdTable.append(QString::fromLatin1("TILE_%1_SEL").arg(idx)); } //now faces - for (short idx=1; idx<=9; idx++) { - d->elementIdTable.append(QString::fromLatin1( "CHARACTER_%1").arg(idx)); + for (short idx = 1; idx <= 9; idx++) { + d->elementIdTable.append(QString::fromLatin1("CHARACTER_%1").arg(idx)); } - for (short idx=1; idx<=9; idx++) { - d->elementIdTable.append(QString::fromLatin1( "BAMBOO_%1").arg(idx)); + for (short idx = 1; idx <= 9; idx++) { + d->elementIdTable.append(QString::fromLatin1("BAMBOO_%1").arg(idx)); } - for (short idx=1; idx<=9; idx++) { - d->elementIdTable.append(QString::fromLatin1( "ROD_%1").arg(idx)); + for (short idx = 1; idx <= 9; idx++) { + d->elementIdTable.append(QString::fromLatin1("ROD_%1").arg(idx)); } - for (short idx=1; idx<=4; idx++) { - d->elementIdTable.append(QString::fromLatin1( "SEASON_%1").arg(idx)); + for (short idx = 1; idx <= 4; idx++) { + d->elementIdTable.append(QString::fromLatin1("SEASON_%1").arg(idx)); } - for (short idx=1; idx<=4; idx++) { - d->elementIdTable.append(QString::fromLatin1( "WIND_%1").arg(idx)); + for (short idx = 1; idx <= 4; idx++) { + d->elementIdTable.append(QString::fromLatin1("WIND_%1").arg(idx)); } - for (short idx=1; idx<=3; idx++) { - d->elementIdTable.append(QString::fromLatin1( "DRAGON_%1").arg(idx)); + for (short idx = 1; idx <= 3; idx++) { + d->elementIdTable.append(QString::fromLatin1("DRAGON_%1").arg(idx)); } - for (short idx=1; idx<=4; idx++) { - d->elementIdTable.append(QString::fromLatin1( "FLOWER_%1").arg(idx)); + for (short idx = 1; idx <= 4; idx++) { + d->elementIdTable.append(QString::fromLatin1("FLOWER_%1").arg(idx)); } } -QString KMahjonggTileset::pixmapCacheNameFromElementId(const QString & elementid) { - return authorProperty(QLatin1String( "Name" ))+ elementid + QString::fromLatin1( "W%1H%2").arg(d->scaleddata.w).arg(d->scaleddata.h); +QString KMahjonggTileset::pixmapCacheNameFromElementId(const QString & elementid) +{ + return authorProperty(QLatin1String("Name")) + elementid + QString::fromLatin1("W%1H%2").arg(d->scaleddata.w).arg(d->scaleddata.h); } -QPixmap KMahjonggTileset::renderElement(short width, short height, const QString & elementid) { - ////qCDebug(LIBKMAHJONGG_LOG) << "render element" << elementid << width << height; - QImage qiRend(QSize(width, height),QImage::Format_ARGB32_Premultiplied); +QPixmap KMahjonggTileset::renderElement(short width, short height, const QString & elementid) +{ + //qCDebug(LIBKMAHJONGG_LOG) << "render element" << elementid << width << height; + QImage qiRend(QSize(width, height), QImage::Format_ARGB32_Premultiplied); qiRend.fill(0); if (d->svg.isValid()) { @@ -342,9 +347,10 @@ return QPixmap::fromImage(qiRend); } -QPixmap KMahjonggTileset::selectedTile(int num) { +QPixmap KMahjonggTileset::selectedTile(int num) +{ QPixmap pm; - QString elemId = d->elementIdTable.at(num+4);//selected offset in our idtable; + QString elemId = d->elementIdTable.at(num + 4); //selected offset in our idtable; if (!QPixmapCache::find(pixmapCacheNameFromElementId(elemId), &pm)) { //use tile size pm = renderElement(d->scaleddata.w, d->scaleddata.h, elemId); @@ -353,7 +359,8 @@ return pm; } -QPixmap KMahjonggTileset::unselectedTile(int num) { +QPixmap KMahjonggTileset::unselectedTile(int num) +{ QPixmap pm; QString elemId = d->elementIdTable.at(num); if (!QPixmapCache::find(pixmapCacheNameFromElementId(elemId), &pm)) { @@ -364,14 +371,15 @@ return pm; } -QPixmap KMahjonggTileset::tileface(int num) { +QPixmap KMahjonggTileset::tileface(int num) +{ QPixmap pm; if ((num + 8) >= d->elementIdTable.count()) { //qCDebug(LIBKMAHJONGG_LOG) << "Client asked for invalid tileface id"; return pm; } - QString elemId = d->elementIdTable.at(num + 8);//tileface offset in our idtable; + QString elemId = d->elementIdTable.at(num + 8); //tileface offset in our idtable; if (!QPixmapCache::find(pixmapCacheNameFromElementId(elemId), &pm)) { //use face size pm = renderElement(d->scaleddata.fw, d->scaleddata.fh, elemId); @@ -379,4 +387,3 @@ } return pm; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggtileset.h new/libkmahjongg-16.08.0/kmahjonggtileset.h --- old/libkmahjongg-16.04.3/kmahjonggtileset.h 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggtileset.h 2016-08-07 14:15:56.000000000 +0200 @@ -17,45 +17,47 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _KMAHJONGGTILESET_H_ -#define _KMAHJONGGTILESET_H_ +#ifndef KMAHJONGGTILESET_H +#define KMAHJONGGTILESET_H -#include <QtCore/QString> -#include <QtGui/QPixmap> +// Qt +#include <QString> +#include <QPixmap> +// LibKMahjongg #include <libkmahjongg_export.h> class KMahjonggTilesetPrivate; class LIBKMAHJONGG_EXPORT KMahjonggTileset { public: - KMahjonggTileset(); - ~KMahjonggTileset(); + KMahjonggTileset(); + ~KMahjonggTileset(); - bool loadDefault(); - bool loadTileset(const QString & tilesetPath); - bool loadGraphics(); - bool reloadTileset(const QSize & newTilesize); - QSize preferredTileSize(const QSize & boardsize, int horizontalCells, int verticalCells); - QString authorProperty(const QString &key) const; - - short width() const; - short height() const; - short levelOffsetX() const; - short levelOffsetY() const; - short qWidth() const; - short qHeight() const; - QString path() const; - - QPixmap selectedTile(int num); - QPixmap unselectedTile(int num); - QPixmap tileface(int num); - - protected: - void updateScaleInfo(short tilew, short tileh); - void buildElementIdTable(void); - QString pixmapCacheNameFromElementId(const QString & elementid); - QPixmap renderElement(short width, short height, const QString & elementid); + bool loadDefault(); + bool loadTileset(const QString & tilesetPath); + bool loadGraphics(); + bool reloadTileset(const QSize & newTilesize); + QSize preferredTileSize(const QSize & boardsize, int horizontalCells, int verticalCells); + QString authorProperty(const QString &key) const; + + short width() const; + short height() const; + short levelOffsetX() const; + short levelOffsetY() const; + short qWidth() const; + short qHeight() const; + QString path() const; + + QPixmap selectedTile(int num); + QPixmap unselectedTile(int num); + QPixmap tileface(int num); + +protected: + void updateScaleInfo(short tilew, short tileh); + void buildElementIdTable(void); + QString pixmapCacheNameFromElementId(const QString & elementid); + QPixmap renderElement(short width, short height, const QString & elementid); private: @@ -65,4 +67,4 @@ Q_DISABLE_COPY(KMahjonggTileset) }; -#endif +#endif // KMAHJONGGTILESET_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggtilesetselector.cpp new/libkmahjongg-16.08.0/kmahjonggtilesetselector.cpp --- old/libkmahjongg-16.04.3/kmahjonggtilesetselector.cpp 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggtilesetselector.cpp 2016-08-07 14:15:56.000000000 +0200 @@ -16,17 +16,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +// own #include "kmahjonggtilesetselector.h" -#include <KLocalizedString> -#include <QPainter> -#include <qstandardpaths.h> +// Qt #include <QDir> +#include <QPainter> +#include <QStandardPaths> +// KDE +#include <KLocalizedString> + +// LibKMahjongg #include "kmahjonggtileset.h" -KMahjonggTilesetSelector::KMahjonggTilesetSelector( QWidget* parent, KConfigSkeleton * aconfig ) - : QWidget( parent ) +KMahjonggTilesetSelector::KMahjonggTilesetSelector(QWidget * parent, KConfigSkeleton * aconfig) + : QWidget(parent) { setupUi(this); setupData(aconfig); @@ -34,7 +39,7 @@ KMahjonggTilesetSelector::~KMahjonggTilesetSelector() { - tilesetMap.clear(); + tilesetMap.clear(); } void KMahjonggTilesetSelector::setupData(KConfigSkeleton * aconfig) @@ -53,24 +58,23 @@ //Now get our tilesets into a list QStringList tilesAvailable; const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "kmahjongglib/tilesets", QStandardPaths::LocateDirectory); - Q_FOREACH (const QString& dir, dirs) { + Q_FOREACH (const QString & dir, dirs) { const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.desktop")); - Q_FOREACH (const QString& file, fileNames) { + Q_FOREACH (const QString & file, fileNames) { tilesAvailable.append(dir + '/' + file); } } QLatin1String namestr("Name"); int numvalidentries = 0; - for (int i = 0; i < tilesAvailable.size(); ++i) - { + for (int i = 0; i < tilesAvailable.size(); ++i) { KMahjonggTileset * aset = new KMahjonggTileset(); QString atileset = tilesAvailable.at(i); if (aset->loadTileset(atileset)) { tilesetMap.insert(aset->authorProperty(namestr), aset); tilesetList->addItem(aset->authorProperty(namestr)); //Find if this is our currently configured Tileset - if (atileset==initialGroup) { + if (atileset == initialGroup) { //Select current entry tilesetList->setCurrentRow(numvalidentries); tilesetChanged(); @@ -88,8 +92,10 @@ { KMahjonggTileset * selTileset = tilesetMap.value(tilesetList->currentItem()->text()); //Sanity checkings. Should not happen. - if (!selTileset) return; - if (selTileset->path()==kcfg_TileSet->text()) { + if (selTileset == nullptr) { + return; + } + if (selTileset->path() == kcfg_TileSet->text()) { return; } QLatin1String authstr("Author"); @@ -101,22 +107,21 @@ tilesetDescription->setText(selTileset->authorProperty(descstr)); //Make sure SVG is loaded when graphics is selected - if (!selTileset->loadGraphics()) return; + if (!selTileset->loadGraphics()) { + return; + } //Let the tileset calculate its ideal size for the preview area, but reduce the margins a bit (pass oversized drawing area) - QSize tilesize = selTileset->preferredTileSize(tilesetPreview->size()*1.3, 1, 1); + QSize tilesize = selTileset->preferredTileSize(tilesetPreview->size() * 1.3, 1, 1); selTileset->reloadTileset(tilesize); //Draw the preview - QImage qiRend(tilesetPreview->size(),QImage::Format_ARGB32_Premultiplied); + QImage qiRend(tilesetPreview->size(), QImage::Format_ARGB32_Premultiplied); qiRend.fill(0); QPainter p(&qiRend); //Calculate the margins to center the tile QSize margin = tilesetPreview->size() - tilesize; //Draw unselected tile and first tileface - p.drawPixmap(margin.width()/2, margin.height()/2, selTileset->unselectedTile(1)); - p.drawPixmap(margin.width()/2, margin.height()/2, selTileset->tileface(0)); + p.drawPixmap(margin.width() / 2, margin.height() / 2, selTileset->unselectedTile(1)); + p.drawPixmap(margin.width() / 2, margin.height() / 2, selTileset->tileface(0)); p.end(); tilesetPreview->setPixmap(QPixmap::fromImage(qiRend)); - } - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/kmahjonggtilesetselector.h new/libkmahjongg-16.08.0/kmahjonggtilesetselector.h --- old/libkmahjongg-16.04.3/kmahjonggtilesetselector.h 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/kmahjonggtilesetselector.h 2016-08-07 14:15:56.000000000 +0200 @@ -16,11 +16,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __LIB_KMAHJONGGTILESETSELECTOR_H_ -#define __LIB_KMAHJONGGTILESETSELECTOR_H_ +#ifndef KMAHJONGGTILESETSELECTOR_H +#define KMAHJONGGTILESETSELECTOR_H +// Qt #include <QMap> + +// KDE #include <KConfigSkeleton> + +// LibKMahjongg #include "ui_kmahjonggtilesetselector.h" class KMahjonggTileset; @@ -29,13 +34,13 @@ { Q_OBJECT public: - explicit KMahjonggTilesetSelector( QWidget* parent, KConfigSkeleton * config ); + explicit KMahjonggTilesetSelector( QWidget* parent, KConfigSkeleton * aconfig ); ~KMahjonggTilesetSelector(); - void setupData(KConfigSkeleton * config); + void setupData(KConfigSkeleton * aconfig); QMap<QString, KMahjonggTileset *> tilesetMap; public slots: void tilesetChanged(); }; -#endif // __LIB_KMAHJONGGTILESETSELECTOR_H_ +#endif // KMAHJONGGTILESETSELECTOR_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/libkmahjongg_debug.cpp new/libkmahjongg-16.08.0/libkmahjongg_debug.cpp --- old/libkmahjongg-16.04.3/libkmahjongg_debug.cpp 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/libkmahjongg_debug.cpp 2016-08-07 14:15:56.000000000 +0200 @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ +// own #include "libkmahjongg_debug.h" -Q_LOGGING_CATEGORY(LIBKMAHJONGG_LOG, "log_libkmahjongg") - +Q_LOGGING_CATEGORY(LIBKMAHJONGG_LOG, "log_libkmahjongg") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-16.04.3/tilesets/CMakeLists.txt new/libkmahjongg-16.08.0/tilesets/CMakeLists.txt --- old/libkmahjongg-16.04.3/tilesets/CMakeLists.txt 2016-03-25 14:05:11.000000000 +0100 +++ new/libkmahjongg-16.08.0/tilesets/CMakeLists.txt 2016-08-07 14:15:56.000000000 +0200 @@ -1,36 +1,36 @@ ##default -install( FILES default.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES default.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES default.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) +install(FILES default.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES default.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES default.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) ##classic -install( FILES classic.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES classic.svg DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES classic.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) +install(FILES classic.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES classic.svg DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES classic.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) ##bamboo -#install( FILES bamboo.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -#install( FILES bamboo.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -#install( FILES bamboo.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) +#install(FILES bamboo.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +#install(FILES bamboo.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +#install(FILES bamboo.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) ##traditional -install( FILES traditional.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES traditional.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES traditional.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) +install(FILES traditional.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES traditional.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES traditional.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) ##alphabet -install( FILES alphabet.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES alphabet.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES alphabet.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) +install(FILES alphabet.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES alphabet.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES alphabet.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) ##egypt -install( FILES egypt.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES egypt.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES egypt.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) +install(FILES egypt.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES egypt.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES egypt.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) ##Jade -install( FILES jade.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES jade.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) -install( FILES jade.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/ ) +install(FILES jade.desktop DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES jade.svgz DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/) +install(FILES jade.copyright DESTINATION ${DATA_INSTALL_DIR}/kmahjongglib/tilesets/)

1 0

commit libkeduvocdocument for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package libkeduvocdocument for openSUSE:Factory checked in at 2016-08-31 00:08:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkeduvocdocument (Old) and /work/SRC/openSUSE:Factory/.libkeduvocdocument.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkeduvocdocument" Changes: -------- --- /work/SRC/openSUSE:Factory/libkeduvocdocument/libkeduvocdocument.changes 2016-07-24 19:49:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkeduvocdocument.new/libkeduvocdocument.changes 2016-08-31 00:09:02.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:29:00 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:41:39 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- libkeduvocdocument-16.04.3.tar.xz New: ---- libkeduvocdocument-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkeduvocdocument.spec ++++++ --- /var/tmp/diff_new_pack.aMEjR4/_old 2016-08-31 00:09:03.000000000 +0200 +++ /var/tmp/diff_new_pack.aMEjR4/_new 2016-08-31 00:09:03.000000000 +0200 @@ -17,7 +17,7 @@ Name: libkeduvocdocument -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Library for KDE Education Applications License: GPL-2.0+ ++++++ libkeduvocdocument-16.04.3.tar.xz -> libkeduvocdocument-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/.gitignore new/libkeduvocdocument-16.08.0/.gitignore --- old/libkeduvocdocument-16.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/.gitignore 2016-06-16 21:58:51.000000000 +0200 @@ -0,0 +1,3 @@ +build/ +libkeduvocdocument.kdev4 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/autotests/CMakeLists.txt new/libkeduvocdocument-16.08.0/keduvocdocument/autotests/CMakeLists.txt --- old/libkeduvocdocument-16.04.3/keduvocdocument/autotests/CMakeLists.txt 2016-02-18 08:51:38.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/autotests/CMakeLists.txt 2016-06-16 21:58:51.000000000 +0200 @@ -18,6 +18,8 @@ # keduvocdocumentvalidatortest # keduvocdocumentfilelockingtest # openAPItest + keduvocdocumenttest + emptydocumenttest ) #Unit Tests linked to objects behind the API wall @@ -64,5 +66,5 @@ endmacro() -keduvocdocument_gui_unit_tests(keduvocdocument ${kvocdoc_api_unittests}) +keduvocdocument_non_gui_unit_tests(KEduVocDocument ${kvocdoc_api_unittests}) keduvocdocument_gui_unit_tests_static(keduvocdocument_static ${kvocdoc_unittests}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/autotests/emptydocumenttest.cpp new/libkeduvocdocument-16.08.0/keduvocdocument/autotests/emptydocumenttest.cpp --- old/libkeduvocdocument-16.04.3/keduvocdocument/autotests/emptydocumenttest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/autotests/emptydocumenttest.cpp 2016-06-16 21:58:51.000000000 +0200 @@ -0,0 +1,50 @@ +/*************************************************************************** + * Copyright (C) 2016 by Hartmut Riesenbeck <hartmut.riesenbeck(a)gmx.de> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + +#include "emptydocumenttest.h" + +#include "keduvocdocument.h" +#include <QTest> + +namespace EmptyDocumentTests{ + +QString EmptyDocumentTest::sm_cappturedMessageOutput = QString(); + +void EmptyDocumentTest::testConstuctionDestruction() +{ + sm_cappturedMessageOutput.clear(); + QtMessageHandler previouMsgHandler = qInstallMessageHandler(captureMessageOutput); + KEduVocDocument *doc = new KEduVocDocument; + delete doc; + qInstallMessageHandler(previouMsgHandler); + + QCOMPARE(sm_cappturedMessageOutput, QString()); +} + +void EmptyDocumentTest::captureMessageOutput(QtMsgType /*type*/, const QMessageLogContext &/*context*/, const QString &msg) +{ + sm_cappturedMessageOutput = msg; +} + +} + +QTEST_MAIN(EmptyDocumentTests::EmptyDocumentTest) + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/autotests/emptydocumenttest.h new/libkeduvocdocument-16.08.0/keduvocdocument/autotests/emptydocumenttest.h --- old/libkeduvocdocument-16.04.3/keduvocdocument/autotests/emptydocumenttest.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/autotests/emptydocumenttest.h 2016-06-16 21:58:51.000000000 +0200 @@ -0,0 +1,48 @@ +/*************************************************************************** + * Copyright (C) 2016 by Hartmut Riesenbeck <hartmut.riesenbeck(a)gmx.de> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + +#ifndef EMPTYDOCUMENTTEST_H +#define EMPTYDOCUMENTTEST_H + +#include <QObject> + +namespace EmptyDocumentTests { +/** @file + * \brief Empty KEduVocDocument test application + * The creation and destruction of a default constructed KEduVocDocument object shouldn't + * give any error message on stderr. + * @author Hartmut Riesenbeck <hartmut.riesenbeck(a)gmx.de> + */ + +class EmptyDocumentTest : public QObject +{ +Q_OBJECT + +private slots: + void testConstuctionDestruction(); + +private: + static void captureMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg); + +private: + static QString sm_cappturedMessageOutput; +}; +} + +#endif // EMPTYDOCUMENTTEST_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/autotests/keduvocdocumenttest.cpp new/libkeduvocdocument-16.08.0/keduvocdocument/autotests/keduvocdocumenttest.cpp --- old/libkeduvocdocument-16.04.3/keduvocdocument/autotests/keduvocdocumenttest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/autotests/keduvocdocumenttest.cpp 2016-06-16 21:58:51.000000000 +0200 @@ -0,0 +1,126 @@ +/*************************************************************************** + * Copyright (C) 2016 by Hartmut Riesenbeck <hartmut.riesenbeck(a)gmx.de> * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + +#include "keduvocdocument.h" +#include <QTemporaryFile> +#include <QTest> + +namespace KEduVocDocumentTests { +/** @file + * \brief Various KEduVocDocument tests + * This test class contends various tests for public KEduVocDocument methods. + * They are used to proof expected behavior before and after apply changes to the tested methods. + * @author Hartmut Riesenbeck <hartmut.riesenbeck(a)gmx.de> + */ + +class KEduVocDocumentTest : public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + void testDetectFileType(); + void testOpen(); + +private: + void createTmpTestFileOfType(KEduVocDocument::FileType fileType); + QString tmpTestFileName() const; + QUrl tmpTestFileUrl() const; + +private: + QTemporaryFile m_tempTestFile; + KEduVocDocument m_documentTemplate; +}; + +void KEduVocDocumentTest::initTestCase() +{ + if (!m_tempTestFile.open()) { + QFAIL("Temporary test file could not be created."); + return; + } + m_tempTestFile.close(); + + KEduVocIdentifier lang; + lang.setName(QStringLiteral("KEduVocDocument Language Name")); + lang.setLocale(QStringLiteral("en")); + + m_documentTemplate.setAuthor(QStringLiteral("KEduVocDocument Tests")); + m_documentTemplate.appendIdentifier(lang); + m_documentTemplate.setGenerator(QStringLiteral("KEduVocDocument Unit Tests")); +} + +void KEduVocDocumentTest::testDetectFileType() +{ + KEduVocDocument::FileType resultFileType(KEduVocDocument::KvdNone); + + createTmpTestFileOfType(KEduVocDocument::Kvtml); + resultFileType = KEduVocDocument::detectFileType(tmpTestFileName()); + QCOMPARE(resultFileType, KEduVocDocument::Kvtml); + + createTmpTestFileOfType(KEduVocDocument::Csv); + resultFileType = KEduVocDocument::detectFileType(tmpTestFileName()); + QCOMPARE(resultFileType, KEduVocDocument::Csv); +} + +void KEduVocDocumentTest::testOpen() +{ + KEduVocDocument::ErrorCode openResult(KEduVocDocument::NoError); + + createTmpTestFileOfType(KEduVocDocument::Kvtml); + KEduVocDocument docKvtml; + openResult = docKvtml.open(tmpTestFileUrl(), KEduVocDocument::FileOpenReadOnly); + QCOMPARE(openResult, KEduVocDocument::NoError); + + createTmpTestFileOfType(KEduVocDocument::Csv); + KEduVocDocument docCsv; + openResult = docCsv.open(tmpTestFileUrl(), KEduVocDocument::FileOpenReadOnly); + QCOMPARE(openResult, KEduVocDocument::NoError); +} + +void KEduVocDocumentTest::createTmpTestFileOfType(KEduVocDocument::FileType fileType) +{ + KEduVocDocument::ErrorCode result = m_documentTemplate.saveAs(tmpTestFileUrl(), fileType); + if (result != KEduVocDocument::NoError) { + QStringList errorStrings = QStringList() << "NoError" << "Unknown" << "InvalidXml" + << "FileTypeUnknown" << "FileCannotWrite" << "FileWriterFailed" << "FileCannotRead" + << "FileReaderFailed"<< "FileDoesNotExist" << "FileLocked" << "FileCannotLock" + << "FileIsReadOnly"; + QString failText =QString("Temporary test file could not be saved. (Error code = %1)"); + failText = failText.arg(errorStrings.value(result)); + QFAIL(failText.toLocal8Bit().constData()); + } +} + +QString KEduVocDocumentTest::tmpTestFileName() const +{ + return m_tempTestFile.fileName(); +} + +QUrl KEduVocDocumentTest::tmpTestFileUrl() const +{ + return QUrl::fromLocalFile(m_tempTestFile.fileName()); +} + +} + +QTEST_MAIN(KEduVocDocumentTests::KEduVocDocumentTest) + +#include "keduvocdocumenttest.moc" + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/keduvocdocument.cpp new/libkeduvocdocument-16.08.0/keduvocdocument/keduvocdocument.cpp --- old/libkeduvocdocument-16.04.3/keduvocdocument/keduvocdocument.cpp 2016-02-18 08:51:38.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/keduvocdocument.cpp 2016-06-16 21:58:51.000000000 +0200 @@ -130,9 +130,6 @@ delete m_lessonContainer; delete m_wordTypeContainer; delete m_leitnerContainer; - - m_autosave->remove(); - m_autosave->releaseLock(); delete m_autosave; } @@ -217,33 +214,32 @@ } -KEduVocDocument::FileType KEduVocDocument::detectFileType( const QString &fileName ) +KEduVocDocument::FileType KEduVocDocument::detectFileType(const QString &fileName) { - QIODevice * f = KFilterDev::deviceForFile( fileName ); - f->open( QIODevice::ReadOnly ); + KFilterDev f(fileName); + f.open(QIODevice::ReadOnly); - ReaderManager::ReaderPtr reader( ReaderManager::reader( *f ) ); + ReaderManager::ReaderPtr reader(ReaderManager::reader(f)); - f->close(); - delete f; + f.close(); return reader->fileTypeHandled(); } -KEduVocDocument::ErrorCode KEduVocDocument::open( const QUrl& url, FileHandlingFlags flags) +KEduVocDocument::ErrorCode KEduVocDocument::open(const QUrl &url, FileHandlingFlags flags) { // save csv delimiter to preserve it in case this is a csv document QString csv = d->m_csvDelimiter; // clear all other properties d->init(); - if ( !url.isEmpty() ) { - setUrl( url ); + if (!url.isEmpty()) { + setUrl(url); } d->m_csvDelimiter = csv; KEduVocDocument::ErrorCode errStatus = Unknown; - QString errorMessage = i18n( "<qt>Cannot open file %1</qt>", url.toDisplayString() ); + QString errorMessage = i18n("<qt>Cannot open file %1</qt>", url.toDisplayString()); QString temporaryFile; QTemporaryFile tempFile; @@ -263,36 +259,35 @@ } if (flags & FileOpenReadOnly) { - d->m_isReadOnly = true; + d->m_isReadOnly = true; } ErrorCode autosaveError = NoError; if (!d->m_isReadOnly) { - autosaveError = d->initializeKAutoSave( *d->m_autosave, temporaryFile, flags ); - if (autosaveError != NoError) { - return autosaveError; - } + autosaveError = d->initializeKAutoSave(*d->m_autosave, temporaryFile, flags); + if (autosaveError != NoError) { + return autosaveError; + } } - QIODevice * f = KFilterDev::deviceForFile( temporaryFile ); - if ( f->open( QIODevice::ReadOnly ) ) { + KFilterDev f(temporaryFile); + if (f.open(QIODevice::ReadOnly)) { - ReaderManager::ReaderPtr reader( ReaderManager::reader( *f ) ); - errStatus = reader->read( *this ); + ReaderManager::ReaderPtr reader(ReaderManager::reader(f)); + errStatus = reader->read(*this); - if ( errStatus != KEduVocDocument::NoError ) { - errorMessage = i18n( "Could not open or properly read \"%1\"\n(Error reported: %2)" - , url.toDisplayString(), reader->errorMessage() ); + if (errStatus != KEduVocDocument::NoError) { + errorMessage = i18n("Could not open or properly read \"%1\"\n(Error reported: %2)" + , url.toDisplayString(), reader->errorMessage()); } } else { errStatus = FileCannotRead; } - f->close(); - delete f; + f.close(); - if ( errStatus == KEduVocDocument::NoError ) { + if (errStatus == KEduVocDocument::NoError) { setModified(false); } else { qWarning() << errorMessage; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/keduvocdocument.h new/libkeduvocdocument-16.08.0/keduvocdocument/keduvocdocument.h --- old/libkeduvocdocument-16.04.3/keduvocdocument/keduvocdocument.h 2016-02-18 08:51:38.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/keduvocdocument.h 2016-06-16 21:58:51.000000000 +0200 @@ -126,7 +126,7 @@ * @param flags How to handle expected unusual conditions (i.e. locking) * @returns ErrorCode */ - ErrorCode open( const QUrl& url, FileHandlingFlags flags = FileDefaultHandling); + ErrorCode open(const QUrl &url, FileHandlingFlags flags = FileDefaultHandling); /** * Close a document file and release the lock on the file @@ -395,7 +395,7 @@ * @param fileName filename * @return enum of filetype */ - static FileType detectFileType( const QString &fileName ); + static FileType detectFileType(const QString &fileName); /** * Create a string with the supported document types, that can be used diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/keduvockvtml2writer.cpp new/libkeduvocdocument-16.08.0/keduvocdocument/keduvockvtml2writer.cpp --- old/libkeduvocdocument-16.04.3/keduvocdocument/keduvockvtml2writer.cpp 2016-02-18 08:51:38.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/keduvockvtml2writer.cpp 2016-06-16 21:58:51.000000000 +0200 @@ -523,7 +523,7 @@ } // multiplechoice - if ( !translation->multipleChoice().isEmpty() ) { + if (!translation->getMultipleChoice().isEmpty()) { QDomElement multipleChoiceElement = m_domDoc.createElement( KVTML_MULTIPLECHOICE ); writeMultipleChoice( multipleChoiceElement, translation ); translationElement.appendChild( multipleChoiceElement ); @@ -595,7 +595,7 @@ </multiplechoice> */ { - foreach ( const QString &choice, translation->multipleChoice() ) { + foreach (const QString &choice, translation->getMultipleChoice()) { multipleChoiceElement.appendChild( newTextElement( KVTML_CHOICE, choice ) ); } return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/keduvoctranslation.cpp new/libkeduvocdocument-16.08.0/keduvocdocument/keduvoctranslation.cpp --- old/libkeduvocdocument-16.04.3/keduvocdocument/keduvoctranslation.cpp 2016-02-18 08:51:38.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/keduvoctranslation.cpp 2016-06-16 21:58:51.000000000 +0200 @@ -287,18 +287,39 @@ } -KEduVocConjugation& KEduVocTranslation::conjugation( const QString& tense ) +KEduVocConjugation& KEduVocTranslation::conjugation(const QString &tense) { return d->m_conjugations[tense]; } -QStringList & KEduVocTranslation::multipleChoice() +KEduVocConjugation KEduVocTranslation::getConjugation(const QString &tense) const +{ + if (d->m_conjugations.contains(tense)) { + return d->m_conjugations[tense]; + } + return KEduVocConjugation(); +} + + +QStringList& KEduVocTranslation::multipleChoice() +{ + return d->m_multipleChoice; +} + + +QStringList KEduVocTranslation::getMultipleChoice() const { return d->m_multipleChoice; } +void KEduVocTranslation::setMultipleChoice(const QStringList &choices) +{ + d->m_multipleChoice = choices; +} + + QString KEduVocTranslation::pronunciation() const { return d->m_pronunciation; @@ -503,7 +524,7 @@ // conjugation foreach ( const QString &tense, conjugationTenses() ) { QDomElement conjugationElement = parent.ownerDocument().createElement( KVTML_CONJUGATION ); - conjugation(tense).toKVTML2(conjugationElement, tense); + getConjugation(tense).toKVTML2(conjugationElement, tense); if (conjugationElement.hasChildNodes()) { parent.appendChild( conjugationElement ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/keduvoctranslation.h new/libkeduvocdocument-16.08.0/keduvocdocument/keduvoctranslation.h --- old/libkeduvocdocument-16.04.3/keduvocdocument/keduvoctranslation.h 2016-02-18 08:51:38.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/keduvoctranslation.h 2016-06-16 21:58:51.000000000 +0200 @@ -147,11 +147,19 @@ void setLeitnerBox( KEduVocLeitnerBox* leitnerBox ); /** + * This method is deprecated, please use @see getConjugation() @see setConjugation() * Returns a conjugation if available * @param tense tense of the requested conjugation * @return the conjugation */ - KEduVocConjugation& conjugation( const QString& tense ); + KEDUVOCDOCUMENT_DEPRECATED KEduVocConjugation& conjugation(const QString &tense); + + /** + * Returns a conjugation if available + * @param tense tense of the requested conjugation + * @return the conjugation + */ + KEduVocConjugation getConjugation(const QString &tense) const; /** adds conjugations or replaces them, if they exist. * @param conjugation conjugation @@ -202,14 +210,22 @@ KEduVocText article() const; void setArticle(const KEduVocText& article); - /** Returns multiple choice if available - */ - QStringList & multipleChoice(); + /** + * This method is deprecated, please use @see getMultipleChoice() @see setMultipleChoice() + * Returns multiple choice if available + */ + KEDUVOCDOCUMENT_DEPRECATED QStringList& multipleChoice(); + + /** + * Returns multiple choice if available + * @return list of multiple choice answers + */ + QStringList getMultipleChoice() const; /** Sets multiple choice - * @param mc multiple choice block - */ -// void setMultipleChoice( const QStringList &mc ); + * @param choices multiple choice block + */ + void setMultipleChoice(const QStringList &choices); /** Get the sound url for this translation if it exists */ QUrl soundUrl(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/readerwriters/keduvockvtml2reader.cpp new/libkeduvocdocument-16.08.0/keduvocdocument/readerwriters/keduvockvtml2reader.cpp --- old/libkeduvocdocument-16.04.3/keduvocdocument/readerwriters/keduvockvtml2reader.cpp 2016-02-18 08:51:38.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/readerwriters/keduvockvtml2reader.cpp 2016-06-16 21:58:51.000000000 +0200 @@ -700,7 +700,9 @@ { currentElement = choiceNodes.item( i ).toElement(); if ( currentElement.parentNode() == multipleChoiceElement ) { - translation->multipleChoice().append( currentElement.text() ); + QStringList choices = translation->getMultipleChoice(); + choices.append(currentElement.text()); + translation->setMultipleChoice(choices); } } return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkeduvocdocument-16.04.3/keduvocdocument/readerwriters/keduvockvtmlreader.cpp new/libkeduvocdocument-16.08.0/keduvocdocument/readerwriters/keduvockvtmlreader.cpp --- old/libkeduvocdocument-16.04.3/keduvocdocument/readerwriters/keduvockvtmlreader.cpp 2016-02-18 08:51:38.000000000 +0100 +++ new/libkeduvocdocument-16.08.0/keduvocdocument/readerwriters/keduvockvtmlreader.cpp 2016-06-16 21:58:51.000000000 +0200 @@ -337,7 +337,32 @@ nat_indef = ""; } - m_doc->identifier(i).setArticle( KEduVocArticle( fem_def, fem_indef, mal_def, mal_indef, nat_def, nat_indef ) ); + KEduVocArticle article; + article.setArticle( + mal_def, + KEduVocWordFlag::Singular | KEduVocWordFlag::Definite | KEduVocWordFlag::Masculine + ); + article.setArticle( + fem_def, + KEduVocWordFlag::Singular | KEduVocWordFlag::Definite | KEduVocWordFlag::Feminine + ); + article.setArticle( + nat_def, + KEduVocWordFlag::Singular | KEduVocWordFlag::Definite | KEduVocWordFlag::Neuter + ); + article.setArticle( + mal_indef, + KEduVocWordFlag::Singular | KEduVocWordFlag::Indefinite | KEduVocWordFlag::Masculine + ); + article.setArticle( + fem_indef, + KEduVocWordFlag::Singular | KEduVocWordFlag::Indefinite | KEduVocWordFlag::Feminine + ); + article.setArticle( + nat_indef, + KEduVocWordFlag::Singular | KEduVocWordFlag::Indefinite | KEduVocWordFlag::Neuter + ); + m_doc->identifier(i).setArticle(article); } } @@ -670,10 +695,10 @@ QDomElement currentElement; currentElement = domElementParent.firstChildElement( KV_COMP_L2 ); - translation->setComparative(currentElement.text()); + translation->setComparativeForm(currentElement.text()); currentElement = domElementParent.firstChildElement( KV_COMP_L3 ); - translation->setSuperlative(currentElement.text()); + translation->setSuperlativeForm(currentElement.text()); return true; } @@ -692,32 +717,35 @@ { QDomElement currentElement; + QStringList choices = translation->getMultipleChoice(); currentElement = domElementParent.firstChildElement( KV_MC_1 ); if ( !currentElement.isNull() ) { - translation->multipleChoice().append( currentElement.text() ); + choices.append(currentElement.text()); } currentElement = domElementParent.firstChildElement( KV_MC_2 ); if ( !currentElement.isNull() ) { - translation->multipleChoice().append( currentElement.text() ); + choices.append(currentElement.text()); } currentElement = domElementParent.firstChildElement( KV_MC_3 ); if ( !currentElement.isNull() ) { - translation->multipleChoice().append( currentElement.text() ); + choices.append(currentElement.text()); } currentElement = domElementParent.firstChildElement( KV_MC_4 ); if ( !currentElement.isNull() ) { - translation->multipleChoice().append( currentElement.text() ); + choices.append(currentElement.text()); } currentElement = domElementParent.firstChildElement( KV_MC_5 ); if ( !currentElement.isNull() ) { - translation->multipleChoice().append( currentElement.text() ); + choices.append(currentElement.text()); } + translation->setMultipleChoice(choices); + return true; }

1 0

commit libkdegames for openSUSE:Factory
by root＠hilbert.suse.de 30 Aug '16

30 Aug '16

Hello community, here is the log from the commit of package libkdegames for openSUSE:Factory checked in at 2016-08-31 00:08:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkdegames (Old) and /work/SRC/openSUSE:Factory/.libkdegames.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkdegames" Changes: -------- --- /work/SRC/openSUSE:Factory/libkdegames/libkdegames.changes 2016-07-24 19:52:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkdegames.new/libkdegames.changes 2016-08-31 00:08:58.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:28:50 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 15:41:08 UTC 2016 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- libkdegames-16.04.3.tar.xz New: ---- libkdegames-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkdegames.spec ++++++ --- /var/tmp/diff_new_pack.Ldhbib/_old 2016-08-31 00:08:59.000000000 +0200 +++ /var/tmp/diff_new_pack.Ldhbib/_new 2016-08-31 00:08:59.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: libkdegames-%{version}.tar.xz Patch1: libkdegames-bnc793185.patch ++++++ libkdegames-16.04.3.tar.xz -> libkdegames-16.08.0.tar.xz ++++++ ++++ 2533 lines of diff (skipped)

1 0