Menu
▾
▴
[Osmo-pim-svn] SF.net SVN: osmo-pim:[1035] branches/gtk3/src
|
From: <mgo...@us...> - 2015-09-23 21:19:08
|
Revision: 1035
http://sourceforge.net/p/osmo-pim/code/1035
Author: mgordienko
Date: 2015-09-23 21:19:06 +0000 (Wed, 23 Sep 2015)
Log Message:
-----------
Used GtkWidget alignment instead of deprecated GtkMisc
Modified Paths:
--------------
branches/gtk3/src/calendar.c
branches/gtk3/src/calendar_calc.c
branches/gtk3/src/calendar_notes.c
branches/gtk3/src/calendar_preferences_gui.c
branches/gtk3/src/calendar_print.c
branches/gtk3/src/calendar_timeline.c
branches/gtk3/src/contacts.c
branches/gtk3/src/contacts_import.c
branches/gtk3/src/contacts_items.c
branches/gtk3/src/notes.c
branches/gtk3/src/preferences_gui.c
branches/gtk3/src/tasks.c
branches/gtk3/src/tasks_items.c
branches/gtk3/src/tasks_preferences_gui.c
branches/gtk3/src/utils_gui.c
Modified: branches/gtk3/src/calendar.c
===================================================================
--- branches/gtk3/src/calendar.c 2015-09-23 21:18:57 UTC (rev 1034)
+++ branches/gtk3/src/calendar.c 2015-09-23 21:19:06 UTC (rev 1035)
@@ -782,7 +782,8 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, i, 1, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
i++;
}
@@ -792,7 +793,8 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, i, 1, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
i++;
}
@@ -802,7 +804,8 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, i, 1, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
i++;
}
@@ -812,7 +815,8 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, i, 1, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
i++;
}
@@ -822,7 +826,8 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, i, 1, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
i++;
}
@@ -832,7 +837,8 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, i, 1, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
i++;
}
@@ -842,7 +848,8 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, i, 1, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
i++;
}
@@ -852,7 +859,8 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, i, 1, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
i++;
}
@@ -862,7 +870,8 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, i, 1, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
}
i = 0;
@@ -872,7 +881,8 @@
update_clock (appGUI);
gtk_widget_show (appGUI->cal->time_label);
gtk_grid_attach (GTK_GRID (table), appGUI->cal->time_label, 1, i, 2, 1);
- gtk_misc_set_alignment (GTK_MISC (appGUI->cal->time_label), 0, 0.5);
+ gtk_widget_set_valign(appGUI->cal->time_label, GTK_ALIGN_START);
+ gtk_widget_set_halign(appGUI->cal->time_label, GTK_ALIGN_CENTER);
i++;
}
@@ -880,12 +890,14 @@
appGUI->cal->day_number_label = gtk_label_new (NULL);
gtk_widget_show (appGUI->cal->day_number_label);
gtk_grid_attach (GTK_GRID (table), appGUI->cal->day_number_label, 1, i, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (appGUI->cal->day_number_label), 0, 0.5);
+ gtk_widget_set_valign(appGUI->cal->day_number_label, GTK_ALIGN_START);
+ gtk_widget_set_halign(appGUI->cal->day_number_label, GTK_ALIGN_CENTER);
appGUI->cal->day_number_year_label = gtk_label_new (NULL);
gtk_widget_show (appGUI->cal->day_number_year_label);
gtk_grid_attach (GTK_GRID (table), appGUI->cal->day_number_year_label, 2, i, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (appGUI->cal->day_number_year_label), 0, 0.5);
+ gtk_widget_set_valign(appGUI->cal->day_number_year_label, GTK_ALIGN_START);
+ gtk_widget_set_halign(appGUI->cal->day_number_year_label, GTK_ALIGN_CENTER);
i++;
}
@@ -893,7 +905,8 @@
label = gtk_label_new (NULL);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 1, i, 2, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
gtk_label_set_text (GTK_LABEL (label), get_current_date_distance_str (g_date_get_julian (date)));
i++;
}
@@ -902,7 +915,8 @@
appGUI->cal->week_number_label = gtk_label_new (NULL);
gtk_widget_show (appGUI->cal->week_number_label);
gtk_grid_attach (GTK_GRID (table), appGUI->cal->week_number_label, 1, i, 2, 1);
- gtk_misc_set_alignment (GTK_MISC (appGUI->cal->week_number_label), 0, 0.5);
+ gtk_widget_set_valign(appGUI->cal->week_number_label, GTK_ALIGN_START);
+ gtk_widget_set_halign(appGUI->cal->week_number_label, GTK_ALIGN_CENTER);
i++;
}
@@ -910,7 +924,8 @@
appGUI->cal->marked_days_label = gtk_label_new (NULL);
gtk_widget_show (appGUI->cal->marked_days_label);
gtk_grid_attach (GTK_GRID (table), appGUI->cal->marked_days_label, 1, i, 2, 1);
- gtk_misc_set_alignment (GTK_MISC (appGUI->cal->marked_days_label), 0, 0.5);
+ gtk_widget_set_valign(appGUI->cal->marked_days_label, GTK_ALIGN_START);
+ gtk_widget_set_halign(appGUI->cal->marked_days_label, GTK_ALIGN_CENTER);
i++;
}
@@ -918,7 +933,8 @@
appGUI->cal->weekend_days_label = gtk_label_new (NULL);
gtk_widget_show (appGUI->cal->weekend_days_label);
gtk_grid_attach (GTK_GRID (table), appGUI->cal->weekend_days_label, 1, i, 2, 1);
- gtk_misc_set_alignment (GTK_MISC (appGUI->cal->weekend_days_label), 0, 0.5);
+ gtk_widget_set_valign(appGUI->cal->weekend_days_label, GTK_ALIGN_START);
+ gtk_widget_set_halign(appGUI->cal->weekend_days_label, GTK_ALIGN_CENTER);
i++;
}
@@ -926,7 +942,8 @@
appGUI->cal->day_category_label = gtk_label_new (NULL);
gtk_widget_show (appGUI->cal->day_category_label);
gtk_grid_attach (GTK_GRID (table), appGUI->cal->day_category_label, 1, i, 2, 1);
- gtk_misc_set_alignment (GTK_MISC (appGUI->cal->day_category_label), 0, 0.5);
+ gtk_widget_set_valign(appGUI->cal->day_category_label, GTK_ALIGN_START);
+ gtk_widget_set_halign(appGUI->cal->day_category_label, GTK_ALIGN_CENTER);
i++;
}
@@ -934,12 +951,14 @@
appGUI->cal->moon_icon = gtk_image_new();
gtk_widget_show (appGUI->cal->moon_icon);
gtk_grid_attach (GTK_GRID (table), appGUI->cal->moon_icon, 1, i, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (appGUI->cal->moon_icon), 0, 0.5);
+ gtk_widget_set_valign(appGUI->cal->moon_icon, GTK_ALIGN_START);
+ gtk_widget_set_halign(appGUI->cal->moon_icon, GTK_ALIGN_CENTER);
appGUI->cal->moon_phase_label = gtk_label_new (NULL);
gtk_widget_show (appGUI->cal->moon_phase_label);
gtk_grid_attach (GTK_GRID (table), appGUI->cal->moon_phase_label, 2, i, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (appGUI->cal->moon_phase_label), 0, 0.5);
+ gtk_widget_set_valign(appGUI->cal->moon_phase_label, GTK_ALIGN_START);
+ gtk_widget_set_halign(appGUI->cal->moon_phase_label, GTK_ALIGN_CENTER);
cal_set_moon_icon (utl_calc_moon_phase (date), appGUI);
i++;
@@ -949,7 +968,8 @@
label = gtk_label_new (NULL);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 1, i, 2, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
gtk_label_set_text (GTK_LABEL (label), utl_get_zodiac_name (g_date_get_day (date), g_date_get_month (date)));
}
Modified: branches/gtk3/src/calendar_calc.c
===================================================================
--- branches/gtk3/src/calendar_calc.c 2015-09-23 21:18:57 UTC (rev 1034)
+++ branches/gtk3/src/calendar_calc.c 2015-09-23 21:19:06 UTC (rev 1035)
@@ -708,17 +708,20 @@
label = gtk_label_new (_("Year"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
label = gtk_label_new (_("Month"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 1, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
label = gtk_label_new (_("Day"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 2, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
spinbutton_adjustment = gtk_adjustment_new (1, 1, 9999, 1, 10, 0);
appGUI->cal->spinbutton_start_year = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adjustment), 1, 0);
@@ -766,17 +769,20 @@
label = gtk_label_new (_("Hour"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
label = gtk_label_new (_("Minute"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 1, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
label = gtk_label_new (_("Second"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 2, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
spinbutton_adjustment = gtk_adjustment_new (0, 0, 23, 1, 10, 0);
appGUI->cal->spinbutton_start_hour = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adjustment), 1, 0);
@@ -861,17 +867,20 @@
label = gtk_label_new (_("Year"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
label = gtk_label_new (_("Month"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 1, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
label = gtk_label_new (_("Day"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 2, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
spinbutton_adjustment = gtk_adjustment_new (1, 1, 9999, 1, 10, 0);
appGUI->cal->spinbutton_end_year = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adjustment), 1, 0);
@@ -919,17 +928,20 @@
label = gtk_label_new (_("Hour"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
label = gtk_label_new (_("Minute"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 1, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
label = gtk_label_new (_("Second"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 2, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
spinbutton_adjustment = gtk_adjustment_new (0, 0, 23, 1, 10, 0);
appGUI->cal->spinbutton_end_hour = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adjustment), 1, 0);
@@ -1030,13 +1042,15 @@
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (vbox_result), label, FALSE, FALSE, 0);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->cal->label_result_3 = gtk_label_new ("");
gtk_widget_show (appGUI->cal->label_result_3);
gtk_label_set_selectable (GTK_LABEL (appGUI->cal->label_result_3), 1);
gtk_box_pack_start (GTK_BOX (vbox_result), appGUI->cal->label_result_3, FALSE, FALSE, 0);
- gtk_misc_set_alignment (GTK_MISC (appGUI->cal->label_result_3), 0.05, 0.5);
+ gtk_widget_set_valign(appGUI->cal->label_result_3, GTK_ALIGN_START);
+ gtk_widget_set_halign(appGUI->cal->label_result_3, GTK_ALIGN_CENTER);
g_snprintf (tmpbuf, BUFFER_SIZE, "<b>%s:</b>", _("Result"));
label = gtk_label_new (tmpbuf);
@@ -1094,17 +1108,20 @@
label = gtk_label_new (_("Year"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
label = gtk_label_new (_("Month"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 1, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
label = gtk_label_new (_("Day"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 2, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
spinbutton_adjustment = gtk_adjustment_new (1, 1, 9999, 1, 10, 0);
appGUI->cal->spinbutton2_start_year = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adjustment), 1, 0);
@@ -1152,17 +1169,20 @@
label = gtk_label_new (_("Hour"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
label = gtk_label_new (_("Minute"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 1, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
label = gtk_label_new (_("Second"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 2, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
spinbutton_adjustment = gtk_adjustment_new (0, 0, 23, 1, 10, 0);
appGUI->cal->spinbutton2_start_hour = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adjustment), 1, 0);
@@ -1263,12 +1283,14 @@
label = gtk_label_new (_("Years"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
label = gtk_label_new (_("Months"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 1, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
spinbutton_adjustment = gtk_adjustment_new (0, 0, 10000, 1, 10, 0);
appGUI->cal->spinbutton2_end_year = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adjustment), 1, 0);
@@ -1291,12 +1313,14 @@
label = gtk_label_new (_("Days"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 2, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
label = gtk_label_new (_("Weeks"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 3, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
spinbutton_adjustment = gtk_adjustment_new (0, 0, 1000000, 1, 10, 0);
appGUI->cal->spinbutton2_end_week = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adjustment), 1, 0);
@@ -1314,17 +1338,20 @@
label = gtk_label_new (_("Hours"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
label = gtk_label_new (_("Minutes"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 1, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
label = gtk_label_new (_("Seconds"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 2, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
spinbutton_adjustment = gtk_adjustment_new (0, 0, 100000000, 1, 10, 0);
appGUI->cal->spinbutton2_end_hour = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adjustment), 1, 0);
Modified: branches/gtk3/src/calendar_notes.c
===================================================================
--- branches/gtk3/src/calendar_notes.c 2015-09-23 21:18:57 UTC (rev 1034)
+++ branches/gtk3/src/calendar_notes.c 2015-09-23 21:19:06 UTC (rev 1035)
@@ -678,7 +678,8 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (notes_tools_table), label, 0, 2, 1, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show (hbox1);
@@ -703,7 +704,8 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (notes_tools_table), label, 0, 0, 1, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->cal->notes_filter_combobox = gtk_combo_box_text_new ();
gtk_widget_show (appGUI->cal->notes_filter_combobox);
Modified: branches/gtk3/src/calendar_preferences_gui.c
===================================================================
--- branches/gtk3/src/calendar_preferences_gui.c 2015-09-23 21:18:57 UTC (rev 1034)
+++ branches/gtk3/src/calendar_preferences_gui.c 2015-09-23 21:19:06 UTC (rev 1035)
@@ -311,7 +311,8 @@
label = utl_gui_create_label ("%s:", _("Day note marker"));
gtk_grid_attach (GTK_GRID (table), label, 0, i, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
gtk_widget_set_size_request (label, 120, -1);
entry_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
@@ -489,19 +490,23 @@
i++;
label = utl_gui_create_label ("%s:", _("Cursor thickness"));
gtk_grid_attach (GTK_GRID (table), label, 0, i, 1, 2);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->opt->cft_label_1 = label;
label = utl_gui_create_label ("<u>%s</u>", _("Thin"));
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_grid_attach (GTK_GRID (table), label, 1, i, 4, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 1.0);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_END);
appGUI->opt->cft_label_2 = label;
label = utl_gui_create_label ("<u>%s</u>", _("Thick"));
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_grid_attach (GTK_GRID (table), label, 1, i, 4, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
+ gtk_widget_set_valign(label, GTK_ALIGN_END);
+ gtk_widget_set_halign(label, GTK_ALIGN_END);
+
appGUI->opt->cft_label_3 = label;
i++;
Modified: branches/gtk3/src/calendar_print.c
===================================================================
--- branches/gtk3/src/calendar_print.c 2015-09-23 21:18:57 UTC (rev 1034)
+++ branches/gtk3/src/calendar_print.c 2015-09-23 21:19:06 UTC (rev 1035)
@@ -595,7 +595,8 @@
label = gtk_label_new (buffer);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table_fonts), label, 0, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->cal->print_month_name_font_entry = gtk_entry_new ();
gtk_widget_set_can_focus (appGUI->cal->print_month_name_font_entry, FALSE);
@@ -619,7 +620,8 @@
label = gtk_label_new (buffer);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table_fonts), label, 0, 1, 1,1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->cal->print_day_name_font_entry = gtk_entry_new ();
gtk_widget_set_can_focus (appGUI->cal->print_day_name_font_entry, FALSE);
@@ -643,7 +645,8 @@
label = gtk_label_new (buffer);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table_fonts), label, 0, 2, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->cal->print_day_num_font_entry = gtk_entry_new ();
gtk_widget_set_can_focus (appGUI->cal->print_day_num_font_entry, FALSE);
@@ -667,7 +670,8 @@
label = gtk_label_new (buffer);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table_fonts), label, 0, 3, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->cal->print_event_font_entry = gtk_entry_new ();
gtk_widget_set_can_focus (appGUI->cal->print_event_font_entry, FALSE);
@@ -785,13 +789,15 @@
label = gtk_label_new (buffer);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table5), label, 0, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
g_snprintf (buffer, BUFFER_SIZE, "%s:", _("Event maximum length"));
label = gtk_label_new (buffer);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table5), label, 0, 1, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
spinbutton_adj = gtk_adjustment_new (config.cal_print_padding, 1, 16, 1, 10, 0);
appGUI->cal->print_padding_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adj), 1, 0);
@@ -808,7 +814,8 @@
label = gtk_label_new (_("Page orientation:"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table5), label, 0, 2, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->cal->print_portrait_radiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("Portrait"));
gtk_widget_set_can_focus (appGUI->cal->print_portrait_radiobutton, FALSE);
Modified: branches/gtk3/src/calendar_timeline.c
===================================================================
--- branches/gtk3/src/calendar_timeline.c 2015-09-23 21:18:57 UTC (rev 1034)
+++ branches/gtk3/src/calendar_timeline.c 2015-09-23 21:19:06 UTC (rev 1035)
@@ -193,7 +193,8 @@
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (timeline_table), label, 0, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
tl_start_h_spinbutton_adj = gtk_adjustment_new (1, 0, 24, 1, 10, 0);
appGUI->cal->tl_start_h_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (tl_start_h_spinbutton_adj), 1, 0);
@@ -205,7 +206,8 @@
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (timeline_table), label, 0, 2, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
tl_step_spinbutton_adj = gtk_adjustment_new (1, 1, 120, 1, 10, 0);
appGUI->cal->tl_step_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (tl_step_spinbutton_adj), 1, 0);
@@ -217,7 +219,8 @@
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (timeline_table), label, 0, 1, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
tl_end_h_spinbutton_adj = gtk_adjustment_new (1, 1, 23, 1, 10, 0);
appGUI->cal->tl_end_h_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (tl_end_h_spinbutton_adj), 1, 0);
Modified: branches/gtk3/src/contacts.c
===================================================================
--- branches/gtk3/src/contacts.c 2015-09-23 21:18:57 UTC (rev 1034)
+++ branches/gtk3/src/contacts.c 2015-09-23 21:19:06 UTC (rev 1035)
@@ -964,7 +964,8 @@
gtk_widget_show (label);
gtk_label_set_use_markup (GTK_LABEL(label), TRUE);
gtk_box_pack_start (GTK_BOX (vbox3), label, FALSE, FALSE, 0);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show (hbox2);
Modified: branches/gtk3/src/contacts_import.c
===================================================================
--- branches/gtk3/src/contacts_import.c 2015-09-23 21:18:57 UTC (rev 1034)
+++ branches/gtk3/src/contacts_import.c 2015-09-23 21:19:06 UTC (rev 1035)
@@ -822,7 +822,8 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (fields_table), label, 0, i, 1, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
gtk_misc_set_padding (GTK_MISC (label), 8, 0);
sprintf(tmpbuf, "<b>%s:</b>", _("Value"));
@@ -830,7 +831,8 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (fields_table), label, 2, i, 1, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
gtk_misc_set_padding (GTK_MISC (label), 8, 0);
appGUI->cnt->value_labels[i] = gtk_label_new ("");
@@ -838,7 +840,8 @@
gtk_widget_set_hexpand(appGUI->cnt->value_labels[i], TRUE);
gtk_grid_attach (GTK_GRID (fields_table), appGUI->cnt->value_labels[i], 3, i, 1, 1);
gtk_widget_set_size_request (appGUI->cnt->value_labels[i], 50, -1);
- gtk_misc_set_alignment (GTK_MISC (appGUI->cnt->value_labels[i]), 0, 0.5);
+ gtk_widget_set_valign(appGUI->cnt->value_labels[i], GTK_ALIGN_START);
+ gtk_widget_set_halign(appGUI->cnt->value_labels[i], GTK_ALIGN_CENTER);
gtk_misc_set_padding (GTK_MISC (appGUI->cnt->value_labels[i]), 8, 0);
appGUI->cnt->field_type_comboboxes[i] = gtk_combo_box_text_new ();
Modified: branches/gtk3/src/contacts_items.c
===================================================================
--- branches/gtk3/src/contacts_items.c 2015-09-23 21:18:57 UTC (rev 1034)
+++ branches/gtk3/src/contacts_items.c 2015-09-23 21:19:06 UTC (rev 1035)
@@ -665,7 +665,8 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 5, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
gtk_misc_set_padding (GTK_MISC (label), 5, 0);
pos++;
@@ -676,7 +677,8 @@
gtk_widget_set_margin_left(label, 4);
gtk_widget_set_margin_right(label, 4);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->cnt->combobox_group = gtk_combo_box_text_new ();
gtk_widget_show (appGUI->cnt->combobox_group);
@@ -700,7 +702,8 @@
gtk_widget_set_margin_left(label, 4);
gtk_widget_set_margin_right(label, 4);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->cnt->contact_entries[i] = gtk_entry_new ();
@@ -722,7 +725,8 @@
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->cnt->contact_entries[COLUMN_BIRTH_DAY_DATE] = gtk_entry_new ();
gtk_widget_set_can_focus(appGUI->cnt->contact_entries[COLUMN_BIRTH_DAY_DATE], FALSE);
@@ -750,7 +754,8 @@
gtk_widget_set_margin_left(label, 4);
gtk_widget_set_margin_right(label, 4);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->cnt->contact_entries[COLUMN_NAME_DAY_DATE] = gtk_entry_new ();
gtk_widget_set_can_focus(appGUI->cnt->contact_entries[COLUMN_NAME_DAY_DATE], FALSE);
@@ -778,7 +783,8 @@
gtk_widget_set_margin_left(label, 4);
gtk_widget_set_margin_right(label, 4);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->cnt->contact_entries[COLUMN_PHOTO] = gtk_entry_new ();
gtk_widget_set_can_focus(appGUI->cnt->contact_entries[COLUMN_PHOTO], FALSE);
@@ -813,7 +819,8 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 5, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
gtk_misc_set_padding (GTK_MISC (label), 5, 0);
pos++;
@@ -826,7 +833,8 @@
gtk_widget_set_margin_left(label, 4);
gtk_widget_set_margin_right(label, 4);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->cnt->contact_entries[i] = gtk_entry_new ();
gtk_widget_show (appGUI->cnt->contact_entries[i]);
@@ -847,7 +855,8 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 5, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
gtk_misc_set_padding (GTK_MISC (label), 5, 0);
pos++;
@@ -864,7 +873,8 @@
gtk_widget_set_margin_left(label, 4);
gtk_widget_set_margin_right(label, 4);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->cnt->contact_entries[i] = gtk_entry_new ();
gtk_widget_show (appGUI->cnt->contact_entries[i]);
@@ -885,7 +895,8 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 5, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
gtk_misc_set_padding (GTK_MISC (label), 5, 0);
pos++;
@@ -897,7 +908,8 @@
gtk_widget_set_margin_left(label, 4);
gtk_widget_set_margin_right(label, 4);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->cnt->contact_entries[i] = gtk_entry_new ();
gtk_widget_set_hexpand(appGUI->cnt->contact_entries[i], TRUE);
@@ -941,7 +953,8 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 5, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
gtk_misc_set_padding (GTK_MISC (label), 5, 0);
pos++;
@@ -954,7 +967,8 @@
gtk_widget_set_margin_left(label, 4);
gtk_widget_set_margin_right(label, 4);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->cnt->contact_entries[i] = gtk_entry_new ();
gtk_widget_show (appGUI->cnt->contact_entries[i]);
@@ -1006,7 +1020,8 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 5, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
gtk_misc_set_padding (GTK_MISC (label), 5, 0);
pos++;
Modified: branches/gtk3/src/notes.c
===================================================================
--- branches/gtk3/src/notes.c 2015-09-23 21:18:57 UTC (rev 1034)
+++ branches/gtk3/src/notes.c 2015-09-23 21:19:06 UTC (rev 1035)
@@ -1594,7 +1594,8 @@
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->nte->notes_find_entry = gtk_entry_new();
gtk_entry_set_max_length(GTK_ENTRY(appGUI->nte->notes_find_entry), 128);
Modified: branches/gtk3/src/preferences_gui.c
===================================================================
--- branches/gtk3/src/preferences_gui.c 2015-09-23 21:18:57 UTC (rev 1034)
+++ branches/gtk3/src/preferences_gui.c 2015-09-23 21:19:06 UTC (rev 1035)
@@ -595,7 +595,8 @@
label = utl_gui_create_label ("%s:", _("Web browser"));
gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
label = utl_gui_create_label ("%s:", _("E-mail client"));
gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);
Modified: branches/gtk3/src/tasks.c
===================================================================
--- branches/gtk3/src/tasks.c 2015-09-23 21:18:57 UTC (rev 1034)
+++ branches/gtk3/src/tasks.c 2015-09-23 21:19:06 UTC (rev 1035)
@@ -1402,7 +1402,8 @@
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
appGUI->tsk->tasks_find_entry = gtk_entry_new ();
Modified: branches/gtk3/src/tasks_items.c
===================================================================
--- branches/gtk3/src/tasks_items.c 2015-09-23 21:18:57 UTC (rev 1034)
+++ branches/gtk3/src/tasks_items.c 2015-09-23 21:19:06 UTC (rev 1035)
@@ -410,12 +410,14 @@
label = gtk_label_new (_("Hour"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
label = gtk_label_new (_("Minute"));
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (grid), label, 1, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
spinbutton_adjustment = gtk_adjustment_new (get_current_hour(), 0, 23, 1, 10, 0);
appGUI->cal->spinbutton_start_hour = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adjustment), 1, 0);
@@ -737,7 +739,8 @@
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_grid_attach (GTK_GRID (m_grid), label, 0, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
g_snprintf (tmpbuf, BUFFER_SIZE, "<b>%s:</b>", _("Due date"));
label = gtk_label_new (tmpbuf);
@@ -745,7 +748,8 @@
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_grid_attach (GTK_GRID (m_grid), label, 0, 1, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->tsk->summary_entry = gtk_entry_new ();
g_signal_connect (G_OBJECT (appGUI->tsk->summary_entry), "changed",
@@ -775,7 +779,8 @@
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_grid_attach (GTK_GRID (m_grid), label, 0, 2, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->tsk->category_combobox = gtk_combo_box_text_new ();
gtk_widget_show (appGUI->tsk->category_combobox);
@@ -796,7 +801,8 @@
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_grid_attach (GTK_GRID (m_grid), label, 2, 2, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
appGUI->tsk->priority_combobox = gtk_combo_box_text_new ();
gtk_widget_show (appGUI->tsk->priority_combobox);
@@ -818,7 +824,8 @@
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
gtk_container_add (GTK_CONTAINER (alignment), label);
scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
@@ -915,19 +922,22 @@
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
g_snprintf (tmpbuf, BUFFER_SIZE, "%s:", _("Hours"));
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (grid), label, 2, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
g_snprintf (tmpbuf, BUFFER_SIZE, "%s:", _("Minutes"));
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (grid), label, 4, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
aw_days_spinbutton_adj = gtk_adjustment_new (0, 0, 10000, 1, 10, 0);
appGUI->tsk->aw_days_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (aw_days_spinbutton_adj), 1, 0);
@@ -976,7 +986,8 @@
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
spinbutton_adjustment = gtk_adjustment_new (config.postpone_time, 0, 1440, 1, 10, 0);
appGUI->tsk->postpone_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton_adjustment), 1, 0);
@@ -1086,14 +1097,16 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
g_snprintf (tmpbuf, BUFFER_SIZE, "<small>%s</small>", _("Minute"));
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (grid), label, 1, 0, 1, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
rt_start_hour_spinbutton_adj = gtk_adjustment_new (0, 0, 23, 1, 10, 0);
appGUI->tsk->rt_start_hour_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (rt_start_hour_spinbutton_adj), 1, 0);
@@ -1118,14 +1131,16 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
g_snprintf (tmpbuf, BUFFER_SIZE, "<small>%s</small>", _("Minute"));
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (grid), label, 1, 0, 1, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
rt_end_hour_spinbutton_adj = gtk_adjustment_new (23, 0, 23, 1, 10, 0);
appGUI->tsk->rt_end_hour_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (rt_end_hour_spinbutton_adj), 1, 0);
@@ -1150,14 +1165,16 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
g_snprintf (tmpbuf, BUFFER_SIZE, "<small>%s</small>", _("Minute"));
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (grid), label, 1, 0, 1, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
rt_interval_hour_spinbutton_adj = gtk_adjustment_new (0, 0, 23, 1, 10, 0);
appGUI->tsk->rt_interval_hour_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (rt_interval_hour_spinbutton_adj), 1, 0);
@@ -1224,25 +1241,29 @@
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
g_snprintf (tmpbuf, BUFFER_SIZE, "%s:", _("Months"));
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (grid), label, 2, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
g_snprintf (tmpbuf, BUFFER_SIZE, "%s:", _("Repeat"));
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (grid), label, 4, 0, 1, 1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
g_snprintf (tmpbuf, BUFFER_SIZE, "%s:", _("Repeat in the following days"));
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (vbox3), label, FALSE, FALSE, 0);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
grid = gtk_grid_new ();
gtk_widget_show (grid);
Modified: branches/gtk3/src/tasks_preferences_gui.c
===================================================================
--- branches/gtk3/src/tasks_preferences_gui.c 2015-09-23 21:18:57 UTC (rev 1034)
+++ branches/gtk3/src/tasks_preferences_gui.c 2015-09-23 21:19:06 UTC (rev 1035)
@@ -578,7 +578,8 @@
str = g_strdup_printf ("%s (%s)", _("minutes"), _("0 for disable"));
label = gtk_label_new (str);
g_free (str);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
gtk_grid_attach (GTK_GRID (table), label, 2, i, 1, 1);
i++;
@@ -596,7 +597,8 @@
str = g_strdup_printf ("%s (%s)", _("times"), _("0 for disable"));
label = gtk_label_new (str);
g_free (str);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
gtk_grid_attach (GTK_GRID (table), label, 2, i, 1, 1);
i++;
Modified: branches/gtk3/src/utils_gui.c
===================================================================
--- branches/gtk3/src/utils_gui.c 2015-09-23 21:18:57 UTC (rev 1034)
+++ branches/gtk3/src/utils_gui.c 2015-09-23 21:19:06 UTC (rev 1035)
@@ -35,7 +35,8 @@
{
gchar *str = g_strdup_printf (format, name);
GtkWidget *label = gtk_label_new (str);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ gtk_widget_set_valign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
g_free (str);
return label;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|