File 4_3_BRANCH.diff of Package kdegames4

Overview Repositories Revisions Requests Users Attributes Meta

File 4_3_BRANCH.diff of Package kdegames4 (Revision c5ad67cd2c08e127c585498afd59217f)

Currently displaying revision c5ad67cd2c08e127c585498afd59217f , Show latest

package: kdegames-4.2.85.tar.bz2
kdemod: kdegames
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
+current HEAD: 967299
+svn di between //tags/KDE/4.2.85/kdegames and //trunk/KDE/kdegames
--- kolf/courses/Impossible	
+++ kolf/courses/Impossible	
@@ -1558,6 +1558,7 @@
 [17-sign@23,152|20]
 Comment=Luck
 Comment[ca]=Sort
+Comment[cs]=Štěstí
 Comment[da]=Held
 Comment[de]=Glück
 Comment[el]=Τύχη
--- kolf/kolf.desktop	
+++ kolf/kolf.desktop	
@@ -68,8 +68,8 @@
 GenericName[tr]=Minyatür Golf
 GenericName[uk]=Мініатюрний гольф
 GenericName[wa]=Golf miniateure
-GenericName[x-test]=xxMiniature Golfxx
 GenericName[xh]=Igalufa encinci
+GenericName[x-test]=xxMiniature Golfxx
 GenericName[zh_CN]=微型高尔夫
 GenericName[zh_TW]=迷你高爾夫
 Categories=Qt;KDE;Game;ArcadeGame;
--- libkmahjongg/tilesets/bamboo.desktop	
+++ libkmahjongg/tilesets/bamboo.desktop	
@@ -1,5 +1,6 @@
 [KMahjonggTileset]
 Name=Bamboo
+Name[et]=Bambus
 Name[pt]=Bambu
 Name[pt_BR]=Bambu
 Name[sv]=Bambu
@@ -7,6 +8,7 @@
 Name[zh_TW]=竹子
 Description=Japanese tileset with brightly-colored kanji on a soft woodgrain
 Description[en_GB]=Japanese tileset with brightly-coloured kanji on a soft woodgrain
+Description[et]=Jaapani klotsid heledate kanjidega pehmetoonilisel puidul
 Description[pt]=Conjunto de peças japonesas com um Kanji colorido sobre um tom suave de serradura
 Description[pt_BR]=Conjunto de peças japonesas com um Kanji colorido sobre um tom suave de serradura
 Description[sv]=Japanska brickor med kanji i klara färger på svagt ådrat trä
--- ksame/ksame.desktop	
+++ ksame/ksame.desktop	
@@ -34,8 +34,8 @@
 Name[tr]=AynıOyun
 Name[uk]=Та сама гра
 Name[wa]=Djeu Same Game
-Name[x-test]=xxSameGamexx
 Name[xh]=Ikwa ngumdlalo ofanayo
+Name[x-test]=xxSameGamexx
 Exec=ksame -caption "%c"
 Type=Application
 X-DocPath=ksame/index.html
@@ -95,8 +95,8 @@
 GenericName[uz@cyrillic]=Стол ўйини
 GenericName[vi]=Game bàn 
 GenericName[wa]=Djeu d' platea
-GenericName[x-test]=xxBoard Gamexx
 GenericName[xh]=Umdlalo Webhodi
+GenericName[x-test]=xxBoard Gamexx
 GenericName[zh_CN]=色块消去游戏
 GenericName[zh_TW]=棋盤遊戲
 Icon=ksame
--- kshisen/src/app.cpp	
+++ kshisen/src/app.cpp	
@@ -68,8 +68,7 @@
 m_gameTimerLabel(0),
 m_gameTilesLabel(0),
 m_gameCheatLabel(0),
- m_board(0),
- m_cheat(false)
+ m_board(0)
 {
 m_board = new Board(this);
 m_board->setObjectName("board");
@@ -127,6 +126,7 @@
 // Settings
 KStandardAction::preferences(this, SLOT(showSettings()), actionCollection());
 
+ connect(m_board, SIGNAL(cheatStatusChanged()), this, SLOT(updateCheatDisplay()));
 connect(m_board, SIGNAL(changed()), this, SLOT(updateItems()));
 connect(m_board, SIGNAL(tilesDontMatch()), this, SLOT(notifyTilesDontMatch()));
 connect(m_board, SIGNAL(invalidMove()), this, SLOT(notifyInvalidMove()));
@@ -204,6 +204,11 @@
 }
 m_board->undo();
 setCheatModeEnabled(true);
+
+ // If the game is stuck (no matching tiles anymore), the player can decide
+ // to undo some steps and try a different approach.
+ m_board->setGameStuckEnabled(false);
+
 updateItems();
 }
 
@@ -246,14 +251,13 @@
 actionCollection()->action(KStandardGameAction::name(KStandardGameAction::Undo))->setEnabled(false);
 actionCollection()->action(KStandardGameAction::name(KStandardGameAction::Redo))->setEnabled(false);
 actionCollection()->action(KStandardGameAction::name(KStandardGameAction::Restart))->setEnabled(false);
- actionCollection()->action(KStandardGameAction::name(KStandardGameAction::Hint))->setEnabled(false);
 actionCollection()->action(KStandardGameAction::name(KStandardGameAction::Pause))->setChecked(true);
+ actionCollection()->action(KStandardGameAction::name(KStandardGameAction::Hint))->setEnabled(false);
 } else {
 actionCollection()->action(KStandardGameAction::name(KStandardGameAction::Undo))->setEnabled(m_board->canUndo());
 actionCollection()->action(KStandardGameAction::name(KStandardGameAction::Redo))->setEnabled(m_board->canRedo());
 actionCollection()->action(KStandardGameAction::name(KStandardGameAction::Restart))->setEnabled(m_board->canUndo());
 actionCollection()->action(KStandardGameAction::name(KStandardGameAction::Pause))->setEnabled(true);
- actionCollection()->action(KStandardGameAction::name(KStandardGameAction::Pause))->setChecked(false);
 actionCollection()->action(KStandardGameAction::name(KStandardGameAction::Hint))->setEnabled(true);
 }
 }
@@ -283,7 +287,7 @@
 }
 scoreDialog.setConfigGroup(QString("%1x%2").arg(sizeX[Prefs::size()]).arg(sizeY[Prefs::size()]));
 
- if (m_cheat) {
+ if (m_board->hasCheated()) {
 QString message = i18n("\nYou could have been in the highscores\nif you did not use Undo or Hint.\nTry without them next time.");
 KMessageBox::information(this, message, i18n("End of Game"));
 } else {
@@ -302,6 +306,9 @@
 
 void App::updateTimeDisplay()
 {
+ if (m_board->isPaused() || m_board->isStuck() || m_board->isOver()) {
+ return;
+ }
 int currentTime = m_board->currentTime();
 QString message = i18n("Your time: %1:%2:%3 %4",
 QString().sprintf("%02d", currentTime / 3600),
@@ -325,6 +332,11 @@
 m_gameTilesLabel->setText(message);
 }
 
+void App::updateCheatDisplay()
+{
+ m_gameCheatLabel->setVisible(m_board->hasCheated());
+}
+
 int App::score(int x, int y, int seconds, bool gravity) const
 {
 double ntiles = x * y;
@@ -367,10 +379,7 @@
 
 void App::setCheatModeEnabled(bool enabled)
 {
- if (m_cheat == enabled) {
- return;
- }
- m_cheat = enabled;
+ m_board->setCheatModeEnabled(enabled);
 m_gameCheatLabel->setVisible(enabled);
 }
 
--- kshisen/src/kshisenui.rc	
+++ kshisen/src/kshisenui.rc	
@@ -10,10 +10,7 @@
 </MenuBar>
 <ToolBar name="mainToolBar"><text>Main Toolbar</text>
 <Action name="game_new"/>
- <Separator/>
 <Action name="move_undo"/>
- <Action name="move_redo"/>
- <Separator/>
 <Action name="game_pause"/>
 </ToolBar>
 </gui>
--- kshisen/src/main.cpp	
+++ kshisen/src/main.cpp	
@@ -31,7 +31,7 @@
 // The MINOR number is increased for every branch of KDE from trunk (i.e. KDE 4.1, KDE 4.2 etc).
 // The MICRO version is increased for every bugfix release if there were changes.
 // MICRO numbers >= 50 are used for development milestones in trunk.
-#define KSHISEN_VERSION "1.6.50"
+#define KSHISEN_VERSION "1.6.55"
 
 static const char description[] = I18N_NOOP("A KDE game similar to Mahjongg");
 
--- kshisen/src/app.h	
+++ kshisen/src/app.h	
@@ -46,6 +46,8 @@
 void updateTimeDisplay();
 /// Updates the tiles removed display in the status bar
 void updateTileDisplay();
+ /// Updates the cheat status display in the status bar
+ void updateCheatDisplay();
 /// Shows the settings dialog
 void showSettings(); // const?
 
@@ -91,7 +93,6 @@
 QLabel *m_gameTilesLabel; ///< Status bar area for the tile counter
 QLabel *m_gameCheatLabel; ///< Status bar area for the cheat mode
 Board *m_board; ///< Holds the game board
- bool m_cheat; ///< Whether the cheat mode is set
 };
 
 #endif // APP_H
--- kshisen/src/board.cpp	
+++ kshisen/src/board.cpp	
@@ -70,7 +70,7 @@
 m_field(0),
 m_xTiles(0), m_yTiles(0),
 m_delay(125), m_shuffle(0),
- m_isPaused(false), m_isStuck(false), m_isOver(false),
+ m_isPaused(false), m_isStuck(false), m_isOver(false), m_cheat(false),
 m_gravityFlag(true), m_solvableFlag(true), m_chineseStyleFlag(false), m_tilesCanSlideFlag(false),
 m_highlightedTile(-1), m_connectionTimeout(0),
 m_paintConnection(false), m_paintPossibleMoves(false)
@@ -85,7 +85,6 @@
 setPalette(palette);
 
 loadSettings();
- setFocus();
 }
 
 Board::~Board()
@@ -93,14 +92,6 @@
 delete [] m_field;
 }
 
-void Board::focusOutEvent(QFocusEvent *)
-{
- if (!m_isPaused && !m_isOver && !m_isStuck) {
- setPauseEnabled(true);
- }
-}
-
-
 void Board::loadSettings()
 {
 if (!loadTileset(Prefs::tileSet())) {
@@ -410,6 +401,7 @@
 
 m_isOver = false;
 m_isPaused = false;
+ setCheatModeEnabled(false);
 
 m_markX = -1;
 m_markY = -1;
@@ -617,10 +609,10 @@
 
 if (m_isPaused) {
 p.setFont(KGlobalSettings::largeFont());
- p.drawText(rect(), Qt::AlignCenter, i18n("Game Paused\nClick to resume game."));
+ p.drawText(rect(), Qt::AlignCenter|Qt::TextWordWrap, i18n("Game Paused\nClick to resume game."));
 } else if (m_isOver) {
 p.setFont(KGlobalSettings::largeFont());
- p.drawText(rect(), Qt::AlignCenter, i18n("Game Over\nClick to start a new game."));
+ p.drawText(rect(), Qt::AlignCenter|Qt::TextWordWrap, i18n("Game Over\nClick to start a new game."));
 } else {
 int w = m_tiles.width();
 int h = m_tiles.height();
@@ -1481,13 +1473,6 @@
 return;
 }
 
- // If the game is stuck (no matching tiles anymore), the player can decide
- // to undo some steps and try a different approach. That's why the clock
- // should be resumed on undo.
- if (m_isStuck) {
- m_gameClock.resume();
- }
-
 clearHighlight();
 undrawConnection();
 Move *move = m_undo.takeLast();
@@ -1521,7 +1506,7 @@
 }
 } else { // else check all tiles from the slide that may have fallen down
 #ifdef DEBUGGING
- kDebug() << "[undo] gravity from slide s1(" << move->slide_x1 << "," << move->slide_y1 << ")=>s2(" << move->slide_x2 << "," << move->slide_y2 << ") matching (" << move->x1 << "," << move->y1 << ")=>(" << move->x2 << "," << move->y2 << ")";
+ kDebug() << "[undo] gravity from slide s1(" << move->m_slideX1 << "," << move->m_slideY1 << ")=>s2(" << move->m_slideX2 << "," << move->m_slideY2 << ") matching (" << move->m_x1 << "," << move->m_y1 << ")=>(" << move->m_x2 << "," << move->m_y2 << ")";
 #endif
 // horizontal slide
 // because tiles that slides horizontaly may fall down
@@ -1566,7 +1551,7 @@
 continue;
 }
 #ifdef DEBUGGING
- kDebug() << "[undo] moving (" <slide_y1 << ")";
+ kDebug() << "[undo] moving (" <m_slideY1 << ")";
 #endif
 // put it back up
 setField(i, move->m_slideY1, field(i, j));
@@ -1592,7 +1577,7 @@
 continue;
 }
 #ifdef DEBUGGING
- kDebug() << "[undo] moving (" <slide_y1 << ")";
+ kDebug() << "[undo] moving (" <m_slideY1 << ")";
 #endif
 // put it back up
 setField(i, move->m_slideY1, field(i, j));
@@ -1603,7 +1588,7 @@
 }
 // move tiles from the second column up
 #ifdef DEBUGGING
- kDebug() << "[undo] moving up column x2" << m->x2;
+ kDebug() << "[undo] moving up column x2" << move->m_x2;
 #endif
 for (y = 0; y <= move->m_y2; ++y) {
 #ifdef DEBUGGING
@@ -1621,7 +1606,7 @@
 if (move->m_slideY1 > 0) {
 for (int i = move->m_x1 + dx; i >= move->m_x1; --i) {
 #ifdef DEBUGGING
- kDebug() << "[undo] moving up column" <slide_y1;
+ kDebug() << "[undo] moving up column" <m_slideY1;
 #endif
 for (int j = 0; j < move->m_slideY1; ++j) {
 #ifdef DEBUGGING
@@ -1631,7 +1616,7 @@
 updateField(i, j);
 }
 #ifdef DEBUGGING
- kDebug() << "[undo] clearing last tile" << move->slide_y1;
+ kDebug() << "[undo] clearing last tile" << move->m_slideY1;
 #endif
 setField(i, move->m_slideY1, EMPTY);
 updateField(i, move->m_slideY1);
@@ -1641,7 +1626,7 @@
 if (move->m_slideY1 > 0) {
 for (int i = move->m_x1 - dx; i <= move->m_x1; ++i) {
 #ifdef DEBUGGING
- kDebug() << "[undo] moving up column" <slide_y1;
+ kDebug() << "[undo] moving up column" <m_slideY1;
 #endif
 for (int j = 0; j < move->m_slideY1; ++j) {
 #ifdef DEBUGGING
@@ -1651,7 +1636,7 @@
 updateField(i, j);
 }
 #ifdef DEBUGGING
- kDebug() << "[undo] clearing last tile" << move->slide_y1;
+ kDebug() << "[undo] clearing last tile" << move->m_slideY1;
 #endif
 setField(i, move->m_slideY1, EMPTY);
 updateField(i, move->m_slideY1);
@@ -1743,11 +1728,11 @@
 {
 PossibleMoves possibleMoves;
 
- if (getHint_I(p)) {
+ if (hint_I(possibleMoves)) {
 m_markX = -1;
 m_markY = -1;
- marked(possibleMoves.first().path.first().x, possibleMoves.first().path.first().y);
- marked(possibleMoves.first().path.last().x, possibleMoves.first().path.last().y);
+ marked(possibleMoves.first().m_path.first().x, possibleMoves.first().m_path.first().y);
+ marked(possibleMoves.first().m_path.last().x, possibleMoves.first().m_path.last().y);
 }
 }
 
@@ -1758,7 +1743,8 @@
 for (int y = 0; y < yTiles(); ++y) {
 QString row;
 for (int x = 0; x < xTiles(); ++x) {
- if (getField(x, y) == EMPTY) {
+ int tile = field(x, y);
+ if (tile == EMPTY) {
 row += " --";
 } else {
 row += QString("%1").arg(tile, 3);
@@ -1774,7 +1760,8 @@
 for (int y = 0; y < yTiles(); ++y) {
 QString row;
 for (int x = 0; x < xTiles(); ++x) {
- if (board[y * xTiles() + x] == EMPTY) {
+ int tile = board[y * xTiles() + x];
+ if (tile == EMPTY) {
 row += " --";
 } else {
 row += QString("%1").arg(tile, 3);
@@ -2006,6 +1993,11 @@
 return;
 }
 m_isStuck = enabled;
+ if (m_isStuck) {
+ m_gameClock.pause();
+ } else {
+ m_gameClock.resume();
+ }
 emit changed();
 update();
 }
@@ -2020,6 +2012,15 @@
 update();
 }
 
+void Board::setCheatModeEnabled(bool enabled)
+{
+ if (m_cheat == enabled) {
+ return;
+ }
+ m_cheat = enabled;
+ emit cheatStatusChanged();
+}
+
 /**
 * @return True if game is over, False if game is not over
 */
@@ -2044,6 +2045,14 @@
 return m_isStuck;
 }
 
+/**
+* @return True if the player is in cheat mode, False if not
+*/
+bool Board::hasCheated() const
+{
+ return m_cheat;
+}
+
 #include "board.moc"
 
 // vim: expandtab:tabstop=4:shiftwidth=4
--- kshisen/src/CMakeLists.txt	
+++ kshisen/src/CMakeLists.txt	
@@ -14,16 +14,12 @@
 
 kde4_add_kcfg_files( kshisen_SRCS prefs.kcfgc )
 
-kde4_add_app_icon( kshisen_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../hi*-app-kshisen.png" )
 kde4_add_executable( kshisen ${kshisen_SRCS} )
 
 target_link_libraries( kshisen ${KDE4_KDEUI_LIBS} kdegames kmahjongglib )
 
 install( TARGETS kshisen ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
-
 install( FILES kshisen.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES kshisenui.rc DESTINATION ${DATA_INSTALL_DIR}/kshisen )
 
-kde4_install_icons( ${ICON_INSTALL_DIR} )
-
--- kshisen/src/board.h	
+++ kshisen/src/board.h	
@@ -141,7 +141,6 @@
 virtual void paintEvent(QPaintEvent *e);
 virtual void mousePressEvent(QMouseEvent *e);
 virtual void resizeEvent(QResizeEvent *e);
- virtual void focusOutEvent(QFocusEvent *e);
 
 void setDelay(int);
 int delay() const;
@@ -199,12 +198,16 @@
 void setGameStuckEnabled(bool enabled);
 /// Sets whether the game is over
 void setGameOverEnabled(bool enabled);
+ /// Sets whether the game is in cheat mode
+ void setCheatModeEnabled(bool enabled);
 /// Returns whether the game is over
 bool isOver() const;
 /// Returns whether the game is in pause mode
 bool isPaused() const;
 /// Returns whether there are still matching tiles left
 bool isStuck() const;
+ /// Returns whether player is in cheat mode
+ bool hasCheated() const;
 
 signals:
 void markMatched(); // unused?
@@ -216,6 +219,7 @@
 void selectATile();
 void selectAMove();
 void selectAMatchingTile();
+ void cheatStatusChanged();
 
 public slots:
 /// Controls the pause mode
@@ -293,6 +297,7 @@
 bool m_isPaused; ///< Whether game is paused
 bool m_isStuck; ///< Whether game has no more matching tiles
 bool m_isOver; ///< Whether game is over
+ bool m_cheat; ///< Whether the cheat mode is set
 
 bool m_gravityFlag; ///< Whether gravity flag is set
 bool m_solvableFlag; ///< Whether solvable flag is set
--- kshisen/ChangeLog	
+++ kshisen/ChangeLog	
@@ -1,20 +1,16 @@
 Changes in 1.7.0:
- * add window title to Player name dialog
 * fix typo in cheat notification dialog
- * fix bug where game is playable in pause mode
+ * fix bug where game was playable in pause mode
 * add Game Over screen to not start the next game without user interaction
- * rework pause mode
- * - game is now paused if the board loses focus (e.g. if a menu is opened
- * or the application itself loses focus)
- * - game can now be resumed by clicking on the board
+ * game can now be resumed by clicking on the board
 * port to KScoreDialog
 * - there is now one highscore section for each board size
 * - the gravity option has its separate column now
- * port to KGameClock
+ * port to KGameClock to solve several issues
 
 * some changes in coding style and naming schema to be more close to the
 kdelibs style
- * some general refactorizing
+ * some general refactoring
 
 Changes in 1.6.1:
 * Remove "prefer unscaled tiles" option, as it is meaningless with SVG
--- kshisen/TODO	
+++ kshisen/TODO	
@@ -2,7 +2,6 @@
 - the highscore dialog stores the status of the gravity flag l10n'ed. This looks ugls if the player switches the game's language.
 - change the way, scores are evaluated (e.g. make gravity x1.2 instead of x2.0 and add chinese style to the evaluation)
 - get rid of the static sizeX and sizeY arrays; use Qlist<QPair<>> instead (this makes it possible to be more dynamic if it comes to board sizes
-- handle the text drawn to canvas better. currently there is no dynamic line-breaking, thus it looks bad on smaller screens.
 - solve the copyright issue (about dialog)
 - enable sounds
 - comment, comment, comment...
--- kshisen/CMakeLists.txt	
+++ kshisen/CMakeLists.txt	
@@ -4,4 +4,8 @@
 # not used as yet
 #add_subdirectory( sounds )
 
+kde4_add_app_icon( kshisen_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../hi*-app-kshisen.png" )
+
 install( FILES kshisen.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+
+kde4_install_icons( ${ICON_INSTALL_DIR} )
--- kmahjongg/layouts/flowers.desktop	
+++ kmahjongg/layouts/flowers.desktop	
@@ -32,8 +32,8 @@
 Name[uz@cyrillic]=Гуллар
 Name[vi]=Hoa 
 Name[wa]=Fleurs
-Name[x-test]=xxFlowersxx
 Name[xh]=Iintyatyambo
+Name[x-test]=xxFlowersxx
 Name[zh_TW]=花兒
 Description=A layout consisting of six flowers
 Description[de]=Ein Design aus sechs Blumen.
--- kmahjongg/layouts/triangle.desktop	
+++ kmahjongg/layouts/triangle.desktop	
@@ -38,6 +38,7 @@
 Name[zh_TW]=三角形
 Description=Triangular pyramid
 Description[ca]=Piràmide triangular
+Description[cs]=Trojúhelníková pyramida
 Description[da]=Trekantet pyramide
 Description[de]=Eine dreieckige Pyramide.
 Description[el]=Τριγωνική πυραμίδα
--- ktuberling/pics/christmas.desktop	
+++ ktuberling/pics/christmas.desktop	
@@ -1,6 +1,7 @@
 [KTuberlingTheme]
 Name=Christmas
 Name[ca]=Nadal
+Name[cs]=Vánoce
 Name[da]=Jul
 Name[de]=Weihnachten
 Name[el]=Χριστούγεννα
--- ktuberling/pics/default_theme.desktop	
+++ ktuberling/pics/default_theme.desktop	
@@ -47,7 +47,7 @@
 Name[tr]=Patates Adam
 Name[uk]=Картопляний хлопець
 Name[wa]=Monsieu Crompire
-Name[x-test]=xxPotato Guyxx
 Name[xh]=Umfana wetapile 
+Name[x-test]=xxPotato Guyxx
 Name[zh_CN]=土豆小子
 Name[zh_TW]=馬鈴薯小子
--- ktuberling/ktuberling.desktop	
+++ ktuberling/ktuberling.desktop	
@@ -48,8 +48,8 @@
 Name[tr]=Patates Adam
 Name[uk]=Картопляний хлопець
 Name[wa]=Monsieu Crompire
-Name[x-test]=xxPotato Guyxx
 Name[xh]=Umfana wetapile 
+Name[x-test]=xxPotato Guyxx
 Name[zh_CN]=土豆小子
 Name[zh_TW]=馬鈴薯小子
 GenericName=Picture Game for Children
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
--- libkdegames/carddecks/svg-penguins/index.desktop	
+++ libkdegames/carddecks/svg-penguins/index.desktop	
@@ -1,7 +1,9 @@
 [KDE Backdeck]
 Name=Penguins
+Name[cs]=Tučňáci
 Name[el]=Πιγκουίνοι
 Name[et]=Pingviinid
+Name[nb]=Pingviner
 Name[nds]=Pinguins
 Name[nn]=Pingvinar
 Name[pt]=Pinguins
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Cannot display: file marked as a binary type.
svn:mime-type = image/png
--- libkdegames/carddecks/svg-penguins/COPYRIGHT	
+++ libkdegames/carddecks/svg-penguins/COPYRIGHT	
@@ -1,10 +1,25 @@
-This PySol cardset was adapted from the Ace of Penguins 1.0.
+This vector deck was adapted from the original Penguins raster deck,
+with elements of the Paris deck.
+
+Copyright 2009 Matthew Woehlke <mw_triad@users.sourceforge.net>
+
+Paris deck SVG conversion by Richard Hoelscher.
+
+Original Tux artwork created by Larry Ewing, Simon Budig and Anja
+Gerwinski; from <http://commons.wikimedia.org/wiki/File:Tux.svg>.
+
+The raster PySol deck was adapted from the Ace of Penguins 1.0.
 http://www.delorie.com/store/ace/
 
-Copyright (C) 1998 DJ Delorie <dj@delorie.com>
-Copyright (C) 1998 Markus F.X.J. Oberhumer <markus.oberhumer@jk.uni-linz.ac.at>
+Copyright 1998 DJ Delorie <dj@delorie.com>
+Copyright 1998 Markus F.X.J. Oberhumer <markus.oberhumer@jk.uni-linz.ac.at>
 
 This cardset 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
+as published by the Free Software Foundation; either version 3 of
 the License, or (at your option) any later version.
+
+In accordance with section 7(b) of GPL3, the following notice must
+accompany any works which include the Tux graphic:
+ Original Tux artwork created by Larry Ewing, Simon Budig and Anja
+ Gerwinski.
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
--- libkdegames/carddecks/decks/deck10.desktop	
+++ libkdegames/carddecks/decks/deck10.desktop	
@@ -6,6 +6,7 @@
 Name[zh_TW]=巴黎
 Comment=Classic
 Comment[ca]=Clàssic
+Comment[cs]=Klasický
 Comment[da]=Klassisk
 Comment[de]=Klassisch
 Comment[el]=Κλασικό
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
--- libkdegames/carddecks/decks/deck18.desktop	
+++ libkdegames/carddecks/decks/deck18.desktop	
@@ -0,0 +1,8 @@
+[KDE Cards]
+Name=Tigullio International
+Name[el]=Διεθνές Tigullio
+Name[pt]=Tigullio Internacional
+Name[pt_BR]=Tigullio Internacional
+Name[sv]=Tigullio internationell
+SVG=deck18.svgz
+default=false
--- libkdegames/carddecks/decks/deck1.desktop	
+++ libkdegames/carddecks/decks/deck1.desktop	
@@ -4,6 +4,7 @@
 Name[be]=Класічны сіні
 Name[bn]=ক্লাসিক নীল
 Name[ca]=Blau clàssic
+Name[cs]=Klasická modrá
 Name[cy]=Glas Clasurol
 Name[da]=Klassisk blå
 Name[el]=Κλασσικό μπλε
@@ -21,6 +22,7 @@
 Name[is]=Klassískur blár
 Name[ko]=고전 파란색
 Name[mk]=Класично сино 
+Name[nb]=Klassisk Blå
 Name[nds]=Klass'sch Blaag
 Name[ne]=उत्कृष्ट निलो
 Name[nn]=Klassisk blå
--- libkdegames/carddecks/decks/deck2.desktop	
+++ libkdegames/carddecks/decks/deck2.desktop	
@@ -52,8 +52,8 @@
 Name[uk]=Класичний червоний
 Name[vi]=ĐềEcềEđiển 
 Name[wa]=Rodje classike
-Name[x-test]=xxClassic Redxx
 Name[xh]=Umbala obomvu wakudala
+Name[x-test]=xxClassic Redxx
 Name[zh_CN]=经典红
 Name[zh_TW]=古典紅
 SVG=deck2.svgz
--- libkdegames/carddecks/decks/deck3.desktop	
+++ libkdegames/carddecks/decks/deck3.desktop	
@@ -1,7 +1,9 @@
 [KDE Cards]
 Name=Penguin
+Name[cs]=Tučňák
 Name[el]=Πιγκουίνος
 Name[et]=Pingviin
+Name[nb]=Pingvin
 Name[nds]=Pinguin
 Name[nn]=Pingvin
 Name[pt]=Pinguim
--- libkdegames/carddecks/decks/deck5.desktop	
+++ libkdegames/carddecks/decks/deck5.desktop	
@@ -49,8 +49,8 @@
 Name[tr]=Büyük anne
 Name[uk]=Бабуся
 Name[wa]=Grand-mere
-Name[x-test]=xxGrandmaxx
 Name[xh]=Umakhulu
+Name[x-test]=xxGrandmaxx
 Name[zh_CN]=祖母
 Name[zh_TW]=祖母
 SVG=deck5.svgz
--- libkdegames/carddecks/decks/deck6.desktop	
+++ libkdegames/carddecks/decks/deck6.desktop	
@@ -52,8 +52,8 @@
 Name[uk]=Сучасний червоний
 Name[vi]=Màu đềEhiện đại 
 Name[wa]=Rodje modiene
-Name[x-test]=xxModern Redxx
 Name[xh]=Umbala omtsha obomvu 
+Name[x-test]=xxModern Redxx
 Name[zh_CN]=现代红
 Name[zh_TW]=現代紅
 SVG=deck6.svgz
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: libkdegames/carddecks/decks/deck18.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: libkdegames/carddecks/decks/deck18.svgz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
--- libkdegames/carddecks/svg-tigullio-international/index.desktop	
+++ libkdegames/carddecks/svg-tigullio-international/index.desktop	
@@ -6,5 +6,5 @@
 Name[sv]=Tigullio internationell
 Preview=queen-of-hearts.png
 SVG=tigullio-international.svgz
-Back=Paris
+Back=Tigullio International
 
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
--- libkdegames/carddecks/svg-standard/index.desktop	
+++ libkdegames/carddecks/svg-standard/index.desktop	
@@ -1,5 +1,6 @@
 [KDE Backdeck]
 Name=Standard
+Name[cs]=Standardní
 Name[el]=Τυπικό
 Name[et]=Standardne
 Name[pt]=Normal
@@ -59,8 +60,8 @@
 Comment[uk]=Типовий набір карт KDE\nліцензія GPL
 Comment[vi]=Thẻ KDE tiêu chuẩn đặt \nGPL license
 Comment[wa]=Cwårdjeus standård di KDE\ndizo licince GPL
-Comment[x-test]=xxStandard KDE card set\nGPL licensexx
 Comment[xh]=Umgangatho wekhadi le KDE iqela lekhadi \nGPL imvumelwano
+Comment[x-test]=xxStandard KDE card set\nGPL licensexx
 Comment[zh_CN]=标准 KDE 牌面\nGPL 授权
 Comment[zh_TW]=標準 KDE 牌局\nGPL 授權
 SVG=standard.svgz
--- lskat/lskat.desktop	
+++ lskat/lskat.desktop	
@@ -64,8 +64,8 @@
 GenericName[uz@cyrillic]=Қарта ўйини
 GenericName[vi]=Game thẻ 
 GenericName[wa]=Cwårdjeu
-GenericName[x-test]=xxCard Gamexx
 GenericName[xh]=Ikhadi lomdlalo
+GenericName[x-test]=xxCard Gamexx
 GenericName[zh_CN]=牌类游戏
 GenericName[zh_TW]=紙牌遊戲
 Exec=lskat
--- kjumpingcube/kjumpingcube.desktop	
+++ kjumpingcube/kjumpingcube.desktop	
@@ -17,8 +17,8 @@
 Name[sv]=Kjumpingcube
 Name[ta]=கேகுதிக்கும் கனசதுரம்
 Name[tg]=KКубикҳои Ҷиҳанда
-Name[x-test]=xxKJumpingCubexx
 Name[xh]=Ityhubhu yeKJumping
+Name[x-test]=xxKJumpingCubexx
 Name[zh_TW]=KJumpingCube 跳躍立方體
 Exec=kjumpingcube -caption "%c"
 Icon=kjumpingcube
--- klines/klines.desktop	
+++ klines/klines.desktop	
@@ -57,8 +57,8 @@
 GenericName[uk]=Тактична гра
 GenericName[vi]=Trò chơi chiến thuật 
 GenericName[wa]=Djeu di tactike
-GenericName[x-test]=xxTactical Gamexx
 GenericName[xh]=Umdlalo onamaqhinga
+GenericName[x-test]=xxTactical Gamexx
 GenericName[zh_CN]=战术游戏
 GenericName[zh_TW]=戰術遊戲
 Terminal=false
@@ -89,8 +89,8 @@
 Name[tr]=Renkli çizgiler
 Name[uk]=Кольорові лінії
 Name[wa]=Royes di coleur
-Name[x-test]=xxKolor Linesxx
 Name[xh]=Iilayini zeKolor 
+Name[x-test]=xxKolor Linesxx
 Name[zh_TW]=Kolor Lines 彩色線條
 X-DBUS-StartupType=Multi
 Categories=Qt;KDE;Game;StrategyGame;
--- kbreakout/themes/default.desktop	
+++ kbreakout/themes/default.desktop	
@@ -44,6 +44,7 @@
 Name[zh_TW]=預設
 Description=KBreakOut Default theme for KDE 4
 Description[ca]=Tema predeterminat de KBreakOut per KDE 4
+Description[cs]=Výchozí motiv pro KBreakOut v KDE 4
 Description[da]=KBreakOuts standardtema for KDE 4
 Description[de]=Das Standard-Design für KBreakout in KDE4.
 Description[el]=Προκαθορισμένο θέμα KBreakOut για το KDE4
--- kbreakout/themes/simple.desktop	
+++ kbreakout/themes/simple.desktop	
@@ -1,5 +1,6 @@
 [KGameTheme]
 Name=Simple
+Name[cs]=Jednoduché
 Name[da]=Enkelt
 Name[de]=Einfach
 Name[el]=Απλό
--- kblocks/themes/default.desktop	
+++ kblocks/themes/default.desktop	
@@ -44,6 +44,7 @@
 Name[zh_TW]=預設
 Description=KBlocks Oxygen theme for KDE 4
 Description[ca]=Tema Oxygen de KBlocks per KDE 4
+Description[cs]=Oxygen motiv pro KBlocks v KDE 4
 Description[da]=KBlocks' Oxygen-tema for KDE 4
 Description[de]=KBlocks-„Oxygen“-Design für KDE4
 Description[el]=Θέμα Oxygen του KBlocks για το KDE4
--- kblocks/kblocks.desktop	
+++ kblocks/kblocks.desktop	
@@ -9,6 +9,7 @@
 Type=Application
 X-DocPath=kblocks/index.html
 GenericName=Falling Blocks Game
+GenericName[et]=Langevate klotside mäng
 GenericName[pt]=Jogo de Blocos em Queda
 GenericName[pt_BR]=Jogo de Blocos em Queda
 GenericName[sv]=Spel med fallande block
--- kgoldrunner/src/kgrrunner.cpp	
+++ kgoldrunner/src/kgrrunner.cpp	
@@ -25,7 +25,8 @@
 #include "kgrrulebook.h"
 
 KGrRunner::KGrRunner (KGrLevelPlayer * pLevelPlayer, KGrLevelGrid * pGrid,
- int i, int j, int pSpriteId, KGrRuleBook * pRules)
+ int i, int j, const int pSpriteId,
+ KGrRuleBook * pRules, const int startDelay)
 :
 QObject (pLevelPlayer),	// Destroy runner when level is destroyed.
 levelPlayer (pLevelPlayer),
@@ -41,13 +42,26 @@
 currDirection (STAND),
 currAnimation (FALL_L),
 
- timeLeft (TickTime),
+ // The start delay is zero for the hero and 50 msec for the enemies. This
+ // gives the hero about one grid-point advantage. Without this lead, some
+ // levels become impossible, notably Challenge, 4, "Quick Off The Mark" and
+ // Curse of the Mummy, 20, "The Parting of the Red Sea".
+ timeLeft (TickTime + startDelay),
+
 leftRightSearch (true)
 {
 getRules();
 
- gridX = i * pointsPerCell;
- gridY = j * pointsPerCell;
+ gridX = i * pointsPerCell;
+ gridY = j * pointsPerCell;
+
+ // As soon as the initial timeLeft has expired (i.e. at the first tick in
+ // the hero's case and after a short delay in the enemies' case), the
+ // pointCtr will reach its maximum, the EndCell situation will occur and
+ // each runner will look for a new direction and head that way if he can.
+ pointCtr = pointsPerCell - 1;
+
+ dbgLevel = 0;
 }
 
 KGrRunner::~KGrRunner()
@@ -68,10 +82,14 @@
 {
 timeLeft -= scaledTime;
 if (timeLeft >= scaledTime) {
+ dbe3 "%d sprite %02d scaled %02d timeLeft %03d - Not Time Yet\n",
+ pointCtr, spriteId, scaledTime, timeLeft);
 return NotTimeYet;
 }
 
 if (grid->cellType (gridI, gridJ) == BRICK) {
+ dbe2 "%d sprite %02d scaled %02d timeLeft %03d - Caught in brick\n",
+ pointCtr, spriteId, scaledTime, timeLeft);
 return CaughtInBrick;
 }
 
@@ -82,9 +100,13 @@
 // TODO - Count one extra tick when turning to L or R from another dirn.
 if (pointCtr < pointsPerCell) {
 timeLeft += interval;
+ dbe2 "%d sprite %02d scaled %02d timeLeft %03d - Mid Cell\n",
+ pointCtr, spriteId, scaledTime, timeLeft);
 return MidCell;
 }
 
+ dbe2 "%d sprite %02d scaled %02d timeLeft %03d - END Cell\n",
+ pointCtr, spriteId, scaledTime, timeLeft);
 return EndCell;
 }
 
@@ -92,7 +114,7 @@
 KGrHero::KGrHero (KGrLevelPlayer * pLevelPlayer, KGrLevelGrid * pGrid,
 int i, int j, int pSpriteId, KGrRuleBook * pRules)
 :
- KGrRunner (pLevelPlayer, pGrid, i, j, pSpriteId, pRules),
+ KGrRunner (pLevelPlayer, pGrid, i, j, pSpriteId, pRules, 0),
 nuggets (0)		// KGrLevelPlayer object will call hero->setNuggets().
 {
 kDebug() << "THE HERO IS BORN at" <standOnEnemy (spriteId, gridX, gridY);
+ if ((! standingOnEnemy) && levelPlayer->heroCaught (gridX, gridY)) {
+ return DEAD;
+ }
 if (s == MidCell) {
 return NORMAL;
 }
@@ -168,6 +195,9 @@
 
 timeLeft += interval;
 
+ dbe2 "%d sprite %02d [%02d,%02d] timeLeft %03d currDir %d nextDir %d\n",
+ pointCtr, spriteId, gridI, gridJ, timeLeft, currDirection, nextDirection);
+
 if ((! onEnemy) && levelPlayer->heroCaught (gridX, gridY)) {
 return DEAD;
 }
@@ -256,7 +286,7 @@
 KGrEnemy::KGrEnemy (KGrLevelPlayer * pLevelPlayer, KGrLevelGrid * pGrid,
 int i, int j, int pSpriteId, KGrRuleBook * pRules)
 :
- KGrRunner (pLevelPlayer, pGrid, i, j, pSpriteId, pRules),
+ KGrRunner (pLevelPlayer, pGrid, i, j, pSpriteId, pRules, 50),
 nuggets (0),
 birthI (i),
 birthJ (j),
@@ -406,6 +436,9 @@
 deltaX = movement [nextDirection][X];
 deltaY = movement [nextDirection][Y];
 
+ dbe2 "%d sprite %02d [%02d,%02d] timeLeft %03d currDir %d nextDir %d\n",
+ pointCtr, spriteId, gridI, gridJ, timeLeft, currDirection, nextDirection);
+
 // If moving, occupy the next cell in the enemy's path and release this one.
 if (nextDirection != STAND) {
 // If multiple enemies move into a cell, they stack. Each enemy uses
--- kgoldrunner/src/kgrgame.cpp	
+++ kgoldrunner/src/kgrgame.cpp	
@@ -343,6 +343,10 @@
 kDebug() << "Calling the first view->changeTheme() ...";
 view->changeTheme (initialThemeFilepath);
 
+ // TODO - Remove the next 2 lines. They temporarily disable the main demo.
+ playback = false;
+ emit setAvail ("move_demo", false);
+
 if (playback && (startDemo (SYSTEM, demoPrefix, 1))) {
 // TODO - Start demo at a random level?
 startupDemo = true;		// Demo is starting.
--- kgoldrunner/src/kgrrunner.h	
+++ kgoldrunner/src/kgrrunner.h	
@@ -47,9 +47,11 @@
 * @param j The starting row-number (>=1).
 * @param pSpriteId The sprite ID of the runner, as used in animation.
 * @param pRules The rules that apply to this game and level.
+ * @param startDelay The starting-time advantage enemies give to the hero.
 */
 KGrRunner (KGrLevelPlayer * pLevelPlayer, KGrLevelGrid * pGrid,
- int i, int j, int pSpriteId, KGrRuleBook * pRules);
+ int i, int j, const int pSpriteId,
+ KGrRuleBook * pRules, const int startDelay);
 virtual ~KGrRunner();
 
 /**
--- kgoldrunner/src/kgrlevelplayer.cpp	
+++ kgoldrunner/src/kgrlevelplayer.cpp	
@@ -56,6 +56,8 @@
 digKillingTime (2)	// Cycle at which enemy/hero gets killed.
 {
 t.start(); // IDW
+
+ dbgLevel = 0;
 }
 
 int KGrLevelPlayer::playerCount = 0;
@@ -71,20 +73,20 @@
 int ch = 0;
 for (int i = 0; i <= (recIndex + 1); i ++) {
 ch = (uchar)(recording->content.at(i));
- dbe2 "%03d ", ch);
+ dbe1 "%03d ", ch);
 if (ch == 0)
 break;
 }
- dbe2 "\n%d bytes\n", recIndex + 1);
+ dbe1 "\n%d bytes\n", recIndex + 1);
 int j = 0;
 while (j < recording->draws.size()) {
 ch = (uchar)(recording->draws.at(j));
- dbe2 "%03d ", ch);
+ dbe1 "%03d ", ch);
 if (ch == 0)
 break;
 j++;
 }
- dbe2 "\n%d bytes\n", j);
+ dbe1 "\n%d bytes\n", j);
 
 // TODO - Do we need this delete?
 // while (! enemies.isEmpty()) {
@@ -394,7 +396,7 @@
 // The human player is playing now.
 if (! playback) {
 if ((pointerI == targetI) && (pointerJ == targetJ) && (recCount < 255)){
- dbe3 "T %04d recIndex %03d REC: codes %d %d %d\n",
+ dbe2 "T %04d recIndex %03d REC: codes %d %d %d\n",
 T, recIndex - 2, (uchar)(recording->content.at (recIndex-2)),
 (uchar)(recording->content.at (recIndex-1)),
 (uchar)(recording->content.at (recIndex)));
@@ -402,7 +404,7 @@
 recording->content [recIndex] = (uchar) recCount;
 }
 else {
- dbe3 "T %04d recIndex %03d REC: codes %d %d %d\n",
+ dbe2 "T %04d recIndex %03d REC: codes %d %d %d\n",
 T, recIndex - 2, (uchar)(recording->content.at (recIndex-2)),
 (uchar)(recording->content.at (recIndex-1)),
 (uchar)(recording->content.at (recIndex)));
@@ -412,7 +414,7 @@
 recording->content [recIndex] = (uchar) 1;
 recording->content [recIndex + 1] = (uchar) 0xff;
 recCount = 1;
- dbe3 "T %04d recIndex %03d REC: codes %d %d %d - NEW TARGET\n",
+ dbe2 "T %04d recIndex %03d REC: codes %d %d %d - NEW TARGET\n",
 T, recIndex - 2, pointerI, pointerJ,
 (uchar)(recording->content.at (recIndex)));
 }
@@ -456,7 +458,7 @@
 // If not the hero's first move, interrupt the previous mouse-move.
 recording->content [recIndex] =
 recording->content [recIndex] - 1;
- dbe3 "T %04d recIndex %03d REC: codes %d %d %d\n",
+ dbe2 "T %04d recIndex %03d REC: codes %d %d %d\n",
 T, recIndex - 2,
 (uchar)(recording->content.at (recIndex-2)),
 (uchar)(recording->content.at (recIndex-1)),
@@ -464,7 +466,7 @@
 recIndex++;
 }
 // Record the digging code.
- dbe3 "T %04d recIndex %03d REC: dig code %d\n",
+ dbe2 "T %04d recIndex %03d REC: dig code %d\n",
 T, recIndex, recordByte);
 recording->content [recIndex++] = recordByte;
 
@@ -507,7 +509,7 @@
 Direction KGrLevelPlayer::getDirection (int heroI, int heroJ)
 {
 int index = (playback) ? recIndex : recIndex - 2;
- dbe3 "T %04d recIndex %03d hero at [%02d, %02d] aiming at [%02d, %02d]\n",
+ dbe2 "T %04d recIndex %03d hero at [%02d, %02d] aiming at [%02d, %02d]\n",
 T, index, heroI, heroJ, targetI, targetJ);
 if ((controlMode == MOUSE) || (controlMode == LAPTOP)) {
 // If using a pointer device, calculate the hero's next direction,
@@ -673,7 +675,11 @@
 if (playback) {			// Replay a recorded move.
 if (! doRecordedMove()) {
 playback = false;
- emit interruptDemo();
+ // TODO - How to handle this case properly. emit interruptDemo();
+ // We want to continue the demo if it is the startup demo.
+ // We also want to continue to next level after a demo level
+ // that signals endLevel (DEAD) or even endLevel (NORMAL).
+ emit endLevel (WON_LEVEL);
 dbk << "END_OF_RECORDING - emit interruptDemo();";
 return;			// End of recording.
 }
@@ -696,6 +702,7 @@
 
 HeroStatus status = hero->run (scaledTime);
 if ((status == WON_LEVEL) || (status == DEAD)) {
+ // TODO - Can this unsolicited timer pause cause problems in KGrGame?
 timer->pause();
 // TODO ? If caught in a brick, brick-closing animation is unfinished.
 // Queued connection ensures KGrGame slot runs AFTER return from here.
@@ -716,13 +723,13 @@
 const bool hasGold, const bool lost)
 {
 if (hasGold) {
- dbk3 << "GOLD COLLECTED BY" << spriteId << "AT" << i << j;
+ dbk2 << "GOLD COLLECTED BY" << spriteId << "AT" << i << j;
 }
 else if (lost) {
- dbk3 << "GOLD LOST BY" << spriteId << "AT" << i << j;
+ dbk2 << "GOLD LOST BY" << spriteId << "AT" <gotGold (i, j, hasGold);		// Record pickup/drop on grid.
@@ -767,7 +774,7 @@
 reappearPos [left - 1] = temp;
 left--;
 }
- dbk3 << "Randoms" << reappearPos;
+ dbk2 << "Randoms" << reappearPos;
 reappearIndex = 0;
 }
 
@@ -811,7 +818,7 @@
 }
 }
 }
- dbk3 << "Reappear at" <getLong ((unsigned long) limit);
 // A zero-byte terminates recording->draws, so add 1 when recording ...
+ dbe2 "Draw %03d, index %04d, limit %02d\n", value, randIndex, limit);
 recording->draws [randIndex++] = value + 1;
 return value;
 }
 else {
+ dbe2 "Draw %03d, index %04d, limit %02d\n",
+ (recording->draws.at (randIndex) - 1), randIndex, limit);
 // and subtract 1 when replaying.
 return ((uchar) recording->draws.at (randIndex++) - 1);
 }
@@ -837,6 +847,8 @@
 while (true) {
 // Check for end of recording.
 if ((code == 0xff) || (code == 0)) {
+ dbe2 "T %04d recIndex %03d PLAY - END of recording\n",
+ T, recIndex);
 return false;
 }
 // Check for a key press or mouse button click.
@@ -844,7 +856,7 @@
 playState = Playing;
 code = code - 0x80;
 if ((code == DIG_LEFT) || (code == DIG_RIGHT)) {
- dbe3 "T %04d recIndex %03d PLAY dig code %d\n",
+ dbe2 "T %04d recIndex %03d PLAY dig code %d\n",
 T, recIndex, code);
 startDigging ((Direction)(code));
 }
@@ -862,7 +874,7 @@
 // targetI = code;
 // targetJ = (uchar)(recording->content [recIndex + 1]);
 recCount = (uchar)(recording->content [recIndex + 2]);
- dbe3 "T %04d recIndex %03d PLAY codes %d %d %d - NEW TARGET\n",
+ dbe2 "T %04d recIndex %03d PLAY codes %d %d %d - NEW TARGET\n",
 T, recIndex, i, j, recCount);
 // T, recIndex, targetI, targetJ, recCount);
 
@@ -871,12 +883,12 @@
 // emit setMousePos (i, j);
 }
 else {
- dbe3 "T %04d recIndex %03d PLAY codes %d %d %d\n",
+ dbe2 "T %04d recIndex %03d PLAY codes %d %d %d\n",
 T, recIndex, targetI, targetJ, recCount);
 }
 if (--recCount <= 0) {
 recIndex = recIndex + 3;
- dbe3 "T %04d recIndex %03d PLAY - next index\n",
+ dbe2 "T %04d recIndex %03d PLAY - next index\n",
 T, recIndex);
 }
 break;
--- kpat/mod3.cpp	
+++ kpat/mod3.cpp	
@@ -29,6 +29,8 @@
 
 //-------------------------------------------------------------------------//
 
+// Special pile type used for the fourth row. Automatically grabs a new card
+// from the deck when emptied.
 class Mod3Pile : public Pile
 {
 public:
@@ -36,7 +38,10 @@
 : Pile( _index, parent ) {}
 virtual void relayoutCards() {
 Pile::relayoutCards();
- if ( isEmpty() && objectName().startsWith( "stack3" ) )
+ // Don't pull cards from the deck if the deck still contains all 104
+ // cards. This prevents glitchy things from happening before the initial
+ // deal has happened.
+ if ( isEmpty() && Deck::deck()->cardsLeft() < 104 )
 {
 add( Deck::deck()->nextCard(), false );
 }
@@ -67,12 +72,10 @@
 
 for ( int r = 0; r < 4; r++ ) {
 for ( int c = 0; c < 8; c++ ) {
- stack[r][c] = new Mod3Pile ( r * 10 + c + 1, this );
- stack[r][c]->setPilePos( 2 + dist_x * c,
- 2 + dist_y * r + margin * ( r == 3 ));
-
-	 // The first 3 rows are the playing field, the fourth is the store.
+ int pileIndex = r * 10 + c + 1;
+ // The first 3 rows are the playing field, the fourth is the store.
 if ( r < 3 ) {
+ stack[r][c] = new Pile ( pileIndex, this );
 stack[r][c]->setCheckIndex( 0 );
 stack[r][c]->setTarget(true);
 stack[r][c]->setAddFlags( Pile::addSpread );
@@ -80,11 +83,15 @@
 stack[r][c]->setObjectName( QString( "stack%1_%2" ).arg( r ).arg( c ) );
 stack[r][c]->setReservedSpace( QSizeF( 10, 12.3 ) );
 } else {
+ stack[r][c] = new Mod3Pile ( pileIndex, this );
 stack[r][c]->setReservedSpace( QSizeF( 10, 18 ) );
 stack[r][c]->setAddFlags( Pile::addSpread );
 stack[r][c]->setCheckIndex( 1 );
 stack[r][c]->setObjectName( QString( "stack3_%1" ).arg( c ) );
 }
+
+ stack[r][c]->setPilePos( 2 + dist_x * c,
+ 2 + dist_y * r + margin * ( r == 3 ));
 }
 }
 
--- kpat/kpat.desktop	
+++ kpat/kpat.desktop	
@@ -67,8 +67,8 @@
 GenericName[tr]=Sabır Kart Oyunu
 GenericName[uk]=Гра картами у пасьянс
 GenericName[wa]=Cwårdjeu d' pacyince
-GenericName[x-test]=xxPatience Card Gamexx
 GenericName[xh]=Ikhadi lomdlalo wokunyamezela
+GenericName[x-test]=xxPatience Card Gamexx
 GenericName[zh_CN]=考验耐心的牌类游戏
 GenericName[zh_TW]=單人玩的紙牌遊戲
 X-DBUS-StartupType=Multi
--- bovo/gui/scene.cc	
+++ bovo/gui/scene.cc	
@@ -219,7 +219,7 @@
 QRectF boardRect(cellTopLeft(0, 0), QSizeF(m_curCellSize * NUMCOLS,
 m_curCellSize * NUMCOLS));
 if (!boardRect.contains(ev->scenePos())) {
- setPaintMarker(false);
+ removePaintMarker();
 } else {
 uint row = (uint)((ev->scenePos().y()-boardRect.y()) / m_curCellSize);
 uint col = (uint)((ev->scenePos().x()-boardRect.x()) / m_curCellSize);
@@ -228,9 +228,11 @@
 col = qMax(col, static_cast<uint>(0));
 col = qMin(static_cast<uint>(NUMCOLS-1), col);
 if (m_row != row || m_col != col || !m_paintMarker) {
- m_col = col;
- m_row = row;
- setPaintMarker(m_game->player(Coord(col, row)) == No);
+ if (m_game->player(Coord(col, row)) == No) {
+ setPaintMarker(col, row);
+ } else {
+ removePaintMarker();
+ }
 }
 }
 }
@@ -254,15 +256,32 @@
 emit move(Move(m_player, Coord(col, row)));
 }
 
-void Scene::setPaintMarker(bool enabled) {
- if (m_paintMarker || enabled) {
- m_paintMarker = enabled;
- QRectF boardRect(cellTopLeft(0, 0), QSizeF(m_curCellSize * NUMCOLS,
- m_curCellSize * NUMCOLS));
- // I really only want to repaint this and the old square!
- demandRepaint();
+void Scene::removePaintMarker() {
+ if (m_paintMarker) {
+ m_paintMarker = false;
+ QPointF topLeftOld = cellTopLeft(m_col, m_row);
+ // because Gomoku theme has larger marks than the cell
+ qreal exrtaMargin = m_curCellSize / 2.0;
+ invalidate(topLeftOld.x() - exrtaMargin, topLeftOld.y() - exrtaMargin,
+ m_curCellSize + 2 * exrtaMargin, m_curCellSize + 2 * exrtaMargin);
+ }
+}
+
+void Scene::setPaintMarker(uint col, uint row) {
+ bool paintMarkerOld = m_paintMarker;
+ QPointF topLeftOld = cellTopLeft(m_col, m_row);
+ m_paintMarker = true;
+ m_col = col;
+ m_row = row;
+ QPointF topLeftNew = cellTopLeft(m_col, m_row);
+ // because Gomoku theme has larger marks than the cell
+ qreal exrtaMargin = m_curCellSize / 2.0;
+ invalidate(topLeftNew.x() - exrtaMargin, topLeftNew.y() - exrtaMargin,
+ m_curCellSize + 2 * exrtaMargin, m_curCellSize + 2 * exrtaMargin);
+ if (paintMarkerOld) {
+ invalidate(topLeftOld.x() - exrtaMargin, topLeftOld.y() - exrtaMargin,
+ m_curCellSize + 2 * exrtaMargin, m_curCellSize + 2 * exrtaMargin);
 }
- m_paintMarker = enabled;
 }
 
 void Scene::slotPlayerTurn() {
@@ -270,25 +289,17 @@
 }
 
 void Scene::slotOposerTurn() {
- setPaintMarker(false);
+ removePaintMarker();
 activate(false);
 }
 
 void Scene::slotGameOver(const QList<Move>& win) {
- setPaintMarker(false);
+ removePaintMarker();
 m_winningMoves = win;
 setWin();
 activate(false);
 }
 
-void Scene::demandRepaint() {
- QList<QRectF> tmp;
-/** @TODO only update this square. Possible,
- * given the fact that we have x and y :) */
- tmp.push_back(QRectF(0, 0, width(), height()));
- emit changed(tmp);
-}
-
 void Scene::hint(const Move& hint) {
 destroyHint();
 m_hintItem = new HintItem(this, hint, m_animation, m_fill);
--- bovo/gui/scene.h	
+++ bovo/gui/scene.h	
@@ -67,7 +67,6 @@
 void hintTimeout();
 void destroyHint();
 void enableAnimation(bool enabled);
- void demandRepaint();
 void setWin();
 void replay();
 void killMark(Mark*);
@@ -98,7 +97,8 @@
 uint m_row;
 uint m_col;
 bool m_paintMarker;
- void setPaintMarker(bool enabled);
+ void removePaintMarker();
+ void setPaintMarker(uint col, uint row);
 qreal m_fill;
 void loadTheme(const Theme& theme);
 };
--- bovo/gui/mainwindow.cc	
+++ bovo/gui/mainwindow.cc	
@@ -242,6 +242,7 @@
 }
 
 void MainWindow::slotNewGame() {
+ m_demoMode = false;
 if (m_game != 0) {
 m_game->cancelAndWait();
 if (m_scene != 0) {
@@ -267,6 +268,7 @@
 }
 if (m_scene == 0 && (m_lastGame.isEmpty())) { //first time, demo time
 m_scene = new Scene(m_theme, m_animate);
+ m_demoMode = true;
 slotNewDemo();
 } else {
 Dimension dimension(NUMCOLS, NUMCOLS);
@@ -306,6 +308,10 @@
 }
 
 void MainWindow::slotNewDemo() {
+ if (!m_demoMode) {
+ // a new game already started, do not start demo
+ return;
+ }
 if (m_game != 0) {
 m_game->deleteLater();
 m_game = 0;
--- bovo/gui/mainwindow.h	
+++ bovo/gui/mainwindow.h	
@@ -98,6 +98,7 @@
 int m_playbackSpeed;
 QStringList m_lastGame;
 bool m_animate;
+ bool m_demoMode;
 };
 
 } /* namespace gui */
--- bomber/themes/Lava-Island.desktop	
+++ bomber/themes/Lava-Island.desktop	
@@ -23,6 +23,7 @@
 Name[zh_CN]=火山岛
 Name[zh_TW]=火山島
 Description=Stop the lava and save the day
+Description[cs]=Zastavte lávu a zachraňte den
 Description[da]=Stop lavaen og red dagen
 Description[de]=Die Lava aufhalten und den Tag retten.
 Description[el]=Σταματήστε τη λάβα και σώστε τον κόσμο
--- bomber/src/bomber.desktop	
+++ bomber/src/bomber.desktop	
@@ -13,6 +13,7 @@
 Type=Application
 Terminal=false
 GenericName=Arcade Bombing Game
+GenericName[et]=Seikluslik pommitamismäng
 GenericName[pt]=Jogo de Bombardeamento para Arcadas
 GenericName[pt_BR]=Jogo de Bombardeamento para Arcadas
 GenericName[sv]=Bombspel
--- kapman/kapman.desktop	
+++ kapman/kapman.desktop	
@@ -6,6 +6,7 @@
 Name[nn]=Kappmann
 Name[x-test]=xxKapmanxx
 GenericName=Pac-Man Clone
+GenericName[et]=Pac-Mani kloon
 GenericName[pt]=Clone do Pac-Man
 GenericName[pt_BR]=Clone do Pac-Man
 GenericName[sv]=Klon av Pac-Man
--- kapman/themes/mountain.desktop	
+++ kapman/themes/mountain.desktop	
@@ -24,6 +24,7 @@
 Name[zh_CN]=山中冒险
 Name[zh_TW]=山中冒險
 Description=Default
+Description[cs]=Výchozí
 Description[da]=Standard
 Description[de]=Standard
 Description[el]=Προκαθορισμένο

Property changes on: .
___________________________________________________________________
Added: svn:externals
   +

Places

File 4_3_BRANCH.diff of Package kdegames4 (Revision c5ad67cd2c08e127c585498afd59217f)

Places