From 4725a8a9ff60dfdef771ab1731adef45e3f05ac3 Mon Sep 17 00:00:00 2001 From: "Javier S. Pedro" Date: Fri, 12 Mar 2010 21:34:55 +0100 Subject: [PATCH] zeemote gui --- gui/controls.c | 35 +++++++++++++++++++++++++++++++++-- gui/i18n/de.po | 40 ++++++++++++++++++++-------------------- gui/i18n/drnoksnes_plugin.pot | 40 ++++++++++++++++++++-------------------- gui/i18n/es.po | 41 ++++++++++++++++++++--------------------- gui/i18n/pl.po | 40 ++++++++++++++++++++-------------------- gui/i18n/sv.po | 40 ++++++++++++++++++++-------------------- 6 files changed, 133 insertions(+), 103 deletions(-) diff --git a/gui/controls.c b/gui/controls.c index 83b34b1..5c4a945 100644 --- a/gui/controls.c +++ b/gui/controls.c @@ -63,27 +63,41 @@ static void load_settings() gchar *key = key_base + key_len; #if MAEMO_VERSION >= 5 + // Keyboard strcpy(key, kGConfPlayerKeyboardEnable); hildon_check_button_set_active(keys_chk, gconf_client_get_bool(gcc, key_base, NULL)); + // Touchscreen strcpy(key, kGConfPlayerTouchscreenEnable); hildon_check_button_set_active(touch_chk, gconf_client_get_bool(gcc, key_base, NULL)); strcpy(key, kGConfPlayerTouchscreenShow); hildon_check_button_set_active(touch_show_chk, gconf_client_get_bool(gcc, key_base, NULL)); + + // Zeemote + strcpy(key, kGConfPlayerZeemoteEnable); + hildon_check_button_set_active(zeemote_chk, + gconf_client_get_bool(gcc, key_base, NULL)); #else + // Keyboard strcpy(key, kGConfPlayerKeyboardEnable); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keys_chk), gconf_client_get_bool(gcc, key_base, NULL)); + // Touchscreen strcpy(key, kGConfPlayerTouchscreenEnable); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(touch_chk), gconf_client_get_bool(gcc, key_base, NULL)); strcpy(key, kGConfPlayerTouchscreenShow); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(touch_show_chk), gconf_client_get_bool(gcc, key_base, NULL)); + + // Zeemote + strcpy(key, kGConfPlayerZeemoteEnable); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(zeemote_chk), + gconf_client_get_bool(gcc, key_base, NULL)); #endif } @@ -159,7 +173,8 @@ static void set_button_layout(HildonButton* button, gchar* controls_describe(int player) { - static gchar description[128]; + static gchar description[256]; + unsigned char count = 0; gchar key_base[kGConfPlayerPathBufferLen]; const int key_len = sprintf(key_base, kGConfPlayerPath, player); @@ -170,9 +185,25 @@ gchar* controls_describe(int player) strcpy(key, kGConfPlayerKeyboardEnable); if (gconf_client_get_bool(gcc, key_base, NULL)) { strcpy(description, _("Keyboard")); + count++; + } + + strcpy(key, kGConfPlayerTouchscreenEnable); + if (gconf_client_get_bool(gcc, key_base, NULL)) { + if (count > 0) strcat(description, ", "); + strcat(description, _("Touchscreen")); + count++; + } + + strcpy(key, kGConfPlayerZeemoteEnable); + if (gconf_client_get_bool(gcc, key_base, NULL)) { + if (count > 0) strcat(description, ", "); + strcat(description, _("Zeemote")); + count++; } - if (description[0] == '\0') { + if (count == 0) { + /* Add some text if there are no enabled controls */ strcpy(description, _("Disabled")); } diff --git a/gui/i18n/de.po b/gui/i18n/de.po index 1cdcc5f..de0ad2c 100644 --- 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-12 19:39+0100\n" +"POT-Creation-Date: 2010-03-12 21:28+0100\n" "PO-Revision-Date: 2010-02-10 09:17+0100\n" "Last-Translator: Philipp Zabel \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:172 +#: controls.c:187 msgid "Keyboard" msgstr "Tastatur" -#: controls.c:176 +#: controls.c:194 controls.c:257 +msgid "Touchscreen" +msgstr "Touchscreen" + +#: controls.c:201 controls.c:285 +msgid "Zeemote" +msgstr "Zeemote" + +#: controls.c:207 msgid "Disabled" msgstr "Deaktiviert" -#: controls.c:184 +#: controls.c:215 #, c-format msgid "Player %d controls" msgstr "Spieler %d Steuerung" -#: controls.c:207 +#: controls.c:238 msgid "Keys" msgstr "Tasten" -#: controls.c:213 controls.c:297 +#: controls.c:244 controls.c:328 msgid "Enable keyboard" msgstr "Tastatur aktivieren" -#: controls.c:220 controls.c:298 +#: controls.c:251 controls.c:329 msgid "Configure keys…" msgstr "Tastenbelegung..." -#: controls.c:226 -msgid "Touchscreen" -msgstr "Touchscreen" - -#: controls.c:233 controls.c:310 +#: controls.c:264 controls.c:341 msgid "Enable touchscreen buttons" msgstr "Bildschirmtasten aktivieren" -#: controls.c:240 controls.c:312 +#: controls.c:271 controls.c:343 msgid "Show on-screen button grid" msgstr "Tastengitter anzeigen" -#: controls.c:245 +#: controls.c:276 msgid "Accelerometer" msgstr "Beschleunigungssensor" -#: controls.c:249 +#: controls.c:280 msgid "Wiimote" msgstr "Wiimote" -#: controls.c:254 -msgid "Zeemote" -msgstr "Zeemote" - -#: controls.c:260 controls.c:316 +#: controls.c:291 controls.c:347 msgid "Enable Zeemote joystick" msgstr "" diff --git a/gui/i18n/drnoksnes_plugin.pot b/gui/i18n/drnoksnes_plugin.pot index 5992829..7fd4d01 100644 --- a/gui/i18n/drnoksnes_plugin.pot +++ b/gui/i18n/drnoksnes_plugin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: DrNokSnes 1.3.1\n" "Report-Msgid-Bugs-To: maemo@javispedro.com\n" -"POT-Creation-Date: 2010-03-12 19:39+0100\n" +"POT-Creation-Date: 2010-03-12 21:29+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -108,56 +108,56 @@ msgstr "" msgid "ROM file does not exist" msgstr "" -#: controls.c:172 +#: controls.c:187 msgid "Keyboard" msgstr "" -#: controls.c:176 +#: controls.c:194 controls.c:257 +msgid "Touchscreen" +msgstr "" + +#: controls.c:201 controls.c:285 +msgid "Zeemote" +msgstr "" + +#: controls.c:207 msgid "Disabled" msgstr "" -#: controls.c:184 +#: controls.c:215 #, c-format msgid "Player %d controls" msgstr "" -#: controls.c:207 +#: controls.c:238 msgid "Keys" msgstr "" -#: controls.c:213 controls.c:297 +#: controls.c:244 controls.c:328 msgid "Enable keyboard" msgstr "" -#: controls.c:220 controls.c:298 +#: controls.c:251 controls.c:329 msgid "Configure keys…" msgstr "" -#: controls.c:226 -msgid "Touchscreen" -msgstr "" - -#: controls.c:233 controls.c:310 +#: controls.c:264 controls.c:341 msgid "Enable touchscreen buttons" msgstr "" -#: controls.c:240 controls.c:312 +#: controls.c:271 controls.c:343 msgid "Show on-screen button grid" msgstr "" -#: controls.c:245 +#: controls.c:276 msgid "Accelerometer" msgstr "" -#: controls.c:249 +#: controls.c:280 msgid "Wiimote" msgstr "" -#: controls.c:254 -msgid "Zeemote" -msgstr "" - -#: controls.c:260 controls.c:316 +#: controls.c:291 controls.c:347 msgid "Enable Zeemote joystick" msgstr "" diff --git a/gui/i18n/es.po b/gui/i18n/es.po index b1e618e..b361134 100644 --- a/gui/i18n/es.po +++ b/gui/i18n/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DrNokSnes 1.3.1\n" "Report-Msgid-Bugs-To: maemo@javispedro.com\n" -"POT-Creation-Date: 2010-03-12 19:39+0100\n" +"POT-Creation-Date: 2010-03-12 21:28+0100\n" "PO-Revision-Date: 2010-02-08 20:56+0100\n" "Last-Translator: Javier \n" "Language-Team: Spanish \n" @@ -110,56 +110,56 @@ msgstr "Sin ROM seleccionada" msgid "ROM file does not exist" msgstr "El archivo ROM no existe" -#: controls.c:172 +#: controls.c:187 msgid "Keyboard" msgstr "Teclado" -#: controls.c:176 +#: controls.c:194 controls.c:257 +msgid "Touchscreen" +msgstr "Pantalla táctil" + +#: controls.c:201 controls.c:285 +msgid "Zeemote" +msgstr "Zeemote" + +#: controls.c:207 msgid "Disabled" msgstr "Desactivado" -#: controls.c:184 +#: controls.c:215 #, c-format msgid "Player %d controls" msgstr "Controles del jugador %d" -#: controls.c:207 +#: controls.c:238 msgid "Keys" msgstr "Teclas" -#: controls.c:213 controls.c:297 +#: controls.c:244 controls.c:328 msgid "Enable keyboard" msgstr "Activar teclado" -#: controls.c:220 controls.c:298 +#: controls.c:251 controls.c:329 msgid "Configure keys…" msgstr "Configurar teclas…" -#: controls.c:226 -msgid "Touchscreen" -msgstr "Pantalla táctil" - -#: controls.c:233 controls.c:310 +#: controls.c:264 controls.c:341 msgid "Enable touchscreen buttons" msgstr "Activar controles en pantalla" -#: controls.c:240 controls.c:312 +#: controls.c:271 controls.c:343 msgid "Show on-screen button grid" msgstr "Mostrar controles en pantalla" -#: controls.c:245 +#: controls.c:276 msgid "Accelerometer" msgstr "Accelerómetro" -#: controls.c:249 +#: controls.c:280 msgid "Wiimote" msgstr "Wiimote" -#: controls.c:254 -msgid "Zeemote" -msgstr "Zeemote" - -#: controls.c:260 controls.c:316 +#: controls.c:291 controls.c:347 msgid "Enable Zeemote joystick" msgstr "Activar Zeemote" @@ -247,4 +247,3 @@ msgstr "Carga rápida 2" #: buttons.inc:27 msgid "Quick Save 2" msgstr "Guardado rápido 2" - diff --git a/gui/i18n/pl.po b/gui/i18n/pl.po index 4943c9f..9888b5d 100644 --- 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-12 19:39+0100\n" +"POT-Creation-Date: 2010-03-12 21:28+0100\n" "PO-Revision-Date: 2010-02-16 23:12+0100\n" "Last-Translator: Tomasz Dominikowski \n" "Language-Team: Polish \n" @@ -109,56 +109,56 @@ msgstr "Nie wybrano pliku ROM" msgid "ROM file does not exist" msgstr "Plik ROM nie istnieje" -#: controls.c:172 +#: controls.c:187 msgid "Keyboard" msgstr "Klawiatura" -#: controls.c:176 +#: controls.c:194 controls.c:257 +msgid "Touchscreen" +msgstr "Ekran dotykowy" + +#: controls.c:201 controls.c:285 +msgid "Zeemote" +msgstr "Zeemote" + +#: controls.c:207 msgid "Disabled" msgstr "Wyłączone" -#: controls.c:184 +#: controls.c:215 #, c-format msgid "Player %d controls" msgstr "Gracz %d steruje" -#: controls.c:207 +#: controls.c:238 msgid "Keys" msgstr "Klawisze" -#: controls.c:213 controls.c:297 +#: controls.c:244 controls.c:328 msgid "Enable keyboard" msgstr "Włącz klawiaturę" -#: controls.c:220 controls.c:298 +#: controls.c:251 controls.c:329 msgid "Configure keys…" msgstr "Skonfiguruj klawisze..." -#: controls.c:226 -msgid "Touchscreen" -msgstr "Ekran dotykowy" - -#: controls.c:233 controls.c:310 +#: controls.c:264 controls.c:341 msgid "Enable touchscreen buttons" msgstr "Włącz przyciski ekranu dotyk." -#: controls.c:240 controls.c:312 +#: controls.c:271 controls.c:343 msgid "Show on-screen button grid" msgstr "Wyświetlaj siatkę ekranową" -#: controls.c:245 +#: controls.c:276 msgid "Accelerometer" msgstr "Akcelerometr" -#: controls.c:249 +#: controls.c:280 msgid "Wiimote" msgstr "Wiimote" -#: controls.c:254 -msgid "Zeemote" -msgstr "Zeemote" - -#: controls.c:260 controls.c:316 +#: controls.c:291 controls.c:347 msgid "Enable Zeemote joystick" msgstr "" diff --git a/gui/i18n/sv.po b/gui/i18n/sv.po index 8103bff..29671ec 100644 --- 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-12 19:39+0100\n" +"POT-Creation-Date: 2010-03-12 21:28+0100\n" "PO-Revision-Date: 2010-01-28 05:00+0100\n" "Last-Translator: Robert Hägerström \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:172 +#: controls.c:187 msgid "Keyboard" msgstr "Tangentbord" -#: controls.c:176 +#: controls.c:194 controls.c:257 +msgid "Touchscreen" +msgstr "Pekskärm" + +#: controls.c:201 controls.c:285 +msgid "Zeemote" +msgstr "Zeemote" + +#: controls.c:207 msgid "Disabled" msgstr "Inaktiverad" -#: controls.c:184 +#: controls.c:215 #, c-format msgid "Player %d controls" msgstr "Spelare %d kontroller" -#: controls.c:207 +#: controls.c:238 msgid "Keys" msgstr "tangenter" -#: controls.c:213 controls.c:297 +#: controls.c:244 controls.c:328 msgid "Enable keyboard" msgstr "Aktivera tangentbordet" -#: controls.c:220 controls.c:298 +#: controls.c:251 controls.c:329 #, fuzzy msgid "Configure keys…" msgstr "Anpassa tangenter..." -#: controls.c:226 -msgid "Touchscreen" -msgstr "Pekskärm" - -#: controls.c:233 controls.c:310 +#: controls.c:264 controls.c:341 msgid "Enable touchscreen buttons" msgstr "Aktivera pekskärmsknappar" -#: controls.c:240 controls.c:312 +#: controls.c:271 controls.c:343 msgid "Show on-screen button grid" msgstr "Visa skärmknapparnas rutnät" -#: controls.c:245 +#: controls.c:276 msgid "Accelerometer" msgstr "Accelerometer" -#: controls.c:249 +#: controls.c:280 msgid "Wiimote" msgstr "Wiimote" -#: controls.c:254 -msgid "Zeemote" -msgstr "Zeemote" - -#: controls.c:260 controls.c:316 +#: controls.c:291 controls.c:347 msgid "Enable Zeemote joystick" msgstr "" -- 1.7.9.5