Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

search-view: remove end date from grid

Browse Source
This commit is contained in:
Georges Basile Stavracas Neto
2015-01-09 08:36:14 -05:00
committed by Erick Pérez Castellanos
parent 4195e294ab
commit 5fc4c25002
1 changed files with 24 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-search-view.c
+24 -47
View File
@@ -121,28 +121,28 @@ make_grid_for_event (GcalSearchView *view,
gchar *text; gchar *text;
GtkWidget *start_date; GtkWidget *start_date;
GtkWidget *end_date;
GtkWidget *start_time; GtkWidget *start_time;
GtkWidget *end_time;
icaltimetype *start, *end; icaltimetype *start;
gboolean all_day;
priv = gcal_search_view_get_instance_private (view); priv = gcal_search_view_get_instance_private (view);
start = gcal_event_widget_get_date (event); start = gcal_event_widget_get_date (event);
end = gcal_event_widget_get_end_date (event); all_day = gcal_event_widget_get_all_day (event);
/* event widget properties */ /* event widget properties */
gtk_widget_set_margin_start (GTK_WIDGET (event), 96);
gtk_widget_set_margin_end (GTK_WIDGET (event), 96);
gtk_widget_set_valign (GTK_WIDGET (event), GTK_ALIGN_CENTER); gtk_widget_set_valign (GTK_WIDGET (event), GTK_ALIGN_CENTER);
gtk_widget_set_hexpand (GTK_WIDGET (event), TRUE); gtk_widget_set_hexpand (GTK_WIDGET (event), TRUE);
/* grid */ /* grid */
grid = gtk_grid_new (); grid = gtk_grid_new ();
gtk_grid_set_column_spacing (GTK_GRID (grid), 6); g_object_set (grid,
gtk_grid_set_row_spacing (GTK_GRID (grid), 6); "column-spacing", 6,
gtk_container_set_border_width (GTK_CONTAINER (grid), 6); "column-homogeneous", TRUE,
gtk_widget_set_hexpand (grid, TRUE); "border-width", 6,
"margin-start", 12,
"margin-end", 12,
"hexpand", TRUE, NULL);
/* start date & time */ /* start date & time */
datetime = g_date_time_new_local (start->year, start->month, start->day, start->hour, start->minute, start->second); datetime = g_date_time_new_local (start->year, start->month, start->day, start->hour, start->minute, start->second);
@@ -150,47 +150,24 @@ make_grid_for_event (GcalSearchView *view,
start_date = gtk_label_new (text); start_date = gtk_label_new (text);
g_free (text); g_free (text);
text = g_date_time_format (datetime, priv->time_mask); if (!all_day)
start_time = gtk_label_new (text); {
g_free (text); text = g_date_time_format (datetime, priv->time_mask);
start_time = gtk_label_new (text);
g_free (text);
}
else
{
start_time = gtk_label_new (NULL);
}
g_date_time_unref (datetime); g_date_time_unref (datetime);
g_free (start); g_free (start);
/* end date & time */ /* labels: 20%; event widget: 80% */
if (end != NULL) gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (event), 2, 0, 10, 1);
{ gtk_grid_attach (GTK_GRID (grid), start_date, 0, 0, 1, 1);
datetime = g_date_time_new_local (end->year, end->month, end->day, end->hour, end->minute, end->second); gtk_grid_attach (GTK_GRID (grid), start_time, 1, 0, 1, 1);
text = g_date_time_format (datetime, priv->date_mask);
end_date = gtk_label_new (text);
g_free (text);
text = g_date_time_format (datetime, priv->time_mask);
end_time = gtk_label_new (text);
g_free (text);
g_date_time_unref (datetime);
g_free (end);
}
gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (event), 2, 0, 1, 2);
if (end != NULL)
{
gtk_grid_attach (GTK_GRID (grid), start_date, 0, 0, 1, 1);
gtk_grid_attach (GTK_GRID (grid), start_time, 1, 0, 1, 1);
gtk_grid_attach (GTK_GRID (grid), end_date, 0, 1, 1, 1);
gtk_grid_attach (GTK_GRID (grid), end_time, 1, 1, 1, 1);
gtk_widget_show (end_date);
gtk_widget_show (end_time);
}
else
{
gtk_grid_attach (GTK_GRID (grid), start_date, 0, 0, 1, 2);
gtk_grid_attach (GTK_GRID (grid), start_time, 1, 0, 1, 2);
}
gtk_widget_show (start_date); gtk_widget_show (start_date);
gtk_widget_show (start_time); gtk_widget_show (start_time);
gtk_widget_show (grid); gtk_widget_show (grid);