gboolean current_rom_file_exists = FALSE;
#if MAEMO_VERSION >= 5
-static GtkBox* buttons_hbox;
static HildonButton* select_rom_btn;
-static HildonCheckButton* audio_check;
+static HildonCheckButton* sound_check;
static HildonPickerButton* framerate_picker;
static HildonCheckButton* display_fps_check;
static HildonCheckButton* turbo_check;
#else
static GtkButton* select_rom_btn;
static GtkLabel* rom_label;
-static GtkCheckButton* audio_check;
+static GtkCheckButton* sound_check;
static GtkCheckButton* turbo_check;
static GtkComboBox* framerate_combo;
static GtkCheckButton* accu_check;
static GtkComboBox* speedhacks_combo;
#endif
+static inline void set_rom_label(gchar * text)
+{
+#if MAEMO_VERSION >= 5
+ hildon_button_set_value(select_rom_btn, text);
+#else
+ gtk_label_set_text(GTK_LABEL(rom_label), text);
+#endif
+}
+
static void set_rom(const char * rom_file)
{
if (current_rom_file) g_free(current_rom_file);
- if (!rom_file) {
+ if (!rom_file || strlen(rom_file) == 0) {
current_rom_file = NULL;
+ set_rom_label("<no rom selected>");
return;
}
current_rom_file = g_strdup(rom_file);
gchar * utf8_filename = g_filename_display_basename(rom_file);
-#if MAEMO_VERSION >= 5
- hildon_button_set_value(select_rom_btn, utf8_filename);
-#else
- gtk_label_set_text(GTK_LABEL(rom_label), utf8_filename);
-#endif
+ set_rom_label(utf8_filename);
g_free(utf8_filename);
current_rom_file_exists = g_file_test(current_rom_file,
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(),
controls_dialog(get_parent_window());
}
+static void advanced_item_callback(GtkWidget * button, gpointer data)
+{
+ advanced_dialog(get_parent_window());
+}
+
static void about_item_callback(GtkWidget * button, gpointer data)
{
about_dialog(get_parent_window());
}
+#if MAEMO_VERSION >= 5
+/* 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,
+ HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_THUMB_HEIGHT);
+ gtk_widget_set_size_request(widget, 200, -1);
+ gtk_box_set_child_packing(GTK_BOX(data), widget,
+ FALSE, FALSE, 0, GTK_PACK_START);
+}
+#endif
+
static GtkWidget * load_plugin(void)
{
g_type_init();
/* Select ROM button */
#if MAEMO_VERSION >= 5
-// Very ugly hack ahead.
{
- buttons_hbox = GTK_BOX(gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT));
- // We can UNsafely assume gs.ui->play_button exists.
-
select_rom_btn = HILDON_BUTTON(hildon_button_new_with_text(
HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_THUMB_HEIGHT,
HILDON_BUTTON_ARRANGEMENT_VERTICAL,
"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));
- gtk_widget_reparent(gs.ui->play_button, GTK_WIDGET(buttons_hbox));
- gtk_box_set_child_packing(buttons_hbox, gs.ui->play_button,
- FALSE, FALSE, 0, GTK_PACK_START);
+ // 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
{
#if MAEMO_VERSION >= 5
{
GtkBox* opt_hbox1 = GTK_BOX(gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT));
- audio_check =
+ sound_check =
HILDON_CHECK_BUTTON(hildon_check_button_new(
HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT));
- gtk_button_set_label(GTK_BUTTON(audio_check), "Sound");
+ gtk_button_set_label(GTK_BUTTON(sound_check), "Sound");
framerate_picker = HILDON_PICKER_BUTTON(hildon_picker_button_new(
- HILDON_SIZE_AUTO, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL));
+ HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT,
+ HILDON_BUTTON_ARRANGEMENT_HORIZONTAL));
hildon_button_set_title(HILDON_BUTTON(framerate_picker), "Target framerate");
HildonTouchSelector* framerate_sel =
gtk_box_pack_start(GTK_BOX(framerate_sel), GTK_WIDGET(framerate_sel_box), FALSE, FALSE, 0);
gtk_widget_show_all(GTK_WIDGET(framerate_sel_box));
- gtk_box_pack_start_defaults(opt_hbox1, GTK_WIDGET(audio_check));
+ gtk_box_pack_start_defaults(opt_hbox1, GTK_WIDGET(sound_check));
gtk_box_pack_start_defaults(opt_hbox1, GTK_WIDGET(framerate_picker));
gtk_box_pack_start(GTK_BOX(parent), GTK_WIDGET(opt_hbox1), FALSE, FALSE, 0);
}
#else
{
GtkBox* opt_hbox1 = GTK_BOX(gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT));
- audio_check =
+ sound_check =
GTK_CHECK_BUTTON(gtk_check_button_new_with_label("Enable sound"));
turbo_check =
speedhacks_combo =
GTK_COMBO_BOX(gtk_combo_box_new_text());
- gtk_box_pack_start(opt_hbox1, GTK_WIDGET(audio_check), FALSE, FALSE, 0);
+ gtk_box_pack_start(opt_hbox1, GTK_WIDGET(sound_check), FALSE, FALSE, 0);
gtk_box_pack_start(opt_hbox1, GTK_WIDGET(display_fps_check), TRUE, FALSE, 0);
gtk_box_pack_start(opt_hbox1, GTK_WIDGET(turbo_check), FALSE, FALSE, 0);
- gtk_box_pack_start_defaults(GTK_BOX(parent), GTK_WIDGET(opt_hbox1));
+ gtk_box_pack_start(GTK_BOX(parent), GTK_WIDGET(opt_hbox1), FALSE, FALSE, 0);
}
#endif
/* Load current configuration from GConf */
#if MAEMO_VERSION >= 5
- hildon_check_button_set_active(audio_check,
- !gconf_client_get_bool(gcc, kGConfDisableAudio, NULL));
+ hildon_check_button_set_active(sound_check,
+ gconf_client_get_bool(gcc, kGConfSound, NULL));
hildon_picker_button_set_active(framerate_picker,
gconf_client_get_int(gcc, kGConfFrameskip, NULL));
hildon_check_button_set_active(turbo_check,
hildon_check_button_set_active(display_fps_check,
gconf_client_get_bool(gcc, kGConfDisplayFramerate, NULL));
#else
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(audio_check),
- !gconf_client_get_bool(gcc, kGConfDisableAudio, NULL));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sound_check),
+ gconf_client_get_bool(gcc, kGConfSound, NULL));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(turbo_check),
gconf_client_get_bool(gcc, kGConfTurboMode, NULL));
gtk_combo_box_set_active(framerate_combo,
{
/* Write current settings to gconf */
#if MAEMO_VERSION >= 5
- gconf_client_set_bool(gcc, kGConfDisableAudio,
- !hildon_check_button_get_active(audio_check), NULL);
+ gconf_client_set_bool(gcc, kGConfSound,
+ hildon_check_button_get_active(sound_check), NULL);
gconf_client_set_int(gcc, kGConfFrameskip,
hildon_picker_button_get_active(framerate_picker), NULL);
gconf_client_set_bool(gcc, kGConfDisplayFramerate,
hildon_check_button_get_active(display_fps_check), NULL);
gconf_client_set_bool(gcc, kGConfTurboMode,
hildon_check_button_get_active(turbo_check), NULL);
-
- // For now, transparencies are always enabled in Fremantle
- gconf_client_set_bool(gcc, kGConfTransparency, TRUE, NULL);
- // Speedhacks always disabled
- gconf_client_set_int(gcc, kGConfSpeedhacks, FALSE, NULL);
#else
- gconf_client_set_bool(gcc, kGConfDisableAudio,
- !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(audio_check)), NULL);
+ gconf_client_set_bool(gcc, kGConfSound,
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sound_check)), NULL);
gconf_client_set_bool(gcc, kGConfTurboMode,
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(turbo_check)), NULL);
gconf_client_set_int(gcc, kGConfFrameskip,
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]), "Placeholder");
+ 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;
+ g_signal_connect(G_OBJECT(menu_items[0]), "clicked",
+ G_CALLBACK(advanced_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",
*nitems = 2;
GtkMenu* settings_menu = GTK_MENU(gtk_menu_new());
- GtkMenuItem* controls_item =
- GTK_MENU_ITEM(gtk_menu_item_new_with_label("Controls…"));
-
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_items[0]),
GTK_WIDGET(settings_menu));
+
+ GtkMenuItem* controls_item =
+ 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_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_signal_connect(G_OBJECT(menu_items[1]), "activate",
G_CALLBACK(about_item_callback), NULL);
#endif
static void plugin_callback(GtkWidget * menu_item, gpointer data)
{
-#if MAEMO_VERSION >= 5
- static int widgets_moved = 0;
-#endif
switch ((gint) data) {
case ME_GAME_OPEN:
save_load(get_parent_window());
gtk_widget_destroy(note);
}
break;
-#if MAEMO_VERSION >= 5
- // The above horrible hack continues here.
- case MA_GAME_CHECKSTATE:
- if (gs.ui->restart_button &&
- gtk_widget_get_parent(gs.ui->restart_button)
- != GTK_WIDGET(buttons_hbox))
- {
- GtkWidget* old_parent = gtk_widget_get_parent(gs.ui->restart_button);
- gtk_widget_reparent(gs.ui->restart_button,
- GTK_WIDGET(buttons_hbox));
- gtk_box_set_child_packing(buttons_hbox, gs.ui->restart_button,
- FALSE, FALSE, 0, GTK_PACK_END);
-
- widgets_moved++;
- if (widgets_moved == 1) {
- gtk_widget_set_size_request(
- gtk_widget_get_parent(GTK_WIDGET(buttons_hbox)),
- -1, -1);
- } else if (widgets_moved == 2) {
- gtk_widget_destroy(old_parent);
- }
- }
- break;
- case MA_GAME_PLAYING:
- if (gtk_widget_get_parent(gs.ui->play_button) != GTK_WIDGET(buttons_hbox))
- {
- GtkWidget* old_parent = gtk_widget_get_parent(gs.ui->play_button);
- gtk_widget_reparent(gs.ui->play_button,
- GTK_WIDGET(buttons_hbox));
- gtk_box_set_child_packing(buttons_hbox, gs.ui->play_button,
- FALSE, FALSE, 0, GTK_PACK_START);
-
- widgets_moved++;
- if (widgets_moved == 1) {
- gtk_widget_set_size_request(
- gtk_widget_get_parent(GTK_WIDGET(buttons_hbox)),
- -1, -1);
- } else if (widgets_moved == 2) {
- gtk_widget_destroy(old_parent);
- }
- }
-
- break;
-#endif
}
}
projects / drnoksnes / blobdiff