← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/geany/jaunty

« back to all changes in this revision

Viewing changes to src/dialogs.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2007-02-25 21:12:13 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20070225211213-jk4d4vxtgji0rj74
Tags: 0.10.2-0ubuntu1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dialogs.c
17
17
 *      along with this program; if not, write to the Free Software
18
18
 *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19
19
 *
20
 
 * $Id: dialogs.c 1117 2006-12-18 12:34:29Z ntrel $
 
20
 * $Id: dialogs.c 1316 2007-02-22 12:41:48Z ntrel $
21
21
 */
22
22
 
23
23
#include "geany.h"
126
126
                g_signal_connect((gpointer) app->open_filesel, "selection-changed",
127
127
                                        G_CALLBACK(on_file_open_selection_changed), NULL);
128
128
                g_signal_connect ((gpointer) app->open_filesel, "delete_event",
129
 
                                        G_CALLBACK(gtk_widget_hide), NULL);
 
129
                                        G_CALLBACK(gtk_widget_hide_on_delete), NULL);
130
130
                g_signal_connect((gpointer) app->open_filesel, "response",
131
131
                                        G_CALLBACK(on_file_open_dialog_response), NULL);
132
132
        }
266
266
                gtk_window_set_type_hint(GTK_WINDOW(app->save_filesel), GDK_WINDOW_TYPE_HINT_DIALOG);
267
267
                gtk_dialog_set_default_response(GTK_DIALOG(app->save_filesel), GTK_RESPONSE_ACCEPT);
268
268
 
269
 
                g_signal_connect((gpointer) app->save_filesel, "delete_event", G_CALLBACK(gtk_widget_hide), NULL);
270
 
                g_signal_connect((gpointer) app->save_filesel, "response", G_CALLBACK(on_file_save_dialog_response), NULL);
 
269
                g_signal_connect((gpointer) app->save_filesel, "delete_event",
 
270
                        G_CALLBACK(gtk_widget_hide_on_delete), NULL);
 
271
                g_signal_connect((gpointer) app->save_filesel, "response",
 
272
                        G_CALLBACK(on_file_save_dialog_response), NULL);
271
273
 
272
274
                gtk_window_set_transient_for(GTK_WINDOW(app->save_filesel), GTK_WINDOW(app->window));
273
275
        }
340
342
 
341
343
        // display the file tab to remind the user of the document
342
344
        gtk_notebook_set_current_page(GTK_NOTEBOOK(app->notebook),
343
 
                document_find_by_sci(doc_list[idx].sci));
 
345
                document_get_notebook_page(idx));
344
346
 
345
347
        if (doc_list[idx].file_name != NULL)
346
348
        {
414
416
                gtk_widget_show(GTK_FONT_SELECTION_DIALOG(app->open_fontsel)->apply_button);
415
417
 
416
418
                g_signal_connect((gpointer) app->open_fontsel,
417
 
                                        "delete_event", G_CALLBACK(gtk_widget_hide), NULL);
 
419
                                        "delete_event", G_CALLBACK(gtk_widget_hide_on_delete), NULL);
418
420
                g_signal_connect((gpointer) GTK_FONT_SELECTION_DIALOG(app->open_fontsel)->ok_button,
419
421
                                        "clicked", G_CALLBACK(on_font_ok_button_clicked), NULL);
420
422
                g_signal_connect((gpointer) GTK_FONT_SELECTION_DIALOG(app->open_fontsel)->cancel_button,
422
424
                g_signal_connect((gpointer) GTK_FONT_SELECTION_DIALOG(app->open_fontsel)->apply_button,
423
425
                                        "clicked", G_CALLBACK(on_font_apply_button_clicked), NULL);
424
426
 
425
 
                gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(app->open_fontsel), app->editor_font);
 
427
                gtk_font_selection_dialog_set_font_name(
 
428
                        GTK_FONT_SELECTION_DIALOG(app->open_fontsel), app->editor_font);
426
429
                gtk_window_set_transient_for(GTK_WINDOW(app->open_fontsel), GTK_WINDOW(app->window));
427
430
        }
428
431
        /* We make sure the dialog is visible. */
545
548
                g_signal_connect(GTK_COLOR_SELECTION_DIALOG(app->open_colorsel)->ok_button, "clicked",
546
549
                                                G_CALLBACK(on_color_ok_button_clicked), NULL);
547
550
                g_signal_connect(app->open_colorsel, "delete_event",
548
 
                                                G_CALLBACK(gtk_widget_hide), NULL);
 
551
                                                G_CALLBACK(gtk_widget_hide_on_delete), NULL);
549
552
        }
550
553
        // if colour is non-NULL set it in the dialog as preselected colour
551
554
        if (colour != NULL && (colour[0] == '0' || colour[0] == '#'))
1013
1016
        gtk_misc_set_alignment(GTK_MISC(label), 1, 0);
1014
1017
 
1015
1018
        enctext = g_strdup_printf("%s %s",
1016
 
        doc_list[idx].encoding,
1017
 
        (utils_is_unicode_charset(doc_list[idx].encoding)) ? ((doc_list[idx].has_bom) ? _("(with BOM)") : _("(without BOM)")) : "");
 
1019
                doc_list[idx].encoding,
 
1020
                (encodings_is_unicode_charset(doc_list[idx].encoding)) ?
 
1021
                        ((doc_list[idx].has_bom) ? _("(with BOM)") : _("(without BOM)")) : "");
1018
1022
 
1019
1023
        label = gtk_label_new(enctext);
1020
1024
        g_free(enctext);