Enlightenment CVS committal
Author : moom16
Project : e17
Module : apps/eclair
Dir : e17/apps/eclair/src
Modified Files:
eclair_dialogs.c eclair_private.h
Log Message:
* Do not use anymore GtkFileChooserDialog with glade since it seems to be
unsupported with libglade <= 2.4
I hope it will fix the open bug
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_dialogs.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- eclair_dialogs.c 27 May 2005 20:28:22 -0000 1.6
+++ eclair_dialogs.c 27 May 2005 21:31:49 -0000 1.7
@@ -61,7 +61,7 @@
if (!dialogs_manager)
return;
- 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))))
+ 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_widget))))
{
eclair_config_set_prop_string(&dialogs_manager->eclair->config,
"last_location", "path", last_location_path);
g_free(last_location_path);
@@ -179,6 +179,7 @@
{
char *last_location_path;
Eclair *eclair;
+ GtkWidget *file_chooser_alignment;
if (!dialogs_manager || !(eclair = dialogs_manager->eclair) || fc_type ==
ECLAIR_FC_NONE)
return;
@@ -187,6 +188,11 @@
{
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");
+ gtk_widget_hide(dialogs_manager->file_chooser_dialog);
+ file_chooser_alignment =
glade_xml_get_widget(dialogs_manager->file_chooser_xml,
"file_chooser_alignment");
+ dialogs_manager->file_chooser_widget =
gtk_file_chooser_widget_new(GTK_FILE_CHOOSER_ACTION_OPEN);
+ gtk_container_add(GTK_CONTAINER(file_chooser_alignment),
dialogs_manager->file_chooser_widget);
+ gtk_widget_show(dialogs_manager->file_chooser_widget);
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");
@@ -196,11 +202,11 @@
//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);
+
gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget),
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_dialog),
last_location_path);
+
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget),
last_location_path);
free(last_location_path);
}
@@ -215,8 +221,8 @@
if (fc_type == ECLAIR_FC_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_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_window_set_title(GTK_WINDOW(dialogs_manager->file_chooser_dialog),
"Add Files");
gtk_widget_show(dialogs_manager->file_chooser_all_button);
gtk_widget_show(dialogs_manager->file_chooser_none_button);
@@ -227,8 +233,8 @@
}
else if (fc_type == ECLAIR_FC_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_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget),
FALSE);
+
gtk_file_chooser_set_action(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget),
GTK_FILE_CHOOSER_ACTION_OPEN);
gtk_window_set_title(GTK_WINDOW(dialogs_manager->file_chooser_dialog),
"Load Playlist");
gtk_widget_hide(dialogs_manager->file_chooser_all_button);
gtk_widget_hide(dialogs_manager->file_chooser_none_button);
@@ -239,8 +245,8 @@
}
else if (fc_type == ECLAIR_FC_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_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget),
FALSE);
+
gtk_file_chooser_set_action(GTK_FILE_CHOOSER(dialogs_manager->file_chooser_widget),
GTK_FILE_CHOOSER_ACTION_SAVE);
gtk_window_set_title(GTK_WINDOW(dialogs_manager->file_chooser_dialog),
"Save Playlist");
gtk_widget_hide(dialogs_manager->file_chooser_all_button);
gtk_widget_hide(dialogs_manager->file_chooser_none_button);
@@ -252,6 +258,7 @@
else
return;
+ gtk_window_resize(GTK_WINDOW(dialogs_manager->file_chooser_dialog), 600,
400);
gtk_window_present(GTK_WINDOW(dialogs_manager->file_chooser_dialog));
}
@@ -262,7 +269,7 @@
GtkWidget *file_chooser;
GSList *filenames, *l;
- if (!(eclair = data) || !(file_chooser =
eclair->dialogs_manager.file_chooser_dialog))
+ if (!(eclair = data) || !(file_chooser =
eclair->dialogs_manager.file_chooser_widget))
return FALSE;
if (!(filenames =
gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(file_chooser))))
@@ -275,7 +282,7 @@
g_slist_free(filenames);
gtk_file_chooser_unselect_all(GTK_FILE_CHOOSER(file_chooser));
- gtk_widget_hide(file_chooser);
+ gtk_widget_hide(eclair->dialogs_manager.file_chooser_dialog);
return TRUE;
}
@@ -287,7 +294,7 @@
gchar *filename;
char *ext, *new_filename;
- if (!(eclair = data) || !(file_chooser =
eclair->dialogs_manager.file_chooser_dialog) ||
+ if (!(eclair = data) || !(file_chooser =
eclair->dialogs_manager.file_chooser_widget) ||
!(filename =
gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(file_chooser))) ||
strlen(filename) <= 0)
return FALSE;
@@ -303,7 +310,7 @@
g_free(filename);
gtk_file_chooser_unselect_all(GTK_FILE_CHOOSER(file_chooser));
- gtk_widget_hide(file_chooser);
+ gtk_widget_hide(eclair->dialogs_manager.file_chooser_dialog);
return TRUE;
}
@@ -312,11 +319,11 @@
{
Eclair *eclair;
- if (!(eclair = data))
+ if (!(eclair = data) || !eclair->dialogs_manager.file_chooser_widget)
return FALSE;
- gtk_file_chooser_unselect_all(GTK_FILE_CHOOSER(widget));
- gtk_widget_hide(widget);
+
gtk_file_chooser_unselect_all(GTK_FILE_CHOOSER(eclair->dialogs_manager.file_chooser_widget));
+ gtk_widget_hide(eclair->dialogs_manager.file_chooser_dialog);
return TRUE;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/eclair/src/eclair_private.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- eclair_private.h 27 May 2005 20:28:22 -0000 1.17
+++ eclair_private.h 27 May 2005 21:31:49 -0000 1.18
@@ -100,6 +100,7 @@
GtkWidget *file_chooser_load_playlist_button;
GtkWidget *file_chooser_add_files_button;
GtkWidget *file_chooser_cancel_button;
+ GtkWidget *file_chooser_widget;
GtkWidget *file_chooser_dialog;
//Menu widget vars
-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
