new controls dialog; using gconf instead of hgw
[drnoksnes] / gui / plugin.c
index d9c15bf..f1cde36 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,
@@ -71,7 +72,6 @@ gchar* current_rom_file = 0;
 gboolean current_rom_file_exists = FALSE;
 
 #if MAEMO_VERSION >= 5
-static GtkBox* buttons_hbox;
 static HildonButton* select_rom_btn;
 static HildonCheckButton* sound_check;
 static HildonPickerButton* framerate_picker;
@@ -103,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;
        }
 
@@ -137,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(),
@@ -166,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());
 }
+#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)
@@ -183,14 +185,35 @@ 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)
 {
-       gtk_widget_reparent(widget,     GTK_WIDGET(buttons_hbox));
        hildon_gtk_widget_set_theme_size(widget,
                HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_THUMB_HEIGHT);
        gtk_widget_set_size_request(widget, 200, -1);
-       gtk_box_set_child_packing(buttons_hbox, widget,
-                       FALSE, FALSE, 0, GTK_PACK_START);
+       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
 
@@ -204,30 +227,28 @@ static GtkWidget * load_plugin(void)
 /* Select ROM button */
 #if MAEMO_VERSION >= 5
 {
-       buttons_hbox = GTK_BOX(gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT));
-
        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);
-       gtk_box_pack_start_defaults(buttons_hbox, GTK_WIDGET(select_rom_btn));
 
-       // Ugly hacks: we move all of the osso-games-startup buttons to our container
-       GtkContainer* old_parent =
-               GTK_CONTAINER(gtk_widget_get_parent(gs.ui->play_button));
-       gtk_container_foreach(old_parent, found_ogs_button_callback, NULL);
-       // Get rid of the GtkFixed container
-       gtk_widget_destroy(old_parent);
+       // Ugly hacks: resize the Osso-Games-Startup buttons
+       GtkBox* button_box =
+               GTK_BOX(gtk_widget_get_parent(gs.ui->play_button));
+       gtk_box_set_spacing(button_box, HILDON_MARGIN_DEFAULT);
+       gtk_container_foreach(GTK_CONTAINER(button_box),
+               found_ogs_button_callback, button_box);
 
-       gtk_box_pack_start(GTK_BOX(parent), GTK_WIDGET(buttons_hbox), FALSE, FALSE, 0);
-       gtk_container_set_border_width(GTK_CONTAINER(parent), HILDON_MARGIN_HALF);
+       // Ugly hacks: move the select rom button to the left.
+       gtk_box_pack_start_defaults(button_box, GTK_WIDGET(select_rom_btn));
+       gtk_box_reorder_child(button_box, GTK_WIDGET(select_rom_btn), 0);
 }
 #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));
 
@@ -244,12 +265,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());
@@ -266,11 +288,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));
@@ -285,12 +307,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());
 
@@ -309,11 +331,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");
@@ -322,9 +344,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);
@@ -360,6 +382,11 @@ 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);
@@ -408,8 +435,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)
@@ -418,22 +443,18 @@ 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());
@@ -441,17 +462,17 @@ static GtkWidget **load_menu(guint *nitems)
                GTK_WIDGET(settings_menu));
 
        GtkMenuItem* controls_item =
-               GTK_MENU_ITEM(gtk_menu_item_new_with_label("Controls…"));
+               GTK_MENU_ITEM(gtk_menu_item_new_with_label(_("Controls…")));
        gtk_menu_append(GTK_MENU(settings_menu), GTK_WIDGET(controls_item));
 
        GtkMenuItem* advanced_item =
-               GTK_MENU_ITEM(gtk_menu_item_new_with_label("Advanced…"));
+               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);
        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
@@ -507,27 +528,16 @@ 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);
                        }
                        break;
-#if MAEMO_VERSION >= 5
-               case MA_GAME_SAVEMENU_REFERENCE:
-                       // We're misusing this event.
-                       // It is always fired after GUI is built, and we like that.
-
-                       // Override size limit set by OGS
-                       gtk_widget_set_size_request(
-                               gtk_widget_get_parent(GTK_WIDGET(buttons_hbox)),
-                               -1, -1);
-                       break;
-#endif
        }
 }