hsoft / moneyguru / changeset / c9eecee6ea20

Up to file-list cocoa/controllers/account/MGEntryTable.m:

@@ -218,13 +218,4 @@ http://www.hardcoded.net/licenses/hs_lic
+{
     [[self py] showTransferAccount];
+}
 /* Callbacks for python */
 - (void)refresh
+{
     [columns setColumn:@"balance" visible:[[self py] shouldShowBalanceColumn]];
     [super refresh];
+}
 @end

Up to file-list cocoa/mg_cocoa.py:

@@ -506,10 +506,6 @@ class PyEntryTable(PyTableWithDate):
     def moveRows_to_(self, rows, position):
         self.py.move(list(rows), position)
     @signature('c@:')
     def shouldShowBalanceColumn(self):
         return self.py.should_show_balance_column()
     def showTransferAccount(self):
         self.py.show_transfer_account()

Up to file-list cocoa/proxies/PyEntryTable.h:

@@ -15,7 +15,6 @@ http://www.hardcoded.net/licenses/hs_lic
 - (BOOL)isBalanceNegativeAtRow:(NSInteger)row;
 - (BOOL)isBoldAtRow:(NSInteger)row;
 - (void)moveRows:(NSArray *)rows to:(NSInteger)position;
 - (BOOL)shouldShowBalanceColumn;
 - (void)showTransferAccount;
 - (void)toggleReconciled;
 - (void)toggleReconciledAtRow:(NSInteger)row;

Up to file-list core/gui/entry_table.py:

@@ -79,6 +79,8 @@ class EntryTable(TransactionTableBase):
             total_increase += convert(row._increase)
             total_decrease += convert(row._decrease)
         self.footer = TotalRow(self, date_range.end, total_increase, total_decrease)
         balance_visible = account.is_balance_sheet_account()
         self.columns.set_column_visible('balance', balance_visible)
     def _restore_selection(self, previous_selection):
         if self.mainwindow.explicitly_selected_transactions:
@@ -133,10 +135,6 @@ class EntryTable(TransactionTableBase):
         else:
             self.selected_index = len(self) - 1
     def should_show_balance_column(self):
         account = self.mainwindow.shown_account
         return account is not None and self.mainwindow.shown_account.is_balance_sheet_account()
     def show_transfer_account(self):
         if not self.selected_entries:
             return

Up to file-list core/tests/gui/entry_table_test.py:

@@ -242,7 +242,7 @@ def test_show_transfer_account_entry_wit
     app.etable.show_transfer_account()
     app.check_current_pane(PaneType.Account, account_name='second')
     # Previously, this was based on selected_account rather than shown_account
-    assert not app.etable.should_show_balance_column()
+    assert not app.etable.columns.column_is_visible('balance')
 @with_app(app_one_entry)
 def test_show_transfer_account_then_add_entry(app):
@@ -627,7 +627,7 @@ def test_amount_of_selected_entry():
 def test_should_show_balance_column():
     def check(app, expected):
-        eq_(app.etable.should_show_balance_column(), expected)
+        eq_(app.etable.columns.column_is_visible('balance'), expected)
     # When a liability account is selected, we show the balance column.
     app = app_liability_account()

Up to file-list core/tests/main_test.py:

@@ -11,11 +11,12 @@ import os.path as op
 import sys
 from datetime import date
-from hsutil.testutil import eq_, assert_raises
+from py.test import config
 from hsutil import io
 from hscommon.currency import EUR
-from hsutil.testutil import Patcher, with_tmpdir
+from hsutil.testutil import Patcher
 from hsutil.testutil import eq_, assert_raises
 from .base import TestCase, CommonSetup, ApplicationGUI, TestApp, with_app
 from ..app import FIRST_WEEKDAY_PREFERENCE, AHEAD_MONTHS_PREFERENCE
@@ -101,11 +102,10 @@ def test_graph_yaxis():
     eq_(list(app.nwgraph.ytickmarks), range(0, 101, 20))
     eq_(list(app.nwgraph.ylabels), [dict(text=str(x), pos=x) for x in range(0, 101, 20)])
 @with_tmpdir
 def test_load_inexistant(tmppath):
 def test_load_inexistant():
     # Raise FileFormatError when filename doesn't exist
     app = TestApp()
-    filename = unicode(tmppath + 'does_not_exist.xml')
+    filename = unicode(config.mktemp(u'foo').join('does_not_exist.xml'))
     assert_raises(FileFormatError, app.doc.load_from_xml, filename)
 def test_load_invalid():
@@ -223,17 +223,6 @@ class OneEmptyAccountRangeOnOctober2007(
         assert not self.document.is_dirty()
 class OneGroup(TestCase):
     def setUp(self):
         self.create_instances()
         self.add_group()
     def test_should_show_balance_column(self):
         # When a group is selected, False is returned (not None).
         assert not self.etable.should_show_balance_column()
         assert isinstance(self.etable.should_show_balance_column(), bool)
 class ThreeAccountsAndOneEntry(TestCase, CommonSetup):
     def setUp(self):
         self.create_instances()
@@ -335,6 +324,7 @@ class OneEntryYearRange2007(TestCase):
         self.etable.save_edits()
         # Make sure that the values really made it down in the model by using a spanking new gui
         etable = EntryTable(self.etable_gui, self.aview)
         etable.columns.view = self.etable_gui
         etable.connect()
         etable.show()
         eq_(getattr(etable[0], column), value)

Up to file-list qt/controller/account/table.py:

@@ -93,10 +93,3 @@ class EntryTable(TableWithTransactions):
             if row.can_reconcile() and row.reconciled:
                 row.toggle_reconciled()
     #--- model --> view
     def refresh(self):
         TableWithTransactions.refresh(self)
         balanceColumn = self.ATTR2COLUMN['balance']
         shouldShow = self.model.should_show_balance_column()
         self._headerView.setSectionHidden(balanceColumn.index, not shouldShow)

commit 983:	c9eecee6ea20
parent 982:	908467b66659
branch:	default

hsoft / moneyguru (http://hardcoded.net/moneyguru)