diablo controls dialog

diff --git a/gui/controls.c b/gui/controls.c
index 8a935cf..7bfa6de 100644 (file)
--- a/gui/controls.c
+++ b/gui/controls.c
@@ -48,7 +48,10 @@ static HildonButton* keys_btn;
 static HildonCheckButton* touch_chk;
 static HildonCheckButton* touch_show_chk;
 #else
-
+static GtkCheckButton* keys_chk;
+static GtkButton* keys_btn;
+static GtkCheckButton* touch_chk;
+static GtkCheckButton* touch_show_chk;
 #endif
 
 static void load_settings()
@@ -62,6 +65,9 @@ static void load_settings()
        hildon_check_button_set_active(keys_chk,
                gconf_client_get_bool(gcc, key_base, NULL));
 #else
+       strcpy(key, kGConfPlayerKeyboardEnable);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(keys_chk),
+               gconf_client_get_bool(gcc, key_base, NULL));
 #endif
 }
 
@@ -76,6 +82,9 @@ static void save_settings()
        gconf_client_set_bool(gcc, key_base,
                hildon_check_button_get_active(keys_chk), NULL);
 #else
+       strcpy(key, kGConfPlayerKeyboardEnable);
+       gconf_client_set_bool(gcc, key_base,
+               gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(keys_chk)), NULL);
 #endif
 }
 
@@ -226,6 +235,32 @@ void controls_dialog(GtkWindow* parent, int player)
        g_object_unref(titles_size_group);
        g_object_unref(values_size_group);
 #else
+       GtkBox* keys_box = GTK_BOX(gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT));
+
+       keys_chk = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(
+               _("Enable keyboard")));
+       keys_btn = GTK_BUTTON(gtk_button_new_with_label(_("Configure keys…")));
+       g_signal_connect(G_OBJECT(keys_btn), "clicked",
+                                       G_CALLBACK(keys_btn_callback), GINT_TO_POINTER(player));
+
+       gtk_box_pack_start_defaults(keys_box, GTK_WIDGET(keys_chk));
+       gtk_box_pack_start_defaults(keys_box, GTK_WIDGET(keys_btn));
+
+       GtkWidget* sep_1 = GTK_WIDGET(gtk_hseparator_new());
+
+       GtkBox* touch_box = GTK_BOX(gtk_vbox_new(FALSE, HILDON_MARGIN_HALF));
+
+       touch_chk = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(
+               _("Enable touchscreen buttons")));
+       touch_show_chk = GTK_CHECK_BUTTON(gtk_check_button_new_with_label(
+               _("Show on-screen button grid")));
+
+       gtk_box_pack_start_defaults(touch_box, GTK_WIDGET(touch_chk));
+       gtk_box_pack_start_defaults(touch_box, GTK_WIDGET(touch_show_chk));
+
+       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));
 #endif
 
        load_settings();

diff --git a/gui/i18n/de.po b/gui/i18n/de.po
index 43cbc23..767a544 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 18:37+0100\n"
+"POT-Creation-Date: 2010-02-08 18:56+0100\n"
 "PO-Revision-Date: 2010-01-28 09:50+0100\n"
 "Last-Translator: Philipp Zabel <philipp.zabel@gmail.com>\n"
 "Language-Team: German\n"
@@ -112,53 +112,53 @@ msgstr "Kein ROM ausgewählt"
 msgid "ROM file does not exist"
 msgstr "ROM-Datei existiert nicht"
 
-#: controls.c:119
+#: controls.c:128
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: controls.c:123
+#: controls.c:132
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: controls.c:131
+#: controls.c:140
 #, c-format
 msgid "Player %d controls"
 msgstr "Spieler %d Steuerung"
 
-#: controls.c:154
+#: controls.c:163
 msgid "Keys"
 msgstr "Tasten"
 
-#: controls.c:160
+#: controls.c:169 controls.c:241
 msgid "Enable keyboard"
 msgstr "Tastatur aktivieren"
 
-#: controls.c:167
+#: controls.c:176 controls.c:242
 #, fuzzy
 msgid "Configure keys…"
 msgstr "Tasten konfigurieren..."
 
-#: controls.c:173
+#: controls.c:182
 msgid "Touchscreen"
 msgstr "Touchscreen"
 
-#: controls.c:180
+#: controls.c:189 controls.c:254
 msgid "Enable touchscreen buttons"
 msgstr "Touchscreen-Knöpfe aktivieren"
 
-#: controls.c:187
+#: controls.c:196 controls.c:256
 msgid "Show on-screen button grid"
 msgstr "Wyświetlaj siatkę ekranową"
 
-#: controls.c:191
+#: controls.c:200
 msgid "Accelerometer"
 msgstr "Beschleunigungssensor"
 
-#: controls.c:195
+#: controls.c:204
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: controls.c:199
+#: controls.c:208
 msgid "Zeemote"
 msgstr "Zeemote"
 

diff --git a/gui/i18n/drnoksnes_plugin.pot b/gui/i18n/drnoksnes_plugin.pot
index 63e7eee..de54805 100644 (file)
--- a/gui/i18n/drnoksnes_plugin.pot
+++ b/gui/i18n/drnoksnes_plugin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: maemo@javispedro.com\n"
-"POT-Creation-Date: 2010-02-08 18:38+0100\n"
+"POT-Creation-Date: 2010-02-08 18:56+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,52 +108,52 @@ msgstr ""
 msgid "ROM file does not exist"
 msgstr ""
 
-#: controls.c:119
+#: controls.c:128
 msgid "Keyboard"
 msgstr ""
 
-#: controls.c:123
+#: controls.c:132
 msgid "Disabled"
 msgstr ""
 
-#: controls.c:131
+#: controls.c:140
 #, c-format
 msgid "Player %d controls"
 msgstr ""
 
-#: controls.c:154
+#: controls.c:163
 msgid "Keys"
 msgstr ""
 
-#: controls.c:160
+#: controls.c:169 controls.c:241
 msgid "Enable keyboard"
 msgstr ""
 
-#: controls.c:167
+#: controls.c:176 controls.c:242
 msgid "Configure keys…"
 msgstr ""
 
-#: controls.c:173
+#: controls.c:182
 msgid "Touchscreen"
 msgstr ""
 
-#: controls.c:180
+#: controls.c:189 controls.c:254
 msgid "Enable touchscreen buttons"
 msgstr ""
 
-#: controls.c:187
+#: controls.c:196 controls.c:256
 msgid "Show on-screen button grid"
 msgstr ""
 
-#: controls.c:191
+#: controls.c:200
 msgid "Accelerometer"
 msgstr ""
 
-#: controls.c:195
+#: controls.c:204
 msgid "Wiimote"
 msgstr ""
 
-#: controls.c:199
+#: controls.c:208
 msgid "Zeemote"
 msgstr ""
 

diff --git a/gui/i18n/es.po b/gui/i18n/es.po
index b1be64a..3582491 100644 (file)
--- a/gui/i18n/es.po
+++ b/gui/i18n/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrNokSnes 1.2.6\n"
 "Report-Msgid-Bugs-To: maemo@javispedro.com\n"
-"POT-Creation-Date: 2010-02-08 18:37+0100\n"
+"POT-Creation-Date: 2010-02-08 18:56+0100\n"
 "PO-Revision-Date: 2010-01-07 03:11+0100\n"
 "Last-Translator: Javier <javier@javispedro.com>\n"
 "Language-Team: Spanish <maemo@javispedro.com>\n"
@@ -113,53 +113,53 @@ msgstr "Sin ROM seleccionada"
 msgid "ROM file does not exist"
 msgstr "El archivo ROM no existe"
 
-#: controls.c:119
+#: controls.c:128
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: controls.c:123
+#: controls.c:132
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: controls.c:131
+#: controls.c:140
 #, c-format
 msgid "Player %d controls"
 msgstr "Controles del jugador %d"
 
-#: controls.c:154
+#: controls.c:163
 msgid "Keys"
 msgstr "Teclas"
 
-#: controls.c:160
+#: controls.c:169 controls.c:241
 msgid "Enable keyboard"
 msgstr "Activar teclado"
 
-#: controls.c:167
+#: controls.c:176 controls.c:242
 #, fuzzy
 msgid "Configure keys…"
 msgstr "Configurar teclas…"
 
-#: controls.c:173
+#: controls.c:182
 msgid "Touchscreen"
 msgstr "Pantalla táctil"
 
-#: controls.c:180
+#: controls.c:189 controls.c:254
 msgid "Enable touchscreen buttons"
 msgstr "Activar controles en pantalla"
 
-#: controls.c:187
+#: controls.c:196 controls.c:256
 msgid "Show on-screen button grid"
 msgstr "Mostrar controles en pantalla"
 
-#: controls.c:191
+#: controls.c:200
 msgid "Accelerometer"
 msgstr "Accelerómetro"
 
-#: controls.c:195
+#: controls.c:204
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: controls.c:199
+#: controls.c:208
 msgid "Zeemote"
 msgstr "Zeemote"
 

diff --git a/gui/i18n/pl.po b/gui/i18n/pl.po
index 461bd51..6ff0e25 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 18:37+0100\n"
+"POT-Creation-Date: 2010-02-08 18:56+0100\n"
 "PO-Revision-Date: 2010-01-28 00:42+0100\n"
 "Last-Translator: Tomasz Dominikowski <dominikowski@gmail.com>\n"
 "Language-Team: Polish <dominikowski@gmail.com>\n"
@@ -112,53 +112,53 @@ msgstr "Nie wybrano pliku ROM"
 msgid "ROM file does not exist"
 msgstr "Plik ROM nie istnieje"
 
-#: controls.c:119
+#: controls.c:128
 msgid "Keyboard"
 msgstr "Klawiatura"
 
-#: controls.c:123
+#: controls.c:132
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: controls.c:131
+#: controls.c:140
 #, c-format
 msgid "Player %d controls"
 msgstr "Gracz %d steruje"
 
-#: controls.c:154
+#: controls.c:163
 msgid "Keys"
 msgstr "Klawisze"
 
-#: controls.c:160
+#: controls.c:169 controls.c:241
 msgid "Enable keyboard"
 msgstr "Włącz klawiaturę"
 
-#: controls.c:167
+#: controls.c:176 controls.c:242
 #, fuzzy
 msgid "Configure keys…"
 msgstr "Skonfiguruj klawisze..."
 
-#: controls.c:173
+#: controls.c:182
 msgid "Touchscreen"
 msgstr "Ekran dotykowy"
 
-#: controls.c:180
+#: controls.c:189 controls.c:254
 msgid "Enable touchscreen buttons"
 msgstr "Włącz przyciski ekranu dotyk."
 
-#: controls.c:187
+#: controls.c:196 controls.c:256
 msgid "Show on-screen button grid"
 msgstr "Wyświetlaj siatkę ekranową"
 
-#: controls.c:191
+#: controls.c:200
 msgid "Accelerometer"
 msgstr "Akcelerometr"
 
-#: controls.c:195
+#: controls.c:204
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: controls.c:199
+#: controls.c:208
 msgid "Zeemote"
 msgstr "Zeemote"
 

diff --git a/gui/i18n/sv.po b/gui/i18n/sv.po
index e61b7fc..9792f7a 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 18:37+0100\n"
+"POT-Creation-Date: 2010-02-08 18:56+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,53 +110,53 @@ msgstr "Ingen ROM vald"
 msgid "ROM file does not exist"
 msgstr "ROM-filen existerar inte"
 
-#: controls.c:119
+#: controls.c:128
 msgid "Keyboard"
 msgstr "Tangentbord"
 
-#: controls.c:123
+#: controls.c:132
 msgid "Disabled"
 msgstr "Inaktiverad"
 
-#: controls.c:131
+#: controls.c:140
 #, c-format
 msgid "Player %d controls"
 msgstr "Spelare %d kontroller"
 
-#: controls.c:154
+#: controls.c:163
 msgid "Keys"
 msgstr "tangenter"
 
-#: controls.c:160
+#: controls.c:169 controls.c:241
 msgid "Enable keyboard"
 msgstr "Aktivera tangentbordet"
 
-#: controls.c:167
+#: controls.c:176 controls.c:242
 #, fuzzy
 msgid "Configure keys…"
 msgstr "Anpassa tangenter..."
 
-#: controls.c:173
+#: controls.c:182
 msgid "Touchscreen"
 msgstr "Pekskärm"
 
-#: controls.c:180
+#: controls.c:189 controls.c:254
 msgid "Enable touchscreen buttons"
 msgstr "Aktivera pekskärmsknappar"
 
-#: controls.c:187
+#: controls.c:196 controls.c:256
 msgid "Show on-screen button grid"
 msgstr "Visa skärmknapparnas rutnät"
 
-#: controls.c:191
+#: controls.c:200
 msgid "Accelerometer"
 msgstr "Accelerometer"
 
-#: controls.c:195
+#: controls.c:204
 msgid "Wiimote"
 msgstr "Wiimote"
 
-#: controls.c:199
+#: controls.c:208
 msgid "Zeemote"
 msgstr "Zeemote"