cleaning fremantle gui

diff --git a/debian/changelog b/debian/changelog
index f56b11c..6c9573f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+drnoksnes (1.3.1) unstable; urgency=low
+
+  * Fixed issue with Fremantle player 2 GUI.
+
+ -- Javier S. Pedro <maemo@javispedro.com>  Fri, 19 Feb 2010 16:13:04 +0100
+
 drnoksnes (1.3.0) unstable; urgency=low
 
   * Diablo config dialogs updated.

diff --git a/gui/i18n/de.po b/gui/i18n/de.po
index 5163a4c..4b27ce0 100644 (file)
--- a/gui/i18n/de.po
+++ b/gui/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drnoksnes\n"
 "Report-Msgid-Bugs-To: maemo@javispedro.com\n"
-"POT-Creation-Date: 2010-02-08 20:56+0100\n"
+"POT-Creation-Date: 2010-02-19 16:14+0100\n"
 "PO-Revision-Date: 2010-02-10 09:17+0100\n"
 "Last-Translator: Philipp Zabel <philipp.zabel@gmail.com>\n"
 "Language-Team: German\n"
@@ -41,8 +41,7 @@ msgstr "Ziel-Bildwiederholrate"
 msgid "Show while in game"
 msgstr "Im Spiel anzeigen"
 
-#: plugin.c:295
-#: plugin.c:313
+#: plugin.c:295 plugin.c:313
 msgid "Turbo mode"
 msgstr "Turbomodus"
 
@@ -54,8 +53,7 @@ msgstr "Ton einschalten"
 msgid "Display framerate"
 msgstr "Bildwiederholrate anzeigen"
 
-#: plugin.c:334
-#: settings.c:237
+#: plugin.c:334 settings.c:237
 msgid "Accurate graphics"
 msgstr "Akkurate Grafik"
 
@@ -63,18 +61,15 @@ msgstr "Akkurate Grafik"
 msgid "Framerate:"
 msgstr "Bildwiederholrate:"
 
-#: plugin.c:347
-#: settings.c:269
+#: plugin.c:347 settings.c:269
 msgid "No speedhacks"
 msgstr "Keine Speedhacks"
 
-#: plugin.c:348
-#: settings.c:270
+#: plugin.c:348 settings.c:270
 msgid "Safe hacks only"
 msgstr "Nur sichere Hacks"
 
-#: plugin.c:349
-#: settings.c:271
+#: plugin.c:349 settings.c:271
 msgid "All speedhacks"
 msgstr "Alle Speedhacks"
 
@@ -82,18 +77,15 @@ msgstr "Alle Speedhacks"
 msgid "Settings…"
 msgstr "Einstellungen..."
 
-#: plugin.c:448
-#: plugin.c:457
+#: plugin.c:448 plugin.c:457
 msgid "About…"
 msgstr "Über..."
 
-#: plugin.c:456
-#: settings.c:190
+#: plugin.c:456 settings.c:190
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: plugin.c:466
-#: settings.c:209
+#: plugin.c:466 settings.c:209
 msgid "Controls"
 msgstr "Steuerung"
 
@@ -134,13 +126,11 @@ msgstr "Spieler %d Steuerung"
 msgid "Keys"
 msgstr "Tasten"
 
-#: controls.c:197
-#: controls.c:269
+#: controls.c:197 controls.c:269
 msgid "Enable keyboard"
 msgstr "Tastatur aktivieren"
 
-#: controls.c:204
-#: controls.c:270
+#: controls.c:204 controls.c:270
 msgid "Configure keys…"
 msgstr "Tastenbelegung..."
 
@@ -148,13 +138,11 @@ msgstr "Tastenbelegung..."
 msgid "Touchscreen"
 msgstr "Touchscreen"
 
-#: controls.c:217
-#: controls.c:282
+#: controls.c:217 controls.c:282
 msgid "Enable touchscreen buttons"
 msgstr "Bildschirmtasten aktivieren"
 
-#: controls.c:224
-#: controls.c:284
+#: controls.c:224 controls.c:284
 msgid "Show on-screen button grid"
 msgstr "Tastengitter anzeigen"
 
@@ -179,9 +167,7 @@ msgstr "Spieler %d Tasten"
 msgid "Defaults"
 msgstr "Standard"
 
-#: settings.c:51
-#: settings.c:58
-#: settings.c:60
+#: settings.c:51 settings.c:58 settings.c:60
 msgid "2x zoom"
 msgstr "2x Vergrößerung"
 
@@ -213,13 +199,11 @@ msgstr "Spieler 2"
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: settings.c:244
-#: settings.c:307
+#: settings.c:244 settings.c:309
 msgid "Pause game in the background"
 msgstr "Spiel im Hintergrund anhalten"
 
-#: settings.c:251
-#: settings.c:302
+#: settings.c:251 settings.c:304
 msgid "Zoom"
 msgstr "Zoom"
 
@@ -261,4 +245,3 @@ msgstr "Schnell speichern 2"
 
 #~ msgid "Controls…"
 #~ msgstr "Steuerung..."
-

diff --git a/gui/i18n/drnoksnes_plugin.pot b/gui/i18n/drnoksnes_plugin.pot
index ca83ab7..1293057 100644 (file)
--- a/gui/i18n/drnoksnes_plugin.pot
+++ b/gui/i18n/drnoksnes_plugin.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: DrNokSnes 1.3.0\n"
+"Project-Id-Version: DrNokSnes 1.3.1\n"
 "Report-Msgid-Bugs-To: maemo@javispedro.com\n"
-"POT-Creation-Date: 2010-02-08 20:56+0100\n"
+"POT-Creation-Date: 2010-02-19 16:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -198,11 +198,11 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
-#: settings.c:244 settings.c:307
+#: settings.c:244 settings.c:309
 msgid "Pause game in the background"
 msgstr ""
 
-#: settings.c:251 settings.c:302
+#: settings.c:251 settings.c:304
 msgid "Zoom"
 msgstr ""
 

diff --git a/gui/i18n/es.po b/gui/i18n/es.po
index 749c050..ec7c128 100644 (file)
--- a/gui/i18n/es.po
+++ b/gui/i18n/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrNokSnes 1.3.0\n"
 "Report-Msgid-Bugs-To: maemo@javispedro.com\n"
-"POT-Creation-Date: 2010-02-08 20:11+0100\n"
+"POT-Creation-Date: 2010-02-19 16:14+0100\n"
 "PO-Revision-Date: 2010-02-08 20:56+0100\n"
 "Last-Translator: Javier <javier@javispedro.com>\n"
 "Language-Team: Spanish <maemo@javispedro.com>\n"
@@ -42,8 +42,7 @@ msgstr "Velocidad objetivo"
 msgid "Show while in game"
 msgstr "Mostrar durante el juego"
 
-#: plugin.c:295
-#: plugin.c:313
+#: plugin.c:295 plugin.c:313
 msgid "Turbo mode"
 msgstr "Modo Turbo"
 
@@ -55,8 +54,7 @@ msgstr "Activar sonido"
 msgid "Display framerate"
 msgstr "Mostrar velocidad"
 
-#: plugin.c:334
-#: settings.c:237
+#: plugin.c:334 settings.c:237
 msgid "Accurate graphics"
 msgstr "Mejores gráficos"
 
@@ -64,18 +62,15 @@ msgstr "Mejores gráficos"
 msgid "Framerate:"
 msgstr "Velocidad:"
 
-#: plugin.c:347
-#: settings.c:269
+#: plugin.c:347 settings.c:269
 msgid "No speedhacks"
 msgstr "Sin speedhacks"
 
-#: plugin.c:348
-#: settings.c:270
+#: plugin.c:348 settings.c:270
 msgid "Safe hacks only"
 msgstr "Sólo hacks seguros"
 
-#: plugin.c:349
-#: settings.c:271
+#: plugin.c:349 settings.c:271
 msgid "All speedhacks"
 msgstr "Todos los hacks"
 
@@ -83,18 +78,15 @@ msgstr "Todos los hacks"
 msgid "Settings…"
 msgstr "Ajustes…"
 
-#: plugin.c:448
-#: plugin.c:457
+#: plugin.c:448 plugin.c:457
 msgid "About…"
 msgstr "Acerca de…"
 
-#: plugin.c:456
-#: settings.c:190
+#: plugin.c:456 settings.c:190
 msgid "Settings"
 msgstr "Ajustes"
 
-#: plugin.c:466
-#: settings.c:209
+#: plugin.c:466 settings.c:209
 msgid "Controls"
 msgstr "Controles"
 
@@ -135,13 +127,11 @@ msgstr "Controles del jugador %d"
 msgid "Keys"
 msgstr "Teclas"
 
-#: controls.c:197
-#: controls.c:269
+#: controls.c:197 controls.c:269
 msgid "Enable keyboard"
 msgstr "Activar teclado"
 
-#: controls.c:204
-#: controls.c:270
+#: controls.c:204 controls.c:270
 msgid "Configure keys…"
 msgstr "Configurar teclas…"
 
@@ -149,13 +139,11 @@ msgstr "Configurar teclas…"
 msgid "Touchscreen"
 msgstr "Pantalla táctil"
 
-#: controls.c:217
-#: controls.c:282
+#: controls.c:217 controls.c:282
 msgid "Enable touchscreen buttons"
 msgstr "Activar controles en pantalla"
 
-#: controls.c:224
-#: controls.c:284
+#: controls.c:224 controls.c:284
 msgid "Show on-screen button grid"
 msgstr "Mostrar controles en pantalla"
 
@@ -180,9 +168,7 @@ msgstr "Teclas del jugador %d"
 msgid "Defaults"
 msgstr "Por defecto"
 
-#: settings.c:51
-#: settings.c:58
-#: settings.c:60
+#: settings.c:51 settings.c:58 settings.c:60
 msgid "2x zoom"
 msgstr "Zoom 2x"
 
@@ -214,13 +200,11 @@ msgstr "Jugador 2"
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: settings.c:244
-#: settings.c:307
+#: settings.c:244 settings.c:309
 msgid "Pause game in the background"
 msgstr "Pausar juego en segundo plano"
 
-#: settings.c:251
-#: settings.c:302
+#: settings.c:251 settings.c:304
 msgid "Zoom"
 msgstr "Zoom"
 
@@ -262,4 +246,3 @@ msgstr "Guardado rápido 2"
 
 #~ msgid "Controls…"
 #~ msgstr "Controles…"
-

diff --git a/gui/i18n/pl.po b/gui/i18n/pl.po
index 3d73f50..631e106 100644 (file)
--- a/gui/i18n/pl.po
+++ b/gui/i18n/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drnoksnes\n"
 "Report-Msgid-Bugs-To: maemo@javispedro.com\n"
-"POT-Creation-Date: 2010-02-08 20:56+0100\n"
+"POT-Creation-Date: 2010-02-19 16:14+0100\n"
 "PO-Revision-Date: 2010-02-16 23:12+0100\n"
 "Last-Translator: Tomasz Dominikowski <dominikowski@gmail.com>\n"
 "Language-Team: Polish <dominikowski@gmail.com>\n"
@@ -41,8 +41,7 @@ msgstr "Docel. liczba kl./s"
 msgid "Show while in game"
 msgstr "Wyświetlaj podczas gry"
 
-#: plugin.c:295
-#: plugin.c:313
+#: plugin.c:295 plugin.c:313
 msgid "Turbo mode"
 msgstr "Tryb Turbo"
 
@@ -54,8 +53,7 @@ msgstr "Włącz dźwięk"
 msgid "Display framerate"
 msgstr "Wyświetlaj liczbę klatek/s"
 
-#: plugin.c:334
-#: settings.c:237
+#: plugin.c:334 settings.c:237
 msgid "Accurate graphics"
 msgstr "Dokładna grafika"
 
@@ -63,18 +61,15 @@ msgstr "Dokładna grafika"
 msgid "Framerate:"
 msgstr "Klatek/s:"
 
-#: plugin.c:347
-#: settings.c:269
+#: plugin.c:347 settings.c:269
 msgid "No speedhacks"
 msgstr "Bez sztuczek z prędkością"
 
-#: plugin.c:348
-#: settings.c:270
+#: plugin.c:348 settings.c:270
 msgid "Safe hacks only"
 msgstr "Tylko bezpieczne sztuczki"
 
-#: plugin.c:349
-#: settings.c:271
+#: plugin.c:349 settings.c:271
 msgid "All speedhacks"
 msgstr "Wszystkie sztuczki z prędkością"
 
@@ -82,18 +77,15 @@ msgstr "Wszystkie sztuczki z prędkością"
 msgid "Settings…"
 msgstr "Ustawienia..."
 
-#: plugin.c:448
-#: plugin.c:457
+#: plugin.c:448 plugin.c:457
 msgid "About…"
 msgstr "O programie..."
 
-#: plugin.c:456
-#: settings.c:190
+#: plugin.c:456 settings.c:190
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: plugin.c:466
-#: settings.c:209
+#: plugin.c:466 settings.c:209
 msgid "Controls"
 msgstr "Sterowanie"
 
@@ -134,13 +126,11 @@ msgstr "Gracz %d steruje"
 msgid "Keys"
 msgstr "Klawisze"
 
-#: controls.c:197
-#: controls.c:269
+#: controls.c:197 controls.c:269
 msgid "Enable keyboard"
 msgstr "Włącz klawiaturę"
 
-#: controls.c:204
-#: controls.c:270
+#: controls.c:204 controls.c:270
 msgid "Configure keys…"
 msgstr "Skonfiguruj klawisze..."
 
@@ -148,13 +138,11 @@ msgstr "Skonfiguruj klawisze..."
 msgid "Touchscreen"
 msgstr "Ekran dotykowy"
 
-#: controls.c:217
-#: controls.c:282
+#: controls.c:217 controls.c:282
 msgid "Enable touchscreen buttons"
 msgstr "Włącz przyciski ekranu dotyk."
 
-#: controls.c:224
-#: controls.c:284
+#: controls.c:224 controls.c:284
 msgid "Show on-screen button grid"
 msgstr "Wyświetlaj siatkę ekranową"
 
@@ -179,9 +167,7 @@ msgstr "Klawisze gracza %d"
 msgid "Defaults"
 msgstr "Domyślne"
 
-#: settings.c:51
-#: settings.c:58
-#: settings.c:60
+#: settings.c:51 settings.c:58 settings.c:60
 msgid "2x zoom"
 msgstr "2x przybliżenie"
 
@@ -213,13 +199,11 @@ msgstr "Gracz 2"
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: settings.c:244
-#: settings.c:307
+#: settings.c:244 settings.c:309
 msgid "Pause game in the background"
 msgstr "Wstrzymaj grę w tle"
 
-#: settings.c:251
-#: settings.c:302
+#: settings.c:251 settings.c:304
 msgid "Zoom"
 msgstr "Przybliżenie"
 
@@ -261,4 +245,3 @@ msgstr "Szybki zapis 2"
 
 #~ msgid "Controls…"
 #~ msgstr "Sterowanie..."
-

diff --git a/gui/i18n/sv.po b/gui/i18n/sv.po
index 29ac2e1..5729891 100644 (file)
--- a/gui/i18n/sv.po
+++ b/gui/i18n/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrNokSnes 1.2.5\n"
 "Report-Msgid-Bugs-To: maemo@javispedro.com\n"
-"POT-Creation-Date: 2010-02-08 20:11+0100\n"
+"POT-Creation-Date: 2010-02-19 16:14+0100\n"
 "PO-Revision-Date: 2010-01-28 05:00+0100\n"
 "Last-Translator: Robert Hägerström <rofo1000@gmail.com>\n"
 "Language-Team: Swedish\n"
@@ -201,11 +201,11 @@ msgstr "Spelare 2"
 msgid "Advanced"
 msgstr "Avancerad"
 
-#: settings.c:244 settings.c:307
+#: settings.c:244 settings.c:309
 msgid "Pause game in the background"
 msgstr ""
 
-#: settings.c:251 settings.c:302
+#: settings.c:251 settings.c:304
 msgid "Zoom"
 msgstr "Zoom"
 

diff --git a/gui/plugin.c b/gui/plugin.c
index 8009230..fd98a2f 100644 (file)
--- a/gui/plugin.c
+++ b/gui/plugin.c
@@ -185,9 +185,6 @@ static void about_item_callback(GtkWidget * button, gpointer data)
 }
 
 #if MAEMO_VERSION >= 5
-#include <gdk/gdkx.h>
-#include <X11/Xatom.h>
-
 /** Called for each of the play/restart/continue buttons */
 static void found_ogs_button_callback(GtkWidget *widget, gpointer data)
 {
@@ -197,24 +194,6 @@ static void found_ogs_button_callback(GtkWidget *widget, gpointer data)
        gtk_box_set_child_packing(GTK_BOX(data), widget,
                FALSE, FALSE, 0, GTK_PACK_START);
 }
-/** Converts the window into a stackable one */
-static void plugin_realized_callback(GtkWidget *widget, gpointer data)
-{
-       GdkDisplay *display;
-    Atom atom;
-    unsigned long val = 0;
-       GtkWidget* window = gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW);
-
-    /* Set additional property "_HILDON_STACKABLE_WINDOW", 
-       to allow the WM to manage it as a stackable window. */
-    display = gdk_drawable_get_display(window->window);
-    atom = gdk_x11_get_xatom_by_name_for_display (display,
-                               "_HILDON_STACKABLE_WINDOW");
-    XChangeProperty(GDK_DISPLAY_XDISPLAY(display),
-                                GDK_WINDOW_XID(window->window),
-                                atom, XA_INTEGER, 32, PropModeReplace,
-                     (unsigned char *) &val, 1);
-}
 #endif
 
 static GtkWidget * load_plugin(void)
@@ -382,11 +361,6 @@ static GtkWidget * load_plugin(void)
 
        set_rom(gconf_client_get_string(gcc, kGConfRomFile, NULL));
 
-#if MAEMO_VERSION == 5
-       g_signal_connect_after(G_OBJECT(parent), "realize",
-                                               G_CALLBACK(plugin_realized_callback), NULL);
-#endif
-
        // Connect signals
        g_signal_connect(G_OBJECT(select_rom_btn), "clicked",
                                        G_CALLBACK(select_rom_callback), NULL);

diff --git a/gui/settings.c b/gui/settings.c
index 5fee86f..a87a339 100644 (file)
--- a/gui/settings.c
+++ b/gui/settings.c
@@ -275,6 +275,8 @@ void settings_dialog(GtkWindow* parent)
                FALSE, FALSE, HILDON_MARGIN_HALF);
        gtk_box_pack_start(box, GTK_WIDGET(player1_btn),
                FALSE, FALSE, 0);
+       gtk_box_pack_start(box, GTK_WIDGET(player2_btn),
+               FALSE, FALSE, 0);
        gtk_box_pack_start(box, GTK_WIDGET(separator_2),
                FALSE, FALSE, HILDON_MARGIN_HALF);
        gtk_box_pack_start(box, GTK_WIDGET(accu_check),