diff options
| author | raveit65 <[email protected]> | 2016-08-04 22:30:50 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2016-08-31 15:29:57 +0200 |
| commit | d1d63a614de57d43d58d7067eb2838c7cdb927c7 (patch) | |
| tree | 1e32735ea11396652caabda2e2a728c8df782913 | |
| parent | 2f3a2f5d2c49d537d6cf922ac35b244f6ee7dec8 (diff) | |
| download | mate-applets-d1d63a614de57d43d58d7067eb2838c7cdb927c7.tar.bz2 mate-applets-d1d63a614de57d43d58d7067eb2838c7cdb927c7.tar.xz | |
GTK+-3 mateweather port to GtkGrid
| -rw-r--r-- | mateweather/mateweather-pref.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/mateweather/mateweather-pref.c b/mateweather/mateweather-pref.c index 2d0cf304..d2b31c0b 100644 --- a/mateweather/mateweather-pref.c +++ b/mateweather/mateweather-pref.c @@ -802,7 +802,11 @@ static void mateweather_pref_create(MateWeatherPref* pref) GtkWidget* pres_combo; GtkWidget* dist_label; GtkWidget* dist_combo; +#if GTK_CHECK_VERSION (3, 0, 0) + GtkWidget* unit_grid; +#else GtkWidget* unit_table; +#endif GtkWidget* pref_find_label; GtkWidget* pref_find_hbox; GtkWidget* image; @@ -967,6 +971,24 @@ static void mateweather_pref_create(MateWeatherPref* pref) if ( ! g_settings_is_writable (pref->priv->applet->settings, "distance-unit")) hard_set_sensitive (pref->priv->basic_dist_combo, FALSE); +#if GTK_CHECK_VERSION (3, 0, 0) + unit_grid = gtk_grid_new (); + gtk_grid_set_row_spacing(GTK_GRID(unit_grid), 6); + gtk_grid_set_column_spacing(GTK_GRID(unit_grid), 12); + gtk_widget_set_halign (temp_label, GTK_ALIGN_START); + gtk_grid_attach(GTK_GRID(unit_grid), temp_label, 0, 0, 1, 1); + gtk_grid_attach(GTK_GRID(unit_grid), temp_combo, 1, 0, 1, 1); + gtk_widget_set_halign (speed_label, GTK_ALIGN_START); + gtk_grid_attach(GTK_GRID(unit_grid), speed_label, 0, 1, 1, 1); + gtk_grid_attach(GTK_GRID(unit_grid), speed_combo, 1, 1, 1, 1); + gtk_widget_set_halign (pres_label, GTK_ALIGN_START); + gtk_grid_attach(GTK_GRID(unit_grid), pres_label, 0, 2, 1, 1); + gtk_grid_attach(GTK_GRID(unit_grid), pres_combo, 1, 2, 1, 1); + gtk_widget_set_halign (dist_label, GTK_ALIGN_START); + gtk_grid_attach(GTK_GRID(unit_grid), dist_label, 0, 3, 1, 1); + gtk_grid_attach(GTK_GRID(unit_grid), dist_combo, 1, 3, 1, 1); + gtk_widget_show(unit_grid); +#else unit_table = gtk_table_new(5, 2, FALSE); gtk_table_set_row_spacings(GTK_TABLE(unit_table), 6); gtk_table_set_col_spacings(GTK_TABLE(unit_table), 12); @@ -979,6 +1001,7 @@ static void mateweather_pref_create(MateWeatherPref* pref) gtk_table_attach(GTK_TABLE(unit_table), dist_label, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_table_attach_defaults(GTK_TABLE(unit_table), dist_combo, 1, 2, 3, 4); gtk_widget_show(unit_table); +#endif g_signal_connect (temp_combo, "changed", G_CALLBACK (temp_combo_changed_cb), pref); g_signal_connect (speed_combo, "changed", G_CALLBACK (speed_combo_changed_cb), pref); @@ -1085,7 +1108,11 @@ static void mateweather_pref_create(MateWeatherPref* pref) vbox = gtk_vbox_new (FALSE, 6); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_box_pack_start (GTK_BOX (vbox), unit_grid, TRUE, TRUE, 0); +#else gtk_box_pack_start (GTK_BOX (vbox), unit_table, TRUE, TRUE, 0); +#endif #ifdef RADARMAP gtk_box_pack_start (GTK_BOX (vbox), pref->priv->basic_radar_btn, TRUE, TRUE, 0); |