IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2026-09-03 20:53:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cutecash: Add empty line for entering a new transaction in the register. Doesn't yet store data, though.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18929 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming
2010-03-18 22:07:02 +00:00
parent a58c3c0690
commit 4b4fed8b4c
4 changed files with 336 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gnc/Cmd.cpp
+22
View File
@@ -227,6 +227,28 @@ QUndoCommand* destroyTransaction(Transaction& t)
}
QUndoCommand* setSplitReconcile(TmpSplit& t, char newValue)
{
return 0;
}
QUndoCommand* setTransactionNum(TmpTransaction& t, const QString& newValue)
{
return 0;
}
QUndoCommand* setTransactionDescription(TmpTransaction& t, const QString& newValue)
{
return 0;
}
QUndoCommand* setTransactionDate(TmpTransaction& t, const QDate& newValue)
{
return 0;
}
QUndoCommand* setSplitValueAndAmount(TmpSplit& t, const Numeric& newValue)
{
return 0;
}
} // END namespace cmd
src/gnc/Cmd.hpp
+13 -6
View File
@@ -30,8 +30,10 @@
namespace gnc
{
class Split;
class Account;
class Split;
class TmpSplit;
class TmpTransaction;
class Transaction;
/** This is a templated implementation of a QUndoCommand class. This
@@ -156,16 +158,21 @@ namespace cmd
// members. Just create one of those, add it to a QUndoStack, and
// magically the values will change with undo/redo back and
// forth. Spooky, IMHO.
QUndoCommand* setSplitMemo(Split& split, const QString& newValue);
QUndoCommand* setSplitAction(Split& t, const QString& newValue);
// QUndoCommand* setSplitMemo(Split& split, const QString& newValue);
// QUndoCommand* setSplitAction(Split& t, const QString& newValue);
QUndoCommand* setSplitReconcile(Split& t, char newValue);
QUndoCommand* setSplitAmount(Split& t, const Numeric& newValue);
QUndoCommand* setSplitValue(Split& t, const Numeric& newValue);
QUndoCommand* setSplitReconcile(TmpSplit& t, char newValue);
// QUndoCommand* setSplitAmount(Split& t, const Numeric& newValue);
// QUndoCommand* setSplitValue(Split& t, const Numeric& newValue);
QUndoCommand* setTransactionNum(Transaction& t, const QString& newValue);
QUndoCommand* setTransactionNum(TmpTransaction& t, const QString& newValue);
QUndoCommand* setTransactionDescription(Transaction& t, const QString& newValue);
QUndoCommand* setTransactionNotes(Transaction& t, const QString& newValue);
QUndoCommand* setTransactionDescription(TmpTransaction& t, const QString& newValue);
// QUndoCommand* setTransactionNotes(Transaction& t, const QString& newValue);
QUndoCommand* setTransactionDate(Transaction& t, const QDate& newValue);
QUndoCommand* setTransactionDate(TmpTransaction& t, const QDate& newValue);
QUndoCommand* setSplitValueAndAmount(Split& t, const Numeric& newValue);
QUndoCommand* setSplitValueAndAmount(TmpSplit& t, const Numeric& newValue);
QUndoCommand* destroyTransaction(Transaction& t);
} // END namespace cmd
src/gnc/SplitListModel.cpp
+294 -91
View File
@@ -44,8 +44,10 @@ SplitListModel::SplitListModel(const Account& acc, QUndoStack* undoStack, QObjec
, m_undoStack(undoStack)
, m_eventWrapper(*this, &SplitListModel::transactionEvent, GNC_ID_TRANS)
, m_eventWrapperAccount(*this, &SplitListModel::accountEvent, GNC_ID_ACCOUNT)
, m_enableNewTransaction(true)
{
recreateCache();
recreateTmpTrans();
}
void SplitListModel::recreateCache()
@@ -66,6 +68,14 @@ void SplitListModel::recreateCache()
reset();
}
void SplitListModel::recreateTmpTrans()
{
m_tmpTransaction.clear();
m_tmpTransaction.push_back(TmpSplit(m_account.get()));
m_tmpTransaction.setCommodity(m_account.getCommodity());
m_tmpTransaction.setDatePosted(QDate::currentDate());
}
SplitListModel::~SplitListModel()
{
}
@@ -74,9 +84,12 @@ QModelIndex SplitListModel::index(int row, int column,
const QModelIndex &parent) const
{
//qDebug() << "index(), " << row << column << parent;
if (!hasIndex(row, column, parent) || row >= m_list.size())
if (!hasIndex(row, column, parent) || row >= rowCount())
return QModelIndex();
if (m_enableNewTransaction && row == m_list.size())
return createIndex(row, column, (void*)NULL);
Split childItem = m_list.at(row);
if (childItem.get())
{
@@ -87,16 +100,8 @@ QModelIndex SplitListModel::index(int row, int column,
return QModelIndex();
}
bool SplitListModel::insertRows(int position, int rows, const QModelIndex &index)
{
beginInsertRows(QModelIndex(), position, position + rows - 1);
endInsertRows();
return true;
}
bool SplitListModel::removeRows(int position, int rows, const QModelIndex &index)
{
beginRemoveRows(QModelIndex(), position, position+rows-1);
for (int row = position; row < position + rows; ++row)
{
Split s(m_list.at(row));
@@ -106,10 +111,16 @@ bool SplitListModel::removeRows(int position, int rows, const QModelIndex &index
QUndoCommand* cmd = cmd::destroyTransaction(t);
m_undoStack->push(cmd);
}
endRemoveRows();
// No beginInsertRows/endInsertRows because reset() is called in
// recreateCache() anyway.
return true;
}
int SplitListModel::rowCount(const QModelIndex& parent) const
{
return m_list.size() + (m_enableNewTransaction ? 1 : 0);
}
int SplitListModel::columnCount(const QModelIndex& parent) const
{
//qDebug() << "columnCount()" << parent;
@@ -148,95 +159,187 @@ QVariant SplitListModel::data(const QModelIndex& index, int role) const
if (!index.isValid())
return QVariant();
Split split(static_cast< ::Split*>(index.internalPointer()));
Transaction trans(split.getParent());
Numeric amount = split.getValue(); // Alternatively: xaccSplitConvertAmount(split.get(), split.getAccount().get());
PrintAmountInfo printInfo(split.get(), false);
switch (index.column())
if (m_enableNewTransaction && index.row() == m_list.size())
{
case 0:
switch (role)
// Special case: We are in the last row which represents the
// newly entered txn.
TmpSplit split(m_tmpTransaction.getSplits().front());
const TmpTransaction& trans = m_tmpTransaction;
Numeric amount = split.getValue();
PrintAmountInfo printInfo(m_account, false);
switch (index.column())
{
case Qt::DisplayRole:
case Qt::EditRole:
return trans.getDatePosted();
case 0:
switch (role)
{
case Qt::DisplayRole:
case Qt::EditRole:
return trans.getDatePosted();
default:
return QVariant();
}
case 1:
switch (role)
{
case Qt::DisplayRole:
case Qt::EditRole:
return trans.getNum();
default:
return QVariant();
}
case 2:
switch (role)
{
case Qt::DisplayRole:
case Qt::EditRole:
return trans.getDescription();
default:
return QVariant();
}
case 3:
switch (role)
{
// case Qt::DisplayRole:
// return split.getCorrAccountFullName();
default:
return QVariant();
}
case 4:
switch (role)
{
case Qt::DisplayRole:
case Qt::EditRole:
return QString::fromUtf8(gnc_get_reconcile_str(split.getReconcile()));
default:
return QVariant();
}
case 5:
switch (role)
{
case Qt::DisplayRole:
case Qt::EditRole:
if (amount.positive_p())
return amount.printAmount(printInfo);
else
return QString();
default:
return QVariant();
}
case 6:
switch (role)
{
case Qt::DisplayRole:
case Qt::EditRole:
if (amount.positive_p())
return QString();
else
return amount.neg().printAmount(printInfo);
default:
return QVariant();
}
case 7:
default:
return QVariant();
}
case 1:
switch (role)
}
else
{
// Normal case: We are in a row that displays a normal
// transaction and split
Split split(static_cast< ::Split*>(index.internalPointer()));
Transaction trans(split.getParent());
Numeric amount = split.getValue(); // Alternatively: xaccSplitConvertAmount(split.get(), split.getAccount().get());
PrintAmountInfo printInfo(split, false);
switch (index.column())
{
case Qt::DisplayRole:
case Qt::EditRole:
return trans.getNum();
case 0:
switch (role)
{
case Qt::DisplayRole:
case Qt::EditRole:
return trans.getDatePosted();
default:
return QVariant();
}
case 1:
switch (role)
{
case Qt::DisplayRole:
case Qt::EditRole:
return trans.getNum();
default:
return QVariant();
}
case 2:
switch (role)
{
case Qt::DisplayRole:
case Qt::EditRole:
return trans.getDescription();
default:
return QVariant();
}
case 3:
switch (role)
{
case Qt::DisplayRole:
return split.getCorrAccountFullName();
default:
return QVariant();
}
case 4:
switch (role)
{
case Qt::DisplayRole:
case Qt::EditRole:
return QString::fromUtf8(gnc_get_reconcile_str(split.getReconcile()));
default:
return QVariant();
}
case 5:
switch (role)
{
case Qt::DisplayRole:
case Qt::EditRole:
if (amount.positive_p())
return amount.printAmount(printInfo);
else
return QString();
default:
return QVariant();
}
case 6:
switch (role)
{
case Qt::DisplayRole:
case Qt::EditRole:
if (amount.positive_p())
return QString();
else
return amount.neg().printAmount(printInfo);
default:
return QVariant();
}
case 7:
switch (role)
{
case Qt::DisplayRole:
return split.getBalance().printAmount(printInfo);
case Qt::ForegroundRole:
return split.getBalance().negative_p()
? QBrush(Qt::red)
: QBrush();
default:
return QVariant();
}
default:
return QVariant();
}
case 2:
switch (role)
{
case Qt::DisplayRole:
case Qt::EditRole:
return trans.getDescription();
default:
return QVariant();
}
case 3:
switch (role)
{
case Qt::DisplayRole:
return split.getCorrAccountFullName();
default:
return QVariant();
}
case 4:
switch (role)
{
case Qt::DisplayRole:
case Qt::EditRole:
return QString::fromUtf8(gnc_get_reconcile_str(split.getReconcile()));
default:
return QVariant();
}
case 5:
switch (role)
{
case Qt::DisplayRole:
case Qt::EditRole:
if (amount.positive_p())
return amount.printAmount(printInfo);
else
return QString();
default:
return QVariant();
}
case 6:
switch (role)
{
case Qt::DisplayRole:
case Qt::EditRole:
if (amount.positive_p())
return QString();
else
return amount.neg().printAmount(printInfo);
default:
return QVariant();
}
case 7:
switch (role)
{
case Qt::DisplayRole:
return split.getBalance().printAmount(printInfo);
case Qt::ForegroundRole:
return split.getBalance().negative_p()
? QBrush(Qt::red)
: QBrush();
default:
return QVariant();
}
default:
return QVariant();
}
}
@@ -275,9 +378,109 @@ QVariant SplitListModel::headerData(int section, Qt::Orientation orientation, in
bool SplitListModel::setData(const QModelIndex &index, const QVariant &value, int role)
{
if (!index.isValid() || role != Qt::EditRole)
return false;
QUndoCommand* cmd = NULL;
if (index.isValid() && role == Qt::EditRole)
if (m_enableNewTransaction && index.row() == m_list.size())
{
// Special case: We are in the last row which represents the
// newly entered txn.
TmpTransaction& trans = m_tmpTransaction;
TmpSplit& split = trans.getSplits().front();
// "Editing" is done by creating a Cmd-object and adding it to
// the undo stack. That's in fact all that was needed to
// create an *undoable* edit of this data cell. Seems almost
// spooky, doesn't it?
switch (index.column())
{
case 0:
{
QDate date = value.toDate();
if (date.isValid())
{
cmd = cmd::setTransactionDate(trans, date);
}
break;
}
case 1:
cmd = cmd::setTransactionNum(trans, value.toString());
break;
case 2:
cmd = cmd::setTransactionDescription(trans, value.toString());
break;
case 4:
{
QString str(value.toString());
if (str.size() > 0)
{
char recn = str[0].toLatin1();
switch (recn)
{
case NREC:
case CREC:
case YREC:
case FREC:
case VREC:
cmd = cmd::setSplitReconcile(split, recn);
break;
default:
qDebug() << "Unknown reconcile string:" << str;
}
}
break;
}
case 5:
case 6:
{
QString str(value.toString().simplified());
Numeric n;
QString errmsg = n.parse(str);
if (errmsg.isEmpty())
{
qDebug() << "Does setting numeric work? numeric=" << n.to_string();
if (index.column() == 6)
n = n.neg();
// Check whether we have the simple case here
if (trans.getSplits().size() != 1)
{
QMessageBox::warning(NULL, tr("Unimplemented"),
tr("Sorry, but editing a transaction with more than two splits (here: %1) is not yet implemented.").arg(trans.getSplits().size()));
}
else
{
Commodity originCommodity = m_account.getCommodity();
Commodity transCommodity = trans.getCommodity();
if (originCommodity != transCommodity)
{
QMessageBox::warning(NULL, tr("Unimplemented"),
tr("Sorry, but editing a transaction with different accounts is not yet implemented."));
}
else
{
// This is the really simple case which we can
// handle now.
cmd = cmd::setSplitValueAndAmount(split, n);
}
}
}
else
{
qDebug() << "Cannot convert this string to gnc_numeric:" << str;
}
break;
}
default:
break;
}
}
else
{
// Normal case: We are in a row that displays a normal
// transaction and split
Split split(static_cast< ::Split*>(index.internalPointer()));
Transaction trans(split.getParent());
src/gnc/SplitListModel.hpp
+7 -2
View File
@@ -26,6 +26,7 @@
#include "gnc/Account.hpp"
#include "gnc/Split.hpp"
#include "gnc/QofEventWrapper.hpp"
#include "gnc/Transaction.hpp"
extern "C"
{
@@ -49,7 +50,7 @@ public:
~SplitListModel();
QModelIndex parent(const QModelIndex &index) const { return QModelIndex(); }
int rowCount(const QModelIndex& parent = QModelIndex()) const { return m_list.size(); }
int rowCount(const QModelIndex& parent = QModelIndex()) const;
int columnCount(const QModelIndex& parent = QModelIndex()) const;
QModelIndex index(int row, int column,
const QModelIndex &parent = QModelIndex()) const;
@@ -59,7 +60,6 @@ public:
QVariant headerData(int section, Qt::Orientation orientation, int role) const;
bool setData(const QModelIndex &index, const QVariant &value, int role);
bool insertRows(int position, int rows, const QModelIndex &index = QModelIndex());
bool removeRows(int position, int rows, const QModelIndex &index = QModelIndex());
public slots:
@@ -68,6 +68,8 @@ public slots:
private:
void recreateCache();
void recreateTmpTrans();
protected:
Account m_account;
SplitQList m_list;
@@ -78,6 +80,9 @@ protected:
/** The wrapper for receiving events from gnc. */
QofEventWrapper<SplitListModel, ::Transaction*> m_eventWrapper;
QofEventWrapper<SplitListModel, ::Account*> m_eventWrapperAccount;
bool m_enableNewTransaction;
TmpTransaction m_tmpTransaction;
};
} // END namespace gnc