diff --git a/CONTRIBUTORS b/AUTHORS similarity index 100% rename from CONTRIBUTORS rename to AUTHORS diff --git a/Makefile b/Makefile index 11df91b..a2a5c7f 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ install: cp -rf ressources/* $(SHARE_DIR) rm -rf $(SHARE_DIR)/ressources/po/* cp -rf ressources/po/*.qm $(SHARE_DIR)/ressources/po/ - cp -rf README* ChangeLog CONTRIBUTORS COPYING TODO $(DOC_DIR) + cp -rf README* ChangeLog AUTHORS COPYING TODO $(DOC_DIR) remove: rm -rf $(LIB_DIR) $(SHARE_DIR) $(DOC_DIR) $(BIN_DIR)/kc diff --git a/TODO b/TODO index 3e7ec24..e7d63b4 100644 --- a/TODO +++ b/TODO @@ -1,10 +1,9 @@ -Version 0.3 +Version 0.4 Using tabulation to navigate throw interface (Search Panel) -Windows version Choosing accounts & categories position -Cool for 0.4: +Cool for 0.5: Database auto saving at startup Use caches for created panels (avoid destroying/creating panels for nothing) Add search function to web view diff --git a/debian/docs b/debian/docs index c2788bf..dccc7f2 100644 --- a/debian/docs +++ b/debian/docs @@ -2,4 +2,4 @@ README README.fr ChangeLog TODO -CONTRIBUTORS +AUTHORS diff --git a/ressources/po/french.po b/ressources/po/french.po index cb4a698..10eb213 100644 --- a/ressources/po/french.po +++ b/ressources/po/french.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-31 19:54+0200\n" +"POT-Creation-Date: 2012-06-10 17:06+0200\n" "PO-Revision-Date: \n" "Last-Translator: Soutadé \n" "Language-Team: \n" @@ -204,13 +204,13 @@ msgstr "Bloqué" msgid "Cancel" msgstr "Annuler" -#: src/view/grid/GridAccount.cpp:1298 -#: src/view/grid/GridAccount.cpp:1311 +#: src/view/grid/GridAccount.cpp:1305 +#: src/view/grid/GridAccount.cpp:1318 msgid "Cannot group these operations" msgstr "Impossible de grouper ces opérations" -#: src/view/grid/GridAccount.cpp:1442 -#: src/view/grid/GridAccount.cpp:1448 +#: src/view/grid/GridAccount.cpp:1449 +#: src/view/grid/GridAccount.cpp:1455 msgid "Cannot ungroup these operations" msgstr "Impossible de dégrouper ces opérations" @@ -406,10 +406,10 @@ msgstr "Nouvelle description" #: src/view/PasswordDialog.cpp:64 #: 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/GridAccount.cpp:1305 +#: src/view/grid/GridAccount.cpp:1318 +#: src/view/grid/GridAccount.cpp:1449 +#: src/view/grid/GridAccount.cpp:1455 #: src/view/grid/FormulaDelegate.cpp:59 #: src/model/Database.cpp:47 #: src/model/Database.cpp:55 @@ -419,10 +419,10 @@ msgstr "Nouvelle description" #: src/model/Database.cpp:111 #: src/model/Database.cpp:121 #: src/model/Database.cpp:140 -#: src/model/Database.cpp:597 -#: src/model/Database.cpp:773 -#: src/model/Database.cpp:915 -#: src/model/Database.cpp:1735 +#: src/model/Database.cpp:582 +#: src/model/Database.cpp:758 +#: src/model/Database.cpp:900 +#: src/model/Database.cpp:1720 #: src/model/DatabaseUpdate.cpp:31 #: src/model/DatabaseUpdate.cpp:164 msgid "Error" @@ -606,6 +606,10 @@ msgstr "Langue non changée" msgid "Language successfully changed, please go to another panel" msgstr "Langue changée, allez sur un autre panneau pour rendre le changement effectif" +#: src/view/wxUI.cpp:296 +msgid "Licenced under GNU GPL v3" +msgstr "Licence GNU GPL v3" + #: src/view/ImportPanel.cpp:43 msgid "Load operations" msgstr "Charger les opérations" @@ -716,22 +720,8 @@ msgid "Password changed" msgstr "Mot de passe changé" #: src/view/wxUI.cpp:296 -msgid "" -"Personal accounting software\n" -"\n" -"http://indefero.soutade.fr/p/kisscount/\n" -"\n" -"Licenced under GNU GPL v3\n" -"\n" -"Copyright (C) 2010-2012 Grégory Soutadé" -msgstr "" -"Logiciel de comptabilité personnelle\n" -"\n" -"http://indefero.soutade.fr/p/kisscount/\n" -"\n" -"Licence GNU GPL v3\n" -"\n" -"Copyright (C) 2010-2012 Grégory Soutadé" +msgid "Personal accounting software" +msgstr "Logiciel de comptabilité personnelle" #: src/view/PasswordDialog.cpp:70 msgid "Please retype new password" @@ -817,7 +807,7 @@ msgstr "Impossible d'ouvrir la base de données" #: src/model/Database.cpp:47 #: src/model/Database.cpp:55 #: src/model/Database.cpp:74 -#: src/model/Database.cpp:1735 +#: src/model/Database.cpp:1720 msgid "Unable to open database" msgstr "Impossible d'ouvrir la base de données" @@ -851,9 +841,9 @@ msgstr "Comptes non résolus" msgid "Unresolved categories" msgstr "Catégories non résolues" -#: src/model/Database.cpp:597 -#: src/model/Database.cpp:773 -#: src/model/Database.cpp:915 +#: src/model/Database.cpp:582 +#: src/model/Database.cpp:758 +#: src/model/Database.cpp:900 msgid "Update failed !\n" msgstr "La mise à jour à échouée !\n" @@ -880,7 +870,7 @@ msgstr "Utilisateurs" msgid "Virtual" msgstr "Virtuel" -#: src/view/grid/GridAccount.cpp:1104 +#: src/view/grid/GridAccount.cpp:1111 msgid "Warning" msgstr "Attention" @@ -897,7 +887,7 @@ msgstr "Quel compte va remplacer celui-ci ?" msgid "Wich category will replace this one ?" msgstr "Quelle catégorie va remplacer celle-ci" -#: src/view/grid/GridAccount.cpp:1104 +#: src/view/grid/GridAccount.cpp:1111 msgid "You made a debit on a blocked account" msgstr "Vous avez effectué une opération de débit sur un compte bloqué" @@ -949,6 +939,23 @@ msgstr "octobre" msgid "september" msgstr "septembre" +#~ msgid "" +#~ "Personal accounting software\n" +#~ "\n" +#~ "http://indefero.soutade.fr/p/kisscount/\n" +#~ "\n" +#~ "Licenced under GNU GPL v3\n" +#~ "\n" +#~ "Copyright (C) 2010-2012 Grégory Soutadé" +#~ msgstr "" +#~ "Logiciel de comptabilité personnelle\n" +#~ "\n" +#~ "http://indefero.soutade.fr/p/kisscount/\n" +#~ "\n" +#~ "Licence GNU GPL v3\n" +#~ "\n" +#~ "Copyright (C) 2010-2012 Grégory Soutadé" + #~ msgid " profil ?" #~ msgstr " profil ?" diff --git a/ressources/po/french.qm b/ressources/po/french.qm index c586b65..4f81a9f 100644 Binary files a/ressources/po/french.qm and b/ressources/po/french.qm differ diff --git a/ressources/po/kisscount.pot b/ressources/po/kisscount.pot index c4a7f4c..0334f52 100644 --- a/ressources/po/kisscount.pot +++ b/ressources/po/kisscount.pot @@ -8,13 +8,13 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-31 19:54+0200\n" +"POT-Creation-Date: 2012-06-10 17:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" #: src/view/StatsPanel.cpp:416 @@ -188,11 +188,11 @@ msgstr "" msgid "Cancel" msgstr "" -#: src/view/grid/GridAccount.cpp:1298 src/view/grid/GridAccount.cpp:1311 +#: src/view/grid/GridAccount.cpp:1305 src/view/grid/GridAccount.cpp:1318 msgid "Cannot group these operations" msgstr "" -#: src/view/grid/GridAccount.cpp:1442 src/view/grid/GridAccount.cpp:1448 +#: src/view/grid/GridAccount.cpp:1449 src/view/grid/GridAccount.cpp:1455 msgid "Cannot ungroup these operations" msgstr "" @@ -366,15 +366,15 @@ msgstr "" #: 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: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/GridAccount.cpp:1305 src/view/grid/GridAccount.cpp:1318 +#: src/view/grid/GridAccount.cpp:1449 src/view/grid/GridAccount.cpp:1455 #: src/view/grid/FormulaDelegate.cpp:59 src/model/Database.cpp:47 #: src/model/Database.cpp:55 src/model/Database.cpp:74 #: src/model/Database.cpp:99 src/model/Database.cpp:105 #: src/model/Database.cpp:111 src/model/Database.cpp:121 -#: src/model/Database.cpp:140 src/model/Database.cpp:597 -#: src/model/Database.cpp:773 src/model/Database.cpp:915 -#: src/model/Database.cpp:1735 src/model/DatabaseUpdate.cpp:31 +#: src/model/Database.cpp:140 src/model/Database.cpp:582 +#: src/model/Database.cpp:758 src/model/Database.cpp:900 +#: src/model/Database.cpp:1720 src/model/DatabaseUpdate.cpp:31 #: src/model/DatabaseUpdate.cpp:164 msgid "Error" msgstr "" @@ -551,6 +551,10 @@ msgstr "" msgid "Language successfully changed, please go to another panel" msgstr "" +#: src/view/wxUI.cpp:296 +msgid "Licenced under GNU GPL v3" +msgstr "" + #: src/view/ImportPanel.cpp:43 msgid "Load operations" msgstr "" @@ -652,14 +656,7 @@ msgid "Password changed" msgstr "" #: src/view/wxUI.cpp:296 -msgid "" -"Personal accounting software\n" -"\n" -"http://indefero.soutade.fr/p/kisscount/\n" -"\n" -"Licenced under GNU GPL v3\n" -"\n" -"Copyright (C) 2010-2012 Grégory Soutadé" +msgid "Personal accounting software" msgstr "" #: src/view/PasswordDialog.cpp:70 @@ -736,7 +733,7 @@ msgid "Unable to open Database" msgstr "" #: src/model/Database.cpp:47 src/model/Database.cpp:55 -#: src/model/Database.cpp:74 src/model/Database.cpp:1735 +#: src/model/Database.cpp:74 src/model/Database.cpp:1720 msgid "Unable to open database" msgstr "" @@ -766,8 +763,8 @@ msgstr "" msgid "Unresolved categories" msgstr "" -#: src/model/Database.cpp:597 src/model/Database.cpp:773 -#: src/model/Database.cpp:915 +#: src/model/Database.cpp:582 src/model/Database.cpp:758 +#: src/model/Database.cpp:900 msgid "Update failed !\n" msgstr "" @@ -792,7 +789,7 @@ msgstr "" msgid "Virtual" msgstr "" -#: src/view/grid/GridAccount.cpp:1104 +#: src/view/grid/GridAccount.cpp:1111 msgid "Warning" msgstr "" @@ -808,7 +805,7 @@ msgstr "" msgid "Wich category will replace this one ?" msgstr "" -#: src/view/grid/GridAccount.cpp:1104 +#: src/view/grid/GridAccount.cpp:1111 msgid "You made a debit on a blocked account" msgstr "" diff --git a/src/view/grid/GridAccount.cpp b/src/view/grid/GridAccount.cpp index 5b343f9..af938e1 100644 --- a/src/view/grid/GridAccount.cpp +++ b/src/view/grid/GridAccount.cpp @@ -1063,7 +1063,6 @@ void GridAccount::OnOperationModified(int row, int col) 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); @@ -1087,6 +1086,7 @@ void GridAccount::OnOperationModified(int row, int col) else day = 1; setItem(row, OP_DATE, new QTableWidgetItem(_kiss->FormatDate(day, _curMonth+1, _curYear))); + this->item(row, OP_DATE)->setTextAlignment(Qt::AlignHCenter|Qt::AlignVCenter); } DEFAULT_FONT(font); diff --git a/src/view/wxUI.cpp b/src/view/wxUI.cpp index 7adeb98..2d50647 100644 --- a/src/view/wxUI.cpp +++ b/src/view/wxUI.cpp @@ -293,7 +293,7 @@ void wxUI::ChangeUser() void wxUI::OnButtonAbout() { - QMessageBox::information(0, "KissCount " APP_VERSION, _("Personal accounting software\n\nhttp://indefero.soutade.fr/p/kisscount/\n\nLicenced under GNU GPL v3\n\nCopyright (C) 2010-2012 Grégory Soutadé")); + QMessageBox::information(0, "KissCount " APP_VERSION, _("Personal accounting software") + "\n\nhttp://indefero.soutade.fr/p/kisscount/\n\n" + _("Licenced under GNU GPL v3") + "\n\nCopyright (C) 2010-2012 Grégory Soutadé"); } void wxUI::OnButtonQuit() diff --git a/tools/package.sh b/tools/package.sh index 87e3dfe..165d7e3 100755 --- a/tools/package.sh +++ b/tools/package.sh @@ -20,7 +20,7 @@ if [ "$1" == "clean" ] ; then make clean fi make || (echo "Compilation failed" ; exit 1) -cp -r kc ressources TODO CONTRIBUTORS COPYING README* www install.sh "$DIR" +cp -r kc ressources TODO AUTHORS COPYING README* www install.sh "$DIR" rm -rf "$DIR"/ressources/po/* cp -r ressources/po/*.qm "$DIR/ressources/po/" # Copy only QM files find "$DIR" -type f -executable -exec ${HOST}strip \{\} \; @@ -32,7 +32,7 @@ if [ -d "debian" ] ; then DEB_FILE="kisscount_${VERSION}-1_${ARCH}.deb" rm -rf "$DEB_DIR" "$DEB_FILE" mkdir "$DEB_DIR" -cp -r kc.1 kc debian README* ChangeLog TODO CONTRIBUTORS COPYING ressources "$DEB_DIR" +cp -r kc.1 kc debian README* ChangeLog TODO AUTHORS COPYING ressources "$DEB_DIR" rm -rf "$DEB_DIR/ressources/po/*" cp -r ressources/po/*.qm "$DEB_DIR"/ressources/po/ # Copy only QM files cd "$DEB_DIR" diff --git a/tools/package_win32.sh b/tools/package_win32.sh index 576f691..14ff006 100755 --- a/tools/package_win32.sh +++ b/tools/package_win32.sh @@ -15,7 +15,7 @@ make || (echo "Compilation failed" ; exit 1) rm -rf "$DIR" mkdir -p "$DIR" cp -r lib/*.dll* "$DIR" -cp -r kc ressources TODO CONTRIBUTORS COPYING README README.fr www "$DIR" +cp -r kc ressources TODO AUTHORS COPYING README README.fr www "$DIR" rm -rf "$DIR"/ressources/po/* cp -r ressources/po/*.qm "$DIR/ressources/po/" # Copy only QM files mv "$DIR"/kc "$DIR"/kc.exe