Menu
▾
▴
[Osmo-pim-svn] SF.net SVN: osmo-pim:[1108] trunk/src
|
From: <pa...@us...> - 2017-02-07 19:12:50
|
Revision: 1108
http://sourceforge.net/p/osmo-pim/code/1108
Author: pasp
Date: 2017-02-07 19:12:46 +0000 (Tue, 07 Feb 2017)
Log Message:
-----------
* GUI fixes - part 1
Modified Paths:
--------------
trunk/src/Makefile.am
trunk/src/backup.c
trunk/src/calendar.c
trunk/src/calendar_calc.c
trunk/src/calendar_fullyear.c
trunk/src/calendar_ical.c
trunk/src/calendar_jumpto.c
trunk/src/calendar_preferences_gui.c
trunk/src/calendar_print.c
trunk/src/calendar_timeline.c
trunk/src/contacts.c
trunk/src/contacts_export.c
trunk/src/contacts_import.c
trunk/src/contacts_items.c
trunk/src/gui.c
trunk/src/main.c
trunk/src/notes.c
trunk/src/notes_items.c
trunk/src/stock_icons.c
trunk/src/tasks.c
trunk/src/tasks_items.c
trunk/src/utils_gui.c
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2016-11-15 18:44:46 UTC (rev 1107)
+++ trunk/src/Makefile.am 2017-02-07 19:12:46 UTC (rev 1108)
@@ -1,9 +1,9 @@
AUTOMAKE_OPTIONS = -Wno-portability
-REVISION := $(shell if test -e .svn; then echo -DREV=\"`LC_ALL=C svn info | sed -n '/^Rev/p'| sed -e 's/^Revision:\ //'`\"; fi;)
+REVISION := "$(shell LC_ALL=C svnversion -cn ../ | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/" | grep "[0-9]" )"
VERSION_MAJOR := $(shell echo $(VERSION) | awk -F "." '{print $$1}')
VERSION_MINOR := $(shell echo $(VERSION) | awk -F "." '{print $$2}')
VERSION_MICRO := $(shell echo $(VERSION) | awk -F "." '{print $$3}')
-AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" $(REVISION) -DDATADIR=\"$(datadir)\" \
+AM_CPPFLAGS = -DREV=$(REVISION) -DLOCALEDIR=\"$(datadir)/locale\" -DDATADIR=\"$(datadir)\" \
-DSOUNDSDIR=\"$(datadir)/sounds\" -DVERSION_MAJOR=\"$(VERSION_MAJOR)\" -DVERSION_MINOR=\"$(VERSION_MINOR)\" -DVERSION_MICRO=\"$(VERSION_MICRO)\" \
@GTK_CFLAGS@ @XML_CPPFLAGS@ -Wall
dnl -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DG_DISABLE_CAST_CHECKS
Modified: trunk/src/backup.c
===================================================================
--- trunk/src/backup.c 2016-11-15 18:44:46 UTC (rev 1107)
+++ trunk/src/backup.c 2017-02-07 19:12:46 UTC (rev 1108)
@@ -268,8 +268,8 @@
bck_p1_entry = gtk_entry_new ();
gtk_widget_show (bck_p1_entry);
gtk_container_add (GTK_CONTAINER (frame), bck_p1_entry);
- gtk_widget_set_margin_left(bck_p1_entry, 16);
- gtk_widget_set_margin_right(bck_p1_entry, 4);
+ gtk_widget_set_margin_start(bck_p1_entry, 16);
+ gtk_widget_set_margin_end(bck_p1_entry, 4);
gtk_widget_set_margin_top(bck_p1_entry, 4);
gtk_widget_set_margin_bottom(bck_p1_entry, 4);
gtk_entry_set_invisible_char (GTK_ENTRY (bck_p1_entry), 8226);
@@ -289,8 +289,8 @@
bck_p2_entry = gtk_entry_new ();
gtk_widget_show (bck_p2_entry);
gtk_container_add (GTK_CONTAINER (frame), bck_p2_entry);
- gtk_widget_set_margin_left(bck_p2_entry, 16);
- gtk_widget_set_margin_right(bck_p2_entry, 4);
+ gtk_widget_set_margin_start(bck_p2_entry, 16);
+ gtk_widget_set_margin_end(bck_p2_entry, 4);
gtk_widget_set_margin_top(bck_p2_entry, 4);
gtk_widget_set_margin_bottom(bck_p2_entry, 4);
gtk_entry_set_invisible_char (GTK_ENTRY (bck_p2_entry), 8226);
@@ -492,8 +492,8 @@
pass_entry = gtk_entry_new ();
gtk_widget_show (pass_entry);
gtk_container_add (GTK_CONTAINER (frame), pass_entry);
- gtk_widget_set_margin_left(pass_entry, 16);
- gtk_widget_set_margin_right(pass_entry, 4);
+ gtk_widget_set_margin_start(pass_entry, 16);
+ gtk_widget_set_margin_end(pass_entry, 4);
gtk_widget_set_margin_top(pass_entry, 4);
gtk_widget_set_margin_bottom(pass_entry, 4);
gtk_entry_set_invisible_char (GTK_ENTRY (pass_entry), 8226);
Modified: trunk/src/calendar.c
===================================================================
--- trunk/src/calendar.c 2016-11-15 18:44:46 UTC (rev 1107)
+++ trunk/src/calendar.c 2017-02-07 19:12:46 UTC (rev 1108)
@@ -1782,7 +1782,7 @@
vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox1);
- gtk_container_set_border_width (GTK_CONTAINER (vbox1), 8);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox1), 0);
g_snprintf (tmpbuf, BUFFER_SIZE, "<b>%s</b>", _("Calendar"));
gui_add_to_notebook (vbox1, tmpbuf, appGUI);
@@ -1862,6 +1862,7 @@
}
vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ gtk_widget_set_hexpand (vbox3, FALSE);
gtk_widget_show (vbox3);
if (appGUI->calendar_only == TRUE) {
gtk_box_pack_start (GTK_BOX (vbox2), vbox3, TRUE, TRUE, 0);
@@ -1944,7 +1945,7 @@
hseparator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_widget_show (hseparator);
- gtk_box_pack_start (GTK_BOX (vbox3), hseparator, FALSE, FALSE, 6);
+ gtk_box_pack_start (GTK_BOX (vbox3), hseparator, FALSE, FALSE, 6);
appGUI->cal->calendar = gui_calendar_new ();
gtk_widget_show (appGUI->cal->calendar);
@@ -2240,7 +2241,7 @@
appGUI->cal->day_info_scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_show (appGUI->cal->day_info_scrolledwindow);
#ifndef HAVE_LIBWEBKIT
- gtk_widget_set_margin_left(appGUI->cal->day_info_scrolledwindow, 8);
+ gtk_widget_set_margin_start(appGUI->cal->day_info_scrolledwindow, 8);
#endif /* HAVE_LIBWEBKIT */
gtk_container_add (GTK_CONTAINER (frame), appGUI->cal->day_info_scrolledwindow);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (appGUI->cal->day_info_scrolledwindow),
Modified: trunk/src/calendar_calc.c
===================================================================
--- trunk/src/calendar_calc.c 2016-11-15 18:44:46 UTC (rev 1107)
+++ trunk/src/calendar_calc.c 2017-02-07 19:12:46 UTC (rev 1108)
@@ -318,7 +318,7 @@
ts, ngettext ("second", "seconds", ts));
gtk_label_set_markup (GTK_LABEL (appGUI->cal->label_result_1_2), tmpbuf);
- g_snprintf (tmpbuf, BUFFER_SIZE, "<small>(%s: %d %s, %d %s, %d %s, %d %s)</small>",
+ g_snprintf (tmpbuf, BUFFER_SIZE, "(%s: %d %s, %d %s, %d %s, %d %s)",
_("or"),
days, ngettext ("day", "days", days),
th, ngettext ("hour", "hours", th),
@@ -331,7 +331,7 @@
hours = minutes / 60;
weeks = (gint) (hours / (24 * 7));
working_days = days - we_d + 1;
- g_snprintf (tmpbuf, BUFFER_SIZE, "<small>%llu %s\n%llu %s (%s)\n%llu %s (%s)\n%d %s (%s)\n%d %s (%s)\n%d %s (%s)</small>",
+ g_snprintf (tmpbuf, BUFFER_SIZE, "%llu %s\n%llu %s (%s)\n%llu %s (%s)\n%d %s (%s)\n%d %s (%s)\n%d %s (%s)",
seconds, ngettext ("second", "seconds", seconds),
minutes, ngettext ("minute", "minutes", minutes), _("rounded down"),
hours, ngettext ("hour", "hours", hours), _("rounded down"),
@@ -344,7 +344,7 @@
E = 100.0 * sin (2.0 * M_PI * days / 28.0);
I = 100.0 * sin (2.0 * M_PI * days / 33.0);
g_snprintf (tmpbuf2, BUFFER_SIZE,
- "<small>\n\nBiorhythms:\nPhysical: %d%%, Emotional: %d%%, Intellectual: %d%%</small>", P, E, I);
+ "\n\nBiorhythms:\nPhysical: %d%%, Emotional: %d%%, Intellectual: %d%%", P, E, I);
g_strlcat (tmpbuf, tmpbuf2, BUFFER_SIZE);
}
@@ -521,16 +521,16 @@
if (ignore_weekend_days) {
str = utl_date_print_j (julian, DATE_FULL, config.override_locale_settings);
- text = g_strdup_printf ("<big>%s</big>\n<small>(%d %s)</small>", str,
+ text = g_strdup_printf ("<span size=\"xx-large\">%s</span>\n(%d %s)", str,
wd_n, ngettext ("weekend day ignored", "weekend days ignored", wd_n));
} else if (hour == 0 && minute == 0 && second == 0) {
str = utl_date_print_j (julian, DATE_FULL, config.override_locale_settings);
- text = g_strdup_printf ("<big>%s</big>", str);
+ text = g_strdup_printf ("<span size=\"xx-large\">%s</span>", str);
} else {
str = utl_date_time_print_js (julian, DATE_FULL,
utl_time_hms_to_seconds (hour, minute, second), TIME_HH_MM_SS,
config.override_locale_settings);
- text = g_strdup_printf ("<big>%s</big>", str);
+ text = g_strdup_printf ("<span size=\"xx-large\">%s</span>", str);
}
gtk_label_set_markup (GTK_LABEL (appGUI->cal->label2_result), text);
g_free (str);
@@ -675,18 +675,14 @@
frame = gtk_frame_new (NULL);
gtk_widget_show (frame);
- if (!config.gui_layout) {
- gtk_box_pack_start (GTK_BOX (vbox2), frame, FALSE, FALSE, 0);
- } else {
- gtk_box_pack_start (GTK_BOX (vbox99), frame, FALSE, FALSE, 0);
- }
+ gtk_box_pack_start (GTK_BOX (vbox2), frame, FALSE, FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show (hbox1);
- gtk_widget_set_margin_left(hbox1, 16);
- gtk_widget_set_margin_right(hbox1, 4);
+ gtk_widget_set_margin_start(hbox1, 16);
+ gtk_widget_set_margin_end(hbox1, 4);
gtk_widget_set_margin_top(hbox1, 4);
gtk_widget_set_margin_bottom(hbox1, 4);
gtk_container_add (GTK_CONTAINER (frame), hbox1);
@@ -832,18 +828,14 @@
frame = gtk_frame_new (NULL);
gtk_widget_show (frame);
- if (!config.gui_layout) {
- gtk_box_pack_start (GTK_BOX (vbox2), frame, FALSE, FALSE, 0);
- } else {
- gtk_box_pack_start (GTK_BOX (vbox99), frame, FALSE, FALSE, 0);
- }
+ gtk_box_pack_start (GTK_BOX (vbox2), frame, FALSE, FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show (hbox2);
- gtk_widget_set_margin_left(hbox2, 16);
- gtk_widget_set_margin_right(hbox2, 4);
+ gtk_widget_set_margin_start(hbox2, 16);
+ gtk_widget_set_margin_end(hbox2, 4);
gtk_widget_set_margin_top(hbox2, 4);
gtk_widget_set_margin_bottom(hbox2, 4);
gtk_container_add (GTK_CONTAINER (frame), hbox2);
@@ -987,30 +979,20 @@
gtk_frame_set_label_widget (GTK_FRAME (frame), label);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- if (!config.gui_layout) {
- hseparator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_widget_show (hseparator);
- gtk_box_pack_start (GTK_BOX (vbox2), hseparator, FALSE, FALSE, 6);
- } else {
- hseparator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
- gtk_widget_show (hseparator);
- gtk_box_pack_start (GTK_BOX (hbox99), hseparator, FALSE, FALSE, 6);
- }
+ hseparator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+ gtk_widget_show (hseparator);
+ gtk_box_pack_start (GTK_BOX (vbox2), hseparator, FALSE, FALSE, 6);
frame = gtk_frame_new (NULL);
gtk_widget_show (frame);
- if (!config.gui_layout) {
- gtk_box_pack_start (GTK_BOX (vbox2), frame, FALSE, FALSE, 0);
- } else {
- gtk_box_pack_start (GTK_BOX (hbox99), frame, FALSE, FALSE, 0);
- }
+ gtk_box_pack_start (GTK_BOX (vbox2), frame, FALSE, FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
vbox_result = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox_result);
- gtk_widget_set_margin_left(vbox_result, 20);
- gtk_widget_set_margin_right(vbox_result, 8);
+ gtk_widget_set_margin_start(vbox_result, 20);
+ gtk_widget_set_margin_end(vbox_result, 8);
gtk_widget_set_margin_top(vbox_result, 8);
gtk_widget_set_margin_bottom(vbox_result, 8);
gtk_container_add (GTK_CONTAINER (frame), vbox_result);
@@ -1030,7 +1012,7 @@
gtk_label_set_selectable (GTK_LABEL (appGUI->cal->label_result_2), 1);
gtk_box_pack_start (GTK_BOX (vbox_result), appGUI->cal->label_result_2, TRUE, TRUE, 0);
- g_snprintf (tmpbuf, BUFFER_SIZE, "<small>\n<i>%s:</i></small>", _("Alternative time units"));
+ g_snprintf (tmpbuf, BUFFER_SIZE, "\n<i>%s:</i>\n", _("Alternative time units"));
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (vbox_result), label, FALSE, FALSE, 0);
@@ -1065,18 +1047,14 @@
frame = gtk_frame_new (NULL);
gtk_widget_show (frame);
- if (!config.gui_layout) {
- gtk_box_pack_start (GTK_BOX (vbox7), frame, FALSE, FALSE, 0);
- } else {
- gtk_box_pack_start (GTK_BOX (hbox98), frame, FALSE, FALSE, 0);
- }
+ gtk_box_pack_start (GTK_BOX (vbox7), frame, FALSE, FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
vbox22 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox22);
- gtk_widget_set_margin_left(vbox22, 16);
- gtk_widget_set_margin_right(vbox22, 4);
+ gtk_widget_set_margin_start(vbox22, 16);
+ gtk_widget_set_margin_end(vbox22, 4);
gtk_widget_set_margin_top(vbox22, 4);
gtk_widget_set_margin_bottom(vbox22, 4);
gtk_container_add (GTK_CONTAINER (frame), vbox22);
@@ -1247,17 +1225,13 @@
frame = gtk_frame_new (NULL);
gtk_widget_show (frame);
- if (!config.gui_layout) {
- gtk_box_pack_start (GTK_BOX (vbox7), frame, FALSE, FALSE, 0);
- } else {
- gtk_box_pack_start (GTK_BOX (hbox98), frame, FALSE, FALSE, 0);
- }
+ gtk_box_pack_start (GTK_BOX (vbox7), frame, FALSE, FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
vbox10 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox10);
- gtk_widget_set_margin_left(vbox10, 12);
+ gtk_widget_set_margin_start(vbox10, 12);
gtk_container_add (GTK_CONTAINER (frame), vbox10);
table = gtk_grid_new ();
@@ -1399,8 +1373,8 @@
hbox12 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox12);
- gtk_widget_set_margin_left(hbox12, 20);
- gtk_widget_set_margin_right(hbox12, 8);
+ gtk_widget_set_margin_start(hbox12, 20);
+ gtk_widget_set_margin_end(hbox12, 8);
gtk_widget_set_margin_top(hbox12, 8);
gtk_widget_set_margin_bottom(hbox12, 8);
gtk_container_add (GTK_CONTAINER (frame), hbox12);
Modified: trunk/src/calendar_fullyear.c
===================================================================
--- trunk/src/calendar_fullyear.c 2016-11-15 18:44:46 UTC (rev 1107)
+++ trunk/src/calendar_fullyear.c 2017-02-07 19:12:46 UTC (rev 1108)
@@ -141,8 +141,8 @@
selected_date[idx].appGUI = appGUI;
g_signal_connect (G_OBJECT (appGUI->cal->calendar_buttons[idx]), "clicked",
G_CALLBACK (select_date_day_cb), &selected_date[idx]);
- gtk_button_set_label (GTK_BUTTON (appGUI->cal->calendar_buttons[idx]), "");
- // FIXME gtk_label_set_markup (GTK_LABEL (GTK_BIN (appGUI->cal->calendar_buttons[idx])->child), tmpbuf);
+ GList *btnCh = gtk_container_get_children(GTK_CONTAINER (appGUI->cal->calendar_buttons[idx]));
+ gtk_label_set_markup (GTK_LABEL (btnCh->data), tmpbuf);
gtk_widget_show (appGUI->cal->calendar_buttons[idx]);
} else {
@@ -513,17 +513,16 @@
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (appGUI->cal->fycal_table_1), label, 0, month + 1, 1, 1);
- gtk_widget_set_margin_left (label, 8);
- gtk_widget_set_margin_right (label, 8);
+ gtk_widget_set_margin_start (label, 8);
+ gtk_widget_set_margin_end (label, 8);
gtk_label_set_markup (GTK_LABEL (label), tmpbuf);
if (config.fy_simple_view == FALSE) {
label = gtk_label_new (NULL);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (appGUI->cal->fycal_table_1), label, FULL_YEAR_COLS + 3, month + 1, 1, 1);
-
- gtk_widget_set_margin_left (label, 8);
- gtk_widget_set_margin_right (label, 8);
+ gtk_widget_set_margin_start (label, 8);
+ gtk_widget_set_margin_end (label, 8);
gtk_label_set_markup (GTK_LABEL (label), tmpbuf);
}
}
@@ -546,8 +545,8 @@
label = gtk_label_new (NULL);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (appGUI->cal->fycal_table_1), label, i + 2, 0, 1, 1);
- gtk_widget_set_margin_left (label, 4);
- gtk_widget_set_margin_right (label, 4);
+ gtk_widget_set_margin_start (label, 4);
+ gtk_widget_set_margin_end (label, 4);
if (rotate)
gtk_label_set_angle (GTK_LABEL (label), 90);
gtk_label_set_markup (GTK_LABEL (label), tmpbuf);
@@ -556,8 +555,8 @@
label = gtk_label_new (NULL);
gtk_widget_show (label);
gtk_grid_attach (GTK_GRID (appGUI->cal->fycal_table_1), label, i + 2, MAX_MONTHS + 3, 1, 1);
- gtk_widget_set_margin_left (label, 4);
- gtk_widget_set_margin_right (label, 4);
+ gtk_widget_set_margin_start (label, 4);
+ gtk_widget_set_margin_end (label, 4);
if (rotate)
gtk_label_set_angle (GTK_LABEL (label), 90);
gtk_label_set_markup (GTK_LABEL (label), tmpbuf);
@@ -571,7 +570,7 @@
i = month - 1;
idx = i * FULL_YEAR_COLS + j;
- appGUI->cal->calendar_buttons[idx] = gtk_button_new ();
+ appGUI->cal->calendar_buttons[idx] = gtk_button_new_with_label ("");
gtk_widget_set_can_focus (appGUI->cal->calendar_buttons[idx], FALSE);
gtk_button_set_relief (GTK_BUTTON (appGUI->cal->calendar_buttons[idx]), GTK_RELIEF_NONE);
gtk_widget_show (appGUI->cal->calendar_buttons[idx]);
Modified: trunk/src/calendar_ical.c
===================================================================
--- trunk/src/calendar_ical.c 2016-11-15 18:44:46 UTC (rev 1107)
+++ trunk/src/calendar_ical.c 2017-02-07 19:12:46 UTC (rev 1108)
@@ -1526,7 +1526,7 @@
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_show (vbox2);
- gtk_widget_set_margin_left(vbox2, 12);
+ gtk_widget_set_margin_start(vbox2, 12);
gtk_container_add (GTK_CONTAINER (frame), vbox2);
hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
@@ -1698,7 +1698,7 @@
hbox3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox3);
- gtk_widget_set_margin_left(hbox3, 12);
+ gtk_widget_set_margin_start(hbox3, 12);
gtk_container_add (GTK_CONTAINER (frame), hbox3);
appGUI->cal->output_file_entry = gtk_entry_new ();
Modified: trunk/src/calendar_jumpto.c
===================================================================
--- trunk/src/calendar_jumpto.c 2016-11-15 18:44:46 UTC (rev 1107)
+++ trunk/src/calendar_jumpto.c 2017-02-07 19:12:46 UTC (rev 1108)
@@ -132,7 +132,7 @@
}
/*------------------------------------------------------------------------------*/
-/* FIXME */
+
void
jumpto_go_window_close_cb (GtkButton *button, gpointer user_data)
{
@@ -197,7 +197,7 @@
GtkWidget *cancel_button;
GtkWidget *jumpto_button;
gint win_xpos, win_ypos;
-gchar tmpbuf[BUFFER_SIZE];
+gchar tmpbuf[BUFFER_SIZE];
appGUI->cal->jumpto_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (appGUI->cal->jumpto_window), _("Jump to date"));
@@ -226,12 +226,10 @@
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
- gtk_widget_set_margin_left (label, 8);
- gtk_widget_set_margin_right (label, 8);
+ gtk_widget_set_margin_end (label, 8);
appGUI->cal->day_entry = gtk_entry_new ();
gtk_widget_show (appGUI->cal->day_entry);
- gtk_widget_set_size_request (appGUI->cal->day_entry, 50, -1);
gtk_entry_set_max_length (GTK_ENTRY(appGUI->cal->day_entry), 2);
g_signal_connect (G_OBJECT (appGUI->cal->day_entry), "key_press_event",
G_CALLBACK (day_key_press_cb), appGUI);
@@ -241,12 +239,11 @@
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
- gtk_widget_set_margin_left (label, 8);
- gtk_widget_set_margin_right (label, 8);
+ gtk_widget_set_margin_start (label, 8);
+ gtk_widget_set_margin_end (label, 8);
appGUI->cal->month_entry = gtk_entry_new ();
gtk_widget_show (appGUI->cal->month_entry);
- gtk_widget_set_size_request (appGUI->cal->month_entry, 50, -1);
gtk_entry_set_max_length (GTK_ENTRY(appGUI->cal->month_entry), 2);
g_signal_connect (G_OBJECT (appGUI->cal->month_entry), "key_press_event",
G_CALLBACK (month_key_press_cb), appGUI);
@@ -256,12 +253,11 @@
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
- gtk_widget_set_margin_left (label, 8);
- gtk_widget_set_margin_right (label, 8);
+ gtk_widget_set_margin_start (label, 8);
+ gtk_widget_set_margin_end (label, 8);
appGUI->cal->year_entry = gtk_entry_new ();
gtk_widget_show (appGUI->cal->year_entry);
- gtk_widget_set_size_request (appGUI->cal->year_entry, 50, -1);
gtk_entry_set_max_length (GTK_ENTRY(appGUI->cal->year_entry), 4);
g_signal_connect (G_OBJECT (appGUI->cal->year_entry), "key_press_event",
G_CALLBACK (year_key_press_cb), appGUI);
Modified: trunk/src/calendar_preferences_gui.c
===================================================================
--- trunk/src/calendar_preferences_gui.c 2016-11-15 18:44:46 UTC (rev 1107)
+++ trunk/src/calendar_preferences_gui.c 2017-02-07 19:12:46 UTC (rev 1108)
@@ -465,7 +465,7 @@
appGUI->opt->notes_font_entry = gtk_entry_new ();
gtk_entry_set_text (GTK_ENTRY (appGUI->opt->notes_font_entry), config.notes_font);
gtk_widget_set_can_focus(appGUI->opt->notes_font_entry, FALSE);
- gtk_widget_set_hexpand(appGUI->opt->notes_font_entry, TRUE);
+ gtk_widget_set_hexpand(appGUI->opt->notes_font_entry, TRUE);
gtk_grid_attach (GTK_GRID (table), appGUI->opt->notes_font_entry, 1, i, 5, 1);
sel3.config = config.notes_font;
@@ -480,27 +480,27 @@
i++;
appGUI->opt->enable_block_cursor_checkbutton = gtk_check_button_new_with_mnemonic (_("Enable block cursor"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (appGUI->opt->enable_block_cursor_checkbutton), !config.cursor_type);
- gtk_widget_set_hexpand(appGUI->opt->enable_block_cursor_checkbutton, TRUE);
+ gtk_widget_set_hexpand(appGUI->opt->enable_block_cursor_checkbutton, TRUE);
gtk_grid_attach (GTK_GRID (table), appGUI->opt->enable_block_cursor_checkbutton, 0, i, 5, 1);
g_signal_connect (G_OBJECT (appGUI->opt->enable_block_cursor_checkbutton), "toggled", G_CALLBACK (calendar_options_cb), appGUI);
i++;
label = utl_gui_create_label ("%s:", _("Cursor thickness"));
gtk_grid_attach (GTK_GRID (table), label, 0, i, 1, 2);
- gtk_widget_set_valign(label, GTK_ALIGN_START);
- gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
+ 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_widget_set_halign(label, GTK_ALIGN_START);
+ gtk_widget_set_halign(label, GTK_ALIGN_START);
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_widget_set_halign(label, GTK_ALIGN_END);
+ gtk_widget_set_halign(label, GTK_ALIGN_END);
appGUI->opt->cft_label_3 = label;
@@ -511,7 +511,7 @@
gtk_scale_set_draw_value (GTK_SCALE (appGUI->opt->cft_hscale), FALSE);
// FIXME no replacement gtk_range_set_update_policy (GTK_RANGE (appGUI->opt->cft_hscale), GTK_UPDATE_DISCONTINUOUS);
gtk_range_set_value (GTK_RANGE (appGUI->opt->cft_hscale), config.frame_cursor_thickness);
- gtk_widget_set_hexpand(appGUI->opt->cft_hscale, TRUE);
+ gtk_widget_set_hexpand(appGUI->opt->cft_hscale, TRUE);
gtk_grid_attach (GTK_GRID (table), appGUI->opt->cft_hscale, 1, i, 4, 1);
g_signal_connect (G_OBJECT (appGUI->opt->cft_hscale), "value-changed", G_CALLBACK (cursor_thickness_changed_cb), appGUI);
}
@@ -1517,7 +1517,7 @@
i = 0;
checkbutton = gtk_check_button_new_with_mnemonic (_("Week start on Monday"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.display_options & GUI_CALENDAR_WEEK_START_MONDAY);
- gtk_widget_set_hexpand(checkbutton, TRUE);
+ gtk_widget_set_hexpand(checkbutton, TRUE);
gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1);
g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (calendar_options_cb), appGUI);
appGUI->opt->week_start_monday_checkbutton = checkbutton;
@@ -1525,7 +1525,7 @@
i++;
checkbutton = gtk_check_button_new_with_mnemonic (_("Show day names"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.display_options & GUI_CALENDAR_SHOW_DAY_NAMES);
- gtk_widget_set_hexpand(checkbutton, TRUE);
+ gtk_widget_set_hexpand(checkbutton, TRUE);
gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1);
g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (calendar_options_cb), appGUI);
appGUI->opt->show_day_names_checkbutton = checkbutton;
@@ -1533,7 +1533,7 @@
i++;
checkbutton = gtk_check_button_new_with_mnemonic (_("No month change"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.display_options & GUI_CALENDAR_NO_MONTH_CHANGE);
- gtk_widget_set_hexpand(checkbutton, TRUE);
+ gtk_widget_set_hexpand(checkbutton, TRUE);
gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1);
g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (calendar_options_cb), appGUI);
appGUI->opt->no_month_change_checkbutton = checkbutton;
@@ -1541,7 +1541,7 @@
i++;
checkbutton = gtk_check_button_new_with_mnemonic (_("Show week numbers"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.display_options & GUI_CALENDAR_SHOW_WEEK_NUMBERS);
- gtk_widget_set_hexpand(checkbutton, TRUE);
+ gtk_widget_set_hexpand(checkbutton, TRUE);
gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1);
g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (calendar_options_cb), appGUI);
appGUI->opt->show_week_numbers_checkbutton = checkbutton;
@@ -1549,7 +1549,7 @@
i++;
checkbutton = gtk_check_button_new_with_mnemonic (_("Simple view in full-year calendar"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.fy_simple_view);
- gtk_widget_set_hexpand(checkbutton, TRUE);
+ gtk_widget_set_hexpand(checkbutton, TRUE);
gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1);
g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (calendar_options_cb), appGUI);
appGUI->opt->simple_view_in_fy_calendar_checkbutton = checkbutton;
@@ -1557,7 +1557,7 @@
i++;
checkbutton = gtk_check_button_new_with_mnemonic (_("Enable auxilary calendars"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.enable_auxilary_calendars);
- gtk_widget_set_hexpand(checkbutton, TRUE);
+ gtk_widget_set_hexpand(checkbutton, TRUE);
gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1);
g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (calendar_options_cb), appGUI);
appGUI->opt->enable_auxilary_calendars_checkbutton = checkbutton;
@@ -1565,7 +1565,7 @@
i++;
checkbutton = gtk_check_button_new_with_mnemonic (_("Strikethrough past day notes"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.strikethrough_past_notes);
- gtk_widget_set_hexpand(checkbutton, TRUE);
+ gtk_widget_set_hexpand(checkbutton, TRUE);
gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1);
g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (calendar_options_cb), appGUI);
appGUI->opt->strikethrough_past_notes_checkbutton = checkbutton;
@@ -1573,7 +1573,7 @@
i++;
checkbutton = gtk_check_button_new_with_mnemonic (_("Ascending sorting in day notes browser"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.ascending_sorting_in_day_notes_browser);
- gtk_widget_set_hexpand(checkbutton, TRUE);
+ gtk_widget_set_hexpand(checkbutton, TRUE);
gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1);
g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (calendar_options_cb), appGUI);
appGUI->opt->ascending_sorting_in_day_notes_checkbutton = checkbutton;
@@ -1582,7 +1582,7 @@
#ifdef HAVE_GTKSPELL
checkbutton = gtk_check_button_new_with_mnemonic (_("Enable spell checker in day notes"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.day_note_spell_checker);
- gtk_widget_set_hexpand(checkbutton, TRUE);
+ gtk_widget_set_hexpand(checkbutton, TRUE);
gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1);
g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (calendar_options_cb), appGUI);
appGUI->opt->spell_checker_in_day_notes_checkbutton = checkbutton;
@@ -1626,15 +1626,15 @@
i = 0;
checkbutton = gtk_check_button_new_with_mnemonic (_("Current time"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.di_show_current_time);
- gtk_widget_set_hexpand(checkbutton, TRUE);
+ gtk_widget_set_hexpand(checkbutton, TRUE);
gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1);
g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (day_info_panel_options_cb), appGUI);
appGUI->opt->di_show_current_time_checkbutton = checkbutton;
i++;
- gtk_widget_set_hexpand(checkbutton, TRUE);
+ gtk_widget_set_hexpand(checkbutton, TRUE);
checkbutton = gtk_check_button_new_with_mnemonic (_("Show seconds"));
- gtk_widget_set_margin_left(checkbutton, 16);
+ gtk_widget_set_margin_start(checkbutton, 16);
gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.di_show_current_time_seconds);
g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (day_info_panel_options_cb), appGUI);
@@ -1644,7 +1644,7 @@
i++;
checkbutton = gtk_check_button_new_with_mnemonic (_("Day number"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.di_show_day_number);
- gtk_widget_set_hexpand(checkbutton, TRUE);
+ gtk_widget_set_hexpand(checkbutton, TRUE);
gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1);
g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (day_info_panel_options_cb), appGUI);
appGUI->opt->di_show_day_number_checkbutton = checkbutton;
@@ -1660,7 +1660,7 @@
i++;
checkbutton = gtk_check_button_new_with_mnemonic (_("Marked days"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.di_show_marked_days);
- gtk_widget_set_hexpand(checkbutton, TRUE);
+ gtk_widget_set_hexpand(checkbutton, TRUE);
gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1);
g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (day_info_panel_options_cb), appGUI);
appGUI->opt->di_show_marked_days_checkbutton = checkbutton;
@@ -1668,7 +1668,7 @@
i++;
checkbutton = gtk_check_button_new_with_mnemonic (_("Week number"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.di_show_week_number);
- gtk_widget_set_hexpand(checkbutton, TRUE);
+ gtk_widget_set_hexpand(checkbutton, TRUE);
gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1);
g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (day_info_panel_options_cb), appGUI);
appGUI->opt->di_show_week_number_checkbutton = checkbutton;
@@ -1676,7 +1676,7 @@
i++;
checkbutton = gtk_check_button_new_with_mnemonic (_("Weekend days"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.di_show_weekend_days);
- gtk_widget_set_hexpand(checkbutton, TRUE);
+ gtk_widget_set_hexpand(checkbutton, TRUE);
gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1);
g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (day_info_panel_options_cb), appGUI);
appGUI->opt->di_show_weekend_days_checkbutton = checkbutton;
@@ -1684,7 +1684,7 @@
i++;
checkbutton = gtk_check_button_new_with_mnemonic (_("Day category"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.di_show_day_category);
- gtk_widget_set_hexpand(checkbutton, TRUE);
+ gtk_widget_set_hexpand(checkbutton, TRUE);
gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1);
g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (day_info_panel_options_cb), appGUI);
appGUI->opt->di_show_day_category_checkbutton = checkbutton;
@@ -1692,7 +1692,7 @@
i++;
checkbutton = gtk_check_button_new_with_mnemonic (_("Moon phase"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.di_show_moon_phase);
- gtk_widget_set_hexpand(checkbutton, TRUE);
+ gtk_widget_set_hexpand(checkbutton, TRUE);
gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1);
g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (day_info_panel_options_cb), appGUI);
appGUI->opt->di_show_moon_phase_checkbutton = checkbutton;
@@ -1700,7 +1700,7 @@
i++;
checkbutton = gtk_check_button_new_with_mnemonic (_("Day notes"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.di_show_notes);
- gtk_widget_set_hexpand(checkbutton, TRUE);
+ gtk_widget_set_hexpand(checkbutton, TRUE);
gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1);
g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (day_info_panel_options_cb), appGUI);
appGUI->opt->di_show_notes_checkbutton = checkbutton;
@@ -1708,7 +1708,7 @@
i++;
checkbutton = gtk_check_button_new_with_mnemonic (_("Zodiac sign"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), config.di_show_zodiac_sign);
- gtk_widget_set_hexpand(checkbutton, TRUE);
+ gtk_widget_set_hexpand(checkbutton, TRUE);
gtk_grid_attach (GTK_GRID (table), checkbutton, 0, i, 1, 1);
g_signal_connect (G_OBJECT (checkbutton), "toggled", G_CALLBACK (day_info_panel_options_cb), appGUI);
appGUI->opt->di_show_zodiac_sign_checkbutton = checkbutton;
Modified: trunk/src/calendar_print.c
===================================================================
--- trunk/src/calendar_print.c 2016-11-15 18:44:46 UTC (rev 1107)
+++ trunk/src/calendar_print.c 2017-02-07 19:12:46 UTC (rev 1108)
@@ -585,7 +585,7 @@
table_fonts = gtk_grid_new ();
gtk_widget_show (table_fonts);
- gtk_widget_set_margin_left(table_fonts, 12);
+ gtk_widget_set_margin_start(table_fonts, 12);
gtk_container_add (GTK_CONTAINER (frame1), table_fonts);
gtk_grid_set_row_spacing (GTK_GRID (table_fonts), 4);
gtk_grid_set_column_spacing (GTK_GRID (table_fonts), 4);
@@ -704,7 +704,7 @@
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox2);
- gtk_widget_set_margin_left(vbox2, 12);
+ gtk_widget_set_margin_start(vbox2, 12);
gtk_container_add (GTK_CONTAINER (frame2), vbox2);
appGUI->cal->print_tasks_checkbutton = gtk_check_button_new_with_mnemonic (_("Tasks"));
@@ -768,7 +768,7 @@
table5 = gtk_grid_new ();
gtk_widget_show (table5);
- gtk_widget_set_margin_left(table5, 12);
+ gtk_widget_set_margin_start(table5, 12);
gtk_container_add (GTK_CONTAINER (frame3), table5);
gtk_grid_set_row_spacing (GTK_GRID (table5), 4);
gtk_grid_set_column_spacing (GTK_GRID (table5), 4);
Modified: trunk/src/calendar_timeline.c
===================================================================
--- trunk/src/calendar_timeline.c 2016-11-15 18:44:46 UTC (rev 1107)
+++ trunk/src/calendar_timeline.c 2017-02-07 19:12:46 UTC (rev 1108)
@@ -182,7 +182,7 @@
gtk_container_set_border_width (GTK_CONTAINER (timeline_table), 4);
gtk_grid_set_column_spacing (GTK_GRID (timeline_table), 8);
gtk_grid_set_row_spacing (GTK_GRID (timeline_table), 4);
- gtk_widget_set_margin_left(timeline_table, 12);
+ gtk_widget_set_margin_start(timeline_table, 12);
gtk_widget_set_margin_bottom(timeline_table, 12);
gtk_container_add (GTK_CONTAINER (frame), timeline_table);
Modified: trunk/src/contacts.c
===================================================================
--- trunk/src/contacts.c 2016-11-15 18:44:46 UTC (rev 1107)
+++ trunk/src/contacts.c 2017-02-07 19:12:46 UTC (rev 1108)
@@ -822,7 +822,7 @@
vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox1);
- gtk_container_set_border_width (GTK_CONTAINER (vbox1), 8);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox1), 0);
g_snprintf(tmpbuf, BUFFER_SIZE, "<b>%s</b>", _("Contacts"));
gui_add_to_notebook (vbox1, tmpbuf, appGUI);
Modified: trunk/src/contacts_export.c
===================================================================
--- trunk/src/contacts_export.c 2016-11-15 18:44:46 UTC (rev 1107)
+++ trunk/src/contacts_export.c 2017-02-07 19:12:46 UTC (rev 1108)
@@ -900,7 +900,7 @@
vbox4 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox4);
- gtk_widget_set_margin_left(vbox4, 12);
+ gtk_widget_set_margin_start(vbox4, 12);
gtk_container_add (GTK_CONTAINER (frame), vbox4);
gtk_container_set_border_width (GTK_CONTAINER (vbox4), 8);
@@ -921,7 +921,7 @@
vbox4 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox4);
- gtk_widget_set_margin_left(vbox4, 12);
+ gtk_widget_set_margin_start(vbox4, 12);
gtk_container_add (GTK_CONTAINER (frame), vbox4);
gtk_container_set_border_width (GTK_CONTAINER (vbox4), 8);
@@ -954,7 +954,7 @@
scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_show (scrolledwindow);
- gtk_widget_set_margin_left(scrolledwindow, 12);
+ gtk_widget_set_margin_start(scrolledwindow, 12);
gtk_container_add (GTK_CONTAINER (frame), scrolledwindow);
gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow), 8);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -1025,7 +1025,7 @@
hbox3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
gtk_widget_show (hbox3);
- gtk_widget_set_margin_left(hbox3, 12);
+ gtk_widget_set_margin_start(hbox3, 12);
gtk_container_add (GTK_CONTAINER (frame), hbox3);
appGUI->cnt->output_file_entry = gtk_entry_new ();
Modified: trunk/src/contacts_import.c
===================================================================
--- trunk/src/contacts_import.c 2016-11-15 18:44:46 UTC (rev 1107)
+++ trunk/src/contacts_import.c 2017-02-07 19:12:46 UTC (rev 1108)
@@ -257,7 +257,7 @@
hbox4 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show (hbox4);
- gtk_widget_set_margin_left(hbox4, 12);
+ gtk_widget_set_margin_start(hbox4, 12);
gtk_container_add (GTK_CONTAINER (frame), hbox4);
appGUI->cnt->input_file_entry = gtk_entry_new ();
@@ -288,7 +288,7 @@
vbox4 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox4);
- gtk_widget_set_margin_left(vbox4, 12);
+ gtk_widget_set_margin_start(vbox4, 12);
gtk_container_add (GTK_CONTAINER (frame), vbox4);
hbox6 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
@@ -704,16 +704,16 @@
appGUI->cnt->n_records_label = gtk_label_new (tmpbuf);
gtk_widget_show (appGUI->cnt->n_records_label);
gtk_box_pack_end (GTK_BOX (hbox1), appGUI->cnt->n_records_label, FALSE, FALSE, 0);
- gtk_widget_set_margin_left (appGUI->cnt->n_records_label, 6);
- gtk_widget_set_margin_right (appGUI->cnt->n_records_label, 6);
+ gtk_widget_set_margin_start (appGUI->cnt->n_records_label, 6);
+ gtk_widget_set_margin_end (appGUI->cnt->n_records_label, 6);
g_snprintf(tmpbuf, BUFFER_SIZE, "<b>%s</b>", _("of"));
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_box_pack_end (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_widget_set_margin_left (label, 6);
- gtk_widget_set_margin_right (label, 6);
+ gtk_widget_set_margin_start (label, 6);
+ gtk_widget_set_margin_end (label, 6);
appGUI->cnt->current_record_spinbutton_adj = gtk_adjustment_new (1, 1, n_records, 1, 10, 0);
appGUI->cnt->current_record_spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (appGUI->cnt->current_record_spinbutton_adj), 1, 0);
@@ -727,23 +727,23 @@
gtk_widget_show (label);
gtk_box_pack_end (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_widget_set_margin_left (label, 6);
- gtk_widget_set_margin_right (label, 6);
+ gtk_widget_set_margin_start (label, 6);
+ gtk_widget_set_margin_end (label, 6);
g_snprintf(tmpbuf, BUFFER_SIZE, "<b>%s:</b>", _("Number fields per record"));
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_widget_set_margin_left (label, 6);
- gtk_widget_set_margin_right (label, 6);
+ gtk_widget_set_margin_start (label, 6);
+ gtk_widget_set_margin_end (label, 6);
g_snprintf(tmpbuf, BUFFER_SIZE, "%d", appGUI->cnt->max_fields);
max_fields_label = gtk_label_new (tmpbuf);
gtk_widget_show (max_fields_label);
gtk_box_pack_start (GTK_BOX (hbox1), max_fields_label, FALSE, FALSE, 0);
- gtk_widget_set_margin_left (max_fields_label, 6);
- gtk_widget_set_margin_right (max_fields_label, 6);
+ gtk_widget_set_margin_start (max_fields_label, 6);
+ gtk_widget_set_margin_end (max_fields_label, 6);
hseparator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_widget_show (hseparator);
@@ -812,8 +812,8 @@
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_widget_set_valign(label, GTK_ALIGN_START);
gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
- gtk_widget_set_margin_left (label, 8);
- gtk_widget_set_margin_right (label, 8);
+ gtk_widget_set_margin_start (label, 8);
+ gtk_widget_set_margin_end (label, 8);
g_snprintf(tmpbuf, BUFFER_SIZE, "<b>%s:</b>", _("Value"));
label = gtk_label_new (tmpbuf);
@@ -822,8 +822,8 @@
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_widget_set_valign(label, GTK_ALIGN_START);
gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
- gtk_widget_set_margin_left (label, 8);
- gtk_widget_set_margin_right (label, 8);
+ gtk_widget_set_margin_start (label, 8);
+ gtk_widget_set_margin_end (label, 8);
appGUI->cnt->value_labels[i] = gtk_label_new ("");
gtk_widget_show (appGUI->cnt->value_labels[i]);
@@ -832,8 +832,8 @@
gtk_widget_set_size_request (appGUI->cnt->value_labels[i], 50, -1);
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_widget_set_margin_left (appGUI->cnt->value_labels[i], 8);
- gtk_widget_set_margin_right (appGUI->cnt->value_labels[i], 8);
+ gtk_widget_set_margin_start (appGUI->cnt->value_labels[i], 8);
+ gtk_widget_set_margin_end (appGUI->cnt->value_labels[i], 8);
appGUI->cnt->field_type_comboboxes[i] = gtk_combo_box_text_new ();
gtk_widget_show (appGUI->cnt->field_type_comboboxes[i]);
Modified: trunk/src/contacts_items.c
===================================================================
--- trunk/src/contacts_items.c 2016-11-15 18:44:46 UTC (rev 1107)
+++ trunk/src/contacts_items.c 2017-02-07 19:12:46 UTC (rev 1108)
@@ -431,8 +431,8 @@
msg_selected.appGUI = msg->appGUI;
g_signal_connect (G_OBJECT (msg->appGUI->cnt->select_date_calendar), "day_selected_double_click",
G_CALLBACK (select_date_selected_cb), &msg_selected);
- gtk_widget_set_margin_left(msg->appGUI->cnt->select_date_calendar, 4);
- gtk_widget_set_margin_right(msg->appGUI->cnt->select_date_calendar, 4);
+ gtk_widget_set_margin_start(msg->appGUI->cnt->select_date_calendar, 4);
+ gtk_widget_set_margin_end(msg->appGUI->cnt->select_date_calendar, 4);
gtk_widget_set_margin_top(msg->appGUI->cnt->select_date_calendar, 4);
gtk_widget_set_margin_bottom(msg->appGUI->cnt->select_date_calendar, 4);
gtk_box_pack_start (GTK_BOX (vbox1), msg->appGUI->cnt->select_date_calendar, TRUE, TRUE, 0);
@@ -442,8 +442,8 @@
(config.display_options & GUI_CALENDAR_WEEK_START_MONDAY));
hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
- gtk_widget_set_margin_left(hbox1, 4);
- gtk_widget_set_margin_right(hbox1, 4);
+ gtk_widget_set_margin_start(hbox1, 4);
+ gtk_widget_set_margin_end(hbox1, 4);
gtk_widget_set_margin_top(hbox1, 4);
gtk_widget_set_margin_bottom(hbox1, 4);
gtk_widget_show (hbox1);
@@ -636,16 +636,16 @@
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_widget_set_valign(label, GTK_ALIGN_START);
gtk_widget_set_halign(label, GTK_ALIGN_CENTER);
- gtk_widget_set_margin_left (label, 5);
- gtk_widget_set_margin_right (label, 5);
+ gtk_widget_set_margin_start (label, 5);
+ gtk_widget_set_margin_end (label, 5);
pos++;
g_snprintf(tmpbuf, BUFFER_SIZE, "%s:", _("Group"));
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
- gtk_widget_set_margin_left(label, 4);
- gtk_widget_set_margin_right(label, 4);
+ gtk_widget_set_margin_start(label, 4);
+ gtk_widget_set_margin_end(label, 4);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1);
gtk_widget_set_halign(label, GTK_ALIGN_START);
@@ -668,8 +668,8 @@
g_snprintf(tmpbuf, BUFFER_SIZE, "%s:", gettext(appGUI->cnt->contact_fields_tags_name[i*2]));
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
- gtk_widget_set_margin_left(label, 4);
- gtk_widget_set_margin_right(label, 4);
+ gtk_widget_set_margin_start(label, 4);
+ gtk_widget_set_margin_end(label, 4);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1);
gtk_widget_set_halign(label, GTK_ALIGN_START);
@@ -718,8 +718,8 @@
g_snprintf(tmpbuf, BUFFER_SIZE, "%s:", gettext(appGUI->cnt->contact_fields_tags_name[COLUMN_NAME_DAY_DATE*2]));
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
- gtk_widget_set_margin_left(label, 4);
- gtk_widget_set_margin_right(label, 4);
+ gtk_widget_set_margin_start(label, 4);
+ gtk_widget_set_margin_end(label, 4);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1);
gtk_widget_set_halign(label, GTK_ALIGN_START);
@@ -746,8 +746,8 @@
g_snprintf(tmpbuf, BUFFER_SIZE, "%s:", gettext(appGUI->cnt->contact_fields_tags_name[COLUMN_PHOTO*2]));
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
- gtk_widget_set_margin_left(label, 4);
- gtk_widget_set_margin_right(label, 4);
+ gtk_widget_set_margin_start(label, 4);
+ gtk_widget_set_margin_end(label, 4);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1);
gtk_widget_set_halign(label, GTK_ALIGN_START);
@@ -785,8 +785,8 @@
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 5, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_widget_set_halign(label, GTK_ALIGN_START);
- gtk_widget_set_margin_left (label, 5);
- gtk_widget_set_margin_right (label, 5);
+ gtk_widget_set_margin_start (label, 5);
+ gtk_widget_set_margin_end (label, 5);
pos++;
@@ -795,8 +795,8 @@
g_snprintf(tmpbuf, BUFFER_SIZE, "%s:", gettext(contact_replace_tags[i-COLUMN_HOME_ADDRESS]));
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
- gtk_widget_set_margin_left(label, 4);
- gtk_widget_set_margin_right(label, 4);
+ gtk_widget_set_margin_start(label, 4);
+ gtk_widget_set_margin_end(label, 4);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1);
gtk_widget_set_halign(label, GTK_ALIGN_START);
@@ -820,8 +820,8 @@
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 5, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_widget_set_halign(label, GTK_ALIGN_START);
- gtk_widget_set_margin_left (label, 5);
- gtk_widget_set_margin_right (label, 5);
+ gtk_widget_set_margin_start (label, 5);
+ gtk_widget_set_margin_end (label, 5);
pos++;
@@ -834,8 +834,8 @@
}
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
- gtk_widget_set_margin_left(label, 4);
- gtk_widget_set_margin_right(label, 4);
+ gtk_widget_set_margin_start(label, 4);
+ gtk_widget_set_margin_end(label, 4);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1);
gtk_widget_set_halign(label, GTK_ALIGN_START);
@@ -859,8 +859,8 @@
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 5, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_widget_set_halign(label, GTK_ALIGN_START);
- gtk_widget_set_margin_left (label, 5);
- gtk_widget_set_margin_right (label, 5);
+ gtk_widget_set_margin_start (label, 5);
+ gtk_widget_set_margin_end (label, 5);
pos++;
@@ -868,8 +868,8 @@
g_snprintf(tmpbuf, BUFFER_SIZE, "%s:", gettext(appGUI->cnt->contact_fields_tags_name[i*2]));
label = gtk_label_new (tmpbuf);
- gtk_widget_set_margin_left(label, 4);
- gtk_widget_set_margin_right(label, 4);
+ gtk_widget_set_margin_start(label, 4);
+ gtk_widget_set_margin_end(label, 4);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1);
gtk_widget_set_halign(label, GTK_ALIGN_START);
@@ -916,8 +916,8 @@
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 5, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_widget_set_halign(label, GTK_ALIGN_START);
- gtk_widget_set_margin_left (label, 5);
- gtk_widget_set_margin_right (label, 5);
+ gtk_widget_set_margin_start (label, 5);
+ gtk_widget_set_margin_end (label, 5);
pos++;
@@ -926,8 +926,8 @@
g_snprintf(tmpbuf, BUFFER_SIZE, "%s:", gettext(appGUI->cnt->contact_fields_tags_name[i*2]));
label = gtk_label_new (tmpbuf);
gtk_widget_show (label);
- gtk_widget_set_margin_left(label, 4);
- gtk_widget_set_margin_right(label, 4);
+ gtk_widget_set_margin_start(label, 4);
+ gtk_widget_set_margin_end(label, 4);
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 2, 1);
gtk_widget_set_halign(label, GTK_ALIGN_START);
@@ -986,8 +986,8 @@
gtk_grid_attach (GTK_GRID (table), label, 0, pos, 5, 1);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_widget_set_halign(label, GTK_ALIGN_START);
- gtk_widget_set_margin_left (label, 5);
- gtk_widget_set_margin_right (label, 5);
+ gtk_widget_set_margin_start (label, 5);
+ gtk_widget_set_margin_end (label, 5);
pos++;
Modified: trunk/src/gui.c
===================================================================
--- trunk/src/gui.c 2016-11-15 18:44:46 UTC (rev 1107)
+++ trunk/src/gui.c 2017-02-07 19:12:46 UTC (rev 1108)
@@ -83,7 +83,7 @@
cal_write_notes (appGUI);
#ifdef TASKS_ENABLED
- store_task_columns_info (appGUI);
+ store_task_columns_info (appGUI);
write_tasks_entries (appGUI);
#endif /* TASKS_ENABLED */
#ifdef HAVE_LIBICAL
@@ -91,11 +91,11 @@
ics_calendar_refresh (appGUI);
#endif /* HAVE_LIBICAL */
#ifdef CONTACTS_ENABLED
- store_contact_columns_info (appGUI);
+ store_contact_columns_info (appGUI);
write_contacts_entries (appGUI);
#endif /* CONTACTS_ENABLED */
#ifdef NOTES_ENABLED
- store_note_columns_info (appGUI);
+ store_note_columns_info (appGUI);
write_notes_entries (appGUI);
#endif /* NOTES_ENABLED */
prefs_write_config (appGUI);
@@ -114,16 +114,16 @@
if (appGUI->window_visible == TRUE) {
gtk_status_icon_set_from_icon_name (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_NORMAL);
gtk_window_set_default_size (GTK_WINDOW(appGUI->main_window),
- config.window_size_x, config.window_size_y);
+ config.window_size_x, config.window_size_y);
gtk_window_move (GTK_WINDOW (appGUI->main_window), config.window_x, config.window_y);
gtk_widget_show (appGUI->main_window);
} else {
if (appGUI->calendar_only == FALSE) {
gui_save_all_data (appGUI);
- gtk_window_get_size (GTK_WINDOW(appGUI->main_window),
- &config.window_size_x, &config.window_size_y);
- gdk_window_get_root_origin (gtk_widget_get_window(appGUI->main_window),
- &config.window_x, &config.window_y);
+ gtk_window_get_size (GTK_WINDOW(appGUI->main_window),
+ &config.window_size_x, &config.window_size_y);
+ gdk_window_get_root_origin (gtk_widget_get_window(appGUI->main_window),
+ &config.window_x, &config.window_y);
}
gtk_widget_hide (appGUI->main_window);
}
@@ -134,13 +134,13 @@
void
gui_toggle_fullscreen (GUI *appGUI) {
- if (config.fullscreen == FALSE) {
- gtk_window_fullscreen (GTK_WINDOW(appGUI->main_window));
- config.fullscreen = TRUE;
- } else {
- gtk_window_unfullscreen (GTK_WINDOW(appGUI->main_window));
- config.fullscreen = FALSE;
- }
+ if (config.fullscreen == FALSE) {
+ gtk_window_fullscreen (GTK_WINDOW(appGUI->main_window));
+ config.fullscreen = TRUE;
+ } else {
+ gtk_window_unfullscreen (GTK_WINDOW(appGUI->main_window));
+ config.fullscreen = FALSE;
+ }
}
/*------------------------------------------------------------------------------*/
@@ -150,7 +150,7 @@
#ifdef NOTES_ENABLED
if (appGUI->nte->editor_active == TRUE) {
- editor_close_cb (NULL, appGUI);
+ editor_close_cb (NULL, appGUI);
}
#endif /* NOTES_ENABLED */
@@ -188,10 +188,10 @@
gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON(appGUI->cal->notes_button), FALSE);
if (appGUI->window_visible == TRUE) {
- if (!config.fullscreen) {
- gtk_window_get_size (GTK_WINDOW(appGUI->main_window),
- &config.window_size_x, &config.window_size_y);
- }
+ if (!config.fullscreen) {
+ gtk_window_get_size (GTK_WINDOW(appGUI->main_window),
+ &config.window_size_x, &config.window_size_y);
+ }
}
}
@@ -242,13 +242,13 @@
#ifdef NOTES_ENABLED
if (appGUI->current_tab == PAGE_NOTES) {
- gtk_widget_grab_focus (GTK_WIDGET(appGUI->nte->notes_find_entry));
- }
+ gtk_widget_grab_focus (GTK_WIDGET(appGUI->nte->notes_find_entry));
+ }
#endif /* NOTES_ENABLED */
#ifdef TASKS_ENABLED
if (appGUI->current_tab == PAGE_TASKS) {
- gtk_widget_grab_focus (GTK_WIDGET(appGUI->tsk->tasks_find_entry));
+ gtk_widget_grab_focus (GTK_WIDGET(appGUI->tsk->tasks_find_entry));
}
#endif /* TASKS_ENABLED */
@@ -341,7 +341,7 @@
}
gtk_notebook_set_current_page (GTK_NOTEBOOK (appGUI->notebook), appGUI->current_tab);
- gui_activate_find_fields (appGUI);
+ gui_activate_find_fields (appGUI);
}
@@ -350,20 +350,20 @@
static gint
get_visible_tabs (GUI *appGUI)
{
- gint i = 0;
+ gint i = 0;
- if (!config.hide_calendar) i++;
+ if (!config.hide_calendar) i++;
#ifdef TASKS_ENABLED
- if (!config.hide_tasks) i++;
+ if (!config.hide_tasks) i++;
#endif /* TASKS_ENABLED */
#ifdef CONTACTS_ENABLED
- if (!config.hide_contacts) i++;
+ if (!config.hide_contacts) i++;
#endif /* CONTACTS_ENABLED */
#ifdef NOTES_ENABLED
- if (!config.hide_notes) i++;
+ if (!config.hide_notes) i++;
#endif /* NOTES_ENABLED */
- return i;
+ return i;
}
/*------------------------------------------------------------------------------*/
@@ -371,30 +371,30 @@
static void
select_tab (gint tab, GUI *appGUI)
{
- gint i, n = 0;
+ gint i, n = 0;
- if (tab >= get_visible_tabs (appGUI)) return;
+ if (tab >= get_visible_tabs (appGUI)) return;
- for (i = PAGE_CALENDAR; i < NUMBER_OF_TABS; i++) {
+ for (i = PAGE_CALENDAR; i < NUMBER_OF_TABS; i++) {
- if (i == PAGE_CALENDAR && !config.hide_calendar) n++;
+ if (i == PAGE_CALENDAR && !config.hide_calendar) n++;
#ifdef TASKS_ENABLED
- if (i == PAGE_TASKS && !config.hide_tasks) n++;
+ if (i == PAGE_TASKS && !config.hide_tasks) n++;
#endif /* TASKS_ENABLED */
#ifdef CONTACTS_ENABLED
- if (i == PAGE_CONTACTS && !config.hide_contacts) n++;
+ if (i == PAGE_CONTACTS && !config.hide_contacts) n++;
#endif /* CONTACTS_ENABLED */
#ifdef NOTES_ENABLED
- if (i == PAGE_NOTES && !config.hide_notes) n++;
+ if (i == PAGE_NOTES && !config.hide_notes) n++;
#endif /* NOTES_ENABLED */
- if (n == tab + 1) {
- gtk_notebook_set_current_page (GTK_NOTEBOOK (appGUI->notebook), i);
- break;
- }
- }
+ if (n == tab + 1) {
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (appGUI->notebook), i);
+ break;
+ }
+ }
- gui_activate_find_fields (appGUI);
+ gui_activate_find_fields (appGUI);
}
/*------------------------------------------------------------------------------*/
@@ -423,8 +423,8 @@
gtk_widget_destroy(dialog);
g_free(tmpbuff);
} else if (appGUI->key_counter == 41) {
- appGUI->cal->datecal_bio = TRUE;
- }
+ appGUI->cal->datecal_bio = TRUE;
+ }
}
/*------------------------------------------------------------------------------*/
@@ -432,7 +432,7 @@
gint
key_press_cb (GtkWidget *widget, GdkEventKey *event, GUI *appGUI)
{
- gint page;
+ gint page;
page = gtk_notebook_get_current_page (GTK_NOTEBOOK(appGUI->notebook));
@@ -511,10 +511,10 @@
calendar_create_calc_window (appGUI);
return TRUE;
case GDK_KEY_a:
- if (!config.gui_layout) {
- gtk_expander_set_expanded (GTK_EXPANDER (appGUI->cal->aux_cal_expander),
- !gtk_expander_get_expanded (GTK_EXPANDER (appGUI->cal->aux_cal_expander)));
- }
+ if (!config.gui_layout) {
+ gtk_expander_set_expanded (GTK_EXPANDER (appGUI->cal->aux_cal_expander),
+ !gtk_expander_get_expanded (GTK_EXPANDER (appGUI->cal->aux_cal_expander)));
+ }
key_counter_add (5, appGUI);
return TRUE;
case GDK_KEY_b:
@@ -540,10 +540,10 @@
if (gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(appGUI->cal->notes_button)) == FALSE) {
if (config.enable_systray == TRUE && appGUI->no_tray == FALSE && appGUI->calendar_only == FALSE) {
gui_toggle_window_visibility (appGUI);
- }
- } else {
- gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(appGUI->cal->notes_button), FALSE);
- }
+ }
+ } else {
+ gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(appGUI->cal->notes_button), FALSE);
+ }
}
return TRUE;
case GDK_KEY_L...
[truncated message content] |
