Hello community, here is the log from the commit of package picmi for openSUSE:Factory checked in at 2013-07-08 07:28:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-06-11 09:36:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.picmi.new/picmi.changes 2013-07-08 07:28:18.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Jun 27 18:52:25 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.10.90 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta2.php + +------------------------------------------------------------------- +Thu Jun 13 20:56:48 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.10.80 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta1.php + +------------------------------------------------------------------- Old: ---- picmi-4.10.4.tar.xz New: ---- picmi-4.10.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ picmi.spec ++++++ --- /var/tmp/diff_new_pack.4M4y7a/_old 2013-07-08 07:28:19.000000000 +0200 +++ /var/tmp/diff_new_pack.4M4y7a/_new 2013-07-08 07:28:19.000000000 +0200 @@ -23,7 +23,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Logic Url: http://www.kde.org -Version: 4.10.4 +Version: 4.10.90 Release: 0 Source0: picmi-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ picmi-4.10.4.tar.xz -> picmi-4.10.90.tar.xz ++++++ Files old/picmi-4.10.4/doc/index.cache.bz2 and new/picmi-4.10.90/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-4.10.4/picmi.desktop new/picmi-4.10.90/picmi.desktop --- old/picmi-4.10.4/picmi.desktop 2013-05-28 22:15:50.000000000 +0200 +++ new/picmi-4.10.90/picmi.desktop 2013-06-10 20:55:21.000000000 +0200 @@ -1,6 +1,7 @@ [Desktop Entry] Name=picmi Name[bs]=picmi +Name[ca]=picmi Name[cs]=picmi Name[da]=picmi Name[de]=picmi @@ -30,12 +31,14 @@ Name[sr@ijekavianlatin]=Picmi Name[sr@latin]=Picmi Name[sv]=picmi +Name[tr]=picmi Name[uk]=picmi Name[x-test]=xxpicmixx Name[zh_CN]=picmi Name[zh_TW]=picmi GenericName=Logic Game GenericName[bs]=Logička igra +GenericName[ca]=Joc de lògica GenericName[cs]=Logická hra GenericName[da]=Logikspil GenericName[de]=Logikspiel @@ -65,12 +68,14 @@ GenericName[sr@ijekavianlatin]=Logička igra GenericName[sr@latin]=Logička igra GenericName[sv]=Logikspel +GenericName[tr]=Mantık Oyunu GenericName[uk]=Гра на логіку GenericName[x-test]=xxLogic Gamexx GenericName[zh_CN]=逻辑游戏 GenericName[zh_TW]=智力遊戲 Comment=A number logic game Comment[bs]=Logička igra s brojevima +Comment[ca]=Un joc de lògica de nombres Comment[cs]=Logická hra s čísly Comment[da]=Et spil med tallogik Comment[de]=Ein Logikspiel mit Zahlen @@ -98,6 +103,7 @@ Comment[sr@ijekavianlatin]=Logička igra s brojevima Comment[sr@latin]=Logička igra s brojevima Comment[sv]=Ett logikspel med siffror +Comment[tr]=Bir sayı mantığı oyunu Comment[uk]=Гра з числами на логіку Comment[x-test]=xxA number logic gamexx Comment[zh_CN]=数字逻辑游戏 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-4.10.4/src/gui/mainwindow.cpp new/picmi-4.10.90/src/gui/mainwindow.cpp --- old/picmi-4.10.4/src/gui/mainwindow.cpp 2013-05-28 22:15:50.000000000 +0200 +++ new/picmi-4.10.90/src/gui/mainwindow.cpp 2013-06-10 20:55:21.000000000 +0200 @@ -56,12 +56,14 @@ void MainWindow::setupActions() { KStandardGameAction::gameNew(this, SLOT(startRandomGame()), actionCollection()); KStandardGameAction::load(this, SLOT(loadBoard()), actionCollection()); + KStandardGameAction::restart(this, SLOT(restartGame()), actionCollection()); KStandardGameAction::highscores(this, SLOT(highscores()), actionCollection()); KStandardGameAction::quit(this, SLOT(close()), actionCollection()); KStandardAction::preferences(this, SLOT(settings()), actionCollection()); KStandardAction::fullScreen(this, SLOT(toggleFullscreen(bool)), this, actionCollection()); m_action_pause = KStandardGameAction::pause(this, SLOT(togglePaused(bool)), actionCollection()); m_action_undo = KStandardGameAction::undo(this, SLOT(undo()), actionCollection()); + m_action_hint = KStandardGameAction::hint(this, SLOT(hint()), actionCollection()); m_action_save_state = actionCollection()->addAction("save-position"); m_action_save_state->setText(i18n("Save Position")); @@ -157,6 +159,13 @@ m_scene->refresh(p); } +void MainWindow::hint() +{ + QPoint p = m_game->hint(); + m_scene->refresh(p); + m_scene->hover(p.x(), p.y()); +} + void MainWindow::saveState() { m_game->saveState(); updatePositions(); @@ -174,6 +183,13 @@ startGame(); } +void MainWindow::restartGame() +{ + m_game = QSharedPointer<Picmi>(new Picmi(m_game->getBoardMap())); + + startGame(); +} + void MainWindow::startPresetGame(QSharedPointer<Level> board) { QSharedPointer<BoardMap> p(new BoardMap(board->width(), board->height(), board->map())); m_game = QSharedPointer<Picmi>(new Picmi(p)); @@ -190,6 +206,7 @@ } m_action_undo->setEnabled(false); + m_action_hint->setEnabled(true); m_action_save_state->setEnabled(true); m_action_load_state->setEnabled(false); m_action_pause->setEnabled(true); @@ -237,6 +254,7 @@ KScoreDialog::FieldInfo score = m_game->endGame(); m_view.setEnabled(false); m_action_pause->setEnabled(false); + m_action_hint->setEnabled(false); m_action_undo->setEnabled(false); m_action_save_state->setEnabled(false); m_action_load_state->setEnabled(false); @@ -276,6 +294,7 @@ void MainWindow::togglePaused(bool paused) { m_view.setPaused(paused); m_action_undo->setEnabled(!paused); + m_action_hint->setEnabled(!paused); m_action_save_state->setEnabled(!paused); m_action_load_state->setEnabled(!paused); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-4.10.4/src/gui/mainwindow.h new/picmi-4.10.90/src/gui/mainwindow.h --- old/picmi-4.10.4/src/gui/mainwindow.h 2013-05-28 22:15:50.000000000 +0200 +++ new/picmi-4.10.90/src/gui/mainwindow.h 2013-06-10 20:55:21.000000000 +0200 @@ -44,13 +44,15 @@ protected: void closeEvent(QCloseEvent *event); - + private slots: void startRandomGame(); + void restartGame(); void togglePaused(bool paused); void settings(); void gameWon(); void undo(); + void hint(); void saveState(); void loadState(); void highscores(); @@ -79,7 +81,7 @@ QSharedPointer<KScoreDialog> createScoreDialog(); void setupActions(); - KAction *m_action_undo, *m_action_save_state, *m_action_load_state; + KAction *m_action_undo, *m_action_save_state, *m_action_load_state, *m_action_hint; KToggleAction *m_action_pause; QLabel *m_status_time, *m_status_position; View m_view; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-4.10.4/src/logic/picmi.cpp new/picmi-4.10.90/src/logic/picmi.cpp --- old/picmi-4.10.4/src/logic/picmi.cpp 2013-05-28 22:15:50.000000000 +0200 +++ new/picmi-4.10.90/src/logic/picmi.cpp 2013-06-10 20:55:21.000000000 +0200 @@ -167,6 +167,33 @@ return coord; } +QPoint Picmi::hint() +{ + QVector<QPoint> empty_cells; + for (int x = 0; x != width(); ++x) { + for (int y = 0; y != height(); ++y) { + if (stateAt(x, y) == Board::Nothing) { + empty_cells.push_back(QPoint(x, y)); + } + } + } + + if (empty_cells.size() == 0) { + return QPoint(0, 0); + } + + const int idx = rand() % empty_cells.size(); + const QPoint cell(empty_cells.at(idx)); + Board::State state = m_map->get(cell.x(), cell.y()); + if (state == Board::Nothing) { + state = Board::Cross; + } + + setState(cell.x(), cell.y(), state); + m_timer.addPenaltyTime(); + return cell; +} + KScoreDialog::FieldInfo Picmi::endGame() { m_timer.stop(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-4.10.4/src/logic/picmi.h new/picmi-4.10.90/src/logic/picmi.h --- old/picmi-4.10.4/src/logic/picmi.h 2013-05-28 22:15:50.000000000 +0200 +++ new/picmi-4.10.90/src/logic/picmi.h 2013-06-10 20:55:21.000000000 +0200 @@ -57,6 +57,7 @@ int width() const; int height() const; int remainingBoxCount() const { return m_map->boxCount() - m_state->boxCount(); } + QSharedPointer<BoardMap> getBoardMap() const { return m_map; } bool outOfBounds(int x, int y) const; /* 0 <= x < width(); 0 <= y < height() */ @@ -72,6 +73,8 @@ /* undo last action (if it exists) and return the changed coordinate. */ QPoint undo(); + QPoint hint(); + /* if a saved state exists, load it. otherwise, do nothing */ void loadState() { m_state->loadState(); m_streaks->update(); emit stateChanged(); } void saveState() { m_state->saveState(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/picmi-4.10.4/themes/picmi.desktop new/picmi-4.10.90/themes/picmi.desktop --- old/picmi-4.10.4/themes/picmi.desktop 2013-05-28 22:15:50.000000000 +0200 +++ new/picmi-4.10.90/themes/picmi.desktop 2013-06-10 20:55:21.000000000 +0200 @@ -2,6 +2,7 @@ VersionFormat=1 Name=Picmi Name[bs]=Picmi +Name[ca]=Picmi Name[cs]=Picmi Name[da]=Picmi Name[de]=Picmi @@ -31,6 +32,7 @@ Name[sr@ijekavianlatin]=Picmi Name[sr@latin]=Picmi Name[sv]=Picmi +Name[tr]=Picmi Name[uk]=Picmi Name[x-test]=xxPicmixx Name[zh_CN]=Picmi -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
