[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/office/skrooge
From: Stephane Mankowski <stephane () mankowski ! fr>
Date: 2011-02-12 22:01:28
Message-ID: 20110212220128.20FC7AC8D0 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1220091 by smankowski:
feature: Some fields are directly editable in view
M +1 -0 CHANGELOG
M +4 -1 skgbankgui/skgobjectmodel.cpp
M +14 -7 skgbankmodeler/skgdocumentbank.cpp
--- trunk/extragear/office/skrooge/CHANGELOG #1220090:1220091
@@ -37,6 +37,7 @@
*New feature: Possibility to merge units by using massive update on name of units
*New feature: Possibility to merge categories by using massive update on name of \
categories
*New feature: Timeline in reports
+ *New feature: Some fields are directly editable in view
-- maintainer Stephane MANKOWSKI <stephane@mankowski.fr> xxx
--- trunk/extragear/office/skrooge/skgbankgui/skgobjectmodel.cpp #1220090:1220091
@@ -731,7 +731,7 @@
SKGMainPanel::displayErrorMessage(err);
return err.isSucceeded();
}
- return QAbstractItemModel::setData(index, value, role);
+ return SKGObjectModelBase::setData(index, value, role);
}
Qt::ItemFlags SKGObjectModel::flags(const QModelIndex & index) const
@@ -740,6 +740,9 @@
Qt::ItemFlags flags = SKGObjectModelBase::flags(index);
+ QString att = m_listAttibutes[index.column()];
+ if(att=="t_bookmarked" || m_ruleTable) flags ^= Qt::ItemIsEditable;
+
if(m_categoryTable || m_payeeTable || m_accountTable || m_unitTable) {
if(index.isValid()) flags |= Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
else flags |= Qt::ItemIsDropEnabled;
--- trunk/extragear/office/skrooge/skgbankmodeler/skgdocumentbank.cpp \
#1220090:1220091 @@ -947,7 +947,7 @@
if(err.isSucceeded()) err = SKGServices::executeSqliteOrders(this, \
BankInitialDataModel);
//Set new version
- version = "6.0";
+ version = "6.1";
if(err.isSucceeded()) err = \
SKGDocument::setParameter("SKG_DB_BANK_VERSION", version); }
@@ -1618,6 +1618,12 @@
<< "5.9"
<< "6.0"
<< "UPDATE category SET t_name=t_name;"
+ //============
+ << ""
+ << "6.0"
+ << "6.1"
+ << "UPDATE node SET t_data=replace(t_data,'t_type', \
't_TYPENLS')" + << "UPDATE parameters SET t_value=replace(t_value, \
't_type', 't_TYPENLS') where t_name like '%_DEFAULT_PARAMETERS'" ;
}
@@ -1975,21 +1981,21 @@
def.id = "default";
def.name = i18nc("Noun, the default value of an item", "Default");
def.icon = "edit-undo";
- def.schema = \
"t_BANK;t_close;t_bookmarked;t_name;t_type;t_BANK_NUMBER;t_agency_number;t_number;t_ag \
ency_address;t_comment;f_CURRENTAMOUNT;f_CHECKED;f_COMING_SOON;i_NBOPERATIONS;f_RATE|N" \
+ propSchema; + def.schema = \
"t_BANK;t_close;t_bookmarked;t_name;t_TYPENLS;t_BANK_NUMBER;t_agency_number;t_number;t \
_agency_address;t_comment;f_CURRENTAMOUNT;f_CHECKED;f_COMING_SOON;i_NBOPERATIONS;f_RATE|N" \
+ propSchema; listSchema.push_back(def);
SKGModelTemplate minimum;
minimum.id = "minimum";
minimum.name = i18nc("Noun, the minimum value of an item", "Minimum");
minimum.icon = "";
- minimum.schema = \
"t_BANK;t_close;t_bookmarked|N;t_name;t_type|N;t_BANK_NUMBER|N;t_agency_number|N;t_num \
ber|N;t_agency_address|N;t_comment|N;f_CURRENTAMOUNT|N;f_CHECKED|N;f_COMING_SOON|N;i_NBOPERATIONS|N;f_RATE|N" \
+ propSchema; + minimum.schema = \
"t_BANK;t_close;t_bookmarked|N;t_name;t_TYPENLS|N;t_BANK_NUMBER|N;t_agency_number|N;t_ \
number|N;t_agency_address|N;t_comment|N;f_CURRENTAMOUNT|N;f_CHECKED|N;f_COMING_SOON|N;i_NBOPERATIONS|N;f_RATE|N" \
+ propSchema; listSchema.push_back(minimum);
SKGModelTemplate intermediate;
intermediate.id = "intermediate";
intermediate.name = i18nc("Noun, an intermediate value between two \
extremums", "Intermediate"); intermediate.icon = "";
- intermediate.schema = \
"t_BANK;t_close;t_bookmarked;t_name;t_type|N;t_BANK_NUMBER|N;t_agency_number|N;t_numbe \
r|N;t_agency_address|N;t_comment|N;f_CURRENTAMOUNT;f_CHECKED;f_COMING_SOON;i_NBOPERATIONS|N;f_RATE|N" \
+ propSchema; + intermediate.schema = \
"t_BANK;t_close;t_bookmarked;t_name;t_TYPENLS|N;t_BANK_NUMBER|N;t_agency_number|N;t_nu \
mber|N;t_agency_address|N;t_comment|N;f_CURRENTAMOUNT;f_CHECKED;f_COMING_SOON;i_NBOPERATIONS|N;f_RATE|N" \
+ propSchema; listSchema.push_back(intermediate);
} else if(iRealTable == "category") {
SKGModelTemplate def;
@@ -2024,14 +2030,14 @@
def.id = "default";
def.name = i18nc("Noun, the default value of an item", "Default");
def.icon = "edit-undo";
- def.schema = \
"t_name;t_symbol;t_country;t_type;t_internet_code;f_CURRENTAMOUNT;f_QUANTITYOWNED;i_nbdecimal;t_UNIT" \
+ propSchema; + def.schema = \
"t_name;t_symbol;t_country;t_TYPENLS;t_internet_code;f_CURRENTAMOUNT;f_QUANTITYOWNED;i_nbdecimal;t_UNIT" \
+ propSchema; listSchema.push_back(def);
SKGModelTemplate minimum;
minimum.id = "minimum";
minimum.name = i18nc("Noun, the minimum value of an item", "Minimum");
minimum.icon = "";
- minimum.schema = \
"t_name;t_symbol;t_country|N;t_type;t_internet_code|N;f_CURRENTAMOUNT|N;f_QUANTITYOWNED|N;i_nbdecimal|N;t_UNIT|N" \
+ propSchema; + minimum.schema = \
"t_name;t_symbol;t_country|N;t_TYPENLS;t_internet_code|N;f_CURRENTAMOUNT|N;f_QUANTITYOWNED|N;i_nbdecimal|N;t_UNIT|N" \
+ propSchema; listSchema.push_back(minimum);
} else if(iRealTable == "unitvalue") {
SKGModelTemplate def;
@@ -2246,7 +2252,8 @@
if(output.endsWith(QLatin1String("f_coming_soon"))) return i18nc("Adjective, a \
foreseen value", "Foreseen");
if(output.endsWith(QLatin1String("t_symbol"))) return i18nc("Noun, ahe unit \
symbol, something in the line of $, €, £...", "Symbol");
if(output.endsWith(QLatin1String("t_country"))) return i18nc("Noun, a country in \
the world (France, China...)", "Country");
- if(output.endsWith(QLatin1String("t_type"))) return i18nc("Noun, the type of an \
item", "Type"); + if(output.endsWith(QLatin1String("t_type"))||
+ output.endsWith(QLatin1String("t_typenls"))) return i18nc("Noun, the \
type of an item", "Type");
if(output.endsWith(QLatin1String("t_typeexpensenls"))) return i18nc("Noun, the \
type of an item", "Type");
if(output.endsWith(QLatin1String("t_internet_code"))) return i18nc("Noun", \
"Internet code");
if(output.endsWith(QLatin1String("i_nboperations"))) return i18nc("Noun", \
"Number of operations");
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic