From cca1149265b8d0269ad2b4e33ba944387f63aa38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 31 May 2012 20:02:34 +0200 Subject: [PATCH] Fix a bug : alignment not reset after a new operation was inserted --- ressources/po/french.mo | Bin 11714 -> 11718 bytes ressources/po/french.po | 43 +++++++++++++++++----------------- ressources/po/kisscount.pot | 40 +++++++++++++++---------------- src/view/grid/GridAccount.cpp | 7 ++++++ 4 files changed, 49 insertions(+), 41 deletions(-) diff --git a/ressources/po/french.mo b/ressources/po/french.mo index b28d368aab491b92fe60aa191750068d6675048f..9fd1ee3117ef5befba317217ff1217183186cad0 100644 GIT binary patch delta 2855 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\n" "Language-Team: \n" @@ -42,7 +42,7 @@ msgid " and " msgstr " et " #: src/view/SnapshotsDialog.cpp:133 -#: src/view/SnapshotsDialog.cpp:165 +#: src/view/SnapshotsDialog.cpp:167 msgid " does not exist" msgstr " n'existe pas" @@ -60,7 +60,7 @@ msgstr " doit avoir un nom" msgid " not found, aborting" msgstr " non trouvé, arrêt" -#: src/view/AccountPanel.cpp:942 +#: src/view/AccountPanel.cpp:941 msgid " operations ?" msgstr " opérations ?" @@ -132,7 +132,7 @@ msgstr "Numéro de compte" msgid "Accounts" msgstr "Comptes" -#: src/view/AccountPanel.cpp:1174 +#: src/view/AccountPanel.cpp:1173 msgid "Accounts updated until " msgstr "Comptes mis à jours jusqu'à " @@ -148,7 +148,7 @@ msgstr "Montant min" msgid "Amount to" msgstr "Montant max" -#: src/view/AccountPanel.cpp:1179 +#: src/view/AccountPanel.cpp:1178 msgid "Any account updated !" msgstr "Aucun compte mis à jour" @@ -157,12 +157,12 @@ msgstr "Aucun compte mis à jour" msgid "Any engine can process this file !" msgstr "Format de fichier non reconnu" -#: src/view/SnapshotsDialog.cpp:169 +#: src/view/SnapshotsDialog.cpp:171 msgid "Are you sure want to come back to " msgstr "êtes vous sûr de vouloir revenir à " #: src/view/SnapshotsDialog.cpp:137 -#: src/view/AccountPanel.cpp:937 +#: src/view/AccountPanel.cpp:936 msgid "Are you sure want to delete " msgstr "Etes vous sûr de vouloir supprimer " @@ -294,6 +294,10 @@ msgstr "Confirmer le mot de passe" msgid "Cost repartition" msgstr "Répartition des coûts" +#: src/view/SnapshotsDialog.cpp:41 +msgid "Create a snapshot" +msgstr "Faire une sauvegarde" + #: src/view/ImportPanel.cpp:181 #: src/view/ImportPanel.cpp:211 #: src/view/ImportPanel.cpp:255 @@ -303,10 +307,6 @@ msgstr "Répartition des coûts" msgid "Create one" msgstr "En créer un" -#: src/view/SnapshotsDialog.cpp:41 -msgid "Create snapshot" -msgstr "Faire une sauvegarde" - #: src/view/grid/GridAccount.cpp:73 msgid "Credit" msgstr "Crédit" @@ -353,12 +353,12 @@ msgstr "Impossible de cacher le compte par défaut" #: src/view/PreferencesPanel.cpp:222 #: src/view/PreferencesPanel.cpp:357 -#: src/view/AccountPanel.cpp:795 +#: src/view/AccountPanel.cpp:794 msgid "Delete" msgstr "Supprimer" #: src/view/SnapshotsDialog.cpp:42 -msgid "Delete snapshot" +msgid "Delete a snapshot" msgstr "Supprimer la sauvegarde" #: src/view/PreferencesPanel.cpp:477 @@ -384,8 +384,8 @@ msgstr "Nouvelle description" #: src/view/SnapshotsDialog.cpp:117 #: src/view/SnapshotsDialog.cpp:133 #: src/view/SnapshotsDialog.cpp:142 -#: src/view/SnapshotsDialog.cpp:165 -#: src/view/SnapshotsDialog.cpp:174 +#: src/view/SnapshotsDialog.cpp:167 +#: src/view/SnapshotsDialog.cpp:176 #: src/view/ImportPanel.cpp:170 #: src/view/ImportPanel.cpp:304 #: src/view/ImportPanel.cpp:328 @@ -405,7 +405,7 @@ msgstr "Nouvelle description" #: src/view/PreferencesPanel.cpp:1150 #: src/view/PasswordDialog.cpp:64 #: src/view/PasswordDialog.cpp:70 -#: src/view/AccountPanel.cpp:933 +#: src/view/AccountPanel.cpp:932 #: src/view/grid/GridAccount.cpp:1298 #: src/view/grid/GridAccount.cpp:1311 #: src/view/grid/GridAccount.cpp:1442 @@ -476,7 +476,7 @@ msgid "From " msgstr "A partir de " #: src/view/GenerateDialog.cpp:33 -#: src/view/AccountPanel.cpp:792 +#: src/view/AccountPanel.cpp:791 msgid "Generate month" msgstr "Générer mois" @@ -560,7 +560,7 @@ msgstr "Intervalle de temps invalide" msgid "It must be at least one account !" msgstr "Il doit y avoir au moins un compte !" -#: src/view/AccountPanel.cpp:933 +#: src/view/AccountPanel.cpp:932 msgid "It must be at least one month !" msgstr "Il doit rester au moins un mois" @@ -671,7 +671,7 @@ msgstr "Non rapprochée" msgid "Number" msgstr "Numéro de compte" -#: src/model/import/OFXImportEngine.cpp:141 +#: src/model/import/OFXImportEngine.cpp:144 msgid "OFX files (*.ofx)" msgstr "Fichiers OFX (*.ofx)" @@ -822,7 +822,7 @@ msgid "Unable to open database" msgstr "Impossible d'ouvrir la base de données" #: src/view/SnapshotsDialog.cpp:142 -#: src/view/SnapshotsDialog.cpp:174 +#: src/view/SnapshotsDialog.cpp:176 msgid "Unable to remove " msgstr "Impossible de supprimer " @@ -884,7 +884,8 @@ msgstr "Virtuel" msgid "Warning" msgstr "Attention" -#: src/view/SnapshotsDialog.cpp:185 +#: src/view/SnapshotsDialog.cpp:193 +#: src/view/SnapshotsDialog.cpp:203 msgid "Welcome back to " msgstr "Bienvenue sur " diff --git a/ressources/po/kisscount.pot b/ressources/po/kisscount.pot index d620884..c4a7f4c 100644 --- a/ressources/po/kisscount.pot +++ b/ressources/po/kisscount.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-22 21:27+0200\n" +"POT-Creation-Date: 2012-05-31 19:54+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -36,7 +36,7 @@ msgstr "" msgid " and " msgstr "" -#: src/view/SnapshotsDialog.cpp:133 src/view/SnapshotsDialog.cpp:165 +#: src/view/SnapshotsDialog.cpp:133 src/view/SnapshotsDialog.cpp:167 msgid " does not exist" msgstr "" @@ -52,7 +52,7 @@ msgstr "" msgid " not found, aborting" msgstr "" -#: src/view/AccountPanel.cpp:942 +#: src/view/AccountPanel.cpp:941 msgid " operations ?" msgstr "" @@ -119,7 +119,7 @@ msgstr "" msgid "Accounts" msgstr "" -#: src/view/AccountPanel.cpp:1174 +#: src/view/AccountPanel.cpp:1173 msgid "Accounts updated until " msgstr "" @@ -135,7 +135,7 @@ msgstr "" msgid "Amount to" msgstr "" -#: src/view/AccountPanel.cpp:1179 +#: src/view/AccountPanel.cpp:1178 msgid "Any account updated !" msgstr "" @@ -143,11 +143,11 @@ msgstr "" msgid "Any engine can process this file !" msgstr "" -#: src/view/SnapshotsDialog.cpp:169 +#: src/view/SnapshotsDialog.cpp:171 msgid "Are you sure want to come back to " msgstr "" -#: src/view/SnapshotsDialog.cpp:137 src/view/AccountPanel.cpp:937 +#: src/view/SnapshotsDialog.cpp:137 src/view/AccountPanel.cpp:936 msgid "Are you sure want to delete " msgstr "" @@ -275,16 +275,16 @@ msgstr "" msgid "Cost repartition" msgstr "" +#: src/view/SnapshotsDialog.cpp:41 +msgid "Create a snapshot" +msgstr "" + #: src/view/ImportPanel.cpp:181 src/view/ImportPanel.cpp:211 #: src/view/ImportPanel.cpp:255 src/view/ImportPanel.cpp:266 #: src/view/ImportPanel.cpp:295 src/view/ImportPanel.cpp:318 msgid "Create one" msgstr "" -#: src/view/SnapshotsDialog.cpp:41 -msgid "Create snapshot" -msgstr "" - #: src/view/grid/GridAccount.cpp:73 msgid "Credit" msgstr "" @@ -330,12 +330,12 @@ msgid "Default account cannot be hidden" msgstr "" #: src/view/PreferencesPanel.cpp:222 src/view/PreferencesPanel.cpp:357 -#: src/view/AccountPanel.cpp:795 +#: src/view/AccountPanel.cpp:794 msgid "Delete" msgstr "" #: src/view/SnapshotsDialog.cpp:42 -msgid "Delete snapshot" +msgid "Delete a snapshot" msgstr "" #: src/view/PreferencesPanel.cpp:477 @@ -355,7 +355,7 @@ msgstr "" #: src/view/SearchBanner.cpp:166 src/view/SearchBanner.cpp:179 #: src/view/SearchBanner.cpp:188 src/view/SnapshotsDialog.cpp:117 #: src/view/SnapshotsDialog.cpp:133 src/view/SnapshotsDialog.cpp:142 -#: src/view/SnapshotsDialog.cpp:165 src/view/SnapshotsDialog.cpp:174 +#: src/view/SnapshotsDialog.cpp:167 src/view/SnapshotsDialog.cpp:176 #: src/view/ImportPanel.cpp:170 src/view/ImportPanel.cpp:304 #: src/view/ImportPanel.cpp:328 src/view/ExportPanel.cpp:125 #: src/view/ExportPanel.cpp:138 src/view/ExportPanel.cpp:145 @@ -365,7 +365,7 @@ msgstr "" #: src/view/PreferencesPanel.cpp:1043 src/view/PreferencesPanel.cpp:1065 #: src/view/PreferencesPanel.cpp:1102 src/view/PreferencesPanel.cpp:1108 #: src/view/PreferencesPanel.cpp:1150 src/view/PasswordDialog.cpp:64 -#: src/view/PasswordDialog.cpp:70 src/view/AccountPanel.cpp:933 +#: src/view/PasswordDialog.cpp:70 src/view/AccountPanel.cpp:932 #: src/view/grid/GridAccount.cpp:1298 src/view/grid/GridAccount.cpp:1311 #: src/view/grid/GridAccount.cpp:1442 src/view/grid/GridAccount.cpp:1448 #: src/view/grid/FormulaDelegate.cpp:59 src/model/Database.cpp:47 @@ -424,7 +424,7 @@ msgstr "" msgid "From " msgstr "" -#: src/view/GenerateDialog.cpp:33 src/view/AccountPanel.cpp:792 +#: src/view/GenerateDialog.cpp:33 src/view/AccountPanel.cpp:791 msgid "Generate month" msgstr "" @@ -508,7 +508,7 @@ msgstr "" msgid "It must be at least one account !" msgstr "" -#: src/view/AccountPanel.cpp:933 +#: src/view/AccountPanel.cpp:932 msgid "It must be at least one month !" msgstr "" @@ -610,7 +610,7 @@ msgstr "" msgid "Number" msgstr "" -#: src/model/import/OFXImportEngine.cpp:141 +#: src/model/import/OFXImportEngine.cpp:144 msgid "OFX files (*.ofx)" msgstr "" @@ -740,7 +740,7 @@ msgstr "" msgid "Unable to open database" msgstr "" -#: src/view/SnapshotsDialog.cpp:142 src/view/SnapshotsDialog.cpp:174 +#: src/view/SnapshotsDialog.cpp:142 src/view/SnapshotsDialog.cpp:176 msgid "Unable to remove " msgstr "" @@ -796,7 +796,7 @@ msgstr "" msgid "Warning" msgstr "" -#: src/view/SnapshotsDialog.cpp:185 +#: src/view/SnapshotsDialog.cpp:193 src/view/SnapshotsDialog.cpp:203 msgid "Welcome back to " msgstr "" diff --git a/src/view/grid/GridAccount.cpp b/src/view/grid/GridAccount.cpp index 5130335..5b343f9 100644 --- a/src/view/grid/GridAccount.cpp +++ b/src/view/grid/GridAccount.cpp @@ -1062,6 +1062,13 @@ void GridAccount::OnOperationModified(int row, int col) if (fix_cost && i == CATEGORY) continue; setItem(row, i, new QTableWidgetItem("")); } + + this->item(row, OP_DATE)->setTextAlignment(Qt::AlignHCenter|Qt::AlignVCenter); + this->item(row, DEBIT)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); + this->item(row, CREDIT)->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); + this->item(row, OP_DELETE)->setTextAlignment(Qt::AlignHCenter|Qt::AlignVCenter); + this->item(row, CHECKED)->setTextAlignment(Qt::AlignHCenter|Qt::AlignVCenter); + if (!fix_cost) { int day;