[gnome-games/sudoku-tube: 55/55] Merge branch 'master' into work
- From: Zhang Sen <zhangsen src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-games/sudoku-tube: 55/55] Merge branch 'master' into work
- Date: Sat, 5 Sep 2009 08:05:23 +0000 (UTC)
commit bf23b22b6d10895254270df8d280250fc624c6ee
Merge: 4bb5489... 6ee82c2...
Author: Zhang Sen <zh jesse gmail com>
Date: Sat Sep 5 16:04:26 2009 +0800
Merge branch 'master' into work
aisleriot/board-noclutter.c | 95 +-
aisleriot/game.c | 2 +
aisleriot/help/de/de.po | 1174 +++--
blackjack/src/blackjack.cpp | 2 +-
configure.in | 10 +-
glchess/data/glchess.ui | 6 +-
glchess/src/lib/ai.py | 22 +-
glchess/src/lib/cecp.py | 23 +-
glchess/src/lib/chess/pgn.py | 2 +-
glchess/src/lib/history.py | 2 +-
glchess/src/lib/main.py | 2 +-
glchess/src/lib/network.py | 4 +-
glchess/src/lib/scene/opengl/png.py | 2 +-
glchess/src/lib/scene/opengl/texture.py | 2 +-
gnibbles/main.c | 1 +
gnobots2/Makefile.am | 15 +-
gnobots2/graphics.c | 8 +-
gnobots2/properties.c | 2 +-
gnome-sudoku/src/lib/printing.py | 2 +-
gnome-sudoku/src/lib/sudoku_thumber.py | 12 +-
gnometris/Makefile.am | 4 +-
gnometris/blockops.cpp | 261 +-
gnometris/blockops.h | 43 +-
gnometris/blocks-cache.cpp | 389 ++
gnometris/blocks-cache.h | 70 +
gnometris/blocks.cpp | 86 +
gnometris/blocks.h | 37 +
gnometris/preview.cpp | 90 +-
gnometris/preview.h | 11 +-
gnometris/renderer.cpp | 90 +-
gnometris/renderer.h | 25 +-
gnometris/tetris.cpp | 4 +-
gnometris/tetris.h | 2 +-
gnomine/gnomine.c | 25 +-
libgames-support/Makefile.am | 6 +-
libgames-support/games-conf.c | 1 +
libgames-support/games-debug.c | 1 +
libgames-support/games-debug.h | 7 +-
libgames-support/games-gridframe.c | 5 +-
libgames-support/games-gtk-compat.h | 48 +
lightsoff/help/Makefile.am | 2 +-
lightsoff/help/de/de.po | 387 ++
m4/shave.m4 | 99 -
po/LINGUAS | 2 +
po/bg.po | 3694 +++++++-----
po/br.po | 9479 +++++++++++++++++++++++++++++
po/ca.po | 3933 +++++++-----
po/ca valencia po |10044 +++++++++++++++++++++++++++++++
po/et.po | 17 +-
po/eu.po | 3791 +++++++-----
po/fr.po | 444 +-
po/gl.po | 184 +-
po/gu.po | 4104 +++++++------
po/kn.po | 38 +-
po/pt.po | 4259 +++++++------
po/pt_BR.po | 3817 +++++++-----
po/sr.po | 5439 ++++++++++-------
po/sr latin po | 5439 ++++++++++-------
po/ta.po | 378 +-
po/te.po | 6006 ++++++++++---------
po/tr.po | 5619 +++++++++++-------
shave-libtool.in | 109 -
shave.in | 102 -
63 files changed, 48807 insertions(+), 21172 deletions(-)
---
diff --cc gnome-sudoku/src/lib/printing.py
index bcbcc2c,0150b74..068d5a9
--- a/gnome-sudoku/src/lib/printing.py
+++ b/gnome-sudoku/src/lib/printing.py
@@@ -85,10 -85,10 +85,10 @@@ class SudokuPrinter
cr.move_to(left, top - height / 2)
cr.show_text(label)
- if isinstance(sudoku, gsudoku.SudokuGameDisplay):
+ if isinstance(sudoku, model.SudokuModel):
sudoku = sudoku.grid
- sudoku_thumber.draw_sudoku (cr, sudoku.grid, None, best_square_size, left, top)
+ sudoku_thumber.draw_sudoku (cr, sudoku.grid, None, best_square_size, left, top, for_printing = True)
if pos[0] < best_fit[0]:
left = left + best_square_size + margin
pos[0] += 1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]