[Pioneers-commits] r8 - trunk/client/gtk

[kemm at garage.maemo.org]

Author: kemm
Date: 2008-02-17 22:51:07 +0200 (Sun, 17 Feb 2008)
New Revision: 8

Modified:
   trunk/client/gtk/gui.c
Log:
* hotkeys
* fullscreen mode



Modified: trunk/client/gtk/gui.c
===================================================================
--- trunk/client/gtk/gui.c	2008-02-17 18:17:18 UTC (rev 7)
+++ trunk/client/gtk/gui.c	2008-02-17 20:51:07 UTC (rev 8)
@@ -118,6 +118,7 @@
 static gint resource_pixmap_res = 0;
 
 static void gui_set_toolbar_visible(void);
+static void gui_toggle_fullscreen(void);
 static void gui_toolbar_show_accelerators(gboolean show_accelerators);
 
 static void game_new_cb(void)
@@ -201,6 +202,7 @@
 }
 
 static void showhide_toolbar_cb(void);
+static void toggle_fullscreen_cb(void);
 static void preferences_cb(void);
 
 static void help_about_cb(void);
@@ -233,16 +235,16 @@
 	{"GameQuit", GTK_STOCK_QUIT, N_("_Quit"), "<control>Q",
 	 N_("Quit the program"), game_quit_cb},
 	{"ActionsMenu", NULL, N_("_Actions"), NULL, NULL, NULL},
-	{"RollDice", PIONEERS_PIXMAP_DICE, N_("Roll Dice"), "F1",
+	{"RollDice", PIONEERS_PIXMAP_DICE, N_("Roll Dice"), "Return",
 	 N_("Roll the dice"), roll_dice_cb},
 	{"Trade", PIONEERS_PIXMAP_TRADE, N_("Trade"), "F2", N_("Trade"),
 	 trade_cb},
 	{"Undo", GTK_STOCK_UNDO, N_("Undo"), "F3", N_("Undo"), undo_cb},
-	{"Finish", PIONEERS_PIXMAP_FINISH, N_("Finish"), "F4",
+	{"Finish", PIONEERS_PIXMAP_FINISH, N_("Finish"), NULL,
 	 N_("Finish"), finish_cb},
 	{"BuildRoad", PIONEERS_PIXMAP_ROAD, N_("Road"), "F5",
 	 N_("Build a road"), build_road_cb},
-	{"BuildShip", PIONEERS_PIXMAP_SHIP, N_("Ship"), "F6",
+	{"BuildShip", PIONEERS_PIXMAP_SHIP, N_("Ship"), NULL,
 	 N_("Build a ship"), build_ship_cb},
 	{"MoveShip", PIONEERS_PIXMAP_SHIP_MOVEMENT, N_("Move Ship"), "F7",
 	 N_("Move a ship"), move_ship_cb},
@@ -273,7 +275,9 @@
 /* Toggle items */
 static GtkToggleActionEntry toggle_entries[] = {
 	{"ShowHideToolbar", NULL, N_("_Toolbar"), NULL,
-	 N_("Show or hide the toolbar"), showhide_toolbar_cb, TRUE}
+        N_("Show or hide the toolbar"), showhide_toolbar_cb, TRUE},
+    {"Fullscreen", NULL, N_("_Fullscreen"), "F6",
+        N_("Toggle fullscreen"), toggle_fullscreen_cb, FALSE}
 };
 
 /* *INDENT-OFF* */
@@ -312,6 +316,7 @@
 "    </menu>"
 "    <menu action='SettingsMenu'>"
 "      <menuitem action='ShowHideToolbar'/>"
+"      <menuitem action='Fullscreen'/>"
 "      <menuitem action='Preferences'/>"
 "    </menu>"
 "    <menu action='HelpMenu'>"
@@ -838,6 +843,11 @@
 	gui_set_toolbar_visible();
 }
 
+static void toggle_fullscreen_cb(void)
+{
+    gui_toggle_fullscreen();
+}
+
 static void toolbar_shortcuts_cb(void)
 {
 	gui_toolbar_show_accelerators(!toolbar_show_accelerators);
@@ -1147,6 +1157,23 @@
 	g_slist_free(list);
 }
 
+/** Toggle fullscreen */
+static void gui_toggle_fullscreen(void)
+{
+    gboolean visible;
+
+    visible = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION
+                                           (gtk_ui_manager_get_action
+                                            (ui_manager,
+                                             "ui/MainMenu/SettingsMenu/Fullscreen")));
+
+    if (visible) {
+        gtk_window_fullscreen(GTK_WINDOW(app_window));
+    } else {
+        gtk_window_unfullscreen(GTK_WINDOW(app_window));
+    }
+}
+
 /** Show the accelerators in the toolbar */
 static void gui_toolbar_show_accelerators(gboolean show_accelerators)
 {