From 9e7969381151d15f216c09945455d3b526c2a708 Mon Sep 17 00:00:00 2001
From: Sean Davis <smd.seandavis@gmail.com>
Date: Mon, 3 Sep 2018 12:48:32 -0400
Subject: [PATCH 1/1] Improved spacing

---
 panel-plugin/config_gui.c | 91 ++++++++++++++++++++++-----------------
 panel-plugin/main.c       |  6 ++-
 2 files changed, 56 insertions(+), 41 deletions(-)

diff --git a/panel-plugin/config_gui.c b/panel-plugin/config_gui.c
index 82e9e32..50ab3eb 100644
--- a/panel-plugin/config_gui.c
+++ b/panel-plugin/config_gui.c
@@ -89,10 +89,13 @@ int CreateConfigGUI (GtkWidget * vbox1, struct gui_t *p_poGUI)
     GtkWidget      *wRB_WriteReadOrder;
     GtkWidget      *wPB_Rcolor;
     GtkWidget      *wPB_Wcolor;
+    GtkSizeGroup   *size_group;
+
+    size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
     table1 = gtk_grid_new ();
-    gtk_grid_set_column_spacing(GTK_GRID (table1), 2);
-    gtk_grid_set_row_spacing(GTK_GRID (table1), 2);
+    gtk_grid_set_column_spacing(GTK_GRID (table1), 12);
+    gtk_grid_set_row_spacing(GTK_GRID (table1), 6);
     gtk_widget_show (table1);
     gtk_box_pack_start (GTK_BOX (vbox1), table1, FALSE, FALSE, 0);
 
@@ -100,11 +103,15 @@ int CreateConfigGUI (GtkWidget * vbox1, struct gui_t *p_poGUI)
     gtk_widget_show (label1);
     gtk_grid_attach (GTK_GRID (table1), label1, 0, 0, 1, 1);
     gtk_label_set_justify (GTK_LABEL (label1), GTK_JUSTIFY_LEFT);
+    gtk_label_set_xalign (GTK_LABEL (label1), 0.0f);
     gtk_widget_set_valign(GTK_WIDGET (label1), GTK_ALIGN_CENTER);
 
+    gtk_size_group_add_widget (size_group, label1);
+
     wTF_Device = gtk_entry_new ();
     gtk_widget_show (wTF_Device);
-    gtk_grid_attach (GTK_GRID (table1), wTF_Device, 1, 0, 1, 1);
+    gtk_widget_set_hexpand (wTF_Device, TRUE);
+    gtk_grid_attach (GTK_GRID (table1), wTF_Device, 1, 0, 2, 1);
     gtk_widget_set_tooltip_text (wTF_Device,
 			  _("Input the device name, then press <Enter>"));
     gtk_entry_set_max_length (GTK_ENTRY (wTF_Device), 64);
@@ -112,15 +119,14 @@ int CreateConfigGUI (GtkWidget * vbox1, struct gui_t *p_poGUI)
 
     eventbox1 = gtk_event_box_new ();
     gtk_widget_show (eventbox1);
-    gtk_grid_attach (GTK_GRID (table1), eventbox1, 1, 2, 1, 1);
-    gtk_widget_set_valign(GTK_WIDGET(eventbox1), GTK_ALIGN_CENTER);
-    gtk_widget_set_halign(GTK_WIDGET(eventbox1), GTK_ALIGN_CENTER);
-    gtk_widget_set_vexpand(GTK_WIDGET(eventbox1), TRUE);
+    gtk_grid_attach (GTK_GRID (table1), eventbox1, 1, 2, 2, 1);
+    gtk_widget_set_vexpand(GTK_WIDGET(eventbox1), FALSE);
     gtk_widget_set_hexpand(GTK_WIDGET(eventbox1), TRUE);
 
     wSc_Period_adj = gtk_adjustment_new (0.5, 0.25, 4, 0.05, 1, 0);
     wSc_Period =
 	gtk_spin_button_new (GTK_ADJUSTMENT (wSc_Period_adj), 1, 3);
+    gtk_widget_set_halign (GTK_WIDGET (wSc_Period), GTK_ALIGN_START);
     gtk_widget_show (wSc_Period);
     gtk_container_add (GTK_CONTAINER (eventbox1), wSc_Period);
     gtk_widget_set_tooltip_text (wSc_Period, _("Data collection period"));
@@ -130,7 +136,7 @@ int CreateConfigGUI (GtkWidget * vbox1, struct gui_t *p_poGUI)
     gtk_widget_show (label2);
     gtk_grid_attach (GTK_GRID (table1), label2, 0, 2, 1, 1);
     gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_LEFT);
-    gtk_widget_set_valign(GTK_WIDGET (label2), GTK_ALIGN_CENTER);
+    gtk_label_set_xalign (GTK_LABEL (label2), 0.0f);
 
     wTB_Title = gtk_check_button_new_with_mnemonic (_("Label"));
     gtk_widget_show (wTB_Title);
@@ -139,28 +145,27 @@ int CreateConfigGUI (GtkWidget * vbox1, struct gui_t *p_poGUI)
 
     wTF_Title = gtk_entry_new ();
     gtk_widget_show (wTF_Title);
-    gtk_grid_attach (GTK_GRID (table1), wTF_Title, 1, 1, 1, 1);
+    gtk_grid_attach (GTK_GRID (table1), wTF_Title, 1, 1, 2, 1);
     gtk_widget_set_tooltip_text (wTF_Title,
 			  _("Input the label, then press <Enter>"));
     gtk_entry_set_max_length (GTK_ENTRY (wTF_Title), 16);
     gtk_entry_set_text (GTK_ENTRY (wTF_Title), _("hda1"));
 
     hseparator7 = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+    gtk_widget_set_margin_top (GTK_WIDGET (hseparator7), 6);
+    gtk_widget_set_margin_bottom (GTK_WIDGET (hseparator7), 6);
     gtk_widget_show (hseparator7);
-    gtk_box_pack_start (GTK_BOX (vbox1), hseparator7, TRUE, TRUE, 0);
+    gtk_grid_attach (GTK_GRID (table1), hseparator7, 0, 3, 3, 1);
 
-    hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-    gtk_widget_show (hbox2);
-    gtk_box_pack_start (GTK_BOX (vbox1), hbox2, TRUE, TRUE, 0);
-
-    label9 = gtk_label_new (_("Monitor    "));
+    label9 = gtk_label_new (_("Monitor"));
     gtk_widget_show (label9);
-    gtk_box_pack_start (GTK_BOX (hbox2), label9, FALSE, FALSE, 0);
+    gtk_grid_attach (GTK_GRID (table1), label9, 0, 4, 1, 1);
     gtk_label_set_justify (GTK_LABEL (label9), GTK_JUSTIFY_LEFT);
+    gtk_label_set_xalign (GTK_LABEL (label9), 0.0f);
 
     wRB_IO = gtk_radio_button_new_with_mnemonic (NULL, _("I/O transfer"));
     gtk_widget_show (wRB_IO);
-    gtk_box_pack_start (GTK_BOX (hbox2), wRB_IO, FALSE, FALSE, 0);
+    gtk_grid_attach (GTK_GRID (table1), wRB_IO, 1, 4, 1, 1);
     gtk_widget_set_tooltip_text (wRB_IO, _("MiB transferred / second"));
     gtk_radio_button_set_group (GTK_RADIO_BUTTON (wRB_IO), wRB_IO_group);
     wRB_IO_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (wRB_IO));
@@ -168,7 +173,7 @@ int CreateConfigGUI (GtkWidget * vbox1, struct gui_t *p_poGUI)
     wRB_BusyTime =
 	gtk_radio_button_new_with_mnemonic (NULL, _("Busy time"));
     gtk_widget_show (wRB_BusyTime);
-    gtk_box_pack_start (GTK_BOX (hbox2), wRB_BusyTime, FALSE, FALSE, 0);
+    gtk_grid_attach (GTK_GRID (table1), wRB_BusyTime, 2, 4, 1, 1);
     gtk_widget_set_tooltip_text (wRB_BusyTime,
 			  _("Percentage of time the device is busy"));
     gtk_radio_button_set_group (GTK_RADIO_BUTTON (wRB_BusyTime),
@@ -176,46 +181,55 @@ int CreateConfigGUI (GtkWidget * vbox1, struct gui_t *p_poGUI)
     wRB_IO_group =
 	gtk_radio_button_get_group (GTK_RADIO_BUTTON (wRB_BusyTime));
 
-    wHBox_MaxIO = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+    wHBox_MaxIO = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
     gtk_widget_show (wHBox_MaxIO);
-    gtk_box_pack_start (GTK_BOX (vbox1), wHBox_MaxIO, TRUE, TRUE, 0);
+    gtk_grid_attach (GTK_GRID (table1), wHBox_MaxIO, 0, 5, 3, 1);
 
     label3 = gtk_label_new (_("Max. I/O rate (MiB/s) "));
     gtk_widget_show (label3);
     gtk_box_pack_start (GTK_BOX (wHBox_MaxIO), label3, FALSE, FALSE, 0);
     gtk_label_set_justify (GTK_LABEL (label3), GTK_JUSTIFY_LEFT);
+    gtk_label_set_xalign (GTK_LABEL (label3), 0.0f);
     gtk_widget_set_valign (GTK_WIDGET (label3), GTK_ALIGN_CENTER);
 
+    gtk_size_group_add_widget (size_group, label3);
+
     wTF_MaxXfer = gtk_entry_new ();
     gtk_widget_show (wTF_MaxXfer);
-    gtk_box_pack_start (GTK_BOX (wHBox_MaxIO), wTF_MaxXfer, TRUE, TRUE, 0);
+    gtk_widget_set_hexpand (wTF_MaxXfer, TRUE);
+    gtk_box_pack_start (GTK_BOX (wHBox_MaxIO), wTF_MaxXfer, FALSE, TRUE, 0);
     gtk_widget_set_tooltip_text (wTF_MaxXfer,
 			  _("Input the maximum I/O transfer rate of the device, then press <Enter>"));
     gtk_entry_set_max_length (GTK_ENTRY (wTF_MaxXfer), 3);
     gtk_entry_set_text (GTK_ENTRY (wTF_MaxXfer), _("35"));
 
     hseparator8 = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+    gtk_widget_set_margin_top (GTK_WIDGET (hseparator8), 6);
+    gtk_widget_set_margin_bottom (GTK_WIDGET (hseparator8), 6);
     gtk_widget_show (hseparator8);
-    gtk_box_pack_start (GTK_BOX (vbox1), hseparator8, FALSE, FALSE, 0);
+    gtk_grid_attach (GTK_GRID (table1), hseparator8, 0, 6, 3, 1);
 
     wTB_RWcombined =
 	gtk_check_button_new_with_mnemonic (_("Combine Read/Write data"));
     gtk_widget_show (wTB_RWcombined);
-    gtk_box_pack_start (GTK_BOX (vbox1), wTB_RWcombined, FALSE, FALSE, 0);
+    gtk_grid_attach (GTK_GRID (table1), wTB_RWcombined, 0, 7, 3, 1);
     gtk_widget_set_tooltip_text (wTB_RWcombined,
 			  _("Combine Read/Write data into one single monitor?"));
 
     wTa_SingleBar = gtk_grid_new ();
-    gtk_grid_set_column_spacing(GTK_GRID (wTa_SingleBar), 2);
-    gtk_grid_set_row_spacing(GTK_GRID (wTa_SingleBar), 2);
+    gtk_grid_set_column_spacing(GTK_GRID (wTa_SingleBar), 12);
+    gtk_grid_set_row_spacing(GTK_GRID (wTa_SingleBar), 6);
     gtk_widget_show (wTa_SingleBar);
-    gtk_box_pack_start (GTK_BOX (vbox1), wTa_SingleBar, FALSE, FALSE, 0);
+    gtk_grid_attach (GTK_GRID (table1), wTa_SingleBar, 0, 8, 3, 1);
 
     label7 = gtk_label_new (_("Bar color "));
     gtk_widget_show (label7);
     gtk_grid_attach (GTK_GRID (wTa_SingleBar), label7, 0, 0, 1, 1);
     gtk_label_set_justify (GTK_LABEL (label7), GTK_JUSTIFY_LEFT);
     gtk_widget_set_valign (GTK_WIDGET (label7), GTK_ALIGN_CENTER);
+    gtk_label_set_xalign (GTK_LABEL (label7), 0.0f);
+
+    gtk_size_group_add_widget (size_group, label7);
 
     wPB_RWcolor = gtk_color_button_new();
     gtk_widget_show (wPB_RWcolor);
@@ -224,38 +238,38 @@ int CreateConfigGUI (GtkWidget * vbox1, struct gui_t *p_poGUI)
     gtk_widget_set_hexpand (GTK_WIDGET (wPB_RWcolor), TRUE);
 
     wTa_DualBars = gtk_grid_new ();
-    gtk_grid_set_column_spacing(GTK_GRID (wTa_DualBars), 2);
-    gtk_grid_set_row_spacing(GTK_GRID (wTa_DualBars), 2);
+    gtk_grid_set_column_spacing(GTK_GRID (wTa_DualBars), 12);
+    gtk_grid_set_row_spacing(GTK_GRID (wTa_DualBars), 6);
     gtk_widget_show (wTa_DualBars);
-    gtk_box_pack_start (GTK_BOX (vbox1), wTa_DualBars, FALSE, FALSE, 0);
+    gtk_grid_attach (GTK_GRID (table1), wTa_DualBars, 0, 9, 3, 1);
 
     label5 = gtk_label_new (_("Read bar color "));
     gtk_widget_show (label5);
     gtk_grid_attach (GTK_GRID (wTa_DualBars), label5, 0, 1, 1, 1);
     gtk_label_set_justify (GTK_LABEL (label5), GTK_JUSTIFY_LEFT);
     gtk_widget_set_valign (GTK_WIDGET (label5), GTK_ALIGN_CENTER);
+    gtk_label_set_xalign (GTK_LABEL (label5), 0.0f);
+
+    gtk_size_group_add_widget (size_group, label5);
 
     label6 = gtk_label_new (_("Write bar color "));
     gtk_widget_show (label6);
     gtk_grid_attach (GTK_GRID (wTa_DualBars), label6, 0, 2, 1, 1);
     gtk_label_set_justify (GTK_LABEL (label6), GTK_JUSTIFY_LEFT);
     gtk_widget_set_valign (GTK_WIDGET (label6), GTK_ALIGN_CENTER);
+    gtk_label_set_xalign (GTK_LABEL (label6), 0.0f);
 
     label8 = gtk_label_new (_("Bar order"));
     gtk_widget_show (label8);
     gtk_grid_attach (GTK_GRID (wTa_DualBars), label8, 0, 0, 1, 1);
     gtk_label_set_justify (GTK_LABEL (label8), GTK_JUSTIFY_LEFT);
     gtk_widget_set_valign (GTK_WIDGET (label8), GTK_ALIGN_CENTER);
-
-    hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-    gtk_widget_show (hbox1);
-    gtk_grid_attach (GTK_GRID (wTa_DualBars), hbox1, 1, 0, 1, 1);
+    gtk_label_set_xalign (GTK_LABEL (label8), 0.0f);
 
     wRB_ReadWriteOrder =
 	gtk_radio_button_new_with_mnemonic (NULL, _("Read-Write"));
     gtk_widget_show (wRB_ReadWriteOrder);
-    gtk_box_pack_start (GTK_BOX (hbox1), wRB_ReadWriteOrder, FALSE, FALSE,
-			0);
+    gtk_grid_attach (GTK_GRID (wTa_DualBars), wRB_ReadWriteOrder, 1, 0, 1, 1);
     gtk_widget_set_tooltip_text (wRB_ReadWriteOrder,
 			  _("\"Read\" monitor first"));
     gtk_radio_button_set_group (GTK_RADIO_BUTTON (wRB_ReadWriteOrder),
@@ -266,8 +280,7 @@ int CreateConfigGUI (GtkWidget * vbox1, struct gui_t *p_poGUI)
     wRB_WriteReadOrder =
 	gtk_radio_button_new_with_mnemonic (NULL, _("Write-Read"));
     gtk_widget_show (wRB_WriteReadOrder);
-    gtk_box_pack_start (GTK_BOX (hbox1), wRB_WriteReadOrder, FALSE, FALSE,
-			0);
+    gtk_grid_attach (GTK_GRID (wTa_DualBars), wRB_WriteReadOrder, 2, 0, 1, 1);
     gtk_widget_set_tooltip_text (wRB_WriteReadOrder,
 			  _("\"Write\" monitor first"));
     gtk_radio_button_set_group (GTK_RADIO_BUTTON (wRB_WriteReadOrder),
@@ -277,13 +290,13 @@ int CreateConfigGUI (GtkWidget * vbox1, struct gui_t *p_poGUI)
 
     wPB_Rcolor = gtk_color_button_new();
     gtk_widget_show (wPB_Rcolor);
-    gtk_grid_attach (GTK_GRID (wTa_DualBars), wPB_Rcolor, 1, 1, 1, 1);
+    gtk_grid_attach (GTK_GRID (wTa_DualBars), wPB_Rcolor, 1, 1, 2, 1);
     gtk_widget_set_tooltip_text (wPB_Rcolor, _("Press to change color"));
     gtk_widget_set_hexpand (GTK_WIDGET (wPB_Rcolor), TRUE);
 
     wPB_Wcolor = gtk_color_button_new();
     gtk_widget_show (wPB_Wcolor);
-    gtk_grid_attach (GTK_GRID (wTa_DualBars), wPB_Wcolor, 1, 2, 1, 1);
+    gtk_grid_attach (GTK_GRID (wTa_DualBars), wPB_Wcolor, 1, 2, 2, 1);
     gtk_widget_set_tooltip_text (wPB_Wcolor, _("Press to change color"));
     gtk_widget_set_hexpand (GTK_WIDGET (wPB_Wcolor), TRUE);
 
diff --git a/panel-plugin/main.c b/panel-plugin/main.c
index 64b3dc4..4ebd48d 100644
--- a/panel-plugin/main.c
+++ b/panel-plugin/main.c
@@ -984,6 +984,8 @@ static void diskperf_create_options (XfcePanelPlugin *plugin,
                                                 GTK_DIALOG_DESTROY_WITH_PARENT,
                                                 "gtk-close", GTK_RESPONSE_OK,
                                                 NULL);
+
+    gtk_window_set_resizable (GTK_WINDOW (dlg), FALSE);
     
     g_signal_connect (G_OBJECT (dlg), "response",
                       G_CALLBACK (diskperf_dialog_response), poPlugin);
@@ -991,8 +993,8 @@ static void diskperf_create_options (XfcePanelPlugin *plugin,
     gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER);
     gtk_window_set_icon_name (GTK_WINDOW (dlg), "drive-harddisk");
     
-    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, BORDER);
-    gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER - 2);
+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 18);
+    gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
     gtk_widget_show(vbox);
     gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (dlg))), vbox,
                         TRUE, TRUE, 0);
-- 
2.17.1