#include <glib.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtkdialog.h>
#include <gtk/gtkhbox.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkprogressbar.h>
#include "progressdialog.h"
#include "gtkutils.h"
#include "utils.h"
+#include "prefs_common.h"
enum {
PROGRESS_IMAGE,
ProgressDialog *progress_dialog_create(void)
{
ProgressDialog *progress;
- GtkWidget *window;
- GtkWidget *vbox;
+ GtkWidget *dialog;
GtkWidget *hbox;
GtkWidget *label;
GtkWidget *cancel_btn;
- GtkWidget *cancel_area;
GtkWidget *progressbar;
GtkWidget *scrolledwin;
GtkWidget *clist;
debug_print("Creating progress dialog...\n");
progress = g_new0(ProgressDialog, 1);
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_widget_set_usize(window, 460, -1);
- gtk_container_set_border_width(GTK_CONTAINER(window), 8);
- gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
- gtk_widget_realize(window);
+ dialog = gtk_dialog_new();
+ gtk_widget_set_size_request(dialog, 460, -1);
+ gtk_container_set_border_width(GTK_CONTAINER(dialog), 8);
+ gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, TRUE, TRUE);
+ gtk_widget_realize(dialog);
- vbox = gtk_vbox_new(FALSE, 8);
- gtk_container_add(GTK_CONTAINER(window), vbox);
- gtk_widget_show(vbox);
+ gtk_container_set_border_width
+ (GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 0);
+ gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog)->vbox), 8);
+ gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
hbox = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 8);
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox,
+ FALSE, FALSE, 8);
gtk_widget_show(hbox);
label = gtk_label_new("");
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 8);
gtk_widget_show(label);
- gtkut_stock_button_set_create
- (&cancel_area, &cancel_btn, GTK_STOCK_CANCEL,
- NULL, NULL, NULL, NULL);
- gtk_box_pack_end(GTK_BOX(vbox), cancel_area, FALSE, FALSE, 0);
+ cancel_btn = gtk_dialog_add_button(GTK_DIALOG(dialog),
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_NONE);
gtk_widget_grab_default(cancel_btn);
- gtk_widget_show_all(cancel_area);
+ gtk_widget_grab_focus(cancel_btn);
progressbar = gtk_progress_bar_new();
- gtk_box_pack_start(GTK_BOX(vbox), progressbar, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), progressbar,
+ FALSE, FALSE, 0);
gtk_widget_show(progressbar);
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_show(scrolledwin);
- gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), scrolledwin,
+ TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
clist = gtk_clist_new_with_titles(3, text);
gtk_widget_hide(clist);
/* gtk_container_add(GTK_CONTAINER(scrolledwin), clist); */
- /* gtk_widget_set_usize(clist, -1, 120); */
+ /* gtk_widget_set_size_request(clist, -1, 120); */
gtk_clist_set_column_justification(GTK_CLIST(clist), 0,
GTK_JUSTIFY_CENTER);
gtk_clist_set_column_width(GTK_CLIST(clist), 0, 16);
list_view = progress_dialog_list_view_create();
gtk_widget_show(list_view);
gtk_container_add(GTK_CONTAINER(scrolledwin), list_view);
- gtk_widget_set_usize(list_view, -1, 120);
+ gtk_widget_set_size_request(list_view, -1, 120);
- progress->window = window;
+ progress->window = dialog;
progress->label = label;
progress->cancel_btn = cancel_btn;
progress->progressbar = progressbar;
list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
g_object_unref(model);
- gtk_tree_view_set_rules_hint(list_view, TRUE);
+ gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
/* create the columns */
progress_dialog_create_list_view_columns(list_view);