kolan
/
gkrellm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Config appearance and one option change 

Edit one of the CPU chart text format string options.

Fix gkrellm_category_vbox() so the returned vbox will be expanded like
it should be.  This exposed a clock config box packing needing a change.

The Disk Launch Commands vbox was packed into the wrong box.
This commit is contained in:
Bill Wilson 2014-10-15 13:50:40 -05:00
parent 8b1833342e
commit 62c2fe4ad4
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/clock.c
View File

@ -726,7 +726,7 @@ create_clock_tab(GtkWidget *tab_vbox)
label = gtk_label_new(_("Display format string:")); label = gtk_label_new(_("Display format string:"));
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
cal_format_combo_box = gtk_combo_box_entry_new_text(); cal_format_combo_box = gtk_combo_box_entry_new_text();
gtk_box_pack_start(GTK_BOX(vbox1), cal_format_combo_box, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox1), cal_format_combo_box, FALSE, FALSE, 0);
gtk_combo_box_append_text(GTK_COMBO_BOX(cal_format_combo_box), cal_format); gtk_combo_box_append_text(GTK_COMBO_BOX(cal_format_combo_box), cal_format);
gtk_combo_box_append_text(GTK_COMBO_BOX(cal_format_combo_box), DEFAULT_CAL_FORMAT); gtk_combo_box_append_text(GTK_COMBO_BOX(cal_format_combo_box), DEFAULT_CAL_FORMAT);
gtk_combo_box_append_text(GTK_COMBO_BOX(cal_format_combo_box), ALT1_CAL_FORMAT); gtk_combo_box_append_text(GTK_COMBO_BOX(cal_format_combo_box), ALT1_CAL_FORMAT);
@ -745,7 +745,7 @@ create_clock_tab(GtkWidget *tab_vbox)
label = gtk_label_new(_("Display format string:")); label = gtk_label_new(_("Display format string:"));
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
clock_format_combo_box = gtk_combo_box_entry_new_text(); clock_format_combo_box = gtk_combo_box_entry_new_text();
gtk_box_pack_start(GTK_BOX(vbox1), clock_format_combo_box, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox1), clock_format_combo_box, FALSE, FALSE, 0);
gtk_combo_box_append_text(GTK_COMBO_BOX(clock_format_combo_box), clock_format); gtk_combo_box_append_text(GTK_COMBO_BOX(clock_format_combo_box), clock_format);
gtk_combo_box_append_text(GTK_COMBO_BOX(clock_format_combo_box), DEFAULT_CLOCK_FORMAT); gtk_combo_box_append_text(GTK_COMBO_BOX(clock_format_combo_box), DEFAULT_CLOCK_FORMAT);
gtk_combo_box_append_text(GTK_COMBO_BOX(clock_format_combo_box), ALT1_CLOCK_FORMAT); gtk_combo_box_append_text(GTK_COMBO_BOX(clock_format_combo_box), ALT1_CLOCK_FORMAT);

6
src/cpu.c
View File

@ -1449,7 +1449,11 @@ create_cpu_tab(GtkWidget *tab_vbox)
gtk_combo_box_append_text(GTK_COMBO_BOX(text_format_combo_box), gtk_combo_box_append_text(GTK_COMBO_BOX(text_format_combo_box),
_("\\ww\\D3\\f\\au\\.$u\\D0\\f\\as\\.$s")); _("\\ww\\D3\\f\\au\\.$u\\D0\\f\\as\\.$s"));
gtk_combo_box_append_text(GTK_COMBO_BOX(text_format_combo_box), gtk_combo_box_append_text(GTK_COMBO_BOX(text_format_combo_box),
_("\\ww\\D2\\f\\au\\.$u\\D1\\f\\as\\.$s\\D1\\f\\r$L")); _("\\ww\\D2\\f\\au\\.$u\\D1\\f\\as\\.$s\\D3\\f\\r$L"));
gtk_combo_box_append_text(GTK_COMBO_BOX(text_format_combo_box),
_("\\ww\\D2\\f\\au\\.$u\\D1\\f\\as\\.$s\\D3\\f\\r$L"));
gtk_combo_box_append_text(GTK_COMBO_BOX(text_format_combo_box),
_("\\ww\\D3\\f$L\\n\\f\\as\\.$s\\n\\f\\au\\.$u"));
if (!nice_time_unsupported) if (!nice_time_unsupported)
{ {

2
src/disk.c
View File

@ -1451,7 +1451,7 @@ create_disk_tab(GtkWidget *tab_vbox)
vbox1 = gkrellm_gtk_category_vbox(vbox, vbox1 = gkrellm_gtk_category_vbox(vbox,
_("Launch Commands"), _("Launch Commands"),
4, 0, TRUE); 4, 0, TRUE);
launch_vbox = gkrellm_gtk_scrolled_vbox(vbox, NULL, launch_vbox = gkrellm_gtk_scrolled_vbox(vbox1, NULL,
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_widget_show(launch_vbox); gtk_widget_show(launch_vbox);
gtk_widget_realize(launch_vbox); gtk_widget_realize(launch_vbox);

10
src/gui.c
View File

@ -688,11 +688,13 @@ gkrellm_gtk_category_vbox(GtkWidget *box, gchar *category_header,
GtkWidget *vbox, *vbox1, *hbox, *label; GtkWidget *vbox, *vbox1, *hbox, *label;
gchar *s; gchar *s;
vbox = gtk_vbox_new(FALSE, 0); vbox = gtk_vbox_new(TRUE, 0);
gtk_box_set_homogeneous(GTK_BOX(vbox), FALSE);
if (pack_start) if (pack_start)
gtk_box_pack_start(GTK_BOX(box), vbox, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(box), vbox, TRUE, TRUE, 0);
else else
gtk_box_pack_end(GTK_BOX(box), vbox, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(box), vbox, TRUE, TRUE, 0);
if (category_header) if (category_header)
{ {
@ -706,7 +708,7 @@ gkrellm_gtk_category_vbox(GtkWidget *box, gchar *category_header,
} }
hbox = gtk_hbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
label = gtk_label_new(" "); label = gtk_label_new(" ");
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);