diff options
author | Glynn Foster <glynn.foster@sun.com> | 2003-03-10 17:11:18 +0000 |
---|---|---|
committer | Glynn Foster <gman@src.gnome.org> | 2003-03-10 17:11:18 +0000 |
commit | 49f89795349a47ae4e061666d84a715bf24f5373 (patch) | |
tree | fe33734a99bda00908c87cb8065c0dcd6644f51e /src/text.c | |
parent | Added "pt_BR" (Brazilian Portuguese). (diff) | |
download | zenity-49f89795349a47ae4e061666d84a715bf24f5373.tar.gz zenity-49f89795349a47ae4e061666d84a715bf24f5373.tar.bz2 zenity-49f89795349a47ae4e061666d84a715bf24f5373.zip |
Mass indentation cleanup. Make sure the glade dialogs aren't initially
2003-03-10 Glynn Foster <glynn.foster@sun.com>
* src/about.c, src/calendar.c, src/entry.c, src/fileselection.c,
src/main.c, src/msg.c, src/progress.c, src/text.c, src/tree.c,
src/util.c, src/util.h, src/zenity.glade, src/zenity.h:
Mass indentation cleanup. Make sure the glade dialogs aren't initially
visible because this avoids a visibility jump. Apparently == TRUE is
bad mojo. Fix up.
Diffstat (limited to 'src/text.c')
-rw-r--r-- | src/text.c | 113 |
1 files changed, 57 insertions, 56 deletions
@@ -32,74 +32,75 @@ static void zenity_text_dialog_response (GtkWidget *widget, int response, gpoint void zenity_text (ZenityData *data, ZenityTextData *text_data) { - GladeXML *glade_dialog = NULL; - GtkWidget *dialog; - GtkWidget *text_view; - GtkTextBuffer *text_buffer; - - zen_text_data = text_data; - glade_dialog = zenity_util_load_glade_file ("zenity_text_dialog"); - - if (glade_dialog == NULL) { - data->exit_code = -1; - return; - } - - glade_xml_signal_autoconnect (glade_dialog); + GladeXML *glade_dialog = NULL; + GtkWidget *dialog; + GtkWidget *text_view; + GtkTextBuffer *text_buffer; - dialog = glade_xml_get_widget (glade_dialog, "zenity_text_dialog"); + zen_text_data = text_data; + glade_dialog = zenity_util_load_glade_file ("zenity_text_dialog"); + + if (glade_dialog == NULL) { + data->exit_code = -1; + return; + } + + glade_xml_signal_autoconnect (glade_dialog); + + dialog = glade_xml_get_widget (glade_dialog, "zenity_text_dialog"); - g_signal_connect (G_OBJECT (dialog), "response", - G_CALLBACK (zenity_text_dialog_response), data); + g_signal_connect (G_OBJECT (dialog), "response", + G_CALLBACK (zenity_text_dialog_response), data); - if (data->dialog_title) - gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title); + if (data->dialog_title) + gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title); + + if (data->window_icon) + zenity_util_set_window_icon (dialog, data->window_icon); + else + zenity_util_set_window_icon (dialog, ZENITY_IMAGE_FULLPATH ("zenity-text.png")); + + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); - if (data->window_icon) - zenity_util_set_window_icon (dialog, data->window_icon); - else - zenity_util_set_window_icon (dialog, ZENITY_IMAGE_FULLPATH ("zenity-text.png")); + text_buffer = gtk_text_buffer_new (NULL); + text_view = glade_xml_get_widget (glade_dialog, "zenity_text_view"); + gtk_text_view_set_buffer (GTK_TEXT_VIEW (text_view), text_buffer); + gtk_text_view_set_editable (GTK_TEXT_VIEW(text_view), text_data->editable); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE); + if (text_data->uri) + zenity_util_fill_file_buffer (text_buffer, text_data->uri); - text_buffer = gtk_text_buffer_new (NULL); - text_view = glade_xml_get_widget (glade_dialog, "zenity_text_view"); - gtk_text_view_set_buffer (GTK_TEXT_VIEW (text_view), text_buffer); - gtk_text_view_set_editable (GTK_TEXT_VIEW(text_view), text_data->editable); - if (text_data->uri) { - zenity_util_fill_file_buffer (text_buffer, text_data->uri); - } + if (text_data->editable) + zen_text_data->buffer = text_buffer; - if (text_data->editable) { - zen_text_data->buffer = text_buffer; - } - gtk_widget_show (dialog); + gtk_widget_show (dialog); - if (glade_dialog) - g_object_unref (glade_dialog); + if (glade_dialog) + g_object_unref (glade_dialog); - gtk_main (); + gtk_main (); } static void zenity_text_dialog_response (GtkWidget *widget, int response, gpointer data) { - ZenityData *zen_data = data; - - switch (response) { - case GTK_RESPONSE_CLOSE: - if (zen_text_data->editable) { - GtkTextIter start, end; - - gtk_text_buffer_get_bounds (zen_text_data->buffer, &start, &end); - g_printerr (gtk_text_buffer_get_text (zen_text_data->buffer, &start, &end, 0)); - } - zen_data->exit_code = 0; - gtk_main_quit (); - break; - - default: - zen_data->exit_code = 1; - break; - } + ZenityData *zen_data = data; + + switch (response) { + case GTK_RESPONSE_CLOSE: + if (zen_text_data->editable) { + GtkTextIter start, end; + + gtk_text_buffer_get_bounds (zen_text_data->buffer, &start, &end); + g_printerr (gtk_text_buffer_get_text (zen_text_data->buffer, &start, &end, 0)); + } + zen_data->exit_code = 0; + gtk_main_quit (); + break; + + default: + /* Esc dialog */ + zen_data->exit_code = 1; + break; + } } |