Hello community, here is the log from the commit of package palapeli for openSUSE:Factory checked in at 2014-07-16 16:18:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-06-24 15:15:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.palapeli.new/palapeli.changes 2014-07-16 16:19:13.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 10 22:20:48 UTC 2014 - [email protected] + +- Update to 4.13.80 + * KDE 4.14 Beta 1 release + * See http://www.kde.org/announcements/announce-4.14-beta1.php + +------------------------------------------------------------------- Old: ---- palapeli-4.13.2.tar.xz New: ---- palapeli-4.13.80.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ palapeli.spec ++++++ --- /var/tmp/diff_new_pack.pYoy4x/_old 2014-07-16 16:19:14.000000000 +0200 +++ /var/tmp/diff_new_pack.pYoy4x/_new 2014-07-16 16:19:14.000000000 +0200 @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 4.13.2 +Version: 4.13.80 Release: 0 Source0: palapeli-%{version}.tar.xz BuildRequires: libkdegames-devel ++++++ palapeli-4.13.2.tar.xz -> palapeli-4.13.80.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-4.13.2/doc/index.docbook new/palapeli-4.13.80/doc/index.docbook --- old/palapeli-4.13.2/doc/index.docbook 2014-04-06 09:15:53.000000000 +0200 +++ new/palapeli-4.13.80/doc/index.docbook 2014-07-09 08:19:41.000000000 +0200 @@ -761,6 +761,10 @@ <listitem><para><action>Decrease the scale.</action></para></listitem> </varlistentry> <varlistentry> + <term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Enable all messages</guimenuitem></menuchoice></term> + <listitem><para><action>Allows you to enable all messages disabled by checking the <guilabel>Do not show this message again</guilabel> item in the &palapeli; confirmation dialogs.</action></para></listitem> + </varlistentry> + <varlistentry> <term><menuchoice><guimenu>Settings</guimenu><guimenuitem>Show statusbar of puzzle table</guimenuitem></menuchoice></term> <listitem><para><action>Toggle the display of the progress bar and buttons below the puzzle table.</action> This action will change nothing in the puzzle collection.</para></listitem> </varlistentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-4.13.2/slicers/goldberg/grid-voronoi.cpp new/palapeli-4.13.80/slicers/goldberg/grid-voronoi.cpp --- old/palapeli-4.13.2/slicers/goldberg/grid-voronoi.cpp 2014-04-06 09:15:53.000000000 +0200 +++ new/palapeli-4.13.80/slicers/goldberg/grid-voronoi.cpp 2014-07-09 08:19:41.000000000 +0200 @@ -122,6 +122,12 @@ } else { if (QLineF::BoundedIntersection == border.intersect(ridge, &new_p2)) { + // We have to set new_points_found > 1, in order to get + // endpoints cropped correctly in the case where both points are + // outside the frame, but the ridge passes through the frame. + // The lack of the next line was probably the cause of the + // crashes mentioned below + new_points_found = 2; // no need to search further break; } @@ -139,7 +145,9 @@ else { *p1 = new_p1; } - // sometimes there is a crash which probably comes from bad cropping. hoping to catch it with this. + // Sometimes there is a crash which probably comes from bad cropping. + // Hoping to catch it with this. + // Problem should be fixed now - SB qDebug() << "p1contained:" << p1_contained << " p1:" << *p1 << " p2:" << *p2; } else { @@ -390,9 +398,10 @@ bool ridge_oob = !crop_endpoints_to_frame(&p1, &p2, width, height); //qDebug() << "after crop: " << p1 << p2; - // add the cell with lower id to the neighbour list of the cell with higher id - // but only if none of both belongs to the "safety box" - if (cell1 < cells.size() && cell2 < cells.size()) { + // Add the cell with lower id to the neighbour list of the cell with + // higher id, but only if none of both belongs to the "safety box" + // and only if the ridge is not out of bounds. + if ( ! ridge_oob && cell1 < cells.size() && cell2 < cells.size()) { if (cell1 < cell2) { cells[cell2].neighbours.append(cell1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-4.13.2/src/engine/gameplay.cpp new/palapeli-4.13.80/src/engine/gameplay.cpp --- old/palapeli-4.13.2/src/engine/gameplay.cpp 2014-04-06 09:15:53.000000000 +0200 +++ new/palapeli-4.13.80/src/engine/gameplay.cpp 2014-07-09 08:19:41.000000000 +0200 @@ -299,8 +299,16 @@ return; //do deletion Palapeli::Collection* coll = Palapeli::Collection::instance(); - foreach (const QModelIndex& index, indexes) - coll->deletePuzzle(index); + + // We cannot simply use a foreach here, because after deleting the first + // puzzle, the rest of the indexes should no longer be used (model was + // modified). Ask again for the list of selected indexes after each + // step instead. + while (indexes.size() > 0) + { + coll->deletePuzzle(indexes.at(0)); + indexes = m_collectionView->selectedIndexes(); + } } void Palapeli::GamePlay::actionImport() -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
