Merge branch 'upstream'

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

diff --git a/src/ui-transaction.h b/src/ui-transaction.h
index fae7fc4b33ac77f11b61a13f1bed4da00c3ed23f..31d075909a91951ecb8c62fed54fd66dfe2a01ec 100644 (file)
--- a/src/ui-transaction.h
+++ b/src/ui-transaction.h
@@ -1,5 +1,5 @@
 /*  HomeBank -- Free, easy, personal accounting for everyone.
- *  Copyright (C) 1995-2014 Maxime DOYEN
+ *  Copyright (C) 1995-2016 Maxime DOYEN
  *
  *  This file is part of HomeBank.
  *
@@ -20,28 +20,30 @@
 #ifndef __HB_TRANSACTION_GTK_H__
 #define __HB_TRANSACTION_GTK_H__
 
+#include "ui-split.h"
+
 enum {
        HID_AMOUNT,
        MAX_HID_AMOUNT
 };
 
-enum {
-       TXN_SPLIT_NEW,
-       TXN_SPLIT_AMOUNT
-};
-
 
 struct deftransaction_data
 {
        GtkWidget       *window;
 
+       /* popover */
+       GtkWidget   *MB_template;
+       GtkTreeModel *model;
+       GtkTreeModelFilter *modelfilter;
+       GtkWidget   *LV_arc;
+       GtkWidget   *CM_showsched;
+       GtkWidget   *ST_search;
+
        GtkWidget       *PO_date;
        GtkWidget       *PO_pay;
-       GtkWidget       *PO_arc;
        GtkWidget       *ST_word;
-       GtkWidget       *ST_amount, *BT_amount, *BT_split;
-       GtkWidget       *CM_valid;
-       GtkWidget       *CM_remind;
+       GtkWidget       *ST_amount, *BT_split;
        GtkWidget       *CM_cheque;
 
        GtkWidget       *NU_mode;
@@ -50,44 +52,30 @@ struct deftransaction_data
        GtkWidget       *PO_acc;
        GtkWidget       *LB_accto, *PO_accto;
        GtkWidget       *ST_tags;
+       GtkWidget   *RA_status;
 
-       gint    action;
-       gint    accnum;
-       gint    type;
+       GtkWidget   *IB_warnsign;
+       
+       gint            action;
+       gint            accnum;
+       gint            type;
+       gboolean        showtemplate;
 
        Transaction *ope;
 
 };
 
-struct ui_txn_split_dialog_data
+enum
 {
-       GtkWidget       *dialog;
-       GtkWidget       *BT_rem[TXN_MAX_SPLIT];
-       GtkWidget       *BT_add[TXN_MAX_SPLIT];
-       GtkWidget       *PO_cat[TXN_MAX_SPLIT];
-       GtkWidget       *ST_amount[TXN_MAX_SPLIT];
-       GtkWidget       *ST_memo[TXN_MAX_SPLIT];
-
-       GtkWidget       *LB_sumsplit;
-       GtkWidget       *LB_remain;
-       GtkWidget       *LB_txnamount;
-
-       Transaction *ope;
-       gdouble         amount;
-       gdouble         sumsplit;
-       gdouble         remsplit;
-
-       gint            nbsplit;
-       gint            splittype;
-       gint            activeline;
-       
-       gulong          handler_id[TXN_MAX_SPLIT];
+       LST_DSPTPL_DATAS,
+       LST_DSPTPL_NAME,
+       NUM_LST_DSPTPL
 };
 
 
-
-GtkWidget *create_deftransaction_window (GtkWindow *parent, gint type);
+GtkWidget *create_deftransaction_window (GtkWindow *parent, gint type, gboolean postmode);
 void deftransaction_set_amount(GtkWidget *widget, gdouble amount);
+gint deftransaction_external_edit(GtkWindow *parent, Transaction *old_txn, Transaction *new_txn);
 void deftransaction_set_transaction(GtkWidget *widget, Transaction *ope);
 void deftransaction_get                        (GtkWidget *widget, gpointer user_data);
 void deftransaction_add                        (GtkWidget *widget, gpointer user_data);