- label = make_label(_("Filter Date"), 0.0, 0.5);
- gimp_label_set_attributes(GTK_LABEL(label), PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD, -1);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 3, row, row+1);
- //gtk_table_attach (GTK_TABLE (table), label, 0, 3, row, row+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
-
- row++;
- label = make_label("", 0.0, 0.5);
- gtk_misc_set_padding (GTK_MISC (label), HB_BOX_SPACING, 0);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
-
- label = make_label(_("_Option:"), 0, 0.5);
- //----------------------------------------- l, r, t, b
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
- data->CY_option[FILTER_DATE] = make_nainex(label);
- //gtk_table_attach_defaults (GTK_TABLE (table), data->CY_option[FILTER_DATE], 1, 2, row, row+1);
- gtk_table_attach (GTK_TABLE (table), data->CY_option[FILTER_DATE], 2, 3, row, row+1, (GtkAttachOptions) (GTK_FILL|GTK_EXPAND), (GtkAttachOptions) (0), 0, 0);
-
- row++;
- label = make_label(_("_From:"), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
- data->PO_mindate = gtk_dateentry_new();
- //data->PO_mindate = gtk_entry_new();
- //gtk_table_attach_defaults (GTK_TABLE (table), data->PO_mindate, 1, 2, row, row+1);
- gtk_table_attach (GTK_TABLE (table), data->PO_mindate, 2, 3, row, row+1, (GtkAttachOptions) (GTK_FILL|GTK_EXPAND), (GtkAttachOptions) (0), 0, 0);
-
- row++;
- label = make_label(_("_To:"), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
- data->PO_maxdate = gtk_dateentry_new();
- //data->PO_maxdate = gtk_entry_new();
- //gtk_table_attach_defaults (GTK_TABLE (table), data->PO_maxdate, 1, 2, row, row+1);
- gtk_table_attach (GTK_TABLE (table), data->PO_maxdate, 2, 3, row, row+1, (GtkAttachOptions) (GTK_FILL|GTK_EXPAND), (GtkAttachOptions) (0), 0, 0);
-
- row++;
- label = make_label(_("_Month:"), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
- data->CY_month = make_cycle(label, CYA_SELECT);
- gtk_table_attach (GTK_TABLE (table), data->CY_month, 2, 3, row, row+1, (GtkAttachOptions) (GTK_FILL|GTK_EXPAND), (GtkAttachOptions) (0), 0, 0);
-
- row++;
- label = make_label(_("_Year:"), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, row, row+1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
- data->NB_year = make_year(label);
- gtk_table_attach (GTK_TABLE (table), data->NB_year, 2, 3, row, row+1, (GtkAttachOptions) (GTK_FILL|GTK_EXPAND), (GtkAttachOptions) (0), 0, 0);
-
- gtk_container_set_border_width(GTK_CONTAINER(alignment), HB_BOX_SPACING);
-
- return alignment;
+ label = make_label_widget(_("_Option:"));
+ //----------------------------------------- l, r, t, b
+ gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
+ data->CY_option[FILTER_DATE] = make_nainex(label);
+ gtk_grid_attach (GTK_GRID (table), data->CY_option[FILTER_DATE], 2, row, 1, 1);
+
+ row++;
+ label = make_label (_("Dates"), 0, 0);
+ gimp_label_set_attributes (GTK_LABEL (label), PANGO_ATTR_SCALE, PANGO_SCALE_LARGE, -1);
+ gtk_grid_attach (GTK_GRID (table), label, 0, row, 3, 1);
+
+ row++;
+ label = make_label_widget(_("_From:"));
+ gtk_grid_attach (GTK_GRID (table), label, 0, row, 1, 1);
+ data->PO_mindate = gtk_date_entry_new();
+ gtk_grid_attach (GTK_GRID (table), data->PO_mindate, 1, row, 2, 1);
+
+ row++;
+ label = make_label_widget(_("_To:"));
+ gtk_grid_attach (GTK_GRID (table), label, 0, row, 1, 1);
+ data->PO_maxdate = gtk_date_entry_new();
+ gtk_grid_attach (GTK_GRID (table), data->PO_maxdate, 1, row, 2, 1);
+
+ row++;
+ label = make_label_widget(_("_Month:"));
+ gtk_grid_attach (GTK_GRID (table), label, 0, row, 1, 1);
+ data->CY_month = make_cycle(label, CYA_SELECT);
+ gtk_grid_attach (GTK_GRID (table), data->CY_month, 1, row, 2, 1);
+
+ row++;
+ label = make_label_widget(_("_Year:"));
+ gtk_grid_attach (GTK_GRID (table), label, 0, row, 1, 1);
+ data->NB_year = make_year(label);
+ gtk_grid_attach (GTK_GRID (table), data->NB_year, 1, row, 2, 1);
+
+ return table;