GNOME.org
 

gnome-games r8954 - in branches/clutter-0-9: gnometris po

Author: jclinton
Date: Mon Mar 30 01:26:37 2009
New Revision: 8954
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8954&view=rev

Log:
Remove noclutter version of Gnometris; update translations to reflect

Removed:
   branches/clutter-0-9/gnometris/blockops-noclutter.cpp
   branches/clutter-0-9/gnometris/blockops-noclutter.h
   branches/clutter-0-9/gnometris/field-noclutter.cpp
   branches/clutter-0-9/gnometris/field-noclutter.h
   branches/clutter-0-9/gnometris/preview-noclutter.cpp
   branches/clutter-0-9/gnometris/preview-noclutter.h
   branches/clutter-0-9/gnometris/renderer-noclutter.cpp
   branches/clutter-0-9/gnometris/renderer-noclutter.h
Modified:
   branches/clutter-0-9/gnometris/Makefile.am
   branches/clutter-0-9/gnometris/blockops.h
   branches/clutter-0-9/gnometris/main.cpp
   branches/clutter-0-9/gnometris/tetris.cpp
   branches/clutter-0-9/gnometris/tetris.h
   branches/clutter-0-9/po/POTFILES.in
   branches/clutter-0-9/po/POTFILES.skip
   branches/clutter-0-9/po/af.po
   branches/clutter-0-9/po/am.po
   branches/clutter-0-9/po/ar.po
   branches/clutter-0-9/po/as.po
   branches/clutter-0-9/po/az.po
   branches/clutter-0-9/po/be.po
   branches/clutter-0-9/po/bg.po
   branches/clutter-0-9/po/bn.po
   branches/clutter-0-9/po/bn_IN.po
   branches/clutter-0-9/po/ca.po
   branches/clutter-0-9/po/cs.po
   branches/clutter-0-9/po/cy.po
   branches/clutter-0-9/po/da.po
   branches/clutter-0-9/po/de.po
   branches/clutter-0-9/po/dz.po
   branches/clutter-0-9/po/el.po
   branches/clutter-0-9/po/en_CA.po
   branches/clutter-0-9/po/en_GB.po
   branches/clutter-0-9/po/es.po
   branches/clutter-0-9/po/et.po
   branches/clutter-0-9/po/eu.po
   branches/clutter-0-9/po/fa.po
   branches/clutter-0-9/po/fi.po
   branches/clutter-0-9/po/fr.po
   branches/clutter-0-9/po/ga.po
   branches/clutter-0-9/po/gl.po
   branches/clutter-0-9/po/gu.po
   branches/clutter-0-9/po/he.po
   branches/clutter-0-9/po/hi.po
   branches/clutter-0-9/po/hr.po
   branches/clutter-0-9/po/hu.po
   branches/clutter-0-9/po/id.po
   branches/clutter-0-9/po/is.po
   branches/clutter-0-9/po/it.po
   branches/clutter-0-9/po/ja.po
   branches/clutter-0-9/po/ka.po
   branches/clutter-0-9/po/kn.po
   branches/clutter-0-9/po/ko.po
   branches/clutter-0-9/po/ku.po
   branches/clutter-0-9/po/lt.po
   branches/clutter-0-9/po/lv.po
   branches/clutter-0-9/po/mai.po
   branches/clutter-0-9/po/mk.po
   branches/clutter-0-9/po/ml.po
   branches/clutter-0-9/po/mn.po
   branches/clutter-0-9/po/mr.po
   branches/clutter-0-9/po/ms.po
   branches/clutter-0-9/po/nb.po
   branches/clutter-0-9/po/ne.po
   branches/clutter-0-9/po/nl.po
   branches/clutter-0-9/po/nn.po
   branches/clutter-0-9/po/oc.po
   branches/clutter-0-9/po/or.po
   branches/clutter-0-9/po/pa.po
   branches/clutter-0-9/po/pl.po
   branches/clutter-0-9/po/pt.po
   branches/clutter-0-9/po/pt_BR.po
   branches/clutter-0-9/po/ro.po
   branches/clutter-0-9/po/ru.po
   branches/clutter-0-9/po/rw.po
   branches/clutter-0-9/po/si.po
   branches/clutter-0-9/po/sk.po
   branches/clutter-0-9/po/sl.po
   branches/clutter-0-9/po/sq.po
   branches/clutter-0-9/po/sr.po
   branches/clutter-0-9/po/sr latin po
   branches/clutter-0-9/po/sv.po
   branches/clutter-0-9/po/ta.po
   branches/clutter-0-9/po/te.po
   branches/clutter-0-9/po/th.po
   branches/clutter-0-9/po/tr.po
   branches/clutter-0-9/po/uk.po
   branches/clutter-0-9/po/vi.po
   branches/clutter-0-9/po/wa.po
   branches/clutter-0-9/po/xh.po
   branches/clutter-0-9/po/zh_CN.po
   branches/clutter-0-9/po/zh_HK.po
   branches/clutter-0-9/po/zh_TW.po

Modified: branches/clutter-0-9/gnometris/Makefile.am
==============================================================================
--- branches/clutter-0-9/gnometris/Makefile.am	(original)
+++ branches/clutter-0-9/gnometris/Makefile.am	Mon Mar 30 01:26:37 2009
@@ -11,27 +11,13 @@
 	scoreframe.cpp \
 	scoreframe.h \
 	tetris.cpp \
-	tetris.h
-
-if HAVE_CLUTTER
-gnometris_SOURCES += \
+	tetris.h \
 	preview.cpp \
 	preview.h \
 	blockops.cpp \
 	blockops.h \
 	renderer.cpp \
 	renderer.h
-else
-gnometris_SOURCES += \
-	field-noclutter.cpp \
-	field-noclutter.h \
-	preview-noclutter.cpp \
-	preview-noclutter.h \
-	blockops-noclutter.cpp \
-	blockops-noclutter.h \
-	renderer-noclutter.cpp \
-	renderer-noclutter.h
-endif
 
 gnometris_CPPFLAGS = \
 	-I$(top_srcdir) \
@@ -39,10 +25,14 @@
 
 gnometris_CXXFLAGS = \
 	$(GTK_CFLAGS) \
+	$(CLUTTER_CFLAGS) \
+	$(CLUTTER_GTK_CFLAGS) \
 	$(AM_CXXFLAGS)
 
 gnometris_LDADD = \
 	$(top_builddir)/libgames-support/libgames-support.la \
+	$(CLUTTER_LIBS) \
+	$(CLUTTER_GTK_LIBS) \
 	$(GTK_LIBS) \
 	$(INTLLIBS)
 
@@ -52,7 +42,7 @@
 endif
 
 if HAVE_RSVG
-gnometris_CXXFLAGS += $(RSVG_CFLAGS)
+gnometris_CXXFLAGS += $(RSVG_CFLAGS) 
 gnometris_LDADD += $(RSVG_LIBS)
 endif
 
@@ -61,36 +51,6 @@
 gnometris_LDADD += $(GTHREAD_LIBS)
 endif
 
-if HAVE_CLUTTER
-#noinst_PROGRAMS = gnometris-noclutter
-
-#gnometris_noclutter_SOURCES = \
-#	main.cpp \
-#	blocks.cpp \
-#	blocks.h \
-#	preview-noclutter.cpp \
-#	preview-noclutter.h \
-#	blockops-noclutter.cpp \
-#	blockops-noclutter.h \
-#	field-noclutter.cpp \
-#	field-noclutter.h \
-#	highscores.cpp \
-#	highscores.h \
-#	renderer-noclutter.cpp \
-#	renderer-noclutter.h \
-#	scoreframe.cpp \
-#	scoreframe.h \
-#	tetris.cpp \
-#	tetris.h
-
-#gnometris_noclutter_CPPFLAGS = $(gnometris_CPPFLAGS) -UHAVE_CLUTTER
-#gnometris_noclutter_CXXFLAGS = $(gnometris_CXXFLAGS) -UHAVE_CLUTTER
-#gnometris_noclutter_LDADD = $(gnometris_LDADD)
-gnometris_CPPFLAGS += -DHAVE_CLUTTER
-gnometris_CXXFLAGS += $(CLUTTER_CFLAGS) $(CLUTTER_GTK_CFLAGS)
-gnometris_LDADD += $(CLUTTER_LIBS) $(CLUTTER_GTK_LIBS)
-endif
-
 pixmapdir = $(pkgdatadir)/gnometris/pixmaps
 pixmap_DATA = gnometris.svg
 

Modified: branches/clutter-0-9/gnometris/blockops.h
==============================================================================
--- branches/clutter-0-9/gnometris/blockops.h	(original)
+++ branches/clutter-0-9/gnometris/blockops.h	Mon Mar 30 01:26:37 2009
@@ -24,7 +24,6 @@
 
 #include "tetris.h"
 #include "renderer.h"
-
 #include <clutter/clutter.h>
 
 enum SlotType {

Modified: branches/clutter-0-9/gnometris/main.cpp
==============================================================================
--- branches/clutter-0-9/gnometris/main.cpp	(original)
+++ branches/clutter-0-9/gnometris/main.cpp	Mon Mar 30 01:26:37 2009
@@ -25,10 +25,7 @@
 #include <libgames-support/games-sound.h>
 #include <libgames-support/games-conf.h>
 #include <libgames-support/games-runtime.h>
-
-#ifdef HAVE_CLUTTER
 #include <clutter-gtk/gtk-clutter-embed.h>
-#endif
 
 #include "tetris.h"
 
@@ -54,9 +51,7 @@
 	GOptionContext *context = g_option_context_new (NULL);
 
 	g_option_context_add_group (context, gtk_get_option_group (TRUE));
-#ifdef HAVE_CLUTTER
 	g_option_context_add_group (context, clutter_get_option_group_without_init ());
-#endif
 	g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
 	games_sound_add_option_group (context);
 
@@ -74,13 +69,11 @@
 
 	games_conf_initialise ("Gnometris");
 
-#ifdef HAVE_CLUTTER
         if (gtk_clutter_init_with_args (NULL, NULL, NULL, NULL, NULL, &error) != CLUTTER_INIT_SUCCESS) {
 		g_printerr ("Failed to initialise clutter: %s\n", error->message);
 		g_error_free (error);
 		return 1;
 	}
-#endif
 
 	Tetris *t = new Tetris(cmdlineLevel);
 

Modified: branches/clutter-0-9/gnometris/tetris.cpp
==============================================================================
--- branches/clutter-0-9/gnometris/tetris.cpp	(original)
+++ branches/clutter-0-9/gnometris/tetris.cpp	Mon Mar 30 01:26:37 2009
@@ -42,17 +42,9 @@
 #include "blocks.h"
 #include "scoreframe.h"
 #include "highscores.h"
-
-#ifdef HAVE_CLUTTER
 #include "preview.h"
 #include "renderer.h"
 #include "blockops.h"
-#else
-#include "preview-noclutter.h"
-#include "field-noclutter.h"
-#include "renderer-noclutter.h"
-#include "blockops-noclutter.h"
-#endif
 
 int LINES = 20;
 int COLUMNS = 14;
@@ -89,9 +81,6 @@
 	timeoutId(0),
 	onePause(false),
 	inPlay(false),
-#ifndef HAVE_CLUTTER
-	useTarget(false),
-#endif
 	bgimage(0),
 	setupdialog(0),
 	cmdlineLevel(cmdlLevel),
@@ -188,12 +177,7 @@
 	games_conf_add_window (GTK_WINDOW (w), KEY_SAVED_GROUP);
 
 	preview = new Preview ();
-#ifdef HAVE_CLUTTER
 	field = new BlockOps ();
-#else
-	field = new Field();
-	field->setUseTarget (false);
-#endif
 
 	initOptions ();
 
@@ -446,10 +430,6 @@
 
 	games_sound_enable (confGetBoolean (KEY_OPTIONS_GROUP, KEY_SOUND, TRUE));
 
-#ifndef HAVE_CLUTTER
-	useTarget = confGetBoolean (KEY_OPTIONS_GROUP, KEY_USE_TARGET, FALSE);
-#endif
-
 	do_preview = confGetBoolean (KEY_OPTIONS_GROUP, KEY_DO_PREVIEW, TRUE);
 
 	if (preview) {
@@ -500,9 +480,6 @@
 
 		if (theme_preview) {
 			theme_preview->setTheme (themeno);
-#ifndef HAVE_CLUTTER
-			gtk_widget_queue_draw(theme_preview->getWidget());
-#endif
 		}
 	}
 
@@ -551,21 +528,6 @@
 			       ThemeTable[t->themeno].id);
 }
 
-#ifndef HAVE_CLUTTER
-void
-Tetris::setTarget (GtkWidget *widget, void *data)
-{
-	Tetris *t;
-
-	t = (Tetris *)data;
-
-	t->useTarget = GTK_TOGGLE_BUTTON (widget)->active;
-
-	games_conf_set_boolean (KEY_OPTIONS_GROUP, KEY_USE_TARGET,
-				t->useTarget);
-}
-#endif
-
 void
 Tetris::lineFillHeightChanged (GtkWidget *spin, gpointer data)
 {
@@ -741,12 +703,6 @@
 			    0, 0, 0);
 
 	t->useTargetToggle = gtk_check_button_new_with_mnemonic (_("Show _where the block will land"));
-#ifndef HAVE_CLUTTER
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (t->useTargetToggle),
-				      t->useTarget);
-	g_signal_connect (t->useTargetToggle, "clicked",
-			  G_CALLBACK (setTarget), d);
-#endif
  	gtk_box_pack_start (GTK_BOX (fvbox), t->useTargetToggle,
 			    0, 0, 0);
 
@@ -810,11 +766,7 @@
 	t->theme_preview->setTheme (t->themeno);
 	gtk_box_pack_start(GTK_BOX(fvbox), t->theme_preview->getWidget(), TRUE, TRUE, 0);
 
-#ifndef HAVE_CLUTTER
-	t->theme_preview->previewBlock(4, 0, 0);
-#else
 	t->theme_preview->previewBlock(4, 0);
-#endif
 
 	gtk_widget_show_all (t->setupdialog);
 	gtk_action_set_sensitive(t->new_game_action, FALSE);
@@ -913,20 +865,12 @@
 	if (t->onePause)
 	{
 		t->onePause = false;
-#ifdef HAVE_CLUTTER
 		t->field->drawMessage();
-#else
-		t->field->redraw();
-#endif
 	}
 	else
 	{
 		bool res = t->field->moveBlockDown();
 
-#ifndef HAVE_CLUTTER
-		t->field->redraw();
-#endif
-
 		if (res)
 		{
 			t->manageFallen();
@@ -990,10 +934,6 @@
 		}
 	}
 
-#ifndef HAVE_CLUTTER
-	t->field->redraw();
-#endif
-
 	return res;
 }
 
@@ -1242,14 +1182,8 @@
 {
 	if (field->generateFallingBlock())
 	{
-#ifndef HAVE_CLUTTER
-		field->putBlockInField(false);
-		preview->previewBlock(blocknr_next, rot_next, color_next);
-		gtk_widget_queue_draw(preview->getWidget());
-#else
 		field->putBlockInField(FALLING);
 		preview->previewBlock(blocknr_next, color_next);
-#endif
 		onePause = true;
 	}
 	else
@@ -1273,12 +1207,7 @@
 	color_next = -1;
 	blocknr_next = -1;
 	rot_next = -1;
-#ifndef HAVE_CLUTTER
-	preview->previewBlock(-1, -1, -1);
-	gtk_widget_queue_draw(preview->getWidget());
-#else
 	preview->previewBlock(-1, -1);
-#endif
 	field->hidePauseMessage();
 	field->showGameOverMessage();
 	games_sound_play ("gameover");
@@ -1289,10 +1218,6 @@
 		int pos = high_scores->add (scoreFrame->getScore());
 		high_scores->show (GTK_WINDOW (w), pos);
 	}
-
-#ifndef HAVE_CLUTTER
-	field->setUseTarget (false);
-#endif
 }
 
 int
@@ -1320,10 +1245,6 @@
 	t->scoreFrame->setLevel(level);
 	t->scoreFrame->setStartingLevel(level);
 
-#ifndef HAVE_CLUTTER
-	t->field->setUseTarget (t->useTarget);
-#endif
-
 	t->generateTimer (level);
 	t->field->emptyField(t->line_fill_height,t->line_fill_prob);
 
@@ -1331,15 +1252,8 @@
 	t->paused = false;
 
 	t->field->generateFallingBlock();
-#ifndef HAVE_CLUTTER
-	t->field->redraw();
-
-	t->preview->previewBlock(blocknr_next, rot_next, color_next);
-	gtk_widget_queue_draw(t->preview->getWidget());
-#else
 	t->field->putBlockInField(FALLING);
 	t->preview->previewBlock(blocknr_next, color_next);
-#endif
 
 	gtk_action_set_visible(t->pause_action, TRUE);
 	gtk_action_set_visible(t->resume_action, FALSE);

Modified: branches/clutter-0-9/gnometris/tetris.h
==============================================================================
--- branches/clutter-0-9/gnometris/tetris.h	(original)
+++ branches/clutter-0-9/gnometris/tetris.h	Mon Mar 30 01:26:37 2009
@@ -65,9 +65,6 @@
 
 extern bool random_block_colors;
 
-#ifndef HAVE_CLUTTER
-class Field;
-#endif
 class Preview;
 class BlockOps;
 class ScoreFrame;
@@ -95,11 +92,7 @@
 	char *defaultPixmap;
 	gint themeno;
 
-#ifdef HAVE_CLUTTER
 	BlockOps *field;
-#else
-	Field *field;
-#endif
 	Preview *preview;
 	ScoreFrame *scoreFrame;
 	HighScores *high_scores;

Modified: branches/clutter-0-9/po/POTFILES.in
==============================================================================
--- branches/clutter-0-9/po/POTFILES.in	(original)
+++ branches/clutter-0-9/po/POTFILES.in	Mon Mar 30 01:26:37 2009
@@ -219,11 +219,11 @@
 gnobots2/menu.c
 gnobots2/properties.c
 gnobots2/statusbar.c
-gnometris/field-noclutter.cpp
+gnometris/field.cpp
 gnometris/gnometris.desktop.in.in
 gnometris/gnometris.schemas.in
 gnometris/main.cpp
-gnometris/renderer-noclutter.cpp
+gnometris/renderer.cpp
 gnometris/scoreframe.cpp
 gnometris/tetris.cpp
 gnometris/highscores.cpp

Modified: branches/clutter-0-9/po/POTFILES.skip
==============================================================================
--- branches/clutter-0-9/po/POTFILES.skip	(original)
+++ branches/clutter-0-9/po/POTFILES.skip	Mon Mar 30 01:26:37 2009
@@ -10,8 +10,6 @@
 gnome-sudoku/gnome-sudoku.desktop.in
 gnome-sudoku/src/lib/defaults.py
 gnometris/gnometris.desktop.in
-gnometris/blockops.cpp
-gnometris/renderer.cpp
 gnomine/gnomine.desktop.in
 gnotravex/gnotravex.desktop.in
 gnotski/gnotski.desktop.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]