minor code trimming and reformatting
[drnoksnes] / gui / plugin.c
index fea6e21..fd98a2f 100644 (file)
@@ -42,8 +42,9 @@
 #include <hildon/hildon-caption.h>
 #endif
 
-#include "../platform/hgw.h"
 #include "plugin.h"
+#include "gconf.h"
+#include "i18n.h"
 
 static GtkWidget * load_plugin(void);
 static void unload_plugin(void);
@@ -54,7 +55,7 @@ static void plugin_callback(GtkWidget * menu_item, gpointer data);
 
 GConfClient * gcc = NULL;
 static GameStartupInfo gs;
-static GtkWidget * menu_items[4];
+static GtkWidget * menu_items[2];
 
 static StartupPluginInfo plugin_info = {
        load_plugin,
@@ -102,7 +103,7 @@ static void set_rom(const char * rom_file)
        if (current_rom_file) g_free(current_rom_file);
        if (!rom_file || strlen(rom_file) == 0) {
                current_rom_file = NULL;
-               set_rom_label("<no rom selected>");
+               set_rom_label(_("<no rom selected>"));
                return;
        }
 
@@ -136,6 +137,7 @@ static void select_rom_callback(GtkWidget * button, gpointer data)
        gtk_file_filter_add_pattern(filter, "*.smc.gz");
        gtk_file_filter_add_pattern(filter, "*.sfc.gz");
        gtk_file_filter_add_pattern(filter, "*.fig.gz");
+       gtk_file_filter_add_pattern(filter, "*.zip");
 
        dialog = hildon_file_chooser_dialog_new_with_properties(
                get_parent_window(),
@@ -165,15 +167,16 @@ static void select_rom_callback(GtkWidget * button, gpointer data)
        }
 }
 
+#if MAEMO_VERSION < 5
 static void controls_item_callback(GtkWidget * button, gpointer data)
 {
-       controls_setup();
-       controls_dialog(get_parent_window());
+       controls_dialog(get_parent_window(), GPOINTER_TO_INT(data));
 }
+#endif
 
-static void advanced_item_callback(GtkWidget * button, gpointer data)
+static void settings_item_callback(GtkWidget * button, gpointer data)
 {
-       advanced_dialog(get_parent_window());
+       settings_dialog(get_parent_window());
 }
 
 static void about_item_callback(GtkWidget * button, gpointer data)
@@ -182,7 +185,7 @@ static void about_item_callback(GtkWidget * button, gpointer data)
 }
 
 #if MAEMO_VERSION >= 5
-/* Called for each of the play/restart/continue buttons */
+/** Called for each of the play/restart/continue buttons */
 static void found_ogs_button_callback(GtkWidget *widget, gpointer data)
 {
        hildon_gtk_widget_set_theme_size(widget,
@@ -206,7 +209,7 @@ static GtkWidget * load_plugin(void)
        select_rom_btn = HILDON_BUTTON(hildon_button_new_with_text(
                HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_THUMB_HEIGHT,
                HILDON_BUTTON_ARRANGEMENT_VERTICAL,
-               "ROM",
+               _("ROM"),
                NULL));
        hildon_button_set_alignment(select_rom_btn, 0.0f, 0.5f, 0.9f, 0.2f);
 
@@ -224,7 +227,7 @@ static GtkWidget * load_plugin(void)
 #else
 {
        GtkWidget* rom_hbox = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
-       select_rom_btn = GTK_BUTTON(gtk_button_new_with_label("Select ROM..."));
+       select_rom_btn = GTK_BUTTON(gtk_button_new_with_label(_("Select ROM…")));
        gtk_widget_set_size_request(GTK_WIDGET(select_rom_btn), 180, 46);
        rom_label = GTK_LABEL(gtk_label_new(NULL));
 
@@ -241,12 +244,13 @@ static GtkWidget * load_plugin(void)
        sound_check =
                HILDON_CHECK_BUTTON(hildon_check_button_new(
                        HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT));
-       gtk_button_set_label(GTK_BUTTON(sound_check), "Sound");
+       gtk_button_set_label(GTK_BUTTON(sound_check), _("Sound"));
 
        framerate_picker = HILDON_PICKER_BUTTON(hildon_picker_button_new(
                HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT,
                HILDON_BUTTON_ARRANGEMENT_HORIZONTAL));
-       hildon_button_set_title(HILDON_BUTTON(framerate_picker), "Target framerate");
+       hildon_button_set_title(HILDON_BUTTON(framerate_picker),
+               _("Target framerate"));
 
        HildonTouchSelector* framerate_sel =
                HILDON_TOUCH_SELECTOR(hildon_touch_selector_new_text());
@@ -263,11 +267,11 @@ static GtkWidget * load_plugin(void)
        display_fps_check =
                HILDON_CHECK_BUTTON(hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT));
        gtk_button_set_label(GTK_BUTTON(display_fps_check),
-               "Show while in game");
+               _("Show while in game"));
        turbo_check =
                HILDON_CHECK_BUTTON(hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT));
        gtk_button_set_label(GTK_BUTTON(turbo_check),
-               "Turbo mode");
+               _("Turbo mode"));
 
        gtk_box_pack_start_defaults(framerate_sel_box, GTK_WIDGET(display_fps_check));
        gtk_box_pack_start_defaults(framerate_sel_box, GTK_WIDGET(turbo_check));
@@ -282,12 +286,12 @@ static GtkWidget * load_plugin(void)
 {
        GtkBox* opt_hbox1 = GTK_BOX(gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT));
        sound_check =
-               GTK_CHECK_BUTTON(gtk_check_button_new_with_label("Enable sound"));
+               GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("Enable sound")));
 
        turbo_check =
-               GTK_CHECK_BUTTON(gtk_check_button_new_with_label("Turbo mode"));
+               GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("Turbo mode")));
        display_fps_check =
-               GTK_CHECK_BUTTON(gtk_check_button_new_with_label("Display framerate"));
+               GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("Display framerate")));
        speedhacks_combo =
                GTK_COMBO_BOX(gtk_combo_box_new_text());
 
@@ -306,11 +310,11 @@ static GtkWidget * load_plugin(void)
        GtkBox* opt_hbox2 = GTK_BOX(gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT));
 
        accu_check =
-               GTK_CHECK_BUTTON(gtk_check_button_new_with_label("Accurate graphics"));
+               GTK_CHECK_BUTTON(gtk_check_button_new_with_label(_("Accurate graphics")));
 
        framerate_combo =
                GTK_COMBO_BOX(gtk_combo_box_new_text());
-       GtkWidget* framerate_box = hildon_caption_new(NULL, "Framerate:",
+       GtkWidget* framerate_box = hildon_caption_new(NULL, _("Framerate:"),
                GTK_WIDGET(framerate_combo), NULL, HILDON_CAPTION_OPTIONAL);
 
        gtk_combo_box_append_text(framerate_combo, "Auto");
@@ -319,9 +323,9 @@ static GtkWidget * load_plugin(void)
                sprintf(buffer, "%d-%d", 50/i, 60/i);
                gtk_combo_box_append_text(framerate_combo, buffer);
        }
-       gtk_combo_box_append_text(speedhacks_combo, "No speedhacks");
-       gtk_combo_box_append_text(speedhacks_combo, "Safe hacks only");
-       gtk_combo_box_append_text(speedhacks_combo, "All speedhacks");
+       gtk_combo_box_append_text(speedhacks_combo, _("No speedhacks"));
+       gtk_combo_box_append_text(speedhacks_combo, _("Safe hacks only"));
+       gtk_combo_box_append_text(speedhacks_combo, _("All speedhacks"));
 
        gtk_box_pack_start(opt_hbox2, GTK_WIDGET(accu_check), FALSE, FALSE, 0);
        gtk_box_pack_start(opt_hbox2, GTK_WIDGET(framerate_box), TRUE, FALSE, 0);
@@ -405,8 +409,6 @@ static void write_config(void)
        if (current_rom_file) {
                gconf_client_set_string(gcc, kGConfRomFile, current_rom_file, NULL);
        }
-
-       controls_setup();
 }
 
 static GtkWidget **load_menu(guint *nitems)
@@ -415,40 +417,47 @@ static GtkWidget **load_menu(guint *nitems)
        const HildonSizeType button_size =
                HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH;
        menu_items[0] = hildon_gtk_button_new(button_size);
-       gtk_button_set_label(GTK_BUTTON(menu_items[0]), "Settings…");
+       gtk_button_set_label(GTK_BUTTON(menu_items[0]), _("Settings…"));
        menu_items[1] = hildon_gtk_button_new(button_size);
-       gtk_button_set_label(GTK_BUTTON(menu_items[1]), "Controls…");
-       menu_items[2] = hildon_gtk_button_new(button_size);
-       gtk_button_set_label(GTK_BUTTON(menu_items[2]), "About…");
-       *nitems = 3;
+       gtk_button_set_label(GTK_BUTTON(menu_items[1]), _("About…"));
+       *nitems = 2;
 
        g_signal_connect(G_OBJECT(menu_items[0]), "clicked",
-                                       G_CALLBACK(advanced_item_callback), NULL);
+                                       G_CALLBACK(settings_item_callback), NULL);
        g_signal_connect(G_OBJECT(menu_items[1]), "clicked",
-                                       G_CALLBACK(controls_item_callback), NULL);
-       g_signal_connect(G_OBJECT(menu_items[2]), "clicked",
                                        G_CALLBACK(about_item_callback), NULL);
 #else
-       menu_items[0] = gtk_menu_item_new_with_label("Settings");
-       menu_items[1] = gtk_menu_item_new_with_label("About…");
+       menu_items[0] = gtk_menu_item_new_with_label(_("Settings"));
+       menu_items[1] = gtk_menu_item_new_with_label(_("About…"));
        *nitems = 2;
 
        GtkMenu* settings_menu = GTK_MENU(gtk_menu_new());
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_items[0]),
                GTK_WIDGET(settings_menu));
 
+       GtkMenu* controls_menu = GTK_MENU(gtk_menu_new());
        GtkMenuItem* controls_item =
-               GTK_MENU_ITEM(gtk_menu_item_new_with_label("Controls…"));
-       gtk_menu_append(GTK_MENU(settings_menu), GTK_WIDGET(controls_item));
+               GTK_MENU_ITEM(gtk_menu_item_new_with_label(_("Controls")));
+       gtk_menu_item_set_submenu(controls_item, GTK_WIDGET(controls_menu));
+       gtk_menu_append(settings_menu, GTK_WIDGET(controls_item));
 
        GtkMenuItem* advanced_item =
-               GTK_MENU_ITEM(gtk_menu_item_new_with_label("Advanced…"));
-       gtk_menu_append(GTK_MENU(settings_menu), GTK_WIDGET(advanced_item));
-
-       g_signal_connect(G_OBJECT(controls_item), "activate",
-                                       G_CALLBACK(controls_item_callback), NULL);
+               GTK_MENU_ITEM(gtk_menu_item_new_with_label(_("Advanced…")));
+       gtk_menu_append(settings_menu, GTK_WIDGET(advanced_item));
+
+       GtkMenuItem* player1_item =
+               GTK_MENU_ITEM(gtk_menu_item_new_with_label(_("Player 1…")));
+       gtk_menu_append(controls_menu, GTK_WIDGET(player1_item));
+       GtkMenuItem* player2_item =
+               GTK_MENU_ITEM(gtk_menu_item_new_with_label(_("Player 2…")));
+       gtk_menu_append(controls_menu, GTK_WIDGET(player2_item));
+
+       g_signal_connect(G_OBJECT(player1_item), "activate",
+                                       G_CALLBACK(controls_item_callback), GINT_TO_POINTER(1));
+       g_signal_connect(G_OBJECT(player2_item), "activate",
+                                       G_CALLBACK(controls_item_callback), GINT_TO_POINTER(2));
        g_signal_connect(G_OBJECT(advanced_item), "activate",
-                                       G_CALLBACK(advanced_item_callback), NULL);
+                                       G_CALLBACK(settings_item_callback), NULL);
        g_signal_connect(G_OBJECT(menu_items[1]), "activate",
                                        G_CALLBACK(about_item_callback), NULL);
 #endif
@@ -504,12 +513,12 @@ static void plugin_callback(GtkWidget * menu_item, gpointer data)
                        }
                        if (!current_rom_file) {
                                GtkWidget* note = hildon_note_new_information(get_parent_window(),
-                                       "No ROM selected");
+                                       _("No ROM selected"));
                                gtk_dialog_run(GTK_DIALOG(note));
                                gtk_widget_destroy(note);
                        } else if (!current_rom_file_exists) {
                                GtkWidget* note = hildon_note_new_information(get_parent_window(),
-                                       "ROM file does not exist");
+                                       _("ROM file does not exist"));
                                gtk_dialog_run(GTK_DIALOG(note));
                                gtk_widget_destroy(note);
                        }