commit palapeli for openSUSE:Factory
Hello community, here is the log from the commit of package palapeli for openSUSE:Factory checked in at 2014-01-27 11: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 2013-12-19 13:19:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.palapeli.new/palapeli.changes 2014-01-27 11:18:39.000000000 +0100 @@ -1,0 +2,7 @@ +Sat Jan 11 16:04:20 UTC 2014 - tittiatcoke@gmail.com + +- Update to 4.12.1 + * KDE 4.12.1 release + * See http://www.kde.org/announcements/announce-4.12.1.php + +------------------------------------------------------------------- Old: ---- palapeli-4.12.0.tar.xz New: ---- palapeli-4.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ palapeli.spec ++++++ --- /var/tmp/diff_new_pack.EiHpEG/_old 2014-01-27 11:18:40.000000000 +0100 +++ /var/tmp/diff_new_pack.EiHpEG/_new 2014-01-27 11:18:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package palapeli # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 4.12.0 +Version: 4.12.1 Release: 0 Source0: palapeli-%{version}.tar.xz BuildRequires: libkdegames-devel ++++++ palapeli-4.12.0.tar.xz -> palapeli-4.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-4.12.0/puzzles/panther-chameleon-female.desktop new/palapeli-4.12.1/puzzles/panther-chameleon-female.desktop --- old/palapeli-4.12.0/puzzles/panther-chameleon-female.desktop 2013-08-04 06:26:01.000000000 +0200 +++ new/palapeli-4.12.1/puzzles/panther-chameleon-female.desktop 2014-01-03 08:27:28.000000000 +0100 @@ -35,7 +35,7 @@ Name[sr@latin]=Panterski kameleon Name[sv]=Furcifer pardalis Name[tr]=Panter Bukalemun -Name[uk]=Самиця барса +Name[uk]=П’ятнистий хамелеон Name[x-test]=xxFurcifer pardalisxx Name[zh_CN]=变色龙 Name[zh_TW]=Furcifer pardalis diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-4.12.0/src/engine/scene.cpp new/palapeli-4.12.1/src/engine/scene.cpp --- old/palapeli-4.12.0/src/engine/scene.cpp 2013-08-04 06:26:01.000000000 +0200 +++ new/palapeli-4.12.1/src/engine/scene.cpp 2014-01-03 08:27:28.000000000 +0100 @@ -361,6 +361,9 @@ void Palapeli::Scene::restartPuzzle() { + if (!m_puzzle) { + return; // If no puzzle was successfully loaded and started. + } static const QString pathTemplate = QString::fromLatin1("collection/%1.save"); QFile(KStandardDirs::locateLocal("appdata", pathTemplate.arg(m_puzzle->identifier()))).remove(); //reload puzzle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/palapeli-4.12.0/src/window/mainwindow.cpp new/palapeli-4.12.1/src/window/mainwindow.cpp --- old/palapeli-4.12.0/src/window/mainwindow.cpp 2013-08-04 06:26:01.000000000 +0200 +++ new/palapeli-4.12.1/src/window/mainwindow.cpp 2014-01-03 08:27:28.000000000 +0100 @@ -111,6 +111,7 @@ //Restart puzzle (TODO: placed here only temporarily) KAction* restartPuzzleAct = new KAction(KIcon("view-refresh"), i18n("&Restart puzzle..."), 0); restartPuzzleAct->setToolTip(i18n("Delete the saved progress")); + restartPuzzleAct->setEnabled(false); //no puzzle in progress initially actionCollection()->addAction("game_restart", restartPuzzleAct); connect(restartPuzzleAct, SIGNAL(triggered()), m_puzzleTable->view()->scene(), SLOT(restartPuzzle())); } @@ -129,6 +130,7 @@ m_puzzleTable->view()->scene()->loadPuzzle(puzzle); m_centralWidget->setCurrentWidget(m_puzzleTable); actionCollection()->action("go_collection")->setEnabled(true); + actionCollection()->action("game_restart")->setEnabled(true); //load caption from metadata puzzle->get(Palapeli::PuzzleComponent::Metadata).waitForFinished(); const Palapeli::MetadataComponent* cmp = puzzle->componentPalapeli::MetadataComponent(); @@ -139,6 +141,7 @@ { m_centralWidget->setCurrentWidget(m_collectionView); actionCollection()->action("go_collection")->setEnabled(false); + actionCollection()->action("game_restart")->setEnabled(false); setCaption(QString()); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de