Merge branch 'upstream'

[chaz/homebank] / src / ui-filter.h

diff --git a/src/ui-filter.h b/src/ui-filter.h
index a3a3922719bc065d6cf8d101f9464cdac38464fa..63fc6a01a71811aa57d1972c0ef98cf4a4384c27 100644 (file)
--- a/src/ui-filter.h
+++ b/src/ui-filter.h
@@ -1,5 +1,5 @@
 /*  HomeBank -- Free, easy, personal accounting for everyone.
- *  Copyright (C) 1995-2014 Maxime DOYEN
+ *  Copyright (C) 1995-2019 Maxime DOYEN
  *
  *  This file is part of HomeBank.
  *
@@ -36,35 +36,40 @@ struct ui_flt_manage_data
 {
        Filter          *filter;
 
-       GtkWidget       *notebook;
+       GtkWidget       *stack;
 
        GtkWidget       *CY_option[FILTER_MAX];
 
        GtkWidget       *PO_mindate, *PO_maxdate;
        GtkWidget       *CY_month, *NB_year;
 
-       GtkWidget       *CM_reconciled, *CM_reminded;
-
-       GtkWidget       *CM_forceadd, *CM_forcechg;
+       GtkWidget       *CM_reconciled;
+       GtkWidget   *CM_cleared;
+       GtkWidget       *LB_force, *GR_force;
+       
+       GtkWidget       *CM_forceadd, *CM_forcechg, *CM_forceremind;
 
        GtkWidget       *CM_paymode[NUM_PAYMODE_MAX];
 
        GtkWidget       *ST_minamount, *ST_maxamount;
 
        GtkWidget       *CM_exact;
-       GtkWidget       *ST_info, *ST_wording, *ST_tag;
+       GtkWidget       *ST_info, *ST_memo, *ST_tag;
 
        GtkWidget       *LV_acc, *BT_acc[MAX_BUTTON];
        GtkWidget       *LV_pay, *BT_pay[MAX_BUTTON];
        GtkWidget       *LV_cat, *BT_cat[MAX_BUTTON];
 
+       GtkWidget       *BT_expand, *BT_collapse;
+
+
        gboolean        show_account;
 
 
 };
 
 
-gint ui_flt_manage_dialog_new(Filter *filter, gboolean show_account);
+gint ui_flt_manage_dialog_new(GtkWindow *parentwindow, Filter *filter, gboolean show_account, gboolean txnmode);
 
 
 #endif