commit b542eacf49d913f26bf0f8d7d2b3a7f178ef1663 Author: Daniele Forsi <dani...@forsi.it> Date: Mon Dec 20 23:54:30 2010 +0100
More GUI fixes * libgtkpod/misc.c * Make get_user_string() open its dialog centered and on top of the main window. * libgtkpod/fileselection.c * Make fileselection_get_file_or_dir() and fileselection_get_cover_filename() open their dialogs centered and on top of the main window. * plugins/exporter/file_export.c * Make export_tracks_as_files() and export_tracks_to_playlist_file() open their dialogs centered and on top of the main window. * plugins/playlist_display/playlist_display_actions.c * Make fileselection_get_files() open its dialog centered and on top of the main window. * src/anjuta-app.c * Make anjuta_gtkpod_app_confirmation() open its dialog centered and on top of the main window. * plugins/repository_editor/repository_editor.glade * In the "Initialize iPod" dialog Make the "Browse" button identical to the "Browse" buttons in the other dialogs and make the "Model" combo fill the available space and align to the widgets above. libgtkpod/fileselection.c | 6 ++- libgtkpod/misc.c | 1 + plugins/exporter/file_export.c | 6 ++- .../playlist_display/playlist_display_actions.c | 3 +- plugins/repository_editor/repository_editor.glade | 39 ++++++++++++++++---- src/anjuta-app.c | 3 ++ 6 files changed, 45 insertions(+), 13 deletions(-) --- diff --git a/libgtkpod/fileselection.c b/libgtkpod/fileselection.c index 2b103f5..f7bc243 100644 --- a/libgtkpod/fileselection.c +++ b/libgtkpod/fileselection.c @@ -276,7 +276,8 @@ gchar *fileselection_get_cover_filename(void) { /* Create the file chooser, and handle the response */ fc - = gtk_file_chooser_dialog_new(_("Set Cover"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + = gtk_file_chooser_dialog_new(_("Set Cover"), GTK_WINDOW (gtkpod_app), GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER (fc), FALSE); @@ -340,7 +341,8 @@ gchar *fileselection_get_file_or_dir(const gchar *title, const gchar *cur_file, /* Create the file chooser, and handle the response */ fc - = gtk_file_chooser_dialog_new(title, NULL, action, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + = gtk_file_chooser_dialog_new(title, GTK_WINDOW (gtkpod_app), action, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER (fc), FALSE); diff --git a/libgtkpod/misc.c b/libgtkpod/misc.c index 3bdccee..b322424 100644 --- a/libgtkpod/misc.c +++ b/libgtkpod/misc.c @@ -1741,6 +1741,7 @@ gchar *get_user_string(gchar *title, gchar *message, gchar *dflt, gchar *opt_msg gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (checkb), *opt_state); } + gtk_window_set_transient_for(GTK_WINDOW (dialog), GTK_WINDOW (gtkpod_app)); response = gtk_dialog_run(GTK_DIALOG (dialog)); if (response == GTK_RESPONSE_OK) { diff --git a/plugins/exporter/file_export.c b/plugins/exporter/file_export.c index dd296ed..2081323 100644 --- a/plugins/exporter/file_export.c +++ b/plugins/exporter/file_export.c @@ -529,7 +529,8 @@ void export_tracks_as_files(GList *tracks, GList **filenames, gboolean display, } fc - = gtk_file_chooser_dialog_new(_("Select Export Destination Directory"), NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); + = gtk_file_chooser_dialog_new(_("Select Export Destination Directory"), GTK_WINDOW (gtkpod_app), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); gchar *glade_path = g_build_filename(get_glade_dir(), "exporter.xml", NULL); export_files_xml = gtk_builder_new(); @@ -931,7 +932,8 @@ void export_tracks_to_playlist_file(GList *tracks) { struct fcd *fcd = g_malloc0(sizeof(struct fcd)); GtkWidget *fc = - gtk_file_chooser_dialog_new(_("Create Playlist File"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_APPLY, RESPONSE_APPLY, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); + gtk_file_chooser_dialog_new(_("Create Playlist File"), GTK_WINDOW (gtkpod_app), GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_APPLY, RESPONSE_APPLY, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); GtkBuilder *export_playlist_xml; gchar *glade_path = g_build_filename(get_glade_dir(), "exporter.glade", NULL); diff --git a/plugins/playlist_display/playlist_display_actions.c b/plugins/playlist_display/playlist_display_actions.c index 85a9e77..df44af7 100644 --- a/plugins/playlist_display/playlist_display_actions.c +++ b/plugins/playlist_display/playlist_display_actions.c @@ -159,7 +159,8 @@ static GSList* fileselection_get_files(const gchar *title) { GSList * files = NULL; fc - = gtk_file_chooser_dialog_new(title, NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + = gtk_file_chooser_dialog_new(title, GTK_WINDOW (gtkpod_app), GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); /* allow multiple selection of files */ gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER (fc), TRUE); diff --git a/plugins/repository_editor/repository_editor.glade b/plugins/repository_editor/repository_editor.glade index 5057c09..a077d05 100644 --- a/plugins/repository_editor/repository_editor.glade +++ b/plugins/repository_editor/repository_editor.glade @@ -1899,16 +1899,39 @@ Local Repository (Podcasts) <widget class="GtkButton" id="iid_mountpoint_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Browse</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> + <child> + <widget class="GtkHBox" id="hbox185"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <widget class="GtkImage" id="image10"> + <property name="visible">True</property> + <property name="stock">gtk-directory</property> + </widget> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label79"> + <property name="visible">True</property> + <property name="label" translatable="yes">Browse...</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options"/> - <property name="y_options"/> - <property name="x_padding">3</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options"/> + <property name="y_options"/> + <property name="x_padding">3</property> </packing> </child> <child> @@ -1938,7 +1961,7 @@ Local Repository (Podcasts) <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options"/> + <property name="x_options">GTK_FILL</property> <property name="y_options"/> <property name="x_padding">3</property> <property name="y_padding">3</property> diff --git a/src/anjuta-app.c b/src/anjuta-app.c index c0d506b..91c389f 100644 --- a/src/anjuta-app.c +++ b/src/anjuta-app.c @@ -1422,6 +1422,9 @@ static GtkResponseType anjuta_gtkpod_app_confirmation(GtkPodApp *obj, gint id, g G_CALLBACK (on_cancel_clicked), GINT_TO_POINTER(id)); + /* Stay on top of main window */ + gtk_window_set_transient_for(GTK_WINDOW (window), GTK_WINDOW (gtkpod_app)); + if (modal) { /* use gtk_dialog_run() to block the application */ gint response = gtk_dialog_run(GTK_DIALOG (window)); ------------------------------------------------------------------------------ Forrester recently released a report on the Return on Investment (ROI) of Google Apps. They found a 300% ROI, 38%-56% cost savings, and break-even within 7 months. Over 3 million businesses have gone Google with Google Apps: an online email calendar, and document program that's accessible from your browser. Read the Forrester report: http://p.sf.net/sfu/googleapps-sfnew _______________________________________________ gtkpod-cvs2 mailing list gtkpod-cvs2@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2