temporarily removed zeemote support

diff --git a/debian/changelog b/debian/changelog
index 65b49b4..8ca4e69 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+drnoksnes (1.3.4) unstable; urgency=low
+
+  * Removed zeemote support since it was not ready for extras yet. 
+
+ -- Javier S. Pedro <maemo@javispedro.com>  Mon, 22 Mar 2010 23:16:46 +0100
+
 drnoksnes (1.3.3) unstable; urgency=low
 
   * Minor fix to control file. 

diff --git a/debian/rules b/debian/rules
index 22c3430..2239c4f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -80,7 +80,6 @@ ifeq ($(shell expr "$(MAEMO_VERSION)" ">" 4), 1)
 else
        echo CONF_XSP=1 >> config.mk
 endif
-       echo CONF_ZEEMOTE=1 >> config.mk
        echo ASFLAGS="$(ASFLAGS)" >> config.mk
        echo CFLAGS="$(CFLAGS)" >> config.mk
        echo CXXFLAGS="$(CXXFLAGS)" >> config.mk

diff --git a/gui/controls.c b/gui/controls.c
index 17ebbbc..b5608da 100644 (file)
--- a/gui/controls.c
+++ b/gui/controls.c
@@ -47,14 +47,18 @@ static HildonCheckButton* keys_chk;
 static HildonButton* keys_btn;
 static HildonCheckButton* touch_chk;
 static HildonCheckButton* touch_show_chk;
+#if CONF_ZEEMOTE
 static HildonCheckButton* zeemote_chk;
-#else
+#endif
+#else /* MAEMO_VERSION < 5 */
 static GtkCheckButton* keys_chk;
 static GtkButton* keys_btn;
 static GtkCheckButton* touch_chk;
 static GtkCheckButton* touch_show_chk;
+#if CONF_ZEEMOTE
 static GtkCheckButton* zeemote_chk;
 #endif
+#endif /* MAEMO_VERSION */
 
 static void load_settings()
 {
@@ -76,11 +80,12 @@ static void load_settings()
        hildon_check_button_set_active(touch_show_chk,
                gconf_client_get_bool(gcc, key_base, NULL));
 
-       // Zeemote
+#if CONF_ZEEMOTE
        strcpy(key, kGConfPlayerZeemoteEnable);
        hildon_check_button_set_active(zeemote_chk,
                gconf_client_get_bool(gcc, key_base, NULL));
-#else
+#endif
+#else /* MAEMO_VERSION < 5 */
        // Keyboard
        strcpy(key, kGConfPlayerKeyboardEnable);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keys_chk),
@@ -94,11 +99,12 @@ static void load_settings()
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(touch_show_chk),
                gconf_client_get_bool(gcc, key_base, NULL));
 
-       // Zeemote
+#if CONF_ZEEMOTE
        strcpy(key, kGConfPlayerZeemoteEnable);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(zeemote_chk),
                gconf_client_get_bool(gcc, key_base, NULL));
 #endif
+#endif /* MAEMO_VERSION */
 }
 
 static void save_settings()
@@ -121,10 +127,11 @@ static void save_settings()
        gconf_client_set_bool(gcc, key_base,
                hildon_check_button_get_active(touch_show_chk), NULL);
 
-       // Zeemote
+#if CONF_ZEEMOTE
        strcpy(key, kGConfPlayerZeemoteEnable);
        gconf_client_set_bool(gcc, key_base,
                hildon_check_button_get_active(zeemote_chk), NULL);
+#endif
 #else /* MAEMO_VERSION < 5 */
        // Keyboard
        strcpy(key, kGConfPlayerKeyboardEnable);
@@ -139,11 +146,12 @@ static void save_settings()
        gconf_client_set_bool(gcc, key_base,
                gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(touch_show_chk)), NULL);
 
-       // Zeemote
+#if CONF_ZEEMOTE
        strcpy(key, kGConfPlayerZeemoteEnable);
        gconf_client_set_bool(gcc, key_base,
                gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(zeemote_chk)), NULL);
 #endif
+#endif /* MAEMO_VERSION */
 }
 
 static void keys_btn_callback(GtkWidget * button, gpointer data)
@@ -195,12 +203,14 @@ gchar* controls_describe(int player)
                count++;
        }
 
+#if CONF_ZEEMOTE
        strcpy(key, kGConfPlayerZeemoteEnable);
        if (gconf_client_get_bool(gcc, key_base, NULL)) {
                if (count > 0) strcat(description, ", ");
                strcat(description, _("Zeemote"));
                count++;
        }
+#endif
 
        if (count == 0) {
                /* Add some text if there are no enabled controls */
@@ -281,7 +291,7 @@ void controls_dialog(GtkWindow* parent, int player)
        gtk_label_set_attributes(separator_4, pattrlist);
        gtk_label_set_justify(separator_4, GTK_JUSTIFY_CENTER);
 #endif
-
+#if CONF_ZEEMOTE
        GtkLabel* separator_5 = GTK_LABEL(gtk_label_new(_("Zeemote")));
        gtk_label_set_attributes(separator_5, pattrlist);
        gtk_label_set_justify(separator_5, GTK_JUSTIFY_CENTER);
@@ -291,7 +301,7 @@ void controls_dialog(GtkWindow* parent, int player)
        gtk_button_set_label(GTK_BUTTON(zeemote_chk), _("Enable Zeemote joystick"));
        set_button_layout(HILDON_BUTTON(zeemote_chk),
                titles_size_group, values_size_group);
-
+#endif
        gtk_box_pack_start(box, GTK_WIDGET(separator_1),
                FALSE, FALSE, HILDON_MARGIN_HALF);
        gtk_box_pack_start(box, GTK_WIDGET(keys_chk),
@@ -310,10 +320,12 @@ void controls_dialog(GtkWindow* parent, int player)
        gtk_box_pack_start(box, GTK_WIDGET(separator_4),
                FALSE, FALSE, HILDON_MARGIN_HALF);
 #endif
+#if CONF_ZEEMOTE
        gtk_box_pack_start(box, GTK_WIDGET(separator_5),
                FALSE, FALSE, HILDON_MARGIN_HALF);
        gtk_box_pack_start(box, GTK_WIDGET(zeemote_chk),
                FALSE, FALSE, 0);
+#endif
 
        hildon_pannable_area_add_with_viewport(pannable, GTK_WIDGET(box));
        gtk_box_pack_start_defaults(GTK_BOX(dialog->vbox), GTK_WIDGET(pannable));
@@ -344,16 +356,20 @@ void controls_dialog(GtkWindow* parent, int player)
        gtk_box_pack_start_defaults(touch_box, GTK_WIDGET(touch_chk));
        gtk_box_pack_start_defaults(touch_box, GTK_WIDGET(touch_show_chk));
 
+#if CONF_ZEEMOTE
        GtkWidget* sep_2 = GTK_WIDGET(gtk_hseparator_new());
        zeemote_chk = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(
                _("Enable Zeemote joystick")));
+#endif
 
        gtk_box_pack_start_defaults(GTK_BOX(dialog->vbox), GTK_WIDGET(keys_box));
        gtk_box_pack_start_defaults(GTK_BOX(dialog->vbox), sep_1);
        gtk_box_pack_start_defaults(GTK_BOX(dialog->vbox), GTK_WIDGET(touch_box));
+#if CONF_ZEEMOTE
        gtk_box_pack_start_defaults(GTK_BOX(dialog->vbox), sep_2);
        gtk_box_pack_start_defaults(GTK_BOX(dialog->vbox), GTK_WIDGET(zeemote_chk));
 #endif
+#endif /* MAEMO_VERSION */
 
        load_settings();
 

diff --git a/gui/i18n/de.po b/gui/i18n/de.po
index 41cc063..54afa88 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-03-21 16:14+0100\n"
+"POT-Creation-Date: 2010-03-22 23:23+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"
@@ -109,56 +109,56 @@ msgstr "Kein ROM ausgewählt"
 msgid "ROM file does not exist"
 msgstr "ROM-Datei existiert nicht"
 
-#: controls.c:187
+#: controls.c:195
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: controls.c:194 controls.c:257
+#: controls.c:202 controls.c:267
 msgid "Touchscreen"
 msgstr "Touchscreen"
 
-#: controls.c:201 controls.c:285
+#: controls.c:210 controls.c:295
 msgid "Zeemote"
 msgstr "Zeemote"
 
-#: controls.c:207
+#: controls.c:217
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: controls.c:215
+#: controls.c:225
 #, c-format
 msgid "Player %d controls"
 msgstr "Spieler %d Steuerung"
 
-#: controls.c:238
+#: controls.c:248
 msgid "Keys"
 msgstr "Tasten"
 
-#: controls.c:244 controls.c:328
+#: controls.c:254 controls.c:340
 msgid "Enable keyboard"
 msgstr "Tastatur aktivieren"
 
-#: controls.c:251 controls.c:329
+#: controls.c:261 controls.c:341
 msgid "Configure keys…"
 msgstr "Tastenbelegung..."
 
-#: controls.c:264 controls.c:340
+#: controls.c:274 controls.c:352
 msgid "Enable touchscreen buttons"
 msgstr "Bildschirmtasten aktivieren"
 
-#: controls.c:271 controls.c:342
+#: controls.c:281 controls.c:354
 msgid "Show on-screen button grid"
 msgstr "Tastengitter anzeigen"
 
-#: controls.c:276
+#: controls.c:286
 msgid "Accelerometer"
 msgstr "Beschleunigungssensor"
 
-#: controls.c:280
+#: controls.c:290
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: controls.c:291 controls.c:349
+#: controls.c:301 controls.c:362
 msgid "Enable Zeemote joystick"
 msgstr ""
 

diff --git a/gui/i18n/drnoksnes_plugin.pot b/gui/i18n/drnoksnes_plugin.pot
index 39f25bb..c4e0174 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.2\n"
+"Project-Id-Version: DrNokSnes 1.3.4\n"
 "Report-Msgid-Bugs-To: maemo@javispedro.com\n"
-"POT-Creation-Date: 2010-03-21 16:16+0100\n"
+"POT-Creation-Date: 2010-03-22 23:23+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"
@@ -108,56 +108,56 @@ msgstr ""
 msgid "ROM file does not exist"
 msgstr ""
 
-#: controls.c:187
+#: controls.c:195
 msgid "Keyboard"
 msgstr ""
 
-#: controls.c:194 controls.c:257
+#: controls.c:202 controls.c:267
 msgid "Touchscreen"
 msgstr ""
 
-#: controls.c:201 controls.c:285
+#: controls.c:210 controls.c:295
 msgid "Zeemote"
 msgstr ""
 
-#: controls.c:207
+#: controls.c:217
 msgid "Disabled"
 msgstr ""
 
-#: controls.c:215
+#: controls.c:225
 #, c-format
 msgid "Player %d controls"
 msgstr ""
 
-#: controls.c:238
+#: controls.c:248
 msgid "Keys"
 msgstr ""
 
-#: controls.c:244 controls.c:328
+#: controls.c:254 controls.c:340
 msgid "Enable keyboard"
 msgstr ""
 
-#: controls.c:251 controls.c:329
+#: controls.c:261 controls.c:341
 msgid "Configure keys…"
 msgstr ""
 
-#: controls.c:264 controls.c:340
+#: controls.c:274 controls.c:352
 msgid "Enable touchscreen buttons"
 msgstr ""
 
-#: controls.c:271 controls.c:342
+#: controls.c:281 controls.c:354
 msgid "Show on-screen button grid"
 msgstr ""
 
-#: controls.c:276
+#: controls.c:286
 msgid "Accelerometer"
 msgstr ""
 
-#: controls.c:280
+#: controls.c:290
 msgid "Wiimote"
 msgstr ""
 
-#: controls.c:291 controls.c:349
+#: controls.c:301 controls.c:362
 msgid "Enable Zeemote joystick"
 msgstr ""
 

diff --git a/gui/i18n/es.po b/gui/i18n/es.po
index a63a6b9..0b64474 100644 (file)
--- a/gui/i18n/es.po
+++ b/gui/i18n/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrNokSnes 1.3.2\n"
 "Report-Msgid-Bugs-To: maemo@javispedro.com\n"
-"POT-Creation-Date: 2010-03-21 16:14+0100\n"
+"POT-Creation-Date: 2010-03-22 23:23+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"
@@ -110,56 +110,56 @@ msgstr "Sin ROM seleccionada"
 msgid "ROM file does not exist"
 msgstr "El archivo ROM no existe"
 
-#: controls.c:187
+#: controls.c:195
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: controls.c:194 controls.c:257
+#: controls.c:202 controls.c:267
 msgid "Touchscreen"
 msgstr "Pantalla táctil"
 
-#: controls.c:201 controls.c:285
+#: controls.c:210 controls.c:295
 msgid "Zeemote"
 msgstr "Zeemote"
 
-#: controls.c:207
+#: controls.c:217
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: controls.c:215
+#: controls.c:225
 #, c-format
 msgid "Player %d controls"
 msgstr "Controles del jugador %d"
 
-#: controls.c:238
+#: controls.c:248
 msgid "Keys"
 msgstr "Teclas"
 
-#: controls.c:244 controls.c:328
+#: controls.c:254 controls.c:340
 msgid "Enable keyboard"
 msgstr "Activar teclado"
 
-#: controls.c:251 controls.c:329
+#: controls.c:261 controls.c:341
 msgid "Configure keys…"
 msgstr "Configurar teclas…"
 
-#: controls.c:264 controls.c:340
+#: controls.c:274 controls.c:352
 msgid "Enable touchscreen buttons"
 msgstr "Activar controles en pantalla"
 
-#: controls.c:271 controls.c:342
+#: controls.c:281 controls.c:354
 msgid "Show on-screen button grid"
 msgstr "Mostrar controles en pantalla"
 
-#: controls.c:276
+#: controls.c:286
 msgid "Accelerometer"
 msgstr "Accelerómetro"
 
-#: controls.c:280
+#: controls.c:290
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: controls.c:291 controls.c:349
+#: controls.c:301 controls.c:362
 msgid "Enable Zeemote joystick"
 msgstr "Activar Zeemote"
 

diff --git a/gui/i18n/pl.po b/gui/i18n/pl.po
index 0b57ecd..5ffa03c 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-03-21 16:14+0100\n"
+"POT-Creation-Date: 2010-03-22 23:23+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"
@@ -109,56 +109,56 @@ msgstr "Nie wybrano pliku ROM"
 msgid "ROM file does not exist"
 msgstr "Plik ROM nie istnieje"
 
-#: controls.c:187
+#: controls.c:195
 msgid "Keyboard"
 msgstr "Klawiatura"
 
-#: controls.c:194 controls.c:257
+#: controls.c:202 controls.c:267
 msgid "Touchscreen"
 msgstr "Ekran dotykowy"
 
-#: controls.c:201 controls.c:285
+#: controls.c:210 controls.c:295
 msgid "Zeemote"
 msgstr "Zeemote"
 
-#: controls.c:207
+#: controls.c:217
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: controls.c:215
+#: controls.c:225
 #, c-format
 msgid "Player %d controls"
 msgstr "Gracz %d steruje"
 
-#: controls.c:238
+#: controls.c:248
 msgid "Keys"
 msgstr "Klawisze"
 
-#: controls.c:244 controls.c:328
+#: controls.c:254 controls.c:340
 msgid "Enable keyboard"
 msgstr "Włącz klawiaturę"
 
-#: controls.c:251 controls.c:329
+#: controls.c:261 controls.c:341
 msgid "Configure keys…"
 msgstr "Skonfiguruj klawisze..."
 
-#: controls.c:264 controls.c:340
+#: controls.c:274 controls.c:352
 msgid "Enable touchscreen buttons"
 msgstr "Włącz przyciski ekranu dotyk."
 
-#: controls.c:271 controls.c:342
+#: controls.c:281 controls.c:354
 msgid "Show on-screen button grid"
 msgstr "Wyświetlaj siatkę ekranową"
 
-#: controls.c:276
+#: controls.c:286
 msgid "Accelerometer"
 msgstr "Akcelerometr"
 
-#: controls.c:280
+#: controls.c:290
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: controls.c:291 controls.c:349
+#: controls.c:301 controls.c:362
 msgid "Enable Zeemote joystick"
 msgstr ""
 

diff --git a/gui/i18n/sv.po b/gui/i18n/sv.po
index e641010..10e4673 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-03-21 16:14+0100\n"
+"POT-Creation-Date: 2010-03-22 23:23+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"
@@ -110,57 +110,57 @@ msgstr "Ingen ROM vald"
 msgid "ROM file does not exist"
 msgstr "ROM-filen existerar inte"
 
-#: controls.c:187
+#: controls.c:195
 msgid "Keyboard"
 msgstr "Tangentbord"
 
-#: controls.c:194 controls.c:257
+#: controls.c:202 controls.c:267
 msgid "Touchscreen"
 msgstr "Pekskärm"
 
-#: controls.c:201 controls.c:285
+#: controls.c:210 controls.c:295
 msgid "Zeemote"
 msgstr "Zeemote"
 
-#: controls.c:207
+#: controls.c:217
 msgid "Disabled"
 msgstr "Inaktiverad"
 
-#: controls.c:215
+#: controls.c:225
 #, c-format
 msgid "Player %d controls"
 msgstr "Spelare %d kontroller"
 
-#: controls.c:238
+#: controls.c:248
 msgid "Keys"
 msgstr "tangenter"
 
-#: controls.c:244 controls.c:328
+#: controls.c:254 controls.c:340
 msgid "Enable keyboard"
 msgstr "Aktivera tangentbordet"
 
-#: controls.c:251 controls.c:329
+#: controls.c:261 controls.c:341
 #, fuzzy
 msgid "Configure keys…"
 msgstr "Anpassa tangenter..."
 
-#: controls.c:264 controls.c:340
+#: controls.c:274 controls.c:352
 msgid "Enable touchscreen buttons"
 msgstr "Aktivera pekskärmsknappar"
 
-#: controls.c:271 controls.c:342
+#: controls.c:281 controls.c:354
 msgid "Show on-screen button grid"
 msgstr "Visa skärmknapparnas rutnät"
 
-#: controls.c:276
+#: controls.c:286
 msgid "Accelerometer"
 msgstr "Accelerometer"
 
-#: controls.c:280
+#: controls.c:290
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: controls.c:291 controls.c:349
+#: controls.c:301 controls.c:362
 msgid "Enable Zeemote joystick"
 msgstr ""