summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
3af4520)
Lots of these are only used for initial setup of the page, other
entries are the ones we reuse later. So kill the entries to avoid
confusing them post init.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
GtkWidget *menu;
GtkWidget *window;
GtkWidget *vbox;
GtkWidget *menu;
GtkWidget *window;
GtkWidget *vbox;
- GtkWidget *topvbox;
- GtkWidget *topalign;
- GtkWidget *bottomalign;
GtkWidget *thread_status_pb;
GtkWidget *buttonbox;
GtkWidget *thread_status_pb;
GtkWidget *buttonbox;
- GtkWidget *scrolled_window;
GtkWidget *notebook;
GtkWidget *error_info_bar;
GtkWidget *error_label;
GtkWidget *notebook;
GtkWidget *error_info_bar;
GtkWidget *error_label;
struct gui *ui;
GtkWidget *vbox;
struct gui *ui;
GtkWidget *vbox;
- GtkWidget *topvbox;
- GtkWidget *topalign;
- GtkWidget *bottomalign;
GtkWidget *job_notebook;
GtkWidget *thread_status_pb;
GtkWidget *buttonbox;
GtkWidget *button[ARRAYSIZE(buttonspeclist)];
GtkWidget *job_notebook;
GtkWidget *thread_status_pb;
GtkWidget *buttonbox;
GtkWidget *button[ARRAYSIZE(buttonspeclist)];
- GtkWidget *scrolled_window;
GtkWidget *notebook;
GtkWidget *error_info_bar;
GtkWidget *error_label;
GtkWidget *notebook;
GtkWidget *error_info_bar;
GtkWidget *error_label;
static GtkWidget *new_client_page(struct gui_entry *ge)
{
GtkWidget *main_vbox, *probe, *probe_frame, *probe_box;
static GtkWidget *new_client_page(struct gui_entry *ge)
{
GtkWidget *main_vbox, *probe, *probe_frame, *probe_box;
+ GtkWidget *scrolled_window, *bottom_align, *top_align, *top_vbox;
GdkColor white;
main_vbox = gtk_vbox_new(FALSE, 3);
GdkColor white;
main_vbox = gtk_vbox_new(FALSE, 3);
- ge->topalign = gtk_alignment_new(0, 0, 1, 0);
- ge->topvbox = gtk_vbox_new(FALSE, 3);
- gtk_container_add(GTK_CONTAINER(ge->topalign), ge->topvbox);
- gtk_box_pack_start(GTK_BOX(main_vbox), ge->topalign, FALSE, FALSE, 0);
+ top_align = gtk_alignment_new(0, 0, 1, 0);
+ top_vbox = gtk_vbox_new(FALSE, 3);
+ gtk_container_add(GTK_CONTAINER(top_align), top_vbox);
+ gtk_box_pack_start(GTK_BOX(main_vbox), top_align, FALSE, FALSE, 0);
probe = gtk_frame_new("Job");
gtk_box_pack_start(GTK_BOX(main_vbox), probe, FALSE, FALSE, 3);
probe = gtk_frame_new("Job");
gtk_box_pack_start(GTK_BOX(main_vbox), probe, FALSE, FALSE, 3);
G_CALLBACK(on_expose_drawing_area), &ge->graphs);
g_signal_connect(G_OBJECT(ge->graphs.drawing_area), "configure_event",
G_CALLBACK(on_config_drawing_area), &ge->graphs);
G_CALLBACK(on_expose_drawing_area), &ge->graphs);
g_signal_connect(G_OBJECT(ge->graphs.drawing_area), "configure_event",
G_CALLBACK(on_config_drawing_area), &ge->graphs);
- ge->scrolled_window = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ge->scrolled_window),
+ scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(ge->scrolled_window),
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
ge->graphs.drawing_area);
ge->graphs.drawing_area);
- gtk_box_pack_start(GTK_BOX(main_vbox), ge->scrolled_window,
- TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(main_vbox), scrolled_window, TRUE, TRUE, 0);
setup_graphs(&ge->graphs);
setup_graphs(&ge->graphs);
* Set up alignments for widgets at the bottom of ui,
* align bottom left, expand horizontally but not vertically
*/
* Set up alignments for widgets at the bottom of ui,
* align bottom left, expand horizontally but not vertically
*/
- ge->bottomalign = gtk_alignment_new(0, 1, 1, 0);
+ bottom_align = gtk_alignment_new(0, 1, 1, 0);
ge->buttonbox = gtk_hbox_new(FALSE, 0);
ge->buttonbox = gtk_hbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(ge->bottomalign), ge->buttonbox);
- gtk_box_pack_start(GTK_BOX(main_vbox), ge->bottomalign,
- FALSE, FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(bottom_align), ge->buttonbox);
+ gtk_box_pack_start(GTK_BOX(main_vbox), bottom_align, FALSE, FALSE, 0);
add_buttons(ge, buttonspeclist, ARRAYSIZE(buttonspeclist));
add_buttons(ge, buttonspeclist, ARRAYSIZE(buttonspeclist));
static GtkWidget *new_main_page(struct gui *ui)
{
GtkWidget *main_vbox, *probe, *probe_frame, *probe_box;
static GtkWidget *new_main_page(struct gui *ui)
{
GtkWidget *main_vbox, *probe, *probe_frame, *probe_box;
+ GtkWidget *scrolled_window, *bottom_align, *top_align, *top_vbox;
GdkColor white;
main_vbox = gtk_vbox_new(FALSE, 3);
GdkColor white;
main_vbox = gtk_vbox_new(FALSE, 3);
* Set up alignments for widgets at the top of ui,
* align top left, expand horizontally but not vertically
*/
* Set up alignments for widgets at the top of ui,
* align top left, expand horizontally but not vertically
*/
- ui->topalign = gtk_alignment_new(0, 0, 1, 0);
- ui->topvbox = gtk_vbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(ui->topalign), ui->topvbox);
- gtk_box_pack_start(GTK_BOX(main_vbox), ui->topalign, FALSE, FALSE, 0);
+ top_align = gtk_alignment_new(0, 0, 1, 0);
+ top_vbox = gtk_vbox_new(FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(top_align), top_vbox);
+ gtk_box_pack_start(GTK_BOX(main_vbox), top_align, FALSE, FALSE, 0);
probe = gtk_frame_new("Run statistics");
gtk_box_pack_start(GTK_BOX(main_vbox), probe, FALSE, FALSE, 3);
probe = gtk_frame_new("Run statistics");
gtk_box_pack_start(GTK_BOX(main_vbox), probe, FALSE, FALSE, 3);
G_CALLBACK(on_expose_drawing_area), &ui->graphs);
g_signal_connect(G_OBJECT(ui->graphs.drawing_area), "configure_event",
G_CALLBACK(on_config_drawing_area), &ui->graphs);
G_CALLBACK(on_expose_drawing_area), &ui->graphs);
g_signal_connect(G_OBJECT(ui->graphs.drawing_area), "configure_event",
G_CALLBACK(on_config_drawing_area), &ui->graphs);
- ui->scrolled_window = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ui->scrolled_window),
+ scrolled_window = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(ui->scrolled_window),
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
ui->graphs.drawing_area);
ui->graphs.drawing_area);
- gtk_box_pack_start(GTK_BOX(main_vbox), ui->scrolled_window,
+ gtk_box_pack_start(GTK_BOX(main_vbox), scrolled_window,
TRUE, TRUE, 0);
setup_graphs(&ui->graphs);
TRUE, TRUE, 0);
setup_graphs(&ui->graphs);
* Set up alignments for widgets at the bottom of ui,
* align bottom left, expand horizontally but not vertically
*/
* Set up alignments for widgets at the bottom of ui,
* align bottom left, expand horizontally but not vertically
*/
- ui->bottomalign = gtk_alignment_new(0, 1, 1, 0);
+ bottom_align = gtk_alignment_new(0, 1, 1, 0);
ui->buttonbox = gtk_hbox_new(FALSE, 0);
ui->buttonbox = gtk_hbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(ui->bottomalign), ui->buttonbox);
- gtk_box_pack_start(GTK_BOX(main_vbox), ui->bottomalign,
- FALSE, FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(bottom_align), ui->buttonbox);
+ gtk_box_pack_start(GTK_BOX(main_vbox), bottom_align, FALSE, FALSE, 0);
/*
* Set up thread status progress bar
/*
* Set up thread status progress bar