Hello community, here is the log from the commit of package ksudoku for openSUSE:Factory checked in at 2013-07-08 07:28:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksudoku (Old) and /work/SRC/openSUSE:Factory/.ksudoku.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksudoku" Changes: -------- --- /work/SRC/openSUSE:Factory/ksudoku/ksudoku.changes 2013-06-11 09:33:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ksudoku.new/ksudoku.changes 2013-07-08 07:28:38.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Jun 27 18:51:05 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:53:58 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: ---- ksudoku-4.10.4.tar.xz New: ---- ksudoku-4.10.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksudoku.spec ++++++ --- /var/tmp/diff_new_pack.zszdBI/_old 2013-07-08 07:28:39.000000000 +0200 +++ /var/tmp/diff_new_pack.zszdBI/_new 2013-07-08 07:28:39.000000000 +0200 @@ -24,7 +24,7 @@ License: GPL-2.0+ Group: Amusements/Games/Board/Puzzle Url: http://www.kde.org -Version: 4.10.4 +Version: 4.10.90 Release: 0 Source0: ksudoku-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ ksudoku-4.10.4.tar.xz -> ksudoku-4.10.90.tar.xz ++++++ Files old/ksudoku-4.10.4/doc/index.cache.bz2 and new/ksudoku-4.10.90/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksudoku-4.10.4/doc/index.docbook new/ksudoku-4.10.90/doc/index.docbook --- old/ksudoku-4.10.4/doc/index.docbook 2013-05-28 21:50:46.000000000 +0200 +++ new/ksudoku-4.10.90/doc/index.docbook 2013-06-10 20:55:10.000000000 +0200 @@ -2,7 +2,7 @@ <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!ENTITY ksudoku "KSudoku"> <!ENTITY kappname "&ksudoku;"> - <!ENTITY kappversion "1.0"><!--Application version. Use this variable everywhere it's needed.--> + <!ENTITY kappversion "1.1"><!--Application version. Use this variable everywhere it's needed.--> <!ENTITY package "kdegames"> <!-- do not change this! --> <!ENTITY % English "INCLUDE" > <!-- change language only here --> <!ENTITY % addindex "IGNORE"> <!-- do not change this! --> @@ -42,8 +42,8 @@ </copyright> <legalnotice>&FDLNotice;</legalnotice> -<date>2011-11-24</date><!-- Date of (re)writing, or update.--> -<releaseinfo>&kappversion; &kde; 4.8</releaseinfo><!-- Application version number. Use the variable definitions within header to change this value.--> +<date>2013-05-05</date><!-- Date of (re)writing, or update.--> +<releaseinfo>&kappversion; (&kde; 4.11)</releaseinfo><!-- Application version number. Use the variable definitions within header to change this value.--> <!--Short description of this document. Do not change unless necessary!--> <abstract> @@ -465,44 +465,6 @@ <sect1 id="settings-menu"> <title>The <guimenu>Settings</guimenu> Menu</title> <variablelist> - <varlistentry> - <term><menuchoice> - <guimenu>Settings</guimenu> - <guisubmenu>Toolbars</guisubmenu> - <guimenuitem>Main Toolbar</guimenuitem> - </menuchoice></term> - <listitem><para>Show or hide the Main Toolbar.</para></listitem> - </varlistentry> - <varlistentry id="settings-menu-hide-matching"> - <term><menuchoice> - <guimenu>Settings</guimenu> - <guisubmenu>Toolbars</guisubmenu> - <guimenuitem>Actions Toolbar</guimenuitem> - </menuchoice></term> - <listitem><para>Show or hide the Actions Toolbar.</para></listitem> - </varlistentry> - - <varlistentry id="settings-menu-statusbar"> - <term><menuchoice> - <guimenu>Settings</guimenu> - <guimenuitem>Show Statusbar</guimenuitem> - </menuchoice></term> - <listitem><para>Show or hide the Statusbar.</para></listitem> - </varlistentry> - <varlistentry id="settings-menu-shortcuts"> - <term><menuchoice> - <guimenu>Settings</guimenu> - <guimenuitem>Configure Shortcuts...</guimenuitem> - </menuchoice></term> - <listitem><para><action>Display a standard &kde; shortcut configuration dialog</action> to change the keyboard shortcuts for &kappname;.</para></listitem> - </varlistentry> - <varlistentry id="settings-menu-toolbar"> - <term><menuchoice> - <guimenu>Settings</guimenu> - <guimenuitem>Configure Toolbars...</guimenuitem> - </menuchoice></term> - <listitem><para>Display a standard &kde; dialog where you can configure the toolbar icons.</para></listitem> - </varlistentry> <varlistentry id="settings-menu-settings"> <term><menuchoice> <guimenu>Settings</guimenu> @@ -511,13 +473,12 @@ <listitem><para><action>Open a dialog to configure &kappname;.</action> See <link linkend="configuration">Game Configuration</link> section for details.</para></listitem> </varlistentry> </variablelist> -</sect1> -<sect1 id="help"><!--This is a standard Help menubar entry. Only change if needed.--> -<title>The <guimenu>Help</guimenu> Menu</title> -<para>&kappname; has a default &kde; <guimenu>Help</guimenu> menu as described -below:</para> - -&help.menu.documentation; + <para> + Additionally &ksudoku; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> + menu items, for more information read the sections about the <ulink url="help:/fundamentals/ui.html#menus-settings">Settings Menu</ulink> and + <ulink url="help:/fundamentals/ui.html#menus-help">Help Menu</ulink> + of the &kde; Fundamentals. + </para> </sect1> </chapter> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksudoku-4.10.4/src/CMakeLists.txt new/ksudoku-4.10.90/src/CMakeLists.txt --- old/ksudoku-4.10.4/src/CMakeLists.txt 2013-05-28 21:50:46.000000000 +0200 +++ new/ksudoku-4.10.90/src/CMakeLists.txt 2013-06-10 20:55:10.000000000 +0200 @@ -6,7 +6,6 @@ ${CMAKE_CURRENT_SOURCE_DIR}/gui/views ${CMAKE_CURRENT_SOURCE_DIR}/logic ${CMAKE_CURRENT_BINARY_DIR}/gui - ${CMAKE_CURRENT_BINARY_DIR}/gui/views # ${CMAKE_CURRENT_BINARY_DIR}/gui/export # ${CMAKE_CURRENT_BINARY_DIR}/gui/export/draw ${CMAKE_CURRENT_BINARY_DIR}/logic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksudoku-4.10.4/src/generator/sudokuboard.cpp new/ksudoku-4.10.90/src/generator/sudokuboard.cpp --- old/ksudoku-4.10.4/src/generator/sudokuboard.cpp 2013-05-28 21:50:46.000000000 +0200 +++ new/ksudoku-4.10.90/src/generator/sudokuboard.cpp 2013-06-10 20:55:10.000000000 +0200 @@ -33,7 +33,6 @@ SudokuBoard::SudokuBoard (SKGraph * graph) : - m_graph (graph), m_type (graph->specificType()), m_order (graph->order()), m_blockSize (graph->base()), @@ -42,31 +41,33 @@ m_overlap (0), m_nGroups (graph->cliqueCount()), m_groupSize (m_order), + m_graph (graph), m_vacant (VACANT), m_unusable (UNUSABLE) { - dbgLevel = 1; + dbgLevel = 0; m_stats.type = m_type; m_stats.blockSize = m_blockSize; m_stats.order = m_order; m_boardSize = graph->sizeX(); // TODO - IDW. Rationalise grid sizes. - dbe "SudokuBoard constructor: type %d, block %d, order %d, BoardArea %d\n", - m_type, m_blockSize, m_order, m_boardArea); + dbe "SudokuBoard: type %d %s, block %d, order %d, BoardArea %d\n", + m_type, graph->name().toAscii().constData(), + m_blockSize, m_order, m_boardArea); } void SudokuBoard::setSeed() { static bool started = false; if (started) { - dbo "setSeed(): RESET IS TURNED OFF\n"); + dbo1 "setSeed(): RESET IS TURNED OFF\n"); // qsrand (m_stats.seed); // IDW test. } else { started = true; m_stats.seed = time(0); qsrand (m_stats.seed); - dbo "setSeed(): SEED = %d\n", m_stats.seed); + dbo1 "setSeed(): SEED = %d\n", m_stats.seed); } } @@ -75,7 +76,8 @@ Difficulty difficultyRequired, Symmetry symmetry) { - dbo "Entered generatePuzzle()\n"); + dbe "Entered generatePuzzle(): difficulty %d, symmetry %d\n", + difficultyRequired, symmetry); QTime t; t.start(); setSeed(); @@ -95,11 +97,11 @@ if (symmetry == RANDOM_SYM) { // Choose a symmetry at random. symmetry = (Symmetry) (qrand() % (int) LAST_CHOICE); } - dbo "SYMMETRY IS %d\n", (int) symmetry); + dbo1 "SYMMETRY IS %d\n", (int) symmetry); if (symmetry == DIAGONAL_1) { // If diagonal symmetry, choose between NW->SE and NE->SW diagonals. symmetry = (qrand() % 2 == 0) ? DIAGONAL_1 : DIAGONAL_2; - dbo "Diagonal symmetry, choosing %s\n", + dbo1 "Diagonal symmetry, choosing %s\n", (symmetry == DIAGONAL_1) ? "DIAGONAL_1" : "DIAGONAL_2"); } @@ -107,28 +109,28 @@ // Fill the board with values that satisfy the Sudoku rules but are // chosen in a random way: these values are the solution of the puzzle. currSolution = this->fillBoard(); - dbo "RETURN FROM fillBoard()\n"); - dbo "Time to fill board: %d msec\n", t.elapsed()); + dbo1 "RETURN FROM fillBoard()\n"); + dbo1 "Time to fill board: %d msec\n", t.elapsed()); // Randomly insert solution-values into an empty board until a point is // reached where all the cells in the solution can be logically deduced. currPuzzle = insertValues (currSolution, difficultyRequired, symmetry); - dbo "RETURN FROM insertValues()\n"); - dbo "Time to do insertValues: %d msec\n", t.elapsed()); + dbo1 "RETURN FROM insertValues()\n"); + dbo1 "Time to do insertValues: %d msec\n", t.elapsed()); if (difficultyRequired > m_stats.difficulty) { // Make the puzzle harder by removing values at random. currPuzzle = removeValues (currSolution, currPuzzle, difficultyRequired, symmetry); - dbo "RETURN FROM removeValues()\n"); - dbo "Time to do removeValues: %d msec\n", t.elapsed()); + dbo1 "RETURN FROM removeValues()\n"); + dbo1 "Time to do removeValues: %d msec\n", t.elapsed()); } Difficulty d = calculateRating (currPuzzle, 5); count++; - dbo "CYCLE %d, achieved difficulty %d, required %d, rating %3.1f\n", + dbo1 "CYCLE %d, achieved difficulty %d, required %d, rating %3.1f\n", count, d, difficultyRequired, m_accum.rating); - dbe "CYCLE %d, achieved difficulty %d, required %d, rating %3.1f\n", + dbe1 "CYCLE %d, achieved difficulty %d, required %d, rating %3.1f\n", count, d, difficultyRequired, m_accum.rating); // Use the highest rated puzzle so far. @@ -159,14 +161,16 @@ i18n("Difficulty Level"), KGuiItem(i18n("&Try Again")), KGuiItem(i18n("&Accept"))); if (ans == KMessageBox::Yes) { - count = 0; + count = 0; // Continue on if the puzzle is not hard enough. continue; } + break; // Exit if the puzzle is accepted. } if ((d >= difficultyRequired) || (count >= maxTries)) { QWidget owner; + int ans = 0; if (m_accum.nGuesses == 0) { - KMessageBox::information (&owner, + ans = KMessageBox::questionYesNo (&owner, i18n("It will be possible to solve the generated puzzle " "by logic alone. No guessing will be required.\n" "\n" @@ -175,10 +179,10 @@ .arg(bestRating, 0, 'f', 1).arg(bestNClues) .arg(m_stats.nCells - bestNClues), i18n("Difficulty Level"), - "ShowPuzzleStatistics_1"); + KGuiItem(i18n("&OK")), KGuiItem(i18n("&Retry"))); } else { - KMessageBox::information (&owner, + ans = KMessageBox::questionYesNo (&owner, i18n("Solving the generated puzzle will require an " "average of %1 guesses or branch points and if you " "guess wrong, backtracking will be necessary. The " @@ -190,11 +194,20 @@ .arg(bestFirstGuessAt) .arg(bestRating, 0, 'f', 1).arg(bestNClues) .arg(m_stats.nCells - bestNClues), - i18n("Difficulty Level"), - "ShowPuzzleStatistics_2"); + i18n("Difficulty Level"), + KGuiItem(i18n("&OK")), KGuiItem(i18n("&Retry"))); } // Exit when the required difficulty or number of tries is reached. - break; + if (ans == KMessageBox::No) { + count = 0; + bestRating = 0.0; + bestDifficulty = 0; + bestNClues = 0; + bestNGuesses = 0; + bestFirstGuessAt = 0; + continue; // Start again if the user rejects this puzzle. + } + break; // Exit if the puzzle is OK. } } @@ -221,9 +234,9 @@ setSeed(); for (int n = 0; n < nSamples; n++) { - dbo "SOLVE PUZZLE %d\n", n); + dbo1 "SOLVE PUZZLE %d\n", n); solution = solveBoard (puzzle, nSamples == 1 ? NotRandom : Random); - dbo "PUZZLE SOLVED %d\n", n); + dbo1 "PUZZLE SOLVED %d\n", n); analyseMoves (m_stats); fracClues = float (m_stats.nClues) / float (m_stats.nCells); m_accum.nSingles += m_stats.nSingles; @@ -248,7 +261,7 @@ avDeduced = float (m_accum.nSingles + m_accum.nSpots) / m_accum.nDeduces; m_accum.rating = m_accum.rating / nSamples; m_accum.difficulty = calculateDifficulty (m_accum.rating); - dbo " Av guesses %2.1f Av deduces %2.1f" + dbo1 " Av guesses %2.1f Av deduces %2.1f" " Av per deduce %3.1f rating %2.1f difficulty %d\n", avGuesses, avDeduces, avDeduced, m_accum.rating, m_accum.difficulty); @@ -414,7 +427,7 @@ } } } - print (puzzle); // IDW test. + if (dbgLevel > 0) print (puzzle); while (true) { // Check the difficulty of the puzzle. @@ -437,7 +450,7 @@ index, solution.at (cell), cell, cell/m_boardSize + 1, cell%m_boardSize + 1); } - print (puzzle); + if (dbgLevel > 0) print (puzzle); return puzzle; } @@ -596,13 +609,12 @@ // Calculate the difficulty level for empirical ranges of the rating. s.difficulty = calculateDifficulty (s.rating); - dbo1 // IDW test. - " aM: Type %2d %2d: clues %3d %3d %2.1f%% %3dP %3dS %3dG " - "%3dM %3dD %3.1fR D=%d\n\n", + dbo1 " aM: Type %2d %2d: clues %3d %3d %2.1f%% %3dP %3dS %3dG " + "%3dM %3dD %3.1fR D=%d F=%d\n\n", m_stats.type, m_stats.order, s.nClues, s.nCells, ((float) s.nClues / s.nCells) * 100.0, s.nSingles, s.nSpots, s.nGuesses, (s.nSingles + s.nSpots + s.nGuesses), - s.nDeduces, s.rating, s.difficulty); + s.nDeduces, s.rating, s.difficulty, s.firstGuessAt); } Difficulty SudokuBoard::calculateDifficulty (float rating) @@ -862,7 +874,7 @@ } solveBoard (m_currentValues); - dbo "BOARD FILLED\n"); + dbo1 "BOARD FILLED\n"); return m_currentValues; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksudoku-4.10.4/src/gui/ksudoku.cpp new/ksudoku-4.10.90/src/gui/ksudoku.cpp --- old/ksudoku-4.10.4/src/gui/ksudoku.cpp 2013-05-28 21:50:46.000000000 +0200 +++ new/ksudoku-4.10.90/src/gui/ksudoku.cpp 2013-06-10 20:55:10.000000000 +0200 @@ -252,7 +252,7 @@ widget->show(); widget->setFocus(); - connect(game.interface(), SIGNAL(completed(bool,const QTime&,bool)), SLOT(onCompleted(bool,const QTime&,bool))); + connect(game.interface(), SIGNAL(completed(bool,QTime,bool)), SLOT(onCompleted(bool,QTime,bool))); connect(game.interface(), SIGNAL(modified(bool)), SLOT(onModified(bool))); adaptActions2View(); @@ -841,7 +841,7 @@ dialog->addPage(new KGameThemeSelector(dialog, Settings::self(), KGameThemeSelector::NewStuffDisableDownload), i18n("Theme"), "games-config-theme"); dialog->setHelp(QString(),"ksudoku"); - connect(dialog, SIGNAL(settingsChanged(const QString&)), SLOT(updateSettings())); + connect(dialog, SIGNAL(settingsChanged(QString)), SLOT(updateSettings())); dialog->show(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksudoku-4.10.4/src/gui/ksudoku.desktop new/ksudoku-4.10.90/src/gui/ksudoku.desktop --- old/ksudoku-4.10.4/src/gui/ksudoku.desktop 2013-05-28 21:50:46.000000000 +0200 +++ new/ksudoku-4.10.90/src/gui/ksudoku.desktop 2013-06-10 20:55:10.000000000 +0200 @@ -49,7 +49,7 @@ Name[x-test]=xxKSudokuxx Name[zh_CN]=KSudoku Name[zh_TW]=KSudoku -Exec=ksudoku %i -caption "%c" +Exec=ksudoku %i -caption %c Icon=ksudoku Type=Application X-DocPath=ksudoku/index.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksudoku-4.10.4/src/gui/welcomescreen.cpp new/ksudoku-4.10.90/src/gui/welcomescreen.cpp --- old/ksudoku-4.10.4/src/gui/welcomescreen.cpp 2013-05-28 21:50:46.000000000 +0200 +++ new/ksudoku-4.10.90/src/gui/welcomescreen.cpp 2013-06-10 20:55:10.000000000 +0200 @@ -53,7 +53,7 @@ Qt::QueuedConnection, Q_ARG (int, m_selectedPuzzle)); - connect(gameListWidget->selectionModel(), SIGNAL(currentChanged(const QModelIndex&,const QModelIndex&)), this, SLOT(onCurrentVariantChange())); + connect(gameListWidget->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(onCurrentVariantChange())); connect(getNewGameButton, SIGNAL(clicked(bool)), this, SLOT(getNewVariant())); // TODO disabled due to missing per-game config dialog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksudoku-4.10.4/src/logic/puzzle.cpp new/ksudoku-4.10.90/src/logic/puzzle.cpp --- old/ksudoku-4.10.4/src/logic/puzzle.cpp 2013-05-28 21:50:46.000000000 +0200 +++ new/ksudoku-4.10.90/src/logic/puzzle.cpp 2013-06-10 20:55:10.000000000 +0200 @@ -69,7 +69,6 @@ SudokuBoard * board = new SudokuBoard (m_graph); // Generate a puzzle and its solution. - qDebug() << "Calling board->generatePuzzle()"; // IDW test. board->generatePuzzle (m_puzzle, m_solution, (Difficulty) difficulty, (Symmetry) symmetry); board->getMoveList (m_hintList); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksudoku-4.10.4/src/main.cpp new/ksudoku-4.10.90/src/main.cpp --- old/ksudoku-4.10.4/src/main.cpp 2013-05-28 21:50:46.000000000 +0200 +++ new/ksudoku-4.10.90/src/main.cpp 2013-06-10 20:55:10.000000000 +0200 @@ -36,7 +36,7 @@ static const char description[] = I18N_NOOP("KSudoku - Sudokus and more"); -static const char version[] = "1.2"; +static const char version[] = "1.2.1"; int main(int argc, char **argv) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
