gnome-games r7264 - in trunk: aisleriot libgames-support

[chpe svn gnome org]

Author: chpe
Date: Wed Jan 23 13:38:01 2008
New Revision: 7264
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7264&view=rev

Log:
Add stock item for "Deal cards" in aisleriot, to allow adding a themed icon later (bug #474698).


Modified:
   trunk/aisleriot/window.c
   trunk/libgames-support/games-stock.c
   trunk/libgames-support/games-stock.h

Modified: trunk/aisleriot/window.c
==============================================================================
--- trunk/aisleriot/window.c	(original)
+++ trunk/aisleriot/window.c	Wed Jan 23 13:38:01 2008
@@ -2079,7 +2079,7 @@
     { "RedoMove", GAMES_STOCK_REDO_MOVE, NULL, NULL,
       ACTION_TOOLTIP (N_("Redo the undone move")),
       G_CALLBACK (redo_cb) },
-    { "Deal", GTK_STOCK_OK /* FIXMEchpe */, _("_Deal"), "<control>D",
+    { "Deal", GAMES_STOCK_DEAL_CARDS, NULL, NULL,
       ACTION_TOOLTIP (N_("Deal next card or cards")),
       G_CALLBACK (deal_cb) },
     { "Hint", GAMES_STOCK_HINT, NULL, NULL,

Modified: trunk/libgames-support/games-stock.c
==============================================================================
--- trunk/libgames-support/games-stock.c	(original)
+++ trunk/libgames-support/games-stock.c	Wed Jan 23 13:38:01 2008
@@ -258,6 +258,7 @@
     { GAMES_STOCK_RESET,            GTK_STOCK_CLEAR },
     { GAMES_STOCK_RESTART_GAME,     GTK_STOCK_REFRESH },
     { GAMES_STOCK_UNDO_MOVE,        GTK_STOCK_UNDO },
+    { GAMES_STOCK_DEAL_CARDS,       GTK_STOCK_OK } /* FIXMEchpe */,
 #ifndef HAVE_HILDON
     { GAMES_STOCK_FULLSCREEN,       GTK_STOCK_FULLSCREEN },
     { GAMES_STOCK_LEAVE_FULLSCREEN, GTK_STOCK_LEAVE_FULLSCREEN },
@@ -303,6 +304,7 @@
     /* Translators: "_Restart" is the menu item 'Game->Restart', implies "Restart Game" */
     { GAMES_STOCK_RESTART_GAME,     N_("_Restart"),           0, 0, NULL },
     { GAMES_STOCK_UNDO_MOVE,        N_("_Undo Move"),         STOCK_ACCEL (GDK_CONTROL_MASK, 0), STOCK_ACCEL ('z', GDK_F8), NULL },
+    { GAMES_STOCK_DEAL_CARDS,       N_("_Deal"),              GDK_CONTROL_MASK, 'd', NULL },
 #ifndef HAVE_HILDON
     { GAMES_STOCK_LEAVE_FULLSCREEN, N_("_Leave Fullscreen"),  0, GDK_F11, NULL },
     { GAMES_STOCK_NETWORK_GAME,     N_("Network _Game"),      GDK_CONTROL_MASK, 'g', NULL },
@@ -315,6 +317,7 @@
 #endif
 
     /* Work around maemo brokenness wrt. stock item translations */
+    /* FIXMEchpe: this only applies to maemo3; should be fixed in maemo4 */
 #ifdef HAVE_HILDON
     { GTK_STOCK_ABOUT,              N_("_About"),             0, 0, NULL },
     { GTK_STOCK_CANCEL,             N_("_Cancel"),            0, 0, NULL },
@@ -389,7 +392,7 @@
 
 #if !GTK_CHECK_VERSION (2, 8, 0)
   /* We have to manually wrap the text, since the about dialogue cannot
-   * do it itselfbefore gtk 2.8.
+   * do it itself before gtk 2.8.
    */
   {
     char *p;

Modified: trunk/libgames-support/games-stock.h
==============================================================================
--- trunk/libgames-support/games-stock.h	(original)
+++ trunk/libgames-support/games-stock.h	Wed Jan 23 13:38:01 2008
@@ -35,6 +35,7 @@
 #define GAMES_STOCK_SCORES           "games-scores"
 #define GAMES_STOCK_PAUSE_GAME       "games-pause-game"
 #define GAMES_STOCK_RESUME_GAME      "games-resume-game"
+#define GAMES_STOCK_DEAL_CARDS       "games-stock-deal-cards"
 
 /* These use stock gtk icons */
 #define GAMES_STOCK_FULLSCREEN       "games-fullscreen"