Fill the filter by dialog with given start/end time instead of calculating earliest/latest date found. Fix 335237.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13677 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Andreas Köhler 2006-03-21 06:16:40 +00:00
parent 0e9df48e47
commit ebd82d625a
3 changed files with 19 additions and 6 deletions

View File

@ -1,3 +1,12 @@
2006-03-21 Andreas Köhler <andi5.py@gmx.net>
* src/gnome/gnc-plugin-page-register.c: Fill the filter by dialog
with given start/end time instead of calculating earliest/latest
date found. Fix 335237.
* src/gnome-utils/gnc-date-edit.c (gnc_date_edit_get_date): Avoid
needless second call to mktime.
2006-03-19 Chris Lyttle <chris@wilddev.net>
* NEWS: Added some text about the release.

View File

@ -871,16 +871,18 @@ gnc_date_edit_get_date_internal (GNCDateEdit *gde)
time_t
gnc_date_edit_get_date (GNCDateEdit *gde)
{
struct tm tm;
struct tm tm;
time_t retval;
g_return_val_if_fail (gde != NULL, 0);
g_return_val_if_fail (GNC_IS_DATE_EDIT (gde), 0);
tm = gnc_date_edit_get_date_internal (gde);
if (mktime (&tm) == -1)
return gnc_timet_get_today_start();
return mktime (&tm);
retval = mktime (&tm);
if (retval == -1)
return gnc_timet_get_today_start ();
return retval;
}
void

View File

@ -2188,8 +2188,10 @@ gnc_plugin_page_register_cmd_view_filter_by (GtkAction *action,
/* Start date info */
if (start_time == 0) {
button = glade_xml_get_widget(xml, "start_date_earliest");
time_val = xaccQueryGetEarliestDateFound (query);
sensitive = FALSE;
} else {
time_val = start_time;
if ((start_time >= gnc_timet_get_today_start()) &&
(start_time <= gnc_timet_get_today_end())) {
button = glade_xml_get_widget(xml, "start_date_today");
@ -2202,7 +2204,6 @@ gnc_plugin_page_register_cmd_view_filter_by (GtkAction *action,
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
start_date = glade_xml_get_widget(xml, "start_date");
gtk_widget_set_sensitive(GTK_WIDGET(start_date), sensitive);
time_val = xaccQueryGetEarliestDateFound (query);
gnc_date_edit_set_time(GNC_DATE_EDIT(start_date), time_val);
g_signal_connect (G_OBJECT (start_date), "date-changed",
G_CALLBACK (gnc_plugin_page_register_filter_gde_changed_cb),
@ -2213,8 +2214,10 @@ gnc_plugin_page_register_cmd_view_filter_by (GtkAction *action,
/* End date info */
if (end_time == 0) {
button = glade_xml_get_widget(xml, "end_date_latest");
time_val = xaccQueryGetLatestDateFound (query);
sensitive = FALSE;
} else {
time_val = end_time;
if ((end_time >= gnc_timet_get_today_start()) &&
(end_time <= gnc_timet_get_today_end())) {
button = glade_xml_get_widget(xml, "end_date_today");
@ -2227,7 +2230,6 @@ gnc_plugin_page_register_cmd_view_filter_by (GtkAction *action,
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
end_date = glade_xml_get_widget(xml, "end_date");
gtk_widget_set_sensitive(GTK_WIDGET(end_date), sensitive);
time_val = xaccQueryGetLatestDateFound (query);
gnc_date_edit_set_time(GNC_DATE_EDIT(end_date), time_val);
g_signal_connect (G_OBJECT (end_date), "date-changed",
G_CALLBACK (gnc_plugin_page_register_filter_gde_changed_cb),