Menu
▾
▴
E CVS: apps/eclair moom16
|
From: <enl...@li...> - 2005-05-21 10:18:22
|
Enlightenment CVS committal
Author : moom16
Project : e17
Module : apps/eclair
Dir : e17/apps/eclair/src
Modified Files:
Makefile.am eclair_dialogs.c eclair_private.h
Log Message:
* Glade-ify the dialogs
* Add icons to the menu and to the the dialogs
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 18 May 2005 15:36:25 -0000 1.4
+++ Makefile.am 21 May 2005 10:18:11 -0000 1.5
@@ -2,6 +2,7 @@
INCLUDES = \
@gtk_cflags@ \
+@libglade_cflags@ \
@evas_cflags@ \
@ecore_cflags@ \
@edje_cflags@ \
@@ -34,6 +35,7 @@
eclair_LDADD = \
@gtk_libs@ \
+@libglade_libs@ \
@evas_libs@ \
@ecore_libs@ \
@edje_libs@ \
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_dialogs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- eclair_dialogs.c 20 May 2005 17:03:23 -0000 1.3
+++ eclair_dialogs.c 21 May 2005 10:18:11 -0000 1.4
@@ -1,5 +1,7 @@
#include "eclair_dialogs.h"
#include <gtk/gtk.h>
+#include <glade/glade.h>
+#include "../config.h"
#include "eclair.h"
#include "eclair_config.h"
#include "eclair_playlist.h"
@@ -14,36 +16,15 @@
static gboolean _eclair_dialogs_file_chooser_on_save_playlist(GtkWidget *widget, gpointer data);
static gboolean _eclair_dialogs_file_chooser_on_delete(GtkWidget *widget, GdkEvent *event, gpointer data);
-static void _eclair_dialogs_menu_on_add_files(gpointer data, guint action, GtkWidget *widget);
-static void _eclair_dialogs_menu_on_load_list(gpointer data, guint action, GtkWidget *widget);
-static void _eclair_dialogs_menu_on_save_list(gpointer data, guint action, GtkWidget *widget);
-static void _eclair_dialogs_menu_on_select_all(gpointer data, guint action, GtkWidget *widget);
-static void _eclair_dialogs_menu_on_select_none(gpointer data, guint action, GtkWidget *widget);
-static void _eclair_dialogs_menu_on_invert_selection(gpointer data, guint action, GtkWidget *widget);
-static void _eclair_dialogs_menu_on_remove_selected(gpointer data, guint action, GtkWidget *widget);
-static void _eclair_dialogs_menu_on_remove_unselected(gpointer data, guint action, GtkWidget *widget);
-static void _eclair_dialogs_menu_on_remove_all(gpointer data, guint action, GtkWidget *widget);
-
-static GtkItemFactoryEntry menu_items[] = {
- { "/tear", NULL, NULL, 0, "<Tearoff>" },
- { "/Open", NULL, NULL, 0, "<Branch>" },
- { "/Open/tear", NULL, NULL, 0, "<Tearoff>" },
- { "/Open/Add Files", NULL, _eclair_dialogs_menu_on_add_files, 1, "<Item>" },
- { "/Playlist", NULL, NULL, 0, "<Branch>" },
- { "/Playlist/tear", NULL, NULL, 0, "<Tearoff>" },
- { "/Playlist/Load List", NULL, _eclair_dialogs_menu_on_load_list, 1, "<Item>" },
- { "/Playlist/Save List", NULL, _eclair_dialogs_menu_on_save_list, 1, "<Item>" },
- { "/Playlist/separator1", NULL, NULL, 0, "<Separator>" },
- { "/Playlist/Select All", NULL, _eclair_dialogs_menu_on_select_all, 1, "<Item>" },
- { "/Playlist/Select None", NULL, _eclair_dialogs_menu_on_select_none, 1, "<Item>" },
- { "/Playlist/Invert Selection", NULL, _eclair_dialogs_menu_on_invert_selection, 1, "<Item>" },
- { "/Playlist/separator2", NULL, NULL, 0, "<Separator>" },
- { "/Playlist/Remove Selected", NULL, _eclair_dialogs_menu_on_remove_selected, 1, "<Item>" },
- { "/Playlist/Remove Unselected", NULL, _eclair_dialogs_menu_on_remove_unselected, 1, "<Item>" },
- { "/Playlist/Remove All", NULL, _eclair_dialogs_menu_on_remove_all, 1, "<Item>" }
-};
-
-static gint num_menu_items = sizeof(menu_items) / sizeof(menu_items[0]);
+static void _eclair_dialogs_menu_on_add_files(GtkWidget *widget, gpointer data);
+static void _eclair_dialogs_menu_on_load_playlist(GtkWidget *widget, gpointer data);
+static void _eclair_dialogs_menu_on_save_playlist(GtkWidget *widget, gpointer data);
+static void _eclair_dialogs_menu_on_select_all(GtkWidget *widget, gpointer data);
+static void _eclair_dialogs_menu_on_select_none(GtkWidget *widget, gpointer data);
+static void _eclair_dialogs_menu_on_invert_selection(GtkWidget *widget, gpointer data);
+static void _eclair_dialogs_menu_on_remove_selected(GtkWidget *widget, gpointer data);
+static void _eclair_dialogs_menu_on_remove_unselected(GtkWidget *widget, gpointer data);
+static void _eclair_dialogs_menu_on_remove_all(GtkWidget *widget, gpointer data);
//Initialize dialogs manager
void eclair_dialogs_init(Eclair_Dialogs_Manager *dialogs_manager, Eclair *eclair)
@@ -53,12 +34,16 @@
dialogs_manager->eclair = eclair;
+ dialogs_manager->file_chooser_xml = NULL;
dialogs_manager->file_chooser_all_button = NULL;
dialogs_manager->file_chooser_none_button = NULL;
- dialogs_manager->file_chooser_ok_button = NULL;
- dialogs_manager->file_chooser_close_button = NULL;
- dialogs_manager->file_chooser_widget = NULL;
+ dialogs_manager->file_chooser_save_playlist_button = NULL;
+ dialogs_manager->file_chooser_load_playlist_button = NULL;
+ dialogs_manager->file_chooser_add_files_button = NULL;
+ dialogs_manager->file_chooser_cancel_button = NULL;
dialogs_manager->file_chooser_dialog = NULL;
+
+ dialogs_manager->menu_xml = NULL;
dialogs_manager->menu_widget = NULL;
dialogs_manager->should_quit = FALSE;
@@ -76,7 +61,7 @@
if (!dialogs_manager)
return;
- if (dialogs_manager->file_chooser_widget && dialogs_manager->eclair && (last_location_path = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget))))
+ if (dialogs_manager->eclair &&dialogs_manager->file_chooser_dialog && (last_location_path = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_dialog))))
{
eclair_config_set_prop_string(&dialogs_manager->eclair->config, "last_location", "path", last_location_path);
g_free(last_location_path);
@@ -155,7 +140,6 @@
//Init and start the eclair dialogs main loop
static void *_eclair_dialogs_thread(void *param)
{
- GtkItemFactory *item_factory;
Eclair_Dialogs_Manager *dialogs_manager;
Eclair *eclair = (Eclair *)param;
@@ -167,9 +151,17 @@
dialogs_manager = &eclair->dialogs_manager;
//Create the menu
- item_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL);
- gtk_item_factory_create_items(item_factory, num_menu_items, menu_items, eclair);
- dialogs_manager->menu_widget = gtk_item_factory_get_widget(item_factory, "<main>");
+ dialogs_manager->menu_xml = glade_xml_new(PACKAGE_DATA_DIR "/glade/eclair.glade", "popup_menu", NULL);
+ dialogs_manager->menu_widget = glade_xml_get_widget(dialogs_manager->menu_xml, "popup_menu");
+ glade_xml_signal_connect_data(dialogs_manager->menu_xml, "add_files_handler", G_CALLBACK(_eclair_dialogs_menu_on_add_files), eclair);
+ glade_xml_signal_connect_data(dialogs_manager->menu_xml, "load_playlist_handler", G_CALLBACK(_eclair_dialogs_menu_on_load_playlist), eclair);
+ glade_xml_signal_connect_data(dialogs_manager->menu_xml, "save_playlist_handler", G_CALLBACK(_eclair_dialogs_menu_on_save_playlist), eclair);
+ glade_xml_signal_connect_data(dialogs_manager->menu_xml, "select_all_handler", G_CALLBACK(_eclair_dialogs_menu_on_select_all), eclair);
+ glade_xml_signal_connect_data(dialogs_manager->menu_xml, "select_none_handler", G_CALLBACK(_eclair_dialogs_menu_on_select_none), eclair);
+ glade_xml_signal_connect_data(dialogs_manager->menu_xml, "invert_selection_handler", G_CALLBACK(_eclair_dialogs_menu_on_invert_selection), eclair);
+ glade_xml_signal_connect_data(dialogs_manager->menu_xml, "remove_selected_handler", G_CALLBACK(_eclair_dialogs_menu_on_remove_selected), eclair);
+ glade_xml_signal_connect_data(dialogs_manager->menu_xml, "remove_unselected_handler", G_CALLBACK(_eclair_dialogs_menu_on_remove_unselected), eclair);
+ glade_xml_signal_connect_data(dialogs_manager->menu_xml, "remove_all_handler", G_CALLBACK(_eclair_dialogs_menu_on_remove_all), eclair);
g_timeout_add(50, _eclair_dialogs_update, dialogs_manager);
@@ -191,72 +183,71 @@
if (!dialogs_manager || !(eclair = dialogs_manager->eclair) || fc_type == ECLAIR_FC_NONE)
return;
- if (!dialogs_manager->file_chooser_dialog)
+ if (!dialogs_manager->file_chooser_xml || !dialogs_manager->file_chooser_dialog)
{
- //Create the file chooser
- dialogs_manager->file_chooser_dialog = gtk_dialog_new_with_buttons("Add Files", NULL, GTK_DIALOG_NO_SEPARATOR, NULL);
- gtk_window_set_wmclass(GTK_WINDOW(dialogs_manager->file_chooser_dialog), "eclair", "eclair");
- gtk_window_set_default_size(GTK_WINDOW(dialogs_manager->file_chooser_dialog), 600, 420);
- dialogs_manager->file_chooser_widget = gtk_file_chooser_widget_new(GTK_FILE_CHOOSER_ACTION_OPEN);
- gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget), FALSE);
+ dialogs_manager->file_chooser_xml = glade_xml_new(PACKAGE_DATA_DIR "/glade/eclair.glade", "file_chooser_dialog", NULL);
+ dialogs_manager->file_chooser_dialog = glade_xml_get_widget(dialogs_manager->file_chooser_xml, "file_chooser_dialog");
+ dialogs_manager->file_chooser_all_button = glade_xml_get_widget(dialogs_manager->file_chooser_xml, "select_all_button");
+ dialogs_manager->file_chooser_none_button = glade_xml_get_widget(dialogs_manager->file_chooser_xml, "select_none_button");
+ dialogs_manager->file_chooser_save_playlist_button = glade_xml_get_widget(dialogs_manager->file_chooser_xml, "save_playlist_button");
+ dialogs_manager->file_chooser_load_playlist_button = glade_xml_get_widget(dialogs_manager->file_chooser_xml, "load_playlist_button");
+ dialogs_manager->file_chooser_add_files_button = glade_xml_get_widget(dialogs_manager->file_chooser_xml, "add_files_button");
+ dialogs_manager->file_chooser_cancel_button = glade_xml_get_widget(dialogs_manager->file_chooser_xml, "cancel_button");
+
+ //TODO:
+ //gtk_window_set_wmclass(GTK_WINDOW(dialogs_manager->file_chooser_dialog), "eclair", "eclair");
+ gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_dialog), TRUE);
if (eclair_config_get_prop_string(&eclair->config, "last_location", "path", &last_location_path))
{
if (strlen(last_location_path) > 0)
- gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget), last_location_path);
+ gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_dialog), last_location_path);
free(last_location_path);
}
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialogs_manager->file_chooser_dialog)->vbox), dialogs_manager->file_chooser_widget, TRUE, TRUE, 0);
-
- dialogs_manager->file_chooser_all_button = gtk_button_new_with_label("All");
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialogs_manager->file_chooser_dialog)->action_area), dialogs_manager->file_chooser_all_button, TRUE, TRUE, 0);
- dialogs_manager->file_chooser_none_button = gtk_button_new_with_label("None");
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialogs_manager->file_chooser_dialog)->action_area), dialogs_manager->file_chooser_none_button, TRUE, TRUE, 0);
- dialogs_manager->file_chooser_ok_button = gtk_button_new_with_label("Add Files");
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialogs_manager->file_chooser_dialog)->action_area), dialogs_manager->file_chooser_ok_button, TRUE, TRUE, 0);
- dialogs_manager->file_chooser_close_button = gtk_button_new_with_label("Close");
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialogs_manager->file_chooser_dialog)->action_area), dialogs_manager->file_chooser_close_button, TRUE, TRUE, 0);
-
- g_signal_connect_swapped(dialogs_manager->file_chooser_all_button, "clicked", G_CALLBACK(gtk_file_chooser_select_all), dialogs_manager->file_chooser_widget);
- g_signal_connect_swapped(dialogs_manager->file_chooser_none_button, "clicked", G_CALLBACK(gtk_file_chooser_unselect_all), dialogs_manager->file_chooser_widget);
- dialogs_manager->file_chooser_ok_handler = g_signal_connect(dialogs_manager->file_chooser_ok_button, "clicked", G_CALLBACK(_eclair_dialogs_file_chooser_on_add_files), eclair);
- g_signal_connect_swapped(dialogs_manager->file_chooser_close_button, "clicked", G_CALLBACK(gtk_widget_hide), dialogs_manager->file_chooser_dialog);
+
+ g_signal_connect_swapped(dialogs_manager->file_chooser_all_button, "clicked", G_CALLBACK(gtk_file_chooser_select_all), dialogs_manager->file_chooser_dialog);
+ g_signal_connect_swapped(dialogs_manager->file_chooser_none_button, "clicked", G_CALLBACK(gtk_file_chooser_unselect_all), dialogs_manager->file_chooser_dialog);
+ g_signal_connect(dialogs_manager->file_chooser_save_playlist_button, "clicked", G_CALLBACK(_eclair_dialogs_file_chooser_on_save_playlist), eclair);
+ g_signal_connect(dialogs_manager->file_chooser_load_playlist_button, "clicked", G_CALLBACK(_eclair_dialogs_file_chooser_on_add_files), eclair);
+ g_signal_connect(dialogs_manager->file_chooser_add_files_button, "clicked", G_CALLBACK(_eclair_dialogs_file_chooser_on_add_files), eclair);
+ g_signal_connect_swapped(dialogs_manager->file_chooser_cancel_button, "clicked", G_CALLBACK(gtk_widget_hide), dialogs_manager->file_chooser_dialog);
g_signal_connect(dialogs_manager->file_chooser_dialog, "delete_event", G_CALLBACK(_eclair_dialogs_file_chooser_on_delete), eclair);
-
- gtk_widget_show_all(dialogs_manager->file_chooser_dialog);
}
if (fc_type == ECLAIR_FC_ADD_FILES)
{
- gtk_file_chooser_set_action(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget), GTK_FILE_CHOOSER_ACTION_OPEN);
- gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget), TRUE);
- gtk_button_set_label(GTK_BUTTON(dialogs_manager->file_chooser_ok_button), "Add Files");
+ gtk_file_chooser_set_action(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_dialog), GTK_FILE_CHOOSER_ACTION_OPEN);
+ gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_dialog), TRUE);
gtk_window_set_title(GTK_WINDOW(dialogs_manager->file_chooser_dialog), "Add Files");
- g_signal_handler_disconnect(dialogs_manager->file_chooser_ok_button, dialogs_manager->file_chooser_ok_handler);
- dialogs_manager->file_chooser_ok_handler = g_signal_connect(dialogs_manager->file_chooser_ok_button, "clicked", G_CALLBACK(_eclair_dialogs_file_chooser_on_add_files), eclair);
gtk_widget_show(dialogs_manager->file_chooser_all_button);
gtk_widget_show(dialogs_manager->file_chooser_none_button);
+ gtk_widget_hide(dialogs_manager->file_chooser_save_playlist_button);
+ gtk_widget_hide(dialogs_manager->file_chooser_load_playlist_button);
+ gtk_widget_show(dialogs_manager->file_chooser_add_files_button);
+ gtk_widget_show(dialogs_manager->file_chooser_cancel_button);
}
else if (fc_type == ECLAIR_FC_LOAD_PLAYLIST)
{
- gtk_file_chooser_set_action(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget), GTK_FILE_CHOOSER_ACTION_OPEN);
- gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget), FALSE);
- gtk_button_set_label(GTK_BUTTON(dialogs_manager->file_chooser_ok_button), "Load Playlist");
+ gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_dialog), FALSE);
+ gtk_file_chooser_set_action(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_dialog), GTK_FILE_CHOOSER_ACTION_OPEN);
gtk_window_set_title(GTK_WINDOW(dialogs_manager->file_chooser_dialog), "Load Playlist");
- g_signal_handler_disconnect(dialogs_manager->file_chooser_ok_button, dialogs_manager->file_chooser_ok_handler);
- dialogs_manager->file_chooser_ok_handler = g_signal_connect(dialogs_manager->file_chooser_ok_button, "clicked", G_CALLBACK(_eclair_dialogs_file_chooser_on_add_files), eclair);
gtk_widget_hide(dialogs_manager->file_chooser_all_button);
gtk_widget_hide(dialogs_manager->file_chooser_none_button);
+ gtk_widget_hide(dialogs_manager->file_chooser_save_playlist_button);
+ gtk_widget_show(dialogs_manager->file_chooser_load_playlist_button);
+ gtk_widget_hide(dialogs_manager->file_chooser_add_files_button);
+ gtk_widget_show(dialogs_manager->file_chooser_cancel_button);
}
else if (fc_type == ECLAIR_FC_SAVE_PLAYLIST)
{
- gtk_file_chooser_set_action(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget), GTK_FILE_CHOOSER_ACTION_SAVE);
- gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget), FALSE);
- gtk_button_set_label(GTK_BUTTON(dialogs_manager->file_chooser_ok_button), "Save Playlist");
+ gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_dialog), FALSE);
+ gtk_file_chooser_set_action(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_dialog), GTK_FILE_CHOOSER_ACTION_SAVE);
gtk_window_set_title(GTK_WINDOW(dialogs_manager->file_chooser_dialog), "Save Playlist");
- g_signal_handler_disconnect(dialogs_manager->file_chooser_ok_button, dialogs_manager->file_chooser_ok_handler);
- dialogs_manager->file_chooser_ok_handler = g_signal_connect(dialogs_manager->file_chooser_ok_button, "clicked", G_CALLBACK(_eclair_dialogs_file_chooser_on_save_playlist), eclair);
gtk_widget_hide(dialogs_manager->file_chooser_all_button);
gtk_widget_hide(dialogs_manager->file_chooser_none_button);
+ gtk_widget_show(dialogs_manager->file_chooser_save_playlist_button);
+ gtk_widget_hide(dialogs_manager->file_chooser_load_playlist_button);
+ gtk_widget_hide(dialogs_manager->file_chooser_add_files_button);
+ gtk_widget_show(dialogs_manager->file_chooser_cancel_button);
}
else
return;
@@ -271,7 +262,7 @@
GtkWidget *file_chooser;
GSList *filenames, *l;
- if (!eclair || !(file_chooser = eclair->dialogs_manager.file_chooser_widget))
+ if (!eclair || !(file_chooser = eclair->dialogs_manager.file_chooser_dialog))
return FALSE;
if (!(filenames = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(file_chooser))))
@@ -285,7 +276,7 @@
g_slist_free(filenames);
gtk_file_chooser_unselect_all(GTK_FILE_CHOOSER(file_chooser));
- gtk_widget_hide(eclair->dialogs_manager.file_chooser_dialog);
+ gtk_widget_hide(file_chooser);
return TRUE;
}
@@ -297,7 +288,7 @@
gchar *filename;
char *ext, *new_filename;
- if (!eclair || !(file_chooser = eclair->dialogs_manager.file_chooser_widget))
+ if (!eclair || !(file_chooser = eclair->dialogs_manager.file_chooser_dialog))
return FALSE;
if (!(filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(file_chooser))) || strlen(filename) <= 0)
@@ -315,7 +306,7 @@
g_free(filename);
gtk_file_chooser_unselect_all(GTK_FILE_CHOOSER(file_chooser));
- gtk_widget_hide(eclair->dialogs_manager.file_chooser_dialog);
+ gtk_widget_hide(file_chooser);
return TRUE;
}
@@ -327,8 +318,8 @@
if (!eclair)
return FALSE;
- gtk_file_chooser_unselect_all(GTK_FILE_CHOOSER(eclair->dialogs_manager.file_chooser_widget));
- gtk_widget_hide(eclair->dialogs_manager.file_chooser_dialog);
+ gtk_file_chooser_unselect_all(GTK_FILE_CHOOSER(widget));
+ gtk_widget_hide(widget);
return TRUE;
}
@@ -336,7 +327,7 @@
// Menu functions
//------------------------------
-static void _eclair_dialogs_menu_on_add_files(gpointer data, guint action, GtkWidget *widget)
+static void _eclair_dialogs_menu_on_add_files(GtkWidget *widget, gpointer data)
{
Eclair *eclair = (Eclair *)data;
@@ -346,7 +337,7 @@
eclair_dialogs_add_files_file_chooser(&eclair->dialogs_manager);
}
-static void _eclair_dialogs_menu_on_load_list(gpointer data, guint action, GtkWidget *widget)
+static void _eclair_dialogs_menu_on_load_playlist(GtkWidget *widget, gpointer data)
{
Eclair *eclair = (Eclair *)data;
@@ -356,7 +347,7 @@
eclair_dialogs_load_playlist_file_chooser(&eclair->dialogs_manager);
}
-static void _eclair_dialogs_menu_on_save_list(gpointer data, guint action, GtkWidget *widget)
+static void _eclair_dialogs_menu_on_save_playlist(GtkWidget *widget, gpointer data)
{
Eclair *eclair = (Eclair *)data;
@@ -366,7 +357,7 @@
eclair_dialogs_save_playlist_file_chooser(&eclair->dialogs_manager);
}
-static void _eclair_dialogs_menu_on_select_all(gpointer data, guint action, GtkWidget *widget)
+static void _eclair_dialogs_menu_on_select_all(GtkWidget *widget, gpointer data)
{
Eclair *eclair = (Eclair *)data;
@@ -376,7 +367,7 @@
eclair_playlist_container_select_all(eclair->playlist_container);
}
-static void _eclair_dialogs_menu_on_select_none(gpointer data, guint action, GtkWidget *widget)
+static void _eclair_dialogs_menu_on_select_none(GtkWidget *widget, gpointer data)
{
Eclair *eclair = (Eclair *)data;
@@ -386,7 +377,7 @@
eclair_playlist_container_select_none(eclair->playlist_container);
}
-static void _eclair_dialogs_menu_on_invert_selection(gpointer data, guint action, GtkWidget *widget)
+static void _eclair_dialogs_menu_on_invert_selection(GtkWidget *widget, gpointer data)
{
Eclair *eclair = (Eclair *)data;
@@ -396,7 +387,7 @@
eclair_playlist_container_invert_selection(eclair->playlist_container);
}
-static void _eclair_dialogs_menu_on_remove_selected(gpointer data, guint action, GtkWidget *widget)
+static void _eclair_dialogs_menu_on_remove_selected(GtkWidget *widget, gpointer data)
{
Eclair *eclair = (Eclair *)data;
@@ -406,7 +397,7 @@
eclair_playlist_remove_selected_media_files(&eclair->playlist);
}
-static void _eclair_dialogs_menu_on_remove_unselected(gpointer data, guint action, GtkWidget *widget)
+static void _eclair_dialogs_menu_on_remove_unselected(GtkWidget *widget, gpointer data)
{
Eclair *eclair = (Eclair *)data;
@@ -416,7 +407,7 @@
eclair_playlist_remove_unselected_media_files(&eclair->playlist);
}
-static void _eclair_dialogs_menu_on_remove_all(gpointer data, guint action, GtkWidget *widget)
+static void _eclair_dialogs_menu_on_remove_all(GtkWidget *widget, gpointer data)
{
Eclair *eclair = (Eclair *)data;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_private.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- eclair_private.h 20 May 2005 17:03:23 -0000 1.14
+++ eclair_private.h 21 May 2005 10:18:11 -0000 1.15
@@ -7,6 +7,7 @@
#include <Ecore_Evas.h>
#include <Edje.h>
#include <gtk/gtk.h>
+#include <glade/glade.h>
#include <pthread.h>
#include <libxml/tree.h>
@@ -87,14 +88,16 @@
struct _Eclair_Dialogs_Manager
{
+ GladeXML *file_chooser_xml;
GtkWidget *file_chooser_all_button;
GtkWidget *file_chooser_none_button;
- GtkWidget *file_chooser_ok_button;
- GtkWidget *file_chooser_close_button;
- GtkWidget *file_chooser_widget;
+ GtkWidget *file_chooser_save_playlist_button;
+ GtkWidget *file_chooser_load_playlist_button;
+ GtkWidget *file_chooser_add_files_button;
+ GtkWidget *file_chooser_cancel_button;
GtkWidget *file_chooser_dialog;
- gulong file_chooser_ok_handler;
+ GladeXML *menu_xml;
GtkWidget *menu_widget;
gboolean should_popup_menu;
|
