apply patch to HEAD

1 files changed, 13 insertions, 2 deletions

diff --git a/noncore/apps/checkbook/cfg.cpp b/noncore/apps/checkbook/cfg.cpp
index 1e0ec5c..0d5d9ed 100644
--- a/noncore/apps/checkbook/cfg.cpp
+++ b/noncore/apps/checkbook/cfg.cpp
@@ -40,23 +40,22 @@
 Cfg::Cfg()
 {
     _currencySymbol="$";
     _showLocks=FALSE;
     _showBalances=FALSE;
     _pCategories=new CategoryList();
+    _bDirty=false;
 }
 
 // --- readStringList ---------------------------------------------------------
 // Reads the entries for the control from a configuration file and returns
 // them in a StringList. Later this list can be used to create the control. It
 // is assumed, that the group is already set. Key is used to enumerate the
 // entries.
 void Cfg::readStringList(Config &cfg, const char *sKey, QStringList &lst)
 {
-qDebug( "%s", sKey );
-
     QString sEntry;
     int iCount;
 
     // read count of elements
     sEntry.sprintf("%s_Count", sKey);
     iCount=cfg.readNumEntry(sEntry, 0);
@@ -83,12 +82,13 @@ void Cfg::readConfig(Config &config)
 	_currencySymbol = config.readEntry( "CurrencySymbol", "$" );
 	_showLocks = config.readBoolEntry( "ShowLocks", FALSE );
 	_showBalances = config.readBoolEntry( "ShowBalances", FALSE );
     _openLastBook = config.readBoolEntry( "OpenLastBook", FALSE );
     _sLastBook = config.readEntry("LastBook", "");
     _showLastTab = config.readBoolEntry( "ShowLastTab", FALSE );
+    _bSavePayees = config.readBoolEntry( "SavePayees", FALSE );
 
     // Account types
     readStringList(config, "AccType", _AccountTypes);
     if( _AccountTypes.isEmpty() ) {
         _AccountTypes+= (const char *)QWidget::tr("Savings");
         _AccountTypes+= (const char *)QWidget::tr("Checking");
@@ -97,12 +97,15 @@ void Cfg::readConfig(Config &config)
 	    _AccountTypes+= (const char *)QWidget::tr("Mutual fund");
 	    _AccountTypes+= (const char *)QWidget::tr("Other");
         writeStringList(config, "AccType", _AccountTypes);
         config.write();
     }
 
+    // Payees
+    readStringList(config, "Payee", _Payees);
+
     // Read Categories
     QStringList lst;
     readStringList(config, "Category", lst);
     if( lst.isEmpty() ) {
         QString type=QWidget::tr("Expense");
         lst += QWidget::tr( "Automobile" )+";"+type;
@@ -128,12 +131,15 @@ void Cfg::readConfig(Config &config)
         setCategories(lst);
         writeStringList(config, "Category", lst);
         config.write();
     } else {
         setCategories(lst);
     }
+
+    // not dirty
+    _bDirty=false;
 }
 
 
 // --- writeStringList --------------------------------------------------------
 // Writes the entries in the control in a configuration file. It is assumed,
 // that the group is already set. Key is used to enumerate the entries
@@ -163,22 +169,27 @@ void Cfg::writeConfig(Config &config)
     config.writeEntry( "CurrencySymbol", _currencySymbol );
     config.writeEntry( "ShowLocks", _showLocks );
     config.writeEntry( "ShowBalances", _showBalances );
     config.writeEntry( "OpenLastBook", _openLastBook );
     config.writeEntry( "LastBook", _sLastBook );
     config.writeEntry( "ShowLastTab", _showLastTab );
+    config.writeEntry( "SavePayees", _bSavePayees );
 
     // write account types
     writeStringList(config, "AccType", _AccountTypes);
 
+    // write payees
+    writeStringList(config, "Payee", _Payees);
+
     // write categories
     QStringList lst=getCategories();
     writeStringList(config, "Category", lst );
 
     // commit write
     config.write();
+    _bDirty=false;
 }
 
 
 // --- getCategories ----------------------------------------------------------
 QStringList Cfg::getCategories()
 {