From 11ddf87a9af211707b51ee194528eea4db0b15c7 Mon Sep 17 00:00:00 2001 From: Sean Davis Date: Wed, 5 Sep 2018 20:10:07 -0400 Subject: [PATCH 1/1] Preferences: Improve spacing --- include/sensors-interface-common.h | 3 - lib/sensors-interface.c | 79 +++++------ panel-plugin/sensors-plugin.c | 213 ++++++++++++++--------------- src/interface.c | 15 +- 4 files changed, 148 insertions(+), 162 deletions(-) diff --git a/include/sensors-interface-common.h b/include/sensors-interface-common.h index aa1cb27..29b4daf 100644 --- a/include/sensors-interface-common.h +++ b/include/sensors-interface-common.h @@ -107,9 +107,6 @@ typedef struct { /** pointer to GtkCheckbox for text mode to have smaller spacings */ GtkWidget *smallspacing_checkbox; - /** used to enable 'show labels' option when using graphical view */ - GtkWidget *labels_Box; - /** * pointer to GtkCheckbox whether to colorize the checkboxes over the Gtk * theme diff --git a/lib/sensors-interface.c b/lib/sensors-interface.c index 03bab75..a50681a 100644 --- a/lib/sensors-interface.c +++ b/lib/sensors-interface.c @@ -155,25 +155,23 @@ fill_gtkTreeStore (GtkTreeStore *ptr_treestore, t_chip *ptr_chip, t_tempscale te /* -------------------------------------------------------------------------- */ void -add_type_box (GtkWidget *ptr_widget_vbox, t_sensors_dialog *ptr_sensorsdialog) +add_type_box (GtkWidget *ptr_widget_grid, t_sensors_dialog *ptr_sensorsdialog) { - GtkWidget *ptr_hbox, *ptr_labelwidget; + GtkWidget *ptr_labelwidget; t_chip *ptr_chip; gint idx_activecomboboxentry; TRACE ("enters add_type_box"); - ptr_hbox = gtk_hbox_new (FALSE, BORDER); - gtk_widget_show (ptr_hbox); - gtk_box_pack_start (GTK_BOX (ptr_widget_vbox), ptr_hbox, FALSE, FALSE, 0); - ptr_labelwidget = gtk_label_new_with_mnemonic (_("Sensors t_ype:")); gtk_widget_show (ptr_labelwidget); + gtk_label_set_xalign (GTK_LABEL (ptr_labelwidget), 0.0f); gtk_widget_set_valign(ptr_labelwidget, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (ptr_hbox), ptr_labelwidget, FALSE, FALSE, 0); + gtk_grid_attach (GTK_GRID (ptr_widget_grid), ptr_labelwidget, 0, 0, 1, 1); gtk_widget_show (ptr_sensorsdialog->myComboBox); - gtk_box_pack_start (GTK_BOX (ptr_hbox), ptr_sensorsdialog->myComboBox, FALSE, FALSE, 0); + gtk_widget_set_hexpand (GTK_WIDGET (ptr_sensorsdialog->myComboBox), TRUE); + gtk_grid_attach (GTK_GRID (ptr_widget_grid), ptr_sensorsdialog->myComboBox, 1, 0, 2, 1); gtk_label_set_mnemonic_widget(GTK_LABEL(ptr_labelwidget), ptr_sensorsdialog->myComboBox); @@ -183,19 +181,17 @@ add_type_box (GtkWidget *ptr_widget_vbox, t_sensors_dialog *ptr_sensorsdialog) ptr_chip = g_ptr_array_index (ptr_sensorsdialog->sensors->chips, idx_activecomboboxentry); DBG("index: %d, chip: %p\n", idx_activecomboboxentry, ptr_chip); - ptr_hbox = gtk_hbox_new (FALSE, BORDER); - gtk_widget_show (ptr_hbox); - gtk_box_pack_start (GTK_BOX (ptr_widget_vbox), ptr_hbox, FALSE, FALSE, 0); - ptr_labelwidget = gtk_label_new_with_mnemonic (_("Description:")); gtk_widget_show (ptr_labelwidget); + gtk_label_set_xalign (GTK_LABEL (ptr_labelwidget), 0.0f); gtk_widget_set_valign(ptr_labelwidget, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (ptr_hbox), ptr_labelwidget, FALSE, FALSE, 0); + gtk_grid_attach (GTK_GRID (ptr_widget_grid), ptr_labelwidget, 0, 1, 1, 1); ptr_sensorsdialog->mySensorLabel = gtk_label_new (ptr_chip->description); + gtk_label_set_xalign (GTK_LABEL (ptr_sensorsdialog->mySensorLabel), 0.0f); gtk_widget_show (ptr_sensorsdialog->mySensorLabel); - gtk_box_pack_start (GTK_BOX (ptr_hbox), ptr_sensorsdialog->mySensorLabel, FALSE, FALSE, 0); + gtk_grid_attach (GTK_GRID (ptr_widget_grid), ptr_sensorsdialog->mySensorLabel, 1, 1, 2, 1); g_signal_connect (G_OBJECT (ptr_sensorsdialog->myComboBox), "changed", G_CALLBACK (sensor_entry_changed), ptr_sensorsdialog ); @@ -206,9 +202,9 @@ add_type_box (GtkWidget *ptr_widget_vbox, t_sensors_dialog *ptr_sensorsdialog) /* -------------------------------------------------------------------------- */ void -add_update_time_box (GtkWidget *ptr_widget_vbox, t_sensors_dialog *ptr_sensorsdialog) +add_update_time_box (GtkWidget *ptr_widget_grid, t_sensors_dialog *ptr_sensorsdialog) { - GtkWidget *ptr_labelwidget, *ptr_hbox; + GtkWidget *ptr_labelwidget; GtkAdjustment *ptr_spinneradjustment; TRACE ("enters add_update_time_box"); @@ -223,15 +219,13 @@ add_update_time_box (GtkWidget *ptr_widget_vbox, t_sensors_dialog *ptr_sensorsdi ptr_labelwidget = gtk_label_new_with_mnemonic ( _("U_pdate interval (seconds):")); gtk_label_set_mnemonic_widget (GTK_LABEL(ptr_labelwidget), ptr_sensorsdialog->spin_button_update_time); - ptr_hbox = gtk_hbox_new(FALSE, BORDER); + gtk_grid_attach (GTK_GRID (ptr_widget_grid), ptr_labelwidget, 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (ptr_widget_grid), ptr_sensorsdialog->spin_button_update_time, 1, 0, 1, 1); - gtk_box_pack_start (GTK_BOX (ptr_hbox), ptr_labelwidget, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (ptr_hbox), ptr_sensorsdialog->spin_button_update_time, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (ptr_widget_vbox), ptr_hbox, FALSE, FALSE, 0); + gtk_widget_set_halign (GTK_WIDGET (ptr_sensorsdialog->spin_button_update_time), GTK_ALIGN_START); gtk_widget_show (ptr_labelwidget); gtk_widget_show (ptr_sensorsdialog->spin_button_update_time); - gtk_widget_show (ptr_hbox); g_signal_connect (G_OBJECT (ptr_spinneradjustment), "value_changed", G_CALLBACK (adjustment_value_changed), ptr_sensorsdialog ); @@ -242,7 +236,7 @@ add_update_time_box (GtkWidget *ptr_widget_vbox, t_sensors_dialog *ptr_sensorsdi /* -------------------------------------------------------------------------- */ void -add_sensor_settings_box (GtkWidget *ptr_widget_vbox, t_sensors_dialog *ptr_sensorsdialog) +add_sensor_settings_box (GtkWidget *ptr_widget_grid, t_sensors_dialog *ptr_sensorsdialog) { GtkTreeViewColumn *ptr_treeviewcolumn; GtkCellRenderer *ptr_textcellrenderer, *ptr_togglecellrenderer; @@ -324,7 +318,10 @@ add_sensor_settings_box (GtkWidget *ptr_widget_vbox, t_sensors_dialog *ptr_senso gtk_container_set_border_width (GTK_CONTAINER (ptr_scrolledwindow), 0); gtk_container_add (GTK_CONTAINER (ptr_scrolledwindow), ptr_sensorsdialog->myTreeView); - gtk_box_pack_start (GTK_BOX (ptr_widget_vbox), ptr_scrolledwindow, TRUE, TRUE, BORDER); + gtk_widget_set_vexpand (GTK_WIDGET (ptr_scrolledwindow), TRUE); + gtk_widget_set_margin_top (GTK_WIDGET (ptr_scrolledwindow), 6); + gtk_widget_set_margin_bottom (GTK_WIDGET (ptr_scrolledwindow), 6); + gtk_grid_attach (GTK_GRID (ptr_widget_grid), ptr_scrolledwindow, 0, 2, 3, 1); gtk_widget_show (ptr_sensorsdialog->myTreeView); gtk_widget_show (ptr_scrolledwindow); @@ -335,16 +332,15 @@ add_sensor_settings_box (GtkWidget *ptr_widget_vbox, t_sensors_dialog *ptr_senso /* -------------------------------------------------------------------------- */ void -add_temperature_unit_box (GtkWidget *ptr_widget_vbox, t_sensors_dialog *ptr_sensorsdialog) +add_temperature_unit_box (GtkWidget *ptr_widget_grid, t_sensors_dialog *ptr_sensorsdialog) { GtkWidget *ptr_hbox, *ptr_labelwidget, *ptr_radiobutton_celsius, *ptr_radiobutton_fahrenheit; TRACE ("enters add_temperature_unit_box"); - ptr_hbox = gtk_hbox_new (FALSE, BORDER); - gtk_widget_show (ptr_hbox); - ptr_labelwidget = gtk_label_new ( _("Temperature scale:")); + gtk_label_set_xalign (GTK_LABEL (ptr_labelwidget), 0.0f); + ptr_radiobutton_celsius = gtk_radio_button_new_with_mnemonic (NULL, _("_Celsius")); ptr_radiobutton_fahrenheit = gtk_radio_button_new_with_mnemonic( @@ -359,11 +355,11 @@ add_temperature_unit_box (GtkWidget *ptr_widget_vbox, t_sensors_dialog *ptr_sens gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ptr_radiobutton_fahrenheit), ptr_sensorsdialog->sensors->scale == FAHRENHEIT); - gtk_box_pack_start(GTK_BOX (ptr_hbox), ptr_labelwidget, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX (ptr_hbox), ptr_radiobutton_celsius, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX (ptr_hbox), ptr_radiobutton_fahrenheit, FALSE, FALSE, 0); + gtk_grid_attach (GTK_GRID (ptr_widget_grid), ptr_labelwidget, 0, 3, 1, 1); + gtk_grid_attach (GTK_GRID (ptr_widget_grid), ptr_radiobutton_celsius, 1, 3, 1, 1); + gtk_grid_attach (GTK_GRID (ptr_widget_grid), ptr_radiobutton_fahrenheit, 2, 3, 1, 1); - gtk_box_pack_start (GTK_BOX (ptr_widget_vbox), ptr_hbox, FALSE, TRUE, 0); + gtk_widget_set_hexpand (GTK_WIDGET (ptr_radiobutton_fahrenheit), TRUE); g_signal_connect (G_OBJECT (ptr_radiobutton_celsius), "toggled", G_CALLBACK (temperature_unit_change), ptr_sensorsdialog ); @@ -376,26 +372,27 @@ add_temperature_unit_box (GtkWidget *ptr_widget_vbox, t_sensors_dialog *ptr_sens void add_sensors_frame (GtkWidget *ptr_widget_notebook, t_sensors_dialog * ptr_sensorsdialog) { - GtkWidget *ptr_vbox, *ptr_label; + GtkWidget *ptr_grid, *ptr_label; TRACE ("enters add_sensors_frame"); - ptr_vbox = gtk_vbox_new (FALSE, OUTER_BORDER); - gtk_container_set_border_width (GTK_CONTAINER(ptr_vbox), OUTER_BORDER); - gtk_widget_show (ptr_vbox); + ptr_grid = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID (ptr_grid), 6); + gtk_grid_set_column_spacing (GTK_GRID (ptr_grid), 12); + gtk_container_set_border_width (GTK_CONTAINER(ptr_grid), 12); + + gtk_widget_show (ptr_grid); ptr_label = gtk_label_new_with_mnemonic(_("_Sensors")); gtk_widget_show (ptr_label); - gtk_container_set_border_width (GTK_CONTAINER (ptr_vbox), BORDER<<1); - - gtk_notebook_append_page (GTK_NOTEBOOK(ptr_widget_notebook), ptr_vbox, ptr_label); + gtk_notebook_append_page (GTK_NOTEBOOK(ptr_widget_notebook), ptr_grid, ptr_label); - add_type_box (ptr_vbox, ptr_sensorsdialog); + add_type_box (ptr_grid, ptr_sensorsdialog); - add_sensor_settings_box (ptr_vbox, ptr_sensorsdialog); + add_sensor_settings_box (ptr_grid, ptr_sensorsdialog); - add_temperature_unit_box (ptr_vbox, ptr_sensorsdialog); + add_temperature_unit_box (ptr_grid, ptr_sensorsdialog); TRACE ("leaves add_sensors_frame"); } diff --git a/panel-plugin/sensors-plugin.c b/panel-plugin/sensors-plugin.c index f1936c3..fbc7d90 100644 --- a/panel-plugin/sensors-plugin.c +++ b/panel-plugin/sensors-plugin.c @@ -1930,17 +1930,15 @@ on_font_set (GtkWidget *widget, gpointer data) /* -------------------------------------------------------------------------- */ static void -add_ui_style_box (GtkWidget * vbox, t_sensors_dialog * sd) +add_ui_style_box (GtkWidget * grid, t_sensors_dialog * sd, GtkSizeGroup *sg) { - GtkWidget *hbox, *label, *radioText, *radioBars, *radioTachos; /* *checkButton, */ + GtkWidget *box, *label, *radioText, *radioBars, *radioTachos; TRACE ("enters add_ui_style_box"); - - hbox = gtk_hbox_new (FALSE, BORDER); - gtk_widget_show (hbox); - label = gtk_label_new (_("UI style:")); + gtk_label_set_xalign (GTK_LABEL (label), 0.0f); + radioText = gtk_radio_button_new_with_mnemonic(NULL, _("_text")); radioBars = gtk_radio_button_new_with_mnemonic_from_widget( GTK_RADIO_BUTTON(radioText), _("_progress bars")); @@ -1959,12 +1957,20 @@ add_ui_style_box (GtkWidget * vbox, t_sensors_dialog * sd) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radioTachos), sd->sensors->display_values_type == DISPLAY_TACHO); - gtk_box_pack_start(GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX (hbox), radioText, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX (hbox), radioBars, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX (hbox), radioTachos, FALSE, FALSE, 0); + box = gtk_hbox_new (FALSE, 12); + gtk_widget_show (box); + + gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (box), radioText, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (box), radioBars, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (box), radioTachos, FALSE, FALSE, 0); + + gtk_grid_attach (GTK_GRID (grid), box, 0, 3, 4, 1); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0); + gtk_widget_set_margin_top (GTK_WIDGET (label), 12); + gtk_widget_set_margin_bottom (GTK_WIDGET (label), 6); + gtk_widget_set_hexpand (GTK_WIDGET (radioTachos), TRUE); + gtk_size_group_add_widget (sg, label); g_signal_connect (G_OBJECT (radioText), "toggled", G_CALLBACK (display_style_changed_text), sd ); @@ -1979,25 +1985,19 @@ add_ui_style_box (GtkWidget * vbox, t_sensors_dialog * sd) /* -------------------------------------------------------------------------- */ static void -add_labels_box (GtkWidget * vbox, t_sensors_dialog * sd) +add_labels_box (GtkWidget * grid, t_sensors_dialog * sd) { - GtkWidget *hbox, *checkButton; + GtkWidget *checkButton; TRACE ("enters add_labels_box"); - - hbox = gtk_hbox_new (FALSE, BORDER); - gtk_widget_show (hbox); - sd->labels_Box = hbox; - checkButton = gtk_check_button_new_with_mnemonic ( _("Show _labels")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(checkButton), sd->sensors->show_labels); gtk_widget_show (checkButton); - gtk_box_pack_start (GTK_BOX (hbox), checkButton, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0); + gtk_grid_attach (GTK_GRID (grid), checkButton, 0, 1, 4, 1); g_signal_connect (G_OBJECT (checkButton), "toggled", G_CALLBACK (show_labels_toggled), sd ); @@ -2008,27 +2008,22 @@ add_labels_box (GtkWidget * vbox, t_sensors_dialog * sd) /* -------------------------------------------------------------------------- */ static void -add_colored_bars_box (GtkWidget *vbox, t_sensors_dialog *sd) +add_colored_bars_box (GtkWidget *grid, t_sensors_dialog *sd) { - GtkWidget *hbox, *checkButton; + GtkWidget *checkButton; TRACE ("enters add_colored_bars_box"); - - hbox = gtk_hbox_new (FALSE, BORDER); - - gtk_widget_show (hbox); - sd->coloredBars_Box = hbox; - checkButton = gtk_check_button_new_with_mnemonic ( _("Show colored _bars")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(checkButton), sd->sensors->show_colored_bars); + sd->coloredBars_Box = checkButton; gtk_widget_show (checkButton); + gtk_widget_set_margin_start (GTK_WIDGET (checkButton), 12); - gtk_box_pack_start (GTK_BOX (hbox), checkButton, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0); + gtk_grid_attach (GTK_GRID (grid), checkButton, 0, 8, 4, 1); if (sd->sensors->display_values_type != DISPLAY_BARS) gtk_widget_hide(sd->coloredBars_Box); @@ -2042,23 +2037,18 @@ add_colored_bars_box (GtkWidget *vbox, t_sensors_dialog *sd) /* -------------------------------------------------------------------------- */ static void -add_title_box (GtkWidget * vbox, t_sensors_dialog * sd) +add_title_box (GtkWidget * grid, t_sensors_dialog * sd) { - GtkWidget *hbox, *checkButton; + GtkWidget *checkButton; TRACE ("enters add_title_box"); - - hbox = gtk_hbox_new (FALSE, BORDER); - gtk_widget_show (hbox); - checkButton = gtk_check_button_new_with_mnemonic (_("_Show title")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(checkButton), sd->sensors->show_title); gtk_widget_show (checkButton); - gtk_box_pack_start (GTK_BOX (hbox), checkButton, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0); + gtk_grid_attach (GTK_GRID (grid), checkButton, 0, 0, 4, 1); g_signal_connect (G_OBJECT (checkButton), "toggled", G_CALLBACK (show_title_toggled), sd ); @@ -2069,7 +2059,7 @@ add_title_box (GtkWidget * vbox, t_sensors_dialog * sd) /* -------------------------------------------------------------------------- */ static void -add_lines_box (GtkWidget * vbox, t_sensors_dialog * sd) +add_lines_box (GtkWidget * grid, t_sensors_dialog * sd, GtkSizeGroup *sg) { GtkWidget *myLinesLabel; GtkWidget *myLinesBox; @@ -2078,7 +2068,11 @@ add_lines_box (GtkWidget * vbox, t_sensors_dialog * sd) TRACE ("enters add_lines_box"); myLinesLabel = gtk_label_new_with_mnemonic (_("_Number of text lines:")); - myLinesBox = gtk_hbox_new(FALSE, BORDER); + gtk_label_set_xalign (GTK_LABEL (myLinesLabel), 0.0f); + + myLinesBox = gtk_hbox_new(FALSE, 6); + gtk_widget_set_margin_start (GTK_WIDGET (myLinesBox), 12); + myLinesSizeSpinBox = gtk_spin_button_new_with_range (1.0, 10.0, 1.0); gtk_spin_button_set_value(GTK_SPIN_BUTTON(myLinesSizeSpinBox), (gdouble) sd->sensors->lines_size); @@ -2086,9 +2080,9 @@ add_lines_box (GtkWidget * vbox, t_sensors_dialog * sd) sd->Lines_Spin_Box = myLinesSizeSpinBox; gtk_box_pack_start (GTK_BOX (myLinesBox), myLinesLabel, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (myLinesBox), myLinesSizeSpinBox, FALSE, FALSE, - 0); - gtk_box_pack_start (GTK_BOX (vbox), myLinesBox, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (myLinesBox), myLinesSizeSpinBox, FALSE, FALSE, 0); + gtk_grid_attach (GTK_GRID (grid), myLinesBox, 0, 6, 4, 1); + gtk_size_group_add_widget (sg, myLinesLabel); gtk_widget_show (myLinesLabel); gtk_widget_show (myLinesSizeSpinBox); @@ -2106,42 +2100,45 @@ add_lines_box (GtkWidget * vbox, t_sensors_dialog * sd) /* -------------------------------------------------------------------------- */ static void -add_cover_rows_box (GtkWidget * vbox, t_sensors_dialog * sd) +add_cover_rows_box (GtkWidget * grid, t_sensors_dialog * sd) { GtkWidget *myCheckBox; TRACE ("enters add_cover_rows_box"); - if (xfce_panel_plugin_get_mode(sd->sensors->plugin) != XFCE_PANEL_PLUGIN_MODE_DESKBAR) { myCheckBox = gtk_check_button_new_with_mnemonic (_("_Cover all panel rows/columns")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(myCheckBox), sd->sensors->cover_panel_rows); - gtk_box_pack_start (GTK_BOX (vbox), myCheckBox, FALSE, FALSE, 0); + gtk_grid_attach (GTK_GRID (grid), myCheckBox, 0, 2, 4, 1); gtk_widget_show (myCheckBox); g_signal_connect (G_OBJECT (myCheckBox), "toggled", G_CALLBACK (cover_rows_toggled), sd ); } + TRACE ("leaves add_cover_rows_box"); } /* -------------------------------------------------------------------------- */ static void -add_str_fontsize_box (GtkWidget * vbox, t_sensors_dialog * sd) +add_str_fontsize_box (GtkWidget * grid, t_sensors_dialog * sd, GtkSizeGroup *sg) { - GtkWidget *myFontLabel; GtkWidget *myFontBox; + GtkWidget *myFontLabel; GtkWidget *myFontSizeComboBox; TRACE ("enters add_str_fontsize_box"); - myFontLabel = gtk_label_new_with_mnemonic (_("F_ont size:")); - myFontBox = gtk_hbox_new(FALSE, BORDER); + gtk_label_set_xalign (GTK_LABEL (myFontLabel), 0.0f); + + myFontBox = gtk_hbox_new(FALSE, 6); + gtk_widget_set_margin_start (GTK_WIDGET (myFontBox), 12); + myFontSizeComboBox = gtk_combo_box_text_new(); sd->font_Box = myFontBox; @@ -2155,9 +2152,9 @@ add_str_fontsize_box (GtkWidget * vbox, t_sensors_dialog * sd) sd->sensors->val_fontsize); gtk_box_pack_start (GTK_BOX (myFontBox), myFontLabel, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (myFontBox), myFontSizeComboBox, FALSE, FALSE, - 0); - gtk_box_pack_start (GTK_BOX (vbox), myFontBox, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (myFontBox), myFontSizeComboBox, FALSE, FALSE, 0); + gtk_grid_attach (GTK_GRID (grid), myFontBox, 0, 5, 4, 1); + gtk_size_group_add_widget (sg, myFontLabel); gtk_widget_show (myFontLabel); gtk_widget_show (myFontSizeComboBox); @@ -2175,7 +2172,7 @@ add_str_fontsize_box (GtkWidget * vbox, t_sensors_dialog * sd) /* -------------------------------------------------------------------------- */ static void -add_font_settings_box (GtkWidget * vbox, t_sensors_dialog * sd) +add_font_settings_box (GtkWidget * grid, t_sensors_dialog * sd, GtkSizeGroup *sg) { GtkWidget *myFontLabel; GtkWidget *myFontSettingsBox; @@ -2183,18 +2180,21 @@ add_font_settings_box (GtkWidget * vbox, t_sensors_dialog * sd) TRACE ("enters add_font_settings_box"); - myFontLabel = gtk_label_new_with_mnemonic (_("F_ont:")); - myFontSettingsBox = gtk_hbox_new (FALSE, BORDER); + gtk_label_set_xalign (GTK_LABEL (myFontLabel), 0.0f); + + myFontSettingsBox = gtk_hbox_new (FALSE, 6); + gtk_widget_set_margin_start (GTK_WIDGET (myFontSettingsBox), 12); + myFontSettingsButton = gtk_font_button_new_with_font(font); gtk_font_button_set_use_font(GTK_FONT_BUTTON(myFontSettingsButton), TRUE); sd->fontSettings_Box = myFontSettingsBox; gtk_box_pack_start (GTK_BOX (myFontSettingsBox), myFontLabel, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (myFontSettingsBox), myFontSettingsButton, FALSE, FALSE, - 0); - gtk_box_pack_start (GTK_BOX (vbox), myFontSettingsBox, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (myFontSettingsBox), myFontSettingsButton, FALSE, FALSE, 0); + gtk_grid_attach (GTK_GRID (grid), myFontSettingsBox, 0, 6, 4, 1); + gtk_size_group_add_widget (sg, myFontLabel); gtk_widget_show (myFontLabel); gtk_widget_show (myFontSettingsButton); @@ -2211,17 +2211,17 @@ add_font_settings_box (GtkWidget * vbox, t_sensors_dialog * sd) /* -------------------------------------------------------------------------- */ static void -add_units_box (GtkWidget * vbox, t_sensors_dialog * sd) +add_units_box (GtkWidget * grid, t_sensors_dialog * sd) { TRACE ("enters add_units_box"); - sd->unit_checkbox = gtk_check_button_new_with_mnemonic(_("Show _Units")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sd->unit_checkbox), sd->sensors->show_units); gtk_widget_show (sd->unit_checkbox); - gtk_box_pack_start (GTK_BOX (vbox), sd->unit_checkbox, FALSE, TRUE, 0); + gtk_grid_attach (GTK_GRID (grid), sd->unit_checkbox, 0, 9, 4, 1); + gtk_widget_set_margin_start (GTK_WIDGET (sd->unit_checkbox), 12); if (sd->sensors->display_values_type!=DISPLAY_TEXT) gtk_widget_hide(sd->unit_checkbox); @@ -2235,17 +2235,17 @@ add_units_box (GtkWidget * vbox, t_sensors_dialog * sd) /* -------------------------------------------------------------------------- */ static void -add_smallspacings_box (GtkWidget * vbox, t_sensors_dialog * sd) +add_smallspacings_box (GtkWidget * grid, t_sensors_dialog * sd) { TRACE ("enters add_smallspacings_box"); - sd->smallspacing_checkbox = gtk_check_button_new_with_mnemonic(_("Small horizontal s_pacing")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sd->smallspacing_checkbox), sd->sensors->show_smallspacings); gtk_widget_show (sd->smallspacing_checkbox); - gtk_box_pack_start (GTK_BOX (vbox), sd->smallspacing_checkbox, FALSE, TRUE, 0); + gtk_grid_attach (GTK_GRID (grid), sd->smallspacing_checkbox, 0, 10, 4, 1); + gtk_widget_set_margin_start (GTK_WIDGET (sd->smallspacing_checkbox), 12); if (sd->sensors->display_values_type!=DISPLAY_TEXT) gtk_widget_hide(sd->smallspacing_checkbox); @@ -2259,17 +2259,16 @@ add_smallspacings_box (GtkWidget * vbox, t_sensors_dialog * sd) /* -------------------------------------------------------------------------- */ static void -add_suppressmessage_box (GtkWidget * vbox, t_sensors_dialog * sd) +add_suppressmessage_box (GtkWidget * grid, t_sensors_dialog * sd) { TRACE ("enters add_suppressmessage_box"); - sd->suppressmessage_checkbox = gtk_check_button_new_with_mnemonic(_("Suppress messages")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sd->suppressmessage_checkbox), sd->sensors->suppressmessage); gtk_widget_show (sd->suppressmessage_checkbox); - gtk_box_pack_start (GTK_BOX (vbox), sd->suppressmessage_checkbox, FALSE, TRUE, 0); + gtk_grid_attach (GTK_GRID (grid), sd->suppressmessage_checkbox, 0, 2, 1, 1); g_signal_connect (G_OBJECT (sd->suppressmessage_checkbox), "toggled", G_CALLBACK (suppressmessage_changed), sd ); @@ -2280,17 +2279,16 @@ add_suppressmessage_box (GtkWidget * vbox, t_sensors_dialog * sd) /* -------------------------------------------------------------------------- */ static void -add_suppresstooltips_box (GtkWidget * vbox, t_sensors_dialog * sd) +add_suppresstooltips_box (GtkWidget * grid, t_sensors_dialog * sd) { TRACE ("enters add_suppresstooltips_box"); - sd->suppresstooltip_checkbox = gtk_check_button_new_with_mnemonic(_("Suppress tooltip")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(sd->suppresstooltip_checkbox), sd->sensors->suppresstooltip); gtk_widget_show (sd->suppresstooltip_checkbox); - gtk_box_pack_start (GTK_BOX (vbox), sd->suppresstooltip_checkbox, FALSE, TRUE, 0); + gtk_grid_attach (GTK_GRID (grid), sd->suppresstooltip_checkbox, 0, 3, 1, 1); g_signal_connect (G_OBJECT (sd->suppresstooltip_checkbox), "toggled", G_CALLBACK (suppresstooltip_changed), sd ); @@ -2302,15 +2300,10 @@ add_suppresstooltips_box (GtkWidget * vbox, t_sensors_dialog * sd) /* -------------------------------------------------------------------------- */ /* double-click improvement */ static void -add_command_box (GtkWidget * vbox, t_sensors_dialog * sd) +add_command_box (GtkWidget * grid, t_sensors_dialog * sd) { - GtkWidget *myBox; - TRACE ("enters add_command_box"); - - myBox = gtk_hbox_new(FALSE, BORDER); - sd->myExecCommand_CheckBox = gtk_check_button_new_with_mnemonic (_("E_xecute on double click:")); gtk_toggle_button_set_active @@ -2323,15 +2316,11 @@ add_command_box (GtkWidget * vbox, t_sensors_dialog * sd) gtk_entry_set_text( GTK_ENTRY(sd->myCommandName_Entry), sd->sensors->command_name ); - gtk_box_pack_start (GTK_BOX (myBox), sd->myExecCommand_CheckBox, FALSE, - FALSE, 0); - gtk_box_pack_start (GTK_BOX (myBox), sd->myCommandName_Entry, FALSE, - FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), myBox, FALSE, FALSE, 0); + gtk_grid_attach (GTK_GRID (grid), sd->myExecCommand_CheckBox, 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID (grid), sd->myCommandName_Entry, 1, 1, 1, 1); gtk_widget_show (sd->myExecCommand_CheckBox); gtk_widget_show (sd->myCommandName_Entry); - gtk_widget_show (myBox); g_signal_connect (G_OBJECT (sd->myExecCommand_CheckBox), "toggled", G_CALLBACK (execCommand_toggled), sd ); @@ -2344,32 +2333,36 @@ add_command_box (GtkWidget * vbox, t_sensors_dialog * sd) static void add_view_frame (GtkWidget * notebook, t_sensors_dialog * sd) { - GtkWidget *_vbox, *_label; + GtkWidget *_grid, *_label; + GtkSizeGroup *sg; TRACE ("enters add_view_frame"); + _grid = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID (_grid), 6); + gtk_grid_set_column_spacing (GTK_GRID (_grid), 18); - _vbox = gtk_vbox_new (FALSE, OUTER_BORDER); - gtk_widget_show (_vbox); + gtk_widget_show (_grid); _label = gtk_label_new_with_mnemonic(_("_View")); gtk_widget_show (_label); - gtk_container_set_border_width (GTK_CONTAINER (_vbox), BORDER<<1); + gtk_container_set_border_width (GTK_CONTAINER (_grid), 12); - gtk_notebook_append_page (GTK_NOTEBOOK(notebook), _vbox, _label); + gtk_notebook_append_page (GTK_NOTEBOOK(notebook), _grid, _label); - add_title_box (_vbox, sd); + sg = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); - add_ui_style_box (_vbox, sd); - add_labels_box (_vbox, sd); - add_str_fontsize_box (_vbox, sd); - add_font_settings_box (_vbox, sd); - add_lines_box (_vbox, sd); - add_cover_rows_box(_vbox, sd); - add_colored_bars_box (_vbox, sd); - add_units_box (_vbox, sd); - add_smallspacings_box(_vbox, sd); + add_title_box (_grid, sd); + add_labels_box (_grid, sd); + add_ui_style_box (_grid, sd, sg); + add_str_fontsize_box (_grid, sd, sg); + add_font_settings_box (_grid, sd, sg); + add_lines_box (_grid, sd, sg); + add_cover_rows_box (_grid, sd); + add_colored_bars_box (_grid, sd); + add_units_box (_grid, sd); + add_smallspacings_box(_grid, sd); TRACE ("leaves add_view_frame"); } @@ -2379,28 +2372,29 @@ add_view_frame (GtkWidget * notebook, t_sensors_dialog * sd) static void add_miscellaneous_frame (GtkWidget * notebook, t_sensors_dialog * sd) { - GtkWidget *_vbox, *_label; + GtkWidget *_grid, *_label; TRACE ("enters add_miscellaneous_frame"); - - _vbox = gtk_vbox_new (FALSE, OUTER_BORDER); - gtk_widget_show (_vbox); + _grid = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID (_grid), 6); + gtk_grid_set_column_spacing (GTK_GRID (_grid), 12); + gtk_widget_show (_grid); _label = gtk_label_new_with_mnemonic (_("_Miscellaneous")); gtk_widget_show (_label); - gtk_container_set_border_width (GTK_CONTAINER (_vbox), BORDER<<1); + gtk_container_set_border_width (GTK_CONTAINER (_grid), 12); - gtk_notebook_append_page (GTK_NOTEBOOK(notebook), _vbox, _label); + gtk_notebook_append_page (GTK_NOTEBOOK(notebook), _grid, _label); - add_update_time_box (_vbox, sd); + add_update_time_box (_grid, sd); - add_suppressmessage_box(_vbox, sd); + add_command_box (_grid, sd); - add_suppresstooltips_box(_vbox, sd); + add_suppressmessage_box(_grid, sd); - add_command_box (_vbox, sd); + add_suppresstooltips_box(_grid, sd); TRACE ("leaves add_miscellaneous_frame"); } @@ -2466,8 +2460,6 @@ sensors_create_options (XfcePanelPlugin *plugin, t_sensors *sensors) xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), _("Properties")); gtk_window_set_icon_name(GTK_WINDOW(dlg),"xfce-sensors"); - gtk_container_set_border_width (GTK_CONTAINER (dlg), 2); - vbox = gtk_dialog_get_content_area(GTK_DIALOG(dlg)); sd = g_new0 (t_sensors_dialog, 1); @@ -2483,6 +2475,7 @@ sensors_create_options (XfcePanelPlugin *plugin, t_sensors *sensors) gtk_combo_box_set_active (GTK_COMBO_BOX(sd->myComboBox), 0); notebook = gtk_notebook_new (); + gtk_container_set_border_width (GTK_CONTAINER (notebook), 6); gtk_box_pack_start (GTK_BOX(vbox), notebook, TRUE, TRUE, 0); gtk_widget_show(notebook); diff --git a/src/interface.c b/src/interface.c index 7d43e48..79efbfa 100644 --- a/src/interface.c +++ b/src/interface.c @@ -73,8 +73,10 @@ add_notebook (GtkWidget *ptr_boxwidget, t_sensors_dialog *ptr_sensorsdialog) ptr_notebook = gtk_notebook_new(); gtk_widget_show (ptr_notebook); - ptr_childvbox = gtk_vbox_new (FALSE, BORDER); - gtk_container_set_border_width (GTK_CONTAINER (ptr_childvbox), BORDER); + gtk_container_set_border_width (GTK_CONTAINER (ptr_notebook), 6); + + ptr_childvbox = gtk_vbox_new (FALSE, 6); + gtk_container_set_border_width (GTK_CONTAINER (ptr_childvbox), 12); gtk_widget_show (ptr_childvbox); add_type_box(ptr_childvbox, ptr_sensorsdialog); @@ -86,8 +88,8 @@ add_notebook (GtkWidget *ptr_boxwidget, t_sensors_dialog *ptr_sensorsdialog) gtk_widget_show (ptr_tablabel); gtk_notebook_append_page (GTK_NOTEBOOK(ptr_notebook), ptr_childvbox, ptr_tablabel); - ptr_childvbox = gtk_vbox_new (FALSE, BORDER); - gtk_container_set_border_width (GTK_CONTAINER (ptr_childvbox), BORDER); + ptr_childvbox = gtk_vbox_new (FALSE, 6); + gtk_container_set_border_width (GTK_CONTAINER (ptr_childvbox), 12); gtk_widget_show (ptr_childvbox); ptr_scrolledwindow = gtk_scrolled_window_new( NULL, NULL); @@ -128,12 +130,9 @@ create_main_window (t_sensors_dialog *ptr_sensorsdialog) ); gtk_widget_show (ptr_xfcedialog); - gtk_window_set_icon_name(GTK_WINDOW(ptr_xfcedialog),"xfce-sensors"); - - gtk_container_set_border_width (GTK_CONTAINER (ptr_xfcedialog), BORDER>>1); + gtk_window_set_icon_name(GTK_WINDOW(ptr_xfcedialog),"xfce-sensors"); ptr_contentareavbox = gtk_dialog_get_content_area(GTK_DIALOG (ptr_xfcedialog)); - gtk_box_set_spacing(GTK_BOX(ptr_contentareavbox), BORDER>>1); gtk_widget_show (ptr_contentareavbox); -- 2.17.1