soutade/KissCount
1
0
Fork 0
Code Issues Pull Requests Packages Releases 1 Wiki Activity

Use fixed chase font for amount values

Browse Source
This commit is contained in:
Grégory Soutadé 2021-10-03 12:32:22 +02:00
parent 2e89948c1f
commit fb65e585b3
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/view/AccountPanel.cpp
View File

@ -241,6 +241,7 @@ QString AccountPanel::GetToolTip()
void AccountPanel::InitStatsGrid(User* user) void AccountPanel::InitStatsGrid(User* user)
{ {
DEFAULT_FONT(font); DEFAULT_FONT(font);
DEFAULT_FONT_VALUES(font_values);
if (!_statsGrid->rowCount()) if (!_statsGrid->rowCount())
{ {
@ -275,6 +276,12 @@ void AccountPanel::InitStatsGrid(User* user)
_statsGrid->item(BALANCE, 0)->setFont(font); _statsGrid->item(BALANCE, 0)->setFont(font);
_statsGrid->item(BALANCE, 1)->setFont(font); _statsGrid->item(BALANCE, 1)->setFont(font);
_statsGrid->item(CUR_CREDIT, 1)->setFont(font_values);
_statsGrid->item(CUR_DEBIT, 1)->setFont(font_values);
_statsGrid->item(TOTAL_CREDIT, 1)->setFont(font_values);
_statsGrid->item(TOTAL_DEBIT, 1)->setFont(font_values);
_statsGrid->item(BALANCE, 1)->setFont(font_values);
_statsGrid->item(CUR_CREDIT, 1)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); _statsGrid->item(CUR_CREDIT, 1)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
_statsGrid->item(CUR_DEBIT, 1)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); _statsGrid->item(CUR_DEBIT, 1)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
_statsGrid->item(TOTAL_CREDIT, 1)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); _statsGrid->item(TOTAL_CREDIT, 1)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
@ -466,6 +473,7 @@ void AccountPanel::InitAccountsGrid(User* user, int month, int year)
QTableWidgetItem* item; QTableWidgetItem* item;
QString v; QString v;
DEFAULT_FONT(font); DEFAULT_FONT(font);
DEFAULT_FONT_VALUES(font_values);
font.setBold(true); font.setBold(true);
@ -528,6 +536,9 @@ void AccountPanel::InitAccountsGrid(User* user, int month, int year)
_accountsGrid->item(curLine, ACCOUNT_INIT)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); _accountsGrid->item(curLine, ACCOUNT_INIT)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
_accountsGrid->item(curLine, ACCOUNT_CUR)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); _accountsGrid->item(curLine, ACCOUNT_CUR)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
_accountsGrid->item(curLine, ACCOUNT_FINAL)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); _accountsGrid->item(curLine, ACCOUNT_FINAL)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
_accountsGrid->item(curLine, ACCOUNT_INIT)->setFont(font_values);
_accountsGrid->item(curLine, ACCOUNT_CUR)->setFont(font_values);
_accountsGrid->item(curLine, ACCOUNT_FINAL)->setFont(font_values);
} }
_accountsGrid->resizeColumnsToContents(); _accountsGrid->resizeColumnsToContents();

4
src/view/CostRepartitionBanner.cpp
View File

@ -94,6 +94,7 @@ void CostRepartitionBanner::Reset()
int i; int i;
User* user = _kiss->GetUser(); User* user = _kiss->GetUser();
int nb_categories = user->GetCategoriesNumber(); int nb_categories = user->GetCategoriesNumber();
DEFAULT_FONT_VALUES(font_values);
if (!_statsGrid->rowCount()) if (!_statsGrid->rowCount())
{ {
@ -109,6 +110,7 @@ void CostRepartitionBanner::Reset()
_statsGrid->setItem(1, 0, new QTableWidgetItem(_("Non fix"))); _statsGrid->setItem(1, 0, new QTableWidgetItem(_("Non fix")));
_statsGrid->setItem(1, 1, new QTableWidgetItem("")); _statsGrid->setItem(1, 1, new QTableWidgetItem(""));
_statsGrid->item(1, 1)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); _statsGrid->item(1, 1)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
_statsGrid->item(1, 1)->setFont(font_values);
for(i=0; i<nb_categories; i++) for(i=0; i<nb_categories; i++)
{ {
@ -117,12 +119,14 @@ void CostRepartitionBanner::Reset()
_statsGrid->setItem(i, 0, new QTableWidgetItem(_categories[i])); _statsGrid->setItem(i, 0, new QTableWidgetItem(_categories[i]));
_statsGrid->setItem(i, 1, new QTableWidgetItem("")); _statsGrid->setItem(i, 1, new QTableWidgetItem(""));
_statsGrid->item(i, 1)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); _statsGrid->item(i, 1)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
_statsGrid->item(i, 1)->setFont(font_values);
} }
else else
{ {
_statsGrid->setItem(i+1, 0, new QTableWidgetItem(_categories[i])); _statsGrid->setItem(i+1, 0, new QTableWidgetItem(_categories[i]));
_statsGrid->setItem(i+1, 1, new QTableWidgetItem("")); _statsGrid->setItem(i+1, 1, new QTableWidgetItem(""));
_statsGrid->item(i+1, 1)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); _statsGrid->item(i+1, 1)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
_statsGrid->item(i+1, 1)->setFont(font_values);
} }
} }

6
src/view/grid/GridAccount.cpp
View File

@ -40,7 +40,9 @@
{ \ { \
if (!this->item(row, i)) setItem(row, i, new QTableWidgetItem("")); \ if (!this->item(row, i)) setItem(row, i, new QTableWidgetItem("")); \
this->item(row, i)->setFont(font); \ this->item(row, i)->setFont(font); \
} } \
this->item(row, GridAccount::DEBIT)->setFont(font_values); \
this->item(row, GridAccount::CREDIT)->setFont(font_values);
#define SET_READ_ONLY(item) item->setFlags(item->flags() & ~Qt::ItemIsEditable); #define SET_READ_ONLY(item) item->setFlags(item->flags() & ~Qt::ItemIsEditable);
@ -400,6 +402,7 @@ void GridAccount::InsertOperation(User* user, Operation& op, int line, bool fix,
QDate curDate = QDate::currentDate(); QDate curDate = QDate::currentDate();
QString description, v; QString description, v;
DEFAULT_FONT(font); DEFAULT_FONT(font);
DEFAULT_FONT_VALUES(font_values);
Category cat ; Category cat ;
Tag tag; Tag tag;
Operation op2; Operation op2;
@ -975,6 +978,7 @@ void GridAccount::OnOperationModified(int row, int col)
bool fix_cost; bool fix_cost;
Operation NULLop = Operation(); Operation NULLop = Operation();
Account account; Account account;
DEFAULT_FONT_VALUES(font_values);
// Avoid recursives calls // Avoid recursives calls
if (_inModification || _loadOperations) return; if (_inModification || _loadOperations) return;

4
src/view/view.hpp
View File

@ -27,9 +27,11 @@ namespace view {
const QColor OWN_YELLOW(0xFF, 0xFF, 0x99); const QColor OWN_YELLOW(0xFF, 0xFF, 0x99);
const QColor OWN_GREEN(0x3D, 0xEB, 0x3D); const QColor OWN_GREEN(0x3D, 0xEB, 0x3D);
const QString DEFAULT_FONT_NAME("Liberation Sans"); const QString DEFAULT_FONT_NAME("Liberation Sans");
const QString DEFAULT_FONT_NAME_VALUES("Liberation Serif");
const int DEFAULT_FONT_SIZE = 12; const int DEFAULT_FONT_SIZE = 12;
#define DEFAULT_FONT(font_name) QFont font_name; #define DEFAULT_FONT(font_name) QFont font_name(view::DEFAULT_FONT_NAME);
#define DEFAULT_FONT_VALUES(font_name) QFont font_name(view::DEFAULT_FONT_NAME_VALUES, view::DEFAULT_FONT_SIZE);
}; };
#define DELETE_ICON RESOURCES_ROOT "icons/delete.png" #define DELETE_ICON RESOURCES_ROOT "icons/delete.png"