Add icon pay in table of billings

FACT-Team · Mar 6, 2015 · ff8320e · ff8320e
1 parent 4568061
commit ff8320e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/documents/LaTexTemplate b/documents/LaTexTemplate
diff --git a/fact-team.github.io b/fact-team.github.io
diff --git a/src/gui/mainwindow/mainwindow.cpp b/src/gui/mainwindow/mainwindow.cpp
@@ -508,7 +508,8 @@ void MainWindow::updateTableBillings(const int idProject, const int row)
     ui->tblQuotes->setColumnWidth(2, 200);
     ui->tblQuotes->setColumnWidth(3, 300);
     ui->tblQuotes->setColumnWidth(4, 100);
-    ui->tblQuotes->setColumnWidth(5, 50);
+    ui->tblQuotes->setColumnWidth(5, 100);
+
     if (row > -1) {
         ui->tblQuotes->selectRow(row);
     } else {

diff --git a/src/gui/widgets/widgetsmodels/billingstablemodel.cpp b/src/gui/widgets/widgetsmodels/billingstablemodel.cpp
@@ -25,7 +25,7 @@ int Gui::Widgets::WdgModels::BillingsTableModel::columnCount(
 QVariant Gui::Widgets::WdgModels::BillingsTableModel::data(
         const QModelIndex &index, int role) const
 {
-    if (role != Qt::DisplayRole && role != Qt::EditRole || index.row() == -1) {
+    if (role != Qt::DisplayRole && role != Qt::EditRole && role != Qt::DecorationRole || index.row() == -1) {
         return QVariant();
     }
 
@@ -38,9 +38,9 @@ QVariant Gui::Widgets::WdgModels::BillingsTableModel::data(
     case 4: return billing.getDate();
     case 5:
         if (billing.isPaid()) {
-            return "Payée";
+            return QImage(":/icons/img/img32/ok_pay.png").scaled(30,30);
         } else {
-            return "";
+            return QVariant();
         }
         break;
     default: return QVariant();

diff --git a/src/icons.qrc b/src/icons.qrc
@@ -85,6 +85,7 @@
         <file>img/coffee_level3.png</file>
         <file>img/coffee_level4.png</file>
         <file>img/coffee_ready.png</file>
+        <file>img/img32/ok_pay.png</file>
     </qresource>
     <qresource prefix="/">
         <file>../icons/img/256/remove_contributory.png</file>

diff --git a/src/img/img32/ok_pay.png b/src/img/img32/ok_pay.png
diff --git a/tests/QTestRunner b/tests/QTestRunner